From 32e427136101ba84c1a40fbd835c00d8495e309f Mon Sep 17 00:00:00 2001
From: shlainn <shlainn@fda9a0ab-4e26-0410-ba80-894f06a4b443>
Date: Sat, 11 Apr 2009 00:59:48 +0000
Subject: [PATCH] * Major overhaul of linux build system ** Only openssl and
 bz2 (for stuffextract) left as external dependencies, zlib, zthread and
 irrlicht are compiled from dep folder ** Irrlicht upgraded to version 1.5 **
 Various fixes to make GCC not complain ** to compile: autoreconf -if &&
 ./compile -prefix=full_path_to_bin_directory && make ** Only issue: rename
 dep/openssl otherwise compiler will complain - too late to figure out now.

---
 configure.ac                                  |     9 +-
 src/Client/GUI/CM2MeshFileLoader.cpp          |    36 +-
 src/Client/GUI/Makefile.am                    |     2 +-
 src/Client/GUI/SImage.cpp                     |    35 +
 src/Client/GUI/SImage.h                       |     8 +
 src/Client/GUI/SSkinnedMesh.cpp               |    23 +-
 src/Client/GUI/SSkinnedMesh.h                 |     7 +
 src/Client/GUI/SceneWorld.cpp                 |     9 +-
 src/Client/Makefile.am                        |    14 +-
 src/Client/Realm/Makefile.am                  |     2 +-
 src/Client/World/Makefile.am                  |     2 +-
 src/Makefile.am                               |     2 +-
 src/PseuWoW.cbp                               |    34 +-
 src/dep/include/irrlicht/CMeshBuffer.h        |   173 +-
 src/dep/include/irrlicht/ECullingTypes.h      |     2 +-
 src/dep/include/irrlicht/EDebugSceneTypes.h   |     9 +-
 src/dep/include/irrlicht/EDriverFeatures.h    |    13 +-
 src/dep/include/irrlicht/EDriverTypes.h       |    47 +-
 src/dep/include/irrlicht/EGUIElementTypes.h   |    22 +-
 src/dep/include/irrlicht/EMaterialFlags.h     |    32 +-
 src/dep/include/irrlicht/EMaterialTypes.h     |   239 +-
 src/dep/include/irrlicht/EMeshWriterEnums.h   |     9 +-
 src/dep/include/irrlicht/EMessageBoxFlags.h   |     5 +-
 .../irrlicht/ESceneNodeAnimatorTypes.h        |    11 +-
 src/dep/include/irrlicht/ESceneNodeTypes.h    |    23 +-
 src/dep/include/irrlicht/ETerrainElements.h   |     2 +-
 src/dep/include/irrlicht/IAnimatedMesh.h      |    18 +-
 src/dep/include/irrlicht/IAnimatedMeshMD2.h   |    34 +-
 src/dep/include/irrlicht/IAnimatedMeshMD3.h   |   108 +-
 .../include/irrlicht/IAnimatedMeshSceneNode.h |   194 +-
 .../irrlicht/IAttributeExchangingObject.h     |    22 +-
 src/dep/include/irrlicht/IAttributes.h        |    95 +-
 .../include/irrlicht/IBillboardSceneNode.h    |    17 +-
 src/dep/include/irrlicht/IBoneSceneNode.h     |    35 +-
 src/dep/include/irrlicht/ICameraSceneNode.h   |   119 +-
 src/dep/include/irrlicht/ICursorControl.h     |    36 +-
 .../irrlicht/IDummyTransformationSceneNode.h  |    10 +-
 src/dep/include/irrlicht/IEventReceiver.h     |   224 +-
 src/dep/include/irrlicht/IFileList.h          |    38 +-
 src/dep/include/irrlicht/IFileSystem.h        |    60 +-
 .../irrlicht/IGPUProgrammingServices.h        |   364 +-
 src/dep/include/irrlicht/IGUIButton.h         |    23 +-
 src/dep/include/irrlicht/IGUICheckBox.h       |     5 +-
 .../include/irrlicht/IGUIColorSelectDialog.h  |     5 +-
 src/dep/include/irrlicht/IGUIComboBox.h       |    19 +-
 src/dep/include/irrlicht/IGUIContextMenu.h    |    43 +-
 src/dep/include/irrlicht/IGUIEditBox.h        |    51 +-
 src/dep/include/irrlicht/IGUIElement.h        |   191 +-
 src/dep/include/irrlicht/IGUIElementFactory.h |    28 +-
 src/dep/include/irrlicht/IGUIEnvironment.h    |   526 +-
 src/dep/include/irrlicht/IGUIFileOpenDialog.h |     5 +-
 src/dep/include/irrlicht/IGUIFont.h           |    39 +-
 src/dep/include/irrlicht/IGUIFontBitmap.h     |     5 +-
 src/dep/include/irrlicht/IGUIImage.h          |     5 +-
 src/dep/include/irrlicht/IGUIInOutFader.h     |    30 +-
 src/dep/include/irrlicht/IGUIListBox.h        |    37 +-
 src/dep/include/irrlicht/IGUIMeshViewer.h     |     5 +-
 src/dep/include/irrlicht/IGUIScrollBar.h      |    15 +-
 src/dep/include/irrlicht/IGUISkin.h           |   115 +-
 src/dep/include/irrlicht/IGUISpinBox.h        |    11 +-
 src/dep/include/irrlicht/IGUISpriteBank.h     |    18 +-
 src/dep/include/irrlicht/IGUIStaticText.h     |    47 +-
 src/dep/include/irrlicht/IGUITabControl.h     |    43 +-
 src/dep/include/irrlicht/IGUIToolbar.h        |     5 +-
 src/dep/include/irrlicht/IGUIWindow.h         |     5 +-
 src/dep/include/irrlicht/IImage.h             |    74 +-
 src/dep/include/irrlicht/IImageLoader.h       |    26 +-
 src/dep/include/irrlicht/IImageWriter.h       |    17 +-
 src/dep/include/irrlicht/ILightSceneNode.h    |    51 +-
 src/dep/include/irrlicht/ILogger.h            |    79 +-
 src/dep/include/irrlicht/IMaterialRenderer.h  |   102 +-
 .../irrlicht/IMaterialRendererServices.h      |   111 +-
 src/dep/include/irrlicht/IMesh.h              |    55 +-
 src/dep/include/irrlicht/IMeshBuffer.h        |   129 +-
 src/dep/include/irrlicht/IMeshCache.h         |   139 +-
 src/dep/include/irrlicht/IMeshLoader.h        |    22 +-
 src/dep/include/irrlicht/IMeshManipulator.h   |   157 +-
 src/dep/include/irrlicht/IMeshSceneNode.h     |    24 +-
 src/dep/include/irrlicht/IMeshWriter.h        |    24 +-
 .../include/irrlicht/IMetaTriangleSelector.h  |    19 +-
 src/dep/include/irrlicht/IOSOperator.h        |    28 +-
 src/dep/include/irrlicht/IParticleAffector.h  |    26 +-
 .../IParticleAnimatedMeshSceneNodeEmitter.h   |    10 +-
 .../irrlicht/IParticleAttractionAffector.h    |     2 +-
 .../include/irrlicht/IParticleBoxEmitter.h    |     2 +-
 .../irrlicht/IParticleCylinderEmitter.h       |     2 +-
 src/dep/include/irrlicht/IParticleEmitter.h   |    47 +-
 .../irrlicht/IParticleFadeOutAffector.h       |     8 +-
 .../irrlicht/IParticleGravityAffector.h       |     9 +-
 .../include/irrlicht/IParticleMeshEmitter.h   |     8 +-
 .../include/irrlicht/IParticleRingEmitter.h   |     2 +-
 .../irrlicht/IParticleRotationAffector.h      |     2 +-
 .../include/irrlicht/IParticleSphereEmitter.h |     2 +-
 .../irrlicht/IParticleSystemSceneNode.h       |   602 +-
 src/dep/include/irrlicht/IQ3LevelMesh.h       |    18 +-
 src/dep/include/irrlicht/IQ3Shader.h          |    61 +-
 src/dep/include/irrlicht/IReadFile.h          |    35 +-
 src/dep/include/irrlicht/IReferenceCounted.h  |   137 +-
 .../include/irrlicht/ISceneCollisionManager.h |   179 +-
 src/dep/include/irrlicht/ISceneManager.h      |   977 +-
 src/dep/include/irrlicht/ISceneNode.h         |   399 +-
 src/dep/include/irrlicht/ISceneNodeAnimator.h |    35 +-
 .../ISceneNodeAnimatorCollisionResponse.h     |   109 +-
 .../irrlicht/ISceneNodeAnimatorFactory.h      |    14 +-
 src/dep/include/irrlicht/ISceneNodeFactory.h  |    19 +-
 .../irrlicht/ISceneUserDataSerializer.h       |     9 +-
 .../irrlicht/IShaderConstantSetCallBack.h     |    92 +-
 .../include/irrlicht/IShadowVolumeSceneNode.h |    11 +-
 src/dep/include/irrlicht/ISkinnedMesh.h       |    25 +-
 src/dep/include/irrlicht/ITerrainSceneNode.h  |   193 +-
 src/dep/include/irrlicht/ITextSceneNode.h     |     4 +-
 src/dep/include/irrlicht/ITexture.h           |   158 +-
 src/dep/include/irrlicht/ITimer.h             |    40 +-
 src/dep/include/irrlicht/ITriangleSelector.h  |    90 +-
 src/dep/include/irrlicht/IVideoDriver.h       |  1095 +-
 src/dep/include/irrlicht/IVideoModeList.h     |    38 +-
 src/dep/include/irrlicht/IWriteFile.h         |    31 +-
 src/dep/include/irrlicht/IXMLReader.h         |    18 +-
 src/dep/include/irrlicht/IXMLWriter.h         |    50 +-
 src/dep/include/irrlicht/IrrCompileConfig.h   |   152 +-
 src/dep/include/irrlicht/IrrlichtDevice.h     |   198 +-
 src/dep/include/irrlicht/Keycodes.h           |   278 +-
 src/dep/include/irrlicht/S3DVertex.h          |    77 +-
 src/dep/include/irrlicht/SAnimatedMesh.h      |    79 +-
 src/dep/include/irrlicht/SColor.h             |   539 +-
 src/dep/include/irrlicht/SExposedVideoData.h  |    46 +-
 .../include/irrlicht/SIrrCreationParameters.h |   168 +-
 src/dep/include/irrlicht/SKeyMap.h            |     4 +-
 src/dep/include/irrlicht/SLight.h             |    48 +-
 src/dep/include/irrlicht/SMaterial.h          |   158 +-
 src/dep/include/irrlicht/SMaterialLayer.h     |    77 +-
 src/dep/include/irrlicht/SMesh.h              |    22 +-
 src/dep/include/irrlicht/SMeshBuffer.h        |     2 +-
 .../include/irrlicht/SMeshBufferLightMap.h    |     2 +-
 .../include/irrlicht/SMeshBufferTangents.h    |     2 +-
 src/dep/include/irrlicht/SParticle.h          |    20 +-
 src/dep/include/irrlicht/SSharedMeshBuffer.h  |    69 +-
 src/dep/include/irrlicht/SSkinMeshBuffer.h    |   205 +-
 src/dep/include/irrlicht/SViewFrustum.h       |    71 +-
 src/dep/include/irrlicht/SceneParameters.h    |    99 +-
 src/dep/include/irrlicht/aabbox3d.h           |   148 +-
 src/dep/include/irrlicht/coreutil.h           |     6 +-
 src/dep/include/irrlicht/dimension2d.h        |   257 +-
 src/dep/include/irrlicht/fast_atof.h          |   191 +-
 src/dep/include/irrlicht/heapsort.h           |    10 +-
 src/dep/include/irrlicht/irrAllocator.h       |    25 +-
 src/dep/include/irrlicht/irrArray.h           |   216 +-
 src/dep/include/irrlicht/irrList.h            |    71 +-
 src/dep/include/irrlicht/irrMap.h             |    73 +-
 src/dep/include/irrlicht/irrMath.h            |   126 +-
 src/dep/include/irrlicht/irrString.h          |   234 +-
 src/dep/include/irrlicht/irrTypes.h           |    85 +-
 src/dep/include/irrlicht/irrXML.h             |   223 +-
 src/dep/include/irrlicht/irrlicht.h           |   113 +-
 src/dep/include/irrlicht/line2d.h             |   139 +-
 src/dep/include/irrlicht/line3d.h             |    68 +-
 src/dep/include/irrlicht/matrix4.h            |   596 +-
 src/dep/include/irrlicht/plane3d.h            |   126 +-
 src/dep/include/irrlicht/position2d.h         |    14 +-
 src/dep/include/irrlicht/quaternion.h         |   304 +-
 src/dep/include/irrlicht/rect.h               |    82 +-
 src/dep/include/irrlicht/triangle3d.h         |   109 +-
 src/dep/include/irrlicht/vector2d.h           |   202 +-
 src/dep/include/irrlicht/vector3d.h           |   308 +-
 src/dep/src/irrlicht/BuiltInFont.h            |    14 +-
 src/dep/src/irrlicht/C3DSMeshFileLoader.cpp   |   311 +-
 src/dep/src/irrlicht/C3DSMeshFileLoader.h     |    18 +-
 src/dep/src/irrlicht/CAnimatedMeshMD2.cpp     |   423 +-
 src/dep/src/irrlicht/CAnimatedMeshMD2.h       |    70 +-
 src/dep/src/irrlicht/CAnimatedMeshMD3.cpp     |    44 +-
 src/dep/src/irrlicht/CAnimatedMeshMD3.h       |    10 +-
 .../src/irrlicht/CAnimatedMeshSceneNode.cpp   |   447 +-
 src/dep/src/irrlicht/CAnimatedMeshSceneNode.h |    35 +-
 src/dep/src/irrlicht/CAttributeImpl.h         |     6 +-
 src/dep/src/irrlicht/CAttributes.cpp          |     6 +-
 src/dep/src/irrlicht/CAttributes.h            |     2 +-
 src/dep/src/irrlicht/CB3DMeshFileLoader.cpp   |   775 +-
 src/dep/src/irrlicht/CB3DMeshFileLoader.h     |    53 +-
 src/dep/src/irrlicht/CBSPMeshFileLoader.cpp   |    30 +-
 src/dep/src/irrlicht/CBSPMeshFileLoader.h     |     5 +-
 src/dep/src/irrlicht/CBillboardSceneNode.cpp  |    24 +-
 src/dep/src/irrlicht/CBillboardSceneNode.h    |     6 +-
 src/dep/src/irrlicht/CBoneSceneNode.cpp       |    53 +-
 src/dep/src/irrlicht/CBoneSceneNode.h         |    33 +-
 src/dep/src/irrlicht/CCSMLoader.cpp           |     6 +-
 src/dep/src/irrlicht/CCSMLoader.h             |     2 +-
 src/dep/src/irrlicht/CCameraFPSSceneNode.cpp  |   302 -
 src/dep/src/irrlicht/CCameraFPSSceneNode.h    |   104 -
 src/dep/src/irrlicht/CCameraMayaSceneNode.cpp |   329 -
 src/dep/src/irrlicht/CCameraMayaSceneNode.h   |    90 -
 src/dep/src/irrlicht/CCameraSceneNode.cpp     |   132 +-
 src/dep/src/irrlicht/CCameraSceneNode.h       |    45 +-
 src/dep/src/irrlicht/CColladaFileLoader.cpp   |  1987 +-
 src/dep/src/irrlicht/CColladaFileLoader.h     |    98 +-
 src/dep/src/irrlicht/CColladaMeshWriter.cpp   |   299 +-
 src/dep/src/irrlicht/CColladaMeshWriter.h     |     4 +
 src/dep/src/irrlicht/CColorConverter.cpp      |     2 +-
 src/dep/src/irrlicht/CColorConverter.h        |     2 +-
 src/dep/src/irrlicht/CCubeSceneNode.cpp       |    69 +-
 src/dep/src/irrlicht/CCubeSceneNode.h         |    27 +-
 src/dep/src/irrlicht/CD3D8Driver.cpp          |   407 +-
 src/dep/src/irrlicht/CD3D8Driver.h            |    28 +-
 src/dep/src/irrlicht/CD3D8MaterialRenderer.h  |    39 +-
 .../src/irrlicht/CD3D8NormalMapRenderer.cpp   |    12 +-
 src/dep/src/irrlicht/CD3D8NormalMapRenderer.h |     2 +-
 .../src/irrlicht/CD3D8ParallaxMapRenderer.cpp |    22 +-
 .../src/irrlicht/CD3D8ParallaxMapRenderer.h   |     2 +-
 .../irrlicht/CD3D8ShaderMaterialRenderer.cpp  |    39 +-
 .../irrlicht/CD3D8ShaderMaterialRenderer.h    |     2 +-
 src/dep/src/irrlicht/CD3D8Texture.cpp         |    59 +-
 src/dep/src/irrlicht/CD3D8Texture.h           |    12 +-
 src/dep/src/irrlicht/CD3D9Driver.cpp          |  1152 +-
 src/dep/src/irrlicht/CD3D9Driver.h            |   127 +-
 .../irrlicht/CD3D9HLSLMaterialRenderer.cpp    |     7 +-
 .../src/irrlicht/CD3D9HLSLMaterialRenderer.h  |     2 +-
 src/dep/src/irrlicht/CD3D9MaterialRenderer.h  |    46 +-
 .../src/irrlicht/CD3D9NormalMapRenderer.cpp   |    26 +-
 src/dep/src/irrlicht/CD3D9NormalMapRenderer.h |     4 +-
 .../src/irrlicht/CD3D9ParallaxMapRenderer.cpp |    25 +-
 .../src/irrlicht/CD3D9ParallaxMapRenderer.h   |     4 +-
 .../irrlicht/CD3D9ShaderMaterialRenderer.cpp  |    86 +-
 .../irrlicht/CD3D9ShaderMaterialRenderer.h    |     4 +-
 src/dep/src/irrlicht/CD3D9Texture.cpp         |   216 +-
 src/dep/src/irrlicht/CD3D9Texture.h           |    31 +-
 src/dep/src/irrlicht/CDMFLoader.cpp           |   268 +-
 src/dep/src/irrlicht/CDMFLoader.h             |    56 +-
 .../irrlicht/CDefaultGUIElementFactory.cpp    |    17 +-
 .../src/irrlicht/CDefaultGUIElementFactory.h  |     2 +-
 .../CDefaultSceneNodeAnimatorFactory.cpp      |    28 +-
 .../CDefaultSceneNodeAnimatorFactory.h        |    11 +-
 .../src/irrlicht/CDefaultSceneNodeFactory.cpp |    13 +-
 .../src/irrlicht/CDefaultSceneNodeFactory.h   |     2 +-
 src/dep/src/irrlicht/CDepthBuffer.cpp         |    18 +-
 src/dep/src/irrlicht/CDepthBuffer.h           |    19 +-
 .../CDummyTransformationSceneNode.cpp         |    10 +-
 .../irrlicht/CDummyTransformationSceneNode.h  |     5 +-
 src/dep/src/irrlicht/CEmptySceneNode.cpp      |     8 +-
 src/dep/src/irrlicht/CEmptySceneNode.h        |     2 +-
 src/dep/src/irrlicht/CFPSCounter.cpp          |     2 +-
 src/dep/src/irrlicht/CFPSCounter.h            |     2 +-
 src/dep/src/irrlicht/CFileList.cpp            |    32 +-
 src/dep/src/irrlicht/CFileList.h              |    20 +-
 src/dep/src/irrlicht/CFileSystem.cpp          |   147 +-
 src/dep/src/irrlicht/CFileSystem.h            |    13 +-
 src/dep/src/irrlicht/CGUIButton.cpp           |    64 +-
 src/dep/src/irrlicht/CGUIButton.h             |    17 +-
 src/dep/src/irrlicht/CGUICheckBox.cpp         |   160 +-
 src/dep/src/irrlicht/CGUICheckBox.h           |     4 +-
 .../src/irrlicht/CGUIColorSelectDialog.cpp    |   265 +-
 src/dep/src/irrlicht/CGUIColorSelectDialog.h  |     4 +-
 src/dep/src/irrlicht/CGUIComboBox.cpp         |   356 +-
 src/dep/src/irrlicht/CGUIComboBox.h           |    13 +-
 src/dep/src/irrlicht/CGUIContextMenu.cpp      |   102 +-
 src/dep/src/irrlicht/CGUIContextMenu.h        |     8 +-
 src/dep/src/irrlicht/CGUIEditBox.cpp          |   129 +-
 src/dep/src/irrlicht/CGUIEditBox.h            |     8 +-
 src/dep/src/irrlicht/CGUIEnvironment.cpp      |   159 +-
 src/dep/src/irrlicht/CGUIEnvironment.h        |    42 +-
 src/dep/src/irrlicht/CGUIFileOpenDialog.cpp   |   171 +-
 src/dep/src/irrlicht/CGUIFileOpenDialog.h     |     5 +-
 src/dep/src/irrlicht/CGUIFont.cpp             |    51 +-
 src/dep/src/irrlicht/CGUIFont.h               |     6 +-
 src/dep/src/irrlicht/CGUIImage.cpp            |    28 +-
 src/dep/src/irrlicht/CGUIImage.h              |     5 +-
 src/dep/src/irrlicht/CGUIInOutFader.cpp       |    13 +-
 src/dep/src/irrlicht/CGUIInOutFader.h         |     5 +-
 src/dep/src/irrlicht/CGUIListBox.cpp          |   400 +-
 src/dep/src/irrlicht/CGUIListBox.h            |    24 +-
 src/dep/src/irrlicht/CGUIMenu.cpp             |   121 +-
 src/dep/src/irrlicht/CGUIMenu.h               |     3 +-
 src/dep/src/irrlicht/CGUIMeshViewer.cpp       |    31 +-
 src/dep/src/irrlicht/CGUIMeshViewer.h         |     3 +-
 src/dep/src/irrlicht/CGUIMessageBox.cpp       |   246 +-
 src/dep/src/irrlicht/CGUIMessageBox.h         |     4 +-
 src/dep/src/irrlicht/CGUIModalScreen.cpp      |    25 +-
 src/dep/src/irrlicht/CGUIModalScreen.h        |     3 +-
 src/dep/src/irrlicht/CGUIScrollBar.cpp        |   276 +-
 src/dep/src/irrlicht/CGUIScrollBar.h          |     2 +-
 src/dep/src/irrlicht/CGUISkin.cpp             |   196 +-
 src/dep/src/irrlicht/CGUISkin.h               |    98 +-
 src/dep/src/irrlicht/CGUISpinBox.cpp          |    78 +-
 src/dep/src/irrlicht/CGUISpinBox.h            |     5 +-
 src/dep/src/irrlicht/CGUISpriteBank.cpp       |     5 +-
 src/dep/src/irrlicht/CGUISpriteBank.h         |     7 +-
 src/dep/src/irrlicht/CGUIStaticText.cpp       |    16 +-
 src/dep/src/irrlicht/CGUIStaticText.h         |     4 +-
 src/dep/src/irrlicht/CGUITabControl.cpp       |   554 +-
 src/dep/src/irrlicht/CGUITabControl.h         |    53 +-
 src/dep/src/irrlicht/CGUIToolBar.cpp          |    23 +-
 src/dep/src/irrlicht/CGUIToolBar.h            |     2 +-
 src/dep/src/irrlicht/CGUIWindow.cpp           |   147 +-
 src/dep/src/irrlicht/CGUIWindow.h             |    10 +-
 src/dep/src/irrlicht/CGeometryCreator.cpp     |   522 +-
 src/dep/src/irrlicht/CGeometryCreator.h       |     8 +-
 src/dep/src/irrlicht/CImage.cpp               |  2923 +--
 src/dep/src/irrlicht/CImage.h                 |    46 +-
 src/dep/src/irrlicht/CImageLoaderBMP.cpp      |     4 +-
 src/dep/src/irrlicht/CImageLoaderBMP.h        |     2 +-
 src/dep/src/irrlicht/CImageLoaderJPG.cpp      |     2 +-
 src/dep/src/irrlicht/CImageLoaderJPG.h        |     2 +-
 src/dep/src/irrlicht/CImageLoaderPCX.cpp      |    99 +-
 src/dep/src/irrlicht/CImageLoaderPCX.h        |     2 +-
 src/dep/src/irrlicht/CImageLoaderPNG.cpp      |    28 +-
 src/dep/src/irrlicht/CImageLoaderPNG.h        |     2 +-
 src/dep/src/irrlicht/CImageLoaderPPM.cpp      |    12 +-
 src/dep/src/irrlicht/CImageLoaderPPM.h        |     2 +-
 src/dep/src/irrlicht/CImageLoaderPSD.cpp      |     6 +-
 src/dep/src/irrlicht/CImageLoaderPSD.h        |     2 +-
 src/dep/src/irrlicht/CImageLoaderTGA.cpp      |     4 +-
 src/dep/src/irrlicht/CImageLoaderTGA.h        |     2 +-
 src/dep/src/irrlicht/CImageWriterBMP.cpp      |     2 +-
 src/dep/src/irrlicht/CImageWriterBMP.h        |     2 +-
 src/dep/src/irrlicht/CImageWriterJPG.cpp      |   230 +-
 src/dep/src/irrlicht/CImageWriterJPG.h        |     2 +-
 src/dep/src/irrlicht/CImageWriterPCX.cpp      |   122 +-
 src/dep/src/irrlicht/CImageWriterPCX.h        |     2 +-
 src/dep/src/irrlicht/CImageWriterPNG.cpp      |    10 +-
 src/dep/src/irrlicht/CImageWriterPNG.h        |     2 +-
 src/dep/src/irrlicht/CImageWriterPPM.cpp      |    10 +-
 src/dep/src/irrlicht/CImageWriterPPM.h        |     2 +-
 src/dep/src/irrlicht/CImageWriterPSD.cpp      |     2 +-
 src/dep/src/irrlicht/CImageWriterPSD.h        |     2 +-
 src/dep/src/irrlicht/CImageWriterTGA.cpp      |     2 +-
 src/dep/src/irrlicht/CImageWriterTGA.h        |     2 +-
 src/dep/src/irrlicht/CIrrDeviceLinux.cpp      |   660 +-
 src/dep/src/irrlicht/CIrrDeviceLinux.h        |    75 +-
 src/dep/src/irrlicht/CIrrDeviceSDL.cpp        |   523 +-
 src/dep/src/irrlicht/CIrrDeviceSDL.h          |    46 +-
 src/dep/src/irrlicht/CIrrDeviceStub.cpp       |    51 +-
 src/dep/src/irrlicht/CIrrDeviceStub.h         |    39 +-
 src/dep/src/irrlicht/CIrrDeviceWin32.cpp      |   412 +-
 src/dep/src/irrlicht/CIrrDeviceWin32.h        |    47 +-
 src/dep/src/irrlicht/CIrrMeshFileLoader.cpp   |    21 +-
 src/dep/src/irrlicht/CIrrMeshFileLoader.h     |     9 +-
 src/dep/src/irrlicht/CIrrMeshWriter.cpp       |    38 +-
 src/dep/src/irrlicht/CIrrMeshWriter.h         |     4 +
 src/dep/src/irrlicht/CLMTSMeshFileLoader.cpp  |   150 +-
 src/dep/src/irrlicht/CLMTSMeshFileLoader.h    |    10 +-
 src/dep/src/irrlicht/CLightSceneNode.cpp      |    72 +-
 src/dep/src/irrlicht/CLightSceneNode.h        |    33 +-
 src/dep/src/irrlicht/CLimitReadFile.cpp       |     2 +-
 src/dep/src/irrlicht/CLimitReadFile.h         |     2 +-
 src/dep/src/irrlicht/CLogger.cpp              |     5 +-
 src/dep/src/irrlicht/CLogger.h                |     2 +-
 src/dep/src/irrlicht/CMD2MeshFileLoader.cpp   |   325 +-
 src/dep/src/irrlicht/CMD2MeshFileLoader.h     |     8 +-
 src/dep/src/irrlicht/CMD3MeshFileLoader.cpp   |    14 +-
 src/dep/src/irrlicht/CMD3MeshFileLoader.h     |    14 +-
 src/dep/src/irrlicht/CMS3DMeshFileLoader.cpp  |   460 +-
 src/dep/src/irrlicht/CMS3DMeshFileLoader.h    |    16 +-
 src/dep/src/irrlicht/CMY3DHelper.h            |   142 +-
 src/dep/src/irrlicht/CMY3DMeshFileLoader.cpp  |   685 +-
 src/dep/src/irrlicht/CMY3DMeshFileLoader.h    |    53 +-
 src/dep/src/irrlicht/CMY3DStuff.h             |   188 -
 src/dep/src/irrlicht/CMemoryReadFile.cpp      |    14 +-
 src/dep/src/irrlicht/CMemoryReadFile.h        |     8 +-
 src/dep/src/irrlicht/CMeshCache.cpp           |    14 +-
 src/dep/src/irrlicht/CMeshCache.h             |     2 +-
 src/dep/src/irrlicht/CMeshManipulator.cpp     |   688 +-
 src/dep/src/irrlicht/CMeshManipulator.h       |    80 +-
 src/dep/src/irrlicht/CMeshSceneNode.cpp       |   144 +-
 src/dep/src/irrlicht/CMeshSceneNode.h         |     2 +-
 .../src/irrlicht/CMetaTriangleSelector.cpp    |    43 +-
 src/dep/src/irrlicht/CMetaTriangleSelector.h  |     2 +-
 src/dep/src/irrlicht/CNullDriver.cpp          |   320 +-
 src/dep/src/irrlicht/CNullDriver.h            |   223 +-
 src/dep/src/irrlicht/COBJMeshFileLoader.cpp   |   692 +-
 src/dep/src/irrlicht/COBJMeshFileLoader.h     |    57 +-
 src/dep/src/irrlicht/COCTLoader.cpp           |   165 +-
 src/dep/src/irrlicht/COCTLoader.h             |    25 +-
 src/dep/src/irrlicht/COSOperator.cpp          |    27 +-
 src/dep/src/irrlicht/COSOperator.h            |     2 +-
 src/dep/src/irrlicht/COctTreeSceneNode.cpp    |   207 +-
 src/dep/src/irrlicht/COctTreeSceneNode.h      |     8 +-
 .../src/irrlicht/COctTreeTriangleSelector.cpp |     9 +-
 .../src/irrlicht/COctTreeTriangleSelector.h   |    20 +-
 src/dep/src/irrlicht/COgreMeshFileLoader.cpp  |   161 +-
 src/dep/src/irrlicht/COgreMeshFileLoader.h    |     7 +-
 src/dep/src/irrlicht/COpenGLDriver.cpp        |  1671 +-
 src/dep/src/irrlicht/COpenGLDriver.h          |   137 +-
 .../src/irrlicht/COpenGLExtensionHandler.cpp  |   134 +-
 .../src/irrlicht/COpenGLExtensionHandler.h    |   246 +-
 .../src/irrlicht/COpenGLMaterialRenderer.h    |  1367 +-
 .../src/irrlicht/COpenGLNormalMapRenderer.cpp |    37 +-
 .../src/irrlicht/COpenGLNormalMapRenderer.h   |     2 +-
 .../irrlicht/COpenGLParallaxMapRenderer.cpp   |    11 +-
 .../src/irrlicht/COpenGLParallaxMapRenderer.h |     2 +-
 .../irrlicht/COpenGLSLMaterialRenderer.cpp    |    44 +-
 .../src/irrlicht/COpenGLSLMaterialRenderer.h  |    14 +-
 .../COpenGLShaderMaterialRenderer.cpp         |    39 +-
 .../irrlicht/COpenGLShaderMaterialRenderer.h  |    14 +-
 src/dep/src/irrlicht/COpenGLTexture.cpp       |   558 +-
 src/dep/src/irrlicht/COpenGLTexture.h         |    92 +-
 src/dep/src/irrlicht/CPakReader.cpp           |     6 +-
 src/dep/src/irrlicht/CPakReader.h             |     2 +-
 .../CParticleAnimatedMeshSceneNodeEmitter.cpp |   121 +-
 .../CParticleAnimatedMeshSceneNodeEmitter.h   |    28 +-
 .../irrlicht/CParticleAttractionAffector.cpp  |     5 +-
 .../irrlicht/CParticleAttractionAffector.h    |     2 +-
 src/dep/src/irrlicht/CParticleBoxEmitter.cpp  |    43 +-
 src/dep/src/irrlicht/CParticleBoxEmitter.h    |    20 +-
 .../src/irrlicht/CParticleCylinderEmitter.cpp |    36 +-
 .../src/irrlicht/CParticleCylinderEmitter.h   |    29 +-
 .../src/irrlicht/CParticleFadeOutAffector.cpp |     7 +-
 .../src/irrlicht/CParticleFadeOutAffector.h   |     2 +-
 .../src/irrlicht/CParticleGravityAffector.cpp |     5 +-
 .../src/irrlicht/CParticleGravityAffector.h   |     2 +-
 src/dep/src/irrlicht/CParticleMeshEmitter.cpp |    99 +-
 src/dep/src/irrlicht/CParticleMeshEmitter.h   |    26 +-
 .../src/irrlicht/CParticlePointEmitter.cpp    |    35 +-
 src/dep/src/irrlicht/CParticlePointEmitter.h  |    19 +-
 src/dep/src/irrlicht/CParticleRingEmitter.cpp |    30 +-
 src/dep/src/irrlicht/CParticleRingEmitter.h   |    23 +-
 .../irrlicht/CParticleRotationAffector.cpp    |     5 +-
 .../src/irrlicht/CParticleRotationAffector.h  |     2 +-
 .../src/irrlicht/CParticleSphereEmitter.cpp   |    42 +-
 src/dep/src/irrlicht/CParticleSphereEmitter.h |    21 +-
 .../src/irrlicht/CParticleSystemSceneNode.cpp |   228 +-
 .../src/irrlicht/CParticleSystemSceneNode.h   |    46 +-
 src/dep/src/irrlicht/CQ3LevelMesh.cpp         |   454 +-
 src/dep/src/irrlicht/CQ3LevelMesh.h           |   122 +-
 .../src/irrlicht/CQuake3ShaderSceneNode.cpp   |   545 +-
 src/dep/src/irrlicht/CQuake3ShaderSceneNode.h |    24 +-
 src/dep/src/irrlicht/CReadFile.cpp            |    13 +-
 src/dep/src/irrlicht/CReadFile.h              |     6 +-
 src/dep/src/irrlicht/CSTLMeshFileLoader.cpp   |     2 +-
 src/dep/src/irrlicht/CSTLMeshFileLoader.h     |     2 +-
 src/dep/src/irrlicht/CSTLMeshWriter.cpp       |   111 +-
 src/dep/src/irrlicht/CSTLMeshWriter.h         |     2 +-
 .../src/irrlicht/CSceneCollisionManager.cpp   |   152 +-
 src/dep/src/irrlicht/CSceneCollisionManager.h |     2 +-
 src/dep/src/irrlicht/CSceneManager.cpp        |   441 +-
 src/dep/src/irrlicht/CSceneManager.h          |   215 +-
 .../CSceneNodeAnimatorCollisionResponse.cpp   |   455 +-
 .../CSceneNodeAnimatorCollisionResponse.h     |    24 +-
 .../src/irrlicht/CSceneNodeAnimatorDelete.cpp |     9 +-
 .../src/irrlicht/CSceneNodeAnimatorDelete.h   |    94 +-
 .../irrlicht/CSceneNodeAnimatorFlyCircle.cpp  |    29 +-
 .../irrlicht/CSceneNodeAnimatorFlyCircle.h    |    23 +-
 .../CSceneNodeAnimatorFlyStraight.cpp         |     9 +-
 .../irrlicht/CSceneNodeAnimatorFlyStraight.h  |     8 +-
 .../CSceneNodeAnimatorFollowSpline.cpp        |   251 +-
 .../irrlicht/CSceneNodeAnimatorFollowSpline.h |     8 +-
 .../irrlicht/CSceneNodeAnimatorRotation.cpp   |     9 +-
 .../src/irrlicht/CSceneNodeAnimatorRotation.h |     8 +-
 .../irrlicht/CSceneNodeAnimatorTexture.cpp    |    16 +-
 .../src/irrlicht/CSceneNodeAnimatorTexture.h  |     8 +-
 .../src/irrlicht/CShadowVolumeSceneNode.cpp   |   122 +-
 src/dep/src/irrlicht/CShadowVolumeSceneNode.h |    33 +-
 src/dep/src/irrlicht/CSkinnedMesh.cpp         |   510 +-
 src/dep/src/irrlicht/CSkinnedMesh.h           |    57 +-
 src/dep/src/irrlicht/CSkyBoxSceneNode.cpp     |    67 +-
 src/dep/src/irrlicht/CSkyBoxSceneNode.h       |     2 +-
 src/dep/src/irrlicht/CSkyDomeSceneNode.cpp    |    75 +-
 src/dep/src/irrlicht/CSkyDomeSceneNode.h      |     8 +-
 .../src/irrlicht/CSoftware2MaterialRenderer.h |    47 +-
 src/dep/src/irrlicht/CSoftwareDriver.cpp      |  1872 +-
 src/dep/src/irrlicht/CSoftwareDriver.h        |    52 +-
 src/dep/src/irrlicht/CSoftwareDriver2.cpp     |  3925 ++--
 src/dep/src/irrlicht/CSoftwareDriver2.h       |    92 +-
 src/dep/src/irrlicht/CSoftwareTexture.cpp     |     4 +-
 src/dep/src/irrlicht/CSoftwareTexture.h       |     4 +-
 src/dep/src/irrlicht/CSoftwareTexture2.cpp    |    60 +-
 src/dep/src/irrlicht/CSoftwareTexture2.h      |    14 +-
 src/dep/src/irrlicht/CSphereSceneNode.cpp     |     4 +-
 src/dep/src/irrlicht/CSphereSceneNode.h       |    20 +-
 src/dep/src/irrlicht/CTRFlat.cpp              |     5 +-
 src/dep/src/irrlicht/CTRFlatWire.cpp          |     5 +-
 src/dep/src/irrlicht/CTRGouraud.cpp           |    61 +-
 src/dep/src/irrlicht/CTRGouraud2.cpp          |   150 +-
 src/dep/src/irrlicht/CTRGouraudAlpha2.cpp     |   150 +-
 src/dep/src/irrlicht/CTRGouraudAlphaNoZ2.cpp  |   150 +-
 src/dep/src/irrlicht/CTRGouraudWire.cpp       |    63 +-
 src/dep/src/irrlicht/CTRTextureBlend.cpp      |   111 +-
 src/dep/src/irrlicht/CTRTextureDetailMap2.cpp |   163 +-
 src/dep/src/irrlicht/CTRTextureFlat.cpp       |     5 +-
 src/dep/src/irrlicht/CTRTextureFlatWire.cpp   |     5 +-
 src/dep/src/irrlicht/CTRTextureGouraud.cpp    |    65 +-
 src/dep/src/irrlicht/CTRTextureGouraud.h      |    22 +-
 src/dep/src/irrlicht/CTRTextureGouraud2.cpp   |   166 +-
 src/dep/src/irrlicht/CTRTextureGouraudAdd.cpp |    52 +-
 .../src/irrlicht/CTRTextureGouraudAdd2.cpp    |   119 +-
 .../src/irrlicht/CTRTextureGouraudAddNoZ2.cpp |   111 +-
 .../src/irrlicht/CTRTextureGouraudAlpha.cpp   |   115 +-
 .../irrlicht/CTRTextureGouraudAlphaNoZ.cpp    |   115 +-
 src/dep/src/irrlicht/CTRTextureGouraudNoZ.cpp |    45 +-
 .../src/irrlicht/CTRTextureGouraudNoZ2.cpp    |   111 +-
 .../CTRTextureGouraudVertexAlpha2.cpp         |   163 +-
 .../src/irrlicht/CTRTextureGouraudWire.cpp    |    53 +-
 .../src/irrlicht/CTRTextureLightMap2_Add.cpp  |   123 +-
 .../src/irrlicht/CTRTextureLightMap2_M1.cpp   |   110 +-
 .../src/irrlicht/CTRTextureLightMap2_M2.cpp   |   106 +-
 .../src/irrlicht/CTRTextureLightMap2_M4.cpp   |   257 +-
 .../CTRTextureLightMapGouraud2_M4.cpp         |   169 +-
 src/dep/src/irrlicht/CTRTextureWire2.cpp      |    16 +-
 src/dep/src/irrlicht/CTerrainSceneNode.cpp    |  1075 +-
 src/dep/src/irrlicht/CTerrainSceneNode.h      |   119 +-
 .../src/irrlicht/CTerrainTriangleSelector.cpp |    35 +-
 .../src/irrlicht/CTerrainTriangleSelector.h   |    30 +-
 src/dep/src/irrlicht/CTextSceneNode.cpp       |   102 +-
 src/dep/src/irrlicht/CTextSceneNode.h         |    27 +-
 src/dep/src/irrlicht/CTimer.h                 |     2 +-
 src/dep/src/irrlicht/CTriangleBBSelector.cpp  |     6 +-
 src/dep/src/irrlicht/CTriangleBBSelector.h    |     4 +-
 src/dep/src/irrlicht/CTriangleSelector.cpp    |    61 +-
 src/dep/src/irrlicht/CTriangleSelector.h      |    10 +-
 src/dep/src/irrlicht/CVideoModeList.cpp       |    56 +-
 src/dep/src/irrlicht/CVideoModeList.h         |    10 +-
 .../src/irrlicht/CWaterSurfaceSceneNode.cpp   |    52 +-
 src/dep/src/irrlicht/CWaterSurfaceSceneNode.h |     2 +-
 src/dep/src/irrlicht/CWriteFile.cpp           |     2 +-
 src/dep/src/irrlicht/CWriteFile.h             |     2 +-
 src/dep/src/irrlicht/CXMLReader.cpp           |     2 +-
 src/dep/src/irrlicht/CXMLReader.h             |     2 +-
 src/dep/src/irrlicht/CXMLReaderImpl.h         |    37 +-
 src/dep/src/irrlicht/CXMLWriter.cpp           |     8 +-
 src/dep/src/irrlicht/CXMLWriter.h             |     2 +-
 src/dep/src/irrlicht/CXMeshFileLoader.cpp     |   594 +-
 src/dep/src/irrlicht/CXMeshFileLoader.h       |    14 +-
 src/dep/src/irrlicht/CZBuffer.cpp             |     2 +-
 src/dep/src/irrlicht/CZBuffer.h               |     2 +-
 src/dep/src/irrlicht/CZipReader.cpp           |     6 +-
 src/dep/src/irrlicht/CZipReader.h             |    18 +-
 src/dep/src/irrlicht/IBurningShader.cpp       |    58 +-
 src/dep/src/irrlicht/IBurningShader.h         |    55 +-
 src/dep/src/irrlicht/IDepthBuffer.h           |     8 +-
 src/dep/src/irrlicht/IImagePresenter.h        |     4 +-
 src/dep/src/irrlicht/ITriangleRenderer.h      |     7 +-
 src/dep/src/irrlicht/IZBuffer.h               |     2 +-
 src/dep/src/irrlicht/Irrlicht.cpp             |    26 +-
 src/dep/src/irrlicht/Irrlicht.dev             |  1242 +-
 src/dep/src/irrlicht/Irrlicht.dsp             |  2365 ---
 src/dep/src/irrlicht/Irrlicht.dsw             |    29 -
 src/dep/src/irrlicht/Irrlicht7.1.sln          |     9 +
 src/dep/src/irrlicht/Irrlicht7.1.vcproj       |   780 +-
 src/dep/src/irrlicht/Irrlicht8.0.sln          |    11 +-
 src/dep/src/irrlicht/Irrlicht8.0.vcproj       |   493 +-
 src/dep/src/irrlicht/Irrlicht9.0.vcproj       |  1368 +-
 src/dep/src/irrlicht/Irrlicht_Win32-gcc.cbp   |   854 -
 .../src/irrlicht/MacOSX/DemoApp-Info.plist    |    24 -
 src/dep/src/irrlicht/MacOSX/MacOSX_Prefix.pch |     5 -
 .../irrlicht/MacOSX/MainMenu.nib/classes.nib  |     4 -
 .../src/irrlicht/MacOSX/MainMenu.nib/info.nib |    17 -
 src/dep/src/irrlicht/Makefile                 |    83 +-
 src/dep/src/irrlicht/OctTree.h                |   122 +-
 src/dep/src/irrlicht/S2DVertex.h              |     2 +-
 src/dep/src/irrlicht/S4DVertex.h              |    83 +-
 .../irrlicht/SoftwareDriver2_compile_config.h |    24 +-
 src/dep/src/irrlicht/SoftwareDriver2_helper.h |    42 +-
 src/dep/src/irrlicht/dmfsupport.h             |   972 +-
 src/dep/src/irrlicht/glext.h                  | 15655 +++++++++-------
 src/dep/src/irrlicht/glxext.h                 |  1618 +-
 src/dep/src/irrlicht/irrXML.cpp               |    63 +-
 src/dep/src/irrlicht/jpeglib/README           |   385 -
 src/dep/src/irrlicht/jpeglib/configure        |  2011 --
 src/dep/src/irrlicht/jpeglib/install-sh       |   250 -
 src/dep/src/irrlicht/jpeglib/ltconfig         |  1512 --
 src/dep/src/irrlicht/libpng/example.c         |   814 +
 src/dep/src/irrlicht/libpng/libpng.3          |  4124 ++++
 src/dep/src/irrlicht/libpng/libpngpf.3        |   790 +
 src/dep/src/irrlicht/libpng/png.5             |    74 +
 src/dep/src/irrlicht/libpng/png.c             |   911 +
 src/dep/src/irrlicht/libpng/png.h             |  3666 ++++
 src/dep/src/irrlicht/libpng/pngconf.h         |  1493 ++
 src/dep/src/irrlicht/libpng/pngerror.c        |   345 +
 src/dep/src/irrlicht/libpng/pnggccrd.c        |   103 +
 src/dep/src/irrlicht/libpng/pngget.c          |   900 +
 src/dep/src/irrlicht/libpng/pngmem.c          |   609 +
 src/dep/src/irrlicht/libpng/pngpread.c        |  1594 ++
 src/dep/src/irrlicht/libpng/pngread.c         |  1459 ++
 src/dep/src/irrlicht/libpng/pngrio.c          |   166 +
 src/dep/src/irrlicht/libpng/pngrtran.c        |  4301 +++++
 src/dep/src/irrlicht/libpng/pngrutil.c        |  3221 ++++
 src/dep/src/irrlicht/libpng/pngset.c          |  1255 ++
 src/dep/src/irrlicht/libpng/pngtest.c         |  1688 ++
 src/dep/src/irrlicht/libpng/pngtrans.c        |   662 +
 src/dep/src/irrlicht/libpng/pngvcrd.c         |     1 +
 src/dep/src/irrlicht/libpng/pngwio.c          |   234 +
 src/dep/src/irrlicht/libpng/pngwrite.c        |  1547 ++
 src/dep/src/irrlicht/libpng/pngwtran.c        |   572 +
 src/dep/src/irrlicht/libpng/pngwutil.c        |  2785 +++
 src/dep/src/irrlicht/os.cpp                   |    66 +-
 src/dep/src/irrlicht/os.h                     |     2 +-
 src/dep/src/irrlicht/source.txt               |     2 +-
 src/dep/src/irrlicht/zlib/ChangeLog           |   855 -
 src/dep/src/irrlicht/zlib/FAQ                 |   339 -
 src/dep/src/irrlicht/zlib/INDEX               |    51 -
 src/dep/src/irrlicht/zlib/README              |   125 -
 src/dep/src/zlib/Makefile.am                  |     2 +-
 src/dep/src/zlib/Makefile.in                  |   482 -
 src/dep/src/zthread/Makefile.am               |    22 +-
 src/dep/src/zthread/Makefile.in               |   659 -
 src/shared/ADTFile.cpp                        |     2 +-
 src/shared/Auth/Makefile.am                   |     2 +-
 src/shared/Makefile.am                        |     2 +-
 src/tools/stuffextract/Makefile.am            |     2 +-
 596 files changed, 80509 insertions(+), 44938 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3b3b77a..4f56655 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,15 +13,16 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_RANLIB
+# AC_PROG_LIBTOOL
 
 # Checks for libraries.
 AC_CHECK_LIB([Xxf86vm], [main], [], [echo "ERROR: Xxf86vm library not found." && exit 1])
 AC_CHECK_LIB([GL], [main], [], [echo "ERROR: GL library not found." && exit 1])
 AC_CHECK_LIB([GLU], [main], [], [echo "ERROR: GLU library not found." && exit 1])
-AC_CHECK_LIB([Irrlicht], [main], [], [echo "ERROR: Irrlicht library not found." && exit 1])
+# AC_CHECK_LIB([Irrlicht], [main], [], [echo "ERROR: Irrlicht library not found." && exit 1])
 AC_CHECK_LIB([ssl], [main], [], [echo "ERROR: ssl library not found." && exit 1])
 AC_CHECK_LIB([crypto], [main], [], [echo "ERROR: ssl crypto library not found." && exit 1])
-AC_CHECK_LIB([ZThread], [main], [], [echo "ERROR: ZThread library not found." && exit 1])
+# AC_CHECK_LIB([ZThread], [main], [], [echo "ERROR: ZThread library not found." && exit 1])
 
 # Checks for header files.
 AC_PATH_X
@@ -65,6 +66,10 @@ AC_CHECK_FUNCS([floor ftime ftruncate getcwd gethostbyaddr gethostbyname gethost
 #                   src/dep/src/irrlicht/libpng])
 AC_CONFIG_FILES([Makefile
 		 src/Makefile
+		 src/dep/Makefile
+		 src/dep/src/Makefile
+		 src/dep/src/zlib/Makefile
+		 src/dep/src/zthread/Makefile
 		 src/tools/Makefile
 		 src/tools/stuffextract/Makefile
 		 src/tools/stuffextract/StormLib/Makefile
diff --git a/src/Client/GUI/CM2MeshFileLoader.cpp b/src/Client/GUI/CM2MeshFileLoader.cpp
index 3d0dd2d..f3183f4 100644
--- a/src/Client/GUI/CM2MeshFileLoader.cpp
+++ b/src/Client/GUI/CM2MeshFileLoader.cpp
@@ -1,32 +1,7 @@
 #include <iostream>
 #include "CM2MeshFileLoader.h"
 #include "SSkinnedMesh.h"
-#define _DEBUG
 #include "common.h"
-#ifdef _DEBUG
-#define DEBUG(code) code;
-#else
-#define DEBUG(code) ;
-#endif
-
-/*
-
-void logdebug(const char *str, ...)
-{
-    if(!str)
-        return;
-    va_list ap;
-//    _log_setcolor(true,LBLUE);
-    va_start(ap, str);
-    vprintf( str, ap );
-    va_end(ap);
-//    _log_resetcolor(true);
-
-
-    printf("\n");
-
-  fflush(stdout);
-}*/
 
 namespace irr
 {
@@ -207,7 +182,7 @@ for(u32 i=0;i<header.nTexLookup;i++)
 {
     MeshFile->read(&tempM2TexLookup,sizeof(u16));
     M2MTextureLookup.push_back(tempM2TexLookup);
-    printf("Texture %u Type %u\n",i,tempM2TexLookup);
+    DEBUG(logdebug("Texture %u Type %u\n",i,tempM2TexLookup));
 }
 DEBUG(logdebug("Read %u Texture lookup entries",M2MTextureLookup.size()));
 
@@ -222,7 +197,7 @@ for(u32 i=0;i<header.nTextures;i++)
 {
     MeshFile->read(&tempM2TexDef,sizeof(TextureDefinition));
     M2MTextureDef.push_back(tempM2TexDef);
-    printf("Texture %u Type %u\n",i,tempM2TexDef.texType);
+    DEBUG(logdebug("Texture %u Type %u\n",i,tempM2TexDef.texType));
 }
 DEBUG(logdebug("Read %u Texture Definition entries",M2MTextureDef.size()));
 
@@ -241,10 +216,6 @@ for(u32 i=0;i<header.nTexFlags;i++)
 }
 DEBUG(logdebug("Read %u Renderflags",M2MRenderFlags.size()));
 
-
-
-//std::cout << M2MTextureUnit[0].submeshIndex1 <<","<<M2MTextureUnit[0].submeshIndex1 <<","<<M2MTextureUnit[0].textureIndex<<";\n";
-
 if(!M2MTextureFiles.empty())
     M2MTextureFiles.clear();
 
@@ -258,7 +229,6 @@ for(u32 i=0; i<M2MTextureDef.size(); i++)
     M2MTextureFiles.push_back(tempTexFileName.c_str());
     DEBUG(logdebug("Texture: %u (%s)",M2MTextureFiles.size(),M2MTextureFiles[i].c_str()));
 }
-//    std::cout << "Read "<<M2MTextureFiles.size()<<"/"<<M2MTextureDef.size()<<" Texture file names\n";
 
 ///////////////////////////////////////
 //      Animation related stuff      //
@@ -491,7 +461,7 @@ for(u32 i=0; i < currentView.nSub;i++)//
     {
         MeshBuffer->Indices.push_back(M2MIndices[M2MTriangles[j]]-M2MSubmeshes[i].ofsVertex);
     }
-  //  std::cout << i << ": " << MeshBuffer->Indices.size() << "\n";
+
     for(u32 j=M2MSubmeshes[i].ofsVertex;j<M2MSubmeshes[i].ofsVertex+M2MSubmeshes[i].nVertex;j++)
     {
         MeshBuffer->Vertices_Standard.push_back(M2Vertices[j]);
diff --git a/src/Client/GUI/Makefile.am b/src/Client/GUI/Makefile.am
index 5a8c8f1..03a144b 100644
--- a/src/Client/GUI/Makefile.am
+++ b/src/Client/GUI/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm  -Wall -D_DEBUG
+AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -I$(top_builddir)/src/dep/include  -Wall -D_DEBUG
 ## Build pseuwow
 noinst_LIBRARIES = libgui.a
 libgui_a_SOURCES =CCursorController.cpp  DrawObject.cpp  MInput.h           Scene.h                   SImage.h\
diff --git a/src/Client/GUI/SImage.cpp b/src/Client/GUI/SImage.cpp
index a789b11..64bcbb5 100644
--- a/src/Client/GUI/SImage.cpp
+++ b/src/Client/GUI/SImage.cpp
@@ -185,6 +185,7 @@ void SImage::setPixel(u32 x, u32 y, const SColor &color )
 }
 
 
+
 //! returns a pixel
 SColor SImage::getPixel(u32 x, u32 y) const
 {
@@ -269,6 +270,40 @@ void SImage::copyToScaling(void* target, s32 width, s32 height, ECOLOR_FORMAT fo
 	}
 }
 
+
+//! copies this surface into another, using the alpha mask, an cliprect and a color to add with
+void SImage::copyToWithAlpha(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const SColor &color, const core::rect<s32>* clipRect)
+{
+	// color blend only necessary on not full spectrum aka. color.color != 0xFFFFFFFF
+//	Blit(color.color == 0xFFFFFFFF ? BLITTER_TEXTURE_ALPHA_BLEND: BLITTER_TEXTURE_ALPHA_COLOR_BLEND, target, clipRect, &pos, this, &sourceRect, color.color);
+}
+
+//! fills the surface with given color
+void SImage::fill(const SColor &color)
+{
+	u32 c;
+
+	switch ( Format )
+	{
+		case ECF_A1R5G5B5:
+			c = video::A8R8G8B8toA1R5G5B5( color.color );
+			c |= c << 16;
+			break;
+		case ECF_R5G6B5:
+			c = video::A8R8G8B8toR5G6B5( color.color );
+			c |= c << 16;
+			break;
+		case ECF_A8R8G8B8:
+			c = color.color;
+			break;
+		default:
+//			os::Printer::log("CImage::Format not supported", ELL_ERROR);
+			return;
+	}
+
+	//memset32( Data, c, getImageDataSizeInBytes() );
+}
+
 //! copies this surface into another, scaling it to the target image size
 // note: this is very very slow. (i didn't want to write a fast version.
 // but hopefully, nobody wants to scale surfaces every frame.
diff --git a/src/Client/GUI/SImage.h b/src/Client/GUI/SImage.h
index ef09481..ba7a093 100644
--- a/src/Client/GUI/SImage.h
+++ b/src/Client/GUI/SImage.h
@@ -64,6 +64,14 @@ public:
 	//! copies this surface into another
 	void copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect=0);
 
+	//! copies this surface into another, using the alpha mask, an cliprect and a color to add with
+	virtual void copyToWithAlpha(IImage* target, const core::position2d<s32>& pos,
+			const core::rect<s32>& sourceRect, const SColor &color,
+			const core::rect<s32>* clipRect = 0);
+
+	//! fills the surface with black or white
+	virtual void fill(const SColor &color);
+
 	//! copies this surface into another, scaling it to fit.
 	void copyToScaling(void* target, s32 width, s32 height, ECOLOR_FORMAT format, u32 pitch=0);
 
diff --git a/src/Client/GUI/SSkinnedMesh.cpp b/src/Client/GUI/SSkinnedMesh.cpp
index 475626f..ef061bd 100755
--- a/src/Client/GUI/SSkinnedMesh.cpp
+++ b/src/Client/GUI/SSkinnedMesh.cpp
@@ -70,7 +70,7 @@ IMesh* CSkinnedMesh::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32
 //! Animates this mesh's joints based on frame input
 //! blend: {0-old position, 1-New position}
 void CSkinnedMesh::animateMesh(f32 frame, f32 blend)
-{
+{
 //    std::cout<<"Frame "<<frame<<' '<<blend<<'\n';
 	if ( !HasAnimation  || LastAnimatedFrame==frame)
 		return;
@@ -596,6 +596,22 @@ void CSkinnedMesh::setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue)
 		LocalBuffers[i]->Material.setFlag(flag,newvalue);
 }
 
+//! set the hardware mapping hint, for driver
+void CSkinnedMesh::setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint,
+                E_BUFFER_TYPE buffer)
+{
+        for (u32 i=0; i<LocalBuffers.size(); ++i)
+                LocalBuffers[i]->setHardwareMappingHint(newMappingHint, buffer);
+}
+ 
+ 
+//! flags the meshbuffer as changed, reloads hardware buffers
+void CSkinnedMesh::setDirty(E_BUFFER_TYPE buffer)
+{
+        for (u32 i=0; i<LocalBuffers.size(); ++i)
+                LocalBuffers[i]->setDirty(buffer);
+}
+
 
 //! uses animation from another mesh
 bool CSkinnedMesh::useAnimationFrom(const ISkinnedMesh *mesh)
@@ -837,7 +853,6 @@ void CSkinnedMesh::checkForAnimation()
 //! called by loader after populating with mesh and bone data
 void CSkinnedMesh::finalize()
 {
-	std::cout<<"Finalize has been called\n";
 	u32 i;
 
 	LastAnimatedFrame=-1;
@@ -913,8 +928,8 @@ void CSkinnedMesh::finalize()
 	//Todo: optimise keys here...
 
 	checkForAnimation();
-    printf("Has Animation %u\n",HasAnimation);
-	if (HasAnimation)
+
+if (HasAnimation)
 	{
 		//--- optimize and check keyframes ---
 		for(i=0;i<AllJoints.size();++i)
diff --git a/src/Client/GUI/SSkinnedMesh.h b/src/Client/GUI/SSkinnedMesh.h
index 8420000..dc3ddf5 100755
--- a/src/Client/GUI/SSkinnedMesh.h
+++ b/src/Client/GUI/SSkinnedMesh.h
@@ -61,6 +61,13 @@ namespace scene
 		//! sets a flag of all contained materials to a new value
 		virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue);
 
+		//! set the hardware mapping hint, for driver
+		virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX);
+
+		//! flags the meshbuffer as changed, reloads hardware buffers
+		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX);
+
+
 		//! Returns the type of the animated mesh.
 		virtual E_ANIMATED_MESH_TYPE getMeshType() const;
 
diff --git a/src/Client/GUI/SceneWorld.cpp b/src/Client/GUI/SceneWorld.cpp
index e034148..6df8a5d 100644
--- a/src/Client/GUI/SceneWorld.cpp
+++ b/src/Client/GUI/SceneWorld.cpp
@@ -418,7 +418,14 @@ void SceneWorld::OnUpdate(s32 timediff)
     str += " ## HEAD: ";
     str += IRR_TO_O(camera->getHeading());
     str += L"  Pos: ";
-    str += ((((((str + wp.x) + L" | ") + wp.y) + L" | ") + wp.z) + L" | OR:") + wp.o;
+    str += wp.x;
+    str += L" | ";
+    str += wp.y;
+    str += L" | ";
+    str += wp.z;
+    str += L" | OR:";
+    str += wp.o;
+//    str += ((((((str + wp.x) + L" | ") + wp.y) + L" | ") + wp.z) + L" | OR:") + wp.o;// WTF?
     str += L"  -- Terrain: Sectors: ";
     str += (int)terrain->getSectorsRendered();
     str += L" / ";
diff --git a/src/Client/Makefile.am b/src/Client/Makefile.am
index aa3e976..4013837 100644
--- a/src/Client/Makefile.am
+++ b/src/Client/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 SUBDIRS = DefScript Realm World GUI
-AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm  -Wall
+AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -I$(top_builddir)/src/dep/include -Wall
 ## Build pseuwow
 bin_PROGRAMS = pseuwow
 pseuwow_SOURCES = 	Cli.cpp\
@@ -18,5 +18,15 @@ pseuwow_SOURCES = 	Cli.cpp\
 			World/MapMgr.cpp
 			
 
-pseuwow_LDADD = ../shared/libshared.a ../shared/Auth/libauth.a ../shared/Network/libnetwork.a DefScript/libdefscript.a World/libworld.a GUI/libgui.a /usr/local/lib/libIrrKlang.so
+pseuwow_LDADD = ../shared/libshared.a\
+				../shared/Auth/libauth.a\
+				../shared/Network/libnetwork.a\
+				DefScript/libdefscript.a\
+				World/libworld.a \
+				GUI/libgui.a\
+				$(prefix)/libIrrKlang.so\
+				../dep/lib/linux-gcc/libIrrlicht.a\
+				../dep/src/zlib/libzlib.a\
+				../dep/src/zthread/libZThread.a
+
 pseuwow_LDFLAGS =-pthread 
\ No newline at end of file
diff --git a/src/Client/Realm/Makefile.am b/src/Client/Realm/Makefile.am
index 3c68f12..d0b34ea 100644
--- a/src/Client/Realm/Makefile.am
+++ b/src/Client/Realm/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm  -Wall
+AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -I$(top_builddir)/src/dep/include  -Wall
 ## Build pseuwow
 noinst_LIBRARIES = librealm.a
 librealm_a_SOURCES =RealmSession.cpp  RealmSession.h  RealmSocket.cpp  RealmSocket.h
diff --git a/src/Client/World/Makefile.am b/src/Client/World/Makefile.am
index 3e2d7e9..52cc27e 100644
--- a/src/Client/World/Makefile.am
+++ b/src/Client/World/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm  -Wall
+AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -I$(top_builddir)/src/dep/include  -Wall
 ## Build pseuwow
 noinst_LIBRARIES = libworld.a
 libworld_a_SOURCES =Bag.cpp              DynamicObject.cpp  MovementMgr.cpp  Player.cpp       World.cpp\
diff --git a/src/Makefile.am b/src/Makefile.am
index e213cde..2b1c49d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
 ## Makefile.am - process this file with automake 
 AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm  -Wall
-SUBDIRS = shared Client tools
+SUBDIRS = dep shared Client tools
 ## End Makefile.am
diff --git a/src/PseuWoW.cbp b/src/PseuWoW.cbp
index 432709a..e155e32 100644
--- a/src/PseuWoW.cbp
+++ b/src/PseuWoW.cbp
@@ -8,7 +8,7 @@
 		<Build>
 			<Target title="Debug">
 				<Option platforms="Unix;" />
-				<Option output="bin/Debug/pseuwow" prefix_auto="1" extension_auto="1" />
+				<Option output="../bin/pseuwow" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -48,6 +48,8 @@
 			<Add library="Xxf86vm" />
 			<Add library="/usr/local/ssl/lib/libssl.a" />
 			<Add library="/usr/local/ssl/lib/libcrypto.a" />
+			<Add library="../bin/ikpMP3.so" />
+			<Add library="../bin/libIrrKlang.so" />
 		</Linker>
 		<Unit filename="Client/Cli.cpp" />
 		<Unit filename="Client/Cli.h" />
@@ -70,29 +72,55 @@
 		<Unit filename="Client/DefScriptInterface.cpp" />
 		<Unit filename="Client/DefScriptInterface.h" />
 		<Unit filename="Client/DefScriptInterfaceInclude.h" />
+		<Unit filename="Client/GUI/CBoneSceneNode.cpp" />
+		<Unit filename="Client/GUI/CBoneSceneNode.h" />
 		<Unit filename="Client/GUI/CCursorController.cpp" />
 		<Unit filename="Client/GUI/CCursorController.h" />
 		<Unit filename="Client/GUI/CImageLoaderBLP.cpp" />
 		<Unit filename="Client/GUI/CImageLoaderBLP.h" />
+		<Unit filename="Client/GUI/CIrrKlangAudioStreamLoaderMP3.cpp" />
+		<Unit filename="Client/GUI/CIrrKlangAudioStreamLoaderMP3.h" />
+		<Unit filename="Client/GUI/CIrrKlangAudioStreamMP3.cpp" />
+		<Unit filename="Client/GUI/CIrrKlangAudioStreamMP3.h" />
 		<Unit filename="Client/GUI/CM2MeshFileLoader.cpp" />
 		<Unit filename="Client/GUI/CM2MeshFileLoader.h" />
 		<Unit filename="Client/GUI/DrawObjMgr.cpp" />
 		<Unit filename="Client/GUI/DrawObjMgr.h" />
 		<Unit filename="Client/GUI/DrawObject.cpp" />
 		<Unit filename="Client/GUI/DrawObject.h" />
+		<Unit filename="Client/GUI/GUIEventReceiver.h" />
 		<Unit filename="Client/GUI/MCamera.h" />
 		<Unit filename="Client/GUI/MInput.h" />
 		<Unit filename="Client/GUI/PseuGUI.cpp" />
 		<Unit filename="Client/GUI/PseuGUI.h" />
 		<Unit filename="Client/GUI/SImage.cpp" />
 		<Unit filename="Client/GUI/SImage.h" />
+		<Unit filename="Client/GUI/SSkinnedMesh.cpp" />
+		<Unit filename="Client/GUI/SSkinnedMesh.h" />
 		<Unit filename="Client/GUI/Scene.cpp" />
 		<Unit filename="Client/GUI/Scene.h" />
+		<Unit filename="Client/GUI/SceneCharselection.cpp" />
+		<Unit filename="Client/GUI/SceneData.h" />
 		<Unit filename="Client/GUI/SceneGuiStart.cpp" />
+		<Unit filename="Client/GUI/SceneLogin.cpp" />
 		<Unit filename="Client/GUI/SceneWorld.cpp" />
 		<Unit filename="Client/GUI/ShTlTerrainSceneNode.cpp" />
 		<Unit filename="Client/GUI/ShTlTerrainSceneNode.h" />
 		<Unit filename="Client/GUI/TlTMesh.h" />
+		<Unit filename="Client/GUI/TlTSector.h" />
+		<Unit filename="Client/GUI/decoder/bits.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="Client/GUI/decoder/internal.h" />
+		<Unit filename="Client/GUI/decoder/mpaudec.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="Client/GUI/decoder/mpaudec.h" />
+		<Unit filename="Client/GUI/decoder/mpaudectab.h" />
+		<Unit filename="Client/GUI/decoder/mpegaudio.h" />
+		<Unit filename="Client/GUI/ikpMP3.cpp" />
+		<Unit filename="Client/GUI/irrKlangSceneNode.cpp" />
+		<Unit filename="Client/GUI/irrKlangSceneNode.h" />
 		<Unit filename="Client/HelperDefs.h" />
 		<Unit filename="Client/MemoryDataHolder.cpp" />
 		<Unit filename="Client/MemoryDataHolder.h" />
@@ -159,6 +187,8 @@
 		<Unit filename="shared/Auth/AuthCrypt.h" />
 		<Unit filename="shared/Auth/BigNumber.cpp" />
 		<Unit filename="shared/Auth/BigNumber.h" />
+		<Unit filename="shared/Auth/Hmac.cpp" />
+		<Unit filename="shared/Auth/Hmac.h" />
 		<Unit filename="shared/Auth/MD5Hash.h" />
 		<Unit filename="shared/Auth/Sha1.cpp" />
 		<Unit filename="shared/Auth/Sha1.h" />
@@ -202,6 +232,8 @@
 		<Unit filename="shared/Network/Utility.h" />
 		<Unit filename="shared/Network/socket_include.cpp" />
 		<Unit filename="shared/Network/socket_include.h" />
+		<Unit filename="shared/ProgressBar.cpp" />
+		<Unit filename="shared/ProgressBar.h" />
 		<Unit filename="shared/SysDefs.h" />
 		<Unit filename="shared/WDTFile.cpp" />
 		<Unit filename="shared/WDTFile.h" />
diff --git a/src/dep/include/irrlicht/CMeshBuffer.h b/src/dep/include/irrlicht/CMeshBuffer.h
index 34386b9..e2b2a50 100644
--- a/src/dep/include/irrlicht/CMeshBuffer.h
+++ b/src/dep/include/irrlicht/CMeshBuffer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,68 +17,95 @@ namespace scene
 	class CMeshBuffer : public IMeshBuffer
 	{
 	public:
-		//! constructor
-		CMeshBuffer() // everything's default constructed
+		//! Default constructor for empty meshbuffer
+		CMeshBuffer():ChangedID_Vertex(1),ChangedID_Index(1),MappingHint_Vertex(EHM_NEVER), MappingHint_Index(EHM_NEVER)
 		{
 			#ifdef _DEBUG
 			setDebugName("SMeshBuffer");
 			#endif
 		}
 
-		//! returns the material of this meshbuffer
+
+		//! Get material of this meshbuffer
+		/** \return Material of this buffer */
 		virtual const video::SMaterial& getMaterial() const
 		{
 			return Material;
 		}
 
-		//! returns the material of this meshbuffer
+
+		//! Get material of this meshbuffer
+		/** \return Material of this buffer */
 		virtual video::SMaterial& getMaterial()
 		{
 			return Material;
 		}
 
-		//! returns pointer to vertices
+
+		//! Get pointer to vertices
+		/** \return Pointer to vertices. */
 		virtual const void* getVertices() const
 		{
 			return Vertices.const_pointer();
-		} 
+		}
 
-		//! returns pointer to vertices
+
+		//! Get pointer to vertices
+		/** \return Pointer to vertices. */
 		virtual void* getVertices()
 		{
 			return Vertices.pointer();
-		} 
+		}
 
-		//! returns amount of vertices
+
+		//! Get number of vertices
+		/** \return Number of vertices. */
 		virtual u32 getVertexCount() const
 		{
 			return Vertices.size();
 		}
 
-		//! returns pointer to Indices
+		//! Get type of index data which is stored in this meshbuffer.
+		/** \return Index type of this buffer. */
+		virtual video::E_INDEX_TYPE getIndexType() const
+		{
+			return video::EIT_16BIT;
+		}
+
+		//! Get pointer to indices
+		/** \return Pointer to indices. */
 		virtual const u16* getIndices() const
 		{
 			return Indices.const_pointer();
 		}
 
-		//! returns pointer to Indices
+
+		//! Get pointer to indices
+		/** \return Pointer to indices. */
 		virtual u16* getIndices()
 		{
 			return Indices.pointer();
 		}
 
-		//! returns amount of indices
+
+		//! Get number of indices
+		/** \return Number of indices. */
 		virtual u32 getIndexCount() const
 		{
 			return Indices.size();
 		}
 
-		//! returns an axis aligned bounding box
+
+		//! Get the axis aligned bounding box
+		/** \return Axis aligned bounding box of this buffer. */
 		virtual const core::aabbox3d<f32>& getBoundingBox() const
 		{
 			return BoundingBox;
 		}
 
+
+		//! Set the axis aligned bounding box
+		/** \param box New axis aligned bounding box for this buffer. */
 		//! set user axis aligned bounding box
 		virtual void setBoundingBox(const core::aabbox3df& box)
 		{
@@ -86,7 +113,8 @@ namespace scene
 		}
 
 
-		//! recalculates the bounding box. should be called if the mesh changed.
+		//! Recalculate the bounding box.
+		/** should be called if the mesh changed. */
 		virtual void recalculateBoundingBox()
 		{
 			if (Vertices.empty())
@@ -99,16 +127,61 @@ namespace scene
 			}
 		}
 
-		//! returns which type of vertex data is stored.
+
+		//! Get type of vertex data stored in this buffer.
+		/** \return Type of vertex data. */
 		virtual video::E_VERTEX_TYPE getVertexType() const
 		{
 			return T().getType();
 		}
 
-	
-		//! append the vertices and indices to the current buffer
+		//! returns position of vertex i
+		virtual const core::vector3df& getPosition(u32 i) const
+		{
+			return Vertices[i].Pos;
+		}
+
+		//! returns position of vertex i
+		virtual core::vector3df& getPosition(u32 i)
+		{
+			return Vertices[i].Pos;
+		}
+
+		//! returns normal of vertex i
+		virtual const core::vector3df& getNormal(u32 i) const
+		{
+			return Vertices[i].Normal;
+		}
+
+		//! returns normal of vertex i
+		virtual core::vector3df& getNormal(u32 i)
+		{
+			return Vertices[i].Normal;
+		}
+
+		//! returns texture coord of vertex i
+		virtual const core::vector2df& getTCoords(u32 i) const
+		{
+			return Vertices[i].TCoords;
+		}
+
+		//! returns texture coord of vertex i
+		virtual core::vector2df& getTCoords(u32 i)
+		{
+			return Vertices[i].TCoords;
+		}
+
+
+		//! Append the vertices and indices to the current buffer
+		/** Only works for compatible types, i.e. either the same type
+		or the main buffer is of standard type. Otherwise, behavior is
+		undefined.
+		*/
 		virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices)
 		{
+			if (vertices == getVertices())
+				return;
+
 			const u32 vertexCount = getVertexCount();
 			u32 i;
 
@@ -126,9 +199,19 @@ namespace scene
 			}
 		}
 
-		//! append the meshbuffer to the current buffer
+
+		//! Append the meshbuffer to the current buffer
+		/** Only works for compatible types, i.e. either the same type
+		or the main buffer is of standard type. Otherwise, behavior is
+		undefined.
+		\param other Meshbuffer to be appended to this one.
+		*/
 		virtual void append(const IMeshBuffer* const other)
 		{
+			/*
+			if (this==other)
+				return;
+
 			const u32 vertexCount = getVertexCount();
 			u32 i;
 
@@ -144,8 +227,56 @@ namespace scene
 				Indices.push_back(other->getIndices()[i]+vertexCount);
 			}
 			BoundingBox.addInternalBox(other->getBoundingBox());
+			*/
 		}
 
+
+		//! get the current hardware mapping hint
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const
+		{
+			return MappingHint_Vertex;
+		}
+
+		//! get the current hardware mapping hint
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const
+		{
+			return MappingHint_Index;
+		}
+
+		//! set the hardware mapping hint, for driver
+		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX )
+		{
+			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
+				MappingHint_Vertex=NewMappingHint;
+			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_INDEX)
+				MappingHint_Index=NewMappingHint;
+		}
+
+
+		//! flags the mesh as changed, reloads hardware buffers
+		virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX)
+		{
+			if (Buffer==EBT_VERTEX_AND_INDEX ||Buffer==EBT_VERTEX)
+				++ChangedID_Vertex;
+			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_INDEX)
+				++ChangedID_Index;
+		}
+
+		//! Get the currently used ID for identification of changes.
+		/** This shouldn't be used for anything outside the VideoDriver. */
+		virtual u32 getChangedID_Vertex() const {return ChangedID_Vertex;}
+
+		//! Get the currently used ID for identification of changes.
+		/** This shouldn't be used for anything outside the VideoDriver. */
+		virtual u32 getChangedID_Index() const {return ChangedID_Index;}
+
+		u32 ChangedID_Vertex;
+		u32 ChangedID_Index;
+
+		//! hardware mapping hint
+		E_HARDWARE_MAPPING MappingHint_Vertex;
+		E_HARDWARE_MAPPING MappingHint_Index;
+
 		//! Material for this meshbuffer.
 		video::SMaterial Material;
 		//! Vertices of this buffer
@@ -156,11 +287,15 @@ namespace scene
 		core::aabbox3d<f32> BoundingBox;
 	};
 
+	//! Standard meshbuffer
 	typedef CMeshBuffer<video::S3DVertex> SMeshBuffer;
+	//! Meshbuffer with two texture coords per vertex, e.g. for lightmaps
 	typedef CMeshBuffer<video::S3DVertex2TCoords> SMeshBufferLightMap;
+	//! Meshbuffer with vertices having tangents stored, e.g. for normal mapping
 	typedef CMeshBuffer<video::S3DVertexTangents> SMeshBufferTangents;
 } // end namespace scene
 } // end namespace irr
 
 #endif
 
+
diff --git a/src/dep/include/irrlicht/ECullingTypes.h b/src/dep/include/irrlicht/ECullingTypes.h
index 31d74ac..95c865a 100644
--- a/src/dep/include/irrlicht/ECullingTypes.h
+++ b/src/dep/include/irrlicht/ECullingTypes.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/EDebugSceneTypes.h b/src/dep/include/irrlicht/EDebugSceneTypes.h
index 4d00a5b..025d22b 100644
--- a/src/dep/include/irrlicht/EDebugSceneTypes.h
+++ b/src/dep/include/irrlicht/EDebugSceneTypes.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,13 +14,13 @@ namespace scene
 	enum E_DEBUG_SCENE_TYPE
 	{
 		//! No Debug Data ( Default )
-		EDS_OFF	= 0,
+		EDS_OFF = 0,
 
 		//! Show Bounding Boxes of SceneNode
 		EDS_BBOX = 1,
 
 		//! Show Vertex Normals
-		EDS_NORMALS	= 2,
+		EDS_NORMALS = 2,
 
 		//! Shows Skeleton/Tags
 		EDS_SKELETON = 4,
@@ -34,6 +34,9 @@ namespace scene
 		//! Show Bounding Boxes of all MeshBuffers
 		EDS_BBOX_BUFFERS = 32,
 
+		//! EDS_BBOX | EDS_BBOX_BUFFERS
+		EDS_BBOX_ALL = EDS_BBOX | EDS_BBOX_BUFFERS,
+
 		//! Show all debug infos
 		EDS_FULL = 0xffffffff
 	};
diff --git a/src/dep/include/irrlicht/EDriverFeatures.h b/src/dep/include/irrlicht/EDriverFeatures.h
index dd5b8c8..e4c8935 100644
--- a/src/dep/include/irrlicht/EDriverFeatures.h
+++ b/src/dep/include/irrlicht/EDriverFeatures.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -73,11 +73,20 @@ namespace video
 		//! Is HLSL supported?
 		EVDF_HLSL,
 
+		//! Are non-square textures supported?
+		EVDF_TEXTURE_NSQUARE,
+
 		//! Are non-power-of-two textures supported?
 		EVDF_TEXTURE_NPOT,
 
 		//! Are framebuffer objects supported?
-		EVDF_FRAMEBUFFER_OBJECT
+		EVDF_FRAMEBUFFER_OBJECT,
+
+		//! Are vertex buffer objects supported?
+		EVDF_VERTEX_BUFFER_OBJECT,
+
+		//! Only used for counting the elements of this enum
+		EVDF_COUNT
 	};
 
 } // end namespace video
diff --git a/src/dep/include/irrlicht/EDriverTypes.h b/src/dep/include/irrlicht/EDriverTypes.h
index 2993de9..b59b6b2 100644
--- a/src/dep/include/irrlicht/EDriverTypes.h
+++ b/src/dep/include/irrlicht/EDriverTypes.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,38 +13,43 @@ namespace video
 	//! An enum for all types of drivers the Irrlicht Engine supports.
 	enum E_DRIVER_TYPE
 	{
-		//! Null device, useful for applications to run the engine without visualisation.
-		//! The null device is able to load textures, but does not render and display
-		//! any graphics.
+		//! Null driver, useful for applications to run the engine without visualisation.
+		/** The null device is able to load textures, but does not
+		render and display any graphics. */
 		EDT_NULL,
 
-		//! The Irrlicht Engine Software renderer, runs on all platforms,
-		//! with every hardware. It should only be used for 2d graphics,
-		//! but it can also perform some primitive 3d functions. These 3d drawing
-		//! functions are quite fast, but very inaccurate, and don't even support
-		//! clipping in 3D mode.
+		//! The Irrlicht Engine Software renderer.
+		/** Runs on all platforms, with every hardware. It should only be used for
+		2d graphics, but it can also perform some primitive 3d
+		functions. These 3d drawing functions are quite fast, but
+		very inaccurate, and don't even support clipping in 3D mode. */
 		EDT_SOFTWARE,
 
-		//! The Burning's Software Renderer, an alternative software renderer for Irrlicht.
-		//! Basically it can be described as the Irrlicht Software renderer on steroids. It rasterizes
-		//! 3D geometry perfectly: It is able to perform correct 3d clipping, perspective
-		//! correct texture mapping, perspective correct color mapping, and renders
-		//! sub pixel correct, sub texel correct primitives. In addition, it does
-		//! bilinear texel filtering and supports more materials than the EDT_SOFTWARE driver.
-		//! This renderer has been written entirely by Thomas Alten, thanks a lot for this huge
-		//! contribution.
+		//! The Burning's Software Renderer, an alternative software renderer
+		/** Basically it can be described as the Irrlicht Software
+		renderer on steroids. It rasterizes 3D geometry perfectly: It
+		is able to perform correct 3d clipping, perspective correct
+		texture mapping, perspective correct color mapping, and renders
+		sub pixel correct, sub texel correct primitives. In addition,
+		it does bilinear texel filtering and supports more materials
+		than the EDT_SOFTWARE driver. This renderer has been written
+		entirely by Thomas Alten, thanks a lot for this huge
+		contribution. */
 		EDT_BURNINGSVIDEO,
 
-		//! Direct3D 8 device, only available on Win32 platforms.
-		//! Performs hardware accelerated rendering of 3D and 2D primitives.
+		//! Direct3D8 device, only available on Win32 platforms.
+		/** Performs hardware accelerated rendering of 3D and 2D
+		primitives. */
 		EDT_DIRECT3D8,
 
 		//! Direct3D 9 device, only available on Win32 platforms.
-		//! Performs hardware accelerated rendering of 3D and 2D primitives.
+		/** Performs hardware accelerated rendering of 3D and 2D
+		primitives. */
 		EDT_DIRECT3D9,
 
 		//! OpenGL device, available on most platforms.
-		//! Performs hardware accelerated rendering of 3D and 2D primitives.
+		/** Performs hardware accelerated rendering of 3D and 2D
+		primitives. */
 		EDT_OPENGL
 	};
 
diff --git a/src/dep/include/irrlicht/EGUIElementTypes.h b/src/dep/include/irrlicht/EGUIElementTypes.h
index 53faa15..30306d4 100644
--- a/src/dep/include/irrlicht/EGUIElementTypes.h
+++ b/src/dep/include/irrlicht/EGUIElementTypes.h
@@ -1,10 +1,12 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __E_GUI_ELEMENT_TYPES_H_INCLUDED__
 #define __E_GUI_ELEMENT_TYPES_H_INCLUDED__
 
+#include "irrTypes.h"
+
 namespace irr
 {
 namespace gui
@@ -59,6 +61,9 @@ enum EGUI_ELEMENT_TYPE
 	//! A scroll bar (IGUIScrollBar)
 	EGUIET_SCROLL_BAR,
 
+	//! A spin box (IGUISpinBox)
+	EGUIET_SPIN_BOX,
+
 	//! A static text (IGUIStaticText)
 	EGUIET_STATIC_TEXT,
 
@@ -68,23 +73,22 @@ enum EGUI_ELEMENT_TYPE
 	//! A tab control
 	EGUIET_TAB_CONTROL,
 
+	//! A Table
+	EGUIET_TABLE,
+
 	//! A tool bar (IGUIToolBar)
 	EGUIET_TOOL_BAR,
 
 	//! A window
 	EGUIET_WINDOW,
 
-	//! A spin box (IGUISpinBox)
-	EGUIET_SPIN_BOX,
-
 	//! Not an element, amount of elements in there
 	EGUIET_COUNT,
 
 	//! Unknown type.
 	EGUIET_ELEMENT,
 
-	//! This enum is never used, it only forces the compiler to
-	//! compile these enumeration values to 32 bit.
+	//! This enum is never used, it only forces the compiler to compile this enumeration to 32 bit.
 	EGUIET_FORCE_32_BIT = 0x7fffffff
 
 };
@@ -107,12 +111,13 @@ const c8* const GUIElementTypeNames[] =
 	"messageBox",
 	"modalScreen",
 	"scrollBar",
+	"spinBox",
 	"staticText",
 	"tab",
 	"tabControl",
+	"table",
 	"toolBar",
 	"window",
-	"spinBox",
 	0
 };
 
@@ -121,3 +126,6 @@ const c8* const GUIElementTypeNames[] =
 
 #endif
 
+
+
+
diff --git a/src/dep/include/irrlicht/EMaterialFlags.h b/src/dep/include/irrlicht/EMaterialFlags.h
index 4cb0767..9411f81 100644
--- a/src/dep/include/irrlicht/EMaterialFlags.h
+++ b/src/dep/include/irrlicht/EMaterialFlags.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -29,34 +29,40 @@ namespace video
 		EMF_ZBUFFER,
 
 		//! May be written to the zbuffer or is it readonly. Default: true
-		//! This flag is ignored, if the material type is a transparent type.
+		/** This flag is ignored, if the material type is a transparent type. */
 		EMF_ZWRITE_ENABLE,
 
-		//! Is backfaceculling enabled? Default: true
+		//! Is backface culling enabled? Default: true
 		EMF_BACK_FACE_CULLING,
 
+		//! Is frontface culling enabled? Default: false
+		/** Overrides EMF_BACK_FACE_CULLING if both are enabled. */
+		EMF_FRONT_FACE_CULLING,
+
 		//! Is bilinear filtering enabled? Default: true
 		EMF_BILINEAR_FILTER,
 
 		//! Is trilinear filtering enabled? Default: false
-		//! If the trilinear filter flag is enabled,
-		//! the bilinear filtering flag is ignored.
+		/** If the trilinear filter flag is enabled,
+		the bilinear filtering flag is ignored. */
 		EMF_TRILINEAR_FILTER,
 
 		//! Is anisotropic filtering? Default: false
-		//! In Irrlicht you can use anisotropic texture filtering in
-		//! conjunction with bilinear or trilinear texture filtering
-		//! to improve rendering results. Primitives will look less
-		//! blurry with this flag switched on.
+		/** In Irrlicht you can use anisotropic texture filtering in
+		conjunction with bilinear or trilinear texture filtering
+		to improve rendering results. Primitives will look less
+		blurry with this flag switched on. */
 		EMF_ANISOTROPIC_FILTER,
 
 		//! Is fog enabled? Default: false
 		EMF_FOG_ENABLE,
 
-		//! Normalizes normals.You can enable this if you need
-		//! to scale a dynamic lighted model. Usually, its normals will get scaled
-		//! too then and it will get darker. If you enable the EMF_NORMALIZE_NORMALS flag,
-		//! the normals will be normalized again, and the model will look as bright as it should.
+		//! Normalizes normals. Default: false
+		/** You can enable this if you need to scale a dynamic lighted
+		model. Usually, its normals will get scaled too then and it
+		will get darker. If you enable the EMF_NORMALIZE_NORMALS flag,
+		the normals will be normalized again, and the model will look
+		as bright as it should. */
 		EMF_NORMALIZE_NORMALS,
 
 		//! Access to all layers texture wrap settings. Overwrites separate layer settings.
diff --git a/src/dep/include/irrlicht/EMaterialTypes.h b/src/dep/include/irrlicht/EMaterialTypes.h
index 087c338..69f92cd 100644
--- a/src/dep/include/irrlicht/EMaterialTypes.h
+++ b/src/dep/include/irrlicht/EMaterialTypes.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,37 +13,39 @@ namespace video
 	//! Abstracted and easy to use fixed function/programmable pipeline material modes.
 	enum E_MATERIAL_TYPE
 	{
-		//! Standard solid material. Only first texture is used, which is
-		//! supposed to be the diffuse material.
+		//! Standard solid material.
+		/** Only first texture is used, which is supposed to be the
+		diffuse material. */
 		EMT_SOLID = 0,
 
-		//! Solid material with 2 texture layers. The second is blended onto the
-		//! first using the alpha value of the vertex colors.
-		//! This material is currently not implemented in OpenGL, but it
-		//! works with DirectX.
+		//! Solid material with 2 texture layers.
+		/** The second is blended onto the first using the alpha value
+		of the vertex colors. This material is currently not implemented in OpenGL.
+		*/
 		EMT_SOLID_2_LAYER,
 
-		//! Material type with standard lightmap technique:
-		//! There should be 2 textures: The first texture layer is a diffuse map,
-		//! the second is a light map. Vertex light is ignored.
+		//! Material type with standard lightmap technique
+		/** There should be 2 textures: The first texture layer is a
+		diffuse map, the second is a light map. Dynamic light is
+		ignored. */
 		EMT_LIGHTMAP,
 
-		//! Material type with lightmap technique like EMT_LIGHTMAP, but
-		//! lightmap and diffuse texture are not modulated, but added instead.
+		//! Material type with lightmap technique like EMT_LIGHTMAP.
+		/** But lightmap and diffuse texture are added instead of modulated. */
 		EMT_LIGHTMAP_ADD,
 
-		//! Material type with standard lightmap technique:
-		//! There should be 2 textures: The first texture layer is a diffuse map,
-		//! the second is a light map. Vertex light is ignored.
-		//! The texture colors are effectively multiplyied by 2 for brightening.
-		//! like known in DirectX as D3DTOP_MODULATE2X.
+		//! Material type with standard lightmap technique
+		/** There should be 2 textures: The first texture layer is a
+		diffuse map, the second is a light map. Dynamic light is
+		ignored. The texture colors are effectively multiplied by 2
+		for brightening. Like known in DirectX as D3DTOP_MODULATE2X. */
 		EMT_LIGHTMAP_M2,
 
-		//! Material type with standard lightmap technique:
-		//! There should be 2 textures: The first texture layer is a diffuse map,
-		//! the second is a light map. Vertex light is ignored.
-		//! The texture colors are effectively multiplyied by 4 for brightening.
-		//! like known in DirectX as D3DTOP_MODULATE4X.
+		//! Material type with standard lightmap technique
+		/** There should be 2 textures: The first texture layer is a
+		diffuse map, the second is a light map. Dynamic light is
+		ignored. The texture colors are effectively multiplyied by 4
+		for brightening. Like known in DirectX as D3DTOP_MODULATE4X. */
 		EMT_LIGHTMAP_M4,
 
 		//! Like EMT_LIGHTMAP, but also supports dynamic lighting.
@@ -55,133 +57,142 @@ namespace video
 		//! Like EMT_LIGHTMAP_4, but also supports dynamic lighting.
 		EMT_LIGHTMAP_LIGHTING_M4,
 
-		//! Detail mapped material. The first texture is diffuse color map, the
-		//! second is added to this and usually displayed with a bigger scale value
-		//! so that it adds more detail. The detail map is added to the diffuse map using
-		//! ADD_SIGNED, so that it is possible to add and substract color from the diffuse
-		//! map. For example a value of (127,127,127) will not change the appearance of
-		//! the diffuse map at all.
-		//! Often used for terrain rendering.
+		//! Detail mapped material.
+		/** The first texture is diffuse color map, the second is added
+		to this and usually displayed with a bigger scale value so that
+		it adds more detail. The detail map is added to the diffuse map
+		using ADD_SIGNED, so that it is possible to add and substract
+		color from the diffuse map. For example a value of
+		(127,127,127) will not change the appearance of the diffuse map
+		at all. Often used for terrain rendering. */
 		EMT_DETAIL_MAP,
 
-		//! Makes the material look like it was reflection the environment
-		//! around it. To make this possible, a texture called 'sphere map'
-		//! is used, which must be set as Textures[0].
+		//! Look like a reflection of the environment around it.
+		/** To make this possible, a texture called 'sphere map' is
+		used, which must be set as the first texture. */
 		EMT_SPHERE_MAP,
 
-		//! A reflecting material with an
-		//! optional additional non reflecting texture layer. The reflection
-		//! map should be set as Texture 1.
+		//! A reflecting material with an optional non reflecting texture layer.
+		/** The reflection map should be set as first texture. */
 		EMT_REFLECTION_2_LAYER,
 
-		//! A transparent material. Only the first texture is used.
-		//! The new color is calculated by simply adding the source color and
-		//! the dest color. This means if for example a billboard using a texture with
-		//! black background and a red circle on it is drawn with this material, the
-		//! result is that only the red circle will be drawn a little bit transparent,
-		//! and everything which was black is 100% transparent and not visible.
-		//! This material type is useful for e.g. particle effects.
+		//! A transparent material.
+		/** Only the first texture is used. The new color is calculated
+		by simply adding the source color and the dest color. This
+		means if for example a billboard using a texture with black
+		background and a red circle on it is drawn with this material,
+		the result is that only the red circle will be drawn a little
+		bit transparent, and everything which was black is 100%
+		transparent and not visible. This material type is useful for
+		particle effects. */
 		EMT_TRANSPARENT_ADD_COLOR,
 
 		//! Makes the material transparent based on the texture alpha channel.
-		//! The final color is blended together from the destination color and the
-		//! texture color, using the alpha channel value as blend factor.
-		//! Only first texture is used. If you are using this material with small
-		//! textures, it is a good idea to load the texture in 32 bit
-		//! mode (video::IVideoDriver::setTextureCreationFlag()).
-		//! Also, an alpha ref is used, which can be manipulated using SMaterial::MaterialTypeParam.
-		//! If set to 0, the alpha ref gets its default value which is 0.5f and which means
-		//! that pixels with an alpha value >127 will be written, others not.  In other, simple
-		//! words: this value controls how sharp the edges become when going from a
-		//! transparent to a solid spot on the texture.
+		/** The final color is blended together from the destination
+		color and the texture color, using the alpha channel value as
+		blend factor. Only first texture is used. If you are using
+		this material with small textures, it is a good idea to load
+		the texture in 32 bit mode
+		(video::IVideoDriver::setTextureCreationFlag()). Also, an alpha
+		ref is used, which can be manipulated using
+		SMaterial::MaterialTypeParam. This value controls how sharp the
+		edges become when going from a transparent to a solid spot on
+		the texture. */
 		EMT_TRANSPARENT_ALPHA_CHANNEL,
 
 		//! Makes the material transparent based on the texture alpha channel.
-		//! If the alpha channel value is greater than 127, a pixel is written to the
-		//! target, otherwise not. This material does not use alpha blending
-		//! and is a lot faster than EMT_TRANSPARENT_ALPHA_CHANNEL. It
-		//! is ideal for drawing stuff like leafes of plants, because the borders
-		//! are not blurry but sharp.
-		//! Only first texture is used. If you are using this material with small
-		//! textures and 3d object, it is a good idea to load the texture in 32 bit
-		//! mode (video::IVideoDriver::setTextureCreationFlag()).
+		/** If the alpha channel value is greater than 127, a
+		pixel is written to the target, otherwise not. This
+		material does not use alpha blending and is a lot faster
+		than EMT_TRANSPARENT_ALPHA_CHANNEL. It is ideal for drawing
+		stuff like leafes of plants, because the borders are not
+		blurry but sharp. Only first texture is used. If you are
+		using this material with small textures and 3d object, it
+		is a good idea to load the texture in 32 bit mode
+		(video::IVideoDriver::setTextureCreationFlag()). */
 		EMT_TRANSPARENT_ALPHA_CHANNEL_REF,
 
 		//! Makes the material transparent based on the vertex alpha value.
 		EMT_TRANSPARENT_VERTEX_ALPHA,
 
-		//! A transparent reflecting material with an
-		//! optional additional non reflecting texture layer. The reflection
-		//! map should be set as Texture 1. The transparency depends on the
-		//! alpha value in the vertex colors. A texture which will not reflect
-		//! can be set als Texture 2.
-		//! Please note that this material type is currently not 100% implemented
-		//! in OpenGL. It works in Direct3D.
+		//! A transparent reflecting material with an optional additional non reflecting texture layer.
+		/** The reflection map should be set as first texture. The
+		transparency depends on the alpha value in the vertex colors. A
+		texture which will not reflect can be set as second texture.
+		Please note that this material type is currently not 100%
+		implemented in OpenGL. */
 		EMT_TRANSPARENT_REFLECTION_2_LAYER,
 
-		//! A solid normal map renderer. First texture is the color map, the
-		//! second should be the normal map. Note that you should use this material
-		//! only when drawing geometry consisting of vertices of type S3DVertexTangents
-		//! (EVT_TANGENTS). You can convert any mesh into this format using
-		//! IMeshManipulator::createMeshWithTangents() (See SpecialFX2 Tutorial).
-		//! This shader runs on vertex shader 1.1 and pixel shader 1.1 capable hardware and
-		//! falls back on a fixed function lighted material if this hardware is not available.
-		//! Only two lights are supported by this shader, if there are more, the nearest two
-		//! are chosen. Currently, this shader is only implemented for the D3D8 and D3D9 renderers.
+		//! A solid normal map renderer.
+		/** First texture is the color map, the second should be the
+		normal map. Note that you should use this material only when
+		drawing geometry consisting of vertices of type
+		S3DVertexTangents (EVT_TANGENTS). You can convert any mesh into
+		this format using IMeshManipulator::createMeshWithTangents()
+		(See SpecialFX2 Tutorial). This shader runs on vertex shader
+		1.1 and pixel shader 1.1 capable hardware and falls back to a
+		fixed function lighted material if this hardware is not
+		available. Only two lights are supported by this shader, if
+		there are more, the nearest two are chosen. */
 		EMT_NORMAL_MAP_SOLID,
 
-		//! A transparent normal map renderer. First texture is the color map, the
-		//! second should be the normal map. Note that you should use this material
-		//! only when drawing geometry consisting of vertices of type S3DVertexTangents
-		//! (EVT_TANGENTS). You can convert any mesh into this format using
-		//! IMeshManipulator::createMeshWithTangents() (See SpecialFX2 Tutorial).
-		//! This shader runs on vertex shader 1.1 and pixel shader 1.1 capable hardware and
-		//! falls back on a fixed function lighted material if this hardware is not available.
-		//! Only two lights are supported by this shader, if there are more, the nearest two
-		//! are chosen. Currently, this shader is only implemented for the D3D8 and D3D9 renderers.
+		//! A transparent normal map renderer.
+		/** First texture is the color map, the second should be the
+		normal map. Note that you should use this material only when
+		drawing geometry consisting of vertices of type
+		S3DVertexTangents (EVT_TANGENTS). You can convert any mesh into
+		this format using IMeshManipulator::createMeshWithTangents()
+		(See SpecialFX2 Tutorial). This shader runs on vertex shader
+		1.1 and pixel shader 1.1 capable hardware and falls back to a
+		fixed function lighted material if this hardware is not
+		available. Only two lights are supported by this shader, if
+		there are more, the nearest two are chosen. */
 		EMT_NORMAL_MAP_TRANSPARENT_ADD_COLOR,
 
 		//! A transparent (based on the vertex alpha value) normal map renderer.
-		//! First texture is the color map, the
-		//! second should be the normal map. Note that you should use this material
-		//! only when drawing geometry consisting of vertices of type S3DVertexTangents
-		//! (EVT_TANGENTS). You can convert any mesh into this format using
-		//! IMeshManipulator::createMeshWithTangents() (See SpecialFX2 Tutorial).
-		//! This shader runs on vertex shader 1.1 and pixel shader 1.1 capable hardware and
-		//! falls back on a fixed function lighted material if this hardware is not available.
-		//! Only two lights are supported by this shader, if there are more, the nearest two
-		//! are chosen. Currently, this shader is only implemented for the D3D8 and D3D9 renderers.
+		/** First texture is the color map, the second should be the
+		normal map. Note that you should use this material only when
+		drawing geometry consisting of vertices of type
+		S3DVertexTangents (EVT_TANGENTS). You can convert any mesh into
+		this format using IMeshManipulator::createMeshWithTangents()
+		(See SpecialFX2 Tutorial). This shader runs on vertex shader
+		1.1 and pixel shader 1.1 capable hardware and falls back to a
+		fixed function lighted material if this hardware is not
+		available.  Only two lights are supported by this shader, if
+		there are more, the nearest two are chosen. */
 		EMT_NORMAL_MAP_TRANSPARENT_VERTEX_ALPHA,
 
-		//! Just like EMT_NORMAL_MAP_SOLID, but uses parallax mapping too, which
-		//! looks a lot more realistic. This only works when the hardware supports at
-		//! least vertex shader 1.1 and pixel shader 1.4.
-		//! First texture is the color map, the  second should be the normal map.
-		//! The normal map texture should contain the height value in the
-		//! alpha component. The IVideoDriver::makeNormalMapTexture() method writes
-		//! this value automaticly when creating normal maps from a heightmap when using a 32 bit
-		//! texture.
-		//! The height scale of the material (affecting the bumpiness) is being controlled
-		//! by the SMaterial::MaterialTypeParam member.
-		//! If set to zero, the default value (0.02f) will be applied. Otherwise
-		//! the value set in SMaterial::MaterialTypeParam is taken. This value depends on with which
-		//! scale the texture is mapped on the material. Too high or low values of MaterialTypeParam
-		//! can result in strange artifacts.
+		//! Just like EMT_NORMAL_MAP_SOLID, but uses parallax mapping.
+		/** Looks a lot more realistic. This only works when the
+		hardware supports at least vertex shader 1.1 and pixel shader
+		1.4. First texture is the color map, the second should be the
+		normal map. The normal map texture should contain the height
+		value in the alpha component. The
+		IVideoDriver::makeNormalMapTexture() method writes this value
+		automatically when creating normal maps from a heightmap when
+		using a 32 bit texture. The height scale of the material
+		(affecting the bumpiness) is being controlled by the
+		SMaterial::MaterialTypeParam member. If set to zero, the
+		default value (0.02f) will be applied. Otherwise the value set
+		in SMaterial::MaterialTypeParam is taken. This value depends on
+		with which scale the texture is mapped on the material. Too
+		high or low values of MaterialTypeParam can result in strange
+		artifacts. */
 		EMT_PARALLAX_MAP_SOLID,
 
-		//! A material just like EMT_PARALLAX_MAP_SOLID, but it is transparent, using
-		//! EMT_TRANSPARENT_ADD_COLOR as base material.
+		//! A material like EMT_PARALLAX_MAP_SOLID, but transparent.
+		/** Using EMT_TRANSPARENT_ADD_COLOR as base material. */
 		EMT_PARALLAX_MAP_TRANSPARENT_ADD_COLOR,
 
-		//! A material just like EMT_PARALLAX_MAP_SOLID, but it is transparent, using
-		//! EMT_TRANSPARENT_VERTEX_ALPHA as base material.
+		//! A material like EMT_PARALLAX_MAP_SOLID, but transparent.
+		/** Using EMT_TRANSPARENT_VERTEX_ALPHA as base material. */
 		EMT_PARALLAX_MAP_TRANSPARENT_VERTEX_ALPHA,
 
 		//! BlendFunc = source * sourceFactor + dest * destFactor ( E_BLEND_FUNC )
-		//! Using only Textures[0]. generic Blender
+		/** Using only first texture. Generic blending method. */
 		EMT_ONETEXTURE_BLEND,
 
-		//! This value is not used. It only forces this enumeration to compile in 32 bit.
+		//! This value is not used. It only forces this enumeration to compile to 32 bit.
 		EMT_FORCE_32BIT = 0x7fffffff
 	};
 
diff --git a/src/dep/include/irrlicht/EMeshWriterEnums.h b/src/dep/include/irrlicht/EMeshWriterEnums.h
index 8028ff4..8acc285 100644
--- a/src/dep/include/irrlicht/EMeshWriterEnums.h
+++ b/src/dep/include/irrlicht/EMeshWriterEnums.h
@@ -1,10 +1,12 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __E_MESH_WRITER_ENUMS_H_INCLUDED__
 #define __E_MESH_WRITER_ENUMS_H_INCLUDED__
 
+#include "irrTypes.h"
+
 namespace irr
 {
 namespace scene
@@ -23,7 +25,10 @@ namespace scene
 		EMWT_COLLADA      = MAKE_IRR_ID('c','o','l','l'),
 
 		//! STL mesh writer for .stl files
-		EMWT_STL          = MAKE_IRR_ID('s','t','l',0)
+		EMWT_STL          = MAKE_IRR_ID('s','t','l',0),
+
+		//! OBJ mesh writer for .obj files
+		EMWT_OBJ          = MAKE_IRR_ID('o','b','j',0)
 	};
 
 
diff --git a/src/dep/include/irrlicht/EMessageBoxFlags.h b/src/dep/include/irrlicht/EMessageBoxFlags.h
index 636a135..8e8ead8 100644
--- a/src/dep/include/irrlicht/EMessageBoxFlags.h
+++ b/src/dep/include/irrlicht/EMessageBoxFlags.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -26,10 +26,11 @@ enum EMESSAGE_BOX_FLAG
 	EMBF_NO = 0x8,
 
 	//! This value is not used. It only forces this enumeration to compile in 32 bit.
-	EMBF_FORCE_32BIT = 0x7fffffff	
+	EMBF_FORCE_32BIT = 0x7fffffff
 };
 
 } // namespace gui
 } // namespace irr
 
 #endif
+
diff --git a/src/dep/include/irrlicht/ESceneNodeAnimatorTypes.h b/src/dep/include/irrlicht/ESceneNodeAnimatorTypes.h
index 4b9cbae..63a78f7 100644
--- a/src/dep/include/irrlicht/ESceneNodeAnimatorTypes.h
+++ b/src/dep/include/irrlicht/ESceneNodeAnimatorTypes.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -34,14 +34,19 @@ namespace scene
 		//! Collision respose scene node animator
 		ESNAT_COLLISION_RESPONSE,
 
+		//! FPS camera animator
+		ESNAT_CAMERA_FPS,
+
+		//! Maya camera animator
+		ESNAT_CAMERA_MAYA,
+
 		//! Amount of built-in scene node animators
 		ESNAT_COUNT,
 
 		//! Unknown scene node animator
 		ESNAT_UNKNOWN,
 
-		//! This enum is never used, it only forces the compiler to
-		//! compile these enumeration values to 32 bit.
+		//! This enum is never used, it only forces the compiler to compile this enumeration to 32 bit.
 		ESNAT_FORCE_32_BIT = 0x7fffffff
 	};
 
diff --git a/src/dep/include/irrlicht/ESceneNodeTypes.h b/src/dep/include/irrlicht/ESceneNodeTypes.h
index 1e74161..a7148cd 100644
--- a/src/dep/include/irrlicht/ESceneNodeTypes.h
+++ b/src/dep/include/irrlicht/ESceneNodeTypes.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -57,12 +57,6 @@ namespace scene
 		//! Camera Scene Node
 		ESNT_CAMERA         = MAKE_IRR_ID('c','a','m','_'),
 
-		//! Maya Camera Scene Node
-		ESNT_CAMERA_MAYA    = MAKE_IRR_ID('c','a','m','M'),
-
-		//! First Person Shooter style Camera
-		ESNT_CAMERA_FPS	    = MAKE_IRR_ID('c','a','m','F'),
-
 		//! Billboard Scene Node
 		ESNT_BILLBOARD      = MAKE_IRR_ID('b','i','l','l'),
 
@@ -73,10 +67,21 @@ namespace scene
 		ESNT_PARTICLE_SYSTEM = MAKE_IRR_ID('p','t','c','l'),
 
 		//! Quake3 Model Scene Node ( has tag to link to )
-		ESNT_MD3_SCENE_NODE	= MAKE_IRR_ID('m','d','3','_'),
+		ESNT_MD3_SCENE_NODE  = MAKE_IRR_ID('m','d','3','_'),
+
+		//! Maya Camera Scene Node
+		/** Legacy, for loading version <= 1.4.x .irr files */
+		ESNT_CAMERA_MAYA    = MAKE_IRR_ID('c','a','m','M'),
+
+		//! First Person Shooter Camera
+		/** Legacy, for loading version <= 1.4.x .irr files */
+		ESNT_CAMERA_FPS     = MAKE_IRR_ID('c','a','m','F'),
 
 		//! Unknown scene node
-		ESNT_UNKNOWN        = MAKE_IRR_ID('u','n','k','n')
+		ESNT_UNKNOWN        = MAKE_IRR_ID('u','n','k','n'),
+
+		//! Will match with any scene node when checking types
+		ESNT_ANY            = MAKE_IRR_ID('a','n','y','_')
 	};
 
 
diff --git a/src/dep/include/irrlicht/ETerrainElements.h b/src/dep/include/irrlicht/ETerrainElements.h
index 9644d78..dd08ef7 100644
--- a/src/dep/include/irrlicht/ETerrainElements.h
+++ b/src/dep/include/irrlicht/ETerrainElements.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/IAnimatedMesh.h b/src/dep/include/irrlicht/IAnimatedMesh.h
index 6d11e5f..dc60700 100644
--- a/src/dep/include/irrlicht/IAnimatedMesh.h
+++ b/src/dep/include/irrlicht/IAnimatedMesh.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -12,7 +12,7 @@ namespace irr
 {
 namespace scene
 {
-
+	//! Possible types of (animated) meshes.
 	enum E_ANIMATED_MESH_TYPE
 	{
 		//! Unknown animated mesh type.
@@ -36,16 +36,15 @@ namespace scene
 		//! My3D Mesh, the file format by Zhuck Dimitry
 		EAMT_MY3D,
 
-		//! Pulsar LMTools .lmts file. This Irrlicht loader was
-		//! written by Jonas Petersen
+		//! Pulsar LMTools .lmts file. This Irrlicht loader was written by Jonas Petersen
 		EAMT_LMTS,
 
 		//! Cartography Shop .csm file. This loader was created by Saurav Mohapatra.
 		EAMT_CSM,
 
-		//! .oct file for Paul Nette's FSRad or from Murphy McCauley's
-		//! Blender .oct exporter. The oct file format contains 3D
-		//! geometry and lightmaps and can be loaded directly by Irrlicht
+		//! .oct file for Paul Nette's FSRad or from Murphy McCauley's Blender .oct exporter.
+		/** The oct file format contains 3D geometry and lightmaps and
+		can be loaded directly by Irrlicht */
 		EAMT_OCT,
 
 		//! generic skinned mesh
@@ -61,9 +60,6 @@ namespace scene
 	{
 	public:
 
-		//! destructor
-		virtual ~IAnimatedMesh() { }
-
 		//! Gets the frame count of the animated mesh.
 		/** \return Returns the amount of frames. If the amount is 1,
 		it is a static, non animated mesh. */
@@ -81,7 +77,7 @@ namespace scene
 		outside of this loop.
 		If startFrameLoop and endFrameLoop are both -1, they are ignored.
 		\param endFrameLoop: see startFrameLoop.
-		\return Returns the animated mesh based on a detail level.  */
+		\return Returns the animated mesh based on a detail level. */
 		virtual IMesh* getMesh(s32 frame, s32 detailLevel=255, s32 startFrameLoop=-1, s32 endFrameLoop=-1) = 0;
 
 		//! Returns the type of the animated mesh.
diff --git a/src/dep/include/irrlicht/IAnimatedMeshMD2.h b/src/dep/include/irrlicht/IAnimatedMeshMD2.h
index f61848b..692a8c5 100644
--- a/src/dep/include/irrlicht/IAnimatedMeshMD2.h
+++ b/src/dep/include/irrlicht/IAnimatedMeshMD2.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -46,29 +46,29 @@ namespace scene
 	{
 	public:
 
-		// Get frame loop data for a default MD2 animation type.
-		//! \param l: The EMD2_ANIMATION_TYPE to get the frames for.
-		//! \param outBegin: The returned beginning frame for animation type specified.
-		//! \param outEnd: The returned ending frame for the animation type specified.
-		//! \param outFPS: The number of frames per second, this animation should be played at.
-		//! \return Returns the beginframe, endframe and frames per second for a default MD2 animation type.
+		//! Get frame loop data for a default MD2 animation type.
+		/** \param l The EMD2_ANIMATION_TYPE to get the frames for.
+		\param outBegin The returned beginning frame for animation type specified.
+		\param outEnd The returned ending frame for the animation type specified.
+		\param outFPS The number of frames per second, this animation should be played at.
+		\return beginframe, endframe and frames per second for a default MD2 animation type. */
 		virtual void getFrameLoop(EMD2_ANIMATION_TYPE l, s32& outBegin,
 			s32& outEnd, s32& outFPS) const = 0;
 
-		// Get frame loop data for a special MD2 animation type, identified by name.
-		//! \param name: Name of the animation.
-		//! \param outBegin: The returned beginning frame for animation type specified.
-		//! \param outEnd: The returned ending frame for the animation type specified.
-		//! \param outFPS: The number of frames per second, this animation should be played at.
-		//! \return Returns the beginframe, endframe and frames per second for a special MD2 animation type.
-		virtual bool getFrameLoop(const c8* name, 
+		//! Get frame loop data for a special MD2 animation type, identified by name.
+		/** \param name Name of the animation.
+		\param outBegin The returned beginning frame for animation type specified.
+		\param outEnd The returned ending frame for the animation type specified.
+		\param outFPS The number of frames per second, this animation should be played at.
+		\return beginframe, endframe and frames per second for a special MD2 animation type. */
+		virtual bool getFrameLoop(const c8* name,
 			s32& outBegin, s32& outEnd, s32& outFPS) const = 0;
 
-		//! Returns amount of md2 animations in this file.
+		//! Get amount of md2 animations in this file.
 		virtual s32 getAnimationCount() const = 0;
 
-		//! Returns name of md2 animation. 
-		//! \param nr: Zero based index of animation. 
+		//! Get name of md2 animation.
+		/** \param nr: Zero based index of animation. */
 		virtual const c8* getAnimationName(s32 nr) const = 0;
 	};
 
diff --git a/src/dep/include/irrlicht/IAnimatedMeshMD3.h b/src/dep/include/irrlicht/IAnimatedMeshMD3.h
index 8250f93..a260e10 100644
--- a/src/dep/include/irrlicht/IAnimatedMeshMD3.h
+++ b/src/dep/include/irrlicht/IAnimatedMeshMD3.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2007-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,8 +23,7 @@ namespace scene
 		EMD3_NUMMODELS
 	};
 
-
-	// Animation list
+	//! Animation list
 	enum EMD3_ANIMATION_TYPE
 	{
 		// Animations for both lower and upper parts of the player
@@ -64,15 +63,19 @@ namespace scene
 
 	struct SMD3AnimationInfo
 	{
-		s32 first;     // First frame
-		s32 num;       // Last frame
-		s32 looping;   // Looping frames
-		s32 fps;       // Frames per second
+		//! First frame
+		s32 first;
+		//! Last frame
+		s32 num;
+		//! Looping frames
+		s32 looping;
+		//! Frames per second
+		s32 fps;
 	};
 
 
 // byte-align structures
-#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__) 
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
 #	pragma pack( push, packing )
 #	pragma pack( 1 )
 #	define PACK_STRUCT
@@ -82,36 +85,37 @@ namespace scene
 #	error compiler not supported
 #endif
 
-	// this holds the header info of the MD3 file
+	//! this holds the header info of the MD3 file
 	struct SMD3Header
 	{
-		c8	headerID[4];	//id of file, always "IDP3" 
-		s32	Version;		//this is a version number, always 15 
-		s8	fileName[68];	//sometimes left Blank... 65 chars, 32bit aligned == 68 chars 
-		s32	numFrames;		//number of KeyFrames
-		s32	numTags;		//number of 'tags' per frame
-		s32	numMeshes;		//number of meshes/skins 
-		s32	numMaxSkins;	//maximum number of unique skins used in md3 file 
-		s32	headerSize;		//always equal to the length of this header 
-		s32	tagStart;		//starting position of tag-structures 
-		s32	tagEnd;			//ending position of tag-structures/starting position of mesh-structures 
+		c8	headerID[4];	//id of file, always "IDP3"
+		s32	Version;	//this is a version number, always 15
+		s8	fileName[68];	//sometimes left Blank... 65 chars, 32bit aligned == 68 chars
+		s32	numFrames;	//number of KeyFrames
+		s32	numTags;	//number of 'tags' per frame
+		s32	numMeshes;	//number of meshes/skins
+		s32	numMaxSkins;	//maximum number of unique skins used in md3 file
+		s32	headerSize;	//always equal to the length of this header
+		s32	tagStart;	//starting position of tag-structures
+		s32	tagEnd;		//ending position of tag-structures/starting position of mesh-structures
 		s32	fileSize;
 	};
 
+	//! this holds the header info of an MD3 mesh section
 	struct SMD3MeshHeader
 	{
-		c8 meshID[4];			//id, must be IDP3 
-		c8 meshName[68];		//name of mesh 65 chars, 32 bit aligned == 68 chars
+		c8 meshID[4];		//id, must be IDP3
+		c8 meshName[68];	//name of mesh 65 chars, 32 bit aligned == 68 chars
 
-		s32 numFrames;			//number of meshframes in mesh 
-		s32 numShader;			//number of skins in mesh 
-		s32 numVertices;		//number of vertices 
-		s32 numTriangles;		//number of Triangles 
+		s32 numFrames;		//number of meshframes in mesh
+		s32 numShader;		//number of skins in mesh
+		s32 numVertices;	//number of vertices
+		s32 numTriangles;	//number of Triangles
 
-		s32 offset_triangles;	//starting position of Triangle data, relative to start of Mesh_Header 
-		s32 offset_shaders;		//size of header 
-		s32 offset_st;			//starting position of texvector data, relative to start of Mesh_Header 
-		s32 vertexStart;		//starting position of vertex data,relative to start of Mesh_Header 
+		s32 offset_triangles;	//starting position of Triangle data, relative to start of Mesh_Header
+		s32 offset_shaders;	//size of header
+		s32 offset_st;		//starting position of texvector data, relative to start of Mesh_Header
+		s32 vertexStart;	//starting position of vertex data,relative to start of Mesh_Header
 		s32 offset_end;
 	};
 
@@ -123,7 +127,7 @@ namespace scene
 		u8 normal[2];
 	};
 
-	//! Texure Coordinate
+	//! Texture Coordinate
 	struct SMD3TexCoord
 	{
 		f32 u;
@@ -138,7 +142,7 @@ namespace scene
 
 
 // Default alignment
-#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__) 
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
 #	pragma pack( pop, packing )
 #endif
 
@@ -156,7 +160,7 @@ namespace scene
 	};
 
 	//! hold a tag info for connecting meshes
-	//! basically its an alternate way to describe a transformation
+	/** Basically its an alternate way to describe a transformation. */
 	struct SMD3QuaterionTag
 	{
 		SMD3QuaterionTag() {}
@@ -165,12 +169,12 @@ namespace scene
 			: Name ( name ) {}
 
 		// construct from a matrix
-		SMD3QuaterionTag ( const core::stringc& name, const core::matrix4 &m )
-		{
-			Name = name;
-			position = m.getTranslation ();
-			rotation = m;
-		}
+		SMD3QuaterionTag ( const core::stringc& name, const core::matrix4 &m ) : Name(name), position(m.getTranslation()), rotation(m)
+		{ }
+
+		// construct from a position and euler angles in degrees
+		SMD3QuaterionTag ( const core::vector3df &pos, const core::vector3df &angle ) : position(pos), rotation(angle * core::DEGTORAD)
+		{ }
 
 		// set to matrix
 		void setto ( core::matrix4 &m )
@@ -179,13 +183,6 @@ namespace scene
 			m.setTranslation ( position );
 		}
 
-		// construct from a position and euler angles in degrees
-		SMD3QuaterionTag ( const core::vector3df &pos, const core::vector3df &angle )
-		{
-			position = pos;
-			rotation.set ( angle * core::DEGTORAD );
-		}
-
 		bool operator == ( const SMD3QuaterionTag &other ) const
 		{
 			return Name == other.Name;
@@ -196,7 +193,7 @@ namespace scene
 		core::quaternion rotation;
 	};
 
-	// holds a assoziative list of named quaternions
+	//! holds a associative list of named quaternions
 	struct SMD3QuaterionTagList : public virtual IReferenceCounted
 	{
 		SMD3QuaterionTag* get ( const core::stringc& name )
@@ -213,11 +210,22 @@ namespace scene
 			return Container.size();
 		}
 
-		SMD3QuaterionTag& operator[] (u32 index )
+		const SMD3QuaterionTag& operator[](u32 index) const
 		{
 			return Container[index];
 		}
 
+		SMD3QuaterionTag& operator[](u32 index)
+		{
+			return Container[index];
+		}
+
+		SMD3QuaterionTagList & operator = (const SMD3QuaterionTagList & copyMe)
+		{
+			Container = copyMe.Container;
+			return *this;
+		}
+
 		core::array < SMD3QuaterionTag > Container;
 	};
 
@@ -229,7 +237,7 @@ namespace scene
 		{
 			for (u32 i=0; i<Buffer.size(); ++i)
 				Buffer[i]->drop();
-		};
+		}
 
 		SMD3Header MD3Header;
 		core::stringc Name;
@@ -243,11 +251,13 @@ namespace scene
 	{
 	public:
 
-		//! tune how many frames you want to render inbetween
+		//! tune how many frames you want to render inbetween.
 		virtual void setInterpolationShift ( u32 shift, u32 loopMode ) = 0;
 
+		//! get the tag list of the mesh.
 		virtual SMD3QuaterionTagList *getTagList(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop) = 0;
 
+		//! get the original md3 mesh.
 		virtual SMD3Mesh * getOriginalMesh () = 0;
 	};
 
diff --git a/src/dep/include/irrlicht/IAnimatedMeshSceneNode.h b/src/dep/include/irrlicht/IAnimatedMeshSceneNode.h
index 8b855d4..2d0cba1 100644
--- a/src/dep/include/irrlicht/IAnimatedMeshSceneNode.h
+++ b/src/dep/include/irrlicht/IAnimatedMeshSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,23 +9,22 @@
 #include "IBoneSceneNode.h"
 #include "IAnimatedMeshMD2.h"
 #include "IAnimatedMeshMD3.h"
-#include "IShadowVolumeSceneNode.h"
 
 namespace irr
 {
 namespace scene
 {
-
+	class IShadowVolumeSceneNode;
 
 	enum E_JOINT_UPDATE_ON_RENDER
 	{
-		// do nothing
+		//! do nothing
 		EJUOR_NONE = 0,
 
-		// get joints positions from the mesh (for attached nodes, etc)
+		//! get joints positions from the mesh (for attached nodes, etc)
 		EJUOR_READ,
 
-		// control joint positions in the mesh (eg. ragdolls, or set the animation from animateJoints() )
+		//! control joint positions in the mesh (eg. ragdolls, or set the animation from animateJoints() )
 		EJUOR_CONTROL,
 
 		//! count of all available interpolation modes
@@ -33,28 +32,27 @@ namespace scene
 	};
 
 
-
 	class IAnimatedMeshSceneNode;
 
 	//! Callback interface for catching events of ended animations.
 	/** Implement this interface and use
-	 IAnimatedMeshSceneNode::setAnimationEndCallback to be able to
-	 be notified if an animation playback has ended.
+	IAnimatedMeshSceneNode::setAnimationEndCallback to be able to
+	be notified if an animation playback has ended.
 	**/
 	class IAnimationEndCallBack : public virtual IReferenceCounted
 	{
 	public:
 
 		//! Will be called when the animation playback has ended.
-		//! See IAnimatedMeshSceneNode::setAnimationEndCallback for
-		//! more informations.
-		//! \param node: Node of which the animation has ended.
+		/** See IAnimatedMeshSceneNode::setAnimationEndCallback for
+		more informations.
+		\param node: Node of which the animation has ended. */
 		virtual void OnAnimationEnd(IAnimatedMeshSceneNode* node) = 0;
 	};
 
 	//! Scene node capable of displaying an animated mesh and its shadow.
-	/** The shadow is optional: If a shadow should be displayed too, just invoke
-	the IAnimatedMeshSceneNode::createShadowVolumeSceneNode().*/
+	/** The shadow is optional: If a shadow should be displayed too, just
+	invoke the IAnimatedMeshSceneNode::createShadowVolumeSceneNode().*/
 	class IAnimatedMeshSceneNode : public ISceneNode
 	{
 	public:
@@ -70,88 +68,96 @@ namespace scene
 		virtual ~IAnimatedMeshSceneNode() {}
 
 		//! Sets the current frame number.
-		//! From now on the animation is played from this frame.
-		//! \param frame: Number of the frame to let the animation be started from.
-		//! The frame number must be a valid frame number of the IMesh used by this
-		//! scene node. Set IAnimatedMesh::getMesh() for details.
+		/** From now on the animation is played from this frame.
+		\param frame: Number of the frame to let the animation be started from.
+		The frame number must be a valid frame number of the IMesh used by this
+		scene node. Set IAnimatedMesh::getMesh() for details. */
 		virtual void setCurrentFrame(f32 frame) = 0;
 
 		//! Sets the frame numbers between the animation is looped.
-		//! The default is 0 - MaximalFrameCount of the mesh.
-		//! \param begin: Start frame number of the loop.
-		//! \param end: End frame number of the loop.
-		//! \return Returns true if successful, false if not.
+		/** The default is 0 - MaximalFrameCount of the mesh.
+		\param begin: Start frame number of the loop.
+		\param end: End frame number of the loop.
+		\return True if successful, false if not. */
 		virtual bool setFrameLoop(s32 begin, s32 end) = 0;
 
 		//! Sets the speed with witch the animation is played.
-		//! \param framesPerSecond: Frames per second played.
+		/** \param framesPerSecond: Frames per second played. */
 		virtual void setAnimationSpeed(f32 framesPerSecond) = 0;
 
-		//! Creates shadow volume scene node as child of this node
-		//! and returns a pointer to it.  The shadow can be rendered using the ZPass
-		//! or the zfail method. ZPass is a little bit faster because the shadow volume
-		//! creation is easier, but with this method there occur ugly looking artifacs
-		//! when the camera is inside the shadow volume. These error do not occur
-		//! with the ZFail method.
-		//! \param id: Id of the shadow scene node. This id can be used to identify
-		//! the node later.
-		//! \param zfailmethod: If set to true, the shadow will use the zfail method,
-		//! if not, zpass is used.
-		//! \param infinity: Value used by the shadow volume algorithm to scale the
-		//! shadow volume.
-		//! \return Returns pointer to the created shadow scene node.
-		//! This pointer should not be dropped. See IReferenceCounted::drop() for more information.
-		virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(s32 id=-1,
-			bool zfailmethod=true, f32 infinity=10000.0f) = 0;
+		//! Creates shadow volume scene node as child of this node.
+		/** The shadow can be rendered using the ZPass or the zfail
+		method. ZPass is a little bit faster because the shadow volume
+		creation is easier, but with this method there occur ugly
+		looking artifacs when the camera is inside the shadow volume.
+		These error do not occur with the ZFail method.
+		\param shadowMesh: Optional custom mesh for shadow volume.
+		\param id: Id of the shadow scene node. This id can be used to
+		identify the node later.
+		\param zfailmethod: If set to true, the shadow will use the
+		zfail method, if not, zpass is used.
+		\param infinity: Value used by the shadow volume algorithm to
+		scale the shadow volume.
+		\return Pointer to the created shadow scene node. This pointer
+		should not be dropped. See IReferenceCounted::drop() for more
+		information. */
+		virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh=0,
+			s32 id=-1, bool zfailmethod=true, f32 infinity=10000.0f) = 0;
 
 
-		//! Returns a pointer to a joint in the mesh (if the mesh is a bone based mesh)
-		//! With this method it is possible to attach scene nodes to joints
-		//! for example possible to attach a weapon to the left hand of an
-		//! animated model. This example shows how:
-		//! \code
-		//! ISceneNode* hand =
-		//!		yourAnimatedMeshSceneNode->getJointNode("LeftHand");
-		//! hand->addChild(weaponSceneNode);
-		//! \endcode
-		//! Please note that the joint returned by this method may not exist
-		//! before this call and the joints in the node were created by it.
-		//! \param jointName: Name of the joint.
-		//! \return Returns a pointer to the scene node which represents the joint
-		//! with the specified name. Returns 0 if the contained mesh is not an
-		//! skinned mesh or the name of the joint could not be found.
+		//! Get a pointer to a joint in the mesh (if the mesh is a bone based mesh).
+		/** With this method it is possible to attach scene nodes to
+		joints for example possible to attach a weapon to the left hand
+		of an animated model. This example shows how:
+		\code
+		ISceneNode* hand =
+			yourAnimatedMeshSceneNode->getJointNode("LeftHand");
+		hand->addChild(weaponSceneNode);
+		\endcode
+		Please note that the joint returned by this method may not exist
+		before this call and the joints in the node were created by it.
+		\param jointName: Name of the joint.
+		\return Pointer to the scene node which represents the joint
+		with the specified name. Returns 0 if the contained mesh is not
+		an skinned mesh or the name of the joint could not be found. */
 		virtual IBoneSceneNode* getJointNode(const c8* jointName)=0;
 
 		//! same as getJointNode(const c8* jointName), but based on id
 		virtual IBoneSceneNode* getJointNode(u32 jointID) = 0;
 
-		//! Redundant command, please use getJointNode (only for backwards compatibility)
+		//! Gets joint count.
+		/** \return Amount of joints in the mesh. */
+		virtual u32 getJointCount() const = 0;
+
+		//! Deprecated command, please use getJointNode
 		virtual ISceneNode* getMS3DJointNode(const c8* jointName) = 0;
 
-		//! Redundant command, please use getJointNode (only for backwards compatibility)
+		//! Deprecated command, please use getJointNode
 		virtual ISceneNode* getXJointNode(const c8* jointName) = 0;
 
 		//! Starts a default MD2 animation.
-		//! With this method it is easily possible to start a Run, Attack,
-		//! Die or whatever animation, if the mesh contained in this scene
-		//! node is an md2 mesh. Otherwise, nothing happens.
-		//! \param anim: An MD2 animation type, which should be played, for
-		//! example EMAT_STAND for the standing animation.
-		//! \return Returns true if successful, and false if not, for example
-		//! if the mesh in the scene node is not a md2 mesh.
+		/** With this method it is easily possible to start a Run,
+		Attack, Die or whatever animation, if the mesh contained in
+		this scene node is an md2 mesh. Otherwise, nothing happens.
+		\param anim: An MD2 animation type, which should be played, for
+		example EMAT_STAND for the standing animation.
+		\return True if successful, and false if not, for example if
+		the mesh in the scene node is not a md2 mesh. */
 		virtual bool setMD2Animation(EMD2_ANIMATION_TYPE anim) = 0;
 
 		//! Starts a special MD2 animation.
-		//! With this method it is easily possible to start a Run, Attack,
-		//! Die or whatever animation, if the mesh contained in this scene
-		//! node is an md2 mesh. Otherwise, nothing happens. This method uses
-		//! a character string to identify the animation. If the animation is a
-		//! standard md2 animation, you might want to start this animation
-		//! with the EMD2_ANIMATION_TYPE enumeration instead.
-		//! \param animationName: Name of the animation which should be played.
-		//! \return Returns true if successful, and false if not, for example
-		//! if the mesh in the scene node is not an md2 mesh, or no animation
-		//! with this name could be found.
+		/** With this method it is easily possible to start a Run,
+		Attack, Die or whatever animation, if the mesh contained in
+		this scene node is an md2 mesh. Otherwise, nothing happens.
+		This method uses a character string to identify the animation.
+		If the animation is a standard md2 animation, you might want to
+		start this animation with the EMD2_ANIMATION_TYPE enumeration
+		instead.
+		\param animationName: Name of the animation which should be
+		played.
+		\return Returns true if successful, and false if not, for
+		example if the mesh in the scene node is not an md2 mesh, or no
+		animation with this name could be found. */
 		virtual bool setMD2Animation(const c8* animationName) = 0;
 
 		//! Returns the current displayed frame number.
@@ -161,19 +167,20 @@ namespace scene
 		//! Returns the current end frame number.
 		virtual s32 getEndFrame() const = 0;
 
-		//! Sets looping mode which is on by default. If set to false,
-		//! animations will not be played looped.
+		//! Sets looping mode which is on by default.
+		/** If set to false, animations will not be played looped. */
 		virtual void setLoopMode(bool playAnimationLooped) = 0;
 
-		//! Sets a callback interface which will be called if an animation
-		//! playback has ended. Set this to 0 to disable the callback again.
-		//! Please note that this will only be called when in non looped mode,
-		//! see IAnimatedMeshSceneNode::setLoopMode().
+		//! Sets a callback interface which will be called if an animation playback has ended.
+		/** Set this to 0 to disable the callback again.
+		Please note that this will only be called when in non looped
+		mode, see IAnimatedMeshSceneNode::setLoopMode(). */
 		virtual void setAnimationEndCallback(IAnimationEndCallBack* callback=0) = 0;
 
 		//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
-		/* In this way it is possible to change the materials a mesh causing all mesh scene nodes
-		referencing this mesh to change too. */
+		/* In this way it is possible to change the materials a mesh
+		causing all mesh scene nodes referencing this mesh to change
+		too. */
 		virtual void setReadOnlyMaterials(bool readonly) = 0;
 
 		//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
@@ -185,25 +192,32 @@ namespace scene
 		//! Returns the current mesh
 		virtual IAnimatedMesh* getMesh(void) = 0;
 
-		//! returns the absolute transformation for a special MD3 Tag if the mesh is a md3 mesh,
-		//! or the absolutetransformation if it's a normal scenenode
+		//! Get the absolute transformation for a special MD3 Tag if the mesh is a md3 mesh, or the absolutetransformation if it's a normal scenenode
 		virtual const SMD3QuaterionTag& getMD3TagTransformation( const core::stringc & tagname) = 0;
 
 		//! Set how the joints should be updated on render
-		//! 0-do nothing
-		//! 1-get joints positions from the mesh (for attached nodes, etc)
-		//! 2-control joint positions in the mesh (eg. ragdolls, or set the animation from animateJoints() )
 		virtual void setJointMode(E_JOINT_UPDATE_ON_RENDER mode)=0;
 
-		//! Sets the transition time in seconds (note: This needs to enable joints, and setJointmode maybe set to 2)
-		//! you must call animateJoints(), or the mesh will not ani\mate
+		//! Sets the transition time in seconds
+		/** Note: This needs to enable joints, and setJointmode set to
+		EJUOR_CONTROL. You must call animateJoints(), or the mesh will
+		not animate. */
 		virtual void setTransitionTime(f32 Time) =0;
 
-		//! animates the joints in the mesh based on the current frame (also takes in to account transitions)
+		//! animates the joints in the mesh based on the current frame.
+		/** Also takes in to account transitions. */
 		virtual void animateJoints(bool CalculateAbsolutePositions=true) = 0;
 
-		//! render mesh ignoring it's transformation. Used with ragdolls. (culling is unaffected)
+		//! render mesh ignoring its transformation.
+		/** Used with ragdolls. Culling is unaffected. */
 		virtual void setRenderFromIdentity( bool On )=0;
+
+		//! Creates a clone of this scene node and its children.
+		/** \param newParent An optional new parent.
+		\param newManager An optional new scene manager.
+		\return The newly created clone of this node. */
+		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) = 0;
+
 	};
 
 } // end namespace scene
diff --git a/src/dep/include/irrlicht/IAttributeExchangingObject.h b/src/dep/include/irrlicht/IAttributeExchangingObject.h
index 534cc74..0f90e9f 100644
--- a/src/dep/include/irrlicht/IAttributeExchangingObject.h
+++ b/src/dep/include/irrlicht/IAttributeExchangingObject.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,7 +16,7 @@ namespace io
 
 class IAttributes;
 
-//! Enumation flags passed through SAttributeReadWriteOptions to the IAttributeExchangingObject object
+//! Enumeration flags passed through SAttributeReadWriteOptions to the IAttributeExchangingObject object
 enum E_ATTRIBUTE_READ_WRITE_FLAGS
 {
 	//! Serialization/Deserializion is done for an xml file
@@ -30,36 +30,36 @@ enum E_ATTRIBUTE_READ_WRITE_FLAGS
 };
 
 
-//! struct holding data describing options 
+//! struct holding data describing options
 struct SAttributeReadWriteOptions
 {
-	//! constructor
+	//! Constructor
 	SAttributeReadWriteOptions()
 		: Flags(0), Filename(0)
 	{
 	}
 
 	//! Combination of E_ATTRIBUTE_READ_WRITE_FLAGS or other, custom ones
-	s32 Flags; 
+	s32 Flags;
 
-	//! optional filename
+	//! Optional filename
 	const c8* Filename;
 };
 
 
 //! An object which is able to serialize and deserialize its attributes into an attributes object
-class IAttributeExchangingObject : public virtual IReferenceCounted
+class IAttributeExchangingObject : virtual public IReferenceCounted
 {
 public:
 
 	//! Writes attributes of the object.
-	//! Implement this to expose the attributes of your scene node animator for 
-	//! scripting languages, editors, debuggers or xml serialization purposes.
+	/** Implement this to expose the attributes of your scene node animator for
+	scripting languages, editors, debuggers or xml serialization purposes. */
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const {}
 
 	//! Reads attributes of the object.
-	//! Implement this to set the attributes of your scene node animator for 
-	//! scripting languages, editors, debuggers or xml deserialization purposes.
+	/** Implement this to set the attributes of your scene node animator for
+	scripting languages, editors, debuggers or xml deserialization purposes. */
 	virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) {}
 
 };
diff --git a/src/dep/include/irrlicht/IAttributes.h b/src/dep/include/irrlicht/IAttributes.h
index 96baf28..b0a616f 100644
--- a/src/dep/include/irrlicht/IAttributes.h
+++ b/src/dep/include/irrlicht/IAttributes.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -124,7 +124,7 @@ public:
 	//! Returns amount of attributes in this collection of attributes.
 	virtual u32 getAttributeCount() const = 0;
 
-	//! Returns attribute name by index. 
+	//! Returns attribute name by index.
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
 	virtual const c8* getAttributeName(s32 index) = 0;
 
@@ -132,7 +132,7 @@ public:
 	//! \param attributeName: Name for the attribute
 	virtual E_ATTRIBUTE_TYPE getAttributeType(const c8* attributeName) = 0;
 
-	//! Returns attribute type by index. 
+	//! Returns attribute type by index.
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
 	virtual E_ATTRIBUTE_TYPE getAttributeType(s32 index) = 0;
 
@@ -140,7 +140,7 @@ public:
 	//! \param attributeName: String for the attribute type
 	virtual const wchar_t* getAttributeTypeString(const c8* attributeName) = 0;
 
-	//! Returns the type string of the attribute by index. 
+	//! Returns the type string of the attribute by index.
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
 	virtual const wchar_t* getAttributeTypeString(s32 index) = 0;
 
@@ -154,9 +154,10 @@ public:
 	virtual void clear() = 0;
 
 	//! Reads attributes from a xml file.
-	//! \param readCurrentElementOnly: If set to true, reading only works if current element has the name 'attributes' or 
+	//! \param reader The XML reader to read from
+	//! \param readCurrentElementOnly If set to true, reading only works if current element has the name 'attributes' or
 	//! the name specified using elementName.
-	//! \param elementName: The surrounding element name. If it is null, the default one, "attributes" will be taken.
+	//! \param elementName The surrounding element name. If it is null, the default one, "attributes" will be taken.
 	//! If set to false, the first appearing list of attributes are read.
 	virtual bool read(io::IXMLReader* reader, bool readCurrentElementOnly=false, const wchar_t* elementName=0) = 0;
 
@@ -224,28 +225,29 @@ public:
 	//! Adds an attribute as string
 	virtual void addString(const c8* attributeName, const c8* value) = 0;
 
-	//! Sets an attribute value as string. 
+	//! Sets an attribute value as string.
 	//! \param attributeName: Name for the attribute
 	//! \param value: Value for the attribute. Set this to 0 to delete the attribute
 	virtual void setAttribute(const c8* attributeName, const c8* value) = 0;
 
 	//! Gets an attribute as string.
 	//! \param attributeName: Name of the attribute to get.
-	//! \return Returns value of the attribute previously set by setAttribute() 
+	//! \return Returns value of the attribute previously set by setAttribute()
 	//! or 0 if attribute is not set.
 	virtual core::stringc getAttributeAsString(const c8* attributeName) = 0;
 
 	//! Gets an attribute as string.
-	//! \param attributeName: Name of the attribute to get.
-	//! \param target: Buffer where the string is copied to.
+	//! \param attributeName Name of the attribute to get.
+	//! \param target Buffer where the string is copied to.
 	virtual void getAttributeAsString(const c8* attributeName, c8* target) = 0;
 
-	//! Returns attribute value as string by index. 
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	//! Returns attribute value as string by index.
+	//! \param index Index value, must be between 0 and getAttributeCount()-1.
 	virtual core::stringc getAttributeAsString(s32 index) = 0;
 
-	//! Sets an attribute value as string. 
-	//! \param attributeName: Name for the attribute
+	//! Sets an attribute value as string.
+	//! \param index Index value, must be between 0 and getAttributeCount()-1.
+	//! \param value String to which the attribute is set.
 	virtual void setAttribute(s32 index, const c8* value) = 0;
 
 	// wide strings
@@ -253,14 +255,14 @@ public:
 	//! Adds an attribute as string
 	virtual void addString(const c8* attributeName, const wchar_t* value) = 0;
 
-	//! Sets an attribute value as string. 
+	//! Sets an attribute value as string.
 	//! \param attributeName: Name for the attribute
 	//! \param value: Value for the attribute. Set this to 0 to delete the attribute
 	virtual void setAttribute(const c8* attributeName, const wchar_t* value) = 0;
 
 	//! Gets an attribute as string.
 	//! \param attributeName: Name of the attribute to get.
-	//! \return Returns value of the attribute previously set by setAttribute() 
+	//! \return Returns value of the attribute previously set by setAttribute()
 	//! or 0 if attribute is not set.
 	virtual core::stringw getAttributeAsStringW(const c8* attributeName) = 0;
 
@@ -269,12 +271,13 @@ public:
 	//! \param target: Buffer where the string is copied to.
 	virtual void getAttributeAsStringW(const c8* attributeName, wchar_t* target) = 0;
 
-	//! Returns attribute value as string by index. 
+	//! Returns attribute value as string by index.
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
 	virtual core::stringw getAttributeAsStringW(s32 index) = 0;
 
-	//! Sets an attribute value as string. 
-	//! \param attributeName: Name for the attribute
+	//! Sets an attribute value as string.
+	//! \param index Index value, must be between 0 and getAttributeCount()-1.
+	//! \param value String to which the attribute is set.
 	virtual void setAttribute(s32 index, const wchar_t* value) = 0;
 
 	/*
@@ -290,11 +293,17 @@ public:
 	virtual void setAttribute(const c8* attributeName, void* data, s32 dataSizeInBytes ) = 0;
 
 	//! Gets an attribute as binary data
-	//! \param attributeName: Name of the attribute to get.
+	/** \param attributeName: Name of the attribute to get.
+	\param outData Pointer to buffer where data shall be stored.
+	\param maxSizeInBytes Maximum number of bytes to write into outData.
+	*/
 	virtual void getAttributeAsBinaryData(const c8* attributeName, void* outData, s32 maxSizeInBytes) = 0;
 
 	//! Gets an attribute as binary data
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	/** \param index: Index value, must be between 0 and getAttributeCount()-1.
+	\param outData Pointer to buffer where data shall be stored.
+	\param maxSizeInBytes Maximum number of bytes to write into outData.
+	*/
 	virtual void getAttributeAsBinaryData(s32 index, void* outData, s32 maxSizeInBytes) = 0;
 
 	//! Sets an attribute as binary data
@@ -302,26 +311,24 @@ public:
 
 
 	/*
-
 		Array Attribute
-
 	*/
 
 	//! Adds an attribute as wide string array
 	virtual void addArray(const c8* attributeName, core::array<core::stringw> value) = 0;
 
-	//! Sets an attribute value as a wide string array. 
+	//! Sets an attribute value as a wide string array.
 	//! \param attributeName: Name for the attribute
 	//! \param value: Value for the attribute. Set this to 0 to delete the attribute
 	virtual void setAttribute(const c8* attributeName, const core::array<core::stringw> value) = 0;
 
 	//! Gets an attribute as an array of wide strings.
 	//! \param attributeName: Name of the attribute to get.
-	//! \return Returns value of the attribute previously set by setAttribute() 
+	//! \return Returns value of the attribute previously set by setAttribute()
 	//! or 0 if attribute is not set.
 	virtual core::array<core::stringw> getAttributeAsArray(const c8* attributeName) = 0;
 
-	//! Returns attribute value as an array of wide strings by index. 
+	//! Returns attribute value as an array of wide strings by index.
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
 	virtual core::array<core::stringw> getAttributeAsArray(s32 index) = 0;
 
@@ -343,7 +350,7 @@ public:
 
 	//! Gets an attribute as boolean value
 	//! \param attributeName: Name of the attribute to get.
-	//! \return Returns value of the attribute previously set by setAttribute() 
+	//! \return Returns value of the attribute previously set by setAttribute()
 	virtual bool getAttributeAsBool(const c8* attributeName) = 0;
 
 	//! Gets an attribute as boolean value
@@ -374,27 +381,37 @@ public:
 	virtual const c8* getAttributeAsEnumeration(const c8* attributeName) = 0;
 
 	//! Gets an attribute as enumeration
-	//! \param attributeName: Name of the attribute to get.
-	//! \param enumerationLiteralsToUse: Use these enumeration literals to get the index value instead of the set ones.
-	//! This is useful when the attribute list maybe was read from an xml file, and only contains the enumeration string, but
-	//! no information about its index.
-	//! \return Returns value of the attribute previously set by setAttribute()
+	/** \param attributeName: Name of the attribute to get.
+	\param enumerationLiteralsToUse: Use these enumeration literals to get
+	the index value instead of the set ones. This is useful when the
+	attribute list maybe was read from an xml file, and only contains the
+	enumeration string, but no information about its index.
+	\return Returns value of the attribute previously set by setAttribute()
+	*/
 	virtual s32 getAttributeAsEnumeration(const c8* attributeName, const c8* const* enumerationLiteralsToUse) = 0;
 
 	//! Gets an attribute as enumeration
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	/** \param index: Index value, must be between 0 and getAttributeCount()-1.
+	\param enumerationLiteralsToUse: Use these enumeration literals to get
+	the index value instead of the set ones. This is useful when the
+	attribute list maybe was read from an xml file, and only contains the
+	enumeration string, but no information about its index.
+	\return Returns value of the attribute previously set by setAttribute()
+	*/
 	virtual s32 getAttributeAsEnumeration(s32 index, const c8* const* enumerationLiteralsToUse) = 0;
 
 	//! Gets an attribute as enumeration
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
 	virtual const c8* getAttributeAsEnumeration(s32 index) = 0;
 
-	//! Gets the list of enumeration literals of an enumeration attribute 
-	//! \param attributeName: Name of the attribute to get.
+	//! Gets the list of enumeration literals of an enumeration attribute
+	//! \param attributeName Name of the attribute to get.
+	//! \param outLiterals Set of strings to choose the enum name from.
 	virtual void getAttributeEnumerationLiteralsOfEnumeration(const c8* attributeName, core::array<core::stringc>& outLiterals) = 0;
 
-	//! Gets the list of enumeration literals of an enumeration attribute 
+	//! Gets the list of enumeration literals of an enumeration attribute
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	//! \param outLiterals Set of strings to choose the enum name from.
 	virtual void getAttributeEnumerationLiteralsOfEnumeration(s32 index, core::array<core::stringc>& outLiterals) = 0;
 
 	//! Sets an attribute as enumeration
@@ -471,7 +488,7 @@ public:
 	//! Gets an attribute as 3d vector
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
 	virtual core::vector3df getAttributeAsVector3d(s32 index) = 0;
-	
+
 	//! Sets an attribute as vector
 	virtual void setAttribute(s32 index, core::vector3df v) = 0;
 
@@ -525,10 +542,8 @@ public:
 
 
 	/*
-
 		matrix attribute
-
-	*/ 
+	*/
 
 	//! Adds an attribute as matrix
 	virtual void addMatrix(const c8* attributeName, const core::matrix4& v) = 0;
diff --git a/src/dep/include/irrlicht/IBillboardSceneNode.h b/src/dep/include/irrlicht/IBillboardSceneNode.h
index 80cd37a..1948fe7 100644
--- a/src/dep/include/irrlicht/IBillboardSceneNode.h
+++ b/src/dep/include/irrlicht/IBillboardSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,8 +21,8 @@ class IBillboardSceneNode : public ISceneNode
 {
 public:
 
-	//! constructor
-	IBillboardSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id, 
+	//! Constructor
+	IBillboardSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
 		const core::vector3df& position = core::vector3df(0,0,0))
 		: ISceneNode(parent, mgr, id, position) {}
 
@@ -33,19 +33,18 @@ public:
 	virtual const core::dimension2d<f32>& getSize() const = 0;
 
 	//! Set the color of all vertices of the billboard
-	//! \param overallColor: the color to set
+	/** \param overallColor: the color to set */
 	virtual void setColor(const video::SColor & overallColor) = 0;
 
 	//! Set the color of the top and bottom vertices of the billboard
-	//! \param topColor: the color to set the top vertices
-	//! \param bottomColor: the color to set the bottom vertices
+	/** \param topColor: the color to set the top vertices
+	\param bottomColor: the color to set the bottom vertices */
 	virtual void setColor(const video::SColor & topColor, const video::SColor & bottomColor) = 0;
 
 	//! Gets the color of the top and bottom vertices of the billboard
-	//! \param topColor: stores the color of the top vertices
-	//! \param bottomColor: stores the color of the bottom vertices
+	/** \param topColor: stores the color of the top vertices
+	\param bottomColor: stores the color of the bottom vertices */
 	virtual void getColor(video::SColor & topColor, video::SColor & bottomColor) const = 0;
-
 };
 
 } // end namespace scene
diff --git a/src/dep/include/irrlicht/IBoneSceneNode.h b/src/dep/include/irrlicht/IBoneSceneNode.h
index f840e1c..2fa0b50 100644
--- a/src/dep/include/irrlicht/IBoneSceneNode.h
+++ b/src/dep/include/irrlicht/IBoneSceneNode.h
@@ -1,8 +1,10 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
 #ifndef __I_BONE_SCENE_NODE_H_INCLUDED__
 #define __I_BONE_SCENE_NODE_H_INCLUDED__
 
-// Used with ISkinnedMesh and IAnimatedMeshSceneNode, for boned meshes
-
 #include "ISceneNode.h"
 
 namespace irr
@@ -16,8 +18,7 @@ namespace scene
 		//! The bone is usually animated, unless it's parent is not animated
 		EBAM_AUTOMATIC=0,
 
-		//! The bone is animated by the skin, if it's parent is not animated
-		//! then animation will resume from this bone onward
+		//! The bone is animated by the skin, if it's parent is not animated then animation will resume from this bone onward
 		EBAM_ANIMATED,
 
 		//! The bone is not animated by the skin
@@ -49,47 +50,51 @@ namespace scene
 	};
 
 
+	//! Interface for bones used for skeletal animation.
+	/** Used with ISkinnedMesh and IAnimatedMeshSceneNode. */
 	class IBoneSceneNode : public ISceneNode
 	{
 	public:
 
 		IBoneSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id=-1) :
-		  ISceneNode(parent, mgr, id),positionHint(-1),scaleHint(-1),rotationHint(-1) { }
+			ISceneNode(parent, mgr, id),positionHint(-1),scaleHint(-1),rotationHint(-1) { }
 
-		//! Returns the name of the bone
-		virtual const c8* getBoneName() const = 0;
+		//! Get the name of the bone
+		/** \deprecated Use getName instead. */
+		virtual const c8* getBoneName() const { return getName(); }
 
-		//! Returns the index of the bone
+		//! Get the index of the bone
 		virtual u32 getBoneIndex() const = 0;
 
-		//! Sets the animation mode of the bone. Returns true if successful. (Unused)
+		//! Sets the animation mode of the bone.
+		/** \return True if successful. (Unused) */
 		virtual bool setAnimationMode(E_BONE_ANIMATION_MODE mode) = 0;
 
 		//! Gets the current animation mode of the bone
 		virtual E_BONE_ANIMATION_MODE getAnimationMode() const = 0;
 
-		//! returns the axis aligned bounding box of this node
+		//! Get the axis aligned bounding box of this node
 		virtual const core::aabbox3d<f32>& getBoundingBox() const = 0;
 
 		//! Returns the relative transformation of the scene node.
 		//virtual core::matrix4 getRelativeTransformation() const = 0;
 
+		//! The animation method.
 		virtual void OnAnimate(u32 timeMs) =0;
 
-		//! Does nothing as bones are not visible
+		//! The render method.
+		/** Does nothing as bones are not visible. */
 		virtual void render() { }
 
 		//! How the relative transformation of the bone is used
 		virtual void setSkinningSpace( E_BONE_SKINNING_SPACE space ) =0;
 
 		//! How the relative transformation of the bone is used
-		virtual E_BONE_SKINNING_SPACE getSkinningSpace() =0;
+		virtual E_BONE_SKINNING_SPACE getSkinningSpace() const =0;
 
-		//! updates the absolute position based on the relative and the parents position
+		//! Updates the absolute position based on the relative and the parents position
 		virtual void updateAbsolutePositionOfAllChildren()=0;
 
-
-
 		s32 positionHint;
 		s32 scaleHint;
 		s32 rotationHint;
diff --git a/src/dep/include/irrlicht/ICameraSceneNode.h b/src/dep/include/irrlicht/ICameraSceneNode.h
index 8db1418..c2f151c 100644
--- a/src/dep/include/irrlicht/ICameraSceneNode.h
+++ b/src/dep/include/irrlicht/ICameraSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,79 +15,93 @@ namespace scene
 	struct SViewFrustum;
 
 	//! Scene Node which is a (controlable) camera.
-	/** The whole scene will be
-	rendered from the cameras point of view. Because the ICameraScenNode
-	is a SceneNode, it can be attached to any other scene node, and will
-	follow its parents movement, rotation and so on.
+	/** The whole scene will be rendered from the cameras point of view.
+	Because the ICameraScenNode is a SceneNode, it can be attached to any
+	other scene node, and will follow its parents movement, rotation and so
+	on.
 	*/
 	class ICameraSceneNode : public ISceneNode, public IEventReceiver
 	{
 	public:
 
 		//! Constructor
-		ICameraSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id, 
+		ICameraSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
 			const core::vector3df& position = core::vector3df(0,0,0),
 			const core::vector3df& rotation = core::vector3df(0,0,0),
 			const core::vector3df& scale = core::vector3df(1.0f,1.0f,1.0f))
 			: ISceneNode(parent, mgr, id, position, rotation, scale), IsOrthogonal(false) {}
 
-		//! Destructor
-		virtual ~ICameraSceneNode() {}
-
-		//! Sets the projection matrix of the camera. 
-		/** The core::matrix4 class has some methods
-		to build a projection matrix. e.g: core::matrix4::buildProjectionMatrixPerspectiveFovLH.
-		Note that the matrix will only stay as set by this method until one of 
-		the following Methods are called: setNearValue, setFarValue, setAspectRatio, setFOV.
-		\param projection: The new projection matrix of the camera.  */
-		virtual void setProjectionMatrix(const core::matrix4& projection) = 0;
+		//! Sets the projection matrix of the camera.
+		/** The core::matrix4 class has some methods to build a
+		projection matrix. e.g:
+		core::matrix4::buildProjectionMatrixPerspectiveFovLH.
+		Note that the matrix will only stay as set by this method until
+		one of the following Methods are called: setNearValue,
+		setFarValue, setAspectRatio, setFOV.
+		\param projection The new projection matrix of the camera.
+		\param isOrthogonal Set this to true if the matrix is an
+		orthogonal one (e.g. from matrix4::buildProjectionMatrixOrtho).
+		*/
+		virtual void setProjectionMatrix(const core::matrix4& projection, bool isOrthogonal = false) = 0;
 
 		//! Gets the current projection matrix of the camera.
-		/** \return Returns the current projection matrix of the camera. */
+		/** \return The current projection matrix of the camera. */
 		virtual const core::matrix4& getProjectionMatrix() const = 0;
 
 		//! Gets the current view matrix of the camera.
-		/** \return Returns the current view matrix of the camera. */
+		/** \return The current view matrix of the camera. */
 		virtual const core::matrix4& getViewMatrix() const = 0;
 
 		//! It is possible to send mouse and key events to the camera.
-		/** Most cameras
-		may ignore this input, but camera scene nodes which are created for 
-		example with ISceneManager::addMayaCameraSceneNode or
-		ISceneManager::addMeshViewerCameraSceneNode, may want to get this input
-		for changing their position, look at target or whatever.  */
+		/** Most cameras may ignore this input, but camera scene nodes
+		which are created for example with
+		ISceneManager::addCameraSceneNodeMaya or
+		ISceneManager::addCameraSceneNodeFPS, may want to get
+		this input for changing their position, look at target or
+		whatever. */
 		virtual bool OnEvent(const SEvent& event) = 0;
 
 		//! Sets the look at target of the camera
-		/** \param pos: Look at target of the camera. */
+		/** If the camera's target and rotation are bound ( @see
+		bindTargetAndRotation() ) then calling this will also change
+		the camera's scene node rotation to match the target.
+		\param pos Look at target of the camera, in world co-ordinates. */
 		virtual void setTarget(const core::vector3df& pos) = 0;
 
+		//! Sets the rotation of the node.
+		/** This only modifies the relative rotation of the node.
+		If the camera's target and rotation are bound ( @see
+		bindTargetAndRotation() ) then calling this will also change
+		the camera's target to match the rotation.
+		\param rotation New rotation of the node in degrees. */
+		virtual void setRotation(const core::vector3df& rotation) = 0;
+
 		//! Gets the current look at target of the camera
-		/** \return Returns the current look at target of the camera */
-		virtual core::vector3df getTarget() const = 0;
+		/** \return The current look at target of the camera, in world co-ordinates */
+		virtual const core::vector3df& getTarget() const = 0;
 
 		//! Sets the up vector of the camera.
 		/** \param pos: New upvector of the camera. */
 		virtual void setUpVector(const core::vector3df& pos) = 0;
 
 		//! Gets the up vector of the camera.
-		/** \return Returns the up vector of the camera. */
-		virtual core::vector3df getUpVector() const = 0;
+		/** \return The up vector of the camera, in world space. */
+		virtual const core::vector3df& getUpVector() const = 0;
 
 		//! Gets the value of the near plane of the camera.
-		/** \return Returns the value of the near plane of the camera. */
+		/** \return The value of the near plane of the camera. */
 		virtual f32 getNearValue() const = 0;
 
 		//! Gets the value of the far plane of the camera.
-		/** \return Returns the value of the far plane of the camera. */
+		/** \return The value of the far plane of the camera. */
 		virtual f32 getFarValue() const = 0;
 
 		//! Gets the aspect ratio of the camera.
-		/** \return Returns the aspect ratio of the camera. */
+		/** \return The aspect ratio of the camera. */
 		virtual f32 getAspectRatio() const = 0;
 
 		//! Gets the field of view of the camera.
-		/** \return Returns the field of view of the camera in radiants. */
+		/** \return The field of view of the camera in radiants. */
 		virtual f32 getFOV() const = 0;
 
 		//! Sets the value of the near clipping plane. (default: 1.0f)
@@ -106,37 +120,42 @@ namespace scene
 		/** \param fovy: New field of view in radiants. */
 		virtual void setFOV(f32 fovy) = 0;
 
-		//! Returns the view frustum. 
+		//! Get the view frustum.
 		/** Needed sometimes by bspTree or LOD render nodes.
-		\return Returns the current view frustum. */
+		\return The current view frustum. */
 		virtual const SViewFrustum* getViewFrustum() const = 0;
 
 		//! Disables or enables the camera to get key or mouse inputs.
-		/** If this is set to true, the camera will respond to key inputs
-		 otherwise not. */
+		/** If this is set to true, the camera will respond to key
+		inputs otherwise not. */
 		virtual void setInputReceiverEnabled(bool enabled) = 0;
 
-		//! Returns if the input receiver of the camera is currently enabled.
+		//! Checks if the input receiver of the camera is currently enabled.
 		virtual bool isInputReceiverEnabled() const = 0;
 
-		//! Returns if a camera is orthogonal.
-		/** This setting does not change anything of the view or projection matrix. However
-		it influences how collision detection and picking is done with this camera. */
-		virtual bool isOrthogonal() const 
+		//! Checks if a camera is orthogonal.
+		virtual bool isOrthogonal() const
 		{
 			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 			return IsOrthogonal;
-		} 
-
-		//! Sets if this camera should return if it is orthogonal. 
-		/** This setting does not change anything of the view or projection matrix. However
-		it influences how collision detection and picking is done with this camera. */
-		void setIsOrthogonal( bool orthogonal )
-		{
-			IsOrthogonal = orthogonal;
 		}
 
-	private:
+		//! Binds the camera scene node's rotation to its target position and vice vera, or unbinds them.
+		/** When bound, calling setRotation() will update the camera's
+		target position to be along its +Z axis, and likewise calling
+		setTarget() will update its rotation so that its +Z axis will
+		point at the target point. FPS camera use this binding by
+		default; other cameras do not.
+		\param bound True to bind the camera's scene node rotation
+		and targetting, false to unbind them.
+		@see getTargetAndRotationBinding() */
+		virtual void bindTargetAndRotation(bool bound) = 0;
+
+		//! Queries if the camera scene node's rotation and its target position are bound together.
+		/** @see bindTargetAndRotation() */
+		virtual bool getTargetAndRotationBinding(void) const = 0;
+
+	protected:
 
 		bool IsOrthogonal;
 	};
diff --git a/src/dep/include/irrlicht/ICursorControl.h b/src/dep/include/irrlicht/ICursorControl.h
index f3dab3f..5e2b0d1 100644
--- a/src/dep/include/irrlicht/ICursorControl.h
+++ b/src/dep/include/irrlicht/ICursorControl.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -25,22 +25,24 @@ namespace gui
 		virtual void setVisible(bool visible) = 0;
 
 		//! Returns if the cursor is currently visible.
-		/** \return Returns true if the cursor is visible, false if not. */
+		/** \return True if the cursor is visible, false if not. */
 		virtual bool isVisible() const = 0;
 
-		/** Sets the new position of the cursor. The position must be
-		between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is 
+		//! Sets the new position of the cursor.
+		/** The position must be
+		between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
 		the top left corner and (1.0f, 1.0f) is the bottom right corner of the
-		render window. */
-		//! \param pos: New position of the cursor.
+		render window.
+		\param pos New position of the cursor. */
 		virtual void setPosition(const core::position2d<f32> &pos) = 0;
 
-		/** Sets the new position of the cursor. The position must be
-		between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is 
+		//! Sets the new position of the cursor.
+		/** The position must be
+		between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
 		the top left corner and (1.0f, 1.0f) is the bottom right corner of the
-		render window. */
-		//! \param x: New x-coord of the cursor.
-		//! \param y: New x-coord of the cursor.
+		render window.
+		\param x New x-coord of the cursor.
+		\param y New x-coord of the cursor. */
 		virtual void setPosition(f32 x, f32 y) = 0;
 
 		//! Sets the new position of the cursor.
@@ -48,8 +50,8 @@ namespace gui
 		virtual void setPosition(const core::position2d<s32> &pos) = 0;
 
 		//! Sets the new position of the cursor.
-		/** \param x: New x-coord of the cursor. The coordinates are pixel units. */
-		/** \param y: New y-coord of the cursor. The coordinates are pixel units. */
+		/** \param x New x-coord of the cursor. The coordinates are pixel units.
+		\param y New y-coord of the cursor. The coordinates are pixel units. */
 		virtual void setPosition(s32 x, s32 y) = 0;
 
 		//! Returns the current position of the mouse cursor.
@@ -59,16 +61,16 @@ namespace gui
 
 		//! Returns the current position of the mouse cursor.
 		/** \return Returns the current position of the cursor. The returned position
-		 is a value between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is 
-		 the top left corner and (1.0f, 1.0f) is the bottom right corner of the
-		 render window. */
+		is a value between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
+		the top left corner and (1.0f, 1.0f) is the bottom right corner of the
+		render window. */
 		virtual core::position2d<f32> getRelativePosition() = 0;
 
 		//! Sets an absolute reference rect for setting and retrieving the cursor position.
 		/** If this rect is set, the cursor position is not being calculated relative to
 		the rendering window but to this rect. You can set the rect pointer to 0 to disable
 		this feature again. This feature is useful when rendering into parts of foreign windows
-		for example in an editor. 
+		for example in an editor.
 		\param rect: A pointer to an reference rectangle or 0 to disable the reference rectangle.*/
 		virtual void setReferenceRect(core::rect<s32>* rect=0) = 0;
 	};
diff --git a/src/dep/include/irrlicht/IDummyTransformationSceneNode.h b/src/dep/include/irrlicht/IDummyTransformationSceneNode.h
index e5846a8..ce42da8 100644
--- a/src/dep/include/irrlicht/IDummyTransformationSceneNode.h
+++ b/src/dep/include/irrlicht/IDummyTransformationSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,7 +14,7 @@ namespace scene
 
 //! Dummy scene node for adding additional transformations to the scene graph.
 /** This scene node does not render itself, and does not respond to set/getPosition,
-set/getRotation and set/getScale. Its just a simple scene node that takes a 
+set/getRotation and set/getScale. Its just a simple scene node that takes a
 matrix as relative transformation, making it possible to insert any transformation
 anywhere into the scene graph.
 This scene node is for example used by the IAnimatedMeshSceneNode for emulating
@@ -24,13 +24,13 @@ class IDummyTransformationSceneNode : public ISceneNode
 {
 public:
 
-	//! constructor
+	//! Constructor
 	IDummyTransformationSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id)
 		: ISceneNode(parent, mgr, id) {}
 
 	//! Returns a reference to the current relative transformation matrix.
-	//! This is the matrix, this scene node uses instead of scale, translation
-	//! and rotation.
+	/** This is the matrix, this scene node uses instead of scale, translation
+	and rotation. */
 	virtual core::matrix4& getRelativeTransformationMatrix() = 0;
 };
 
diff --git a/src/dep/include/irrlicht/IEventReceiver.h b/src/dep/include/irrlicht/IEventReceiver.h
index fce37f9..3eb1547 100644
--- a/src/dep/include/irrlicht/IEventReceiver.h
+++ b/src/dep/include/irrlicht/IEventReceiver.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -8,6 +8,7 @@
 #include "ILogger.h"
 #include "position2d.h"
 #include "Keycodes.h"
+#include "irrString.h"
 
 namespace irr
 {
@@ -16,32 +17,58 @@ namespace irr
 	{
 		//! An event of the graphical user interface.
 		/** GUI events are created by the GUI environment or the GUI elements in response
-		to mouse or keyboard events. When a GUI element receives an event it will either 
+		to mouse or keyboard events. When a GUI element receives an event it will either
 		process it and return true, or pass the event to its parent. If an event is not absorbed
 		before it reaches the root element then it will then be passed to the user receiver. */
 		EET_GUI_EVENT = 0,
 
 		//! A mouse input event.
-		/** Mouse events are created by the device and passed to IrrlichtDevice::postEventFromUser 
-		in response to mouse input received from the operating system. 
-		Mouse events are first passed to the user receiver, then to the GUI environment (and possibly
-		many GUI elements), then finally the input receiving scene manager (and possibly the active
-		camera) */
+		/** Mouse events are created by the device and passed to IrrlichtDevice::postEventFromUser
+		in response to mouse input received from the operating system.
+		Mouse events are first passed to the user receiver, then to the GUI environment and its elements,
+		then finally the input receiving scene manager where it is passed to the active camera.
+		*/
 		EET_MOUSE_INPUT_EVENT,
 
-		//! A key input evant.
-		/** Keyboard events are also created by the device and passed to IrrlichtDevice::postEventFromUser.
-		They take the same path as mouse events. */
+		//! A key input event.
+		/** Like mouse events, keyboard events are created by the device and passed to 
+		IrrlichtDevice::postEventFromUser. They take the same path as mouse events. */
 		EET_KEY_INPUT_EVENT,
 
+		//! A joystick (joypad, gamepad) input event.
+		/** Joystick events are created by polling all connected joysticks once per
+		device run() and then passing the events to IrrlichtDevice::postEventFromUser.
+		They take the same path as mouse events.
+		Windows, SDL: Implemented.
+		Linux: Implemented, with POV hat issues.
+		MacOS / Other: Not yet implemented.
+		*/
+		EET_JOYSTICK_INPUT_EVENT, 
+
 		//! A log event
 		/** Log events are only passed to the user receiver if there is one. If they are absorbed by the
 		user receiver then no text will be sent to the console. */
 		EET_LOG_TEXT_EVENT,
 
-		//! A user event with user data. This is not used by Irrlicht and can be used
-		//! to send user specific data though the system.
-		EET_USER_EVENT
+		//! A user event with user data.
+		/** This is not used by Irrlicht and can be used to send user
+		specific data though the system. The Irrlicht 'window handle'
+		can be obtained from IrrlichtDevice::getExposedVideoData()
+		The usage and behaviour depends on the operating system:
+		Windows: send a WM_USER message to the Irrlicht Window; the
+			wParam and lParam will be used to populate the
+			UserData1 and UserData2 members of the SUserEvent.
+		Linux: send a ClientMessage via XSendEvent to the Irrlicht
+			Window; the data.l[0] and data.l[1] members will be
+			casted to s32 and used as UserData1 and UserData2.
+		MacOS: Not yet implemented
+		*/
+		EET_USER_EVENT,
+
+		//! This enum is never used, it only forces the compiler to
+		//! compile these enumeration values to 32 bit.
+		EGUIET_FORCE_32_BIT = 0x7fffffff
+
 	};
 
 	//! Enumeration for all mouse input events
@@ -68,7 +95,7 @@ namespace irr
 		//! The mouse cursor changed its position.
 		EMIE_MOUSE_MOVED,
 
-		//! The mouse wheel was moved. Use Wheel value in event data to find out 
+		//! The mouse wheel was moved. Use Wheel value in event data to find out
 		//! in what direction and how fast.
 		EMIE_MOUSE_WHEEL,
 
@@ -85,12 +112,12 @@ namespace irr
 		enum EGUI_EVENT_TYPE
 		{
 			//! A gui element has lost its focus.
-			//! GUIEvent.Caller is losing the focus to GUIEvent.Element. 
-			//! If the event is absorbed then the focus will not be changed.
+			/** GUIEvent.Caller is losing the focus to GUIEvent.Element.
+			If the event is absorbed then the focus will not be changed. */
 			EGET_ELEMENT_FOCUS_LOST = 0,
 
 			//! A gui element has got the focus.
-			//! If the event is absorbed then the focus will not be changed.
+			/** If the event is absorbed then the focus will not be changed. */
 			EGET_ELEMENT_FOCUSED,
 
 			//! The mouse cursor hovered over a gui element.
@@ -100,8 +127,8 @@ namespace irr
 			EGET_ELEMENT_LEFT,
 
 			//! An element would like to close.
-			//! Windows and context menus use this event when they would like to close,
-			//! this can be cancelled by absorbing the event.
+			/** Windows and context menus use this event when they would like to close,
+			this can be cancelled by absorbing the event. */
 			EGET_ELEMENT_CLOSED,
 
 			//! A button was clicked.
@@ -114,10 +141,10 @@ namespace irr
 			EGET_CHECKBOX_CHANGED,
 
 			//! A new item in a listbox was seleted.
-			EGET_LISTBOX_CHANGED, 
+			EGET_LISTBOX_CHANGED,
 
 			//! An item in the listbox was selected, which was already selected.
-			EGET_LISTBOX_SELECTED_AGAIN, 
+			EGET_LISTBOX_SELECTED_AGAIN,
 
 			//! A file has been selected in the file dialog
 			EGET_FILE_SELECTED,
@@ -150,7 +177,11 @@ namespace irr
 			EGET_COMBO_BOX_CHANGED,
 
 			//! The value of a spin box has changed
-			EGET_SPINBOX_CHANGED
+			EGET_SPINBOX_CHANGED,
+			//! A table has changed
+			EGET_TABLE_CHANGED,
+			EGET_TABLE_HEADER_CHANGED,
+			EGET_TABLE_SELECTED_AGAIN
 
 		};
 	} // end namespace gui
@@ -159,6 +190,7 @@ namespace irr
 //! SEvents hold information about an event. See irr::IEventReceiver for details on event handling.
 struct SEvent
 {
+	//! Any kind of GUI event.
 	struct SGUIEvent
 	{
 		//! IGUIElement who called the event
@@ -172,6 +204,7 @@ struct SEvent
 
 	};
 
+	//! Any kind of mouse event.
 	struct SMouseInput
 	{
 		//! X position of mouse cursor
@@ -182,49 +215,109 @@ struct SEvent
 
 		//! mouse wheel delta, usually 1.0 or -1.0.
 		/** Only valid if event was EMIE_MOUSE_WHEEL */
-		f32 Wheel; 
+		f32 Wheel;
 
-		//! type of mouse event
+		//! Type of mouse event
 		EMOUSE_INPUT_EVENT Event;
 	};
 
+	//! Any kind of keyboard event.
 	struct SKeyInput
 	{
 		//! Character corresponding to the key (0, if not a character)
-		wchar_t Char; 
+		wchar_t Char;
 
 		//! Key which has been pressed or released
-		EKEY_CODE Key; 
+		EKEY_CODE Key;
 
-		//! if not pressed, then the key was left up
-		bool PressedDown; 
+		//! If not true, then the key was left up
+		bool PressedDown;
 
-		//! true if shift was also pressed
-		bool Shift; 
+		//! True if shift was also pressed
+		bool Shift;
 
-		//! true if ctrl was also pressed
-		bool Control; 
+		//! True if ctrl was also pressed
+		bool Control;
 	};
 
+	//! A joystick event.
+	/** Unlike other events, joystick events represent the result of polling 
+	 * each connected joystick once per run() of the device. Joystick events will
+	 * not be generated by default.  If joystick support is available for the 
+	 * active device, _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ is defined, and 
+	 * @ref IrrlichtDevice::activateJoysticks() has been called, an event of 
+	 * this type will be generated once per joystick per @ref IrrlichtDevice::run() 
+	 * regardless of whether the state of the joystick has actually changed. */
+	struct SJoystickEvent
+	{
+		enum
+		{
+			NUMBER_OF_BUTTONS = 32,
+
+			AXIS_X = 0, // e.g. analog stick 1 left to right
+			AXIS_Y,		// e.g. analog stick 1 top to bottom
+			AXIS_Z,		// e.g. throttle, or analog 2 stick 2 left to right
+			AXIS_R,		// e.g. rudder, or analog 2 stick 2 top to bottom
+			AXIS_U,
+			AXIS_V,
+			NUMBER_OF_AXES
+		};
+
+		/** A bitmap of button states.  You can use IsButtonPressed() to
+		 ( check the state of each button from 0 to (NUMBER_OF_BUTTONS - 1) */
+		u32 ButtonStates;
+
+		/** For AXIS_X, AXIS_Y, AXIS_Z, AXIS_R, AXIS_U and AXIS_V
+		 * Values are in the range -32768 to 32767, with 0 representing
+		 * the center position.  You will receive the raw value from the 
+		 * joystick, and so will usually want to implement a dead zone around 
+		 * the center of the range. Axes not supported by this joystick will 
+		 * always have a value of 0. On Linux, POV hats are represented as axes, 
+		 * usually the last two active axis.
+		 */
+		s16 Axis[NUMBER_OF_AXES];
+
+		/** The POV represents the angle of the POV hat in degrees * 100, 
+		 * from 0 to 35,900.  A value of 65535 indicates that the POV hat 
+		 * is centered (or not present).
+		 * This value is only supported on Windows.  On Linux, the POV hat
+		 * will be sent as 2 axes instead. */
+		u16 POV;
+
+		//! The ID of the joystick which generated this event.
+		/** This is an internal Irrlicht index; it does not map directly
+		 * to any particular hardware joystick. */
+		u8 Joystick;
+
+		//! A helper function to check if a button is pressed.
+		bool IsButtonPressed(u32 button) const
+		{
+			if(button >= (u32)NUMBER_OF_BUTTONS)
+				return false;
+
+			return (ButtonStates & (1 << button)) ? true : false;
+		}
+	};
+ 
+
+	//! Any kind of log event.
 	struct SLogEvent
 	{
-		//! pointer to text which has been logged
+		//! Pointer to text which has been logged
 		const c8* Text;
 
-		//! log level in which the text has been logged
+		//! Log level in which the text has been logged
 		ELOG_LEVEL Level;
 	};
 
+	//! Any kind of user event.
 	struct SUserEvent
 	{
 		//! Some user specified data as int
-		s32 UserData1; 
+		s32 UserData1;
 
 		//! Another user specified data as int
-		s32 UserData2; 
-
-		//! Some user specified data as float
-		f32 UserData3; 
+		s32 UserData2;
 	};
 
 	EEVENT_TYPE EventType;
@@ -233,6 +326,7 @@ struct SEvent
 		struct SGUIEvent GUIEvent;
 		struct SMouseInput MouseInput;
 		struct SKeyInput KeyInput;
+		struct SJoystickEvent JoystickEvent;
 		struct SLogEvent LogEvent;
 		struct SUserEvent UserEvent;
 	};
@@ -240,23 +334,61 @@ struct SEvent
 };
 
 //! Interface of an object which can receive events.
-/** Many of the engine's classes inherit IEventReceiver so they are able to process events.
-Events usually start at a postEventFromUser function and are passed down through a chain of 
-event receivers until OnEvent returns true.
-See irr::EEVENT_TYPE for a description of where each type of event starts, and the path it takes
-through the system. */
+/** Many of the engine's classes inherit IEventReceiver so they are able to
+process events. Events usually start at a postEventFromUser function and are
+passed down through a chain of event receivers until OnEvent returns true. See
+irr::EEVENT_TYPE for a description of where each type of event starts, and the
+path it takes through the system. */
 class IEventReceiver
 {
 public:
 
+	//! Destructor
 	virtual ~IEventReceiver() {}
 
-	//! called if an event happened.
-	//! \return Returns true if the event was processed
+	//! Called if an event happened.
+	/** \return True if the event was processed. */
 	virtual bool OnEvent(const SEvent& event) = 0;
 };
 
 
+//! Information on a joystick, returned from @ref IrrlichtDevice::activateJoysticks()
+struct SJoystickInfo
+{
+	//! The ID of the joystick
+	/** This is an internal Irrlicht index; it does not map directly
+	 * to any particular hardware joystick. It corresponds to the 
+	 * irr::SJoystickEvent Joystick ID. */
+	u8				Joystick;
+
+	//! The name that the joystick uses to identify itself.
+	core::stringc	Name;
+
+	//! The number of buttons that the joystick has.
+	u32				Buttons;
+
+	//! The number of axes that the joystick has, i.e. X, Y, Z, R, U, V.
+	/** Note: with a Linux device, the POV hat (if any) will use two axes. These
+	 *  will be included in this count. */
+	u32				Axes;
+
+	//! An indication of whether the joystick has a POV hat.
+	/** A Windows device will identify the presence or absence or the POV hat.  A
+	 *  Linux device cannot, and will always return POV_HAT_UNKNOWN. */
+	enum
+	{
+		//! A hat is definitely present.
+		POV_HAT_PRESENT,
+
+		//! A hat is definitely not present.
+		POV_HAT_ABSENT,
+
+		//! The presence or absence of a hat cannot be determined.
+		POV_HAT_UNKNOWN
+	} PovHat;
+}; // struct SJoystickInfo
+
+
 } // end namespace irr
 
 #endif
diff --git a/src/dep/include/irrlicht/IFileList.h b/src/dep/include/irrlicht/IFileList.h
index 049ce1d..8a06f81 100644
--- a/src/dep/include/irrlicht/IFileList.h
+++ b/src/dep/include/irrlicht/IFileList.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,37 +16,27 @@ namespace io
 class IFileList : public virtual IReferenceCounted
 {
 public:
-
-	//! destructor
-	virtual ~IFileList() {}
-
-	//! Returns the amount of files in the filelist.
-	//! \return
-	//! Returns the amount of files and directories in the file list.
+	//! Get the number of files in the filelist.
+	/** \return Amount of files and directories in the file list. */
 	virtual u32 getFileCount() const = 0;
 
 	//! Gets the name of a file in the list, based on an index.
-	//! The path is not included in this name. Use getFullFileName for this.
-	//! \param index is the zero based index of the file which name should
-	//!   be returned. The index has to be smaller than the amount getFileCount() returns.
-	//! \return
-	//! Returns the file name of the file. Returns 0, if an error occured.
+	/** The path is not included in this name. Use getFullFileName for this.
+	\param index is the zero based index of the file which name should
+	be returned. The index has to be smaller than the amount getFileCount() returns.
+	\return File name of the file. Returns 0, if an error occured. */
 	virtual const c8* getFileName(u32 index) const = 0;
 
 	//! Gets the full name of a file in the list, path included, based on an index.
-	//! \param index is the zero based index of the file which name should
-	//!   be returned. The index has to be smaller than the amount getFileCount() returns.
-	//! \return
-	//! Returns the file name of the file. Returns 0, if an error occured.
+	/** \param index is the zero based index of the file which name should
+	be returned. The index has to be smaller than the amount getFileCount() returns.
+	\return File name of the file. Returns 0, if an error occured. */
 	virtual const c8* getFullFileName(u32 index) = 0;
 
-	//! Returns of the file is a directory
-	//! \param
-	//! index is the zero based index of the file which name should
-	//!   be returned. The index has to be smaller than the amount getFileCount() returns.
-	//! \return
-	//! Returns true, if the file is a directory, and false, if it is not.
-	//!  If an error occurs, the result is undefined.
+	//! Check if the file is a directory
+	/** \param index The zero based index of the file whose name shall
+	be returned. The index has to be smaller than the amount getFileCount() returns.
+	\return True if the file is a directory, else false. */
 	virtual bool isDirectory(u32 index) const = 0;
 };
 
diff --git a/src/dep/include/irrlicht/IFileSystem.h b/src/dep/include/irrlicht/IFileSystem.h
index a4ba2f3..3eecb21 100644
--- a/src/dep/include/irrlicht/IFileSystem.h
+++ b/src/dep/include/irrlicht/IFileSystem.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -25,19 +25,13 @@ class IXMLWriter;
 class IAttributes;
 
 //! The FileSystem manages files and archives and provides access to them.
-/**
-	It manages where files are, so that modules which
-	use the the IO do not need to know where every file is located. A file
-	could be in a .zip-Archive or as file on disk, using the IFileSystem
-	makes no difference to this.
-*/
+/** It manages where files are, so that modules which use the the IO do not
+need to know where every file is located. A file could be in a .zip-Archive or
+as file on disk, using the IFileSystem makes no difference to this. */
 class IFileSystem : public virtual IReferenceCounted
 {
 public:
 
-	//! destructor
-	virtual ~IFileSystem() {}
-
 	//! Opens a file for read access.
 	/** \param filename: Name of file to open.
 	\return Returns a pointer to the created file interface.
@@ -50,17 +44,17 @@ public:
 	\param memory: A pointer to the start of the file in memory
 	\param len: The length of the memory in bytes
 	\param fileName: The name given to this file
-	\param deleteMemoryWhenDropped: True if the memory should be deleted 
+	\param deleteMemoryWhenDropped: True if the memory should be deleted
 	along with the IReadFile when it is dropped.
 	\return Returns a pointer to the created file interface.
 	The returned pointer should be dropped when no longer needed.
-	See IReferenceCounted::drop() for more information. 
+	See IReferenceCounted::drop() for more information.
 	*/
 	virtual IReadFile* createMemoryReadFile(void* memory, s32 len, const c8* fileName, bool deleteMemoryWhenDropped=false) = 0;
 
 	//! Opens a file for write access.
 	/** \param filename: Name of file to open.
-	\param append: If the file already exist, all write operations are 
+	\param append: If the file already exist, all write operations are
 	appended to the file.
 	\return Returns a pointer to the created file interface. 0 is returned, if the
 	file could not created or opened for writing.
@@ -69,9 +63,9 @@ public:
 	virtual IWriteFile* createAndWriteFile(const c8* filename, bool append=false) = 0;
 
 	//! Adds an zip archive to the file system.
-	/** After calling this, the Irrlicht Engine will search and open files directly from this archive too. 
-	 This is useful for hiding data from the end user, speeding up file access and making it possible to
-	 access for example Quake3 .pk3 files, which are nothing different than .zip files.
+	/** After calling this, the Irrlicht Engine will search and open files directly from this archive too.
+	This is useful for hiding data from the end user, speeding up file access and making it possible to
+	access for example Quake3 .pk3 files, which are nothing different than .zip files.
 	\param filename: Filename of the zip archive to add to the file system.
 	\param ignoreCase: If set to true, files in the archive can be accessed without
 	writing all letters in the right case.
@@ -89,11 +83,11 @@ public:
 	without its complete path.
 	\return Returns true if the archive was added successful, false if not. */
 	virtual bool addFolderFileArchive(const c8* filename, bool ignoreCase = true, bool ignorePaths = true) = 0;
-	
+
 	//! Adds an pak archive to the file system.
-	/** After calling this, the Irrlicht Engine will search and open files directly from this archive too. 
-	 This is useful for hiding data from the end user, speeding up file access and making it possible to
-	 access for example Quake2/KingPin/Hexen2 .pak files
+	/** After calling this, the Irrlicht Engine will search and open files directly from this archive too.
+	This is useful for hiding data from the end user, speeding up file access and making it possible to
+	access for example Quake2/KingPin/Hexen2 .pak files
 	\param filename: Filename of the pak archive to add to the file system.
 	\param ignoreCase: If set to true, files in the archive can be accessed without
 	writing all letters in the right case.
@@ -102,23 +96,34 @@ public:
 	\return Returns true if the archive was added successful, false if not. */
 	virtual bool addPakFileArchive(const c8* filename, bool ignoreCase = true, bool ignorePaths = true) = 0;
 
-	//! Returns the string of the current working directory.
+	//! Get the current working directory.
+	/** \return Current working directory as a string. */
 	virtual const c8* getWorkingDirectory() = 0;
 
-	//! Changes the current Working Directory.
+	//! Changes the current working directory.
 	/** \param newDirectory: A string specifying the new working directory.
 	The string is operating system dependent. Under Windows it has
 	the form "<drive>:\<directory>\<sudirectory>\<..>". An example would be: "C:\Windows\"
-	\return Returns true if successful, otherwise false. */
+	\return True if successful, otherwise false. */
 	virtual bool changeWorkingDirectoryTo(const c8* newDirectory) = 0;
 
 	//! Converts a relative path to an absolute (unique) path, resolving symbolic links if required
+	/** \param filename Possibly relative filename begin queried.
+	\result Absolute filename which points to the same file. */
 	virtual core::stringc getAbsolutePath(const core::stringc& filename) const = 0;
 
 	//! Returns the directory a file is located in.
-	/** \param filename: The file to get the directory from */
+	/** \param filename: The file to get the directory from.
+	\return String containing the directory of the file. */
 	virtual core::stringc getFileDir(const core::stringc& filename) const = 0;
 
+	//! Returns the base part of a filename, i.e. the name without the directory
+	//! part. If no directory is prefixed, the full name is returned.
+	/** \param filename: The file to get the basename from
+	\param keepExtension True if filename with extension is returned otherwise everything
+	after the final '.' is removed as well. */
+	virtual core::stringc getFileBasename(const core::stringc& filename, bool keepExtension=true) const = 0;
+
 	//! Creates a list of files and directories in the current working directory and returns it.
 	/** \return a Pointer to the created IFileList is returned. After the list has been used
 	it has to be deleted using its IFileList::drop() method.
@@ -130,6 +135,11 @@ public:
 	\return Returns true if file exists, and false if it does not exist or an error occured. */
 	virtual bool existFile(const c8* filename) const = 0;
 
+	//! Determines if a file exists and could be opened.
+	/** \param filename is the string identifying the file which should be tested for existence.
+	\return Returns true if file exists, and false if it does not exist or an error occured. */
+	virtual bool existFile(const core::stringc& filename) const = 0;
+
 	//! Creates a XML Reader from a file which returns all parsed strings as wide characters (wchar_t*).
 	/** Use createXMLReaderUTF8() if you prefer char* instead of wchar_t*. See IIrrXMLReader for
 	more information on how to use the parser.
@@ -183,7 +193,7 @@ public:
 	//! Creates a new empty collection of attributes, usable for serialization and more.
 	/** \param driver: Video driver to be used to load textures when specified as attribute values.
 	Can be null to prevent automatic texture loading by attributes.
-	\return Returns a pointer to the created object.
+	\return Pointer to the created object.
 	If you no longer need the object, you should call IAttributes::drop().
 	See IReferenceCounted::drop() for more information. */
 	virtual IAttributes* createEmptyAttributes(video::IVideoDriver* driver=0) = 0;
diff --git a/src/dep/include/irrlicht/IGPUProgrammingServices.h b/src/dep/include/irrlicht/IGPUProgrammingServices.h
index 0f86324..da86633 100644
--- a/src/dep/include/irrlicht/IGPUProgrammingServices.h
+++ b/src/dep/include/irrlicht/IGPUProgrammingServices.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,13 +16,13 @@ namespace io
 	class IReadFile;
 } // end namespace io
 
-namespace video  
+namespace video
 {
 
 class IVideoDriver;
 class IShaderConstantSetCallBack;
 
-//! Compile target enumeration for the addHighLevelShaderMaterial() method. 
+//! Compile target enumeration for the addHighLevelShaderMaterial() method.
 enum E_VERTEX_SHADER_TYPE
 {
 	EVST_VS_1_1 = 0,
@@ -42,12 +42,12 @@ const c8* const VERTEX_SHADER_TYPE_NAMES[] = {
 	"vs_3_0",
 	0 };
 
-//! Compile target enumeration for the addHighLevelShaderMaterial() method. 
+//! Compile target enumeration for the addHighLevelShaderMaterial() method.
 enum E_PIXEL_SHADER_TYPE
 {
 	EPST_PS_1_1 = 0,
 	EPST_PS_1_2,
-	EPST_PS_1_3,	
+	EPST_PS_1_3,
 	EPST_PS_1_4,
 	EPST_PS_2_0,
 	EPST_PS_2_a,
@@ -60,7 +60,7 @@ enum E_PIXEL_SHADER_TYPE
 
 //! Names for all pixel shader types, each entry corresponds to a E_PIXEL_SHADER_TYPE entry.
 const c8* const PIXEL_SHADER_TYPE_NAMES[] = {
-	"ps_1_1", 
+	"ps_1_1",
 	"ps_1_2",
 	"ps_1_3",
 	"ps_1_4",
@@ -70,195 +70,229 @@ const c8* const PIXEL_SHADER_TYPE_NAMES[] = {
 	"ps_3_0",
 	0 };
 
-//!	Interface making it possible to create and use programs running on the GPU.
+//! Interface making it possible to create and use programs running on the GPU.
 class IGPUProgrammingServices
 {
 public:
 
-	//! destructor
+	//! Destructor
 	virtual ~IGPUProgrammingServices() {}
 
-	//! Adds a new material renderer to the VideoDriver, based on a high level shading 
-	//! language. Currently only HLSL/D3D9 and GLSL/OpenGL is supported. 
-	//! \param vertexShaderProgram: String containing the source of the vertex shader program.
-	//! This can be 0 if no vertex program shall be used. 
-	//! \param vertexShaderEntryPointName: Name of the entry function of the vertexShaderProgram
-	//! \param vsCompileTarget: Vertex shader version where the high level shader shall be compiled to.
-	//! \param pixelShaderProgram: String containing the source of the pixel shader program.
-	//! This can be 0 if no pixel shader shall be used. 
-	//! \param pixelShaderEntryPointName: Entry name of the function of the pixelShaderEntryPointName
-	//! \param psCompileTarget: Pixel shader version where the high level shader shall be compiled to.
-	//! \param callback: Pointer to an implementation of IShaderConstantSetCallBack in which you 
-	//! can set the needed vertex and pixel shader program constants. Set this to 0 if you don't need this.
-	//! \param baseMaterial: Base material which renderstates will be used to shade the
-	//! material.
-	//! \param userData: a user data int. This int can be set to any value and will be set as parameter
-	//! in the callback method when calling OnSetConstants(). In this way it is easily possible to 
-	//! use the same callback method for multiple materials and distinguish  between them during the call.
-	//! \return Returns the number of the
-	//! material type which can be set in SMaterial::MaterialType to use the renderer.
-	//! -1 is returned if an error occured, e.g. if a vertex or pixel shader
-	//! program could not be compiled or a compile target is not reachable.
-	//! The error strings are then printed to the error log and
-	//! can be catched with a custom event receiver.
-    virtual s32 addHighLevelShaderMaterial(
+	//! Adds a new high-level shading material renderer to the VideoDriver.
+	/** Currently only HLSL/D3D9 and GLSL/OpenGL are supported.
+	\param vertexShaderProgram: String containing the source of the vertex
+	shader program. This can be 0 if no vertex program shall be used.
+	\param vertexShaderEntryPointName: Name of the entry function of the
+	vertexShaderProgram
+	\param vsCompileTarget: Vertex shader version where the high level
+	shader shall be compiled to.
+	\param pixelShaderProgram: String containing the source of the pixel
+	shader program. This can be 0 if no pixel shader shall be used.
+	\param pixelShaderEntryPointName: Entry name of the function of the
+	pixelShaderEntryPointName
+	\param psCompileTarget: Pixel shader version where the high level
+	shader shall be compiled to.
+	\param callback: Pointer to an implementation of
+	IShaderConstantSetCallBack in which you can set the needed vertex and
+	pixel shader program constants. Set this to 0 if you don't need this.
+	\param baseMaterial: Base material which renderstates will be used to
+	shade the material.
+	\param userData: a user data int. This int can be set to any value and
+	will be set as parameter in the callback method when calling
+	OnSetConstants(). In this way it is easily possible to use the same
+	callback method for multiple materials and distinguish between them
+	during the call.
+	\return Returns the number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an
+	error occured, e.g. if a vertex or pixel shader program could not be
+	compiled or a compile target is not reachable. The error strings are
+	then printed to the error log and can be catched with a custom event
+	receiver. */
+	virtual s32 addHighLevelShaderMaterial(
 		const c8* vertexShaderProgram,
 		const c8* vertexShaderEntryPointName = "main",
 		E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-		const c8* pixelShaderProgram = 0, 
+		const c8* pixelShaderProgram = 0,
 		const c8* pixelShaderEntryPointName = "main",
 		E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
 		IShaderConstantSetCallBack* callback = 0,
 		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0 ) = 0;    
+		s32 userData = 0 ) = 0;
 
-	//! Like IGPUProgrammingServices::addShaderMaterial(),
-	//! but tries to load the programs from files. 
-	//! \param vertexShaderProgram: Text file containing the source of the vertex shader program.
-	//! Set to 0 if no shader shall be created.
-	//! \param vertexShaderEntryPointName: Name of the entry function of the vertexShaderProgram
-	//! \param vsCompileTarget: Vertex shader version where the high level shader shall be compiled to.
-	//! \param pixelShaderProgram: Text file containing the source of the pixel shader program. Set to 
-	//! 0 if no shader shall be created.
-	//! \param vertexShaderEntryPointName: Name of the entry function of the vertexShaderProgram
-	//! \param vsCompileTarget: Vertex shader version where the high level shader shall be compiled to.
-	//! \param pixelShaderProgram: String containing the source of the pixel shader program.
-	//! This can be 0 if no pixel shader shall be used. 
-	//! \param pixelShaderEntryPointName: Entry name of the function of the pixelShaderEntryPointName
-	//! \param psCompileTarget: Pixel shader version where the high level shader shall be compiled to.
-	//! \param callback: Pointer to an implementation of IShaderConstantSetCallBack in which you 
-	//! can set the needed vertex and pixel shader program constants. Set this to 0 if you don't need this.
-	//! \param baseMaterial: Base material which renderstates will be used to shade the
-	//! material.
-	//! \param userData: a user data int. This int can be set to any value and will be set as parameter
-	//! in the callback method when calling OnSetConstants(). In this way it is easily possible to 
-	//! use the same callback method for multiple materials and distinguish  between them during the call.
-	//! \return Returns the number of the
-	//! material type which can be set in SMaterial::MaterialType to use the renderer.
-	//! -1 is returned if an error occured, e.g. if a vertex or pixel shader
-	//! program could not be compiled or a compile target is not reachable.
-	//! The error strings are then printed to the error log and
-	//! can be catched with a custom event receiver.
+	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
+	/** \param vertexShaderProgram: Text file containing the source of the
+	 * vertex shader program.
+	Set to 0 if no shader shall be created.
+	\param vertexShaderEntryPointName: Name of the entry function of the
+	vertexShaderProgram
+	\param vsCompileTarget: Vertex shader version where the high level
+	shader shall be compiled to.
+	\param pixelShaderProgram: Text file containing the source of the pixel
+	shader program. Set to 0 if no shader shall be created.
+	\param vertexShaderEntryPointName: Name of the entry function of the
+	vertexShaderProgram
+	\param vsCompileTarget: Vertex shader version where the high level
+	shader shall be compiled to.
+	\param pixelShaderProgram: String containing the source of the pixel
+	shader program. This can be 0 if no pixel shader shall be used.
+	\param pixelShaderEntryPointName: Entry name of the function of the
+	pixelShaderEntryPointName
+	\param psCompileTarget: Pixel shader version where the high level
+	shader shall be compiled to.
+	\param callback: Pointer to an implementation of
+	IShaderConstantSetCallBack in which you can set the needed vertex and
+	pixel shader program constants. Set this to 0 if you don't need this.
+	\param baseMaterial: Base material which renderstates will be used to
+	shade the material.
+	\param userData: a user data int. This int can be set to any value and
+	will be set as parameter in the callback method when calling
+	OnSetConstants(). In this way it is easily possible to use the same
+	callback method for multiple materials and distinguish between them
+	during the call.
+	\return Returns the number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an
+	error occured, e.g. if a vertex or pixel shader program could not be
+	compiled or a compile target is not reachable. The error strings are
+	then printed to the error log and can be catched with a custom event
+	receiver. */
 	virtual s32 addHighLevelShaderMaterialFromFiles(
 		const c8* vertexShaderProgram,
 		const c8* vertexShaderEntryPointName = "main",
 		E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-		const c8* pixelShaderProgram = 0, 
+		const c8* pixelShaderProgram = 0,
 		const c8* pixelShaderEntryPointName = "main",
 		E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
 		IShaderConstantSetCallBack* callback = 0,
 		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0; 
-
-
-	//! Like IGPUProgrammingServices::addShaderMaterial(),
-	//! but tries to load the programs from files. 
-	//! \param vertexShaderProgram: Text file handle containing the source of the vertex shader program.
-	//! Set to 0 if no shader shall be created.
-	//! \param vertexShaderEntryPointName: Name of the entry function of the vertexShaderProgram
-	//! \param vsCompileTarget: Vertex shader version where the high level shader shall be compiled to.
-	//! \param pixelShaderProgram: Text file containing the source of the pixel shader program. Set to 
-	//! \param pixelShaderProgram: Text file handle containing the source of the pixel shader program. Set to 
-	//! 0 if no shader shall be created.
-	//! \param pixelShaderEntryPointName: Entry name of the function of the pixelShaderEntryPointName
-	//! \param psCompileTarget: Pixel shader version where the high level shader shall be compiled to.
-	//! \param callback: Pointer to an implementation of IShaderConstantSetCallBack in which you 
-	//! can set the needed vertex and pixel shader program constants. Set this to 0 if you don't need this.
-	//! \param baseMaterial: Base material which renderstates will be used to shade the
-	//! material.
-	//! \param userData: a user data int. This int can be set to any value and will be set as parameter
-	//! in the callback method when calling OnSetConstants(). In this way it is easily possible to 
-	//! use the same callback method for multiple materials and distinguish  between them during the call.
-	//! \return Returns the number of the
-	//! material type which can be set in SMaterial::MaterialType to use the renderer.
-	//! -1 is returned if an error occured, e.g. if a vertex or pixel shader
-	//! program could not be compiled or a compile target is not reachable.
-	//! The error strings are then printed to the error log and
-	//! can be catched with a custom event receiver.
-	virtual s32 addHighLevelShaderMaterialFromFiles(
-		io::IReadFile* vertexShaderProgram,
-		const c8* vertexShaderEntryPointName = "main",
-		E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-		io::IReadFile* pixelShaderProgram = 0, 
-		const c8* pixelShaderEntryPointName = "main",
-		E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0; 
-
-	//! Adds a new material renderer to the VideoDriver, using pixel and/or 
-	//! vertex shaders to render geometry.
-	//! Note that it is a good idea to call IVideoDriver::queryFeature() before to check 
-	//! if the IVideoDriver supports the vertex and/or pixel shader version your are using.  
-	//! The material is added to the VideoDriver like with IVideoDriver::addMaterialRenderer()
-	//! and can be used like it had been added with that method.
-	//! \param vertexShaderProgram: String containing the source of the vertex shader program. This can be
-	//! 0 if no vertex program shall be used. 
-	//! For DX8 programs, the will always input registers look like this:
-	//! v0: position, v1: normal, 
-	//! v2: color, v3: texture cooridnates, v4: texture coordinates 2 if available.
-	//! For DX9 programs, you can manually set the registers using the dcl_ statements.
-	//! \param pixelShaderProgram: String containing the source of the pixel shader program.
-	//! This can be 0 if you don't want to use a pixel shader. 
-	//! \param callback: Pointer to an implementation of IShaderConstantSetCallBack in which you 
-	//! can set the needed vertex and pixel shader program constants. Set this to 0 if you don't need this.
-	//! \param baseMaterial: Base material which renderstates will be used to shade the
-	//! material.
-	//! \param userData: a user data int. This int can be set to any value and will be set as parameter
-	//! in the callback method when calling OnSetConstants(). In this way it is easily possible to 
-	//! use the same callback method for multiple materials and distinguish  between them during the call.
-	//! \return Returns the number of the
-	//! material type which can be set in SMaterial::MaterialType to use the renderer.
-	//! -1 is returned if an error occured. -1 is returned for example if a vertex or pixel shader
-	//! program could not be compiled, the error strings are then printed out into the error log, and
-	//! can be catched with a custom event receiver.
-	virtual s32 addShaderMaterial(const c8* vertexShaderProgram = 0,
-		const c8* pixelShaderProgram = 0, 
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
 		s32 userData = 0) = 0;
 
-	//! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the 
-	//! programs from files.
-	//! \param vertexShaderProgram: Text file containing the source of the vertex shader program.
-	//! Set to 0 if no shader shall be created.
-	//! \param pixelShaderProgram: Text file containing the source of the pixel shader program. Set to 
-	//! 0 if no shader shall be created.
- 	//! \param callback: Pointer to an IShaderConstantSetCallback object to which the
- 	//! OnSetConstants function is called.
- 	//! \param baseMaterial: baseMaterial
-	//! \param userData: a user data int. This int can be set to any value and will be set as parameter
-	//! in the callback method when calling OnSetConstants(). In this way it is easily possible to 
-	//! use the same callback method for multiple materials and distinguish  between them during the call.
-	//! \return Returns the number of the
-	//! material type which can be set in SMaterial::MaterialType to use the renderer.
-	//! -1 is returned if an error occured. -1 is returned for example if a vertex or pixel shader
-	//! program could not be compiled, the error strings are then printed out into the error log, and
-	//! can be catched with a custom event receiver.
+
+	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
+	/** \param vertexShaderProgram: Text file handle containing the source
+	 * of the vertex shader program.
+	Set to 0 if no shader shall be created.
+	\param vertexShaderEntryPointName: Name of the entry function of the
+	vertexShaderProgram
+	\param vsCompileTarget: Vertex shader version where the high level
+	shader shall be compiled to.
+	\param pixelShaderProgram: Text file containing the source of the pixel
+	shader program. Set to
+	\param pixelShaderProgram: Text file handle containing the source of
+	the pixel shader program. Set to 0 if no shader shall be created.
+	\param pixelShaderEntryPointName: Entry name of the function of the
+	pixelShaderEntryPointName
+	\param psCompileTarget: Pixel shader version where the high level
+	shader shall be compiled to.
+	\param callback: Pointer to an implementation of
+	IShaderConstantSetCallBack in which you can set the needed vertex and
+	pixel shader program constants. Set this to 0 if you don't need this.
+	\param baseMaterial: Base material which renderstates will be used to
+	shade the material.
+	\param userData: a user data int. This int can be set to any value and
+	will be set as parameter in the callback method when calling
+	OnSetConstants(). In this way it is easily possible to use the same
+	callback method for multiple materials and distinguish between them
+	during the call.
+	\return Returns the number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an
+	error occured, e.g. if a vertex or pixel shader program could not be
+	compiled or a compile target is not reachable. The error strings are
+	then printed to the error log and can be catched with a custom event
+	receiver. */
+	virtual s32 addHighLevelShaderMaterialFromFiles(
+		io::IReadFile* vertexShaderProgram,
+		const c8* vertexShaderEntryPointName = "main",
+		E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+		io::IReadFile* pixelShaderProgram = 0,
+		const c8* pixelShaderEntryPointName = "main",
+		E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+		IShaderConstantSetCallBack* callback = 0,
+		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+		s32 userData = 0) = 0;
+
+	//! Adds a new ASM shader material renderer to the VideoDriver
+	/** Note that it is a good idea to call IVideoDriver::queryFeature() in
+	advance to check if the IVideoDriver supports the vertex and/or pixel
+	shader version your are using.
+
+	The material is added to the VideoDriver like with
+	IVideoDriver::addMaterialRenderer() and can be used like it had been
+	added with that method.
+	\param vertexShaderProgram: String containing the source of the vertex
+	shader program. This can be 0 if no vertex program shall be used.
+
+	For DX8 programs, the will always input registers look like this: v0:
+	position, v1: normal, v2: color, v3: texture cooridnates, v4: texture
+	coordinates 2 if available.
+
+	For DX9 programs, you can manually set the registers using the dcl_
+	statements.
+	\param pixelShaderProgram: String containing the source of the pixel
+	shader program. This can be 0 if you don't want to use a pixel shader.
+	\param callback: Pointer to an implementation of
+	IShaderConstantSetCallBack in which you can set the needed vertex and
+	pixel shader program constants. Set this to 0 if you don't need this.
+	\param baseMaterial: Base material which renderstates will be used to
+	shade the material.
+	\param userData: a user data int. This int can be set to any value and
+	will be set as parameter in the callback method when calling
+	OnSetConstants(). In this way it is easily possible to use the same
+	callback method for multiple materials and distinguish between them
+	during the call.
+	\return Returns the number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an
+	error occured. -1 is returned for example if a vertex or pixel shader
+	program could not be compiled, the error strings are then printed out
+	into the error log, and can be catched with a custom event receiver. */
+	virtual s32 addShaderMaterial(const c8* vertexShaderProgram = 0,
+		const c8* pixelShaderProgram = 0,
+		IShaderConstantSetCallBack* callback = 0,
+		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+		s32 userData = 0) = 0;
+
+	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
+	/** \param vertexShaderProgram: Text file containing the source of the
+	vertex shader program. Set to 0 if no shader shall be created.
+	\param pixelShaderProgram: Text file containing the source of the pixel
+	shader program. Set to 0 if no shader shall be created.
+	\param callback: Pointer to an IShaderConstantSetCallback object to
+	which the OnSetConstants function is called.
+	\param baseMaterial: baseMaterial
+	\param userData: a user data int. This int can be set to any value and
+	will be set as parameter in the callback method when calling
+	OnSetConstants(). In this way it is easily possible to use the same
+	callback method for multiple materials and distinguish between them
+	during the call.
+	\return Returns the number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an
+	error occured. -1 is returned for example if a vertex or pixel shader
+	program could not be compiled, the error strings are then printed out
+	into the error log, and can be catched with a custom event receiver. */
 	virtual s32 addShaderMaterialFromFiles(io::IReadFile* vertexShaderProgram,
 		io::IReadFile* pixelShaderProgram,
 		IShaderConstantSetCallBack* callback = 0,
 		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
 		s32 userData = 0) = 0;
 
-	//! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the 
-	//! programs from files.
-	//! \param vertexShaderProgramFileName: Text file name containing the source of the 
-	//! vertex shader program. 
-	//! Set to 0 if no shader shall be created.
-	//! \param pixelShaderProgramFileName: Text file name containing the source of the
-	//! pixel shader program. Set to 0 if no shader shall be created.
- 	//! \param callback: Pointer to an IShaderConstantSetCallback object on which the
- 	//! OnSetConstants function is called.
- 	//! \param baseMaterial: baseMaterial
-	//! \param userData: a user data int. This int can be set to any value and will be set as parameter
-	//! in the callback method when calling OnSetConstants(). In this way it is easily possible to 
-	//! use the same callback method for multiple materials and distinguish  between them during the call.
-	//! \return Returns the number of the
-	//! material type which can be set in SMaterial::MaterialType to use the renderer.
-	//! -1 is returned if an error occured. -1 is returned for example if a vertex or pixel shader
-	//! program could not be compiled, the error strings are then printed out into the error log, and
-	//! can be catched with a custom event receiver.
+	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
+	/** \param vertexShaderProgramFileName: Text file name containing the
+	source of the vertex shader program. Set to 0 if no shader shall be
+	created.
+	\param pixelShaderProgramFileName: Text file name containing the source
+	of the pixel shader program. Set to 0 if no shader shall be created.
+	\param callback: Pointer to an IShaderConstantSetCallback object on
+	which the OnSetConstants function is called.
+	\param baseMaterial: baseMaterial
+	\param userData: a user data int. This int can be set to any value and
+	will be set as parameter in the callback method when calling
+	OnSetConstants(). In this way it is easily possible to use the same
+	callback method for multiple materials and distinguish between them
+	during the call.
+	\return Returns the number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an
+	error occured. -1 is returned for example if a vertex or pixel shader
+	program could not be compiled, the error strings are then printed out
+	into the error log, and can be catched with a custom event receiver. */
 	virtual s32 addShaderMaterialFromFiles(const c8* vertexShaderProgramFileName,
 		const c8* pixelShaderProgramFileName,
 		IShaderConstantSetCallBack* callback = 0,
diff --git a/src/dep/include/irrlicht/IGUIButton.h b/src/dep/include/irrlicht/IGUIButton.h
index aeeb5c1..41127eb 100644
--- a/src/dep/include/irrlicht/IGUIButton.h
+++ b/src/dep/include/irrlicht/IGUIButton.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -60,32 +60,29 @@ namespace gui
 		IGUIButton(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_BUTTON, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIButton() {}
-
 		//! Sets another skin independent font.
 		/** If this is set to zero, the button uses the font of the skin.
-		 \param font: New font to set. */
+		\param font: New font to set. */
 		virtual void setOverrideFont(IGUIFont* font=0) = 0;
 
-		//! Sets an image which should be displayed on the button when it is in normal state. 
+		//! Sets an image which should be displayed on the button when it is in normal state.
 		/** \param image: Image to be displayed */
 		virtual void setImage(video::ITexture* image) = 0;
 
-		//! Sets a background image for the button when it is in normal state. 
+		//! Sets a background image for the button when it is in normal state.
 		/** \param image: Texture containing the image to be displayed
-		 \param pos: Position in the texture, where the image is located */
+		\param pos: Position in the texture, where the image is located */
 		virtual void setImage(video::ITexture* image, const core::rect<s32>& pos) = 0;
 
-		//! Sets a background image for the button when it is in pressed state. 
+		//! Sets a background image for the button when it is in pressed state.
 		/** If no images is specified for the pressed state via
 		setPressedImage(), this image is also drawn in pressed state.
 		\param image: Image to be displayed */
 		virtual void setPressedImage(video::ITexture* image) = 0;
 
-		//! Sets an image which should be displayed on the button when it is in pressed state. 
+		//! Sets an image which should be displayed on the button when it is in pressed state.
 		/** \param image: Texture containing the image to be displayed
-		 \param pos: Position in the texture, where the image is located */
+		\param pos: Position in the texture, where the image is located */
 		virtual void setPressedImage(video::ITexture* image, const core::rect<s32>& pos) = 0;
 
 		//! Sets the sprite bank used by the button
@@ -98,10 +95,10 @@ namespace gui
 		\param color: The color of the sprite
 		\param loop: True if the animation should loop, false if not
 		*/
-		virtual void setSprite(EGUI_BUTTON_STATE state, s32 index, 
+		virtual void setSprite(EGUI_BUTTON_STATE state, s32 index,
 				video::SColor color=video::SColor(255,255,255,255), bool loop=false) = 0;
 
-		//! Sets if the button should behave like a push button. 
+		//! Sets if the button should behave like a push button.
 		/** Which means it can be in two states: Normal or Pressed. With a click on the button,
 		the user can change the state of the button. */
 		virtual void setIsPushButton(bool isPushButton) = 0;
diff --git a/src/dep/include/irrlicht/IGUICheckBox.h b/src/dep/include/irrlicht/IGUICheckBox.h
index f231004..d398ad6 100644
--- a/src/dep/include/irrlicht/IGUICheckBox.h
+++ b/src/dep/include/irrlicht/IGUICheckBox.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,9 +21,6 @@ namespace gui
 		IGUICheckBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_CHECK_BOX, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUICheckBox() {}
-
 		//! Set if box is checked.
 		virtual void setChecked(bool checked) = 0;
 
diff --git a/src/dep/include/irrlicht/IGUIColorSelectDialog.h b/src/dep/include/irrlicht/IGUIColorSelectDialog.h
index ed71881..342e584 100644
--- a/src/dep/include/irrlicht/IGUIColorSelectDialog.h
+++ b/src/dep/include/irrlicht/IGUIColorSelectDialog.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -20,9 +20,6 @@ namespace gui
 		//! constructor
 		IGUIColorSelectDialog(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_COLOR_SELECT_DIALOG, environment, parent, id, rectangle) {}
-
-		//! destructor
-		virtual ~IGUIColorSelectDialog() {}
 	};
 
 
diff --git a/src/dep/include/irrlicht/IGUIComboBox.h b/src/dep/include/irrlicht/IGUIComboBox.h
index f60f9cf..1eba975 100644
--- a/src/dep/include/irrlicht/IGUIComboBox.h
+++ b/src/dep/include/irrlicht/IGUIComboBox.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,6 +11,7 @@ namespace irr
 {
 namespace gui
 {
+
 	//! Combobox widget
 	class IGUIComboBox : public IGUIElement
 	{
@@ -20,9 +21,6 @@ namespace gui
 		IGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_COMBO_BOX, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIComboBox() {}
-
 		//! Returns amount of items in box
 		virtual u32 getItemCount() const = 0;
 
@@ -33,8 +31,8 @@ namespace gui
 		virtual u32 addItem(const wchar_t* text) = 0;
 
 		//! Removes an item from the combo box.
-		/** Warning. This will change the IDs of all following items */
-		virtual void removeItem(u32 id) = 0;
+		/** Warning. This will change the index of all following items */
+		virtual void removeItem(u32 idx) = 0;
 
 		//! Deletes all items in the combo box
 		virtual void clear() = 0;
@@ -43,7 +41,14 @@ namespace gui
 		virtual s32 getSelected() const = 0;
 
 		//! Sets the selected item. Set this to -1 if no item should be selected
-		virtual void setSelected(s32 id) = 0;
+		virtual void setSelected(s32 idx) = 0;
+
+		//! Sets text justification of the text area
+		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
+		EGUIA_LOWEERRIGHT for right justified, or EGUIA_CENTER for centered text.
+		\param vertical: EGUIA_UPPERLEFT to align with top edge,
+		EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
+		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
 	};
 
 
diff --git a/src/dep/include/irrlicht/IGUIContextMenu.h b/src/dep/include/irrlicht/IGUIContextMenu.h
index 573c8e8..5d8cb3c 100644
--- a/src/dep/include/irrlicht/IGUIContextMenu.h
+++ b/src/dep/include/irrlicht/IGUIContextMenu.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,27 +21,22 @@ namespace gui
 		IGUIContextMenu(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_CONTEXT_MENU, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIContextMenu() {};
-
 		//! Get amount of menu items
 		virtual u32 getItemCount() const = 0;
 
 		//! Adds a menu item.
 		/** \param text: Text of menu item. Set this to 0 to create
-		 an separator instead of a real item, which is the same like
-		 calling addSeparator();
-		 \param commandId: Command id of menu item, a simple id you may 
-		 set to whatever you want.
-		 \param enabled: Specifies if the menu item should be enabled.
-		 \param hasSubMenu: Set this to true if there should be a submenu
-		 at this item. You can acess this submenu via getSubMenu().
-		 \param checked: Specifies if the menu item should be initially checked.
-		 \return Returns the index of the new item */
+		an separator instead of a real item, which is the same like
+		calling addSeparator();
+		\param commandId: Command id of menu item, a simple id you may
+		set to whatever you want.
+		\param enabled: Specifies if the menu item should be enabled.
+		\param hasSubMenu: Set this to true if there should be a submenu
+		at this item. You can acess this submenu via getSubMenu().
+		\param checked: Specifies if the menu item should be initially checked.
+		\return Returns the index of the new item */
 		virtual u32 addItem(const wchar_t* text, s32 commandId=-1, bool enabled=true,
-			bool hasSubMenu=false,
-			bool checked=false
-			) = 0;
+			bool hasSubMenu=false, bool checked=false) = 0;
 
 		//! Adds a separator item to the menu
 		virtual void addSeparator() = 0;
@@ -52,7 +47,7 @@ namespace gui
 
 		//! Sets text of the menu item.
 		/** \param idx: Zero based index of the menu item
-		 \param text: New text of the item. */
+		\param text: New text of the item. */
 		virtual void setItemText(u32 idx, const wchar_t* text) = 0;
 
 		//! Check if a menu item is enabled
@@ -61,12 +56,12 @@ namespace gui
 
 		//! Sets if the menu item should be enabled.
 		/** \param idx: Zero based index of the menu item
-		 \param enabled: True if it is enabled, otherwise false. */
+		\param enabled: True if it is enabled, otherwise false. */
 		virtual void setItemEnabled(u32 idx, bool enabled) = 0;
 
 		//! Sets if the menu item should be checked.
 		/** \param idx: Zero based index of the menu item
-		 \param enabled: True if it is enabled, otherwise false. */
+		\param enabled: True if it is enabled, otherwise false. */
 		virtual void setItemChecked(u32 idx, bool enabled) = 0;
 
 		//! Check if a menu item is checked
@@ -90,14 +85,14 @@ namespace gui
 
 		//! Sets the command id of a menu item
 		/** \param idx: Zero based index of the menu item
-		 \param id: Command id of menu item, a simple id you may 
-		 set to whatever you want. */
+		\param id: Command id of menu item, a simple id you may
+		set to whatever you want. */
 		virtual void setItemCommandId(u32 idx, s32 id) = 0;
 
-		//! Get a pointer to the submenu of an item. 
+		//! Get a pointer to the submenu of an item.
 		/** 0 is returned if there is no submenu
-		 \param idx: Zero based index of the menu item
-		 \return Returns a pointer to the submenu of an item. */
+		\param idx: Zero based index of the menu item
+		\return Returns a pointer to the submenu of an item. */
 		virtual IGUIContextMenu* getSubMenu(u32 idx) const = 0;
 	};
 
diff --git a/src/dep/include/irrlicht/IGUIEditBox.h b/src/dep/include/irrlicht/IGUIEditBox.h
index 65d6c3e..34a2acb 100644
--- a/src/dep/include/irrlicht/IGUIEditBox.h
+++ b/src/dep/include/irrlicht/IGUIEditBox.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,28 +23,25 @@ namespace gui
 		IGUIEditBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_EDIT_BOX, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIEditBox() {};
-
 		//! Sets another skin independent font.
 		/** If this is set to zero, the button uses the font of the skin.
-		 \param font: New font to set. */
+		\param font: New font to set. */
 		virtual void setOverrideFont(IGUIFont* font=0) = 0;
 
 		//! Sets another color for the text.
 		/** If set, the edit box does not use the EGDC_BUTTON_TEXT color defined
-		 in the skin, but the set color instead. You don't need to call 
-		 IGUIEditBox::enableOverrrideColor(true) after this, this is done
-		 by this function.
-		 If you set a color, and you want the text displayed with the color
-		 of the skin again, call IGUIEditBox::enableOverrideColor(false);
-		 \param color: New color of the text. */
+		in the skin, but the set color instead. You don't need to call
+		IGUIEditBox::enableOverrrideColor(true) after this, this is done
+		by this function.
+		If you set a color, and you want the text displayed with the color
+		of the skin again, call IGUIEditBox::enableOverrideColor(false);
+		\param color: New color of the text. */
 		virtual void setOverrideColor(video::SColor color) = 0;
 
 		//! Sets if the text should use the overide color or the color in the gui skin.
 		/** \param enable: If set to true, the override color, which can be set
-		 with IGUIEditBox::setOverrideColor is used, otherwise the
-		 EGDC_BUTTON_TEXT color of the skin. */
+		with IGUIEditBox::setOverrideColor is used, otherwise the
+		EGDC_BUTTON_TEXT color of the skin. */
 		virtual void enableOverrideColor(bool enable) = 0;
 
 		//! Turns the border on or off
@@ -52,19 +49,19 @@ namespace gui
 		virtual void setDrawBorder(bool border) = 0;
 
 		//! Sets text justification mode
-		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default), 
-		 EGUIA_LOWEERRIGHT for right justified, or EGUIA_CENTER for centered text.
-		\param vertical: EGUIA_UPPERLEFT to align with top edge, 
-		 EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
+		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
+		EGUIA_LOWEERRIGHT for right justified, or EGUIA_CENTER for centered text.
+		\param vertical: EGUIA_UPPERLEFT to align with top edge,
+		EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
 		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
 
 		//! Enables or disables word wrap.
-		/** \param enable: If set to true, words going over one line are 
-		 broken to the next line. */
+		/** \param enable: If set to true, words going over one line are
+		broken to the next line. */
 		virtual void setWordWrap(bool enable) = 0;
 
 		//! Checks if word wrap is enabled
-		//! \return true if word wrap is enabled, false otherwise
+		/** \return true if word wrap is enabled, false otherwise */
 		virtual bool isWordWrapEnabled() const = 0;
 
 		//! Enables or disables newlines.
@@ -73,18 +70,18 @@ namespace gui
 		virtual void setMultiLine(bool enable) = 0;
 
 		//! Checks if multi line editing is enabled
-		//! \return true if mult-line is enabled, false otherwise
+		/** \return true if mult-line is enabled, false otherwise */
 		virtual bool isMultiLineEnabled() const = 0;
 
 		//! Enables or disables automatic scrolling with cursor position
-		//! \param enable: If set to true, the text will move around with the cursor position
+		/** \param enable: If set to true, the text will move around with the cursor position */
 		virtual void setAutoScroll(bool enable) = 0;
 
 		//! Checks to see if automatic scrolling is enabled
-		//! \return true if automatic scrolling is enabled, false if not
+		/** \return true if automatic scrolling is enabled, false if not */
 		virtual bool isAutoScrollEnabled() const = 0;
 
-		//! Sets whether the edit box is a password box. Setting this to true will 
+		//! Sets whether the edit box is a password box. Setting this to true will
 		/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
 		\param passwordBox: true to enable password, false to disable
 		\param passwordChar: the character that is displayed instead of letters */
@@ -94,12 +91,12 @@ namespace gui
 		virtual bool isPasswordBox() const = 0;
 
 		//! Gets the size area of the text in the edit box
-		//! \return Returns the size in pixels of the text
+		/** \return The size in pixels of the text */
 		virtual core::dimension2di getTextDimension() = 0;
 
 		//! Sets the maximum amount of characters which may be entered in the box.
-		/** \param max: Maximum amount of characters. If 0, the character amount is 
-		 infinity. */
+		/** \param max: Maximum amount of characters. If 0, the character amount is
+		infinity. */
 		virtual void setMax(u32 max) = 0;
 
 		//! Returns maximum amount of characters, previously set by setMax();
diff --git a/src/dep/include/irrlicht/IGUIElement.h b/src/dep/include/irrlicht/IGUIElement.h
index 548c70d..7c77add 100644
--- a/src/dep/include/irrlicht/IGUIElement.h
+++ b/src/dep/include/irrlicht/IGUIElement.h
@@ -1,4 +1,4 @@
- // Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,6 +11,7 @@
 #include "irrString.h"
 #include "IEventReceiver.h"
 #include "EGUIElementTypes.h"
+#include "EGUIAlignment.h"
 #include "IAttributes.h"
 
 namespace irr
@@ -20,28 +21,6 @@ namespace gui
 
 class IGUIEnvironment;
 
-enum EGUI_ALIGNMENT
-{
-	//! Aligned to parent's top or left side (default)
-	EGUIA_UPPERLEFT=0,
-	//! Aligned to parent's bottom or right side
-	EGUIA_LOWERRIGHT,
-	//! Aligned to the center of parent
-	EGUIA_CENTER,
-	//! Scaled within its parent
-	EGUIA_SCALE
-};
-
-//! Names for alignments
-const c8* const GUIAlignmentNames[] =
-{
-	"upperLeft",
-	"lowerRight",
-	"center",
-	"scale",
-	0
-};
-
 //! Base class of all GUI elements.
 class IGUIElement : public virtual io::IAttributeExchangingObject, public IEventReceiver
 {
@@ -104,6 +83,7 @@ public:
 
 
 	//! Sets the relative rectangle of this element.
+	/** \param r The absolute position to set */
 	void setRelativePosition(const core::rect<s32>& r)
 	{
 		if (Parent)
@@ -126,19 +106,33 @@ public:
 		updateAbsolutePosition();
 	}
 
+	//! Sets the relative rectangle of this element, maintaining its current width and height
+	/** \param position The new relative position to set. Width and height will not be changed. */
+	void setRelativePosition(const core::position2di & position)
+	{
+		const core::dimension2di mySize = RelativeRect.getSize();
+		const core::rect<s32> rectangle(position.X, position.Y,
+						position.X + mySize.Width, position.Y + mySize.Height);
+		setRelativePosition(rectangle);
+	}
 
-	//! Sets the relative rectangle of this element.
-	void setRelativePosition(const core::rect<f32>& r)
+
+	//! Sets the relative rectangle of this element as a proportion of its parent's area.
+	/** \note This method used to be 'void setRelativePosition(const core::rect<f32>& r)'
+	\param r  The rectangle to set, interpreted as a proportion of the parent's area.
+	Meaningful values are in the range [0...1], unless you intend this element to spill
+	outside its parent. */
+	void setRelativePositionProportional(const core::rect<f32>& r)
 	{
 		if (!Parent)
 			return;
-		
+
 		const core::dimension2di& d = Parent->getAbsolutePosition().getSize();
-		
-		DesiredRect = core::rect<s32>( 
-					core::floor32((f32)d.Width  * r.UpperLeftCorner.X),
+
+		DesiredRect = core::rect<s32>(
+					core::floor32((f32)d.Width * r.UpperLeftCorner.X),
 					core::floor32((f32)d.Height * r.UpperLeftCorner.Y),
-					core::floor32((f32)d.Width  * r.LowerRightCorner.X),
+					core::floor32((f32)d.Width * r.LowerRightCorner.X),
 					core::floor32((f32)d.Height * r.LowerRightCorner.Y));
 
 		ScaleRect = r;
@@ -147,7 +141,7 @@ public:
 	}
 
 
-	//! Returns the absolute rectangle of element.
+	//! Gets the absolute rectangle of this element
 	core::rect<s32> getAbsolutePosition() const
 	{
 		return AbsoluteRect;
@@ -162,6 +156,7 @@ public:
 
 
 	//! Sets whether the element will ignore its parent's clipping rectangle
+	/** \param noClip If true, the element will not be clipped by its parent's clipping rectangle. */
 	void setNotClipped(bool noClip)
 	{
 		NoClip = noClip;
@@ -169,6 +164,7 @@ public:
 
 
 	//! Gets whether the element will ignore its parent's clipping rectangle
+	/** \return true if the element is not clipped by its parent's clipping rectangle. */
 	bool isNotClipped() const
 	{
 		return NoClip;
@@ -206,7 +202,7 @@ public:
 		if (Parent)
 		{
 			core::rect<s32> r(Parent->getAbsolutePosition());
-		
+
 			core::dimension2df d((f32)r.getSize().Width, (f32)r.getSize().Height);
 
 			if (AlignLeft   == EGUIA_SCALE)
@@ -226,7 +222,6 @@ public:
 	{
 		core::rect<s32> parentAbsolute(0,0,0,0);
 		core::rect<s32> parentAbsoluteClip;
-		s32 diffx, diffy;
 		f32 fw=0.f, fh=0.f;
 
 		if (Parent)
@@ -236,28 +231,23 @@ public:
 			if (NoClip)
 			{
 				IGUIElement* p=this;
-				while (p && p->NoClip && p->Parent)
-						p = p->Parent;
-				if (p->Parent)
-					parentAbsoluteClip = p->Parent->AbsoluteClippingRect;
-				else
-					parentAbsoluteClip = p->AbsoluteClippingRect;
+				while (p && p->Parent)
+					p = p->Parent;
+				parentAbsoluteClip = p->AbsoluteClippingRect;
 			}
 			else
 				parentAbsoluteClip = Parent->AbsoluteClippingRect;
 		}
 
+		const s32 diffx = parentAbsolute.getWidth() - LastParentRect.getWidth();
+		const s32 diffy = parentAbsolute.getHeight() - LastParentRect.getHeight();
 
-		diffx = parentAbsolute.getWidth() - LastParentRect.getWidth();
-		diffy = parentAbsolute.getHeight() - LastParentRect.getHeight();
-		
 		if (AlignLeft == EGUIA_SCALE || AlignRight == EGUIA_SCALE)
 			fw = (f32)parentAbsolute.getWidth();
 
 		if (AlignTop == EGUIA_SCALE || AlignBottom == EGUIA_SCALE)
 			fh = (f32)parentAbsolute.getHeight();
 
-
 		switch (AlignLeft)
 		{
 			case EGUIA_UPPERLEFT:
@@ -320,8 +310,8 @@ public:
 
 		RelativeRect = DesiredRect;
 
-		s32 w = RelativeRect.getWidth();
-		s32 h = RelativeRect.getHeight();
+		const s32 w = RelativeRect.getWidth();
+		const s32 h = RelativeRect.getHeight();
 
 		// make sure the desired rectangle is allowed
 		if (w < MinSize.Width)
@@ -334,7 +324,7 @@ public:
 			RelativeRect.LowerRightCorner.Y = RelativeRect.UpperLeftCorner.Y + MaxSize.Height;
 
 		RelativeRect.repair();
-		
+
 		AbsoluteRect = RelativeRect + parentAbsolute.UpperLeftCorner;
 
 		if (!Parent)
@@ -354,7 +344,18 @@ public:
 	}
 
 
-	//! Returns the child element, which is at the position of the point.
+	//! Returns the topmost GUI element at the specific position.
+	/**
+	This will check this GUI element and all of its descendants, so it
+	may return this GUI element.  To check all GUI elements, call this
+	function on device->getGUIEnvironment()->getRootGUIElement(). Note
+	that the root element is the size of the screen, so doing so (with
+	an on-screen point) will always return the root element if no other
+	element is above it at that point.
+	\param point: The point at which to find a GUI element.
+	\return The topmost GUI element at that point, or 0 if there are
+	no candidate elements at this point.
+	 */
 	IGUIElement* getElementFromPoint(const core::position2d<s32>& point)
 	{
 		IGUIElement* target = 0;
@@ -365,6 +366,7 @@ public:
 		core::list<IGUIElement*>::Iterator it = Children.getLast();
 
 		if (IsVisible)
+		{
 			while(it != Children.end())
 			{
 				target = (*it)->getElementFromPoint(point);
@@ -373,16 +375,17 @@ public:
 
 				--it;
 			}
+		}
 
 		if (IsVisible && isPointInside(point))
 			target = this;
-		
+
 		return target;
 	}
 
 
 	//! Returns true if a point is within this element.
-	//! Elements with a shape other than a rectangle will override this method
+	/** Elements with a shape other than a rectangle should override this method */
 	virtual bool isPointInside(const core::position2d<s32>& point) const
 	{
 		return AbsoluteClippingRect.isPointInside(point);
@@ -395,10 +398,10 @@ public:
 		if (child)
 		{
 			child->grab();
-			child->remove();  // remove from old parent
+			child->remove(); // remove from old parent
 			child->LastParentRect = getAbsolutePosition();
 			child->Parent = this;
-			Children.push_back(child);			
+			Children.push_back(child);
 		}
 	}
 
@@ -480,19 +483,18 @@ public:
 	}
 
 
-	//! Sets whether this control was created as part of its parent, 
-	//! for example when a scrollbar is part of a listbox. 
-	//! SubElements are not saved to disk when calling guiEnvironment->saveGUI()
+	//! Sets whether this control was created as part of its parent.
+	/** For example, it is true when a scrollbar is part of a listbox.
+	SubElements are not saved to disk when calling guiEnvironment->saveGUI() */
 	virtual void setSubElement(bool subElement)
 	{
 		IsSubElement = subElement;
 	}
 
 
-	//! If set to true, the focus will visit this element when using 
-	//! the tab key to cycle through elements.
-	//! If this element is a tab group (see isTabGroup/setTabGroup) then
-	//! ctrl+tab will be used instead.
+	//! If set to true, the focus will visit this element when using the tab key to cycle through elements.
+	/** If this element is a tab group (see isTabGroup/setTabGroup) then
+	ctrl+tab will be used instead. */
 	void setTabStop(bool enable)
 	{
 		IsTabStop = enable;
@@ -507,9 +509,9 @@ public:
 	}
 
 
-	//! Sets the priority of focus when using the tab key to navigate between a group 
-	//! of elements. See setTabGroup, isTabGroup and getTabGroup for information on tab groups.
-	//! Elements with a lower number are focused first
+	//! Sets the priority of focus when using the tab key to navigate between a group of elements.
+	/** See setTabGroup, isTabGroup and getTabGroup for information on tab groups.
+	Elements with a lower number are focused first */
 	void setTabOrder(s32 index)
 	{
 		// negative = autonumber
@@ -519,7 +521,7 @@ public:
 			IGUIElement *el = getTabGroup();
 			while (IsTabGroup && el && el->Parent)
 				el = el->Parent;
-				
+
 			IGUIElement *first=0, *closest=0;
 			if (el)
 			{
@@ -544,9 +546,9 @@ public:
 	}
 
 
-	//! Sets whether this element is a container for a group of elements which
-	//! can be navigated using the tab key. For example, windows are tab groups.
-	//! Groups can be navigated using ctrl+tab, providing isTabStop is true.
+	//! Sets whether this element is a container for a group of elements which can be navigated using the tab key.
+	/** For example, windows are tab groups.
+	Groups can be navigated using ctrl+tab, providing isTabStop is true. */
 	void setTabGroup(bool isGroup)
 	{
 		IsTabGroup = isGroup;
@@ -561,12 +563,11 @@ public:
 	}
 
 
-	//! Returns the container element which holds all elements in this element's
-	//! tab group. 
+	//! Returns the container element which holds all elements in this element's tab group.
 	IGUIElement* getTabGroup()
 	{
 		IGUIElement *ret=this;
-		
+
 		while (ret && !ret->isTabGroup())
 			ret = ret->getParent();
 
@@ -639,7 +640,7 @@ public:
 
 
 	//! Brings a child to front
-	/** \return Returns true if successful, false if not. */
+	/** \return True if successful, false if not. */
 	virtual bool bringToFront(IGUIElement* element)
 	{
 		core::list<IGUIElement*>::Iterator it = Children.begin();
@@ -667,11 +668,11 @@ public:
 
 	//! Finds the first element with the given id.
 	/** \param id: Id to search for.
-	 \param searchchildren: Set this to true, if also children of this 
-	 element may contain the element with the searched id and they 
-	 should be searched too.
-	 \return Returns the first element with the given id. If no element
-	 with this id was found, 0 is returned. */
+	\param searchchildren: Set this to true, if also children of this
+	element may contain the element with the searched id and they
+	should be searched too.
+	\return Returns the first element with the given id. If no element
+	with this id was found, 0 is returned. */
 	virtual IGUIElement* getElementFromId(s32 id, bool searchchildren=false) const
 	{
 		IGUIElement* e = 0;
@@ -687,7 +688,7 @@ public:
 
 			if (e)
 				return e;
-		}		
+		}
 
 		return e;
 	}
@@ -699,7 +700,7 @@ public:
 	{
 		if (!child)
 			return false;
-		do 
+		do
 		{
 			if (child->Parent)
 				child = child->Parent;
@@ -712,14 +713,14 @@ public:
 
 
 	//! searches elements to find the closest next element to tab to
-	//! \param startOrder: The TabOrder of the current element, -1 if none
-	//! \param reverse: true if searching for a lower number
-	//! \param group: true if searching for a higher one
-	//! \param first: element with the highest/lowest known tab order depending on search direction
-	//! \param closest: the closest match, depending on tab order and direction
-	//! \param includeInvisible: includes invisible elements in the search (default=false)
-	//! \return true if successfully found an element, false to continue searching/fail
-	bool getNextElement(s32 startOrder, bool reverse, bool group, 
+	/** \param startOrder: The TabOrder of the current element, -1 if none
+	\param reverse: true if searching for a lower number
+	\param group: true if searching for a higher one
+	\param first: element with the highest/lowest known tab order depending on search direction
+	\param closest: the closest match, depending on tab order and direction
+	\param includeInvisible: includes invisible elements in the search (default=false)
+	\return true if successfully found an element, false to continue searching/fail */
+	bool getNextElement(s32 startOrder, bool reverse, bool group,
 		IGUIElement*& first, IGUIElement*& closest, bool includeInvisible=false) const
 	{
 		// we'll stop searching if we find this number
@@ -748,18 +749,18 @@ public:
 						closest = *it;
 						return true;
 					}
-					
+
 					// is it closer than the current closest?
 					if (closest)
 					{
 						closestOrder = closest->getTabOrder();
-						if (  ( reverse && currentOrder > closestOrder && currentOrder < startOrder) 
+						if ( ( reverse && currentOrder > closestOrder && currentOrder < startOrder)
 							||(!reverse && currentOrder < closestOrder && currentOrder > startOrder))
 						{
 							closest = *it;
 						}
 					}
-					else 
+					else
 					if ( (reverse && currentOrder < startOrder) || (!reverse && currentOrder > startOrder) )
 					{
 						closest = *it;
@@ -794,7 +795,7 @@ public:
 	}
 
 
-	//! Returns the type of the gui element. 
+	//! Returns the type of the gui element.
 	/** This is needed for the .NET wrapper but will be used
 	later for serializing and deserializing.
 	If you wrote your own GUIElements, you need to set the type for your element as first parameter
@@ -805,8 +806,8 @@ public:
 	}
 
 
-	//! Returns the type name of the gui element. 
-	/** This is needed serializing elements. For serializing your own elements, override this function 
+	//! Returns the type name of the gui element.
+	/** This is needed serializing elements. For serializing your own elements, override this function
 	and return your own type name which is created by your IGUIElementFactory */
 	virtual const c8* getTypeName() const
 	{
@@ -815,8 +816,8 @@ public:
 
 
 	//! Writes attributes of the scene node.
-	//! Implement this to expose the attributes of your scene node for
-	//! scripting languages, editors, debuggers or xml serialization purposes.
+	/** Implement this to expose the attributes of your scene node for
+	scripting languages, editors, debuggers or xml serialization purposes. */
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
 	{
 		out->addInt("Id", ID );
@@ -838,8 +839,8 @@ public:
 
 
 	//! Reads attributes of the scene node.
-	//! Implement this to set the attributes of your scene node for
-	//! scripting languages, editors, debuggers or xml deserialization purposes.
+	/** Implement this to set the attributes of your scene node for
+	scripting languages, editors, debuggers or xml deserialization purposes. */
 	virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
 	{
 		setID(in->getAttributeAsInt("Id"));
@@ -882,7 +883,7 @@ protected:
 	//! absolute clipping rect of element
 	core::rect<s32> AbsoluteClippingRect;
 
-	//! the rectangle the element would prefer to be, 
+	//! the rectangle the element would prefer to be,
 	//! if it was not constrained by parent or max/min size
 	core::rect<s32> DesiredRect;
 
diff --git a/src/dep/include/irrlicht/IGUIElementFactory.h b/src/dep/include/irrlicht/IGUIElementFactory.h
index 15fc88e..1a3a733 100644
--- a/src/dep/include/irrlicht/IGUIElementFactory.h
+++ b/src/dep/include/irrlicht/IGUIElementFactory.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,14 +11,13 @@
 namespace irr
 {
 
-
 namespace gui
 {
 	class IGUIElement;
-	
-	//!	Interface making it possible to dynamicly create GUI elements
-	/** To be able to add custom elements to Irrlicht and to make it possible for the 
-	scene manager to save and load them, simply implement this interface and register it 
+
+	//! Interface making it possible to dynamicly create GUI elements
+	/** To be able to add custom elements to Irrlicht and to make it possible for the
+	scene manager to save and load them, simply implement this interface and register it
 	in your gui environment via IGUIEnvironment::registerGUIElementFactory.
 	Note: When implementing your own element factory, don't call IGUIEnvironment::grab() to
 	increase the reference counter of the environment. This is not necessary because the
@@ -28,37 +27,34 @@ namespace gui
 	{
 	public:
 
-		// destructor
-		virtual ~IGUIElementFactory() {}
-
 		//! adds an element to the gui environment based on its type id
 		/** \param type: Type of the element to add.
 		\param parent: Parent scene node of the new element, can be null to add to the root.
-		\return Returns pointer to the new element or null if not successful. */
+		\return Pointer to the new element or null if not successful. */
 		virtual IGUIElement* addGUIElement(EGUI_ELEMENT_TYPE type, IGUIElement* parent=0) = 0;
 
 		//! adds a GUI element to the GUI Environment based on its type name
 		/** \param typeName: Type name of the element to add.
 		\param parent: Parent scene node of the new element, can be null to add it to the root.
-		\return Returns pointer to the new element or null if not successful. */
+		\return Pointer to the new element or null if not successful. */
 		virtual IGUIElement* addGUIElement(const c8* typeName, IGUIElement* parent=0) = 0;
 
-		//! returns amount of GUI element types this factory is able to create
+		//! Get amount of GUI element types this factory is able to create
 		virtual s32 getCreatableGUIElementTypeCount() const = 0;
 
-		//! returns type of a createable element type
+		//! Get type of a createable element type
 		/** \param idx: Index of the element type in this factory. Must be a value between 0 and
 		getCreatableGUIElementTypeCount() */
 		virtual EGUI_ELEMENT_TYPE getCreateableGUIElementType(s32 idx) const = 0;
 
-		//! returns type name of a createable GUI element type by index
+		//! Get type name of a createable GUI element type by index
 		/** \param idx: Index of the type in this factory. Must be a value between 0 and
 		getCreatableGUIElementTypeCount() */
 		virtual const c8* getCreateableGUIElementTypeName(s32 idx) const = 0;
 
 		//! returns type name of a createable GUI element
-		/** \param type: Type of GUI element. 
-		\return: Returns name of the type if this factory can create the type, otherwise 0. */
+		/** \param type: Type of GUI element.
+		\return Name of the type if this factory can create the type, otherwise 0. */
 		virtual const c8* getCreateableGUIElementTypeName(EGUI_ELEMENT_TYPE type) const = 0;
 	};
 
diff --git a/src/dep/include/irrlicht/IGUIEnvironment.h b/src/dep/include/irrlicht/IGUIEnvironment.h
index 6c34538..5258ab6 100644
--- a/src/dep/include/irrlicht/IGUIEnvironment.h
+++ b/src/dep/include/irrlicht/IGUIEnvironment.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -49,6 +49,7 @@ class IGUIEditBox;
 class IGUISpinBox;
 class IGUITabControl;
 class IGUITab;
+class IGUITable;
 class IGUIContextMenu;
 class IGUIComboBox;
 class IGUIToolBar;
@@ -61,350 +62,474 @@ class IGUIEnvironment : public virtual IReferenceCounted
 {
 public:
 
-	//! destructor
-	virtual ~IGUIEnvironment() {};
-
-	//! Draws all gui elements.
+	//! Draws all gui elements by traversing the GUI environment starting at the root node.
 	virtual void drawAll() = 0;
 
 	//! Sets the focus to an element.
-	/** Causes a EGET_ELEMENT_FOCUS_LOST event followed by a EGET_ELEMENT_FOCUSED event.
-	If someone absorbed either of the events, then the focus will not be changed.
-	\return Returns true on success, false on failure */
+	/** Causes a EGET_ELEMENT_FOCUS_LOST event followed by a
+	EGET_ELEMENT_FOCUSED event. If someone absorbed either of the events,
+	then the focus will not be changed.
+	\param element Pointer to the element which shall get the focus.
+	\return True on success, false on failure */
 	virtual bool setFocus(IGUIElement* element) = 0;
 
-	//! Returns the element with the focus
+	//! Returns the element which holds the focus.
+	/** \return Pointer to the element with focus. */
 	virtual IGUIElement* getFocus() const = 0;
 
 	//! Removes the focus from an element.
-	/** Causes a EGET_ELEMENT_FOCUS_LOST event. If the event is absorbed then the focus
-	will not be changed.
-	\return Returns true on success, false on failure */
+	/** Causes a EGET_ELEMENT_FOCUS_LOST event. If the event is absorbed
+	then the focus will not be changed.
+	\param element Pointer to the element which shall lose the focus.
+	\return True on success, false on failure */
 	virtual bool removeFocus(IGUIElement* element) = 0;
 
-	//! Returns if the element has focus
+	//! Returns whether the element has focus
+	/** \param element Pointer to the element which is tested.
+	\return True if the element has focus, else false. */
 	virtual bool hasFocus(IGUIElement* element) const = 0;
 
 	//! Returns the current video driver.
+	/** \return Pointer to the video driver. */
 	virtual video::IVideoDriver* getVideoDriver() const = 0;
 
 	//! Returns the file system.
+	/** \return Pointer to the file system. */
 	virtual io::IFileSystem* getFileSystem() const = 0;
 
 	//! returns a pointer to the OS operator
+	/** \return Pointer to the OS operator. */
 	virtual IOSOperator* getOSOperator() const = 0;
 
-	//! removes all elements from the environment.
+	//! Removes all elements from the environment.
 	virtual void clear() = 0;
 
-	//! Posts an input event to the environment. 
+	//! Posts an input event to the environment.
 	/** Usually you do not have to
-	use this method, it is used by the internal engine. */
+	use this method, it is used by the engine internally.
+	\param event The event to post.
+	\return True if succeeded, else false. */
 	virtual bool postEventFromUser(const SEvent& event) = 0;
 
-	//! This sets a new event receiver for gui events. 
+	//! This sets a new event receiver for gui events.
 	/** Usually you do not have to
-	use this method, it is used by the internal engine. */
+	use this method, it is used by the engine internally.
+	\param evr Pointer to the new receiver. */
 	virtual void setUserEventReceiver(IEventReceiver* evr) = 0;
 
 	//! Returns pointer to the current gui skin.
+	/** \return Pointer to the GUI skin. */
 	virtual IGUISkin* getSkin() const = 0;
 
 	//! Sets a new GUI Skin
-	/** You can use this to change the appearance of the whole GUI Environment. You
-	can set one of the built-in skins or implement your own class derived from 
-	IGUISkin and enable it using this method.
-	To set for example the built-in Windows classic skin, use the following code:
+	/** You can use this to change the appearance of the whole GUI
+	Environment. You can set one of the built-in skins or implement your
+	own class derived from IGUISkin and enable it using this method.
+	To set for example the built-in Windows classic skin, use the following
+	code:
 	\code
 	gui::IGUISkin* newskin = environment->createSkin(gui::EGST_WINDOWS_CLASSIC);
 	environment->setSkin(newskin);
 	newskin->drop();
 	\endcode
+	\param skin New skin to use.
 	*/
 	virtual void setSkin(IGUISkin* skin) = 0;
 
 	//! Creates a new GUI Skin based on a template.
 	/** Use setSkin() to set the created skin.
-	\return Returns a pointer to the created skin.
+	\param type The type of the new skin.
+	\return Pointer to the created skin.
 	If you no longer need it, you should call IGUISkin::drop().
 	See IReferenceCounted::drop() for more information. */
 	virtual IGUISkin* createSkin(EGUI_SKIN_TYPE type) = 0;
 
-	//! Returns pointer to the font with the specified file name. 
-	/** Loads the font if it was not loaded before. Returns 0 if the font could not be loaded.
-	\return
-	returns a pointer to the font.
-	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	//! Returns pointer to the font with the specified filename.
+	/** Loads the font if it was not loaded before.
+	\param filename Filename of the Font.
+	\return Pointer to the font. Returns 0 if the font could not be loaded.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
 	virtual IGUIFont* getFont(const c8* filename) = 0;
 
 	//! Returns the default built-in font.
+	/** \return Pointer to the default built-in font.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
 	virtual IGUIFont* getBuiltInFont() const = 0;
 
-	//! Returns pointer to the sprite bank with the specified file name. 
-	/** Loads the bank if it was not loaded before. Returns 0 if it could not be loaded.
-	\return
-	returns a pointer to the sprite bank.
+	//! Returns pointer to the sprite bank with the specified file name.
+	/** Loads the bank if it was not loaded before.
+	\param filename Filename of the sprite bank's origin.
+	\return Pointer to the sprite bank. Returns 0 if it could not be loaded.
 	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 	virtual IGUISpriteBank* getSpriteBank(const c8* filename) = 0;
 
-	//! adds an empty sprite bank to the manager
+	//! Adds an empty sprite bank to the manager
+	/** \param name Name of the new sprite bank.
+	\return Pointer to the sprite bank.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 	virtual IGUISpriteBank* addEmptySpriteBank(const c8 *name) = 0;
 
-	//! Returns the root gui element. 
-	/** This is the first gui element, parent of all other
-	gui elements. You'll never need to use this method, unless you are not creating 
-	your own gui elements, trying to add them to the gui elements without a parent.
-	The returned pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	//! Returns the root gui element.
+	/** This is the first gui element, the (direct or indirect) parent of all 
+	other gui elements.  It is a valid IGUIElement, with dimensions the same 
+	size as the screen.	You should not need to use this method directly, unless 
+	you wish to reparent GUI elements to the top level.
+	\return Pointer to the root element of the GUI. The returned pointer
+	should not be dropped. See IReferenceCounted::drop() for more
+	information. */
 	virtual IGUIElement* getRootGUIElement() = 0;
 
-	//! Adds an button element. 
-	/** \return
-	 Returns a pointer to the created button. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	//! Adds a button element.
+	/** \param rectangle Rectangle specifying the borders of the button.
+	\param parent Parent gui element of the button.
+	\param id Id with which the gui element can be identified.
+	\param text Text displayed on the button.
+	\param tooltiptext Text displayed in the tooltip.
+	\return Pointer to the created button. Returns 0 if an error occured.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
 	virtual IGUIButton* addButton(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0, const wchar_t* tooltiptext = 0) = 0;
 
-	//! Adds an empty window element. 
-	/** \param modal: Defines if the dialog is modal. This means, that all other
-	gui elements which were created before the message box cannot be used
-	until this messagebox is removed.
-	\return
-	Returns a pointer to the created window. Returns 0 if an error occured.
-	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-	virtual IGUIWindow* addWindow(const core::rect<s32>& rectangle, bool modal = false, 
+	//! Adds an empty window element.
+	/** \param rectangle Rectangle specifying the borders of the window.
+	\param modal Defines if the dialog is modal. This means, that all other
+	gui elements which were created before the window cannot be used until
+	it is removed.
+	\param text Text displayed as the window title.
+	\param parent Parent gui element of the window.
+	\param id Id with which the gui element can be identified.
+	\return Pointer to the created window. Returns 0 if an error occured.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUIWindow* addWindow(const core::rect<s32>& rectangle, bool modal = false,
 		const wchar_t* text=0, IGUIElement* parent=0, s32 id=-1) = 0;
 
-	//! Adds a modal screen. This control stops its parent's members from being 
-	//! able to recieve input until its last child is removed, it then deletes its self.
-	/** \return
-	Returns a pointer to the created window. Returns 0 if an error occured.
-	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	//! Adds a modal screen.
+	/** This control stops its parent's members from being able to receive
+	input until its last child is removed, it then deletes itself.
+	\param parent Parent gui element of the modal.
+	\return Pointer to the created modal. Returns 0 if an error occured.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
 	virtual IGUIElement* addModalScreen(IGUIElement* parent) = 0;
 
 	//! Adds a message box.
-	/** \param caption: Text to be displayed the title of the message box.
-	\param text: Text to be displayed in the body of the message box.
-	 \param modal: Defines if the dialog is modal. This means, that all other
-	 gui elements which were created before the message box cannot be used
-	 until this messagebox is removed.
-	 \param flags: Flags specifying the layout of the message box. For example
-	 to create a message box with an OK and a CANCEL button on it, set this
-	 to (EMBF_OK | EMBF_CANCEL).
-	 \param parent: Parent gui element of the message box.
-	 \param id: Id with which the gui element can be identified.
-	 \return
-	 Returns a pointer to the created message box. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	/** \param caption Text to be displayed the title of the message box.
+	\param text Text to be displayed in the body of the message box.
+	\param modal Defines if the dialog is modal. This means, that all other
+	gui elements which were created before the message box cannot be used
+	until this messagebox is removed.
+	\param flags Flags specifying the layout of the message box. For example
+	to create a message box with an OK and a CANCEL button on it, set this
+	to (EMBF_OK | EMBF_CANCEL).
+	\param parent Parent gui element of the message box.
+	\param id Id with which the gui element can be identified.
+	\return Pointer to the created message box. Returns 0 if an error
+	occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUIWindow* addMessageBox(const wchar_t* caption, const wchar_t* text=0,
 		bool modal = true, s32 flags = EMBF_OK, IGUIElement* parent=0, s32 id=-1) = 0;
 
-	//! Adds a scrollbar. 
-	/** \return
-	Returns a pointer to the created scrollbar. Returns 0 if an error occured.
-	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	//! Adds a scrollbar.
+	/** \param horizontal Specifies if the scroll bar is drawn horizontal
+	or vertical.
+	\param rectangle Rectangle specifying the borders of the scrollbar.
+	\param parent Parent gui element of the scroll bar.
+	\param id Id to identify the gui element.
+	\return Pointer to the created scrollbar. Returns 0 if an error
+	occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUIScrollBar* addScrollBar(bool horizontal, const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1) = 0;
 
-	//! Adds an image element. 
-	/** \param image: Image to be displayed.
-	 \param pos: Position of the image. The width and height of the image is taken
-	 from the image.
-	 \param useAlphaChannel: Sets if the image should use the alpha channel of the texture
-	 to draw itself.
-	 \return
-	 Returns a pointer to the created image element. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	//! Adds an image element.
+	/** \param image Image to be displayed.
+	\param pos Position of the image. The width and height of the image is
+	taken from the image.
+	\param useAlphaChannel Sets if the image should use the alpha channel
+	of the texture to draw itself.
+	\param parent Parent gui element of the image.
+	\param id Id to identify the gui element.
+	\param text Title text of the image.
+	\return Pointer to the created image element. Returns 0 if an error
+	occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUIImage* addImage(video::ITexture* image, core::position2d<s32> pos,
 		bool useAlphaChannel=true, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0;
 
-	//! Adds an image element. 
-	/** Use IGUIImage::setImage later to set the image to be displayed. 
-	\return
-	 Returns a pointer to the created image element. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	//! Adds an image element.
+	/** Use IGUIImage::setImage later to set the image to be displayed.
+	\param rectangle Rectangle specifying the borders of the image.
+	\param parent Parent gui element of the image.
+	\param id Id to identify the gui element.
+	\param text Title text of the image.
+	\return Pointer to the created image element. Returns 0 if an error
+	occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUIImage* addImage(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0;
 
 	//! Adds a checkbox element.
-	/** \return
-	 Returns a pointer to the created check box. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	/** \param checked Define the initial state of the check box.
+	\param rectangle Rectangle specifying the borders of the check box.
+	\param parent Parent gui element of the check box.
+	\param id Id to identify the gui element.
+	\param text Title text of the check box.
+	\return Pointer to the created check box. Returns 0 if an error
+	occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUICheckBox* addCheckBox(bool checked, const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0;
 
 	//! Adds a list box element.
-	/** \return
-	 Returns a pointer to the created list box. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-	virtual IGUIListBox* addListBox(const core::rect<s32>& rectangle, 
+	/** \param rectangle Rectangle specifying the borders of the list box.
+	\param parent Parent gui element of the list box.
+	\param id Id to identify the gui element.
+	\param drawBackground Flag whether the background should be drawn.
+	\return Pointer to the created list box. Returns 0 if an error occured.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUIListBox* addListBox(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) = 0;
 
-	//! Adds an mesh viewer. Not 100% implemented yet.
-	/** \return
-	 Returns a pointer to the created mesh viewer. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-	virtual IGUIMeshViewer* addMeshViewer(const core::rect<s32>& rectangle, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0;
+	//! Adds a mesh viewer. Not 100% implemented yet.
+	/** \param rectangle Rectangle specifying the borders of the mesh viewer.
+	\param parent Parent gui element of the mesh viewer.
+	\param id Id to identify the gui element.
+	\param text Title text of the mesh viewer.
+	\return Pointer to the created mesh viewer. Returns 0 if an error
+	occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUIMeshViewer* addMeshViewer(const core::rect<s32>& rectangle,
+			IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0;
 
 	//! Adds a file open dialog.
-	/** \param modal: Defines if the dialog is modal. This means, that all other
-	 gui elements which were created before the message box cannot be used
-	 until this messagebox is removed.
-	 \return
-	 Returns a pointer to the created file open dialog. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-	virtual IGUIFileOpenDialog* addFileOpenDialog(const wchar_t* title = 0, 
+	/** \param title Text to be displayed as the title of the dialog.
+	\param modal Defines if the dialog is modal. This means, that all other
+	gui elements which were created before the message box cannot be used
+	until this messagebox is removed.
+	\param parent Parent gui element of the dialog.
+	\param id Id to identify the gui element.
+	\return Pointer to the created file open dialog. Returns 0 if an error
+	occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUIFileOpenDialog* addFileOpenDialog(const wchar_t* title = 0,
 		bool modal=true, IGUIElement* parent=0, s32 id=-1) = 0;
 
 	//! Adds a color select dialog.
-	/** \param modal: Defines if the dialog is modal. This means, that all other
-	 gui elements which were created before the message box cannot be used
-	 until this messagebox is removed.
-	 \return
-	 Returns a pointer to the created file open dialog. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-	virtual IGUIColorSelectDialog* addColorSelectDialog(const wchar_t* title = 0, 
+	/** \param title The title of the dialog.
+	\param modal Defines if the dialog is modal. This means, that all other
+	gui elements which were created before the dialog cannot be used
+	until it is removed.
+	\param parent The parent of the dialog.
+	\param id The ID of the dialog.
+	\return Pointer to the created file open dialog. Returns 0 if an error
+	occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUIColorSelectDialog* addColorSelectDialog(const wchar_t* title = 0,
 		bool modal=true, IGUIElement* parent=0, s32 id=-1) = 0;
 
-	//! Adds a static text. 
-	/** The returned pointer must not be dropped.
-	 \param text is the text to be displayed. Can be altered after creation with SetText().
-	 \param rectangle is the position of the static text.
-	 \param border has to be set to true if the static text should have a 3d border.
-	 \param wordWrap specifies, if the text should be wrapped into multiple lines.
-	 \param parent is the parent item of the element. E.g. a window. Set it to 0 to place the fader directly in the environment.
-	 \param id is a s32 to identify the static text element.
-	 \param fillBackground specifies if the background will be filled. Default: false.
-	 \return
-	 Returns a pointer to the created static text. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-	virtual IGUIStaticText* addStaticText(const wchar_t* text, const core::rect<s32>& rectangle, 
-		bool border=false, bool wordWrap=true, IGUIElement* parent=0, s32 id=-1, 
+	//! Adds a static text.
+	/** \param text Text to be displayed. Can be altered after creation by SetText().
+	\param rectangle Rectangle specifying the borders of the static text
+	\param border Set to true if the static text should have a 3d border.
+	\param wordWrap Enable if the text should wrap into multiple lines.
+	\param parent Parent item of the element, e.g. a window.
+	\param id The ID of the element.
+	\param fillBackground Enable if the background shall be filled.
+	Defaults to false.
+	\return Pointer to the created static text. Returns 0 if an error
+	occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUIStaticText* addStaticText(const wchar_t* text, const core::rect<s32>& rectangle,
+		bool border=false, bool wordWrap=true, IGUIElement* parent=0, s32 id=-1,
 		bool fillBackground = false) = 0;
 
-	//! Adds an edit box.  
-	/**  Supports unicode input from every keyboard around the world,
-	 scrolling, copying and pasting (exchanging data with the clipboard directly), maximum 
-	 character amount, marking and all shortcuts like ctrl+X, ctrl+V, ctrg+C, 
-	 shift+Left, shift+Right, Home, End, and so on. 
-	 \param text is the text to be displayed. Can be altered after creation with setText().
-	 \param rectangle is the position of the edit box.
-	 \param border has to be set to true if the edit box should have a 3d border.
-	 \param parent is the parent item of the element. E.g. a window. Set it to 0 to place the edit box directly in the environment.
-	 \param id is a s32 to identify the edit box.
-	 \return
-	 Returns a pointer to the created edit box. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-	virtual IGUIEditBox* addEditBox(const wchar_t* text, const core::rect<s32>& rectangle, 
+	//! Adds an edit box.
+	/** Supports unicode input from every keyboard around the world,
+	scrolling, copying and pasting (exchanging data with the clipboard
+	directly), maximum character amount, marking, and all shortcuts like
+	ctrl+X, ctrl+V, ctrl+C, shift+Left, shift+Right, Home, End, and so on.
+	\param text Text to be displayed. Can be altered after creation
+	by setText().
+	\param rectangle Rectangle specifying the borders of the edit box.
+	\param border Set to true if the edit box should have a 3d border.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the edit box directly in the environment.
+	\param id The ID of the element.
+	\return Pointer to the created edit box. Returns 0 if an error occured.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUIEditBox* addEditBox(const wchar_t* text, const core::rect<s32>& rectangle,
 		bool border=true, IGUIElement* parent=0, s32 id=-1) = 0;
 
-	//! Adds a spin box.  
-	/**  An edit box with up and down buttons
-	 \param text is the text to be displayed. Can be altered after creation with setText().
-	 \param rectangle is the position of the spin box.
-	 \param parent is the parent item of the element. E.g. a window. Set it to 0 to place the spin box directly in the environment.
-	 \param id is a s32 to identify the spin box.
-	 \return
-	 Returns a pointer to the created spin box. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-	virtual IGUISpinBox* addSpinBox(const wchar_t* text, const core::rect<s32>& rectangle, 
+	//! Adds a spin box.
+	/** An edit box with up and down buttons
+	\param text Text to be displayed. Can be altered after creation by setText().
+	\param rectangle Rectangle specifying the borders of the spin box.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the spin box directly in the environment.
+	\param id The ID of the element.
+	\return Pointer to the created spin box. Returns 0 if an error occured.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUISpinBox* addSpinBox(const wchar_t* text, const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1) = 0;
 
 	//! Adds an element for fading in or out.
-	/* \param rectangle: Pointer to rectangle specifing the borders of the element.
-	 If the pointer is NULL, the whole screen is used.
-	 \param parent: Parent item of the element. E.g. a window. Set it to 0 to place the static text directly in the environment.
-	 \param id: A s32 to identify the text.
-	 \return
-	 Returns a pointer to the created in-out-fader. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	/** \param rectangle Rectangle specifying the borders of the fader.
+	If the pointer is NULL, the whole screen is used.
+	\param parent Parent item of the element, e.g. a window.
+	\param id An identifier for the fader.
+	\return Pointer to the created in-out-fader. Returns 0 if an error
+	occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUIInOutFader* addInOutFader(const core::rect<s32>* rectangle=0, IGUIElement* parent=0, s32 id=-1) = 0;
 
 	//! Adds a tab control to the environment.
-	/** \param rectangle is the position of the tab control.
-	 \param parent is the parent item of the element. E.g. a window. Set it to 0 to place the tab control directly in the environment.
-	 \param fillbackground specifies if the background of the tab control should be drawn to.
-	 \param border specifiys if a flat 3d border should be drawn.
-	 This is usually not necesarry unless you don't place the control directly into the environment without a window as parent.
-	 \param id is a s32 to identify the tab control.
-	 \return
-	 Returns a pointer to the created tab control element. Returns 0 if an error occured.
-	 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	/** \param rectangle Rectangle specifying the borders of the tab control.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the tab control directly in the environment.
+	\param fillbackground Specifies if the background of the tab control
+	should be drawn.
+	\param border Specifies if a flat 3d border should be drawn. This is
+	usually not necessary unless you place the control directly into
+	the environment without a window as parent.
+	\param id An identifier for the tab control.
+	\return Pointer to the created tab control element. Returns 0 if an
+	error occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUITabControl* addTabControl(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, bool fillbackground=false,
 		bool border=true, s32 id=-1) = 0;
 
-	//! Adds tab to the environment. 
-	/**  You can use this element to group other elements. This is not used for creating tabs on tab controls,
-	 please use IGUITabControl::addTab() for this instead.
-	 \param rectangle is the position of the tab.
-	 \param parent is the parent item of the element. E.g. a window. Set it to 0 to place the tab directly in the environment.
-	 \param id is a s32 to identify the tab. */
+	//! Adds tab to the environment.
+	/** You can use this element to group other elements. This is not used
+	for creating tabs on tab controls, please use IGUITabControl::addTab()
+	for this instead.
+	\param rectangle Rectangle specifying the borders of the tab.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the tab directly in the environment.
+	\param id An identifier for the tab.
+	\return Pointer to the created tab. Returns 0 if an
+	error occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUITab* addTab(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1) = 0;
 
 	//! Adds a context menu to the environment.
-	/** \param rectangle is the position of the menu. Note that the menu is 
-	 resizing itself based on what items you add.
-	 \param parent is the parent item of the element. E.g. a window. Set it to 0 to place the menu directly in the environment.
-	 \param id is a s32 to identify the menu. */
+	/** \param rectangle Rectangle specifying the borders of the menu.
+	Note that the menu is resizing itself based on what items you add.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the menu directly in the environment.
+	\param id An identifier for the menu.
+	\return Pointer to the created context menu. Returns 0 if an
+	error occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUIContextMenu* addContextMenu(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1) = 0;
 
 	//! Adds a menu to the environment.
-	/*  This is like the menu you can find on top of most windows in modern graphical user interfaces.
-	 \param parent is the parent item of the element. E.g. a window. Set it to 0 to place the menu directly in the environment.
-	 \param id is a s32 to identify the menu. */
+	/* This is like the menu you can find on top of most windows in modern
+	graphical user interfaces.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the menu directly in the environment.
+	\param id An identifier for the menu.
+	\return Pointer to the created menu. Returns 0 if an
+	error occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUIContextMenu* addMenu(IGUIElement* parent=0, s32 id=-1) = 0;
 
 	//! Adds a toolbar to the environment.
-	/** It is like a menu is always placed on top
-	 in its parent, and contains buttons.
-	 \param parent is the parent item of the element. E.g. a window. Set it to 0 to place the tool bar directly in the environment.
-	 \param id is a s32 to identify the tool bar. */
+	/** It is like a menu that is always placed on top of its parent, and
+	contains buttons.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the tool bar directly in the environment.
+	\param id An identifier for the tool bar.
+	\return Pointer to the created tool bar. Returns 0 if an
+	error occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUIToolBar* addToolBar(IGUIElement* parent=0, s32 id=-1) = 0;
 
 	//! Adds a combo box to the environment.
-	/** \param parent is the parent item of the element. E.g. a window. Set it to 0 to place the combo box directly in the environment.
-	 \param id is a s32 to identify the combo box. */
+	/** \param rectangle Rectangle specifying the borders of the combo box.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the combo box directly in the environment.
+	\param id An identifier for the combo box.
+	\return Pointer to the created combo box. Returns 0 if an
+	error occured. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
 	virtual IGUIComboBox* addComboBox(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1) = 0;
 
-	//! Returns the default element factory which can create all built in elements
+	//! Adds a table to the environment
+	/** \param rectangle Rectangle specifying the borders of the table.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the table directly in the environment.
+	\param id An identifier for the combo box.
+	\param drawBackground Sets whether to draw the background filled.
+	\return Pointer to the created table. Returns 0 if an error occured.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUITable* addTable(const core::rect<s32>& rectangle,
+		IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) =0;
+
+	//! Get the default element factory which can create all built-in elements
+	/** \return Pointer to the factory.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
 	virtual IGUIElementFactory* getDefaultGUIElementFactory() const = 0;
 
 	//! Adds an element factory to the gui environment.
-	/** Use this to extend the gui environment with new element types which it should be
-	able to create automaticly, for example when loading data from xml files. */
+	/** Use this to extend the gui environment with new element types which
+	it should be able to create automatically, for example when loading
+	data from xml files.
+	\param factoryToAdd Pointer to new factory. */
 	virtual void registerGUIElementFactory(IGUIElementFactory* factoryToAdd) = 0;
 
-	//! Returns amount of registered gui element factories.
+	//! Get amount of registered gui element factories.
+	/** \return Amount of registered gui element factories. */
 	virtual u32 getRegisteredGUIElementFactoryCount() const = 0;
 
-	//! Returns a gui element factory by index
+	//! Get a gui element factory by index
+	/** \param index Index of the factory.
+	\return Factory at given index, or 0 if no such factory exists. */
 	virtual IGUIElementFactory* getGUIElementFactory(u32 index) const = 0;
 
-	//! Adds a GUI Element by its name
+	//! Adds a GUI element by its name
+	/** Each factory is checked if it can create an element of the given
+	name. The first match will be created.
+	\param elementName Name of the element to be created.
+	\param parent Parent of the new element, if not 0.
+	\return New GUI element, or 0 if no such element exists. */
 	virtual IGUIElement* addGUIElement(const c8* elementName, IGUIElement* parent=0) = 0;
 
 	//! Saves the current gui into a file.
-	//! \param filename: Name of the file.
-	//! \param start: The GUIElement to start with. Root if 0.
+	/** \param filename Name of the file.
+	\param start The GUIElement to start with. Root if 0.
+	\return True if saving succeeded, else false. */
 	virtual bool saveGUI(const c8* filename, IGUIElement* start=0) = 0;
 
 	//! Saves the current gui into a file.
-	//! \param file: The file to write to.
-	//! \param start: The GUIElement to start with. Root if 0.
+	/** \param file The file to write to.
+	\param start The GUIElement to start with. Root if 0.
+	\return True if saving succeeded, else false. */
 	virtual bool saveGUI(io::IWriteFile* file, IGUIElement* start=0) = 0;
 
 	//! Loads the gui. Note that the current gui is not cleared before.
-	//! \param filename: Name of the file .
-	//! \param parent: Parent for the loaded GUI, root if 0.
+	/** \param filename Name of the file .
+	\param parent Parent for the loaded GUI, root if 0.
+	\return True if loading succeeded, else false. */
 	virtual bool loadGUI(const c8* filename, IGUIElement* parent=0) = 0;
 
 	//! Loads the gui. Note that the current gui is not cleared before.
-	//! \param file: The file to load from.
-	//! \param parent: Parent for the loaded GUI, root if 0.
-	virtual bool loadGUI(io::IReadFile* file, IGUIElement* parent=0) = 0;	
+	/** \param file The file to load from.
+	\param parent Parent for the loaded GUI, root if 0.
+	\return True if loading succeeded, else false. */
+	virtual bool loadGUI(io::IReadFile* file, IGUIElement* parent=0) = 0;
 
 	//! Writes attributes of the gui environment
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const =0;
@@ -417,7 +542,6 @@ public:
 
 	//! reads an element
 	virtual void readGUIElement(io::IXMLReader* reader, IGUIElement* parent) =0;
-
 };
 
 
diff --git a/src/dep/include/irrlicht/IGUIFileOpenDialog.h b/src/dep/include/irrlicht/IGUIFileOpenDialog.h
index 30c26b9..5b7270b 100644
--- a/src/dep/include/irrlicht/IGUIFileOpenDialog.h
+++ b/src/dep/include/irrlicht/IGUIFileOpenDialog.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,9 +21,6 @@ namespace gui
 		IGUIFileOpenDialog(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_FILE_OPEN_DIALOG, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIFileOpenDialog() {}
-
 		//! Returns the filename of the selected file. Returns NULL, if no file was selected.
 		virtual const wchar_t* getFileName() const = 0;
 	};
diff --git a/src/dep/include/irrlicht/IGUIFont.h b/src/dep/include/irrlicht/IGUIFont.h
index ec942e5..a3bb59a 100644
--- a/src/dep/include/irrlicht/IGUIFont.h
+++ b/src/dep/include/irrlicht/IGUIFont.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -20,14 +20,14 @@ enum EGUI_FONT_TYPE
 	//! Bitmap fonts loaded from an XML file or a texture.
 	EGFT_BITMAP = 0,
 
-	//! Scalable vector fonts loaded from an XML file. 
-	//! These fonts reside in system memory and use no video memory 
-	//! until they are displayed. These are slower than bitmap fonts
-	//! but can be easily scaled and rotated.
+	//! Scalable vector fonts loaded from an XML file.
+	/** These fonts reside in system memory and use no video memory
+	until they are displayed. These are slower than bitmap fonts
+	but can be easily scaled and rotated. */
 	EGFT_VECTOR,
 
 	//! A font which uses a the native API provided by the operating system.
-	//! Currently not used.
+	/** Currently not used. */
 	EGFT_OS,
 
 	//! An external font type provided by the user.
@@ -39,24 +39,21 @@ class IGUIFont : public virtual IReferenceCounted
 {
 public:
 
-	//! Destructor
-	virtual ~IGUIFont() {}
-
 	//! Draws an text and clips it to the specified rectangle if wanted.
 	/** \param text: Text to draw
-	 \param position: Rectangle specifying position where to draw the text.
-	 \param color: Color of the text
-	 \param hcenter: Specifiies if the text should be centered horizontally into the rectangle.
-	 \param vcenter: Specifiies if the text should be centered vertically into the rectangle.
-	 \param clip: Optional pointer to a rectangle against which the text will be clipped.
-	 If the pointer is null, no clipping will be done. */
-	virtual void draw(const wchar_t* text, const core::rect<s32>& position, 
+	\param position: Rectangle specifying position where to draw the text.
+	\param color: Color of the text
+	\param hcenter: Specifiies if the text should be centered horizontally into the rectangle.
+	\param vcenter: Specifies if the text should be centered vertically into the rectangle.
+	\param clip: Optional pointer to a rectangle against which the text will be clipped.
+	If the pointer is null, no clipping will be done. */
+	virtual void draw(const wchar_t* text, const core::rect<s32>& position,
 		video::SColor color, bool hcenter=false, bool vcenter=false,
 		const core::rect<s32>* clip=0) = 0;
 
 	//! Calculates the dimension of a text.
-	/** \return Returns width and height of the area covered by the text if it would be
-	  drawn. */
+	/** \return Returns width and height of the area covered by the text if
+	it would be drawn. */
 	virtual core::dimension2d<s32> getDimension(const wchar_t* text) const = 0;
 
 	//! Calculates the index of the character in the text which is on a specific position.
@@ -69,8 +66,10 @@ public:
 	//! Returns the type of this font
 	virtual EGUI_FONT_TYPE getType() const { return EGFT_CUSTOM; }
 
-	//! Sets global kerning for the font.
+	//! Sets global kerning width for the font.
 	virtual void setKerningWidth (s32 kerning) = 0;
+
+	//! Sets global kerning height for the font.
 	virtual void setKerningHeight (s32 kerning) = 0;
 
 	//! Gets kerning values (distance between letters) for the font. If no parameters are provided,
@@ -79,7 +78,7 @@ public:
 	to the global kerning value. For example, a space might only be one pixel wide, but it may
 	be displayed as several pixels.
 	\param previousLetter: If provided, kerning is calculated for both letters and added to the global
-	kerning value. For example, in a font which supports kerning pairs a string such as 'Wo' may have 
+	kerning value. For example, in a font which supports kerning pairs a string such as 'Wo' may have
 	the 'o' tucked neatly under the 'W'.
 	*/
 	virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const = 0;
diff --git a/src/dep/include/irrlicht/IGUIFontBitmap.h b/src/dep/include/irrlicht/IGUIFontBitmap.h
index 4a4a22f..152ca10 100644
--- a/src/dep/include/irrlicht/IGUIFontBitmap.h
+++ b/src/dep/include/irrlicht/IGUIFontBitmap.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,9 +18,6 @@ class IGUIFontBitmap : public IGUIFont
 {
 public:
 
-	//! Destructor
-	virtual ~IGUIFontBitmap() {}
-
 	//! Returns the type of this font
 	virtual EGUI_FONT_TYPE getType() const { return EGFT_BITMAP; }
 
diff --git a/src/dep/include/irrlicht/IGUIImage.h b/src/dep/include/irrlicht/IGUIImage.h
index dcb5ad0..55e6247 100644
--- a/src/dep/include/irrlicht/IGUIImage.h
+++ b/src/dep/include/irrlicht/IGUIImage.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -25,9 +25,6 @@ namespace gui
 		IGUIImage(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_IMAGE, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIImage() {}
-
 		//! Sets an image
 		virtual void setImage(video::ITexture* image) = 0;
 
diff --git a/src/dep/include/irrlicht/IGUIInOutFader.h b/src/dep/include/irrlicht/IGUIInOutFader.h
index 6661645..3732418 100644
--- a/src/dep/include/irrlicht/IGUIInOutFader.h
+++ b/src/dep/include/irrlicht/IGUIInOutFader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,7 +14,7 @@ namespace gui
 {
 
 	//! Element for fading out or in
-	/**	Here is a small example on how the class is used. In this example we fade
+	/** Here is a small example on how the class is used. In this example we fade
 	in from a total red screen in the beginning. As you can see, the fader is not
 	only useful for dramatic in and out fading, but also to show that the player
 	is hit in a first person shooter game for example.
@@ -32,29 +32,27 @@ namespace gui
 		IGUIInOutFader(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_IN_OUT_FADER, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIInOutFader() {}
-
 		//! Gets the color to fade out to or to fade in from.
 		virtual video::SColor getColor() const = 0;
 
 		//! Sets the color to fade out to or to fade in from.
-		//! \param color: Color to where it is faded out od from it is faded in.
+		/** \param color: Color to where it is faded out od from it is faded in. */
 		virtual void setColor(video::SColor color) = 0;
 		virtual void setColor(video::SColor source, video::SColor dest) = 0;
 
-		//! Starts the fade in process. In the beginning the whole rect is drawn by
-		//! the set color (black by default) and at the end of the overgiven
-		//! time the color has faded out.
-		//! \param time: Time specifing how long it should need to fade in,
-		//! in milliseconds.
+		//! Starts the fade in process.
+		/** In the beginning the whole rect is drawn by the set color
+		(black by default) and at the end of the overgiven time the
+		color has faded out.
+		\param time: Time specifing how long it should need to fade in,
+		in milliseconds. */
 		virtual void fadeIn(u32 time) = 0;
 
-		//! Starts the fade out process. In the beginning everything is visible,
-		//! and at the end of the time only the set color (black by the fault)
-		//! will be drawn.
-		//! \param time: Time specifing how long it should need to fade out,
-		//! in milliseconds.
+		//! Starts the fade out process.
+		/** In the beginning everything is visible, and at the end of
+		the time only the set color (black by the fault) will be drawn.
+		\param time: Time specifing how long it should need to fade out,
+		in milliseconds. */
 		virtual void fadeOut(u32 time) = 0;
 
 		//! Returns if the fade in or out process is done.
diff --git a/src/dep/include/irrlicht/IGUIListBox.h b/src/dep/include/irrlicht/IGUIListBox.h
index 0b3cb0f..26fa089 100644
--- a/src/dep/include/irrlicht/IGUIListBox.h
+++ b/src/dep/include/irrlicht/IGUIListBox.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -12,7 +12,6 @@ namespace irr
 {
 namespace gui
 {
-	class IGUIFont;
 	class IGUISpriteBank;
 
 	//! Enumeration for listbox colors
@@ -39,9 +38,6 @@ namespace gui
 		IGUIListBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_LIST_BOX, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIListBox() {}
-
 		//! returns amount of list items
 		virtual u32 getItemCount() const = 0;
 
@@ -52,10 +48,9 @@ namespace gui
 		virtual u32 addItem(const wchar_t* text) = 0;
 
 		//! adds an list item with an icon
-		//! \param text Text of list entry
-		//! \param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon
-		//! \return
-		//! returns the id of the new created item
+		/** \param text Text of list entry
+		\param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon
+		\return The id of the new created item */
 		virtual u32 addItem(const wchar_t* text, s32 icon) = 0;
 
 		//! Removes an item from the list
@@ -64,10 +59,11 @@ namespace gui
 		//! Returns the icon of an item
 		virtual s32 getIcon(u32 index) const = 0;
 
-		//! Sets the sprite bank which should be used to draw list icons. This font is set to the sprite bank of
-		//! the built-in-font by default. A sprite can be displayed in front of every list item.
-		//! An icon is an index within the icon sprite bank. Several default icons are available in the
-		//! skin through getIcon
+		//! Sets the sprite bank which should be used to draw list icons.
+		/** This font is set to the sprite bank of the built-in-font by
+		default. A sprite can be displayed in front of every list item.
+		An icon is an index within the icon sprite bank. Several
+		default icons are available in the skin through getIcon. */
 		virtual void setSpriteBank(IGUISpriteBank* bank) = 0;
 
 		//! clears the list, deletes all items in the listbox
@@ -79,8 +75,7 @@ namespace gui
 		//! sets the selected item. Set this to -1 if no item should be selected
 		virtual void setSelected(s32 index) = 0;
 
-		//! set whether the listbox should scroll to show a newly selected item
-		//! or a new item as it is added to the list.
+		//! set whether the listbox should scroll to new or newly selected items
 		virtual void setAutoScrollEnabled(bool scroll) = 0;
 
 		//! returns true if automatic scrolling is enabled, false if not.
@@ -95,23 +90,23 @@ namespace gui
 		//! clear all item colors at index
 		virtual void clearItemOverrideColor(u32 index) = 0;
 
-		//! clear item color at index for given colortype 
+		//! clear item color at index for given colortype
 		virtual void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) = 0;
 
-		//! has the item at index it's color overwritten?
+		//! has the item at index its color overwritten?
 		virtual bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const = 0;
 
-		//! return the overwrite color at given item index. 
+		//! return the overwrite color at given item index.
 		virtual video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const = 0;
 
 		//! return the default color which is used for the given colorType
 		virtual video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const = 0;
 
-		//! set the item at the given index 
+		//! set the item at the given index
 		virtual void setItem(u32 index, const wchar_t* text, s32 icon) = 0;
 
-		//! Insert the item at the given index 
-		//! Return the index on success or -1 on failure.
+		//! Insert the item at the given index
+		/** \return The index on success or -1 on failure. */
 		virtual s32 insertItem(u32 index, const wchar_t* text, s32 icon) = 0;
 
 		//! Swap the items at the given indices
diff --git a/src/dep/include/irrlicht/IGUIMeshViewer.h b/src/dep/include/irrlicht/IGUIMeshViewer.h
index 5500cc8..5bc499f 100644
--- a/src/dep/include/irrlicht/IGUIMeshViewer.h
+++ b/src/dep/include/irrlicht/IGUIMeshViewer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -32,9 +32,6 @@ namespace gui
 		IGUIMeshViewer(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_MESH_VIEWER, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIMeshViewer() {}
-
 		//! Sets the mesh to be shown
 		virtual void setMesh(scene::IAnimatedMesh* mesh) = 0;
 
diff --git a/src/dep/include/irrlicht/IGUIScrollBar.h b/src/dep/include/irrlicht/IGUIScrollBar.h
index 0d6dca3..9b60e1f 100644
--- a/src/dep/include/irrlicht/IGUIScrollBar.h
+++ b/src/dep/include/irrlicht/IGUIScrollBar.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,9 +21,6 @@ namespace gui
 		IGUIScrollBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_SCROLL_BAR, environment, parent, id, rectangle) {}
 
-		//! destructor
-		~IGUIScrollBar() {};
-
 		//! gets the maximum value of the scrollbar.
 		virtual s32 getMax() const = 0;
 
@@ -33,15 +30,17 @@ namespace gui
 		//! gets the small step value
 		virtual s32 getSmallStep() const = 0;
 
-		//! Sets the small step, the amount that the value changes by when clicking
-		//! on the buttons or using the cursor keys.
+		//! Sets the small step
+		/** That is the amount that the value changes by when clicking
+		on the buttons or using the cursor keys. */
 		virtual void setSmallStep(s32 step) = 0;
 
 		//! gets the large step value
 		virtual s32 getLargeStep() const = 0;
 
-		//! Sets the large step, the amount that the value changes by when clicking
-		//! in the tray, or using the page up and page down keys.
+		//! Sets the large step
+		/** That is the amount that the value changes by when clicking
+		in the tray, or using the page up and page down keys. */
 		virtual void setLargeStep(s32 step) = 0;
 
 		//! gets the current position of the scrollbar
diff --git a/src/dep/include/irrlicht/IGUISkin.h b/src/dep/include/irrlicht/IGUISkin.h
index 1ccfded..e79df2b 100644
--- a/src/dep/include/irrlicht/IGUISkin.h
+++ b/src/dep/include/irrlicht/IGUISkin.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,6 +6,7 @@
 #define __I_GUI_SKIN_H_INCLUDED__
 
 #include "IAttributeExchangingObject.h"
+#include "EGUIAlignment.h"
 #include "SColor.h"
 #include "rect.h"
 
@@ -270,7 +271,7 @@ namespace gui
 		"windowRestore",
 		"windowClose",
 		"windowMinimize",
-		"windowResize", 
+		"windowResize",
 		"cursorUp",
 		"cursorDown",
 		"cursorLeft",
@@ -325,9 +326,6 @@ namespace gui
 	{
 	public:
 
-		//! destructor
-		virtual ~IGUISkin() {};
-
 		//! returns default color
 		virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const = 0;
 
@@ -337,7 +335,7 @@ namespace gui
 		//! returns size for the given size type
 		virtual s32 getSize(EGUI_DEFAULT_SIZE size) const = 0;
 
-		//! Returns a default text. 
+		//! Returns a default text.
 		/** For example for Message box button captions:
 		"OK", "Cancel", "Yes", "No" and so on. */
 		virtual const wchar_t* getDefaultText(EGUI_DEFAULT_TEXT text) const = 0;
@@ -367,50 +365,50 @@ namespace gui
 		virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const = 0;
 
 		//! Sets a default icon
-		/** Sets the sprite index used for drawing icons like arrows, 
-		close buttons and ticks in checkboxes 
+		/** Sets the sprite index used for drawing icons like arrows,
+		close buttons and ticks in checkboxes
 		\param icon: Enum specifying which icon to change
 		\param index: The sprite index used to draw this icon */
 		virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index) = 0;
 
 		//! draws a standard 3d button pane
-		/**	Used for drawing for example buttons in normal state. 
+		/** Used for drawing for example buttons in normal state.
 		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details. 
+		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by IGUISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
+		\param clip: Clip area. */
 		virtual void draw3DButtonPaneStandard(IGUIElement* element,
 			const core::rect<s32>& rect,
 			const core::rect<s32>* clip=0) = 0;
 
 		//! draws a pressed 3d button pane
-		/**	Used for drawing for example buttons in pressed state. 
+		/** Used for drawing for example buttons in pressed state.
 		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details. 
+		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by IGUISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
-		virtual void draw3DButtonPanePressed(IGUIElement* element, 
+		\param clip: Clip area. */
+		virtual void draw3DButtonPanePressed(IGUIElement* element,
 			const core::rect<s32>& rect,
 			const core::rect<s32>* clip=0) = 0;
 
 		//! draws a sunken 3d pane
 		/** Used for drawing the background of edit, combo or check boxes.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by IGUISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param bgcolor: Background color.
-		\param flat: Specifies if the sunken pane should be flat or displayed as sunken 
-		 deep into the ground.
+		\param flat: Specifies if the sunken pane should be flat or displayed as sunken
+		deep into the ground.
 		\param fillBackGround: Specifies if the background should be filled with the background
 		color or not be drawn at all.
 		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
+		\param clip: Clip area. */
 		virtual void draw3DSunkenPane(IGUIElement* element,
 			video::SColor bgcolor, bool flat, bool fillBackGround,
 			const core::rect<s32>& rect,
@@ -419,12 +417,12 @@ namespace gui
 		//! draws a window background
 		/** Used for drawing the background of dialogs and windows.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by IGUISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param titleBarColor: Title color.
 		\param drawTitleBar: True to enable title drawing.
 		\param rect: Defining area where to draw.
-		\param clip: Clip area.	
+		\param clip: Clip area.
 		\return Returns rect where it would be good to draw title bar text. */
 		virtual core::rect<s32> draw3DWindowBackground(IGUIElement* element,
 			bool drawTitleBar, video::SColor titleBarColor,
@@ -432,79 +430,82 @@ namespace gui
 			const core::rect<s32>* clip=0) = 0;
 
 		//! draws a standard 3d menu pane
-		/**	Used for drawing for menus and context menus. 
+		/** Used for drawing for menus and context menus.
 		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details. 
+		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by IGUISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
+		\param clip: Clip area. */
 		virtual void draw3DMenuPane(IGUIElement* element,
 			const core::rect<s32>& rect,
 			const core::rect<s32>* clip=0) = 0;
 
 		//! draws a standard 3d tool bar
-		/**	Used for drawing for toolbars and menus.
+		/** Used for drawing for toolbars and menus.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by IGUISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
+		\param clip: Clip area. */
 		virtual void draw3DToolBar(IGUIElement* element,
 			const core::rect<s32>& rect,
 			const core::rect<s32>* clip=0) = 0;
 
 		//! draws a tab button
-		/**	Used for drawing for tab buttons on top of tabs.
+		/** Used for drawing for tab buttons on top of tabs.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by IGUISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param active: Specifies if the tab is currently active.
 		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
+		\param clip: Clip area.
+		\param alignment Alignment of GUI element. */
 		virtual void draw3DTabButton(IGUIElement* element, bool active,
-			const core::rect<s32>& rect, const core::rect<s32>* clip=0) = 0;
+			const core::rect<s32>& rect, const core::rect<s32>* clip=0, gui::EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) = 0;
 
 		//! draws a tab control body
-		/**	\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		/** \param element: Pointer to the element which wishes to draw this. This parameter
+		is usually not used by IGUISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param border: Specifies if the border should be drawn.
 		\param background: Specifies if the background should be drawn.
 		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
+		\param clip: Clip area.
+		\param tabHeight Height of tab.
+		\param alignment Alignment of GUI element. */
 		virtual void draw3DTabBody(IGUIElement* element, bool border, bool background,
-			const core::rect<s32>& rect, const core::rect<s32>* clip=0) = 0;
+			const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1, gui::EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT ) = 0;
 
 		//! draws an icon, usually from the skin's sprite bank
-		/** \param element: Pointer to the element which wishes to draw this icon. 
-		This parameter is usually not used by IGUISkin, but can be used for example 
-		by more complex implementations to find out how to draw the part exactly. 
+		/** \param element: Pointer to the element which wishes to draw this icon.
+		This parameter is usually not used by IGUISkin, but can be used for example
+		by more complex implementations to find out how to draw the part exactly.
 		\param icon: Specifies the icon to be drawn.
 		\param position: The position to draw the icon
 		\param starttime: The time at the start of the animation
 		\param currenttime: The present time, used to calculate the frame number
 		\param loop: Whether the animation should loop or not
-		\param clip: Clip area.	*/
+		\param clip: Clip area. */
 		virtual void drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
-			const core::position2di position, u32 starttime=0, u32 currenttime=0, 
+			const core::position2di position, u32 starttime=0, u32 currenttime=0,
 			bool loop=false, const core::rect<s32>* clip=0) = 0;
 
 		//! draws a 2d rectangle.
-		/** \param element: Pointer to the element which wishes to draw this icon. 
-		This parameter is usually not used by IGUISkin, but can be used for example 
-		by more complex implementations to find out how to draw the part exactly. 
-		\param color: Color of the rectangle to draw. The alpha component specifies how 
+		/** \param element: Pointer to the element which wishes to draw this icon.
+		This parameter is usually not used by IGUISkin, but can be used for example
+		by more complex implementations to find out how to draw the part exactly.
+		\param color: Color of the rectangle to draw. The alpha component specifies how
 		transparent the rectangle will be.
 		\param pos: Position of the rectangle.
 		\param clip: Pointer to rectangle against which the rectangle will be clipped.
 		If the pointer is null, no clipping will be performed. */
-		virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color, 
+		virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color,
 			const core::rect<s32>& pos, const core::rect<s32>* clip = 0) = 0;
 
 		//! get the type of this skin
-		virtual EGUI_SKIN_TYPE getType() const { return EGST_UNKNOWN; };
+		virtual EGUI_SKIN_TYPE getType() const { return EGST_UNKNOWN; }
 	};
 
 
diff --git a/src/dep/include/irrlicht/IGUISpinBox.h b/src/dep/include/irrlicht/IGUISpinBox.h
index 93cc033..36c67ab 100644
--- a/src/dep/include/irrlicht/IGUISpinBox.h
+++ b/src/dep/include/irrlicht/IGUISpinBox.h
@@ -1,5 +1,6 @@
-// Copyright (C) 2006 Michael Zeilfelder
-// This file uses the licence of the Irrlicht Engine.
+// Copyright (C) 2006-2009 Michael Zeilfelder
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __I_GUI_SPIN_BOX_H_INCLUDED__
 #define __I_GUI_SPIN_BOX_H_INCLUDED__
@@ -22,13 +23,7 @@ namespace gui
 					s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_SPIN_BOX, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUISpinBox() {}
-
 		//! Access the edit box used in the spin control
-		/** \param enable: If set to true, the override color, which can be set
-		 with IGUIEditBox::setOverrideColor is used, otherwise the
-		 EGDC_BUTTON_TEXT color of the skin. */
 		virtual IGUIEditBox* getEditBox() const = 0;
 
 		//! set the current value of the spinbox
diff --git a/src/dep/include/irrlicht/IGUISpriteBank.h b/src/dep/include/irrlicht/IGUISpriteBank.h
index cd01763..0a4032d 100644
--- a/src/dep/include/irrlicht/IGUISpriteBank.h
+++ b/src/dep/include/irrlicht/IGUISpriteBank.h
@@ -1,3 +1,6 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __I_GUI_SPRITE_BANK_H_INCLUDED__
 #define __I_GUI_SPRITE_BANK_H_INCLUDED__
@@ -18,15 +21,18 @@ namespace video
 namespace gui
 {
 
+//! A single sprite frame.
 struct SGUISpriteFrame
 {
 	u32 textureNumber;
 	u32 rectNumber;
 };
 
+//! A sprite composed of several frames.
 struct SGUISprite
 {
-	SGUISprite() : Frames(), frameTime(0) { };
+	SGUISprite() : Frames(), frameTime(0) {}
+
 	core::array<SGUISpriteFrame> Frames;
 	u32 frameTime;
 };
@@ -37,9 +43,6 @@ class IGUISpriteBank : public virtual IReferenceCounted
 {
 public:
 
-	//! Destructor
-	virtual ~IGUISpriteBank() {}
-
 	//! Returns the list of rectangles held by the sprite bank
 	virtual core::array< core::rect<s32> >& getPositions() = 0;
 
@@ -59,10 +62,11 @@ public:
 	virtual void setTexture(u32 index, video::ITexture* texture) = 0;
 
 	//! Draws a sprite in 2d with position and color
-	virtual void draw2DSprite(u32 index, const core::position2di& pos, const core::rect<s32>* clip=0,
+	virtual void draw2DSprite(u32 index, const core::position2di& pos,
+			const core::rect<s32>* clip=0,
 			const video::SColor& color= video::SColor(255,255,255,255),
-			u32 starttime=0, u32 currenttime=0, bool loop=true, bool center=false) = 0;
-
+			u32 starttime=0, u32 currenttime=0,
+			bool loop=true, bool center=false) = 0;
 };
 
 
diff --git a/src/dep/include/irrlicht/IGUIStaticText.h b/src/dep/include/irrlicht/IGUIStaticText.h
index 8041ffb..18cc244 100644
--- a/src/dep/include/irrlicht/IGUIStaticText.h
+++ b/src/dep/include/irrlicht/IGUIStaticText.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,30 +23,27 @@ namespace gui
 		IGUIStaticText(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_STATIC_TEXT, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIStaticText() {}
-
 		//! Sets another skin independent font.
 		/** If this is set to zero, the button uses the font of the skin.
 		\param font: New font to set. */
 		virtual void setOverrideFont(IGUIFont* font=0) = 0;
 
 		//! Gets the override font (if any)
-		//! \return The override font (may be 0)
+		/** \return The override font (may be 0) */
 		virtual IGUIFont* getOverrideFont(void) const = 0;
 
 		//! Sets another color for the text.
 		/** If set, the static text does not use the EGDC_BUTTON_TEXT color defined
-		 in the skin, but the set color instead. You don't need to call 
-		 IGUIStaticText::enableOverrrideColor(true) after this, this is done
-		 by this function.
-		 If you set a color, and you want the text displayed with the color
-		 of the skin again, call IGUIStaticText::enableOverrideColor(false);
-		 \param color: New color of the text. */
+		in the skin, but the set color instead. You don't need to call
+		IGUIStaticText::enableOverrrideColor(true) after this, this is done
+		by this function.
+		If you set a color, and you want the text displayed with the color
+		of the skin again, call IGUIStaticText::enableOverrideColor(false);
+		\param color: New color of the text. */
 		virtual void setOverrideColor(video::SColor color) = 0;
 
 		//! Gets the override color
-		//! \return: The override color
+		/** \return: The override color */
 		virtual video::SColor const& getOverrideColor(void) const = 0;
 
 		//! Sets if the static text should use the overide color or the color in the gui skin.
@@ -56,7 +53,7 @@ namespace gui
 		virtual void enableOverrideColor(bool enable) = 0;
 
 		//! Checks if an override color is enabled
-		//! \return true if the override color is enabled, false otherwise
+		/** \return true if the override color is enabled, false otherwise */
 		virtual bool isOverrideColorEnabled(void) const = 0;
 
 		//! Sets another color for the background.
@@ -69,30 +66,30 @@ namespace gui
 		virtual void setDrawBorder(bool draw) = 0;
 
 		//! Sets text justification mode
-		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default), 
-		 EGUIA_LOWEERRIGHT for right justified, or EGUIA_CENTER for centered text.
-		\param vertical: EGUIA_UPPERLEFT to align with top edge, 
-		 EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
+		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
+		EGUIA_LOWEERRIGHT for right justified, or EGUIA_CENTER for centered text.
+		\param vertical: EGUIA_UPPERLEFT to align with top edge,
+		EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
 		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
 
 		//! Enables or disables word wrap for using the static text as multiline text control.
-		/** \param enable: If set to true, words going over one line are 
-		 broken on to the next line. */
+		/** \param enable: If set to true, words going over one line are
+		broken on to the next line. */
 		virtual void setWordWrap(bool enable) = 0;
 
 		//! Checks if word wrap is enabled
-		//! \return true if word wrap is enabled, false otherwise
+		/** \return true if word wrap is enabled, false otherwise */
 		virtual bool isWordWrapEnabled(void) const = 0;
 
-		//! Returns the height of the text in pixels when it is drawn. 
-		/** This is useful for adjusting the layout of gui elements based on the height 
-		 of the multiline text in this element. 
-		 \return Returns height of text in pixels. */
+		//! Returns the height of the text in pixels when it is drawn.
+		/** This is useful for adjusting the layout of gui elements based on the height
+		of the multiline text in this element.
+		\return Height of text in pixels. */
 		virtual s32 getTextHeight() const = 0;
 
 		//! Returns the width of the current text, in the current font
 		/** If the text is broken, this returns the width of the widest line
-		 \return The width of the text, or the widest broken line. */
+		\return The width of the text, or the widest broken line. */
 		virtual s32 getTextWidth(void) const = 0;
 	};
 
diff --git a/src/dep/include/irrlicht/IGUITabControl.h b/src/dep/include/irrlicht/IGUITabControl.h
index a296fd9..b106d6d 100644
--- a/src/dep/include/irrlicht/IGUITabControl.h
+++ b/src/dep/include/irrlicht/IGUITabControl.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -7,6 +7,7 @@
 
 #include "IGUIElement.h"
 #include "SColor.h"
+#include "IGUISkin.h"
 
 namespace irr
 {
@@ -21,9 +22,6 @@ namespace gui
 		IGUITab(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_TAB, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUITab() {}
-
 		//! Returns number of tab if in tabcontrol.
 		/** Can be accessed later IGUITabControl::getTab() by this number. */
 		virtual s32 getNumber() const = 0;
@@ -39,6 +37,12 @@ namespace gui
 
 		//! returns the color of the background
 		virtual video::SColor getBackgroundColor() const = 0;
+
+		//! sets the color of the text
+		virtual void setTextColor(video::SColor c) = 0;
+
+		//! gets the color of the text
+		virtual video::SColor getTextColor() const = 0;
 	};
 
 	//! A standard tab control
@@ -50,9 +54,6 @@ namespace gui
 		IGUITabControl(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_TAB_CONTROL, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUITabControl() {}
-
 		//! Adds a tab
 		virtual IGUITab* addTab(const wchar_t* caption, s32 id=-1) = 0;
 
@@ -62,21 +63,43 @@ namespace gui
 		//! Returns a tab based on zero based index
 		/** \param idx: zero based index of tab. Is a value betwenn 0 and getTabcount()-1;
 		\return Returns pointer to the Tab. Returns 0 if no tab
-		 is corresponding to this tab. */
+		is corresponding to this tab. */
 		virtual IGUITab* getTab(s32 idx) const = 0;
 
 		//! Brings a tab to front.
 		/** \param idx: number of the tab.
-		 \return Returns true if successful. */
+		\return Returns true if successful. */
 		virtual bool setActiveTab(s32 idx) = 0;
 
 		//! Brings a tab to front.
 		/** \param tab: pointer to the tab.
-		 \return Returns true if successful. */
+		\return Returns true if successful. */
 		virtual bool setActiveTab(IGUIElement *tab) = 0;
 
 		//! Returns which tab is currently active
 		virtual s32 getActiveTab() const = 0;
+
+		//! Set the height of the tabs
+		virtual void setTabHeight( s32 height ) = 0;
+
+		//! Get the height of the tabs
+		/** return Returns the height of the tabs */
+		virtual s32 getTabHeight() const = 0;
+
+		//! Set the alignment of the tabs
+		/** Use EGUIA_UPPERLEFT or EGUIA_LOWERRIGHT */
+		virtual void setTabVerticalAlignment( gui::EGUI_ALIGNMENT alignment ) = 0;
+
+		//! Get the alignment of the tabs
+		/** return Returns the alignment of the tabs */
+		virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const = 0;
+
+		//! Set the extra width added to tabs on each side of the text
+		virtual void setTabExtraWidth( s32 extraWidth ) = 0;
+
+		//! Get the extra width added to tabs on each side of the text
+		/** return Returns the extra width of the tabs */
+		virtual s32 getTabExtraWidth() const = 0;
 	};
 
 
diff --git a/src/dep/include/irrlicht/IGUIToolbar.h b/src/dep/include/irrlicht/IGUIToolbar.h
index f174d0d..962d624 100644
--- a/src/dep/include/irrlicht/IGUIToolbar.h
+++ b/src/dep/include/irrlicht/IGUIToolbar.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -26,9 +26,6 @@ namespace gui
 		IGUIToolBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_TOOL_BAR, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIToolBar() {}
-
 		//! Adds a button to the tool bar
 		virtual IGUIButton* addButton(s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext=0,
 			video::ITexture* img=0, video::ITexture* pressedimg=0,
diff --git a/src/dep/include/irrlicht/IGUIWindow.h b/src/dep/include/irrlicht/IGUIWindow.h
index 1ee7c07..b23aca0 100644
--- a/src/dep/include/irrlicht/IGUIWindow.h
+++ b/src/dep/include/irrlicht/IGUIWindow.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,9 +23,6 @@ namespace gui
 		IGUIWindow(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_WINDOW, environment, parent, id, rectangle) {}
 
-		//! destructor
-		virtual ~IGUIWindow() {}
-
 		//! Returns pointer to the close button
 		virtual IGUIButton* getCloseButton() const = 0;
 
diff --git a/src/dep/include/irrlicht/IImage.h b/src/dep/include/irrlicht/IImage.h
index 7167656..5432511 100644
--- a/src/dep/include/irrlicht/IImage.h
+++ b/src/dep/include/irrlicht/IImage.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -7,6 +7,7 @@
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
+#include "rect.h"
 #include "SColor.h"
 
 namespace irr
@@ -18,9 +19,10 @@ namespace video
 /** A color format specifies how color information is stored. */
 enum ECOLOR_FORMAT
 {
-	//! 16 bit color format used by the software driver, and thus preferred
-	//! by all other irrlicht engine video drivers. There are 5 bits for every
-	//! color component, and a single bit is left for alpha information.
+	//! 16 bit color format used by the software driver.
+	/** It is thus preferred by all other irrlicht engine video drivers.
+	There are 5 bits for every color component, and a single bit is left
+	for alpha information. */
 	ECF_A1R5G5B5 = 0,
 
 	//! Standard 16 bit color format.
@@ -29,13 +31,12 @@ enum ECOLOR_FORMAT
 	//! 24 bit color, no alpha channel, but 8 bit for red, green and blue.
 	ECF_R8G8B8,
 
-	//! Default 32 bit color format. 8 bits are used for every component:
-	//! red, green, blue and alpha.
+	//! Default 32 bit color format. 8 bits are used for every component: red, green, blue and alpha.
 	ECF_A8R8G8B8
 };
 
 
-//!	Interface for software image data.
+//! Interface for software image data.
 /** Image loaders create these images from files. IVideoDrivers convert
 these images into their (hardware) textures.
 */
@@ -43,20 +44,17 @@ class IImage : public virtual IReferenceCounted
 {
 public:
 
-	//! destructor
-	virtual ~IImage() {}
-
-	//! Lock function. Use this to get a pointer to the image data. After you
-	//! don't need the pointer anymore, you must call unlock().
-	//! \return Returns pointer to the image data. What type of data
-	//! is pointed to depends on the color format of the image. For example
-	//! if the color format is ECF_A8R8G8B8, it is of u32.
-	//! Be sure to call unlock() after you don't need the pointer any more.
+	//! Lock function. Use this to get a pointer to the image data.
+	/** After you don't need the pointer anymore, you must call unlock().
+	\return Pointer to the image data. What type of data is pointed to
+	depends on the color format of the image. For example if the color
+	format is ECF_A8R8G8B8, it is of u32. Be sure to call unlock() after
+	you don't need the pointer any more. */
 	virtual void* lock() = 0;
 
 	//! Unlock function.
-	//! Should be called after the pointer received by lock() is not
-	//! needed anymore.
+	/** Should be called after the pointer received by lock() is not
+	needed anymore. */
 	virtual void unlock() = 0;
 
 	//! Returns width and height of image data.
@@ -74,35 +72,49 @@ public:
 	//! Returns image data size in pixels
 	virtual u32 getImageDataSizeInPixels() const = 0;
 
-	//! returns a pixel
+	//! Returns a pixel
 	virtual SColor getPixel(u32 x, u32 y) const = 0;
 
-	//! sets a pixel
+	//! Sets a pixel
 	virtual void setPixel(u32 x, u32 y, const SColor &color ) = 0;
 
-	//! returns the color format
+	//! Returns the color format
 	virtual ECOLOR_FORMAT getColorFormat() const = 0;
 
-	//! returns mask for red value of a pixel
+	//! Returns mask for red value of a pixel
 	virtual u32 getRedMask() const = 0;
 
-	//! returns mask for green value of a pixel
+	//! Returns mask for green value of a pixel
 	virtual u32 getGreenMask() const = 0;
 
-	//! returns mask for blue value of a pixel
+	//! Returns mask for blue value of a pixel
 	virtual u32 getBlueMask() const = 0;
 
-	//! returns mask for alpha value of a pixel
+	//! Returns mask for alpha value of a pixel
 	virtual u32 getAlphaMask() const = 0;
 
-	//! returns pitch of image
-	virtual u32 getPitch() const = 0;
+	//! Returns pitch of image
+	virtual u32 getPitch() const =0;
 
-	//! copies the image into the target, scaling the image to fit
-	virtual void copyToScaling(void* target, s32 width, s32 height, ECOLOR_FORMAT format=ECF_A8R8G8B8, u32 pitch=0) = 0;
+	//! Copies the image into the target, scaling the image to fit
+	virtual void copyToScaling(void* target, s32 width, s32 height, ECOLOR_FORMAT format=ECF_A8R8G8B8, u32 pitch=0) =0;
 
-	//! copies the image into the target, scaling the image to fit
-	virtual void copyToScaling(IImage* target) = 0;
+	//! Copies the image into the target, scaling the image to fit
+	virtual void copyToScaling(IImage* target) =0;
+
+	//! copies this surface into another
+	virtual void copyTo(IImage* target, const core::position2d<s32>& pos=core::position2d<s32>(0,0)) =0;
+
+	//! copies this surface into another
+	virtual void copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect=0) =0;
+
+	//! copies this surface into another, using the alpha mask, an cliprect and a color to add with
+	virtual void copyToWithAlpha(IImage* target, const core::position2d<s32>& pos,
+			const core::rect<s32>& sourceRect, const SColor &color,
+			const core::rect<s32>* clipRect = 0) =0;
+
+	//! fills the surface with black or white
+	virtual void fill(const SColor &color) =0;
 
 };
 
diff --git a/src/dep/include/irrlicht/IImageLoader.h b/src/dep/include/irrlicht/IImageLoader.h
index 399c5b4..f252776 100644
--- a/src/dep/include/irrlicht/IImageLoader.h
+++ b/src/dep/include/irrlicht/IImageLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,26 +17,30 @@ namespace io
 namespace video
 {
 
-//!	Class which is able to create a image from a file.
-/** If you want the Irrlicht Engine be able to load textures of 
+//! Class which is able to create a image from a file.
+/** If you want the Irrlicht Engine be able to load textures of
 currently unsupported file formats (e.g .gif), then implement
-this and add your new Surface loader with 
+this and add your new Surface loader with
 IVideoDriver::addExternalImageLoader() to the engine. */
 class IImageLoader : public virtual IReferenceCounted
 {
 public:
 
-	//! destructor
-	virtual ~IImageLoader() {}
-
-	//! returns true if the file maybe is able to be loaded by this class
-	//! based on the file extension (e.g. ".tga")
+	//! Check if the file might be loaded by this class
+	/** Check is based on the file extension (e.g. ".tga")
+	\param fileName Name of file to check.
+	\return True if file seems to be loadable. */
 	virtual bool isALoadableFileExtension(const c8* fileName) const = 0;
 
-	//! returns true if the file maybe is able to be loaded by this class
+	//! Check if the file might be loaded by this class
+	/** Check might look into the file.
+	\param file File handle to check.
+	\return True if file seems to be loadable. */
 	virtual bool isALoadableFileFormat(io::IReadFile* file) const = 0;
 
-	//! creates a surface from the file
+	//! Creates a surface from the file
+	/** \param file File handle to check.
+	\return Pointer to newly created image, or 0 upon error. */
 	virtual IImage* loadImage(io::IReadFile* file) const = 0;
 };
 
diff --git a/src/dep/include/irrlicht/IImageWriter.h b/src/dep/include/irrlicht/IImageWriter.h
index 081b835..bf62201 100644
--- a/src/dep/include/irrlicht/IImageWriter.h
+++ b/src/dep/include/irrlicht/IImageWriter.h
@@ -1,3 +1,7 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
 #ifndef _I_IMAGE_WRITER_H_INCLUDED__
 #define _I_IMAGE_WRITER_H_INCLUDED__
 
@@ -19,13 +23,16 @@ namespace video
 class IImageWriter : public IReferenceCounted
 {
 public:
-	//! destructor
-	virtual ~IImageWriter() { }
-
-	//! return true if this writer can write a file with the given extension
+	//! Check if this writer can write a file with the given extension
+	/** \param fileName Name of the file to check.
+	\return True if file extension specifies a writable type. */
 	virtual bool isAWriteableFileExtension(const c8* fileName) const = 0;
 
-	//! write image to file
+	//! Write image to file
+	/** \param file File handle to write to.
+	\param image Image to write into file.
+	\param param Writer specific parameter, influencing e.g. quality.
+	\return True if image was successfully written. */
 	virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param = 0) const = 0;
 };
 
diff --git a/src/dep/include/irrlicht/ILightSceneNode.h b/src/dep/include/irrlicht/ILightSceneNode.h
index 6a526dc..0c0f553 100644
--- a/src/dep/include/irrlicht/ILightSceneNode.h
+++ b/src/dep/include/irrlicht/ILightSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,32 +13,63 @@ namespace irr
 namespace scene
 {
 
-//! Scene node which is a dynamic light. 
-/** You can switch the light on and off by 
-making it visible or not, and let it be animated by ordinary scene node animators.
-If you set the light type to be directional, you will need to set the direction of the
-light source manually in the SLight structure, the position of the scene node will have no
-effect on this direction.
+//! Scene node which is a dynamic light.
+/** You can switch the light on and off by making it visible or not. It can be
+animated by ordinary scene node animators. If the light type is directional or
+spot, the direction of the light source is defined by the rotation of the scene
+node (assuming (0,0,1) as the local direction of the light).
 */
 class ILightSceneNode : public ISceneNode
 {
 public:
 
 	//! constructor
-	ILightSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id, 
+	ILightSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
 		const core::vector3df& position = core::vector3df(0,0,0))
 		: ISceneNode(parent, mgr, id, position) {}
 
 	//! Sets the light data associated with this ILightSceneNode
+	/** \param light The new light data. */
 	virtual void setLightData(const video::SLight& light) = 0;
 
 	//! Gets the light data associated with this ILightSceneNode
-	//! \return Returns the light data.
+	/** \return The light data. */
 	virtual const video::SLight& getLightData() const = 0;
 
 	//! Gets the light data associated with this ILightSceneNode
-	//! \return Returns the light data.
+	/** \return The light data. */
 	virtual video::SLight& getLightData() = 0;
+
+	//! Sets the light's radius of influence.
+	/** Outside this radius the light won't lighten geometry and cast no
+	shadows. Setting the radius will also influence the attenuation, setting
+	it to (0,1/radius,0). If you want to override this behavior, set the
+	attenuation after the radius.
+	\param radius The new radius. */
+	virtual void setRadius(f32 radius) = 0;
+
+	//! Gets the light's radius of influence.
+	/** \return The current radius. */
+	virtual f32 getRadius() const = 0;
+
+	//! Sets the light type.
+	/** \param type The new type. */
+	virtual void setLightType(video::E_LIGHT_TYPE type) = 0;
+
+	//! Gets the light type.
+	/** \return The current light type. */
+	virtual video::E_LIGHT_TYPE getLightType() const = 0;
+
+	//! Sets whether this light casts shadows.
+	/** Enabling this flag won't automatically cast shadows, the meshes
+	will still need shadow scene nodes attached. But one can enable or
+	disable distinct lights for shadow casting for performance reasons.
+	\param shadow True if this light shall cast shadows. */
+	virtual void enableCastShadow(bool shadow=true) = 0;
+
+	//! Check whether this light casts shadows.
+	/** \return True if light would cast shadows, else false. */
+	virtual bool getCastShadow() const = 0;
 };
 
 } // end namespace scene
diff --git a/src/dep/include/irrlicht/ILogger.h b/src/dep/include/irrlicht/ILogger.h
index 1aefb30..bedfa8a 100644
--- a/src/dep/include/irrlicht/ILogger.h
+++ b/src/dep/include/irrlicht/ILogger.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,10 +10,10 @@
 namespace irr
 {
 
+//! Possible log levels.
 enum ELOG_LEVEL
 {
-	//! High log level, warnings, errors and important information
-	//! texts are printed out.
+	//! High log level, warnings, errors and important information texts are printed out.
 	ELL_INFORMATION = 0,
 
 	//! Default log level, warnings and errors are printed out
@@ -32,60 +32,59 @@ class ILogger : public virtual IReferenceCounted
 {
 public:
 
-	//! destructor
+	//! Destructor
 	virtual ~ILogger() {}
 
 	//! Returns the current set log level.
 	virtual ELOG_LEVEL getLogLevel() const = 0;
 
-	//! Sets a new log level. With this value, texts which are sent to
-	//! the logger are filtered out. For example setting this value to
-	//! ELL_WARNING, only warnings and
-	//! errors are printed out. Setting it to ELL_INFORMATION, which is
-	//! the default setting, warnings,
-	//! errors and informational texts are printed out.
-	//! \param ll: new log level filter value.
+	//! Sets a new log level.
+	/** With this value, texts which are sent to the logger are filtered
+	out. For example setting this value to ELL_WARNING, only warnings and
+	errors are printed out. Setting it to ELL_INFORMATION, which is the
+	default setting, warnings, errors and informational texts are printed
+	out.
+	\param ll: new log level filter value. */
 	virtual void setLogLevel(ELOG_LEVEL ll) = 0;
 
 	//! Prints out a text into the log
-	//! \param text: Text to print out.
-	//! \param ll: Log level of the text. If the text is an error, set
-	//! it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
-	//! is just an informational text, set it to ELL_INFORMATION. Texts are
-	//! filtered with these levels. If you want to be a text displayed,
-	//! independent on what level filter is set, use ELL_NONE.
+	/** \param text: Text to print out.
+	\param ll: Log level of the text. If the text is an error, set
+	it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
+	is just an informational text, set it to ELL_INFORMATION. Texts are
+	filtered with these levels. If you want to be a text displayed,
+	independent on what level filter is set, use ELL_NONE. */
 	virtual void log(const c8* text, ELOG_LEVEL ll=ELL_INFORMATION) = 0;
 
 	//! Prints out a text into the log
-	//! \param text: Text to print out.
-	//! \param hint: Additional info. This string is added after a " :" to the
-	//! string.
-	//! \param ll: Log level of the text. If the text is an error, set
-	//! it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
-	//! is just an informational text, set it to ELL_INFORMATION. Texts are
-	//! filtered with these levels. If you want to be a text displayed,
-	//! independent on what level filter is set, use ELL_NONE.
+	/** \param text: Text to print out.
+	\param hint: Additional info. This string is added after a " :" to the
+	string.
+	\param ll: Log level of the text. If the text is an error, set
+	it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
+	is just an informational text, set it to ELL_INFORMATION. Texts are
+	filtered with these levels. If you want to be a text displayed,
+	independent on what level filter is set, use ELL_NONE. */
 	virtual void log(const c8* text, const c8* hint, ELOG_LEVEL ll=ELL_INFORMATION) = 0;
 
 	//! Prints out a text into the log
-	//! \param text: Text to print out.
-	//! \param hint: Additional info. This string is added after a " :" to the
-	//! string.
-	//! \param ll: Log level of the text. If the text is an error, set
-	//! it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
-	//! is just an informational text, set it to ELL_INFORMATION. Texts are
-	//! filtered with these levels. If you want to be a text displayed,
-	//! independent on what level filter is set, use ELL_NONE.
+	/** \param text: Text to print out.
+	\param hint: Additional info. This string is added after a " :" to the
+	string.
+	\param ll: Log level of the text. If the text is an error, set
+	it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
+	is just an informational text, set it to ELL_INFORMATION. Texts are
+	filtered with these levels. If you want to be a text displayed,
+	independent on what level filter is set, use ELL_NONE. */
 	virtual void log(const wchar_t* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) = 0;
 
-
 	//! Prints out a text into the log
-	//! \param text: Text to print out.
-	//! \param ll: Log level of the text. If the text is an error, set
-	//! it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
-	//! is just an informational text, set it to ELL_INFORMATION. Texts are
-	//! filtered with these levels. If you want to be a text displayed,
-	//! independent on what level filter is set, use ELL_NONE.
+	/** \param text: Text to print out.
+	\param ll: Log level of the text. If the text is an error, set
+	it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
+	is just an informational text, set it to ELL_INFORMATION. Texts are
+	filtered with these levels. If you want to be a text displayed,
+	independent on what level filter is set, use ELL_NONE. */
 	virtual void log(const wchar_t* text, ELOG_LEVEL ll=ELL_INFORMATION) = 0;
 };
 
diff --git a/src/dep/include/irrlicht/IMaterialRenderer.h b/src/dep/include/irrlicht/IMaterialRenderer.h
index 2eff280..b9396d5 100644
--- a/src/dep/include/irrlicht/IMaterialRenderer.h
+++ b/src/dep/include/irrlicht/IMaterialRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,79 +11,83 @@
 
 namespace irr
 {
-namespace video  
+namespace video
 {
 
 class IVideoDriver;
 class IMaterialRendererServices;
 
-//!	Interface for material rendering. Can be used to extend the engine with new materials.
-/** Refer to IVideoDriver::addMaterialRenderer() for more informations on how to extend the engine
- with new materials.
-*/
+//! Interface for material rendering.
+/** Can be used to extend the engine with new materials. Refer to
+IVideoDriver::addMaterialRenderer() for more informations on how to extend the
+engine with new materials. */
 class IMaterialRenderer : public virtual IReferenceCounted
 {
 public:
 
-	//! destructor
-	virtual ~IMaterialRenderer() {}
-
-	//! Called by the IVideoDriver implementation the let the renderer set its needed render states. 
+	//! Called by the IVideoDriver implementation the let the renderer set its needed render states.
 	/** This is called during the IVideoDriver::setMaterial() call.
-	When overriding this, you can set some renderstates or for example a vertex or pixel shader
-	if you like.
-	\param material: The new material parameters to be set. The renderer may change the material
-	flags in this material. For example if this material does not accept the zbuffer = true, it
-	can set it to false. This is useful, because in the next lastMaterial will be just the material
-	in this call.
-	\param lastMaterial: The material parameters which have been set before this material.
-	\param resetAllRenderstates: True if all renderstates should really be reset. This is usually
-	true if the last rendering mode was not a usual 3d rendering mode, but for example 
-	a 2d rendering mode.
-	You should reset really all renderstates if this is true, no matter if the lastMaterial had
-	some similar settings. This is used because in most cases, some common renderstates are not
-	changed if they are already there, for example bilinear filtering, wireframe, gouraudshading, 
-	lighting, zbuffer, zwriteenable, backfaceculling and fogenable.
-	\param services: Interface providing some methods for changing advanced, internal
-	states of a IVideoDriver. */
+	When overriding this, you can set some renderstates or for example a
+	vertex or pixel shader if you like.
+	\param material: The new material parameters to be set. The renderer
+	may change the material flags in this material. For example if this
+	material does not accept the zbuffer = true, it can set it to false.
+	This is useful, because in the next lastMaterial will be just the
+	material in this call.
+	\param lastMaterial: The material parameters which have been set before
+	this material.
+	\param resetAllRenderstates: True if all renderstates should really be
+	reset. This is usually true if the last rendering mode was not a usual
+	3d rendering mode, but for example a 2d rendering mode.
+	You should reset really all renderstates if this is true, no matter if
+	the lastMaterial had some similar settings. This is used because in
+	most cases, some common renderstates are not changed if they are
+	already there, for example bilinear filtering, wireframe,
+	gouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
+	fogenable.
+	\param services: Interface providing some methods for changing
+	advanced, internal states of a IVideoDriver. */
 	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services) {};
+		bool resetAllRenderstates, IMaterialRendererServices* services) {}
 
-	//! Called every time before a new bunch of geometry is being drawn using this material with
-	//! for example drawIndexedTriangleList() call.
-	/** OnSetMaterial should normally only be called if the renderer decides that the renderstates should be changed, it won't be called if for
-	example two drawIndexedTriangleList() will be called with the same material set. This 
-	method will be called every time. This is useful for example for materials with shaders,
-	which don't only set new renderstates but also shader constants.
-	\param service: Pointer to interface providing methos for setting constants and other things.
-	\param vtxtype: Vertex type with which the next rendering will be done. This can be used
-	by the material renderer to set some specific optimized shaders or if this is an incompatible
-	vertex type for this renderer, to refuse rendering for example.
-	\return Returns true if everything is ok, and false if nothing should be rendered. 
-	The material renderer can choose to return false for example if he doesn't support the
-	specified vertex type. This is actually done in D3D8 and D3D9 when using a 
-	normal mapped material with a vertex type other than EVT_TANGENTS.  */
-	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) { return true; };
+	//! Called every time before a new bunch of geometry is being drawn using this material with for example drawIndexedTriangleList() call.
+	/** OnSetMaterial should normally only be called if the renderer decides
+	that the renderstates should be changed, it won't be called if for
+	example two drawIndexedTriangleList() will be called with the same
+	material set. This method will be called every time. This is useful for
+	example for materials with shaders, which don't only set new
+	renderstates but also shader constants.
+	\param service: Pointer to interface providing methos for setting
+	constants and other things.
+	\param vtxtype: Vertex type with which the next rendering will be done.
+	This can be used by the material renderer to set some specific
+	optimized shaders or if this is an incompatible vertex type for this
+	renderer, to refuse rendering for example.
+	\return Returns true if everything is ok, and false if nothing should
+	be rendered. The material renderer can choose to return false for
+	example if he doesn't support the specified vertex type. This is
+	actually done in D3D8 and D3D9 when using a normal mapped material with
+	a vertex type other than EVT_TANGENTS. */
+	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) { return true; }
 
 	//! Called by the IVideoDriver to unset this material.
-	/** Called during the 
-	IVideoDriver::setMaterial() call before the new material will get the OnSetMaterial()
-	call. */
+	/** Called during the IVideoDriver::setMaterial() call before the new
+	material will get the OnSetMaterial() call. */
 	virtual void OnUnsetMaterial() {}
 
-	//! Returns if the material is transparent. 
+	//! Returns if the material is transparent.
 	/** The scene managment needs to know this
 	for being able to sort the materials by opaque and transparent. */
 	virtual bool isTransparent() const { return false; }
 
-	//! Returns the render capability of the material. 
+	//! Returns the render capability of the material.
 	/** Because some more complex materials
 	are implemented in multiple ways and need special hardware capabilities, it is possible
 	to query how the current material renderer is performing on the current hardware with this
 	function.
 	\return Returns 0 if everything is running fine. Any other value is material renderer
-	specific and means for example that the renderer switched back to a fall back material because 
-	it cannot use the latest shaders. More specific examples: 
+	specific and means for example that the renderer switched back to a fall back material because
+	it cannot use the latest shaders. More specific examples:
 	Fixed function pipeline materials should return 0 in most cases, parallax mapped
 	material will only return 0 when at least pixel shader 1.4 is available on that machine. */
 	virtual s32 getRenderCapability() const { return 0; }
diff --git a/src/dep/include/irrlicht/IMaterialRendererServices.h b/src/dep/include/irrlicht/IMaterialRendererServices.h
index f561a53..fc72648 100644
--- a/src/dep/include/irrlicht/IMaterialRendererServices.h
+++ b/src/dep/include/irrlicht/IMaterialRendererServices.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,7 +11,7 @@
 
 namespace irr
 {
-namespace video  
+namespace video
 {
 
 class IVideoDriver;
@@ -20,69 +20,80 @@ class IVideoDriver;
 //! Interface providing some methods for changing advanced, internal states of a IVideoDriver.
 class IMaterialRendererServices
 {
-public: 
+public:
 
-	//! destructor
+	//! Destructor
 	virtual ~IMaterialRendererServices() {}
 
 	//! Can be called by an IMaterialRenderer to make its work easier.
-	//! Sets all basic renderstates if needed.
-	//! Basic render states are diffuse, ambient, specular, and emissive color, specular power,
-	//! bilinear and trilinear filtering, wireframe mode,
-	//! grouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and fog enabling.
-	virtual void setBasicRenderStates(const SMaterial& material, 
+	/** Sets all basic renderstates if needed.
+	Basic render states are diffuse, ambient, specular, and emissive color,
+	specular power, bilinear and trilinear filtering, wireframe mode,
+	grouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
+	fog enabling.
+	\param material The new material to be used.
+	\param lastMaterial The material used until now.
+	\param resetAllRenderstates Set to true if all renderstates should be
+	set, regardless of their current state. */
+	virtual void setBasicRenderStates(const SMaterial& material,
 		const SMaterial& lastMaterial,
 		bool resetAllRenderstates) = 0;
 
-	//! Sets a constant for the vertex shader based on a name. This can be used if you used
-	//! a high level shader language like GLSL or HLSL to create a shader. Example: If you
-	//! created a shader which has variables named 'mWorldViewProj' (containing the 
-	//! WorldViewProjection matrix) and another one named 'fTime' containing one float, 
-	//! you can set them in your IShaderConstantSetCallBack derived class like this:
-	//! \code
-	//! virtual void OnSetConstants(video::IMaterialRendererServices* services, s32 userData)
-	//! {
-	//! 	video::IVideoDriver* driver = services->getVideoDriver();
-	//! 
-	//! 	f32 time = (f32)os::Timer::getTime()/100000.0f;
-	//! 	services->setVertexShaderConstant("fTime", &time, 1);
-	//! 
-	//! 	core::matrix4 worldViewProj(driver->getTransform(video::ETS_PROJECTION));
-	//! 	worldViewProj *= driver->getTransform(video::ETS_VIEW);
-	//! 	worldViewProj *= driver->getTransform(video::ETS_WORLD);
-	//! 	services->setVertexShaderConstant("mWorldViewProj", worldViewProj.M, 16);
-	//! }
-	//! \endcode
-	//! \param name: Name of the variable
-	//! \param floats: Pointer to array of floats
-	//! \param count: Amount of floats in array.
-	//! \return: Returns true if successful.
+	//! Sets a constant for the vertex shader based on a name.
+	/** This can be used if you used a high level shader language like GLSL
+	or HLSL to create a shader. Example: If you created a shader which has
+	variables named 'mWorldViewProj' (containing the WorldViewProjection
+	matrix) and another one named 'fTime' containing one float, you can set
+	them in your IShaderConstantSetCallBack derived class like this:
+	\code
+	virtual void OnSetConstants(video::IMaterialRendererServices* services, s32 userData)
+	{
+		video::IVideoDriver* driver = services->getVideoDriver();
+
+		f32 time = (f32)os::Timer::getTime()/100000.0f;
+		services->setVertexShaderConstant("fTime", &time, 1);
+
+		core::matrix4 worldViewProj(driver->getTransform(video::ETS_PROJECTION));
+		worldViewProj *= driver->getTransform(video::ETS_VIEW);
+		worldViewProj *= driver->getTransform(video::ETS_WORLD);
+		services->setVertexShaderConstant("mWorldViewProj", worldViewProj.M, 16);
+	}
+	\endcode
+	\param name Name of the variable
+	\param floats Pointer to array of floats
+	\param count Amount of floats in array.
+	\return True if successful.
+	*/
 	virtual bool setVertexShaderConstant(const c8* name, const f32* floats, int count) = 0;
 
-	//! Sets a vertex shader constant. Can be used if you created a shader using 
-	//! pixel/vertex shader assembler or ARB_fragment_program or ARB_vertex_program.
-	//! \param data: Data to be set in the constants
-	//! \param startRegister: First register to be set
-	//! \param constantAmount: Amount of registers to be set. One register consists of 4 floats.
+	//! Sets a vertex shader constant.
+	/** Can be used if you created a shader using pixel/vertex shader
+	assembler or ARB_fragment_program or ARB_vertex_program.
+	\param data: Data to be set in the constants
+	\param startRegister: First register to be set
+	\param constantAmount: Amount of registers to be set. One register consists of 4 floats. */
 	virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) = 0;
 
-	//! Sets a constant for the pixel shader based on a name. This can be used if you used
-	//! a high level shader language like GLSL or HLSL to create a shader. See 
-	//! setVertexShaderConstant() for an example on how to use this.
-	//! \param name: Name of the variable
-	//! \param floats: Pointer to array of floats
-	//! \param count: Amount of floats in array.
-	//! \return: Returns true if successful.
+	//! Sets a constant for the pixel shader based on a name.
+	/** This can be used if you used a high level shader language like GLSL
+	or HLSL to create a shader. See setVertexShaderConstant() for an
+	example on how to use this.
+	\param name Name of the variable
+	\param floats Pointer to array of floats
+	\param count Amount of floats in array.
+	\return True if successful. */
 	virtual bool setPixelShaderConstant(const c8* name, const f32* floats, int count) = 0;
 
-	//! Sets a pixel shader constant. Can be used if you created a shader using 
-	//! pixel/vertex shader assembler or ARB_fragment_program or ARB_vertex_program.
-	//! \param data: Data to be set in the constants
-	//! \param startRegister: First register to be set.
-	//! \param constantAmount: Amount of registers to be set. One register consists of 4 floats.
+	//! Sets a pixel shader constant.
+	/** Can be used if you created a shader using pixel/vertex shader
+	assembler or ARB_fragment_program or ARB_vertex_program.
+	\param data Data to be set in the constants
+	\param startRegister First register to be set.
+	\param constantAmount Amount of registers to be set. One register consists of 4 floats. */
 	virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) = 0;
 
-	//! Returns a pointer to the IVideoDriver interface
+	//! Get pointer to the IVideoDriver interface
+	/** \return Pointer to the IVideoDriver interface */
 	virtual IVideoDriver* getVideoDriver() = 0;
 };
 
diff --git a/src/dep/include/irrlicht/IMesh.h b/src/dep/include/irrlicht/IMesh.h
index cfb0da9..17109bf 100644
--- a/src/dep/include/irrlicht/IMesh.h
+++ b/src/dep/include/irrlicht/IMesh.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -7,6 +7,7 @@
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
+#include "EHardwareBufferFlags.h"
 
 namespace irr
 {
@@ -14,45 +15,57 @@ namespace scene
 {
 	class IMeshBuffer;
 
-	//! Class for accessing a mesh with multiple mesh buffers.
-	/** An IMesh is nothing more than a collection of some mesh buffers (IMeshBuffer).
-	SMesh is a simple implementation of an IMesh.
+	//! Class which holds the geometry of an object.
+	/** An IMesh is nothing more than a collection of some mesh buffers
+	(IMeshBuffer). SMesh is a simple implementation of an IMesh.
+	A mesh is usually added to an IMeshSceneNode in order to be rendered.
 	*/
 	class IMesh : public virtual IReferenceCounted
 	{
 	public:
 
-		//! destructor
-		virtual ~IMesh() { }
-
-		//! Returns the amount of mesh buffers.
-		/** \return Returns the amount of mesh buffers (IMeshBuffer) in this mesh. */
+		//! Get the amount of mesh buffers.
+		/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
 		virtual u32 getMeshBufferCount() const = 0;
 
-		//! Returns pointer to a mesh buffer.
- 		/** \param nr: Zero based index of the mesh buffer. The maximum value is
+		//! Get pointer to a mesh buffer.
+		/** \param nr: Zero based index of the mesh buffer. The maximum value is
 		getMeshBufferCount() - 1;
-		\return Returns the pointer to the mesh buffer or 
-		NULL if there is no such mesh buffer. */
+		\return Pointer to the mesh buffer or 0 if there is no such
+		mesh buffer. */
 		virtual IMeshBuffer* getMeshBuffer(u32 nr) const = 0;
 
-		//! Returns pointer to a mesh buffer which fits a material
- 		/** \param material: material to search for
-		\return Returns the pointer to the mesh buffer or 
-		NULL if there is no such mesh buffer. */
+		//! Get pointer to a mesh buffer which fits a material
+		/** \param material: material to search for
+		\return Pointer to the mesh buffer or 0 if there is no such
+		mesh buffer. */
 		virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const = 0;
 
-		//! Returns an axis aligned bounding box of the mesh.
-		/** \return A bounding box of this mesh is returned. */
+		//! Get an axis aligned bounding box of the mesh.
+		/** \return Bounding box of this mesh. */
 		virtual const core::aabbox3d<f32>& getBoundingBox() const = 0;
 
-		//! set user axis aligned bounding box
+		//! Set user-defined axis aligned bounding box
+		/** \param box New bounding box to use for the mesh. */
 		virtual void setBoundingBox( const core::aabbox3df& box) = 0;
 
 		//! Sets a flag of all contained materials to a new value.
 		/** \param flag: Flag to set in all materials.
-		 \param newvalue: New value to set in all materials. */
+		\param newvalue: New value to set in all materials. */
 		virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) = 0;
+
+		//! Set the hardware mapping hint
+		/** This methods allows to define optimization hints for the
+		hardware. This enables, e.g., the use of hardware buffers on
+		pltforms that support this feature. This can lead to noticeable
+		performance gains. */
+		virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) = 0;
+
+		//! Flag the meshbuffer as changed, reloads hardware buffers
+		/** This method has to be called every time the vertices or
+		indices have changed. Otherwise, changes won't be updated
+		on the GPU in the next render cycle. */
+		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) = 0;
 	};
 
 } // end namespace scene
diff --git a/src/dep/include/irrlicht/IMeshBuffer.h b/src/dep/include/irrlicht/IMeshBuffer.h
index 60b60b0..51947cf 100644
--- a/src/dep/include/irrlicht/IMeshBuffer.h
+++ b/src/dep/include/irrlicht/IMeshBuffer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,6 +9,8 @@
 #include "SMaterial.h"
 #include "aabbox3d.h"
 #include "S3DVertex.h"
+#include "SVertexIndex.h"
+#include "EHardwareBufferFlags.h"
 
 namespace irr
 {
@@ -54,60 +56,134 @@ namespace scene
 		EPT_POINT_SPRITES
 	};
 
+	//! Struct for holding a mesh with a single material.
+	/** A part of an IMesh which has the same material on each face of that
+	group. Logical groups of an IMesh need not be put into separate mesh
+	buffers, but can be. Separately animated parts of the mesh must be put
+	into separate mesh buffers.
+	Some mesh buffer implementations have limitations on the number of
+	vertices the buffer can hold. In that case, logical grouping can help.
+	Moreover, the number of vertices should be optimized for the GPU upload,
+	which often depends on the type of gfx card. Typial figures are
+	1000-10000 vertices per buffer.
+	SMeshBuffer is a simple implementation of a MeshBuffer, which supports
+	up to 65535 vertices.
 
-
-	//! Struct for holding a mesh with a single material
-	/** SMeshBuffer is a simple implementation of a MeshBuffer. */
+	Since meshbuffers are used for drawing, and hence will be exposed
+	to the driver, chances are high that they are grab()'ed from somewhere.
+	It's therefore required to dynamically allocate meshbuffers which are
+	passed to a video driver and only drop the buffer once it's not used in
+	the current code block anymore.
+	*/
 	class IMeshBuffer : public virtual IReferenceCounted
 	{
 	public:
 
-		//! destructor
-		virtual ~IMeshBuffer() { }
-
-		//! returns the material of this meshbuffer
+		//! Get the material of this meshbuffer
+		/** \return Material of this buffer. */
 		virtual video::SMaterial& getMaterial() = 0;
 
-		//! returns the material of this meshbuffer
+		//! Get the material of this meshbuffer
+		/** \return Material of this buffer. */
 		virtual const video::SMaterial& getMaterial() const = 0;
 
-		//! returns which type of vertex data is stored.
+		//! Get type of vertex data which is stored in this meshbuffer.
+		/** \return Vertex type of this buffer. */
 		virtual video::E_VERTEX_TYPE getVertexType() const = 0;
 
-		//! returns pointer to vertex data. The data is an array of vertices. Which vertex
-		//! type is used can be determined with getVertexType().
-		virtual const void* getVertices() const = 0; 
+		//! Get access to vertex data. The data is an array of vertices.
+		/** Which vertex type is used can be determined by getVertexType().
+		\return Pointer to array of vertices. */
+		virtual const void* getVertices() const = 0;
 
-		//! returns pointer to vertex data. The data is an array of vertices. Which vertex
-		//! type is used can be determined with getVertexType().
-		virtual void* getVertices() = 0; 
+		//! Get access to vertex data. The data is an array of vertices.
+		/** Which vertex type is used can be determined by getVertexType().
+		\return Pointer to array of vertices. */
+		virtual void* getVertices() = 0;
 
-		//! returns amount of vertices
+		//! Get amount of vertices in meshbuffer.
+		/** \return Number of vertices in this buffer. */
 		virtual u32 getVertexCount() const = 0;
 
-		//! returns pointer to Indices
+		//! Get type of index data which is stored in this meshbuffer.
+		/** \return Index type of this buffer. */
+		virtual video::E_INDEX_TYPE getIndexType() const =0;
+
+		//! Get access to Indices.
+		/** \return Pointer to indices array. */
 		virtual const u16* getIndices() const = 0;
 
-		//! returns pointer to Indices
+		//! Get access to Indices.
+		/** \return Pointer to indices array. */
 		virtual u16* getIndices() = 0;
 
-		//! returns amount of indices
+		//! Get amount of indices in this meshbuffer.
+		/** \return Number of indices in this buffer. */
 		virtual u32 getIndexCount() const = 0;
 
-		//! returns an axis aligned bounding box
+		//! Get the axis aligned bounding box of this meshbuffer.
+		/** \return Axis aligned bounding box of this buffer. */
 		virtual const core::aabbox3df& getBoundingBox() const = 0;
 
-		//! set user axis aligned bounding box
-		virtual void setBoundingBox( const core::aabbox3df& box) = 0;
+		//! Set axis aligned bounding box
+		/** \param box User defined axis aligned bounding box to use
+		for this buffer. */
+		virtual void setBoundingBox(const core::aabbox3df& box) = 0;
 
-		//! recalculates the bounding box. should be called if the mesh changed.
+		//! Recalculates the bounding box. Should be called if the mesh changed.
 		virtual void recalculateBoundingBox() = 0;
 
-		//! append the vertices and indices to the current buffer
+		//! returns position of vertex i
+		virtual const core::vector3df& getPosition(u32 i) const = 0;
+
+		//! returns position of vertex i
+		virtual core::vector3df& getPosition(u32 i) = 0;
+
+		//! returns normal of vertex i
+		virtual const core::vector3df& getNormal(u32 i) const = 0;
+
+		//! returns normal of vertex i
+		virtual core::vector3df& getNormal(u32 i) = 0;
+
+		//! returns texture coord of vertex i
+		virtual const core::vector2df& getTCoords(u32 i) const = 0;
+
+		//! returns texture coord of vertex i
+		virtual core::vector2df& getTCoords(u32 i) = 0;
+
+		//! Append the vertices and indices to the current buffer
+		/** Only works for compatible vertex types.
+		\param vertices Pointer to a vertex array.
+		\param numVertices Number of vertices in the array.
+		\param indices Pointer to index array.
+		\param numIndices Number of indices in array. */
 		virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) = 0;
 
-		//! append the meshbuffer to the current buffer
+		//! Append the meshbuffer to the current buffer
+		/** Only works for compatible vertex types
+		\param other Buffer to append to this one. */
 		virtual void append(const IMeshBuffer* const other) = 0;
+
+		//! get the current hardware mapping hint
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const = 0;
+
+		//! get the current hardware mapping hint
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const = 0;
+
+		//! set the hardware mapping hint, for driver
+		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) = 0;
+
+		//! flags the meshbuffer as changed, reloads hardware buffers
+		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) = 0;
+
+		//to be spit into vertex and index buffers:
+		//! Get the currently used ID for identification of changes.
+		/** This shouldn't be used for anything outside the VideoDriver. */
+		virtual u32 getChangedID_Vertex() const = 0;
+
+		//! Get the currently used ID for identification of changes.
+		/** This shouldn't be used for anything outside the VideoDriver. */
+		virtual u32 getChangedID_Index() const = 0;
 	};
 
 } // end namespace scene
@@ -115,3 +191,4 @@ namespace scene
 
 #endif
 
+
diff --git a/src/dep/include/irrlicht/IMeshCache.h b/src/dep/include/irrlicht/IMeshCache.h
index 1953e59..4c6837b 100644
--- a/src/dep/include/irrlicht/IMeshCache.h
+++ b/src/dep/include/irrlicht/IMeshCache.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,107 +18,142 @@ namespace scene
 	class IAnimatedMeshSceneNode;
 	class IMeshLoader;
 
-	//!	The mesh cache stores already loaded meshes and provides an interface to them.
-	/** You can access it using ISceneManager::getMeshCache(). All existing scene managers
-	will return a pointer to the same mesh cache, because it is shared between them. With
-	this interface, it is possible to manually add new loaded meshes (if
-	ISceneManager::getMesh() is not sufficient), to remove them and to iterate through
-	already loaded meshes.  */
+	//! The mesh cache stores already loaded meshes and provides an interface to them.
+	/** You can access it using ISceneManager::getMeshCache(). All existing
+	scene managers will return a pointer to the same mesh cache, because it
+	is shared between them. With this interface, it is possible to manually
+	add new loaded meshes (if ISceneManager::getMesh() is not sufficient),
+	to remove them and to iterate through already loaded meshes. */
 	class IMeshCache : public virtual IReferenceCounted
 	{
 	public:
 
-		//! destructor
+		//! Destructor
 		virtual ~IMeshCache() {}
 
 		//! Adds a mesh to the internal list of loaded meshes.
-		/** Usually, ISceneManager::getMesh() is called to load a mesh from a file.
-		That method searches the list of loaded meshes if a mesh has already been loaded and
-		returns a pointer to if	it is in that list and already in memory. Otherwise it loads
-		the mesh. With IMeshCache::addMesh(), it is possible to pretend that a mesh already
-		has been loaded. This method can be used for example by mesh loaders who need to
-		load more than one mesh with one call. They can add additional meshes with this
-		method to the scene manager. The COLLADA loader for example uses this method.
-		\param filename: Filename of the mesh. When called ISceneManager::getMesh() with this
-		parameter, the method will return the mesh parameter given with this method.
-		\param mesh: Pointer to a mesh which will now be referenced by this name. */
+		/** Usually, ISceneManager::getMesh() is called to load a mesh
+		from a file. That method searches the list of loaded meshes if
+		a mesh has already been loaded and returns a pointer to if it
+		is in that list and already in memory. Otherwise it loads the
+		mesh. With IMeshCache::addMesh(), it is possible to pretend
+		that a mesh already has been loaded. This method can be used
+		for example by mesh loaders who need to load more than one mesh
+		with one call. They can add additional meshes with this method
+		to the scene manager. The COLLADA loader for example uses this
+		method.
+		\param filename Filename of the mesh. When calling
+		ISceneManager::getMesh() with this name it will return the mesh
+		set by this method.
+		\param mesh Pointer to a mesh which will now be referenced by
+		this name. */
 		virtual void addMesh(const c8* filename, IAnimatedMesh* mesh) = 0;
 
 		//! Removes a mesh from the cache.
-		/** After loading a mesh with getMesh(), the mesh can be removed from the cache
-		using this method, freeing a lot of memory. */
+		/** After loading a mesh with getMesh(), the mesh can be
+		removed from the cache using this method, freeing a lot of
+		memory.
+		\param mesh Pointer to the mesh which shall be removed. */
 		virtual void removeMesh(const IAnimatedMesh* const mesh) = 0;
 
 		//! Removes a mesh from the cache.
-		/** After loading a mesh with getMesh(), the mesh can be removed from the cache
-		using this method, freeing a lot of memory. */
+		/** After loading a mesh with getMesh(), the mesh can be
+		removed from the cache using this method, freeing a lot of
+		memory.
+		\param mesh Pointer to the mesh which shall be removed. */
 		virtual void removeMesh(const IMesh* const mesh) = 0;
 
 		//! Returns amount of loaded meshes in the cache.
-		/** You can load new meshes into the cache using getMesh() and addMesh().
-		If you ever need to access the internal mesh cache, you can do this using
-		removeMesh(), getMeshNumber(), getMeshByIndex() and getMeshFilename() */
+		/** You can load new meshes into the cache using getMesh() and
+		addMesh(). If you ever need to access the internal mesh cache,
+		you can do this using removeMesh(), getMeshNumber(),
+		getMeshByIndex() and getMeshFilename().
+		\return Number of meshes in cache. */
 		virtual u32 getMeshCount() const = 0;
 
 		//! Returns current index number of the mesh, and -1 if it is not in the cache.
+		/** \param mesh Pointer to the mesh to search for.
+		\return Index of the mesh in the cache, or -1 if not found. */
 		virtual s32 getMeshIndex(const IAnimatedMesh* const mesh) const = 0;
 
 		//! Returns current index number of the mesh, and -1 if it is not in the cache.
+		/** \param mesh Pointer to the mesh to search for.
+		\return Index of the mesh in the cache, or -1 if not found. */
 		virtual s32 getMeshIndex(const IMesh* const mesh) const = 0;
 
 		//! Returns a mesh based on its index number.
-		/** \param index: Index of the mesh, number between 0 and getMeshCount()-1.
-		Note that this number is only valid until a new mesh is loaded or removed *
-		\return Returns pointer to the mesh or 0 if there is none with this number. */
+		/** \param index: Index of the mesh, number between 0 and
+		getMeshCount()-1.
+		Note that this number is only valid until a new mesh is loaded
+		or removed.
+		\return Pointer to the mesh or 0 if there is none with this
+		number. */
 		virtual IAnimatedMesh* getMeshByIndex(u32 index) = 0;
 
-		//! Returns a mesh based on its file name.
-		/** \return Returns pointer to the mesh or 0 if there is none with this number. */
+		//! Returns a mesh based on its filename.
+		/** \param filename Name of the mesh.
+		\return Pointer to the mesh or 0 if there is none with this number. */
 		virtual IAnimatedMesh* getMeshByFilename(const c8* filename) = 0;
 
-		//! Returns name of a mesh based on its index number.
+		//! Get the filename of a loaded mesh, based on its index.
 		/** \param index: Index of the mesh, number between 0 and getMeshCount()-1.
-		Note that this is only valid until a new mesh is loaded */
+		\return String with name if mesh was found and has a name, else
+		0. */
 		virtual const c8* getMeshFilename(u32 index) const = 0;
 
-		//! Returns the filename of a loaded mesh, if there is any.
-		/** Returns 0 if there is none. */
+		//! Get the filename of a loaded mesh, if there is any.
+		/** \param mesh Pointer to mesh to query.
+		\return String with name if mesh was found and has a name, else
+		0. */
 		virtual const c8* getMeshFilename(const IAnimatedMesh* const mesh) const = 0;
 
-		//! Returns the filename of a loaded mesh, if there is any.
-		/* Returns 0 if there is none.*/
+		//! Get the filename of a loaded mesh, if there is any.
+		/** \param mesh Pointer to mesh to query.
+		\return String with name if mesh was found and has a name, else
+		0. */
 		virtual const c8* getMeshFilename(const IMesh* const mesh) const = 0;
 
-		//! Renames a loaded mesh, if possible.
-		/** Returns true if sucessful. Note that renaming meshes might change
-		the ordering of the meshes, and so the index of the meshes as returned by
-		getMeshIndex() or taken by some methods will change. */
+		//! Renames a loaded mesh.
+		/** Note that renaming meshes might change the ordering of the
+		meshes, and so the index of the meshes as returned by
+		getMeshIndex() or taken by some methods will change.
+		\param index The index of the mesh in the cache.
+		\param filename New name for the mesh.
+		\return True if mesh was renamed. */
 		virtual bool setMeshFilename(u32 index, const c8* filename) = 0;
 
-		//! Renames a loaded mesh, if possible.
-		/** Returns true if sucessful. Note that renaming meshes might change
-		the ordering of the meshes, and so the index of the meshes as returned by
-		getMeshIndex() or taken by some methods will change. */
+		//! Renames a loaded mesh.
+		/** Note that renaming meshes might change the ordering of the
+		meshes, and so the index of the meshes as returned by
+		getMeshIndex() or taken by some methods will change.
+		\param mesh Mesh to be renamed.
+		\param filename New name for the mesh.
+		\return True if mesh was renamed. */
 		virtual bool setMeshFilename(const IAnimatedMesh* const mesh, const c8* filename) = 0;
 
-		//! Renames a loaded mesh, if possible.
-		/** Returns true if sucessful. Note that renaming meshes might change
-		the ordering of the meshes, and so the index of the meshes as returned by
-		getMeshIndex() or taken by some methods will change. */
+		//! Renames a loaded mesh.
+		/** Note that renaming meshes might change the ordering of the
+		meshes, and so the index of the meshes as returned by
+		getMeshIndex() or taken by some methods will change.
+		\param mesh Mesh to be renamed.
+		\param filename New name for the mesh.
+		\return True if mesh was renamed. */
 		virtual bool setMeshFilename(const IMesh* const mesh, const c8* filename) = 0;
 
-		//! returns if a mesh already was loaded
+		//! Check if a mesh was already loaded.
+		/** \param filename Name of the mesh.
+		\return True if the mesh has been loaded, else false. */
 		virtual bool isMeshLoaded(const c8* filename) = 0;
 
 		//! Clears the whole mesh cache, removing all meshes.
 		/** All meshes will be reloaded completely when using ISceneManager::getMesh()
-		after calling this method. 
-		Warning: If you have pointers to meshes that were loaded with ISceneManager::getMesh() 
+		after calling this method.
+		Warning: If you have pointers to meshes that were loaded with ISceneManager::getMesh()
 		and you did not grab them, then they may become invalid. */
 		virtual void clear() = 0;
 
 		//! Clears all meshes that are held in the mesh cache but not used anywhere else.
-		/** Warning: If you have pointers to meshes that were loaded with ISceneManager::getMesh() 
+		/** Warning: If you have pointers to meshes that were loaded with ISceneManager::getMesh()
 		and you did not grab them, then they may become invalid. */
 		virtual void clearUnusedMeshes() = 0;
 	};
diff --git a/src/dep/include/irrlicht/IMeshLoader.h b/src/dep/include/irrlicht/IMeshLoader.h
index bfbdd8d..5b26358 100644
--- a/src/dep/include/irrlicht/IMeshLoader.h
+++ b/src/dep/include/irrlicht/IMeshLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,24 +17,28 @@ namespace scene
 {
 	class IAnimatedMesh;
 
-//!	Class which is able to load an animated mesh from a file.
-/** If you want the Irrlicht Engine be able to load meshes of 
-currently unsupported file formats (e.g .cob), then implement
-this and add your new Surface loader with 
+//! Class which is able to load an animated mesh from a file.
+/** If you want Irrlicht be able to load meshes of
+currently unsupported file formats (e.g. .cob), then implement
+this and add your new Meshloader with
 ISceneManager::addExternalMeshLoader() to the engine. */
 class IMeshLoader : public virtual IReferenceCounted
 {
 public:
 
-	//! destructor
+	//! Destructor
 	virtual ~IMeshLoader() {}
 
-	//! Returns true if the file maybe is able to be loaded by this class.
-	/** This decision should be based only on the file extension (e.g. ".cob") */
+	//! Returns true if the file might be loaded by this class.
+	/** This decision should be based on the file extension (e.g. ".cob")
+	only.
+	\param fileName Name of the file to test.
+	\return True if the file might be loaded by this class. */
 	virtual bool isALoadableFileExtension(const c8* fileName) const = 0;
 
 	//! Creates/loads an animated mesh from the file.
-	/** \return Pointer to the created mesh. Returns 0 if loading failed.
+	/** \param file File handler to load the file from.
+	\return Pointer to the created mesh. Returns 0 if loading failed.
 	If you no longer need the mesh, you should call IAnimatedMesh::drop().
 	See IReferenceCounted::drop() for more information. */
 	virtual IAnimatedMesh* createMesh(io::IReadFile* file) = 0;
diff --git a/src/dep/include/irrlicht/IMeshManipulator.h b/src/dep/include/irrlicht/IMeshManipulator.h
index 45f4e41..a667384 100644
--- a/src/dep/include/irrlicht/IMeshManipulator.h
+++ b/src/dep/include/irrlicht/IMeshManipulator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,96 +21,165 @@ namespace scene
 	class IMeshBuffer;
 	struct SMesh;
 
-	//! An interface for easily manipulate meshes.
-	/** Scale, set alpha value, flip surfaces, and so on. This exists for fixing problems 
-	with wrong imported or exported meshes quickly after loading. It is not intended for doing mesh
-	modifications and/or animations during runtime.
+	//! An interface for easy manipulation of meshes.
+	/** Scale, set alpha value, flip surfaces, and so on. This exists for
+	fixing problems with wrong imported or exported meshes quickly after
+	loading. It is not intended for doing mesh modifications and/or
+	animations during runtime.
 	*/
 	class IMeshManipulator : public virtual IReferenceCounted
 	{
 	public:
 
-		//! destructor
-		virtual ~IMeshManipulator() {}
-
-		//! Flips the direction of surfaces. 
+		//! Flips the direction of surfaces.
 		/** Changes backfacing triangles to frontfacing
 		triangles and vice versa.
-		\param mesh: Mesh on which the operation is performed. */
+		\param mesh Mesh on which the operation is performed. */
 		virtual void flipSurfaces(IMesh* mesh) const = 0;
 
 		//! Sets the alpha vertex color value of the whole mesh to a new value.
-		/** \param mesh: Mesh on which the operation is performed.
-		 \param alpha: New alpha value. Must be a value between 0 and 255. */
+		/** \param mesh Mesh on which the operation is performed.
+		\param alpha New alpha value. Must be a value between 0 and 255. */
 		virtual void setVertexColorAlpha(IMesh* mesh, s32 alpha) const = 0;
 
 		//! Sets the colors of all vertices to one color
+		/** \param mesh Mesh on which the operation is performed.
+		\param color New color. */
 		virtual void setVertexColors(IMesh* mesh, video::SColor color) const = 0;
 
 		//! Recalculates all normals of the mesh.
 		/** \param mesh: Mesh on which the operation is performed.
-		    \param smooth: If the normals shall be smoothed. */
-		virtual void recalculateNormals(IMesh* mesh, bool smooth = false) const = 0;
+		\param smooth: If the normals shall be smoothed.
+		\param angleWeighted: If the normals shall be smoothed in relation to their angles. More expensive, but also higher precision. */
+		virtual void recalculateNormals(IMesh* mesh, bool smooth = false, bool angleWeighted = false) const = 0;
 
 		//! Recalculates all normals of the mesh buffer.
 		/** \param buffer: Mesh buffer on which the operation is performed.
-		    \param smooth: If the normals shall be smoothed. */
-		virtual void recalculateNormals(IMeshBuffer* buffer, bool smooth = false) const = 0;
+		\param smooth: If the normals shall be smoothed.
+		\param angleWeighted: If the normals shall be smoothed in relation to their angles. More expensive, but also higher precision. */
+		virtual void recalculateNormals(IMeshBuffer* buffer, bool smooth = false, bool angleWeighted = false) const = 0;
 
-		//! Scales the whole mesh.
-		/** \param mesh: Mesh on which the operation is performed.
-		 \param scale: Scale factor. */
-		virtual void scaleMesh(IMesh* mesh, const core::vector3df& scale) const = 0;
+		//! Scales the actual mesh, not a scene node.
+		/** \param mesh Mesh on which the operation is performed.
+		\param factor Scale factor for each axis. */
+		virtual void scale(IMesh* mesh, const core::vector3df& factor) const = 0;
 
-		//! Applies a transformation
-		/** \param mesh: Mesh on which the operation is performed.
-		 \param m: transformation matrix. */
-		virtual void transformMesh(IMesh* mesh, const core::matrix4& m) const = 0;
+		//! Scales the actual meshbuffer, not a scene node.
+		/** \param buffer Meshbuffer on which the operation is performed.
+		\param factor Scale factor for each axis. */
+		virtual void scale(IMeshBuffer* buffer, const core::vector3df& factor) const = 0;
 
-		//! Clones a static IMesh into a modifyable SMesh.
+		//! Scales the actual mesh, not a scene node.
+		/** \deprecated
+		\param mesh Mesh on which the operation is performed.
+		\param factor Scale factor for each axis. */
+		virtual void scaleMesh(IMesh* mesh, const core::vector3df& factor) const {return scale(mesh,factor);}
+
+		//! Scale the texture coords of a mesh.
+		/** \param mesh Mesh on which the operation is performed.
+		\param factor Vector which defines the scale for each axis.
+		\param level Number of texture coord, starting from 1. Support for level 2 exists for LightMap buffers. */
+		virtual void scaleTCoords(scene::IMesh* mesh, const core::vector2df& factor, u32 level=1) const =0;
+
+		//! Scale the texture coords of a meshbuffer.
+		/** \param buffer Meshbuffer on which the operation is performed.
+		\param factor Vector which defines the scale for each axis.
+		\param level Number of texture coord, starting from 1. Support for level 2 exists for LightMap buffers. */
+		virtual void scaleTCoords(scene::IMeshBuffer* buffer, const core::vector2df& factor, u32 level=1) const =0;
+
+		//! Applies a transformation to a mesh
+		/** \param mesh Mesh on which the operation is performed.
+		\param m transformation matrix. */
+		virtual void transform(IMesh* mesh, const core::matrix4& m) const = 0;
+
+		//! Applies a transformation to a meshbuffer
+		/** \param buffer Meshbuffer on which the operation is performed.
+		\param m transformation matrix. */
+		virtual void transform(IMeshBuffer* buffer, const core::matrix4& m) const = 0;
+
+		//! Applies a transformation to a mesh
+		/** \deprecated
+		\param mesh Mesh on which the operation is performed.
+		\param m transformation matrix. */
+		virtual void transformMesh(IMesh* mesh, const core::matrix4& m) const {return transform(mesh,m);}
+
+		//! Clones a static IMesh into a modifiable SMesh.
 		/** All meshbuffers in the returned SMesh
 		are of type SMeshBuffer or SMeshBufferLightMap.
-		\param mesh: Mesh to copy.
-		\return Returns the cloned mesh.
-		If you no longer need the cloned mesh, you should call SMesh::drop().
-		See IReferenceCounted::drop() for more information. */
+		\param mesh Mesh to copy.
+		\return Cloned mesh. If you no longer need the
+		cloned mesh, you should call SMesh::drop(). See
+		IReferenceCounted::drop() for more information. */
 		virtual SMesh* createMeshCopy(IMesh* mesh) const = 0;
 
-
 		//! Creates a planar texture mapping on the mesh
 		/** \param mesh: Mesh on which the operation is performed.
-		\param resolution: resolution of the planar mapping. This is the value
-		specifying which is the relation between world space and 
-		texture coordinate space. */
+		\param resolution: resolution of the planar mapping. This is
+		the value specifying which is the relation between world space
+		and texture coordinate space. */
 		virtual void makePlanarTextureMapping(IMesh* mesh, f32 resolution=0.001f) const = 0;
 
 		//! Creates a copy of the mesh, which will only consist of S3DVertexTangents vertices.
-        /** This is useful if you want to draw tangent space normal mapped geometry because
-		it calculates the tangent and binormal data which is needed there.
-		\param mesh: Input mesh
-		\return Mesh consiting only of S3DVertexTangents vertices.
-		If you no longer need the cloned mesh, you should call IMesh::drop().
-		See IReferenceCounted::drop() for more information. */
-		virtual IMesh* createMeshWithTangents(IMesh* mesh) const = 0;
+		/** This is useful if you want to draw tangent space normal
+		mapped geometry because it calculates the tangent and binormal
+		data which is needed there.
+		\param mesh Input mesh
+		\param recalculateNormals The normals are recalculated if set,
+		otherwise the original ones are kept. Note that keeping the
+		normals may introduce inaccurate tangents if the normals are
+		very different to those calculated from the faces.
+		\param smooth The normals/tangents are smoothed across the
+		meshbuffer's faces if this flag is set.
+		\param angleWeighted Improved smoothing calculation used
+		\return Mesh consisting only of S3DVertexTangents vertices. If
+		you no longer need the cloned mesh, you should call
+		IMesh::drop(). See IReferenceCounted::drop() for more
+		information. */
+		virtual IMesh* createMeshWithTangents(IMesh* mesh, bool recalculateNormals=false, bool smooth=false, bool angleWeighted=false) const = 0;
 
 		//! Creates a copy of the mesh, which will only consist of S3DVertex2TCoord vertices.
+		/** \param mesh Input mesh
+		\return Mesh consisting only of S3DVertex2TCoord vertices. If
+		you no longer need the cloned mesh, you should call
+		IMesh::drop(). See IReferenceCounted::drop() for more
+		information. */
 		virtual IMesh* createMeshWith2TCoords(IMesh* mesh) const = 0;
+
 		//! Creates a copy of a mesh with all vertices unwelded
+		/** \param mesh Input mesh
+		\return Mesh consisting only of unique faces. All vertices
+		which were previously shared are now duplicated. If you no
+		longer need the cloned mesh, you should call IMesh::drop(). See
+		IReferenceCounted::drop() for more information. */
 		virtual IMesh* createMeshUniquePrimitives(IMesh* mesh) const = 0;
 
 		//! Creates a copy of a mesh with vertices welded
+		/** \param mesh Input mesh
+		\param tolerance The threshold for vertex comparisons.
+		\return Mesh without redundant vertices. If you no longer need
+		the cloned mesh, you should call IMesh::drop(). See
+		IReferenceCounted::drop() for more information. */
 		virtual IMesh* createMeshWelded(IMesh* mesh, f32 tolerance=core::ROUNDING_ERROR_32) const = 0;
 
-		//! Returns amount of polygons in mesh.
+		//! Get amount of polygons in mesh.
+		/** \param mesh Input mesh
+		\return Number of polygons in mesh. */
 		virtual s32 getPolyCount(IMesh* mesh) const = 0;
 
-		//! Returns amount of polygons in mesh.
+		//! Get amount of polygons in mesh.
+		/** \param mesh Input mesh
+		\return Number of polygons in mesh. */
 		virtual s32 getPolyCount(IAnimatedMesh* mesh) const = 0;
 
-		//! create a new AnimatedMesh and adds the mesh to it
+		//! Create a new AnimatedMesh and adds the mesh to it
+		/** \param mesh Input mesh
+		\param type The type of the animated mesh to create.
+		\return Newly created animated mesh with mesh as its only
+		content. When you don't need the animated mesh anymore, you
+		should call IAnimatedMesh::drop(). See
+		IReferenceCounted::drop() for more information. */
 		virtual IAnimatedMesh * createAnimatedMesh(IMesh* mesh,
 			scene::E_ANIMATED_MESH_TYPE type = scene::EAMT_UNKNOWN) const = 0;
-
 	};
 
 } // end namespace scene
diff --git a/src/dep/include/irrlicht/IMeshSceneNode.h b/src/dep/include/irrlicht/IMeshSceneNode.h
index 8c0de7d..77fc9ba 100644
--- a/src/dep/include/irrlicht/IMeshSceneNode.h
+++ b/src/dep/include/irrlicht/IMeshSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -20,24 +20,32 @@ class IMeshSceneNode : public ISceneNode
 {
 public:
 
-	//! constructor
-	IMeshSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id, 
-		const core::vector3df& position, const core::vector3df& rotation,
+	//! Constructor
+	/** Use setMesh() to set the mesh to display.
+	*/
+	IMeshSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
+			const core::vector3df& position,
+			const core::vector3df& rotation,
 			const core::vector3df& scale)
 		: ISceneNode(parent, mgr, id, position, rotation, scale) {}
 
 	//! Sets a new mesh to display
+	/** \param mesh Mesh to display. */
 	virtual void setMesh(IMesh* mesh) = 0;
 
-	//! Returns the current mesh
+	//! Get the currently defined mesh for display.
+	/** \return Pointer to mesh which is displayed by this node. */
 	virtual IMesh* getMesh(void) = 0;
 
 	//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
-	/* In this way it is possible to change the materials a mesh causing all mesh scene nodes 
-	referencing this mesh to change too. */
+	/** In this way it is possible to change the materials of a mesh
+	causing all mesh scene nodes referencing this mesh to change, too.
+	\param readonly Flag if the materials shall be read-only. */
 	virtual void setReadOnlyMaterials(bool readonly) = 0;
 
-	//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
+	//! Check if the scene node should not copy the materials of the mesh but use them in a read only style
+	/** This flag can be set by setReadOnlyMaterials().
+	\return Whether the materials are read-only. */
 	virtual bool isReadOnlyMaterials() const = 0;
 };
 
diff --git a/src/dep/include/irrlicht/IMeshWriter.h b/src/dep/include/irrlicht/IMeshWriter.h
index fefde4e..9b8f095 100644
--- a/src/dep/include/irrlicht/IMeshWriter.h
+++ b/src/dep/include/irrlicht/IMeshWriter.h
@@ -1,3 +1,7 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
 #ifndef __IRR_I_MESH_WRITER_H_INCLUDED__
 #define __IRR_I_MESH_WRITER_H_INCLUDED__
 
@@ -15,24 +19,30 @@ namespace scene
 {
 	class IMesh;
 
-	// interface for writing meshes
+	//! Interface for writing meshes
 	class IMeshWriter : public virtual IReferenceCounted
 	{
 	public:
 
+		//! Destructor
 		virtual ~IMeshWriter() {}
 
-		//! Returns the type of the mesh writer
-		/** For own implementations, use  MAKE_IRR_ID as shown in the EMESH_WRITER_TYPE
-		enumeration to return your own unique mesh type id.*/
+		//! Get the type of the mesh writer
+		/** For own implementations, use MAKE_IRR_ID as shown in the
+		EMESH_WRITER_TYPE enumeration to return your own unique mesh
+		type id.
+		\return Type of the mesh writer. */
 		virtual EMESH_WRITER_TYPE getType() const = 0;
 
-		//! writes a static mesh
-		/** \return Returns true if sucessful */
+		//! Write a static mesh.
+		/** \param file File handle to write the mesh to.
+		\param mesh Pointer to mesh to be written.
+		\param flags Optional flags to set properties of the writer.
+		\return True if sucessful */
 		virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh,
 							s32 flags=EMWF_NONE) = 0;
 
-		// writes an animated mesh
+		// Writes an animated mesh
 		// for future use, no writer is able to write animated meshes currently
 		/* \return Returns true if sucessful */
 		//virtual bool writeAnimatedMesh(io::IWriteFile* file,
diff --git a/src/dep/include/irrlicht/IMetaTriangleSelector.h b/src/dep/include/irrlicht/IMetaTriangleSelector.h
index d3afaba..a4e07a4 100644
--- a/src/dep/include/irrlicht/IMetaTriangleSelector.h
+++ b/src/dep/include/irrlicht/IMetaTriangleSelector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,22 +14,21 @@ namespace scene
 
 //! Interface for making multiple triangle selectors work as one big selector.
 /** This is nothing more than a collection of one or more triangle selectors
-providing together the interface of one triangle selector. In this way, 
+providing together the interface of one triangle selector. In this way,
 collision tests can be done with different triangle soups in one pass.
 */
 class IMetaTriangleSelector : public ITriangleSelector
 {
 public:
 
-	//! Adds a triangle selector to the collection of triangle selectors
-	//! in this metaTriangleSelector.
-	//! \param toAdd: Pointer to an triangle selector to add to the list.
-	virtual void addTriangleSelector(ITriangleSelector* toAdd) = 0; 
+	//! Adds a triangle selector to the collection of triangle selectors.
+	/** \param toAdd: Pointer to an triangle selector to add to the list. */
+	virtual void addTriangleSelector(ITriangleSelector* toAdd) = 0;
 
-	//! Removes a specific triangle selector which was added before	from the collection.
-	//! \param toRemove: Pointer to an triangle selector which is in the list
-	//! but will be removed.
-	//! \return Returns true if successful, false if not.
+	//! Removes a specific triangle selector from the collection.
+	/** \param toRemove: Pointer to an triangle selector which is in the
+	list but will be removed.
+	\return True if successful, false if not. */
 	virtual bool removeTriangleSelector(ITriangleSelector* toRemove) = 0;
 
 	//! Removes all triangle selectors from the collection.
diff --git a/src/dep/include/irrlicht/IOSOperator.h b/src/dep/include/irrlicht/IOSOperator.h
index 2cb72dc..3bc1737 100644
--- a/src/dep/include/irrlicht/IOSOperator.h
+++ b/src/dep/include/irrlicht/IOSOperator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,28 +15,28 @@ class IOSOperator : public virtual IReferenceCounted
 {
 public:
 
-	//! destructor
+	//! Destructor
 	virtual ~IOSOperator() {}
 
-	//! returns the current operation system version as string.
+	//! Get the current operation system version as string.
 	virtual const wchar_t* getOperationSystemVersion() const = 0;
 
-	//! copies text to the clipboard
+	//! Copies text to the clipboard
 	virtual void copyToClipboard(const c8* text) const = 0;
 
-	//! gets text from the clipboard
-	//! \return Returns 0 if no string is in there.
-	virtual c8* getTextFromClipboard() const = 0;	
+	//! Get text from the clipboard
+	/** \return Returns 0 if no string is in there. */
+	virtual c8* getTextFromClipboard() const = 0;
 
-	//! gets the processor speed in megahertz
-	//! \param MHz: The integer variable to store the speed in.
-	//! \return Returns true if successful, false if not
+	//! Get the processor speed in megahertz
+	/** \param MHz The integer variable to store the speed in.
+	\return True if successful, false if not */
 	virtual bool getProcessorSpeedMHz(u32* MHz) const = 0;
 
-	//! gets the total and available system RAM
-	//! \param Total: will contain the total system memory
-	//! \param Avail: will contain the available memory
-	//! \return Returns true if successful, false if not
+	//! Get the total and available system RAM
+	/** \param Total: will contain the total system memory
+	\param Avail: will contain the available memory
+	\return True if successful, false if not */
 	virtual bool getSystemMemory(u32* Total, u32* Avail) const = 0;
 
 };
diff --git a/src/dep/include/irrlicht/IParticleAffector.h b/src/dep/include/irrlicht/IParticleAffector.h
index 9a69c17..7843c91 100644
--- a/src/dep/include/irrlicht/IParticleAffector.h
+++ b/src/dep/include/irrlicht/IParticleAffector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,6 +21,7 @@ enum E_PARTICLE_AFFECTOR_TYPE
 	EPAT_FADE_OUT,
 	EPAT_GRAVITY,
 	EPAT_ROTATE,
+	EPAT_SCALE,
 	EPAT_COUNT
 };
 
@@ -32,6 +33,7 @@ const c8* const ParticleAffectorTypeNames[] =
 	"FadeOut",
 	"Gravity",
 	"Rotate",
+	"Scale",
 	0
 };
 
@@ -44,9 +46,9 @@ public:
 	IParticleAffector() : Enabled(true) {}
 
 	//! Affects an array of particles.
-	//! \param now: Current time. (Same as ITimer::getTime() would return)
-	//! \param particlearray: Array of particles.
-	//! \param count: Amount of particles in array.
+	/** \param now Current time. (Same as ITimer::getTime() would return)
+	\param particlearray Array of particles.
+	\param count Amount of particles in array. */
 	virtual void affect(u32 now, SParticle* particlearray, u32 count) = 0;
 
 	//! Sets whether or not the affector is currently enabled.
@@ -56,17 +58,17 @@ public:
 	virtual bool getEnabled() const { return Enabled; }
 
 	//! Writes attributes of the object.
-	//! Implement this to expose the attributes of your scene node animator for
-	//! scripting languages, editors, debuggers or xml serialization purposes.
+	/** Implement this to expose the attributes of your scene node animator for
+	scripting languages, editors, debuggers or xml serialization purposes. */
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const {}
 
 	//! Reads attributes of the object.
-	//! Implement this to set the attributes of your scene node animator for
-	//! scripting languages, editors, debuggers or xml deserialization purposes.
-	//! \param startIndex: start index where to start reading attributes.
-	//! \param in: The attributes to work with.
-	//! \param options: Additional options.
-	//! \return: returns last index of an attribute read by this affector
+	/** Implement this to set the attributes of your scene node animator for
+	scripting languages, editors, debuggers or xml deserialization purposes.
+	\param startIndex start index where to start reading attributes.
+	\param in The attributes to work with.
+	\param options Additional options.
+	\return Last index of an attribute read by this affector */
 	virtual s32 deserializeAttributes(s32 startIndex, io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) { return 0; }
 
 	//! Get emitter type
diff --git a/src/dep/include/irrlicht/IParticleAnimatedMeshSceneNodeEmitter.h b/src/dep/include/irrlicht/IParticleAnimatedMeshSceneNodeEmitter.h
index 65898a1..f29b26a 100644
--- a/src/dep/include/irrlicht/IParticleAnimatedMeshSceneNodeEmitter.h
+++ b/src/dep/include/irrlicht/IParticleAnimatedMeshSceneNodeEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -27,11 +27,10 @@ public:
 	//! Set the amount that the normal is divided by for getting a particles direction
 	virtual void setNormalDirectionModifier( f32 normalDirectionModifier ) = 0;
 
-	//! Sets whether to emit min<->max particles for every vertex per
-	//! second, or to pick  min<->max vertices every second
+	//! Sets whether to emit min<->max particles for every vertex or to pick min<->max vertices
 	virtual void setEveryMeshVertex( bool everyMeshVertex = true ) = 0;
 
-	//! Get Mesh we're emitting particles from
+	//! Get mesh we're emitting particles from
 	virtual const IAnimatedMeshSceneNode* getAnimatedMeshSceneNode() const = 0;
 
 	//! Get whether to use vertex normal for direction, or direction specified
@@ -40,8 +39,7 @@ public:
 	//! Get the amount that the normal is divided by for getting a particles direction
 	virtual f32 getNormalDirectionModifier() const = 0;
 
-	//! Gets whether to emit min<->max particles for every vertex per
-	//! second, or to pick  min<->max vertices every second
+	//! Gets whether to emit min<->max particles for every vertex or to pick min<->max vertices
 	virtual bool getEveryMeshVertex() const = 0;
 
 	//! Get emitter type
diff --git a/src/dep/include/irrlicht/IParticleAttractionAffector.h b/src/dep/include/irrlicht/IParticleAttractionAffector.h
index 137b3d1..3ac8149 100644
--- a/src/dep/include/irrlicht/IParticleAttractionAffector.h
+++ b/src/dep/include/irrlicht/IParticleAttractionAffector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/IParticleBoxEmitter.h b/src/dep/include/irrlicht/IParticleBoxEmitter.h
index 7e6acd2..5dd1e8a 100644
--- a/src/dep/include/irrlicht/IParticleBoxEmitter.h
+++ b/src/dep/include/irrlicht/IParticleBoxEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/IParticleCylinderEmitter.h b/src/dep/include/irrlicht/IParticleCylinderEmitter.h
index f155897..ed66448 100644
--- a/src/dep/include/irrlicht/IParticleCylinderEmitter.h
+++ b/src/dep/include/irrlicht/IParticleCylinderEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/IParticleEmitter.h b/src/dep/include/irrlicht/IParticleEmitter.h
index b87ff5c..02c8698 100644
--- a/src/dep/include/irrlicht/IParticleEmitter.h
+++ b/src/dep/include/irrlicht/IParticleEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -47,12 +47,11 @@ class IParticleEmitter : public virtual io::IAttributeExchangingObject
 public:
 
 	//! Prepares an array with new particles to emitt into the system
-	//! and returns how much new particles there are.
-	//! \param now: Current time.
-	//! \param timeSinceLastCall: Time elapsed since last call, in milliseconds.
-	//! \param outArray: Pointer which will point to the array with the new
-	//! particles to add into the system.
-	//! \return Returns amount of new particles in the array. Can be 0.
+	/** \param now Current time.
+	\param timeSinceLastCall Time elapsed since last call, in milliseconds.
+	\param outArray Pointer which will point to the array with the new
+	particles to add into the system.
+	\return Amount of new particles in the array. Can be 0. */
 	virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) = 0;
 
 	//! Set direction the emitter emits particles
@@ -70,6 +69,12 @@ public:
 	//! Set maximum starting color for particles
 	virtual void setMaxStartColor( const video::SColor& color ) = 0;
 
+	//! Set the maximum starting size for particles
+	virtual void setMaxStartSize( const core::dimension2df& size ) = 0;
+
+	//! Set the minimum starting size for particles
+	virtual void setMinStartSize( const core::dimension2df& size ) = 0;
+
 	//! Get direction the emitter emits particles
 	virtual const core::vector3df& getDirection() const = 0;
 
@@ -85,19 +90,27 @@ public:
 	//! Get the maximum starting color for particles
 	virtual const video::SColor& getMaxStartColor() const = 0;
 
+	//! Get the maximum starting size for particles
+	virtual const core::dimension2df& getMaxStartSize() const = 0;
+
+	//! Get the minimum starting size for particles
+	virtual const core::dimension2df& getMinStartSize() const = 0;
+
 	//! Writes attributes of the object.
-	//! Implement this to expose the attributes of your scene node animator for
-	//! scripting languages, editors, debuggers or xml serialization purposes.
-	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const {}
+	/** Implement this to expose the attributes of your scene node animator for
+	scripting languages, editors, debuggers or xml serialization purposes. */
+	virtual void serializeAttributes(io::IAttributes* out,
+			io::SAttributeReadWriteOptions* options=0) const {}
 
 	//! Reads attributes of the object.
-	//! Implement this to set the attributes of your scene node animator for
-	//! scripting languages, editors, debuggers or xml deserialization purposes.
-	//! \param startIndex: start index where to start reading attributes.
-	//! \param in: The attributes to work with.
-	//! \param options: Additional options.
-	//! \return: returns last index of an attribute read by this affector
-	virtual s32 deserializeAttributes(s32 startIndex, io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) { return 0; }
+	/** Implement this to set the attributes of your scene node animator for
+	scripting languages, editors, debuggers or xml deserialization purposes.
+	\param startIndex start index where to start reading attributes.
+	\param in The attributes to work with.
+	\param options Additional options.
+	\return Last index of an attribute read by this affector */
+	virtual s32 deserializeAttributes(s32 startIndex, io::IAttributes* in,
+			io::SAttributeReadWriteOptions* options=0) { return 0; }
 
 	//! Get emitter type
 	virtual E_PARTICLE_EMITTER_TYPE getType() const { return EPET_POINT; }
diff --git a/src/dep/include/irrlicht/IParticleFadeOutAffector.h b/src/dep/include/irrlicht/IParticleFadeOutAffector.h
index 15cf84f..54f14da 100644
--- a/src/dep/include/irrlicht/IParticleFadeOutAffector.h
+++ b/src/dep/include/irrlicht/IParticleFadeOutAffector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,15 +17,13 @@ class IParticleFadeOutAffector : public IParticleAffector
 {
 public:
 
-	//! Sets the targetColor, i.e. the color the particles will interpolate
-	//! to over time.
+	//! Sets the targetColor, i.e. the color the particles will interpolate to over time.
 	virtual void setTargetColor( const video::SColor& targetColor ) = 0;
 
 	//! Sets the amount of time it takes for each particle to fade out.
 	virtual void setFadeOutTime( f32 fadeOutTime ) = 0;
 
-	//! Gets the targetColor, i.e. the color the particles will interpolate
-	//! to over time.
+	//! Gets the targetColor, i.e. the color the particles will interpolate to over time.
 	virtual const video::SColor& getTargetColor() const = 0;
 
 	//! Gets the amount of time it takes for each particle to fade out.
diff --git a/src/dep/include/irrlicht/IParticleGravityAffector.h b/src/dep/include/irrlicht/IParticleGravityAffector.h
index 8851fef..45b6da3 100644
--- a/src/dep/include/irrlicht/IParticleGravityAffector.h
+++ b/src/dep/include/irrlicht/IParticleGravityAffector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,15 +17,14 @@ class IParticleGravityAffector : public IParticleAffector
 {
 public:
 
-	//! Set the time in milliseconds when the gravity force is totally
-	//! lost and the particle does not move any more.
+	//! Set the time in milliseconds when the gravity force is totally lost
+	/** At that point the particle does not move any more. */
 	virtual void setTimeForceLost( f32 timeForceLost ) = 0;
 
 	//! Set the direction and force of gravity in all 3 dimensions.
 	virtual void setGravity( const core::vector3df& gravity ) = 0;
 
-	//! Get the time in milliseconds when the gravity force is totally
-	//! lost and the particle does not move any more.
+	//! Get the time in milliseconds when the gravity force is totally lost
 	virtual f32 getTimeForceLost() const = 0;
 
 	//! Get the direction and force of gravity.
diff --git a/src/dep/include/irrlicht/IParticleMeshEmitter.h b/src/dep/include/irrlicht/IParticleMeshEmitter.h
index 99f72a9..69761fa 100644
--- a/src/dep/include/irrlicht/IParticleMeshEmitter.h
+++ b/src/dep/include/irrlicht/IParticleMeshEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -27,8 +27,7 @@ public:
 	//! Set the amount that the normal is divided by for getting a particles direction
 	virtual void setNormalDirectionModifier( f32 normalDirectionModifier ) = 0;
 
-	//! Sets whether to emit min<->max particles for every vertex per second, or to pick 
-	//! min<->max vertices every second
+	//! Sets whether to emit min<->max particles for every vertex or to pick min<->max vertices
 	virtual void setEveryMeshVertex( bool everyMeshVertex = true ) = 0;
 
 	//! Get Mesh we're emitting particles from
@@ -40,8 +39,7 @@ public:
 	//! Get the amount that the normal is divided by for getting a particles direction
 	virtual f32 getNormalDirectionModifier() const = 0;
 
-	//! Gets whether to emit min<->max particles for every vertex per second, or to pick 
-	//! min<->max vertices every second
+	//! Gets whether to emit min<->max particles for every vertex or to pick min<->max vertices
 	virtual bool getEveryMeshVertex() const = 0;
 
 	//! Get emitter type
diff --git a/src/dep/include/irrlicht/IParticleRingEmitter.h b/src/dep/include/irrlicht/IParticleRingEmitter.h
index eaf4de4..9c3c6b5 100644
--- a/src/dep/include/irrlicht/IParticleRingEmitter.h
+++ b/src/dep/include/irrlicht/IParticleRingEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/IParticleRotationAffector.h b/src/dep/include/irrlicht/IParticleRotationAffector.h
index 9646a28..58c743f 100644
--- a/src/dep/include/irrlicht/IParticleRotationAffector.h
+++ b/src/dep/include/irrlicht/IParticleRotationAffector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/IParticleSphereEmitter.h b/src/dep/include/irrlicht/IParticleSphereEmitter.h
index 319f308..bc1b6ee 100644
--- a/src/dep/include/irrlicht/IParticleSphereEmitter.h
+++ b/src/dep/include/irrlicht/IParticleSphereEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/IParticleSystemSceneNode.h b/src/dep/include/irrlicht/IParticleSystemSceneNode.h
index e3de6d2..5835ca0 100644
--- a/src/dep/include/irrlicht/IParticleSystemSceneNode.h
+++ b/src/dep/include/irrlicht/IParticleSystemSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -25,8 +25,8 @@ namespace scene
 
 //! A particle system scene node for creating snow, fire, exlosions, smoke...
 /** A scene node controlling a particle System. The behavior of the particles
-can be controlling by setting the right particle emitters and effectors.
-You can for example easily a campfire by doing this:
+can be controlled by setting the right particle emitters and affectors.
+You can for example easily create a campfire by doing this:
 
 \code
 	scene::IParticleSystemSceneNode* p = scenemgr->addParticleSystemSceneNode();
@@ -47,7 +47,7 @@ class IParticleSystemSceneNode : public ISceneNode
 {
 public:
 
-	//! constructor
+	//! Constructor
 	IParticleSystemSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
 		const core::vector3df& position = core::vector3df(0,0,0),
 		const core::vector3df& rotation = core::vector3df(0,0,0),
@@ -58,101 +58,126 @@ public:
 	virtual void setParticleSize(
 		const core::dimension2d<f32> &size = core::dimension2d<f32>(5.0f, 5.0f)) = 0;
 
-	//! Sets if the particles should be global. If it is, the particles are affected by
-	//! the movement of the particle system scene node too, otherwise they completely
-	//! ignore it. Default is true.
-	virtual void setParticlesAreGlobal(bool global) = 0;
+	//! Sets if the particles should be global.
+	/** If they are, the particles are affected by the movement of the
+	particle system scene node too, otherwise they completely ignore it.
+	Default is true. */
+	virtual void setParticlesAreGlobal(bool global=true) = 0;
+
+	//! Gets the particle emitter, which creates the particles.
+	/** \return The particle emitter. Can be 0 if none is set. */
+	virtual IParticleEmitter* getEmitter() =0;
 
 	//! Sets the particle emitter, which creates the particles.
-	//! A particle emitter can be created using one of the
-	//! methods. For example to create and use a simple PointEmitter,
-	//! call IParticleEmitter* p = createPointEmitter(); setEmitter(p); p->drop();
-	//! \param emitter: Sets the particle emitter. You can set this to 0
-	//! for removing the current emitter and stopping the particle system
-	//! emitting new particles.
+	/** A particle emitter can be created using one of the createEmitter
+	methods. For example to create and use a simple PointEmitter, call
+	IParticleEmitter* p = createPointEmitter(); setEmitter(p); p->drop();
+	\param emitter: Sets the particle emitter. You can set this to 0 for
+	removing the current emitter and stopping the particle system emitting
+	new particles. */
 	virtual void setEmitter(IParticleEmitter* emitter) = 0;
 
-	//! Adds new particle effector to the particle system. A particle
-	//! affector modifies the particles. For example, the FadeOut
-	//! affector lets all particles fade out after some time. It is created
-	//! and used in this way: IParticleAffector* p = createFadeOutParticleAffector();
-	//! addAffector(p); p->drop();
-	//! Please note that a affector is not necessary for the particle
-	//! system to work.
-	//! \param affector: New affector.
+	//! Adds new particle effector to the particle system.
+	/** A particle affector modifies the particles. For example, the FadeOut
+	affector lets all particles fade out after some time. It is created and
+	used in this way:
+	\code
+	IParticleAffector* p = createFadeOutParticleAffector();
+	addAffector(p);
+	p->drop();
+	\endcode
+	Please note that an affector is not necessary for the particle system to
+	work.
+	\param affector: New affector. */
 	virtual void addAffector(IParticleAffector* affector) = 0;
 
 	//! Removes all particle affectors in the particle system.
 	virtual void removeAllAffectors() = 0;
 
 	//! Creates a particle emitter for an animated mesh scene node
-	//! \param node: Pointer to the animated mesh scene node to emit particles from
-	//! \param useNormalDirection: If true, the direction of each particle created will
-	//! be the normal of the vertex that it's emitting from.  The normal is divided by the
-	//! normalDirectionModifier parameter, which defaults to 100.0f.
-	//! \param direction: Direction and speed of particle emission.
-	//! \param normalDirectionModifier: If the emitter is using the normal direction
-	//! then the normal of the vertex that is being emitted from is divided by this number.
-	//! \param mbNumber: This allows you to specify a specific meshBuffer for the IMesh*
-	//! to emit particles from.  The default value is -1, which means a random meshBuffer
-	//! picked from all of the meshes meshBuffers will be selected to pick a random vertex from.
-	//! If the value is 0 or greater, it will only pick random vertices from the meshBuffer
-	//! specified by this value.
-	//! \param everyMeshVertex: If true, the emitter will emit between min/max particles every second,
-	//! for every vertex in the mesh, if false, it will emit between min/max particles from random vertices
-	//! in the mesh.
-	//! \param minParticlesPerSecond: Minimal amount of particles emitted
-	//! per second.
-	//! \param maxParticlesPerSecond: Maximal amount of particles emitted
-	//! per second.
-	//! \param minStartColor: Minimal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param maxStartColor: Maximal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
-	//! \param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
-	//! \param maxAngleDegrees: Maximal angle in degrees, the emitting direction
-	//! of the particle will differ from the orignial direction.
-	//! \return Returns a pointer to the created particle emitter.
-	//! To set this emitter as new emitter of this particle system,
-	//! just call setEmitter(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	/** \param node: Pointer to the animated mesh scene node to emit
+	particles from
+	\param useNormalDirection: If true, the direction of each particle
+	created will be the normal of the vertex that it's emitting from. The
+	normal is divided by the normalDirectionModifier parameter, which
+	defaults to 100.0f.
+	\param direction: Direction and speed of particle emission.
+	\param normalDirectionModifier: If the emitter is using the normal
+	direction then the normal of the vertex that is being emitted from is
+	divided by this number.
+	\param mbNumber: This allows you to specify a specific meshBuffer for
+	the IMesh* to emit particles from. The default value is -1, which
+	means a random meshBuffer picked from all of the meshes meshBuffers
+	will be selected to pick a random vertex from. If the value is 0 or
+	greater, it will only pick random vertices from the meshBuffer
+	specified by this value.
+	\param everyMeshVertex: If true, the emitter will emit between min/max
+	particles every second, for every vertex in the mesh, if false, it will
+	emit between min/max particles from random vertices in the mesh.
+	\param minParticlesPerSecond: Minimal amount of particles emitted per
+	second.
+	\param maxParticlesPerSecond: Maximal amount of particles emitted per
+	second.
+	\param minStartColor: Minimal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param maxStartColor: Maximal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
+	\param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
+	\param maxAngleDegrees: Maximal angle in degrees, the emitting
+	direction of the particle will differ from the original direction.
+	\param minStartSize: Minimal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\param maxStartSize: Maximal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\return Pointer to the created particle emitter. To set this emitter
+	as new emitter of this particle system, just call setEmitter(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticleAnimatedMeshSceneNodeEmitter* createAnimatedMeshSceneNodeEmitter(
 		scene::IAnimatedMeshSceneNode* node, bool useNormalDirection = true,
-		const core::vector3df& direction = core::vector3df(0.0f,0.0f,0.0f),
+		const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f),
 		f32 normalDirectionModifier = 100.0f, s32 mbNumber = -1,
 		bool everyMeshVertex = false,
 		u32 minParticlesPerSecond = 5, u32 maxParticlesPerSecond = 10,
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000,
-		s32 maxAngleDegrees = 0 ) = 0;
+		s32 maxAngleDegrees = 0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) = 0;
 
 	//! Creates a box particle emitter.
-	//! \param box: The box for the emitter.
-	//! \param direction: Direction and speed of particle emission.
-	//! \param minParticlesPerSecond: Minimal amount of particles emitted
-	//! per second.
-	//! \param maxParticlesPerSecond: Maximal amount of particles emitted
-	//! per second.
-	//! \param minStartColor: Minimal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param maxStartColor: Maximal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
-	//! \param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
-	//! \param maxAngleDegrees: Maximal angle in degrees, the emitting direction
-	//! of the particle will differ from the orignial direction.
-	//! \return Returns a pointer to the created particle emitter.
-	//! To set this emitter as new emitter of this particle system,
-	//! just call setEmitter(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	/** \param box: The box for the emitter.
+	\param direction: Direction and speed of particle emission.
+	\param minParticlesPerSecond: Minimal amount of particles emitted per
+	second.
+	\param maxParticlesPerSecond: Maximal amount of particles emitted per
+	second.
+	\param minStartColor: Minimal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param maxStartColor: Maximal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
+	\param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
+	\param maxAngleDegrees: Maximal angle in degrees, the emitting
+	direction of the particle will differ from the original direction.
+	\param minStartSize: Minimal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\param maxStartSize: Maximal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\return Pointer to the created particle emitter. To set this emitter
+	as new emitter of this particle system, just call setEmitter(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticleBoxEmitter* createBoxEmitter(
 		const core::aabbox3df& box = core::aabbox3df(-10,28,-10,10,30,10),
 		const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f),
@@ -161,108 +186,137 @@ public:
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0) = 0;
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) = 0;
 
 	//! Creates a particle emitter for emitting from a cylinder
-	//! \param center: The center of the circle at the base of the cylinder
-	//! \param radius: The thickness of the cylinder
-	//! \param normal: Direction of the length of the cylinder
-	//! \param length: The length of the the cylinder
-	//! \param outlineOnly: Whether or not to put points inside the cylinder or on the outline only
-	//! \param direction: Direction and speed of particle emission.
-	//! \param minParticlesPerSecond: Minimal amount of particles emitted per second.
-	//! \param maxParticlesPerSecond: Maximal amount of particles emitted per second.
-	//! \param minStartColor: Minimal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param maxStartColor: Maximal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
-	//! \param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
-	//! \param maxAngleDegrees: Maximal angle in degrees, the emitting direction
-	//! of the particle will differ from the orignial direction.
-	//! \return Returns a pointer to the created particle emitter.
-	//! To set this emitter as new emitter of this particle system,
-	//! just call setEmitter(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	/** \param center: The center of the circle at the base of the cylinder
+	\param radius: The thickness of the cylinder
+	\param normal: Direction of the length of the cylinder
+	\param length: The length of the the cylinder
+	\param outlineOnly: Whether or not to put points inside the cylinder or
+	on the outline only
+	\param direction: Direction and speed of particle emission.
+	\param minParticlesPerSecond: Minimal amount of particles emitted per
+	second.
+	\param maxParticlesPerSecond: Maximal amount of particles emitted per
+	second.
+	\param minStartColor: Minimal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param maxStartColor: Maximal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
+	\param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
+	\param maxAngleDegrees: Maximal angle in degrees, the emitting
+	direction of the particle will differ from the original direction.
+	\param minStartSize: Minimal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\param maxStartSize: Maximal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\return Pointer to the created particle emitter. To set this emitter
+	as new emitter of this particle system, just call setEmitter(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticleCylinderEmitter* createCylinderEmitter(
 		const core::vector3df& center, f32 radius,
 		const core::vector3df& normal, f32 length,
 		bool outlineOnly = false,
-		const core::vector3df& direction = core::vector3df(0.0f,0.0f,0.0f),
+		const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f),
 		u32 minParticlesPerSecond = 5, u32 maxParticlesPerSecond = 10,
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000,
-		s32 maxAngleDegrees = 0 ) = 0;
+		s32 maxAngleDegrees = 0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) = 0;
 
 	//! Creates a mesh particle emitter.
-	//! \param mesh: Pointer to mesh to emit particles from
-	//! \param useNormalDirection: If true, the direction of each particle created will
-	//! be the normal of the vertex that it's emitting from.  The normal is divided by the
-	//! normalDirectionModifier parameter, which defaults to 100.0f.
-	//! \param direction: Direction and speed of particle emission.
-	//! \param normalDirectionModifier: If the emitter is using the normal direction
-	//! then the normal of the vertex that is being emitted from is divided by this number.
-	//! \param mbNumber: This allows you to specify a specific meshBuffer for the IMesh*
-	//! to emit particles from.  The default value is -1, which means a random meshBuffer
-	//! picked from all of the meshes meshBuffers will be selected to pick a random vertex from.
-	//! If the value is 0 or greater, it will only pick random vertices from the meshBuffer
-	//! specified by this value.
-	//! \param everyMeshVertex: If true, the emitter will emit between min/max particles every second,
-	//! for every vertex in the mesh, if false, it will emit between min/max particles from random vertices
-	//! in the mesh.
-	//! \param minParticlesPerSecond: Minimal amount of particles emitted per second.
-	//! \param maxParticlesPerSecond: Maximal amount of particles emitted per second.
-	//! \param minStartColor: Minimal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param maxStartColor: Maximal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
-	//! \param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
-	//! \param maxAngleDegrees: Maximal angle in degrees, the emitting direction
-	//! of the particle will differ from the orignial direction.
-	//! \return Returns a pointer to the created particle emitter.
-	//! To set this emitter as new emitter of this particle system,
-	//! just call setEmitter(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	/** \param mesh: Pointer to mesh to emit particles from
+	\param useNormalDirection: If true, the direction of each particle
+	created will be the normal of the vertex that it's emitting from. The
+	normal is divided by the normalDirectionModifier parameter, which
+	defaults to 100.0f.
+	\param direction: Direction and speed of particle emission.
+	\param normalDirectionModifier: If the emitter is using the normal
+	direction then the normal of the vertex that is being emitted from is
+	divided by this number.
+	\param mbNumber: This allows you to specify a specific meshBuffer for
+	the IMesh* to emit particles from. The default value is -1, which
+	means a random meshBuffer picked from all of the meshes meshBuffers
+	will be selected to pick a random vertex from. If the value is 0 or
+	greater, it will only pick random vertices from the meshBuffer
+	specified by this value.
+	\param everyMeshVertex: If true, the emitter will emit between min/max
+	particles every second, for every vertex in the mesh, if false, it will
+	emit between min/max particles from random vertices in the mesh.
+	\param minParticlesPerSecond: Minimal amount of particles emitted per
+	second.
+	\param maxParticlesPerSecond: Maximal amount of particles emitted per
+	second.
+	\param minStartColor: Minimal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param maxStartColor: Maximal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
+	\param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
+	\param maxAngleDegrees: Maximal angle in degrees, the emitting
+	direction of the particle will differ from the original direction.
+	\param minStartSize: Minimal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\param maxStartSize: Maximal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\return Pointer to the created particle emitter. To set this emitter
+	as new emitter of this particle system, just call setEmitter(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticleMeshEmitter* createMeshEmitter(
 		scene::IMesh* mesh, bool useNormalDirection = true,
-		const core::vector3df& direction = core::vector3df(0.0f,0.0f,0.0f),
+		const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f),
 		f32 normalDirectionModifier = 100.0f, s32 mbNumber = -1,
 		bool everyMeshVertex = false,
 		u32 minParticlesPerSecond = 5, u32 maxParticlesPerSecond = 10,
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000,
-		s32 maxAngleDegrees = 0 ) = 0;
+		s32 maxAngleDegrees = 0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) = 0;
 
 	//! Creates a point particle emitter.
-	//! \param direction: Direction and speed of particle emission.
-	//! \param minParticlesPerSecond: Minimal amount of particles emitted
-	//! per second.
-	//! \param maxParticlesPerSecond: Maximal amount of particles emitted
-	//! per second.
-	//! \param minStartColor: Minimal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param maxStartColor: Maximal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
-	//! \param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
-	//! \param maxAngleDegrees: Maximal angle in degrees, the emitting direction
-	//! of the particle will differ from the orignial direction.
-	//! \return Returns a pointer to the created particle emitter.
-	//! To set this emitter as new emitter of this particle system,
-	//! just call setEmitter(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	/** \param direction: Direction and speed of particle emission.
+	\param minParticlesPerSecond: Minimal amount of particles emitted per
+	second.
+	\param maxParticlesPerSecond: Maximal amount of particles emitted per
+	second.
+	\param minStartColor: Minimal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param maxStartColor: Maximal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
+	\param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
+	\param maxAngleDegrees: Maximal angle in degrees, the emitting
+	direction of the particle will differ from the original direction.
+	\param minStartSize: Minimal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\param maxStartSize: Maximal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\return Pointer to the created particle emitter. To set this emitter
+	as new emitter of this particle system, just call setEmitter(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticlePointEmitter* createPointEmitter(
 		const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f),
 		u32 minParticlesPerSecond = 5,
@@ -270,34 +324,41 @@ public:
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0) = 0;
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) = 0;
 
 	//! Creates a ring particle emitter.
-	//! \param center: Center of ring
-	//! \param radius: Distance of points from center, points will be rotated around the
-	//! Y axis at a random 360 degrees and will then be shifted by the provided ringThickness
-	//! values in each axis.
-	//! \param ringThickness : thickness of the ring or how wide the ring is
-	//! \param direction: Direction and speed of particle emission.
-	//! \param minParticlesPerSecond: Minimal amount of particles emitted
-	//! per second.
-	//! \param maxParticlesPerSecond: Maximal amount of particles emitted
-	//! per second.
-	//! \param minStartColor: Minimal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param maxStartColor: Maximal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
-	//! \param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
-	//! \param maxAngleDegrees: Maximal angle in degrees, the emitting direction
-	//! of the particle will differ from the orignial direction.
-	//! \return Returns a pointer to the created particle emitter.
-	//! To set this emitter as new emitter of this particle system,
-	//! just call setEmitter(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	/** \param center: Center of ring
+	\param radius: Distance of points from center, points will be rotated
+	around the Y axis at a random 360 degrees and will then be shifted by
+	the provided ringThickness values in each axis.
+	\param ringThickness : thickness of the ring or how wide the ring is
+	\param direction: Direction and speed of particle emission.
+	\param minParticlesPerSecond: Minimal amount of particles emitted per
+	second.
+	\param maxParticlesPerSecond: Maximal amount of particles emitted per
+	second.
+	\param minStartColor: Minimal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param maxStartColor: Maximal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
+	\param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
+	\param maxAngleDegrees: Maximal angle in degrees, the emitting
+	direction of the particle will differ from the original direction.
+	\param minStartSize: Minimal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\param maxStartSize: Maximal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\return Pointer to the created particle emitter. To set this emitter
+	as new emitter of this particle system, just call setEmitter(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticleRingEmitter* createRingEmitter(
 		const core::vector3df& center, f32 radius, f32 ringThickness,
 		const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f),
@@ -306,31 +367,38 @@ public:
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0) = 0;
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) = 0;
 
 	//! Creates a sphere particle emitter.
-	//! \param center: Center of sphere
-	//! \param radius: Radius of sphere
-	//! \param direction: Direction and speed of particle emission.
-	//! \param minParticlesPerSecond: Minimal amount of particles emitted
-	//! per second.
-	//! \param maxParticlesPerSecond: Maximal amount of particles emitted
-	//! per second.
-	//! \param minStartColor: Minimal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param maxStartColor: Maximal initial start color of a particle.
-	//! The real color of every particle is calculated as random interpolation
-	//! between minStartColor and maxStartColor.
-	//! \param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
-	//! \param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
-	//! \param maxAngleDegrees: Maximal angle in degrees, the emitting direction
-	//! of the particle will differ from the orignial direction.
-	//! \return Returns a pointer to the created particle emitter.
-	//! To set this emitter as new emitter of this particle system,
-	//! just call setEmitter(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	/** \param center: Center of sphere
+	\param radius: Radius of sphere
+	\param direction: Direction and speed of particle emission.
+	\param minParticlesPerSecond: Minimal amount of particles emitted per
+	second.
+	\param maxParticlesPerSecond: Maximal amount of particles emitted per
+	second.
+	\param minStartColor: Minimal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param maxStartColor: Maximal initial start color of a particle. The
+	real color of every particle is calculated as random interpolation
+	between minStartColor and maxStartColor.
+	\param lifeTimeMin: Minimal lifetime of a particle, in milliseconds.
+	\param lifeTimeMax: Maximal lifetime of a particle, in milliseconds.
+	\param maxAngleDegrees: Maximal angle in degrees, the emitting
+	direction of the particle will differ from the original direction.
+	\param minStartSize: Minimal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\param maxStartSize: Maximal initial start size of a particle. The
+	real size of every particle is calculated as random interpolation
+	between minStartSize and maxStartSize.
+	\return Pointer to the created particle emitter. To set this emitter
+	as new emitter of this particle system, just call setEmitter(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticleSphereEmitter* createSphereEmitter(
 		const core::vector3df& center, f32 radius,
 		const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f),
@@ -339,70 +407,86 @@ public:
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0) = 0;
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) ) = 0;
 
-	//! Creates a point attraction affector. This affector modifies the positions of the
-	//! particles and attracts them to a specified point at a specified speed per second.
-	//! \param point: Point to attract particles to.
-	//! \param speed: Speed in units per second, to attract to the specified point.
-	//! \param attract: Whether the particles attract or detract from this point.
-	//! \param affectX: Whether or not this will affect the X position of the particle.
-	//! \param affectY: Whether or not this will affect the Y position of the particle.
-	//! \param affectZ: Whether or not this will affect the Z position of the particle.
-	//! \return Returns a pointer to the created particle affector.
-	//! To add this affector as new affector of this particle system,
-	//! just call addAffector(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	//! Creates a point attraction affector.
+	/** This affector modifies the positions of the particles and attracts
+	them to a specified point at a specified speed per second.
+	\param point: Point to attract particles to.
+	\param speed: Speed in units per second, to attract to the specified
+	point.
+	\param attract: Whether the particles attract or detract from this
+	point.
+	\param affectX: Whether or not this will affect the X position of the
+	particle.
+	\param affectY: Whether or not this will affect the Y position of the
+	particle.
+	\param affectZ: Whether or not this will affect the Z position of the
+	particle.
+	\return Pointer to the created particle affector. To add this affector
+	as new affector of this particle system, just call addAffector(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticleAttractionAffector* createAttractionAffector(
 		const core::vector3df& point, f32 speed = 1.0f, bool attract = true,
 		bool affectX = true, bool affectY = true, bool affectZ = true) = 0;
 
-	//! Creates a fade out particle affector. This affector modifies
-	//! the color of every particle and and reaches the final color
-	//! when the particle dies.
-	//! This affector looks really good, if the EMT_TRANSPARENT_VERTEX_ALPHA
-	//! material is used and the targetColor is video::SColor(0,0,0,0):
-	//! Particles are fading out into void with this setting.
-	//! \param targetColor: Color whereto the color of the particle is changed.
-	//! \param timeNeededToFadeOut: How much time in milli seconds
-	//! should the affector need to change the color to the targetColor.
-	//! \return Returns a pointer to the created particle affector.
-	//! To add this affector as new affector of this particle system,
-	//! just call addAffector(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	//! Creates a scale particle affector.
+	/** This affector scales the particle to the a multiple of its size defined
+	by the scaleTo variable.
+	\param scaleTo: multiple of the size which the particle will be scaled to until deletion
+	\return Pointer to the created particle affector.
+	To add this affector as new affector of this particle system,
+	just call addAffector(). Note that you'll have to drop() the
+	returned pointer, after you don't need it any more, see
+	IReferenceCounted::drop() for more information. */
+	virtual IParticleAffector* createScaleParticleAffector(const core::dimension2df& scaleTo = core::dimension2df(1.0f, 1.0f)) = 0;
+
+	//! Creates a fade out particle affector.
+	/** This affector modifies the color of every particle and and reaches
+	the final color when the particle dies. This affector looks really
+	good, if the EMT_TRANSPARENT_VERTEX_ALPHA material is used and the
+	targetColor is video::SColor(0,0,0,0): Particles are fading out into
+	void with this setting.
+	\param targetColor: Color whereto the color of the particle is changed.
+	\param timeNeededToFadeOut: How much time in milli seconds should the
+	affector need to change the color to the targetColor.
+	\return Pointer to the created particle affector. To add this affector
+	as new affector of this particle system, just call addAffector(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticleFadeOutAffector* createFadeOutParticleAffector(
 		const video::SColor& targetColor = video::SColor(0,0,0,0),
 		u32 timeNeededToFadeOut = 1000) = 0;
 
-	//! Creates a gravity affector. This affector modifies the direction
-	//! of the particle. It assumes that the particle is fired out of the
-	//! emitter with huge force, but is loosing this after some time
-	//! and is catched by the gravity then. This affector is ideal for
-	//! creating things like fountains.
-	//! \param gravity: Direction and force of gravity.
-	//! \param timeForceLost: Time in milli seconds when the force
-	//! of the emitter is totally lost and the particle does not move any more.
-	//! This is the time where gravity fully affects the particle.
-	//! \return Returns a pointer to the created particle affector.
-	//! To add this affector as new affector of this particle system,
-	//! just call addAffector(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	//! Creates a gravity affector.
+	/** This affector modifies the direction of the particle. It assumes
+	that the particle is fired out of the emitter with huge force, but is
+	loosing this after some time and is catched by the gravity then. This
+	affector is ideal for creating things like fountains.
+	\param gravity: Direction and force of gravity.
+	\param timeForceLost: Time in milli seconds when the force of the
+	emitter is totally lost and the particle does not move any more. This
+	is the time where gravity fully affects the particle.
+	\return Pointer to the created particle affector. To add this affector
+	as new affector of this particle system, just call addAffector(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticleGravityAffector* createGravityAffector(
 		const core::vector3df& gravity = core::vector3df(0.0f,-0.03f,0.0f),
 		u32 timeForceLost = 1000) = 0;
 
-	//! Creates a rotation affector. This affector modifies the positions of the
-	//! particles and attracts them to a specified point at a specified speed per second.
-	//! \param speed: Rotation in degrees per second
-	//! \param pivotPoint: Point to rotate the particles around
-	//! \return Returns a pointer to the created particle affector.
-	//! To add this affector as new affector of this particle system,
-	//! just call addAffector(). Note that you'll have to drop() the
-	//! returned pointer, after you don't need it any more, see
-	//! IReferenceCounted::drop() for more informations.
+	//! Creates a rotation affector.
+	/** This affector modifies the positions of the particles and attracts
+	them to a specified point at a specified speed per second.
+	\param speed: Rotation in degrees per second
+	\param pivotPoint: Point to rotate the particles around
+	\return Pointer to the created particle affector. To add this affector
+	as new affector of this particle system, just call addAffector(). Note
+	that you'll have to drop() the returned pointer, after you don't need
+	it any more, see IReferenceCounted::drop() for more informations. */
 	virtual IParticleRotationAffector* createRotationAffector(
 		const core::vector3df& speed = core::vector3df(5.0f,5.0f,5.0f),
 		const core::vector3df& pivotPoint = core::vector3df(0.0f,0.0f,0.0f) ) = 0;
diff --git a/src/dep/include/irrlicht/IQ3LevelMesh.h b/src/dep/include/irrlicht/IQ3LevelMesh.h
index e0abafb..2f5948c 100644
--- a/src/dep/include/irrlicht/IQ3LevelMesh.h
+++ b/src/dep/include/irrlicht/IQ3LevelMesh.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,7 +13,7 @@ namespace irr
 namespace scene
 {
 	//! Interface for a Mesh which can be loaded directly from a Quake3 .bsp-file.
-	/** The Mesh tries to load all textures of the map. There are currently 
+	/** The Mesh tries to load all textures of the map. There are currently
 	no additional methods in this class, but maybe there will be some in later
 	releases if there are feature requests. */
 	class IQ3LevelMesh : public IAnimatedMesh
@@ -21,18 +21,18 @@ namespace scene
 	public:
 
 		//! releases a Mesh from the Q3 Loader
-		virtual void releaseMesh ( s32 index ) = 0;
+		virtual void releaseMesh(s32 index) = 0;
 
-		//! loads the shader definition
-		//  either from file ( we assume /scripts on fileNameIsValid == 0 )
-		virtual const quake3::SShader * getShader ( const c8 * filename, s32 fileNameIsValid ) = 0;
+		//! loads the shader definition from file
+		/** \param filename Name of the shaderfile, defaults to /scripts if fileNameIsValid is false.
+		\param fileNameIsValid Specifies whether the filename is valid in the current situation. */
+		virtual const quake3::SShader* getShader( const c8* filename, bool fileNameIsValid=true ) = 0;
 
 		//! returns a already loaded Shader
-		virtual const quake3::SShader * getShader ( u32 index  ) const = 0;
+		virtual const quake3::SShader* getShader(u32 index) const = 0;
 
 		//! get's an interface to the entities
-		virtual const quake3::tQ3EntityList & getEntityList () = 0;
-
+		virtual const quake3::tQ3EntityList& getEntityList() = 0;
 	};
 
 } // end namespace scene
diff --git a/src/dep/include/irrlicht/IQ3Shader.h b/src/dep/include/irrlicht/IQ3Shader.h
index 35b052c..4b921ed 100644
--- a/src/dep/include/irrlicht/IQ3Shader.h
+++ b/src/dep/include/irrlicht/IQ3Shader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2006-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -31,8 +31,8 @@ namespace quake3
 
 	// we are not using gamma, so quake3 is very dark.
 	// define the standard multiplication for lightmaps and vertex colors
-	const video::E_MATERIAL_TYPE defaultLightMap = video::EMT_LIGHTMAP_M2;
-	const video::E_MODULATE_FUNC defaultModulate = video::EMFN_MODULATE_2X;
+	const video::E_MATERIAL_TYPE defaultMaterialType = video::EMT_LIGHTMAP_M4;
+	const video::E_MODULATE_FUNC defaultModulate = video::EMFN_MODULATE_4X;
 
 	// some useful typedefs
 	typedef core::array< core::stringc > tStringList;
@@ -132,16 +132,22 @@ namespace quake3
 
 	}
 
+	//! A blend function for a q3 shader.
 	struct SBlendFunc
 	{
-		SBlendFunc () : type ( video::EMT_SOLID ), param ( 0.f ) {}
+		SBlendFunc ()
+			: type ( video::EMT_SOLID ), modulate ( defaultModulate ), param ( 0.f ),
+			isTransparent ( false ) {}
 
 		video::E_MATERIAL_TYPE type;
+		video::E_MODULATE_FUNC modulate;
+
 		f32 param;
+		bool isTransparent;
 	};
 
 	// parses the content of Variable cull
-	inline bool getBackfaceCulling ( const core::stringc &string )
+	inline bool isDisabled ( const core::stringc &string )
 	{
 		if ( string.size() == 0 )
 			return true;
@@ -168,7 +174,7 @@ namespace quake3
 			return 1;
 
 		u32 ret = 1;
-		static const c8 * funclist[] = { "lequal","equal"  };
+		static const c8 * funclist[] = { "lequal","equal" };
 
 		u32 pos = 0;
 		switch ( isEqual ( string, pos, funclist, 2 ) )
@@ -183,7 +189,6 @@ namespace quake3
 	}
 
 
-
 	// parses the content of Variable blendfunc,alphafunc
 	inline static void getBlendFunc ( const core::stringc &string, SBlendFunc &blendfunc )
 	{
@@ -231,12 +236,14 @@ namespace quake3
 					// gl_one gl_zero
 					case video::EBF_ZERO:
 						blendfunc.type = video::EMT_SOLID;
+						blendfunc.isTransparent = false;
 						resolved = 1;
 						break;
 
 					// gl_one gl_one
 					case video::EBF_ONE:
 						blendfunc.type = video::EMT_TRANSPARENT_ADD_COLOR;
+						blendfunc.isTransparent = true;
 						resolved = 1;
 						break;
 				} break;
@@ -248,6 +255,7 @@ namespace quake3
 					case video::EBF_ONE_MINUS_SRC_ALPHA:
 						blendfunc.type = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 						blendfunc.param = 1.f / 255.f;
+						blendfunc.isTransparent = true;
 						resolved = 1;
 						break;
 				} break;
@@ -255,30 +263,35 @@ namespace quake3
 			case 11:
 				// add
 				blendfunc.type = video::EMT_TRANSPARENT_ADD_COLOR;
+				blendfunc.isTransparent = true;
 				resolved = 1;
 				break;
 			case 12:
 				// filter = gl_dst_color gl_zero
 				blendfunc.type = video::EMT_ONETEXTURE_BLEND;
 				blendfunc.param = video::pack_texureBlendFunc ( video::EBF_DST_COLOR, video::EBF_ZERO, defaultModulate );
+				blendfunc.isTransparent = false;
 				resolved = 1;
 				break;
 			case 13:
 				// blend
 				blendfunc.type = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 				blendfunc.param = 1.f / 255.f;
+				blendfunc.isTransparent = true;
 				resolved = 1;
 				break;
 			case 14:
 				// alphafunc ge128
 				blendfunc.type = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
 				blendfunc.param = 0.5f;
+				blendfunc.isTransparent = true;
 				resolved = 1;
 				break;
 			case 15:
 				// alphafunc gt0
 				blendfunc.type = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
 				blendfunc.param = 1.f / 255.f;
+				blendfunc.isTransparent = true;
 				resolved = 1;
 				break;
 		}
@@ -290,14 +303,24 @@ namespace quake3
 			blendfunc.param = video::pack_texureBlendFunc (
 					(video::E_BLEND_FACTOR) srcFact,
 					(video::E_BLEND_FACTOR) dstFact,
-					defaultModulate);
+					blendfunc.modulate);
+
+			if (srcFact == video::EBF_SRC_COLOR && dstFact == video::EBF_ZERO) 
+			{
+				blendfunc.isTransparent = 0;
+			}
+			else
+			{
+				blendfunc.isTransparent = true;
+			}
+
 		}
 	}
 
 	struct SModifierFunction
 	{
 		SModifierFunction ()
-			: masterfunc0 ( 0 ), masterfunc1(0), func ( 0 ),
+			: masterfunc0 ( -2 ), masterfunc1(0), func ( 0 ),
 			tcgen( 8 ), base ( 0 ), amp ( 1 ), phase ( 0 ), freq ( 1 ), wave(1) {}
 
 		// "tcmod","deformvertexes","rgbgen", "tcgen"
@@ -442,6 +465,7 @@ namespace quake3
 		core::array < SVarGroup > VariableGroup;
 	};
 
+
 	//! A Parsed Shader Holding Variables ordered in Groups
 	class SShader
 	{
@@ -470,7 +494,7 @@ namespace quake3
 			// Shader: shader name ( also first variable in first Vargroup )
 			// Entity: classname ( variable in Group(1) )
 			core::stringc name;
-			SVarGroupList *VarGroup;	// reference
+			SVarGroupList *VarGroup; // reference
 	};
 
 	typedef SShader SEntity;
@@ -535,7 +559,7 @@ namespace quake3
 		for ( u32 i = 0; i != size; ++i )
 		{
 			group = &shader->VarGroup->VariableGroup[ i ];
-			dumpVarGroup ( dest, group, core::clamp ( (s32) i, 0, 2 ) );
+			dumpVarGroup ( dest, group, core::clamp( (int)i, 0, 2 ) );
 		}
 
 		if ( size <= 1 )
@@ -554,13 +578,12 @@ namespace quake3
 		load one or multiple files stored in name started at startPos to the texture array textures
 		if texture is not loaded 0 will be added ( to find missing textures easier)
 	*/
-	inline void getTextures (	tTexArray &textures ,
-						const core::stringc &name, u32 &startPos,
-						io::IFileSystem *fileSystem,
-						video::IVideoDriver* driver
-					)
+	inline void getTextures(tTexArray &textures,
+				const core::stringc &name, u32 &startPos,
+				io::IFileSystem *fileSystem,
+				video::IVideoDriver* driver)
 	{
-		static const char * extension[2] = 
+		static const char * extension[2] =
 		{
 			".jpg",
 			".tga"
@@ -594,9 +617,7 @@ namespace quake3
 	}
 
 
-	/*!
-		Manages various Quake3 Shader Styles
-	*/
+	//! Manages various Quake3 Shader Styles
 	class IShaderManager : public IReferenceCounted
 	{
 	};
diff --git a/src/dep/include/irrlicht/IReadFile.h b/src/dep/include/irrlicht/IReadFile.h
index ce4edd5..78d7670 100644
--- a/src/dep/include/irrlicht/IReadFile.h
+++ b/src/dep/include/irrlicht/IReadFile.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,33 +16,30 @@ namespace io
 	class IReadFile : public virtual IReferenceCounted
 	{
 	public:
-
-		virtual ~IReadFile() {}
-
 		//! Reads an amount of bytes from the file.
-		//! \param buffer: Pointer to buffer where to read bytes will be written to.
-		//! \param sizeToRead: Amount of bytes to read from the file.
-		//! \return Returns how much bytes were read.
+		/** \param buffer Pointer to buffer where read bytes are written to.
+		\param sizeToRead Amount of bytes to read from the file.
+		\return How much bytes were read. */
 		virtual s32 read(void* buffer, u32 sizeToRead) = 0;
 
-		//! Changes position in file, returns true if successful.
-		//! \param finalPos: Destination position in the file.
-		//! \param relativeMovement: If set to true, the position in the file is
-		//! changed relative to current position. Otherwise the position is changed 
-		//! from beginning of file.
-		//! \return Returns true if successful, otherwise false.
+		//! Changes position in file
+		/** \param finalPos Destination position in the file.
+		\param relativeMovement If set to true, the position in the file is
+		changed relative to current position. Otherwise the position is changed
+		from beginning of file.
+		\return True if successful, otherwise false. */
 		virtual bool seek(long finalPos, bool relativeMovement = false) = 0;
 
-		//! Returns size of file.
-		//! \return Returns the size of the file in bytes.
+		//! Get size of file.
+		/** \return Size of the file in bytes. */
 		virtual long getSize() const = 0;
 
-		//! Returns the current position in the file.
-		//! \return Returns the current position in the file in bytes.
+		//! Get the current position in the file.
+		/** \return Current position in the file in bytes. */
 		virtual long getPos() const = 0;
 
-		//! Returns name of file.
-		//! \return Returns the file name as zero terminated character string.
+		//! Get name of file.
+		/** \return File name as zero terminated character string. */
 		virtual const c8* getFileName() const = 0;
 	};
 
diff --git a/src/dep/include/irrlicht/IReferenceCounted.h b/src/dep/include/irrlicht/IReferenceCounted.h
index 0c7098e..c4c9eec 100644
--- a/src/dep/include/irrlicht/IReferenceCounted.h
+++ b/src/dep/include/irrlicht/IReferenceCounted.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,11 +18,11 @@ namespace irr
 
 	When you create an object in the Irrlicht engine, calling a method
 	which starts with 'create', an object is created, and you get a pointer
-	to the new object. If you no longer need the object, you have 
+	to the new object. If you no longer need the object, you have
 	to call drop(). This will destroy the object, if grab() was not called
 	in another part of you program, because this part still needs the object.
 	Note, that you only need to call drop() to the object, if you created it,
-	and the method had a 'create' in it. 
+	and the method had a 'create' in it.
 
 	A simple example:
 
@@ -54,64 +54,69 @@ namespace irr
 		}
 
 		//! Grabs the object. Increments the reference counter by one.
-		//! Someone who calls grab() to an object, should later also call
-		//! drop() to it. If an object never gets as much drop() as grab()
-		//! calls, it will never be destroyed.
-		//! The IReferenceCounted class provides a basic reference counting mechanism
-		//! with its methods grab() and drop(). Most objects of the Irrlicht
-		//! Engine are derived from IReferenceCounted, and so they are reference counted.
-		//!
-		//! When you create an object in the Irrlicht engine, calling a method
-		//! which starts with 'create', an object is created, and you get a pointer
-		//! to the new object. If you no longer need the object, you have 
-		//! to call drop(). This will destroy the object, if grab() was not called
-		//! in another part of you program, because this part still needs the object.
-		//! Note, that you only need to call drop() to the object, if you created it,
-		//! and the method had a 'create' in it. 
-		//!
-		//! A simple example:
-		//!
-		//! If you want to create a texture, you may want to call an imaginable method
-		//! IDriver::createTexture. You call
-		//! ITexture* texture = driver->createTexture(dimension2d<s32>(128, 128));
-		//! If you no longer need the texture, call texture->drop().
-		//! If you want to load a texture, you may want to call imaginable method
-		//! IDriver::loadTexture. You do this like
-		//! ITexture* texture = driver->loadTexture("example.jpg");
-		//! You will not have to drop the pointer to the loaded texture, because
-		//! the name of the method does not start with 'create'. The texture
-		//! is stored somewhere by the driver.
+		/** Someone who calls grab() to an object, should later also
+		call drop() to it. If an object never gets as much drop() as
+		grab() calls, it will never be destroyed. The
+		IReferenceCounted class provides a basic reference counting
+		mechanism with its methods grab() and drop(). Most objects of
+		the Irrlicht Engine are derived from IReferenceCounted, and so
+		they are reference counted.
+
+		When you create an object in the Irrlicht engine, calling a
+		method which starts with 'create', an object is created, and
+		you get a pointer to the new object. If you no longer need the
+		object, you have to call drop(). This will destroy the object,
+		if grab() was not called in another part of you program,
+		because this part still needs the object. Note, that you only
+		need to call drop() to the object, if you created it, and the
+		method had a 'create' in it.
+
+		A simple example:
+
+		If you want to create a texture, you may want to call an
+		imaginable method IDriver::createTexture. You call
+		ITexture* texture = driver->createTexture(dimension2d<s32>(128, 128));
+		If you no longer need the texture, call texture->drop().
+		If you want to load a texture, you may want to call imaginable
+		method IDriver::loadTexture. You do this like
+		ITexture* texture = driver->loadTexture("example.jpg");
+		You will not have to drop the pointer to the loaded texture,
+		because the name of the method does not start with 'create'.
+		The texture is stored somewhere by the driver. */
 		void grab() const { ++ReferenceCounter; }
 
 		//! Drops the object. Decrements the reference counter by one.
-		//! Returns true, if the object was deleted.
-		//! The IReferenceCounted class provides a basic reference counting mechanism
-		//! with its methods grab() and drop(). Most objects of the Irrlicht
-		//! Engine are derived from IReferenceCounted, and so they are reference counted.
-		//!
-		//! When you create an object in the Irrlicht engine, calling a method
-		//! which starts with 'create', an object is created, and you get a pointer
-		//! to the new object. If you no longer need the object, you have 
-		//! to call drop(). This will destroy the object, if grab() was not called
-		//! in another part of you program, because this part still needs the object.
-		//! Note, that you only need to call drop() to the object, if you created it,
-		//! and the method had a 'create' in it. 
-		//!
-		//! A simple example:
-		//!
-		//! If you want to create a texture, you may want to call an imaginable method
-		//! IDriver::createTexture. You call
-		//! ITexture* texture = driver->createTexture(dimension2d<s32>(128, 128));
-		//! If you no longer need the texture, call texture->drop().
-		//! If you want to load a texture, you may want to call imaginable method
-		//! IDriver::loadTexture. You do this like
-		//! ITexture* texture = driver->loadTexture("example.jpg");
-		//! You will not have to drop the pointer to the loaded texture, because
-		//! the name of the method does not start with 'create'. The texture
-		//! is stored somewhere by the driver.
+		/** The IReferenceCounted class provides a basic reference
+		counting mechanism with its methods grab() and drop(). Most
+		objects of the Irrlicht Engine are derived from
+		IReferenceCounted, and so they are reference counted.
+
+		When you create an object in the Irrlicht engine, calling a
+		method which starts with 'create', an object is created, and
+		you get a pointer to the new object. If you no longer need the
+		object, you have to call drop(). This will destroy the object,
+		if grab() was not called in another part of you program,
+		because this part still needs the object. Note, that you only
+		need to call drop() to the object, if you created it, and the
+		method had a 'create' in it.
+
+		A simple example:
+
+		If you want to create a texture, you may want to call an
+		imaginable method IDriver::createTexture. You call
+		ITexture* texture = driver->createTexture(dimension2d<s32>(128, 128));
+		If you no longer need the texture, call texture->drop().
+		If you want to load a texture, you may want to call imaginable
+		method IDriver::loadTexture. You do this like
+		ITexture* texture = driver->loadTexture("example.jpg");
+		You will not have to drop the pointer to the loaded texture,
+		because the name of the method does not start with 'create'.
+		The texture is stored somewhere by the driver.
+		\return True, if the object was deleted. */
 		bool drop() const
 		{
-			_IRR_DEBUG_BREAK_IF(ReferenceCounter <= 0) // someone is doing bad reference counting.
+			// someone is doing bad reference counting.
+			_IRR_DEBUG_BREAK_IF(ReferenceCounter <= 0)
 
 			--ReferenceCounter;
 			if (!ReferenceCounter)
@@ -123,15 +128,17 @@ namespace irr
 			return false;
 		}
 
-		//! Returns the reference counter.
+		//! Get the reference count.
+		/** \return Current value of the reference counter. */
 		s32 getReferenceCount() const
 		{
 			return ReferenceCounter;
 		}
 
-		//! Returns the debug name of the object. The Debugname may only be set and
-		//! changed by the object itself. This method should only be used in Debug mode.
-		//! \return Returns a string, previously set by setDebugName();
+		//! Returns the debug name of the object.
+		/** The Debugname may only be set and changed by the object
+		itself. This method should only be used in Debug mode.
+		\return Returns a string, previously set by setDebugName(); */
 		const c8* getDebugName() const
 		{
 			return DebugName;
@@ -139,17 +146,19 @@ namespace irr
 
 	protected:
 
-		//! Sets the debug name of the object. The Debugname may only be set and
-		//! changed by the object itself. This method should only be used in Debug mode.
-		//! \param newName: New debug name to set.
+		//! Sets the debug name of the object.
+		/** The Debugname may only be set and changed by the object
+		itself. This method should only be used in Debug mode.
+		\param newName: New debug name to set. */
 		void setDebugName(const c8* newName)
 		{
 			DebugName = newName;
 		}
 
 	private:
-
+		//! The reference counter. Mutable to do reference counting on const objects.
 		mutable s32 ReferenceCounter;
+		//! The debug name.
 		const c8* DebugName;
 	};
 
diff --git a/src/dep/include/irrlicht/ISceneCollisionManager.h b/src/dep/include/irrlicht/ISceneCollisionManager.h
index 433630a..8b3027d 100644
--- a/src/dep/include/irrlicht/ISceneCollisionManager.h
+++ b/src/dep/include/irrlicht/ISceneCollisionManager.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,131 +14,136 @@
 namespace irr
 {
 
-
 namespace scene
 {
 	class ISceneNode;
 	class ICameraSceneNode;
 	class ITriangleSelector;
 
-	//!	The Scene Collision Manager provides methods for performing collision tests and picking on scene nodes.
+	//! The Scene Collision Manager provides methods for performing collision tests and picking on scene nodes.
 	class ISceneCollisionManager : public virtual IReferenceCounted
 	{
 	public:
 
-		//! destructor
+		//! Destructor
 		virtual ~ISceneCollisionManager() {}
 
 		//! Finds the collision point of a line and lots of triangles, if there is one.
-		//! \param ray: Line with witch collisions are tested.
-		//! \param selector: TriangleSelector containing the triangles. It can
-		//! be created for example using ISceneManager::createTriangleSelector() or 
-		//! ISceneManager::createTriangleOctTreeSelector().
-		//! \param outCollisionPoint: If a collision is detected, this will contain the
-		//! position of the nearest collision.
-		//! \param outTriangle: If a collision is detected, this will contain the triangle
-		//! with which the ray collided.
-		//! \return Returns true if a collision was detected and false if not.
+		/** \param ray: Line with witch collisions are tested.
+		\param selector: TriangleSelector containing the triangles. It
+		can be created for example using
+		ISceneManager::createTriangleSelector() or
+		ISceneManager::createTriangleOctTreeSelector().
+		\param outCollisionPoint: If a collision is detected, this will
+		contain the position of the nearest collision.
+		\param outTriangle: If a collision is detected, this will
+		contain the triangle with which the ray collided.
+		\return True if a collision was detected and false if not. */
 		virtual bool getCollisionPoint(const core::line3d<f32>& ray,
 			ITriangleSelector* selector, core::vector3df& outCollisionPoint,
 			core::triangle3df& outTriangle) = 0;
 
-		//! Collides a moving ellipsoid with a 3d world with gravity and returns
-		//! the resulting new position of the ellipsoid. This can be used for moving
-		//! a character in a 3d world: The character will slide at walls and is able
-		//! to walk up stairs. The method used how to calculate the collision result
-		//! position is based on the paper "Improved Collision detection and Response"
-		//! by Kasper Fauerby.
-		//! \param selector: TriangleSelector containing the triangles of the world.
-		//! It can be created for example using ISceneManager::createTriangleSelector() or 
-		//! ISceneManager::createTriangleOctTreeSelector().
-		//! \param ellipsoidPosition: Position of the ellipsoid.
-		//! \param ellipsoidRadius: Radius of the ellipsoid.
-		//! \param ellipsoidDirectionAndSpeed: Direction and speed of 
-		//! the movement of the ellipsoid.
-		//! \param triout: Optional parameter where the last triangle causing a 
-		//! collision is stored, if there is a collision.
-		//! \param outFalling: Is set to true if the ellipsoid is falling down, caused
-		//! by gravity.
-		//! \param slidingSpeed: DOCUMENTATION NEEDED.
-		//! \param gravityDirectionAndSpeed: Direction and force of gravity.
-		//! \return Returns the new position of the ellipsoid.
+		//! Collides a moving ellipsoid with a 3d world with gravity and returns the resulting new position of the ellipsoid.
+		/** This can be used for moving a character in a 3d world: The
+		character will slide at walls and is able to walk up stairs.
+		The method used how to calculate the collision result position
+		is based on the paper "Improved Collision detection and
+		Response" by Kasper Fauerby.
+		\param selector: TriangleSelector containing the triangles of
+		the world. It can be created for example using
+		ISceneManager::createTriangleSelector() or
+		ISceneManager::createTriangleOctTreeSelector().
+		\param ellipsoidPosition: Position of the ellipsoid.
+		\param ellipsoidRadius: Radius of the ellipsoid.
+		\param ellipsoidDirectionAndSpeed: Direction and speed of the
+		movement of the ellipsoid.
+		\param triout: Optional parameter where the last triangle
+		causing a collision is stored, if there is a collision.
+		\param outFalling: Is set to true if the ellipsoid is falling
+		down, caused by gravity.
+		\param slidingSpeed: DOCUMENTATION NEEDED.
+		\param gravityDirectionAndSpeed: Direction and force of gravity.
+		\return New position of the ellipsoid. */
 		virtual core::vector3df getCollisionResultPosition(
 			ITriangleSelector* selector,
 			const core::vector3df &ellipsoidPosition,
-			const core::vector3df& ellipsoidRadius, 
+			const core::vector3df& ellipsoidRadius,
 			const core::vector3df& ellipsoidDirectionAndSpeed,
 			core::triangle3df& triout,
 			bool& outFalling,
 			f32 slidingSpeed = 0.0005f,
-			const core::vector3df& gravityDirectionAndSpeed 
+			const core::vector3df& gravityDirectionAndSpeed
 			= core::vector3df(0.0f, 0.0f, 0.0f)) = 0;
 
 		//! Returns a 3d ray which would go through the 2d screen coodinates.
-		//! \param pos: Screen coordinates in pixels.
-		//! \param camera: Camera from which the ray starts. If null, the
-		//! active camera is used. 
-		//! \return Returns a ray starting from the position of the camera
-		//! and ending at a length of the far value of the camera at a position
-		//! which would be behind the 2d screen coodinates.
+		/** \param pos: Screen coordinates in pixels.
+		\param camera: Camera from which the ray starts. If null, the
+		active camera is used.
+		\return Ray starting from the position of the camera and ending
+		at a length of the far value of the camera at a position which
+		would be behind the 2d screen coodinates. */
 		virtual core::line3d<f32> getRayFromScreenCoordinates(
 			core::position2d<s32> pos, ICameraSceneNode* camera = 0) = 0;
 
 		//! Calculates 2d screen position from a 3d position.
-		//! \param pos: 3D position in world space to be transformed into
-		//! 2d.
-		//! \param camera: Camera to be used. If null, the currently active
-		//! camera is used.
-		//! \return Returns the 2d screen coordinates which a object in the 
-		//! 3d world would have if it would be rendered to the screen. If the 
-		//! 3d position is behind the camera, it is set to (-10000,-10000). In
-		//! most cases you can ignore this fact, because if you use this method
-		//! for drawing a decorator over a 3d object, it will be clipped by the
-		//! screen borders.
+		/** \param pos: 3D position in world space to be transformed
+		into 2d.
+		\param camera: Camera to be used. If null, the currently active
+		camera is used.
+		\return 2d screen coordinates which a object in the 3d world
+		would have if it would be rendered to the screen. If the 3d
+		position is behind the camera, it is set to (-10000,-10000). In
+		most cases you can ignore this fact, because if you use this
+		method for drawing a decorator over a 3d object, it will be
+		clipped by the screen borders. */
 		virtual core::position2d<s32> getScreenCoordinatesFrom3DPosition(
 			core::vector3df pos, ICameraSceneNode* camera=0) = 0;
 
-		//! Returns the scene node, which is currently visible under the overgiven 
-		//! screencoordinates, viewed from the currently active camera. The collision
-		//! tests are done using a bounding box for each scene node.
-		//! \param pos: Position in pixel screen coordinates, under which the returned
-		//! scene node will be.
-		//! \param idBitMask: Only scene nodes with an id with bits set like in this mask
-		//! will be tested. If the BitMask is 0, this feature is disabled.
-		//! \param bNoDebugObjects: Doesn't take debug objects into account when true. These
-		//  are scene nodes with IsDebugObject() = true.
-		//! \return Returns the visible scene node under screen coordinates with matching
-		//! bits in its id. If there is no scene node under this position, 0 is returned.
+		//! Gets the scene node, which is currently visible under the given screencoordinates, viewed from the currently active camera.
+		/** The collision tests are done using a bounding box for each
+		scene node.
+		\param pos: Position in pixel screen coordinates, under which
+		the returned scene node will be.
+		\param idBitMask: Only scene nodes with an id with bits set
+		like in this mask will be tested. If the BitMask is 0, this
+		feature is disabled.
+		\param bNoDebugObjects: Doesn't take debug objects into account
+		when true. These are scene nodes with IsDebugObject() = true.
+		\return Visible scene node under screen coordinates with
+		matching bits in its id. If there is no scene node under this
+		position, 0 is returned. */
 		virtual ISceneNode* getSceneNodeFromScreenCoordinatesBB(core::position2d<s32> pos,
 			s32 idBitMask=0, bool bNoDebugObjects = false) = 0;
 
-		//! Returns the nearest scene node which collides with a 3d ray and 
-		//! which id matches a bitmask. The collision tests are done using a bounding
-		//! box for each scene node.
-		//! \param ray: Line with witch collisions are tested.
-		//! \param idBitMask: Only scene nodes with an id with bits set like in this mask
-		//! will be tested. If the BitMask is 0, this feature is disabled.
-		//! \param bNoDebugObjects: Doesn't take debug objects into account when true. These
-		//  are scene nodes with IsDebugObject() = true.
-		//! \return Returns the scene node nearest to ray.start, which collides with the
-		//! ray and matches the idBitMask, if the mask is not null. If no scene
-		//! node is found, 0 is returned.
-		virtual ISceneNode* getSceneNodeFromRayBB(core::line3d<f32> ray, 
+		//! Get the nearest scene node which collides with a 3d ray and whose id matches a bitmask.
+		/** The collision tests are done using a bounding box for each
+		scene node.
+		\param ray: Line with witch collisions are tested.
+		\param idBitMask: Only scene nodes with an id with bits set
+		like in this mask will be tested. If the BitMask is 0, this
+		feature is disabled.
+		\param bNoDebugObjects: Doesn't take debug objects into account
+		when true. These are scene nodes with IsDebugObject() = true.
+		\return Scene node nearest to ray.start, which collides with
+		the ray and matches the idBitMask, if the mask is not null. If
+		no scene node is found, 0 is returned. */
+		virtual ISceneNode* getSceneNodeFromRayBB(core::line3d<f32> ray,
 			s32 idBitMask=0, bool bNoDebugObjects = false) = 0;
 
-		//! Returns the scene node, at which the overgiven camera is looking at and
-		//! which id matches the bitmask. A ray is simply casted from the position
-		//! of the camera to the view target position, and all scene nodes are tested
-		//! against this ray. The collision tests are done using a bounding
-		//! box for each scene node.
-		//! \param camera: Camera from which the ray is casted.
-		//! \param idBitMask: Only scene nodes with an id with bits set like in this mask
-		//! will be tested. If the BitMask is 0, this feature is disabled.
-		//! \param bNoDebugObjects: Doesn't take debug objects into account when true. These
-		//  are scene nodes with IsDebugObject() = true.
-		//! \return Returns the scene node nearest to the camera, which collides with the
-		//! ray and matches the idBitMask, if the mask is not null. If no scene
-		//! node is found, 0 is returned.
+		//! Get the scene node, which the overgiven camera is looking at and whose id matches the bitmask.
+		/** A ray is simply casted from the position of the camera to
+		the view target position, and all scene nodes are tested
+		against this ray. The collision tests are done using a bounding
+		box for each scene node.
+		\param camera: Camera from which the ray is casted.
+		\param idBitMask: Only scene nodes with an id with bits set
+		like in this mask will be tested. If the BitMask is 0, this
+		feature is disabled.
+		\param bNoDebugObjects: Doesn't take debug objects into account
+		when true. These are scene nodes with IsDebugObject() = true.
+		\return Scene node nearest to the camera, which collides with
+		the ray and matches the idBitMask, if the mask is not null. If
+		no scene node is found, 0 is returned. */
 		virtual ISceneNode* getSceneNodeFromCameraBB(ICameraSceneNode* camera,
 			s32 idBitMask=0, bool bNoDebugObjects = false) = 0;
 	};
diff --git a/src/dep/include/irrlicht/ISceneManager.h b/src/dep/include/irrlicht/ISceneManager.h
index f64ae5c..39d4e34 100644
--- a/src/dep/include/irrlicht/ISceneManager.h
+++ b/src/dep/include/irrlicht/ISceneManager.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -47,11 +47,10 @@ namespace scene
 
 	//! Enumeration for render passes.
 	/** A parameter passed to the registerNodeForRendering() method of the ISceneManager,
-	specifying when the mode wants to be drawn in relation to the other nodes. */
+	specifying when the node wants to be drawn in relation to the other nodes. */
 	enum E_SCENE_NODE_RENDER_PASS
 	{
-		//! Camera pass. The active view is set up here.
-		//! The very first pass.
+		//! Camera pass. The active view is set up here. The very first pass.
 		ESNRP_CAMERA,
 
 		//! In this pass, lights are transformed into camera space and added to the driver
@@ -61,15 +60,18 @@ namespace scene
 		ESNRP_SKY_BOX,
 
 		//! All normal objects can use this for registering themselves.
-		//! This value will never be returned by ISceneManager::getSceneNodeRenderPass().
-		//! The scene manager will determine by itself if an object is
-		//! transparent or solid and register the object as SNRT_TRANSPARENT or
-		//! SNRT_SOLD automatically if you call registerNodeForRendering with this
-		//! value (which is default). Note that it will register the node only as ONE type.
-		//! If your scene node has both solid and transparent material types register
-		//! it twice (one time as SNRT_SOLID, the other time as SNRT_TRANSPARENT) and
-		//! in the render() method call getSceneNodeRenderPass() to find out the current
-		//! render pass and render only the corresponding parts of the node.
+		/** This value will never be returned by
+		ISceneManager::getSceneNodeRenderPass(). The scene manager
+		will determine by itself if an object is transparent or solid
+		and register the object as SNRT_TRANSPARENT or SNRT_SOLD
+		automatically if you call registerNodeForRendering with this
+		value (which is default). Note that it will register the node
+		only as ONE type. If your scene node has both solid and
+		transparent material types register it twice (one time as
+		SNRT_SOLID, the other time as SNRT_TRANSPARENT) and in the
+		render() method call getSceneNodeRenderPass() to find out the
+		current render pass and render only the corresponding parts of
+		the node. */
 		ESNRP_AUTOMATIC,
 
 		//! Solid scene nodes or special scene nodes without materials.
@@ -78,23 +80,9 @@ namespace scene
 		//! Drawn after the transparent nodes, the time for drawing shadow volumes
 		ESNRP_SHADOW,
 
-		//! Transparent scene nodes, drawn after shadow nodes. They are sorted from back
-		//! to front and drawn in that order.
+		//! Transparent scene nodes, drawn after shadow nodes. They are sorted from back to front and drawn in that order.
 		ESNRP_TRANSPARENT,
 
-		//! Scene Nodes with special support
-		ESNRP_SHADER_0,
-		ESNRP_SHADER_1,
-		ESNRP_SHADER_2,
-		ESNRP_SHADER_3,
-		ESNRP_SHADER_4,
-		ESNRP_SHADER_5,
-		ESNRP_SHADER_6,
-		ESNRP_SHADER_7,
-		ESNRP_SHADER_8,
-		ESNRP_SHADER_9,
-		ESNRP_SHADER_10,
-
 		//! Never used, value specifing how much parameters there are.
 		ESNRP_COUNT
 	};
@@ -120,6 +108,8 @@ namespace scene
 	class IMetaTriangleSelector;
 	class IMeshManipulator;
 	class ITextSceneNode;
+	class IBillboardTextSceneNode;
+	class IVolumeLightSceneNode;
 	class ISceneNodeFactory;
 	class ISceneNodeAnimatorFactory;
 	class ISceneUserDataSerializer;
@@ -129,30 +119,32 @@ namespace scene
 		class SShader;
 	} // end namespace quake3
 
-	//!	The Scene Manager manages scene nodes, mesh recources, cameras and all the other stuff.
-	/** All Scene nodes can be created only here. There is a always growing list of scene
-	nodes for lots of purposes: Indoor rendering scene nodes like the Octree
-	(addOctTreeSceneNode()) or the terrain renderer (addTerrainSceneNode()),
-	different Camera scene nodes (addCameraSceneNode(), addCameraSceneNodeMaya()),
-	scene nodes for Light (addLightSceneNode()), Billboards (addBillboardSceneNode())
-	and so on.
-	A scene node is a node in the hierachical scene graph. Every scene node may have children,
-	which are other scene nodes. Children move relative the their parents position. If the parent of a node is not
-	visible, its children won't be visible, too. In this way, it is for example easily possible
-	to attach a light to a moving car or to place a walking character on a moving platform
-	on a moving ship.
-	The SceneManager is also able to load 3d mesh files of different formats. Take a look
-	at getMesh() to find out what formats are supported. And if these formats are not enough
-	use addExternalMeshLoader() to add new formats to the engine.
+	//! The Scene Manager manages scene nodes, mesh recources, cameras and all the other stuff.
+	/** All Scene nodes can be created only here. There is a always growing
+	list of scene nodes for lots of purposes: Indoor rendering scene nodes
+	like the Octree (addOctTreeSceneNode()) or the terrain renderer
+	(addTerrainSceneNode()), different Camera scene nodes
+	(addCameraSceneNode(), addCameraSceneNodeMaya()), scene nodes for Light
+	(addLightSceneNode()), Billboards (addBillboardSceneNode()) and so on.
+	A scene node is a node in the hierachical scene graph. Every scene node
+	may have children, which are other scene nodes. Children move relative
+	the their parents position. If the parent of a node is not visible, its
+	children won't be visible, too. In this way, it is for example easily
+	possible to attach a light to a moving car or to place a walking
+	character on a moving platform on a moving ship.
+	The SceneManager is also able to load 3d mesh files of different
+	formats. Take a look at getMesh() to find out what formats are
+	supported. And if these formats are not enough use
+	addExternalMeshLoader() to add new formats to the engine.
 	*/
 	class ISceneManager : public virtual IReferenceCounted
 	{
 	public:
 
-		//! destructor
+		//! Destructor
 		virtual ~ISceneManager() {}
 
-		//! Returns pointer to an animateable mesh. Loads the file if not loaded already.
+		//! Get pointer to an animateable mesh. Loads the file if not loaded already.
 		/**
 		 * If you want to remove a loaded mesh from the cache again, use removeMesh().
 		 *  Currently there are the following mesh formats supported:
@@ -163,161 +155,233 @@ namespace scene
 		 *  </TR>
 		 *  <TR>
 		 *    <TD>3D Studio (.3ds)</TD>
-		 *    <TD>Loader for 3D-Studio files which lots of 3D packages are able to export.
-		 *      Only static meshes are currently supported by this importer. </TD>
+		 *    <TD>Loader for 3D-Studio files which lots of 3D packages
+		 *      are able to export. Only static meshes are currently
+		 *      supported by this importer. </TD>
 		 *  </TR>
 		 *  <TR>
 		 *    <TD>Bliz Basic B3D (.b3d)</TD>
-		 *    <TD>Loader for blitz basic files, developed by Mark Sibly, also supports animations.</TD>
+		 *    <TD>Loader for blitz basic files, developed by Mark
+		 *      Sibly, also supports animations.</TD>
 		 *  </TR>
 		 *  <TR>
 		 *    <TD>Cartography shop 4 (.csm)</TD>
-		 *    <TD>Cartography Shop is a modeling program for creating architecture and calculating
-		 *      lighting. Irrlicht can directly import .csm files thanks to the IrrCSM library
-		 *      created by Saurav Mohapatra which is now integrated directly in Irrlicht.
-		 *      If you are using this loader, please note that you'll have to set the path
-		 *      of the textures before loading .csm files. You can do this using SceneManager-&gt;getParameters()-&gt;setParameter(scene::CSM_TEXTURE_PATH,
+		 *    <TD>Cartography Shop is a modeling program for creating
+		 *      architecture and calculating lighting. Irrlicht can
+		 *      directly import .csm files thanks to the IrrCSM library
+		 *      created by Saurav Mohapatra which is now integrated
+		 *      directly in Irrlicht. If you are using this loader,
+		 *      please note that you'll have to set the path of the
+		 *      textures before loading .csm files. You can do this
+		 *      using
+		 *      SceneManager-&gt;getParameters()-&gt;setParameter(scene::CSM_TEXTURE_PATH,
 		 *      &quot;path/to/your/textures&quot;);</TD>
 		 *  </TR>
 		 *  <TR>
 		 *    <TD>COLLADA (.dae, .xml)</TD>
-		 *    <TD>COLLADA is an open Digital Asset Exchange Schema for the interactive 3D industry. There are
-		 *        exporters and importers for this format available for most of the big 3d packages
-		 *        at http://collada.org. Irrlicht can import COLLADA files by using the
-		 *        ISceneManager::getMesh() method. COLLADA files need not contain only one single mesh
-		 *        but multiple meshes and a whole scene setup with lights, cameras and mesh instances,
-		 *        this loader can set up a scene as described by the COLLADA file instead of loading
-		 *        and returning one single mesh. By default, this loader behaves like the other loaders
-		 *        and does not create instances, but it can be switched into this mode by using
-		 *        SceneManager->getParameters()->setParameter(COLLADA_CREATE_SCENE_INSTANCES, true);
-		 *        Created scene nodes will be named as the names of the nodes in the
-		 *        COLLADA file. The returned mesh is just a dummy object in this mode. Meshes included in
-		 *        the scene will be added into the scene manager with the following naming scheme:
-		 *        path/to/file/file.dea#meshname. The loading of such meshes is logged.
-		 *        Currently, this loader is able to create meshes (made of only polygons), lights,
-		 *        and cameras. Materials and animations are currently not supported but this will
-		 *        change with future releases.
+		 *    <TD>COLLADA is an open Digital Asset Exchange Schema for
+		 *      the interactive 3D industry. There are exporters and
+		 *      importers for this format available for most of the
+		 *      big 3d packagesat http://collada.org. Irrlicht can
+		 *      import COLLADA files by using the
+		 *      ISceneManager::getMesh() method. COLLADA files need
+		 *      not contain only one single mesh but multiple meshes
+		 *      and a whole scene setup with lights, cameras and mesh
+		 *      instances, this loader can set up a scene as
+		 *      described by the COLLADA file instead of loading and
+		 *      returning one single mesh. By default, this loader
+		 *      behaves like the other loaders and does not create
+		 *      instances, but it can be switched into this mode by
+		 *      using
+		 *      SceneManager->getParameters()->setParameter(COLLADA_CREATE_SCENE_INSTANCES, true);
+		 *      Created scene nodes will be named as the names of the
+		 *      nodes in the COLLADA file. The returned mesh is just
+		 *      a dummy object in this mode. Meshes included in the
+		 *      scene will be added into the scene manager with the
+		 *      following naming scheme:
+		 *      path/to/file/file.dea#meshname. The loading of such
+		 *      meshes is logged. Currently, this loader is able to
+		 *      create meshes (made of only polygons), lights, and
+		 *      cameras. Materials and animations are currently not
+		 *      supported but this will change with future releases.
 		 *    </TD>
 		 *  </TR>
 		 *  <TR>
 		 *    <TD>Delgine DeleD (.dmf)</TD>
-		 *    <TD>DeleD (delgine.com) is a 3D editor and level-editor combined into one and is specifically
-		 *        designed for 3D game-development. With this loader, it is possible to directly load
-		 *        all geometry is as well as textures and lightmaps from .dmf files. To set texture and
-		 *        material paths, see scene::DMF_USE_MATERIALS_DIRS and scene::DMF_TEXTURE_PATH. It is also
-		 *        possible to flip the alpha texture by setting scene::DMF_FLIP_ALPHA_TEXTURES to true and
-		 *        to set the material transparent reference value by setting scene::DMF_ALPHA_CHANNEL_REF to
-		 *        a float between 0 and 1. The loader is
-		 *        based on Salvatore Russo's .dmf loader, I just changed some parts of it. Thanks to
-		 *        Salvatore for his work and for allowing me to use his code in Irrlicht and put it under Irrlicht's
-		 *        license. For newer and more enchanced versions of the loader, take a look at delgine.com.
-		 *    </TD>
+		 *    <TD>DeleD (delgine.com) is a 3D editor and level-editor
+		 *      combined into one and is specifically designed for 3D
+		 *      game-development. With this loader, it is possible to
+		 *      directly load all geometry is as well as textures and
+		 *      lightmaps from .dmf files. To set texture and
+		 *      material paths, see scene::DMF_USE_MATERIALS_DIRS and
+		 *      scene::DMF_TEXTURE_PATH. It is also possible to flip
+		 *      the alpha texture by setting
+		 *      scene::DMF_FLIP_ALPHA_TEXTURES to true and to set the
+		 *      material transparent reference value by setting
+		 *      scene::DMF_ALPHA_CHANNEL_REF to a float between 0 and
+		 *      1. The loader is based on Salvatore Russo's .dmf
+		 *      loader, I just changed some parts of it. Thanks to
+		 *      Salvatore for his work and for allowing me to use his
+		 *      code in Irrlicht and put it under Irrlicht's license.
+		 *      For newer and more enchanced versions of the loader,
+		 *      take a look at delgine.com.</TD>
 		 *  </TR>
 		 *  <TR>
 		 *    <TD>DirectX (.x)</TD>
-		 *    <TD>Platform independent importer (so not D3D-only) for .x files. Most 3D
-		 *      packages can export these natively and there are several tools for them
-		 *      available. (e.g. the Maya exporter included in the DX SDK) .x files can
-		 *      include skeletal animations and Irrlicht is able to play and display them.
-		 *      Currently, Irrlicht only supports uncompressed .x files.</TD>
+		 *    <TD>Platform independent importer (so not D3D-only) for
+		 *      .x files. Most 3D packages can export these natively
+		 *      and there are several tools for them available, e.g.
+		 *      the Maya exporter included in the DX SDK.
+		 *      .x files can include skeletal animations and Irrlicht
+		 *      is able to play and display them. Currently, Irrlicht
+		 *      only supports uncompressed .x files.</TD>
 		 *  </TR>
 		 *  <TR>
 		 *    <TD>Maya (.obj)</TD>
-		 *    <TD>Most 3D software can create .obj files which contain static geometry without
-		 *      material data. The material files .mtl are also supported. This importer
-		 *      for Irrlicht can load them directly. </TD>
+		 *    <TD>Most 3D software can create .obj files which contain
+		 *      static geometry without material data. The material
+		 *      files .mtl are also supported. This importer for
+		 *      Irrlicht can load them directly. </TD>
 		 *  </TR>
 		 *  <TR>
 		 *    <TD>Milkshape (.ms3d)</TD>
-		 *    <TD>.MS3D files contain models and sometimes skeletal animations from the
-		 *      Milkshape 3D modeling and animation software. This importer for Irrlicht
-		 *      can display and/or animate these files.  </TD>
+		 *    <TD>.MS3D files contain models and sometimes skeletal
+		 *      animations from the Milkshape 3D modeling and animation
+		 *      software. This importer for Irrlicht can display and/or
+		 *      animate these files. </TD>
 		 *  </TR>
 		 *  <TR>
-		 *  <TD>My3D (.my3d)</TD>
-		 *      <TD>.my3D is a flexible 3D file format. The My3DTools contains plug-ins to
-		 *        export .my3D files from several 3D packages. With this built-in importer,
-		 *        Irrlicht can read and display those files directly. This loader was written
-		 *        by Zhuck Dimitry who also created the whole My3DTools package. If you are using this loader, please
-		 *      note that you can set the path of the textures before loading .my3d files.
-		 *      You can do this using SceneManager-&gt;getParameters()-&gt;setParameter(scene::MY3D_TEXTURE_PATH,
-		 *      &quot;path/to/your/textures&quot;); </TD>
-		 *    </TR>
-		 *    <TR>
-		 *      <TD>OCT (.oct)</TD>
-		 *      <TD>The oct file format contains 3D geometry and lightmaps and can be loaded
-		 *        directly by Irrlicht. OCT files<br>
-		 *        can be created by FSRad, Paul Nette's radiosity processor or exported from
-		 *        Blender using OCTTools which can be found in the exporters/OCTTools directory
-		 *        of the SDK. Thanks to Murphy McCauley for creating all this.</TD>
-		 *    </TR>
-		 *	  <TR>
-		 *      <TD>OGRE Meshes (.mesh)</TD>
-		 *      <TD>Ogre .mesh files contain 3D data for the OGRE 3D engine. Irrlicht can read and
-		 *          display them directly with this importer. To define materials for the mesh,
-		 *			copy a .material file named like the corresponding .mesh file where the .mesh
-		 *			file is. (For example ogrehead.material for ogrehead.mesh). Thanks to Christian Stehno
-		 *			who wrote and contributed this loader.</TD>
-		 *    </TR>
-		 *    <TR>
-		 *      <TD>Pulsar LMTools (.lmts)</TD>
-		 *      <TD>LMTools is a set of tools (Windows &amp; Linux) for creating lightmaps.
-		 *        Irrlicht can directly read .lmts files thanks to<br>
-		 *        the importer created by Jonas Petersen. If you are using this loader, please
-		 *        note that you can set the path of the textures before loading .lmts files.
-		 *        You can do this using SceneManager-&gt;getParameters()-&gt;setParameter(scene::LMTS_TEXTURE_PATH,
-		 *        &quot;path/to/your/textures&quot;); Notes for<br>
-		 *        this version of the loader:<br>
-		 *        - It does not recognice/support user data in the *.lmts files.<br>
-		 *        - The TGAs generated by LMTools don't work in Irrlicht for some reason (the
-		 *        textures are upside down). Opening and resaving them in a graphics app will
-		 *        solve the problem.</TD>
-		 *    </TR>
-		 *    <TR>
-		 *      <TD>Quake 3 levels (.bsp)</TD>
-		 *      <TD>Quake 3 is a popular game by IDSoftware, and .pk3 files contain .bsp files
-		 *        and textures/lightmaps describing huge<br>
-		 *        prelighted levels. Irrlicht can read .pk3 and .bsp files directly and thus
-		 *        render Quake 3 levels directly. Written by Nikolaus Gebhardt enhanced by
-		 *        Dean P. Macri with the curved surfaces feature. </TD>
-		 *    </TR>
-		 *    <TR>
-		 *      <TD>Quake 2 models (.md2)</TD>
-		 *      <TD>Quake 2 models are characters with morph target animation. Irrlicht can
-		 *        read, display and animate them directly with this importer. </TD>
-		 *    </TR>
-		 *  </TABLE>
+		 *    <TD>My3D (.my3d)</TD>
+		 *    <TD>.my3D is a flexible 3D file format. The My3DTools
+		 *      contains plug-ins to export .my3D files from several
+		 *      3D packages. With this built-in importer, Irrlicht
+		 *      can read and display those files directly. This
+		 *      loader was written by Zhuck Dimitry who also created
+		 *      the whole My3DTools package. If you are using this
+		 *      loader, please note that you can set the path of the
+		 *      textures before loading .my3d files. You can do this
+		 *      using
+		 *      SceneManager-&gt;getParameters()-&gt;setParameter(scene::MY3D_TEXTURE_PATH,
+		 *      &quot;path/to/your/textures&quot;);</TD>
+		 *  </TR>
+		 *  <TR>
+		 *    <TD>OCT (.oct)</TD>
+		 *    <TD>The oct file format contains 3D geometry and
+		 *      lightmaps and can be loaded directly by Irrlicht. OCT
+		 *      files<br> can be created by FSRad, Paul Nette's
+		 *      radiosity processor or exported from Blender using
+		 *      OCTTools which can be found in the exporters/OCTTools
+		 *      directory of the SDK. Thanks to Murphy McCauley for
+		 *      creating all this.</TD>
+		 *  </TR>
+		 *  <TR>
+		 *    <TD>OGRE Meshes (.mesh)</TD>
+		 *    <TD>Ogre .mesh files contain 3D data for the OGRE 3D
+		 *      engine. Irrlicht can read and display them directly
+		 *      with this importer. To define materials for the mesh,
+		 *      copy a .material file named like the corresponding
+		 *      .mesh file where the .mesh file is. (For example
+		 *      ogrehead.material for ogrehead.mesh). Thanks to
+		 *      Christian Stehno who wrote and contributed this
+		 *      loader.</TD>
+		 *  </TR>
+		 *  <TR>
+		 *    <TD>Pulsar LMTools (.lmts)</TD>
+		 *    <TD>LMTools is a set of tools (Windows &amp; Linux) for
+		 *      creating lightmaps. Irrlicht can directly read .lmts
+		 *      files thanks to<br> the importer created by Jonas
+		 *      Petersen. If you are using this loader, please note
+		 *      that you can set the path of the textures before
+		 *      loading .lmts files. You can do this using
+		 *      SceneManager-&gt;getParameters()-&gt;setParameter(scene::LMTS_TEXTURE_PATH,
+		 *      &quot;path/to/your/textures&quot;);
+		 *      Notes for<br> this version of the loader:<br>
+		 *      - It does not recognise/support user data in the
+		 *        *.lmts files.<br>
+		 *      - The TGAs generated by LMTools don't work in
+		 *        Irrlicht for some reason (the textures are upside
+		 *        down). Opening and resaving them in a graphics app
+		 *        will solve the problem.</TD>
+		 *  </TR>
+		 *  <TR>
+		 *    <TD>Quake 3 levels (.bsp)</TD>
+		 *    <TD>Quake 3 is a popular game by IDSoftware, and .pk3
+		 *      files contain .bsp files and textures/lightmaps
+		 *      describing huge prelighted levels. Irrlicht can read
+		 *      .pk3 and .bsp files directly and thus render Quake 3
+		 *      levels directly. Written by Nikolaus Gebhardt
+		 *      enhanced by Dean P. Macri with the curved surfaces
+		 *      feature.</TD>
+		 *  </TR>
+		 *  <TR>
+		 *    <TD>Quake 2 models (.md2)</TD>
+		 *    <TD>Quake 2 models are characters with morph target
+		 *      animation. Irrlicht can read, display and animate
+		 *      them directly with this importer. </TD>
+		 *  </TR>
+		 * </TABLE>
 		 *
-		 *  To load and display a mesh quickly, just do this:
-		 *  \code
-		 *  SceneManager->addAnimatedMeshSceneNode(
+		 * To load and display a mesh quickly, just do this:
+		 * \code
+		 * SceneManager->addAnimatedMeshSceneNode(
 		 *		SceneManager->getMesh("yourmesh.3ds"));
-		 *  \endcode
-		 *  If you would like to implement and add your own file format loader to Irrlicht,
-		 *  see addExternalMeshLoader().
-		 *  \param filename: Filename of the mesh to load.
-		 *  \return Returns NULL if failed and the pointer to the mesh if
-		 *  successful.
-		 *  This pointer should not be dropped. See IReferenceCounted::drop() for more information.
+		 * \endcode
+		 * If you would like to implement and add your own file format loader to Irrlicht,
+		 * see addExternalMeshLoader().
+		 * \param filename: Filename of the mesh to load.
+		 * \return Null if failed, otherwise pointer to the mesh.
+		 * This pointer should not be dropped. See IReferenceCounted::drop() for more information.
 		 **/
 		virtual IAnimatedMesh* getMesh(const c8* filename) = 0;
 
-		//! Returns an interface to the mesh cache which is shared beween all existing scene managers.
+		//! Get pointer to an animateable mesh. Loads the file if not loaded already.
+		/** Works just as getMesh(const char* filename). If you want to
+		remove a loaded mesh from the cache again, use removeMesh().
+		\param file File handle of the mesh to load.
+		\return 0 if failed and pointer to the mesh if successful.
+		This pointer should not be dropped. See
+		IReferenceCounted::drop() for more information. */
+		virtual IAnimatedMesh* getMesh(io::IReadFile* file) = 0;
+
+		//! Get interface to the mesh cache which is shared beween all existing scene managers.
 		/** With this interface, it is possible to manually add new loaded
 		meshes (if ISceneManager::getMesh() is not sufficient), to remove them and to iterate
 		through already loaded meshes. */
 		virtual IMeshCache* getMeshCache() = 0;
 
-		//! Returns the video driver.
-		/** \return Returns pointer to the video Driver.
+		//! Get the video driver.
+		/** \return Pointer to the video Driver.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual video::IVideoDriver* getVideoDriver() = 0;
 
-		//! Returns the active GUIEnvironment
-		/** \return Returns pointer to the GUIEnvironment
+		//! Get the active GUIEnvironment
+		/** \return Pointer to the GUIEnvironment
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual gui::IGUIEnvironment* getGUIEnvironment() = 0;
 
+		//! adds Volume Lighting Scene Node.
+		/** Example Usage:
+			scene::IVolumeLightSceneNode * n = smgr->addVolumeLightSceneNode(NULL, -1,
+						32, 32, //Subdivide U/V
+						video::SColor(0, 180, 180, 180), //foot color
+						video::SColor(0, 0, 0, 0) //tail color
+						);
+			if (n)
+			{
+				n->setScale(core::vector3df(46.0f, 45.0f, 46.0f));
+				n->getMaterial(0).setTexture(0, smgr->getVideoDriver()->getTexture("lightFalloff.png"));
+			}
+		\return Pointer to the volumeLight if successful, otherwise NULL.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		virtual IVolumeLightSceneNode* addVolumeLightSceneNode(ISceneNode* parent=0, s32 id=-1,
+			const u32 subdivU = 32, const u32 subdivV = 32,
+			const video::SColor foot = video::SColor(51, 0, 230, 180),
+			const video::SColor tail = video::SColor(0, 0, 0, 0),
+			const core::vector3df& position = core::vector3df(0,0,0),
+			const core::vector3df& rotation = core::vector3df(0,0,0),
+			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) = 0;
+
+
 		//! Adds a test scene node for test purposes to the scene.
 		/** It is a simple cube of (1,1,1) size.
 		\param size: Size of the cube.
@@ -327,9 +391,10 @@ namespace scene
 		 scene node will be placed.
 		\param rotation: Initital rotation of the scene node.
 		\param scale: Initial scale of the scene node.
-		\return Returns pointer to the created test scene node.
-	     This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-		virtual ISceneNode* addCubeSceneNode(f32 size=10.0f, ISceneNode* parent=0, s32 id=-1,
+		\return Pointer to the created test scene node. This
+		pointer should not be dropped. See IReferenceCounted::drop()
+		for more information. */
+		virtual IMeshSceneNode* addCubeSceneNode(f32 size=10.0f, ISceneNode* parent=0, s32 id=-1,
 			const core::vector3df& position = core::vector3df(0,0,0),
 			const core::vector3df& rotation = core::vector3df(0,0,0),
 			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) = 0;
@@ -344,12 +409,14 @@ namespace scene
 		 scene node will be placed.
 		\param rotation: Initital rotation of the scene node.
 		\param scale: Initial scale of the scene node.
-		\return Returns pointer to the created test scene node.
-	     This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-		virtual ISceneNode* addSphereSceneNode(f32 radius=5.0f, s32 polyCount=16, ISceneNode* parent=0, s32 id=-1,
-			const core::vector3df& position = core::vector3df(0,0,0),
-			const core::vector3df& rotation = core::vector3df(0,0,0),
-			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) = 0;
+		\return Pointer to the created test scene node. This
+		pointer should not be dropped. See IReferenceCounted::drop()
+		for more information. */
+		virtual IMeshSceneNode* addSphereSceneNode(f32 radius=5.0f, s32 polyCount=16,
+				ISceneNode* parent=0, s32 id=-1,
+				const core::vector3df& position = core::vector3df(0,0,0),
+				const core::vector3df& rotation = core::vector3df(0,0,0),
+				const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f)) = 0;
 
 		//! Adds a scene node for rendering an animated mesh model.
 		/** \param mesh: Pointer to the loaded animated mesh to be displayed.
@@ -360,13 +427,14 @@ namespace scene
 		\param rotation: Initital rotation of the scene node.
 		\param scale: Initial scale of the scene node.
 		\param alsoAddIfMeshPointerZero: Add the scene node even if a 0 pointer is passed.
-		\return Returns pointer to the created scene node.
+		\return Pointer to the created scene node.
 		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-		virtual IAnimatedMeshSceneNode* addAnimatedMeshSceneNode(IAnimatedMesh* mesh, ISceneNode* parent=0, s32 id=-1,
-			const core::vector3df& position = core::vector3df(0,0,0),
-			const core::vector3df& rotation = core::vector3df(0,0,0),
-			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f),
-			bool alsoAddIfMeshPointerZero=false) = 0;
+		virtual IAnimatedMeshSceneNode* addAnimatedMeshSceneNode(IAnimatedMesh* mesh,
+				ISceneNode* parent=0, s32 id=-1,
+				const core::vector3df& position = core::vector3df(0,0,0),
+				const core::vector3df& rotation = core::vector3df(0,0,0),
+				const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f),
+				bool alsoAddIfMeshPointerZero=false) = 0;
 
 		//! Adds a scene node for rendering a static mesh.
 		/** \param mesh: Pointer to the loaded static mesh to be displayed.
@@ -377,7 +445,7 @@ namespace scene
 		\param rotation: Initital rotation of the scene node.
 		\param scale: Initial scale of the scene node.
 		\param alsoAddIfMeshPointerZero: Add the scene node even if a 0 pointer is passed.
-		\return Returns pointer to the created scene node.
+		\return Pointer to the created scene node.
 		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual IMeshSceneNode* addMeshSceneNode(IMesh* mesh, ISceneNode* parent=0, s32 id=-1,
 			const core::vector3df& position = core::vector3df(0,0,0),
@@ -387,19 +455,19 @@ namespace scene
 
 		//! Adds a scene node for rendering a animated water surface mesh.
 		/** Looks really good when the Material type EMT_TRANSPARENT_REFLECTION
-		 is used.
-		 \param waveHeight: Height of the water waves.
-		 \param waveSpeed: Speed of the water waves.
-		 \param waveLength: Lenght of a water wave.
-		 \param mesh: Pointer to the loaded static mesh to be displayed with water waves on it.
-		 \param parent: Parent of the scene node. Can be NULL if no parent.
-		 \param id: Id of the node. This id can be used to identify the scene node.
-		 \param position: Position of the space relative to its parent where the
-		 scene node will be placed.
-		 \param rotation: Initital rotation of the scene node.
-		 \param scale: Initial scale of the scene node.
-		 \return Returns pointer to the created scene node.
-		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		is used.
+		\param waveHeight: Height of the water waves.
+		\param waveSpeed: Speed of the water waves.
+		\param waveLength: Lenght of a water wave.
+		\param mesh: Pointer to the loaded static mesh to be displayed with water waves on it.
+		\param parent: Parent of the scene node. Can be NULL if no parent.
+		\param id: Id of the node. This id can be used to identify the scene node.
+		\param position: Position of the space relative to its parent where the
+		scene node will be placed.
+		\param rotation: Initital rotation of the scene node.
+		\param scale: Initial scale of the scene node.
+		\return Pointer to the created scene node.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* addWaterSurfaceSceneNode(IMesh* mesh,
 			f32 waveHeight=2.0f, f32 waveSpeed=300.0f, f32 waveLength=10.0f,
 			ISceneNode* parent=0, s32 id=-1,
@@ -419,24 +487,24 @@ namespace scene
 		 If a node gets less polys than this value it will not be split into
 		 smaller nodes.
 		\param alsoAddIfMeshPointerZero: Add the scene node even if a 0 pointer is passed.
-		 \return Returns the pointer to the OctTree if successful, otherwise 0.
+		 \return Pointer to the OctTree if successful, otherwise 0.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* addOctTreeSceneNode(IAnimatedMesh* mesh, ISceneNode* parent=0,
-			s32 id=-1, s32 minimalPolysPerNode=256, bool alsoAddIfMeshPointerZero=false) = 0;
+			s32 id=-1, s32 minimalPolysPerNode=512, bool alsoAddIfMeshPointerZero=false) = 0;
 
 		//! Adds a scene node for rendering using a octtree to the scene graph.
-		/** This a good method for rendering
-		 scenes with lots of geometry. The Octree is built on the fly from the mesh, much
-		 faster then a bsp tree.
-		 \param mesh: The mesh containing all geometry from which the octtree will be build.
-		 \param parent: Parent node of the octtree node.
-		 \param id: id of the node. This id can be used to identify the node.
-		 \param minimalPolysPerNode: Specifies the minimal polygons contained a octree node.
-		 If a node gets less polys than this value it will not be split into
-		 smaller nodes.
+		/** This a good method for rendering scenes with lots of
+		geometry. The Octree is built on the fly from the mesh, much
+		faster then a bsp tree.
+		\param mesh: The mesh containing all geometry from which the octtree will be build.
+		\param parent: Parent node of the octtree node.
+		\param id: id of the node. This id can be used to identify the node.
+		\param minimalPolysPerNode: Specifies the minimal polygons contained a octree node.
+		If a node gets less polys than this value it will not be split into
+		smaller nodes.
 		\param alsoAddIfMeshPointerZero: Add the scene node even if a 0 pointer is passed.
-		 \return Returns the pointer to the octtree if successful, otherwise 0.
-		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		\return Pointer to the octtree if successful, otherwise 0.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* addOctTreeSceneNode(IMesh* mesh, ISceneNode* parent=0,
 			s32 id=-1, s32 minimalPolysPerNode=256, bool alsoAddIfMeshPointerZero=false) = 0;
 
@@ -444,78 +512,93 @@ namespace scene
 		/** This camera does not react on user input like for example the one created with
 		addCameraSceneNodeFPS(). If you want to move or animate it, use animators or the
 		ISceneNode::setPosition(), ICameraSceneNode::setTarget() etc methods.
+		By default, a camera's look at position (set with setTarget()) and its scene node 
+		rotation (set with setRotation()) are independent.  If you want to be able to 
+		control the direction that the camera looks by using setRotation() then call 
+		ICameraSceneNode::bindTargetAndRotation(true) on it.
 		 \param position: Position of the space relative to its parent where the camera will be placed.
 		 \param lookat: Position where the camera will look at. Also known as target.
 		 \param parent: Parent scene node of the camera. Can be null. If the parent moves,
 		 the camera will move too.
 		 \param id: id of the camera. This id can be used to identify the camera.
-		 \return Returns pointer to interface to camera if successful, otherwise 0.
+		 \return Pointer to interface to camera if successful, otherwise 0.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ICameraSceneNode* addCameraSceneNode(ISceneNode* parent = 0,
 			const core::vector3df& position = core::vector3df(0,0,0),
 			const core::vector3df& lookat = core::vector3df(0,0,100), s32 id=-1) = 0;
 
 		//! Adds a maya style user controlled camera scene node to the scene graph.
-		/** The maya camera is able to be controlled with the mouse similar
-		 like in the 3D Software Maya by Alias Wavefront.
-		 \param parent: Parent scene node of the camera. Can be null.
-		 \param rotateSpeed: Rotation speed of the camera.
-		 \param zoomSpeed: Zoom speed of the camera.
-		 \param translationSpeed: TranslationSpeed of the camera.
-		 \param id: id of the camera. This id can be used to identify the camera.
-		 \return Returns a pointer to the interface of the camera if successful, otherwise 0.
-		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		/** This is a standard camera with an animator that provides
+		mouse control similar to camera in the 3D Software Maya.
+		\param parent: Parent scene node of the camera. Can be null.
+		\param rotateSpeed: Rotation speed of the camera.
+		\param zoomSpeed: Zoom speed of the camera.
+		\param translationSpeed: Translation speed of the camera.
+		\param id: id of the camera. This id can be used to identify the camera.
+		\return Pointer to the interface of the camera if successful, otherwise 0.
+		This pointer should not be dropped. See
+		IReferenceCounted::drop() for more information. */
 		virtual ICameraSceneNode* addCameraSceneNodeMaya(ISceneNode* parent = 0,
-			f32 rotateSpeed = -1500.0f, f32 zoomSpeed = 200.0f, f32 translationSpeed = 1500.0f, s32 id=-1) = 0;
+			f32 rotateSpeed = -1500.0f, f32 zoomSpeed = 200.0f,
+			f32 translationSpeed = 1500.0f, s32 id=-1) = 0;
 
-		//! Adds a camera scene node which is able to be controlled with the mouse and keys like in most first person shooters (FPS).
-		/** Look with the mouse, move with cursor keys. If you do not like the default
-		 key layout, you may want to specify your own. For example to make the camera
-		 be controlled by the cursor keys AND the keys W,A,S, and D, do something
-		 like this:
-		 \code
-		 SKeyMap keyMap[8];
-		 keyMap[0].Action = EKA_MOVE_FORWARD;
-		 keyMap[0].KeyCode = KEY_UP;
-		 keyMap[1].Action = EKA_MOVE_FORWARD;
-		 keyMap[1].KeyCode = KEY_KEY_W;
+		//! Adds a camera scene node with an animator which provides mouse and keyboard control appropriate for first person shooters (FPS).
+		/** This FPS camera is intended to provide a demonstration of a
+		camera that behaves like a typical First Person Shooter. It is
+		useful for simple demos and prototyping but is not intended to
+		provide a full solution for a production quality game. It binds
+		the camera scene node rotation to the look-at target; @see
+		ICameraSceneNode::bindTargetAndRotation().  With this camera,
+		you look with the mouse, and move with cursor keys. If you want
+		to change the key layout, you can specify your own keymap. For
+		example to make the camera be controlled by the cursor keys AND
+		the keys W,A,S, and D, do something like this:
+		\code
+		SKeyMap keyMap[8];
+		keyMap[0].Action = EKA_MOVE_FORWARD;
+		keyMap[0].KeyCode = KEY_UP;
+		keyMap[1].Action = EKA_MOVE_FORWARD;
+		keyMap[1].KeyCode = KEY_KEY_W;
 
-		 keyMap[2].Action = EKA_MOVE_BACKWARD;
-		 keyMap[2].KeyCode = KEY_DOWN;
-		 keyMap[3].Action = EKA_MOVE_BACKWARD;
-		 keyMap[3].KeyCode = KEY_KEY_S;
+		keyMap[2].Action = EKA_MOVE_BACKWARD;
+		keyMap[2].KeyCode = KEY_DOWN;
+		keyMap[3].Action = EKA_MOVE_BACKWARD;
+		keyMap[3].KeyCode = KEY_KEY_S;
 
-		 keyMap[4].Action = EKA_STRAFE_LEFT;
-		 keyMap[4].KeyCode = KEY_LEFT;
-		 keyMap[5].Action = EKA_STRAFE_LEFT;
-		 keyMap[5].KeyCode = KEY_KEY_A;
+		keyMap[4].Action = EKA_STRAFE_LEFT;
+		keyMap[4].KeyCode = KEY_LEFT;
+		keyMap[5].Action = EKA_STRAFE_LEFT;
+		keyMap[5].KeyCode = KEY_KEY_A;
 
-		 keyMap[6].Action = EKA_STRAFE_RIGHT;
-		 keyMap[6].KeyCode = KEY_RIGHT;
-		 keyMap[7].Action = EKA_STRAFE_RIGHT;
-		 keyMap[7].KeyCode = KEY_KEY_D;
+		keyMap[6].Action = EKA_STRAFE_RIGHT;
+		keyMap[6].KeyCode = KEY_RIGHT;
+		keyMap[7].Action = EKA_STRAFE_RIGHT;
+		keyMap[7].KeyCode = KEY_KEY_D;
 
-		 camera = sceneManager->addCameraSceneNodeFPS(0, 100, 500, -1, keyMap, 8);
-		 \endcode
-		 \param parent: Parent scene node of the camera. Can be null.
-		 \param rotateSpeed: Speed with which the camera is rotated. This can be done
-		 only with the mouse.
-		 \param moveSpeed: Speed with which the camera is moved. Movement is done with
-		 the cursor keys.
-		 \param id: id of the camera. This id can be used to identify the camera.
-		 \param keyMapArray: Optional pointer to an array of a keymap, specifying what
-		 keys should be used to move the camera. If this is null, the default keymap
-		 is used. You can define actions more then one time in the array, to bind
-		 multiple keys to the same action.
-		 \param keyMapSize: Amount of items in the keymap array.
-		 \param noVerticalMovement: Setting this to true makes the camera only move within a
-		 horizontal plane, and disables vertical movement as known from most ego shooters. Default
-		 is 'false', with which it is possible to fly around in space, if no gravity is there.
-		 \param jumpSpeed: Speed with which the camera is moved when jumping.
-		 \return Returns a pointer to the interface of the camera if successful, otherwise 0.
-		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		camera = sceneManager->addCameraSceneNodeFPS(0, 100, 500, -1, keyMap, 8);
+		\endcode
+		\param parent: Parent scene node of the camera. Can be null.
+		\param rotateSpeed: Speed in degress with which the camera is
+		rotated. This can be done only with the mouse.
+		\param moveSpeed: Speed in units per millisecond with which
+		the camera is moved. Movement is done with the cursor keys.
+		\param id: id of the camera. This id can be used to identify the camera.
+		\param keyMapArray: Optional pointer to an array of a keymap, specifying what
+		keys should be used to move the camera. If this is null, the default keymap
+		is used. You can define actions more then one time in the array, to bind
+		multiple keys to the same action.
+		\param keyMapSize: Amount of items in the keymap array.
+		\param noVerticalMovement: Setting this to true makes the
+		camera only move within a horizontal plane, and disables
+		vertical movement as known from most ego shooters. Default is
+		'false', with which it is possible to fly around in space, if
+		no gravity is there.
+		\param jumpSpeed: Speed with which the camera is moved when jumping.
+		\return Pointer to the interface of the camera if successful, otherwise 0.
+		This pointer should not be dropped. See
+		IReferenceCounted::drop() for more information. */
 		virtual ICameraSceneNode* addCameraSceneNodeFPS(ISceneNode* parent = 0,
-			f32 rotateSpeed = 100.0f, f32 moveSpeed = 500.0f, s32 id=-1,
+			f32 rotateSpeed = 100.0f, f32 moveSpeed = .5f, s32 id=-1,
 			SKeyMap* keyMapArray=0, s32 keyMapSize=0, bool noVerticalMovement=false,
 			f32 jumpSpeed = 0.f) = 0;
 
@@ -530,7 +613,7 @@ namespace scene
 		 the ILightSceneNode::getLightData() method.
 		 \param radius: Radius of the light.
 		 \param id: id of the node. This id can be used to identify the node.
-		 \return Returns pointer to the interface of the light if successful, otherwise NULL.
+		 \return Pointer to the interface of the light if successful, otherwise NULL.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ILightSceneNode* addLightSceneNode(ISceneNode* parent = 0,
 			const core::vector3df& position = core::vector3df(0,0,0),
@@ -543,18 +626,19 @@ namespace scene
 		 lensflares and things like that.
 		 \param parent: Parent scene node of the billboard. Can be null. If the parent moves,
 		 the billboard will move too.
-		 \param position: Position of the space relative to its parent where the billboard will be placed.
+		 \param position: Position of the space relative to its parent
+		 where the billboard will be placed.
 		 \param size: Size of the billboard. This size is 2 dimensional because a billboard only has
 		 width and height.
 		 \param id: An id of the node. This id can be used to identify the node.
-		 \param shade_top: vertex color top
-		 \param shade_down: vertex color down
-		 \return Returns pointer to the billboard if successful, otherwise NULL.
+		 \param colorTop: The color of the vertices at the top of the billboard (default: white).
+		 \param colorBottom: The color of the vertices at the bottom of the billboard (default: white).
+		 \return Pointer to the billboard if successful, otherwise NULL.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual IBillboardSceneNode* addBillboardSceneNode(ISceneNode* parent = 0,
 			const core::dimension2d<f32>& size = core::dimension2d<f32>(10.0f, 10.0f),
 			const core::vector3df& position = core::vector3df(0,0,0), s32 id=-1,
-			video::SColor shade_top = 0xFFFFFFFF, video::SColor shade_down = 0xFFFFFFFF) = 0;
+			video::SColor colorTop = 0xFFFFFFFF, video::SColor colorBottom = 0xFFFFFFFF) = 0;
 
 		//! Adds a skybox scene node to the scene graph.
 		/** A skybox is a big cube with 6 textures on it and
@@ -569,7 +653,7 @@ namespace scene
 		 so this should be null. Note: If a parent is set to the skybox, the box will not
 		 change how it is drawn.
 		 \param id: An id of the node. This id can be used to identify the node.
-		 \return Returns a pointer to the sky box if successful, otherwise NULL.
+		 \return Pointer to the sky box if successful, otherwise NULL.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* addSkyBoxSceneNode(video::ITexture* top, video::ITexture* bottom,
 			video::ITexture* left, video::ITexture* right, video::ITexture* front,
@@ -581,17 +665,21 @@ namespace scene
 		 \param texture: Texture for the dome.
 		 \param horiRes: Number of vertices of a horizontal layer of the sphere.
 		 \param vertRes: Number of vertices of a vertical layer of the sphere.
-		 \param texturePercentage: How much of the height of the texture is used. Should be between 0 and 1.
-		 \param spherePercentage: How much of the sphere is drawn. Value should be between 0 and 2, where 1 is an exact half-sphere and 2 is a full sphere.
+		 \param texturePercentage: How much of the height of the
+		 texture is used. Should be between 0 and 1.
+		 \param spherePercentage: How much of the sphere is drawn.
+		 Value should be between 0 and 2, where 1 is an exact
+		 half-sphere and 2 is a full sphere.
 		 \param parent: Parent scene node of the dome. A dome usually has no parent,
 		 so this should be null. Note: If a parent is set, the dome will not
 		 change how it is drawn.
 		 \param id: An id of the node. This id can be used to identify the node.
-		 \return Returns a pointer to the sky dome if successful, otherwise NULL.
+		 \return Pointer to the sky dome if successful, otherwise NULL.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* addSkyDomeSceneNode(video::ITexture* texture,
-			u32 horiRes, u32 vertRes, f64 texturePercentage, f64 spherePercentage,
-			ISceneNode* parent = 0, s32 id=-1) = 0;
+			u32 horiRes=16, u32 vertRes=8,
+			f64 texturePercentage=0.9, f64 spherePercentage=2.0,
+			ISceneNode* parent=0, s32 id=-1) = 0;
 
 		//! Adds a particle system scene node to the scene graph.
 		/** \param withDefaultEmitter: Creates a default working point emitter
@@ -604,7 +692,7 @@ namespace scene
 		 scene node will be placed.
 		 \param rotation: Initital rotation of the scene node.
 		 \param scale: Initial scale of the scene node.
-		 \return Returns pointer to the created scene node.
+		 \return Pointer to the created scene node.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual IParticleSystemSceneNode* addParticleSystemSceneNode(
 			bool withDefaultEmitter=true, ISceneNode* parent=0, s32 id=-1,
@@ -629,24 +717,32 @@ namespace scene
 		 a LOD (Level of Detail) which is determined based on a patch's
 		 distance from the camera.
 
-		 The patch size of the terrain must always be a size of ( 2^N+1, i.e. 8+1(9), 16+1(17), etc. ).
-		 The MaxLOD available is directly dependent on the patch size of the terrain.  LOD 0 contains all
-		 of the indices to draw all the triangles at the max detail for a patch.  As each LOD goes up by 1
-		 the step taken, in generating indices increases by - 2^LOD, so for LOD 1, the step taken is 2, for
-		 LOD 2, the step taken is 4, LOD 3 - 8, etc.  The step can be no larger than the size of the patch,
-		 so having a LOD of 8, with a patch size of 17, is asking the algoritm to generate indices every
-		 2^8 ( 256 ) vertices, which is not possible with a patch size of 17.  The maximum LOD for a patch
-		 size of 17 is 2^4 ( 16 ).  So, with a MaxLOD of 5, you'll have LOD 0 ( full detail ), LOD 1 ( every
-		 2 vertices ), LOD 2 ( every 4 vertices ), LOD 3 ( every 8 vertices ) and LOD 4 ( every 16 vertices ).
+		 The patch size of the terrain must always be a size of 2^N+1,
+		 i.e. 8+1(9), 16+1(17), etc.
+		 The MaxLOD available is directly dependent on the patch size
+		 of the terrain. LOD 0 contains all of the indices to draw all
+		 the triangles at the max detail for a patch. As each LOD goes
+		 up by 1 the step taken, in generating indices increases by
+		 -2^LOD, so for LOD 1, the step taken is 2, for LOD 2, the step
+		 taken is 4, LOD 3 - 8, etc. The step can be no larger than
+		 the size of the patch, so having a LOD of 8, with a patch size
+		 of 17, is asking the algoritm to generate indices every 2^8 (
+		 256 ) vertices, which is not possible with a patch size of 17.
+		 The maximum LOD for a patch size of 17 is 2^4 ( 16 ). So,
+		 with a MaxLOD of 5, you'll have LOD 0 ( full detail ), LOD 1 (
+		 every 2 vertices ), LOD 2 ( every 4 vertices ), LOD 3 ( every
+		 8 vertices ) and LOD 4 ( every 16 vertices ).
 		 \param heightMapFileName: The name of the file on disk, to read vertex data from. This should
 		 be a gray scale bitmap.
 		 \param parent: Parent of the scene node. Can be 0 if no parent.
 		 \param id: Id of the node. This id can be used to identify the scene node.
 		 \param position: The absolute position of this node.
 		 \param rotation: The absolute rotation of this node. ( NOT YET IMPLEMENTED )
-		 \param scale: The scale factor for the terrain.  If you're using a heightmap of size 129x129 and would like
-		 your terrain to be 12900x12900 in game units, then use a scale factor of ( core::vector ( 100.0f, 100.0f, 100.0f ).
-		 If you use a Y scaling factor of 0.0f, then your terrain will be flat.
+		 \param scale: The scale factor for the terrain. If you're
+		 using a heightmap of size 129x129 and would like your terrain
+		 to be 12900x12900 in game units, then use a scale factor of (
+		 core::vector ( 100.0f, 100.0f, 100.0f ). If you use a Y
+		 scaling factor of 0.0f, then your terrain will be flat.
 		 \param vertexColor: The default color of all the vertices. If no texture is associated
 		 with the scene node, then all vertices will be this color. Defaults to white.
 		 \param maxLOD: The maximum LOD (level of detail) for the node. Only change if you
@@ -655,9 +751,11 @@ namespace scene
 		 know what you are doing, this might lead to strange behaviour.
 		 \param smoothFactor: The number of times the vertices are smoothed.
 		 \param addAlsoIfHeightmapEmpty: Add terrain node even with empty heightmap.
-		 \return Returns pointer to the created scene node. Can be null if the
-		 terrain could not be created, for example because the heightmap could not be loaded.
-		 The returned pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		 \return Pointer to the created scene node. Can be null
+		 if the terrain could not be created, for example because the
+		 heightmap could not be loaded. The returned pointer should
+		 not be dropped. See IReferenceCounted::drop() for more
+		 information. */
 		virtual ITerrainSceneNode* addTerrainSceneNode(
 				const c8* heightMapFileName,
 				ISceneNode* parent=0, s32 id=-1,
@@ -678,9 +776,11 @@ namespace scene
 		 \param id: Id of the node. This id can be used to identify the scene node.
 		 \param position: The absolute position of this node.
 		 \param rotation: The absolute rotation of this node. ( NOT YET IMPLEMENTED )
-		 \param scale: The scale factor for the terrain.  If you're using a heightmap of size 129x129 and would like
-		 your terrain to be 12900x12900 in game units, then use a scale factor of ( core::vector ( 100.0f, 100.0f, 100.0f ).
-		 If you use a Y scaling factor of 0.0f, then your terrain will be flat.
+		 \param scale: The scale factor for the terrain. If you're
+		 using a heightmap of size 129x129 and would like your terrain
+		 to be 12900x12900 in game units, then use a scale factor of (
+		 core::vector ( 100.0f, 100.0f, 100.0f ). If you use a Y
+		 scaling factor of 0.0f, then your terrain will be flat.
 		 \param vertexColor: The default color of all the vertices. If no texture is associated
 		 with the scene node, then all vertices will be this color. Defaults to white.
 		 \param maxLOD: The maximum LOD (level of detail) for the node. Only change if you
@@ -689,9 +789,11 @@ namespace scene
 		 know what you are doing, this might lead to strange behaviour.
 		 \param smoothFactor: The number of times the vertices are smoothed.
 		 \param addAlsoIfHeightmapEmpty: Add terrain node even with empty heightmap.
-		 \return Returns pointer to the created scene node. Can be null if the
-		 terrain could not be created, for example because the heightmap could not be loaded.
-		 The returned pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		 \return Pointer to the created scene node. Can be null
+		 if the terrain could not be created, for example because the
+		 heightmap could not be loaded. The returned pointer should
+		 not be dropped. See IReferenceCounted::drop() for more
+		 information. */
 		virtual ITerrainSceneNode* addTerrainSceneNode(
 			io::IReadFile* heightMapFile,
 			ISceneNode* parent=0, s32 id=-1,
@@ -704,7 +806,7 @@ namespace scene
 
 		//! Adds a quake3 scene node to the scene graph.
 		/** A Quake3 Scene renders multiple meshes for a specific HighLanguage Shader (Quake3 Style )
-		 \return Returns a pointer to the quake3 scene node if successful, otherwise NULL.
+		 \return Pointer to the quake3 scene node if successful, otherwise NULL.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* addQuake3SceneNode(IMeshBuffer* meshBuffer, const quake3::SShader * shader,
 												ISceneNode* parent=0, s32 id=-1
@@ -714,7 +816,7 @@ namespace scene
 		//! Adds an empty scene node to the scene graph.
 		/** Can be used for doing advanced transformations
 		 or structuring the scene graph.
-		 \return Returns pointer to the created scene node.
+		 \return Pointer to the created scene node.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* addEmptySceneNode(ISceneNode* parent=0, s32 id=-1) = 0;
 
@@ -723,23 +825,34 @@ namespace scene
 		 set/getRotation and set/getScale. Its just a simple scene node that takes a
 		 matrix as relative transformation, making it possible to insert any transformation
 		 anywhere into the scene graph.
-		 \return Returns pointer to the created scene node.
+		 \return Pointer to the created scene node.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual IDummyTransformationSceneNode* addDummyTransformationSceneNode(
 			ISceneNode* parent=0, s32 id=-1) = 0;
 
-		//! Adds a text scene node, which is able to display  2d text at a position in three dimensional space
+		//! Adds a text scene node, which is able to display 2d text at a position in three dimensional space
 		virtual ITextSceneNode* addTextSceneNode(gui::IGUIFont* font, const wchar_t* text,
 			video::SColor color=video::SColor(100,255,255,255),
-			ISceneNode* parent = 0,	const core::vector3df& position = core::vector3df(0,0,0),
+			ISceneNode* parent = 0, const core::vector3df& position = core::vector3df(0,0,0),
 			s32 id=-1) = 0;
 
-		//! Adds a text scene node, which uses billboards
-		virtual ITextSceneNode* addBillboardTextSceneNode( gui::IGUIFont* font, const wchar_t* text,
+		//! Adds a text scene node, which uses billboards. The node, and the text on it, will scale with distance.
+		/**
+		\param font The font to use on the billboard. Pass 0 to use the GUI environment's default font.
+		\param text The text to display on the billboard.
+		\param parent The billboard's parent. Pass 0 to use the root scene node.
+		\param size The billboard's width and height.
+		\param position The billboards position relative to its parent.
+		\param id: An id of the node. This id can be used to identify the node.
+		\param colorTop: The color of the vertices at the top of the billboard (default: white).
+		\param colorBottom: The color of the vertices at the bottom of the billboard (default: white).
+		\return Pointer to the billboard if successful, otherwise NULL.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		virtual IBillboardTextSceneNode* addBillboardTextSceneNode( gui::IGUIFont* font, const wchar_t* text,
 			ISceneNode* parent = 0,
 			const core::dimension2d<f32>& size = core::dimension2d<f32>(10.0f, 10.0f),
 			const core::vector3df& position = core::vector3df(0,0,0), s32 id=-1,
-			video::SColor shade_top = 0xFFFFFFFF, video::SColor shade_down = 0xFFFFFFFF) = 0;
+			video::SColor colorTop = 0xFFFFFFFF, video::SColor colorBottom = 0xFFFFFFFF) = 0;
 
 		//! Adds a Hill Plane mesh to the mesh pool.
 		/** The mesh is generated on the fly
@@ -764,13 +877,13 @@ namespace scene
 		 will be countHills.X * countHills.Y hills.
 		 \param textureRepeatCount: Defines how often the texture will be repeated in
 		 x and y direction.
-		\return Returns null if the creation failed. The reason could be that you
+		\return Null if the creation failed. The reason could be that you
 		 specified some invalid parameters or that a mesh with that name already
 		 exists. If successful, a pointer to the mesh is returned.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual IAnimatedMesh* addHillPlaneMesh(const c8* name,
 			const core::dimension2d<f32>& tileSize, const core::dimension2d<u32>& tileCount,
-			video::SMaterial* material = 0,	f32 hillHeight = 0.0f,
+			video::SMaterial* material = 0, f32 hillHeight = 0.0f,
 			const core::dimension2d<f32>& countHills = core::dimension2d<f32>(0.0f, 0.0f),
 			const core::dimension2d<f32>& textureRepeatCount = core::dimension2d<f32>(1.0f, 1.0f)) = 0;
 
@@ -791,9 +904,9 @@ namespace scene
 		 of triangles created depends on the size of this texture, so use a small
 		 heightmap to increase rendering speed.
 		 \param stretchSize: Parameter defining how big a is pixel on the heightmap.
-		 \param maxHeight: Defines how height a white pixel on the heighmap is.
+		 \param maxHeight: Defines how high a white pixel on the heighmap is.
 		 \param defaultVertexBlockSize: Defines the initial dimension between vertices.
-		 \return Returns null if the creation failed. The reason could be that you
+		 \return Null if the creation failed. The reason could be that you
 		 specified some invalid parameters, that a mesh with that name already
 		 exists, or that a texture could not be found. If successful, a pointer to the mesh is returned.
 		 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
@@ -804,6 +917,17 @@ namespace scene
 			const core::dimension2d<s32>& defaultVertexBlockSize = core::dimension2d<s32>(64,64)) = 0;
 
 		//! add a static arrow mesh to the meshpool
+		/** \param name Name of the mesh
+		\param vtxColor0 color of the cylinder
+		\param vtxColor1 color of the cone
+		\param tesselationCylinder Number of quads the cylinder side consists of
+		\param tesselationCone Number of triangles the cone's roof consits of
+		\param height Total height of the arrow
+		\param cylinderHeight Total height of the cylinder, should be lesser than total height
+		\param width0 Diameter of the cylinder
+		\param width1 Diameter of the cone's base, should be not smaller than the cylinder's diameter
+		\return Pointer to the arrow mesh if successful, otherwise 0.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual IAnimatedMesh* addArrowMesh(const c8* name,
 				video::SColor vtxColor0=0xFFFFFFFF,
 				video::SColor vtxColor1=0xFFFFFFFF,
@@ -812,67 +936,80 @@ namespace scene
 				f32 width0=0.05f, f32 width1=0.3f) = 0;
 
 		//! add a static sphere mesh to the meshpool
+		/** \param name Name of the mesh
+		\param radius Radius of the sphere
+		\param polyCountX Number of quads used for the horizontal tiling
+		\param polyCountY Number of quads used for the vertical tiling
+		\return Pointer to the sphere mesh if successful, otherwise 0.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual IAnimatedMesh* addSphereMesh(const c8* name,
 				f32 radius=5.f, u32 polyCountX = 16,
 				u32 polyCountY = 16) = 0;
 
-		//! Returns the root scene node.
+		//! Gets the root scene node.
 		/** This is the scene node which is parent
-		 of all scene nodes. The root scene node is a special scene node which
-		 only exists to manage all scene nodes. It will not be rendered and cannot
-		 be removed from the scene.
-		 \return Returns a pointer to the root scene node. */
+		of all scene nodes. The root scene node is a special scene node which
+		only exists to manage all scene nodes. It will not be rendered and cannot
+		be removed from the scene.
+		\return Pointer to the root scene node.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* getRootSceneNode() = 0;
 
-		//! Returns the first scene node with the specified id.
+		//! Get the first scene node with the specified id.
 		/** \param id: The id to search for
-		 \param start: Scene node to start from. All children of this scene
-		 node are searched. If null is specified, the root scene node is
-		 taken.
-		 \return Returns pointer to the first scene node with this id,
-		 and null if no scene node could be found. */
+		\param start: Scene node to start from. All children of this scene
+		node are searched. If null is specified, the root scene node is
+		taken.
+		\return Pointer to the first scene node with this id,
+		and null if no scene node could be found.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* getSceneNodeFromId(s32 id, ISceneNode* start=0) = 0;
 
-		//! Returns the first scene node with the specified name.
+		//! Get the first scene node with the specified name.
 		/** \param name: The name to search for
-		 \param start: Scene node to start from. All children of this scene
-		 node are searched. If null is specified, the root scene node is
-		 taken.
-		 \return Returns pointer to the first scene node with this id,
-		 and null if no scene node could be found. */
+		\param start: Scene node to start from. All children of this scene
+		node are searched. If null is specified, the root scene node is
+		taken.
+		\return Pointer to the first scene node with this id,
+		and null if no scene node could be found.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* getSceneNodeFromName(const c8* name, ISceneNode* start=0) = 0;
 
-		//! Returns the first scene node with the specified type.
+		//! Get the first scene node with the specified type.
 		/** \param type: The type to search for
-		 \param start: Scene node to start from. All children of this scene
-		 node are searched. If null is specified, the root scene node is
-		 taken.
-		 \return Returns pointer to the first scene node with this type,
-		 and null if no scene node could be found. */
+		\param start: Scene node to start from. All children of this scene
+		node are searched. If null is specified, the root scene node is
+		taken.
+		\return Pointer to the first scene node with this type,
+		and null if no scene node could be found.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* getSceneNodeFromType(scene::ESCENE_NODE_TYPE type, ISceneNode* start=0) = 0;
 
-		//! returns scene nodes by type.
-		/** \param type: Type of scene node to find.
+		//! Get scene nodes by type.
+		/** \param type: Type of scene node to find (ESNT_ANY will return all child nodes).
 		\param outNodes: array to be filled with results.
 		\param start: Scene node to start from. All children of this scene
 		node are searched. If null is specified, the root scene node is
 		taken. */
-		virtual void getSceneNodesFromType(ESCENE_NODE_TYPE type, core::array<scene::ISceneNode*>& outNodes, ISceneNode* start=0) = 0;
+		virtual void getSceneNodesFromType(ESCENE_NODE_TYPE type,
+				core::array<scene::ISceneNode*>& outNodes,
+				ISceneNode* start=0) = 0;
 
-		//! Returns the current active camera.
-		/** \return The active camera is returned. Note that this can be NULL, if there
-		 was no camera created yet. */
+		//! Get the current active camera.
+		/** \return The active camera is returned. Note that this can
+		be NULL, if there was no camera created yet.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ICameraSceneNode* getActiveCamera() = 0;
 
 		//! Sets the currently active camera.
 		/** The previous active camera will be deactivated.
-		 \param camera: The new camera which should be active. */
+		\param camera: The new camera which should be active. */
 		virtual void setActiveCamera(ICameraSceneNode* camera) = 0;
 
 		//! Sets the color of stencil buffers shadows drawn by the scene manager.
 		virtual void setShadowColor(video::SColor color = video::SColor(150,0,0,0)) = 0;
 
-		//! Returns the current color of shadows.
+		//! Get the current color of shadows.
 		virtual video::SColor getShadowColor() const = 0;
 
 		//! Registers a node for rendering it at a specific time.
@@ -880,9 +1017,9 @@ namespace scene
 		 ISceneNode::OnRegisterSceneNode() call.
 		 \param node: Node to register for drawing. Usually scene nodes would set 'this'
 		 as parameter here because they want to be drawn.
-		 \param pass: Specifies when the mode wants to be drawn in relation to the other nodes.
+		 \param pass: Specifies when the node wants to be drawn in relation to the other nodes.
 		 For example, if the node is a shadow, it usually wants to be drawn after all other nodes
-		 and will use ESNRP_SHADOW for this. See E_SCENE_NODE_RENDER_PASS for details.
+		 and will use ESNRP_SHADOW for this. See scene::E_SCENE_NODE_RENDER_PASS for details.
 		 \return scene will be rendered ( passed culling ) */
 		virtual u32 registerNodeForRendering(ISceneNode* node,
 			E_SCENE_NODE_RENDER_PASS pass = ESNRP_AUTOMATIC) = 0;
@@ -896,23 +1033,25 @@ namespace scene
 
 		//! Creates a rotation animator, which rotates the attached scene node around itself.
 		/** \param rotationPerSecond: Specifies the speed of the animation
-		 \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator()
+		 \return The animator. Attach it to a scene node with ISceneNode::addAnimator()
 		 and the animator will animate it.
 		 If you no longer need the animator, you should call ISceneNodeAnimator::drop().
 		 See IReferenceCounted::drop() for more information. */
 		virtual ISceneNodeAnimator* createRotationAnimator(const core::vector3df& rotationPerSecond) = 0;
 
-		//! Creates a fly circle animator, which lets the attached scene node fly  around a center.
+		//! Creates a fly circle animator, which lets the attached scene node fly around a center.
 		/** \param center: Center of the circle.
 		 \param radius: Radius of the circle.
-		 \param speed: Specifies the speed of the flight.
+		 \param speed: The orbital speed, in radians per millisecond.
 		 \param direction: Specifies the upvector used for alignment of the mesh.
-		 \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator()
+		 \return The animator. Attach it to a scene node with ISceneNode::addAnimator()
 		 and the animator will animate it.
 		 If you no longer need the animator, you should call ISceneNodeAnimator::drop().
 		 See IReferenceCounted::drop() for more information. */
-		virtual ISceneNodeAnimator* createFlyCircleAnimator(const core::vector3df& center,
-			f32 radius, f32 speed=0.001f, const core::vector3df& direction= core::vector3df ( 0.f, 1.f, 0.f ) ) = 0;
+		virtual ISceneNodeAnimator* createFlyCircleAnimator(
+				const core::vector3df& center=core::vector3df(0.f,0.f,0.f),
+				f32 radius=100.f, f32 speed=0.001f,
+				const core::vector3df& direction=core::vector3df(0.f, 1.f, 0.f)) = 0;
 
 		//! Creates a fly straight animator, which lets the attached scene node fly or move along a line between two points.
 		/** \param startPoint: Start point of the line.
@@ -921,20 +1060,20 @@ namespace scene
 		 move from the start point to the end point.
 		 \param loop: If set to false, the node stops when the end point is reached.
 		 If loop is true, the node begins again at the start.
-		 \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator()
+		 \return The animator. Attach it to a scene node with ISceneNode::addAnimator()
 		 and the animator will animate it.
 		 If you no longer need the animator, you should call ISceneNodeAnimator::drop().
 		 See IReferenceCounted::drop() for more information. */
 		virtual ISceneNodeAnimator* createFlyStraightAnimator(const core::vector3df& startPoint,
 			const core::vector3df& endPoint, u32 timeForWay, bool loop=false) = 0;
 
-		//! Creates a texture animator, which switches the textures of the target scene	 node based on a list of textures.
+		//! Creates a texture animator, which switches the textures of the target scene node based on a list of textures.
 		/** \param textures: List of textures to use.
 		 \param timePerFrame: Time in milliseconds, how long any texture in the list
 		 should be visible.
 		 \param loop: If set to to false, the last texture remains set, and the animation
 		 stops. If set to true, the animation restarts with the first texture.
-		 \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator()
+		 \return The animator. Attach it to a scene node with ISceneNode::addAnimator()
 		 and the animator will animate it.
 		 If you no longer need the animator, you should call ISceneNodeAnimator::drop().
 		 See IReferenceCounted::drop() for more information. */
@@ -943,7 +1082,7 @@ namespace scene
 
 		//! Creates a scene node animator, which deletes the scene node after some time automatically.
 		/** \param timeMs: Time in milliseconds, after when the node will be deleted.
-		 \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator()
+		 \return The animator. Attach it to a scene node with ISceneNode::addAnimator()
 		 and the animator will animate it.
 		 If you no longer need the animator, you should call ISceneNodeAnimator::drop().
 		 See IReferenceCounted::drop() for more information. */
@@ -958,41 +1097,42 @@ namespace scene
 		 to the scene node, the scene node will not be able to move through walls and is
 		 affected by gravity.
 		 \param ellipsoidRadius: Radius of the ellipsoid with which collision detection and
-		 response is done.  If you have got a scene node, and you are unsure about
+		 response is done. If you have got a scene node, and you are unsure about
 		 how big the radius should be, you could use the following code to determine
 		 it:
 		 \code
-		 const core::aabbox<f32>& box = yourSceneNode->getBoundingBox();
+		 const core::aabbox3d<f32>& box = yourSceneNode->getBoundingBox();
 		 core::vector3df radius = box.MaxEdge - box.getCenter();
 		 \endcode
-		 \param gravityPerSecond: Sets the gravity of the environment. A good example value would be
-		 core::vector3df(0,-100.0f,0) for letting gravity affect all object to
-		 fall down. For bigger gravity, make increase the length of the vector.
+		 \param gravityPerSecond: Sets the gravity of the environment, as an acceleration in 
+		 units per second per second. If your units are equivalent to metres, then 
+		 core::vector3df(0,-10.0f,0) would give an approximately realistic gravity.
 		 You can disable gravity by setting it to core::vector3df(0,0,0).
 		 \param ellipsoidTranslation: By default, the ellipsoid for collision detection is created around
 		 the center of the scene node, which means that the ellipsoid surrounds
 		 it completely. If this is not what you want, you may specify a translation
 		 for the ellipsoid.
 		 \param slidingValue: DOCUMENTATION NEEDED.
-		 \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator()
+		 \return The animator. Attach it to a scene node with ISceneNode::addAnimator()
 		 and the animator will cause it to do collision detection and response.
 		 If you no longer need the animator, you should call ISceneNodeAnimator::drop().
 		 See IReferenceCounted::drop() for more information. */
 		virtual ISceneNodeAnimatorCollisionResponse* createCollisionResponseAnimator(
 			ITriangleSelector* world, ISceneNode* sceneNode,
 			const core::vector3df& ellipsoidRadius = core::vector3df(30,60,30),
-			const core::vector3df& gravityPerSecond = core::vector3df(0,-100.0f,0),
+			const core::vector3df& gravityPerSecond = core::vector3df(0,-10.0f,0),
 			const core::vector3df& ellipsoidTranslation = core::vector3df(0,0,0),
 			f32 slidingValue = 0.0005f) = 0;
 
 		//! Creates a follow spline animator.
 		/** The animator modifies the position of
-		 the attached scene node to make it follow a hermite spline.
-		 The code of the is based on a scene node
-		 Matthias Gall sent in. Thanks! I adapted the code just a little bit. Matthias
-		 wrote:
-		 Uses a subset of hermite splines: either cardinal splines (tightness != 0.5) or catmull-rom-splines (tightness == 0.5)
-		 but this is just my understanding of this stuff, I'm not a mathematician, so this might be wrong ;) */
+		the attached scene node to make it follow a hermite spline.
+		It uses a subset of hermite splines: either cardinal splines
+		(tightness != 0.5) or catmull-rom-splines (tightness == 0.5).
+		The animator moves from one control point to the next in
+		1/speed seconds. This code was sent in by Matthias Gall.
+		If you no longer need the animator, you should call ISceneNodeAnimator::drop().
+		See IReferenceCounted::drop() for more information. */
 		virtual ISceneNodeAnimator* createFollowSplineAnimator(s32 startTime,
 			const core::array< core::vector3df >& points,
 			f32 speed = 1.0f, f32 tightness = 0.5f) = 0;
@@ -1013,7 +1153,7 @@ namespace scene
 		 \endcode
 		 \param mesh: Mesh of which the triangles are taken.
 		 \param node: Scene node of which visibility and transformation is used.
-		 \return Returns the selector, or null if not successful.
+		 \return The selector, or null if not successful.
 		 If you no longer need the selector, you should call ITriangleSelector::drop().
 		 See IReferenceCounted::drop() for more information. */
 		virtual ITriangleSelector* createTriangleSelector(IMesh* mesh, ISceneNode* node) = 0;
@@ -1024,7 +1164,7 @@ namespace scene
 		 queried, the triangle selector gets the bounding box of the scene node,
 		 an creates new triangles. In this way, it works good with animated scene nodes.
 		 \param node: Scene node of which the bounding box, visibility and transformation is used.
-		 \return Returns the selector, or null if not successful.
+		 \return The selector, or null if not successful.
 		 If you no longer need the selector, you should call ITriangleSelector::drop().
 		 See IReferenceCounted::drop() for more information. */
 		virtual ITriangleSelector* createTriangleSelectorFromBoundingBox(ISceneNode* node) = 0;
@@ -1049,7 +1189,7 @@ namespace scene
 		 \param minimalPolysPerNode: Specifies the minimal polygons contained a octree node.
 		 If a node gets less polys the this value, it will not be splitted into
 		 smaller nodes.
-		 \return Returns the selector, or null if not successful.
+		 \return The selector, or null if not successful.
 		 If you no longer need the selector, you should call ITriangleSelector::drop().
 		 See IReferenceCounted::drop() for more information. */
 		virtual ITriangleSelector* createOctTreeTriangleSelector(IMesh* mesh,
@@ -1060,30 +1200,37 @@ namespace scene
 		 collection of one or more triangle selectors providing together
 		 the interface of one triangle selector. In this way,
 		 collision tests can be done with different triangle soups in one pass.
-		 \return Returns the selector, or null if not successful.
+		 \return The selector, or null if not successful.
 		 If you no longer need the selector, you should call ITriangleSelector::drop().
 		 See IReferenceCounted::drop() for more information. */
 		virtual IMetaTriangleSelector* createMetaTriangleSelector() = 0;
 
 		//! Creates a triangle selector which can select triangles from a terrain scene node.
 		/** \param node: Pointer to the created terrain scene node
-		 \param LOD: Level of detail, 0 for highest detail. */
+		\param LOD: Level of detail, 0 for highest detail.
+		\return The selector, or null if not successful.
+		If you no longer need the selector, you should call ITriangleSelector::drop().
+		See IReferenceCounted::drop() for more information. */
 		virtual ITriangleSelector* createTerrainTriangleSelector(
 			ITerrainSceneNode* node, s32 LOD=0) = 0;
 
 		//! Adds an external mesh loader for extending the engine with new file formats.
 		/** If you want the engine to be extended with
-		 file formats it currently is not able to load (e.g. .cob), just implement
-		 the IMeshLoader interface in your loading class and add it with this method.
-		 Using this method it is also possible to override built-in mesh loaders with
-		 newer or updated versions without the need of recompiling the engine.
-		 \param externalLoader: Implementation of a new mesh loader. */
+		file formats it currently is not able to load (e.g. .cob), just implement
+		the IMeshLoader interface in your loading class and add it with this method.
+		Using this method it is also possible to override built-in mesh loaders with
+		newer or updated versions without the need of recompiling the engine.
+		\param externalLoader: Implementation of a new mesh loader. */
 		virtual void addExternalMeshLoader(IMeshLoader* externalLoader) = 0;
 
-		//! Returns a pointer to the scene collision manager.
+		//! Get pointer to the scene collision manager.
+		/** \return Pointer to the collision manager
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneCollisionManager* getSceneCollisionManager() = 0;
 
-		//! Returns a pointer to the mesh manipulator.
+		//! Get pointer to the mesh manipulator.
+		/** \return Pointer to the mesh manipulator
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual IMeshManipulator* getMeshManipulator() = 0;
 
 		//! Adds a scene node to the deletion queue.
@@ -1106,7 +1253,7 @@ namespace scene
 		/** All scene nodes are removed. */
 		virtual void clear() = 0;
 
-		//! Returns interface to the parameters set in this scene.
+		//! Get interface to the parameters set in this scene.
 		/** String parameters can be used by plugins and mesh loaders.
 		 For example the CMS and LMTS loader want a parameter named 'CSM_TexturePath'
 		 and 'LMTS_TexturePath' set to the path were attached textures can be found. See
@@ -1114,7 +1261,7 @@ namespace scene
 		 COLLADA_CREATE_SCENE_INSTANCES, DMF_TEXTURE_PATH and DMF_USE_MATERIALS_DIRS*/
 		virtual io::IAttributes* getParameters() = 0;
 
-		//! Returns current render pass.
+		//! Get current render pass.
 		/** All scene nodes are being rendered in a specific order.
 		 First lights, cameras, sky boxes, solid geometry, and then transparent
 		 stuff. During the rendering process, scene nodes may want to know what the scene
@@ -1123,7 +1270,9 @@ namespace scene
 		 pass currently is active they can render the correct part of their geometry. */
 		virtual E_SCENE_NODE_RENDER_PASS getSceneNodeRenderPass() const = 0;
 
-		//! Returns the default scene node factory which can create all built in scene nodes
+		//! Get the default scene node factory which can create all built in scene nodes
+		/** \return Pointer to the default scene node factory
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNodeFactory* getDefaultSceneNodeFactory() = 0;
 
 		//! Adds a scene node factory to the scene manager.
@@ -1131,13 +1280,17 @@ namespace scene
 		able to create automaticly, for example when loading data from xml files. */
 		virtual void registerSceneNodeFactory(ISceneNodeFactory* factoryToAdd) = 0;
 
-		//! Returns amount of registered scene node factories.
+		//! Get amount of registered scene node factories.
 		virtual u32 getRegisteredSceneNodeFactoryCount() const = 0;
 
-		//! Returns a scene node factory by index
+		//! Get a scene node factory by index
+		/** \return Pointer to the requested scene node factory, or 0 if it does not exist.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNodeFactory* getSceneNodeFactory(u32 index) = 0;
 
-		//! Returns the default scene node animator factory which can create all built-in scene node animators
+		//! Get the default scene node animator factory which can create all built-in scene node animators
+		/** \return Pointer to the default scene node animator factory
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNodeAnimatorFactory* getDefaultSceneNodeAnimatorFactory() = 0;
 
 		//! Adds a scene node animator factory to the scene manager.
@@ -1145,29 +1298,40 @@ namespace scene
 		able to create automaticly, for example when loading data from xml files. */
 		virtual void registerSceneNodeAnimatorFactory(ISceneNodeAnimatorFactory* factoryToAdd) = 0;
 
-		//! Returns amount of registered scene node animator factories.
+		//! Get amount of registered scene node animator factories.
 		virtual u32 getRegisteredSceneNodeAnimatorFactoryCount() const = 0;
 
-		//! Returns a scene node animator factory by index
+		//! Get scene node animator factory by index
+		/** \return Pointer to the requested scene node animator factory, or 0 if it does not exist.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNodeAnimatorFactory* getSceneNodeAnimatorFactory(u32 index) = 0;
 
-		//! Returns a typename from a scene node type or null if not found
+		//! Get typename from a scene node type or null if not found
 		virtual const c8* getSceneNodeTypeName(ESCENE_NODE_TYPE type) = 0;
 
 		//! Adds a scene node to the scene by name
-		virtual ISceneNode* addSceneNode(const char* sceneNodeTypeName, ISceneNode* parent) = 0;
+		/** \return Pointer to the scene node added by a factory
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		virtual ISceneNode* addSceneNode(const char* sceneNodeTypeName, ISceneNode* parent=0) = 0;
 
 		//! Creates a new scene manager.
-		/** This can be used to easily draw and/or store two independent scenes at the same time.
-		The mesh cache will be shared between all existing scene managers, which means if you load
-		a mesh in the original scene manager using for example getMesh(), the mesh will be available
-		in all other scene managers too, without loading.
-		The original/main scene manager will still be there and accessible via IrrlichtDevice::getSceneManager().
-		If you need input event in this new scene manager, for example for FPS cameras, you'll need
-		to forward input to this manually: Just implement an IEventReceiver and call
-		yourNewSceneManager->postEventFromUser(), and return true so that the original scene manager
-		doesn't get the event. Otherwise, all input will go automaticly to the main scene manager.
-		If you no longer need the new scene manager, you should call ISceneManager::drop().
+		/** This can be used to easily draw and/or store two
+		independent scenes at the same time. The mesh cache will be
+		shared between all existing scene managers, which means if you
+		load a mesh in the original scene manager using for example
+		getMesh(), the mesh will be available in all other scene
+		managers too, without loading.
+		The original/main scene manager will still be there and
+		accessible via IrrlichtDevice::getSceneManager(). If you need
+		input event in this new scene manager, for example for FPS
+		cameras, you'll need to forward input to this manually: Just
+		implement an IEventReceiver and call
+		yourNewSceneManager->postEventFromUser(), and return true so
+		that the original scene manager doesn't get the event.
+		Otherwise, all input will go to the main scene manager
+		automatically.
+		If you no longer need the new scene manager, you should call
+		ISceneManager::drop().
 		See IReferenceCounted::drop() for more information. */
 		virtual ISceneManager* createNewSceneManager(bool cloneContent=false) = 0;
 
@@ -1180,7 +1344,7 @@ namespace scene
 		\param userDataSerializer: If you want to save some user data for every scene node into the
 		file, implement the ISceneUserDataSerializer interface and provide it as parameter here.
 		Otherwise, simply specify 0 as this parameter.
-		\return Returns true if successful. */
+		\return True if successful. */
 		virtual bool saveScene(const c8* filename, ISceneUserDataSerializer* userDataSerializer=0) = 0;
 
 		//! Saves the current scene into a file.
@@ -1192,32 +1356,36 @@ namespace scene
 		\param userDataSerializer: If you want to save some user data for every scene node into the
 		file, implement the ISceneUserDataSerializer interface and provide it as parameter here.
 		Otherwise, simply specify 0 as this parameter.
-		\return Returns true if successful. */
+		\return True if successful. */
 		virtual bool saveScene(io::IWriteFile* file, ISceneUserDataSerializer* userDataSerializer=0) = 0;
 
 		//! Loads a scene. Note that the current scene is not cleared before.
 		/** The scene is usually load from an .irr file, an xml based format. .irr files can
 		Be edited with the Irrlicht Engine Editor, irrEdit (http://irredit.irrlicht3d.org) or
-		saved directly by the engine using ISceneManager::saveScene().		
+		saved directly by the engine using ISceneManager::saveScene().
 		\param filename: Name of the file.
-		\param userDataSerializer: If you want to load user data possibily saved in that file for
-		some scene nodes in the file, implement the ISceneUserDataSerializer interface and provide it as parameter here.
-		Otherwise, simply specify 0 as this parameter.
-		\return Returns true if successful. */
+		\param userDataSerializer: If you want to load user data
+		possibily saved in that file for some scene nodes in the file,
+		implement the ISceneUserDataSerializer interface and provide it
+		as parameter here. Otherwise, simply specify 0 as this
+		parameter.
+		\return True if successful. */
 		virtual bool loadScene(const c8* filename, ISceneUserDataSerializer* userDataSerializer=0) = 0;
 
 		//! Loads a scene. Note that the current scene is not cleared before.
 		/** The scene is usually load from an .irr file, an xml based format. .irr files can
 		Be edited with the Irrlicht Engine Editor, irrEdit (http://irredit.irrlicht3d.org) or
-		saved directly by the engine using ISceneManager::saveScene().		
+		saved directly by the engine using ISceneManager::saveScene().
 		\param file: File where the scene is going to be saved into.
-		\param userDataSerializer: If you want to load user data possibily saved in that file for
-		some scene nodes in the file, implement the ISceneUserDataSerializer interface and provide it as parameter here.
-		Otherwise, simply specify 0 as this parameter.
-		\return Returns true if successful.	*/
-		virtual bool loadScene(io::IReadFile* file, ISceneUserDataSerializer* userDataSerializer=0) = 0;	
+		\param userDataSerializer: If you want to load user data
+		possibily saved in that file for some scene nodes in the file,
+		implement the ISceneUserDataSerializer interface and provide it
+		as parameter here. Otherwise, simply specify 0 as this
+		parameter.
+		\return True if successful. */
+		virtual bool loadScene(io::IReadFile* file, ISceneUserDataSerializer* userDataSerializer=0) = 0;
 
-		//! Returns a mesh writer implementation if available
+		//! Get a mesh writer implementation if available
 		/** Note: You need to drop() the pointer after use again, see IReferenceCounted::drop()
 		for details. */
 		virtual IMeshWriter* createMeshWriter(EMESH_WRITER_TYPE type) = 0;
@@ -1225,9 +1393,8 @@ namespace scene
 		//! Sets ambient color of the scene
 		virtual void setAmbientLight(const video::SColorf &ambientColor) = 0;
 
-		//! Returns ambient color of the scene
+		//! Get ambient color of the scene
 		virtual const video::SColorf& getAmbientLight() const = 0;
-
 	};
 
 
diff --git a/src/dep/include/irrlicht/ISceneNode.h b/src/dep/include/irrlicht/ISceneNode.h
index 6eca6a8..d65a5c9 100644
--- a/src/dep/include/irrlicht/ISceneNode.h
+++ b/src/dep/include/irrlicht/ISceneNode.h
@@ -1,15 +1,14 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __I_SCENE_NODE_H_INCLUDED__
 #define __I_SCENE_NODE_H_INCLUDED__
 
-#include "IReferenceCounted.h"
+#include "IAttributeExchangingObject.h"
 #include "ESceneNodeTypes.h"
 #include "ECullingTypes.h"
 #include "EDebugSceneTypes.h"
-#include "ISceneManager.h"
 #include "ISceneNodeAnimator.h"
 #include "ITriangleSelector.h"
 #include "SMaterial.h"
@@ -18,19 +17,22 @@
 #include "matrix4.h"
 #include "irrList.h"
 #include "IAttributes.h"
-#include "IAttributeExchangingObject.h"
 
 namespace irr
 {
 namespace scene
 {
+	class ISceneManager;
+
 	//! Scene node interface.
-	/** A scene node is a node in the hirachical scene graph. Every scene node may have children,
-	which are other scene nodes. Children move relative the their parents position. If the parent of a node is not
-	visible, its children won't be visible too. In this way, it is for example easily possible
-	to attach a light to a moving car, or to place a walking character on a moving platform
-	on a moving ship. */
-	class ISceneNode : public io::IAttributeExchangingObject
+	/** A scene node is a node in the hierarchical scene graph. Every scene
+	node may have children, which are also scene nodes. Children move
+	relative to their parent's position. If the parent of a node is not
+	visible, its children won't be visible either. In this way, it is for
+	example easily possible to attach a light to a moving car, or to place
+	a walking character on a moving platform on a moving ship.
+	*/
+	class ISceneNode : virtual public io::IAttributeExchangingObject
 	{
 	public:
 
@@ -40,12 +42,12 @@ namespace scene
 				const core::vector3df& rotation = core::vector3df(0,0,0),
 				const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f))
 			: RelativeTranslation(position), RelativeRotation(rotation), RelativeScale(scale),
-				Parent(parent), ID(id), SceneManager(mgr), TriangleSelector(0),
+				Parent(0), ID(id), SceneManager(mgr), TriangleSelector(0),
 				AutomaticCullingState(EAC_BOX), IsVisible(true),
 				DebugDataVisible(EDS_OFF), IsDebugObject(false)
 		{
-			if (Parent)
-				Parent->addChild(this);
+			if (parent)
+				parent->addChild(this);
 
 			updateAbsolutePosition();
 		}
@@ -69,18 +71,18 @@ namespace scene
 
 		//! This method is called just before the rendering process of the whole scene.
 		/** Nodes may register themselves in the render pipeline during this call,
-		 precalculate the geometry which should be renderered, and prevent their
-		 children from being able to register them selfes if they are clipped by simply
-		 not calling their OnRegisterSceneNode-Method. 
-		 If you are implementing your own scene node, you should overwrite this method
-		 with an implementtion code looking like this:
-		 \code
-		 if (IsVisible)
+		precalculate the geometry which should be renderered, and prevent their
+		children from being able to register themselves if they are clipped by simply
+		not calling their OnRegisterSceneNode method.
+		If you are implementing your own scene node, you should overwrite this method
+		with an implementation code looking like this:
+		\code
+		if (IsVisible)
 			SceneManager->registerNodeForRendering(this);
 
-		 ISceneNode::OnRegisterSceneNode();
-		 \endcode
-	    */
+		ISceneNode::OnRegisterSceneNode();
+		\endcode
+		*/
 		virtual void OnRegisterSceneNode()
 		{
 			if (IsVisible)
@@ -93,11 +95,11 @@ namespace scene
 
 
 		//! OnAnimate() is called just before rendering the whole scene.
-		//! Nodes may calculate or store animations here, and may do other useful things,
-		//! dependent on what they are. Also, OnAnimate() should be called for all
-		//! child scene nodes here. This method will called once per frame, independent
-		//! of if the scene node is visible or not.
-		//! \param timeMs: Current time in milli seconds.
+		/** Nodes may calculate or store animations here, and may do other useful things,
+		depending on what they are. Also, OnAnimate() should be called for all
+		child scene nodes here. This method will be called once per frame, independent
+		of whether the scene node is visible or not.
+		\param timeMs Current time in milliseconds. */
 		virtual void OnAnimate(u32 timeMs)
 		{
 			if (IsVisible)
@@ -105,8 +107,15 @@ namespace scene
 				// animate this node with all animators
 
 				core::list<ISceneNodeAnimator*>::Iterator ait = Animators.begin();
-				for (; ait != Animators.end(); ++ait)
-					(*ait)->animateNode(this, timeMs);
+				while (ait != Animators.end())
+					{
+					// continue to the next node before calling animateNode()
+					// so that the animator may remove itself from the scene
+					// node without the iterator becoming invalid
+					ISceneNodeAnimator* anim = *ait;
+					++ait;
+					anim->animateNode(this, timeMs);
+				} 
 
 				// update absolute position
 				updateAbsolutePosition();
@@ -125,7 +134,7 @@ namespace scene
 
 
 		//! Returns the name of the node.
-		//! \return Returns name as wide character string.
+		/** \return Name as character string. */
 		virtual const c8* getName() const
 		{
 			return Name.c_str();
@@ -133,51 +142,62 @@ namespace scene
 
 
 		//! Sets the name of the node.
-		//! \param name: New name of the scene node.
+		/** \param name New name of the scene node. */
 		virtual void setName(const c8* name)
 		{
 			Name = name;
 		}
 
 
-		//! Returns the axis aligned, not transformed bounding box of this node.
-		//! This means that if this node is a animated 3d character, moving in a room,
-		//! the bounding box will always be around the origin. To get the box in
-		//! real world coordinates, just transform it with the matrix you receive with
-		//! getAbsoluteTransformation() or simply use getTransformedBoundingBox(),
-		//! which does the same.
+		//! Sets the name of the node.
+		/** \param name New name of the scene node. */
+		virtual void setName(const core::stringc& name)
+		{
+			Name = name;
+		}
+
+
+		//! Get the axis aligned, not transformed bounding box of this node.
+		/** This means that if this node is an animated 3d character,
+		moving in a room, the bounding box will always be around the
+		origin. To get the box in real world coordinates, just
+		transform it with the matrix you receive with
+		getAbsoluteTransformation() or simply use
+		getTransformedBoundingBox(), which does the same.
+		\return The non-transformed bounding box. */
 		virtual const core::aabbox3d<f32>& getBoundingBox() const = 0;
 
 
-		//! Returns the axis aligned, transformed and animated absolute bounding box
-		//! of this node.
+		//! Get the axis aligned, transformed and animated absolute bounding box of this node.
+		/** \return The transformed bounding box. */
 		virtual const core::aabbox3d<f32> getTransformedBoundingBox() const
 		{
 			core::aabbox3d<f32> box = getBoundingBox();
-			AbsoluteTransformation.transformBox(box);
+			AbsoluteTransformation.transformBoxEx(box);
 			return box;
 		}
 
 
-		//! returns the absolute transformation of the node. Is recalculated every OnAnimate()-call.
-		const core::matrix4& getAbsoluteTransformation() const
+		//! Get the absolute transformation of the node. Is recalculated every OnAnimate()-call.
+		//! \return The absolute transformation matrix.
+		virtual const core::matrix4& getAbsoluteTransformation() const
 		{
 			return AbsoluteTransformation;
 		}
 
 
 		//! Returns the relative transformation of the scene node.
-		//! The relative transformation is stored internally as 3 vectors:
-		//! translation, rotation and scale. To get the relative transformation
-		//! matrix, it is calculated from these values.
-		//! \return Returns the relative transformation matrix.
+		/** The relative transformation is stored internally as 3
+		vectors: translation, rotation and scale. To get the relative
+		transformation matrix, it is calculated from these values.
+		\return The relative transformation matrix. */
 		virtual core::matrix4 getRelativeTransformation() const
 		{
 			core::matrix4 mat;
 			mat.setRotationDegrees(RelativeRotation);
 			mat.setTranslation(RelativeTranslation);
 
-			if (RelativeScale != core::vector3df(1,1,1))
+			if (RelativeScale != core::vector3df(1.f,1.f,1.f))
 			{
 				core::matrix4 smat;
 				smat.setScale(RelativeScale);
@@ -188,42 +208,57 @@ namespace scene
 		}
 
 
-		//! Returns true if the node is visible. This is only an option, set by the user and has
-		//! nothing to do with geometry culling
+		//! Returns whether the node should be visible (if all of its parents are visible).
+		/** This is only an option set by the user, but has nothing to
+		do with geometry culling
+		\return The requested visibility of the node, true means visible (if all parents are also visible). */
 		virtual bool isVisible() const
 		{
 			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 			return IsVisible;
 		}
 
-
-		//! Sets if the node should be visible or not. All children of this node won't be visible too.
+		//! Sets if the node should be visible or not.
+		/** All children of this node won't be visible either, when set
+		to false.  Invisible nodes are not valid candidates for selection by
+		collision manager bounding box methods.
+		\param isVisible If the node shall be visible. */
 		virtual void setVisible(bool isVisible)
 		{
 			IsVisible = isVisible;
 		}
 
 
-		//! Returns the id of the scene node. This id can be used to identify the node.
+		//! Get the id of the scene node.
+		/** This id can be used to identify the node.
+		\return The id. */
 		virtual s32 getID() const
 		{
 			return ID;
 		}
 
 
-		//! sets the id of the scene node. This id can be used to identify the node.
+		//! Sets the id of the scene node.
+		/** This id can be used to identify the node.
+		\param id The new id. */
 		virtual void setID(s32 id)
 		{
 			ID = id;
 		}
 
 
-		//! Adds a child to this scene node. If the scene node already
-		//! has got a parent, it is removed from there as child.
+		//! Adds a child to this scene node.
+		/** If the scene node already has a parent it is first removed
+		from the other parent.
+		\param child A pointer to the new child. */
 		virtual void addChild(ISceneNode* child)
 		{
-			if (child)
+			if (child && (child != this))
 			{
+				// Change scene manager?
+				if (SceneManager != child->SceneManager)
+					child->setSceneManager(SceneManager);
+
 				child->grab();
 				child->remove(); // remove from old parent
 				Children.push_back(child);
@@ -233,7 +268,9 @@ namespace scene
 
 
 		//! Removes a child from this scene node.
-		//! \return Returns true if the child could be removed, and false if not.
+		/** \param child A pointer to the new child.
+		\return True if the child was removed, and false if not,
+		e.g. because it couldn't be found in the children list. */
 		virtual bool removeChild(ISceneNode* child)
 		{
 			core::list<ISceneNode*>::Iterator it = Children.begin();
@@ -274,6 +311,7 @@ namespace scene
 
 
 		//! Adds an animator which should animate this node.
+		/** \param animator A pointer to the new animator. */
 		virtual void addAnimator(ISceneNodeAnimator* animator)
 		{
 			if (animator)
@@ -284,7 +322,8 @@ namespace scene
 		}
 
 
-		//! Returns a const reference to the list of all scene node animators.
+		//! Get a list of all scene node animators.
+		/** \return The list of animators attached to this node. */
 		const core::list<ISceneNodeAnimator*>& getAnimators() const
 		{
 			return Animators;
@@ -292,6 +331,7 @@ namespace scene
 
 
 		//! Removes an animator from this scene node.
+		/** \param animator A pointer to the animator to be deleted. */
 		virtual void removeAnimator(ISceneNodeAnimator* animator)
 		{
 			core::list<ISceneNodeAnimator*>::Iterator it = Animators.begin();
@@ -316,31 +356,33 @@ namespace scene
 		}
 
 
-		//! Returns the material based on the zero based index i. To get the amount
-		//! of materials used by this scene node, use getMaterialCount().
-		//! This function is needed for inserting the node into the scene hirachy on a
-		//! optimal position for minimizing renderstate changes, but can also be used
-		//! to directly modify the material of a scene node.
-		//! \param num: Zero based index. The maximal value is getMaterialCount() - 1.
-		//! \return Returns the material of that index.
+		//! Returns the material based on the zero based index i.
+		/** To get the amount of materials used by this scene node, use
+		getMaterialCount(). This function is needed for inserting the
+		node into the scene hierarchy at an optimal position for
+		minimizing renderstate changes, but can also be used to
+		directly modify the material of a scene node.
+		\param num Zero based index. The maximal value is getMaterialCount() - 1.
+		\return The material at that index. */
 		virtual video::SMaterial& getMaterial(u32 num)
 		{
 			return *((video::SMaterial*)0);
 		}
 
 
-		//! Returns amount of materials used by this scene node.
-		//! \return Returns current count of materials used by this scene node.
+		//! Get amount of materials used by this scene node.
+		/** \return Current amount of materials of this scene node. */
 		virtual u32 getMaterialCount() const
 		{
 			return 0;
 		}
 
 
-		//! Sets all material flags at once to a new value. Helpful for
-		//! example, if you want to be the the whole mesh to be lighted by
-		//! \param flag: Which flag of all materials to be set.
-		//! \param newvalue: New value of the flag.
+		//! Sets all material flags at once to a new value.
+		/** Useful, for example, if you want the whole mesh to be
+		affected by light.
+		\param flag Which flag of all materials to be set.
+		\param newvalue New value of that flag. */
 		void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue)
 		{
 			for (u32 i=0; i<getMaterialCount(); ++i)
@@ -348,11 +390,10 @@ namespace scene
 		}
 
 
-		//! Sets the texture of the specified layer in all materials of this
-		//! scene node to the new texture.
-		//! \param textureLayer: Layer of texture to be set. Must be a value greater or
-		//! equal than 0 and smaller than MATERIAL_MAX_TEXTURES.
-		//! \param texture: Texture to be used.
+		//! Sets the texture of the specified layer in all materials of this scene node to the new texture.
+		/** \param textureLayer Layer of texture to be set. Must be a
+		value smaller than MATERIAL_MAX_TEXTURES.
+		\param texture New texture to be used. */
 		void setMaterialTexture(u32 textureLayer, video::ITexture* texture)
 		{
 			if (textureLayer >= video::MATERIAL_MAX_TEXTURES)
@@ -363,9 +404,8 @@ namespace scene
 		}
 
 
-		//! Sets the material type of all materials s32 this scene node
-		//! to a new material type.
-		//! \param newType: New type of material to be set.
+		//! Sets the material type of all materials in this scene node to a new material type.
+		/** \param newType New type of material to be set. */
 		void setMaterialType(video::E_MATERIAL_TYPE newType)
 		{
 			for (u32 i=0; i<getMaterialCount(); ++i)
@@ -373,24 +413,29 @@ namespace scene
 		}
 
 
-		//! Gets the scale of the scene node.
-		/** \return Returns the scale of the scene node. */
-		virtual core::vector3df getScale() const
+		//! Gets the scale of the scene node relative to its parent.
+		/** This is the scale of this node relative to its parent. 
+        If you want the absolute scale, use 
+        getAbsoluteTransformation().getScale()
+        \return The scale of the scene node. */
+		virtual const core::vector3df& getScale() const
 		{
 			return RelativeScale;
 		}
 
 
-		//! Sets the scale of the scene node.
-		/** \param scale: New scale of the node */
+		//! Sets the relative scale of the scene node.
+		/** \param scale New scale of the node, relative to its parent. */
 		virtual void setScale(const core::vector3df& scale)
 		{
 			RelativeScale = scale;
 		}
 
 
-		//! Gets the rotation of the node.
+		//! Gets the rotation of the node relative to its parent.
 		/** Note that this is the relative rotation of the node.
+        If you want the absolute rotation, use
+        getAbsoluteTransformation().getRotation()
 		\return Current relative rotation of the scene node. */
 		virtual const core::vector3df& getRotation() const
 		{
@@ -398,36 +443,38 @@ namespace scene
 		}
 
 
-		//! Sets the rotation of the node.
+		//! Sets the rotation of the node relative to its parent.
 		/** This only modifies the relative rotation of the node.
-		\param rotation: New rotation of the node in degrees. */
+		\param rotation New rotation of the node in degrees. */
 		virtual void setRotation(const core::vector3df& rotation)
 		{
 			RelativeRotation = rotation;
 		}
 
 
-		//! Gets the position of the node.
-		/** Note that the position is relative to the parent.
-		\return Returns the current position of the node relative to the parent. */
-		virtual const core::vector3df getPosition() const
+		//! Gets the position of the node relative to its parent.
+		/** Note that the position is relative to the parent. If you want
+        the position in world coordinates, use getAbsolutePosition() instead.
+		\return The current position of the node relative to the parent. */
+		virtual const core::vector3df& getPosition() const
 		{
 			return RelativeTranslation;
 		}
 
 
-		//! Sets the position of the node.
+		//! Sets the position of the node relative to its parent.
 		/** Note that the position is relative to the parent.
-		\param newpos: New relative postition of the scene node. */
+		\param newpos New relative position of the scene node. */
 		virtual void setPosition(const core::vector3df& newpos)
 		{
 			RelativeTranslation = newpos;
 		}
 
 
-		//! Gets the abolute position of the node.
-		/** The position is absolute.
-		\return Returns the current absolute position of the scene node. */
+		//! Gets the absolute position of the node in world coordinates.
+		/** If you want the position of the node relative to its parent,
+        use getPosition() instead.
+        \return The current absolute position of the scene node. */
 		virtual core::vector3df getAbsolutePosition() const
 		{
 			return AbsoluteTransformation.getTranslation();
@@ -436,10 +483,10 @@ namespace scene
 
 		//! Enables or disables automatic culling based on the bounding box.
 		/** Automatic culling is enabled by default. Note that not
-		all SceneNodes support culling (e.g. the billboard scene node)
-		and that some nodes always cull their geometry because it is their
-		only reason for existence, for example the OctreeSceneNode.
-		\param state: The culling state to be used. */
+		all SceneNodes support culling and that some nodes always cull
+		their geometry because it is their only reason for existence,
+		for example the OctreeSceneNode.
+		\param state The culling state to be used. */
 		void setAutomaticCulling( E_CULLING_TYPE state)
 		{
 			AutomaticCullingState = state;
@@ -447,8 +494,7 @@ namespace scene
 
 
 		//! Gets the automatic culling state.
-		/** \return The node is culled based on its bounding box if this method
-		 returns true, otherwise no culling is performed. */
+		/** \return The automatic culling state. */
 		E_CULLING_TYPE getAutomaticCulling() const
 		{
 			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
@@ -457,16 +503,19 @@ namespace scene
 
 
 		//! Sets if debug data like bounding boxes should be drawn.
-		/** Please note that not all scene nodes support this feature. */
-		virtual void setDebugDataVisible(E_DEBUG_SCENE_TYPE visible)
+		/** A bitwise OR of the types from @ref irr::scene::E_DEBUG_SCENE_TYPE. 
+		Please note that not all scene nodes support all debug data types.
+		\param state The debug data visibility state to be used. */
+		virtual void setDebugDataVisible(s32 state)
 		{
-			DebugDataVisible = visible;
+			DebugDataVisible = state;
 		}
 
-		//! Returns if debug data like bounding boxes are drawed.
-		E_DEBUG_SCENE_TYPE isDebugDataVisible() const
+		//! Returns if debug data like bounding boxes are drawn.
+		/** \return A bitwise OR of the debug data values from 
+		@ref irr::scene::E_DEBUG_SCENE_TYPE that are currently visible. */
+		s32 isDebugDataVisible() const
 		{
-			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 			return DebugDataVisible;
 		}
 
@@ -479,9 +528,11 @@ namespace scene
 			IsDebugObject = debugObject;
 		}
 
+
 		//! Returns if this scene node is a debug object.
 		/** Debug objects have some special properties, for example they can be easily
-		excluded from collision detection or from serialization, etc. */
+		excluded from collision detection or from serialization, etc.
+		\return If this node is a debug object, true is returned. */
 		bool isDebugObject() const
 		{
 			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
@@ -490,6 +541,7 @@ namespace scene
 
 
 		//! Returns a const reference to the list of all children.
+		/** \return The list of all children of this node. */
 		const core::list<ISceneNode*>& getChildren() const
 		{
 			return Children;
@@ -497,6 +549,7 @@ namespace scene
 
 
 		//! Changes the parent of the scene node.
+		/** \param newParent The new parent to be used. */
 		virtual void setParent(ISceneNode* newParent)
 		{
 			grab();
@@ -512,29 +565,30 @@ namespace scene
 
 
 		//! Returns the triangle selector attached to this scene node.
-		//! The Selector can be used by the engine for doing collision
-		//! detection. You can create a TriangleSelector with
-		//! ISceneManager::createTriangleSelector() or
-		//! ISceneManager::createOctTreeTriangleSelector and set it with
-		//! ISceneNode::setTriangleSelector(). If a scene node got no triangle
-		//! selector, but collision tests should be done with it, a triangle
-		//! selector is created using the bounding box of the scene node.
-		//! \return Returns a pointer to the TriangleSelector or NULL, if there
-		//! is none.
+		/** The Selector can be used by the engine for doing collision
+		detection. You can create a TriangleSelector with
+		ISceneManager::createTriangleSelector() or
+		ISceneManager::createOctTreeTriangleSelector and set it with
+		ISceneNode::setTriangleSelector(). If a scene node got no triangle
+		selector, but collision tests should be done with it, a triangle
+		selector is created using the bounding box of the scene node.
+		\return A pointer to the TriangleSelector or 0, if there
+		is none. */
 		virtual ITriangleSelector* getTriangleSelector() const
 		{
 			return TriangleSelector;
 		}
 
 
-		//! Sets the triangle selector of the scene node. The Selector can be
-		//! used by the engine for doing collision detection. You can create a
-		//! TriangleSelector with ISceneManager::createTriangleSelector() or
-		//! ISceneManager::createOctTreeTriangleSelector(). Some nodes may
-		//! create their own selector by default, so it would be good to
-		//! check if there is already a selector in this node by calling
-		//! ISceneNode::getTriangleSelector().
-		//! \param selector: New triangle selector for this scene node.
+		//! Sets the triangle selector of the scene node.
+		/** The Selector can be used by the engine for doing collision
+		detection. You can create a TriangleSelector with
+		ISceneManager::createTriangleSelector() or
+		ISceneManager::createOctTreeTriangleSelector(). Some nodes may
+		create their own selector by default, so it would be good to
+		check if there is already a selector in this node by calling
+		ISceneNode::getTriangleSelector().
+		\param selector New triangle selector for this scene node. */
 		virtual void setTriangleSelector(ITriangleSelector* selector)
 		{
 			if (TriangleSelector)
@@ -546,10 +600,10 @@ namespace scene
 		}
 
 
-		//! updates the absolute position based on the relative and the parents position
+		//! Updates the absolute position based on the relative and the parents position
 		virtual void updateAbsolutePosition()
 		{
-			if (Parent )
+			if (Parent)
 			{
 				AbsoluteTransformation =
 					Parent->getAbsoluteTransformation() * getRelativeTransformation();
@@ -558,23 +612,34 @@ namespace scene
 				AbsoluteTransformation = getRelativeTransformation();
 		}
 
+
 		//! Returns the parent of this scene node
+		/** \return A pointer to the parent. */
 		scene::ISceneNode* getParent() const
 		{
 			return Parent;
 		}
 
+
 		//! Returns type of the scene node
+		/** \return The type of this node. */
 		virtual ESCENE_NODE_TYPE getType() const
 		{
 			return ESNT_UNKNOWN;
 		}
 
+
 		//! Writes attributes of the scene node.
-		//! Implement this to expose the attributes of your scene node for
-		//! scripting languages, editors, debuggers or xml serialization purposes.
+		/** Implement this to expose the attributes of your scene node
+		for scripting languages, editors, debuggers or xml
+		serialization purposes.
+		\param out The attribute container to write into.
+		\param options Additional options which might influence the
+		serialization. */
 		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
 		{
+			if (!out)
+				return;
 			out->addString	("Name", Name.c_str());
 			out->addInt	("Id", ID );
 
@@ -588,11 +653,18 @@ namespace scene
 			out->addBool	("IsDebugObject", IsDebugObject );
 		}
 
+
 		//! Reads attributes of the scene node.
-		//! Implement this to set the attributes of your scene node for
-		//! scripting languages, editors, debuggers or xml deserialization purposes.
+		/** Implement this to set the attributes of your scene node for
+		scripting languages, editors, debuggers or xml deserialization
+		purposes.
+		\param in The attribute container to read from.
+		\param options Additional options which might influence the
+		deserialization. */
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
 		{
+			if (!in)
+				return;
 			Name = in->getAttributeAsString("Name");
 			ID = in->getAttributeAsInt("Id");
 
@@ -601,30 +673,42 @@ namespace scene
 			setScale(in->getAttributeAsVector3d("Scale"));
 
 			IsVisible = in->getAttributeAsBool("Visible");
-			AutomaticCullingState = (scene::E_CULLING_TYPE ) in->getAttributeAsEnumeration("AutomaticCulling", scene::AutomaticCullingNames);
+			AutomaticCullingState = (scene::E_CULLING_TYPE) in->getAttributeAsEnumeration("AutomaticCulling",
+					scene::AutomaticCullingNames);
 
-			DebugDataVisible = (scene::E_DEBUG_SCENE_TYPE ) in->getAttributeAsInt("DebugDataVisible");
+			DebugDataVisible = in->getAttributeAsInt("DebugDataVisible");
 			IsDebugObject = in->getAttributeAsBool("IsDebugObject");
 
 			updateAbsolutePosition();
 		}
 
 		//! Creates a clone of this scene node and its children.
-		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) 
-		{ 
+		/** \param newParent An optional new parent.
+		\param newManager An optional new scene manager.
+		\return The newly created clone of this node. */
+		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0)
+		{
 			return 0; // to be implemented by derived classes
 		}
 
+		//! Retrieve the scene manager for this node.
+		/** \return The node's scene manager. */
+		virtual ISceneManager* getSceneManager(void) const { return SceneManager; }
+
 	protected:
 
-		//! this method can be used by clone() implementations of derived classes
+		//! A clone function for the ISceneNode members.
+		/** This method can be used by clone() implementations of
+		derived classes
+		\param toCopyFrom The node from which the values are copied
+		\param newManager The new scene manager. */
 		void cloneMembers(ISceneNode* toCopyFrom, ISceneManager* newManager)
 		{
 			Name = toCopyFrom->Name;
 			AbsoluteTransformation = toCopyFrom->AbsoluteTransformation;
 			RelativeTranslation = toCopyFrom->RelativeTranslation;
 			RelativeRotation = toCopyFrom->RelativeRotation;
-			RelativeScale = toCopyFrom->RelativeScale;			
+			RelativeScale = toCopyFrom->RelativeScale;
 			ID = toCopyFrom->ID;
 			setTriangleSelector(toCopyFrom->TriangleSelector);
 			AutomaticCullingState = toCopyFrom->AutomaticCullingState;
@@ -657,19 +741,30 @@ namespace scene
 			}
 		}
 
-		//! name of the scene node.
+		//! Sets the new scene manager for this node and all children.
+		//! Called by addChild when moving nodes between scene managers
+		void setSceneManager(ISceneManager* newManager)
+		{
+			SceneManager = newManager;
+
+			core::list<ISceneNode*>::Iterator it = Children.begin();
+			for (; it != Children.end(); ++it)
+				(*it)->setSceneManager(newManager);
+		}
+
+		//! Name of the scene node.
 		core::stringc Name;
 
-		//! absolute transformation of the node.
+		//! Absolute transformation of the node.
 		core::matrix4 AbsoluteTransformation;
 
-		//! relative translation of the scene node.
+		//! Relative translation of the scene node.
 		core::vector3df RelativeTranslation;
 
-		//! relative rotation of the scene node.
+		//! Relative rotation of the scene node.
 		core::vector3df RelativeRotation;
 
-		//! relative scale of the scene node.
+		//! Relative scale of the scene node.
 		core::vector3df RelativeScale;
 
 		//! Pointer to the parent
@@ -681,25 +776,25 @@ namespace scene
 		//! List of all animator nodes
 		core::list<ISceneNodeAnimator*> Animators;
 
-		//! id of the node.
+		//! ID of the node.
 		s32 ID;
 
-		//! pointer to the scene manager
+		//! Pointer to the scene manager
 		ISceneManager* SceneManager;
 
-		//! pointer to the triangle selector
+		//! Pointer to the triangle selector
 		ITriangleSelector* TriangleSelector;
 
-		//! automatic culling
+		//! Automatic culling state
 		E_CULLING_TYPE AutomaticCullingState;
 
-		//! is the node visible?
+		//! Is the node visible?
 		bool IsVisible;
 
-		//! flag if debug data should be drawn, such as Bounding Boxes.
-		E_DEBUG_SCENE_TYPE DebugDataVisible;
+		//! Flag if debug data should be drawn, such as Bounding Boxes.
+		s32 DebugDataVisible;
 
-		//! is debug object?
+		//! Is debug object?
 		bool IsDebugObject;
 	};
 
diff --git a/src/dep/include/irrlicht/ISceneNodeAnimator.h b/src/dep/include/irrlicht/ISceneNodeAnimator.h
index 8b8e6ec..e3315f6 100644
--- a/src/dep/include/irrlicht/ISceneNodeAnimator.h
+++ b/src/dep/include/irrlicht/ISceneNodeAnimator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,6 +9,7 @@
 #include "vector3d.h"
 #include "ESceneNodeAnimatorTypes.h"
 #include "IAttributeExchangingObject.h"
+#include "IEventReceiver.h"
 
 namespace irr
 {
@@ -26,24 +27,36 @@ namespace scene
 	change its position, rotation, scale and/or material. There are lots of animators
 	to choose from. You can create scene node animators with the ISceneManager interface.
 	*/
-	class ISceneNodeAnimator : public io::IAttributeExchangingObject
+	class ISceneNodeAnimator : public io::IAttributeExchangingObject, public IEventReceiver
 	{
 	public:
 
-		//! destructor
+		//! Destructor
 		virtual ~ISceneNodeAnimator() {}
 
 		//! Animates a scene node.
-		//! \param node: Node to animate.
-		//! \param timeMs: Current time in milli seconds.
+		/** \param node Node to animate.
+		\param timeMs Current time in milli seconds. */
 		virtual void animateNode(ISceneNode* node, u32 timeMs) = 0;
 
-		//! Creates a clone of this animator. 
-		/** Please note that you will have to drop (IReferenceCounted::drop()) 
-		the returned pointer after calling this. */
-		virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) 
+		//! Creates a clone of this animator.
+		/** Please note that you will have to drop
+		(IReferenceCounted::drop()) the returned pointer after calling
+		this. */
+		virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) = 0;
+
+		//! Returns true if this animator receives events.
+		/** When attached to an active camera, this animator will be
+		able to respond to events such as mouse and keyboard events. */
+		virtual bool isEventReceiverEnabled() const
 		{
-			return 0; // to be implemented by derived classes.
+			return false;
+		}
+
+		//! Event receiver, override this function for camera controlling animators
+		virtual bool OnEvent(const SEvent& event)
+		{
+			return false;
 		}
 
 		//! Returns type of the scene node animator
@@ -52,6 +65,8 @@ namespace scene
 			return ESNAT_UNKNOWN;
 		}
 	};
+
+
 } // end namespace scene
 } // end namespace irr
 
diff --git a/src/dep/include/irrlicht/ISceneNodeAnimatorCollisionResponse.h b/src/dep/include/irrlicht/ISceneNodeAnimatorCollisionResponse.h
index e295425..4df9837 100644
--- a/src/dep/include/irrlicht/ISceneNodeAnimatorCollisionResponse.h
+++ b/src/dep/include/irrlicht/ISceneNodeAnimatorCollisionResponse.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,79 +13,88 @@ namespace scene
 {
 
 	//! Special scene node animator for doing automatic collision detection and response.
-	/** This scene node animator can be attached to any scene node modifying it in that
-	way, that it cannot move through walls of the world, is influenced by gravity and
-	acceleration. This animator is useful for example for first person shooter 
-	games. Attach it for example to a first person shooter camera, and the camera will
-	behave as the player control in a first person shooter game: The camera stops and
-	slides at walls, walks up stairs, falls down if there is no floor under it, and so on.
-	*/
+	/** This scene node animator can be attached to any scene node
+	modifying it in that way, that it cannot move through walls of the
+	world, is influenced by gravity and acceleration. This animator is
+	useful for example for first person shooter games. Attach it for
+	example to a first person shooter camera, and the camera will behave as
+	the player control in a first person shooter game: The camera stops and
+	slides at walls, walks up stairs, falls down if there is no floor under
+	it, and so on. */
 	class ISceneNodeAnimatorCollisionResponse : public ISceneNodeAnimator
 	{
 	public:
 
-		//! destructor
+		//! Destructor
 		virtual ~ISceneNodeAnimatorCollisionResponse() {}
 
-		//! Returns if the attached scene node is falling, which means that
-		//! there is no blocking wall from the scene node in the direction of
-		//! the gravity. The implementation of this method is very fast,
-		//! no collision detection is done when invoking it. 
-		//! \return Returns true if the scene node is falling, false if not.
+		//! Check if the attached scene node is falling.
+		/** Falling means that there is no blocking wall from the scene
+		node in the direction of the gravity. The implementation of
+		this method is very fast, no collision detection is done when
+		invoking it.
+		\return True if the scene node is falling, false if not. */
 		virtual bool isFalling() const = 0;
 
-		//! Sets the radius of the ellipsoid with which collision detection and
-		//! response is done. If you have got a scene node, and you are unsure about
-		//! how big the radius should be, you could use the following code to determine
-		//! it:
-		//! \code
-		//! core::aabbox<f32> box = yourSceneNode->getBoundingBox();
-		//! core::vector3df radius = box.MaxEdge - box.getCenter();
-		//! \endcode
-		//! \param radius: New radius of the ellipsoid.
+		//! Sets the radius of the ellipsoid for collision detection and response.
+		/** If you have a scene node, and you are unsure about how big
+		the radius should be, you could use the following code to
+		determine it:
+		\code
+		core::aabbox<f32> box = yourSceneNode->getBoundingBox();
+		core::vector3df radius = box.MaxEdge - box.getCenter();
+		\endcode
+		\param radius: New radius of the ellipsoid. */
 		virtual void setEllipsoidRadius(const core::vector3df& radius) = 0;
 
-		//! Returns the radius of the ellipsoid with which the collision detection and
-		//! response is done.
-		//! \return Radius of the ellipsoid.
+		//! Returns the radius of the ellipsoid for collision detection and response.
+		/** \return Radius of the ellipsoid. */
 		virtual core::vector3df getEllipsoidRadius() const = 0;
 
-		//! Sets the gravity of the environment. A good example value would be
-		//! core::vector3df(0,-100.0f,0) for letting gravity affect all object to
-		//! fall down. For bigger gravity, make increase the length of the vector.
-		//! You can disable gravity by setting it to core::vector3df(0,0,0);
-		//! \param gravity: New gravity vector.
+		//! Sets the gravity of the environment.
+		/** A good example value would be core::vector3df(0,-100.0f,0)
+		for letting gravity affect all object to fall down. For bigger
+		gravity, make increase the length of the vector. You can
+		disable gravity by setting it to core::vector3df(0,0,0);
+		\param gravity: New gravity vector. */
 		virtual void setGravity(const core::vector3df& gravity) = 0;
 
-		//! Returns current vector of gravity.
-		//! \return Returns the gravity vector.
+		//! Get current vector of gravity.
+		//! \return Gravity vector. */
 		virtual core::vector3df getGravity() const = 0;
 
-		//! By default, the ellipsoid for collision detection is created around
-		//! the center of the scene node, which means that the ellipsoid surrounds
-		//! it completely. If this is not what you want, you may specify a translation
-		//! for the ellipsoid.
-		//! \param translation: Translation of the ellipsoid relative 
-		//! to the position of the scene node.
+		//! 'Jump' the animator, by adding a jump speed opposite to its gravity
+		/** \param jumpSpeed The initial speed of the jump; the velocity will be opposite
+		to this animator's gravity vector. */
+		virtual void jump(f32 jumpSpeed) = 0;
+
+		//! Set translation of the collision ellipsoid.
+		/** By default, the ellipsoid for collision detection is
+		created around the center of the scene node, which means that
+		the ellipsoid surrounds it completely. If this is not what you
+		want, you may specify a translation for the ellipsoid.
+		\param translation: Translation of the ellipsoid relative
+		to the position of the scene node. */
 		virtual void setEllipsoidTranslation(const core::vector3df &translation) = 0;
 
-		//! Returns the translation of the ellipsoid for collision detection. See
-		//! ISceneNodeAnimatorCollisionResponse::setEllipsoidTranslation() for
-		//! more details.
-		//! \return Returns the tranlation of the ellipsoid relative to the position
-		//! of the scene node.
+		//! Get the translation of the ellipsoid for collision detection.
+		/** See
+		ISceneNodeAnimatorCollisionResponse::setEllipsoidTranslation()
+		for more details.
+		\return Translation of the ellipsoid relative to the position
+		of the scene node. */
 		virtual core::vector3df getEllipsoidTranslation() const = 0;
 
-		//! Sets a triangle selector holding all triangles of the world with which
-		//! the scene node may collide.
-		//! \param newWorld: New triangle selector containing triangles to let the
-		//! scene node collide with.
+		//! Sets a triangle selector holding all triangles of the world with which the scene node may collide.
+		/** \param newWorld: New triangle selector containing triangles
+		to let the scene node collide with. */
 		virtual void setWorld(ITriangleSelector* newWorld) = 0;
 
-		//! Returns the current triangle selector containing all triangles for
-		//! collision detection.
+		//! Get the current triangle selector containing all triangles for collision detection.
 		virtual ITriangleSelector* getWorld() const = 0;
 	};
+
+
 } // end namespace scene
 } // end namespace irr
 
diff --git a/src/dep/include/irrlicht/ISceneNodeAnimatorFactory.h b/src/dep/include/irrlicht/ISceneNodeAnimatorFactory.h
index 7fe086b..589682b 100644
--- a/src/dep/include/irrlicht/ISceneNodeAnimatorFactory.h
+++ b/src/dep/include/irrlicht/ISceneNodeAnimatorFactory.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,9 +14,9 @@ namespace scene
 {
 	class ISceneNode;
 	class ISceneNodeAnimator;
-	
-	//!	Interface making it possible to dynamicly create scene nodes animators 
-	/** To be able to add custom scene node animators to Irrlicht and to make it possible for the 
+
+	//! Interface for dynamic creation of scene node animators
+	/** To be able to add custom scene node animators to Irrlicht and to make it possible for the
 	scene manager to save and load those external animators, simply implement this
 	interface and register it in you scene manager via ISceneManager::registerSceneNodeAnimatorFactory.
 	Note: When implementing your own scene node factory, don't call ISceneNodeManager::grab() to
@@ -52,13 +52,13 @@ namespace scene
 		getCreatableSceneNodeTypeCount() */
 		virtual ESCENE_NODE_ANIMATOR_TYPE getCreateableSceneNodeAnimatorType(u32 idx) const = 0;
 
-		//! returns type name of a createable scene node animator type 
+		//! returns type name of a createable scene node animator type
 		/** \param idx: Index of scene node animator type in this factory. Must be a value between 0 and
 		getCreatableSceneNodeAnimatorTypeCount() */
 		virtual const c8* getCreateableSceneNodeAnimatorTypeName(u32 idx) const = 0;
 
-		//! returns type name of a createable scene node animator type 
-		/** \param type: Type of scene node animator. 
+		//! returns type name of a createable scene node animator type
+		/** \param type: Type of scene node animator.
 		\return: Returns name of scene node animator type if this factory can create the type, otherwise 0. */
 		virtual const c8* getCreateableSceneNodeAnimatorTypeName(ESCENE_NODE_ANIMATOR_TYPE type) const = 0;
 	};
diff --git a/src/dep/include/irrlicht/ISceneNodeFactory.h b/src/dep/include/irrlicht/ISceneNodeFactory.h
index eaaf497..3102e08 100644
--- a/src/dep/include/irrlicht/ISceneNodeFactory.h
+++ b/src/dep/include/irrlicht/ISceneNodeFactory.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,13 +11,12 @@
 namespace irr
 {
 
-
 namespace scene
 {
 	class ISceneNode;
-	
-	//!	Interface making it possible to dynamicly create scene nodes 
-	/** To be able to add custom scene nodes to Irrlicht and to make it possible for the 
+
+	//! Interface for dynamic creation of scene nodes
+	/** To be able to add custom scene nodes to Irrlicht and to make it possible for the
 	scene manager to save and load those external scene nodes, simply implement this
 	interface and register it in you scene manager via ISceneManager::registerSceneNodeFactory.
 	Note: When implementing your own scene node factory, don't call ISceneNodeManager::grab() to
@@ -34,13 +33,15 @@ namespace scene
 		//! adds a scene node to the scene graph based on its type id
 		/** \param type: Type of the scene node to add.
 		\param parent: Parent scene node of the new node, can be null to add the scene node to the root.
-		\return Returns pointer to the new scene node or null if not successful. */
+		\return Returns pointer to the new scene node or null if not successful.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* addSceneNode(ESCENE_NODE_TYPE type, ISceneNode* parent=0) = 0;
 
 		//! adds a scene node to the scene graph based on its type name
 		/** \param typeName: Type name of the scene node to add.
 		\param parent: Parent scene node of the new node, can be null to add the scene node to the root.
-		\return Returns pointer to the new scene node or null if not successful. */
+		\return Returns pointer to the new scene node or null if not successful.
+		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
 		virtual ISceneNode* addSceneNode(const c8* typeName, ISceneNode* parent=0) = 0;
 
 		//! returns amount of scene node types this factory is able to create
@@ -56,8 +57,8 @@ namespace scene
 		getCreatableSceneNodeTypeCount() */
 		virtual const c8* getCreateableSceneNodeTypeName(u32 idx) const = 0;
 
-		//! returns type name of a createable scene node type 
-		/** \param type: Type of scene node. 
+		//! returns type name of a createable scene node type
+		/** \param type: Type of scene node.
 		\return: Returns name of scene node type if this factory can create the type, otherwise 0. */
 		virtual const c8* getCreateableSceneNodeTypeName(ESCENE_NODE_TYPE type) const = 0;
 	};
diff --git a/src/dep/include/irrlicht/ISceneUserDataSerializer.h b/src/dep/include/irrlicht/ISceneUserDataSerializer.h
index 468c244..33c299d 100644
--- a/src/dep/include/irrlicht/ISceneUserDataSerializer.h
+++ b/src/dep/include/irrlicht/ISceneUserDataSerializer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,7 +18,7 @@ namespace scene
 	class ISceneNode;
 
 //! Interface to read and write user data to and from .irr files.
-/** This interface is to be imlpemented by the user, to make it possible to read 
+/** This interface is to be implemented by the user, to make it possible to read
 and write user data when reading or writing .irr files via ISceneManager.
 To be used with ISceneManager::loadScene() and ISceneManager::saveScene() */
 class ISceneUserDataSerializer
@@ -27,6 +27,9 @@ public:
 
 	virtual ~ISceneUserDataSerializer() {}
 
+	//! Called when the scene manager create a scene node while loading a file.
+	virtual void OnCreateNode(ISceneNode* node) = 0;
+	
 	//! Called when the scene manager read a scene node while loading a file.
 	/** The userData pointer contains a list of attributes with userData which
 	were attached to the scene node in the read scene file.*/
@@ -34,7 +37,7 @@ public:
 
 	//! Called when the scene manager is writing a scene node to an xml file for example.
 	/** Implement this method and return a list of attributes containing the user data
-	you want to be saved together with the scene node. Return 0 if no user data should 
+	you want to be saved together with the scene node. Return 0 if no user data should
 	be added. Please note that the scene manager will call drop() to the returned pointer
 	after it no longer needs it, so if you didn't create a new object for the return value
 	and returning a longer existing IAttributes object, simply call grab() before returning it. */
diff --git a/src/dep/include/irrlicht/IShaderConstantSetCallBack.h b/src/dep/include/irrlicht/IShaderConstantSetCallBack.h
index e8c7824..8446971 100644
--- a/src/dep/include/irrlicht/IShaderConstantSetCallBack.h
+++ b/src/dep/include/irrlicht/IShaderConstantSetCallBack.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,51 +9,69 @@
 
 namespace irr
 {
-namespace video  
+namespace video
 {
 	class IMaterialRendererServices;
 
-//! Interface making it possible to set constants for gpu programs every frame. 
-/** Implement this interface in an own class and pass a pointer to it to one of the methods in
- IGPUProgrammingServices when creating a shader. The OnSetConstants method will be called
- every frame now. */
+//! Interface making it possible to set constants for gpu programs every frame.
+/** Implement this interface in an own class and pass a pointer to it to one of
+the methods in IGPUProgrammingServices when creating a shader. The
+OnSetConstants method will be called every frame now. */
 class IShaderConstantSetCallBack : public virtual IReferenceCounted
 {
 public:
 
-	//! Destructor.
-	virtual ~IShaderConstantSetCallBack() {}
+	//! Called to let the callBack know the used material (optional method)
+	/**
+	 \code
+	class MyCallBack : public IShaderConstantSetCallBack
+	{
+		const video::SMaterial *UsedMaterial;
+
+		OnSetMaterial(const video::SMaterial& material)
+		{
+			UsedMaterial=&material;
+		}
+
+		OnSetConstants(IMaterialRendererServices* services, s32 userData)
+		{
+			services->setVertexShaderConstant("myColor", reinterpret_cast<f32*>(&UsedMaterial->color), 4);
+		}
+	}
+	\endcode
+	*/
+	virtual void OnSetMaterial(const SMaterial& material) { }
 
 	//! Called by the engine when the vertex and/or pixel shader constants for an material renderer should be set.
-	/** 
-	 Implement the IShaderConstantSetCallBack in an own class and implement your own
-	 OnSetConstants method using the given IMaterialRendererServices interface.
-	 Pass a pointer to this class to one of the methods in IGPUProgrammingServices 
-	 when creating a shader. The OnSetConstants method will now be called every time
-	 before geometry is being drawn using your shader material. A sample implementation
-	 would look like this:
-	 \code
-	 virtual void OnSetConstants(video::IMaterialRendererServices* services, s32 userData)
-	 {
-	   video::IVideoDriver* driver = services->getVideoDriver();
-	
-	   // set clip matrix at register 4
-	   core::matrix4 worldViewProj(driver->getTransform(video::ETS_PROJECTION));
-	   worldViewProj *= driver->getTransform(video::ETS_VIEW);
-	   worldViewProj *= driver->getTransform(video::ETS_WORLD);
-	   services->setVertexShaderConstant(&worldViewProj.M[0], 4, 4);
-	   // for high level shading languages, this would be another solution:
-	   //services->setVertexShaderConstant("mWorldViewProj", worldViewProj.M, 16);
-	   
-	   // set some light color at register 9
-	   video::SColorf col(0.0f,1.0f,1.0f,0.0f);
-	   services->setVertexShaderConstant(reinterpret_cast<const f32*>(&col), 9, 1);
-	   // for high level shading languages, this would be another solution:
-	   //services->setVertexShaderConstant("myColor", reinterpret_cast<f32*>(&col), 4);
-	 }
-	 \endcode
-	 \param services: Pointer to an interface providing methods to set the constants for the shader.
-	 \param userData: Userdata int which can be specified when creating the shader.
+	/**
+	Implement the IShaderConstantSetCallBack in an own class and implement your own
+	OnSetConstants method using the given IMaterialRendererServices interface.
+	Pass a pointer to this class to one of the methods in IGPUProgrammingServices
+	when creating a shader. The OnSetConstants method will now be called every time
+	before geometry is being drawn using your shader material. A sample implementation
+	would look like this:
+	\code
+	virtual void OnSetConstants(video::IMaterialRendererServices* services, s32 userData)
+	{
+		video::IVideoDriver* driver = services->getVideoDriver();
+
+		// set clip matrix at register 4
+		core::matrix4 worldViewProj(driver->getTransform(video::ETS_PROJECTION));
+		worldViewProj *= driver->getTransform(video::ETS_VIEW);
+		worldViewProj *= driver->getTransform(video::ETS_WORLD);
+		services->setVertexShaderConstant(&worldViewProj.M[0], 4, 4);
+		// for high level shading languages, this would be another solution:
+		//services->setVertexShaderConstant("mWorldViewProj", worldViewProj.M, 16);
+
+		// set some light color at register 9
+		video::SColorf col(0.0f,1.0f,1.0f,0.0f);
+		services->setVertexShaderConstant(reinterpret_cast<const f32*>(&col), 9, 1);
+		// for high level shading languages, this would be another solution:
+		//services->setVertexShaderConstant("myColor", reinterpret_cast<f32*>(&col), 4);
+	}
+	\endcode
+	\param services: Pointer to an interface providing methods to set the constants for the shader.
+	\param userData: Userdata int which can be specified when creating the shader.
 	*/
 	virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) = 0;
 };
diff --git a/src/dep/include/irrlicht/IShadowVolumeSceneNode.h b/src/dep/include/irrlicht/IShadowVolumeSceneNode.h
index 2143c18..e0e838f 100644
--- a/src/dep/include/irrlicht/IShadowVolumeSceneNode.h
+++ b/src/dep/include/irrlicht/IShadowVolumeSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -22,8 +22,13 @@ namespace scene
 		IShadowVolumeSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id)
 			: ISceneNode(parent, mgr, id) {}
 
-		//! sets the mesh from which the shadow volume should be generated.
-		virtual void setMeshToRenderFrom(const IMesh* mesh) = 0;
+		//! Sets the mesh from which the shadow volume should be generated.
+		/** To optimize shadow rendering, use a simpler mesh for shadows.
+		*/
+		virtual void setShadowMesh(const IMesh* mesh) = 0;
+
+		//! Updates the shadow volumes for current light positions.
+		virtual void updateShadowVolumes() = 0;
 	};
 
 } // end namespace scene
diff --git a/src/dep/include/irrlicht/ISkinnedMesh.h b/src/dep/include/irrlicht/ISkinnedMesh.h
index 2c47165..d4a733b 100644
--- a/src/dep/include/irrlicht/ISkinnedMesh.h
+++ b/src/dep/include/irrlicht/ISkinnedMesh.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2006 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -50,8 +50,9 @@ namespace scene
 
 		//! uses animation from another mesh
 		//! the animation is linked (not copied) based on joint names (so make sure they are unique)
-		//! \return Returns true if all joints in this mesh were matched up (empty names will not be matched, and it's case sensitive)
-		//! unmatched joints will not be animated
+		//! \return Returns true if all joints in this mesh were
+		//! matched up (empty names will not be matched, and it's case
+		//! sensitive). Unmatched joints will not be animated.
 		virtual bool useAnimationFrom(const ISkinnedMesh *mesh) = 0;
 
 		//!Update Normals when Animating
@@ -68,8 +69,12 @@ namespace scene
 		//! Preforms a software skin on this mesh based of joint positions
 		virtual void skinMesh() = 0;
 
+		//! converts the vertex type of all meshbuffers to tangents. eg for bumpmapping
 		virtual void convertMeshToTangents() = 0;
 
+		//! (This feature is not implementated in irrlicht yet)
+		virtual bool setHardwareSkinning(bool on) = 0;
+
 		//! A vertex weight
 		struct SWeight
 		{
@@ -91,19 +96,21 @@ namespace scene
 		};
 
 
-		//! Animation keyframe which describes a new position, scale or rotation
+		//! Animation keyframe which describes a new position
 		struct SPositionKey
 		{
 			f32 frame;
 			core::vector3df position;
 		};
 
+		//! Animation keyframe which describes a new scale
 		struct SScaleKey
 		{
 			f32 frame;
 			core::vector3df scale;
 		};
 
+		//! Animation keyframe which describes a new rotation
 		struct SRotationKey
 		{
 			f32 frame;
@@ -111,10 +118,10 @@ namespace scene
 		};
 
 		//! Joints
-	  	struct SJoint
+		struct SJoint
 		{
 			SJoint() : UseAnimationFrom(0), LocalAnimatedMatrix_Animated(false), GlobalSkinningSpace(false),
-				   positionHint(-1),scaleHint(-1),rotationHint(-1)
+				positionHint(-1),scaleHint(-1),rotationHint(-1)
 			{
 			}
 
@@ -150,8 +157,6 @@ namespace scene
 			core::vector3df Animatedscale;
 			core::quaternion Animatedrotation;
 
-
-
 			core::matrix4 GlobalInversedMatrix; //the x format pre-calculates this
 
 		private:
@@ -185,16 +190,16 @@ namespace scene
 		//! loaders should call this after populating the mesh
 		virtual void finalize() = 0;
 
-
 		virtual SSkinMeshBuffer *createBuffer() = 0;
 
 		virtual SJoint *createJoint(SJoint *parent=0) = 0;
+		virtual SWeight *createWeight(SJoint *joint) = 0;
 
 		virtual SPositionKey *createPositionKey(SJoint *joint) = 0;
 		virtual SScaleKey *createScaleKey(SJoint *joint) = 0;
 		virtual SRotationKey *createRotationKey(SJoint *joint) = 0;
 
-		virtual SWeight *createWeight(SJoint *joint) = 0;
+		virtual bool isStatic()=0;
 	};
 
 } // end namespace scene
diff --git a/src/dep/include/irrlicht/ITerrainSceneNode.h b/src/dep/include/irrlicht/ITerrainSceneNode.h
index 1534761..88f6453 100644
--- a/src/dep/include/irrlicht/ITerrainSceneNode.h
+++ b/src/dep/include/irrlicht/ITerrainSceneNode.h
@@ -1,141 +1,182 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-// The code for the TerrainSceneNode is based on the terrain renderer by Soconne and
-// the GeoMipMapSceneNode developed by Spintz.  They made their code available for Irrlicht 
-// and allowed it to be  distributed under this licence. I only modified some parts.
-// A lot of thanks go to them. 
+// The code for the TerrainSceneNode is based on the terrain renderer by
+// Soconne and the GeoMipMapSceneNode developed by Spintz. They made their
+// code available for Irrlicht and allowed it to be distributed under this
+// licence. I only modified some parts. A lot of thanks go to them.
 
 #ifndef __I_TERRAIN_SCENE_NODE_H__
 #define __I_TERRAIN_SCENE_NODE_H__
 
 #include "ETerrainElements.h"
 #include "ISceneNode.h"
-#include "SMeshBufferLightMap.h"
+#include "IDynamicMeshBuffer.h"
 #include "irrArray.h"
 
 namespace irr
 {
+namespace io
+{
+	class IReadFile;
+} // end namespace io
 namespace scene
 {
 	class IMesh;
 
 	//! A scene node for displaying terrain using the geo mip map algorithm.
-	/** The code for the TerrainSceneNode is based on the Terrain renderer by Soconne and 
-	 * the GeoMipMapSceneNode developed by Spintz. They made their code available for Irrlicht 
-	 * and allowed it to be  distributed under this licence. I only modified some parts.
-	 * A lot of thanks go to them. 
+	/** The code for the TerrainSceneNode is based on the Terrain renderer by Soconne and
+	 * the GeoMipMapSceneNode developed by Spintz. They made their code available for Irrlicht
+	 * and allowed it to be distributed under this licence. I only modified some parts.
+	 * A lot of thanks go to them.
 	 *
 	 * This scene node is capable of very quickly loading
-	 * terrains and updating the indices at runtime to enable viewing very large terrains.  It uses a
-	 * CLOD ( Continuous Level of Detail ) algorithm which updates the indices for each patch based on 
-	 * a LOD ( Level of Detail ) which is determined based on a patch's distance from the camera.
+	 * terrains and updating the indices at runtime to enable viewing very large terrains. It uses a
+	 * CLOD (Continuous Level of Detail) algorithm which updates the indices for each patch based on
+	 * a LOD (Level of Detail) which is determined based on a patch's distance from the camera.
 	 *
 	 * The Patch Size of the terrain must always be a size of ( 2^N+1, i.e. 8+1(9), 16+1(17), etc. ).
-	 * The MaxLOD available is directly dependent on the patch size of the terrain.  LOD 0 contains all
-	 * of the indices to draw all the triangles at the max detail for a patch.  As each LOD goes up by 1
+	 * The MaxLOD available is directly dependent on the patch size of the terrain. LOD 0 contains all
+	 * of the indices to draw all the triangles at the max detail for a patch. As each LOD goes up by 1
 	 * the step taken, in generating indices increases by - 2^LOD, so for LOD 1, the step taken is 2, for
-	 * LOD 2, the step taken is 4, LOD 3 - 8, etc.  The step can be no larger than the size of the patch,
-	 * so having a LOD of 8, with a patch size of 17, is asking the algoritm to generate indices every 
-	 * 2^8 ( 256 ) vertices, which is not possible with a patch size of 17.  The maximum LOD for a patch
-	 * size of 17 is 2^4 ( 16 ).  So, with a MaxLOD of 5, you'll have LOD 0 ( full detail ), LOD 1 ( every
+	 * LOD 2, the step taken is 4, LOD 3 - 8, etc. The step can be no larger than the size of the patch,
+	 * so having a LOD of 8, with a patch size of 17, is asking the algoritm to generate indices every
+	 * 2^8 ( 256 ) vertices, which is not possible with a patch size of 17. The maximum LOD for a patch
+	 * size of 17 is 2^4 ( 16 ). So, with a MaxLOD of 5, you'll have LOD 0 ( full detail ), LOD 1 ( every
 	 * 2 vertices ), LOD 2 ( every 4 vertices ), LOD 3 ( every 8 vertices ) and LOD 4 ( every 16 vertices ).
 	 **/
 	class ITerrainSceneNode : public ISceneNode
 	{
 	public:
-
-		//! constructor
-		ITerrainSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id, 
+		//! Constructor
+		ITerrainSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
 			const core::vector3df& position = core::vector3df(0.0f, 0.0f, 0.0f),
 			const core::vector3df& rotation = core::vector3df(0.0f, 0.0f, 0.0f),
-			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f) ) 
+			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f) )
 			: ISceneNode (parent, mgr, id, position, rotation, scale) {}
 
-		//! destructor
-		virtual ~ITerrainSceneNode() {}
+		//! Get the bounding box of the terrain.
+		/** \return The bounding box of the entire terrain. */
+		virtual const core::aabbox3d<f32>& getBoundingBox() const =0;
 
-		//! \return: Returns the bounding box of the entire terrain.
-		virtual const core::aabbox3d<f32>& getBoundingBox ( ) const = 0;
+		//! Get the bounding box of a patch
+		/** \return The bounding box of the chosen patch. */
+		virtual const core::aabbox3d<f32>& getBoundingBox(s32 patchX, s32 patchZ) const =0;
 
-		//! Returns the bounding box of a patch
-		virtual const core::aabbox3d<f32>& getBoundingBox (s32 patchX, s32 patchZ) const = 0;
+		//! Get the number of indices currently in the meshbuffer
+		/** \return The index count. */
+		virtual u32 getIndexCount() const =0;
 
-		//! Returns the number of indices currently in the meshbuffer for this scene node.
-		virtual u32 getIndexCount() const = 0;
+		//! Get pointer to the mesh
+		/** \return Pointer to the mesh. */
+		virtual IMesh* getMesh() =0;
+
+		//! Get pointer to the buffer used by the terrain (most users will not need this)
+		virtual IMeshBuffer* getRenderBuffer() =0;
 
-		//! Returns pointer to the mesh
-		virtual IMesh* getMesh() = 0;
 
 		//! Gets the meshbuffer data based on a specified level of detail.
-		/** \param mb: A reference to an SMeshBuffer object
-		 \param LOD: the level of detail you want the indices from. */
-		virtual void getMeshBufferForLOD(SMeshBufferLightMap& mb, s32 LOD) const = 0;
+		/** \param mb A reference to an IDynamicMeshBuffer object
+		\param LOD The level of detail you want the indices from. */
+		virtual void getMeshBufferForLOD(IDynamicMeshBuffer& mb, s32 LOD=0) const =0;
 
-		//! Gets the indices for a specified patch at a specified Level of Detail.  
-		/** \param indices: A reference to an array of u32 indices.
-		\param patchX: Patch x coordinate.
-		\param patchZ: Patch z coordinate.
-		\param LOD: The level of detail to get for that patch.  If -1, then get 
-		the CurrentLOD.  If the CurrentLOD is set to -1, meaning it's not shown,
-		then it will retrieve the triangles at the highest LOD ( 0 ).
-		\return: Number if indices put into the buffer. */
-		virtual s32 getIndicesForPatch(core::array<u32>& indices, 
-			s32 patchX, s32 patchZ, s32 LOD = 0 ) = 0;
+		//! Gets the indices for a specified patch at a specified Level of Detail.
+		/** \param indices A reference to an array of u32 indices.
+		\param patchX Patch x coordinate.
+		\param patchZ Patch z coordinate.
+		\param LOD The level of detail to get for that patch. If -1,
+		then get the CurrentLOD. If the CurrentLOD is set to -1,
+		meaning it's not shown, then it will retrieve the triangles at
+		the highest LOD (0).
+		\return Number of indices put into the buffer. */
+		virtual s32 getIndicesForPatch(core::array<u32>& indices,
+			s32 patchX, s32 patchZ, s32 LOD=0) =0;
 
 		//! Populates an array with the CurrentLOD of each patch.
-		/** \param LODs: A reference to a core::array<s32> to hold the values
-		 \return: Returns the number of elements in the array */
-		virtual s32 getCurrentLODOfPatches(core::array<s32>& LODs) const = 0;
+		/** \param LODs A reference to a core::array<s32> to hold the
+		values
+		\return Number of elements in the array */
+		virtual s32 getCurrentLODOfPatches(core::array<s32>& LODs) const =0;
 
 		//! Manually sets the LOD of a patch
-		/** \param patchX: Patch x coordinate.
-		\param patchZ: Patch z coordinate.
-		\param LOD: The level of detail to set the patch to. */
-		virtual void setLODOfPatch( s32 patchX, s32 patchZ, s32 LOD ) = 0;
+		/** \param patchX Patch x coordinate.
+		\param patchZ Patch z coordinate.
+		\param LOD The level of detail to set the patch to. */
+		virtual void setLODOfPatch(s32 patchX, s32 patchZ, s32 LOD=0) =0;
 
-		//! Returns center of terrain.
-		virtual const core::vector3df& getTerrainCenter() const = 0;
+		//! Get center of terrain.
+		virtual const core::vector3df& getTerrainCenter() const =0;
 
-		//! Returns height of a point of the terrain.
-		virtual f32 getHeight( f32 x, f32 y ) const = 0;
+		//! Get height of a point of the terrain.
+		virtual f32 getHeight(f32 x, f32 y) const =0;
 
 		//! Sets the movement camera threshold.
 		/** It is used to determine when to recalculate
-		 indices for the scene node.  The default value is 10.0f. */
-		virtual void setCameraMovementDelta(f32 delta) = 0;
+		indices for the scene node. The default value is 10.0f. */
+		virtual void setCameraMovementDelta(f32 delta) =0;
 
 		//! Sets the rotation camera threshold.
 		/** It is used to determine when to recalculate
-		indices for the scene node.  The default value is 1.0f. */
-		virtual void setCameraRotationDelta(f32 delta) = 0;
+		indices for the scene node. The default value is 1.0f. */
+		virtual void setCameraRotationDelta(f32 delta) =0;
 
 		//! Sets whether or not the node should dynamically update its associated selector when the geomipmap data changes.
 		/** \param bVal: Boolean value representing whether or not to update selector dynamically. */
-		virtual void setDynamicSelectorUpdate(bool bVal) = 0;
+		virtual void setDynamicSelectorUpdate(bool bVal) =0;
 
 		//! Override the default generation of distance thresholds.
-		/** For determining the LOD a patch
-		is rendered at. If any LOD is overridden, then the scene node will no longer apply
-		scaling factors to these values.  If you override these distances, and then apply
-		a scale to the scene node, it is your responsibility to update the new distances to
-		work best with your new terrain size. */
-		virtual bool overrideLODDistance(s32 LOD, f64 newDistance) = 0;
+		/** For determining the LOD a patch is rendered at. If any LOD
+		is overridden, then the scene node will no longer apply scaling
+		factors to these values. If you override these distances, and
+		then apply a scale to the scene node, it is your responsibility
+		to update the new distances to work best with your new terrain
+		size. */
+		virtual bool overrideLODDistance(s32 LOD, f64 newDistance) =0;
 
 		//! Scales the base texture, similar to makePlanarTextureMapping.
-		/** \param scale: The scaling amount.  Values above 1.0 increase the number of time the 
-		texture is drawn on the terrain.  Values below 0 will decrease the number of times the
-		texture is drawn on the terrain.  Using negative values will flip the texture, as
-		well as still scaling it. 
-		\param scale2: If set to 0 (default value), this will set the second texture coordinate set
-		to the same values as in the first set. If this is another value than zero, it will scale
+		/** \param scale The scaling amount. Values above 1.0
+		increase the number of time the texture is drawn on the
+		terrain. Values below 0 will decrease the number of times the
+		texture is drawn on the terrain. Using negative values will
+		flip the texture, as well as still scaling it.
+		\param scale2 If set to 0 (default value), this will set the
+		second texture coordinate set to the same values as in the
+		first set. If this is another value than zero, it will scale
 		the second texture coordinate set by this value. */
-		virtual void scaleTexture(f32 scale = 1.0f, f32 scale2 = 0.0f) = 0;
+		virtual void scaleTexture(f32 scale = 1.0f, f32 scale2=0.0f) =0;
+
+		//! Initializes the terrain data.  Loads the vertices from the heightMapFile.
+		/** The file must contain a loadable image of the heightmap. The heightmap
+		must be square.
+		\param file The file to read the image from. File is not rewinded.
+		\param vertexColor Color of all vertices.
+		\param smoothFactor Number of smoothing passes. */
+		virtual bool loadHeightMap(io::IReadFile* file, 
+			video::SColor vertexColor=video::SColor(255,255,255,255),
+			s32 smoothFactor=0) =0;
+
+		//! Initializes the terrain data.  Loads the vertices from the heightMapFile.
+		/** The data is interpreted as (signed) integers of the given bit size or
+		floats (with 32bits, signed). Allowed bitsizes for integers are
+		8, 16, and 32. The heightmap must be square.
+		\param file The file to read the RAW data from. File is not rewinded.
+		\param bitsPerPixel Size of data if integers used, for floats always use 32.
+		\param signedData Whether we use signed or unsigned ints, ignored for floats.
+		\param floatVals Whether the data is float or int.
+		\param width Width (and also Height, as it must be square) of the heightmap. Use 0 for autocalculating from the filesize.
+		\param vertexColor Color of all vertices.
+		\param smoothFactor Number of smoothing passes. */
+		virtual bool loadHeightMapRAW(io::IReadFile* file, s32 bitsPerPixel=16,
+			bool signedData=false, bool floatVals=false, s32 width=0,
+			video::SColor vertexColor=video::SColor(255,255,255,255),
+			s32 smoothFactor=0) =0;
+
 	};
 
 } // end namespace scene
 } // end namespace irr
 
 
-#endif // __IGEOMIPMAPSCENENODE_H__
+#endif // __I_TERRAIN_SCENE_NODE_H__
+
diff --git a/src/dep/include/irrlicht/ITextSceneNode.h b/src/dep/include/irrlicht/ITextSceneNode.h
index 30c86df..9542199 100644
--- a/src/dep/include/irrlicht/ITextSceneNode.h
+++ b/src/dep/include/irrlicht/ITextSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,7 +18,7 @@ class ITextSceneNode : public ISceneNode
 public:
 
 	//! constructor
-	ITextSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id, 
+	ITextSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
 		const core::vector3df& position = core::vector3df(0,0,0))
 			: ISceneNode(parent, mgr, id, position) {}
 
diff --git a/src/dep/include/irrlicht/ITexture.h b/src/dep/include/irrlicht/ITexture.h
index ad35a98..1173d73 100644
--- a/src/dep/include/irrlicht/ITexture.h
+++ b/src/dep/include/irrlicht/ITexture.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,59 +18,58 @@ namespace video
 {
 
 
-//! Enumeration flags telling the video driver in which format textures
-//! should be created.
+//! Enumeration flags telling the video driver in which format textures should be created.
 enum E_TEXTURE_CREATION_FLAG
 {
-	//! Forces the driver to create 16 bit textures always, independent of
-	//! which format the file on disk has. When choosing this you may loose
-	//! some color detail, but gain much speed and memory. 16 bit textures
-	//! can be transferred twice as fast as 32 bit textures and only use 
-	//! half of the space in memory.
-	//! When using this flag, it does not make sense to use the flags
-	//! ETCF_ALWAYS_32_BIT, ETCF_OPTIMIZED_FOR_QUALITY,
-	//! or ETCF_OPTIMIZED_FOR_SPEED at the same time.
+	/** Forces the driver to create 16 bit textures always, independent of
+	which format the file on disk has. When choosing this you may loose
+	some color detail, but gain much speed and memory. 16 bit textures can
+	be transferred twice as fast as 32 bit textures and only use half of
+	the space in memory.
+	When using this flag, it does not make sense to use the flags
+	ETCF_ALWAYS_32_BIT, ETCF_OPTIMIZED_FOR_QUALITY, or
+	ETCF_OPTIMIZED_FOR_SPEED at the same time. */
 	ETCF_ALWAYS_16_BIT = 0x00000001,
 
-	//! Forces the driver to create 32 bit textures always, independent of
-	//! which format the file on disk has. Please note that some drivers 
-	//! (like the software device) will ignore this, because they are only
-	//! able to create and use 16 bit textures.
-	//! When using this flag, it does not make sense to use the flags
-	//! ETCF_ALWAYS_16_BIT, ETCF_OPTIMIZED_FOR_QUALITY,
-	//! or ETCF_OPTIMIZED_FOR_SPEED at the same time.
+	/** Forces the driver to create 32 bit textures always, independent of
+	which format the file on disk has. Please note that some drivers (like
+	the software device) will ignore this, because they are only able to
+	create and use 16 bit textures.
+	When using this flag, it does not make sense to use the flags
+	ETCF_ALWAYS_16_BIT, ETCF_OPTIMIZED_FOR_QUALITY, or
+	ETCF_OPTIMIZED_FOR_SPEED at the same time. */
 	ETCF_ALWAYS_32_BIT = 0x00000002,
 
-	//! Lets the driver decide in which format the textures are created and
-	//! tries to make the textures look as good as possible.
-	//! Usually it simply chooses the format in which the texture was stored on disk.
-	//! When using this flag, it does not make sense to use the flags
-	//! ETCF_ALWAYS_16_BIT, ETCF_ALWAYS_32_BIT, 
-	//! or ETCF_OPTIMIZED_FOR_SPEED at the same time.
-	ETCF_OPTIMIZED_FOR_QUALITY  = 0x00000004,
+	/** Lets the driver decide in which format the textures are created and
+	tries to make the textures look as good as possible. Usually it simply
+	chooses the format in which the texture was stored on disk.
+	When using this flag, it does not make sense to use the flags
+	ETCF_ALWAYS_16_BIT, ETCF_ALWAYS_32_BIT, or ETCF_OPTIMIZED_FOR_SPEED at
+	the same time. */
+	ETCF_OPTIMIZED_FOR_QUALITY = 0x00000004,
 
-	//! Lets the driver decide in which format the textures are created and
-	//! tries to create them maximizing render speed.
-	//! When using this flag, it does not make sense to use the flags
-	//! ETCF_ALWAYS_16_BIT, ETCF_ALWAYS_32_BIT, or ETCF_OPTIMIZED_FOR_QUALITY,
-	//! at the same time.
+	/** Lets the driver decide in which format the textures are created and
+	tries to create them maximizing render speed.
+	When using this flag, it does not make sense to use the flags
+	ETCF_ALWAYS_16_BIT, ETCF_ALWAYS_32_BIT, or ETCF_OPTIMIZED_FOR_QUALITY,
+	at the same time. */
 	ETCF_OPTIMIZED_FOR_SPEED = 0x00000008,
 
-	//! Automatically creates mip map levels for the textures.
+	/** Automatically creates mip map levels for the textures. */
 	ETCF_CREATE_MIP_MAPS = 0x00000010,
 
-	//! Discard any alpha layer and use non-alpha color format.
+	/** Discard any alpha layer and use non-alpha color format. */
 	ETCF_NO_ALPHA_CHANNEL = 0x00000020,
 
-	//! This flag is never used, it only forces the compiler to 
-	//! compile these enumeration values to 32 bit.
+	/** This flag is never used, it only forces the compiler to compile
+	these enumeration values to 32 bit. */
 	ETCF_FORCE_32_BIT_DO_NOT_USE = 0x7fffffff
 };
 
 
 //! Helper function, helps to get the desired texture creation format from the flags.
-//! Returns either ETCF_ALWAYS_32_BIT, ETCF_ALWAYS_16_BIT, ETCF_OPTIMIZED_FOR_QUALITY,
-//! or ETCF_OPTIMIZED_FOR_SPEED.
+/** \return Either ETCF_ALWAYS_32_BIT, ETCF_ALWAYS_16_BIT,
+ETCF_OPTIMIZED_FOR_QUALITY, or ETCF_OPTIMIZED_FOR_SPEED. */
 inline E_TEXTURE_CREATION_FLAG getTextureFormatFromFlags(u32 flags)
 {
 	if (flags & ETCF_OPTIMIZED_FOR_SPEED)
@@ -86,13 +85,13 @@ inline E_TEXTURE_CREATION_FLAG getTextureFormatFromFlags(u32 flags)
 
 
 //! Interface of a Video Driver dependent Texture.
-/**
-	An ITexture is created by an IVideoDriver by using IVideoDriver::addTexture or
-	IVideoDriver::getTexture. After that, the texture may only be used by this VideoDriver.
-	As you can imagine, textures of the DirectX and the OpenGL device will, e.g., not be compatible.
-	An exception is the Software device and the NULL device, their textures are compatible.
-	If you try to use a texture created by one device with an other device, the device
-	will refuse to do that and write a warning or an error message to the output buffer.
+/** An ITexture is created by an IVideoDriver by using IVideoDriver::addTexture
+or IVideoDriver::getTexture. After that, the texture may only be used by this
+VideoDriver. As you can imagine, textures of the DirectX and the OpenGL device
+will, e.g., not be compatible. An exception is the Software device and the
+NULL device, their textures are compatible. If you try to use a texture
+created by one device with an other device, the device will refuse to do that
+and write a warning or an error message to the output buffer.
 */
 class ITexture : public virtual IReferenceCounted
 {
@@ -104,67 +103,68 @@ public:
 		Name.make_lower();
 	}
 
-	//! destructor
-	virtual ~ITexture() {}
-
-	//! Lock function. 
-	/** Locks the Texture and returns a pointer to access the 
+	//! Lock function.
+	/** Locks the Texture and returns a pointer to access the
 	pixels. After lock() has been called and all operations on the pixels
 	are done, you must call unlock().
+	Locks are not accumulating, hence one unlock will do for an arbitrary
+	number of previous locks.
+	\param readOnly Specifies that no changes to the locked texture are
+	made. Unspecified behavior will arise if still write access happens.
 	\return Returns a pointer to the pixel data. The format of the pixel can
-	be determinated by using getColorFormat(). NULL is returned, if
+	be determined by using getColorFormat(). 0 is returned, if
 	the texture cannot be locked. */
-	virtual void* lock() = 0;
+	virtual void* lock(bool readOnly = false) = 0;
 
 	//! Unlock function. Must be called after a lock() to the texture.
+	/** One should avoid to call unlock more than once before another lock. */
 	virtual void unlock() = 0;
 
-	//! Returns original size of the texture.
-	/** The texture is usually
-	scaled, if it was created with an unoptimal size. For example if the size
-	of the texture file it was loaded from was not a power of two. This returns
-	the size of the texture, it had before it was scaled. Can be useful
-	when drawing 2d images on the screen, which should have the exact size
-	of the original texture. Use ITexture::getSize() if you want to know 
-	the real size it has now stored in the system.
-	\return Returns the original size of the texture. */
+	//! Get original size of the texture.
+	/** The texture is usually scaled, if it was created with an unoptimal
+	size. For example if the size of the texture file it was loaded from
+	was not a power of two. This returns the size of the texture, it had
+	before it was scaled. Can be useful when drawing 2d images on the
+	screen, which should have the exact size of the original texture. Use
+	ITexture::getSize() if you want to know the real size it has now stored
+	in the system.
+	\return The original size of the texture. */
 	virtual const core::dimension2d<s32>& getOriginalSize() const = 0;
 
-	//! Returns dimension (=size) of the texture.
-	/** \return Returns the size of the texture. */
+	//! Get dimension (=size) of the texture.
+	/** \return The size of the texture. */
 	virtual const core::dimension2d<s32>& getSize() const = 0;
 
-	//! Returns driver type of texture. 
-	/** This is the driver, which created the texture.
-	This method is used internally by the video devices, to check, if they may
-	use a texture because textures may be incompatible between different
-	devices.
-	\return Returns driver type of texture. */
+	//! Get driver type of texture.
+	/** This is the driver, which created the texture. This method is used
+	internally by the video devices, to check, if they may use a texture
+	because textures may be incompatible between different devices.
+	\return Driver type of texture. */
 	virtual E_DRIVER_TYPE getDriverType() const = 0;
 
-	//! Returns the color format of texture.
-	/** \return Returns the color format of texture. */
+	//! Get the color format of texture.
+	/** \return The color format of texture. */
 	virtual ECOLOR_FORMAT getColorFormat() const = 0;
 
-	//! Returns pitch of texture (in bytes).
-	/** The pitch is the amount of bytes
-	used for a row of pixels in a texture.
-	\return Returns pitch of texture in bytes. */
+	//! Get pitch of texture (in bytes).
+	/** The pitch is the amount of bytes used for a row of pixels in a
+	texture.
+	\return Pitch of texture in bytes. */
 	virtual u32 getPitch() const = 0;
 
-	//! Returns whether the texture has MipMaps
-	/** \return Returns true if texture has MipMaps, else false. */
+	//! Check whether the texture has MipMaps
+	/** \return True if texture has MipMaps, else false. */
 	virtual bool hasMipMaps() const { return false; }
 
 	//! Regenerates the mip map levels of the texture.
-	/** Useful after locking and modifying the texture */
+	/** Required after modifying the texture, usually after calling unlock(). */
 	virtual void regenerateMipMapLevels() = 0;
 
-	//! Returns whether the texture is a render target
-	/** \return Returns true if this is a render target, otherwise false. */
+	//! Check whether the texture is a render target
+	/** \return True if this is a render target, otherwise false. */
 	virtual bool isRenderTarget() const { return false; }
 
-	//! Returns name of texture (in most cases this is the filename)
+	//! Get name of texture (in most cases this is the filename)
 	const core::stringc& getName() const { return Name; }
 
 protected:
diff --git a/src/dep/include/irrlicht/ITimer.h b/src/dep/include/irrlicht/ITimer.h
index 329aa04..104225e 100644
--- a/src/dep/include/irrlicht/ITimer.h
+++ b/src/dep/include/irrlicht/ITimer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,41 +18,43 @@ public:
 	//! destructor
 	virtual ~ITimer() {}
 
-	//! Returns current real time in milliseconds of the system. 
+	//! Returns current real time in milliseconds of the system.
 	/** This value does not start with 0 when the application starts.
-	For example in one implementation the value returned could be the 
-	amount of milliseconds which have elapsed since the system was started. */
+	For example in one implementation the value returned could be the
+	amount of milliseconds which have elapsed since the system was started.
+	*/
 	virtual u32 getRealTime() const = 0;
 
-	//! Returns current virtual time in milliseconds. 
-	/** This value starts with 0 and can be manipulated using setTime(), stopTimer(),
-	startTimer(), etc. This value depends on the set speed of the timer if the timer 
-	is stopped, etc. If you need the system time, use getRealTime() */
+	//! Returns current virtual time in milliseconds.
+	/** This value starts with 0 and can be manipulated using setTime(),
+	stopTimer(), startTimer(), etc. This value depends on the set speed of
+	the timer if the timer is stopped, etc. If you need the system time,
+	use getRealTime() */
 	virtual u32 getTime() const = 0;
 
 	//! sets current virtual time
 	virtual void setTime(u32 time) = 0;
 
-	//! Stops the virtual timer. 
-	/** The timer is reference counted, which means everything which calls 
-	stop() will also have to call start(), otherwise the timer may not start/stop
-	corretly again. */
+	//! Stops the virtual timer.
+	/** The timer is reference counted, which means everything which calls
+	stop() will also have to call start(), otherwise the timer may not
+	start/stop correctly again. */
 	virtual void stop() = 0;
 
 	//! Starts the virtual timer.
-	/** The timer is reference counted, which means everything which calls 
-	stop() will also have to call start(), otherwise the timer may not start/stop
-	corretly again. */
+	/** The timer is reference counted, which means everything which calls
+	stop() will also have to call start(), otherwise the timer may not
+	start/stop correctly again. */
 	virtual void start() = 0;
 
 	//! Sets the speed of the timer
-	/** The speed is the factor with which the time is running faster or slower then the
-	real system time. */
+	/** The speed is the factor with which the time is running faster or
+	slower then the real system time. */
 	virtual void setSpeed(f32 speed = 1.0f) = 0;
 
 	//! Returns current speed of the timer
-	/** The speed is the factor with which the time is running faster or slower then the
-	real system time. */
+	/** The speed is the factor with which the time is running faster or
+	slower then the real system time. */
 	virtual f32 getSpeed() const = 0;
 
 	//! Returns if the virtual timer is currently stopped
diff --git a/src/dep/include/irrlicht/ITriangleSelector.h b/src/dep/include/irrlicht/ITriangleSelector.h
index bcc70af..385f423 100644
--- a/src/dep/include/irrlicht/ITriangleSelector.h
+++ b/src/dep/include/irrlicht/ITriangleSelector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,69 +17,69 @@ namespace scene
 {
 
 //! Interface to return triangles with specific properties.
-/** Every ISceneNode may have a triangle selector, available with 
- ISceneNode::getTriangleScelector() or ISceneManager::createTriangleSelector.
- This is used for doing collision detection: For example if you know, that a
- collision may have happened in the area between (1,1,1) and (10,10,10), you
- can get all triangles of the scene node in this area with the
- ITriangleSelector easily and check every triangle if it collided. */
+/** Every ISceneNode may have a triangle selector, available with
+ISceneNode::getTriangleScelector() or ISceneManager::createTriangleSelector.
+This is used for doing collision detection: For example if you know, that a
+collision may have happened in the area between (1,1,1) and (10,10,10), you
+can get all triangles of the scene node in this area with the
+ITriangleSelector easily and check every triangle if it collided. */
 class ITriangleSelector : public virtual IReferenceCounted
 {
 public:
 
-	//! destructor
+	//! Destructor
 	virtual ~ITriangleSelector() {}
 
 	//! Returns amount of all available triangles in this selector
 	virtual s32 getTriangleCount() const = 0;
 
 	//! Gets all triangles.
-	//! \param triangles: Array where the resulting triangles will be
-	//! written to.
-	//! \param arraySize: Size of the target array.
-	//! \param outTriangleCount: Amount of triangles which have been
-	//! written into the array.
-	//! \param transform: Pointer to matrix for transforming the triangles
-	//! before they are returned. Useful for example to scale all triangles
-	//! down into an ellipsoid space. If this pointer is null, no
-	//! transformation will be done.
+	/** \param triangles: Array where the resulting triangles will be
+	written to.
+	\param arraySize: Size of the target array.
+	\param outTriangleCount: Amount of triangles which have been written
+	into the array.
+	\param transform: Pointer to matrix for transforming the triangles
+	before they are returned. Useful for example to scale all triangles
+	down into an ellipsoid space. If this pointer is null, no
+	transformation will be done. */
 	virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
 		s32& outTriangleCount, const core::matrix4* transform=0) const = 0;
 
 	//! Gets all triangles which lie within a specific bounding box.
-	//! Please note that unoptimized triangle selectors also may return
-	//! triangles which are not in the specific box at all.
-	//! \param triangles: Array where the resulting triangles will be
-	//! written to.
-	//! \param arraySize: Size of the target array.
-	//! \param outTriangleCount: Amount of triangles which have been
-	//! written into the array.
-	//! \param box: Only triangles which are in this axis aligned bounding
-	//! box will be written into the array.
-	//! \param transform: Pointer to matrix for transforming the triangles
-	//! before they are returned. Useful for example to scale all triangles
-	//! down into an ellipsoid space. If this pointer is null, no
-	//! transformation will be done.
+	/** Please note that unoptimized triangle selectors also may return
+	triangles which are not in the specific box at all.
+	\param triangles: Array where the resulting triangles will be written
+	to.
+	\param arraySize: Size of the target array.
+	\param outTriangleCount: Amount of triangles which have been written
+	into the array.
+	\param box: Only triangles which are in this axis aligned bounding box
+	will be written into the array.
+	\param transform: Pointer to matrix for transforming the triangles
+	before they are returned. Useful for example to scale all triangles
+	down into an ellipsoid space. If this pointer is null, no
+	transformation will be done. */
 	virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
-		s32& outTriangleCount, const core::aabbox3d<f32>& box, 
+		s32& outTriangleCount, const core::aabbox3d<f32>& box,
 		const core::matrix4* transform=0) const = 0;
 
 	//! Gets all triangles which have or may have contact with a 3d line.
-	//! Please note that unoptimized triangle selectors also may return
-	//! triangles which are not in contact at all with the 3d line.
-	//! \param triangles: Array where the resulting triangles will be
-	//! written to.
-	//! \param arraySize: Size of the target array.
-	//! \param outTriangleCount: Amount of triangles which have been
-	//! written into the array.
-	//! \param line: Only triangles which may be in contact with this 3d
-	//! line will be written into the array.
-	//! \param transform: Pointer to matrix for transforming the triangles
-	//! before they are returned. Useful for example to scale all triangles
-	//! down into an ellipsoid space. If this pointer is null, no
-	//! transformation will be done.
+	/** Please note that unoptimized triangle selectors also may return
+	triangles which are not in contact at all with the 3d line.
+	\param triangles: Array where the resulting triangles will be written
+	to.
+	\param arraySize: Size of the target array.
+	\param outTriangleCount: Amount of triangles which have been written
+	into the array.
+	\param line: Only triangles which may be in contact with this 3d line
+	will be written into the array.
+	\param transform: Pointer to matrix for transforming the triangles
+	before they are returned. Useful for example to scale all triangles
+	down into an ellipsoid space. If this pointer is null, no
+	transformation will be done. */
 	virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
-		s32& outTriangleCount, const core::line3d<f32>& line, 
+		s32& outTriangleCount, const core::line3d<f32>& line,
 		const core::matrix4* transform=0) const = 0;
 };
 
diff --git a/src/dep/include/irrlicht/IVideoDriver.h b/src/dep/include/irrlicht/IVideoDriver.h
index 7ca22c1..9122f58 100644
--- a/src/dep/include/irrlicht/IVideoDriver.h
+++ b/src/dep/include/irrlicht/IVideoDriver.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -29,6 +29,7 @@ namespace io
 namespace scene
 {
 	class IMeshBuffer;
+	class IMeshManipulator;
 } // end namespace scene
 
 namespace video
@@ -64,289 +65,365 @@ namespace video
 		ETS_COUNT
 	};
 
+	enum E_LOST_RESSOURCE
+	{
+		//! The whole device/driver is lost
+		ELR_DEVICE = 1,
+		//! All texture are lost, rare problem
+		ELR_TEXTURES = 2,
+		//! The Render Target Textures are lost, typical problem for D3D
+		ELR_RTTS = 4,
+		//! The HW buffers are lost, will be recreated automatically, but might require some more time this frame
+		ELR_HW_BUFFERS = 8
+	};
 
-	//! Interface to driver which is able to perform 2d and 3d gfx functions.
-	/** The IVideoDriver interface is one of the most important interfaces of
-	the Irrlicht Engine: All rendering and texture manipulating is done with
-	this interface. You are able to use the Irrlicht Engine by only invoking methods
-	of this interface if you would like to, although the irr::scene::ISceneManager interface
-	provides a lot of powerful classes and methods to make the programmers life
-	easier.
+	//! Interface to driver which is able to perform 2d and 3d graphics functions.
+	/** This interface is one of the most important interfaces of
+	the Irrlicht Engine: All rendering and texture manipulation is done with
+	this interface. You are able to use the Irrlicht Engine by only
+	invoking methods of this interface if you like to, although the
+	irr::scene::ISceneManager interface provides a lot of powerful classes
+	and methods to make the programmer's life easier.
 	*/
 	class IVideoDriver : public virtual IReferenceCounted
 	{
 	public:
 
-		//! destructor
-		virtual ~IVideoDriver() {}
-
 		//! Applications must call this method before performing any rendering.
-		/** \param backBuffer: Specifies if the back buffer should be cleared, which
-		means that the screen is filled with the color specified.
-		If this parameter is false, the back buffer will not be cleared and the color
-		parameter is ignored.
-		\param zBuffer: Specifies if the depth or z buffer should be cleared. It is
-		not nesesarry to do so if only 2d drawing is used.
-		\param color: The color used for back buffer clearing
-		\return Returns false if failed. Begin Scene can clear the back- and the z-buffer. */
-		virtual bool beginScene(bool backBuffer, bool zBuffer, SColor color) = 0;
+		/** This method can clear the back- and the z-buffer.
+		\param backBuffer Specifies if the back buffer should be
+		cleared, which means that the screen is filled with the color
+		specified. If this parameter is false, the back buffer will
+		not be cleared and the color parameter is ignored.
+		\param zBuffer Specifies if the depth buffer (z buffer) should
+		be cleared. It is not nesesarry to do so if only 2d drawing is
+		used.
+		\param color The color used for back buffer clearing
+		\param windowId Handle of another window, if you want the
+		bitmap to be displayed on another window. If this is null,
+		everything will be displayed in the default window.
+		Note: This feature is not fully implemented for all devices.
+		\param sourceRect Pointer to a rectangle defining the source
+		rectangle of the area to be presented. Set to null to present
+		everything. Note: not implemented in all devices.
+		\return False if failed. */
+		virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
+				SColor color=SColor(255,0,0,0),
+				void* windowId=0,
+				core::rect<s32>* sourceRect=0) = 0;
 
-		//! Presents the rendered image on the screen.
-		/** Applications must call this method after performing any rendering.
-		\param  windowId: Handle of another window, if you want the bitmap to be displayed
-		on another window. If this is null, everything will be displayed in the default window.
-		Note: This does not work in fullscreen mode and is not implemented for all devices (only for
-		D3D8, D3D9, Software1 and Software2, and only for Windows).
-		\param sourceRect: Pointer to a rectangle defining the source rectangle of the area
-		to be presented. Set to null to present everything. Note: not implemented in all devices.
-		\return Returns false if failed and true if succeeded. */
-		virtual bool endScene( s32 windowId = 0, core::rect<s32>* sourceRect=0 ) = 0;
+		//! Presents the rendered image to the screen.
+		/** Applications must call this method after performing any
+		rendering.
+		\return False if failed and true if succeeded. */
+		virtual bool endScene() = 0;
 
 		//! Queries the features of the driver.
 		/** Returns true if a feature is available
-		\param feature: A feature to query.
-		\return Returns true if the feature is available, false if not. */
+		\param feature Feature to query.
+		\return True if the feature is available, false if not. */
 		virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const = 0;
 
-		//! Sets the view, world or projection transformation.
-		/* \param state: Transformation type to be set. Can be view, world or projection.
-		\param mat: Matrix describing the transformation. */
+		//! Disable a feature of the driver.
+		/** Can also be used to enable the features again. It is not
+		possible to enable unsupported features this way, though.
+		\param feature Feature to disable.
+		\param flag When true the feature is disabled, otherwise it is enabled. */
+		virtual void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag=true) =0;
+
+		//! Check if the driver was recently reset.
+		/** For d3d devices you will need to recreate the RTTs if the
+		driver was reset. Should be queried right after beginScene().
+		*/
+		virtual bool checkDriverReset() =0;
+
+		//! Sets transformation matrices.
+		/** \param state Transformation type to be set, e.g. view,
+		world, or projection.
+		\param mat Matrix describing the transformation. */
 		virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat) = 0;
 
 		//! Returns the transformation set by setTransform
+		/** \param state Transformation type to query
+		\return Matrix describing the transformation. */
 		virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const = 0;
 
 		//! Sets a material.
-		/** All 3d drawing functions will draw geometry using this material.
+		/** All 3d drawing functions will draw geometry using this material thereafter.
 		\param material: Material to be used from now on. */
 		virtual void setMaterial(const SMaterial& material) = 0;
 
-		//! Returns a pointer to a texture.
+		//! Get access to a named texture.
 		/** Loads the texture from disk if it is not
 		already loaded and generates mipmap levels if desired.
-		Texture loading can be influenced using the setTextureCreationFlag() method.
-		The texture can be in BMP, JPG, TGA, PCX, PNG, and PSD format.
-		\param filename: Filename of the texture to be loaded.
-		\return Returns a pointer to the texture or 0 if the texture
-		could not be loaded.
-		This pointer should not be dropped. See IReferenceCounted::drop() for more information.*/
+		Texture loading can be influenced using the
+		setTextureCreationFlag() method. The texture can be in several
+		imageformats, such as BMP, JPG, TGA, PCX, PNG, and PSD.
+		\param filename Filename of the texture to be loaded.
+		\return Pointer to the texture, or 0 if the texture
+		could not be loaded. This pointer should not be dropped. See
+		IReferenceCounted::drop() for more information. */
 		virtual ITexture* getTexture(const c8* filename) = 0;
 
-		//! Returns a pointer to a texture.
+		//! Get access to a named texture.
 		/** Loads the texture from disk if it is not
 		already loaded and generates mipmap levels if desired.
-		Texture loading can be influenced using the setTextureCreationFlag() method.
-		The texture can be in BMP, JPG, TGA, PCX, PNG, and PSD format.
-		\param file: Pointer to an already opened file.
-		\return Returns a pointer to the texture or 0 if the texture
-		could not be loaded.
-		This pointer should not be dropped. See IReferenceCounted::drop() for more information.*/
+		Texture loading can be influenced using the
+		setTextureCreationFlag() method. The texture can be in several
+		imageformats, such as BMP, JPG, TGA, PCX, PNG, and PSD.
+		\param filename Filename of the texture to be loaded.
+		\return Pointer to the texture, or 0 if the texture
+		could not be loaded. This pointer should not be dropped. See
+		IReferenceCounted::drop() for more information. */
+		virtual ITexture* getTexture(const core::stringc& filename) = 0;
+
+		//! Get access to a named texture.
+		/** Loads the texture from disk if it is not
+		already loaded and generates mipmap levels if desired.
+		Texture loading can be influenced using the
+		setTextureCreationFlag() method. The texture can be in several
+		imageformats, such as BMP, JPG, TGA, PCX, PNG, and PSD.
+		\param file Pointer to an already opened file.
+		\return Pointer to the texture, or 0 if the texture
+		could not be loaded. This pointer should not be dropped. See
+		IReferenceCounted::drop() for more information. */
 		virtual ITexture* getTexture(io::IReadFile* file) = 0;
 
 		//! Returns a texture by index
-		/** \param index: Index of the texture, must be smaller than getTextureCount()
-		Please note that this index might change when adding or removing textures
-		*/
+		/** \param index: Index of the texture, must be smaller than
+		getTextureCount() Please note that this index might change when
+		adding or removing textures
+		\return Pointer to the texture, or 0 if the texture was not
+		set or index is out of bounds. This pointer should not be
+		dropped. See IReferenceCounted::drop() for more information. */
 		virtual ITexture* getTextureByIndex(u32 index) = 0;
 
 		//! Returns amount of textures currently loaded
+		/** \return Amount of textures currently loaded */
 		virtual u32 getTextureCount() const = 0;
 
 		//! Renames a texture
+		/** \param texture Pointer to the texture to rename.
+		\param newName New name for the texture. This should be a unique name. */
 		virtual void renameTexture(ITexture* texture, const c8* newName) = 0;
 
-		//! Creates an empty Texture of specified size.
+		//! Creates an empty texture of specified size.
 		/** \param size: Size of the texture.
-		\param name: A name for the texture. Later calls to getTexture() with this name
-		will return this texture
-		\param format: Desired color format of the texture. Please note that
-		the driver may choose to create the texture in another color format.
-		\return Returns a pointer to the newly created texture.
-		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		\param name A name for the texture. Later calls to
+		getTexture() with this name will return this texture
+		\param format Desired color format of the texture. Please note
+		that the driver may choose to create the texture in another
+		color format.
+		\return Pointer to the newly created texture. This pointer
+		should not be dropped. See IReferenceCounted::drop() for more
+		information. */
 		virtual ITexture* addTexture(const core::dimension2d<s32>& size,
 			const c8* name, ECOLOR_FORMAT format = ECF_A8R8G8B8) = 0;
 
-		//! Creates a texture from a loaded IImage.
-		/** \param name: A name for the texture. Later calls of getTexture() with this name
-		 will return this texture
-		\param image: Image the texture is created from.
-		\return Returns a pointer to the newly created Texture.
-		This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+		//! Creates a texture from an IImage.
+		/** \param name A name for the texture. Later calls of
+		getTexture() with this name will return this texture
+		\param image Image the texture is created from.
+		\return Pointer to the newly created texture. This pointer
+		should not be dropped. See IReferenceCounted::drop() for more
+		information. */
 		virtual ITexture* addTexture(const c8* name, IImage* image) = 0;
 
-		//! Creates a render target texture.
-		/** \param size: Size of the texture, in pixels. Width and height should
-		be a power of two (for example 64, 128, 256, 512, ...) and it should not
-		be bigger than the backbuffer, because it shares the zbuffer with the
-		screen buffer.
-		\return Returns a pointer to the created texture or 0 if the texture could not
-		be created. If you no longer need the image, you should call ITexture::drop().
-		See IReferenceCounted::drop() for more information. */
-		virtual ITexture* createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name = 0) = 0;
+		//! Adds a new render target texture to the texture cache.
+		/** \param size Size of the texture, in pixels. Width and
+		height should be a power of two (e.g. 64, 128, 256, 512, ...)
+		and it should not be bigger than the backbuffer, because it
+		shares the zbuffer with the screen buffer.
+		\param name An optional name for the RTT.
+		\return Pointer to the created texture or 0 if the texture
+		could not be created. This pointer should not be dropped. See
+		IReferenceCounted::drop() for more information. */
+		virtual ITexture* addRenderTargetTexture(const core::dimension2d<s32>& size,
+				const c8* name=0) =0;
 
-		//! Removes a texture from the texture cache and deletes it, freeing lot of memory.
-		/** Please note that after calling this, the pointer to the ITexture
-		may not be longer valid, if it was not grabbed before by other parts of
-		the engine for storing it longer. So it would be a good idea to set all
-		materials which are using this texture to 0 or another texture first.
-		\param texture: Texture to delete from the engine cache. */
+		//! Adds a new render target texture
+		/** \deprecated use addRenderTargetTexture instead. */
+		virtual ITexture* createRenderTargetTexture(const core::dimension2d<s32>& size,
+				const c8* name=0) =0;
+
+		//! Removes a texture from the texture cache and deletes it.
+		/** This method can free a lot of memory!
+		Please note that after calling this, the pointer to the
+		ITexture may no longer be valid, if it was not grabbed before
+		by other parts of the engine for storing it longer. So it is a
+		good idea to set all materials which are using this texture to
+		0 or another texture first.
+		\param texture Texture to delete from the engine cache. */
 		virtual void removeTexture(ITexture* texture) = 0;
 
-		//! Removes all textures from the texture cache and deletes them, freeing lot of memory.
-		/** Please note that after calling this, the pointer to all ITextures
-		may not be longer valid, if they were not grabbed before by other parts of
-		the engine for storing them longer. So it would be a good idea to set all
-		materials which are using textures to 0 first. */
+		//! Removes all textures from the texture cache and deletes them.
+		/** This method can free a lot of memory!
+		Please note that after calling this, the pointer to the
+		ITexture may no longer be valid, if it was not grabbed before
+		by other parts of the engine for storing it longer. So it is a
+		good idea to set all materials which are using this texture to
+		0 or another texture first. */
 		virtual void removeAllTextures() = 0;
 
+		//! Remove hardware buffer
+		virtual void removeHardwareBuffer(const scene::IMeshBuffer* mb) = 0;
+
+		//! Remove all hardware buffers
+		virtual void removeAllHardwareBuffers() = 0;
+
 		//! Creates a 1bit alpha channel of the texture based of an color key.
-		/** This makes the texture transparent at the regions where this color
-		key can be found when using for example draw2DImage with useAlphachannel
-		= true.
-		\param texture: Texture whose alpha channel is modified.
-		\param color: Color key color. Every pixel with this color will become transparent
-		as described above. Please note that the colors of a texture may be
-		converted when loading it, so the color values may not be exactly the same
-		in the engine and for example in picture edit programs. To avoid this
-		problem, you could use the makeColorKeyTexture method, which takes the position
-		of a pixel instead a color value. */
+		/** This makes the texture transparent at the regions where
+		this color key can be found when using for example draw2DImage
+		with useAlphachannel==true.
+		\param texture Texture whose alpha channel is modified.
+		\param color Color key color. Every pixel with this color will
+		become transparent as described above. Please note that the
+		colors of a texture may be converted when loading it, so the
+		color values may not be exactly the same in the engine and for
+		example in picture edit programs. To avoid this problem, you
+		could use the makeColorKeyTexture method, which takes the
+		position of a pixel instead a color value. */
 		virtual void makeColorKeyTexture(video::ITexture* texture, video::SColor color) const = 0;
 
 		//! Creates a 1bit alpha channel of the texture based of an color key position.
-		/** This makes the texture transparent at the regions where this color
-		key can be found when using for example draw2DImage with useAlphachannel=true.
-		\param texture: Texture whose alpha channel is modified.
-		\param colorKeyPixelPos: Position of a pixel with the color key color.
-		Every pixel with this color will become transparent as described above. */
+		/** This makes the texture transparent at the regions where
+		this color key can be found when using for example draw2DImage
+		with useAlphachannel==true.
+		\param texture Texture whose alpha channel is modified.
+		\param colorKeyPixelPos Position of a pixel with the color key
+		color. Every pixel with this color will become transparent as
+		described above. */
 		virtual void makeColorKeyTexture(video::ITexture* texture,
 			core::position2d<s32> colorKeyPixelPos) const = 0;
 
 		//! Creates a normal map from a height map texture.
-		/** If the target texture
-		has 32 bit, the height value is stored in the alpha component of the texture as
-		addition. This value is used by the video::EMT_PARALLAX_MAP_SOLID
-		material and similar materials.
-		\param texture: Texture whose alpha channel is modified.
-		\param amplitude: Constant value by which the height information is multiplied.*/
+		/** If the target texture has 32 bit, the height value is
+		stored in the alpha component of the texture as addition. This
+		value is used by the video::EMT_PARALLAX_MAP_SOLID material and
+		similar materials.
+		\param texture Texture whose alpha channel is modified.
+		\param amplitude Constant value by which the height
+		information is multiplied.*/
 		virtual void makeNormalMapTexture(video::ITexture* texture, f32 amplitude=1.0f) const = 0;
 
 		//! Sets a new render target.
-		/** This will only work if the driver
-		supports the EVDF_RENDER_TO_TARGET feature, which can be
-		queried with queryFeature(). Usually, rendering to textures is done in this
+		/** This will only work if the driver supports the
+		EVDF_RENDER_TO_TARGET feature, which can be queried with
+		queryFeature(). Usually, rendering to textures is done in this
 		way:
 		\code
 		// create render target
-		ITexture* target = driver->createRenderTargetTexture(core::dimension2d<s32>(128,128));
+		ITexture* target = driver->addRenderTargetTexture(core::dimension2d<s32>(128,128), "rtt1");
 
 		// ...
 
 		driver->setRenderTarget(target); // set render target
 		// .. draw stuff here
-		driver->setRenderTarget(0);     // set previous render target
-		Please note that you cannot render 3D or 2D geometry with a render target as texture
-		on it when you are rendering the scene into this render target at the same time. It is
-		usually only possible to render into a texture between the IVideoDriver::beginScene() and endScene()
-		method calls. And please also note that the scene will be rendered upside down into the texture
-		in some devices (e.g. OpenGL vs. D3D). A simple workaround for this is to flip the
-		texture coordinates of the geometry where the render target texture is displayed on.
+		driver->setRenderTarget(0); // set previous render target
 		\endcode
-		\param texture: New render target. Must be a texture created with
-		IVideoDriver::createRenderTargetTexture(). If set to 0, it sets the previous render
-		target which was set before the last setRenderTarget() call.
-		\param clearBackBuffer: Clears the backbuffer of the render target with the color parameter
-		\param clearZBuffer: Clears the zBuffer of the rendertarget. Note that, because the frame
-		buffer shares the zbuffer with the rendertarget, its zbuffer will be partially cleared
-		too with this.
-		\param color: The background color for the render target.
-		\return Returns true if sucessful and false if not. */
+		Please note that you cannot render 3D or 2D geometry with a
+		render target as texture on it when you are rendering the scene
+		into this render target at the same time. It is usually only
+		possible to render into a texture between the
+		IVideoDriver::beginScene() and endScene() method calls.
+		\param texture New render target. Must be a texture created with
+		IVideoDriver::addRenderTargetTexture(). If set to 0, it sets
+		the previous render target which was set before the last
+		setRenderTarget() call.
+		\param clearBackBuffer Clears the backbuffer of the render
+		target with the color parameter
+		\param clearZBuffer Clears the zBuffer of the rendertarget.
+		Note that because the frame buffer may share the zbuffer with
+		the rendertarget, its zbuffer might be partially cleared too
+		by this.
+		\param color The background color for the render target.
+		\return True if sucessful and false if not. */
 		virtual bool setRenderTarget(video::ITexture* texture,
 			bool clearBackBuffer=true, bool clearZBuffer=true,
 			SColor color=video::SColor(0,0,0,0)) = 0;
 
 		//! Sets a new viewport.
-		/** Every rendering operation is done into this	new area.
-		\param area: Rectangle defining the new area of rendering operations. */
+		/** Every rendering operation is done into this new area.
+		\param area: Rectangle defining the new area of rendering
+		operations. */
 		virtual void setViewPort(const core::rect<s32>& area) = 0;
 
 		//! Gets the area of the current viewport.
-		/** \return Returns rectangle of the current viewport. */
+		/** \return Rectangle of the current viewport. */
 		virtual const core::rect<s32>& getViewPort() const = 0;
 
-		//! draws a vertex primitive list
-		/** Note that there may be at maximum 65536 vertices, because the
-		index list is an array of 16 bit values each with a maximum value
-		of 65536. If there are more than 65536 vertices in the list,
-		results of this operation are not defined.
-		\param vertices: Pointer to array of vertices.
-		\param vertexCount: Amount of vertices in the array.
-		\param indexList: Pointer to array of indices.
-		\param triangleCount: amount of Triangles.
-		\param vType: Vertex type, e.g. EVT_STANDARD for S3DVertex.
-		\param pType: Primitive type, e.g. EPT_TRIANGLE_FAN for a triangle fan. */
-		virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 triangleCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType) = 0;
+		//! Draws a vertex primitive list
+		/** Note that, depending on the index type, some vertices might be not
+		accessible through the index list. The limit is at 65535 vertices for 16bit
+		indices.
+		\param vertices Pointer to array of vertices.
+		\param vertexCount Amount of vertices in the array.
+		\param indexList Pointer to array of indices.
+		\param primCount Amount of Primitives
+		\param vType Vertex type, e.g. video::EVT_STANDARD for S3DVertex.
+		\param pType Primitive type, e.g. scene::EPT_TRIANGLE_FAN for a triangle fan.
+		\param iType Index type, e.g. video::EIT_16BIT for a triangle fan. */
+		virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
+				const void* indexList, u32 primCount,
+				E_VERTEX_TYPE vType=EVT_STANDARD, scene::E_PRIMITIVE_TYPE pType=scene::EPT_TRIANGLES, E_INDEX_TYPE iType=EIT_16BIT) = 0;
 
 		//! Draws an indexed triangle list.
-		/** Note that there may be at maximum 65536 vertices, because the
-		index list is a array of 16 bit values each with a maximum value
-		of 65536. If there are more than 65536 vertices in the list,
-		results of this operation are not defined.
-		\param vertices: Pointer to array of vertices.
-		\param vertexCount: Amount of vertices in the array.
-		\param indexList: Pointer to array of indices.
-		\param triangleCount: amount of Triangles. Usually amount of indices / 3. */
+		/** Note that there may be at maximum 65536 vertices, because
+		the index list is an array of 16 bit values each with a maximum
+		value of 65536. If there are more than 65536 vertices in the
+		list, results of this operation are not defined.
+		\param vertices Pointer to array of vertices.
+		\param vertexCount Amount of vertices in the array.
+		\param indexList Pointer to array of indices.
+		\param triangleCount Amount of Triangles. Usually amount of indices / 3. */
 		virtual void drawIndexedTriangleList(const S3DVertex* vertices,
 			u32 vertexCount, const u16* indexList, u32 triangleCount) = 0;
 
 		//! Draws an indexed triangle list.
-		/** Note that there may be at maximum 65536 vertices, because the
-		index list is a array of 16 bit values each with a maximum value
-		of 65536. If there are more than 65536 vertices in the list,
-		results of this operation are not defined.
-		\param vertices: Pointer to array of vertices.
-		\param vertexCount: Amount of vertices in the array.
-		\param indexList: Pointer to array of indices.
-		\param triangleCount: amount of Triangles. Usually amount of indices / 3.*/
+		/** Note that there may be at maximum 65536 vertices, because
+		the index list is an array of 16 bit values each with a maximum
+		value of 65536. If there are more than 65536 vertices in the
+		list, results of this operation are not defined.
+		\param vertices Pointer to array of vertices.
+		\param vertexCount Amount of vertices in the array.
+		\param indexList Pointer to array of indices.
+		\param triangleCount Amount of Triangles. Usually amount of indices / 3. */
 		virtual void drawIndexedTriangleList(const S3DVertex2TCoords* vertices,
 			u32 vertexCount, const u16* indexList, u32 triangleCount) = 0;
 
 		//! Draws an indexed triangle list.
-		/** Note that there may be at maximum 65536 vertices, because the
-		index list is a array of 16 bit values each with a maximum value
-		of 65536. If there are more than 65536 vertices in the list,
-		results of this operation are not defined.
-		\param vertices: Pointer to array of vertices.
-		\param vertexCount: Amount of vertices in the array.
-		\param indexList: Pointer to array of indices.
-		\param triangleCount: amount of Triangles. Usually amount of indices / 3. */
+		/** Note that there may be at maximum 65536 vertices, because
+		the index list is an array of 16 bit values each with a maximum
+		value of 65536. If there are more than 65536 vertices in the
+		list, results of this operation are not defined.
+		\param vertices Pointer to array of vertices.
+		\param vertexCount Amount of vertices in the array.
+		\param indexList Pointer to array of indices.
+		\param triangleCount Amount of Triangles. Usually amount of indices / 3. */
 		virtual void drawIndexedTriangleList(const S3DVertexTangents* vertices,
 			u32 vertexCount, const u16* indexList, u32 triangleCount) = 0;
 
 		//! Draws an indexed triangle fan.
-		/** Note that there may be at maximum 65536 vertices, because the
-		index list is a array of 16 bit values each with a maximum value
-		of 65536. If there are more than 65536 vertices in the list,
-		results of this operation are not defined.
-		Please note that some of the implementation code for this method is based on
-		free code sent in by Mario Gruber, lots of thanks go to him!
-		\param vertices: Pointer to array of vertices.
-		\param vertexCount: Amount of vertices in the array.
-		\param indexList: Pointer to array of indices.
-		\param triangleCount: amount of Triangles. Usually amount of indices - 2. */
+		/** Note that there may be at maximum 65536 vertices, because
+		the index list is an array of 16 bit values each with a maximum
+		value of 65536. If there are more than 65536 vertices in the
+		list, results of this operation are not defined.
+		\param vertices Pointer to array of vertices.
+		\param vertexCount Amount of vertices in the array.
+		\param indexList Pointer to array of indices.
+		\param triangleCount Amount of Triangles. Usually amount of indices - 2. */
 		virtual void drawIndexedTriangleFan(const S3DVertex* vertices,
 			u32 vertexCount, const u16* indexList, u32 triangleCount) = 0;
 
 		//! Draws an indexed triangle fan.
-		/** Note that there may be at maximum 65536 vertices, because the
-		index list is a array of 16 bit values each with a maximum value
-		of 65536. If there are more than 65536 vertices in the list,
-		results of this operation are not defined.
-		Please note that some of the implementation code for this method is based on
-		free code sent in by Mario Gruber, lots of thanks go to him!
-		\param vertices: Pointer to array of vertices.
-		\param vertexCount: Amount of vertices in the array.
-		\param indexList: Pointer to array of indices.
-		\param triangleCount: amount of Triangles. Usually amount of indices - 2. */
+		/** Note that there may be at maximum 65536 vertices, because
+		the index list is an array of 16 bit values each with a maximum
+		value of 65536. If there are more than 65536 vertices in the
+		list, results of this operation are not defined.
+		\param vertices Pointer to array of vertices.
+		\param vertexCount Amount of vertices in the array.
+		\param indexList Pointer to array of indices.
+		\param triangleCount Amount of Triangles. Usually amount of indices - 2. */
 		virtual void drawIndexedTriangleFan(const S3DVertex2TCoords* vertices,
 			u32 vertexCount, const u16* indexList, u32 triangleCount) = 0;
 
@@ -361,16 +438,17 @@ namespace video
 		driver->setTransform(video::ETS_WORLD, core::matrix4());
 		\endcode
 		for some properly set up material before drawing the line.
-		\param start: Start of the 3d line.
-		\param end: End of the 3d line.
-		\param color: Color of the line.  */
+		Some drivers support line thickness set in the material.
+		\param start Start of the 3d line.
+		\param end End of the 3d line.
+		\param color Color of the line. */
 		virtual void draw3DLine(const core::vector3df& start,
 			const core::vector3df& end, SColor color = SColor(255,255,255,255)) = 0;
 
 		//! Draws a 3d triangle.
 		/** This method calls drawIndexedTriangles for some triangles.
 		This method works with all drivers because it simply calls
-		drawIndexedTriangleList but is hence not very fast.
+		drawIndexedTriangleList but it is hence not very fast.
 		Note that the triangle is drawn using the current
 		transformation matrix and material. So if you need to draw it
 		independently of the current transformation, use
@@ -379,17 +457,14 @@ namespace video
 		driver->setTransform(video::ETS_WORLD, core::matrix4());
 		\endcode
 		for some properly set up material before drawing the triangle.
-		\param triangle: The triangle to draw.
-		\param color: Color of the line. */
+		\param triangle The triangle to draw.
+		\param color Color of the line. */
 		virtual void draw3DTriangle(const core::triangle3df& triangle,
 			SColor color = SColor(255,255,255,255)) = 0;
 
 		//! Draws a 3d axis aligned box.
-		/** This method simply calls drawIndexedTriangles for some
-		triangles. This method works with all drivers because it
-		simply calls drawIndexedTriangleList but is hence not very
-		fast.
-		Note that the box is drawn using the current transformation
+		/** This method simply calls draw3DLine for the edges of the
+		box. Note that the box is drawn using the current transformation
 		matrix and material. So if you need to draw it independently of
 		the current transformation, use
 		\code
@@ -397,51 +472,58 @@ namespace video
 		driver->setTransform(video::ETS_WORLD, core::matrix4());
 		\endcode
 		for some properly set up material before drawing the box.
-		\param box: The axis aligned box to draw
-		\param color: Color to use while drawing the box. */
+		\param box The axis aligned box to draw
+		\param color Color to use while drawing the box. */
 		virtual void draw3DBox(const core::aabbox3d<f32>& box,
 			SColor color = SColor(255,255,255,255)) = 0;
 
 		//! Draws a 2d image without any special effects
-		/** \param texture: Pointer to texture to use.
-		\param destPos: upper left 2d destination position where the image will be drawn. */
+		/** \param texture Pointer to texture to use.
+		\param destPos Upper left 2d destination position where the
+		image will be drawn. */
 		virtual void draw2DImage(const video::ITexture* texture,
 			const core::position2d<s32>& destPos) = 0;
 
 		//! Draws a 2d image using a color
 		/** (if color is other than
-		Color(255,255,255,255)) and the alpha channel of the texture if wanted.
-		\param texture: Texture to be drawn.
-		\param destPos: Upper left 2d destination position where the image will be drawn.
-		\param sourceRect: Source rectangle in the image.
-		\param clipRect: Pointer to rectangle on the screen where the image is clipped to.
-		This pointer can be NULL. Then the image is not clipped.
-		\param color: Color with which the image is colored. If the color equals
-		Color(255,255,255,255), the color is ignored. Note that the alpha component
-		is used: If alpha is other than 255, the image will be transparent.
-		\param useAlphaChannelOfTexture: If true, the alpha channel of the texture is
-		used to draw the image.*/
+		Color(255,255,255,255)) and the alpha channel of the texture.
+		\param texture Texture to be drawn.
+		\param destPos Upper left 2d destination position where the
+		image will be drawn.
+		\param sourceRect Source rectangle in the image.
+		\param clipRect Pointer to rectangle on the screen where the
+		image is clipped to.
+		If this pointer is NULL the image is not clipped.
+		\param color Color with which the image is drawn. If the color
+		equals Color(255,255,255,255) it is ignored. Note that the
+		alpha component is used: If alpha is other than 255, the image
+		will be transparent.
+		\param useAlphaChannelOfTexture: If true, the alpha channel of
+		the texture is used to draw the image.*/
 		virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
 			const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
 			SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false) = 0;
 
-		//! draws a set of 2d images, using a color and the alpha
-		/** channel of the texture if desired. The images are drawn
-		beginning at pos and concatenated in one line. All drawings
-		are clipped against clipRect (if != 0).
-		The subtextures are defined by the array of sourceRects
-		and are chosen by the indices given.
-		\param texture: Texture to be drawn.
-		\param pos: Upper left 2d destination position where the image will be drawn.
-		\param sourceRects: Source rectangles of the image.
-		\param indices: List of indices which choose the actual rectangle used each time.
-		\param kerningWidth: Offset to Position on X
-		\param clipRect: Pointer to rectangle on the screen where the image is clipped to.
-		This pointer can be 0. Then the image is not clipped.
-		\param color: Color with which the image is colored.
-		Note that the alpha component is used: If alpha is other than 255, the image will be transparent.
-		\param useAlphaChannelOfTexture: If true, the alpha channel of the texture is
-		used to draw the image. */
+		//! Draws a set of 2d images, using a color and the alpha channel of the texture.
+		/** The images are drawn beginning at pos and concatenated in
+		one line. All drawings are clipped against clipRect (if != 0).
+		The subtextures are defined by the array of sourceRects and are
+		chosen by the indices given.
+		\param texture Texture to be drawn.
+		\param pos Upper left 2d destination position where the image
+		will be drawn.
+		\param sourceRects Source rectangles of the image.
+		\param indices List of indices which choose the actual
+		rectangle used each time.
+		\param kerningWidth Offset to Position on X
+		\param clipRect Pointer to rectangle on the screen where the
+		image is clipped to.
+		If this pointer is 0 then the image is not clipped.
+		\param color Color with which the image is drawn.
+		Note that the alpha component is used. If alpha is other than
+		255, the image will be transparent.
+		\param useAlphaChannelOfTexture: If true, the alpha channel of
+		the texture is used to draw the image. */
 		virtual void draw2DImage(const video::ITexture* texture,
 				const core::position2d<s32>& pos,
 				const core::array<core::rect<s32> >& sourceRects,
@@ -451,90 +533,128 @@ namespace video
 				SColor color=SColor(255,255,255,255),
 				bool useAlphaChannelOfTexture=false) = 0;
 
-		//! Draws a part of the texture into the rectangle.
+		//! Draws a part of the texture into the rectangle. Note that colors must be an array of 4 colors if used.
 		/** Suggested and first implemented by zola.
-		\param texture: the texture to draw from
-		\param destRect: the rectangle to draw into
-		\param sourceRect: the rectangle denoting a part of the texture
-		\param clipRect: clips the destination rectangle (may be 0)
-		\param colors: array of 4 colors denoting the color values of the corners of the destRect
-		\param useAlphaChannelOfTexture: true if alpha channel will be blended. */
+		\param texture The texture to draw from
+		\param destRect The rectangle to draw into
+		\param sourceRect The rectangle denoting a part of the texture
+		\param clipRect Clips the destination rectangle (may be 0)
+		\param colors Array of 4 colors denoting the color values of
+		the corners of the destRect
+		\param useAlphaChannelOfTexture True if alpha channel will be
+		blended. */
 		virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
 			const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
-			video::SColor* colors=0, bool useAlphaChannelOfTexture=false) = 0;
+			const video::SColor * const colors=0, bool useAlphaChannelOfTexture=false) = 0;
 
-		//!Draws an 2d rectangle.
-		/** \param color: Color of the rectangle to draw. The alpha component will not
-		be ignored and specifies how transparent the rectangle will be.
-		\param pos: Position of the rectangle.
-		\param clip: Pointer to rectangle against which the rectangle will be clipped.
-		If the pointer is null, no clipping will be performed. */
+		//! Draws a 2d rectangle.
+		/** \param color Color of the rectangle to draw. The alpha
+		component will not be ignored and specifies how transparent the
+		rectangle will be.
+		\param pos Position of the rectangle.
+		\param clip Pointer to rectangle against which the rectangle
+		will be clipped. If the pointer is null, no clipping will be
+		performed. */
 		virtual void draw2DRectangle(SColor color, const core::rect<s32>& pos,
 			const core::rect<s32>* clip = 0) = 0;
 
-		//!Draws an 2d rectangle with a gradient.
-		/** \param colorLeftUp: Color of the left upper corner to draw.
-		The alpha component will not be ignored and specifies how transparent the rectangle will be.
-		\param colorRightUp: Color of the right upper corner to draw.
-		The alpha component will not be ignored and specifies how transparent the rectangle will be.
-		\param colorLeftDown: Color of the left lower corner to draw.
-		The alpha component will not be ignored and specifies how transparent the rectangle will be.
-		\param colorRightDown: Color of the right lower corner to draw.
-		The alpha component will not be ignored and specifies how transparent the rectangle will be.
-		\param pos: Position of the rectangle.
-		\param clip: Pointer to rectangle against which the rectangle will be clipped.
-		If the pointer is null, no clipping will be performed. */
+		//! Draws a 2d rectangle with a gradient.
+		/** \param colorLeftUp Color of the upper left corner to draw.
+		The alpha component will not be ignored and specifies how
+		transparent the rectangle will be.
+		\param colorRightUp Color of the upper right corner to draw.
+		The alpha component will not be ignored and specifies how
+		transparent the rectangle will be.
+		\param colorLeftDown Color of the lower left corner to draw.
+		The alpha component will not be ignored and specifies how
+		transparent the rectangle will be.
+		\param colorRightDown Color of the lower right corner to draw.
+		The alpha component will not be ignored and specifies how
+		transparent the rectangle will be.
+		\param pos Position of the rectangle.
+		\param clip Pointer to rectangle against which the rectangle
+		will be clipped. If the pointer is null, no clipping will be
+		performed. */
 		virtual void draw2DRectangle(const core::rect<s32>& pos,
-			SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
-			const core::rect<s32>* clip = 0) = 0;
+				SColor colorLeftUp, SColor colorRightUp,
+				SColor colorLeftDown, SColor colorRightDown,
+				const core::rect<s32>* clip = 0) = 0;
+
+		//! Draws the outline of a 2D rectangle.
+		/** \param pos Position of the rectangle.
+		\param color Color of the rectangle to draw. The alpha component
+		specifies how transparent the rectangle outline will be. */
+		virtual void draw2DRectangleOutline(const core::recti& pos,
+				SColor color=SColor(255,255,255,255)) = 0 ;
 
 		//! Draws a 2d line.
-		/** \param start: Screen coordinates of the start of the line in pixels.
-		\param end: Screen coordinates of the start of the line in pixels.
-		\param color: Color of the line to draw. */
+		/** \param start Screen coordinates of the start of the line
+		in pixels.
+		\param end Screen coordinates of the start of the line in
+		pixels.
+		\param color Color of the line to draw. */
 		virtual void draw2DLine(const core::position2d<s32>& start,
 					const core::position2d<s32>& end,
 					SColor color=SColor(255,255,255,255)) = 0;
 
+		//! Draws a pixel.
+		/** \param x The x-position of the pixel.
+		\param y The y-position of the pixel.
+		\param color Color of the pixel to draw. */
+		virtual void drawPixel(u32 x, u32 y, const SColor& color) = 0; 
+
 		//! Draws a non filled concyclic regular 2d polyon.
-		/** This method can be used to draw
-		circles, but also triangles, tetragons, pentagons, hexagons, heptagons, octagons,
-		enneagons, decagons, hendecagons, dodecagon, triskaidecagons, etc. I think you'll
-		got it now. And all this by simply specifying the vertex count. Welcome to the
-		wonders of geometry.
-		\param center: Position of center of circle (pixels).
-		\param radius: Radius of circle in pixels.
-		\param color: Color of the circle.
-		\param vertexCount: Amount of vertices of the polygon. Specify 2 to draw a line,
-		3 to draw a triangle, 4 for a tetragons and a lot (>10) for nearly a circle. */
+		/** This method can be used to draw circles, but also
+		triangles, tetragons, pentagons, hexagons, heptagons, octagons,
+		enneagons, decagons, hendecagons, dodecagon, triskaidecagons,
+		etc. I think you'll got it now. And all this by simply
+		specifying the vertex count. Welcome to the wonders of
+		geometry.
+		\param center Position of center of circle (pixels).
+		\param radius Radius of circle in pixels.
+		\param color Color of the circle.
+		\param vertexCount Amount of vertices of the polygon. Specify 2
+		to draw a line, 3 to draw a triangle, 4 for tetragons and a lot
+		(>10) for nearly a circle. */
 		virtual void draw2DPolygon(core::position2d<s32> center,
-			f32 radius, video::SColor color=SColor(100,255,255,255), s32 vertexCount=10) = 0;
+				f32 radius,
+				video::SColor color=SColor(100,255,255,255),
+				s32 vertexCount=10) = 0;
 
 		//! Draws a shadow volume into the stencil buffer.
-		/** To draw a stencil shadow, do
-		this: Frist, draw all geometry. Then use this method, to draw the shadow
-		volume. Then, use IVideoDriver::drawStencilShadow() to visualize the shadow.
-		Please note that the code for the opengl version of the method is based on
-		free code sent in by Philipp Dortmann, lots of thanks go to him!
-		\param triangles: Pointer to array of 3d vectors, specifing the shadow volume.
-		\param count: Amount of triangles in the array.
-		\param zfail: If set to true, zfail method is used, otherwise zpass. */
+		/** To draw a stencil shadow, do this: First, draw all geometry.
+		Then use this method, to draw the shadow volume. Then, use
+		IVideoDriver::drawStencilShadow() to visualize the shadow.
+		Please note that the code for the opengl version of the method
+		is based on free code sent in by Philipp Dortmann, lots of
+		thanks go to him!
+		\param triangles Pointer to array of 3d vectors, specifying the
+		shadow volume.
+		\param count Amount of triangles in the array.
+		\param zfail If set to true, zfail method is used, otherwise
+		zpass. */
 		virtual void drawStencilShadowVolume(const core::vector3df* triangles, s32 count, bool zfail=true) = 0;
 
 		//! Fills the stencil shadow with color.
-		/** After the shadow volume has been drawn
-		into the stencil buffer using IVideoDriver::drawStencilShadowVolume(), use this
+		/** After the shadow volume has been drawn into the stencil
+		buffer using IVideoDriver::drawStencilShadowVolume(), use this
 		to draw the color of the shadow.
-		Please note that the code for the opengl version of the method is based on
-		free code sent in by Philipp Dortmann, lots of thanks go to him!
-		\param clearStencilBuffer: Set this to false, if you want to draw every shadow
-		with the same color, and only want to call drawStencilShadow() once after all
-		shadow volumes have been drawn. Set this to true, if you want to paint every
-		shadow with its own color.
-		\param leftUpEdge: Color of the shadow in the upper left corner of screen.
-		\param rightUpEdge: Color of the shadow in the upper right corner of screen.
-		\param leftDownEdge: Color of the shadow in the lower left corner of screen.
-		\param rightDownEdge: Color of the shadow in the lower right corner of screen. */
+		Please note that the code for the opengl version of the method
+		is based on free code sent in by Philipp Dortmann, lots of
+		thanks go to him!
+		\param clearStencilBuffer Set this to false, if you want to
+		draw every shadow with the same color, and only want to call
+		drawStencilShadow() once after all shadow volumes have been
+		drawn. Set this to true, if you want to paint every shadow with
+		its own color.
+		\param leftUpEdge Color of the shadow in the upper left corner
+		of screen.
+		\param rightUpEdge Color of the shadow in the upper right
+		corner of screen.
+		\param leftDownEdge Color of the shadow in the lower left
+		corner of screen.
+		\param rightDownEdge Color of the shadow in the lower right
+		corner of screen. */
 		virtual void drawStencilShadow(bool clearStencilBuffer=false,
 			video::SColor leftUpEdge = video::SColor(255,0,0,0),
 			video::SColor rightUpEdge = video::SColor(255,0,0,0),
@@ -542,151 +662,174 @@ namespace video
 			video::SColor rightDownEdge = video::SColor(255,0,0,0)) = 0;
 
 		//! Draws a mesh buffer
-		/** \param mb: Buffer to draw; */
-		virtual void drawMeshBuffer( const scene::IMeshBuffer* mb) = 0;
+		/** \param mb Buffer to draw; */
+		virtual void drawMeshBuffer(const scene::IMeshBuffer* mb) = 0;
 
 		//! Sets the fog mode.
-		/** These are global values attached to each 3d object
-		rendered, which has the fog flag enabled in its material.
-		\param color: Color of the fog
-		\param linearFog: Set this to true for linear fog, otherwise exponential fog is applied.
-		\param start: Only used in linear fog mode (linearFog=true). Specifies where fog starts.
-		\param end: Only used in linear fog mode (linearFog=true). Specifies where fog ends.
-		\param density: Only used in expotential fog mode (linearFog=false). Must be a value between 0 and 1.
-		\param pixelFog: Set this to false for vertex fog, and true if you want pixel fog.
-		\param rangeFog: Set this to true to enable range-based vertex fog. The distance
-		from the viewer is used to compute the fog, not the z-coordinate. This is
-		better, but slower. This is only available with D3D and vertex fog. */
-		virtual void setFog(SColor color=SColor(0,255,255,255), bool linearFog=true, f32 start=50.0f, f32 end=100.0f,
-			f32 density=0.01f, bool pixelFog=false, bool rangeFog=false) = 0;
+		/** These are global values attached to each 3d object rendered,
+		which has the fog flag enabled in its material.
+		\param color Color of the fog
+		\param linearFog Set this to true for linear fog, otherwise
+		exponential fog is applied.
+		\param start Only used in linear fog mode (linearFog=true).
+		Specifies where fog starts.
+		\param end Only used in linear fog mode (linearFog=true).
+		Specifies where fog ends.
+		\param density Only used in exponential fog mode
+		(linearFog=false). Must be a value between 0 and 1.
+		\param pixelFog Set this to false for vertex fog, and true if
+		you want per-pixel fog.
+		\param rangeFog Set this to true to enable range-based vertex
+		fog. The distance from the viewer is used to compute the fog,
+		not the z-coordinate. This is better, but slower. This is only
+		available with D3D and vertex fog. */
+		virtual void setFog(SColor color=SColor(0,255,255,255),
+				bool linearFog=true, f32 start=50.0f, f32 end=100.0f,
+				f32 density=0.01f,
+				bool pixelFog=false, bool rangeFog=false) = 0;
 
-		//! Returns the size of the screen or render window.
+		//! Get the current color format of the color buffer
+		/** \return Color format of the color buffer. */
+		virtual ECOLOR_FORMAT getColorFormat() const = 0;
+
+		//! Get the size of the screen or render window.
 		/** \return Size of screen or render window. */
 		virtual const core::dimension2d<s32>& getScreenSize() const = 0;
 
-		//! Returns the size of the current render target, or the screen size if the driver 
-		//! doesnt support render to texture
-		/** \return Size of render target or screen/window */
+		//! Get the size of the current render target
+		/** This method will return the screen size if the driver
+		doesn't support render to texture, or if the current render
+		target is the screen.
+		\return Size of render target or screen/window */
 		virtual const core::dimension2d<s32>& getCurrentRenderTargetSize() const = 0;
 
-
 		//! Returns current frames per second value.
-		/** \return Returns amount of frames per second drawn. **/
+		/** This value is updated approximately every 1.5 seconds and
+		is only intended to provide a rough guide to the average frame
+		rate. It is not suitable for use in performing timing
+		calculations or framerate independent movement.
+		\return Approximate amount of frames per second drawn. */
 		virtual s32 getFPS() const = 0;
 
 		//! Returns amount of primitives (mostly triangles) which were drawn in the last frame.
 		/** Together with getFPS() very useful method for statistics.
+		\param mode Defines if the primitives drawn are accumulated or
+		counted per frame.
 		\return Amount of primitives drawn in the last frame. */
-		virtual u32 getPrimitiveCountDrawn( u32 param = 0 ) const = 0;
+		virtual u32 getPrimitiveCountDrawn( u32 mode = 0 ) const = 0;
 
 		//! Deletes all dynamic lights which were previously added with addDynamicLight().
 		virtual void deleteAllDynamicLights() = 0;
 
 		//! Adds a dynamic light.
-		/** \param light: Data specifying the dynamic light. */
+		/** \param light Data specifying the dynamic light. */
 		virtual void addDynamicLight(const SLight& light) = 0;
 
 		//! Returns the maximal amount of dynamic lights the device can handle
 		/** \return Maximal amount of dynamic lights. */
 		virtual u32 getMaximalDynamicLightAmount() const = 0;
 
-		//! Returns current amount of dynamic lights set
-		/** \return Current amount of dynamic lights set */
+		//! Returns amount of dynamic lights currently set
+		/** \return Amount of dynamic lights currently set */
 		virtual u32 getDynamicLightCount() const = 0;
 
 		//! Returns light data which was previously set by IVideoDriver::addDynamicLight().
-		/** \param idx: Zero based index of the light. Must be 0 or greater and smaller
-		than IVideoDriver()::getDynamicLightCount.
+		/** \param idx Zero based index of the light. Must be 0 or
+		greater and smaller than IVideoDriver()::getDynamicLightCount.
 		\return Light data. */
 		virtual const SLight& getDynamicLight(u32 idx) const = 0;
 
 		//! Gets name of this video driver.
-		/** \return Returns the name of the video driver. Example: In case of the Direct3D8
-		driver, it would return "Direct3D 8.1". */
+		/** \return Returns the name of the video driver, e.g. in case
+		of the Direct3D8 driver, it would return "Direct3D 8.1". */
 		virtual const wchar_t* getName() const = 0;
 
 		//! Adds an external image loader to the engine.
-		/** This is useful if
-		the Irrlicht Engine should be able to load textures of currently
-		unsupported file formats (e.g .gif). The IImageLoader only needs
-		to be implemented for loading this file format. A pointer to
-		the implementation can be passed to the engine using this method.
-		\param loader: Pointer to the external loader created. */
+		/** This is useful if the Irrlicht Engine should be able to load
+		textures of currently unsupported file formats (e.g. gif). The
+		IImageLoader only needs to be implemented for loading this file
+		format. A pointer to the implementation can be passed to the
+		engine using this method.
+		\param loader Pointer to the external loader created. */
 		virtual void addExternalImageLoader(IImageLoader* loader) = 0;
 
 		//! Adds an external image writer to the engine.
-		/** This is useful if
-		the Irrlicht Engine should be able to write textures of currently
-		unsupported file formats (e.g .gif). The IImageWriter only needs
-		to be implemented for writing this file format. A pointer to
-		the implementation can be passed to the engine using this method.
+		/** This is useful if the Irrlicht Engine should be able to
+		write textures of currently unsupported file formats (e.g
+		.gif). The IImageWriter only needs to be implemented for
+		writing this file format. A pointer to the implementation can
+		be passed to the engine using this method.
 		\param writer: Pointer to the external writer created. */
 		virtual void addExternalImageWriter(IImageWriter* writer) = 0;
 
 		//! Returns the maximum amount of primitives
-		/** (mostly vertices) which
-		the device is able to render with one drawIndexedTriangleList
-		call. */
+		/** (mostly vertices) which the device is able to render with
+		one drawIndexedTriangleList call.
+		\return Maximum amount of primitives. */
 		virtual u32 getMaximalPrimitiveCount() const = 0;
 
 		//! Enables or disables a texture creation flag.
-		/** This flag defines how
-		textures should be created. By changing this value, you can influence for example
-		the speed of rendering a lot. But please note that the video drivers
-		take this value only as recommendation. It could happen that you
-		enable the ETCM_ALWAYS_16_BIT mode, but the driver creates 32 bit
-		textures.
-		\param flag: Texture creation flag.
-		\param enabled: Specifies if the given flag should be enabled or disabled.*/
+		/** These flags define how textures should be created. By
+		changing this value, you can influence for example the speed of
+		rendering a lot. But please note that the video drivers take
+		this value only as recommendation. It could happen that you
+		enable the ETCF_ALWAYS_16_BIT mode, but the driver still creates
+		32 bit textures.
+		\param flag Texture creation flag.
+		\param enabled Specifies if the given flag should be enabled or
+		disabled. */
 		virtual void setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enabled) = 0;
 
 		//! Returns if a texture creation flag is enabled or disabled.
 		/** You can change this value using setTextureCreationMode().
-		\param flag: Texture creation flag.
-		\return Returns the current texture creation mode. */
+		\param flag Texture creation flag.
+		\return The current texture creation mode. */
 		virtual bool getTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag) const = 0;
 
 		//! Creates a software image from a file.
-		/** No hardware texture will
-		be created for this image. This method is useful for example if
-		you want to read a heightmap for a terrain renderer.
-		\param filename: Name of the file from which the image is created.
-		\return Returns the created image.
+		/** No hardware texture will be created for this image. This
+		method is useful for example if you want to read a heightmap
+		for a terrain renderer.
+		\param filename Name of the file from which the image is
+		created.
+		\return The created image.
 		If you no longer need the image, you should call IImage::drop().
 		See IReferenceCounted::drop() for more information. */
 		virtual IImage* createImageFromFile(const c8* filename) = 0;
 
 		//! Creates a software image from a file.
-		/** No hardware texture will
-		be created for this image. This method is useful for example if
-		you want to read a heightmap for a terrain renderer.
-		\param file: File from which the image is created.
-		\return Returns the created image.
+		/** No hardware texture will be created for this image. This
+		method is useful for example if you want to read a heightmap
+		for a terrain renderer.
+		\param file File from which the image is created.
+		\return The created image.
 		If you no longer need the image, you should call IImage::drop().
 		See IReferenceCounted::drop() for more information. */
 		virtual IImage* createImageFromFile(io::IReadFile* file) = 0;
 
-		//! Writes the provided image to disk file
-		/** Requires that there is a suitable image writer
-		registered for writing the image to disk
-		\param image: Image to write to disk
-		\param filename: name of the file to write
-		\param param: control parameter for the backend ( eq. compression level )
-		\return Returns true on success */
+		//! Writes the provided image to a file.
+		/** Requires that there is a suitable image writer registered
+		for writing the image.
+		\param image Image to write.
+		\param filename Name of the file to write.
+		\param param Control parameter for the backend (e.g. compression
+		level).
+		\return True on successful write. */
 		virtual bool writeImageToFile(IImage* image, const c8* filename, u32 param = 0) = 0;
 
 		//! Creates a software image from a byte array.
-		/** No hardware texture will
-		be created for this image. This method is useful for example if
-		you want to read a heightmap for a terrain renderer.
-		\param format: Desired color format of the texture
-		\param size: Desired size of the image
-		\param data: A byte array with pixel color information
-		\param ownForeignMemory: If true, the image will use the data pointer
-		directly and own it afterwards.
-		If false the memory will by copied internally.
-		\param deleteMemory: Whether the memory is deallocated upon destruction
-		\return Returns the created image.
+		/** No hardware texture will be created for this image. This
+		method is useful for example if you want to read a heightmap
+		for a terrain renderer.
+		\param format Desired color format of the texture
+		\param size Desired size of the image
+		\param data A byte array with pixel color information
+		\param ownForeignMemory If true, the image will use the data
+		pointer directly and own it afterwards. If false, the memory
+		will by copied internally.
+		\param deleteMemory Whether the memory is deallocated upon
+		destruction.
+		\return The created image.
 		If you no longer need the image, you should call IImage::drop().
 		See IReferenceCounted::drop() for more information. */
 		virtual IImage* createImageFromData(ECOLOR_FORMAT format,
@@ -694,113 +837,187 @@ namespace video
 			bool ownForeignMemory=false,
 			bool deleteMemory = true) = 0;
 
-		//! Only used by the internal engine.
-		/** Used to notify the driver that
-		the window was resized. Usually, there is no need to call this method. */
+		//! Creates an empty software image.
+		/**
+		\param format Desired color format of the image.
+		\param size Size of the image to create.
+		\return The created image.
+		If you no longer need the image, you should call IImage::drop().
+		See IReferenceCounted::drop() for more information. */
+		virtual IImage* createImage(ECOLOR_FORMAT format, const core::dimension2d<s32>& size) =0;
+
+		//! Creates a software image by converting it to given format from another image.
+		/**
+		\param format Desired color format of the image.
+		\param imageToCopy Image to copy to the new image.
+		\return The created image.
+		If you no longer need the image, you should call IImage::drop().
+		See IReferenceCounted::drop() for more information. */
+		virtual IImage* createImage(ECOLOR_FORMAT format, IImage *imageToCopy) =0;
+
+		//! Creates a software image from a part of another image.
+		/**
+		\param imageToCopy Image to copy the the new image in part.
+		\param pos Position of rectangle to copy.
+		\param size Extents of rectangle to copy.
+		\return The created image.
+		If you no longer need the image, you should call IImage::drop().
+		See IReferenceCounted::drop() for more information. */
+		virtual IImage* createImage(IImage* imageToCopy,
+				const core::position2d<s32>& pos,
+				const core::dimension2d<s32>& size) =0;
+
+		//! Event handler for resize events. Only used by the engine internally.
+		/** Used to notify the driver that the window was resized.
+		Usually, there is no need to call this method. */
 		virtual void OnResize(const core::dimension2d<s32>& size) = 0;
 
 		//! Adds a new material renderer to the video device.
-		/** Use this method to extend the VideoDriver with new MaterialTypes. To extend the
-		engine using this method do the following:
-		Derive a class from IMaterialRenderer and override the methods you need. For
-		setting the right renderstates, you can try to get a pointer to the real rendering device
-		using IVideoDriver::getExposedVideoData(). Add your class with
-		IVideoDriver::addMaterialRenderer(). To use an object being displayed
-		with your new material set the MaterialType member of the SMaterial struct to the
-		value returned by this method.
-		If you simply want to create a new material using vertex and/or pixel shaders it would
-		be easier to use the video::IGPUProgrammingServices interface which you can get using
-		the getGPUProgrammingServices() method.
-		\param renderer: A pointer to the new renderer.
-		\param name: Optional name for this registered material renderer entry.
-		\return Returns the number of the
-		material type which can be set in SMaterial::MaterialType to use the renderer.
-		-1 is returned if an error occured. (For example if you tried to add
-		an material renderer to the software renderer or the null device, which do not accept
-		material renderers.) */
+		/** Use this method to extend the VideoDriver with new material
+		types. To extend the engine using this method do the following:
+		Derive a class from IMaterialRenderer and override the methods
+		you need. For setting the right renderstates, you can try to
+		get a pointer to the real rendering device using
+		IVideoDriver::getExposedVideoData(). Add your class with
+		IVideoDriver::addMaterialRenderer(). To use an object being
+		displayed with your new material, set the MaterialType member of
+		the SMaterial struct to the value returned by this method.
+		If you simply want to create a new material using vertex and/or
+		pixel shaders it would be easier to use the
+		video::IGPUProgrammingServices interface which you can get
+		using the getGPUProgrammingServices() method.
+		\param renderer A pointer to the new renderer.
+		\param name Optional name for the material renderer entry.
+		\return The number of the material type which can be set in
+		SMaterial::MaterialType to use the renderer. -1 is returned if
+		an error occured. For example if you tried to add an material
+		renderer to the software renderer or the null device, which do
+		not accept material renderers. */
 		virtual s32 addMaterialRenderer(IMaterialRenderer* renderer, const c8* name = 0) = 0;
 
-		//! Returns pointer to material renderer or null if not existing.
-		/** \param idx: Id of the material renderer. Can be a value of the E_MATERIAL_TYPE enum or a
-		value which was returned by addMaterialRenderer(). */
+		//! Get access to a material renderer by index.
+		/** \param idx Id of the material renderer. Can be a value of
+		the E_MATERIAL_TYPE enum or a value which was returned by
+		addMaterialRenderer().
+		\return Pointer to material renderer or null if not existing. */
 		virtual IMaterialRenderer* getMaterialRenderer(u32 idx) = 0;
 
-		//! Returns amount of currently available material renderers.
+		//! Get amount of currently available material renderers.
+		/** \return Amount of currently available material renderers. */
 		virtual u32 getMaterialRendererCount() const = 0;
 
-		//! Returns name of the material renderer
-		/** This string can for example be used to test if a specific renderer already has
-		been registered/created, or use this string to store data about materials: This
-		returned name will be also used when serializing Materials.
-		\param idx: Id of the material renderer. Can be a value of the E_MATERIAL_TYPE enum or a
-		value which was returned by addMaterialRenderer(). */
+		//! Get name of a material renderer
+		/** This string can, e.g., be used to test if a specific
+		renderer already has been registered/created, or use this
+		string to store data about materials: This returned name will
+		be also used when serializing materials.
+		\param idx Id of the material renderer. Can be a value of the
+		E_MATERIAL_TYPE enum or a value which was returned by
+		addMaterialRenderer().
+		\return String with the name of the renderer, or 0 if not
+		exisiting */
 		virtual const c8* getMaterialRendererName(u32 idx) const = 0;
 
 		//! Sets the name of a material renderer.
 		/** Will have no effect on built-in material renderers.
-		\param idx: Id of the material renderer. Can be a value of the E_MATERIAL_TYPE enum or a
-		value which was returned by addMaterialRenderer().
+		\param idx: Id of the material renderer. Can be a value of the
+		E_MATERIAL_TYPE enum or a value which was returned by
+		addMaterialRenderer().
 		\param name: New name of the material renderer. */
 		virtual void setMaterialRendererName(s32 idx, const c8* name) = 0;
 
-		//! Creates material attributes list from a material, usable for serialization and more.
-		/** Please note that the videodriver will use the material renderer names from
-		getMaterialRendererName() to write out the material type name, so they should be set before. */
+		//! Creates material attributes list from a material
+		/** This method is useful for serialization and more.
+		Please note that the video driver will use the material
+		renderer names from getMaterialRendererName() to write out the
+		material type name, so they should be set before.
+		\param material The material to serialize.
+		\return The io::IAttributes container holding the material
+		properties. */
 		virtual io::IAttributes* createAttributesFromMaterial(const video::SMaterial& material) = 0;
 
 		//! Fills an SMaterial structure from attributes.
-		/** Please note that for setting material types of the material, the video driver
-		will need to query the material renderers for their names, so all non built-in materials must have been created before
-		calling this method. */
+		/** Please note that for setting material types of the
+		material, the video driver will need to query the material
+		renderers for their names, so all non built-in materials must
+		have been created before calling this method.
+		\param outMaterial The material to set the properties for.
+		\param attributes The attributes to read from. */
 		virtual void fillMaterialStructureFromAttributes(video::SMaterial& outMaterial, io::IAttributes* attributes) = 0;
 
 		//! Returns driver and operating system specific data about the IVideoDriver.
-		/** This method should only be used if the engine should be extended without having
-		to modify the source of the engine. */
+		/** This method should only be used if the engine should be
+		extended without having to modify the source of the engine.
+		\return Collection of device dependent pointers. */
 		virtual const SExposedVideoData& getExposedVideoData() = 0;
 
-		//! Returns type of video driver
+		//! Get type of video driver
+		/** \return Type of driver. */
 		virtual E_DRIVER_TYPE getDriverType() const = 0;
 
-		//! Returns pointer to the IGPUProgrammingServices interface.
-		/** Returns 0 if the
-		videodriver does not support this. (For example the Software and the NULL device
-		will always return 0) */
+		//! Gets the IGPUProgrammingServices interface.
+		/** \return Pointer to the IGPUProgrammingServices. Returns 0
+		if the video driver does not support this. For example the
+		Software driver and the Null driver will always return 0. */
 		virtual IGPUProgrammingServices* getGPUProgrammingServices() = 0;
 
+		//! Returns a pointer to the mesh manipulator.
+		virtual scene::IMeshManipulator* getMeshManipulator() = 0;
+
 		//! Clears the ZBuffer.
-		/** Note that you usually need not to call this method,
-		This is done automaticly during IVideoDriver::beginScene() or
-		IVideoDriver::setRenderTarget() if you specify zBuffer=true.
-		But if you have to render some special things, you can clear the zbuffer
-		during the rendering process with this method another time. */
+		/** Note that you usually need not to call this method, as it
+		is automatically done in IVideoDriver::beginScene() or
+		IVideoDriver::setRenderTarget() if you enable zBuffer. But if
+		you have to render some special things, you can clear the
+		zbuffer during the rendering process with this method any time.
+		*/
 		virtual void clearZBuffer() = 0;
 
-		//! Returns an image created from the last rendered frame.
+		//! Make a screenshot of the last rendered frame.
+		/** \return An image created from the last rendered frame. */
 		virtual IImage* createScreenShot() = 0;
 
-		//! looks if the image is already loaded
+		//! Check if the image is already loaded.
+		/** Works similar to getTexture(), but does not load the texture
+		if it is not currently loaded.
+		\param filename Name of the texture.
+		\return Pointer to loaded texture, or 0 if not found. */
 		virtual video::ITexture* findTexture(const c8* filename) = 0;
 
-		//! Set/unset a clipping plane.
-		//! There are at least 6 clipping planes available for the user to set at will.
-		//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
-		//! \param plane: The plane itself.
-		//! \param enable: If true, enable the clipping plane else disable it.
-		//! \return Returns true if the clipping plane is usable.
+		//! Set or unset a clipping plane.
+		/** There are at least 6 clipping planes available for the user
+		to set at will.
+		\param index The plane index. Must be between 0 and
+		MaxUserClipPlanes.
+		\param plane The plane itself.
+		\param enable If true, enable the clipping plane else disable
+		it.
+		\return True if the clipping plane is usable. */
 		virtual bool setClipPlane(u32 index, const core::plane3df& plane, bool enable=false) = 0;
 
-		//! Enable/disable a clipping plane.
-		//! There are at least 6 clipping planes available for the user to set at will.
-		//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
-		//! \param enable: If true, enable the clipping plane else disable it.
+		//! Enable or disable a clipping plane.
+		/** There are at least 6 clipping planes available for the user
+		to set at will.
+		\param index The plane index. Must be between 0 and
+		MaxUserClipPlanes.
+		\param enable If true, enable the clipping plane else disable
+		it. */
 		virtual void enableClipPlane(u32 index, bool enable) = 0;
 
-		//! Sets the driver's ambient light color.
-		/** This color is set in the scene manager, see ISceneManager.h.
-		\param color: New color of the ambient light. */
+		//! Returns the graphics card vendor name.
+		virtual core::stringc getVendorInfo() = 0;
+
+		//! Only used by the engine internally.
+		/** The ambient color is set in the scene manager, see
+		scene::ISceneManager::setAmbientLight().
+		\param color New color of the ambient light. */
 		virtual void setAmbientLight(const SColorf& color) = 0;
 
+		//! Only used by the engine internally.
+		/** Passes the global material flag AllowZWriteOnTransparent.
+		Use the SceneManager attribute to set this value from your app.
+		\param flag Default behavior is to disable ZWrite, i.e. false. */
+		virtual void setAllowZWriteOnTransparent(bool flag) = 0;
 	};
 
 } // end namespace video
@@ -809,3 +1026,5 @@ namespace video
 
 #endif
 
+
+
diff --git a/src/dep/include/irrlicht/IVideoModeList.h b/src/dep/include/irrlicht/IVideoModeList.h
index d65a6f6..9ce5741 100644
--- a/src/dep/include/irrlicht/IVideoModeList.h
+++ b/src/dep/include/irrlicht/IVideoModeList.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,7 +14,7 @@ namespace video
 {
 
 	//! A list of all available video modes.
-	/** You can get a list via IrrlichtDevice::getVideoModeList(). If you are confused 
+	/** You can get a list via IrrlichtDevice::getVideoModeList(). If you are confused
 	now, because you think you have to create an Irrlicht Device with a video
 	mode before being able to get the video mode list, let me tell you that
 	there is no need to start up an Irrlicht Device with EDT_DIRECT3D8, EDT_OPENGL or
@@ -24,29 +24,33 @@ namespace video
 	{
 	public:
 
-		//! destructor
-		virtual ~IVideoModeList() {}
-
 		//! Gets amount of video modes in the list.
-		//! \return Returns amount of video modes.
+		/** \return Returns amount of video modes. */
 		virtual s32 getVideoModeCount() const = 0;
 
-		//! Returns the screen size of a video mode in pixels.
-		//! \param modeNumber: zero based index of the video mode.
-		//! \return Returns size of screen in pixels of the specified video mode.
+		//! Get the screen size of a video mode in pixels.
+		/** \param modeNumber: zero based index of the video mode.
+		\return Size of screen in pixels of the specified video mode. */
 		virtual core::dimension2d<s32> getVideoModeResolution(s32 modeNumber) const = 0;
 
-		//! Returns the pixel depth of a video mode in bits.
-		//! \param modeNumber: zero based index of the video mode.
-		//! \return Returns the size of each pixel of the specified video mode in bits.
+		//! Get a supported screen size with certain constraints.
+		/** \param minSize: Minimum dimensions required.
+		\param maxSize: Maximum dimensions allowed.
+		\return Size of screen in pixels which matches the requirements.
+		as good as possible. */
+		virtual core::dimension2d<s32> getVideoModeResolution(const core::dimension2d<s32>& minSize, const core::dimension2d<s32>& maxSize) const = 0;
+
+		//! Get the pixel depth of a video mode in bits.
+		/** \param modeNumber: zero based index of the video mode.
+		\return Size of each pixel of the specified video mode in bits. */
 		virtual s32 getVideoModeDepth(s32 modeNumber) const = 0;
 
-		//! Returns current desktop screen resolution.
-		//! \return Returns size of screen in pixels of the current desktop video mode.
-		virtual core::dimension2d<s32> getDesktopResolution() const = 0;
+		//! Get current desktop screen resolution.
+		/** \return Size of screen in pixels of the current desktop video mode. */
+		virtual const core::dimension2d<s32>& getDesktopResolution() const = 0;
 
-		//! Returns the pixel depth of a video mode in bits.
-		//! \return Returns the size of each pixel of the current desktop video mode in bits.
+		//! Get the pixel depth of a video mode in bits.
+		/** \return Size of each pixel of the current desktop video mode in bits. */
 		virtual s32 getDesktopDepth() const = 0;
 	};
 
diff --git a/src/dep/include/irrlicht/IWriteFile.h b/src/dep/include/irrlicht/IWriteFile.h
index 49fe565..4f1a694 100644
--- a/src/dep/include/irrlicht/IWriteFile.h
+++ b/src/dep/include/irrlicht/IWriteFile.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,29 +16,26 @@ namespace io
 	class IWriteFile : public virtual IReferenceCounted
 	{
 	public:
-
-		virtual ~IWriteFile() {}
-
 		//! Writes an amount of bytes to the file.
-		//! \param buffer: Pointer to buffer of bytes to write.
-		//! \param sizeToWrite: Amount of bytes to write to the file.
-		//! \return Returns how much bytes were written.
+		/** \param buffer Pointer to buffer of bytes to write.
+		\param sizeToWrite Amount of bytes to write to the file.
+		\return How much bytes were written. */
 		virtual s32 write(const void* buffer, u32 sizeToWrite) = 0;
 
-		//! Changes position in file, returns true if successful.
-		//! \param finalPos: Destination position in the file.
-		//! \param relativeMovement: If set to true, the position in the file is
-		//! changed relative to current position. Otherwise the position is changed 
-		//! from begin of file.		
-		//! \return Returns true if successful, otherwise false.
+		//! Changes position in file
+		/** \param finalPos Destination position in the file.
+		\param relativeMovement If set to true, the position in the file is
+		changed relative to current position. Otherwise the position is changed
+		from begin of file.
+		\return True if successful, otherwise false. */
 		virtual bool seek(long finalPos, bool relativeMovement = false) = 0;
 
-		//! Returns the current position in the file.
-		//! \return Returns the current position in the file in bytes.
+		//! Get the current position in the file.
+		/** \return Current position in the file in bytes. */
 		virtual long getPos() const = 0;
 
-		//! Returns name of file.
-		//! \return Returns the file name as zero terminated character string.
+		//! Get name of file.
+		/** \return File name as zero terminated character string. */
 		virtual const c8* getFileName() const = 0;
 	};
 
diff --git a/src/dep/include/irrlicht/IXMLReader.h b/src/dep/include/irrlicht/IXMLReader.h
index ca6ee2a..d0bec49 100644
--- a/src/dep/include/irrlicht/IXMLReader.h
+++ b/src/dep/include/irrlicht/IXMLReader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -12,16 +12,16 @@ namespace irr
 {
 namespace io
 {
-	//! A xml reader for wide characters, derived from IReferenceCounted.
-	//! This XML Parser can read any type of text files from any source where irrlicht
-	//! can read. Just call IFileSystem::createXMLReader(). 
-	//! For more informations on how to use the parser, see IIrrXMLReader
+	//! An xml reader for wide characters, derived from IReferenceCounted.
+	/** This XML Parser can read any type of text files from any source
+	Irrlicht can read. Just call IFileSystem::createXMLReader(). For more
+	informations on how to use the parser, see IIrrXMLReader */
 	typedef IIrrXMLReader<wchar_t, IReferenceCounted> IXMLReader;
 
-	//! A xml reader for ASCII or UTF-8 characters, derived from IReferenceCounted.
-	//! This XML Parser can read any type of text files from any source where irrlicht
-	//! can read. Just call IFileSystem::createXMLReaderUTF8(). 
-	//! For more informations on how to use the parser, see IIrrXMLReader
+	//! An xml reader for ASCII or UTF-8 characters, derived from IReferenceCounted.
+	/** This XML Parser can read any type of text files from any source
+	Irrlicht can read. Just call IFileSystem::createXMLReaderUTF8(). For
+	more informations on how to use the parser, see IIrrXMLReader */
 	typedef IIrrXMLReader<c8, IReferenceCounted> IXMLReaderUTF8;
 
 } // end namespace io
diff --git a/src/dep/include/irrlicht/IXMLWriter.h b/src/dep/include/irrlicht/IXMLWriter.h
index 79cd639..d75e0fd 100644
--- a/src/dep/include/irrlicht/IXMLWriter.h
+++ b/src/dep/include/irrlicht/IXMLWriter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,9 +15,8 @@ namespace io
 {
 
 	//! Interface providing methods for making it easier to write XML files.
-	/** This XML Writer only writes UTF-16 xml files, because these are parsed 
-	faster than all other formats by IXMLReader.
-	*/
+	/** This XML Writer writes xml files using in the platform dependent 
+	wchar_t format and sets the xml-encoding correspondingly. */
 	class IXMLWriter : public virtual IReferenceCounted
 	{
 	public:
@@ -25,26 +24,29 @@ namespace io
 		//! Destructor
 		virtual ~IXMLWriter() {}
 
-		//! Writes a xml 1.0 header like &lt;?xml version="1.0"?&gt;. This should
-		//! always be called before writing anything other, because also the
-		//! text file header for unicode texts is written out with this method.
+		//! Writes an xml 1.0 header.
+		/** Looks like &lt;?xml version="1.0"?&gt;. This should always
+		be called before writing anything other, because also the text
+		file header for unicode texts is written out with this method. */
 		virtual void writeXMLHeader() = 0;
 
 		//! Writes an xml element with maximal 5 attributes like "<foo />" or
-		//! &lt;foo optAttr="value" /&gt;. The element can be empty or not.
-		//! \param name: Name of the element
-		//! \param empty: Specifies if the element should be empty. Like "<foo />". If
-		//! You set this to false, something like this is written instead: "<foo>".
-		//! \param attr1Name: 1st attributes name
-		//! \param attr1Value: 1st attributes value
-		//! \param attr2Name: 2nd attributes name
-		//! \param attr2Value: 2nd attributes value
-		//! \param attr3Name: 3rd attributes name
-		//! \param attr3Value: 3rd attributes value
-		//! \param attr4Name: 4th attributes name
-		//! \param attr4Value: 4th attributes value
-		//! \param attr5Name: 5th attributes name
-		//! \param attr5Value: 5th attributes value
+		//! &lt;foo optAttr="value" /&gt;.
+		/** The element can be empty or not.
+		\param name: Name of the element
+		\param empty: Specifies if the element should be empty. Like
+		"<foo />". If You set this to false, something like this is
+		written instead: "<foo>".
+		\param attr1Name: 1st attributes name
+		\param attr1Value: 1st attributes value
+		\param attr2Name: 2nd attributes name
+		\param attr2Value: 2nd attributes value
+		\param attr3Name: 3rd attributes name
+		\param attr3Value: 3rd attributes value
+		\param attr4Name: 4th attributes name
+		\param attr4Value: 4th attributes value
+		\param attr5Name: 5th attributes name
+		\param attr5Value: 5th attributes value */
 		virtual void writeElement(const wchar_t* name, bool empty=false,
 			const wchar_t* attr1Name = 0, const wchar_t* attr1Value = 0,
 			const wchar_t* attr2Name = 0, const wchar_t* attr2Value = 0,
@@ -62,8 +64,10 @@ namespace io
 		//! Writes the closing tag for an element. Like "</foo>"
 		virtual void writeClosingTag(const wchar_t* name) = 0;
 
-		//! Writes a text into the file. All occurrences of special characters like
-		//! & (&amp;), < (&lt;), > (&gt;), and " (&quot;) are automaticly replaced.
+		//! Writes a text into the file.
+		/** All occurrences of special characters such as
+		& (&amp;), < (&lt;), > (&gt;), and " (&quot;) are automaticly
+		replaced. */
 		virtual void writeText(const wchar_t* text) = 0;
 
 		//! Writes a line break
diff --git a/src/dep/include/irrlicht/IrrCompileConfig.h b/src/dep/include/irrlicht/IrrCompileConfig.h
index 24c8a79..90a9c19 100644
--- a/src/dep/include/irrlicht/IrrCompileConfig.h
+++ b/src/dep/include/irrlicht/IrrCompileConfig.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,7 +6,9 @@
 #define __IRR_COMPILE_CONFIG_H_INCLUDED__
 
 //! Irrlicht SDK Version
-#define IRRLICHT_SDK_VERSION "1.4"
+#define IRRLICHT_SDK_VERSION "1.5"
+
+#include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
 
 //! The defines for different operating system are:
 //! _IRR_XBOX_PLATFORM_ for XBox
@@ -14,17 +16,23 @@
 //! _IRR_WINDOWS_API_ for Windows or XBox
 //! _IRR_LINUX_PLATFORM_ for Linux (it is defined here if no other os is defined)
 //! _IRR_SOLARIS_PLATFORM_ for Solaris
+//! _IRR_OSX_PLATFORM_ for Apple systems running OSX
 //! _IRR_POSIX_API_ for Posix compatible systems
 //! _IRR_USE_SDL_DEVICE_ for platform independent SDL framework
 //! _IRR_USE_WINDOWS_DEVICE_ for Windows API based device
+//! _IRR_USE_WINDOWS_CE_DEVICE_ for Windows CE API based device
 //! _IRR_USE_LINUX_DEVICE_ for X11 based device
-//! MACOSX for Mac OS X
+//! _IRR_USE_OSX_DEVICE_ for Cocoa native windowing on OSX
+//! Note: PLATFORM defines the OS specific layer, API can groups several platforms
+//! DEVICE is the windowing system used, several PLATFORMs support more than one DEVICE
+//! Moreover, the DEVICE defined here is not directly related to the Irrlicht devices created in the app (but may depend on each other).
 
 //#define _IRR_USE_SDL_DEVICE_ 1
 
 //! WIN32 for Windows32
 //! WIN64 for Windows64
-#if defined(WIN32) || defined(WIN64)
+// The windows platform and API support SDL and WINDOW device
+#if defined(_WIN32) || defined(_WIN64) || defined(WIN32) || defined(WIN64) || defined(_WIN32_WCE)
 #define _IRR_WINDOWS_
 #define _IRR_WINDOWS_API_
 #ifndef _IRR_USE_SDL_DEVICE_
@@ -32,12 +40,24 @@
 #endif
 #endif
 
+// XBox only suppots the native Window stuff
 #if defined(_XBOX)
 #define _IRR_XBOX_PLATFORM_
 #define _IRR_WINDOWS_API_
+#define _IRR_USE_WINDOWS_DEVICE_
 #endif
 
-#if !defined(_IRR_WINDOWS_API_) && !defined(MACOSX)
+#if defined(__APPLE__) || defined(MACOSX)
+#if !defined(MACOSX)
+#define MACOSX // legacy support
+#endif
+#define _IRR_OSX_PLATFORM_
+#if !defined(_IRR_USE_LINUX_DEVICE_) // for X11 windowing declare this
+#define _IRR_USE_OSX_DEVICE_
+#endif
+#endif
+
+#if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_)
 #if defined(__sparc__) || defined(__sun__)
 #define __BIG_ENDIAN__
 #define _IRR_SOLARIS_PLATFORM_
@@ -51,7 +71,8 @@
 #endif
 #endif
 
-#include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
+//! Define _IRR_COMPILE_WITH_JOYSTICK_SUPPORT_ if you want joystick events.
+#define _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
 
 //! Define _IRR_COMPILE_WITH_DIRECT3D_8_ and _IRR_COMPILE_WITH_DIRECT3D_9_ to
 //! compile the Irrlicht engine with Direct3D8 and/or DIRECT3D9.
@@ -61,9 +82,16 @@ directX header files, and directX is only available on windows platforms. If you
 are using Dev-Cpp, and want to compile this using a DX dev pack, you can define
 _IRR_COMPILE_WITH_DX9_DEV_PACK_. So you simply need to add something like this
 to the compiler settings: -DIRR_COMPILE_WITH_DX9_DEV_PACK
-and this to the linker settings: -ld3dx9 -ld3dx8 **/
+and this to the linker settings: -ld3dx9 -ld3dx8
+
+Microsoft have chosen to remove D3D8 headers from their recent DXSDKs, and 
+so D3D8 support is now disabled by default.  If you really want to build 
+with D3D8 support, then you will have to source a DXSDK with the appropriate 
+headers, e.g. Summer 2004.  This is a Microsoft issue, not an Irrlicht one.
+*/
 #if defined(_IRR_WINDOWS_API_) && (!defined(__GNUC__) || defined(IRR_COMPILE_WITH_DX9_DEV_PACK))
 
+//! Only define _IRR_COMPILE_WITH_DIRECT3D_8_ if you have an appropriate DXSDK, e.g. Summer 2004 
 //#define _IRR_COMPILE_WITH_DIRECT3D_8_
 #define _IRR_COMPILE_WITH_DIRECT3D_9_
 
@@ -92,13 +120,13 @@ define out. */
 //! Define _IRR_OPENGL_USE_EXTPOINTER_ if the OpenGL renderer should use OpenGL extensions via function pointers.
 /** On some systems there is no support for the dynamic extension of OpenGL
 	via function pointers such that this has to be undef'ed. */
-#if !defined(MACOSX) && !defined(_IRR_SOLARIS_PLATFORM_)
+#if !defined(_IRR_OSX_PLATFORM_) && !defined(_IRR_SOLARIS_PLATFORM_)
 #define _IRR_OPENGL_USE_EXTPOINTER_
 #endif
 
 //! On some Linux systems the XF86 vidmode extension or X11 RandR are missing. Use these flags
 //! to remove the dependencies such that Irrlicht will compile on those systems, too.
-#if defined(_IRR_LINUX_PLATFORM_)
+#if defined(_IRR_LINUX_PLATFORM_) && defined(_IRR_COMPILE_WITH_X11_)
 #define _IRR_LINUX_X11_VIDMODE_
 //#define _IRR_LINUX_X11_RANDR_
 #endif
@@ -154,44 +182,13 @@ watch registers, variables etc. This works with ASM, HLSL, and both with pixel a
 Note that the engine will run in D3D REF for this, which is a lot slower than HAL. */
 #define _IRR_D3D_NO_SHADER_DEBUGGING
 
-
-#ifdef _IRR_WINDOWS_API_
-
-#ifndef _IRR_STATIC_LIB_
-#ifdef IRRLICHT_EXPORTS
-#define IRRLICHT_API __declspec(dllexport)
-#else
-#define IRRLICHT_API __declspec(dllimport)
-#endif // IRRLICHT_EXPORT
-#else
-#define IRRLICHT_API
-#endif // _IRR_STATIC_LIB_
-
-// Declare the calling convention.
-#if defined(_STDCALL_SUPPORTED)
-#define IRRCALLCONV __stdcall
-#else
-#define IRRCALLCONV __cdecl
-#endif // STDCALL_SUPPORTED
-
-#else
-#define IRRLICHT_API
-#define IRRCALLCONV
-#endif // _IRR_WINDOWS_API_
-
-// We need to disable DIRECT3D9 support for Visual Studio 6.0 because
-// those $%&$!! disabled support for it since Dec. 2004 and users are complaining
-// about linker errors. Comment this out only if you are knowing what you are
-// doing. (Which means you have an old DX9 SDK and VisualStudio6).
-#ifdef _MSC_VER
-#if (_MSC_VER < 1300 && !defined(__GNUC__))
-#undef _IRR_COMPILE_WITH_DIRECT3D_9_
-#pragma message("Compiling Irrlicht with Visual Studio 6.0, support for DX9 is disabled.")
-#endif
-#endif
+//! Define _IRR_USE_NVIDIA_PERFHUD_ to opt-in to using the nVidia PerHUD tool
+/** Enable, by opting-in, to use the nVidia PerfHUD performance analysis driver
+tool <http://developer.nvidia.com/object/nvperfhud_home.html>. */
+#undef _IRR_USE_NVIDIA_PERFHUD_
 
 //! Define one of the three setting for Burning's Video Software Rasterizer
-/** So if we were marketing guys we could says Irrlicht has 4 Software-Rasterizers.
+/** So if we were marketing guys we could say Irrlicht has 4 Software-Rasterizers.
 	In a Nutshell:
 		All Burnings Rasterizers use 32 Bit Backbuffer, 32Bit Texture & 32 Bit Z or WBuffer,
 		16 Bit/32 Bit can be adjusted on a global flag.
@@ -255,6 +252,8 @@ B3D, MS3D or X meshes */
 #define _IRR_COMPILE_WITH_OCT_LOADER_
 //! Define _IRR_COMPILE_WITH_OGRE_LOADER_ if you want to load Ogre 3D files
 #define _IRR_COMPILE_WITH_OGRE_LOADER_
+//! Define _IRR_COMPILE_WITH_LWO_LOADER_ if you want to load Lightwave3D files
+#define _IRR_COMPILE_WITH_LWO_LOADER_
 //! Define _IRR_COMPILE_WITH_STL_LOADER_ if you want to load .stl files
 #define _IRR_COMPILE_WITH_STL_LOADER_
 
@@ -264,8 +263,11 @@ B3D, MS3D or X meshes */
 #define _IRR_COMPILE_WITH_COLLADA_WRITER_
 //! Define _IRR_COMPILE_WITH_STL_WRITER_ if you want to write .stl files
 #define _IRR_COMPILE_WITH_STL_WRITER_
+//! Define _IRR_COMPILE_WITH_OBJ_WRITER_ if you want to write .obj files
+#define _IRR_COMPILE_WITH_OBJ_WRITER_
 
 //! Define _IRR_COMPILE_WITH_BMP_LOADER_ if you want to load .bmp files
+//! Disabling this loader will also disable the built-in font
 #define _IRR_COMPILE_WITH_BMP_LOADER_
 //! Define _IRR_COMPILE_WITH_JPG_LOADER_ if you want to load .jpg files
 #define _IRR_COMPILE_WITH_JPG_LOADER_
@@ -279,6 +281,8 @@ B3D, MS3D or X meshes */
 #define _IRR_COMPILE_WITH_PSD_LOADER_
 //! Define _IRR_COMPILE_WITH_TGA_LOADER_ if you want to load .tga files
 #define _IRR_COMPILE_WITH_TGA_LOADER_
+//! Define _IRR_COMPILE_WITH_WAL_LOADER_ if you want to load .wal files
+#define _IRR_COMPILE_WITH_WAL_LOADER_
 
 //! Define _IRR_COMPILE_WITH_BMP_WRITER_ if you want to write .bmp files
 #define _IRR_COMPILE_WITH_BMP_WRITER_
@@ -299,16 +303,70 @@ B3D, MS3D or X meshes */
 /** Irrlicht should use approximate float and integer fpu techniques
 precision will be lower but speed higher. currently X86 only
 */
-#if !defined(MACOSX) && !defined(_IRR_SOLARIS_PLATFORM_)
+#if !defined(_IRR_OSX_PLATFORM_) && !defined(_IRR_SOLARIS_PLATFORM_)
 	//#define IRRLICHT_FAST_MATH
 #endif
 
-// Some cleanup
+// Some cleanup and standard stuff
+
+#ifdef _IRR_WINDOWS_API_
+
+// To build Irrlicht as a static library, you must define _IRR_STATIC_LIB_ in both the
+// Irrlicht build, *and* in the user application, before #including <irrlicht.h>
+#ifndef _IRR_STATIC_LIB_
+#ifdef IRRLICHT_EXPORTS
+#define IRRLICHT_API __declspec(dllexport)
+#else
+#define IRRLICHT_API __declspec(dllimport)
+#endif // IRRLICHT_EXPORT
+#else
+#define IRRLICHT_API
+#endif // _IRR_STATIC_LIB_
+
+// Declare the calling convention.
+#if defined(_STDCALL_SUPPORTED)
+#define IRRCALLCONV __stdcall
+#else
+#define IRRCALLCONV __cdecl
+#endif // STDCALL_SUPPORTED
+
+#else
+#define IRRLICHT_API
+#define IRRCALLCONV
+#endif // _IRR_WINDOWS_API_
+
+// We need to disable DIRECT3D9 support for Visual Studio 6.0 because
+// those $%&$!! disabled support for it since Dec. 2004 and users are complaining
+// about linker errors. Comment this out only if you are knowing what you are
+// doing. (Which means you have an old DX9 SDK and VisualStudio6).
+#ifdef _MSC_VER
+#if (_MSC_VER < 1300 && !defined(__GNUC__))
+#undef _IRR_COMPILE_WITH_DIRECT3D_9_
+#pragma message("Compiling Irrlicht with Visual Studio 6.0, support for DX9 is disabled.")
+#endif
+#endif
+
 // XBox does not have OpenGL or DirectX9
 #if defined(_IRR_XBOX_PLATFORM_)
 #undef _IRR_COMPILE_WITH_OPENGL_
 #undef _IRR_COMPILE_WITH_DIRECT3D_9_
 #endif
 
+// WinCE does not have OpenGL or DirectX9
+#if defined(_WIN32_WCE)
+	#undef _IRR_COMPILE_WITH_OPENGL_
+	#undef _IRR_COMPILE_WITH_DIRECT3D_8_
+	#undef _IRR_COMPILE_WITH_DIRECT3D_9_
+	#undef _IRR_COMPILE_WITH_SOFTWARE_
+	#undef BURNINGVIDEO_RENDERER_BEAUTIFUL
+	#undef _IRR_USE_WINDOWS_DEVICE_
+	#define _IRR_USE_WINDOWS_CE_DEVICE_
+	#define BURNINGVIDEO_RENDERER_CE
+#endif
+
+#if defined(_IRR_SOLARIS_PLATFORM_)
+#undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+#endif
+
 #endif // __IRR_COMPILE_CONFIG_H_INCLUDED__
 
diff --git a/src/dep/include/irrlicht/IrrlichtDevice.h b/src/dep/include/irrlicht/IrrlichtDevice.h
index f126af9..ef7bad1 100644
--- a/src/dep/include/irrlicht/IrrlichtDevice.h
+++ b/src/dep/include/irrlicht/IrrlichtDevice.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -32,101 +32,101 @@ namespace irr
 		class ISceneManager;
 	} // end namespace scene
 
-	//! The Irrlicht device. You can create it with createDevice() or createDeviceEx(). 
+	//! The Irrlicht device. You can create it with createDevice() or createDeviceEx().
 	/** This is the most important class of the Irrlicht Engine. You can access everything
-	in the engine if you have a pointer to an instance of this class. 
+	in the engine if you have a pointer to an instance of this class.
+	There should be only one instance of this class at any time.
 	*/
 	class IrrlichtDevice : public virtual IReferenceCounted
 	{
 	public:
 
-		//! destructor
-		virtual ~IrrlichtDevice() {}
+		//! Runs the device.
+		/** Also increments the virtual timer by calling
+		ITimer::tick();. You can prevent this
+		by calling ITimer::stop(); before and ITimer::start() after
+		calling IrrlichtDevice::run(). Returns false if device wants
+		to be deleted. Use it in this way:
+		\code
+		while(device->run())
+		{
+			// draw everything here
+		}
+		\endcode
+		If you want the device to do nothing if the window is inactive
+		(recommended), use the slightly enhanced code shown at isWindowActive().
 
-        //! Runs the device. 
-		/** Also increments the virtual timer by calling ITimer::tick();. You can prevent this
-		by calling ITimer::stop(); before and ITimer::start() after calling IrrlichtDevice::run().
-		Returns false if device wants to be deleted. Use it in this way:
-		\code
-while(device->run())
-{
-  // draw everything here
-}
-		\endcode 
-		If you want the device to do nothing if the window is inactive (recommended),
-		use this slightly enhanced code instead:
-		\code
-while(device->run())
-  if (device->isWindowActive())
-  {
-    // draw everything here
-  }
-		\endcode 
-		Note if you are running Irrlicht inside an external, custom created window:
-		Calling	Device->run() will cause Irrlicht to dispatch windows messages internally.
-		If you are running Irrlicht in your own, custom window, you 
-		you can also simply use your own message loop
-		using GetMessage, DispatchMessage and whatever and simply don't use this method.
-		But note that Irrlicht will not be able to fetch user input then. See 
-		irr::SIrrlichtCreationParameters::WindowId for more informations and example code.
+		Note if you are running Irrlicht inside an external, custom
+		created window: Calling Device->run() will cause Irrlicht to
+		dispatch windows messages internally.
+		If you are running Irrlicht in your own custom window, you can
+		also simply use your own message loop using GetMessage,
+		DispatchMessage and whatever and simply don't use this method.
+		But note that Irrlicht will not be able to fetch user input
+		then. See irr::SIrrlichtCreationParameters::WindowId for more
+		informations and example code.
 		*/
 		virtual bool run() = 0;
 
-		//! Cause the device to temporarily pause execution and let other processes to run
-		// This should bring down processor usage without major performance loss for Irrlicht
+		//! Cause the device to temporarily pause execution and let other processes run.
+		/** This should bring down processor usage without major
+		performance loss for Irrlicht */
 		virtual void yield() = 0;
 
 		//! Pause execution and let other processes to run for a specified amount of time.
 		/** It may not wait the full given time, as sleep may be interrupted
-		\param timeMs: Time to sleep for in milisecs. 
+		\param timeMs: Time to sleep for in milisecs.
 		\param pauseTimer: If true, pauses the device timer while sleeping
 		*/
 		virtual void sleep(u32 timeMs, bool pauseTimer=false) = 0;
 
 		//! Provides access to the video driver for drawing 3d and 2d geometry.
-		/** \return Returns a pointer the video driver. */
+		/** \return Pointer the video driver. */
 		virtual video::IVideoDriver* getVideoDriver() = 0;
 
 		//! Provides access to the virtual file system.
-		/** \return Returns a pointer to the file system. */
+		/** \return Pointer to the file system. */
 		virtual io::IFileSystem* getFileSystem() = 0;
 
 		//! Provides access to the 2d user interface environment.
-		/** \return Returns a pointer to the gui environment. */
+		/** \return Pointer to the gui environment. */
 		virtual gui::IGUIEnvironment* getGUIEnvironment() = 0;
 
-		//! \return Returns a pointer to the scene manager.
+		//! Provides access to the scene manager.
+		/** \return Pointer to the scene manager. */
 		virtual scene::ISceneManager* getSceneManager() = 0;
 
 		//! Provides access to the cursor control.
-		/** \return Returns a pointer to the mouse cursor control interface. */
+		/** \return Pointer to the mouse cursor control interface. */
 		virtual gui::ICursorControl* getCursorControl() = 0;
 
-		//! Provides access to the logger. 
-		/** \return Returns a pointer to the logger. */
+		//! Provides access to the message logger.
+		/** \return Pointer to the logger. */
 		virtual ILogger* getLogger() = 0;
 
-		//! Gets a list with all video modes available. 
-		/** If you are confused 
-		now, because you think you have to create an Irrlicht Device with a video
-		mode before being able to get the video mode list, let me tell you that
-		there is no need to start up an Irrlicht Device with EDT_DIRECT3D8, EDT_OPENGL or
-		EDT_SOFTWARE: For this (and for lots of other reasons) the null device,
-		EDT_NULL exists.
-		\return Returns a pointer to a list with all video modes supported
+		//! Gets a list with all video modes available.
+		/** If you are confused now, because you think you have to
+		create an Irrlicht Device with a video mode before being able
+		to get the video mode list, let me tell you that there is no
+		need to start up an Irrlicht Device with EDT_DIRECT3D8,
+		EDT_OPENGL or EDT_SOFTWARE: For this (and for lots of other
+		reasons) the null driver, EDT_NULL exists.
+		\return Pointer to a list with all video modes supported
 		by the gfx adapter. */
 		virtual video::IVideoModeList* getVideoModeList() = 0;
 
-		//! Returns the operation system opertator object.
-		/** It provides methods for
-		getting operation system specific informations and doing operation system
-		specific operations. Like for example exchanging data with the clipboard
-		or reading the operation system version. */
+		//! Provides access to the operation system operator object.
+		/** The OS operator provides methods for
+		getting system specific informations and doing system
+		specific operations, such as exchanging data with the clipboard
+		or reading the operation system version.
+		\return Pointer to the OS operator. */
 		virtual IOSOperator* getOSOperator() = 0;
 
-		//! Returns pointer to the timer.
-		/** \return Returns a pointer to the ITimer object. The system time can be retrieved by it as
-		well as the virtual time, which also can be manipulated. */
+		//! Provides access to the engine's timer.
+		/** The system time can be retrieved by it as
+		well as the virtual time, which also can be manipulated.
+		\return Pointer to the ITimer object. */
 		virtual ITimer* getTimer() = 0;
 
 		//! Sets the caption of the window.
@@ -134,47 +134,89 @@ while(device->run())
 		virtual void setWindowCaption(const wchar_t* text) = 0;
 
 		//! Returns if the window is active.
-		/** \return Returns true if window is active. If the window is inactive,
-		nothing need to be drawn. So if you don't want to draw anything when
-		the window is inactive, create your drawing loop this way:
+		/** If the window is inactive,
+		nothing needs to be drawn. So if you don't want to draw anything
+		when the window is inactive, create your drawing loop this way:
 		\code
-while(device->run())
-  if (device->isWindowActive())
-  {
-    // draw everything here
-  }
-		\endcode */
+		while(device->run())
+		{
+			if (device->isWindowActive())
+			{
+				// draw everything here
+			}
+			else
+				device->yield();
+		}
+		\endcode
+		\return True if window is active. */
 		virtual bool isWindowActive() const = 0;
 
+		//! Checks if the Irrlicht window has focus
+		/** \return True if window has focus. */
+		virtual bool isWindowFocused() const = 0;
+
+		//! Checks if the Irrlicht window is minimized
+		/** \return True if window is minimized. */
+		virtual bool isWindowMinimized() const = 0;
+
+		//! Checks if the Irrlicht window is running in fullscreen mode
+		/** \return True if window is fullscreen. */
+		virtual bool isFullscreen() const = 0;
+
+		//! Get the current color format of the window
+		/** \return Color format of the window. */
+		virtual video::ECOLOR_FORMAT getColorFormat() const = 0;
+
 		//! Notifies the device that it should close itself.
 		/** IrrlichtDevice::run() will always return false after closeDevice() was called. */
 		virtual void closeDevice() = 0;
 
-		//! Returns the version of the engine.
+		//! Get the version of the engine.
 		/** The returned string
-		will look like this: "1.2.3" or this: "1.2". */
+		will look like this: "1.2.3" or this: "1.2".
+		\return String which contains the version. */
 		virtual const c8* getVersion() const = 0;
 
-		//! Sets a new event receiver to receive events.
+		//! Sets a new user event receiver which will receive events from the engine. 
+		/** Return true in IEventReceiver::OnEvent to prevent the event from continuing along 
+		the chain of event receivers. The path that an event takes through the system depends
+		on its type. See irr::EEVENT_TYPE for details.
+		\param receiver New receiver to be used. */
 		virtual void setEventReceiver(IEventReceiver* receiver) = 0;
 
-		//! Returns poinhter to the current event receiver. Returns 0 if there is none.
+		//! Provides access to the current event receiver.
+		/** \return Pointer to the current event receiver. Returns 0 if there is none. */
 		virtual IEventReceiver* getEventReceiver() = 0;
 
 		//! Sends a user created event to the engine.
-		/** Is is usually not necessary to use this. However, if you are using an own
-		input library for example for doing joystick input, you can use this to post key or mouse input 
-		events to the engine. Internally, this method only delegates the events further to the 
-		scene manager and the GUI environment. */
-		virtual void postEventFromUser(const SEvent& event) = 0;
+		/** Is is usually not necessary to use this. However, if you
+		are using an own input library for example for doing joystick
+		input, you can use this to post key or mouse input events to
+		the engine. Internally, this method only delegates the events
+		further to the scene manager and the GUI environment. */
+		virtual bool postEventFromUser(const SEvent& event) = 0;
 
-		//! Sets the input receiving scene manager. 
-		/** If set to null, the main scene manager (returned by GetSceneManager()) will receive the input */
+		//! Sets the input receiving scene manager.
+		/** If set to null, the main scene manager (returned by
+		GetSceneManager()) will receive the input
+		\param sceneManager New scene manager to be used. */
 		virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager) = 0;
 
 		//! Sets if the window should be resizeable in windowed mode.
-		/** The default is false. This method only works in windowed mode. */
+		/** The default is false. This method only works in windowed
+		mode.
+		\param resize Flag whether the window should be resizeable. */
 		virtual void setResizeAble(bool resize=false) = 0;
+
+		//! Activate any joysticks, and generate events for them.
+		/** Irrlicht contains support for joysticks, but does not generate joystick events by default,
+		as this would consume joystick info that 3rd party libraries might rely on. Call this method to 
+		activate joystick support in Irrlicht and to receive irr::SJoystickEvent events.
+		\param joystickInfo On return, this will contain an array of each joystick that was found and activated.
+		\return true if joysticks are supported on this device and _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+				is defined, false if joysticks are not supported or support is compiled out.
+		*/
+		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) = 0;
 	};
 
 } // end namespace irr
diff --git a/src/dep/include/irrlicht/Keycodes.h b/src/dep/include/irrlicht/Keycodes.h
index c35124c..a8d8bff 100644
--- a/src/dep/include/irrlicht/Keycodes.h
+++ b/src/dep/include/irrlicht/Keycodes.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,149 +10,149 @@ namespace irr
 
 	enum EKEY_CODE
 	{
-		KEY_LBUTTON          = 0x01,  // Left mouse button  
-		KEY_RBUTTON          = 0x02,  // Right mouse button  
-		KEY_CANCEL           = 0x03,  // Control-break processing  
-		KEY_MBUTTON          = 0x04,  // Middle mouse button (three-button mouse)  
-		KEY_XBUTTON1         = 0x05,  // Windows 2000/XP: X1 mouse button 
-		KEY_XBUTTON2         = 0x06,  // Windows 2000/XP: X2 mouse button 
-		KEY_BACK             = 0x08,  // BACKSPACE key  
-		KEY_TAB              = 0x09,  // TAB key  
-		KEY_CLEAR            = 0x0C,  // CLEAR key  
-		KEY_RETURN           = 0x0D,  // ENTER key  
-		KEY_SHIFT            = 0x10,  // SHIFT key  
-		KEY_CONTROL          = 0x11,  // CTRL key  
-		KEY_MENU             = 0x12,  // ALT key  
-		KEY_PAUSE            = 0x13,  // PAUSE key  
-		KEY_CAPITAL          = 0x14,  // CAPS LOCK key  
-		KEY_KANA             = 0x15,  // IME Kana mode 
-		KEY_HANGUEL          = 0x15,  // IME Hanguel mode (maintained for compatibility use KEY_HANGUL) 
-		KEY_HANGUL           = 0x15,  // IME Hangul mode 
-		KEY_JUNJA            = 0x17,  // IME Junja mode 
-		KEY_FINAL            = 0x18,  // IME final mode 
-		KEY_HANJA            = 0x19,  // IME Hanja mode 
-		KEY_KANJI            = 0x19,  // IME Kanji mode 
-		KEY_ESCAPE           = 0x1B,  // ESC key  
-		KEY_CONVERT          = 0x1C,  // IME convert 
-		KEY_NONCONVERT       = 0x1D,  // IME nonconvert 
-		KEY_ACCEPT           = 0x1E,  // IME accept 
-		KEY_MODECHANGE       = 0x1F,  // IME mode change request 
-		KEY_SPACE            = 0x20,  // SPACEBAR  
-		KEY_PRIOR            = 0x21,  // PAGE UP key  
-		KEY_NEXT             = 0x22,  // PAGE DOWN key  
-		KEY_END              = 0x23,  // END key  
-		KEY_HOME             = 0x24,  // HOME key  
-		KEY_LEFT             = 0x25,  // LEFT ARROW key  
-		KEY_UP               = 0x26,  // UP ARROW key  
-		KEY_RIGHT            = 0x27,  // RIGHT ARROW key  
-		KEY_DOWN             = 0x28,  // DOWN ARROW key  
-		KEY_SELECT           = 0x29,  // SELECT key  
+		KEY_LBUTTON          = 0x01,  // Left mouse button
+		KEY_RBUTTON          = 0x02,  // Right mouse button
+		KEY_CANCEL           = 0x03,  // Control-break processing
+		KEY_MBUTTON          = 0x04,  // Middle mouse button (three-button mouse)
+		KEY_XBUTTON1         = 0x05,  // Windows 2000/XP: X1 mouse button
+		KEY_XBUTTON2         = 0x06,  // Windows 2000/XP: X2 mouse button
+		KEY_BACK             = 0x08,  // BACKSPACE key
+		KEY_TAB              = 0x09,  // TAB key
+		KEY_CLEAR            = 0x0C,  // CLEAR key
+		KEY_RETURN           = 0x0D,  // ENTER key
+		KEY_SHIFT            = 0x10,  // SHIFT key
+		KEY_CONTROL          = 0x11,  // CTRL key
+		KEY_MENU             = 0x12,  // ALT key
+		KEY_PAUSE            = 0x13,  // PAUSE key
+		KEY_CAPITAL          = 0x14,  // CAPS LOCK key
+		KEY_KANA             = 0x15,  // IME Kana mode
+		KEY_HANGUEL          = 0x15,  // IME Hanguel mode (maintained for compatibility use KEY_HANGUL)
+		KEY_HANGUL           = 0x15,  // IME Hangul mode
+		KEY_JUNJA            = 0x17,  // IME Junja mode
+		KEY_FINAL            = 0x18,  // IME final mode
+		KEY_HANJA            = 0x19,  // IME Hanja mode
+		KEY_KANJI            = 0x19,  // IME Kanji mode
+		KEY_ESCAPE           = 0x1B,  // ESC key
+		KEY_CONVERT          = 0x1C,  // IME convert
+		KEY_NONCONVERT       = 0x1D,  // IME nonconvert
+		KEY_ACCEPT           = 0x1E,  // IME accept
+		KEY_MODECHANGE       = 0x1F,  // IME mode change request
+		KEY_SPACE            = 0x20,  // SPACEBAR
+		KEY_PRIOR            = 0x21,  // PAGE UP key
+		KEY_NEXT             = 0x22,  // PAGE DOWN key
+		KEY_END              = 0x23,  // END key
+		KEY_HOME             = 0x24,  // HOME key
+		KEY_LEFT             = 0x25,  // LEFT ARROW key
+		KEY_UP               = 0x26,  // UP ARROW key
+		KEY_RIGHT            = 0x27,  // RIGHT ARROW key
+		KEY_DOWN             = 0x28,  // DOWN ARROW key
+		KEY_SELECT           = 0x29,  // SELECT key
 		KEY_PRINT            = 0x2A,  // PRINT key
-		KEY_EXECUT           = 0x2B,  // EXECUTE key  
-		KEY_SNAPSHOT         = 0x2C,  // PRINT SCREEN key  
-		KEY_INSERT           = 0x2D,  // INS key  
-		KEY_DELETE           = 0x2E,  // DEL key  
-		KEY_HELP             = 0x2F,  // HELP key  
-		KEY_KEY_0            = 0x30,  // 0 key  
-		KEY_KEY_1            = 0x31,  // 1 key  
-		KEY_KEY_2            = 0x32,  // 2 key  
-		KEY_KEY_3            = 0x33,  // 3 key  
-		KEY_KEY_4            = 0x34,  // 4 key  
-		KEY_KEY_5            = 0x35,  // 5 key  
-		KEY_KEY_6            = 0x36,  // 6 key  
-		KEY_KEY_7            = 0x37,  // 7 key  
-		KEY_KEY_8            = 0x38,  // 8 key  
-		KEY_KEY_9            = 0x39,  // 9 key  
-		KEY_KEY_A            = 0x41,  // A key  
-		KEY_KEY_B            = 0x42,  // B key  
-		KEY_KEY_C            = 0x43,  // C key  
-		KEY_KEY_D            = 0x44,  // D key  
-		KEY_KEY_E            = 0x45,  // E key  
-		KEY_KEY_F            = 0x46,  // F key  
-		KEY_KEY_G            = 0x47,  // G key  
-		KEY_KEY_H            = 0x48,  // H key  
-		KEY_KEY_I            = 0x49,  // I key  
-		KEY_KEY_J            = 0x4A,  // J key  
-		KEY_KEY_K            = 0x4B,  // K key  
-		KEY_KEY_L            = 0x4C,  // L key  
-		KEY_KEY_M            = 0x4D,  // M key  
-		KEY_KEY_N            = 0x4E,  // N key  
-		KEY_KEY_O            = 0x4F,  // O key  
-		KEY_KEY_P            = 0x50,  // P key  
-		KEY_KEY_Q            = 0x51,  // Q key  
-		KEY_KEY_R            = 0x52,  // R key  
-		KEY_KEY_S            = 0x53,  // S key  
-		KEY_KEY_T            = 0x54,  // T key  
-		KEY_KEY_U            = 0x55,  // U key  
-		KEY_KEY_V            = 0x56,  // V key  
-		KEY_KEY_W            = 0x57,  // W key  
-		KEY_KEY_X            = 0x58,  // X key  
-		KEY_KEY_Y            = 0x59,  // Y key  
-		KEY_KEY_Z            = 0x5A,  // Z key  
-		KEY_LWIN             = 0x5B,  // Left Windows key (Microsoft® Natural® keyboard)  
-		KEY_RWIN             = 0x5C,  // Right Windows key (Natural keyboard)  
-		KEY_APPS             = 0x5D,  //Applications key (Natural keyboard)  
-		KEY_SLEEP            = 0x5F,  // Computer Sleep key 
-		KEY_NUMPAD0          = 0x60,  // Numeric keypad 0 key  
-		KEY_NUMPAD1          = 0x61,  // Numeric keypad 1 key  
-		KEY_NUMPAD2          = 0x62,  // Numeric keypad 2 key  
-		KEY_NUMPAD3          = 0x63,  // Numeric keypad 3 key  
-		KEY_NUMPAD4          = 0x64,  // Numeric keypad 4 key  
-		KEY_NUMPAD5          = 0x65,  // Numeric keypad 5 key  
-		KEY_NUMPAD6          = 0x66,  // Numeric keypad 6 key  
-		KEY_NUMPAD7          = 0x67,  // Numeric keypad 7 key  
-		KEY_NUMPAD8          = 0x68,  // Numeric keypad 8 key  
-		KEY_NUMPAD9          = 0x69,  // Numeric keypad 9 key  
-		KEY_MULTIPLY         = 0x6A,  // Multiply key  
-		KEY_ADD              = 0x6B,  // Add key  
-		KEY_SEPARATOR        = 0x6C,  // Separator key  
-		KEY_SUBTRACT         = 0x6D,  // Subtract key  
-		KEY_DECIMAL          = 0x6E,  // Decimal key  
-		KEY_DIVIDE           = 0x6F,  // Divide key  
-		KEY_F1               = 0x70,  // F1 key  
-		KEY_F2               = 0x71,  // F2 key  
-		KEY_F3               = 0x72,  // F3 key  
-		KEY_F4               = 0x73,  // F4 key  
-		KEY_F5               = 0x74,  // F5 key  
-		KEY_F6               = 0x75,  // F6 key  
-		KEY_F7               = 0x76,  // F7 key  
-		KEY_F8               = 0x77,  // F8 key  
-		KEY_F9               = 0x78,  // F9 key  
-		KEY_F10              = 0x79,  // F10 key  
-		KEY_F11              = 0x7A,  // F11 key  
-		KEY_F12              = 0x7B,  // F12 key  
-		KEY_F13              = 0x7C,  // F13 key  
-		KEY_F14              = 0x7D,  // F14 key  
-		KEY_F15              = 0x7E,  // F15 key  
-		KEY_F16              = 0x7F,  // F16 key  
-		KEY_F17              = 0x80,  // F17 key  
-		KEY_F18              = 0x81,  // F18 key  
-		KEY_F19              = 0x82,  // F19 key  
-		KEY_F20              = 0x83,  // F20 key  
-		KEY_F21              = 0x84,  // F21 key  
-		KEY_F22              = 0x85,  // F22 key  
-		KEY_F23              = 0x86,  // F23 key  
-		KEY_F24              = 0x87,  // F24 key  
-		KEY_NUMLOCK          = 0x90,  // NUM LOCK key  
-		KEY_SCROLL           = 0x91,  // SCROLL LOCK key  
-		KEY_LSHIFT           = 0xA0,  // Left SHIFT key 
-		KEY_RSHIFT           = 0xA1,  // Right SHIFT key 
-		KEY_LCONTROL         = 0xA2,  // Left CONTROL key 
-		KEY_RCONTROL         = 0xA3,  // Right CONTROL key 
-		KEY_LMENU            = 0xA4,  // Left MENU key 
-		KEY_RMENU            = 0xA5,  // Right MENU key 
+		KEY_EXECUT           = 0x2B,  // EXECUTE key
+		KEY_SNAPSHOT         = 0x2C,  // PRINT SCREEN key
+		KEY_INSERT           = 0x2D,  // INS key
+		KEY_DELETE           = 0x2E,  // DEL key
+		KEY_HELP             = 0x2F,  // HELP key
+		KEY_KEY_0            = 0x30,  // 0 key
+		KEY_KEY_1            = 0x31,  // 1 key
+		KEY_KEY_2            = 0x32,  // 2 key
+		KEY_KEY_3            = 0x33,  // 3 key
+		KEY_KEY_4            = 0x34,  // 4 key
+		KEY_KEY_5            = 0x35,  // 5 key
+		KEY_KEY_6            = 0x36,  // 6 key
+		KEY_KEY_7            = 0x37,  // 7 key
+		KEY_KEY_8            = 0x38,  // 8 key
+		KEY_KEY_9            = 0x39,  // 9 key
+		KEY_KEY_A            = 0x41,  // A key
+		KEY_KEY_B            = 0x42,  // B key
+		KEY_KEY_C            = 0x43,  // C key
+		KEY_KEY_D            = 0x44,  // D key
+		KEY_KEY_E            = 0x45,  // E key
+		KEY_KEY_F            = 0x46,  // F key
+		KEY_KEY_G            = 0x47,  // G key
+		KEY_KEY_H            = 0x48,  // H key
+		KEY_KEY_I            = 0x49,  // I key
+		KEY_KEY_J            = 0x4A,  // J key
+		KEY_KEY_K            = 0x4B,  // K key
+		KEY_KEY_L            = 0x4C,  // L key
+		KEY_KEY_M            = 0x4D,  // M key
+		KEY_KEY_N            = 0x4E,  // N key
+		KEY_KEY_O            = 0x4F,  // O key
+		KEY_KEY_P            = 0x50,  // P key
+		KEY_KEY_Q            = 0x51,  // Q key
+		KEY_KEY_R            = 0x52,  // R key
+		KEY_KEY_S            = 0x53,  // S key
+		KEY_KEY_T            = 0x54,  // T key
+		KEY_KEY_U            = 0x55,  // U key
+		KEY_KEY_V            = 0x56,  // V key
+		KEY_KEY_W            = 0x57,  // W key
+		KEY_KEY_X            = 0x58,  // X key
+		KEY_KEY_Y            = 0x59,  // Y key
+		KEY_KEY_Z            = 0x5A,  // Z key
+		KEY_LWIN             = 0x5B,  // Left Windows key (Microsoft® Natural® keyboard)
+		KEY_RWIN             = 0x5C,  // Right Windows key (Natural keyboard)
+		KEY_APPS             = 0x5D,  //Applications key (Natural keyboard)
+		KEY_SLEEP            = 0x5F,  // Computer Sleep key
+		KEY_NUMPAD0          = 0x60,  // Numeric keypad 0 key
+		KEY_NUMPAD1          = 0x61,  // Numeric keypad 1 key
+		KEY_NUMPAD2          = 0x62,  // Numeric keypad 2 key
+		KEY_NUMPAD3          = 0x63,  // Numeric keypad 3 key
+		KEY_NUMPAD4          = 0x64,  // Numeric keypad 4 key
+		KEY_NUMPAD5          = 0x65,  // Numeric keypad 5 key
+		KEY_NUMPAD6          = 0x66,  // Numeric keypad 6 key
+		KEY_NUMPAD7          = 0x67,  // Numeric keypad 7 key
+		KEY_NUMPAD8          = 0x68,  // Numeric keypad 8 key
+		KEY_NUMPAD9          = 0x69,  // Numeric keypad 9 key
+		KEY_MULTIPLY         = 0x6A,  // Multiply key
+		KEY_ADD              = 0x6B,  // Add key
+		KEY_SEPARATOR        = 0x6C,  // Separator key
+		KEY_SUBTRACT         = 0x6D,  // Subtract key
+		KEY_DECIMAL          = 0x6E,  // Decimal key
+		KEY_DIVIDE           = 0x6F,  // Divide key
+		KEY_F1               = 0x70,  // F1 key
+		KEY_F2               = 0x71,  // F2 key
+		KEY_F3               = 0x72,  // F3 key
+		KEY_F4               = 0x73,  // F4 key
+		KEY_F5               = 0x74,  // F5 key
+		KEY_F6               = 0x75,  // F6 key
+		KEY_F7               = 0x76,  // F7 key
+		KEY_F8               = 0x77,  // F8 key
+		KEY_F9               = 0x78,  // F9 key
+		KEY_F10              = 0x79,  // F10 key
+		KEY_F11              = 0x7A,  // F11 key
+		KEY_F12              = 0x7B,  // F12 key
+		KEY_F13              = 0x7C,  // F13 key
+		KEY_F14              = 0x7D,  // F14 key
+		KEY_F15              = 0x7E,  // F15 key
+		KEY_F16              = 0x7F,  // F16 key
+		KEY_F17              = 0x80,  // F17 key
+		KEY_F18              = 0x81,  // F18 key
+		KEY_F19              = 0x82,  // F19 key
+		KEY_F20              = 0x83,  // F20 key
+		KEY_F21              = 0x84,  // F21 key
+		KEY_F22              = 0x85,  // F22 key
+		KEY_F23              = 0x86,  // F23 key
+		KEY_F24              = 0x87,  // F24 key
+		KEY_NUMLOCK          = 0x90,  // NUM LOCK key
+		KEY_SCROLL           = 0x91,  // SCROLL LOCK key
+		KEY_LSHIFT           = 0xA0,  // Left SHIFT key
+		KEY_RSHIFT           = 0xA1,  // Right SHIFT key
+		KEY_LCONTROL         = 0xA2,  // Left CONTROL key
+		KEY_RCONTROL         = 0xA3,  // Right CONTROL key
+		KEY_LMENU            = 0xA4,  // Left MENU key
+		KEY_RMENU            = 0xA5,  // Right MENU key
 		KEY_PLUS             = 0xBB,  // Plus Key   (+)
 		KEY_COMMA            = 0xBC,  // Comma Key  (,)
 		KEY_MINUS            = 0xBD,  // Minus Key  (-)
 		KEY_PERIOD           = 0xBE,  // Period Key (.)
-		KEY_ATTN             = 0xF6,  // Attn key 
-		KEY_CRSEL            = 0xF7,  // CrSel key 
-		KEY_EXSEL            = 0xF8,  // ExSel key 
-		KEY_EREOF            = 0xF9,  // Erase EOF key 
-		KEY_PLAY             = 0xFA,  // Play key 
-		KEY_ZOOM             = 0xFB,  // Zoom key 
-		KEY_PA1              = 0xFD,  // PA1 key 
-		KEY_OEM_CLEAR        = 0xFE,   // Clear key 
+		KEY_ATTN             = 0xF6,  // Attn key
+		KEY_CRSEL            = 0xF7,  // CrSel key
+		KEY_EXSEL            = 0xF8,  // ExSel key
+		KEY_EREOF            = 0xF9,  // Erase EOF key
+		KEY_PLAY             = 0xFA,  // Play key
+		KEY_ZOOM             = 0xFB,  // Zoom key
+		KEY_PA1              = 0xFD,  // PA1 key
+		KEY_OEM_CLEAR        = 0xFE,   // Clear key
 
 		KEY_KEY_CODES_COUNT  = 0xFF // this is not a key, but the amount of keycodes there are.
 	};
diff --git a/src/dep/include/irrlicht/S3DVertex.h b/src/dep/include/irrlicht/S3DVertex.h
index ad6e7e6..86d64fd 100644
--- a/src/dep/include/irrlicht/S3DVertex.h
+++ b/src/dep/include/irrlicht/S3DVertex.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -20,12 +20,12 @@ enum E_VERTEX_TYPE
 	//! Standard vertex type used by the Irrlicht engine, video::S3DVertex.
 	EVT_STANDARD = 0,
 
-	//! Vertex with two texture coordinates, video::S3DVertex2TCoords. Usually used
-	//! for geometry with lightmaps or other special materials.
+	//! Vertex with two texture coordinates, video::S3DVertex2TCoords.
+	/** Usually used for geometry with lightmaps or other special materials. */
 	EVT_2TCOORDS,
 
-	//! Vertex with a tangent and binormal vector, video::S3DVertexTangents. Usually
-	//! used for tangent space normal mapping.
+	//! Vertex with a tangent and binormal vector, video::S3DVertexTangents.
+	/** Usually used for tangent space normal mapping. */
 	EVT_TANGENTS
 };
 
@@ -65,16 +65,24 @@ struct S3DVertex
 	//! Texture coordinates
 	core::vector2d<f32> TCoords;
 
-	bool operator == (const S3DVertex& other) const
+	bool operator==(const S3DVertex& other) const
 	{
-		return (Pos == other.Pos && Normal == other.Normal &&
-			Color == other.Color && TCoords == other.TCoords);
+		return ((Pos == other.Pos) && (Normal == other.Normal) &&
+			(Color == other.Color) && (TCoords == other.TCoords));
 	}
 
-	bool operator != (const S3DVertex& other) const
+	bool operator!=(const S3DVertex& other) const
 	{
-		return (Pos != other.Pos || Normal != other.Normal ||
-			Color != other.Color || TCoords != other.TCoords);
+		return ((Pos != other.Pos) || (Normal != other.Normal) ||
+			(Color != other.Color) || (TCoords != other.TCoords));
+	}
+
+	bool operator<(const S3DVertex& other) const
+	{
+		return ((Pos < other.Pos) ||
+				((Pos == other.Pos) && (Normal < other.Normal)) ||
+				((Pos == other.Pos) && (Normal == other.Normal) && (Color < other.Color)) ||
+				((Pos == other.Pos) && (Normal == other.Normal) && (Color == other.Color) && (TCoords < other.TCoords)));
 	}
 
 	E_VERTEX_TYPE getType() const
@@ -127,17 +135,23 @@ struct S3DVertex2TCoords : public S3DVertex
 	core::vector2d<f32> TCoords2;
 
 	//! Equality operator
-	bool operator == (const S3DVertex2TCoords& other) const
+	bool operator==(const S3DVertex2TCoords& other) const
 	{
-		return (static_cast<S3DVertex>(*this)==other &&
-			TCoords2 == other.TCoords2);
+		return ((static_cast<S3DVertex>(*this)==other) &&
+			(TCoords2 == other.TCoords2));
 	}
 
 	//! Inequality operator
-	bool operator != (const S3DVertex2TCoords& other) const
+	bool operator!=(const S3DVertex2TCoords& other) const
 	{
-		return (static_cast<S3DVertex>(*this)!=other &&
-			TCoords2 != other.TCoords2);
+		return ((static_cast<S3DVertex>(*this)!=other) ||
+			(TCoords2 != other.TCoords2));
+	}
+
+	bool operator<(const S3DVertex2TCoords& other) const
+	{
+		return ((static_cast<S3DVertex>(*this) < other) ||
+				((static_cast<S3DVertex>(*this) == other) && (TCoords2 < other.TCoords2)));
 	}
 
 	E_VERTEX_TYPE getType() const
@@ -148,15 +162,17 @@ struct S3DVertex2TCoords : public S3DVertex
 
 
 //! Vertex with a tangent and binormal vector.
-/**  Usually used for tangent space normal mapping.
-*/
+/** Usually used for tangent space normal mapping. */
 struct S3DVertexTangents : public S3DVertex
 {
 	//! default constructor
 	S3DVertexTangents() : S3DVertex() { }
 
 	//! constructor
-	S3DVertexTangents(f32 x, f32 y, f32 z, f32 nx=0.0f, f32 ny=0.0f, f32 nz=0.0f, SColor c = 0xFFFFFFFF, f32 tu=0.0f, f32 tv=0.0f, f32 tanx=0.0f, f32 tany=0.0f, f32 tanz=0.0f, f32 bx=0.0f, f32 by=0.0f, f32 bz=0.0f)
+	S3DVertexTangents(f32 x, f32 y, f32 z, f32 nx=0.0f, f32 ny=0.0f, f32 nz=0.0f,
+			SColor c = 0xFFFFFFFF, f32 tu=0.0f, f32 tv=0.0f,
+			f32 tanx=0.0f, f32 tany=0.0f, f32 tanz=0.0f,
+			f32 bx=0.0f, f32 by=0.0f, f32 bz=0.0f)
 		: S3DVertex(x,y,z, nx,ny,nz, c, tu,tv), Tangent(tanx,tany,tanz), Binormal(bx,by,bz) { }
 
 	//! constructor
@@ -178,16 +194,25 @@ struct S3DVertexTangents : public S3DVertex
 	//! Binormal vector (tangent x normal)
 	core::vector3df Binormal;
 
-	bool operator == (const S3DVertexTangents& other) const
+	bool operator==(const S3DVertexTangents& other) const
 	{
-		return (static_cast<S3DVertex>(*this)==other &&
-			Tangent == other.Tangent && Binormal == other.Binormal);
+		return ((static_cast<S3DVertex>(*this)==other) &&
+			(Tangent == other.Tangent) &&
+			(Binormal == other.Binormal));
 	}
 
-	bool operator != (const S3DVertexTangents& other) const
+	bool operator!=(const S3DVertexTangents& other) const
 	{
-		return (static_cast<S3DVertex>(*this)!=other &&
-			Tangent != other.Tangent || Binormal != other.Binormal);
+		return ((static_cast<S3DVertex>(*this)!=other) ||
+			(Tangent != other.Tangent) ||
+			(Binormal != other.Binormal));
+	}
+
+	bool operator<(const S3DVertexTangents& other) const
+	{
+		return ((static_cast<S3DVertex>(*this) < other) ||
+				((static_cast<S3DVertex>(*this) == other) && (Tangent < other.Tangent)) ||
+				((static_cast<S3DVertex>(*this) == other) && (Tangent == other.Tangent) && (Binormal < other.Binormal)));
 	}
 
 	E_VERTEX_TYPE getType() const
diff --git a/src/dep/include/irrlicht/SAnimatedMesh.h b/src/dep/include/irrlicht/SAnimatedMesh.h
index 03c5ef3..12d191e 100644
--- a/src/dep/include/irrlicht/SAnimatedMesh.h
+++ b/src/dep/include/irrlicht/SAnimatedMesh.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,16 +19,7 @@ namespace scene
 	struct SAnimatedMesh : public IAnimatedMesh
 	{
 		//! constructor
-		SAnimatedMesh() : IAnimatedMesh(), Type(EAMT_UNKNOWN)
-		{
-			#ifdef _DEBUG
-			setDebugName("SAnimatedMesh");
-			#endif
-		}
-
-
-		//! constructor
-		SAnimatedMesh(scene::IMesh* mesh, scene::E_ANIMATED_MESH_TYPE type) : IAnimatedMesh(), Type(type)
+		SAnimatedMesh(scene::IMesh* mesh=0, scene::E_ANIMATED_MESH_TYPE type=scene::EAMT_UNKNOWN) : IAnimatedMesh(), Type(type)
 		{
 			#ifdef _DEBUG
 			setDebugName("SAnimatedMesh");
@@ -44,26 +35,25 @@ namespace scene
 			// drop meshes
 			for (u32 i=0; i<Meshes.size(); ++i)
 				Meshes[i]->drop();
-		};
+		}
 
 
 		//! Gets the frame count of the animated mesh.
-		//! \return Returns the amount of frames. If the amount is 1, it is a static, non animated mesh.
+		/** \return Amount of frames. If the amount is 1, it is a static, non animated mesh. */
 		virtual u32 getFrameCount() const
 		{
 			return Meshes.size();
 		}
 
 
-
 		//! Returns the IMesh interface for a frame.
-		//! \param frame: Frame number as zero based index. The maximum frame number is
-		//! getFrameCount() - 1;
-		//! \param detailLevel: Level of detail. 0 is the lowest,
-		//! 255 the highest level of detail. Most meshes will ignore the detail level.
-		//! \param startFrameLoop: start frame
-		//! \param endFrameLoop: end frame
-		//! \return Returns the animated mesh based on a detail level.
+		/** \param frame: Frame number as zero based index. The maximum frame number is
+		getFrameCount() - 1;
+		\param detailLevel: Level of detail. 0 is the lowest,
+		255 the highest level of detail. Most meshes will ignore the detail level.
+		\param startFrameLoop: start frame
+		\param endFrameLoop: end frame
+		\return The animated mesh based on a detail level. */
 		virtual IMesh* getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop=-1, s32 endFrameLoop=-1)
 		{
 			if (Meshes.empty())
@@ -85,18 +75,20 @@ namespace scene
 
 
 		//! Returns an axis aligned bounding box of the mesh.
-		//! \return A bounding box of this mesh is returned.
+		/** \return A bounding box of this mesh is returned. */
 		virtual const core::aabbox3d<f32>& getBoundingBox() const
 		{
 			return Box;
 		}
 
+
 		//! set user axis aligned bounding box
-		virtual void setBoundingBox( const core::aabbox3df& box)
+		virtual void setBoundingBox(const core::aabbox3df& box)
 		{
 			Box = box;
 		}
 
+		//! Recalculates the bounding box.
 		void recalculateBoundingBox()
 		{
 			Box.reset(0,0,0);
@@ -110,40 +102,73 @@ namespace scene
 				Box.addInternalBox(Meshes[i]->getBoundingBox());
 		}
 
+
 		//! Returns the type of the animated mesh.
 		virtual E_ANIMATED_MESH_TYPE getMeshType() const
 		{
 			return Type;
 		}
 
+
 		//! returns amount of mesh buffers.
 		virtual u32 getMeshBufferCount() const
 		{
-			return 0;
+			if (Meshes.empty())
+				return 0;
+
+			return Meshes[0]->getMeshBufferCount();
 		}
 
+
 		//! returns pointer to a mesh buffer
 		virtual IMeshBuffer* getMeshBuffer(u32 nr) const
 		{
-			return 0;
+			if (Meshes.empty())
+				return 0;
+
+			return Meshes[0]->getMeshBuffer(nr);
 		}
 
+
 		//! Returns pointer to a mesh buffer which fits a material
- 		/** \param material: material to search for
+		/** \param material: material to search for
 		\return Returns the pointer to the mesh buffer or
 		NULL if there is no such mesh buffer. */
 		virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const
 		{
-			return 0;
+			if (Meshes.empty())
+				return 0;
+
+			return Meshes[0]->getMeshBuffer(material);
 		}
 
+
+		//! Set a material flag for all meshbuffers of this mesh.
 		virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue)
 		{
+			for (u32 i=0; i<Meshes.size(); ++i)
+				Meshes[i]->setMaterialFlag(flag, newvalue);
 		}
 
+		//! set the hardware mapping hint, for driver
+		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX )
+		{
+			for (u32 i=0; i<Meshes.size(); ++i)
+				Meshes[i]->setHardwareMappingHint(newMappingHint, buffer);
+		}
 
+		//! flags the meshbuffer as changed, reloads hardware buffers
+		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX)
+		{
+			for (u32 i=0; i<Meshes.size(); ++i)
+				Meshes[i]->setDirty(buffer);
+		}
+
+		//! The bounding box of this mesh
 		core::aabbox3d<f32> Box;
+		//! All meshes defining the animated mesh
 		core::array<IMesh*> Meshes;
+		//! Tyhe type fo the mesh.
 		E_ANIMATED_MESH_TYPE Type;
 	};
 
diff --git a/src/dep/include/irrlicht/SColor.h b/src/dep/include/irrlicht/SColor.h
index 1564ac9..c3c5b9b 100644
--- a/src/dep/include/irrlicht/SColor.h
+++ b/src/dep/include/irrlicht/SColor.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,9 +13,9 @@ namespace irr
 namespace video
 {
 	//! Creates a 16 bit A1R5G5B5 color
-	inline u16 RGBA16(u32 r, u32 g, u32 b, u32 a)
+	inline u16 RGBA16(u32 r, u32 g, u32 b, u32 a=0xFF)
 	{
-		return ((a & 0x80) << 8 |
+		return (u16)((a & 0x80) << 8 |
 			(r & 0xF8) << 7 |
 			(g & 0xF8) << 2 |
 			(b & 0xF8) >> 3);
@@ -25,56 +25,57 @@ namespace video
 	//! Creates a 16 bit A1R5G5B5 color
 	inline u16 RGB16(u32 r, u32 g, u32 b)
 	{
-		return RGBA16(r,g,b,0xFF);
+		return RGBA16(r,g,b);
 	}
 
 
-	//! Creates a 16 bit A1R5G5B5 color, based on 16 bit input values
+	//! Creates a 16bit A1R5G5B5 color, based on 16bit input values
 	inline u16 RGB16from16(u16 r, u16 g, u16 b)
 	{
-		return (r & 0x1F) << 10 |
-			   (g & 0x1F) << 5  |
-			   (b & 0x1F);
+		return (0x8000 |
+				(r & 0x1F) << 10 |
+				(g & 0x1F) << 5  |
+				(b & 0x1F));
 	}
 
 
-	//! Converts a 32 bit (X8R8G8B8) color to a 16 A1R5G5B5 color
+	//! Converts a 32bit (X8R8G8B8) color to a 16bit A1R5G5B5 color
 	inline u16 X8R8G8B8toA1R5G5B5(u32 color)
 	{
-		return (	0x8000 |
+		return (u16)(0x8000 |
 			( color & 0x00F80000) >> 9 |
 			( color & 0x0000F800) >> 6 |
 			( color & 0x000000F8) >> 3);
 	}
 
 
-	//! Converts a 32 bit (A8R8G8B8) color to a 16 A1R5G5B5 color
+	//! Converts a 32bit (A8R8G8B8) color to a 16bit A1R5G5B5 color
 	inline u16 A8R8G8B8toA1R5G5B5(u32 color)
 	{
-		return (( color & 0x80000000) >> 16|
+		return (u16)(( color & 0x80000000) >> 16|
 			( color & 0x00F80000) >> 9 |
 			( color & 0x0000F800) >> 6 |
 			( color & 0x000000F8) >> 3);
 	}
 
 
-	//! Converts a 32 bit (A8R8G8B8) color to a 16 R5G6B5 color
+	//! Converts a 32bit (A8R8G8B8) color to a 16bit R5G6B5 color
 	inline u16 A8R8G8B8toR5G6B5(u32 color)
 	{
-		return (( color & 0x00F80000) >> 8 |
+		return (u16)(( color & 0x00F80000) >> 8 |
 			( color & 0x0000FC00) >> 5 |
 			( color & 0x000000F8) >> 3);
 	}
 
 
-	//! Returns A8R8G8B8 Color from A1R5G5B5 color
-	//! build a nicer 32 Bit Color by extending dest lower bits with source high bits
+	//! Convert A8R8G8B8 Color from A1R5G5B5 color
+	/** build a nicer 32bit Color by extending dest lower bits with source high bits. */
 	inline u32 A1R5G5B5toA8R8G8B8(u16 color)
 	{
-		return	( (( -( (s32) color & 0x00008000 ) >> (s32) 31 ) & 0xFF000000 ) |
+		return ( (( -( (s32) color & 0x00008000 ) >> (s32) 31 ) & 0xFF000000 ) |
 				(( color & 0x00007C00 ) << 9) | (( color & 0x00007000 ) << 4) |
 				(( color & 0x000003E0 ) << 6) | (( color & 0x00000380 ) << 1) |
-				(( color & 0x0000001F ) << 3) | (( color & 0x0000001C ) >> 2) 
+				(( color & 0x0000001F ) << 3) | (( color & 0x0000001C ) >> 2)
 				);
 	}
 
@@ -105,6 +106,8 @@ namespace video
 
 
 	//! Returns the alpha component from A1R5G5B5 color
+	/** In Irrlicht, alpha refers to opacity. 
+	\return The alpha value of the color. 0 is transparent, 1 is opaque. */
 	inline u32 getAlpha(u16 color)
 	{
 		return ((color >> 15)&0x1);
@@ -112,7 +115,7 @@ namespace video
 
 
 	//! Returns the red component from A1R5G5B5 color.
-	//! Shift left by 3 to get 8 bit value.
+	/** Shift left by 3 to get 8 bit value. */
 	inline u32 getRed(u16 color)
 	{
 		return ((color >> 10)&0x1F);
@@ -120,7 +123,7 @@ namespace video
 
 
 	//! Returns the green component from A1R5G5B5 color
-	//! Shift left by 3 to get 8 bit value.
+	/** Shift left by 3 to get 8 bit value. */
 	inline u32 getGreen(u16 color)
 	{
 		return ((color >> 5)&0x1F);
@@ -128,34 +131,12 @@ namespace video
 
 
 	//! Returns the blue component from A1R5G5B5 color
-	//! Shift left by 3 to get 8 bit value.
+	/** Shift left by 3 to get 8 bit value. */
 	inline u32 getBlue(u16 color)
 	{
 		return (color & 0x1F);
 	}
 
-	//! Returns the red component from A1R5G5B5 color.
-	//! Shift left by 3 to get 8 bit value.
-	inline s32 getRedSigned(u16 color)
-	{
-		return ((color >> 10)&0x1F);
-	}
-
-
-	//! Returns the green component from A1R5G5B5 color
-	//! Shift left by 3 to get 8 bit value.
-	inline s32 getGreenSigned(u16 color)
-	{
-		return ((color >> 5)&0x1F);
-	}
-
-
-	//! Returns the blue component from A1R5G5B5 color
-	//! Shift left by 3 to get 8 bit value.
-	inline s32 getBlueSigned(u16 color)
-	{
-		return (color & 0x1F);
-	}
 
 	//! Returns the average from a 16 bit A1R5G5B5 color
 	inline s32 getAverage(s16 color)
@@ -164,155 +145,150 @@ namespace video
 	}
 
 
-
 	//! Class representing a 32 bit ARGB color.
 	/** The color values for alpha, red, green, and blue are
-	stored in a single s32. So all four values may be between 0 and 255.
+	stored in a single u32. So all four values may be between 0 and 255.
+	Alpha in Irrlicht is opacity, so 0 is fully transparent, 255 is fully opaque (solid).
 	This class is used by most parts of the Irrlicht Engine
-	to specify a color. Another way is using the class Colorf, which
+	to specify a color. Another way is using the class SColorf, which
 	stores the color values in 4 floats.
 	*/
 	class SColor
 	{
 	public:
 
-		//! Constructor of the Color. Does nothing. The color value
-		//! is not initialized to save time.
-		inline SColor() {}
+		//! Constructor of the Color. Does nothing.
+		/** The color value is not initialized to save time. */
+		SColor() {}
 
-		//! Constructs the color from 4 values representing the alpha, red, green and
-		//! blue components of the color. Must be values between 0 and 255.
-		inline SColor (u32 a, u32 r, u32 g, u32 b)
-			: color(((a & 0xff)<<24) | ((r & 0xff)<<16) | ((g & 0xff)<<8) | (b & 0xff))	{}
+		//! Constructs the color from 4 values representing the alpha, red, green and blue component.
+		/** Must be values between 0 and 255. */
+		SColor (u32 a, u32 r, u32 g, u32 b)
+			: color(((a & 0xff)<<24) | ((r & 0xff)<<16) | ((g & 0xff)<<8) | (b & 0xff)) {}
 
 		//! Constructs the color from a 32 bit value. Could be another color.
-		inline SColor(u32 clr)
+		SColor(u32 clr)
 			: color(clr) {}
 
-		//! Returns the alpha component of the color. The alpha component
-		//! defines how transparent a color should be.
-		//! 0 means not transparent (opaque), 255 means fully transparent.
-		inline u32 getAlpha() const { return color>>24; }
+		//! Returns the alpha component of the color.
+		/** The alpha component defines how opaque a color is. 
+		\return The alpha value of the color. 0 is fully transparent, 255 is fully opaque. */
+		u32 getAlpha() const { return color>>24; }
 
 		//! Returns the red component of the color.
-		//! \return Returns a value between 0 and 255, specifying how red the color is.
-		//! 0 means no red, 255 means full red.
-		inline u32 getRed() const { return (color>>16) & 0xff; }
+		/** \return Value between 0 and 255, specifying how red the color is.
+		0 means no red, 255 means full red. */
+		u32 getRed() const { return (color>>16) & 0xff; }
 
 		//! Returns the green component of the color.
-		//! \return Returns a value between 0 and 255, specifying how green the color is.
-		//! 0 means no green, 255 means full green.
-		inline u32 getGreen() const { return (color>>8) & 0xff; }
+		/** \return Value between 0 and 255, specifying how green the color is.
+		0 means no green, 255 means full green. */
+		u32 getGreen() const { return (color>>8) & 0xff; }
 
 		//! Returns the blue component of the color.
-		//! \return Returns a value between 0 and 255, specifying how blue the color is.
-		//! 0 means no blue, 255 means full blue.
-		inline u32 getBlue() const { return color & 0xff; }
+		/** \return Value between 0 and 255, specifying how blue the color is.
+		0 means no blue, 255 means full blue. */
+		u32 getBlue() const { return color & 0xff; }
 
 		//! Returns the luminance of the color.
-		inline f32 getLuminance() const
+		f32 getLuminance() const
 		{
 			return 0.3f*getRed() + 0.59f*getGreen() + 0.11f*getBlue();
 		}
 
 		//! Returns the average intensity of the color.
-		inline u32 getAverage() const
+		u32 getAverage() const
 		{
 			return ( getRed() + getGreen() + getBlue() ) / 3;
 		}
 
-		//! Sets the alpha component of the Color. The alpha component
-		//! defines how transparent a color should be.
-		//! \param a: Has to be a value between 0 and 255.
-		//! 0 means not transparent (opaque), 255 means fully transparent.
-		inline void setAlpha(u32 a) { color = ((a & 0xff)<<24) | (color & 0x00ffffff); }
+		//! Sets the alpha component of the Color.
+		/** The alpha component defines how transparent a color should be.
+		\param a The alpha value of the color. 0 is fully transparent, 255 is fully opaque. */
+		void setAlpha(u32 a) { color = ((a & 0xff)<<24) | (color & 0x00ffffff); }
 
 		//! Sets the red component of the Color.
-		//! \param r: Has to be a value between 0 and 255.
-		//! 0 means no red (=black), 255 means full red.
-		inline void setRed(u32 r) { color = ((r & 0xff)<<16) | (color & 0xff00ffff); }
+		/** \param r: Has to be a value between 0 and 255.
+		0 means no red, 255 means full red. */
+		void setRed(u32 r) { color = ((r & 0xff)<<16) | (color & 0xff00ffff); }
 
 		//! Sets the green component of the Color.
-		//! \param g: Has to be a value between 0 and 255.
-		//! 0 means no green (=black), 255 means full green.
-		inline void setGreen(u32 g) { color = ((g & 0xff)<<8) | (color & 0xffff00ff); }
+		/** \param g: Has to be a value between 0 and 255.
+		0 means no green, 255 means full green. */
+		void setGreen(u32 g) { color = ((g & 0xff)<<8) | (color & 0xffff00ff); }
 
 		//! Sets the blue component of the Color.
-		//! \param b: Has to be a value between 0 and 255.
-		//! 0 means no blue (=black), 255 means full blue.
-		inline void setBlue(u32 b) { color = (b & 0xff) | (color & 0xffffff00); }
+		/** \param b: Has to be a value between 0 and 255.
+		0 means no blue, 255 means full blue. */
+		void setBlue(u32 b) { color = (b & 0xff) | (color & 0xffffff00); }
 
 		//! Calculates a 16 bit A1R5G5B5 value of this color.
-		//! \return Returns the 16 bit A1R5G5B5 value of this color.
-		inline u16 toA1R5G5B5() const { return A8R8G8B8toA1R5G5B5(color); };
+		/** \return 16 bit A1R5G5B5 value of this color. */
+		u16 toA1R5G5B5() const { return A8R8G8B8toA1R5G5B5(color); }
 
-		//! Converts color to OpenGL color format,
-		//! from ARGB to RGBA in 4 byte components for endian aware
-		//! passing to OpenGL
-		//! \param dest: address where the 4x8 bit OpenGL color is stored.
-		inline void toOpenGLColor(u8* dest) const
+		//! Converts color to OpenGL color format
+		/** From ARGB to RGBA in 4 byte components for endian aware
+		passing to OpenGL
+		\param dest: address where the 4x8 bit OpenGL color is stored. */
+		void toOpenGLColor(u8* dest) const
 		{
-			*dest =   getRed();
-			*++dest = getGreen();
-			*++dest = getBlue();
-			*++dest = getAlpha();
-		};
+			*dest =   (u8)getRed();
+			*++dest = (u8)getGreen();
+			*++dest = (u8)getBlue();
+			*++dest = (u8)getAlpha();
+		}
 
 		//! Sets all four components of the color at once.
-		//! Constructs the color from 4 values representing the alpha, red, green and
-		//! blue components of the color. Must be values between 0 and 255.
-		//! \param a: Alpha component of the color.
-		//! The alpha component defines how transparent a color should be.
-		//! Has to be a value between 0 and 255.
-		//! 0 means not transparent (opaque), 255 means fully transparent.
-		//! \param r: Sets the red component of the Color.
-		//! Has to be a value between 0 and 255.
-		//! 0 means no red (=black), 255 means full red.
-		//! \param g: Sets the green component of the Color.
-		//! Has to be a value between 0 and 255.
-		//! 0 means no green (=black), 255 means full green.
-		//! \param b: Sets the blue component of the Color.
-		//! Has to be a value between 0 and 255.
-		//! 0 means no blue (=black), 255 means full blue.
-		inline void set(u32 a, u32 r, u32 g, u32 b) { color = (((a & 0xff)<<24) | ((r & 0xff)<<16) | ((g & 0xff)<<8) | (b & 0xff)); }
-		inline void set(u32 col) { color = col; }
-
-		//! Compares the color to another color.
-		//! \return Returns true if the colors are the same, and false if not.
-		inline bool operator==(const SColor& other) const { return other.color == color; }
-
-		//! Compares the color to another color.
-		//! \return Returns true if the colors are different, and false if they are the same.
-		inline bool operator!=(const SColor& other) const { return other.color != color; }
-
-		//! Adds two colors
-		inline SColor operator+(const SColor& other) const
+		/** Constructs the color from 4 values representing the alpha,
+		red, green and blue components of the color. Must be values
+		between 0 and 255.
+		\param a: Alpha component of the color. The alpha component
+		defines how transparent a color should be. Has to be a value
+		between 0 and 255. 255 means not transparent (opaque), 0 means
+		fully transparent.
+		\param r: Sets the red component of the Color. Has to be a
+		value between 0 and 255. 0 means no red, 255 means full red.
+		\param g: Sets the green component of the Color. Has to be a
+		value between 0 and 255. 0 means no green, 255 means full
+		green.
+		\param b: Sets the blue component of the Color. Has to be a
+		value between 0 and 255. 0 means no blue, 255 means full blue. */
+		void set(u32 a, u32 r, u32 g, u32 b)
 		{
-			s32 a = getAlpha() + other.getAlpha();
-			if (a > 255) 
-				a = 255;
+			color = (((a & 0xff)<<24) | ((r & 0xff)<<16) | ((g & 0xff)<<8) | (b & 0xff));
+		}
+		void set(u32 col) { color = col; }
 
-			s32 r = getRed() + other.getRed();
-			if (r > 255) 
-				r = 255;
+		//! Compares the color to another color.
+		/** \return True if the colors are the same, and false if not. */
+		bool operator==(const SColor& other) const { return other.color == color; }
 
-			s32 g = getGreen() + other.getGreen();
-			if (g > 255) 
-				g = 255;
+		//! Compares the color to another color.
+		/** \return True if the colors are different, and false if they are the same. */
+		bool operator!=(const SColor& other) const { return other.color != color; }
 
-			s32 b = getBlue() + other.getBlue();
-			if (b > 255) 
-				b = 255;
+		//! comparison operator
+		/** \return True if this color is smaller than the other one */
+		bool operator<(const SColor& other) const { return (color < other.color); }
 
-			return SColor(a,r,g,b);
+		//! Adds two colors, result is clamped to 0..255 values
+		/** \param other Color to add to this color
+		\return Addition of the two colors, clamped to 0..255 values */
+		SColor operator+(const SColor& other) const
+		{
+			return SColor(core::min_(getAlpha() + other.getAlpha(), 255u),
+					core::min_(getRed() + other.getRed(), 255u),
+					core::min_(getGreen() + other.getGreen(), 255u),
+					core::min_(getBlue() + other.getBlue(), 255u));
 		}
 
 		//! Interpolates the color with a f32 value to another color
-		//! \param other: Other color
-		//! \param d: value between 0.0f and 1.0f
-		//! \return Returns interpolated color.
-		inline SColor getInterpolated(const SColor &other, f32 d) const
+		/** \param other: Other color
+		\param d: value between 0.0f and 1.0f
+		\return Interpolated color. */
+		SColor getInterpolated(const SColor &other, f32 d) const
 		{
+			d = core::clamp(d, 0.f, 1.f);
 			const f32 inv = 1.0f - d;
 			return SColor((u32)(other.getAlpha()*inv + getAlpha()*d),
 				(u32)(other.getRed()*inv + getRed()*d),
@@ -322,20 +298,26 @@ namespace video
 
 		//! Returns interpolated color. ( quadratic )
 		/** \param c1: first color to interpolate with
-		    \param c2: second color to interpolate with
+		\param c2: second color to interpolate with
 		\param d: value between 0.0f and 1.0f. */
-		inline SColor getInterpolated_quadratic(const SColor& c1, const SColor& c2, const f32 d) const
+		SColor getInterpolated_quadratic(const SColor& c1, const SColor& c2, f32 d) const
 		{
 			// this*(1-d)*(1-d) + 2 * c1 * (1-d) + c2 * d * d;
+			d = core::clamp(d, 0.f, 1.f);
 			const f32 inv = 1.f - d;
 			const f32 mul0 = inv * inv;
 			const f32 mul1 = 2.f * d * inv;
 			const f32 mul2 = d * d;
 
-			return SColor ( core::clamp ( core::floor32 ( getAlpha() * mul0 + c1.getAlpha() * mul1 + c2.getAlpha() * mul2 ), 0, 255 ),
-					core::clamp ( core::floor32 ( getRed()   * mul0 + c1.getRed()   * mul1 + c2.getRed()   * mul2 ), 0, 255 ),
-					core::clamp ( core::floor32 ( getGreen() * mul0 + c1.getGreen() * mul1 + c2.getGreen() * mul2 ), 0, 255 ),
-					core::clamp ( core::floor32 ( getBlue()  * mul0 + c1.getBlue()  * mul1 + c2.getBlue()  * mul2 ), 0, 255 ));
+			return SColor(
+					core::clamp( core::floor32(
+							getAlpha() * mul0 + c1.getAlpha() * mul1 + c2.getAlpha() * mul2 ), 0, 255 ),
+					core::clamp( core::floor32(
+							getRed()   * mul0 + c1.getRed()   * mul1 + c2.getRed()   * mul2 ), 0, 255 ),
+					core::clamp ( core::floor32(
+							getGreen() * mul0 + c1.getGreen() * mul1 + c2.getGreen() * mul2 ), 0, 255 ),
+					core::clamp ( core::floor32(
+							getBlue()  * mul0 + c1.getBlue()  * mul1 + c2.getBlue()  * mul2 ), 0, 255 ));
 		}
 
 		//! color in A8R8G8B8 Format
@@ -344,54 +326,123 @@ namespace video
 
 
 	//! Class representing a color with four floats.
-	/**	The color values for red, green, blue
+	/** The color values for red, green, blue
 	and alpha are each stored in a 32 bit floating point variable.
 	So all four values may be between 0.0f and 1.0f.
-	This class is rarely used by the Irrlicht Engine
-	to specify a color. Another, faster way is using the class Color, which
+	Another, faster way to define colors is using the class SColor, which
 	stores the color values in a single 32 bit integer.
 	*/
 	class SColorf
 	{
 	public:
-
-		//! Constructs a color. All values are initialised with 0.0f, resulting
-		//! in a black color.
-		SColorf() : r(0.0f), g(0.0f), b(0.0f), a(0.0f) {};
-
-		//! Constructs a color from three color values: red, green and blue.
-		//! \param r: Red color component. Should be a value between 0.0f meaning
-		//! no red (=black) and 1.0f, meaning full red.
-		//! \param g: Green color component. Should be a value between 0.0f meaning
-		//! no green (=black) and 1.0f, meaning full green.
-		//! \param b: Blue color component. Should be a value between 0.0f meaning
-		//! no blue (=black) and 1.0f, meaning full blue.
-		SColorf(f32 r, f32 g, f32 b) : r(r), g(g), b(b), a(1.0f) {};
-
-		//! Constructs a color from four color values: red, green, blue, and alpha.
-		//! \param r: Red color component. Should be a value between 0.0f meaning
-		//! no red (=black) and 1.0f, meaning full red.
-		//! \param g: Green color component. Should be a value between 0.0f meaning
-		//! no green (=black) and 1.0f, meaning full green.
-		//! \param b: Blue color component. Should be a value between 0.0f meaning
-		//! no blue (=black) and 1.0f, meaning full blue.
-		//! \param a: Alpha color component of the color.
-		//! The alpha component defines how transparent a color should be.
-		//! Has to be a value between 0.0f and 1.0f,
-		//! 0.0f means not transparent (opaque), 1.0f means fully transparent.
-		SColorf(f32 r, f32 g, f32 b, f32 a) : r(r), g(g), b(b), a(a) {};
+		//! Constructs a color from up to four color values: red, green, blue, and alpha.
+		/** \param r: Red color component. Should be a value between
+		0.0f meaning no red and 1.0f, meaning full red.
+		\param g: Green color component. Should be a value between 0.0f
+		meaning no green and 1.0f, meaning full green.
+		\param b: Blue color component. Should be a value between 0.0f
+		meaning no blue and 1.0f, meaning full blue.
+		\param a: Alpha color component of the color. The alpha
+		component defines how transparent a color should be. Has to be
+		a value between 0.0f and 1.0f, 1.0f means not transparent
+		(opaque), 0.0f means fully transparent. */
+		SColorf(f32 r=0.f, f32 g=0.f, f32 b=0.f, f32 a=1.f) : r(r), g(g), b(b), a(a) {}
 
 		//! Constructs a color from 32 bit Color.
-		//! \param c: 32 bit color value from which this Colorf class is
-		//! constructed from.
-		SColorf(SColor c) { const f32 inv = 1.0f / 255.0f; r = c.getRed() * inv; g = c.getGreen() * inv; b = c.getBlue() * inv;	a = c.getAlpha() * inv;	};
+		/** \param c: 32 bit color from which this SColorf class is
+		constructed from. */
+		SColorf(SColor c)
+		{
+			const f32 inv = 1.0f / 255.0f;
+			r = c.getRed() * inv;
+			g = c.getGreen() * inv;
+			b = c.getBlue() * inv;
+			a = c.getAlpha() * inv;
+		}
 
 		//! Converts this color to a SColor without floats.
 		SColor toSColor() const
 		{
-			return SColor((s32)(a*255.0f), (s32)(r*255.0f), (s32)(g*255.0f), (s32)(b*255.0f));
+			return SColor((u32)(a*255.0f), (u32)(r*255.0f), (u32)(g*255.0f), (u32)(b*255.0f));
 		}
 
+		//! Sets three color components to new values at once.
+		/** \param rr: Red color component. Should be a value between 0.0f meaning
+		no red (=black) and 1.0f, meaning full red.
+		\param gg: Green color component. Should be a value between 0.0f meaning
+		no green (=black) and 1.0f, meaning full green.
+		\param bb: Blue color component. Should be a value between 0.0f meaning
+		no blue (=black) and 1.0f, meaning full blue. */
+		void set(f32 rr, f32 gg, f32 bb) {r = rr; g =gg; b = bb; }
+
+		//! Sets all four color components to new values at once.
+		/** \param aa: Alpha component. Should be a value between 0.0f meaning
+		fully transparent and 1.0f, meaning opaque.
+		\param rr: Red color component. Should be a value between 0.0f meaning
+		no red and 1.0f, meaning full red.
+		\param gg: Green color component. Should be a value between 0.0f meaning
+		no green and 1.0f, meaning full green.
+		\param bb: Blue color component. Should be a value between 0.0f meaning
+		no blue and 1.0f, meaning full blue. */
+		void set(f32 aa, f32 rr, f32 gg, f32 bb) {a = aa; r = rr; g =gg; b = bb; }
+
+		//! Interpolates the color with a f32 value to another color
+		/** \param other: Other color
+		\param d: value between 0.0f and 1.0f
+		\return Interpolated color. */
+		SColorf getInterpolated(const SColorf &other, f32 d) const
+		{
+			d = core::clamp(d, 0.f, 1.f);
+			const f32 inv = 1.0f - d;
+			return SColorf(other.r*inv + r*d,
+				other.g*inv + g*d, other.b*inv + b*d, other.a*inv + a*d);
+		}
+
+		//! Returns interpolated color. ( quadratic )
+		/** \param c1: first color to interpolate with
+		\param c2: second color to interpolate with
+		\param d: value between 0.0f and 1.0f. */
+		inline SColorf getInterpolated_quadratic(const SColorf& c1, const SColorf& c2,
+				f32 d) const
+		{
+			d = core::clamp(d, 0.f, 1.f);
+			// this*(1-d)*(1-d) + 2 * c1 * (1-d) + c2 * d * d;
+			const f32 inv = 1.f - d;
+			const f32 mul0 = inv * inv;
+			const f32 mul1 = 2.f * d * inv;
+			const f32 mul2 = d * d;
+
+			return SColorf (r * mul0 + c1.r * mul1 + c2.r * mul2,
+					g * mul0 + c1.g * mul1 + c2.g * mul2,
+					g * mul0 + c1.b * mul1 + c2.b * mul2,
+					a * mul0 + c1.a * mul1 + c2.a * mul2);
+		}
+
+
+		//! Sets a color component by index. R=0, G=1, B=2, A=3
+		void setColorComponentValue(s32 index, f32 value)
+		{
+			switch(index)
+			{
+			case 0: r = value; break;
+			case 1: g = value; break;
+			case 2: b = value; break;
+			case 3: a = value; break;
+			}
+		}
+
+		//! Returns the alpha component of the color in the range 0.0 (transparent) to 1.0 (opaque)
+		f32 getAlpha() const { return a; }
+
+		//! Returns the red component of the color in the range 0.0 to 1.0
+		f32 getRed() const { return r; }
+
+		//! Returns the green component of the color in the range 0.0 to 1.0
+		f32 getGreen() const { return g; }
+
+		//! Returns the blue component of the color in the range 0.0 to 1.0
+		f32 getBlue() const { return b; }
+
 		//! red color component
 		f32 r;
 
@@ -403,72 +454,11 @@ namespace video
 
 		//! alpha color component
 		f32 a;
-
-		//! Sets three color components to new values at once.
-		//! \param rr: Red color component. Should be a value between 0.0f meaning
-		//! no red (=black) and 1.0f, meaning full red.
-		//! \param gg: Green color component. Should be a value between 0.0f meaning
-		//! no green (=black) and 1.0f, meaning full green.
-		//! \param bb: Blue color component. Should be a value between 0.0f meaning
-		//! no blue (=black) and 1.0f, meaning full blue.
-		void set(f32 rr, f32 gg, f32 bb) {r = rr; g =gg; b = bb; };
-
-		//! Sets all four color components to new values at once.
-		//! \param aa: Alpha component.
-		//! \param rr: Red color component. Should be a value between 0.0f meaning
-		//! no red (=black) and 1.0f, meaning full red.
-		//! \param gg: Green color component. Should be a value between 0.0f meaning
-		//! no green (=black) and 1.0f, meaning full green.
-		//! \param bb: Blue color component. Should be a value between 0.0f meaning
-		//! no blue (=black) and 1.0f, meaning full blue.
-		void set(f32 aa, f32 rr, f32 gg, f32 bb) {a = aa; r = rr; g =gg; b = bb; };
-
-		//! Interpolates the color with a f32 value to another color
-		//! \param other: Other color
-		//! \param d: value between 0.0f and 1.0f
-		//! \return Returns interpolated color.
-		inline SColorf getInterpolated(const SColorf &other, f32 d) const
-		{
-			const f32 inv = 1.0f - d;
-			return SColorf(other.r*inv + r*d,
-				other.g*inv + g*d, other.b*inv + b*d, other.a*inv + a*d);
-		}
-
-		//! Returns interpolated color. ( quadratic )
-		/** \param c1: first color to interpolate with
-		\param c2: second color to interpolate with
-		\param d: value between 0.0f and 1.0f. */
-		inline SColorf getInterpolated_quadratic(const SColorf& c1, const SColorf& c2, const f32 d) const
-		{
-			// this*(1-d)*(1-d) + 2 * c1 * (1-d) + c2 * d * d;
-			const f32 inv = 1.f - d;
-			const f32 mul0 = inv * inv;
-			const f32 mul1 = 2.f * d * inv;
-			const f32 mul2 = d * d;
-
-			return SColorf ( r * mul0 + c1.r * mul1 + c2.r * mul2,
-					 g * mul0 + c1.g * mul1 + c2.g * mul2,
-					 g * mul0 + c1.b * mul1 + c2.b * mul2,
-					 a * mul0 + c1.a * mul1 + c2.a * mul2);
-		}
-
-
-
-		//! Sets a color component by index. R=0, G=1, B=2, A=3
-		inline void setColorComponentValue(s32 index, f32 value)
-		{
-			switch(index)
-			{
-			case 0: r = value; break;
-			case 1: g = value; break;
-			case 2: b = value; break;
-			case 3: a = value; break;
-			}
-		}
 	};
 
+
 	//! Class representing a color in HSV format
-	/**	The color values for hue, saturation, value
+	/** The color values for hue, saturation, value
 	are stored in a 32 bit floating point variable.
 	*/
 	class SColorHSL
@@ -477,19 +467,54 @@ namespace video
 		SColorHSL ( f32 h = 0.f, f32 s = 0.f, f32 l = 0.f )
 			: Hue ( h ), Saturation ( s ), Luminance ( l ) {}
 
-		void setfromRGB ( const SColor &color );
-		void settoRGB ( SColor &color ) const;
+		void fromRGB(const SColor &color);
+		void toRGB(SColor &color) const;
 
 		f32 Hue;
 		f32 Saturation;
 		f32 Luminance;
 
-		private:
-			inline u32 toRGB1(f32 rm1, f32 rm2, f32 rh) const;
+	private:
+		inline u32 toRGB1(f32 rm1, f32 rm2, f32 rh) const;
 
 	};
 
-	inline void SColorHSL::settoRGB ( SColor &color ) const
+	inline void SColorHSL::fromRGB(const SColor &color)
+	{
+		const f32 maxVal = (f32)core::max_(color.getRed(), color.getGreen(), color.getBlue());
+		const f32 minVal = (f32)core::min_(color.getRed(), color.getGreen(), color.getBlue());
+		Luminance = (maxVal/minVal)*0.5f;
+		if (maxVal==minVal)
+		{
+			Hue=0.f;
+			Saturation=0.f;
+			return;
+		}
+
+		const f32 delta = maxVal-minVal;
+		if ( Luminance <= 0.5f )
+		{
+			Saturation = (delta)/(maxVal+minVal);
+		}
+		else
+		{
+			Saturation = (delta)/(2-maxVal-minVal);
+		}
+
+		if (maxVal==color.getRed())
+			Hue = (color.getRed()-color.getBlue())/delta;
+		else if (maxVal==color.getGreen())
+			Hue = 2+(color.getBlue()-color.getRed())/delta;
+		else if (maxVal==color.getBlue())
+			Hue = 4+(color.getRed()-color.getGreen())/delta;
+
+		Hue *= (60.0f * core::DEGTORAD);
+		while ( Hue < 0.f )
+			Hue += 2.f * core::PI;
+	}
+
+
+	inline void SColorHSL::toRGB(SColor &color) const
 	{
 		if ( Saturation == 0.0f) // grey
 		{
@@ -500,18 +525,18 @@ namespace video
 			return;
 		}
 
-		f32 rm1, rm2;
-			
+		f32 rm2;
+
 		if ( Luminance <= 0.5f )
 		{
-			rm2 = Luminance + Luminance * Saturation;  
+			rm2 = Luminance + Luminance * Saturation;
 		}
 		else
 		{
 			rm2 = Luminance + Saturation - Luminance * Saturation;
 		}
 
-		rm1 = 2.0f * Luminance - rm2;   
+		const f32 rm1 = 2.0f * Luminance - rm2;
 
 		color.setRed ( toRGB1(rm1, rm2, Hue + (120.0f * core::DEGTORAD )) );
 		color.setGreen ( toRGB1(rm1, rm2, Hue) );
@@ -527,10 +552,14 @@ namespace video
 		while ( rh < 0.f )
 			rh += 2.f * core::PI;
 
-		if      (rh <  60.0f * core::DEGTORAD ) rm1 = rm1 + (rm2 - rm1) * rh / (60.0f * core::DEGTORAD);
-		else if (rh < 180.0f * core::DEGTORAD ) rm1 = rm2;
-		else if (rh < 240.0f * core::DEGTORAD ) rm1 = rm1 + (rm2 - rm1) * ( ( 240.0f * core::DEGTORAD ) - rh) / (60.0f * core::DEGTORAD);
-		                
+		if (rh < 60.0f * core::DEGTORAD )
+			rm1 = rm1 + (rm2 - rm1) * rh / (60.0f * core::DEGTORAD);
+		else if (rh < 180.0f * core::DEGTORAD )
+			rm1 = rm2;
+		else if (rh < 240.0f * core::DEGTORAD )
+			rm1 = rm1 + (rm2 - rm1) * ( ( 240.0f * core::DEGTORAD ) - rh) /
+				(60.0f * core::DEGTORAD);
+
 		return (u32) (rm1 * 255.f);
 	}
 
diff --git a/src/dep/include/irrlicht/SExposedVideoData.h b/src/dep/include/irrlicht/SExposedVideoData.h
index f89e8bc..362240d 100644
--- a/src/dep/include/irrlicht/SExposedVideoData.h
+++ b/src/dep/include/irrlicht/SExposedVideoData.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,10 +17,10 @@ namespace video
 {
 
 //! structure for holding data describing a driver and operating system specific data.
-/** This data can be retrived by IVideoDriver::getExposedVideoData(). Use this with caution. 
- This only should be used to make it possible to extend the engine easily without
- modification of its source. Note that this structure does not contain any valid data, if
- you are using the software or the null device.
+/** This data can be retrived by IVideoDriver::getExposedVideoData(). Use this with caution.
+This only should be used to make it possible to extend the engine easily without
+modification of its source. Note that this structure does not contain any valid data, if
+you are using the software or the null device.
 */
 struct SExposedVideoData
 {
@@ -34,9 +34,9 @@ struct SExposedVideoData
 			//! Pointer to the IDirect3D9 interface
 			IDirect3DDevice9* D3DDev9;
 
-			//! Window handle. Get with for example 
-			//! HWND h = reinterpret_cast<HWND>(exposedData.D3D9.HWnd)
-			s32 HWnd;
+			//! Window handle.
+			/** Get with for example HWND h = reinterpret_cast<HWND>(exposedData.D3D9.HWnd) */
+			void* HWnd;
 
 		} D3D9;
 
@@ -48,32 +48,32 @@ struct SExposedVideoData
 			//! Pointer to the IDirect3D8 interface
 			IDirect3DDevice8* D3DDev8;
 
-			//! Window handle. Get with for example with:
-			//! HWND h = reinterpret_cast<HWND>(exposedData.D3D8.HWnd)
-			s32 HWnd;
+			//! Window handle.
+			/** Get with for example with: HWND h = reinterpret_cast<HWND>(exposedData.D3D8.HWnd) */
+			void* HWnd;
 
 		} D3D8;
 
-		struct 
+		struct
 		{
-			//! Private GDI Device Context. Get if for example with:
-			//! HDC h = reinterpret_cast<HDC>(exposedData.OpenGLWin32.HDc)
-			s32 HDc; 
+			//! Private GDI Device Context.
+			/** Get if for example with: HDC h = reinterpret_cast<HDC>(exposedData.OpenGLWin32.HDc) */
+			void* HDc;
 
-			//! Permanent Rendering Context. Get if for example with:
-			//! HGLRC h = reinterpret_cast<HGLRC>(exposedData.OpenGLWin32.HRc)
-			s32 HRc; 
+			//! Permanent Rendering Context.
+			/** Get if for example with: HGLRC h = reinterpret_cast<HGLRC>(exposedData.OpenGLWin32.HRc) */
+			void* HRc;
 
-			//! Window handle. Get with for example with:
-			//! HWND h = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd)
-			s32 HWnd;
-		
+			//! Window handle.
+			/** Get with for example with: HWND h = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd) */
+			void* HWnd;
 		} OpenGLWin32;
 
-		struct 
+		struct
 		{
 			// XWindow handles
 			void* X11Display;
+			void* X11Context;
 			unsigned long X11Window;
 		} OpenGLLinux;
 	};
diff --git a/src/dep/include/irrlicht/SIrrCreationParameters.h b/src/dep/include/irrlicht/SIrrCreationParameters.h
index 86002f8..3193730 100644
--- a/src/dep/include/irrlicht/SIrrCreationParameters.h
+++ b/src/dep/include/irrlicht/SIrrCreationParameters.h
@@ -1,76 +1,129 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __I_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED__
 #define __I_IRRLICHT_CREATION_PARAMETERS_H_INCLUDED__
 
+#include "EDriverTypes.h"
+#include "dimension2d.h"
+
 namespace irr
 {
-	//! Structure for holding advanced Irrlicht Device creation parameters.
-	/** This structure is only used in the createDeviceEx() function. */
+	class IEventReceiver;
+
+	//! Structure for holding Irrlicht Device creation parameters.
+	/** This structure is used in the createDeviceEx() function. */
 	struct SIrrlichtCreationParameters
 	{
 		//! Constructs a SIrrlichtCreationParameters structure with default values.
-		SIrrlichtCreationParameters()
+		SIrrlichtCreationParameters() :
+			DriverType(video::EDT_BURNINGSVIDEO),
+			WindowSize(core::dimension2d<s32>(800, 600)),
+			Bits(16),
+			ZBufferBits(16),
+			Fullscreen(false),
+			Stencilbuffer(false),
+			Vsync(false),
+			AntiAlias(false),
+			WithAlphaChannel(false),
+			IgnoreInput(false),
+			HighPrecisionFPU(false),
+			EventReceiver(0),
+			WindowId(0),
+			SDK_version_do_not_use(IRRLICHT_SDK_VERSION)
 		{
-			DriverType = video::EDT_BURNINGSVIDEO;
-			WindowSize = core::dimension2d<s32>(800, 600);
-			Bits = 16;
-			Fullscreen = false;
-			Stencilbuffer = false;
-			Vsync = false;
-			AntiAlias = false;
-			HighPrecisionFPU = false;
-			EventReceiver = 0;
-			WindowId = 0;
-			SDK_version_do_not_use = IRRLICHT_SDK_VERSION;
 		}
 
-		//! Type of the device. 
-		/** This can currently be video::EDT_NULL, 
-		video::EDT_SOFTWARE, video::EDT_DIRECT3D8, video::EDT_DIRECT3D9 and video::EDT_OPENGL. 
+		SIrrlichtCreationParameters(const SIrrlichtCreationParameters& other) :
+			SDK_version_do_not_use(IRRLICHT_SDK_VERSION)
+		{*this = other;}
+
+		SIrrlichtCreationParameters& operator=(const SIrrlichtCreationParameters& other)
+		{
+			DriverType = other.DriverType;
+			WindowSize = other.WindowSize;
+			Bits = other.Bits;
+			ZBufferBits = other.ZBufferBits;
+			Fullscreen = other.Fullscreen;
+			Stencilbuffer = other.Stencilbuffer;
+			Vsync = other.Vsync;
+			AntiAlias = other.AntiAlias;
+			WithAlphaChannel = other.WithAlphaChannel;
+			IgnoreInput = other.IgnoreInput;
+			HighPrecisionFPU = other.HighPrecisionFPU;
+			EventReceiver = other.EventReceiver;
+			WindowId = other.WindowId;
+			return *this;
+		}
+
+		//! Type of the device.
+		/** This can currently be video::EDT_NULL, video::EDT_SOFTWARE,
+		video::EDT_BURNINGSVIDEO, video::EDT_DIRECT3D8,
+		video::EDT_DIRECT3D9, and video::EDT_OPENGL.
 		Default: Software. */
 		video::E_DRIVER_TYPE DriverType;
 
 		//! Size of the window or the video mode in fullscreen mode. Default: 800x600
 		core::dimension2d<s32> WindowSize;
 
-		//! Bits per pixel in fullscreen mode. Ignored if windowed mode. Default: 16.
-		u32 Bits;
+		//! Minimum Bits per pixel of the color buffer in fullscreen mode. Ignored if windowed mode. Default: 16.
+		u8 Bits;
 
-		//! Should be set to true if the device should run in fullscreen. 
-		/** Otherwise the device runs in windowed mode. Default: false.  */
+		//! Minimum Bits per pixel of the depth buffer. Default: 16.
+		u8 ZBufferBits;
+
+		//! Should be set to true if the device should run in fullscreen.
+		/** Otherwise the device runs in windowed mode. Default: false. */
 		bool Fullscreen;
 
-		//! Specifies if the stencil buffer should be enabled. 
-		/** Set this to true,
-	    if you want the engine be able to draw stencil buffer shadows. Note that not all
-		devices are able to use the stencil buffer. If they don't no shadows will be drawn. 
+		//! Specifies if the stencil buffer should be enabled.
+		/** Set this to true, if you want the engine be able to draw
+		stencil buffer shadows. Note that not all devices are able to
+		use the stencil buffer. If they don't no shadows will be drawn.
 		Default: false. */
 		bool Stencilbuffer;
 
 		//! Specifies vertical syncronisation.
-		/** If set to true, the driver will wait for the vertical retrace period, otherwise not.
+		/** If set to true, the driver will wait for the vertical
+		retrace period, otherwise not.
 		Default: false */
 		bool Vsync;
 
 		//! Specifies if the device should use fullscreen anti aliasing
-		/** Makes sharp/pixelated edges softer, but requires more performance. Also, 2D 
-		elements might look blurred with this switched on. The resulting rendering quality 
-		also depends on the hardware and driver you are using, your program might look
-		different on different hardware with this. So if you are writing a 
-		game/application with antiAlias switched on, it would be a good idea to make it
-		possible to switch this option off again by the user.
-		This is only supported in D3D9 and D3D8. In D3D9, both sample types are supported,
-		D3DMULTISAMPLE_X_SAMPLES and D3DMULTISAMPLE_NONMASKABLE. Default value: false */
+		/** Makes sharp/pixelated edges softer, but requires more
+		performance. Also, 2D elements might look blurred with this
+		switched on. The resulting rendering quality also depends on
+		the hardware and driver you are using, your program might look
+		different on different hardware with this. So if you are
+		writing a game/application with AntiAlias switched on, it would
+		be a good idea to make it possible to switch this option off
+		again by the user.
+		This is curently not supported in OpenGL under Windows.
+		Default value: false */
 		bool AntiAlias;
 
+		//! Whether the main framebuffer uses an alpha channel.
+		/** In some situations it might be desireable to get a color
+		buffer with an alpha channel, e.g. when rendering into a
+		transparent window or overlay. If this flag is set the device
+		tries to create a framebuffer with alpha channel.
+		Default value: false */
+		bool WithAlphaChannel;
+
+		//! Specifies if the device should ignore input events
+		/** This is only relevant when using external I/O handlers.
+		External windows need to take care of this themselves.
+		Currently only supported under X11.
+		Default value: false */
+		bool IgnoreInput;
+
 		//! Specifies if the device should use high precision FPU setting
-		/** This is only relevant for DirectX Devices, which switch to low FPU precision
-		by default for performance reasons. However, this may lead to problems with the
-		other computations of the application. In this case setting this flag to true
-		should help - on the expense of performance loss, though.
+		/** This is only relevant for DirectX Devices, which switch to
+		low FPU precision by default for performance reasons. However,
+		this may lead to problems with the other computations of the
+		application. In this case setting this flag to true should help
+		- on the expense of performance loss, though.
 		Default value: false */
 		bool HighPrecisionFPU;
 
@@ -78,12 +131,14 @@ namespace irr
 		IEventReceiver* EventReceiver;
 
 		//! Window Id.
-		/** If this is set to a value other than 0, the Irrlicht Engine will be created in 
-		an already existing window. For windows, set this to the HWND of the window you want.
-		The windowSize and FullScreen options will be ignored when using the WindowId parameter.
-		Default this is set to 0. 
-		To make Irrlicht run inside the custom window, you still will have to draw Irrlicht
-		on your own. You can use this loop, as usual:
+		/** If this is set to a value other than 0, the Irrlicht Engine
+		will be created in an already existing window. For windows, set
+		this to the HWND of the window you want. The windowSize and
+		FullScreen options will be ignored when using the WindowId
+		parameter. Default this is set to 0.
+		To make Irrlicht run inside the custom window, you still will
+		have to draw Irrlicht on your own. You can use this loop, as
+		usual:
 		\code
 		while (device->run())
 		{
@@ -94,13 +149,14 @@ namespace irr
 		\endcode
 		Instead of this, you can also simply use your own message loop
 		using GetMessage, DispatchMessage and whatever. Calling
-		IrrlichtDevice::run() will cause Irrlicht to dispatch messages internally too. 
-		You need not call Device->run() if you want to do your own message 
-		dispatching loop, but Irrlicht will not be able to fetch
-		user input then and you have to do it on your own using the window
-		messages, DirectInput, or whatever. Also, you'll have to increment the Irrlicht timer.
-		An alternative, own message dispatching loop without device->run() would
-		look like this:
+		IrrlichtDevice::run() will cause Irrlicht to dispatch messages
+		internally too.  You need not call Device->run() if you want to
+		do your own message dispatching loop, but Irrlicht will not be
+		able to fetch user input then and you have to do it on your own
+		using the window messages, DirectInput, or whatever. Also,
+		you'll have to increment the Irrlicht timer.
+		An alternative, own message dispatching loop without
+		device->run() would look like this:
 		\code
 		MSG msg;
 		while (true)
@@ -123,14 +179,14 @@ namespace irr
 			driver->endScene();
 		}
 		\endcode
-		However, there is no need to draw the picture this often. Just do it how you like.
-		*/
+		However, there is no need to draw the picture this often. Just
+		do it how you like. */
 		void* WindowId;
 
-		//! Don't use or change this parameter. 
+		//! Don't use or change this parameter.
 		/** Always set it to IRRLICHT_SDK_VERSION, which is done by default.
 		This is needed for sdk version checks. */
-		const c8* SDK_version_do_not_use;
+		const c8* const SDK_version_do_not_use;
 	};
 
 
diff --git a/src/dep/include/irrlicht/SKeyMap.h b/src/dep/include/irrlicht/SKeyMap.h
index dca1490..1836b5c 100644
--- a/src/dep/include/irrlicht/SKeyMap.h
+++ b/src/dep/include/irrlicht/SKeyMap.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -20,7 +20,7 @@ namespace irr
 		EKA_JUMP_UP,
 		EKA_COUNT,
 
-		//! This value is not used. It only forces this enumeration to compile in 32 bit. 
+		//! This value is not used. It only forces this enumeration to compile in 32 bit.
 		EKA_FORCE_32BIT = 0x7fffffff
 	};
 
diff --git a/src/dep/include/irrlicht/SLight.h b/src/dep/include/irrlicht/SLight.h
index d3a76f7..7a45baa 100644
--- a/src/dep/include/irrlicht/SLight.h
+++ b/src/dep/include/irrlicht/SLight.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -37,31 +37,30 @@ const c8* const LightTypeNames[] =
 */
 struct SLight
 {
-	SLight() : AmbientColor(0.0f,0.0f,0.0f), DiffuseColor(1.0f,1.0f,1.0f),
-		SpecularColor(1.0f,1.0f,1.0f), Attenuation(1.0f,0.0f,0.0f),
-		Radius(100.0f), OuterCone(45.0f), InnerCone(0.0f),
-		Falloff(2.0f), CastShadows(true), Type(ELT_POINT),
-		Position(0.0f,0.0f,0.0f), Direction(0.0f,0.0f,1.0f)
-		 {};
+	SLight() : AmbientColor(0.f,0.f,0.f), DiffuseColor(1.f,1.f,1.f),
+		SpecularColor(1.f,1.f,1.f), Attenuation(1.f,0.f,0.f),
+		OuterCone(45.f), InnerCone(0.f), Falloff(2.f),
+		Position(0.f,0.f,0.f), Direction(0.f,0.f,1.f),
+		Radius(100.f), Type(ELT_POINT), CastShadows(true)
+		{}
 
 	//! Ambient color emitted by the light
 	SColorf AmbientColor;
 
 	//! Diffuse color emitted by the light.
-	/** This is the primary color you might want to set. */
-	SColorf DiffuseColor; 
+	/** This is the primary color you want to set. */
+	SColorf DiffuseColor;
 
-	//! Specular color emitted by the light. 
+	//! Specular color emitted by the light.
 	/** For details how to use specular highlights, see SMaterial::Shininess */
 	SColorf SpecularColor;
 
 	//! Attenuation factors (constant, linear, quadratic)
-	/** Changes the light strength fading over distance */
+	/** Changes the light strength fading over distance.
+	Can also be altered by setting the radius, Attenuation will change to
+	(0,1.f/radius,0). Can be overridden after radius was set. */
 	core::vector3df Attenuation;
 
-	//! Radius of light. Everything within this radius be be lighted.
-	f32 Radius;
-
 	//! The angle of the spot's outer cone. Ignored for other lights.
 	f32 OuterCone;
 
@@ -71,17 +70,22 @@ struct SLight
 	//! The light strength's decrease between Outer and Inner cone.
 	f32 Falloff;
 
-	//! Does the light cast shadows?
-	bool CastShadows;
-
-	//! Type of the light. Default: ELT_POINT
-	E_LIGHT_TYPE Type;
-
-	//! Read-ONLY! Position of the light. If Type is ELT_DIRECTIONAL, this is ignored.
+	//! Read-ONLY! Position of the light.
+	/** If Type is ELT_DIRECTIONAL, it is ignored. Changed via light scene node's position. */
 	core::vector3df Position;
 
-	//! Read-ONLY! Direction of the light. If Type is ELT_POINT, this is ignored.
+	//! Read-ONLY! Direction of the light.
+	/** If Type is ELT_POINT, it is ignored. Changed via light scene node's rotation. */
 	core::vector3df Direction;
+
+	//! Read-ONLY! Radius of light. Everything within this radius be be lighted.
+	f32 Radius;
+
+	//! Read-ONLY! Type of the light. Default: ELT_POINT
+	E_LIGHT_TYPE Type;
+
+	//! Read-ONLY! Does the light cast shadows?
+	bool CastShadows;
 };
 
 } // end namespace video
diff --git a/src/dep/include/irrlicht/SMaterial.h b/src/dep/include/irrlicht/SMaterial.h
index ac3e1cc..bb31dff 100644
--- a/src/dep/include/irrlicht/SMaterial.h
+++ b/src/dep/include/irrlicht/SMaterial.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,21 +18,20 @@ namespace video
 {
 	class ITexture;
 
-	//! Flag for EMT_ONETEXTURE_BLEND, ( BlendFactor )
-	//! BlendFunc = source * sourceFactor + dest * destFactor
+	//! Flag for EMT_ONETEXTURE_BLEND, ( BlendFactor ) BlendFunc = source * sourceFactor + dest * destFactor
 	enum E_BLEND_FACTOR
 	{
-		EBF_ZERO	= 0,		// src & dest	(0, 0, 0, 0)
-		EBF_ONE,			// src & dest	(1, 1, 1, 1)
-		EBF_DST_COLOR, 			// src		(destR, destG, destB, destA)
-		EBF_ONE_MINUS_DST_COLOR, 	// src		(1-destR, 1-destG, 1-destB, 1-destA)
-		EBF_SRC_COLOR,			// dest		(srcR, srcG, srcB, srcA)
-		EBF_ONE_MINUS_SRC_COLOR, 	// dest		(1-srcR, 1-srcG, 1-srcB, 1-srcA)
-		EBF_SRC_ALPHA,			// src & dest	(srcA, srcA, srcA, srcA)
-		EBF_ONE_MINUS_SRC_ALPHA,	// src & dest	(1-srcA, 1-srcA, 1-srcA, 1-srcA)
-		EBF_DST_ALPHA,			// src & dest	(destA, destA, destA, destA)
-		EBF_ONE_MINUS_DST_ALPHA,	// src & dest	(1-destA, 1-destA, 1-destA, 1-destA)
-		EBF_SRC_ALPHA_SATURATE		// src		(min(srcA, 1-destA), idem, ...)
+		EBF_ZERO	= 0,		//!< src & dest	(0, 0, 0, 0)
+		EBF_ONE,			//!< src & dest	(1, 1, 1, 1)
+		EBF_DST_COLOR, 			//!< src	(destR, destG, destB, destA)
+		EBF_ONE_MINUS_DST_COLOR, 	//!< src	(1-destR, 1-destG, 1-destB, 1-destA)
+		EBF_SRC_COLOR,			//!< dest	(srcR, srcG, srcB, srcA)
+		EBF_ONE_MINUS_SRC_COLOR, 	//!< dest	(1-srcR, 1-srcG, 1-srcB, 1-srcA)
+		EBF_SRC_ALPHA,			//!< src & dest	(srcA, srcA, srcA, srcA)
+		EBF_ONE_MINUS_SRC_ALPHA,	//!< src & dest	(1-srcA, 1-srcA, 1-srcA, 1-srcA)
+		EBF_DST_ALPHA,			//!< src & dest	(destA, destA, destA, destA)
+		EBF_ONE_MINUS_DST_ALPHA,	//!< src & dest	(1-destA, 1-destA, 1-destA, 1-destA)
+		EBF_SRC_ALPHA_SATURATE		//!< src	(min(srcA, 1-destA), idem, ...)
 	};
 
 	//! MaterialTypeParam: e.g. DirectX: D3DTOP_MODULATE, D3DTOP_MODULATE2X, D3DTOP_MODULATE4X
@@ -50,32 +49,34 @@ namespace video
 	}
 
 	//! EMT_ONETEXTURE_BLEND: unpack srcFact & dstFact and Modulo to MaterialTypeParam
-	inline void unpack_texureBlendFunc ( E_BLEND_FACTOR &srcFact, E_BLEND_FACTOR &dstFact, E_MODULATE_FUNC &modulo, const f32 param )
+	inline void unpack_texureBlendFunc ( E_BLEND_FACTOR &srcFact, E_BLEND_FACTOR &dstFact,
+			E_MODULATE_FUNC &modulo, const f32 param )
 	{
 		const u32 state = (u32)param;
-		modulo	= E_MODULATE_FUNC  ( ( state & 0x00FF0000 ) >> 16 );
-		srcFact = E_BLEND_FACTOR   ( ( state & 0x0000FF00 ) >> 8  );
-		dstFact = E_BLEND_FACTOR   ( ( state & 0x000000FF )       );
+		modulo	= E_MODULATE_FUNC( ( state & 0x00FF0000 ) >> 16 );
+		srcFact = E_BLEND_FACTOR ( ( state & 0x0000FF00 ) >> 8 );
+		dstFact = E_BLEND_FACTOR ( ( state & 0x000000FF ) );
 	}
 
 	//! Maximum number of texture an SMaterial can have.
 	const u32 MATERIAL_MAX_TEXTURES = 4;
 
-	//! struct for holding parameters for a material renderer
+	//! Struct for holding parameters for a material renderer
 	class SMaterial
 	{
 	public:
-		//! default constructor, creates a solid material with standard colors
+		//! Default constructor. Creates a solid, lit material with white colors
 		SMaterial()
 		: MaterialType(EMT_SOLID), AmbientColor(255,255,255,255), DiffuseColor(255,255,255,255),
 			EmissiveColor(0,0,0,0), SpecularColor(255,255,255,255),
 			Shininess(0.0f), MaterialTypeParam(0.0f), MaterialTypeParam2(0.0f), Thickness(1.0f),
 			Wireframe(false), PointCloud(false), GouraudShading(true), Lighting(true),
-			ZBuffer(true), ZWriteEnable(true), BackfaceCulling(true),
-			FogEnable(false), NormalizeNormals(false)
+			ZWriteEnable(true), BackfaceCulling(true), FrontfaceCulling(false),
+			FogEnable(false), NormalizeNormals(false), ZBuffer(1)
 		{ }
 
-		//! copy constructor
+		//! Copy constructor
+		/** \param other Material to copy from. */
 		SMaterial(const SMaterial& other)
 		{
 			// These pointers are checked during assignment
@@ -85,8 +86,13 @@ namespace video
 		}
 
 		//! Assignment operator
+		/** \param other Material to copy from. */
 		SMaterial& operator=(const SMaterial& other)
 		{
+			// Check for self-assignment!
+			if (this == &other)
+				return *this;
+
 			MaterialType = other.MaterialType;
 
 			AmbientColor = other.AmbientColor;
@@ -106,11 +112,12 @@ namespace video
 			PointCloud = other.PointCloud;
 			GouraudShading = other.GouraudShading;
 			Lighting = other.Lighting;
-			ZBuffer = other.ZBuffer;
 			ZWriteEnable = other.ZWriteEnable;
 			BackfaceCulling = other.BackfaceCulling;
+			FrontfaceCulling = other.FrontfaceCulling;
 			FogEnable = other.FogEnable;
 			NormalizeNormals = other.NormalizeNormals;
+			ZBuffer = other.ZBuffer;
 
 			return *this;
 		}
@@ -119,37 +126,39 @@ namespace video
 		E_MATERIAL_TYPE MaterialType;
 
 		//! How much ambient light (a global light) is reflected by this material.
-		/** The default is full white, meaning objects are completely globally illuminated.
-		 Reduce this if you want to see diffuse or specular light effects. */
+		/** The default is full white, meaning objects are completely
+		globally illuminated. Reduce this if you want to see diffuse
+		or specular light effects. */
 		SColor AmbientColor;
 
 		//! How much diffuse light coming from a light source is reflected by this material.
 		/** The default is full white. */
 		SColor DiffuseColor;
 
-		//! Light emitted by this material. Default is to emitt no light.
+		//! Light emitted by this material. Default is to emit no light.
 		SColor EmissiveColor;
 
 		//! How much specular light (highlights from a light) is reflected.
-		/** The default is to reflect white specular light.  See SMaterial::Shininess how to
-		enable specular lights. */
+		/** The default is to reflect white specular light. See
+		SMaterial::Shininess on how to enable specular lights. */
 		SColor SpecularColor;
 
-		//! Value affecting the size of specular highlights. A value of 20 is common.
-		/** If set to 0, no specular highlights are being used.
-		To activate, simply set the shininess of a material to a value other than 0:
-		Using scene nodes:
+		//! Value affecting the size of specular highlights.
+		/** A value of 20 is common. If set to 0, no specular
+		highlights are being used. To activate, simply set the
+		shininess of a material to a value other than 0:
 		\code
 		sceneNode->getMaterial(0).Shininess = 20.0f;
 		\endcode
 
-		You can also change the color of the highlights using
+		You can change the color of the highlights using
 		\code
 		sceneNode->getMaterial(0).SpecularColor.set(255,255,255,255);
 		\endcode
 
-		The specular color of the dynamic lights (SLight::SpecularColor) will influence
-		the the highlight color too, but they are set to a useful value by default when
+		The specular color of the dynamic lights
+		(SLight::SpecularColor) will influence the the highlight color
+		too, but they are set to a useful value by default when
 		creating the light scene node. Here is a simple example on how
 		to use specular highlights:
 		\code
@@ -162,7 +171,7 @@ namespace video
 
 		// add white light
 		scene::ILightSceneNode* light = smgr->addLightSceneNode(0,
-		    core::vector3df(5,5,5), video::SColorf(1.0f, 1.0f, 1.0f));
+			core::vector3df(5,5,5), video::SColorf(1.0f, 1.0f, 1.0f));
 		\endcode */
 		f32 Shininess;
 
@@ -181,10 +190,10 @@ namespace video
 		//! Texture layer array.
 		SMaterialLayer TextureLayer[MATERIAL_MAX_TEXTURES];
 
-		//! material flags
-		/** The user can access the material flag using 
-		material.Wireframe = true or material.setFlag(EMF_WIREFRAME, true); */
 		//! Draw as wireframe or filled triangles? Default: false
+		/** The user can access a material flag using
+		\code material.Wireframe=true \endcode
+		or \code material.setFlag(EMF_WIREFRAME, true); \endcode */
 		bool Wireframe;
 
 		//! Draw as point cloud or filled triangles? Default: false
@@ -196,33 +205,40 @@ namespace video
 		//! Will this material be lighted? Default: true
 		bool Lighting;
 
-		//! Is the ZBuffer enabled? Default: true
-		//! Changed from bool to integer
-		// ( 0 == ZBuffer Off, 1 == ZBuffer LessEqual, 2 == ZBuffer Equal )
-		u32 ZBuffer;
-
-		//! Is the zbuffer writeable or is it read-only.
-		/** Default: 1 This flag is ignored, if the MaterialType
-		is a transparent type. */
+		//! Is the zbuffer writeable or is it read-only. Default: true.
+		/** This flag is ignored if the MaterialType is a transparent
+		type. */
 		bool ZWriteEnable;
 
 		//! Is backface culling enabled? Default: true
 		bool BackfaceCulling;
 
+		//! Is frontface culling enabled? Default: false
+		bool FrontfaceCulling;
+
 		//! Is fog enabled? Default: false
 		bool FogEnable;
 
 		//! Should normals be normalized? Default: false
 		bool NormalizeNormals;
 
+		//! Is the ZBuffer enabled? Default: 1
+		/** Changed from bool to integer
+		(0 == ZBuffer Off, 1 == ZBuffer LessEqual, 2 == ZBuffer Equal)
+		*/
+		char ZBuffer;
+
 		//! Gets the texture transformation matrix for level i
+		/** \param i The desired level. Must not be larger than MATERIAL_MAX_TEXTURES.
+		\return Texture matrix for texture level i. */
 		core::matrix4& getTextureMatrix(u32 i)
 		{
-			if (i<MATERIAL_MAX_TEXTURES)
-				return TextureLayer[i].getTextureMatrix();
+			return TextureLayer[i].getTextureMatrix();
 		}
 
 		//! Gets the immutable texture transformation matrix for level i
+		/** \param i The desired level.
+		\return Texture matrix for texture level i, or identity matrix for levels larger than MATERIAL_MAX_TEXTURES. */
 		const core::matrix4& getTextureMatrix(u32 i) const
 		{
 			if (i<MATERIAL_MAX_TEXTURES)
@@ -231,7 +247,9 @@ namespace video
 				return core::IdentityMatrix;
 		}
 
-		//! Sets the i-th texture transformation matrix to mat
+		//! Sets the i-th texture transformation matrix
+		/** \param i The desired level.
+		\param mat Texture matrix for texture level i. */
 		void setTextureMatrix(u32 i, const core::matrix4& mat)
 		{
 			if (i>=MATERIAL_MAX_TEXTURES)
@@ -240,15 +258,17 @@ namespace video
 		}
 
 		//! Gets the i-th texture
+		/** \param i The desired level.
+		\return Texture for texture level i, if defined, else 0. */
 		ITexture* getTexture(u32 i) const
 		{
-			if (i>=MATERIAL_MAX_TEXTURES)
-				return 0;
-			else
-				return TextureLayer[i].Texture;
+			return i < MATERIAL_MAX_TEXTURES ? TextureLayer[i].Texture : 0;
 		}
 
 		//! Sets the i-th texture
+		/** If i>=MATERIAL_MAX_TEXTURES this setting will be ignored.
+		\param i The desired level.
+		\param tex Texture for texture level i. */
 		void setTexture(u32 i, ITexture* tex)
 		{
 			if (i>=MATERIAL_MAX_TEXTURES)
@@ -257,6 +277,8 @@ namespace video
 		}
 
 		//! Sets the Material flag to the given value
+		/** \param flag The flag to be set.
+		\param value The new value for the flag. */
 		void setFlag(E_MATERIAL_FLAG flag, bool value)
 		{
 			switch (flag)
@@ -275,6 +297,8 @@ namespace video
 					ZWriteEnable = value; break;
 				case EMF_BACK_FACE_CULLING:
 					BackfaceCulling = value; break;
+				case EMF_FRONT_FACE_CULLING:
+					FrontfaceCulling = value; break;
 				case EMF_BILINEAR_FILTER:
 				{
 					for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
@@ -309,6 +333,8 @@ namespace video
 		}
 
 		//! Gets the Material flag
+		/** \param flag The flag to query.
+		\return The current value of the flag. */
 		bool getFlag(E_MATERIAL_FLAG flag) const
 		{
 			switch (flag)
@@ -327,6 +353,8 @@ namespace video
 					return ZWriteEnable;
 				case EMF_BACK_FACE_CULLING:
 					return BackfaceCulling;
+				case EMF_FRONT_FACE_CULLING:
+					return FrontfaceCulling;
 				case EMF_BILINEAR_FILTER:
 					return TextureLayer[0].BilinearFilter;
 				case EMF_TRILINEAR_FILTER:
@@ -338,7 +366,10 @@ namespace video
 				case EMF_NORMALIZE_NORMALS:
 					return NormalizeNormals;
 				case EMF_TEXTURE_WRAP:
-					return !(TextureLayer[0].TextureWrap || TextureLayer[1].TextureWrap || TextureLayer[2].TextureWrap || TextureLayer[3].TextureWrap);
+					return !(TextureLayer[0].TextureWrap ||
+							TextureLayer[1].TextureWrap ||
+							TextureLayer[2].TextureWrap ||
+							TextureLayer[3].TextureWrap);
 				case EMF_MATERIAL_FLAG_COUNT:
 					break;
 			}
@@ -347,9 +378,11 @@ namespace video
 		}
 
 		//! Inequality operator
+		/** \param b Material to compare to.
+		\return True if the materials differ, else false. */
 		inline bool operator!=(const SMaterial& b) const
 		{
-			bool different = 
+			bool different =
 				MaterialType != b.MaterialType ||
 				AmbientColor != b.AmbientColor ||
 				DiffuseColor != b.DiffuseColor ||
@@ -366,6 +399,7 @@ namespace video
 				ZBuffer != b.ZBuffer ||
 				ZWriteEnable != b.ZWriteEnable ||
 				BackfaceCulling != b.BackfaceCulling ||
+				FrontfaceCulling != b.FrontfaceCulling ||
 				FogEnable != b.FogEnable ||
 				NormalizeNormals != b.NormalizeNormals;
 			for (u32 i=0; (i<MATERIAL_MAX_TEXTURES) && !different; ++i)
@@ -376,8 +410,18 @@ namespace video
 		}
 
 		//! Equality operator
+		/** \param b Material to compare to.
+		\return True if the materials are equal, else false. */
 		inline bool operator==(const SMaterial& b) const
 		{ return !(b!=*this); }
+
+		bool isTransparent() const
+		{
+			return MaterialType==EMT_TRANSPARENT_ADD_COLOR ||
+				MaterialType==EMT_TRANSPARENT_ALPHA_CHANNEL ||
+				MaterialType==EMT_TRANSPARENT_VERTEX_ALPHA ||
+				MaterialType==EMT_TRANSPARENT_REFLECTION_2_LAYER;
+		}
 	};
 
 } // end namespace video
diff --git a/src/dep/include/irrlicht/SMaterialLayer.h b/src/dep/include/irrlicht/SMaterialLayer.h
index 45278b7..9c25a18 100644
--- a/src/dep/include/irrlicht/SMaterialLayer.h
+++ b/src/dep/include/irrlicht/SMaterialLayer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,6 +6,7 @@
 #define __S_MATERIAL_LAYER_H_INCLUDED__
 
 #include "matrix4.h"
+#include "irrAllocator.h"
 
 namespace irr
 {
@@ -34,20 +35,21 @@ namespace video
 			"texture_clamp_clamp_to_border",
 			"texture_clamp_mirror", 0};
 
-	//! struct for holding material parameters which exist per texture layer
+	//! Struct for holding material parameters which exist per texture layer
 	class SMaterialLayer
 	{
 	public:
-		//! default constructor
+		//! Default constructor
 		SMaterialLayer()
-			: Texture(0), TextureMatrix(0),
+			: Texture(0),
 				TextureWrap(ETC_REPEAT),
 				BilinearFilter(true),
 				TrilinearFilter(false),
-				AnisotropicFilter(false)
+				AnisotropicFilter(false), TextureMatrix(0)
 			{}
 
-		//! copy constructor
+		//! Copy constructor
+		/** \param other Material layer to copy from. */
 		SMaterialLayer(const SMaterialLayer& other)
 		{
 			// This pointer is checked during assignment
@@ -55,15 +57,22 @@ namespace video
 			*this = other;
 		}
 
-		//! destructor
+		//! Destructor
 		~SMaterialLayer()
 		{
-			delete TextureMatrix;
+			MatrixAllocator.destruct(TextureMatrix);
+			MatrixAllocator.deallocate(TextureMatrix); 
 		}
 
 		//! Assignment operator
+		/** \param other Material layer to copy from.
+		\return This material layer, updated. */
 		SMaterialLayer& operator=(const SMaterialLayer& other)
 		{
+			// Check for self-assignment!
+			if (this == &other)
+				return *this;
+
 			Texture = other.Texture;
 			if (TextureMatrix)
 			{
@@ -71,14 +80,18 @@ namespace video
 					*TextureMatrix = *other.TextureMatrix;
 				else
 				{
-					delete TextureMatrix;
+					MatrixAllocator.destruct(TextureMatrix);
+					MatrixAllocator.deallocate(TextureMatrix); 
 					TextureMatrix = 0;
 				}
 			}
 			else
 			{
 				if (other.TextureMatrix)
-					TextureMatrix = new core::matrix4(*other.TextureMatrix);
+				{
+					TextureMatrix = MatrixAllocator.allocate(1);
+					MatrixAllocator.construct(TextureMatrix,*other.TextureMatrix);
+				}
 				else
 					TextureMatrix = 0;
 			}
@@ -93,11 +106,6 @@ namespace video
 		//! Texture
 		ITexture* Texture;
 
-		//! Texture Matrix
-		//! Do not acces this element directly as the internal
-		//! ressource management has to cope with Null pointers etc.
-		core::matrix4* TextureMatrix;
-
 		//! Texture Clamp Mode
 		E_TEXTURE_CLAMP TextureWrap;
 
@@ -111,20 +119,25 @@ namespace video
 
 		//! Is anisotropic filtering enabled? Default: false
 		/** In Irrlicht you can use anisotropic texture filtering
-		    in conjunction with bilinear or trilinear texture
-		    filtering to improve rendering results. Primitives
-		    will look less blurry with this flag switched on. */
+		in conjunction with bilinear or trilinear texture
+		filtering to improve rendering results. Primitives
+		will look less blurry with this flag switched on. */
 		bool AnisotropicFilter;
 
 		//! Gets the texture transformation matrix
+		/** \return Texture matrix of this layer. */
 		core::matrix4& getTextureMatrix()
 		{
 			if (!TextureMatrix)
-				TextureMatrix = new core::matrix4(core::matrix4::EM4CONST_IDENTITY);
+			{
+				TextureMatrix = MatrixAllocator.allocate(1);
+				MatrixAllocator.construct(TextureMatrix,core::IdentityMatrix);
+			}
 			return *TextureMatrix;
 		}
 
 		//! Gets the immutable texture transformation matrix
+		/** \return Texture matrix of this layer. */
 		const core::matrix4& getTextureMatrix() const
 		{
 			if (TextureMatrix)
@@ -134,18 +147,24 @@ namespace video
 		}
 
 		//! Sets the texture transformation matrix to mat
+		/** \param mat New texture matrix for this layer. */
 		void setTextureMatrix(const core::matrix4& mat)
 		{
 			if (!TextureMatrix)
-				TextureMatrix = new core::matrix4(mat);
+			{
+				TextureMatrix = MatrixAllocator.allocate(1);
+				MatrixAllocator.construct(TextureMatrix,mat);
+			}
 			else
 				*TextureMatrix = mat;
 		}
 
 		//! Inequality operator
+		/** \param b Layer to compare to.
+		\return True if layers are different, else false. */
 		inline bool operator!=(const SMaterialLayer& b) const
 		{
-			bool different = 
+			bool different =
 				Texture != b.Texture ||
 				TextureWrap != b.TextureWrap ||
 				BilinearFilter != b.BilinearFilter ||
@@ -154,17 +173,29 @@ namespace video
 			if (different)
 				return true;
 			else
-				different |= (TextureMatrix != b.TextureMatrix);
+				different |= (TextureMatrix != b.TextureMatrix) &&
+					TextureMatrix && b.TextureMatrix &&
+					(*TextureMatrix != *(b.TextureMatrix));
 			return different;
 		}
 
 		//! Equality operator
+		/** \param b Layer to compare to.
+		\return True if layers are equal, else false. */
 		inline bool operator==(const SMaterialLayer& b) const
 		{ return !(b!=*this); }
+
+	private:
+		friend class SMaterial;
+		irr::core::irrAllocator<irr::core::matrix4> MatrixAllocator;
+
+		//! Texture Matrix
+		/** Do not access this element directly as the internal
+		ressource management has to cope with Null pointers etc. */
+		core::matrix4* TextureMatrix;
 	};
 
 } // end namespace video
 } // end namespace irr
 
 #endif // __S_MATERIAL_LAYER_H_INCLUDED__
-
diff --git a/src/dep/include/irrlicht/SMesh.h b/src/dep/include/irrlicht/SMesh.h
index 545eaa1..d4c51af 100644
--- a/src/dep/include/irrlicht/SMesh.h
+++ b/src/dep/include/irrlicht/SMesh.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -46,10 +46,10 @@ namespace scene
 		}
 
 		//! returns a meshbuffer which fits a material
-		// reverse search
+		/** reverse search */
 		virtual IMeshBuffer* getMeshBuffer( const video::SMaterial & material) const
 		{
-			for (s32 i = (s32) MeshBuffers.size(); --i >= 0; )
+			for (s32 i = (s32)MeshBuffers.size()-1; i >= 0; --i)
 			{
 				if ( material == MeshBuffers[i]->getMaterial())
 					return MeshBuffers[i];
@@ -100,7 +100,23 @@ namespace scene
 				MeshBuffers[i]->getMaterial().setFlag(flag, newvalue);
 		}
 
+		//! set the hardware mapping hint, for driver
+		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX )
+		{
+			for (u32 i=0; i<MeshBuffers.size(); ++i)
+				MeshBuffers[i]->setHardwareMappingHint(newMappingHint, buffer);
+		}
+
+		//! flags the meshbuffer as changed, reloads hardware buffers
+		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX)
+		{
+			for (u32 i=0; i<MeshBuffers.size(); ++i)
+				MeshBuffers[i]->setDirty(buffer);
+		}
+
+		//! The meshbuffers of this mesh
 		core::array<IMeshBuffer*> MeshBuffers;
+		//! The bounding box of this mesh
 		core::aabbox3d<f32> BoundingBox;
 	};
 
diff --git a/src/dep/include/irrlicht/SMeshBuffer.h b/src/dep/include/irrlicht/SMeshBuffer.h
index 73a4d90..2ae24d3 100644
--- a/src/dep/include/irrlicht/SMeshBuffer.h
+++ b/src/dep/include/irrlicht/SMeshBuffer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/SMeshBufferLightMap.h b/src/dep/include/irrlicht/SMeshBufferLightMap.h
index 73a4d90..2ae24d3 100644
--- a/src/dep/include/irrlicht/SMeshBufferLightMap.h
+++ b/src/dep/include/irrlicht/SMeshBufferLightMap.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/SMeshBufferTangents.h b/src/dep/include/irrlicht/SMeshBufferTangents.h
index 73a4d90..2ae24d3 100644
--- a/src/dep/include/irrlicht/SMeshBufferTangents.h
+++ b/src/dep/include/irrlicht/SMeshBufferTangents.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/include/irrlicht/SParticle.h b/src/dep/include/irrlicht/SParticle.h
index 92bd97a..f3c534d 100644
--- a/src/dep/include/irrlicht/SParticle.h
+++ b/src/dep/include/irrlicht/SParticle.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,6 +6,7 @@
 #define __S_PARTICLE_H_INCLUDED__
 
 #include "vector3d.h"
+#include "dimension2d.h"
 #include "SColor.h"
 
 namespace irr
@@ -30,14 +31,21 @@ namespace scene
 		//! Current color of the particle
 		video::SColor color;
 
-		//! Original color of the particle. That's the color
-		//! of the particle it had when it was emitted.
+		//! Original color of the particle.
+		/** That's the color of the particle it had when it was emitted. */
 		video::SColor startColor;
 
-		//! Original direction and speed of the particle, 
-		//! the direction and speed the particle had when
-		//! it was emitted.
+		//! Original direction and speed of the particle.
+		/** The direction and speed the particle had when it was emitted. */
 		core::vector3df startVector;
+
+		//! Scale of the particle.
+		/** The current scale of the particle. */
+		core::dimension2df size;
+
+		//! Original scale of the particle.
+		/** The scale of the particle when it was emitted. */
+		core::dimension2df startSize;
 	};
 
 
diff --git a/src/dep/include/irrlicht/SSharedMeshBuffer.h b/src/dep/include/irrlicht/SSharedMeshBuffer.h
index fbbef73..775a7b4 100644
--- a/src/dep/include/irrlicht/SSharedMeshBuffer.h
+++ b/src/dep/include/irrlicht/SSharedMeshBuffer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,13 +16,14 @@ namespace scene
 	struct SSharedMeshBuffer : public IMeshBuffer
 	{
 		//! constructor
-		SSharedMeshBuffer() : IMeshBuffer(), Vertices(0)
+		SSharedMeshBuffer() : IMeshBuffer(), ChangedID_Vertex(1), ChangedID_Index(1), Vertices(0), MappingHintVertex(EHM_NEVER), MappingHintIndex(EHM_NEVER)
 		{
 			#ifdef _DEBUG
 			setDebugName("SSharedMeshBuffer");
 			#endif
 		}
 
+		//! constructor
 		SSharedMeshBuffer(core::array<video::S3DVertex> *vertices) : IMeshBuffer(), Vertices(vertices)
 		{
 			#ifdef _DEBUG
@@ -30,9 +31,6 @@ namespace scene
 			#endif
 		}
 
-		//! destructor
-		virtual ~SSharedMeshBuffer() { }
-
 		//! returns the material of this meshbuffer
 		virtual const video::SMaterial& getMaterial() const
 		{
@@ -127,10 +125,63 @@ namespace scene
 		//! append the meshbuffer to the current buffer
 		virtual void append(const IMeshBuffer* const other) {}
 
-		video::SMaterial Material;		//! material of this meshBuffer
-		core::array<video::S3DVertex> *Vertices;//! Shared Array of vertices
-		core::array<u16> Indices;		//! Array of Indices
-		core::aabbox3df BoundingBox;		//! Bounding box
+
+		//! get the current hardware mapping hint
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const
+		{
+			return MappingHintVertex;
+		}
+
+		//! get the current hardware mapping hint
+		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const
+		{
+			return MappingHintIndex;
+		}
+
+		//! set the hardware mapping hint, for driver
+		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX )
+		{
+			if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX)
+				MappingHintVertex=NewMappingHint;
+			if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_INDEX)
+				MappingHintIndex=NewMappingHint;
+		}
+
+		//! flags the mesh as changed, reloads hardware buffers
+		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX)
+		{
+			if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX)
+				++ChangedID_Vertex;
+			if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_INDEX)
+				++ChangedID_Index;
+		}
+
+		//! Get the currently used ID for identification of changes.
+		/** This shouldn't be used for anything outside the VideoDriver. */
+		virtual u32 getChangedID_Vertex() const {return ChangedID_Vertex;}
+
+		//! Get the currently used ID for identification of changes.
+		/** This shouldn't be used for anything outside the VideoDriver. */
+		virtual u32 getChangedID_Index() const {return ChangedID_Index;}
+
+		//! ID used for hardware buffer management
+		u32 ChangedID_Vertex;
+
+		//! ID used for hardware buffer management
+		u32 ChangedID_Index;
+
+		//! Material of this meshBuffer
+		video::SMaterial Material;
+		//! Shared Array of vertices
+		core::array<video::S3DVertex> *Vertices;
+		//! Array of Indices
+		core::array<u16> Indices;
+		//! Bounding box
+		core::aabbox3df BoundingBox;
+		//! hardware mapping hint
+		E_HARDWARE_MAPPING MappingHintVertex;
+		E_HARDWARE_MAPPING MappingHintIndex;
+
 	};
 
 
diff --git a/src/dep/include/irrlicht/SSkinMeshBuffer.h b/src/dep/include/irrlicht/SSkinMeshBuffer.h
index e0ebcee..313fd4a 100644
--- a/src/dep/include/irrlicht/SSkinMeshBuffer.h
+++ b/src/dep/include/irrlicht/SSkinMeshBuffer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2006 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,96 +15,129 @@ namespace scene
 {
 
 
-//! A mesh buffer able to choose between
-//! S3DVertex2TCoords, S3DVertex and S3DVertexTangents at runtime
+//! A mesh buffer able to choose between S3DVertex2TCoords, S3DVertex and S3DVertexTangents at runtime
 struct SSkinMeshBuffer : public IMeshBuffer
 {
-	SSkinMeshBuffer(video::E_VERTEX_TYPE vt=video::EVT_STANDARD) : VertexType(vt)
+	//! Default constructor
+	SSkinMeshBuffer(video::E_VERTEX_TYPE vt=video::EVT_STANDARD) : 
+		ChangedID_Vertex(1),ChangedID_Index(1),MappingHint_Vertex(EHM_NEVER),
+		MappingHint_Index(EHM_NEVER),VertexType(vt),BoundingBoxNeedsRecalculated(true)
 	{
 		#ifdef _DEBUG
 		setDebugName("SSkinMeshBuffer");
 		#endif
 	}
 
-	virtual ~SSkinMeshBuffer() {}
-
+	//! Get Material of this buffer.
 	virtual const video::SMaterial& getMaterial() const
 	{
 		return Material;
 	}
 
+	//! Get Material of this buffer.
 	virtual video::SMaterial& getMaterial()
 	{
 		return Material;
 	}
 
+	//! Get standard vertex at given index
 	virtual video::S3DVertex *getVertex(u32 index)
 	{
 		switch (VertexType)
 		{
-			case video::EVT_2TCOORDS:	return (video::S3DVertex*)&Vertices_2TCoords[index];
-			case video::EVT_TANGENTS:	return (video::S3DVertex*)&Vertices_Tangents[index];
-			default:			return &Vertices_Standard[index];
+			case video::EVT_2TCOORDS:
+				return (video::S3DVertex*)&Vertices_2TCoords[index];
+			case video::EVT_TANGENTS:
+				return (video::S3DVertex*)&Vertices_Tangents[index];
+			default:
+				return &Vertices_Standard[index];
 		}
 	}
 
+	//! Get pointer to vertex array
 	virtual const void* getVertices() const
 	{
 		switch (VertexType)
 		{
-			case video::EVT_2TCOORDS:	return Vertices_2TCoords.const_pointer();
-			case video::EVT_TANGENTS:	return Vertices_Tangents.const_pointer();
-			default:			return Vertices_Standard.const_pointer();
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords.const_pointer();
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents.const_pointer();
+			default:
+				return Vertices_Standard.const_pointer();
 		}
 	}
 
+	//! Get pointer to vertex array
 	virtual void* getVertices()
 	{
 		switch (VertexType)
 		{
-			case video::EVT_2TCOORDS:	return Vertices_2TCoords.pointer();
-			case video::EVT_TANGENTS:	return Vertices_Tangents.pointer();
-			default:			return Vertices_Standard.pointer();
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords.pointer();
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents.pointer();
+			default:
+				return Vertices_Standard.pointer();
 		}
 	}
 
+	//! Get vertex count
 	virtual u32 getVertexCount() const
 	{
 		switch (VertexType)
 		{
-			case video::EVT_2TCOORDS:	return Vertices_2TCoords.size();
-			case video::EVT_TANGENTS:	return Vertices_Tangents.size();
-			default:			return Vertices_Standard.size();
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords.size();
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents.size();
+			default:
+				return Vertices_Standard.size();
 		}
 	}
 
+	//! Get type of index data which is stored in this meshbuffer.
+	/** \return Index type of this buffer. */
+	virtual video::E_INDEX_TYPE getIndexType() const { return video::EIT_16BIT; }
+
+	//! Get pointer to index array
 	virtual const u16* getIndices() const
 	{
 		return Indices.const_pointer();
 	}
 
+	//! Get pointer to index array
 	virtual u16* getIndices()
 	{
 		return Indices.pointer();
 	}
 
+	//! Get index count
 	virtual u32 getIndexCount() const
 	{
 		return Indices.size();
 	}
 
+	//! Get bounding box
 	virtual const core::aabbox3d<f32>& getBoundingBox() const
 	{
 		return BoundingBox;
 	}
 
+	//! Set bounding box
 	virtual void setBoundingBox( const core::aabbox3df& box)
 	{
 		BoundingBox = box;
 	}
 
+	//! Recalculate bounding box
 	virtual void recalculateBoundingBox()
 	{
+		if(!BoundingBoxNeedsRecalculated)
+			return;
+
+		BoundingBoxNeedsRecalculated = false;
+
 		switch (VertexType)
 		{
 			case video::EVT_STANDARD:
@@ -146,11 +179,13 @@ struct SSkinMeshBuffer : public IMeshBuffer
 		}
 	}
 
+	//! Get vertex type
 	virtual video::E_VERTEX_TYPE getVertexType() const
 	{
 		return VertexType;
 	}
 
+	//! Convert to 2tcoords vertex type
 	virtual void MoveTo_2TCoords()
 	{
 		if (VertexType==video::EVT_STANDARD)
@@ -169,6 +204,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
 		}
 	}
 
+	//! Convert to tangents vertex type
 	virtual void MoveTo_Tangents()
 	{
 		if (VertexType==video::EVT_STANDARD)
@@ -201,12 +237,144 @@ struct SSkinMeshBuffer : public IMeshBuffer
 		}
 	}
 
+	//! returns position of vertex i
+	virtual const core::vector3df& getPosition(u32 i) const
+	{
+		switch (VertexType)
+		{
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords[i].Pos;
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents[i].Pos;
+			default:
+				return Vertices_Standard[i].Pos;
+		}
+	}
+
+	//! returns position of vertex i
+	virtual core::vector3df& getPosition(u32 i)
+	{
+		switch (VertexType)
+		{
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords[i].Pos;
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents[i].Pos;
+			default:
+				return Vertices_Standard[i].Pos;
+		}
+	}
+
+	//! returns normal of vertex i
+	virtual const core::vector3df& getNormal(u32 i) const
+	{
+		switch (VertexType)
+		{
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords[i].Normal;
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents[i].Normal;
+			default:
+				return Vertices_Standard[i].Normal;
+		}
+	}
+
+	//! returns normal of vertex i
+	virtual core::vector3df& getNormal(u32 i)
+	{
+		switch (VertexType)
+		{
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords[i].Normal;
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents[i].Normal;
+			default:
+				return Vertices_Standard[i].Normal;
+		}
+	}
+
+	//! returns texture coords of vertex i
+	virtual const core::vector2df& getTCoords(u32 i) const
+	{
+		switch (VertexType)
+		{
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords[i].TCoords;
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents[i].TCoords;
+			default:
+				return Vertices_Standard[i].TCoords;
+		}
+	}
+
+	//! returns texture coords of vertex i
+	virtual core::vector2df& getTCoords(u32 i)
+	{
+		switch (VertexType)
+		{
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords[i].TCoords;
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents[i].TCoords;
+			default:
+				return Vertices_Standard[i].TCoords;
+		}
+	}
+
 	//! append the vertices and indices to the current buffer
 	virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) {}
 
 	//! append the meshbuffer to the current buffer
 	virtual void append(const IMeshBuffer* const other) {}
 
+	//! get the current hardware mapping hint for vertex buffers
+	virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const
+	{
+		return MappingHint_Vertex;
+	}
+
+	//! get the current hardware mapping hint for index buffers
+	virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const
+	{
+		return MappingHint_Index;
+	}
+
+	//! set the hardware mapping hint, for driver
+	virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX )
+	{
+		if (Buffer==EBT_VERTEX)
+			MappingHint_Vertex=NewMappingHint;
+		else if (Buffer==EBT_INDEX)
+			MappingHint_Index=NewMappingHint;
+		else if (Buffer==EBT_VERTEX_AND_INDEX)
+		{
+			MappingHint_Vertex=NewMappingHint;
+			MappingHint_Index=NewMappingHint;
+		}
+	}
+
+	//! flags the mesh as changed, reloads hardware buffers
+	virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX)
+	{
+		if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
+			++ChangedID_Vertex;
+		if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_INDEX)
+			++ChangedID_Index;
+	}
+
+	virtual u32 getChangedID_Vertex() const {return ChangedID_Vertex;}
+
+	virtual u32 getChangedID_Index() const {return ChangedID_Index;}
+
+	//! Call this after changing the positions of any vertex.
+	void boundingBoxNeedsRecalculated(void) { BoundingBoxNeedsRecalculated = true; }
+
+	u32 ChangedID_Vertex;
+	u32 ChangedID_Index;
+
+	// hardware mapping hint
+	E_HARDWARE_MAPPING MappingHint_Vertex;
+	E_HARDWARE_MAPPING MappingHint_Index;
 
 	//ISkinnedMesh::SJoint *AttachedJoint;
 	core::matrix4 Transformation;
@@ -218,6 +386,7 @@ struct SSkinMeshBuffer : public IMeshBuffer
 	core::array<video::S3DVertex> Vertices_Standard;
 	core::array<u16> Indices;
 	core::aabbox3d<f32> BoundingBox;
+	bool BoundingBoxNeedsRecalculated;
 };
 
 
diff --git a/src/dep/include/irrlicht/SViewFrustum.h b/src/dep/include/irrlicht/SViewFrustum.h
index 87fb915..f310629 100644
--- a/src/dep/include/irrlicht/SViewFrustum.h
+++ b/src/dep/include/irrlicht/SViewFrustum.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -57,32 +57,26 @@ namespace scene
 		//! Copy Constructor
 		SViewFrustum(const SViewFrustum& other);
 
-		//! This constructor creates a view frustum based on a
-		//! projection and/or view matrix.
+		//! This constructor creates a view frustum based on a projection and/or view matrix.
 		SViewFrustum(const core::matrix4& mat);
 
-		//! This constructor creates a view frustum based on a projection
-		//! and/or view matrix.
+		//! This constructor creates a view frustum based on a projection and/or view matrix.
 		inline void setFrom(const core::matrix4& mat);
 
 		//! transforms the frustum by the matrix
-		//! \param mat: Matrix by which the view frustum is transformed.
+		/** \param mat: Matrix by which the view frustum is transformed.*/
 		void transform(const core::matrix4& mat);
 
-		//! returns the point which is on the far left upper corner inside the
-		//! the view frustum.
+		//! returns the point which is on the far left upper corner inside the the view frustum.
 		core::vector3df getFarLeftUp() const;
 
-		//! returns the point which is on the far left bottom corner inside the
-		//! the view frustum.
+		//! returns the point which is on the far left bottom corner inside the the view frustum.
 		core::vector3df getFarLeftDown() const;
 
-		//! returns the point which is on the far right top corner inside the
-		//! the view frustum.
+		//! returns the point which is on the far right top corner inside the the view frustum.
 		core::vector3df getFarRightUp() const;
 
-		//! returns the point which is on the far right bottom corner inside the
-		//! the view frustum.
+		//! returns the point which is on the far right bottom corner inside the the view frustum.
 		core::vector3df getFarRightDown() const;
 
 		//! returns a bounding box enclosing the whole view frustum
@@ -91,6 +85,7 @@ namespace scene
 		//! recalculates the bounding box member based on the planes
 		inline void recalculateBoundingBox();
 
+		//! update the given state's matrix
 		void setTransformState( video::E_TRANSFORMATION_STATE state);
 
 		//! the position of the camera
@@ -107,7 +102,6 @@ namespace scene
 	};
 
 
-	//! Construct from another view frustum
 	inline SViewFrustum::SViewFrustum(const SViewFrustum& other)
 	{
 		cameraPosition=other.cameraPosition;
@@ -121,16 +115,12 @@ namespace scene
 			Matrices[i]=other.Matrices[i];
 	}
 
-	//! This constructor creates a view frustum based on a projection
-	//! and/or view matrix.
 	inline SViewFrustum::SViewFrustum(const core::matrix4& mat)
 	{
 		setFrom ( mat );
 	}
 
 
-	//! transforms the frustum by the matrix
-	//! \param Matrix by which the view frustum is transformed.
 	inline void SViewFrustum::transform(const core::matrix4& mat)
 	{
 		for (u32 i=0; i<VF_PLANE_COUNT; ++i)
@@ -141,8 +131,6 @@ namespace scene
 	}
 
 
-	//! returns the point which is on the far left upper corner inside the
-	//! the view frustum.
 	inline core::vector3df SViewFrustum::getFarLeftUp() const
 	{
 		core::vector3df p;
@@ -153,8 +141,6 @@ namespace scene
 		return p;
 	}
 
-	//! returns the point which is on the far left bottom corner inside the
-	//! the view frustum.
 	inline core::vector3df SViewFrustum::getFarLeftDown() const
 	{
 		core::vector3df p;
@@ -165,8 +151,6 @@ namespace scene
 		return p;
 	}
 
-	//! returns the point which is on the far right top corner inside the
-	//! the view frustum.
 	inline core::vector3df SViewFrustum::getFarRightUp() const
 	{
 		core::vector3df p;
@@ -177,8 +161,6 @@ namespace scene
 		return p;
 	}
 
-	//! returns the point which is on the far right bottom corner inside the
-	//! the view frustum.
 	inline core::vector3df SViewFrustum::getFarRightDown() const
 	{
 		core::vector3df p;
@@ -189,13 +171,11 @@ namespace scene
 		return p;
 	}
 
-	//! returns a bounding box enclosing the whole view frustum
 	inline const core::aabbox3d<f32> &SViewFrustum::getBoundingBox() const
 	{
 		return boundingBox;
 	}
 
-	//! recalculates the bounding box member based on the planes
 	inline void SViewFrustum::recalculateBoundingBox()
 	{
 		boundingBox.reset ( cameraPosition );
@@ -215,7 +195,7 @@ namespace scene
 		planes[SViewFrustum::VF_LEFT_PLANE].Normal.X = -(mat(0,3) + mat(0,0));
 		planes[SViewFrustum::VF_LEFT_PLANE].Normal.Y = -(mat(1,3) + mat(1,0));
 		planes[SViewFrustum::VF_LEFT_PLANE].Normal.Z = -(mat(2,3) + mat(2,0));
-		planes[SViewFrustum::VF_LEFT_PLANE].D =		  -(mat(3,3) + mat(3,0));
+		planes[SViewFrustum::VF_LEFT_PLANE].D = -(mat(3,3) + mat(3,0));
 
 		// right clipping plane
 		planes[SViewFrustum::VF_RIGHT_PLANE].Normal.X = -(mat(0,3) - mat(0,0));
@@ -250,7 +230,8 @@ namespace scene
 
 		for (s32 i=0; i<6; ++i)
 		{
-			const f32 len = core::reciprocal_squareroot ( planes[i].Normal.getLengthSQ() );
+			const f32 len = core::reciprocal_squareroot(
+					planes[i].Normal.getLengthSQ() );
 			planes[i].Normal *= len;
 			planes[i].D *= len;
 		}
@@ -260,15 +241,13 @@ namespace scene
 	}
 */
 
-	//! This constructor creates a view frustum based on a projection
-	//! and/or view matrix.
 	inline void SViewFrustum::setFrom(const core::matrix4& mat)
 	{
 		// left clipping plane
-		planes[VF_LEFT_PLANE].Normal.X	= mat[3 ] + mat[0];
-		planes[VF_LEFT_PLANE].Normal.Y	= mat[7 ] + mat[4];
-		planes[VF_LEFT_PLANE].Normal.Z	= mat[11] + mat[8];
-		planes[VF_LEFT_PLANE].D		= mat[15] + mat[12];
+		planes[VF_LEFT_PLANE].Normal.X = mat[3 ] + mat[0];
+		planes[VF_LEFT_PLANE].Normal.Y = mat[7 ] + mat[4];
+		planes[VF_LEFT_PLANE].Normal.Z = mat[11] + mat[8];
+		planes[VF_LEFT_PLANE].D =        mat[15] + mat[12];
 
 		// right clipping plane
 		planes[VF_RIGHT_PLANE].Normal.X = mat[3 ] - mat[0];
@@ -304,7 +283,8 @@ namespace scene
 		u32 i;
 		for ( i=0; i != VF_PLANE_COUNT; ++i)
 		{
-			const f32 len = - core::reciprocal_squareroot ( planes[i].Normal.getLengthSQ() );
+			const f32 len = -core::reciprocal_squareroot(
+					planes[i].Normal.getLengthSQ());
 			planes[i].Normal *= len;
 			planes[i].D *= len;
 		}
@@ -313,21 +293,22 @@ namespace scene
 		recalculateBoundingBox();
 	}
 
-	inline void SViewFrustum::setTransformState( video::E_TRANSFORMATION_STATE state)
+	inline void SViewFrustum::setTransformState(video::E_TRANSFORMATION_STATE state)
 	{
 		switch ( state )
 		{
 			case video::ETS_VIEW:
-				Matrices[ETS_VIEW_PROJECTION_3].setbyproduct_nocheck (	Matrices[ video::ETS_PROJECTION],
-																		Matrices[ video::ETS_VIEW]
-																	);
-				Matrices[ETS_VIEW_MODEL_INVERSE_3] = Matrices[ video::ETS_VIEW];
+				Matrices[ETS_VIEW_PROJECTION_3].setbyproduct_nocheck(
+						Matrices[video::ETS_PROJECTION],
+						Matrices[video::ETS_VIEW]);
+				Matrices[ETS_VIEW_MODEL_INVERSE_3] = Matrices[video::ETS_VIEW];
 				Matrices[ETS_VIEW_MODEL_INVERSE_3].makeInverse();
 				break;
 
 			case video::ETS_WORLD:
-				Matrices[ETS_CURRENT_3].setbyproduct (  Matrices[ ETS_VIEW_PROJECTION_3 ],
-														Matrices[ video::ETS_WORLD]	);
+				Matrices[ETS_CURRENT_3].setbyproduct(
+						Matrices[ETS_VIEW_PROJECTION_3 ],
+						Matrices[video::ETS_WORLD]);
 				break;
 			default:
 				break;
diff --git a/src/dep/include/irrlicht/SceneParameters.h b/src/dep/include/irrlicht/SceneParameters.h
index 34b7b61..17b336a 100644
--- a/src/dep/include/irrlicht/SceneParameters.h
+++ b/src/dep/include/irrlicht/SceneParameters.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,9 +6,9 @@
 #define __I_SCENE_PARAMETERS_H_INCLUDED__
 
 /*! \file SceneParameters.h
-    \brief Header file containing all scene parameters for modifying mesh loading etc.
-    
-    This file includes all parameter names which can be set using ISceneManager::getParameters()
+	\brief Header file containing all scene parameters for modifying mesh loading etc.
+
+	This file includes all parameter names which can be set using ISceneManager::getParameters()
 	to modify the behaviour of plugins and mesh loaders.
 */
 
@@ -16,31 +16,41 @@ namespace irr
 {
 namespace scene
 {
+	//! Name of the parameter for changing how Irrlicht handles the ZWrite flag for transparent (blending) materials
+	/** The default behavior in Irrlicht is to disable writing to the
+	z-buffer for all really transparent, i.e. blending materials. This
+	avoids problems with intersecting faces, but can also break renderings.
+	If transparent materials should use the SMaterial flag for ZWriteEnable
+	just as other material types use this attribute.
+	Use it like this:
+	\code
+	SceneManager->getParameters()->setAttribute(scene::ALLOW_ZWRITE_ON_TRANSPARENT, true);
+	\endcode
+	**/
+	const c8* const ALLOW_ZWRITE_ON_TRANSPARENT = "Allow_ZWrite_On_Transparent";
+
 	//! Name of the parameter for changing the texture path of the built-in csm loader.
 	/** Use it like this:
-	 \code
-	 SceneManager->getParameters()->setAttribute(
-	    scene::CSM_TEXTURE_PATH, "path/to/your/textures");
+	\code
+	SceneManager->getParameters()->setAttribute(scene::CSM_TEXTURE_PATH, "path/to/your/textures");
 	\endcode
-	**/ 
+	**/
 	const c8* const CSM_TEXTURE_PATH = "CSM_TexturePath";
 
 	//! Name of the parameter for changing the texture path of the built-in lmts loader.
 	/** Use it like this:
-	 \code
-	 SceneManager->getParameters()->setAttribute(
-	   scene::LMTS_TEXTURE_PATH, "path/to/your/textures");
+	\code
+	SceneManager->getParameters()->setAttribute(scene::LMTS_TEXTURE_PATH, "path/to/your/textures");
 	\endcode
-	**/ 
+	**/
 	const c8* const LMTS_TEXTURE_PATH = "LMTS_TexturePath";
 
 	//! Name of the parameter for changing the texture path of the built-in my3d loader.
 	/** Use it like this:
-	 \code
-	 SceneManager->getParameters()->setAttribute(
-	   scene::MY3D_TEXTURE_PATH, "path/to/your/textures");
+	\code
+	SceneManager->getParameters()->setAttribute(scene::MY3D_TEXTURE_PATH, "path/to/your/textures");
 	\endcode
-	**/ 
+	**/
 	const c8* const MY3D_TEXTURE_PATH = "MY3D_TexturePath";
 
 	//! Name of the parameter specifying the COLLADA mesh loading mode
@@ -51,55 +61,58 @@ namespace scene
 	dummy mesh and create instances of all meshes and lights and cameras in the collada
 	file by itself. Example:
 	\code
-	 SceneManager->getParameters()->setAttribute(
-	   scene::COLLADA_CREATE_SCENE_INSTANCES, true);
+	SceneManager->getParameters()->setAttribute(scene::COLLADA_CREATE_SCENE_INSTANCES, true);
 	\endcode
 	*/
 	const c8* const COLLADA_CREATE_SCENE_INSTANCES = "COLLADA_CreateSceneInstances";
 
 	//! Name of the parameter for changing the texture path of the built-in DMF loader.
 	/** Use it like this:
-	 \code
-	 SceneManager->getStringParameters()->setAttribute(
-	   scene::DMF_TEXTURE_PATH, "path/to/your/textures");
+	\code
+	SceneManager->getStringParameters()->setAttribute(scene::DMF_TEXTURE_PATH, "path/to/your/textures");
 	\endcode
-	**/ 
+	**/
 	const c8* const DMF_TEXTURE_PATH = "DMF_TexturePath";
-	
+
 	//! Name of the parameter for preserving DMF textures dir structure with built-in DMF loader.
 	/** Use it like this:
-	 \code
-	 //this way you won't use this setting
-	 SceneManager->getParameters()->setAttribute(
-	   scene::DMF_USE_MATERIALS_DIRS, false); 
-	 \endcode
-	 \code
-     //this way you'll use this setting
-     SceneManager->getParameters()->setAttribute(
-	   scene::DMF_USE_MATERIALS_DIRS, true); 
+	\code
+	//this way you won't use this setting
+	SceneManager->getParameters()->setAttribute(scene::DMF_USE_MATERIALS_DIRS, false);
 	\endcode
-	**/ 
+	\code
+	//this way you'll use this setting
+	SceneManager->getParameters()->setAttribute(scene::DMF_USE_MATERIALS_DIRS, true);
+	\endcode
+	**/
 	const c8* const DMF_USE_MATERIALS_DIRS = "DMF_MaterialsDir";
 
 	//! Name of the parameter for setting reference value of alpha in transparent materials.
 	/** Use it like this:
-	 \code
-	 //this way you'll set alpha ref to 0.1
-     SceneManager->getParameters()->setAttribute(
-	   scene::DMF_ALPHA_CHANNEL_REF, 0.1); 
+	\code
+	//this way you'll set alpha ref to 0.1
+	SceneManager->getParameters()->setAttribute(scene::DMF_ALPHA_CHANNEL_REF, 0.1);
 	\endcode
-	**/ 
+	**/
 	const c8* const DMF_ALPHA_CHANNEL_REF = "DMF_AlphaRef";
-	
+
 	//! Name of the parameter for choose to flip or not tga files.
+	/** Use it like this:
+	\code
+	//this way you'll choose to flip alpha textures
+	SceneManager->getParameters()->setAttribute(scene::DMF_FLIP_ALPHA_TEXTURES, true);
+	\endcode
+	**/
+	const c8* const DMF_FLIP_ALPHA_TEXTURES = "DMF_FlipAlpha";
+
+
+	//! Flag to avoid loading group structures in .obj files
 	/** Use it like this:
 	 \code
-	 //this way you'll choose to flip alpha textures
-     SceneManager->()->setAttribute(
-	   scene::DMF_FLIP_ALPHA_TEXTURES, true); 
+     SceneManager->getParameters()->setAttribute(scene::OBJ_LOADER_IGNORE_GROUPS, true); 
 	\endcode
 	**/ 
-	const c8* const DMF_FLIP_ALPHA_TEXTURES = "DMF_FlipAlpha";
+	const c8* const OBJ_LOADER_IGNORE_GROUPS = "OBJ_IgnoreGroups";
 
 
 	//! Flag set as parameter when the scene manager is used as editor
diff --git a/src/dep/include/irrlicht/aabbox3d.h b/src/dep/include/irrlicht/aabbox3d.h
index 2827bad..19eacc9 100644
--- a/src/dep/include/irrlicht/aabbox3d.h
+++ b/src/dep/include/irrlicht/aabbox3d.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -22,38 +22,48 @@ class aabbox3d
 {
 	public:
 
-		// Constructors
-
+		//! Default Constructor.
 		aabbox3d(): MinEdge(-1,-1,-1), MaxEdge(1,1,1) {}
+		//! Constructor with min edge and max edge.
 		aabbox3d(const vector3d<T>& min, const vector3d<T>& max): MinEdge(min), MaxEdge(max) {}
+		//! Constructor with only one point.
 		aabbox3d(const vector3d<T>& init): MinEdge(init), MaxEdge(init) {}
+		//! Constructor with min edge and max edge as single values, not vectors.
 		aabbox3d(T minx, T miny, T minz, T maxx, T maxy, T maxz): MinEdge(minx, miny, minz), MaxEdge(maxx, maxy, maxz) {}
 
 		// operators
-
-		inline bool operator==(const aabbox3d<T>& other) const { return (MinEdge == other.MinEdge && other.MaxEdge == MaxEdge);};
-		inline bool operator!=(const aabbox3d<T>& other) const { return !(MinEdge == other.MinEdge && other.MaxEdge == MaxEdge);};
+		//! Equality operator
+		/** \param other box to compare with.
+		\return True if both boxes are equal, else false. */
+		inline bool operator==(const aabbox3d<T>& other) const { return (MinEdge == other.MinEdge && other.MaxEdge == MaxEdge);}
+		//! Inequality operator
+		/** \param other box to compare with.
+		\return True if both boxes are different, else false. */
+		inline bool operator!=(const aabbox3d<T>& other) const { return !(MinEdge == other.MinEdge && other.MaxEdge == MaxEdge);}
 
 		// functions
 
-		//! Adds a point to the bounding box, causing it to grow bigger, 
-		//! if point is outside of the box
-		//! \param p: Point to add into the box.
+		//! Adds a point to the bounding box
+		/** The box grows bigger, if point was outside of the box.
+		\param p: Point to add into the box. */
 		void addInternalPoint(const vector3d<T>& p)
 		{
 			addInternalPoint(p.X, p.Y, p.Z);
 		}
 
-		//! Adds an other bounding box to the bounding box, causing it to grow bigger,
-		//! if the box is outside of the box
-		//! \param b: Other bounding box to add into this box.
+		//! Adds another bounding box
+		/** The box grows bigger, if the new box was outside of the box.
+		\param b: Other bounding box to add into this box. */
 		void addInternalBox(const aabbox3d<T>& b)
 		{
 			addInternalPoint(b.MaxEdge);
 			addInternalPoint(b.MinEdge);
 		}
 
-		//! Resets the bounding box.
+		//! Resets the bounding box to a one-point box.
+		/** \param x X coord of the point.
+		\param y Y coord of the point.
+		\param z Z coord of the point. */
 		void reset(T x, T y, T z)
 		{
 			MaxEdge.set(x,y,z);
@@ -61,23 +71,25 @@ class aabbox3d
 		}
 
 		//! Resets the bounding box.
+		/** \param initValue New box to set this one to. */
 		void reset(const aabbox3d<T>& initValue)
 		{
 			*this = initValue;
 		}
 
-		//! Resets the bounding box.
+		//! Resets the bounding box to a one-point box.
+		/** \param initValue New point. */
 		void reset(const vector3d<T>& initValue)
 		{
 			MaxEdge = initValue;
 			MinEdge = initValue;
 		}
 
-		//! Adds a point to the bounding box, causing it to grow bigger, 
-		//! if point is outside of the box.
-		//! \param x: X Coordinate of the point to add to this box.
-		//! \param y: Y Coordinate of the point to add to this box.
-		//! \param z: Z Coordinate of the point to add to this box.
+		//! Adds a point to the bounding box
+		/** The box grows bigger, if point is outside of the box.
+		\param x X coordinate of the point to add to this box.
+		\param y Y coordinate of the point to add to this box.
+		\param z Z coordinate of the point to add to this box. */
 		void addInternalPoint(T x, T y, T z)
 		{
 			if (x>MaxEdge.X) MaxEdge.X = x;
@@ -89,60 +101,66 @@ class aabbox3d
 			if (z<MinEdge.Z) MinEdge.Z = z;
 		}
 
-		//! Determinates if a point is within this box.
-		//! \param p: Point to check.
-		//! \return Returns true if the point is withing the box, and false if it is not.
+		//! Determines if a point is within this box.
+		/** \param p: Point to check.
+		\return True if the point is within the box and false if not */
 		bool isPointInside(const vector3d<T>& p) const
 		{
 			return (p.X >= MinEdge.X && p.X <= MaxEdge.X &&
 				p.Y >= MinEdge.Y && p.Y <= MaxEdge.Y &&
 				p.Z >= MinEdge.Z && p.Z <= MaxEdge.Z);
-		};
+		}
 
-		//! Determinates if a point is within this box and its borders.
-		//! \param p: Point to check.
-		//! \return Returns true if the point is withing the box, and false if it is not.
+		//! Determines if a point is within this box and its borders.
+		/** \param p: Point to check.
+		\return True if the point is within the box and false if not. */
 		bool isPointTotalInside(const vector3d<T>& p) const
 		{
 			return (p.X > MinEdge.X && p.X < MaxEdge.X &&
 				p.Y > MinEdge.Y && p.Y < MaxEdge.Y &&
 				p.Z > MinEdge.Z && p.Z < MaxEdge.Z);
-		};
+		}
 
-		//! Determinates if the box intersects with an other box.
-		//! \param other: Other box to check a intersection with.
-		//! \return Returns true if there is a intersection with the other box, 
-		//! otherwise false.
+		//! Determines if the box intersects with another box.
+		/** \param other: Other box to check a intersection with.
+		\return True if there is an intersection with the other box,
+		otherwise false. */
 		bool intersectsWithBox(const aabbox3d<T>& other) const
 		{
 			return (MinEdge <= other.MaxEdge && MaxEdge >= other.MinEdge);
 		}
 
-		//! Returns if this box is completely inside the 'other' box.
+		//! Check if this box is completely inside the 'other' box.
+		/** \param other: Other box to check against.
+		\return True if this box is completly inside the other box,
+		otherwise false. */
 		bool isFullInside(const aabbox3d<T>& other) const
 		{
 			return MinEdge >= other.MinEdge && MaxEdge <= other.MaxEdge;
 		}
 
 		//! Tests if the box intersects with a line
-		//! \param line: Line to test intersection with.
-		//! \return Returns true if there is an intersection and false if not.
+		/** \param line: Line to test intersection with.
+		\return True if there is an intersection , else false. */
 		bool intersectsWithLine(const line3d<T>& line) const
 		{
-			return intersectsWithLine(line.getMiddle(), line.getVector().normalize(), 
+			return intersectsWithLine(line.getMiddle(), line.getVector().normalize(),
 					(T)(line.getLength() * 0.5));
 		}
 
 		//! Tests if the box intersects with a line
-		//! \return Returns true if there is an intersection and false if not.
-		bool intersectsWithLine(const vector3d<T>& linemiddle, 
+		/** \param linemiddle Center of the line.
+		\param linevect Vector of the line.
+		\param halflength Half length of the line.
+		\return True if there is an intersection, else false. */
+		bool intersectsWithLine(const vector3d<T>& linemiddle,
 					const vector3d<T>& linevect,
 					T halflength) const
 		{
 			const vector3d<T> e = getExtent() * (T)0.5;
 			const vector3d<T> t = getCenter() - linemiddle;
 
-			if ((fabs(t.X) > e.X + halflength * fabs(linevect.X)) || 
+			if ((fabs(t.X) > e.X + halflength * fabs(linevect.X)) ||
 				(fabs(t.Y) > e.Y + halflength * fabs(linevect.Y)) ||
 				(fabs(t.Z) > e.Z + halflength * fabs(linevect.Z)) )
 				return false;
@@ -163,10 +181,10 @@ class aabbox3d
 		}
 
 		//! Classifies a relation with a plane.
-		//! \param plane: Plane to classify relation to.
-		//! \return Returns ISREL3D_FRONT if the box is in front of the plane,
-		//! ISREL3D_BACK if the box is behind the plane, and
-		//! ISREL3D_CLIPPED if it is on both sides of the plane.
+		/** \param plane Plane to classify relation to.
+		\return Returns ISREL3D_FRONT if the box is in front of the plane,
+		ISREL3D_BACK if the box is behind the plane, and
+		ISREL3D_CLIPPED if it is on both sides of the plane. */
 		EIntersectionRelation3D classifyPlaneRelation(const plane3d<T>& plane) const
 		{
 			vector3d<T> nearPoint(MaxEdge);
@@ -200,21 +218,24 @@ class aabbox3d
 		}
 
 
-		//! returns center of the bounding box
+		//! Get center of the bounding box
+		/** \return Center of the bounding box. */
 		vector3d<T> getCenter() const
 		{
 			return (MinEdge + MaxEdge) / 2;
 		}
 
-		//! returns extend of the box
+
+		//! Get extent of the box
+		/** \return Extent of the bounding box. */
 		vector3d<T> getExtent() const
 		{
 			return MaxEdge - MinEdge;
 		}
 
 
-		//! stores all 8 edges of the box into a array
-		//! \param edges: Pointer to array of 8 edges
+		//! Stores all 8 edges of the box into an array
+		/** \param edges: Pointer to array of 8 edges. */
 		void getEdges(vector3d<T> *edges) const
 		{
 			const core::vector3d<T> middle = getCenter();
@@ -230,7 +251,7 @@ class aabbox3d
                 |   2- - -| -6
                 |  /      |  /
                 |/        | /
-                0---------4/ 
+                0---------4/
 			*/
 
 			edges[0].set(middle.X + diag.X, middle.Y + diag.Y, middle.Z + diag.Z);
@@ -244,14 +265,18 @@ class aabbox3d
 		}
 
 
-		//! returns if the box is empty, which means that there is
-		//! no space within the min and the max edge.
+		//! Check if the box is empty.
+		/** This means that there is no space between the min and max
+		edge.
+		\return True if box is empty, else false. */
 		bool isEmpty() const
 		{
 			return MinEdge.equals ( MaxEdge );
 		}
 
-		//! repairs the box, if for example MinEdge and MaxEdge are swapped.
+
+		//! Repairs the box.
+		/** Necessary if for example MinEdge and MaxEdge are swapped. */
 		void repair()
 		{
 			T t;
@@ -265,8 +290,9 @@ class aabbox3d
 		}
 
 		//! Calculates a new interpolated bounding box.
-		//! \param other: other box to interpolate between
-		//! \param d: value between 0.0f and 1.0f.
+		/** \param other: other box to interpolate between
+		\param d: value between 0.0f and 1.0f.
+		\return Interpolated box. */
 		aabbox3d<T> getInterpolated(const aabbox3d<T>& other, f32 d) const
 		{
 			f32 inv = 1.0f - d;
@@ -274,9 +300,23 @@ class aabbox3d
 				(other.MaxEdge*inv) + (MaxEdge*d));
 		}
 
-		// member variables
-		
+		//! Get the volume enclosed by the box in cubed units
+		T getVolume() const
+		{
+			const vector3d<T> e = getExtent();
+			return e.X * e.Y * e.Z;
+		}
+
+		//! Get the surface area of the box in squared units
+		T getArea() const
+		{
+			const vector3d<T> e = getExtent();
+			return 2*(e.X*e.Y + e.X*e.Z + e.Y*e.Z);
+		}
+
+		//! The near edge
 		vector3d<T> MinEdge;
+		//! The far edge
 		vector3d<T> MaxEdge;
 };
 
diff --git a/src/dep/include/irrlicht/coreutil.h b/src/dep/include/irrlicht/coreutil.h
index 97fd6c2..e69bbdd 100644
--- a/src/dep/include/irrlicht/coreutil.h
+++ b/src/dep/include/irrlicht/coreutil.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,7 +13,7 @@ namespace core
 {
 
 /*! \file irrxml.h
-    \brief File containing useful basic utility functions
+	\brief File containing useful basic utility functions
 */
 
 // ----------- some basic quite often used string functions -----------------
@@ -42,7 +42,7 @@ inline stringc& getFileNameExtension ( stringc &dest, const stringc &source )
 #undef isspace
 #undef isupper
 inline s32 isdigit(s32 c) { return c >= '0' && c <= '9'; }
-inline s32 isspace(s32 c) { return	c ==  ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v';	}
+inline s32 isspace(s32 c) { return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v'; }
 inline s32 isupper(s32 c) { return c >= 'A' && c <= 'Z'; }
 
 
diff --git a/src/dep/include/irrlicht/dimension2d.h b/src/dep/include/irrlicht/dimension2d.h
index 977685c..f9140bb 100644
--- a/src/dep/include/irrlicht/dimension2d.h
+++ b/src/dep/include/irrlicht/dimension2d.h
@@ -1,78 +1,179 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __IRR_DIMENSION2D_H_INCLUDED__
-#define __IRR_DIMENSION2D_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace core
-{
-
-	//! Specifies a 2 dimensional size.
-	template <class T>
-	class dimension2d
-	{
-		public:
-			dimension2d() : Width(0), Height(0) {}
-
-			dimension2d(const T& width, const T& height)
-				: Width(width), Height(height) {}
-
-			bool operator == (const dimension2d<T>& other) const
-			{
-				return Width == other.Width && Height == other.Height;
-			}
-
-			bool operator != (const dimension2d<T>& other) const
-			{
-				return ! (*this == other);
-			}
-
-			dimension2d<T>& set(const T& width, const T& height) 
-			{
-				Width = width;
-				Height = height;
-				return *this;
-			}
-
-			dimension2d<T>& operator/=(const T& scale)
-			{
-				Width /= scale;
-				Height /= scale;
-				return *this;
-			}
-
-			dimension2d<T> operator/(const T& scale) const
-			{
-				return dimension2d<T>(Width/scale, Height/scale);
-			}
-
-			dimension2d<T>& operator*=(const T& scale)
-			{
-				Width *= scale;
-				Height *= scale;
-				return *this;
-			}
-
-			dimension2d<T> operator*(const T& scale) const
-			{
-				return dimension2d<T>(Width*scale, Height*scale);
-			}
-
-			T Width, Height;
-	};
-
-	//! Typedef for a f32 dimension.
-	typedef dimension2d<f32> dimension2df;
-	//! Typedef for an integer dimension.
-	typedef dimension2d<s32> dimension2di;
-
-} // end namespace core
-} // end namespace irr
-
-#endif
-
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __IRR_DIMENSION2D_H_INCLUDED__
+#define __IRR_DIMENSION2D_H_INCLUDED__
+
+#include "irrTypes.h"
+#include "irrMath.h" // for irr::core::equals()
+
+namespace irr
+{
+namespace core
+{
+
+	//! Specifies a 2 dimensional size.
+	template <class T>
+	class dimension2d
+	{
+		public:
+			//! Default constructor for empty dimension
+			dimension2d() : Width(0), Height(0) {}
+			//! Constructor with width and height
+			dimension2d(const T& width, const T& height)
+				: Width(width), Height(height) {}
+
+			//! Equality operator
+			bool operator==(const dimension2d<T>& other) const
+			{
+				return core::equals(Width, other.Width) &&
+						core::equals(Height, other.Height);
+			}
+
+			//! Inequality operator
+			bool operator!=(const dimension2d<T>& other) const
+			{
+				return ! (*this == other);
+			}
+
+
+			//! Set to new values
+			dimension2d<T>& set(const T& width, const T& height)
+			{
+				Width = width;
+				Height = height;
+				return *this;
+			}
+
+			//! Divide width and height by scalar
+			dimension2d<T>& operator/=(const T& scale)
+			{
+				Width /= scale;
+				Height /= scale;
+				return *this;
+			}
+
+			//! Divide width and height by scalar
+			dimension2d<T> operator/(const T& scale) const
+			{
+				return dimension2d<T>(Width/scale, Height/scale);
+			}
+
+			//! Multiply width and height by scalar
+			dimension2d<T>& operator*=(const T& scale)
+			{
+				Width *= scale;
+				Height *= scale;
+				return *this;
+			}
+
+			//! Multiply width and height by scalar
+			dimension2d<T> operator*(const T& scale) const
+			{
+				return dimension2d<T>(Width*scale, Height*scale);
+			}
+
+			//! Add another dimension to this one.
+			dimension2d<T>& operator+=(const dimension2d<T>& other)
+			{
+				Width += other.Width;
+				Height += other.Height;
+				return *this;
+			}
+
+			//! Subtract a dimension from this one
+			dimension2d<T>& operator-=(const dimension2d<T>& other)
+			{
+				Width -= other.Width;
+				Height -= other.Height;
+				return *this;
+			}
+
+
+			//! Add two dimensions
+			dimension2d<T> operator+(const dimension2d<T>& other) const
+			{
+				return dimension2d<T>(Width+other.Width, Height+other.Height);
+			}
+
+			//! Get area
+			T getArea() const
+			{
+				return Width*Height;
+			}
+
+			//! Get the optimal size according to some properties
+			/** This is a function often used for texture dimension
+			calculations. The function returns the next larger or
+			smaller dimension which is a power-of-two dimension
+			(2^n,2^m) and/or square (Width=Height).
+			\param requirePowerOfTwo Forces the result to use only
+			powers of two as values.
+			\param requireSquare Makes width==height in the result
+			\param larger Choose whether the result is larger or
+			smaller than the current dimension. If one dimension
+			need not be changed it is kept with any value of larger.
+			\return The optimal dimension under the given
+			constraints. */
+			dimension2d<T> getOptimalSize(
+					bool requirePowerOfTwo=true,
+					bool requireSquare=false,
+					bool larger=true) const
+			{
+				u32 i=1;
+				u32 j=1;
+				if (requirePowerOfTwo)
+				{
+					while (i<(u32)Width)
+						i<<=1;
+					if (!larger && i!=1 && i!=(u32)Width)
+						i>>=1;
+					while (j<(u32)Height)
+						j<<=1;
+					if (!larger && j!=1 && j!=(u32)Height)
+						j>>=1;
+				}
+				else
+				{
+					i=(u32)Width;
+					j=(u32)Height;
+				}
+
+				if (requireSquare)
+				{
+					if ((larger && (i>j)) || (!larger && (i<j)))
+						j=i;
+					else
+						i=j;
+				}
+				return dimension2d<T>((T)i,(T)j);
+			}
+
+			//! Get the interpolated dimension
+			/** \param other Other dimension to interpolate with.
+			\param d Value between 0.0f and 1.0f.
+			\return Interpolated dimension. */
+			dimension2d<T> getInterpolated(const dimension2d<T>& other, f32 d) const
+			{
+				T inv = (T) (1.0f - d);
+				return dimension2d<T>(other.Width*inv + Width*d, other.Height*inv + Height*d);
+			}
+
+
+			//! Width of the dimension.
+			T Width;
+			//! Height of the dimension.
+			T Height;
+	};
+
+	//! Typedef for an f32 dimension.
+	typedef dimension2d<f32> dimension2df;
+	//! Typedef for an integer dimension.
+	typedef dimension2d<s32> dimension2di;
+
+} // end namespace core
+} // end namespace irr
+
+#endif
+
diff --git a/src/dep/include/irrlicht/fast_atof.h b/src/dep/include/irrlicht/fast_atof.h
index ff1977b..596a56c 100644
--- a/src/dep/include/irrlicht/fast_atof.h
+++ b/src/dep/include/irrlicht/fast_atof.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
 
@@ -7,13 +7,16 @@
 
 #include <stdlib.h>
 #include "irrMath.h"
+#include <float.h> // For FLT_MAX
+#include <limits.h> // For INT_MAX / UINT_MAX
 
 namespace irr
 {
 namespace core
 {
 
-const float fast_atof_table[16] =	{  // we write [16] here instead of [] to work around a swig bug
+// we write [16] here instead of [] to work around a swig bug
+const float fast_atof_table[16] = {
 	0.f,
 	0.1f,
 	0.01f,
@@ -32,80 +35,160 @@ const float fast_atof_table[16] =	{  // we write [16] here instead of [] to work
 	0.000000000000001f
 };
 
-inline u32 strtol10(const char* in, const char** out=0)
+//! Convert a simple string of base 10 digits into a signed 32 bit integer.
+//! \param[in] in: The string of digits to convert. Only a leading - or + followed 
+//!					by digits 0 to 9 will be considered.  Parsing stops at the
+//!					first non-digit.
+//! \param[out] out: (optional) If provided, it will be set to point at the first
+//!					 character not used in the calculation.
+//! \return The signed integer value of the digits. If the string specifies too many
+//!			digits to encode in an s32 then +INT_MAX or -INT_MAX will be returned.
+inline s32 strtol10(const char* in, const char** out=0)
 {
-	u32 value = 0;
+	if(!in)
+		return 0;
 
-	while ( 1 )
+	bool negative = false;
+	if('-' == *in)
 	{
-		if ( *in < '0' || *in > '9' )
-			break;
-
-		value = ( value * 10 ) + ( *in - '0' );
+		negative = true;
 		++in;
 	}
+	else if('+' == *in)
+		++in;
+
+	u32 unsignedValue = 0;
+
+	while ( ( *in >= '0') && ( *in <= '9' ))
+	{
+		unsignedValue = ( unsignedValue * 10 ) + ( *in - '0' );
+		++in;
+
+		if(unsignedValue > (u32)INT_MAX)
+		{
+			unsignedValue = (u32)INT_MAX;
+			break;
+		}
+	}
 	if (out)
 		*out = in;
-	return value;
+
+	if(negative)
+		return -((s32)unsignedValue);
+	else
+		return (s32)unsignedValue;
 }
 
-//! Provides a fast function for converting a string into a float,
-//! about 6 times faster than atof in win32.
-// If you find any bugs, please send them to me, niko (at) irrlicht3d.org.
-inline const char* fast_atof_move( const char* c, float& out)
+//! Converts a sequence of digits into a whole positive floating point value.
+//! Only digits 0 to 9 are parsed.  Parsing stops at any other character, 
+//! including sign characters or a decimal point.
+//! \param in: the sequence of digits to convert.
+//! \param out: (optional) will be set to point at the first non-converted character.
+//! \return The whole positive floating point representation of the digit sequence.
+inline f32 strtof10(const char* in, const char * * out = 0)
 {
-	bool inv = false;
-	const char *t;
-	float f;
+	if(out)
+		*out = in;
 
-	if (*c=='-')
+	if(!in)
+		return 0.f;
+
+	static const u32 MAX_SAFE_U32_VALUE = UINT_MAX / 10 - 10;
+	f32 floatValue = 0.f;
+	u32 intValue = 0;
+
+	// Use integer arithmetic for as long as possible, for speed
+	// and precision.
+	while ( ( *in >= '0') && ( *in <= '9' ) )
 	{
-		++c;
-		inv = true;
+		// If it looks like we're going to overflow, bail out
+		// now and start using floating point.
+		if(intValue >= MAX_SAFE_U32_VALUE)
+			break;
+
+		intValue = ( intValue * 10) + ( *in - '0' );
+		++in;
 	}
 
-	//f = (float)strtol(c, &t, 10);
-	f = (float) strtol10 ( c, &c );
+	floatValue = (f32)intValue;
 
-	if (*c == '.')
+	// If there are any digits left to parse, then we need to use 
+	// floating point arithmetic from here.
+	while ( ( *in >= '0') && ( *in <= '9' ) )
 	{
-		++c;
-
-		//float pl = (float)strtol(c, &t, 10);
-		float pl = (float) strtol10 ( c, &t );
-		pl *= fast_atof_table[t-c];
-
-		f += pl;
-
-		c = t;
-
-		if (*c == 'e')
-		{
-			++c;
-			//float exp = (float)strtol(c, &t, 10);
-			bool einv = (*c=='-');
-			if (einv)
-				++c;
-
-			float exp = (float)strtol10(c, &c);
-			if (einv)
-				exp *= -1.0f;
-
-			f *= (float)pow(10.0f, exp);
-		}
+		floatValue = ( floatValue * 10.f ) + (f32)( *in - '0' );
+		++in;
+		if(floatValue > FLT_MAX) // Just give up.
+			break;
 	}
 
-	if (inv)
-		f *= -1.0f;
-	
-	out = f;
-	return c;
+	if(out)
+		*out = in;
+
+	return floatValue;
 }
 
-inline float fast_atof(const char* c)
+//! Provides a fast function for converting a string into a float.
+//! This is not guaranteed to be as accurate as atof(), but is 
+//! approximately 6 to 8 times as fast.
+//! \param[in] in: The string to convert. 
+//! \param[out] out: The resultant float will be written here.
+//! \return A pointer to the first character in the string that wasn't
+//!         use to create the float value.
+inline const char* fast_atof_move( const char * in, f32 & out)
+{
+	// Please run this regression test when making any modifications to this function:
+	// https://sourceforge.net/tracker/download.php?group_id=74339&atid=540676&file_id=298968&aid=1865300
+
+	out = 0.f;
+	if(!in)
+		return 0;
+
+	bool negative = false;
+	if(*in == '-')
+	{
+		negative = true;
+		++in;
+	}
+
+	f32 value = strtof10 ( in, &in );
+
+	if (*in == '.')
+	{
+		++in;
+
+		const char * afterDecimal = in;
+		f32 decimal = strtof10 ( in, &afterDecimal );
+		decimal *= fast_atof_table[afterDecimal - in];
+
+		value += decimal;
+
+		in = afterDecimal;
+	}
+
+	if ('e' == *in || 'E' == *in)
+	{
+		++in;
+		// Assume that the exponent is a whole number.
+		// strtol10() will deal with both + and - signs,
+		// but cast to (f32) to prevent overflow at FLT_MAX
+		value *= (f32)pow(10.0f, (f32)strtol10(in, &in));
+	}
+
+	if(negative)
+		out = -value;
+	else
+		out = value;
+
+	return in;
+}
+
+//! Convert a string to a floating point number
+//! \param floatAsString: The string to convert. 
+inline float fast_atof(const char* floatAsString)
 {
 	float ret;
-	fast_atof_move(c, ret);
+	fast_atof_move(floatAsString, ret);
 	return ret;
 }
 
diff --git a/src/dep/include/irrlicht/heapsort.h b/src/dep/include/irrlicht/heapsort.h
index b346364..9c2b3b7 100644
--- a/src/dep/include/irrlicht/heapsort.h
+++ b/src/dep/include/irrlicht/heapsort.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,10 +16,10 @@ namespace core
 template<class T>
 inline void heapsink(T*array, s32 element, s32 max)
 {
-	while ((element<<1) < max)	// there is a left child
+	while ((element<<1) < max) // there is a left child
 	{
 		s32 j = (element<<1);
-	
+
 		if (j+1 < max && array[j] < array[j+1])
 			j = j+1; // take right child
 
@@ -50,12 +50,12 @@ inline void heapsort(T* array_, s32 size)
 
 	// build heap
 
-	for (i=((size-1)/2); i>=0; --i)	
+	for (i=((size-1)/2); i>=0; --i)
 		heapsink(virtualArray, i+1, virtualSize-1);
 
 	// sort array
 
-	for (i=size-1; i>=0; --i)	
+	for (i=size-1; i>=0; --i)
 	{
 		T t = array_[0];
 		array_[0] = array_[i];
diff --git a/src/dep/include/irrlicht/irrAllocator.h b/src/dep/include/irrlicht/irrAllocator.h
index 9c12f6c..b4bb761 100644
--- a/src/dep/include/irrlicht/irrAllocator.h
+++ b/src/dep/include/irrlicht/irrAllocator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
 
@@ -19,35 +19,34 @@ namespace core
 #define DEBUG_CLIENTBLOCK new
 #endif
 
-//!	Very simple allocator implementation, containers using it are able to
-//! be used it across dll boundaries
+//! Very simple allocator implementation, containers using it can be used across dll boundaries
 template<typename T>
 class irrAllocator
 {
 public:
 
-	//! destructor
+	//! Destructor
 	virtual ~irrAllocator() {}
 
-	//! allocate memory for an array of objects
+	//! Allocate memory for an array of objects
 	T* allocate(size_t cnt)
 	{
 		return (T*)internal_new(cnt* sizeof(T));
 	}
 
-	//! deallocate memory for an array of objects
+	//! Deallocate memory for an array of objects
 	void deallocate(T* ptr)
 	{
 		internal_delete(ptr);
 	}
 
-	//! construct an element
+	//! Construct an element
 	void construct(T* ptr, const T&e)
 	{
 		new ((void*)ptr) T(e);
 	}
 
-	//! destruct an element
+	//! Destruct an element
 	void destruct(T* ptr)
 	{
 		ptr->~T();
@@ -68,7 +67,7 @@ protected:
 };
 
 
-//! fast allocator, only to be used in containers inside the same memory heap.
+//! Fast allocator, only to be used in containers inside the same memory heap.
 /** Containers using it are NOT able to be used it across dll boundaries. Use this
 when using in an internal class or function or when compiled into a static lib */
 template<typename T>
@@ -76,25 +75,25 @@ class irrAllocatorFast
 {
 public:
 
-	//! allocate memory for an array of objects
+	//! Allocate memory for an array of objects
 	T* allocate(size_t cnt)
 	{
 		return (T*)operator new(cnt* sizeof(T));
 	}
 
-	//! deallocate memory for an array of objects
+	//! Deallocate memory for an array of objects
 	void deallocate(T* ptr)
 	{
 		operator delete(ptr);
 	}
 
-	//! construct an element
+	//! Construct an element
 	void construct(T* ptr, const T&e)
 	{
 		new ((void*)ptr) T(e);
 	}
 
-	//! destruct an element
+	//! Destruct an element
 	void destruct(T* ptr)
 	{
 		ptr->~T();
diff --git a/src/dep/include/irrlicht/irrArray.h b/src/dep/include/irrlicht/irrArray.h
index 01d8117..4904faa 100644
--- a/src/dep/include/irrlicht/irrArray.h
+++ b/src/dep/include/irrlicht/irrArray.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
 
@@ -14,7 +14,7 @@ namespace irr
 namespace core
 {
 
-//!	Self reallocating template array (like stl vector) with additional features.
+//! Self reallocating template array (like stl vector) with additional features.
 /** Some features are: Heap sorting, binary search methods, easier debugging.
 */
 template <class T, typename TAlloc = irrAllocator<T> >
@@ -23,14 +23,15 @@ class array
 
 public:
 
+	//! Default constructor for empty array.
 	array()
 		: data(0), allocated(0), used(0),
 			free_when_destroyed(true), is_sorted(true)
 	{
 	}
 
-	//! Constructs a array and allocates an initial chunk of memory.
-	//! \param start_count: Amount of elements to allocate.
+	//! Constructs an array and allocates an initial chunk of memory.
+	/** \param start_count Amount of elements to pre-allocate. */
 	array(u32 start_count)
 		: data(0), allocated(0), used(0),
 			free_when_destroyed(true), is_sorted(true)
@@ -48,8 +49,9 @@ public:
 
 
 
-	//! Destructor. Frees allocated memory, if set_free_when_destroyed
-	//! was not set to false by the user before.
+	//! Destructor.
+	/** Frees allocated memory, if set_free_when_destroyed was not set to
+	false by the user before. */
 	~array()
 	{
 		if (free_when_destroyed)
@@ -62,9 +64,8 @@ public:
 	}
 
 
-
 	//! Reallocates the array, make it bigger or smaller.
-	//! \param new_size: New size of array.
+	/** \param new_size New size of array. */
 	void reallocate(u32 new_size)
 	{
 		T* old_data = data;
@@ -74,7 +75,7 @@ public:
 
 		// copy old data
 		s32 end = used < new_size ? used : new_size;
-		
+
 		for (s32 i=0; i<end; ++i)
 		{
 			// data[i] = old_data[i];
@@ -91,9 +92,10 @@ public:
 		allocator.deallocate(old_data); //delete [] old_data;
 	}
 
-	//! Adds an element at back of array. If the array is too small to
-	//! add this new element it is made bigger.
-	//! \param element: Element to add at the back of the array.
+
+	//! Adds an element at back of array.
+	/** If the array is too small to add this new element it is made bigger.
+	\param element: Element to add at the back of the array. */
 	void push_back(const T& element)
 	{
 		if (used + 1 > allocated)
@@ -106,7 +108,7 @@ public:
 			T e(element);
 			reallocate(used * 2 +1); // increase data block
 
-			allocator.construct(&data[used++], e); // data[used++] = e;  // push_back
+			allocator.construct(&data[used++], e); // data[used++] = e; // push_back
 		}
 		else
 		{
@@ -119,34 +121,23 @@ public:
 	}
 
 
-	//! Adds an element at the front of the array. If the array is to small to
-	//! add this new element, the array is made bigger. Please note that this
-	//! is slow, because the whole array needs to be copied for this.
-	//! \param element: Element to add at the back of the array.
+	//! Adds an element at the front of the array.
+	/** If the array is to small to add this new element, the array is
+	made bigger. Please note that this is slow, because the whole array
+	needs to be copied for this.
+	\param element Element to add at the back of the array. */
 	void push_front(const T& element)
 	{
-		if (used + 1 > allocated)
-			reallocate(used +1);
-
-		for (u32 i=used; i>0; --i)
-		{
-			//data[i] = data[i-1];
-			allocator.construct(&data[i], data[i-1]);
-		}
-
-		// data[0] = element;
-		allocator.construct(&data[0], element);
-
-		is_sorted = false;
-		++used;
+		insert(element);
 	}
 
 
-	//! Insert item into array at specified position. Please use this
-	//! only if you know what you are doing (possible performance loss).
-	//! The preferred method of adding elements should be push_back().
-	//! \param element: Element to be inserted
-	//! \param index: Where position to insert the new element.
+	//! Insert item into array at specified position.
+	/** Please use this only if you know what you are doing (possible
+	performance loss). The preferred method of adding elements should be
+	push_back().
+	\param element: Element to be inserted
+	\param index: Where position to insert the new element. */
 	void insert(const T& element, u32 index=0)
 	{
 		_IRR_DEBUG_BREAK_IF(index>used) // access violation
@@ -154,16 +145,21 @@ public:
 		if (used + 1 > allocated)
 			reallocate(used +1);
 
-		for (u32 i=used++; i>index; --i)
+		for (u32 i=used; i>index; --i)
+		{
+			if (i<used)
+				allocator.destruct(&data[i]);
 			allocator.construct(&data[i], data[i-1]); // data[i] = data[i-1];
+		}
 
+		if (used > index)
+			allocator.destruct(&data[index]);
 		allocator.construct(&data[index], element); // data[index] = element;
 		is_sorted = false;
+		++used;
 	}
 
 
-
-
 	//! Clears the array and deletes all allocated memory.
 	void clear()
 	{
@@ -178,10 +174,9 @@ public:
 	}
 
 
-
 	//! Sets pointer to new array, using this as new workspace.
-	//! \param newPointer: Pointer to new array of elements.
-	//! \param size: Size of the new array.
+	/** \param newPointer: Pointer to new array of elements.
+	\param size: Size of the new array. */
 	void set_pointer(T* newPointer, u32 size)
 	{
 		for (u32 i=0; i<used; ++i)
@@ -195,21 +190,19 @@ public:
 	}
 
 
-
-	//! Sets if the array should delete the memory it used.
-	//! \param f: If true, the array frees the allocated memory in its
-	//! destructor, otherwise not. The default is true.
+	//! Sets if the array should delete the memory it uses upon destruction.
+	/** \param f If true, the array frees the allocated memory in its
+	destructor, otherwise not. The default is true. */
 	void set_free_when_destroyed(bool f)
 	{
 		free_when_destroyed = f;
 	}
 
 
-
-	//! Sets the size of the array and adds some new elements if necessary.
-	/** Please note: This is only secure when using it with simple types, because
-	no default constructor will be called for the added new elements.
-	\param usedNow: Amount of elements now used. */
+	//! Sets the size of the array and allocates new elements if necessary.
+	/** Please note: This is only secure when using it with simple types,
+	because no default constructor will be called for the added elements.
+	\param usedNow Amount of elements now used. */
 	void set_used(u32 usedNow)
 	{
 		if (allocated < usedNow)
@@ -219,7 +212,6 @@ public:
 	}
 
 
-
 	//! Assignment operator
 	void operator=(const array<T>& other)
 	{
@@ -246,7 +238,8 @@ public:
 			allocator.construct(&data[i], other.data[i]); // data[i] = other.data[i];
 	}
 
-	// equality operator
+
+	//! Equality operator
 	bool operator == (const array<T>& other) const
 	{
 		if (used != other.used)
@@ -258,12 +251,13 @@ public:
 		return true;
 	}
 
-	// inequality operator
+	//! Inequality operator
 	bool operator != (const array<T>& other) const
 	{
 		return !(*this==other);
 	}
 
+
 	//! Direct access operator
 	T& operator [](u32 index)
 	{
@@ -273,8 +267,7 @@ public:
 	}
 
 
-
-	//! Direct access operator
+	//! Direct const access operator
 	const T& operator [](u32 index) const
 	{
 		_IRR_DEBUG_BREAK_IF(index>=used) // access violation
@@ -282,7 +275,8 @@ public:
 		return data[index];
 	}
 
-	//! Gets last frame
+
+	//! Gets last element.
 	T& getLast()
 	{
 		_IRR_DEBUG_BREAK_IF(!used) // access violation
@@ -291,7 +285,7 @@ public:
 	}
 
 
-	//! Gets last frame
+	//! Gets last element
 	const T& getLast() const
 	{
 		_IRR_DEBUG_BREAK_IF(!used) // access violation
@@ -299,54 +293,51 @@ public:
 		return data[used-1];
 	}
 
-	//! Returns a pointer to the array.
-	//! \return Pointer to the array.
+
+	//! Gets a pointer to the array.
+	/** \return Pointer to the array. */
 	T* pointer()
 	{
 		return data;
 	}
 
 
-
-	//! Returns a const pointer to the array.
-	//! \return Pointer to the array.
+	//! Gets a const pointer to the array.
+	/** \return Pointer to the array. */
 	const T* const_pointer() const
 	{
 		return data;
 	}
 
 
-
-	//! Returns size of used array.
-	//! \return Size of elements in the array.
+	//! Get size of array.
+	/** \return Size of elements used in the array. */
 	u32 size() const
 	{
 		return used;
 	}
 
 
-
-	//! Returns amount memory allocated.
-	//! \return Returns amount of memory allocated. The amount of bytes
-	//! allocated would  be allocated_size() * sizeof(ElementsUsed);
+	//! Get amount of memory allocated.
+	/** \return Amount of memory allocated. The amount of bytes
+	allocated would be allocated_size() * sizeof(ElementsUsed); */
 	u32 allocated_size() const
 	{
 		return allocated;
 	}
 
 
-
-	//! Returns true if array is empty
-	//! \return True if the array is empty, false if not.
+	//! Check if array is empty.
+	/** \return True if the array is empty false if not. */
 	bool empty() const
 	{
 		return used == 0;
 	}
 
 
-
-	//! Sorts the array using heapsort. There is no additional memory waste and
-	//! the algorithm performs O(n*log n) in worst case.
+	//! Sorts the array using heapsort.
+	/** There is no additional memory waste and the algorithm performs
+	O(n*log n) in worst case. */
 	void sort()
 	{
 		if (is_sorted || used<2)
@@ -357,37 +348,36 @@ public:
 	}
 
 
-
 	//! Performs a binary search for an element, returns -1 if not found.
-	//! The array will be sorted before the binary search if it is not
-	//! already sorted.
-	//! \param element: Element to search for.
-	//! \return Returns position of the searched element if it was found,
-	//! otherwise -1 is returned.
+	/** The array will be sorted before the binary search if it is not
+	already sorted.
+	\param element Element to search for.
+	\return Position of the searched element if it was found,
+	otherwise -1 is returned. */
 	s32 binary_search(const T& element)
 	{
 		sort();
 		return binary_search(element, 0, used-1);
 	}
 
+
 	//! Performs a binary search for an element, returns -1 if not found.
-	//! The array must be sorted prior
-	//! \param element: Element to search for.
-	//! \return Returns position of the searched element if it was found,
-	//! otherwise -1 is returned.
+	/** The array must be sorted prior
+	\param element Element to search for.
+	\return Position of the searched element if it was found, otherwise -1
+	is returned. */
 	s32 binary_search_const(const T& element) const
 	{
 		return binary_search(element, 0, used-1);
 	}
 
 
-
 	//! Performs a binary search for an element, returns -1 if not found.
-	//! \param element: Element to search for.
-	//! \param left: First left index
-	//! \param right: Last right index.
-	//! \return Returns position of the searched element if it was found,
-	//! otherwise -1 is returned.
+	/** \param element: Element to search for.
+	\param left First left index
+	\param right Last right index.
+	\return Position of the searched element if it was found, otherwise -1
+	is returned. */
 	s32 binary_search(const T& element, s32 left, s32 right) const
 	{
 		if (!used)
@@ -405,12 +395,12 @@ public:
 				left = m + 1;
 
 		} while((element < data[m] || data[m] < element) && left<=right);
-
 		// this last line equals to:
 		// " while((element != array[m]) && left<=right);"
 		// but we only want to use the '<' operator.
 		// the same in next line, it is "(element == array[m])"
 
+
 		if (!(element < data[m]) && !(data[m] < element))
 			return m;
 
@@ -418,11 +408,12 @@ public:
 	}
 
 
-	//! Finds an element in linear time, which is very slow. Use
-	//! binary_search for faster finding. Only works if ==operator is implemented.
-	//! \param element: Element to search for.
-	//! \return Returns position of the searched element if it was found,
-	//! otherwise -1 is returned.
+	//! Finds an element in linear time, which is very slow.
+	/** Use binary_search for faster finding. Only works if ==operator is
+	implemented.
+	\param element Element to search for.
+	\return Position of the searched element if it was found, otherwise -1
+	is returned. */
 	s32 linear_search(const T& element) const
 	{
 		for (u32 i=0; i<used; ++i)
@@ -433,11 +424,12 @@ public:
 	}
 
 
-	//! Finds an element in linear time, which is very slow. Use
-	//! binary_search for faster finding. Only works if ==operator is implemented.
-	//! \param element: Element to search for.
-	//! \return Returns position of the searched element if it was found,
-	//! otherwise -1 is returned.
+	//! Finds an element in linear time, which is very slow.
+	/** Use binary_search for faster finding. Only works if ==operator is
+	implemented.
+	\param element: Element to search for.
+	\return Position of the searched element if it was found, otherwise -1
+	is returned. */
 	s32 linear_reverse_search(const T& element) const
 	{
 		for (s32 i=used-1; i>=0; --i)
@@ -448,10 +440,10 @@ public:
 	}
 
 
-
-	//! Erases an element from the array. May be slow, because all elements
-	//! following after the erased element have to be copied.
-	//! \param index: Index of element to be erased.
+	//! Erases an element from the array.
+	/** May be slow, because all elements following after the erased
+	element have to be copied.
+	\param index: Index of element to be erased. */
 	void erase(u32 index)
 	{
 		_IRR_DEBUG_BREAK_IF(index>=used) // access violation
@@ -468,10 +460,11 @@ public:
 	}
 
 
-	//! Erases some elements from the array. may be slow, because all elements
-	//! following after the erased element have to be copied.
-	//! \param index: Index of the first element to be erased.
-	//! \param count: Amount of elements to be erased.
+	//! Erases some elements from the array.
+	/** May be slow, because all elements following after the erased
+	element have to be copied.
+	\param index: Index of the first element to be erased.
+	\param count: Amount of elements to be erased. */
 	void erase(u32 index, s32 count)
 	{
 		_IRR_DEBUG_BREAK_IF(index>=used || count<1 || index+count>used) // access violation
@@ -501,7 +494,6 @@ public:
 		is_sorted = _is_sorted;
 	}
 
-
 	private:
 
 		T* data;
diff --git a/src/dep/include/irrlicht/irrList.h b/src/dep/include/irrlicht/irrList.h
index cc85c06..230273c 100644
--- a/src/dep/include/irrlicht/irrList.h
+++ b/src/dep/include/irrlicht/irrList.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,7 +13,7 @@ namespace core
 {
 
 
-//! Double linked list template.
+//! Doubly linked list template.
 template <class T>
 class list
 {
@@ -22,7 +22,7 @@ private:
 	//! List element node with pointer to previous and next element in the list.
 	struct SKListNode
 	{
-		SKListNode() : Next(0), Prev(0) {};
+		SKListNode() : Next(0), Prev(0) {}
 
 		SKListNode* Next;
 		SKListNode* Prev;
@@ -67,9 +67,9 @@ public:
 
 		#if defined (_MSC_VER) && (_MSC_VER < 1300)
 			#pragma warning(disable:4284) // infix notation problem when using iterator operator ->
-		#endif 
+		#endif
 
-		T & operator * () { return Current->Element;  }
+		T & operator * () { return Current->Element; }
 		T * operator ->() { return &Current->Element; }
 
 	private:
@@ -80,6 +80,7 @@ public:
 		friend class list<T>;
 	};
 
+	//! List iterator for const access.
 	class ConstIterator
 	{
 	public:
@@ -127,19 +128,19 @@ public:
 		friend class list<T>;
 	};
 
-	//! constructor
+	//! Default constructor for empty list.
 	list()
 		: First(0), Last(0), Size(0) {}
 
 
-	//! copy constructor
+	//! Copy constructor.
 	list(const list<T>& other) : First(0), Last(0), Size(0)
 	{
 		*this = other;
 	}
 
 
-	//! destructor
+	//! Destructor
 	~list()
 	{
 		clear();
@@ -165,18 +166,16 @@ public:
 	}
 
 
-
 	//! Returns amount of elements in list.
-	//! \return Returns amount of elements in the list.
+	/** \return Amount of elements in the list. */
 	u32 getSize() const
 	{
 		return Size;
 	}
 
 
-
-	//! Clears the list, deletes all elements in the list. All existing
-	//! iterators of this list will be invalid.
+	//! Clears the list, deletes all elements in the list.
+	/** All existing iterators of this list will be invalid. */
 	void clear()
 	{
 		while(First)
@@ -192,18 +191,16 @@ public:
 	}
 
 
-
-	//! Returns ture if the list is empty.
-	//! \return Returns true if the list is empty and false if not.
+	//! Checks for empty list.
+	/** \return True if the list is empty and false if not. */
 	bool empty() const
 	{
 		return (First == 0);
 	}
 
 
-
 	//! Adds an element at the end of the list.
-	//! \param element: Element to add to the list.
+	/** \param element Element to add to the list. */
 	void push_back(const T& element)
 	{
 		SKListNode* node = new SKListNode;
@@ -224,7 +221,7 @@ public:
 
 
 	//! Adds an element at the begin of the list.
-	//! \param element: Element to add to the list.
+	/** \param element: Element to add to the list. */
 	void push_front(const T& element)
 	{
 		SKListNode* node = new SKListNode;
@@ -246,16 +243,16 @@ public:
 	}
 
 
-	//! Gets begin node.
-	//! \return Returns a list iterator pointing to the begin of the list.
+	//! Gets first node.
+	/** \return A list iterator pointing to the beginning of the list. */
 	Iterator begin()
 	{
 		return Iterator(First);
 	}
 
 
-	//! Gets begin node.
-	//! \return Returns a list iterator pointing to the begin of the list.
+	//! Gets first node.
+	/** \return A const list iterator pointing to the beginning of the list. */
 	ConstIterator begin() const
 	{
 		return ConstIterator(First);
@@ -263,7 +260,7 @@ public:
 
 
 	//! Gets end node.
-	//! \return Returns a list iterator pointing to null.
+	/** \return List iterator pointing to null. */
 	Iterator end()
 	{
 		return Iterator(0);
@@ -271,7 +268,7 @@ public:
 
 
 	//! Gets end node.
-	//! \return Returns a list iterator pointing to null.
+	/** \return Const list iterator pointing to null. */
 	ConstIterator end() const
 	{
 		return ConstIterator(0);
@@ -279,7 +276,7 @@ public:
 
 
 	//! Gets last element.
-	//! \return Returns a list iterator pointing to the end of the list.
+	/** \return List iterator pointing to the last element of the list. */
 	Iterator getLast()
 	{
 		return Iterator(Last);
@@ -287,7 +284,7 @@ public:
 
 
 	//! Gets last element.
-	//! \return Returns a list iterator pointing to the end of the list.
+	/** \return Const list iterator pointing to the last element of the list. */
 	ConstIterator getLast() const
 	{
 		return ConstIterator(Last);
@@ -295,9 +292,10 @@ public:
 
 
 	//! Inserts an element after an element.
-	//! \param it: Iterator pointing to element after which the new element
-	//! should be inserted.
-	//! \param element: The new element to be inserted into the list.
+	/** \param it Iterator pointing to element after which the new element
+	should be inserted.
+	\param element The new element to be inserted into the list.
+	*/
 	void insert_after(const Iterator& it, const T& element)
 	{
 		SKListNode* node = new SKListNode;
@@ -318,9 +316,10 @@ public:
 
 
 	//! Inserts an element before an element.
-	//! \param it: Iterator pointing to element before which the new element
-	//! should be inserted.
-	//! \param element: The new element to be inserted into the list.
+	/** \param it Iterator pointing to element before which the new element
+	should be inserted.
+	\param element The new element to be inserted into the list.
+	*/
 	void insert_before(const Iterator& it, const T& element)
 	{
 		SKListNode* node = new SKListNode;
@@ -340,9 +339,9 @@ public:
 	}
 
 
-	//! Erases an element
-	//! \param it: Iterator pointing to the element which shall be erased.
-	//! \return Returns iterator pointing to next element.
+	//! Erases an element.
+	/** \param it Iterator pointing to the element which shall be erased.
+	\return Iterator pointing to next element. */
 	Iterator erase(Iterator& it)
 	{
 		// suggest changing this to a const Iterator& and
diff --git a/src/dep/include/irrlicht/irrMap.h b/src/dep/include/irrlicht/irrMap.h
index 98279fd..75f7f20 100644
--- a/src/dep/include/irrlicht/irrMap.h
+++ b/src/dep/include/irrlicht/irrMap.h
@@ -1,4 +1,4 @@
-// Copyright 2006-2007 by Kat'Oun
+// Copyright (C) 2006-2009 by Kat'Oun
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -26,8 +26,6 @@ class map
 			: LeftChild(0), RightChild(0), Parent(0), Key(k),
 				Value(v), IsRed(true) {}
 
-		~RBTree() {}
-
 		void setLeftChild(RBTree* p)
 		{
 			LeftChild=p;
@@ -98,13 +96,13 @@ class map
 		}
 
 
-		bool isRed()	const
+		bool isRed() const
 		{
 			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-			return  IsRed;
+			return IsRed;
 		}
 
-		bool isBlack()	const
+		bool isBlack() const
 		{
 			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 			return !IsRed;
@@ -122,7 +120,7 @@ class map
 		ValueTypeRB	Value;
 
 		bool IsRed;
-	};
+	}; // RBTree
 
 	public:
 
@@ -280,10 +278,10 @@ class map
 
 
 	//! Parent First Iterator.
-	//! Traverses the tree from top to bottom. Typical usage is
-	//! when storing the tree structure, because when reading it
-	//! later (and inserting elements) the tree structure will
-	//! be the same.
+	/** Traverses the tree from top to bottom. Typical usage is
+	when storing the tree structure, because when reading it
+	later (and inserting elements) the tree structure will
+	be the same. */
 	class ParentFirstIterator
 	{
 	public:
@@ -388,10 +386,10 @@ class map
 
 
 	//! Parent Last Iterator
-	//! Traverse the tree from bottom to top.
-	//! Typical usage is when deleting all elements in the tree
-	//! because you must delete the children before you delete
-	//! their parent.
+	/** Traverse the tree from bottom to top.
+	Typical usage is when deleting all elements in the tree
+	because you must delete the children before you delete
+	their parent. */
 	class ParentLastIterator
 	{
 	public:
@@ -475,7 +473,6 @@ class map
 				Cur = Cur->getParent();
 		}
 
-
 		Node* Root;
 		Node* Cur;
 	}; // ParentLastIterator
@@ -484,8 +481,7 @@ class map
 	// AccessClass is a temporary class used with the [] operator.
 	// It makes it possible to have different behavior in situations like:
 	// myTree["Foo"] = 32;
-	//   If "Foo" already exists, just update its value else insert a new
-	//   element.
+	// If "Foo" already exists update its value else insert a new element.
 	// int i = myTree["Foo"]
 	// If "Foo" exists return its value, else throw an exception.
 	class AccessClass
@@ -540,10 +536,9 @@ class map
 	//------------------------------
 
 	//! Inserts a new node into the tree
-	//! \param keyNew: the index for this value
-	//! \param v: the value to insert
-	//! \return Returns true if successful,
-	//! false if it fails (already exists)
+	/** \param keyNew: the index for this value
+	\param v: the value to insert
+	\return True if successful, false if it fails (already exists) */
 	bool insert(const KeyType& keyNew, const ValueType& v)
 	{
 		// First insert node the "usual" way (no fancy balance logic yet)
@@ -623,10 +618,9 @@ class map
 		return true;
 	}
 
-	//! Replaces the value if the key already exists,
-	//! otherwise inserts a new element.
-	//! \param k: the index for this value
-	//! \param v: the new value of
+	//! Replaces the value if the key already exists, otherwise inserts a new element.
+	/** \param k The index for this value
+	\param v The new value of */
 	void set(const KeyType& k, const ValueType& v)
 	{
 		Node* p = find(k);
@@ -637,9 +631,9 @@ class map
 	}
 
 	//! Removes a node from the tree and returns it.
-	//! The returned node must be deleted by the user
-	//! \param k: the key to remove
-	//! \return: A pointer to the node, or 0 if not found
+	/** The returned node must be deleted by the user
+	\param k the key to remove
+	\return A pointer to the node, or 0 if not found */
 	Node* delink(const KeyType& k)
 	{
 		Node* p = find(k);
@@ -678,7 +672,7 @@ class map
 	}
 
 	//! Removes a node from the tree and deletes it.
-	//! \return True if the node was found and deleted
+	/** \return True if the node was found and deleted */
 	bool remove(const KeyType& k)
 	{
 		Node* p = find(k);
@@ -816,7 +810,7 @@ class map
 	//------------------------------
 
 	//! operator [] for access to elements
-	//! for example myMap["key"]
+	/** for example myMap["key"] */
 	AccessClass operator[](const KeyType& k)
 	{
 		return AccessClass(*this, k);
@@ -826,21 +820,29 @@ class map
 	//------------------------------
 	// Disabled methods
 	//------------------------------
-	//! Copy constructor and assignment operator deliberately
-	//! defined but not implemented. The tree should never be
-	//! copied, pass along references to it instead.
+	// Copy constructor and assignment operator deliberately
+	// defined but not implemented. The tree should never be
+	// copied, pass along references to it instead.
 	explicit map(const map& src);
 	map& operator = (const map& src);
 
+	//! Set node as new root.
+	/** The node will be set to black, otherwise core dumps may arise
+	(patch provided by rogerborg).
+	\param newRoot Node which will be the new root
+	*/
 	void setRoot(Node* newRoot)
 	{
 		Root = newRoot;
 		if (Root != 0)
+		{
 			Root->setParent(0);
+			Root->setBlack();
+		}
 	}
 
 	//! Insert a node into the tree without using any fancy balancing logic.
-	//! Returns false if that key already exist in the tree.
+	/** \return false if that key already exist in the tree. */
 	bool insert(Node* newNode)
 	{
 		bool result=true; // Assume success
@@ -917,7 +919,6 @@ class map
 	//! Pull up node's left child and let it knock node down to the right
 	void rotateRight(Node* p)
 	{
-
 		Node* left = p->getLeftChild();
 
 		p->setLeftChild(left->getRightChild());
diff --git a/src/dep/include/irrlicht/irrMath.h b/src/dep/include/irrlicht/irrMath.h
index 568880d..d7ff2fb 100644
--- a/src/dep/include/irrlicht/irrMath.h
+++ b/src/dep/include/irrlicht/irrMath.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -8,11 +8,15 @@
 #include "IrrCompileConfig.h"
 #include "irrTypes.h"
 #include <math.h>
+#include <stdlib.h> // for abs() etc.
 
-#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
+#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__) || defined (_WIN32_WCE)
 	#define sqrtf(X) (f32)sqrt((f64)(X))
 	#define sinf(X) (f32)sin((f64)(X))
 	#define cosf(X) (f32)cos((f64)(X))
+	#define asinf(X) (f32)asin((f64)(X))
+	#define acosf(X) (f32)acos((f64)(X))
+	#define atan2f(X,Y) (f32)atan2((f64)(X),(f64)(Y))
 	#define ceilf(X) (f32)ceil((f64)(X))
 	#define floorf(X) (f32)floor((f64)(X))
 	#define powf(X,Y) (f32)pow((f64)(X),(f64)(Y))
@@ -28,30 +32,36 @@ namespace core
 	//! Rounding error constant often used when comparing f32 values.
 
 #ifdef IRRLICHT_FAST_MATH
-	const f32 ROUNDING_ERROR_32	= 0.00005f;
-	const f64 ROUNDING_ERROR_64	= 0.000005f;
+	const f32 ROUNDING_ERROR_32 = 0.00005f;
+	const f64 ROUNDING_ERROR_64 = 0.000005;
 #else
-	const f32 ROUNDING_ERROR_32	= 0.000001f;
-	const f64 ROUNDING_ERROR_64	= 0.00000001f;
+	const f32 ROUNDING_ERROR_32 = 0.000001f;
+	const f64 ROUNDING_ERROR_64 = 0.00000001;
 #endif
 
+#ifdef PI // make sure we don't collide with a define
+#undef PI
+#endif
 	//! Constant for PI.
-	const f32 PI			= 3.14159265359f;
+	const f32 PI		= 3.14159265359f;
 
 	//! Constant for reciprocal of PI.
-	const f32 RECIPROCAL_PI		= 1.0f/PI;
+	const f32 RECIPROCAL_PI	= 1.0f/PI;
 
 	//! Constant for half of PI.
-	const f32 HALF_PI		= PI/2.0f;
+	const f32 HALF_PI	= PI/2.0f;
 
+#ifdef PI64 // make sure we don't collide with a define
+#undef PI64
+#endif
 	//! Constant for 64bit PI.
-	const f64 PI64			= 3.1415926535897932384626433832795028841971693993751;
+	const f64 PI64		= 3.1415926535897932384626433832795028841971693993751;
 
 	//! Constant for 64bit reciprocal of PI.
-	const f64 RECIPROCAL_PI64	= 1.0/PI64;
+	const f64 RECIPROCAL_PI64 = 1.0/PI64;
 
 	//! 32bit Constant for converting from degrees to radians
-	const f32 DEGTORAD   = PI / 180.0f;
+	const f32 DEGTORAD = PI / 180.0f;
 
 	//! 32bit constant for converting from radians to degrees (formally known as GRAD_PI)
 	const f32 RADTODEG   = 180.0f / PI;
@@ -62,6 +72,42 @@ namespace core
 	//! 64bit constant for converting from radians to degrees
 	const f64 RADTODEG64 = 180.0 / PI64;
 
+	//! Utility function to convert a radian value to degrees
+	/** Provided as it can be clearer to write radToDeg(X) than RADTODEG * X
+	\param radians	The radians value to convert to degrees.
+	*/
+	inline f32 radToDeg(f32 radians)
+	{
+		return RADTODEG * radians;
+	}
+
+	//! Utility function to convert a radian value to degrees
+	/** Provided as it can be clearer to write radToDeg(X) than RADTODEG * X
+	\param radians	The radians value to convert to degrees.
+	*/
+	inline f64 radToDeg(f64 radians)
+	{
+		return RADTODEG64 * radians;
+	}
+
+	//! Utility function to convert a degrees value to radians
+	/** Provided as it can be clearer to write degToRad(X) than DEGTORAD * X
+	\param degrees	The degrees value to convert to radians.
+	*/
+	inline f32 degToRad(f32 degrees)
+	{
+		return DEGTORAD * degrees;
+	}
+
+	//! Utility function to convert a degrees value to radians
+	/** Provided as it can be clearer to write degToRad(X) than DEGTORAD * X
+	\param degrees	The degrees value to convert to radians.
+	*/
+	inline f64 degToRad(f64 degrees)
+	{
+		return DEGTORAD64 * degrees;
+	}
+
 	//! returns minimum of two values. Own implementation to get rid of the STL (VS6 problems)
 	template<class T>
 	inline const T& min_(const T& a, const T& b)
@@ -102,16 +148,22 @@ namespace core
 	template<class T>
 	inline T lerp(const T& a, const T& b, const f32 t)
 	{
-		return (a*(1.f-t)) + (b*t);
+		return (T)(a*(1.f-t)) + (b*t);
 	}
 
 	//! clamps a value between low and high
 	template <class T>
-	inline const T clamp (const T& value, const T& low, const T& high) 
+	inline const T clamp (const T& value, const T& low, const T& high)
 	{
 		return min_ (max_(value,low), high);
 	}
 
+	//! returns if a equals b, taking possible rounding errors into account
+	inline bool equals(const f64 a, const f64 b, const f64 tolerance = ROUNDING_ERROR_64)
+	{
+		return (a + tolerance >= b) && (a - tolerance <= b);
+	}
+
 	//! returns if a equals b, taking possible rounding errors into account
 	inline bool equals(const f32 a, const f32 b, const f32 tolerance = ROUNDING_ERROR_32)
 	{
@@ -160,13 +212,12 @@ namespace core
 		return (b & mask) | (a & ~mask);
 	}
 
-	inline s32 s32_clamp (s32 value, s32 low, s32 high) 
+	inline s32 s32_clamp (s32 value, s32 low, s32 high)
 	{
 		return s32_min (s32_max(value,low), high);
 	}
 
-	/* 
-	
+	/*
 		float IEEE-754 bit represenation
 
 		0      0x00000000
@@ -179,27 +230,40 @@ namespace core
 		in general: number = (sign ? -1:1) * 2^(exponent) * 1.(mantissa bits)
 	*/
 
+	typedef union { u32 u; s32 s; f32 f; } inttofloat;
+
 	#define F32_AS_S32(f)		(*((s32 *) &(f)))
 	#define F32_AS_U32(f)		(*((u32 *) &(f)))
 	#define F32_AS_U32_POINTER(f)	( ((u32 *) &(f)))
 
 	#define F32_VALUE_0		0x00000000
-	#define F32_VALUE_1		0x3f800000	
+	#define F32_VALUE_1		0x3f800000
 	#define F32_SIGN_BIT		0x80000000U
 	#define F32_EXPON_MANTISSA	0x7FFFFFFFU
 
 	//! code is taken from IceFPU
 	//! Integer representation of a floating-point value.
-	#define IR(x)					((u32&)(x))
+#ifdef IRRLICHT_FAST_MATH
+	#define IR(x)                           ((u32&)(x))
+#else
+	inline u32 IR(f32 x) {inttofloat tmp; tmp.f=x; return tmp.u;}
+#endif
 
 	//! Absolute integer representation of a floating-point value
-	#define AIR(x)					(IR(x)&0x7fffffff)
+	#define AIR(x)				(IR(x)&0x7fffffff)
 
 	//! Floating-point representation of an integer value.
-	#define FR(x)					((f32&)(x))
+#ifdef IRRLICHT_FAST_MATH
+	#define FR(x)                           ((f32&)(x))
+#else
+	inline f32 FR(u32 x) {inttofloat tmp; tmp.u=x; return tmp.f;}
+	inline f32 FR(s32 x) {inttofloat tmp; tmp.s=x; return tmp.f;}
+#endif
 
-	#define IEEE_1_0			0x3f800000						//!<	integer representation of 1.0
-	#define IEEE_255_0			0x437f0000						//!<	integer representation of 255.0
+	//! integer representation of 1.0
+	#define IEEE_1_0			0x3f800000
+	//! integer representation of 255.0
+	#define IEEE_255_0			0x437f0000
 
 #ifdef IRRLICHT_FAST_MATH
 	#define	F32_LOWER_0(f)		(F32_AS_U32(f) >  F32_SIGN_BIT)
@@ -210,8 +274,10 @@ namespace core
 	#define	F32_EQUAL_0(f)		( (F32_AS_U32(f) & F32_EXPON_MANTISSA ) == F32_VALUE_0)
 
 	// only same sign
-	#define	F32_A_GREATER_B(a,b)	(F32_AS_S32((a)) >  F32_AS_S32((b)))
+	#define	F32_A_GREATER_B(a,b)	(F32_AS_S32((a)) > F32_AS_S32((b)))
+
 #else
+
 	#define	F32_LOWER_0(n)		((n) <  0.0f)
 	#define	F32_LOWER_EQUAL_0(n)	((n) <= 0.0f)
 	#define	F32_GREATER_0(n)	((n) >  0.0f)
@@ -244,17 +310,15 @@ namespace core
 	}
 
 	/*
-		if (condition) state |= m; else state &= ~m; 
+		if (condition) state |= m; else state &= ~m;
 	*/
-	REALINLINE void setbit ( u32 &state, s32 condition, u32 mask )
+	REALINLINE void setbit_cond ( u32 &state, s32 condition, u32 mask )
 	{
 		// 0, or any postive to mask
 		//s32 conmask = -condition >> 31;
 		state ^= ( ( -condition >> 31 ) ^ state ) & mask;
 	}
 
-
-
 	inline f32 round_( f32 x )
 	{
 		return floorf( x + 0.5f );
@@ -274,14 +338,14 @@ namespace core
 #endif
 #endif
 	}
-		
+
 	REALINLINE f32 reciprocal_squareroot(const f32 x)
 	{
 #ifdef IRRLICHT_FAST_MATH
 		// comes from Nvidia
 #if 1
-		u32 tmp = (u32(IEEE_1_0 << 1) + IEEE_1_0 - *(u32*)&x) >> 1;   
-		f32 y = *(f32*)&tmp;                                             
+		u32 tmp = (u32(IEEE_1_0 << 1) + IEEE_1_0 - *(u32*)&x) >> 1;
+		f32 y = *(f32*)&tmp;
 		return y * (1.47f - 0.47f * x * y * y);
 #elif defined(_MSC_VER)
 		// an sse2 version
diff --git a/src/dep/include/irrlicht/irrString.h b/src/dep/include/irrlicht/irrString.h
index 1b3f5be..bf31e81 100644
--- a/src/dep/include/irrlicht/irrString.h
+++ b/src/dep/include/irrlicht/irrString.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
 
@@ -17,11 +17,16 @@ namespace irr
 namespace core
 {
 
-//!	Very simple string class with some useful features.
-/**	string<c8> and string<wchar_t> work both with unicode AND ascii,
-so you can assign unicode to string<c8> and ascii to string<wchar_t>
-(and the other way round) if your ever would want to.
-Note that the conversation between both is not done using an encoding.
+//! Very simple string class with some useful features.
+/** string<c8> and string<wchar_t> both accept Unicode AND ASCII/Latin-1,
+so you can assign Unicode to string<c8> and ASCII/Latin-1 to string<wchar_t>
+(and the other way round) if you want to.
+
+However, note that the conversation between both is not done using any encoding.
+This means that c8 strings are treated as ASCII/Latin-1, not UTF-8, and 
+are simply expanded to the equivalent wchar_t, while Unicode/wchar_t 
+characters are truncated to 8-bit ASCII/Latin-1 characters, discarding all
+other information in the wchar_t.
 
 Known bugs:
 Special characters like umlauts are ignored in the
@@ -41,7 +46,6 @@ public:
 	}
 
 
-
 	//! Constructor
 	string(const string<T>& other)
 	: array(0), allocated(0), used(0)
@@ -49,10 +53,17 @@ public:
 		*this = other;
 	}
 
+	//! Constructor from other string types
+	template <class B>
+	string(const string<B>& other)
+	: array(0), allocated(0), used(0)
+	{
+		*this = other;
+	}
 
 
 	//! Constructs a string from a float
-	string(const double number)
+	explicit string(const double number)
 	: array(0), allocated(0), used(0)
 	{
 		c8 tmpbuf[255];
@@ -61,9 +72,8 @@ public:
 	}
 
 
-
 	//! Constructs a string from an int
-	string(int number)
+	explicit string(int number)
 	: array(0), allocated(0), used(0)
 	{
 		// store if negative and make positive
@@ -111,9 +121,8 @@ public:
 	}
 
 
-
 	//! Constructs a string from an unsigned int
-	string(unsigned int number)
+	explicit string(unsigned int number)
 	: array(0), allocated(0), used(0)
 	{
 		// temporary buffer for 16 numbers
@@ -144,7 +153,6 @@ public:
 	}
 
 
-
 	//! Constructor for copying a string from a pointer with a given length
 	template <class B>
 	string(const B* const c, u32 length)
@@ -167,7 +175,6 @@ public:
 	}
 
 
-
 	//! Constructor for unicode and ascii strings
 	template <class B>
 	string(const B* const c)
@@ -177,15 +184,13 @@ public:
 	}
 
 
-
-	//! destructor
+	//! Destructor
 	~string()
 	{
 		allocator.deallocate(array); // delete [] array;
 	}
 
 
-
 	//! Assignment operator
 	string<T>& operator=(const string<T>& other)
 	{
@@ -203,6 +208,13 @@ public:
 		return *this;
 	}
 
+	//! Assignment operator for other string types
+	template <class B>
+	string<T>& operator=(const string<B>& other)
+	{
+		*this = other.c_str();
+		return *this;
+	}
 
 
 	//! Assignment operator for strings, ascii and unicode
@@ -247,7 +259,8 @@ public:
 		return *this;
 	}
 
-	//! Add operator for other strings
+
+	//! Append operator for other strings
 	string<T> operator+(const string<T>& other) const
 	{
 		string<T> str(*this);
@@ -256,7 +269,8 @@ public:
 		return str;
 	}
 
-	//! Add operator for strings, ascii and unicode
+
+	//! Append operator for strings, ascii and unicode
 	template <class B>
 	string<T> operator+(const B* const c) const
 	{
@@ -283,7 +297,7 @@ public:
 	}
 
 
-	//! Comparison operator
+	//! Equality operator
 	bool operator ==(const T* const str) const
 	{
 		if (!str)
@@ -298,8 +312,7 @@ public:
 	}
 
 
-
-	//! Comparison operator
+	//! Equality operator
 	bool operator ==(const string<T>& other) const
 	{
 		for(u32 i=0; array[i] && other.array[i]; ++i)
@@ -310,7 +323,7 @@ public:
 	}
 
 
-	//! Is smaller operator
+	//! Is smaller comparator
 	bool operator <(const string<T>& other) const
 	{
 		for(u32 i=0; array[i] && other.array[i]; ++i)
@@ -328,41 +341,36 @@ public:
 	}
 
 
-
-	//! Equals not operator
+	//! Inequality operator
 	bool operator !=(const T* const str) const
 	{
 		return !(*this == str);
 	}
 
 
-
-	//! Equals not operator
+	//! Inequality operator
 	bool operator !=(const string<T>& other) const
 	{
 		return !(*this == other);
 	}
 
 
-
 	//! Returns length of string
-	/** \return Returns length of the string in characters. */
+	/** \return Length of the string in characters. */
 	u32 size() const
 	{
 		return used-1;
 	}
 
 
-
 	//! Returns character string
-	/** \return Returns pointer to C-style zero terminated string. */
+	/** \return pointer to C-style zero terminated string. */
 	const T* c_str() const
 	{
 		return array;
 	}
 
 
-
 	//! Makes the string lower case.
 	void make_lower()
 	{
@@ -371,7 +379,6 @@ public:
 	}
 
 
-
 	//! Makes the string upper case.
 	void make_upper()
 	{
@@ -387,10 +394,9 @@ public:
 	}
 
 
-
-	//! Compares the string ignoring case.
+	//! Compares the strings ignoring case.
 	/** \param other: Other string to compare.
-	\return Returns true if the string are equal ignoring case. */
+	\return True if the strings are equal ignoring case. */
 	bool equals_ignore_case(const string<T>& other) const
 	{
 		for(u32 i=0; array[i] && other[i]; ++i)
@@ -400,9 +406,10 @@ public:
 		return used == other.used;
 	}
 
-	//! Compares the string ignoring case.
+
+	//! Compares the strings ignoring case.
 	/** \param other: Other string to compare.
-	\return Returns true if the string is smaller ignoring case. */
+	\return True if this string is smaller ignoring case. */
 	bool lower_ignore_case(const string<T>& other) const
 	{
 		for(u32 i=0; array[i] && other.array[i]; ++i)
@@ -416,34 +423,39 @@ public:
 	}
 
 
-
 	//! compares the first n characters of the strings
-	bool equalsn(const string<T>& other, int len) const
+	/** \param other Other string to compare.
+	\param n Number of characters to compare
+	\return True if the n first characters of this string are smaller. */
+	bool equalsn(const string<T>& other, u32 n) const
 	{
 		u32 i;
-		for(i=0; array[i] && other[i] && i < len; ++i)
+		for(i=0; array[i] && other[i] && i < n; ++i)
 			if (array[i] != other[i])
 				return false;
 
 		// if one (or both) of the strings was smaller then they
 		// are only equal if they have the same length
-		return (i == len) || (used == other.used);
+		return (i == n) || (used == other.used);
 	}
 
 
 	//! compares the first n characters of the strings
-	bool equalsn(const T* const str, int len) const
+	/** \param str Other string to compare.
+	\param n Number of characters to compare
+	\return True if the n first characters of this string are smaller. */
+	bool equalsn(const T* const str, u32 n) const
 	{
 		if (!str)
 			return false;
 		u32 i;
-		for(i=0; array[i] && str[i] && i < len; ++i)
+		for(i=0; array[i] && str[i] && i < n; ++i)
 			if (array[i] != str[i])
 				return false;
 
 		// if one (or both) of the strings was smaller then they
 		// are only equal if they have the same length
-		return (i == len) || (array[i] == 0 && str[i] == 0);
+		return (i == n) || (array[i] == 0 && str[i] == 0);
 	}
 
 
@@ -460,6 +472,7 @@ public:
 		array[used-1] = 0;
 	}
 
+
 	//! Appends a char string to this string
 	/** \param other: Char string to append. */
 	void append(const T* const other)
@@ -507,7 +520,7 @@ public:
 
 	//! Appends a string of the length l to this string.
 	/** \param other: other String to append to this string.
-	 \param length: How much characters of the other string to add to this one. */
+	\param length: How much characters of the other string to add to this one. */
 	void append(const string<T>& other, u32 length)
 	{
 		if (other.size() < length)
@@ -544,7 +557,7 @@ public:
 
 	//! finds first occurrence of character in string
 	/** \param c: Character to search for.
-	\return Returns position where the character has been found,
+	\return Position where the character has been found,
 	or -1 if not found. */
 	s32 findFirst(T c) const
 	{
@@ -556,11 +569,11 @@ public:
 	}
 
 	//! finds first occurrence of a character of a list in string
-	/** \param c: List of strings to find. For example if the method
+	/** \param c: List of characters to find. For example if the method
 	should find the first occurrence of 'a' or 'b', this parameter should be "ab".
-	\param count: Amount of characters in the list. Ususally,
-	this should be strlen(ofParameter1)
-	\return Returns position where one of the character has been found,
+	\param count: Amount of characters in the list. Usually,
+	this should be strlen(c)
+	\return Position where one of the characters has been found,
 	or -1 if not found. */
 	s32 findFirstChar(const T* const c, u32 count) const
 	{
@@ -578,10 +591,10 @@ public:
 
 	//! Finds first position of a character not in a given list.
 	/** \param c: List of characters not to find. For example if the method
-	 should find the first occurrence of a character not 'a' or 'b', this parameter should be "ab".
-	\param count: Amount of characters in the list. Ususally,
-	this should be strlen(ofParameter1)
-	\return Returns position where the character has been found,
+	should find the first occurrence of a character not 'a' or 'b', this parameter should be "ab".
+	\param count: Amount of characters in the list. Usually,
+	this should be strlen(c)
+	\return Position where the character has been found,
 	or -1 if not found. */
 	template <class B>
 	s32 findFirstCharNotInList(const B* const c, u32 count) const
@@ -602,10 +615,10 @@ public:
 
 	//! Finds last position of a character not in a given list.
 	/** \param c: List of characters not to find. For example if the method
-	 should find the first occurrence of a character not 'a' or 'b', this parameter should be "ab".
-	\param count: Amount of characters in the list. Ususally,
-	this should be strlen(ofParameter1)
-	\return Returns position where the character has been found,
+	should find the first occurrence of a character not 'a' or 'b', this parameter should be "ab".
+	\param count: Amount of characters in the list. Usually,
+	this should be strlen(c)
+	\return Position where the character has been found,
 	or -1 if not found. */
 	template <class B>
 	s32 findLastCharNotInList(const B* const c, u32 count) const
@@ -627,7 +640,7 @@ public:
 	//! finds next occurrence of character in string
 	/** \param c: Character to search for.
 	\param startPos: Position in string to start searching.
-	\return Returns position where the character has been found,
+	\return Position where the character has been found,
 	or -1 if not found. */
 	s32 findNext(T c, u32 startPos) const
 	{
@@ -640,10 +653,10 @@ public:
 
 
 	//! finds last occurrence of character in string
-	//! \param c: Character to search for.
-	//! \param start: start to search reverse ( default = -1, on end )
-	//! \return Returns position where the character has been found,
-	//! or -1 if not found.
+	/** \param c: Character to search for.
+	\param start: start to search reverse ( default = -1, on end )
+	\return Position where the character has been found,
+	or -1 if not found. */
 	s32 findLast(T c, s32 start = -1) const
 	{
 		start = core::clamp ( start < 0 ? (s32)(used) - 1 : start, 0, (s32)(used) - 1 );
@@ -654,10 +667,31 @@ public:
 		return -1;
 	}
 
+	//! finds last occurrence of a character of a list in string
+	/** \param c: List of strings to find. For example if the method
+	should find the last occurrence of 'a' or 'b', this parameter should be "ab".
+	\param count: Amount of characters in the list. Usually,
+	this should be strlen(c)
+	\return Position where one of the characters has been found,
+	or -1 if not found. */
+	s32 findLastChar(const T* const c, u32 count) const
+	{
+		if (!c)
+			return -1;
+
+		for (s32 i=used-1; i>=0; --i)
+			for (u32 j=0; j<count; ++j)
+				if (array[i] == c[j])
+					return i;
+
+		return -1;
+	}
+
+
 	//! finds another string in this string
-	//! \param str: Another string
-	//! \return Returns positions where the string has been found, 
-	//! or -1 if not found.
+	/** \param str: Another string
+	\return Positions where the string has been found,
+	or -1 if not found. */
 	template <class B>
 	s32 find(const B* const str) const
 	{
@@ -688,14 +722,17 @@ public:
 
 
 	//! Returns a substring
-	//! \param begin: Start of substring.
-	//! \param length: Length of substring.
+	/** \param begin: Start of substring.
+	\param length: Length of substring. */
 	string<T> subString(u32 begin, s32 length) const
 	{
+		// if start after string
+		// or no proper substring length
+		if ((length <= 0) || (begin>=size()))
+			return string<T>("");
+		// clamp length to maximal value
 		if ((length+begin) > size())
 			length = size()-begin;
-		if (length <= 0)
-			return string<T>("");
 
 		string<T> o;
 		o.reserve(length+1);
@@ -710,6 +747,8 @@ public:
 	}
 
 
+	//! Appends a character to this string
+	/** \param c Character to append. */
 	string<T>& operator += (T c)
 	{
 		append(c);
@@ -717,6 +756,8 @@ public:
 	}
 
 
+	//! Appends a char string to this string
+	/** \param c Char string to append. */
 	string<T>& operator += (const T* const c)
 	{
 		append(c);
@@ -724,6 +765,8 @@ public:
 	}
 
 
+	//! Appends a string to this string
+	/** \param other String to append. */
 	string<T>& operator += (const string<T>& other)
 	{
 		append(other);
@@ -731,6 +774,8 @@ public:
 	}
 
 
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
 	string<T>& operator += (const int i)
 	{
 		append(string<T>(i));
@@ -738,6 +783,8 @@ public:
 	}
 
 
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
 	string<T>& operator += (const unsigned int i)
 	{
 		append(string<T>(i));
@@ -745,6 +792,8 @@ public:
 	}
 
 
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
 	string<T>& operator += (const long i)
 	{
 		append(string<T>(i));
@@ -752,6 +801,8 @@ public:
 	}
 
 
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
 	string<T>& operator += (const unsigned long& i)
 	{
 		append(string<T>(i));
@@ -759,6 +810,8 @@ public:
 	}
 
 
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
 	string<T>& operator += (const double i)
 	{
 		append(string<T>(i));
@@ -766,6 +819,8 @@ public:
 	}
 
 
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
 	string<T>& operator += (const float i)
 	{
 		append(string<T>(i));
@@ -773,7 +828,9 @@ public:
 	}
 
 
-	//! replaces all characters of a special type with another one
+	//! Replaces all characters of a special type with another one
+	/** \param toReplace Character to replace.
+	\param replaceWith Character replacing the old one. */
 	void replace(T toReplace, T replaceWith)
 	{
 		for (u32 i=0; i<used; ++i)
@@ -781,30 +838,27 @@ public:
 				array[i] = replaceWith;
 	}
 
-	//! trims the string.
-	/** Removes whitespace from begin and end of the string. */
-	void trim()
+
+	//! Trims the string.
+	/** Removes the specified characters (by default, Latin-1 whitespace) 
+	from the begining and the end of the string. */
+	string<T>& trim(const string<T> & whitespace = " \t\n\r")
 	{
-		const c8 whitespace[] = " \t\n\r";
-		const u32 whitespacecount = 4;
-
-		// find start and end of real string without whitespace
-		s32 begin = findFirstCharNotInList(whitespace, whitespacecount);
+		// find start and end of the substring without the specified characters
+		const s32 begin = findFirstCharNotInList(whitespace.c_str(), whitespace.used);
 		if (begin == -1)
-		{
-			*this="";
-			return;
-		}
+			return (*this="");
 
-		s32 end = findLastCharNotInList(whitespace, whitespacecount);
+		const s32 end = findLastCharNotInList(whitespace.c_str(), whitespace.used);
 
-		*this = subString(begin, (end +1) - begin);
+		return (*this = subString(begin, (end +1) - begin));
 	}
 
 
-	//! Erases a character from the string. May be slow, because all elements
-	//! following after the erased element have to be copied.
-	//! \param index: Index of element to be erased.
+	//! Erases a character from the string.
+	/** May be slow, because all elements
+	following after the erased element have to be copied.
+	\param index: Index of element to be erased. */
 	void erase(u32 index)
 	{
 		_IRR_DEBUG_BREAK_IF(index>=used) // access violation
@@ -815,8 +869,6 @@ public:
 		--used;
 	}
 
-
-
 private:
 /*
 	T toLower(const T& t) const
diff --git a/src/dep/include/irrlicht/irrTypes.h b/src/dep/include/irrlicht/irrTypes.h
index 69dd2ce..01b31f1 100644
--- a/src/dep/include/irrlicht/irrTypes.h
+++ b/src/dep/include/irrlicht/irrTypes.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -12,53 +12,77 @@ namespace irr
 
 //! 8 bit unsigned variable.
 /** This is a typedef for unsigned char, it ensures portability of the engine. */
-typedef unsigned char		u8; 
+#ifdef _MSC_VER
+typedef unsigned __int8		u8;
+#else
+typedef unsigned char		u8;
+#endif
 
 //! 8 bit signed variable.
 /** This is a typedef for signed char, it ensures portability of the engine. */
-typedef signed char		s8; 
+#ifdef _MSC_VER
+typedef __int8			s8;
+#else
+typedef signed char		s8;
+#endif
 
 //! 8 bit character variable.
 /** This is a typedef for char, it ensures portability of the engine. */
-typedef char			c8; 
+typedef char			c8;
 
 
 
 //! 16 bit unsigned variable.
 /** This is a typedef for unsigned short, it ensures portability of the engine. */
+#ifdef _MSC_VER
+typedef unsigned __int16	u16;
+#else
 typedef unsigned short		u16;
+#endif
 
 //! 16 bit signed variable.
 /** This is a typedef for signed short, it ensures portability of the engine. */
-typedef signed short		s16; 
+#ifdef _MSC_VER
+typedef __int16			s16;
+#else
+typedef signed short		s16;
+#endif
 
 
 
 //! 32 bit unsigned variable.
 /** This is a typedef for unsigned int, it ensures portability of the engine. */
+#ifdef _MSC_VER
+typedef unsigned __int32	u32;
+#else
 typedef unsigned int		u32;
+#endif
 
 //! 32 bit signed variable.
 /** This is a typedef for signed int, it ensures portability of the engine. */
-typedef signed int		s32; 
+#ifdef _MSC_VER
+typedef __int32			s32;
+#else
+typedef signed int		s32;
+#endif
 
 
 
 // 64 bit signed variable.
-// This is a typedef for __int64, it ensures portability of the engine. 
+// This is a typedef for __int64, it ensures portability of the engine.
 // This type is currently not used by the engine and not supported by compilers
 // other than Microsoft Compilers, so it is outcommented.
-//typedef __int64				s64; 
+//typedef __int64				s64;
 
 
 
 //! 32 bit floating point variable.
 /** This is a typedef for float, it ensures portability of the engine. */
-typedef float				f32; 
+typedef float				f32;
 
 //! 64 bit floating point variable.
 /** This is a typedef for double, it ensures portability of the engine. */
-typedef double				f64; 
+typedef double				f64;
 
 
 } // end namespace irr
@@ -70,7 +94,7 @@ typedef double				f64;
 //! standard on Windows platforms, but it does on all others.
 //! These should be int snprintf(char *str, size_t size, const char *format, ...);
 //! and int swprintf(wchar_t *wcs, size_t maxlen, const wchar_t *format, ...);
-#if defined(_MSC_VER) && _MSC_VER > 1310 && _MSC_VER < 1500
+#if defined(_MSC_VER) && _MSC_VER > 1310 && !defined (_WIN32_WCE)
 #define swprintf swprintf_s
 #define snprintf sprintf_s
 #else
@@ -79,13 +103,13 @@ typedef double				f64;
 #endif
 
 // define the wchar_t type if not already built in.
-#ifdef _MSC_VER 
+#ifdef _MSC_VER
 #ifndef _WCHAR_T_DEFINED
 //! A 16 bit wide character type.
 /**
 	Defines the wchar_t-type.
 	In VS6, its not possible to tell
-	the standard compiler to treat wchar_t as a built-in type, and 
+	the standard compiler to treat wchar_t as a built-in type, and
 	sometimes we just don't want to include the huge stdlib.h or wchar.h,
 	so we'll use this.
 */
@@ -97,21 +121,26 @@ typedef unsigned short wchar_t;
 
 //! define a break macro for debugging.
 #if defined(_DEBUG)
-#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER)
-#define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_asm int 3}
-#else 
+#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER) && !defined (_WIN32_WCE)
+  #if defined(_WIN64) // using portable common solution for x64 configuration
+  #include <crtdbg.h>
+  #define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_CrtDbgBreak();}
+  #else
+  #define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_asm int 3}
+  #endif
+#else
 #include "assert.h"
 #define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) assert( !(_CONDITION_) );
 #endif
-#else 
+#else
 #define _IRR_DEBUG_BREAK_IF( _CONDITION_ )
 #endif
 
 //! Defines a small statement to work around a microsoft compiler bug.
-/** The microsft compiler 7.0 - 7.1 has a bug:
-When you call unmanaged code that returns a bool type value of false from managed code, 
-the return value may appear as true. See 
-http://support.microsoft.com/default.aspx?kbid=823071 for details. 
+/** The microsoft compiler 7.0 - 7.1 has a bug:
+When you call unmanaged code that returns a bool type value of false from managed code,
+the return value may appear as true. See
+http://support.microsoft.com/default.aspx?kbid=823071 for details.
 Compiler version defines: VC6.0 : 1200, VC7.0 : 1300, VC7.1 : 1310, VC8.0 : 1400*/
 #if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER) && (_MSC_VER > 1299) && (_MSC_VER < 1400)
 #define _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX __asm mov eax,100
@@ -122,15 +151,15 @@ Compiler version defines: VC6.0 : 1200, VC7.0 : 1300, VC7.1 : 1310, VC8.0 : 1400
 
 // memory debugging
 #if defined(_DEBUG) && defined(IRRLICHT_EXPORTS) && defined(_MSC_VER) && \
-	(_MSC_VER > 1299) && !defined(_IRR_DONT_DO_MEMORY_DEBUGGING_HERE)
-	
+	(_MSC_VER > 1299) && !defined(_IRR_DONT_DO_MEMORY_DEBUGGING_HERE) && !defined(_WIN32_WCE)
+
 	#define CRTDBG_MAP_ALLOC
 	#define _CRTDBG_MAP_ALLOC
-	#define DEBUG_CLIENTBLOCK   new( _CLIENT_BLOCK, __FILE__, __LINE__)
+	#define DEBUG_CLIENTBLOCK new( _CLIENT_BLOCK, __FILE__, __LINE__)
 	#include <stdlib.h>
 	#include <crtdbg.h>
 	#define new DEBUG_CLIENTBLOCK
-#endif 
+#endif
 
 // disable truncated debug information warning in visual studio 6 by default
 #if defined(_MSC_VER) && (_MSC_VER < 1300 )
@@ -150,9 +179,9 @@ Compiler version defines: VC6.0 : 1200, VC7.0 : 1300, VC7.1 : 1310, VC8.0 : 1400
 //! creates four CC codes used in Irrlicht for simple ids
 /** some compilers can create those by directly writing the
 code like 'code', but some generate warnings so we use this macro here */
-#define MAKE_IRR_ID(c0, c1, c2, c3)                       \
-                ((u32)(u8)(c0) | ((u32)(u8)(c1) << 8) |   \
-                ((u32)(u8)(c2) << 16) | ((u32)(u8)(c3) << 24 ))
+#define MAKE_IRR_ID(c0, c1, c2, c3) \
+		((u32)(u8)(c0) | ((u32)(u8)(c1) << 8) | \
+		((u32)(u8)(c2) << 16) | ((u32)(u8)(c3) << 24 ))
 
 
 #endif // __IRR_TYPES_H_INCLUDED__
diff --git a/src/dep/include/irrlicht/irrXML.h b/src/dep/include/irrlicht/irrXML.h
index e8c498e..428f05e 100644
--- a/src/dep/include/irrlicht/irrXML.h
+++ b/src/dep/include/irrlicht/irrXML.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h
 
@@ -16,9 +16,9 @@
   Welcome to the irrXML API documentation.
   Here you'll find any information you'll need to develop applications with
   irrXML. If you look for a tutorial on how to start, take a look at the \ref irrxmlexample,
-  at the homepage of irrXML at <A HREF="http://xml.irrlicht3d.org" >xml.irrlicht3d.org</A> 
+  at the homepage of irrXML at <A HREF="http://xml.irrlicht3d.org" >xml.irrlicht3d.org</A>
   or into the SDK in the directory \example.
- 
+
   irrXML is intended to be a high speed and easy-to-use XML Parser for C++, and
   this documentation is an important part of it. If you have any questions or
   suggestions, just send a email to the author of the engine, Nikolaus Gebhardt
@@ -26,29 +26,29 @@
 
   \section features Features
 
-  irrXML provides forward-only, read-only 
+  irrXML provides forward-only, read-only
      access to a stream of non validated XML data. It was fully implemented by
-	 Nikolaus Gebhardt. Its current features are:
+	Nikolaus Gebhardt. Its current features are:
 
-	 - It it fast as lighting and has very low memory usage. It was 
-	   developed with the intention of being used in 3D games, as it already has been.
-	 - irrXML is very small: It only consists of 60 KB of code and can be added easily
-	   to your existing project.
-	 - Of course, it is platform independent and works with lots of compilers.
-	 - It is able to parse ASCII, UTF-8, UTF-16 and UTF-32 text files, both in 
-	   little and big endian format. 
-	 - Independent of the input file format, the parser can return all strings in ASCII, UTF-8,
-	   UTF-16 and UTF-32 format. 
-	 - With its optional file access abstraction it has the advantage that it can read not
-	   only from files but from any type of data (memory, network, ...). For example when 
-	   used with the Irrlicht Engine, it directly reads from compressed .zip files. 
-	 - Just like the Irrlicht Engine for which it was originally created, it is extremely easy 
-	   to use.
-	 - It has no external dependencies, it does not even need the STL. 
+	- It it fast as lighting and has very low memory usage. It was
+	developed with the intention of being used in 3D games, as it already has been.
+	- irrXML is very small: It only consists of 60 KB of code and can be added easily
+	to your existing project.
+	- Of course, it is platform independent and works with lots of compilers.
+	- It is able to parse ASCII, UTF-8, UTF-16 and UTF-32 text files, both in
+	little and big endian format.
+	- Independent of the input file format, the parser can return all strings in ASCII, UTF-8,
+	UTF-16 and UTF-32 format.
+	- With its optional file access abstraction it has the advantage that it can read not
+	only from files but from any type of data (memory, network, ...). For example when
+	used with the Irrlicht Engine, it directly reads from compressed .zip files.
+	- Just like the Irrlicht Engine for which it was originally created, it is extremely easy
+	to use.
+	- It has no external dependencies, it does not even need the STL.
 
-	 Although irrXML has some strenghts, it currently also has the following limitations:
+	Although irrXML has some strenghts, it currently also has the following limitations:
 
-	 - The input xml file is not validated and assumed to be correct. 
+	- The input xml file is not validated and assumed to be correct.
 
     \section irrxmlexample Example
 
@@ -120,10 +120,10 @@
 	The irrXML license is based on the zlib license. Basicly, this means you can do with
 	irrXML whatever you want:
 
-	Copyright (C) 2002-2007 Nikolaus Gebhardt
+	Copyright (C) 2002-2009 Nikolaus Gebhardt
 
 	This software is provided 'as-is', without any express or implied
-	warranty.  In no event will the authors be held liable for any damages
+	warranty. In no event will the authors be held liable for any damages
 	arising from the use of this software.
 
 	Permission is granted to anyone to use this software for any purpose,
@@ -142,10 +142,10 @@
 
 	\section history History
 
-	As lots of references in this documentation and the source show, this xml 
-	parser has originally been a part of the 
+	As lots of references in this documentation and the source show, this xml
+	parser has originally been a part of the
 	<A HREF="http://irrlicht.sourceforge.net" >Irrlicht Engine</A>. But because
-	the parser has become very useful with the latest release, people asked for a 
+	the parser has become very useful with the latest release, people asked for a
 	separate version of it, to be able to use it in non Irrlicht projects. With
 	irrXML 1.0, this has now been done.
 */
@@ -154,7 +154,7 @@ namespace irr
 {
 namespace io
 {
-	//! Enumeration of all supported source text file formats 
+	//! Enumeration of all supported source text file formats
 	enum ETEXT_FORMAT
 	{
 		//! ASCII, file without byte order mark, or not a text file
@@ -202,19 +202,19 @@ namespace io
 		EXN_UNKNOWN
 	};
 
-	//! Callback class for file read abstraction. 
-	/** With this, it is possible to make the xml parser read in other things 
-	than just files. The Irrlicht engine is using this for example to 
-	read xml from compressed .zip files. To make the parser read in 
-	any other data, derive a class from this interface, implement the 
+	//! Callback class for file read abstraction.
+	/** With this, it is possible to make the xml parser read in other
+	things than just files. The Irrlicht engine is using this for example to
+	read xml from compressed .zip files. To make the parser read in
+	any other data, derive a class from this interface, implement the
 	two methods to read your data and give a pointer to an instance of
-	your implementation when calling createIrrXMLReader(), 
+	your implementation when calling createIrrXMLReader(),
 	createIrrXMLReaderUTF16() or createIrrXMLReaderUTF32() */
 	class IFileReadCallBack
 	{
 	public:
 
-		//! virtual destructor
+		//! Destructor
 		virtual ~IFileReadCallBack() {}
 
 		//! Reads an amount of bytes from the file.
@@ -235,12 +235,12 @@ namespace io
 	See irrXML.cpp on how this can be done in detail. */
 	class IXMLBase
 	{
-	};	
+	};
 
 	//! Interface providing easy read access to a XML file.
 	/** You can create an instance of this reader using one of the factory functions
 	createIrrXMLReader(), createIrrXMLReaderUTF16() and createIrrXMLReaderUTF32().
-	If using the parser from the Irrlicht Engine, please use IFileSystem::createXMLReader() 
+	If using the parser from the Irrlicht Engine, please use IFileSystem::createXMLReader()
 	instead.
 	For a detailed intro how to use the parser, see \ref irrxmlexample and \ref features.
 
@@ -278,71 +278,71 @@ namespace io
 		//! Destructor
 		virtual ~IIrrXMLReader() {}
 
-		//! Reads forward to the next xml node. 
-		/** \return Returns false, if there was no further node.  */
+		//! Reads forward to the next xml node.
+		/** \return Returns false, if there was no further node. */
 		virtual bool read() = 0;
 
 		//! Returns the type of the current XML node.
 		virtual EXML_NODE getNodeType() const = 0;
 
-        //! Returns attribute count of the current XML node. 
+		//! Returns attribute count of the current XML node.
 		/** This is usually
 		non null if the current node is EXN_ELEMENT, and the element has attributes.
 		\return Returns amount of attributes of this xml node. */
 		virtual unsigned int getAttributeCount() const = 0;
 
-		//! Returns name of an attribute. 
+		//! Returns name of an attribute.
 		/** \param idx: Zero based index, should be something between 0 and getAttributeCount()-1.
 		\return Name of the attribute, 0 if an attribute with this index does not exist. */
 		virtual const char_type* getAttributeName(int idx) const = 0;
 
-		//! Returns the value of an attribute. 
+		//! Returns the value of an attribute.
 		/** \param idx: Zero based index, should be something between 0 and getAttributeCount()-1.
 		\return Value of the attribute, 0 if an attribute with this index does not exist. */
 		virtual const char_type* getAttributeValue(int idx) const = 0;
 
-		//! Returns the value of an attribute. 
+		//! Returns the value of an attribute.
 		/** \param name: Name of the attribute.
 		\return Value of the attribute, 0 if an attribute with this name does not exist. */
 		virtual const char_type* getAttributeValue(const char_type* name) const = 0;
 
 		//! Returns the value of an attribute in a safe way.
-		/** Like getAttributeValue(), but does not 
+		/** Like getAttributeValue(), but does not
 		return 0 if the attribute does not exist. An empty string ("") is returned then.
 		\param name: Name of the attribute.
 		\return Value of the attribute, and "" if an attribute with this name does not exist */
 		virtual const char_type* getAttributeValueSafe(const char_type* name) const = 0;
 
-		//! Returns the value of an attribute as integer. 
+		//! Returns the value of an attribute as integer.
 		/** \param name Name of the attribute.
 		\return Value of the attribute as integer, and 0 if an attribute with this name does not exist or
 		the value could not be interpreted as integer. */
 		virtual int getAttributeValueAsInt(const char_type* name) const = 0;
 
-		//! Returns the value of an attribute as integer. 
+		//! Returns the value of an attribute as integer.
 		/** \param idx: Zero based index, should be something between 0 and getAttributeCount()-1.
 		\return Value of the attribute as integer, and 0 if an attribute with this index does not exist or
 		the value could not be interpreted as integer. */
 		virtual int getAttributeValueAsInt(int idx) const = 0;
 
-		//! Returns the value of an attribute as float. 
+		//! Returns the value of an attribute as float.
 		/** \param name: Name of the attribute.
 		\return Value of the attribute as float, and 0 if an attribute with this name does not exist or
 		the value could not be interpreted as float. */
 		virtual float getAttributeValueAsFloat(const char_type* name) const = 0;
 
-		//! Returns the value of an attribute as float. 
+		//! Returns the value of an attribute as float.
 		/** \param idx: Zero based index, should be something between 0 and getAttributeCount()-1.
 		\return Value of the attribute as float, and 0 if an attribute with this index does not exist or
 		the value could not be interpreted as float. */
 		virtual float getAttributeValueAsFloat(int idx) const = 0;
 
-		//! Returns the name of the current node. 
+		//! Returns the name of the current node.
 		/** Only non null, if the node type is EXN_ELEMENT.
 		\return Name of the current node or 0 if the node has no name. */
 		virtual const char_type* getNodeName() const = 0;
 
-		//! Returns data of the current node. 
+		//! Returns data of the current node.
 		/** Only non null if the node has some
 		data and it is of type EXN_TEXT or EXN_UNKNOWN. */
 		virtual const char_type* getNodeData() const = 0;
@@ -350,16 +350,16 @@ namespace io
 		//! Returns if an element is an empty element, like &lt;foo />
 		virtual bool isEmptyElement() const = 0;
 
-		//! Returns format of the source xml file. 
+		//! Returns format of the source xml file.
 		/** It is not necessary to use
 		this method because the parser will convert the input file format
 		to the format wanted by the user when creating the parser. This
 		method is useful to get/display additional informations. */
 		virtual ETEXT_FORMAT getSourceFormat() const = 0;
 
-		//! Returns format of the strings returned by the parser. 
+		//! Returns format of the strings returned by the parser.
 		/** This will be UTF8 for example when you created a parser with
-		IrrXMLReaderUTF8() and UTF32 when it has been created using 
+		IrrXMLReaderUTF8() and UTF32 when it has been created using
 		IrrXMLReaderUTF32. It should not be necessary to call this
 		method and only exists for informational purposes. */
 		virtual ETEXT_FORMAT getParserFormat() const = 0;
@@ -367,164 +367,173 @@ namespace io
 
 
 	//! defines the utf-16 type.
-	/** Not using wchar_t for this because 
+	/** Not using wchar_t for this because
 	wchar_t has 16 bit on windows and 32 bit on other operating systems. */
 	typedef unsigned short char16;
 
-	//! defines the utf-32 type. 
-	/** Not using wchar_t for this because 
+	//! defines the utf-32 type.
+	/** Not using wchar_t for this because
 	wchar_t has 16 bit on windows and 32 bit on other operating systems. */
 	typedef unsigned long char32;
 
 	//! A UTF-8 or ASCII character xml parser.
-	/** This means that all character data will be returned in 8 bit ASCII or UTF-8 by this parser. 
+	/** This means that all character data will be returned in 8 bit ASCII or UTF-8 by this parser.
 	The file to read can be in any format, it will be converted to UTF-8 if it is not
 	in this format.
-	Create an instance of this with createIrrXMLReader(); 
+	Create an instance of this with createIrrXMLReader();
 	See IIrrXMLReader for description on how to use it. */
 	typedef IIrrXMLReader<char, IXMLBase> IrrXMLReader;
 
-	//! A UTF-16 xml parser. 
-	/** This means that all character data will be returned in UTF-16 by this parser. 
+	//! A UTF-16 xml parser.
+	/** This means that all character data will be returned in UTF-16 by this parser.
 	The file to read can be in any format, it will be converted to UTF-16 if it is not
 	in this format.
-	Create an instance of this with createIrrXMLReaderUTF16(); 
-	See IIrrXMLReader for description on how to use it.  */
+	Create an instance of this with createIrrXMLReaderUTF16();
+	See IIrrXMLReader for description on how to use it. */
 	typedef IIrrXMLReader<char16, IXMLBase> IrrXMLReaderUTF16;
 
-	//! A UTF-32 xml parser. 
-	/** This means that all character data will be returned in UTF-32 by this parser. 
+	//! A UTF-32 xml parser.
+	/** This means that all character data will be returned in UTF-32 by this parser.
 	The file to read can be in any format, it will be converted to UTF-32 if it is not
 	in this format.
-	Create an instance of this with createIrrXMLReaderUTF32(); 
+	Create an instance of this with createIrrXMLReaderUTF32();
 	See IIrrXMLReader for description on how to use it. */
 	typedef IIrrXMLReader<char32, IXMLBase> IrrXMLReaderUTF32;
 
 
 	//! Creates an instance of an UFT-8 or ASCII character xml parser.
-	/** This means that all character data will be returned in 8 bit ASCII or UTF-8. 
+	/** This means that all character data will be returned in 8 bit ASCII or UTF-8.
 	The file to read can be in any format, it will be converted to UTF-8 if it is not in this format.
 	If you are using the Irrlicht Engine, it is better not to use this function but
 	IFileSystem::createXMLReaderUTF8() instead.
 	\param filename: Name of file to be opened.
-	\return Returns a pointer to the created xml parser. This pointer should be 
+	\return Returns a pointer to the created xml parser. This pointer should be
 	deleted using 'delete' after no longer needed. Returns 0 if an error occured
 	and the file could not be opened. */
 	IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(const char* filename);
 
 	//! Creates an instance of an UFT-8 or ASCII character xml parser.
-	/** This means that all character data will be returned in 8 bit ASCII or UTF-8. The file to read can 
+	/** This means that all character data will be returned in 8 bit ASCII or UTF-8. The file to read can
 	be in any format, it will be converted to UTF-8 if it is not in this format.
 	If you are using the Irrlicht Engine, it is better not to use this function but
 	IFileSystem::createXMLReaderUTF8() instead.
 	\param file: Pointer to opened file, must have been opened in binary mode, e.g.
 	using fopen("foo.bar", "wb"); The file will not be closed after it has been read.
-	\return Returns a pointer to the created xml parser. This pointer should be 
+	\return Returns a pointer to the created xml parser. This pointer should be
 	deleted using 'delete' after no longer needed. Returns 0 if an error occured
 	and the file could not be opened. */
 	IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(FILE* file);
 
-	//! Creates an instance of an UFT-8 or ASCII character xml parser. 
-	/** This means that all character data will be returned in 8 bit ASCII or UTF-8. The file to read can 
-	 be in any format, it will be converted to UTF-8 if it is not in this format.
-	 If you are using the Irrlicht Engine, it is better not to use this function but
-	 IFileSystem::createXMLReaderUTF8() instead.
-	 \param callback: Callback for file read abstraction. Implement your own
-	 callback to make the xml parser read in other things than just files. See
-	 IFileReadCallBack for more information about this.
-	 \return Returns a pointer to the created xml parser. This pointer should be 
-	 deleted using 'delete' after no longer needed. Returns 0 if an error occured
-	 and the file could not be opened. */
-	IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(IFileReadCallBack* callback);
+	//! Creates an instance of an UFT-8 or ASCII character xml parser.
+	/** This means that all character data will be returned in 8 bit ASCII or UTF-8. The file to read can
+	be in any format, it will be converted to UTF-8 if it is not in this format.
+	If you are using the Irrlicht Engine, it is better not to use this function but
+	IFileSystem::createXMLReaderUTF8() instead.
+	\param callback: Callback for file read abstraction. Implement your own
+	callback to make the xml parser read in other things than just files. See
+	IFileReadCallBack for more information about this.
+	\param deleteCallback: if true, the callback will be deleted after the file
+	has been read.  Otherwise the caller si responsible for cleaning it up.
+	\return Returns a pointer to the created xml parser. This pointer should be
+	deleted using 'delete' after no longer needed. Returns 0 if an error occured
+	and the file could not be opened. */
+	IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(IFileReadCallBack* callback,
+																bool deleteCallback = false);
 
-	//! Creates an instance of an UFT-16 xml parser. 
+	//! Creates an instance of an UFT-16 xml parser.
 	/** This means that
-	all character data will be returned in UTF-16. The file to read can 
+	all character data will be returned in UTF-16. The file to read can
 	be in any format, it will be converted to UTF-16 if it is not in this format.
 	If you are using the Irrlicht Engine, it is better not to use this function but
 	IFileSystem::createXMLReader() instead.
 	\param filename: Name of file to be opened.
-	\return Returns a pointer to the created xml parser. This pointer should be 
+	\return Returns a pointer to the created xml parser. This pointer should be
 	deleted using 'delete' after no longer needed. Returns 0 if an error occured
 	and the file could not be opened. */
 	IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(const char* filename);
 
-	//! Creates an instance of an UFT-16 xml parser. 
-	/** This means that all character data will be returned in UTF-16. The file to read can 
+	//! Creates an instance of an UFT-16 xml parser.
+	/** This means that all character data will be returned in UTF-16. The file to read can
 	be in any format, it will be converted to UTF-16 if it is not in this format.
 	If you are using the Irrlicht Engine, it is better not to use this function but
 	IFileSystem::createXMLReader() instead.
 	\param file: Pointer to opened file, must have been opened in binary mode, e.g.
 	using fopen("foo.bar", "wb"); The file will not be closed after it has been read.
-	\return Returns a pointer to the created xml parser. This pointer should be 
+	\return Returns a pointer to the created xml parser. This pointer should be
 	deleted using 'delete' after no longer needed. Returns 0 if an error occured
 	and the file could not be opened. */
 	IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(FILE* file);
 
-	//! Creates an instance of an UFT-16 xml parser. 
-	/** This means that all character data will be returned in UTF-16. The file to read can 
+	//! Creates an instance of an UFT-16 xml parser.
+	/** This means that all character data will be returned in UTF-16. The file to read can
 	be in any format, it will be converted to UTF-16 if it is not in this format.
 	If you are using the Irrlicht Engine, it is better not to use this function but
 	IFileSystem::createXMLReader() instead.
 	\param callback: Callback for file read abstraction. Implement your own
 	callback to make the xml parser read in other things than just files. See
 	IFileReadCallBack for more information about this.
-	\return Returns a pointer to the created xml parser. This pointer should be 
+	\param deleteCallback: if true, the callback will be deleted after the file
+	has been read.  Otherwise the caller si responsible for cleaning it up.
+	\return Returns a pointer to the created xml parser. This pointer should be
 	deleted using 'delete' after no longer needed. Returns 0 if an error occured
 	and the file could not be opened. */
-	IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(IFileReadCallBack* callback);
+	IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(IFileReadCallBack* callback,
+																		bool deleteCallback = false);
 
 
-	//! Creates an instance of an UFT-32 xml parser. 
-	/** This means that all character data will be returned in UTF-32. The file to read can 
+	//! Creates an instance of an UFT-32 xml parser.
+	/** This means that all character data will be returned in UTF-32. The file to read can
 	be in any format, it will be converted to UTF-32 if it is not in this format.
 	If you are using the Irrlicht Engine, it is better not to use this function but
 	IFileSystem::createXMLReader() instead.
 	\param filename: Name of file to be opened.
-	\return Returns a pointer to the created xml parser. This pointer should be 
+	\return Returns a pointer to the created xml parser. This pointer should be
 	deleted using 'delete' after no longer needed. Returns 0 if an error occured
 	and the file could not be opened. */
 	IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(const char* filename);
 
-	//! Creates an instance of an UFT-32 xml parser. 
-	/** This means that all character data will be returned in UTF-32. The file to read can 
+	//! Creates an instance of an UFT-32 xml parser.
+	/** This means that all character data will be returned in UTF-32. The file to read can
 	be in any format, it will be converted to UTF-32 if it is not in this format.
 	if you are using the Irrlicht Engine, it is better not to use this function but
 	IFileSystem::createXMLReader() instead.
 	\param file: Pointer to opened file, must have been opened in binary mode, e.g.
 	using fopen("foo.bar", "wb"); The file will not be closed after it has been read.
-	\return Returns a pointer to the created xml parser. This pointer should be 
+	\return Returns a pointer to the created xml parser. This pointer should be
 	deleted using 'delete' after no longer needed. Returns 0 if an error occured
 	and the file could not be opened. */
 	IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(FILE* file);
 
-	//! Creates an instance of an UFT-32 xml parser. 
+	//! Creates an instance of an UFT-32 xml parser.
 	/** This means that
-	all character data will be returned in UTF-32. The file to read can 
+	all character data will be returned in UTF-32. The file to read can
 	be in any format, it will be converted to UTF-32 if it is not in this format.
 	If you are using the Irrlicht Engine, it is better not to use this function but
 	IFileSystem::createXMLReader() instead.
 	\param callback: Callback for file read abstraction. Implement your own
 	callback to make the xml parser read in other things than just files. See
 	IFileReadCallBack for more information about this.
-	\return Returns a pointer to the created xml parser. This pointer should be 
+	\param deleteCallback: if true, the callback will be deleted after the file
+	has been read.  Otherwise the caller si responsible for cleaning it up.
+	\return Returns a pointer to the created xml parser. This pointer should be
 	deleted using 'delete' after no longer needed. Returns 0 if an error occured
 	and the file could not be opened. */
-	IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(IFileReadCallBack* callback);
-	
+	IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(IFileReadCallBack* callback,
+																		bool deleteCallback = false);
+
 
 	/*! \file irrxml.h
-    \brief Header file of the irrXML, the Irrlicht XML parser.
-    
-    This file includes everything needed for using irrXML, 
-    the XML parser of the Irrlicht Engine. To use irrXML,
+	\brief Header file of the irrXML, the Irrlicht XML parser.
+
+	This file includes everything needed for using irrXML,
+	the XML parser of the Irrlicht Engine. To use irrXML,
 	you only need to include this file in your project:
 
 	\code
 	#include <irrXML.h>
 	\endcode
 
-	It is also common to use the two namespaces in which irrXML is included, 
+	It is also common to use the two namespaces in which irrXML is included,
 	directly after #including irrXML.h:
 
 	\code
diff --git a/src/dep/include/irrlicht/irrlicht.h b/src/dep/include/irrlicht/irrlicht.h
index 52bf324..ab73d52 100644
--- a/src/dep/include/irrlicht/irrlicht.h
+++ b/src/dep/include/irrlicht/irrlicht.h
@@ -1,6 +1,6 @@
 /* irrlicht.h -- interface of the 'Irrlicht Engine'
 
-  Copyright (C) 2002-2007 Nikolaus Gebhardt
+  Copyright (C) 2002-2009 Nikolaus Gebhardt
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -31,27 +31,41 @@
 
 #include "IrrCompileConfig.h"
 #include "aabbox3d.h"
+#include "CDynamicMeshBuffer.h"
+#include "CIndexBuffer.h"
+#include "CMeshBuffer.h"
 #include "coreutil.h"
-#include "irrArray.h"
-#include "irrMap.h"
-#include "irrMath.h"
-#include "irrString.h"
-#include "irrTypes.h"
-#include "SColor.h"
-#include "SLight.h"
+#include "CVertexBuffer.h"
 #include "dimension2d.h"
+#include "ECullingTypes.h"
+#include "EDebugSceneTypes.h"
+#include "EDriverFeatures.h"
 #include "EDriverTypes.h"
-#include "IAttributes.h"
-#include "IAttributeExchangingObject.h"
+#include "EGUIAlignment.h"
+#include "EGUIElementTypes.h"
+#include "EHardwareBufferFlags.h"
+#include "EMaterialFlags.h"
+#include "EMaterialTypes.h"
+#include "EMeshWriterEnums.h"
+#include "EMessageBoxFlags.h"
+#include "ESceneNodeAnimatorTypes.h"
+#include "ESceneNodeTypes.h"
+#include "ETerrainElements.h"
+#include "fast_atof.h"
+#include "heapsort.h"
 #include "IAnimatedMesh.h"
 #include "IAnimatedMeshMD2.h"
 #include "IAnimatedMeshMD3.h"
-#include "IQ3LevelMesh.h"
 #include "IAnimatedMeshSceneNode.h"
+#include "IAttributeExchangingObject.h"
+#include "IAttributes.h"
 #include "IBillboardSceneNode.h"
+#include "IBillboardTextSceneNode.h"
 #include "IBoneSceneNode.h"
 #include "ICameraSceneNode.h"
+#include "ICursorControl.h"
 #include "IDummyTransformationSceneNode.h"
+#include "IDynamicMeshBuffer.h"
 #include "IEventReceiver.h"
 #include "IFileList.h"
 #include "IFileSystem.h"
@@ -78,9 +92,13 @@
 #include "IGUISpriteBank.h"
 #include "IGUIStaticText.h"
 #include "IGUITabControl.h"
+#include "IGUITable.h"
 #include "IGUIToolbar.h"
 #include "IGUIWindow.h"
 #include "IImage.h"
+#include "IImageLoader.h"
+#include "IImageWriter.h"
+#include "IIndexBuffer.h"
 #include "ILightSceneNode.h"
 #include "ILogger.h"
 #include "IMaterialRenderer.h"
@@ -88,57 +106,81 @@
 #include "IMesh.h"
 #include "IMeshBuffer.h"
 #include "IMeshCache.h"
-#include "IMeshSceneNode.h"
+#include "IMeshLoader.h"
 #include "IMeshManipulator.h"
+#include "IMeshSceneNode.h"
 #include "IMeshWriter.h"
 #include "IMetaTriangleSelector.h"
+#include "IOSOperator.h"
+#include "IParticleSystemSceneNode.h" // also includes all emitters and attractors
+#include "IQ3LevelMesh.h"
+#include "IQ3Shader.h"
 #include "IReadFile.h"
+#include "IReferenceCounted.h"
+#include "irrArray.h"
 #include "IrrlichtDevice.h"
+#include "irrList.h"
+#include "irrMap.h"
+#include "irrMath.h"
+#include "irrString.h"
+#include "irrTypes.h"
+#include "irrXML.h"
+#include "ISceneCollisionManager.h"
 #include "ISceneManager.h"
 #include "ISceneNode.h"
-#include "ISceneUserDataSerializer.h"
-#include "ITriangleSelector.h"
 #include "ISceneNodeAnimator.h"
-#include "ISceneCollisionManager.h"
-#include "ISceneNodeFactory.h"
-#include "ISceneNodeAnimatorFactory.h"
+#include "ISceneNodeAnimatorCameraFPS.h"
+#include "ISceneNodeAnimatorCameraMaya.h"
 #include "ISceneNodeAnimatorCollisionResponse.h"
+#include "ISceneNodeAnimatorFactory.h"
+#include "ISceneNodeFactory.h"
+#include "ISceneUserDataSerializer.h"
 #include "IShaderConstantSetCallBack.h"
-#include "IParticleSystemSceneNode.h" // also includes all emitters and attractors
+#include "IShadowVolumeSceneNode.h"
 #include "ISkinnedMesh.h"
 #include "ITerrainSceneNode.h"
 #include "ITextSceneNode.h"
 #include "ITexture.h"
-#include "IReferenceCounted.h"
+#include "ITimer.h"
+#include "ITriangleSelector.h"
+#include "IVertexBuffer.h"
 #include "IVideoDriver.h"
 #include "IVideoModeList.h"
+#include "IVolumeLightSceneNode.h"
 #include "IWriteFile.h"
 #include "IXMLReader.h"
 #include "IXMLWriter.h"
 #include "Keycodes.h"
 #include "line2d.h"
 #include "line3d.h"
-#include "irrList.h"
 #include "matrix4.h"
 #include "plane3d.h"
-#include "vector2d.h"
-#include "vector3d.h"
-#include "triangle3d.h"
 #include "position2d.h"
 #include "quaternion.h"
 #include "rect.h"
 #include "S3DVertex.h"
 #include "SAnimatedMesh.h"
+#include "SceneParameters.h"
+#include "SColor.h"
 #include "SExposedVideoData.h"
+#include "SIrrCreationParameters.h"
 #include "SKeyMap.h"
+#include "SLight.h"
 #include "SMaterial.h"
 #include "SMesh.h"
 #include "SMeshBuffer.h"
 #include "SMeshBufferLightMap.h"
 #include "SMeshBufferTangents.h"
+#include "SParticle.h"
+#include "SSharedMeshBuffer.h"
+#include "SSkinMeshBuffer.h"
+#include "SVertexIndex.h"
 #include "SViewFrustum.h"
+#include "triangle3d.h"
+#include "vector2d.h"
+#include "vector3d.h"
 
-/*! \mainpage Irrlicht Engine 1.4 API documentation
+/*! \mainpage Irrlicht Engine 1.5 API documentation
  *
  * <div align="center"><img src="logobig.png" ></div>
  *
@@ -264,25 +306,23 @@ namespace irr
 	\param fullscreen: Should be set to true if the device should run in fullscreen. Otherwise
 		the device runs in windowed mode.
 	\param stencilbuffer: Specifies if the stencil buffer should be enabled. Set this to true,
-	    if you want the engine be able to draw stencil buffer shadows. Note that not all
-		devices are able to use the stencil buffer. If they don't no shadows will be drawn.
+	if you want the engine be able to draw stencil buffer shadows. Note that not all
+	devices are able to use the stencil buffer. If they don't no shadows will be drawn.
 	\param vsync: Specifies vertical syncronisation: If set to true, the driver will wait
-		for the vertical retrace period, otherwise not.
+	for the vertical retrace period, otherwise not.
 	\param receiver: A user created event receiver.
-	\param sdk_version_do_not_use: Don't use or change this parameter. Always set it to
-	IRRLICHT_SDK_VERSION, which is done by default. This is needed for sdk version checks.
 	\return Returns pointer to the created IrrlichtDevice or null if the
 	device could not be created.
 	*/
 	IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDevice(
 		video::E_DRIVER_TYPE deviceType = video::EDT_SOFTWARE,
-		const core::dimension2d<s32>& windowSize = (core::dimension2d<s32>(640,480)), // paranthese are necessary for some compilers
+		// parantheses are necessary for some compilers
+		const core::dimension2d<s32>& windowSize = (core::dimension2d<s32>(640,480)),
 		u32 bits = 16,
 		bool fullscreen = false,
 		bool stencilbuffer = false,
 		bool vsync = false,
-		IEventReceiver* receiver = 0,
-		const c8* sdk_version_do_not_use = IRRLICHT_SDK_VERSION);
+		IEventReceiver* receiver = 0);
 
 	//! Creates an Irrlicht device with the option to specify advanced parameters.
 	/** Usually you should used createDevice() for creating an Irrlicht Engine device.
@@ -309,12 +349,14 @@ namespace irr
 	{
 	}
 
-	//! This namespace provides interfaces for input/output: Reading and writing files, accessing zip archives, xml files, ...
+	//! This namespace provides interfaces for input/output: Reading and
+	//! writing files, accessing zip archives, xml files, ...
 	namespace io
 	{
 	}
 
-	//! All scene management can be found in this namespace: Mesh loading, special scene nodes like octrees and billboards, ...
+	//! All scene management can be found in this namespace: Mesh loading,
+	//! special scene nodes like octrees and billboards, ...
 	namespace scene
 	{
 	}
@@ -326,8 +368,9 @@ namespace irr
 }
 
 /*! \file irrlicht.h
-    \brief Main header file of the irrlicht, the only file needed to include.
+	\brief Main header file of the irrlicht, the only file needed to include.
 */
 
 #endif
 
+
diff --git a/src/dep/include/irrlicht/line2d.h b/src/dep/include/irrlicht/line2d.h
index f99cc7b..e6f6d36 100644
--- a/src/dep/include/irrlicht/line2d.h
+++ b/src/dep/include/irrlicht/line2d.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,10 +18,13 @@ template <class T>
 class line2d
 {
 	public:
-
+		//! Default constructor for line going from (0,0) to (1,1).
 		line2d() : start(0,0), end(1,1) {}
+		//! Constructor for line between the two points.
 		line2d(T xa, T ya, T xb, T yb) : start(xa, ya), end(xb, yb) {}
+		//! Constructor for line between the two points given as vectors.
 		line2d(const vector2d<T>& start, const vector2d<T>& end) : start(start), end(end) {}
+		//! Copy constructor.
 		line2d(const line2d<T>& other) : start(other.start), end(other.end) {}
 
 		// operators
@@ -32,79 +35,104 @@ class line2d
 		line2d<T> operator-(const vector2d<T>& point) const { return line2d<T>(start - point, end - point); }
 		line2d<T>& operator-=(const vector2d<T>& point) { start -= point; end -= point; return *this; }
 
-		bool operator==(const line2d<T>& other) const { return (start==other.start && end==other.end) || (end==other.start && start==other.end);}
-		bool operator!=(const line2d<T>& other) const { return !(start==other.start && end==other.end) || (end==other.start && start==other.end);}
+		bool operator==(const line2d<T>& other) const
+		{ return (start==other.start && end==other.end) || (end==other.start && start==other.end);}
+		bool operator!=(const line2d<T>& other) const
+		{ return !(start==other.start && end==other.end) || (end==other.start && start==other.end);}
 
 		// functions
-
+		//! Set this line to new line going through the two points.
 		void setLine(const T& xa, const T& ya, const T& xb, const T& yb){start.set(xa, ya); end.set(xb, yb);}
+		//! Set this line to new line going through the two points.
 		void setLine(const vector2d<T>& nstart, const vector2d<T>& nend){start.set(nstart); end.set(nend);}
+		//! Set this line to new line given as parameter.
 		void setLine(const line2d<T>& line){start.set(line.start); end.set(line.end);}
 
-		//! Returns length of line
-		//! \return Returns length of the line.
+		//! Get length of line
+		/** \return Length of the line. */
 		f64 getLength() const { return start.getDistanceFrom(end); }
 
-		//! Returns squared length of the line
-		//! \return Returns squared length of line.
+		//! Get squared length of the line
+		/** \return Squared length of line. */
 		T getLengthSQ() const { return start.getDistanceFromSQ(end); }
 
-		//! Returns middle of the line
+		//! Get middle of the line
+		/** \return center of the line. */
 		vector2d<T> getMiddle() const
 		{
 			return (start + end) * (T)0.5;
 		}
 
-		//! Returns the vector of the line.
-		//! \return Returns the vector of the line.
+		//! Get the vector of the line.
+		/** \return The vector of the line. */
 		vector2d<T> getVector() const { return vector2d<T>(start.X - end.X, start.Y - end.Y); }
 
 		//! Tests if this line intersects with another line.
-		//! \param l: Other line to test intersection with.
-		//! \param out: If there is an intersection, the location of the intersection will
-		//! be stored in this vector.
-		//! \return Returns true if there is an intersection, false if not.
+		/** \param l: Other line to test intersection with.
+		\param out: If there is an intersection, the location of the
+		intersection will be stored in this vector.
+		\return True if there is an intersection, false if not. */
 		bool intersectWith(const line2d<T>& l, vector2d<T>& out) const
 		{
-			bool found=false;
+			// Uses the method given at:
+			// http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/ 
+			const f32 commonDenominator = (l.end.Y - l.start.Y)*(end.X - start.X) -
+											(l.end.X - l.start.X)*(end.Y - start.Y);
 
-			f32 a1,a2,b1,b2;
+			const f32 numeratorA = (l.end.X - l.start.X)*(start.Y - l.start.Y) -
+											(l.end.Y - l.start.Y)*(start.X -l.start.X);
 
-			// calculate slopes, deal with infinity
-			if (end.X-start.X == 0)
-				b1 = (f32)1e+10;
-			else
-				b1 = (end.Y-start.Y)/(end.X-start.X);
-			if (l.end.X-l.start.X == 0)
-				b2 = (f32)1e+10;
-			else
-				b2 = (l.end.Y-l.start.Y)/(l.end.X-l.start.X);
+			const f32 numeratorB = (end.X - start.X)*(start.Y - l.start.Y) -
+											(end.Y - start.Y)*(start.X -l.start.X); 
 
-			// calculate position
-			a1 = start.Y   - b1 *  start.X;
-			a2 = l.start.Y - b2 * l.start.X;
-			out.X = - (a1-a2)/(b1-b2);
-			out.Y = a1 + b1*out.X;
+			if(equals(commonDenominator, 0.f))
+			{ 
+				// The lines are either coincident or parallel
+				if(equals(numeratorA, 0.f) && equals(numeratorB, 0.f))
+				{
+					// Try and find a common endpoint
+					if(l.start == start || l.end == start)
+						out = start;
+					else if(l.end == end || l.start == end)
+						out = end;
+					else
+						// one line is contained in the other, so for lack of a better
+						// answer, pick the average of both lines
+						out = ((start + end + l.start + l.end) * 0.25f);
 
-			// did the lines cross?
-			if (	(start.X-out.X) *(out.X-end.X)	 >= -ROUNDING_ERROR_32 &&
-				(l.start.X-out.X)*(out.X-l.end.X)>= -ROUNDING_ERROR_32 &&
-				(start.Y-out.Y)  *(out.Y-end.Y)  >= -ROUNDING_ERROR_32 &&
-				(l.start.Y-out.Y)*(out.Y-l.end.Y)>= -ROUNDING_ERROR_32 )
-			{
-				found = true;
+					return true; // coincident
+				}
+
+				return false; // parallel
 			}
-			return found;
+
+			// Get the point of intersection on this line, checking that
+			// it is within the line segment.
+			const f32 uA = numeratorA / commonDenominator;
+			if(uA < 0.f || uA > 1.f)
+				return false; // Outside the line segment
+
+			const f32 uB = numeratorB / commonDenominator;
+			if(uB < 0.f || uB > 1.f)
+				return false; // Outside the line segment
+
+			// Calculate the intersection point.
+			out.X = start.X + uA * (end.X - start.X);
+			out.Y = start.Y + uA * (end.Y - start.Y);
+			return true; 
 		}
 
-		//! Returns unit vector of the line.
-		//! \return Returns unit vector of this line.
+		//! Get unit vector of the line.
+		/** \return Unit vector of this line. */
 		vector2d<T> getUnitVector() const
 		{
 			T len = (T)(1.0 / getLength());
 			return vector2d<T>((end.X - start.X) * len, (end.Y - start.Y) * len);
 		}
 
+		//! Get angle between this line and given line.
+		/** \param l Other line for test.
+		\return Angle in degrees. */
 		f64 getAngleWith(const line2d<T>& l) const
 		{
 			vector2d<T> vect = getVector();
@@ -112,32 +140,31 @@ class line2d
 			return vect.getAngleWith(vect2);
 		}
 
-		//! Tells us if the given point lies to the left, 
-		//! right, or on the direction of the line
-		//! \return Returns 0 if the point is on the line
-		//! <0 if to the left, or >0 if to the right.
+		//! Tells us if the given point lies to the left, right, or on the line.
+		/** \return 0 if the point is on the line
+		<0 if to the left, or >0 if to the right. */
 		T getPointOrientation(const vector2d<T>& point) const
 		{
-			return ( (end.X   - start.X) * (point.Y - start.Y) - 
-					 (point.X - start.X) * (end.Y   - start.Y) );
+			return ( (end.X - start.X) * (point.Y - start.Y) -
+					(point.X - start.X) * (end.Y - start.Y) );
 		}
 
-		//! Returns if the given point is a member of the line
-		//! \return Returns true if 
+		//! Check if the given point is a member of the line
+		/** \return True if point is between start and end, else false. */
 		bool isPointOnLine(const vector2d<T>& point) const
 		{
 			T d = getPointOrientation(point);
 			return (d == 0 && point.isBetweenPoints(start, end));
 		}
 
-		//! Returns if the given point is between start and end of the
-		//! line. Assumes that the point is already somewhere on the line.
+		//! Check if the given point is between start and end of the line.
+		/** Assumes that the point is already somewhere on the line. */
 		bool isPointBetweenStartAndEnd(const vector2d<T>& point) const
 		{
 			return point.isBetweenPoints(start, end);
 		}
 
-		//! Returns the closest point on this line to a point
+		//! Get the closest point on this line to a point
 		vector2d<T> getClosestPoint(const vector2d<T>& point) const
 		{
 			vector2d<T> c = point - start;
@@ -153,13 +180,13 @@ class line2d
 			return start + v;
 		}
 
-		// member variables
-
+		//! Start point of the line.
 		vector2d<T> start;
+		//! End point of the line.
 		vector2d<T> end;
 };
 
-	//! Typedef for a f32 line.
+	//! Typedef for an f32 line.
 	typedef line2d<f32> line2df;
 	//! Typedef for an integer line.
 	typedef line2d<s32> line2di;
diff --git a/src/dep/include/irrlicht/line3d.h b/src/dep/include/irrlicht/line3d.h
index b5eff0c..e4ae5d0 100644
--- a/src/dep/include/irrlicht/line3d.h
+++ b/src/dep/include/irrlicht/line3d.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,10 +19,12 @@ class line3d
 {
 	public:
 
-		// Constructors
-
+		//! Default constructor
+		/** line from (0,0,0) to (1,1,1) */
 		line3d() : start(0,0,0), end(1,1,1) {}
+		//! Constructor with two points
 		line3d(T xa, T ya, T za, T xb, T yb, T zb) : start(xa, ya, za), end(xb, yb, zb) {}
+		//! Constructor with two points as vectors
 		line3d(const vector3d<T>& start, const vector3d<T>& end) : start(start), end(end) {}
 
 		// operators
@@ -33,43 +35,57 @@ class line3d
 		line3d<T> operator-(const vector3d<T>& point) const { return line3d<T>(start - point, end - point); }
 		line3d<T>& operator-=(const vector3d<T>& point) { start -= point; end -= point; return *this; }
 
-		bool operator==(const line3d<T>& other) const { return (start==other.start && end==other.end) || (end==other.start && start==other.end);}
-		bool operator!=(const line3d<T>& other) const { return !(start==other.start && end==other.end) || (end==other.start && start==other.end);}
+		bool operator==(const line3d<T>& other) const
+		{ return (start==other.start && end==other.end) || (end==other.start && start==other.end);}
+		bool operator!=(const line3d<T>& other) const
+		{ return !(start==other.start && end==other.end) || (end==other.start && start==other.end);}
 
 		// functions
+		//! Set this line to a new line going through the two points.
+		void setLine(const T& xa, const T& ya, const T& za, const T& xb, const T& yb, const T& zb)
+		{start.set(xa, ya, za); end.set(xb, yb, zb);}
+		//! Set this line to a new line going through the two points.
+		void setLine(const vector3d<T>& nstart, const vector3d<T>& nend)
+		{start.set(nstart); end.set(nend);}
+		//! Set this line to new line given as parameter.
+		void setLine(const line3d<T>& line)
+		{start.set(line.start); end.set(line.end);}
 
-		void setLine(const T& xa, const T& ya, const T& za, const T& xb, const T& yb, const T& zb) {start.set(xa, ya, za); end.set(xb, yb, zb);}
-		void setLine(const vector3d<T>& nstart, const vector3d<T>& nend) {start.set(nstart); end.set(nend);}
-		void setLine(const line3d<T>& line) {start.set(line.start); end.set(line.end);}
-
-		//! Returns length of line
-		//! \return Returns length of line.
+		//! Get length of line
+		/** \return Length of line. */
 		T getLength() const { return start.getDistanceFrom(end); }
 
-		//! Returns sqared length of line
-		//! \return Returns sqared length of line.
+		//! Get squared length of line
+		/** \return Squared length of line. */
 		T getLengthSQ() const { return start.getDistanceFromSQ(end); }
 
-		//! Returns middle of line
+		//! Get middle of line
+		/** \return Center of line. */
 		vector3d<T> getMiddle() const
 		{
 			return (start + end) * (T)0.5;
 		}
 
-		//! Returns vector of line
+		//! Get vector of line
+		/** \return vector of line. */
 		vector3d<T> getVector() const
 		{
 			return end - start;
 		}
 
-		//! Returns if the given point is between start and end of the
-		//! line. Assumes that the point is already somewhere on the line.
+		//! Check if the given point is between start and end of the line.
+		/** Assumes that the point is already somewhere on the line.
+		\param point The point to test.
+		\return True if point is on the line between start and end, else false.
+		*/
 		bool isPointBetweenStartAndEnd(const vector3d<T>& point) const
 		{
 			return point.isBetweenPoints(start, end);
 		}
 
-		//! Returns the closest point on this line to a point
+		//! Get the closest point on this line to a point
+		/** \param point The point to compare to.
+		\return The nearest point which is part of the line. */
 		vector3d<T> getClosestPoint(const vector3d<T>& point) const
 		{
 			vector3d<T> c = point - start;
@@ -87,13 +103,13 @@ class line3d
 			return start + v;
 		}
 
-		//! Returns if the line intersects with a shpere
-		//! \param sorigin: Origin of the shpere.
-		//! \param sradius: Radius of the sphere.
-		//! \param outdistance: The distance to the first intersection point.
-		//! \return Returns true if there is an intersection.
-		//! If there is one, the distance to the first intersection point
-		//! is stored in outdistance.
+		//! Check if the line intersects with a shpere
+		/** \param sorigin: Origin of the shpere.
+		\param sradius: Radius of the sphere.
+		\param outdistance: The distance to the first intersection point.
+		\return True if there is an intersection.
+		If there is one, the distance to the first intersection point
+		is stored in outdistance. */
 		bool getIntersectionWithSphere(vector3d<T> sorigin, T sradius, f64& outdistance) const
 		{
 			const vector3d<T> q = sorigin - start;
@@ -110,7 +126,9 @@ class line3d
 
 		// member variables
 
+		//! Start point of line
 		vector3d<T> start;
+		//! End point of line
 		vector3d<T> end;
 };
 
diff --git a/src/dep/include/irrlicht/matrix4.h b/src/dep/include/irrlicht/matrix4.h
index f541d20..5ff4bb1 100644
--- a/src/dep/include/irrlicht/matrix4.h
+++ b/src/dep/include/irrlicht/matrix4.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,9 +19,7 @@ namespace core
 {
 
 	//! 4x4 matrix. Mostly used as transformation matrix for 3d calculations.
-	/* Matrix4 is mainly used by the Irrlicht engine for doing transformations.
-	The matrix is a D3D style matrix, row major with translations in the 4th row.
-	*/
+	/** The matrix is a D3D style matrix, row major with translations in the 4th row. */
 	template <class T>
 	class CMatrix4
 	{
@@ -38,7 +36,12 @@ namespace core
 				EM4CONST_INVERSE_TRANSPOSED
 			};
 
+			//! Default constructor
+			/** \param constructor Choose the initialization style */
 			CMatrix4( eConstructor constructor = EM4CONST_IDENTITY );
+			//! Copy constructor
+			/** \param other Other matrix to copy from
+			\param constructor Choose the initialization style */
 			CMatrix4( const CMatrix4<T>& other,eConstructor constructor = EM4CONST_COPY);
 
 			//! Simple operator for directly accessing every element of the matrix.
@@ -82,11 +85,12 @@ namespace core
 			CMatrix4<T>& operator-=(const CMatrix4<T>& other);
 
 			//! set this matrix to the product of two matrices
-			inline void setbyproduct(const CMatrix4<T>& other_a,const CMatrix4<T>& other_b );
+			inline CMatrix4<T>& setbyproduct(const CMatrix4<T>& other_a,const CMatrix4<T>& other_b );
 
-			//! set this matrix to the product of two matrices, no logical optimation
-			//! use it if you know you never have a identity matrix
-			void setbyproduct_nocheck(const CMatrix4<T>& other_a,const CMatrix4<T>& other_b );
+			//! Set this matrix to the product of two matrices
+			/** no optimization used,
+			use it if you know you never have a identity matrix */
+			CMatrix4<T>& setbyproduct_nocheck(const CMatrix4<T>& other_a,const CMatrix4<T>& other_b );
 
 			//! Multiply by another matrix.
 			CMatrix4<T> operator*(const CMatrix4<T>& other) const;
@@ -101,7 +105,7 @@ namespace core
 			CMatrix4<T>& operator*=(const T& scalar);
 
 			//! Set matrix to identity.
-			inline void makeIdentity();
+			inline CMatrix4<T>& makeIdentity();
 
 			//! Returns true if the matrix is the identity matrix
 			inline bool isIdentity() const;
@@ -110,31 +114,37 @@ namespace core
 			bool isIdentity_integer_base () const;
 
 			//! Set the translation of the current matrix. Will erase any previous values.
-			void setTranslation( const vector3d<T>& translation );
+			CMatrix4<T>& setTranslation( const vector3d<T>& translation );
 
 			//! Gets the current translation
 			vector3d<T> getTranslation() const;
 
 			//! Set the inverse translation of the current matrix. Will erase any previous values.
-			void setInverseTranslation( const vector3d<T>& translation );
+			CMatrix4<T>& setInverseTranslation( const vector3d<T>& translation );
 
 			//! Make a rotation matrix from Euler angles. The 4th row and column are unmodified.
-			inline void setRotationRadians( const vector3d<T>& rotation );
+			inline CMatrix4<T>& setRotationRadians( const vector3d<T>& rotation );
 
 			//! Make a rotation matrix from Euler angles. The 4th row and column are unmodified.
-			void setRotationDegrees( const vector3d<T>& rotation );
+			CMatrix4<T>& setRotationDegrees( const vector3d<T>& rotation );
 
-			//! Returns the rotation, as set by setRotation(). This code was orginally written by by Chev.
+			//! Returns the rotation, as set by setRotation().
+			/** This code was orginally written by by Chev. */
 			core::vector3d<T> getRotationDegrees() const;
 
-			//! Make an inverted rotation matrix from Euler angles. The 4th row and column are unmodified.
-			inline void setInverseRotationRadians( const vector3d<T>& rotation );
+			//! Make an inverted rotation matrix from Euler angles.
+			/** The 4th row and column are unmodified. */
+			inline CMatrix4<T>& setInverseRotationRadians( const vector3d<T>& rotation );
 
-			//! Make an inverted rotation matrix from Euler angles. The 4th row and column are unmodified.
-			void setInverseRotationDegrees( const vector3d<T>& rotation );
+			//! Make an inverted rotation matrix from Euler angles.
+			/** The 4th row and column are unmodified. */
+			CMatrix4<T>& setInverseRotationDegrees( const vector3d<T>& rotation );
 
 			//! Set Scale
-			void setScale( const vector3d<T>& scale );
+			CMatrix4<T>& setScale( const vector3d<T>& scale );
+
+			//! Set Scale
+			CMatrix4<T>& setScale( const T scale ) { return setScale(core::vector3d<T>(scale,scale,scale)); }
 
 			//! Get Scale
 			core::vector3d<T> getScale() const;
@@ -149,7 +159,7 @@ namespace core
 			void rotateVect( vector3df& vect ) const;
 
 			//! An alternate transform vector method, writing into a second vector
-			void rotateVect(vector3df& out,const core::vector3df& in) const;
+			void rotateVect(core::vector3df& out, const core::vector3df& in) const;
 
 			//! An alternate transform vector method, writing into an array of 3 floats
 			void rotateVect(T *out,const core::vector3df &in) const;
@@ -169,19 +179,16 @@ namespace core
 			//! Transforms a plane by this matrix
 			void transformPlane( core::plane3d<f32> &plane) const;
 
-			//! Transforms a plane by this matrix ( some problems to solve..)
-			void transformPlane_new( core::plane3d<f32> &plane) const;
-
 			//! Transforms a plane by this matrix
 			void transformPlane( const core::plane3d<f32> &in, core::plane3d<f32> &out) const;
 
 			//! Transforms a axis aligned bounding box
-			/** The result box of this operation may not be very accurate. For
-			accurate results, use transformBoxEx() */
+			/** The result box of this operation may not be accurate at all. For
+			correct results, use transformBoxEx() */
 			void transformBox(core::aabbox3d<f32>& box) const;
 
-			//! Transforms a axis aligned bounding box more accurately than transformBox()
-			/** The result box of this operation should by quite accurate, but this operation
+			//! Transforms a axis aligned bounding box
+			/** The result box of this operation should by accurate, but this operation
 			is slower than transformBox(). */
 			void transformBoxEx(core::aabbox3d<f32>& box) const;
 
@@ -189,96 +196,133 @@ namespace core
 			void multiplyWith1x4Matrix(T* matrix) const;
 
 			//! Calculates inverse of matrix. Slow.
-			//! \return Returns false if there is no inverse matrix.
+			/** \return Returns false if there is no inverse matrix.*/
 			bool makeInverse();
 
 
 			//! Inverts a primitive matrix which only contains a translation and a rotation
-			//! \param out: where result matrix is written to.
+			/** \param out: where result matrix is written to. */
 			bool getInversePrimitive ( CMatrix4<T>& out ) const;
 
-			//! returns the inversed matrix of this one
-			//! \param out: where result matrix is written to.
-			//! \return Returns false if there is no inverse matrix.
+			//! Gets the inversed matrix of this one
+			/** \param out: where result matrix is written to.
+			\return Returns false if there is no inverse matrix. */
 			bool getInverse(CMatrix4<T>& out) const;
 
 			//! Builds a right-handed perspective projection matrix based on a field of view
-			void buildProjectionMatrixPerspectiveFovRH(f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar);
+			CMatrix4<T>& buildProjectionMatrixPerspectiveFovRH(f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar);
 
 			//! Builds a left-handed perspective projection matrix based on a field of view
-			void buildProjectionMatrixPerspectiveFovLH(f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar);
+			CMatrix4<T>& buildProjectionMatrixPerspectiveFovLH(f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar);
 
 			//! Builds a right-handed perspective projection matrix.
-			void buildProjectionMatrixPerspectiveRH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar);
+			CMatrix4<T>& buildProjectionMatrixPerspectiveRH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar);
 
 			//! Builds a left-handed perspective projection matrix.
-			void buildProjectionMatrixPerspectiveLH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar);
+			CMatrix4<T>& buildProjectionMatrixPerspectiveLH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar);
 
 			//! Builds a left-handed orthogonal projection matrix.
-			void buildProjectionMatrixOrthoLH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar);
+			CMatrix4<T>& buildProjectionMatrixOrthoLH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar);
 
 			//! Builds a right-handed orthogonal projection matrix.
-			void buildProjectionMatrixOrthoRH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar);
+			CMatrix4<T>& buildProjectionMatrixOrthoRH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar);
 
 			//! Builds a left-handed look-at matrix.
-			void buildCameraLookAtMatrixLH(const vector3df& position, const vector3df& target, const vector3df& upVector);
+			CMatrix4<T>& buildCameraLookAtMatrixLH(
+					const vector3df& position,
+					const vector3df& target,
+					const vector3df& upVector);
 
 			//! Builds a right-handed look-at matrix.
-			void buildCameraLookAtMatrixRH(const vector3df& position, const vector3df& target, const vector3df& upVector);
+			CMatrix4<T>& buildCameraLookAtMatrixRH(
+					const vector3df& position,
+					const vector3df& target,
+					const vector3df& upVector);
 
 			//! Builds a matrix that flattens geometry into a plane.
-			//! \param light: light source
-			//! \param plane: plane into which the geometry if flattened into
-			//! \param point: value between 0 and 1, describing the light source.
-			//! If this is 1, it is a point light, if it is 0, it is a directional light.
-			void buildShadowMatrix(const core::vector3df& light, core::plane3df plane, f32 point=1.0f);
+			/** \param light: light source
+			\param plane: plane into which the geometry if flattened into
+			\param point: value between 0 and 1, describing the light source.
+			If this is 1, it is a point light, if it is 0, it is a directional light. */
+			CMatrix4<T>& buildShadowMatrix(const core::vector3df& light, core::plane3df plane, f32 point=1.0f);
 
 			//! Builds a matrix which transforms a normalized Device Coordinate to Device Coordinates.
 			/** Used to scale <-1,-1><1,1> to viewport, for example from von <-1,-1> <1,1> to the viewport <0,0><0,640> */
-			void buildNDCToDCMatrix( const core::rect<s32>& area, f32 zScale);
+			CMatrix4<T>& buildNDCToDCMatrix( const core::rect<s32>& area, f32 zScale);
 
-			//! creates a new matrix as interpolated matrix from two other ones.
-			//! \param b: other matrix to interpolate with
-			//! \param time: Must be a value between 0 and 1.
+			//! Creates a new matrix as interpolated matrix from two other ones.
+			/** \param b: other matrix to interpolate with
+			\param time: Must be a value between 0 and 1. */
 			CMatrix4<T> interpolate(const core::CMatrix4<T>& b, f32 time) const;
 
-			//! returns transposed matrix
+			//! Gets transposed matrix
 			CMatrix4<T> getTransposed() const;
 
-			//! returns transposed matrix to a plain 4x4 float matrix
+			//! Gets transposed matrix
 			inline void getTransposed( CMatrix4<T>& dest ) const;
 
-			/*!
+			/*
 				construct 2D Texture transformations
 				rotate about center, scale, and transform.
 			*/
-			void setTextureScale( f32 sx, f32 sy );
-
-			void setTextureRotationCenter( f32 radAngle );
-			void setTextureScaleCenter( f32 sx, f32 sy );
-
-			void setTextureTranslate( f32 x, f32 y );
-
-			void buildTextureTransform( f32 rotateRad,
+			//! Set to a texture transformation matrix with the given parameters.
+			CMatrix4<T>& buildTextureTransform( f32 rotateRad,
 					const core::vector2df &rotatecenter,
 					const core::vector2df &translate,
 					const core::vector2df &scale);
 
-			//! sets all matrix data members at once
-			void setM(const T* data);
+			//! Set texture transformation rotation
+			/** Rotate about z axis, recenter at (0.5,0.5).
+			Doesn't clear other elements than those affected
+			\param radAngle Angle in radians
+			\return Altered matrix */
+			CMatrix4<T>& setTextureRotationCenter( f32 radAngle );
 
-			//! sets if the matrix is definitely identity matrix
+			//! Set texture transformation translation
+			/** Doesn't clear other elements than those affected.
+			\param x Offset on x axis
+			\param y Offset on y axis
+			\return Altered matrix */
+			CMatrix4<T>& setTextureTranslate( f32 x, f32 y );
+
+			//! Set texture transformation translation, using a transposed representation
+			/** Doesn't clear other elements than those affected.
+			\param x Offset on x axis
+			\param y Offset on y axis
+			\return Altered matrix */
+			CMatrix4<T>& setTextureTranslateTransposed( f32 x, f32 y );
+
+			//! Set texture transformation scale
+			/** Doesn't clear other elements than those affected.
+			\param sx Scale factor on x axis
+			\param sy Scale factor on y axis
+			\return Altered matrix. */
+			CMatrix4<T>& setTextureScale( f32 sx, f32 sy );
+
+			//! Set texture transformation scale, and recenter at (0.5,0.5)
+			/** Doesn't clear other elements than those affected.
+			\param sx Scale factor on x axis
+			\param sy Scale factor on y axis
+			\return Altered matrix. */
+			CMatrix4<T>& setTextureScaleCenter( f32 sx, f32 sy );
+
+			//! Sets all matrix data members at once
+			CMatrix4<T>& setM(const T* data);
+
+			//! Sets if the matrix is definitely identity matrix
 			void setDefinitelyIdentityMatrix( bool isDefinitelyIdentityMatrix);
 
-			//! gets if the matrix is definitely identity matrix
+			//! Gets if the matrix is definitely identity matrix
 			bool getDefinitelyIdentityMatrix() const;
 
 		private:
 			//! Matrix data, stored in row-major order
 			T M[16];
+			//! Flag is this matrix is identity matrix
 			mutable bool definitelyIdentityMatrix;
 	};
 
+	// Default constructor
 	template <class T>
 	inline CMatrix4<T>::CMatrix4( eConstructor constructor ) : definitelyIdentityMatrix(false)
 	{
@@ -295,6 +339,7 @@ namespace core
 		}
 	}
 
+	// Copy constructor
 	template <class T>
 	inline CMatrix4<T>::CMatrix4( const CMatrix4<T>& other, eConstructor constructor) : definitelyIdentityMatrix(false)
 	{
@@ -478,17 +523,17 @@ namespace core
 	template <class T>
 	inline CMatrix4<T>& CMatrix4<T>::operator*=(const CMatrix4<T>& other)
 	{
-		// do chacks on your own in order to avoid copy creation
+		// do checks on your own in order to avoid copy creation
 		if ( !other.isIdentity() )
 		{
 			if ( this->isIdentity() )
 			{
-				*this = other;
+				return (*this = other);
 			}
 			else
 			{
 				CMatrix4<T> temp ( *this );
-				setbyproduct_nocheck( temp, other );
+				return setbyproduct_nocheck( temp, other );
 			}
 		}
 		return *this;
@@ -498,7 +543,7 @@ namespace core
 	// set this matrix to the product of two other matrices
 	// goal is to reduce stack use and copy
 	template <class T>
-	inline void CMatrix4<T>::setbyproduct_nocheck(const CMatrix4<T>& other_a,const CMatrix4<T>& other_b )
+	inline CMatrix4<T>& CMatrix4<T>::setbyproduct_nocheck(const CMatrix4<T>& other_a,const CMatrix4<T>& other_b )
 	{
 		const T *m1 = other_a.M;
 		const T *m2 = other_b.M;
@@ -523,6 +568,7 @@ namespace core
 		M[14] = m1[2]*m2[12] + m1[6]*m2[13] + m1[10]*m2[14] + m1[14]*m2[15];
 		M[15] = m1[3]*m2[12] + m1[7]*m2[13] + m1[11]*m2[14] + m1[15]*m2[15];
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
@@ -530,20 +576,15 @@ namespace core
 	// set this matrix to the product of two other matrices
 	// goal is to reduce stack use and copy
 	template <class T>
-	inline void CMatrix4<T>::setbyproduct(const CMatrix4<T>& other_a,const CMatrix4<T>& other_b )
+	inline CMatrix4<T>& CMatrix4<T>::setbyproduct(const CMatrix4<T>& other_a, const CMatrix4<T>& other_b )
 	{
 		if ( other_a.isIdentity () )
-		{
-			*this = other_b;
-			return;
-		}
+			return (*this = other_b);
 		else
 		if ( other_b.isIdentity () )
-		{
-			*this = other_a;
-			return;
-		}
-		setbyproduct_nocheck(other_a,other_b);
+			return (*this = other_a);
+		else
+			return setbyproduct_nocheck(other_a,other_b);
 	}
 
 	//! multiply by another matrix
@@ -592,30 +633,33 @@ namespace core
 
 
 	template <class T>
-	inline void CMatrix4<T>::setTranslation( const vector3d<T>& translation )
+	inline CMatrix4<T>& CMatrix4<T>::setTranslation( const vector3d<T>& translation )
 	{
 		M[12] = translation.X;
 		M[13] = translation.Y;
 		M[14] = translation.Z;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 	template <class T>
-	inline void CMatrix4<T>::setInverseTranslation( const vector3d<T>& translation )
+	inline CMatrix4<T>& CMatrix4<T>::setInverseTranslation( const vector3d<T>& translation )
 	{
 		M[12] = -translation.X;
 		M[13] = -translation.Y;
 		M[14] = -translation.Z;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 	template <class T>
-	inline void CMatrix4<T>::setScale( const vector3d<T>& scale )
+	inline CMatrix4<T>& CMatrix4<T>::setScale( const vector3d<T>& scale )
 	{
 		M[0] = scale.X;
 		M[5] = scale.Y;
 		M[10] = scale.Z;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 	template <class T>
@@ -625,33 +669,33 @@ namespace core
 	}
 
 	template <class T>
-	inline void CMatrix4<T>::setRotationDegrees( const vector3d<T>& rotation )
+	inline CMatrix4<T>& CMatrix4<T>::setRotationDegrees( const vector3d<T>& rotation )
 	{
-		setRotationRadians( rotation * core::DEGTORAD );
+		return setRotationRadians( rotation * core::DEGTORAD );
 	}
 
 	template <class T>
-	inline void CMatrix4<T>::setInverseRotationDegrees( const vector3d<T>& rotation )
+	inline CMatrix4<T>& CMatrix4<T>::setInverseRotationDegrees( const vector3d<T>& rotation )
 	{
-		setInverseRotationRadians( rotation * core::DEGTORAD );
+		return setInverseRotationRadians( rotation * core::DEGTORAD );
 	}
 
 	template <class T>
-	inline void CMatrix4<T>::setRotationRadians( const vector3d<T>& rotation )
+	inline CMatrix4<T>& CMatrix4<T>::setRotationRadians( const vector3d<T>& rotation )
 	{
-		f64 cr = cos( rotation.X );
-		f64 sr = sin( rotation.X );
-		f64 cp = cos( rotation.Y );
-		f64 sp = sin( rotation.Y );
-		f64 cy = cos( rotation.Z );
-		f64 sy = sin( rotation.Z );
+		const f64 cr = cos( rotation.X );
+		const f64 sr = sin( rotation.X );
+		const f64 cp = cos( rotation.Y );
+		const f64 sp = sin( rotation.Y );
+		const f64 cy = cos( rotation.Z );
+		const f64 sy = sin( rotation.Z );
 
 		M[0] = (T)( cp*cy );
 		M[1] = (T)( cp*sy );
 		M[2] = (T)( -sp );
 
-		f64 srsp = sr*sp;
-		f64 crsp = cr*sp;
+		const f64 srsp = sr*sp;
+		const f64 crsp = cr*sp;
 
 		M[4] = (T)( srsp*cy-cr*sy );
 		M[5] = (T)( srsp*sy+cr*cy );
@@ -661,30 +705,33 @@ namespace core
 		M[9] = (T)( crsp*sy-sr*cy );
 		M[10] = (T)( cr*cp );
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
-
-	//! Returns the rotation, as set by setRotation(). This code was sent
-	//! in by Chev.
+	//! Returns a rotation that is equivalent to that set by setRotationDegrees().
+	/** This code was sent in by Chev.  Note that it does not necessarily return
+	the *same* Euler angles as those set by setRotationDegrees(), but the rotation will
+	be equivalent, i.e. will have the same result when used to rotate a vector or node. */
 	template <class T>
 	inline core::vector3d<T> CMatrix4<T>::getRotationDegrees() const
 	{
 		const CMatrix4<T> &mat = *this;
 
 		f64 Y = -asin(mat(0,2));
-		f64 C = cos(Y);
+		const f64 C = cos(Y);
 		Y *= RADTODEG64;
 
 		f64 rotx, roty, X, Z;
 
-		if (fabs(C)>0.0005f)
+		if (fabs(C)>ROUNDING_ERROR_64)
 		{
-			rotx = mat(2,2) / C;
-			roty = mat(1,2) / C;
+			const T invC = (T)(1.0/C);
+			rotx = mat(2,2) * invC;
+			roty = mat(1,2) * invC;
 			X = atan2( roty, rotx ) * RADTODEG64;
-			rotx = mat(0,0) / C;
-			roty = mat(0,1) / C;
+			rotx = mat(0,0) * invC;
+			roty = mat(0,1) * invC;
 			Z = atan2( roty, rotx ) * RADTODEG64;
 		}
 		else
@@ -702,11 +749,12 @@ namespace core
 		if (Y < 0.0) Y += 360.0;
 		if (Z < 0.0) Z += 360.0;
 
-		return vector3d<T>((f32)X,(f32)Y,(f32)Z);
+		return vector3d<T>((T)X,(T)Y,(T)Z);
 	}
 
+
 	template <class T>
-	inline void CMatrix4<T>::setInverseRotationRadians( const vector3d<T>& rotation )
+	inline CMatrix4<T>& CMatrix4<T>::setInverseRotationRadians( const vector3d<T>& rotation )
 	{
 		f64 cr = cos( rotation.X );
 		f64 sr = sin( rotation.X );
@@ -730,17 +778,19 @@ namespace core
 		M[6] = (T)( crsp*sy-sr*cy );
 		M[10] = (T)( cr*cp );
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
 	/*!
 	*/
 	template <class T>
-	inline void CMatrix4<T>::makeIdentity()
+	inline CMatrix4<T>& CMatrix4<T>::makeIdentity()
 	{
 		memset(M, 0, 16*sizeof(T));
 		M[0] = M[5] = M[10] = M[15] = (T)1;
 		definitelyIdentityMatrix=true;
+		return *this;
 	}
 
 
@@ -753,18 +803,16 @@ namespace core
 	{
 		if (definitelyIdentityMatrix)
 			return true;
-		if (	!equals ( M[ 0], (T)1 ) ||
-				!equals ( M[ 5], (T)1 ) ||
-				!equals ( M[10], (T)1 ) ||
-				!equals ( M[15], (T)1 )
-			)
+		if (!equals( M[ 0], (T)1 ) ||
+				!equals( M[ 5], (T)1 ) ||
+				!equals( M[10], (T)1 ) ||
+				!equals( M[15], (T)1 ))
 			return false;
 
 		for (s32 i=0; i<4; ++i)
 			for (s32 j=0; j<4; ++j)
-				if (j != i)
-					if (!iszero((*this)(i,j)))
-						return false;
+				if ((j != i) && (!iszero((*this)(i,j))))
+					return false;
 
 		definitelyIdentityMatrix=true;
 		return true;
@@ -805,7 +853,6 @@ namespace core
 	}
 
 
-
 	template <class T>
 	inline void CMatrix4<T>::rotateVect( vector3df& vect ) const
 	{
@@ -866,7 +913,7 @@ namespace core
 
 
 	template <class T>
-	inline void CMatrix4<T>::transformVect(T *out,const vector3df &in) const
+	inline void CMatrix4<T>::transformVect(T *out, const core::vector3df &in) const
 	{
 		out[0] = in.X*M[0] + in.Y*M[4] + in.Z*M[8] + M[12];
 		out[1] = in.X*M[1] + in.Y*M[5] + in.Z*M[9] + M[13];
@@ -880,31 +927,15 @@ namespace core
 	inline void CMatrix4<T>::transformPlane( core::plane3d<f32> &plane) const
 	{
 		vector3df member;
+		// Transform the plane member point, i.e. rotate, translate and scale it.
 		transformVect(member, plane.getMemberPoint());
 
-		vector3df origin(0,0,0);
-		transformVect(plane.Normal);
-		transformVect(origin);
+		// Transform the normal by the transposed inverse of the matrix
+		CMatrix4<T> transposedInverse(*this, EM4CONST_INVERSE_TRANSPOSED);
+		vector3df normal = plane.Normal;
+		transposedInverse.transformVect(normal);
 
-		plane.Normal -= origin;
-		plane.D = - member.dotProduct(plane.Normal);
-	}
-
-	//! Transforms a plane by this matrix
-	template <class T>
-	inline void CMatrix4<T>::transformPlane_new( core::plane3d<f32> &plane) const
-	{
-		// rotate normal -> rotateVect ( plane.n );
-		vector3df n;
-		n.X = plane.Normal.X*M[0] + plane.Normal.Y*M[4] + plane.Normal.Z*M[8];
-		n.Y = plane.Normal.X*M[1] + plane.Normal.Y*M[5] + plane.Normal.Z*M[9];
-		n.Z = plane.Normal.X*M[2] + plane.Normal.Y*M[6] + plane.Normal.Z*M[10];
-
-		// compute new d. -> getTranslation(). dotproduct ( plane.n )
-		plane.D -= M[12] * n.X + M[13] * n.Y + M[14] * n.Z;
-		plane.Normal.X = n.X;
-		plane.Normal.Y = n.Y;
-		plane.Normal.Z = n.Z;
+		plane.setPlane(member, normal);
 	}
 
 	//! Transforms a plane by this matrix
@@ -919,7 +950,7 @@ namespace core
 	template <class T>
 	inline void CMatrix4<T>::transformBox(core::aabbox3d<f32>& box) const
 	{
-		if (isIdentity() )
+		if (isIdentity())
 			return;
 
 		transformVect(box.MinEdge);
@@ -931,32 +962,24 @@ namespace core
 	template <class T>
 	inline void CMatrix4<T>::transformBoxEx(core::aabbox3d<f32>& box) const
 	{
-		f32 Amin[3];
-		f32 Amax[3];
+		const f32 Amin[3] = {box.MinEdge.X, box.MinEdge.Y, box.MinEdge.Z};
+		const f32 Amax[3] = {box.MaxEdge.X, box.MaxEdge.Y, box.MaxEdge.Z};
+
 		f32 Bmin[3];
 		f32 Bmax[3];
 
-		Amin[0] = box.MinEdge.X;
-		Amin[1] = box.MinEdge.Y;
-		Amin[2] = box.MinEdge.Z;
-
-		Amax[0] = box.MaxEdge.X;
-		Amax[1] = box.MaxEdge.Y;
-		Amax[2] = box.MaxEdge.Z;
-
 		Bmin[0] = Bmax[0] = M[12];
 		Bmin[1] = Bmax[1] = M[13];
 		Bmin[2] = Bmax[2] = M[14];
 
-		u32 i, j;
 		const CMatrix4<T> &m = *this;
 
-		for (i = 0; i < 3; ++i)
+		for (u32 i = 0; i < 3; ++i)
 		{
-			for (j = 0; j < 3; ++j)
+			for (u32 j = 0; j < 3; ++j)
 			{
-				f32 a = m(j,i) * Amin[j];
-				f32 b = m(j,i) * Amax[j];
+				const f32 a = m(j,i) * Amin[j];
+				const f32 b = m(j,i) * Amax[j];
 
 				if (a < b)
 				{
@@ -1048,22 +1071,54 @@ namespace core
 
 		d = core::reciprocal ( d );
 
-		out(0, 0) = d * (m(1, 1) * (m(2, 2) * m(3, 3) - m(2, 3) * m(3, 2)) + m(1, 2) * (m(2, 3) * m(3, 1) - m(2, 1) * m(3, 3)) + m(1, 3) * (m(2, 1) * m(3, 2) - m(2, 2) * m(3, 1)));
-		out(0, 1) = d * (m(2, 1) * (m(0, 2) * m(3, 3) - m(0, 3) * m(3, 2)) + m(2, 2) * (m(0, 3) * m(3, 1) - m(0, 1) * m(3, 3)) + m(2, 3) * (m(0, 1) * m(3, 2) - m(0, 2) * m(3, 1)));
-		out(0, 2) = d * (m(3, 1) * (m(0, 2) * m(1, 3) - m(0, 3) * m(1, 2)) + m(3, 2) * (m(0, 3) * m(1, 1) - m(0, 1) * m(1, 3)) + m(3, 3) * (m(0, 1) * m(1, 2) - m(0, 2) * m(1, 1)));
-		out(0, 3) = d * (m(0, 1) * (m(1, 3) * m(2, 2) - m(1, 2) * m(2, 3)) + m(0, 2) * (m(1, 1) * m(2, 3) - m(1, 3) * m(2, 1)) + m(0, 3) * (m(1, 2) * m(2, 1) - m(1, 1) * m(2, 2)));
-		out(1, 0) = d * (m(1, 2) * (m(2, 0) * m(3, 3) - m(2, 3) * m(3, 0)) + m(1, 3) * (m(2, 2) * m(3, 0) - m(2, 0) * m(3, 2)) + m(1, 0) * (m(2, 3) * m(3, 2) - m(2, 2) * m(3, 3)));
-		out(1, 1) = d * (m(2, 2) * (m(0, 0) * m(3, 3) - m(0, 3) * m(3, 0)) + m(2, 3) * (m(0, 2) * m(3, 0) - m(0, 0) * m(3, 2)) + m(2, 0) * (m(0, 3) * m(3, 2) - m(0, 2) * m(3, 3)));
-		out(1, 2) = d * (m(3, 2) * (m(0, 0) * m(1, 3) - m(0, 3) * m(1, 0)) + m(3, 3) * (m(0, 2) * m(1, 0) - m(0, 0) * m(1, 2)) + m(3, 0) * (m(0, 3) * m(1, 2) - m(0, 2) * m(1, 3)));
-		out(1, 3) = d * (m(0, 2) * (m(1, 3) * m(2, 0) - m(1, 0) * m(2, 3)) + m(0, 3) * (m(1, 0) * m(2, 2) - m(1, 2) * m(2, 0)) + m(0, 0) * (m(1, 2) * m(2, 3) - m(1, 3) * m(2, 2)));
-		out(2, 0) = d * (m(1, 3) * (m(2, 0) * m(3, 1) - m(2, 1) * m(3, 0)) + m(1, 0) * (m(2, 1) * m(3, 3) - m(2, 3) * m(3, 1)) + m(1, 1) * (m(2, 3) * m(3, 0) - m(2, 0) * m(3, 3)));
-		out(2, 1) = d * (m(2, 3) * (m(0, 0) * m(3, 1) - m(0, 1) * m(3, 0)) + m(2, 0) * (m(0, 1) * m(3, 3) - m(0, 3) * m(3, 1)) + m(2, 1) * (m(0, 3) * m(3, 0) - m(0, 0) * m(3, 3)));
-		out(2, 2) = d * (m(3, 3) * (m(0, 0) * m(1, 1) - m(0, 1) * m(1, 0)) + m(3, 0) * (m(0, 1) * m(1, 3) - m(0, 3) * m(1, 1)) + m(3, 1) * (m(0, 3) * m(1, 0) - m(0, 0) * m(1, 3)));
-		out(2, 3) = d * (m(0, 3) * (m(1, 1) * m(2, 0) - m(1, 0) * m(2, 1)) + m(0, 0) * (m(1, 3) * m(2, 1) - m(1, 1) * m(2, 3)) + m(0, 1) * (m(1, 0) * m(2, 3) - m(1, 3) * m(2, 0)));
-		out(3, 0) = d * (m(1, 0) * (m(2, 2) * m(3, 1) - m(2, 1) * m(3, 2)) + m(1, 1) * (m(2, 0) * m(3, 2) - m(2, 2) * m(3, 0)) + m(1, 2) * (m(2, 1) * m(3, 0) - m(2, 0) * m(3, 1)));
-		out(3, 1) = d * (m(2, 0) * (m(0, 2) * m(3, 1) - m(0, 1) * m(3, 2)) + m(2, 1) * (m(0, 0) * m(3, 2) - m(0, 2) * m(3, 0)) + m(2, 2) * (m(0, 1) * m(3, 0) - m(0, 0) * m(3, 1)));
-		out(3, 2) = d * (m(3, 0) * (m(0, 2) * m(1, 1) - m(0, 1) * m(1, 2)) + m(3, 1) * (m(0, 0) * m(1, 2) - m(0, 2) * m(1, 0)) + m(3, 2) * (m(0, 1) * m(1, 0) - m(0, 0) * m(1, 1)));
-		out(3, 3) = d * (m(0, 0) * (m(1, 1) * m(2, 2) - m(1, 2) * m(2, 1)) + m(0, 1) * (m(1, 2) * m(2, 0) - m(1, 0) * m(2, 2)) + m(0, 2) * (m(1, 0) * m(2, 1) - m(1, 1) * m(2, 0)));
+		out(0, 0) = d * (m(1, 1) * (m(2, 2) * m(3, 3) - m(2, 3) * m(3, 2)) +
+				m(1, 2) * (m(2, 3) * m(3, 1) - m(2, 1) * m(3, 3)) +
+				m(1, 3) * (m(2, 1) * m(3, 2) - m(2, 2) * m(3, 1)));
+		out(0, 1) = d * (m(2, 1) * (m(0, 2) * m(3, 3) - m(0, 3) * m(3, 2)) +
+				m(2, 2) * (m(0, 3) * m(3, 1) - m(0, 1) * m(3, 3)) +
+				m(2, 3) * (m(0, 1) * m(3, 2) - m(0, 2) * m(3, 1)));
+		out(0, 2) = d * (m(3, 1) * (m(0, 2) * m(1, 3) - m(0, 3) * m(1, 2)) +
+				m(3, 2) * (m(0, 3) * m(1, 1) - m(0, 1) * m(1, 3)) +
+				m(3, 3) * (m(0, 1) * m(1, 2) - m(0, 2) * m(1, 1)));
+		out(0, 3) = d * (m(0, 1) * (m(1, 3) * m(2, 2) - m(1, 2) * m(2, 3)) +
+				m(0, 2) * (m(1, 1) * m(2, 3) - m(1, 3) * m(2, 1)) +
+				m(0, 3) * (m(1, 2) * m(2, 1) - m(1, 1) * m(2, 2)));
+		out(1, 0) = d * (m(1, 2) * (m(2, 0) * m(3, 3) - m(2, 3) * m(3, 0)) +
+				m(1, 3) * (m(2, 2) * m(3, 0) - m(2, 0) * m(3, 2)) +
+				m(1, 0) * (m(2, 3) * m(3, 2) - m(2, 2) * m(3, 3)));
+		out(1, 1) = d * (m(2, 2) * (m(0, 0) * m(3, 3) - m(0, 3) * m(3, 0)) +
+				m(2, 3) * (m(0, 2) * m(3, 0) - m(0, 0) * m(3, 2)) +
+				m(2, 0) * (m(0, 3) * m(3, 2) - m(0, 2) * m(3, 3)));
+		out(1, 2) = d * (m(3, 2) * (m(0, 0) * m(1, 3) - m(0, 3) * m(1, 0)) +
+				m(3, 3) * (m(0, 2) * m(1, 0) - m(0, 0) * m(1, 2)) +
+				m(3, 0) * (m(0, 3) * m(1, 2) - m(0, 2) * m(1, 3)));
+		out(1, 3) = d * (m(0, 2) * (m(1, 3) * m(2, 0) - m(1, 0) * m(2, 3)) +
+				m(0, 3) * (m(1, 0) * m(2, 2) - m(1, 2) * m(2, 0)) +
+				m(0, 0) * (m(1, 2) * m(2, 3) - m(1, 3) * m(2, 2)));
+		out(2, 0) = d * (m(1, 3) * (m(2, 0) * m(3, 1) - m(2, 1) * m(3, 0)) +
+				m(1, 0) * (m(2, 1) * m(3, 3) - m(2, 3) * m(3, 1)) +
+				m(1, 1) * (m(2, 3) * m(3, 0) - m(2, 0) * m(3, 3)));
+		out(2, 1) = d * (m(2, 3) * (m(0, 0) * m(3, 1) - m(0, 1) * m(3, 0)) +
+				m(2, 0) * (m(0, 1) * m(3, 3) - m(0, 3) * m(3, 1)) +
+				m(2, 1) * (m(0, 3) * m(3, 0) - m(0, 0) * m(3, 3)));
+		out(2, 2) = d * (m(3, 3) * (m(0, 0) * m(1, 1) - m(0, 1) * m(1, 0)) +
+				m(3, 0) * (m(0, 1) * m(1, 3) - m(0, 3) * m(1, 1)) +
+				m(3, 1) * (m(0, 3) * m(1, 0) - m(0, 0) * m(1, 3)));
+		out(2, 3) = d * (m(0, 3) * (m(1, 1) * m(2, 0) - m(1, 0) * m(2, 1)) +
+				m(0, 0) * (m(1, 3) * m(2, 1) - m(1, 1) * m(2, 3)) +
+				m(0, 1) * (m(1, 0) * m(2, 3) - m(1, 3) * m(2, 0)));
+		out(3, 0) = d * (m(1, 0) * (m(2, 2) * m(3, 1) - m(2, 1) * m(3, 2)) +
+				m(1, 1) * (m(2, 0) * m(3, 2) - m(2, 2) * m(3, 0)) +
+				m(1, 2) * (m(2, 1) * m(3, 0) - m(2, 0) * m(3, 1)));
+		out(3, 1) = d * (m(2, 0) * (m(0, 2) * m(3, 1) - m(0, 1) * m(3, 2)) +
+				m(2, 1) * (m(0, 0) * m(3, 2) - m(0, 2) * m(3, 0)) +
+				m(2, 2) * (m(0, 1) * m(3, 0) - m(0, 0) * m(3, 1)));
+		out(3, 2) = d * (m(3, 0) * (m(0, 2) * m(1, 1) - m(0, 1) * m(1, 2)) +
+				m(3, 1) * (m(0, 0) * m(1, 2) - m(0, 2) * m(1, 0)) +
+				m(3, 2) * (m(0, 1) * m(1, 0) - m(0, 0) * m(1, 1)));
+		out(3, 3) = d * (m(0, 0) * (m(1, 1) * m(2, 2) - m(1, 2) * m(2, 1)) +
+				m(0, 1) * (m(1, 2) * m(2, 0) - m(1, 0) * m(2, 2)) +
+				m(0, 2) * (m(1, 0) * m(2, 1) - m(1, 1) * m(2, 0)));
 		out.definitelyIdentityMatrix = definitelyIdentityMatrix;
 		return true;
 	}
@@ -1074,25 +1129,25 @@ namespace core
 	template <class T>
 	inline bool CMatrix4<T>::getInversePrimitive ( CMatrix4<T>& out ) const
 	{
-		out.M[0 ]	= M[0];
-		out.M[1 ]	= M[4];
-		out.M[2 ]	= M[8];
-		out.M[3 ]	= 0;
+		out.M[0 ] = M[0];
+		out.M[1 ] = M[4];
+		out.M[2 ] = M[8];
+		out.M[3 ] = 0;
 
-		out.M[4 ]	= M[1];
-		out.M[5 ]	= M[5];
-		out.M[6 ]	= M[9];
-		out.M[7 ]	= 0;
+		out.M[4 ] = M[1];
+		out.M[5 ] = M[5];
+		out.M[6 ] = M[9];
+		out.M[7 ] = 0;
 
-		out.M[8 ]	= M[2];
-		out.M[9 ]	= M[6];
-		out.M[10]	= M[10];
-		out.M[11]	= 0;
+		out.M[8 ] = M[2];
+		out.M[9 ] = M[6];
+		out.M[10] = M[10];
+		out.M[11] = 0;
 
-		out.M[12]	= (T)-(M[12]*M[0] + M[13]*M[1] + M[14]*M[2]);
-		out.M[13]	= (T)-(M[12]*M[4] + M[13]*M[5] + M[14]*M[6]);
-		out.M[14]	= (T)-(M[12]*M[8] + M[13]*M[9] + M[14]*M[10]);
-		out.M[15]	= 1;
+		out.M[12] = (T)-(M[12]*M[0] + M[13]*M[1] + M[14]*M[2]);
+		out.M[13] = (T)-(M[12]*M[4] + M[13]*M[5] + M[14]*M[6]);
+		out.M[14] = (T)-(M[12]*M[8] + M[13]*M[9] + M[14]*M[10]);
+		out.M[15] = 1;
 		out.definitelyIdentityMatrix = definitelyIdentityMatrix;
 		return true;
 	}
@@ -1117,7 +1172,6 @@ namespace core
 	}
 
 
-
 	template <class T>
 	inline CMatrix4<T>& CMatrix4<T>::operator=(const CMatrix4<T> &other)
 	{
@@ -1129,7 +1183,6 @@ namespace core
 	}
 
 
-
 	template <class T>
 	inline CMatrix4<T>& CMatrix4<T>::operator=(const T& scalar)
 	{
@@ -1140,7 +1193,6 @@ namespace core
 	}
 
 
-
 	template <class T>
 	inline bool CMatrix4<T>::operator==(const CMatrix4<T> &other) const
 	{
@@ -1154,7 +1206,6 @@ namespace core
 	}
 
 
-
 	template <class T>
 	inline bool CMatrix4<T>::operator!=(const CMatrix4<T> &other) const
 	{
@@ -1162,13 +1213,13 @@ namespace core
 	}
 
 
-
-	//! Builds a right-handed perspective projection matrix based on a field of view
+	// Builds a right-handed perspective projection matrix based on a field of view
 	template <class T>
-	inline void CMatrix4<T>::buildProjectionMatrixPerspectiveFovRH(f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar)
+	inline CMatrix4<T>& CMatrix4<T>::buildProjectionMatrixPerspectiveFovRH(
+			f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar)
 	{
-		f64 h = 1.0/tan(fieldOfViewRadians/2.0);
-		T w = h / aspectRatio;
+		const f64 h = 1.0/tan(fieldOfViewRadians/2.0);
+		const T w = h / aspectRatio;
 
 		M[0] = w;
 		M[1] = 0;
@@ -1192,16 +1243,17 @@ namespace core
 //		M[14] = (T)(2.0f*zNear*zFar/(zNear-zFar)); // OpenGL version
 		M[15] = 0;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
-
-	//! Builds a left-handed perspective projection matrix based on a field of view
+	// Builds a left-handed perspective projection matrix based on a field of view
 	template <class T>
-	inline void CMatrix4<T>::buildProjectionMatrixPerspectiveFovLH(f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar)
+	inline CMatrix4<T>& CMatrix4<T>::buildProjectionMatrixPerspectiveFovLH(
+			f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar)
 	{
-		f64 h = 1.0/tan(fieldOfViewRadians/2.0);
-		T w = (T)(h / aspectRatio);
+		const f64 h = 1.0/tan(fieldOfViewRadians/2.0);
+		const T w = (T)(h / aspectRatio);
 
 		M[0] = w;
 		M[1] = 0;
@@ -1223,13 +1275,14 @@ namespace core
 		M[14] = (T)(-zNear*zFar/(zFar-zNear));
 		M[15] = 0;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
-
-	//! Builds a left-handed orthogonal projection matrix.
+	// Builds a left-handed orthogonal projection matrix.
 	template <class T>
-	inline void CMatrix4<T>::buildProjectionMatrixOrthoLH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar)
+	inline CMatrix4<T>& CMatrix4<T>::buildProjectionMatrixOrthoLH(
+			f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar)
 	{
 		M[0] = (T)(2/widthOfViewVolume);
 		M[1] = 0;
@@ -1251,13 +1304,14 @@ namespace core
 		M[14] = (T)(zNear/(zNear-zFar));
 		M[15] = 1;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
-
-	//! Builds a right-handed orthogonal projection matrix.
+	// Builds a right-handed orthogonal projection matrix.
 	template <class T>
-	inline void CMatrix4<T>::buildProjectionMatrixOrthoRH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar)
+	inline CMatrix4<T>& CMatrix4<T>::buildProjectionMatrixOrthoRH(
+			f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar)
 	{
 		M[0] = (T)(2/widthOfViewVolume);
 		M[1] = 0;
@@ -1279,12 +1333,14 @@ namespace core
 		M[14] = (T)(zNear/(zNear-zFar));
 		M[15] = -1;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
-	//! Builds a right-handed perspective projection matrix.
+	// Builds a right-handed perspective projection matrix.
 	template <class T>
-	inline void CMatrix4<T>::buildProjectionMatrixPerspectiveRH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar)
+	inline CMatrix4<T>& CMatrix4<T>::buildProjectionMatrixPerspectiveRH(
+			f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar)
 	{
 		M[0] = (T)(2*zNear/widthOfViewVolume);
 		M[1] = 0;
@@ -1306,12 +1362,14 @@ namespace core
 		M[14] = (T)(zNear*zFar/(zNear-zFar));
 		M[15] = 0;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
-	//! Builds a left-handed perspective projection matrix.
+	// Builds a left-handed perspective projection matrix.
 	template <class T>
-	inline void CMatrix4<T>::buildProjectionMatrixPerspectiveLH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar)
+	inline CMatrix4<T>& CMatrix4<T>::buildProjectionMatrixPerspectiveLH(
+			f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar)
 	{
 		M[0] = (T)(2*zNear/widthOfViewVolume);
 		M[1] = 0;
@@ -1333,15 +1391,16 @@ namespace core
 		M[14] = (T)(zNear*zFar/(zNear-zFar));
 		M[15] = 0;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
-	//! Builds a matrix that flattens geometry into a plane.
+	// Builds a matrix that flattens geometry into a plane.
 	template <class T>
-	inline void CMatrix4<T>::buildShadowMatrix(const core::vector3df& light, core::plane3df plane, f32 point)
+	inline CMatrix4<T>& CMatrix4<T>::buildShadowMatrix(const core::vector3df& light, core::plane3df plane, f32 point)
 	{
 		plane.Normal.normalize();
-		f32 d = plane.Normal.dotProduct(light);
+		const f32 d = plane.Normal.dotProduct(light);
 
 		M[ 0] = (T)(-plane.Normal.X * light.X + d);
 		M[ 1] = (T)(-plane.Normal.X * light.Y);
@@ -1363,11 +1422,12 @@ namespace core
 		M[14] = (T)(-plane.D * light.Z);
 		M[15] = (T)(-plane.D * point + d);
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
-	//! Builds a left-handed look-at matrix.
+	// Builds a left-handed look-at matrix.
 	template <class T>
-	inline void CMatrix4<T>::buildCameraLookAtMatrixLH(
+	inline CMatrix4<T>& CMatrix4<T>::buildCameraLookAtMatrixLH(
 				const vector3df& position,
 				const vector3df& target,
 				const vector3df& upVector)
@@ -1400,13 +1460,13 @@ namespace core
 		M[14] = (T)-zaxis.dotProduct(position);
 		M[15] = 1;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
-
-	//! Builds a right-handed look-at matrix.
+	// Builds a right-handed look-at matrix.
 	template <class T>
-	inline void CMatrix4<T>::buildCameraLookAtMatrixRH(
+	inline CMatrix4<T>& CMatrix4<T>::buildCameraLookAtMatrixRH(
 				const vector3df& position,
 				const vector3df& target,
 				const vector3df& upVector)
@@ -1439,11 +1499,11 @@ namespace core
 		M[14] = (T)-zaxis.dotProduct(position);
 		M[15] = 1;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
 
-	//! creates a new matrix as interpolated matrix from to other ones.
-	//! \param time: Must be a value between 0 and 1.
+	// creates a new matrix as interpolated matrix from this and the passed one.
 	template <class T>
 	inline CMatrix4<T> CMatrix4<T>::interpolate(const core::CMatrix4<T>& b, f32 time) const
 	{
@@ -1459,7 +1519,8 @@ namespace core
 		return mat;
 	}
 
-	//! returns transposed matrix
+
+	// returns transposed matrix
 	template <class T>
 	inline CMatrix4<T> CMatrix4<T>::getTransposed() const
 	{
@@ -1468,7 +1529,8 @@ namespace core
 		return t;
 	}
 
-	//! returns transposed matrix
+
+	// returns transposed matrix
 	template <class T>
 	inline void CMatrix4<T>::getTransposed( CMatrix4<T>& o ) const
 	{
@@ -1497,21 +1559,18 @@ namespace core
 
 	// used to scale <-1,-1><1,1> to viewport
 	template <class T>
-	inline void CMatrix4<T>::buildNDCToDCMatrix( const core::rect<s32>& viewport, f32 zScale)
+	inline CMatrix4<T>& CMatrix4<T>::buildNDCToDCMatrix( const core::rect<s32>& viewport, f32 zScale)
 	{
-		f32 scaleX = (viewport.getWidth() - 0.75f ) / 2.0f;
-		f32 scaleY = -(viewport.getHeight() - 0.75f ) / 2.0f;
+		const f32 scaleX = (viewport.getWidth() - 0.75f ) / 2.0f;
+		const f32 scaleY = -(viewport.getHeight() - 0.75f ) / 2.0f;
 
-		f32 dx = -0.5f + ( (viewport.UpperLeftCorner.X + viewport.LowerRightCorner.X ) / 2.0f );
-		f32 dy = -0.5f + ( (viewport.UpperLeftCorner.Y + viewport.LowerRightCorner.Y ) / 2.0f );
+		const f32 dx = -0.5f + ( (viewport.UpperLeftCorner.X + viewport.LowerRightCorner.X ) / 2.0f );
+		const f32 dy = -0.5f + ( (viewport.UpperLeftCorner.Y + viewport.LowerRightCorner.Y ) / 2.0f );
 
 		makeIdentity();
-		M[0] = (T)scaleX;
-		M[5] = (T)scaleY;
-		M[10] = (T)zScale;
 		M[12] = (T)dx;
 		M[13] = (T)dy;
-		definitelyIdentityMatrix=false;
+		return setScale(core::vector3d<T>((T)scaleX, (T)scaleY, (T)zScale));
 	}
 
 	/*!
@@ -1525,11 +1584,12 @@ namespace core
 			Uw  Vw  0  0
 	*/
 
+
 	template <class T>
-	inline void CMatrix4<T>::buildTextureTransform( f32 rotateRad,
-					const core::vector2df &rotatecenter,
-					const core::vector2df &translate,
-					const core::vector2df &scale)
+	inline CMatrix4<T>& CMatrix4<T>::buildTextureTransform( f32 rotateRad,
+			const core::vector2df &rotatecenter,
+			const core::vector2df &translate,
+			const core::vector2df &scale)
 	{
 		const f32 c = cosf(rotateRad);
 		const f32 s = sinf(rotateRad);
@@ -1554,83 +1614,109 @@ namespace core
 		M[14] = 0;
 		M[15] = 1;
 		definitelyIdentityMatrix=false;
+		return *this;
 	}
 
-	//! rotate about z axis, center ( 0.5, 0.5 )
+
+	// rotate about z axis, center ( 0.5, 0.5 )
 	template <class T>
-	inline void CMatrix4<T>::setTextureRotationCenter( f32 rotateRad )
+	inline CMatrix4<T>& CMatrix4<T>::setTextureRotationCenter( f32 rotateRad )
 	{
 		const f32 c = cosf(rotateRad);
 		const f32 s = sinf(rotateRad);
 		M[0] = (T)c;
 		M[1] = (T)s;
-		M[2] = (T)(-0.5f * ( c + s) + 0.5f);
 
 		M[4] = (T)-s;
 		M[5] = (T)c;
-		M[6] = (T)(-0.5f * (-s + c) + 0.5f);
-		definitelyIdentityMatrix=false;
+
+		M[8] = (T)(0.5f * ( s - c) + 0.5f);
+		M[9] = (T)(-0.5f * ( s + c) + 0.5f);
+		definitelyIdentityMatrix = definitelyIdentityMatrix && (rotateRad==0.0f);
+		return *this;
 	}
 
+
 	template <class T>
-	inline void CMatrix4<T>::setTextureTranslate ( f32 x, f32 y )
+	inline CMatrix4<T>& CMatrix4<T>::setTextureTranslate ( f32 x, f32 y )
 	{
 		M[8] = (T)x;
 		M[9] = (T)y;
+		definitelyIdentityMatrix = definitelyIdentityMatrix && (x==0.0f) && (y==0.0f);
+		return *this;
+	}
+
+
+	template <class T>
+	inline CMatrix4<T>& CMatrix4<T>::setTextureTranslateTransposed ( f32 x, f32 y )
+	{
+		M[2] = (T)x;
+		M[6] = (T)y;
 		definitelyIdentityMatrix = definitelyIdentityMatrix && (x==0.0f) && (y==0.0f) ;
+		return *this;
 	}
 
 	template <class T>
-	inline void CMatrix4<T>::setTextureScale ( f32 sx, f32 sy )
+	inline CMatrix4<T>& CMatrix4<T>::setTextureScale ( f32 sx, f32 sy )
 	{
 		M[0] = (T)sx;
 		M[5] = (T)sy;
-		definitelyIdentityMatrix = definitelyIdentityMatrix && (sx==1.0f) && (sy==1.0f) ;
+		definitelyIdentityMatrix = definitelyIdentityMatrix && (sx==1.0f) && (sy==1.0f);
+		return *this;
 	}
 
+
 	template <class T>
-	inline void CMatrix4<T>::setTextureScaleCenter( f32 sx, f32 sy )
+	inline CMatrix4<T>& CMatrix4<T>::setTextureScaleCenter( f32 sx, f32 sy )
 	{
 		M[0] = (T)sx;
-		M[2] = (T)(-0.5f * sx + 0.5f);
 		M[5] = (T)sy;
-		M[6] = (T)(-0.5f * sy + 0.5f);
-		definitelyIdentityMatrix = definitelyIdentityMatrix && (sx==1.0f) && (sy==1.0f) ;
+		M[8] = (T)(0.5f - 0.5f * sx);
+		M[9] = (T)(0.5f - 0.5f * sy);
+		definitelyIdentityMatrix = definitelyIdentityMatrix && (sx==1.0f) && (sy==1.0f);
+		return *this;
 	}
 
-	//! sets all matrix data members at once
+
+	// sets all matrix data members at once
 	template <class T>
-	inline void CMatrix4<T>::setM(const T* data)
+	inline CMatrix4<T>& CMatrix4<T>::setM(const T* data)
 	{
-		for (u32 i = 0; i < 16; ++i)
-			M[i] = data[i];
+		memcpy(M,data, 16*sizeof(T));
 
 		definitelyIdentityMatrix = false;
+		return *this;
 	}
 
-	//! sets if the matrix is definitely identity matrix
+
+	// sets if the matrix is definitely identity matrix
 	template <class T>
 	inline void CMatrix4<T>::setDefinitelyIdentityMatrix( bool isDefinitelyIdentityMatrix)
 	{
 		definitelyIdentityMatrix = isDefinitelyIdentityMatrix;
 	}
 
-	//! gets if the matrix is definitely identity matrix
+
+	// gets if the matrix is definitely identity matrix
 	template <class T>
 	inline bool CMatrix4<T>::getDefinitelyIdentityMatrix() const
 	{
 		return definitelyIdentityMatrix;
 	}
 
-	//! Multiply by scalar.
+
+	// Multiply by scalar.
 	template <class T>
 	inline CMatrix4<T> operator*(const T scalar, const CMatrix4<T>& mat)
 	{
 		return mat*scalar;
 	}
 
+
+	//! Typedef for f32 matrix
 	typedef CMatrix4<f32> matrix4;
-	const matrix4 IdentityMatrix(matrix4::EM4CONST_IDENTITY);
+	//! global const identity matrix
+	IRRLICHT_API extern const matrix4 IdentityMatrix;
 
 } // end namespace core
 } // end namespace irr
diff --git a/src/dep/include/irrlicht/plane3d.h b/src/dep/include/irrlicht/plane3d.h
index d4d9526..74c0386 100644
--- a/src/dep/include/irrlicht/plane3d.h
+++ b/src/dep/include/irrlicht/plane3d.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -32,14 +32,21 @@ class plane3d
 		// Constructors
 
 		plane3d(): Normal(0,1,0) { recalculateD(vector3d<T>(0,0,0)); }
+		
 		plane3d(const vector3d<T>& MPoint, const vector3d<T>& Normal) : Normal(Normal) { recalculateD(MPoint); }
+		
 		plane3d(T px, T py, T pz, T nx, T ny, T nz) : Normal(nx, ny, nz) { recalculateD(vector3d<T>(px, py, pz)); }
-		plane3d(const vector3d<T>& point1, const vector3d<T>& point2, const vector3d<T>& point3) { setPlane(point1, point2, point3); }
+		
+		plane3d(const vector3d<T>& point1, const vector3d<T>& point2, const vector3d<T>& point3)
+		{ setPlane(point1, point2, point3); }
+		
+		plane3d(const vector3d<T> & normal, const T d) : Normal(normal), D(d) { }
 
 		// operators
 
-		inline bool operator==(const plane3d<T>& other) const { return (D==other.D && Normal==other.Normal);}
-		inline bool operator!=(const plane3d<T>& other) const { return !(D==other.D && Normal==other.Normal);}
+		inline bool operator==(const plane3d<T>& other) const { return (equals(D, other.D) && Normal==other.Normal);}
+
+		inline bool operator!=(const plane3d<T>& other) const { return !(*this == other);}
 
 		// functions
 
@@ -65,13 +72,15 @@ class plane3d
 		}
 
 
-		//! Returns an intersection with a 3d line.
-		//! \param lineVect: Vector of the line to intersect with.
-		//! \param linePoint: Point of the line to intersect with.
-		//! \param outIntersection: Place to store the intersection point, if there is one.
-		//! \return Returns true if there was an intersection, false if there was not.
-		bool getIntersectionWithLine(const vector3d<T>& linePoint, const vector3d<T>& lineVect,
-					vector3d<T>& outIntersection) const
+		//! Get an intersection with a 3d line.
+		/** \param lineVect Vector of the line to intersect with.
+		\param linePoint Point of the line to intersect with.
+		\param outIntersection Place to store the intersection point, if there is one.
+		\return True if there was an intersection, false if there was not.
+		*/
+		bool getIntersectionWithLine(const vector3d<T>& linePoint,
+				const vector3d<T>& lineVect,
+				vector3d<T>& outIntersection) const
 		{
 			T t2 = Normal.dotProduct(lineVect);
 
@@ -83,12 +92,13 @@ class plane3d
 			return true;
 		}
 
-		//! Returns where on a line between two points an intersection with this plane happened.
-		//! Only useful if known that there is an intersection.
-		//! \param linePoint1: Point1 of the line to intersect with.
-		//! \param linePoint2: Point2 of the line to intersect with.
-		//! \return Returns where on a line between two points an intersection with this plane happened.
-		//! For example, 0.5 is returned if the intersection happened exectly in the middle of the two points.
+		//! Get percentage of line between two points where an intersection with this plane happens.
+		/** Only useful if known that there is an intersection.
+		\param linePoint1 Point1 of the line to intersect with.
+		\param linePoint2 Point2 of the line to intersect with.
+		\return Where on a line between two points an intersection with this plane happened.
+		For example, 0.5 is returned if the intersection happened exactly in the middle of the two points.
+		*/
 		f32 getKnownIntersectionWithLine(const vector3d<T>& linePoint1,
 			const vector3d<T>& linePoint2) const
 		{
@@ -97,11 +107,12 @@ class plane3d
 			return (f32)-((Normal.dotProduct(linePoint1) + D) / t2);
 		}
 
-		//! Returns an intersection with a 3d line, limited between two 3d points.
-		//! \param linePoint1: Point 1 of the line.
-		//! \param linePoint2: Point 2 of the line.
-		//! \param outIntersection: Place to store the intersection point, if there is one.
-		//! \return Returns true if there was an intersection, false if there was not.
+		//! Get an intersection with a 3d line, limited between two 3d points.
+		/** \param linePoint1 Point 1 of the line.
+		\param linePoint2 Point 2 of the line.
+		\param outIntersection Place to store the intersection point, if there is one.
+		\return True if there was an intersection, false if there was not.
+		*/
 		bool getIntersectionWithLimitedLine(
 				const vector3d<T>& linePoint1,
 				const vector3d<T>& linePoint2,
@@ -112,10 +123,10 @@ class plane3d
 		}
 
 		//! Classifies the relation of a point to this plane.
-		//! \param point: Point to classify its relation.
-		//! \return Returns ISREL3D_FRONT if the point is in front of the plane,
-		//! ISREL3D_BACK if the point is behind of the plane, and
-		//! ISREL3D_PLANAR if the point is within the plane.
+		/** \param point Point to classify its relation.
+		\return ISREL3D_FRONT if the point is in front of the plane,
+		ISREL3D_BACK if the point is behind of the plane, and
+		ISREL3D_PLANAR if the point is within the plane. */
 		EIntersectionRelation3D classifyPointRelation(const vector3d<T>& point) const
 		{
 			const T d = Normal.dotProduct(point) + D;
@@ -129,21 +140,20 @@ class plane3d
 			return ISREL3D_PLANAR;
 		}
 
-		//! Recalculates the distance from origin by applying
-		//! a new member point to the plane.
+		//! Recalculates the distance from origin by applying a new member point to the plane.
 		void recalculateD(const vector3d<T>& MPoint)
 		{
 			D = - MPoint.dotProduct(Normal);
 		}
 
-		//! Returns a member point of the plane.
+		//! Gets a member point of the plane.
 		vector3d<T> getMemberPoint() const
 		{
 			return Normal * -D;
 		}
 
-		//! Tests if there is an intersection between with the other plane
-		//! \return Returns true if there is a intersection.
+		//! Tests if there is an intersection with the other plane
+		/** \return True if there is a intersection. */
 		bool existsIntersection(const plane3d<T>& other) const
 		{
 			vector3d<T> cross = other.Normal.crossProduct(Normal);
@@ -151,28 +161,32 @@ class plane3d
 		}
 
 		//! Intersects this plane with another.
-		//! \return Returns true if there is a intersection, false if not.
-		bool getIntersectionWithPlane(const plane3d<T>& other, vector3d<T>& outLinePoint,
+		/** \param other Other plane to intersect with.
+		\param outLinePoint Base point of intersection line.
+		\param outLineVect Vector of intersection.
+		\return True if there is a intersection, false if not. */
+		bool getIntersectionWithPlane(const plane3d<T>& other,
+				vector3d<T>& outLinePoint,
 				vector3d<T>& outLineVect) const
 		{
-			T fn00 = Normal.getLength();
-			T fn01 = Normal.dotProduct(other.Normal);
-			T fn11 = other.Normal.getLength();
-			f64 det = fn00*fn11 - fn01*fn01;
+			const T fn00 = Normal.getLength();
+			const T fn01 = Normal.dotProduct(other.Normal);
+			const T fn11 = other.Normal.getLength();
+			const f64 det = fn00*fn11 - fn01*fn01;
 
 			if (fabs(det) < ROUNDING_ERROR_64 )
 				return false;
 
-			det = 1.0 / det;
-			f64 fc0 = (fn11*-D + fn01*other.D) * det;
-			f64 fc1 = (fn00*-other.D + fn01*D) * det;
+			const f64 invdet = 1.0 / det;
+			const f64 fc0 = (fn11*-D + fn01*other.D) * invdet;
+			const f64 fc1 = (fn00*-other.D + fn01*D) * invdet;
 
 			outLineVect = Normal.crossProduct(other.Normal);
 			outLinePoint = Normal*(T)fc0 + other.Normal*(T)fc1;
 			return true;
 		}
 
-		//! Returns the intersection point with two other planes if there is one.
+		//! Get the intersection point with two other planes if there is one.
 		bool getIntersectionWithPlanes(const plane3d<T>& o1,
 				const plane3d<T>& o2, vector3d<T>& outPoint) const
 		{
@@ -183,32 +197,32 @@ class plane3d
 			return false;
 		}
 
-		//! Test if the triangle would be front or backfacing from any
-		//! point. Thus, this method assumes a camera position from
-		//! which the triangle is definitely visible when looking into
-		//! the given direction.
-		//! Note that this only works if the normal is Normalized.
-		//! Do not use this method with points as it will give wrong results!
-		//! \param lookDirection: Look direction.
-		//! \return Returns true if the plane is front facing and
-		//! false if it is backfacing.
+		//! Test if the triangle would be front or backfacing from any point.
+		/** Thus, this method assumes a camera position from
+		which the triangle is definitely visible when looking into
+		the given direction.
+		Note that this only works if the normal is Normalized.
+		Do not use this method with points as it will give wrong results!
+		\param lookDirection: Look direction.
+		\return True if the plane is front facing and
+		false if it is backfacing. */
 		bool isFrontFacing(const vector3d<T>& lookDirection) const
 		{
 			const f32 d = Normal.dotProduct(lookDirection);
 			return F32_LOWER_EQUAL_0 ( d );
 		}
 
-		//! Returns the distance to a point.  Note that this only
-		//! works if the normal is Normalized.
+		//! Get the distance to a point.
+		/** Note that this only works if the normal is normalized. */
 		T getDistanceTo(const vector3d<T>& point) const
 		{
 			return point.dotProduct(Normal) + D;
 		}
 
-		// member variables
-
-		vector3d<T> Normal;		// normal vector
-		T D;				// distance from origin
+		//! Normal vector of the plane.
+		vector3d<T> Normal;
+		//! Distance from origin.
+		T D;
 };
 
 
diff --git a/src/dep/include/irrlicht/position2d.h b/src/dep/include/irrlicht/position2d.h
index 5eb96c0..31d7eb1 100644
--- a/src/dep/include/irrlicht/position2d.h
+++ b/src/dep/include/irrlicht/position2d.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,12 +15,13 @@ namespace core
 
 	//! Simple class for holding 2d coordinates.
 	/** Not supposed for doing geometric calculations.
-	use vector2d instead for things like that. 
+	use vector2d instead for things like that.
 	*/
 	template <class T>
 	class position2d
 	{
 		public:
+			//! Default constructor for (0,0).
 			position2d() : X(0), Y(0) {}
 			position2d(T x, T y) : X(x), Y(y) {}
 			position2d(const position2d<T>& other)
@@ -94,17 +95,20 @@ namespace core
 				return position2d<T>(X-other.Width, Y-other.Height);
 			}
 
-			const position2d<T>& operator=(const position2d<T>& other) 
+			const position2d<T>& operator=(const position2d<T>& other)
 			{
 				X = other.X;
 				Y = other.Y;
 				return *this;
 			}
 
-			T X, Y;
+			//! X coordinate of the position.
+			T X;
+			//! Y coordinate of the position.
+			T Y;
 	};
 
-	//! Typedef for a f32 position.
+	//! Typedef for an f32 position.
 	typedef position2d<f32> position2df;
 	//! Typedef for an integer position.
 	typedef position2d<s32> position2di;
diff --git a/src/dep/include/irrlicht/quaternion.h b/src/dep/include/irrlicht/quaternion.h
index 354d6a8..a4a9e9a 100644
--- a/src/dep/include/irrlicht/quaternion.h
+++ b/src/dep/include/irrlicht/quaternion.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,7 +15,9 @@ namespace irr
 namespace core
 {
 
-//! Quaternion class.
+//! Quaternion class for representing rotations.
+/** It provides cheap combinations and avoids gimbal locks.
+Also useful for interpolations. */
 class quaternion
 {
 	public:
@@ -35,46 +37,46 @@ class quaternion
 		//! Constructor which converts a matrix to a quaternion
 		quaternion(const matrix4& mat);
 
-		//! equal operator
+		//! Equalilty operator
 		bool operator==(const quaternion& other) const;
 
-		//! assignment operator
+		//! Assignment operator
 		inline quaternion& operator=(const quaternion& other);
 
-		//! matrix assignment operator
+		//! Matrix assignment operator
 		inline quaternion& operator=(const matrix4& other);
 
-		//! add operator
+		//! Add operator
 		quaternion operator+(const quaternion& other) const;
 
-		//! multiplication operator
+		//! Multiplication operator
 		quaternion operator*(const quaternion& other) const;
 
-		//! multiplication operator
+		//! Multiplication operator with scalar
 		quaternion operator*(f32 s) const;
 
-		//! multiplication operator
+		//! Multiplication operator with scalar
 		quaternion& operator*=(f32 s);
 
-		//! multiplication operator
-		vector3df operator* (const vector3df& v) const;
+		//! Multiplication operator
+		vector3df operator*(const vector3df& v) const;
 
-		//! multiplication operator
+		//! Multiplication operator
 		quaternion& operator*=(const quaternion& other);
 
-		//! calculates the dot product
-		inline f32 getDotProduct(const quaternion& other) const;
+		//! Calculates the dot product
+		inline f32 dotProduct(const quaternion& other) const;
 
-		//! sets new quaternion
-		inline void set(f32 x, f32 y, f32 z, f32 w);
+		//! Sets new quaternion
+		inline quaternion& set(f32 x, f32 y, f32 z, f32 w);
 
-		//! sets new quaternion based on euler angles (radians)
-		inline void set(f32 x, f32 y, f32 z);
+		//! Sets new quaternion based on euler angles (radians)
+		inline quaternion& set(f32 x, f32 y, f32 z);
 
-		//! sets new quaternion based on euler angles (radians)
-		inline void set(const core::vector3df& vec);
+		//! Sets new quaternion based on euler angles (radians)
+		inline quaternion& set(const core::vector3df& vec);
 
-		//! normalizes the quaternion
+		//! Normalizes the quaternion
 		inline quaternion& normalize();
 
 		//! Creates a matrix from this quaternion
@@ -84,73 +86,74 @@ class quaternion
 		void getMatrix( matrix4 &dest ) const;
 
 		//! Creates a matrix from this quaternion
-		void getMatrix_transposed( matrix4 &dest ) const;
+		inline void getMatrix_transposed( matrix4 &dest ) const;
 
 		//! Inverts this quaternion
-		void makeInverse();
+		quaternion& makeInverse();
 
-		//! set this quaternion to the result of the interpolation between two quaternions
-		void slerp( quaternion q1, quaternion q2, f32 interpolate );
+		//! Set this quaternion to the result of the interpolation between two quaternions
+		quaternion& slerp( quaternion q1, quaternion q2, f32 interpolate );
 
-		//! axis must be unit length
-		//! The quaternion representing the rotation is
-		//!  q = cos(A/2)+sin(A/2)*(x*i+y*j+z*k)
-		void fromAngleAxis (f32 angle, const vector3df& axis);
+		//! Create quaternion from rotation angle and rotation axis.
+		/** Axis must be unit length.
+		The quaternion representing the rotation is
+		q = cos(A/2)+sin(A/2)*(x*i+y*j+z*k).
+		\param angle Rotation Angle in radians.
+		\param axis Rotation axis. */
+		quaternion& fromAngleAxis (f32 angle, const vector3df& axis);
 
 		//! Fills an angle (radians) around an axis (unit vector)
-		void toAngleAxis (f32 &angle, vector3df& axis) const;
+		void toAngleAxis (f32 &angle, core::vector3df& axis) const;
 
 		//! Output this quaternion to an euler angle (radians)
 		void toEuler(vector3df& euler) const;
 
-		//! set quaternion to identity
-		void makeIdentity();
+		//! Set quaternion to identity
+		quaternion& makeIdentity();
 
-		//! sets quaternion to represent a rotation from one angle to another
-		void rotationFromTo(const vector3df& from, const vector3df& to);
+		//! Set quaternion to represent a rotation from one vector to another.
+		quaternion& rotationFromTo(const vector3df& from, const vector3df& to);
 
-		f32 X, Y, Z, W;
+		//! Quaternion elements.
+		f32 X; // vectorial (imaginary) part
+		f32 Y;
+		f32 Z;
+		f32 W; // real part
 };
 
 
-//! Constructor which converts euler angles to a quaternion
+// Constructor which converts euler angles to a quaternion
 inline quaternion::quaternion(f32 x, f32 y, f32 z)
 {
 	set(x,y,z);
 }
 
 
-//! Constructor which converts euler angles to a quaternion
+// Constructor which converts euler angles to a quaternion
 inline quaternion::quaternion(const vector3df& vec)
 {
 	set(vec.X,vec.Y,vec.Z);
 }
 
 
-//! Constructor which converts a matrix to a quaternion
+// Constructor which converts a matrix to a quaternion
 inline quaternion::quaternion(const matrix4& mat)
 {
 	(*this) = mat;
 }
 
 
-//! equal operator
+// equal operator
 inline bool quaternion::operator==(const quaternion& other) const
 {
-	if(X != other.X)
-		return false;
-	if(Y != other.Y)
-		return false;
-	if(Z != other.Z)
-		return false;
-	if(W != other.W)
-		return false;
-
-	return true;
+	return ((X == other.X) &&
+		(Y == other.Y) &&
+		(Z == other.Z) &&
+		(W == other.W));
 }
 
 
-//! assignment operator
+// assignment operator
 inline quaternion& quaternion::operator=(const quaternion& other)
 {
 	X = other.X;
@@ -161,15 +164,14 @@ inline quaternion& quaternion::operator=(const quaternion& other)
 }
 
 
-//! matrix assignment operator
+// matrix assignment operator
 inline quaternion& quaternion::operator=(const matrix4& m)
 {
-	f32 diag = m(0,0) + m(1,1) + m(2,2) + 1;
-	f32 scale = 0.0f;
+	const f32 diag = m(0,0) + m(1,1) + m(2,2) + 1;
 
 	if( diag > 0.0f )
 	{
-		scale = sqrtf(diag) * 2.0f; // get scale from diagonal
+		const f32 scale = sqrtf(diag) * 2.0f; // get scale from diagonal
 
 		// TODO: speed this up
 		X = ( m(2,1) - m(1,2)) / scale;
@@ -183,7 +185,7 @@ inline quaternion& quaternion::operator=(const matrix4& m)
 		{
 			// 1st element of diag is greatest value
 			// find scale according to 1st element, and double it
-			scale = sqrtf( 1.0f + m(0,0) - m(1,1) - m(2,2)) * 2.0f;
+			const f32 scale = sqrtf( 1.0f + m(0,0) - m(1,1) - m(2,2)) * 2.0f;
 
 			// TODO: speed this up
 			X = 0.25f * scale;
@@ -195,7 +197,7 @@ inline quaternion& quaternion::operator=(const matrix4& m)
 		{
 			// 2nd element of diag is greatest value
 			// find scale according to 2nd element, and double it
-			scale = sqrtf( 1.0f + m(1,1) - m(0,0) - m(2,2)) * 2.0f;
+			const f32 scale = sqrtf( 1.0f + m(1,1) - m(0,0) - m(2,2)) * 2.0f;
 
 			// TODO: speed this up
 			X = (m(0,1) + m(1,0) ) / scale;
@@ -207,7 +209,7 @@ inline quaternion& quaternion::operator=(const matrix4& m)
 		{
 			// 3rd element of diag is greatest value
 			// find scale according to 3rd element, and double it
-			scale  = sqrtf( 1.0f + m(2,2) - m(0,0) - m(1,1)) * 2.0f;
+			const f32 scale = sqrtf( 1.0f + m(2,2) - m(0,0) - m(1,1)) * 2.0f;
 
 			// TODO: speed this up
 			X = (m(0,2) + m(2,0)) / scale;
@@ -217,12 +219,11 @@ inline quaternion& quaternion::operator=(const matrix4& m)
 		}
 	}
 
-	normalize();
-	return *this;
+	return normalize();
 }
 
 
-//! multiplication operator
+// multiplication operator
 inline quaternion quaternion::operator*(const quaternion& other) const
 {
 	quaternion tmp;
@@ -236,63 +237,45 @@ inline quaternion quaternion::operator*(const quaternion& other) const
 }
 
 
-//! multiplication operator
+// multiplication operator
 inline quaternion quaternion::operator*(f32 s) const
 {
 	return quaternion(s*X, s*Y, s*Z, s*W);
 }
 
-//! multiplication operator
+// multiplication operator
 inline quaternion& quaternion::operator*=(f32 s)
 {
-	X *= s; Y*=s; Z*=s; W*=s;
+	X*=s;
+	Y*=s;
+	Z*=s;
+	W*=s;
 	return *this;
 }
 
-//! multiplication operator
+// multiplication operator
 inline quaternion& quaternion::operator*=(const quaternion& other)
 {
-	*this = other * (*this);
-	return *this;
+	return (*this = other * (*this));
 }
 
-//! add operator
+// add operator
 inline quaternion quaternion::operator+(const quaternion& b) const
 {
 	return quaternion(X+b.X, Y+b.Y, Z+b.Z, W+b.W);
 }
 
 
-//! Creates a matrix from this quaternion
+// Creates a matrix from this quaternion
 inline matrix4 quaternion::getMatrix() const
 {
 	core::matrix4 m;
-
-	m(0,0) = 1.0f - 2.0f*Y*Y - 2.0f*Z*Z;
-	m(1,0) = 2.0f*X*Y + 2.0f*Z*W;
-	m(2,0) = 2.0f*X*Z - 2.0f*Y*W;
-	m(3,0) = 0.0f;
-
-	m(0,1) = 2.0f*X*Y - 2.0f*Z*W;
-	m(1,1) = 1.0f - 2.0f*X*X - 2.0f*Z*Z;
-	m(2,1) = 2.0f*Z*Y + 2.0f*X*W;
-	m(3,1) = 0.0f;
-
-	m(0,2) = 2.0f*X*Z + 2.0f*Y*W;
-	m(1,2) = 2.0f*Z*Y - 2.0f*X*W;
-	m(2,2) = 1.0f - 2.0f*X*X - 2.0f*Y*Y;
-	m(3,2) = 0.0f;
-
-	m(0,3) = 0.0f;
-	m(1,3) = 0.0f;
-	m(2,3) = 0.0f;
-	m(3,3) = 1.0f;
-
+	getMatrix_transposed(m);
 	return m;
 }
 
 
-//! Creates a matrix from this quaternion
+// Creates a matrix from this quaternion
 inline void quaternion::getMatrix( matrix4 &dest ) const
 {
 	dest[0] = 1.0f - 2.0f*Y*Y - 2.0f*Z*Z;
@@ -316,7 +299,7 @@ inline void quaternion::getMatrix( matrix4 &dest ) const
 	dest[15] = 1.f;
 }
 
-//! Creates a matrix from this quaternion
+// Creates a matrix from this quaternion
 inline void quaternion::getMatrix_transposed( matrix4 &dest ) const
 {
 	dest[0] = 1.0f - 2.0f*Y*Y - 2.0f*Z*Z;
@@ -342,81 +325,77 @@ inline void quaternion::getMatrix_transposed( matrix4 &dest ) const
 
 
 
-//! Inverts this quaternion
-inline void quaternion::makeInverse()
+// Inverts this quaternion
+inline quaternion& quaternion::makeInverse()
 {
 	X = -X; Y = -Y; Z = -Z;
+	return *this;
 }
 
-//! sets new quaternion
-inline void quaternion::set(f32 x, f32 y, f32 z, f32 w)
+// sets new quaternion
+inline quaternion& quaternion::set(f32 x, f32 y, f32 z, f32 w)
 {
 	X = x;
 	Y = y;
 	Z = z;
 	W = w;
+	return *this;
 }
 
 
-//! sets new quaternion based on euler angles
-inline void quaternion::set(f32 x, f32 y, f32 z)
+// sets new quaternion based on euler angles
+inline quaternion& quaternion::set(f32 x, f32 y, f32 z)
 {
 	f64 angle;
 
 	angle = x * 0.5;
-	f64 sr = (f32)sin(angle);
-	f64 cr = (f32)cos(angle);
+	const f64 sr = sin(angle);
+	const f64 cr = cos(angle);
 
 	angle = y * 0.5;
-	f64 sp = (f32)sin(angle);
-	f64 cp = (f32)cos(angle);
+	const f64 sp = sin(angle);
+	const f64 cp = cos(angle);
 
 	angle = z * 0.5;
-	f64 sy = (f32)sin(angle);
-	f64 cy = (f32)cos(angle);
+	const f64 sy = sin(angle);
+	const f64 cy = cos(angle);
 
-	f64 cpcy = cp * cy;
-	f64 spcy = sp * cy;
-	f64 cpsy = cp * sy;
-	f64 spsy = sp * sy;
+	const f64 cpcy = cp * cy;
+	const f64 spcy = sp * cy;
+	const f64 cpsy = cp * sy;
+	const f64 spsy = sp * sy;
 
 	X = (f32)(sr * cpcy - cr * spsy);
 	Y = (f32)(cr * spcy + sr * cpsy);
 	Z = (f32)(cr * cpsy - sr * spcy);
 	W = (f32)(cr * cpcy + sr * spsy);
 
-	normalize();
+	return normalize();
 }
 
-//! sets new quaternion based on euler angles
-inline void quaternion::set(const core::vector3df& vec)
+// sets new quaternion based on euler angles
+inline quaternion& quaternion::set(const core::vector3df& vec)
 {
-	set(vec.X, vec.Y, vec.Z);
+	return set(vec.X, vec.Y, vec.Z);
 }
 
-//! normalizes the quaternion
+// normalizes the quaternion
 inline quaternion& quaternion::normalize()
 {
-	f32 n = X*X + Y*Y + Z*Z + W*W;
+	const f32 n = X*X + Y*Y + Z*Z + W*W;
 
 	if (n == 1)
 		return *this;
 
 	//n = 1.0f / sqrtf(n);
-	n = reciprocal_squareroot ( n );
-	X *= n;
-	Y *= n;
-	Z *= n;
-	W *= n;
-
-	return *this;
+	return (*this *= reciprocal_squareroot ( n ));
 }
 
 
 // set this quaternion to the result of the interpolation between two quaternions
-inline void quaternion::slerp( quaternion q1, quaternion q2, f32 time)
+inline quaternion& quaternion::slerp(quaternion q1, quaternion q2, f32 time)
 {
-	f32 angle = q1.getDotProduct(q2);
+	f32 angle = q1.dotProduct(q2);
 
 	if (angle < 0.0f)
 	{
@@ -429,12 +408,12 @@ inline void quaternion::slerp( quaternion q1, quaternion q2, f32 time)
 
 	if ((angle + 1.0f) > 0.05f)
 	{
-		if ((1.0f - angle) >= 0.05f)  // spherical interpolation
+		if ((1.0f - angle) >= 0.05f) // spherical interpolation
 		{
-			f32 theta = (f32)acos(angle);
-			f32 invsintheta = 1.0f / (f32)sin(theta);
-			scale = (f32)sin(theta * (1.0f-time)) * invsintheta;
-			invscale = (f32)sin(theta * time) * invsintheta;
+			const f32 theta = acosf(angle);
+			const f32 invsintheta = reciprocal(sinf(theta));
+			scale = sinf(theta * (1.0f-time)) * invsintheta;
+			invscale = sinf(theta * time) * invsintheta;
 		}
 		else // linear interploation
 		{
@@ -445,34 +424,38 @@ inline void quaternion::slerp( quaternion q1, quaternion q2, f32 time)
 	else
 	{
 		q2.set(-q1.Y, q1.X, -q1.W, q1.Z);
-		scale = (f32)sin(PI * (0.5f - time));
-		invscale = (f32)sin(PI * time);
+		scale = sinf(PI * (0.5f - time));
+		invscale = sinf(PI * time);
 	}
 
-	*this = (q1*scale) + (q2*invscale);
+	return (*this = (q1*scale) + (q2*invscale));
 }
 
 
-//! calculates the dot product
-inline f32 quaternion::getDotProduct(const quaternion& q2) const
+// calculates the dot product
+inline f32 quaternion::dotProduct(const quaternion& q2) const
 {
 	return (X * q2.X) + (Y * q2.Y) + (Z * q2.Z) + (W * q2.W);
 }
 
 
-inline void quaternion::fromAngleAxis(f32 angle, const vector3df& axis)
+//! axis must be unit length
+//! angle in radians
+inline quaternion& quaternion::fromAngleAxis(f32 angle, const vector3df& axis)
 {
-	f32 fHalfAngle = 0.5f*angle;
-	f32 fSin = (f32)sin(fHalfAngle);
-	W = (f32)cos(fHalfAngle);
+	const f32 fHalfAngle = 0.5f*angle;
+	const f32 fSin = sinf(fHalfAngle);
+	W = cosf(fHalfAngle);
 	X = fSin*axis.X;
 	Y = fSin*axis.Y;
 	Z = fSin*axis.Z;
+	return *this;
 }
 
+
 inline void quaternion::toAngleAxis(f32 &angle, core::vector3df &axis) const
 {
-	f32 scale = sqrtf(X*X + Y*Y + Z*Z);
+	const f32 scale = sqrtf(X*X + Y*Y + Z*Z);
 
 	if (core::iszero(scale) || W > 1.0f || W < -1.0f)
 	{
@@ -483,19 +466,20 @@ inline void quaternion::toAngleAxis(f32 &angle, core::vector3df &axis) const
 	}
 	else
 	{
-		angle = 2.0f * acos(W);
-		axis.X = X / scale;
-		axis.Y = Y / scale;
-		axis.Z = Z / scale;
+		const f32 invscale = reciprocal(scale);
+		angle = 2.0f * acosf(W);
+		axis.X = X * invscale;
+		axis.Y = Y * invscale;
+		axis.Z = Z * invscale;
 	}
 }
 
 inline void quaternion::toEuler(vector3df& euler) const
 {
-	double sqw = W*W;
-	double sqx = X*X;
-	double sqy = Y*Y;
-	double sqz = Z*Z;
+	const f64 sqw = W*W;
+	const f64 sqx = X*X;
+	const f64 sqy = Y*Y;
+	const f64 sqz = Z*Z;
 
 	// heading = rotation about z-axis
 	euler.Z = (f32) (atan2(2.0 * (X*Y +Z*W),(sqx - sqy - sqz + sqw)));
@@ -504,9 +488,10 @@ inline void quaternion::toEuler(vector3df& euler) const
 	euler.X = (f32) (atan2(2.0 * (Y*Z +X*W),(-sqx - sqy + sqz + sqw)));
 
 	// attitude = rotation about y-axis
-	euler.Y = (f32) (asin( clamp(-2.0 * (X*Z - Y*W), -1.0, 1.0) ));
+	euler.Y = asinf( clamp(-2.0f * (X*Z - Y*W), -1.0f, 1.0f) );
 }
 
+
 inline vector3df quaternion::operator* (const vector3df& v) const
 {
 	// nVidia SDK implementation
@@ -521,16 +506,17 @@ inline vector3df quaternion::operator* (const vector3df& v) const
 	return v + uv + uuv;
 }
 
-//! set quaterion to identity
-inline void quaternion::makeIdentity()
+// set quaternion to identity
+inline core::quaternion& quaternion::makeIdentity()
 {
 	W = 1.f;
 	X = 0.f;
 	Y = 0.f;
 	Z = 0.f;
+	return *this;
 }
 
-inline void quaternion::rotationFromTo(const vector3df& from, const vector3df& to)
+inline core::quaternion& quaternion::rotationFromTo(const vector3df& from, const vector3df& to)
 {
 	// Based on Stan Melax's article in Game Programming Gems
 	// Copy, since cannot modify local
@@ -539,20 +525,22 @@ inline void quaternion::rotationFromTo(const vector3df& from, const vector3df& t
 	v0.normalize();
 	v1.normalize();
 
-	vector3df c = v0.crossProduct(v1);
-
-	f32 d = v0.dotProduct(v1);
+	const f32 d = v0.dotProduct(v1);
 	if (d >= 1.0f) // If dot == 1, vectors are the same
 	{
-		*this=quaternion(0,0,0,1); //IDENTITY;
+		return makeIdentity();
 	}
-	f32 s = sqrtf( (1+d)*2 ); // optimize inv_sqrt
-	f32 invs = 1 / s;
 
-	X = c.X * invs;
-	Y = c.Y * invs;
-	Z = c.Z * invs;
+	const f32 s = sqrtf( (1+d)*2 ); // optimize inv_sqrt
+	const f32 invs = 1.f / s;
+	const vector3df c = v0.crossProduct(v1)*invs;
+
+	X = c.X;
+	Y = c.Y;
+	Z = c.Z;
 	W = s * 0.5f;
+
+	return *this;
 }
 
 
diff --git a/src/dep/include/irrlicht/rect.h b/src/dep/include/irrlicht/rect.h
index d145132..a189b4f 100644
--- a/src/dep/include/irrlicht/rect.h
+++ b/src/dep/include/irrlicht/rect.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,32 +16,41 @@ namespace core
 
 	//! Rectangle template.
 	/** Mostly used by 2D GUI elements and for 2D drawing methods.
-	    It has 2 positions instead of position and dimension and a fast
-	    method for collision detection with other rectangles and points.
+	It has 2 positions instead of position and dimension and a fast
+	method for collision detection with other rectangles and points.
+
+	Coordinates are (0,0) for top-left corner, and increasing to the right
+	and to the bottom.
 	*/
 	template <class T>
 	class rect
 	{
 	public:
 
+		//! Default constructor creating empty rectangle at (0,0)
 		rect() : UpperLeftCorner(0,0), LowerRightCorner(0,0) {}
 
+		//! Constructor with two corners
 		rect(T x, T y, T x2, T y2)
 			: UpperLeftCorner(x,y), LowerRightCorner(x2,y2) {}
 
+		//! Constructor with two corners
 		rect(const position2d<T>& upperLeft, const position2d<T>& lowerRight)
 			: UpperLeftCorner(upperLeft), LowerRightCorner(lowerRight) {}
 
+		//! Constructor with upper left corner and dimension
 		rect(const position2d<T>& pos, const dimension2d<T>& size)
 			: UpperLeftCorner(pos), LowerRightCorner(pos.X + size.Width, pos.Y + size.Height) {}
 
 
+		//! move right by given numbers
 		rect<T> operator+(const position2d<T>& pos) const
 		{
 			rect<T> ret(*this);
 			return ret+=pos;
 		}
 
+		//! move right by given numbers
 		rect<T>& operator+=(const position2d<T>& pos)
 		{
 			UpperLeftCorner += pos;
@@ -49,12 +58,14 @@ namespace core
 			return *this;
 		}
 
+		//! move left by given numbers
 		rect<T> operator-(const position2d<T>& pos) const
 		{
 			rect<T> ret(*this);
 			return ret-=pos;
 		}
 
+		//! move left by given numbers
 		rect<T>& operator-=(const position2d<T>& pos)
 		{
 			UpperLeftCorner -= pos;
@@ -62,20 +73,21 @@ namespace core
 			return *this;
 		}
 
+		//! equality operator
 		bool operator==(const rect<T>& other) const
 		{
 			return (UpperLeftCorner == other.UpperLeftCorner &&
 				LowerRightCorner == other.LowerRightCorner);
 		}
 
-
+		//! inequality operator
 		bool operator!=(const rect<T>& other) const
 		{
 			return (UpperLeftCorner != other.UpperLeftCorner ||
 				LowerRightCorner != other.LowerRightCorner);
 		}
 
-		// compares size of rectangles
+		//! compares size of rectangles
 		bool operator<(const rect<T>& other) const
 		{
 			return getArea() < other.getArea();
@@ -88,8 +100,8 @@ namespace core
 		}
 
 		//! Returns if a 2d point is within this rectangle.
-		//! \param pos: Position to test if it lies within this rectangle.
-		//! \return Returns true if the position is within the rectangle, false if not.
+		/** \param pos Position to test if it lies within this rectangle.
+		\return True if the position is within the rectangle, false if not. */
 		bool isPointInside(const position2d<T>& pos) const
 		{
 			return (UpperLeftCorner.X <= pos.X &&
@@ -98,7 +110,9 @@ namespace core
 				LowerRightCorner.Y >= pos.Y);
 		}
 
-		//! Returns if the rectangle collides with another rectangle.
+		//! Check if the rectangle collides with another rectangle.
+		/** \param other Rectangle to test collision with
+		\return True if the rectangles collide. */
 		bool isRectCollided(const rect<T>& other) const
 		{
 			return (LowerRightCorner.Y > other.UpperLeftCorner.Y &&
@@ -108,7 +122,8 @@ namespace core
 		}
 
 		//! Clips this rectangle with another one.
-		void clipAgainst(const rect<T>& other) 
+		/** \param other Rectangle to clip with */
+		void clipAgainst(const rect<T>& other)
 		{
 			if (other.LowerRightCorner.X < LowerRightCorner.X)
 				LowerRightCorner.X = other.LowerRightCorner.X;
@@ -128,8 +143,8 @@ namespace core
 		}
 
 		//! Moves this rectangle to fit inside another one.
-		//! \return: returns true on success, false if not possible
-		bool constrainTo(const rect<T>& other) 
+		/** \return True on success, false if not possible */
+		bool constrainTo(const rect<T>& other)
 		{
 			if (other.getWidth() < getWidth() || other.getHeight() < getHeight())
 				return false;
@@ -165,20 +180,19 @@ namespace core
 			return true;
 		}
 
-		//! Returns width of rectangle.
+		//! Get width of rectangle.
 		T getWidth() const
 		{
 			return LowerRightCorner.X - UpperLeftCorner.X;
 		}
 
-		//! Returns height of rectangle.
+		//! Get height of rectangle.
 		T getHeight() const
 		{
 			return LowerRightCorner.Y - UpperLeftCorner.Y;
 		}
 
-		//! If the lower right corner of the rect is smaller then the
-		//! upper left, the points are swapped.
+		//! If the lower right corner of the rect is smaller then the upper left, the points are swapped.
 		void repair()
 		{
 			if (LowerRightCorner.X < UpperLeftCorner.X)
@@ -196,41 +210,44 @@ namespace core
 			}
 		}
 
-		//! Returns if the rect is valid to draw. It could be invalid
-		//! if the UpperLeftCorner is lower or more right than the
-		//! LowerRightCorner, or if any dimension is 0.
+		//! Returns if the rect is valid to draw.
+		/** It would be invalid if the UpperLeftCorner is lower or more
+		right than the LowerRightCorner. */
 		bool isValid() const
 		{
 			return ((LowerRightCorner.X >= UpperLeftCorner.X) &&
 				(LowerRightCorner.Y >= UpperLeftCorner.Y));
 		}
 
-		//! Returns the center of the rectangle
+		//! Get the center of the rectangle
 		position2d<T> getCenter() const
 		{
-			return position2d<T>((UpperLeftCorner.X + LowerRightCorner.X) / 2,
-				(UpperLeftCorner.Y + LowerRightCorner.Y) / 2);
+			return position2d<T>(
+					(UpperLeftCorner.X + LowerRightCorner.X) / 2,
+					(UpperLeftCorner.Y + LowerRightCorner.Y) / 2);
 		}
 
-		//! Returns the dimensions of the rectangle
+		//! Get the dimensions of the rectangle
 		dimension2d<T> getSize() const
 		{
 			return dimension2d<T>(getWidth(), getHeight());
 		}
 
 
-		//! Adds a point to the rectangle, causing it to grow bigger, 
-		//! if point is outside of the box
-		//! \param p: Point to add into the box.
+		//! Adds a point to the rectangle
+		/** Causes the rectangle to grow bigger if point is outside of
+		the box
+		\param p Point to add to the box. */
 		void addInternalPoint(const position2d<T>& p)
 		{
 			addInternalPoint(p.X, p.Y);
 		}
 
-		//! Adds a point to the bounding rectangle, causing it to grow bigger, 
-		//! if point is outside of the box.
-		//! \param x: X Coordinate of the point to add to this box.
-		//! \param y: Y Coordinate of the point to add to this box.
+		//! Adds a point to the bounding rectangle
+		/** Causes the rectangle to grow bigger if point is outside of
+		the box
+		\param x X-Coordinate of the point to add to this box.
+		\param y Y-Coordinate of the point to add to this box. */
 		void addInternalPoint(T x, T y)
 		{
 			if (x>LowerRightCorner.X)
@@ -244,11 +261,16 @@ namespace core
 				UpperLeftCorner.Y = y;
 		}
 
-
+		//! Upper left corner
 		position2d<T> UpperLeftCorner;
+		//! Lower right corner
 		position2d<T> LowerRightCorner;
 	};
 
+	//! Rectangle with float values
+	typedef rect<f32> rectf;
+	//! Rectangle with int values
+	typedef rect<s32> recti;
 
 } // end namespace core
 } // end namespace irr
diff --git a/src/dep/include/irrlicht/triangle3d.h b/src/dep/include/irrlicht/triangle3d.h
index dcfc45d..9fcc253 100644
--- a/src/dep/include/irrlicht/triangle3d.h
+++ b/src/dep/include/irrlicht/triangle3d.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,10 +14,10 @@ namespace irr
 {
 namespace core
 {
-	
+
 	//! 3d triangle template class for doing collision detection and other things.
 	template <class T>
-	class triangle3d  
+	class triangle3d
 	{
 	public:
 
@@ -39,19 +39,18 @@ namespace core
 		}
 
 		//! Determines if the triangle is totally inside a bounding box.
-		//! \param box: Box to check.
-		//! \return Returns true if the triangle is within the box,
-		//! and false otherwise.
+		/** \param box Box to check.
+		\return True if triangle is within the box, otherwise false. */
 		bool isTotalInsideBox(const aabbox3d<T>& box) const
 		{
-			return (box.isPointInside(pointA) && 
+			return (box.isPointInside(pointA) &&
 				box.isPointInside(pointB) &&
 				box.isPointInside(pointC));
 		}
 
 		//! Get the closest point on a triangle to a point on the same plane.
-		//! \param p: Point which must be on the same plane as the triangle.
-		//! \return The closest point of the triangle
+		/** \param p Point which must be on the same plane as the triangle.
+		\return The closest point of the triangle */
 		core::vector3d<T> closestPointOnTriangle(const core::vector3d<T>& p) const
 		{
 			const core::vector3d<T> rab = line3d<T>(pointA, pointB).getClosestPoint(p);
@@ -64,14 +63,14 @@ namespace core
 
 			if (d1 < d2)
 				return d1 < d3 ? rab : rca;
-            
+
 			return d2 < d3 ? rbc : rca;
 		}
 
 		//! Check if a point is inside the triangle
-		//! \param p: Point to test. Assumes that this point is already on the plane
-		//! of the triangle.
-		//! \return Returns true if the point is inside the triangle, otherwise false.
+		/** \param p Point to test. Assumes that this point is already
+		on the plane of the triangle.
+		\return True if the point is inside the triangle, otherwise false. */
 		bool isPointInside(const vector3d<T>& p) const
 		{
 			return (isOnSameSide(p, pointA, pointB, pointC) &&
@@ -79,13 +78,13 @@ namespace core
 				isOnSameSide(p, pointC, pointA, pointB));
 		}
 
-		//! Check if a point is inside the triangle. This method is an
-		//! implementation of the example used in a paper by Kasper
-		//! Fauerby original written by Keidy from Mr-Gamemaker.
-		//! \param p: Point to test. Assumes that this point is already
-		//! on the plane of the triangle.
-		//! \return Returns true if the point is inside the triangle,
-		//! otherwise false.
+		//! Check if a point is inside the triangle.
+		/** This method is an implementation of the example used in a
+		paper by Kasper Fauerby original written by Keidy from
+		Mr-Gamemaker.
+		\param p Point to test. Assumes that this point is already
+		on the plane of the triangle.
+		\return True if point is inside the triangle, otherwise false. */
 		bool isPointInsideFast(const vector3d<T>& p) const
 		{
 			const vector3d<T> f = pointB - pointA;
@@ -104,14 +103,15 @@ namespace core
 			const f32 ac_bb = (a*c)-(b*b);
 			f32 z = x+y-ac_bb;
 
+			// return sign(z) && !(sign(x)||sign(y))
 			return (( (IR(z)) & ~((IR(x))|(IR(y))) ) & 0x80000000)!=0;
 		}
 
 
 		//! Get an intersection with a 3d line.
-		//! \param line: Line to intersect with.
-		//! \param outIntersection: Place to store the intersection point, if there is one.
-		//! \return Returns true if there was an intersection, false if not.
+		/** \param line Line to intersect with.
+		\param outIntersection Place to store the intersection point, if there is one.
+		\return True if there was an intersection, false if not. */
 		bool getIntersectionWithLimitedLine(const line3d<T>& line,
 			vector3d<T>& outIntersection) const
 		{
@@ -121,31 +121,30 @@ namespace core
 		}
 
 
-		//! Returns an intersection with a 3d line.
-		//! Please note that also points are returned as intersection which
-		//! are on the line, but not between the start and end point of the line.
-		//! If you want the returned point be between start and end
-		//! use getIntersectionWithLimitedLine().
-		//! \param linePoint: Point of the line to intersect with.
-		//! \param lineVect: Vector of the line to intersect with.
-		//! \param outIntersection: Place to store the intersection point, if there is one.
-		//! \return Returns true if there was an intersection, false if there was not.
+		//! Get an intersection with a 3d line.
+		/** Please note that also points are returned as intersection which
+		are on the line, but not between the start and end point of the line.
+		If you want the returned point be between start and end
+		use getIntersectionWithLimitedLine().
+		\param linePoint Point of the line to intersect with.
+		\param lineVect Vector of the line to intersect with.
+		\param outIntersection Place to store the intersection point, if there is one.
+		\return True if there was an intersection, false if there was not. */
 		bool getIntersectionWithLine(const vector3d<T>& linePoint,
 			const vector3d<T>& lineVect, vector3d<T>& outIntersection) const
 		{
 			if (getIntersectionOfPlaneWithLine(linePoint, lineVect, outIntersection))
 				return isPointInside(outIntersection);
 
-			return false;			
+			return false;
 		}
 
 
-		//! Calculates the intersection between a 3d line and 
-		//! the plane the triangle is on.
-		//! \param lineVect: Vector of the line to intersect with.
-		//! \param linePoint: Point of the line to intersect with.
-		//! \param outIntersection: Place to store the intersection point, if there is one.
-		//! \return Returns true if there was an intersection, false if there was not.
+		//! Calculates the intersection between a 3d line and the plane the triangle is on.
+		/** \param lineVect Vector of the line to intersect with.
+		\param linePoint Point of the line to intersect with.
+		\param outIntersection Place to store the intersection point, if there is one.
+		\return True if there was an intersection, else false. */
 		bool getIntersectionOfPlaneWithLine(const vector3d<T>& linePoint,
 			const vector3d<T>& lineVect, vector3d<T>& outIntersection) const
 		{
@@ -161,22 +160,20 @@ namespace core
 			return true;
 		}
 
-		
-		//! Returns the normal of the triangle.
-		//! Please note: The normal is not normalized.
+
+		//! Get the normal of the triangle.
+		/** Please note: The normal is not always normalized. */
 		vector3d<T> getNormal() const
 		{
 			return (pointB - pointA).crossProduct(pointC - pointA);
 		}
 
-		//! Test if the triangle would be front or backfacing from any
-		//! point. Thus, this method assumes a camera position from
-		//! which the triangle is definitely visible when looking into
-		//! the given direction.
-		//! Do not use this method with points as it will give wrong results!
-		//! \param lookDirection: Look direction.
-		//! \return Returns true if the plane is front facing and
-		//! false if it is backfacing.
+		//! Test if the triangle would be front or backfacing from any point.
+		/** Thus, this method assumes a camera position from which the
+		triangle is definitely visible when looking at the given direction.
+		Do not use this method with points as it will give wrong results!
+		\param lookDirection Look direction.
+		\return True if the plane is front facing and false if it is backfacing. */
 		bool isFrontFacing(const vector3d<T>& lookDirection) const
 		{
 			const vector3d<T> n = getNormal().normalize();
@@ -184,13 +181,13 @@ namespace core
 			return F32_LOWER_EQUAL_0(d);
 		}
 
-		//! Returns the plane of this triangle.
+		//! Get the plane of this triangle.
 		plane3d<T> getPlane() const
 		{
 			return plane3d<T>(pointA, pointB, pointC);
 		}
 
-		//! Returns the area of the triangle
+		//! Get the area of the triangle
 		T getArea() const
 		{
 			return (pointB - pointA).crossProduct(pointC - pointA).getLength() * 0.5;
@@ -206,12 +203,12 @@ namespace core
 		}
 
 		//! the three points of the triangle
-		vector3d<T> pointA; 
-		vector3d<T> pointB; 
-		vector3d<T> pointC; 
+		vector3d<T> pointA;
+		vector3d<T> pointB;
+		vector3d<T> pointC;
 
 	private:
-		bool isOnSameSide(const vector3d<T>& p1, const vector3d<T>& p2, 
+		bool isOnSameSide(const vector3d<T>& p1, const vector3d<T>& p2,
 			const vector3d<T>& a, const vector3d<T>& b) const
 		{
 			vector3d<T> bminusa = b - a;
diff --git a/src/dep/include/irrlicht/vector2d.h b/src/dep/include/irrlicht/vector2d.h
index 5ab78d3..d8e9adb 100644
--- a/src/dep/include/irrlicht/vector2d.h
+++ b/src/dep/include/irrlicht/vector2d.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,9 +18,13 @@ template <class T>
 class vector2d
 {
 public:
-
+	//! Default constructor (null vector)
 	vector2d() : X(0), Y(0) {}
+	//! Constructor with two different values
 	vector2d(T nx, T ny) : X(nx), Y(ny) {}
+	//! Constructor with the same value for both members
+	explicit vector2d(T n) : X(n), Y(n) {}
+	//! Copy constructor
 	vector2d(const vector2d<T>& other) : X(other.X), Y(other.Y) {}
 
 	// operators
@@ -39,14 +43,14 @@ public:
 	vector2d<T> operator-(const T v) const { return vector2d<T>(X - v, Y - v); }
 	vector2d<T>& operator-=(const T v) { X-=v; Y-=v; return *this; }
 
-	vector2d<T> operator*(const vector2d<T>& other) const { return vector2d<T>(X * other.X, Y * other.Y);	}
+	vector2d<T> operator*(const vector2d<T>& other) const { return vector2d<T>(X * other.X, Y * other.Y); }
 	vector2d<T>& operator*=(const vector2d<T>& other) { X*=other.X; Y*=other.Y; return *this; }
-	vector2d<T> operator*(const T v) const { return vector2d<T>(X * v, Y * v);	}
+	vector2d<T> operator*(const T v) const { return vector2d<T>(X * v, Y * v); }
 	vector2d<T>& operator*=(const T v) { X*=v; Y*=v; return *this; }
 
-	vector2d<T> operator/(const vector2d<T>& other) const { return vector2d<T>(X / other.X, Y / other.Y);	}
+	vector2d<T> operator/(const vector2d<T>& other) const { return vector2d<T>(X / other.X, Y / other.Y); }
 	vector2d<T>& operator/=(const vector2d<T>& other) { X/=other.X; Y/=other.Y; return *this; }
-	vector2d<T> operator/(const T v) const { return vector2d<T>(X / v, Y / v);	}
+	vector2d<T> operator/(const T v) const { return vector2d<T>(X / v, Y / v); }
 	vector2d<T>& operator/=(const T v) { X/=v; Y/=v; return *this; }
 
 	bool operator<=(const vector2d<T>&other) const { return X<=other.X && Y<=other.Y; }
@@ -55,79 +59,96 @@ public:
 	bool operator<(const vector2d<T>&other) const { return X<other.X && Y<other.Y; }
 	bool operator>(const vector2d<T>&other) const { return X>other.X && Y>other.Y; }
 
-	bool operator==(const vector2d<T>& other) const { return other.X==X && other.Y==Y; }
-	bool operator!=(const vector2d<T>& other) const { return other.X!=X || other.Y!=Y; }
+	bool operator==(const vector2d<T>& other) const { return equals(other); }
+	bool operator!=(const vector2d<T>& other) const { return !equals(other); }
 
 	// functions
 
-	//! returns if this vector equals the other one, taking floating point rounding errors into account
+	//! Checks if this vector equals the other one.
+	/** Takes floating point rounding errors into account.
+	\param other Vector to compare with.
+	\return True if the two vector are (almost) equal, else false. */
 	bool equals(const vector2d<T>& other) const
 	{
 		return core::equals(X, other.X) && core::equals(Y, other.Y);
 	}
 
-	void set(T nx, T ny) {X=nx; Y=ny; }
-	void set(const vector2d<T>& p) { X=p.X; Y=p.Y;}
+	vector2d<T>& set(T nx, T ny) {X=nx; Y=ny; return *this; }
+	vector2d<T>& set(const vector2d<T>& p) { X=p.X; Y=p.Y; return *this; }
 
-	//! Returns the length of the vector
-	//! \return Returns the length of the vector.
+	//! Gets the length of the vector.
+	/** \return The length of the vector. */
 	T getLength() const { return (T)sqrt((f64)(X*X + Y*Y)); }
 
-	//! Returns the squared length of this vector
-	/** This is useful because it is much faster than getLength(). */
+	//! Get the squared length of this vector
+	/** This is useful because it is much faster than getLength().
+	\return The squared length of the vector. */
 	T getLengthSQ() const { return X*X + Y*Y; }
 
-	//! Returns the dot product of this vector with another.
+	//! Get the dot product of this vector with another.
+	/** \param other Other vector to take dot product with.
+	\return The dot product of the two vectors. */
 	T dotProduct(const vector2d<T>& other) const
 	{
 		return X*other.X + Y*other.Y;
 	}
 
-	//! Returns distance from another point. Here, the vector is interpreted
-	//! as a point in 2 dimensional space.
+	//! Gets distance from another point.
+	/** Here, the vector is interpreted as a point in 2-dimensional space.
+	\param other Other vector to measure from.
+	\return Distance from other point. */
 	T getDistanceFrom(const vector2d<T>& other) const
 	{
 		return vector2d<T>(X - other.X, Y - other.Y).getLength();
 	}
 
-	//! Returns squared distance from another point. Here, the vector is
-	//! interpreted as a point in 2 dimensional space.
+	//! Returns squared distance from another point.
+	/** Here, the vector is interpreted as a point in 2-dimensional space.
+	\param other Other vector to measure from.
+	\return Squared distance from other point. */
 	T getDistanceFromSQ(const vector2d<T>& other) const
 	{
 		return vector2d<T>(X - other.X, Y - other.Y).getLengthSQ();
 	}
 
-	//! rotates the point around a center by an amount of degrees.
-	void rotateBy(f64 degrees, const vector2d<T>& center)
+	//! rotates the point anticlockwise around a center by an amount of degrees.
+	/** \param degrees Amount of degrees to rotate by, anticlockwise.
+	\param center Rotation center.
+	\return This vector after transformation. */
+	vector2d<T>& rotateBy(f64 degrees, const vector2d<T>& center=vector2d<T>())
 	{
 		degrees *= DEGTORAD64;
-		T cs = (T)cos(degrees);
-		T sn = (T)sin(degrees);
+		const f64 cs = cos(degrees);
+		const f64 sn = sin(degrees);
 
 		X -= center.X;
 		Y -= center.Y;
 
-		set(X*cs - Y*sn, X*sn + Y*cs);
+		set((T)(X*cs - Y*sn), (T)(X*sn + Y*cs));
 
 		X += center.X;
 		Y += center.Y;
-	}
-
-	//! normalizes the vector.
-	vector2d<T>& normalize()
-	{
-		T l = X*X + Y*Y;
-		if (l == 0)
-			return *this;
-		l = core::reciprocal_squareroot ( (f32)l );
-		X *= l;
-		Y *= l;
 		return *this;
 	}
 
-	//! Calculates the angle of this vector in grad in the trigonometric sense.
-	//! This method has been suggested by Pr3t3nd3r.
-	//! \return Returns a value between 0 and 360.
+	//! Normalize the vector.
+	/** The null vector is left untouched.
+	\return Reference to this vector, after normalization. */
+	vector2d<T>& normalize()
+	{
+		f32 length = (f32)(X*X + Y*Y);
+		if (core::equals(length, 0.f))
+			return *this;
+		length = core::reciprocal_squareroot ( length );
+		X = (T)(X * length);
+		Y = (T)(Y * length);
+		return *this;
+	}
+
+	//! Calculates the angle of this vector in degrees in the trigonometric sense.
+	/** 0 is to the left (9 o'clock), values increase clockwise.
+	This method has been suggested by Pr3t3nd3r.
+	\return Returns a value between 0 and 360. */
 	f64 getAngleTrig() const
 	{
 		if (X == 0)
@@ -146,15 +167,16 @@ public:
 				return 360.0-atan(-Y/X) * RADTODEG64;
 			else
 				return 180.0+atan(-Y/-X) * RADTODEG64;
-	} 
+	}
 
-	//! Calculates the angle of this vector in grad in the counter trigonometric sense.
-	//! \return Returns a value between 0 and 360.
+	//! Calculates the angle of this vector in degrees in the counter trigonometric sense.
+	/** 0 is to the right (3 o'clock), values increase counter-clockwise.
+	\return Returns a value between 0 and 360. */
 	inline f64 getAngle() const
 	{
-		if (Y == 0)  // corrected thanks to a suggestion by Jox
-			return X < 0 ? 180 : 0; 
-		else if (X == 0) 
+		if (Y == 0) // corrected thanks to a suggestion by Jox
+			return X < 0 ? 180 : 0;
+		else if (X == 0)
 			return Y < 0 ? 90 : 270;
 
 		f64 tmp = Y / getLength();
@@ -175,8 +197,9 @@ public:
 		return tmp;
 	}
 
-	//! Calculates the angle between this vector and another one in grad.
-	//! \return Returns a value between 0 and 90.
+	//! Calculates the angle between this vector and another one in degree.
+	/** \param b Other vector to test with.
+	\return Returns a value between 0 and 90. */
 	inline f64 getAngleWith(const vector2d<T>& b) const
 	{
 		f64 tmp = X*b.X + Y*b.Y;
@@ -192,54 +215,70 @@ public:
 	}
 
 	//! Returns if this vector interpreted as a point is on a line between two other points.
-	/** It is assumed that the point is on the line. */
-	//! \param begin: Beginning vector to compare between.
-	//! \param end: Ending vector to compare between.
-	//! \return True if this vector is between begin and end.  False if not.
+	/** It is assumed that the point is on the line.
+	\param begin Beginning vector to compare between.
+	\param end Ending vector to compare between.
+	\return True if this vector is between begin and end, false if not. */
 	bool isBetweenPoints(const vector2d<T>& begin, const vector2d<T>& end) const
 	{
-		T f = (end - begin).getLengthSQ();
-		return getDistanceFromSQ(begin) < f && 
-			getDistanceFromSQ(end) < f;
+		if (begin.X != end.X)
+		{
+			return ((begin.X <= X && X <= end.X) ||
+				(begin.X >= X && X >= end.X));
+		}
+		else
+		{
+			return ((begin.Y <= Y && Y <= end.Y) ||
+				(begin.Y >= Y && Y >= end.Y));
+		}
 	}
 
-	//! returns interpolated vector
-	//! \param other: other vector to interpolate between
-	//! \param d: value between 0.0f and 1.0f.
-	vector2d<T> getInterpolated(const vector2d<T>& other, f32 d) const
+	//! Creates an interpolated vector between this vector and another vector.
+	/** \param other The other vector to interpolate with.
+	\param d Interpolation value between 0.0f (all the other vector) and 1.0f (all this vector).
+	Note that this is the opposite direction of interpolation to getInterpolated_quadratic()
+	\return An interpolated vector.  This vector is not modified. */
+	vector2d<T> getInterpolated(const vector2d<T>& other, f64 d) const
 	{
-		T inv = (T) 1.0 - d;
-		return vector2d<T>(other.X*inv + X*d, other.Y*inv + Y*d);
+		f64 inv = 1.0f - d;
+		return vector2d<T>((T)(other.X*inv + X*d), (T)(other.Y*inv + Y*d));
 	}
 
-	//! Returns (quadratically) interpolated vector between this and the two given ones.
-	/** \param v2: second vector to interpolate with
-	\param v3: third vector to interpolate with
-	\param d: value between 0.0f and 1.0f. */
-	vector2d<T> getInterpolated_quadratic(const vector2d<T>& v2, const vector2d<T>& v3, const T d) const
+	//! Creates a quadratically interpolated vector between this and two other vectors.
+	/** \param v2 Second vector to interpolate with.
+	\param v3 Third vector to interpolate with (maximum at 1.0f)
+	\param d Interpolation value between 0.0f (all this vector) and 1.0f (all the 3rd vector).
+	Note that this is the opposite direction of interpolation to getInterpolated() and interpolate()
+	\return An interpolated vector. This vector is not modified. */
+	vector2d<T> getInterpolated_quadratic(const vector2d<T>& v2, const vector2d<T>& v3, f64 d) const
 	{
 		// this*(1-d)*(1-d) + 2 * v2 * (1-d) + v3 * d * d;
-		const T inv = (T) 1.0 - d;
-		const T mul0 = inv * inv;
-		const T mul1 = (T) 2.0 * d * inv;
-		const T mul2 = d * d;
+		const f64 inv = 1.0f - d;
+		const f64 mul0 = inv * inv;
+		const f64 mul1 = 2.0f * d * inv;
+		const f64 mul2 = d * d;
 
-		return vector2d<T> ( X * mul0 + v2.X * mul1 + v3.X * mul2,
-					Y * mul0 + v2.Y * mul1 + v3.Y * mul2);
+		return vector2d<T> ( (T)(X * mul0 + v2.X * mul1 + v3.X * mul2),
+					(T)(Y * mul0 + v2.Y * mul1 + v3.Y * mul2));
 	}
 
-	//! sets this vector to the linearly interpolated vector between a and b.
-	/** \param a: first vector to interpolate with
-	\param b: second vector to interpolate with
-	\param t: value between 0.0f and 1.0f. */
-	void interpolate(const vector2d<T>& a, const vector2d<T>& b, const f32 t)
+	//! Sets this vector to the linearly interpolated vector between a and b.
+	/** \param a first vector to interpolate with, maximum at 1.0f
+	\param b second vector to interpolate with, maximum at 0.0f
+	\param d Interpolation value between 0.0f (all vector b) and 1.0f (all vector a)
+	Note that this is the opposite direction of interpolation to getInterpolated_quadratic()
+	*/
+	vector2d<T>& interpolate(const vector2d<T>& a, const vector2d<T>& b, f64 d)
 	{
-		X = b.X + ( ( a.X - b.X ) * t );
-		Y = b.Y + ( ( a.Y - b.Y ) * t );
+		X = (T)((f64)b.X + ( ( a.X - b.X ) * d ));
+		Y = (T)((f64)b.Y + ( ( a.Y - b.Y ) * d ));
+		return *this;
 	}
 
-	// member variables
-	T X, Y;
+	//! X coordinate of vector.
+	T X;
+	//! Y coordinate of vector.
+	T Y;
 };
 
 	//! Typedef for f32 2d vector.
@@ -247,7 +286,8 @@ public:
 	//! Typedef for integer 2d vector.
 	typedef vector2d<s32> vector2di;
 
-	template<class S, class T> vector2d<T> operator*(const S scalar, const vector2d<T>& vector) { return vector*scalar; }
+	template<class S, class T>
+	vector2d<T> operator*(const S scalar, const vector2d<T>& vector) { return vector*scalar; }
 
 } // end namespace core
 } // end namespace irr
diff --git a/src/dep/include/irrlicht/vector3d.h b/src/dep/include/irrlicht/vector3d.h
index 85a3ee3..0c50193 100644
--- a/src/dep/include/irrlicht/vector3d.h
+++ b/src/dep/include/irrlicht/vector3d.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,46 +13,56 @@ namespace core
 {
 
 	//! 3d vector template class with lots of operators and methods.
+	/** The vector3d class is used in Irrlicht for three main purposes: 
+		1) As a direction vector (most of the methods assume this).
+		2) As a position in 3d space (which is synonymous with a direction vector from the origin to this position).
+		3) To hold three Euler rotations, where X is pitch, Y is yaw and Z is roll.
+	*/
 	template <class T>
 	class vector3d
 	{
 	public:
-
+		//! Default constructor (null vector).
 		vector3d() : X(0), Y(0), Z(0) {}
+		//! Constructor with three different values
 		vector3d(T nx, T ny, T nz) : X(nx), Y(ny), Z(nz) {}
+		//! Constructor with the same value for all elements
+		explicit vector3d(T n) : X(n), Y(n), Z(n) {}
+		//! Copy constructor
 		vector3d(const vector3d<T>& other) : X(other.X), Y(other.Y), Z(other.Z) {}
 
 		// operators
 
-		vector3d<T> operator-() const { return vector3d<T>(-X, -Y, -Z);   }
+		vector3d<T> operator-() const { return vector3d<T>(-X, -Y, -Z); }
 
-		vector3d<T>& operator=(const vector3d<T>& other)	{ X = other.X; Y = other.Y; Z = other.Z; return *this; }
+		vector3d<T>& operator=(const vector3d<T>& other) { X = other.X; Y = other.Y; Z = other.Z; return *this; }
 
-		vector3d<T> operator+(const vector3d<T>& other) const { return vector3d<T>(X + other.X, Y + other.Y, Z + other.Z);	}
-		vector3d<T>& operator+=(const vector3d<T>& other)	{ X+=other.X; Y+=other.Y; Z+=other.Z; return *this; }
+		vector3d<T> operator+(const vector3d<T>& other) const { return vector3d<T>(X + other.X, Y + other.Y, Z + other.Z); }
+		vector3d<T>& operator+=(const vector3d<T>& other) { X+=other.X; Y+=other.Y; Z+=other.Z; return *this; }
+		vector3d<T> operator+(const T val) const { return vector3d<T>(X + val, Y + val, Z + val); }
+		vector3d<T>& operator+=(const T val) { X+=val; Y+=val; Z+=val; return *this; }
 
-		vector3d<T> operator-(const vector3d<T>& other) const { return vector3d<T>(X - other.X, Y - other.Y, Z - other.Z);	}
-		vector3d<T>& operator-=(const vector3d<T>& other)	{ X-=other.X; Y-=other.Y; Z-=other.Z; return *this; }
+		vector3d<T> operator-(const vector3d<T>& other) const { return vector3d<T>(X - other.X, Y - other.Y, Z - other.Z); }
+		vector3d<T>& operator-=(const vector3d<T>& other) { X-=other.X; Y-=other.Y; Z-=other.Z; return *this; }
+		vector3d<T> operator-(const T val) const { return vector3d<T>(X - val, Y - val, Z - val); }
+		vector3d<T>& operator-=(const T val) { X-=val; Y-=val; Z-=val; return *this; }
 
-		vector3d<T> operator*(const vector3d<T>& other) const { return vector3d<T>(X * other.X, Y * other.Y, Z * other.Z);	}
-		vector3d<T>& operator*=(const vector3d<T>& other)	{ X*=other.X; Y*=other.Y; Z*=other.Z; return *this; }
-		vector3d<T> operator*(const T v) const { return vector3d<T>(X * v, Y * v, Z * v);	}
+		vector3d<T> operator*(const vector3d<T>& other) const { return vector3d<T>(X * other.X, Y * other.Y, Z * other.Z); }
+		vector3d<T>& operator*=(const vector3d<T>& other) { X*=other.X; Y*=other.Y; Z*=other.Z; return *this; }
+		vector3d<T> operator*(const T v) const { return vector3d<T>(X * v, Y * v, Z * v); }
 		vector3d<T>& operator*=(const T v) { X*=v; Y*=v; Z*=v; return *this; }
 
-		vector3d<T> operator/(const vector3d<T>& other) const { return vector3d<T>(X / other.X, Y / other.Y, Z / other.Z);	}
-		vector3d<T>& operator/=(const vector3d<T>& other)	{ X/=other.X; Y/=other.Y; Z/=other.Z; return *this; }
-		vector3d<T> operator/(const T v) const { T i=(T)1.0/v; return vector3d<T>(X * i, Y * i, Z * i);	}
+		vector3d<T> operator/(const vector3d<T>& other) const { return vector3d<T>(X / other.X, Y / other.Y, Z / other.Z); }
+		vector3d<T>& operator/=(const vector3d<T>& other) { X/=other.X; Y/=other.Y; Z/=other.Z; return *this; }
+		vector3d<T> operator/(const T v) const { T i=(T)1.0/v; return vector3d<T>(X * i, Y * i, Z * i); }
 		vector3d<T>& operator/=(const T v) { T i=(T)1.0/v; X*=i; Y*=i; Z*=i; return *this; }
 
-		bool operator<=(const vector3d<T>&other) const { return X<=other.X && Y<=other.Y && Z<=other.Z;};
-		bool operator>=(const vector3d<T>&other) const { return X>=other.X && Y>=other.Y && Z>=other.Z;};
-		bool operator<(const vector3d<T>&other) const { return X<other.X && Y<other.Y && Z<other.Z;};
-		bool operator>(const vector3d<T>&other) const { return X>other.X && Y>other.Y && Z>other.Z;};
-
-		//! use week float compare
-		//bool operator==(const vector3d<T>& other) const { return other.X==X && other.Y==Y && other.Z==Z; }
-		//bool operator!=(const vector3d<T>& other) const { return other.X!=X || other.Y!=Y || other.Z!=Z; }
+		bool operator<=(const vector3d<T>&other) const { return X<=other.X && Y<=other.Y && Z<=other.Z;}
+		bool operator>=(const vector3d<T>&other) const { return X>=other.X && Y>=other.Y && Z>=other.Z;}
+		bool operator<(const vector3d<T>&other) const { return X<other.X && Y<other.Y && Z<other.Z;}
+		bool operator>(const vector3d<T>&other) const { return X>other.X && Y>other.Y && Z>other.Z;}
 
+		//! use weak float compare
 		bool operator==(const vector3d<T>& other) const
 		{
 			return this->equals(other);
@@ -73,24 +83,24 @@ namespace core
 				core::equals(Z, other.Z, tolerance);
 		}
 
-		void set(const T nx, const T ny, const T nz) {X=nx; Y=ny; Z=nz; }
-		void set(const vector3d<T>& p) { X=p.X; Y=p.Y; Z=p.Z;}
+		vector3d<T>& set(const T nx, const T ny, const T nz) {X=nx; Y=ny; Z=nz; return *this;}
+		vector3d<T>& set(const vector3d<T>& p) {X=p.X; Y=p.Y; Z=p.Z;return *this;}
 
-		//! Returns length of the vector.
+		//! Get length of the vector.
 		T getLength() const { return (T) sqrt((f64)(X*X + Y*Y + Z*Z)); }
 
-		//! Returns squared length of the vector.
-		/** This is useful because it is much faster than
-		getLength(). */
+		//! Get squared length of the vector.
+		/** This is useful because it is much faster than getLength().
+		\return Squared length of the vector. */
 		T getLengthSQ() const { return X*X + Y*Y + Z*Z; }
 
-		//! Returns the dot product with another vector.
+		//! Get the dot product with another vector.
 		T dotProduct(const vector3d<T>& other) const
 		{
 			return X*other.X + Y*other.Y + Z*other.Z;
 		}
 
-		//! Returns distance from another point.
+		//! Get distance from another point.
 		/** Here, the vector is interpreted as point in 3 dimensional space. */
 		T getDistanceFrom(const vector3d<T>& other) const
 		{
@@ -104,156 +114,222 @@ namespace core
 			return vector3d<T>(X - other.X, Y - other.Y, Z - other.Z).getLengthSQ();
 		}
 
-		//! Calculates the cross product with another vector
-		//! \param p: vector to multiply with.
-		//! \return Crossproduct of this vector with p.
+		//! Calculates the cross product with another vector.
+		/** \param p Vector to multiply with.
+		\return Crossproduct of this vector with p. */
 		vector3d<T> crossProduct(const vector3d<T>& p) const
 		{
 			return vector3d<T>(Y * p.Z - Z * p.Y, Z * p.X - X * p.Z, X * p.Y - Y * p.X);
 		}
 
 		//! Returns if this vector interpreted as a point is on a line between two other points.
-		/** It is assumed that the point is on the line. */
-		//! \param begin: Beginning vector to compare between.
-		//! \param end: Ending vector to compare between.
-		//! \return True if this vector is between begin and end.  False if not.
+		/** It is assumed that the point is on the line.
+		\param begin Beginning vector to compare between.
+		\param end Ending vector to compare between.
+		\return True if this vector is between begin and end, false if not. */
 		bool isBetweenPoints(const vector3d<T>& begin, const vector3d<T>& end) const
 		{
-			T f = (end - begin).getLengthSQ();
-			return getDistanceFromSQ(begin) < f &&
-				getDistanceFromSQ(end) < f;
+			const T f = (end - begin).getLengthSQ();
+			return getDistanceFromSQ(begin) <= f &&
+				getDistanceFromSQ(end) <= f;
 		}
 
-		//! Normalizes the vector. In case of the 0 vector the result
-		//! is still 0, otherwise the length of the vector will be 1.
-		//! Todo: 64 Bit template doesnt work.. need specialized template
+		//! Normalizes the vector.
+		/** In case of the 0 vector the result is still 0, otherwise
+		the length of the vector will be 1.
+		\return Reference to this vector after normalization. */
 		vector3d<T>& normalize()
 		{
-			T l = X*X + Y*Y + Z*Z;
-			if (l == 0)
+			f32 length = (f32)(X*X + Y*Y + Z*Z);
+			if (core::equals(length, 0.f))
 				return *this;
-			l = (T) reciprocal_squareroot ( (f32)l );
-			X *= l;
-			Y *= l;
-			Z *= l;
+			length = core::reciprocal_squareroot ( (f32)length );
+			X = (T)(X * length);
+			Y = (T)(Y * length);
+			Z = (T)(Z * length);
 			return *this;
 		}
 
 		//! Sets the length of the vector to a new value
-		void setLength(T newlength)
+		vector3d<T>& setLength(T newlength)
 		{
 			normalize();
-			*this *= newlength;
+			return (*this *= newlength);
 		}
 
 		//! Inverts the vector.
-		void invert()
+		vector3d<T>& invert()
 		{
 			X *= -1.0f;
 			Y *= -1.0f;
 			Z *= -1.0f;
+			return *this;
 		}
 
-		//! Rotates the vector by a specified number of degrees around the Y
-		//! axis and the specified center.
-		//! \param degrees: Number of degrees to rotate around the Y axis.
-		//! \param center: The center of the rotation.
-		void rotateXZBy(f64 degrees, const vector3d<T>& center)
+		//! Rotates the vector by a specified number of degrees around the Y axis and the specified center.
+		/** \param degrees Number of degrees to rotate around the Y axis.
+		\param center The center of the rotation. */
+		void rotateXZBy(f64 degrees, const vector3d<T>& center=vector3d<T>())
 		{
 			degrees *= DEGTORAD64;
-			T cs = (T)cos(degrees);
-			T sn = (T)sin(degrees);
+			f64 cs = cos(degrees);
+			f64 sn = sin(degrees);
 			X -= center.X;
 			Z -= center.Z;
-			set(X*cs - Z*sn, Y, X*sn + Z*cs);
+			set((T)(X*cs - Z*sn), Y, (T)(X*sn + Z*cs));
 			X += center.X;
 			Z += center.Z;
 		}
 
-		//! Rotates the vector by a specified number of degrees around the Z
-		//! axis and the specified center.
-		//! \param degrees: Number of degrees to rotate around the Z axis.
-		//! \param center: The center of the rotation.
-		void rotateXYBy(f64 degrees, const vector3d<T>& center)
+		//! Rotates the vector by a specified number of degrees around the Z axis and the specified center.
+		/** \param degrees: Number of degrees to rotate around the Z axis.
+		\param center: The center of the rotation. */
+		void rotateXYBy(f64 degrees, const vector3d<T>& center=vector3d<T>())
 		{
 			degrees *= DEGTORAD64;
-			T cs = (T)cos(degrees);
-			T sn = (T)sin(degrees);
+			f64 cs = cos(degrees);
+			f64 sn = sin(degrees);
 			X -= center.X;
 			Y -= center.Y;
-			set(X*cs - Y*sn, X*sn + Y*cs, Z);
+			set((T)(X*cs - Y*sn), (T)(X*sn + Y*cs), Z);
 			X += center.X;
 			Y += center.Y;
 		}
 
-		//! Rotates the vector by a specified number of degrees around the X
-		//! axis and the specified center.
-		//! \param degrees: Number of degrees to rotate around the X axis.
-		//! \param center: The center of the rotation.
-		void rotateYZBy(f64 degrees, const vector3d<T>& center)
+		//! Rotates the vector by a specified number of degrees around the X axis and the specified center.
+		/** \param degrees: Number of degrees to rotate around the X axis.
+		\param center: The center of the rotation. */
+		void rotateYZBy(f64 degrees, const vector3d<T>& center=vector3d<T>())
 		{
 			degrees *= DEGTORAD64;
-			T cs = (T)cos(degrees);
-			T sn = (T)sin(degrees);
+			f64 cs = cos(degrees);
+			f64 sn = sin(degrees);
 			Z -= center.Z;
 			Y -= center.Y;
-			set(X, Y*cs - Z*sn, Y*sn + Z*cs);
+			set(X, (T)(Y*cs - Z*sn), (T)(Y*sn + Z*cs));
 			Z += center.Z;
 			Y += center.Y;
 		}
 
-		//! Returns interpolated vector.
-		/** \param other: other vector to interpolate between
-		\param d: value between 0.0f and 1.0f. */
-		vector3d<T> getInterpolated(const vector3d<T>& other, const T d) const
+		//! Creates an interpolated vector between this vector and another vector.
+		/** \param other The other vector to interpolate with.
+		\param d Interpolation value between 0.0f (all the other vector) and 1.0f (all this vector).
+		Note that this is the opposite direction of interpolation to getInterpolated_quadratic()
+		\return An interpolated vector.  This vector is not modified. */
+		vector3d<T> getInterpolated(const vector3d<T>& other, f64 d) const
 		{
-			const T inv = (T) 1.0 - d;
-			return vector3d<T>(other.X*inv + X*d, other.Y*inv + Y*d, other.Z*inv + Z*d);
+			const f64 inv = 1.0 - d;
+			return vector3d<T>((T)(other.X*inv + X*d), (T)(other.Y*inv + Y*d), (T)(other.Z*inv + Z*d));
 		}
 
-		//! Returns interpolated vector. ( quadratic )
-		/** \param v2: second vector to interpolate with
-		\param v3: third vector to interpolate with
-		\param d: value between 0.0f and 1.0f. */
-		vector3d<T> getInterpolated_quadratic(const vector3d<T>& v2, const vector3d<T>& v3, const T d) const
+		//! Creates a quadratically interpolated vector between this and two other vectors.
+		/** \param v2 Second vector to interpolate with.
+		\param v3 Third vector to interpolate with (maximum at 1.0f)
+		\param d Interpolation value between 0.0f (all this vector) and 1.0f (all the 3rd vector).
+		Note that this is the opposite direction of interpolation to getInterpolated() and interpolate()
+		\return An interpolated vector. This vector is not modified. */
+		vector3d<T> getInterpolated_quadratic(const vector3d<T>& v2, const vector3d<T>& v3, f64 d) const
 		{
 			// this*(1-d)*(1-d) + 2 * v2 * (1-d) + v3 * d * d;
-			const T inv = (T) 1.0 - d;
-			const T mul0 = inv * inv;
-			const T mul1 = (T) 2.0 * d * inv;
-			const T mul2 = d * d;
+			const f64 inv = (T) 1.0 - d;
+			const f64 mul0 = inv * inv;
+			const f64 mul1 = (T) 2.0 * d * inv;
+			const f64 mul2 = d * d;
 
-			return vector3d<T> ( X * mul0 + v2.X * mul1 + v3.X * mul2,
-					Y * mul0 + v2.Y * mul1 + v3.Y * mul2,
-					Z * mul0 + v2.Z * mul1 + v3.Z * mul2);
+			return vector3d<T> ((T)(X * mul0 + v2.X * mul1 + v3.X * mul2),
+					(T)(Y * mul0 + v2.Y * mul1 + v3.Y * mul2),
+					(T)(Z * mul0 + v2.Z * mul1 + v3.Z * mul2));
 		}
 
-		//! Gets the Y and Z rotations of a vector.
-		/** Thanks to Arras on the Irrlicht forums to add this method.
-		\return A vector representing the rotation in degrees of
-		this vector. The Z component of the vector will always be 0. */
-		vector3d<T> getHorizontalAngle()
+		//! Sets this vector to the linearly interpolated vector between a and b.
+		/** \param a first vector to interpolate with, maximum at 1.0f
+		\param b second vector to interpolate with, maximum at 0.0f
+		\param d Interpolation value between 0.0f (all vector b) and 1.0f (all vector a)
+		Note that this is the opposite direction of interpolation to getInterpolated_quadratic()
+		*/
+		vector3d<T>& interpolate(const vector3d<T>& a, const vector3d<T>& b, f64 d)
+		{
+			X = (T)((f64)b.X + ( ( a.X - b.X ) * d ));
+			Y = (T)((f64)b.Y + ( ( a.Y - b.Y ) * d ));
+			Z = (T)((f64)b.Z + ( ( a.Z - b.Z ) * d ));
+			return *this;
+		}
+
+
+		//! Get the rotations that would make a (0,0,1) direction vector point in the same direction as this direction vector.
+		/** Thanks to Arras on the Irrlicht forums for this method.  This utility method is very useful for
+		orienting scene nodes towards specific targets.  For example, if this vector represents the difference
+		between two scene nodes, then applying the result of getHorizontalAngle() to one scene node will point
+		it at the other one.
+		Example code:
+		// Where target and seeker are of type ISceneNode*
+		const vector3df toTarget(target->getAbsolutePosition() - seeker->getAbsolutePosition());
+		const vector3df requiredRotation = toTarget.getHorizontalAngle();
+		seeker->setRotation(requiredRotation); 
+
+		\return A rotation vector containing the X (pitch) and Y (raw) rotations (in degrees) that when applied to a 
+		+Z (e.g. 0, 0, 1) direction vector would make it point in the same direction as this vector. The Z (roll) rotation 
+		is always 0, since two Euler rotations are sufficient to point in any given direction. */
+		vector3d<T> getHorizontalAngle() const
 		{
 			vector3d<T> angle;
 
-			angle.Y = (T)atan2(X, Z);
-			angle.Y *= (f32)RADTODEG64;
+			angle.Y = (T)(atan2(X, Z) * RADTODEG64);
 
-			if (angle.Y < 0.0f) angle.Y += 360.0f;
-			if (angle.Y >= 360.0f) angle.Y -= 360.0f;
+			if (angle.Y < 0.0f)
+				angle.Y += 360.0f;
+			if (angle.Y >= 360.0f)
+				angle.Y -= 360.0f;
 
-			f32 z1 = sqrtf(X*X + Z*Z);
+			const f64 z1 = sqrt(X*X + Z*Z);
 
-			angle.X = (T)atan2(z1, Y);
-			angle.X *= (f32)RADTODEG64;
-			angle.X -= 90.0f;
+			angle.X = (T)(atan2(z1, (f64)Y) * RADTODEG64 - 90.0);
 
-			if (angle.X < 0.0f) angle.X += 360.0f;
-			if (angle.X >= 360.0f) angle.X -= 360.0f;
+			if (angle.X < 0.0f)
+				angle.X += 360.0f;
+			if (angle.X >= 360.0f)
+				angle.X -= 360.0f;
 
 			return angle;
 		}
 
+		//! Builds a direction vector from (this) rotation vector.
+		/** This vector is assumed to be a rotation vector composed of 3 Euler angle rotations, in degrees.
+		The implementation performs the same calculations as using a matrix to do the rotation.
+
+		\param[in] forwards  The direction representing "forwards" which will be rotated by this vector. 
+		If you do not provide a direction, then the +Z axis (0, 0, 1) will be assumed to be forwards.
+		\return A direction vector calculated by rotating the forwards direction by the 3 Euler angles 
+		(in degrees) represented by this vector. */
+		vector3d<T> rotationToDirection(const vector3d<T> & forwards = vector3d<T>(0, 0, 1)) const
+		{
+			const f64 cr = cos( core::DEGTORAD64 * X );
+			const f64 sr = sin( core::DEGTORAD64 * X );
+			const f64 cp = cos( core::DEGTORAD64 * Y );
+			const f64 sp = sin( core::DEGTORAD64 * Y );
+			const f64 cy = cos( core::DEGTORAD64 * Z );
+			const f64 sy = sin( core::DEGTORAD64 * Z );
+
+			const f64 srsp = sr*sp;
+			const f64 crsp = cr*sp;
+
+			const f64 pseudoMatrix[] = {
+				( cp*cy ), ( cp*sy ), ( -sp ),
+				( srsp*cy-cr*sy ), ( srsp*sy+cr*cy ), ( sr*cp ),
+				( crsp*cy+sr*sy ), ( crsp*sy-sr*cy ), ( cr*cp )};
+
+			return vector3d<T>(
+				(T)(forwards.X * pseudoMatrix[0] +
+					forwards.Y * pseudoMatrix[3] +
+					forwards.Z * pseudoMatrix[6]),
+				(T)(forwards.X * pseudoMatrix[1] +
+					forwards.Y * pseudoMatrix[4] +
+					forwards.Z * pseudoMatrix[7]),
+				(T)(forwards.X * pseudoMatrix[2] +
+					forwards.Y * pseudoMatrix[5] +
+					forwards.Z * pseudoMatrix[8]));
+		}
+
 		//! Fills an array of 4 values with the vector data (usually floats).
 		/** Useful for setting in shader constants for example. The fourth value
 		will always be 0. */
@@ -265,10 +341,12 @@ namespace core
 			array[3] = 0;
 		}
 
-
-		// member variables
-
-		T X, Y, Z;
+		//! X coordinate of the vector
+		T X;
+		//! Y coordinate of the vector
+		T Y;
+		//! Z coordinate of the vector
+		T Z;
 	};
 
 
@@ -277,7 +355,9 @@ namespace core
 	//! Typedef for an integer 3d vector.
 	typedef vector3d<s32> vector3di;
 
-	template<class S, class T> vector3d<T> operator*(const S scalar, const vector3d<T>& vector) { return vector*scalar; }
+	//! Function multiplying a scalar and a vector component-wise.
+	template<class S, class T>
+	vector3d<T> operator*(const S scalar, const vector3d<T>& vector) { return vector*scalar; }
 
 } // end namespace core
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/BuiltInFont.h b/src/dep/src/irrlicht/BuiltInFont.h
index bc0a4c2..9da9d0a 100644
--- a/src/dep/src/irrlicht/BuiltInFont.h
+++ b/src/dep/src/irrlicht/BuiltInFont.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,7 +16,7 @@ namespace irr
 {
 namespace gui
 {
-
+#ifdef _IRR_COMPILE_WITH_BMP_LOADER_
 u8 BuiltInFontData[] =
 {
 	0x42, 0x4d, 0x4a, 0x20, 0x00, 0x00, 0x00, 0x00, 
@@ -1056,6 +1056,16 @@ u8 BuiltInFontData[] =
 };
 
 	u32 BuiltInFontDataSize = sizeof(BuiltInFontData);
+
+#else // !defined(_IRR_COMPILE_WITH_BMP_LOADER_)
+
+	// built-in font cannot be loaded if there is no BMP loader
+
+	u8* BuiltInFontData=0;
+
+	u32 BuiltInFontDataSize = 0;
+
+#endif
 } // end namespace gui
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/C3DSMeshFileLoader.cpp b/src/dep/src/irrlicht/C3DSMeshFileLoader.cpp
index b1b4ab6..efe23a1 100644
--- a/src/dep/src/irrlicht/C3DSMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/C3DSMeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,6 +10,12 @@
 #include "SMeshBuffer.h"
 #include "SAnimatedMesh.h"
 #include "IReadFile.h"
+#include "IVideoDriver.h"
+#include "IMeshManipulator.h"
+
+#ifdef _DEBUG
+#define _IRR_DEBUG_3DS_LOADER_
+#endif
 
 namespace irr
 {
@@ -38,6 +44,8 @@ const u16 C3DS_MATSPECULAR   = 0xA030;
 const u16 C3DS_MATSHININESS  = 0xA040;
 const u16 C3DS_MATSHIN2PCT   = 0xA041;
 const u16 C3DS_TRANSPARENCY  = 0xA050;
+const u16 C3DS_TRANSPARENCY_FALLOFF  = 0xA052;
+const u16 C3DS_REFL_BLUR     = 0xA053;
 const u16 C3DS_TWO_SIDE      = 0xA081;
 const u16 C3DS_WIRE          = 0xA085;
 const u16 C3DS_SHADING       = 0xA100;
@@ -85,11 +93,18 @@ const u16 C3DS_KF_CURTIME    = 0xB009;
 const u16 C3DS_KF_NODE_HDR   = 0xB010;
 const u16 C3DS_PIVOTPOINT    = 0xB013;
 const u16 C3DS_BOUNDBOX      = 0xB014;
+const u16 C3DS_MORPH_SMOOTH  = 0xB015;
 const u16 C3DS_POS_TRACK_TAG = 0xB020;
 const u16 C3DS_ROT_TRACK_TAG = 0xB021;
 const u16 C3DS_SCL_TRACK_TAG = 0xB022;
 const u16 C3DS_NODE_ID       = 0xB030;
 
+// Viewport definitions
+const u16 C3DS_VIEWPORT_LAYOUT = 0x7001;
+const u16 C3DS_VIEWPORT_DATA   = 0x7011;
+const u16 C3DS_VIEWPORT_DATA_3 = 0x7012;
+const u16 C3DS_VIEWPORT_SIZE   = 0x7020;
+
 // different color chunk types
 const u16 C3DS_COL_RGB    = 0x0010;
 const u16 C3DS_COL_TRU    = 0x0011;
@@ -102,20 +117,21 @@ const u16 C3DS_PERCENTAGE_F = 0x0031;
 
 
 //! Constructor
-C3DSMeshFileLoader::C3DSMeshFileLoader(IMeshManipulator* manip,io::IFileSystem* fs, video::IVideoDriver* driver)
-: FileSystem(fs), Driver(driver), Vertices(0), Indices(0), SmoothingGroups(0), TCoords(0),
-	CountVertices(0), CountFaces(0), CountTCoords(0), Mesh(0), Manipulator(manip)
+C3DSMeshFileLoader::C3DSMeshFileLoader(ISceneManager* smgr, io::IFileSystem* fs)
+: SceneManager(smgr), FileSystem(fs), Vertices(0), Indices(0), SmoothingGroups(0), TCoords(0),
+	CountVertices(0), CountFaces(0), CountTCoords(0), Mesh(0)
 {
+
+	#ifdef _DEBUG
+	setDebugName("C3DSMeshFileLoader");
+	#endif
+
 	TransformationMatrix.makeIdentity();
 	if (FileSystem)
 		FileSystem->grab();
-
-	if (Driver)
-		Driver->grab();
 }
 
 
-
 //! destructor
 C3DSMeshFileLoader::~C3DSMeshFileLoader()
 {
@@ -124,15 +140,11 @@ C3DSMeshFileLoader::~C3DSMeshFileLoader()
 	if (FileSystem)
 		FileSystem->drop();
 
-	if (Driver)
-		Driver->drop();
-
 	if (Mesh)
 		Mesh->drop();
 }
 
 
-
 //! returns true if the file maybe is able to be loaded by this class
 //! based on the file extension (e.g. ".bsp")
 bool C3DSMeshFileLoader::isALoadableFileExtension(const c8* filename) const
@@ -141,7 +153,6 @@ bool C3DSMeshFileLoader::isALoadableFileExtension(const c8* filename) const
 }
 
 
-
 //! creates/loads an animated mesh from the file.
 //! \return Pointer to the created mesh. Returns 0 if loading failed.
 //! If you no longer need the mesh, you should call IAnimatedMesh::drop().
@@ -168,8 +179,6 @@ IAnimatedMesh* C3DSMeshFileLoader::createMesh(io::IReadFile* file)
 	if (readChunk(file, &data))
 	{
 		// success
-		SAnimatedMesh* am = new SAnimatedMesh();
-		am->Type = EAMT_3DS;
 
 		for (u32 i=0; i<Mesh->getMeshBufferCount(); ++i)
 		{
@@ -181,11 +190,27 @@ IAnimatedMesh* C3DSMeshFileLoader::createMesh(io::IReadFile* file)
 				mb->drop();
 			}
 			else
-				mb->recalculateBoundingBox();
+			{
+				if (mb->Material.MaterialType == video::EMT_PARALLAX_MAP_SOLID)
+				{
+					SMesh tmp;
+					tmp.addMeshBuffer(mb);
+					mb->drop();
+					IMesh* tangentMesh = SceneManager->getMeshManipulator()->createMeshWithTangents(&tmp);
+					Mesh->MeshBuffers[i]=tangentMesh->getMeshBuffer(0);
+					// we need to grab because we replace the buffer manually.
+					Mesh->MeshBuffers[i]->grab();
+					// clean up intermediate mesh struct
+					tangentMesh->drop();
+				}
+				Mesh->MeshBuffers[i]->recalculateBoundingBox();
+			}
 		}
 
 		Mesh->recalculateBoundingBox();
 
+		SAnimatedMesh* am = new SAnimatedMesh();
+		am->Type = EAMT_3DS;
 		am->addMesh(Mesh);
 		am->recalculateBoundingBox();
 		Mesh->drop();
@@ -203,6 +228,10 @@ IAnimatedMesh* C3DSMeshFileLoader::createMesh(io::IReadFile* file)
 bool C3DSMeshFileLoader::readPercentageChunk(io::IReadFile* file,
 					ChunkData* chunk, f32& percentage)
 {
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load percentage chunk.");
+#endif
+
 	ChunkData data;
 	readChunkData(file, data);
 
@@ -251,6 +280,9 @@ bool C3DSMeshFileLoader::readPercentageChunk(io::IReadFile* file,
 bool C3DSMeshFileLoader::readColorChunk(io::IReadFile* file, ChunkData* chunk,
 					video::SColor& out)
 {
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load color chunk.");
+#endif
 	ChunkData data;
 	readChunkData(file, data);
 
@@ -299,6 +331,9 @@ bool C3DSMeshFileLoader::readColorChunk(io::IReadFile* file, ChunkData* chunk,
 
 bool C3DSMeshFileLoader::readMaterialChunk(io::IReadFile* file, ChunkData* parent)
 {
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load material chunk.");
+#endif
 	u16 matSection=0;
 
 	while(parent->read < parent->header.length)
@@ -331,6 +366,7 @@ bool C3DSMeshFileLoader::readMaterialChunk(io::IReadFile* file, ChunkData* paren
 			break;
 		case C3DS_MATSHININESS:
 			readPercentageChunk(file, &data, CurrentMaterial.Material.Shininess);
+			CurrentMaterial.Material.Shininess = (1.f-CurrentMaterial.Material.Shininess)*128.f;
 			break;
 		case C3DS_TRANSPARENCY:
 			{
@@ -387,11 +423,32 @@ bool C3DSMeshFileLoader::readMaterialChunk(io::IReadFile* file, ChunkData* paren
 		case C3DS_MATBUMPMAP:
 			{
 				matSection=data.header.id;
-#if 0 // Should contain a percentage chunk, but does not work with the meshes
-				f32 percentage=0;
-				if (matSection!=C3DS_MATREFLMAP)
-					readPercentageChunk(file, &data, percentage);
+				// Should contain a percentage chunk, but does
+				// not always have it
+				s16 testval;
+				const long pos = file->getPos();
+				file->read(&testval, 2);
+#ifdef __BIG_ENDIAN__
+				testval = os::Byteswap::byteswap(testval);
 #endif
+				file->seek(pos, false);
+				if ((testval == C3DS_PERCENTAGE_I) ||
+					(testval == C3DS_PERCENTAGE_F))
+				switch (matSection)
+				{
+				case C3DS_MATTEXMAP:
+					readPercentageChunk(file, &data, CurrentMaterial.Strength[0]);
+				break;
+				case C3DS_MATSPECMAP:
+					readPercentageChunk(file, &data, CurrentMaterial.Strength[1]);
+				break;
+				case C3DS_MATOPACMAP:
+					readPercentageChunk(file, &data, CurrentMaterial.Strength[2]);
+				break;
+				case C3DS_MATBUMPMAP:
+					readPercentageChunk(file, &data, CurrentMaterial.Strength[4]);
+				break;
+				}
 			}
 			break;
 		case C3DS_MATMAPFILE:
@@ -399,16 +456,24 @@ bool C3DSMeshFileLoader::readMaterialChunk(io::IReadFile* file, ChunkData* paren
 				// read texture file name
 				c8* c = new c8[data.header.length - data.read];
 				file->read(c, data.header.length - data.read);
-				if (matSection == C3DS_MATTEXMAP)
+				switch (matSection)
+				{
+				case C3DS_MATTEXMAP:
 					CurrentMaterial.Filename[0] = c;
-				else if (matSection == C3DS_MATSPECMAP)
+				break;
+				case C3DS_MATSPECMAP:
 					CurrentMaterial.Filename[1] = c;
-				else if (matSection == C3DS_MATOPACMAP)
+				break;
+				case C3DS_MATOPACMAP:
 					CurrentMaterial.Filename[2] = c;
-				else if (matSection == C3DS_MATREFLMAP)
+				break;
+				case C3DS_MATREFLMAP:
 					CurrentMaterial.Filename[3] = c;
-				else if (matSection == C3DS_MATBUMPMAP)
+				break;
+				case C3DS_MATBUMPMAP:
 					CurrentMaterial.Filename[4] = c;
+				break;
+				}
 				data.read += data.header.length - data.read;
 				delete [] c;
 			}
@@ -433,6 +498,27 @@ bool C3DSMeshFileLoader::readMaterialChunk(io::IReadFile* file, ChunkData* paren
 #ifdef __BIG_ENDIAN__
 				value = os::Byteswap::byteswap(value);
 #endif
+				u32 i=0;
+				if (matSection != C3DS_MATTEXMAP)
+					i=1;
+				u32 j=0,k=0;
+				if (data.header.id == C3DS_MAT_VSCALE)
+				{
+					j=1;
+					k=1;
+				}
+				else if (data.header.id == C3DS_MAT_UOFFSET)
+				{
+					j=2;
+					k=0;
+				}
+				else if (data.header.id == C3DS_MAT_VOFFSET)
+				{
+					j=2;
+					k=1;
+				}
+				CurrentMaterial.Material.getTextureMatrix(i)(j,k)=value;
+
 				data.read += 4;
 			}
 			break;
@@ -456,6 +542,9 @@ bool C3DSMeshFileLoader::readMaterialChunk(io::IReadFile* file, ChunkData* paren
 bool C3DSMeshFileLoader::readTrackChunk(io::IReadFile* file, ChunkData& data,
 					IMeshBuffer* mb, const core::vector3df& pivot)
 {
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load track chunk.");
+#endif
 	u16 flags;
 	u32 flags2;
 	// Track flags
@@ -503,8 +592,8 @@ bool C3DSMeshFileLoader::readTrackChunk(io::IReadFile* file, ChunkData& data,
 	file->read(&vec.Z, sizeof(f32));
 #ifdef __BIG_ENDIAN__
 	vec.X = os::Byteswap::byteswap(vec.X);
-	vec.Y = os::Byteswap::byteswap(vec.X);
-	vec.Z = os::Byteswap::byteswap(vec.X);
+	vec.Y = os::Byteswap::byteswap(vec.Y);
+	vec.Z = os::Byteswap::byteswap(vec.Z);
 #endif
 	data.read += 12;
 	vec-=pivot;
@@ -534,9 +623,11 @@ bool C3DSMeshFileLoader::readTrackChunk(io::IReadFile* file, ChunkData& data,
 }
 
 
-
 bool C3DSMeshFileLoader::readFrameChunk(io::IReadFile* file, ChunkData* parent)
 {
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load frame chunk.");
+#endif
 	ChunkData data;
 
 	//KF_HDR is always at the beginning
@@ -545,22 +636,26 @@ bool C3DSMeshFileLoader::readFrameChunk(io::IReadFile* file, ChunkData* parent)
 		return false;
 	else
 	{
-		u16 flags;
-		file->read(&flags, 2);
-#ifdef __BIG_ENDIAN__
-		flags = os::Byteswap::byteswap(flags);
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load keyframe header.");
 #endif
-		c8* c = new c8[data.header.length - data.read-4];
-		file->read(c, data.header.length - data.read-4);
-		file->read(&flags, 2);
+		u16 version;
+		file->read(&version, 2);
+#ifdef __BIG_ENDIAN__
+		version = os::Byteswap::byteswap(version);
+#endif
+		core::stringc name;
+		readString(file, data, name);
+		u32 flags;
+		file->read(&flags, 4);
 #ifdef __BIG_ENDIAN__
 		flags = os::Byteswap::byteswap(flags);
 #endif
 
-		data.read += data.header.length - data.read;
+		data.read += 4;
 		parent->read += data.read;
-		delete [] c;
 	}
+	data.read=0;
 
 	IMeshBuffer* mb=0;
 	core::vector3df pivot,bboxCenter;
@@ -572,26 +667,35 @@ bool C3DSMeshFileLoader::readFrameChunk(io::IReadFile* file, ChunkData* parent)
 		{
 		case C3DS_OBJECT_TAG:
 			{
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load object tag.");
+#endif
 				mb=0;
 				pivot.set(0.0f, 0.0f, 0.0f);
 			}
 			break;
 		case C3DS_KF_SEG:
 			{
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load keyframe segment.");
+#endif
 				u32 flags;
 				file->read(&flags, 4);
 #ifdef __BIG_ENDIAN__
-		flags = os::Byteswap::byteswap(flags);
+				flags = os::Byteswap::byteswap(flags);
 #endif
 				file->read(&flags, 4);
 #ifdef __BIG_ENDIAN__
-		flags = os::Byteswap::byteswap(flags);
+				flags = os::Byteswap::byteswap(flags);
 #endif
 				data.read += 8;
 			}
 			break;
 		case C3DS_KF_NODE_HDR:
 			{
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load keyframe node header.");
+#endif
 				s16 flags;
 				c8* c = new c8[data.header.length - data.read-6];
 				file->read(c, data.header.length - data.read-6);
@@ -624,6 +728,9 @@ bool C3DSMeshFileLoader::readFrameChunk(io::IReadFile* file, ChunkData* parent)
 			break;
 		case C3DS_KF_CURTIME:
 			{
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load keyframe current time.");
+#endif
 				u32 flags;
 				file->read(&flags, 4);
 #ifdef __BIG_ENDIAN__
@@ -634,6 +741,9 @@ bool C3DSMeshFileLoader::readFrameChunk(io::IReadFile* file, ChunkData* parent)
 			break;
 		case C3DS_NODE_ID:
 			{
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load node ID.");
+#endif
 				u16 flags;
 				file->read(&flags, 2);
 #ifdef __BIG_ENDIAN__
@@ -644,6 +754,9 @@ bool C3DSMeshFileLoader::readFrameChunk(io::IReadFile* file, ChunkData* parent)
 			break;
 		case C3DS_PIVOTPOINT:
 			{
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load pivot point.");
+#endif
 				file->read(&pivot.X, sizeof(f32));
 				file->read(&pivot.Y, sizeof(f32));
 				file->read(&pivot.Z, sizeof(f32));
@@ -657,6 +770,9 @@ bool C3DSMeshFileLoader::readFrameChunk(io::IReadFile* file, ChunkData* parent)
 			break;
 		case C3DS_BOUNDBOX:
 			{
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load bounding box.");
+#endif
 				core::aabbox3df bbox;
 				// abuse bboxCenter as temporary variable
 				file->read(&bboxCenter.X, sizeof(f32));
@@ -681,6 +797,19 @@ bool C3DSMeshFileLoader::readFrameChunk(io::IReadFile* file, ChunkData* parent)
 				data.read += 24;
 			}
 			break;
+		case C3DS_MORPH_SMOOTH:
+			{
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load morph smooth.");
+#endif
+				f32 flag;
+				file->read(&flag, 4);
+#ifdef __BIG_ENDIAN__
+				flag = os::Byteswap::byteswap(flag);
+#endif
+				data.read += 4;
+			}
+			break;
 		case C3DS_POS_TRACK_TAG:
 		case C3DS_ROT_TRACK_TAG:
 		case C3DS_SCL_TRACK_TAG:
@@ -700,7 +829,6 @@ bool C3DSMeshFileLoader::readFrameChunk(io::IReadFile* file, ChunkData* parent)
 }
 
 
-
 bool C3DSMeshFileLoader::readChunk(io::IReadFile* file, ChunkData* parent)
 {
 	while(parent->read < parent->header.length)
@@ -764,9 +892,11 @@ bool C3DSMeshFileLoader::readChunk(io::IReadFile* file, ChunkData* parent)
 }
 
 
-
 bool C3DSMeshFileLoader::readObjectChunk(io::IReadFile* file, ChunkData* parent)
 {
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load object chunk.");
+#endif
 	while(parent->read < parent->header.length)
 	{
 		ChunkData data;
@@ -889,8 +1019,7 @@ void C3DSMeshFileLoader::composeObject(io::IReadFile* file, const core::stringc&
 			mb->getMaterial() = Materials[0].Material;
 			mb->drop();
 			// add an empty mesh buffer name
-			core::stringc c = "";
-			MeshBufferNames.push_back(c);
+			MeshBufferNames.push_back("");
 		}
 	}
 
@@ -900,7 +1029,7 @@ void C3DSMeshFileLoader::composeObject(io::IReadFile* file, const core::stringc&
 		video::SMaterial* mat=0;
 		u32 mbPos;
 		// -3 because we add three vertices at once
-		u32 maxPrimitives = core::min_(Driver->getMaximalPrimitiveCount(), (u32)((1<<16)-1))-3; // currently hardcoded s16 max value for index pointers
+		u32 maxPrimitives = core::min_(SceneManager->getVideoDriver()->getMaximalPrimitiveCount(), (u32)((1<<16)-1))-3; // currently hardcoded s16 max value for index pointers
 
 		// find mesh buffer for this group
 		for (mbPos=0; mbPos<Materials.size(); ++mbPos)
@@ -938,7 +1067,7 @@ void C3DSMeshFileLoader::composeObject(io::IReadFile* file, const core::stringc&
 					mb->drop();
 					Mesh->MeshBuffers[mbPos] = Mesh->MeshBuffers.getLast();
 					Mesh->MeshBuffers[Mesh->MeshBuffers.size()-1] = tmp;
-					mb->getMaterial() = *mat;
+					mb->getMaterial() = tmp->getMaterial();
 					vtxCount=0;
 				}
 
@@ -986,24 +1115,6 @@ void C3DSMeshFileLoader::composeObject(io::IReadFile* file, const core::stringc&
 }
 
 
-core::stringc C3DSMeshFileLoader::getTextureFileName(const core::stringc& texture, 
-						 core::stringc& model)
-{
-	s32 idx = -1;
-	idx = model.findLast('/');
-
-	if (idx == -1)
-		idx = model.findLast('\\');
-
-	if (idx == -1)
-		return core::stringc();
-
-	core::stringc p = model.subString(0, idx+1);
-	p.append(texture);
-	return p;
-}
-
-
 void C3DSMeshFileLoader::loadMaterials(io::IReadFile* file)
 {
 	// create a mesh buffer for every material
@@ -1022,15 +1133,15 @@ void C3DSMeshFileLoader::loadMaterials(io::IReadFile* file)
 		m->getMaterial() = Materials[i].Material;
 		if (Materials[i].Filename[0].size())
 		{
-			video::ITexture* texture = Driver->getTexture(Materials[i].Filename[0].c_str());
+			video::ITexture* texture = 0;
+			if (FileSystem->existFile(Materials[i].Filename[0].c_str()))
+				texture = SceneManager->getVideoDriver()->getTexture(Materials[i].Filename[0].c_str());
 			if (!texture)
 			{
-				core::stringc fname = getTextureFileName(
-					Materials[i].Filename[0], modelFilename);
-				if (fname.size())
-					texture = Driver->getTexture(fname.c_str());				
+				const core::stringc fname = FileSystem->getFileDir(modelFilename) + "/" + FileSystem->getFileBasename(Materials[i].Filename[0]);
+				if (FileSystem->existFile(fname.c_str()))
+					texture = SceneManager->getVideoDriver()->getTexture(fname.c_str());				
 			}
-
 			if (!texture)
 				os::Printer::log("Could not load a texture for entry in 3ds file",
 					Materials[i].Filename[0].c_str(), ELL_WARNING);
@@ -1040,16 +1151,15 @@ void C3DSMeshFileLoader::loadMaterials(io::IReadFile* file)
 
 		if (Materials[i].Filename[2].size())
 		{
-			video::ITexture* texture = Driver->getTexture(Materials[i].Filename[2].c_str());
-
+			video::ITexture* texture = 0;
+			if (FileSystem->existFile(Materials[i].Filename[2].c_str()))
+				texture = SceneManager->getVideoDriver()->getTexture(Materials[i].Filename[2].c_str());
 			if (!texture)
 			{
-				core::stringc fname = getTextureFileName(
-					Materials[i].Filename[2], modelFilename);
-				if (fname.size())
-					texture = Driver->getTexture(fname.c_str());				
+				const core::stringc fname = FileSystem->getFileDir(modelFilename) + "/" + FileSystem->getFileBasename(Materials[i].Filename[2]);
+				if (FileSystem->existFile(fname.c_str()))
+					texture = SceneManager->getVideoDriver()->getTexture(fname.c_str());				
 			}
-
 			if (!texture)
 			{
 				os::Printer::log("Could not load a texture for entry in 3ds file",
@@ -1064,14 +1174,14 @@ void C3DSMeshFileLoader::loadMaterials(io::IReadFile* file)
 
 		if (Materials[i].Filename[3].size())
 		{
-			video::ITexture* texture = Driver->getTexture(Materials[i].Filename[3].c_str());
-
+			video::ITexture* texture = 0;
+			if (FileSystem->existFile(Materials[i].Filename[3].c_str()))
+				texture = SceneManager->getVideoDriver()->getTexture(Materials[i].Filename[3].c_str());
 			if (!texture)
 			{
-				core::stringc fname = getTextureFileName(
-					Materials[i].Filename[3], modelFilename);
-				if (fname.size())
-					texture = Driver->getTexture(fname.c_str());				
+				const core::stringc fname = FileSystem->getFileDir(modelFilename) + "/" + FileSystem->getFileBasename(Materials[i].Filename[3]);
+				if (FileSystem->existFile(fname.c_str()))
+					texture = SceneManager->getVideoDriver()->getTexture(fname.c_str());				
 			}
 
 			if (!texture)
@@ -1089,25 +1199,24 @@ void C3DSMeshFileLoader::loadMaterials(io::IReadFile* file)
 
 		if (Materials[i].Filename[4].size())
 		{
-			video::ITexture* texture = Driver->getTexture(Materials[i].Filename[4].c_str());
-
+			video::ITexture* texture = 0;
+			if (FileSystem->existFile(Materials[i].Filename[4].c_str()))
+				texture = SceneManager->getVideoDriver()->getTexture(Materials[i].Filename[4].c_str());
 			if (!texture)
 			{
-				core::stringc fname = getTextureFileName(
-					Materials[i].Filename[4], modelFilename);
-				if (fname.size())
-					texture = Driver->getTexture(fname.c_str());				
+				const core::stringc fname = FileSystem->getFileDir(modelFilename) + "/" + FileSystem->getFileBasename(Materials[i].Filename[4]);
+				if (FileSystem->existFile(fname.c_str()))
+					texture = SceneManager->getVideoDriver()->getTexture(fname.c_str());				
 			}
-
 			if (!texture)
 				os::Printer::log("Could not load a texture for entry in 3ds file",
 					Materials[i].Filename[4].c_str(), ELL_WARNING);
 			else
 			{
 				m->getMaterial().setTexture(1, texture);
-				Driver->makeNormalMapTexture(texture, 9.0f);
+				SceneManager->getVideoDriver()->makeNormalMapTexture(texture, Materials[i].Strength[4]*10.f);
 				m->getMaterial().MaterialType=video::EMT_PARALLAX_MAP_SOLID;
-				m->getMaterial().MaterialTypeParam=0.035f;
+				m->getMaterial().MaterialTypeParam=.035f;
 			}
 		}
 
@@ -1134,10 +1243,11 @@ void C3DSMeshFileLoader::cleanUp()
 }
 
 
-
-
 void C3DSMeshFileLoader::readTextureCoords(io::IReadFile* file, ChunkData& data)
 {
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load texture coords.");
+#endif
 	file->read(&CountTCoords, sizeof(CountTCoords));
 #ifdef __BIG_ENDIAN__
 	CountTCoords = os::Byteswap::byteswap(CountTCoords);
@@ -1163,6 +1273,9 @@ void C3DSMeshFileLoader::readTextureCoords(io::IReadFile* file, ChunkData& data)
 
 void C3DSMeshFileLoader::readMaterialGroup(io::IReadFile* file, ChunkData& data)
 {
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load material group.");
+#endif
 	SMaterialGroup group;
 
 	readString(file, data, group.MaterialName);
@@ -1188,6 +1301,9 @@ void C3DSMeshFileLoader::readMaterialGroup(io::IReadFile* file, ChunkData& data)
 
 void C3DSMeshFileLoader::readIndices(io::IReadFile* file, ChunkData& data)
 {
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load indices.");
+#endif
 	file->read(&CountFaces, sizeof(CountFaces));
 #ifdef __BIG_ENDIAN__
 	CountFaces = os::Byteswap::byteswap(CountFaces);
@@ -1208,9 +1324,11 @@ void C3DSMeshFileLoader::readIndices(io::IReadFile* file, ChunkData& data)
 }
 
 
-
 void C3DSMeshFileLoader::readVertices(io::IReadFile* file, ChunkData& data)
 {
+#ifdef _IRR_DEBUG_3DS_LOADER_
+	os::Printer::log("Load vertices.");
+#endif
 	file->read(&CountVertices, sizeof(CountVertices));
 #ifdef __BIG_ENDIAN__
 	CountVertices = os::Byteswap::byteswap(CountVertices);
@@ -1234,7 +1352,6 @@ void C3DSMeshFileLoader::readVertices(io::IReadFile* file, ChunkData& data)
 }
 
 
-
 void C3DSMeshFileLoader::readChunkData(io::IReadFile* file, ChunkData& data)
 {
 	file->read(&data.header, sizeof(ChunkHeader));
@@ -1256,9 +1373,8 @@ void C3DSMeshFileLoader::readString(io::IReadFile* file, ChunkData& data, core::
 		file->read(&c, sizeof(c8));
 		if (c)
 			out.append(c);
-
-		++data.read;
 	}
+	data.read+=out.size()+1;
 }
 
 
@@ -1266,3 +1382,4 @@ void C3DSMeshFileLoader::readString(io::IReadFile* file, ChunkData& data, core::
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_3DS_LOADER_
+
diff --git a/src/dep/src/irrlicht/C3DSMeshFileLoader.h b/src/dep/src/irrlicht/C3DSMeshFileLoader.h
index 63820ca..9add65f 100644
--- a/src/dep/src/irrlicht/C3DSMeshFileLoader.h
+++ b/src/dep/src/irrlicht/C3DSMeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -7,10 +7,9 @@
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
-#include "IVideoDriver.h"
+#include "ISceneManager.h"
 #include "irrString.h"
 #include "SMesh.h"
-#include "IMeshManipulator.h"
 #include "matrix4.h"
 
 namespace irr
@@ -24,7 +23,7 @@ class C3DSMeshFileLoader : public IMeshLoader
 public:
 
 	//! Constructor
-	C3DSMeshFileLoader(IMeshManipulator* manip,io::IFileSystem* fs, video::IVideoDriver* driver);
+	C3DSMeshFileLoader(ISceneManager* smgr, io::IFileSystem* fs);
 
 	//! destructor
 	virtual ~C3DSMeshFileLoader();
@@ -84,11 +83,17 @@ private:
 			Filename[2]="";
 			Filename[3]="";
 			Filename[4]="";
+			Strength[0]=0.f;
+			Strength[1]=0.f;
+			Strength[2]=0.f;
+			Strength[3]=0.f;
+			Strength[4]=0.f;
 		}
 
 		video::SMaterial Material;
 		core::stringc Name;
 		core::stringc Filename[5];
+		f32 Strength[5];
 	};
 
 	struct SMaterialGroup
@@ -145,10 +150,9 @@ private:
 	void composeObject(io::IReadFile* file, const core::stringc& name);
 	void loadMaterials(io::IReadFile* file);
 	void cleanUp();
-	core::stringc getTextureFileName(const core::stringc& texture, core::stringc& model);
 
+	scene::ISceneManager* SceneManager;
 	io::IFileSystem* FileSystem;
-	video::IVideoDriver* Driver;
 
 	f32* Vertices;
 	u16* Indices;
@@ -166,8 +170,6 @@ private:
 	core::matrix4 TransformationMatrix;
 
 	SMesh* Mesh;
-
-	IMeshManipulator* Manipulator;
 };
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CAnimatedMeshMD2.cpp b/src/dep/src/irrlicht/CAnimatedMeshMD2.cpp
index b01a49e..01de7b7 100644
--- a/src/dep/src/irrlicht/CAnimatedMeshMD2.cpp
+++ b/src/dep/src/irrlicht/CAnimatedMeshMD2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,9 +6,7 @@
 #ifdef _IRR_COMPILE_WITH_MD2_LOADER_
 
 #include "CAnimatedMeshMD2.h"
-#include "os.h"
 #include "SColor.h"
-#include "IReadFile.h"
 #include "irrMath.h"
 
 namespace irr
@@ -16,85 +14,8 @@ namespace irr
 namespace scene
 {
 
-#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__) 
-#	pragma pack( push, packing )
-#	pragma pack( 1 )
-#	define PACK_STRUCT
-#elif defined( __GNUC__ )
-#	define PACK_STRUCT	__attribute__((packed))
-#else
-#	error compiler not supported
-#endif
-
-	// structs needed to load the md2-format
-
-	const s32 MD2_MAGIC_NUMBER = 844121161;
-	const s32 MD2_VERSION		= 8;
-	const s32 MD2_MAX_VERTS		= 2048;
-
-	// TA: private
-	const s32 MD2_FRAME_SHIFT	= 2;
-	const f32 MD2_FRAME_SHIFT_RECIPROCAL = 1.f / ( 1 << MD2_FRAME_SHIFT );
-
-	struct SMD2Header
-	{
-		s32 magic;
-		s32 version;
-		s32 skinWidth;
-		s32 skinHeight;
-		s32 frameSize;
-		s32 numSkins;
-		s32 numVertices;
-		s32 numTexcoords;
-		s32 numTriangles;
-		s32 numGlCommands;
-		s32 numFrames;
-		s32 offsetSkins;
-		s32 offsetTexcoords;
-		s32 offsetTriangles;
-		s32 offsetFrames;
-		s32 offsetGlCommands;
-		s32 offsetEnd;
-	} PACK_STRUCT;
-
-	struct SMD2Vertex
-	{
-		u8 vertex[3];
-		u8 lightNormalIndex;
-	} PACK_STRUCT;
-
-	struct SMD2Frame
-	{
-		f32	scale[3];
-		f32	translate[3];
-		c8	name[16];
-		SMD2Vertex vertices[1];
-	} PACK_STRUCT;
-
-	struct SMD2Triangle
-	{
-		u16 vertexIndices[3];
-		u16 textureIndices[3];
-	} PACK_STRUCT;
-
-	struct SMD2TextureCoordinate
-	{
-		s16 s;
-		s16 t;
-	} PACK_STRUCT;
-
-	struct SMD2GLCommand
-	{
-		f32 s, t;
-		s32 vertexIndex;
-	} PACK_STRUCT;
-
-// Default alignment
-#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__) 
-#	pragma pack( pop, packing )
-#endif
-
-#undef PACK_STRUCT
+const s32 MD2_FRAME_SHIFT	= 2;
+const f32 MD2_FRAME_SHIFT_RECIPROCAL = 1.f / ( 1 << MD2_FRAME_SHIFT );
 
 
 const s32 Q2_VERTEX_NORMAL_TABLE_SIZE = 162;
@@ -299,25 +220,24 @@ static const SMD2AnimationType MD2AnimationTypeList[21] =
 
 //! constructor
 CAnimatedMeshMD2::CAnimatedMeshMD2()
-: FrameList(0), FrameCount(0), TriangleCount(0)
+: InterpolationBuffer(0), FrameList(0), FrameCount(0)
 {
 	#ifdef _DEBUG
 	IAnimatedMesh::setDebugName("CAnimatedMeshMD2 IAnimatedMesh");
 	IMesh::setDebugName("CAnimatedMeshMD2 IMesh");
 	#endif
+	InterpolationBuffer = new SMeshBuffer;
 }
 
 
-
 //! destructor
 CAnimatedMeshMD2::~CAnimatedMeshMD2()
 {
-	if (FrameList)
-		delete [] FrameList;
+	delete [] FrameList;
+	if (InterpolationBuffer)
+		InterpolationBuffer->drop();
 }
 
-
-
 //! returns the amount of frames in milliseconds. If the amount is 1, it is a static (=non animated) mesh.
 u32 CAnimatedMeshMD2::getFrameCount() const
 {
@@ -325,17 +245,16 @@ u32 CAnimatedMeshMD2::getFrameCount() const
 }
 
 
-
 //! returns the animated mesh based on a detail level. 0 is the lowest, 255 the highest detail. Note, that some Meshes will ignore the detail level.
 IMesh* CAnimatedMeshMD2::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop)
 {
-	if ((u32)frame > (FrameCount<<MD2_FRAME_SHIFT))
-		frame = (frame % (FrameCount<<MD2_FRAME_SHIFT));
+	if ((u32)frame > getFrameCount())
+		frame = (frame % getFrameCount());
 
 	if (startFrameLoop == -1 && endFrameLoop == -1)
 	{
 		startFrameLoop = 0;
-		endFrameLoop = FrameCount<<MD2_FRAME_SHIFT;
+		endFrameLoop = getFrameCount();
 	}
 
 	updateInterpolationBuffer(frame, startFrameLoop, endFrameLoop);
@@ -343,7 +262,7 @@ IMesh* CAnimatedMeshMD2::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop,
 }
 
 
-//! returns amount of mesh buffers.
+//! returns amount of mesh buffers. MD2 meshes only have one buffer
 u32 CAnimatedMeshMD2::getMeshBufferCount() const
 {
 	return 1;
@@ -353,15 +272,18 @@ u32 CAnimatedMeshMD2::getMeshBufferCount() const
 //! returns pointer to a mesh buffer
 IMeshBuffer* CAnimatedMeshMD2::getMeshBuffer(u32 nr) const
 {
-	return const_cast<IMeshBuffer*>(reinterpret_cast<const IMeshBuffer*>(&InterpolationBuffer));
+	if (nr == 0)
+		return InterpolationBuffer;
+	else
+		return 0;
 }
 
 
 //! Returns pointer to a mesh buffer which fits a material
 IMeshBuffer* CAnimatedMeshMD2::getMeshBuffer(const video::SMaterial &material) const
 {
-	if (InterpolationBuffer.Material == material)
-		return const_cast<IMeshBuffer*>(reinterpret_cast<const IMeshBuffer*>(&InterpolationBuffer));
+	if (InterpolationBuffer->Material == material)
+		return InterpolationBuffer;
 	else
 		return 0;
 }
@@ -372,6 +294,7 @@ void CAnimatedMeshMD2::updateInterpolationBuffer(s32 frame, s32 startFrameLoop,
 {
 	u32 firstFrame, secondFrame;
 	f32 div;
+	core::vector3df* NormalTable = (core::vector3df*)&Q2_VERTEX_NORMAL_TABLE;
 
 	// TA: resolve missing ipol in loop between end-start
 
@@ -398,267 +321,39 @@ void CAnimatedMeshMD2::updateInterpolationBuffer(s32 frame, s32 startFrameLoop,
 		div = frame * MD2_FRAME_SHIFT_RECIPROCAL;
 	}
 
-	video::S3DVertex* target = reinterpret_cast<video::S3DVertex*>(InterpolationBuffer.getVertices());
-	video::S3DVertex* first = FrameList[firstFrame].pointer();
-	video::S3DVertex* second = FrameList[secondFrame].pointer();
-
-	s32 count = FrameList[firstFrame].size();
+	video::S3DVertex* target = static_cast<video::S3DVertex*>(InterpolationBuffer->getVertices());
+	SMD2Vert*         first  = FrameList[firstFrame].pointer();
+	SMD2Vert*         second = FrameList[secondFrame].pointer();
 
 	// interpolate both frames
-	for (s32 i=0; i<count; ++i)
+	const u32 count = FrameList[firstFrame].size();
+	for (u32 i=0; i<count; ++i)
 	{
-		target->Pos = (second->Pos - first->Pos) * div + first->Pos;
-		target->Normal = (second->Normal - first->Normal) * div + first->Normal;
+		core::vector3df one, two;
+		one.X = f32(first->Pos.X) * FrameTransforms[firstFrame].scale.X + FrameTransforms[firstFrame].translate.X;
+		one.Y = f32(first->Pos.Y) * FrameTransforms[firstFrame].scale.Y + FrameTransforms[firstFrame].translate.Y;
+		one.Z = f32(first->Pos.Z) * FrameTransforms[firstFrame].scale.Z + FrameTransforms[firstFrame].translate.Z;
+		two.X = f32(second->Pos.X) * FrameTransforms[secondFrame].scale.X + FrameTransforms[secondFrame].translate.X;
+		two.Y = f32(second->Pos.Y) * FrameTransforms[secondFrame].scale.Y + FrameTransforms[secondFrame].translate.Y;
+		two.Z = f32(second->Pos.Z) * FrameTransforms[secondFrame].scale.Z + FrameTransforms[secondFrame].translate.Z;
+		target->Pos    = (two - one) * div + one;
 
+		target->Normal = (NormalTable[second->NormalIdx] - NormalTable[first->NormalIdx]) * div 
+			           +  NormalTable[first->NormalIdx];
 		++target;
 		++first;
 		++second;
 	}
 
 	//update bounding box
-	InterpolationBuffer.setBoundingBox(BoxList[secondFrame].getInterpolated(BoxList[firstFrame], div));
+	InterpolationBuffer->setBoundingBox(BoxList[secondFrame].getInterpolated(BoxList[firstFrame], div));
+	InterpolationBuffer->setDirty();
 }
 
-
-//! loads an md2 file
-bool CAnimatedMeshMD2::loadFile(io::IReadFile* file)
-{
-	if (!file)
-		return false;
-
-	SMD2Header header;
-
-	file->read(&header, sizeof(SMD2Header));
-
-#ifdef __BIG_ENDIAN__
-	header.magic = os::Byteswap::byteswap(header.magic);
-	header.version = os::Byteswap::byteswap(header.version);
-	header.skinWidth = os::Byteswap::byteswap(header.skinWidth);
-	header.skinHeight = os::Byteswap::byteswap(header.skinHeight);
-	header.frameSize = os::Byteswap::byteswap(header.frameSize);
-	header.numSkins = os::Byteswap::byteswap(header.numSkins);
-	header.numVertices = os::Byteswap::byteswap(header.numVertices);
-	header.numTexcoords = os::Byteswap::byteswap(header.numTexcoords);
-	header.numTriangles = os::Byteswap::byteswap(header.numTriangles);
-	header.numGlCommands = os::Byteswap::byteswap(header.numGlCommands);
-	header.numFrames = os::Byteswap::byteswap(header.numFrames);
-	header.offsetSkins = os::Byteswap::byteswap(header.offsetSkins);
-	header.offsetTexcoords = os::Byteswap::byteswap(header.offsetTexcoords);
-	header.offsetTriangles = os::Byteswap::byteswap(header.offsetTriangles);
-	header.offsetFrames = os::Byteswap::byteswap(header.offsetFrames);
-	header.offsetGlCommands = os::Byteswap::byteswap(header.offsetGlCommands);
-	header.offsetEnd = os::Byteswap::byteswap(header.offsetEnd);
-#endif
-
-	if (header.magic != MD2_MAGIC_NUMBER || header.version != MD2_VERSION)
-	{
-		os::Printer::log("MD2 Loader: Wrong file header", file->getFileName(), ELL_WARNING);
-		return false;
-	}
-
-	// create Memory for indices and frames
-
-	TriangleCount = header.numTriangles;
-	if (FrameList)
-		delete [] FrameList;
-	FrameList = new core::array<video::S3DVertex>[header.numFrames];
-	FrameCount = header.numFrames;
-
-	s32 i;
-
-	for (i=0; i<header.numFrames; ++i)
-		FrameList[i].reallocate(header.numVertices);
-
-	// read TextureCoords
-
-	file->seek(header.offsetTexcoords);
-	SMD2TextureCoordinate* textureCoords = new SMD2TextureCoordinate[header.numTexcoords];
-
-	if (!file->read(textureCoords, sizeof(SMD2TextureCoordinate)*header.numTexcoords))
-	{
-		os::Printer::log("MD2 Loader: Error reading TextureCoords.", file->getFileName(), ELL_ERROR);
-		return false;
-	}
-
-#ifdef __BIG_ENDIAN__
-	for (i=0; i<header.numTexcoords; ++i)
-	{
-		textureCoords[i].s = os::Byteswap::byteswap(textureCoords[i].s);
-		textureCoords[i].t = os::Byteswap::byteswap(textureCoords[i].t);
-	}
-#endif
-
-	// read Triangles
-
-	file->seek(header.offsetTriangles);
-
-	SMD2Triangle *triangles = new SMD2Triangle[header.numTriangles];
-	if (!file->read(triangles, header.numTriangles *sizeof(SMD2Triangle)))
-	{
-		os::Printer::log("MD2 Loader: Error reading triangles.", file->getFileName(), ELL_ERROR);
-		return false;
-	}
-
-#ifdef __BIG_ENDIAN__
-	for (i=0; i<header.numTriangles; ++i)
-	{
-		triangles[i].vertexIndices[0] = os::Byteswap::byteswap(triangles[i].vertexIndices[0]);
-		triangles[i].vertexIndices[1] = os::Byteswap::byteswap(triangles[i].vertexIndices[1]);
-		triangles[i].vertexIndices[2] = os::Byteswap::byteswap(triangles[i].vertexIndices[2]);
-		triangles[i].textureIndices[0] = os::Byteswap::byteswap(triangles[i].textureIndices[0]);
-		triangles[i].textureIndices[1] = os::Byteswap::byteswap(triangles[i].textureIndices[1]);
-		triangles[i].textureIndices[2] = os::Byteswap::byteswap(triangles[i].textureIndices[2]);
-	}
-#endif
-
-	// read Vertices
-
-	u8 buffer[MD2_MAX_VERTS*4+128];
-	SMD2Frame* frame = (SMD2Frame*)buffer;
-
-	core::array< core::vector3df >* vertices = new core::array< core::vector3df >[header.numFrames];
-	core::array< core::vector3df >* normals = new core::array< core::vector3df >[header.numFrames];
-
-	file->seek(header.offsetFrames);
-
-	for (i = 0; i<header.numFrames; ++i)
-	{
-		// read vertices
-
-		file->read(frame, header.frameSize);
-
-#ifdef __BIG_ENDIAN__
-		frame->scale[0] = os::Byteswap::byteswap(frame->scale[0]);
-		frame->scale[1] = os::Byteswap::byteswap(frame->scale[1]);
-		frame->scale[2] = os::Byteswap::byteswap(frame->scale[2]);
-		frame->translate[0] = os::Byteswap::byteswap(frame->translate[0]);
-		frame->translate[1] = os::Byteswap::byteswap(frame->translate[1]);
-		frame->translate[2] = os::Byteswap::byteswap(frame->translate[2]);
-#endif
-		// store frame data
-
-		SFrameData fdata;
-		fdata.begin = i;
-		fdata.end = i;
-		fdata.fps = 7;
-
-		if (frame->name[0])
-		{
-			for (s32 s = 0; frame->name[s]!=0 && (frame->name[s] < '0' ||
-				frame->name[s] > '9'); ++s)
-				fdata.name += frame->name[s];
-
-			if (!FrameData.empty() && FrameData[FrameData.size()-1].name == fdata.name)
-				++FrameData[FrameData.size()-1].end;
-			else
-				FrameData.push_back(fdata);
-		}
-
-		// add vertices
-
-		vertices[i].reallocate(header.numVertices);
-		for (s32 j=0; j<header.numVertices; ++j)
-		{
-			core::vector3df v;
-			v.X = frame->vertices[j].vertex[0] * frame->scale[0] + frame->translate[0];
-			v.Z = frame->vertices[j].vertex[1] * frame->scale[1] + frame->translate[1];
-			v.Y = frame->vertices[j].vertex[2] * frame->scale[2] + frame->translate[2];
-
-			vertices[i].push_back(v);
-
-			u8 normalidx = frame->vertices[j].lightNormalIndex;
-			if (normalidx < Q2_VERTEX_NORMAL_TABLE_SIZE)
-			{
-				v.X = Q2_VERTEX_NORMAL_TABLE[normalidx][0];
-				v.Z = Q2_VERTEX_NORMAL_TABLE[normalidx][1];
-				v.Y = Q2_VERTEX_NORMAL_TABLE[normalidx][2];
-			}
-
-			normals[i].push_back(v);
-		}
-
-		// calculate bounding boxes
-		if (header.numVertices)
-		{
-			core::aabbox3d<f32> box;
-			box.reset(vertices[i][0]);
-
-			for (s32 j=1; j<header.numVertices; ++j)
-				box.addInternalPoint(vertices[i][j]);
-
-			BoxList.push_back(box);
-		}
-
-	}
-
-	// put triangles into frame list
-
-	f32 dmaxs = 1.0f/(header.skinWidth);
-	f32 dmaxt = 1.0f/(header.skinHeight);
-
-	video::S3DVertex vtx;
-	vtx.Color = video::SColor(255,255,255,255);
-
-	for (s32 f = 0; f<header.numFrames; ++f)
-	{
-		core::array< core::vector3df >& vert = vertices[f];
-
-		for (s32 t=0; t<header.numTriangles; ++t)
-		{
-			for (s32 n=0; n<3; ++n)
-			{
-				vtx.Pos = vert[triangles[t].vertexIndices[n]];
-				vtx.Normal = normals[f].pointer()[triangles[t].vertexIndices[n]];
-				vtx.TCoords.X = (textureCoords[triangles[t].textureIndices[n]].s + 0.5f) * dmaxs;
-				vtx.TCoords.Y = (textureCoords[triangles[t].textureIndices[n]].t + 0.5f) * dmaxt;
-				FrameList[f].push_back(vtx);
-			}
-		}
-	}
-
-	// create indices
-
-	InterpolationBuffer.Indices.reallocate(header.numVertices);
-	s16 count = TriangleCount*3;
-	for (s16 n=0; n<count; n+=3)
-	{
-		InterpolationBuffer.Indices.push_back(n);
-		InterpolationBuffer.Indices.push_back(n+1);
-		InterpolationBuffer.Indices.push_back(n+2);
-	}
-
-	// reallocate interpolate buffer
-	if (header.numFrames)
-	{
-		u32 currCount = FrameList[0].size();
-		InterpolationBuffer.Vertices.set_used(currCount);
-
-		for (u32 num=0; num<currCount; ++num)
-		{
-			InterpolationBuffer.Vertices[num].TCoords = FrameList[0].pointer()[num].TCoords;
-			InterpolationBuffer.Vertices[num].Color = vtx.Color;
-		}
-	}
-
-	// clean up
-
-	delete [] normals;
-	delete [] vertices;
-	delete [] triangles;
-	delete [] textureCoords;
-
-	// return
-
-	calculateBoundingBox();
-
-	return true;
-}
-
-
 //! calculates the bounding box
 void CAnimatedMeshMD2::calculateBoundingBox()
 {
-	InterpolationBuffer.BoundingBox.reset(0,0,0);
+	InterpolationBuffer->BoundingBox.reset(0,0,0);
 
 	if (FrameCount)
 	{
@@ -667,8 +362,8 @@ void CAnimatedMeshMD2::calculateBoundingBox()
 		if (defaultFrame>=FrameCount)
 			defaultFrame = 0;
 
-		for (u32 j=0; j<FrameList[defaultFrame].size(); ++j)
-			InterpolationBuffer.BoundingBox.addInternalPoint(FrameList[defaultFrame].pointer()[j].Pos);
+//		for (u32 j=0; j<FrameList[defaultFrame].size(); ++j)
+//			InterpolationBuffer->BoundingBox.addInternalPoint(FrameList[defaultFrame].pointer()[j].Pos);
 	}
 }
 
@@ -676,21 +371,37 @@ void CAnimatedMeshMD2::calculateBoundingBox()
 //! sets a flag of all contained materials to a new value
 void CAnimatedMeshMD2::setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue)
 {
-	InterpolationBuffer.Material.setFlag(flag, newvalue);
+	InterpolationBuffer->Material.setFlag(flag, newvalue);
+}
+
+
+
+//! set the hardware mapping hint, for driver
+void CAnimatedMeshMD2::setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint,
+		E_BUFFER_TYPE buffer)
+{
+	InterpolationBuffer->setHardwareMappingHint(newMappingHint, buffer);
+}
+
+
+//! flags the meshbuffer as changed, reloads hardware buffers
+void CAnimatedMeshMD2::setDirty(E_BUFFER_TYPE buffer)
+{
+	InterpolationBuffer->setDirty(buffer);
 }
 
 
 //! returns an axis aligned bounding box
 const core::aabbox3d<f32>& CAnimatedMeshMD2::getBoundingBox() const
 {
-	return InterpolationBuffer.BoundingBox;
+	return InterpolationBuffer->BoundingBox;
 }
 
 
 //! set user axis aligned bounding box
 void CAnimatedMeshMD2::setBoundingBox( const core::aabbox3df& box)
 {
-	InterpolationBuffer.BoundingBox = box;
+	InterpolationBuffer->BoundingBox = box;
 }
 
 
@@ -721,15 +432,17 @@ void CAnimatedMeshMD2::getFrameLoop(EMD2_ANIMATION_TYPE l,
 bool CAnimatedMeshMD2::getFrameLoop(const c8* name,
 	s32& outBegin, s32&outEnd, s32& outFPS) const
 {
-	for (s32 i=0; i<(s32)FrameData.size(); ++i)
-		if (FrameData[i].name == name)
+	for (u32 i=0; i < AnimationData.size(); ++i)
+	{
+		if (AnimationData[i].name == name)
 		{
-			outBegin = FrameData[i].begin << MD2_FRAME_SHIFT;
-			outEnd = FrameData[i].end << MD2_FRAME_SHIFT;
+			outBegin = AnimationData[i].begin << MD2_FRAME_SHIFT;
+			outEnd = AnimationData[i].end << MD2_FRAME_SHIFT;
 			outEnd += MD2_FRAME_SHIFT == 0 ? 1 : ( 1 << MD2_FRAME_SHIFT ) - 1;
-			outFPS = FrameData[i].fps << MD2_FRAME_SHIFT;
+			outFPS = AnimationData[i].fps << MD2_FRAME_SHIFT;
 			return true;
 		}
+	}
 
 	return false;
 }
@@ -738,17 +451,17 @@ bool CAnimatedMeshMD2::getFrameLoop(const c8* name,
 //! Returns amount of md2 animations in this file.
 s32 CAnimatedMeshMD2::getAnimationCount() const
 {
-	return FrameData.size();
+	return AnimationData.size();
 }
 
 
 //! Returns name of md2 animation.
 const c8* CAnimatedMeshMD2::getAnimationName(s32 nr) const
 {
-	if (nr < 0 || nr >= (s32)FrameData.size())
+	if ((u32)nr >= AnimationData.size())
 		return 0;
 
-	return FrameData[nr].name.c_str();
+	return AnimationData[nr].name.c_str();
 }
 
 
diff --git a/src/dep/src/irrlicht/CAnimatedMeshMD2.h b/src/dep/src/irrlicht/CAnimatedMeshMD2.h
index 6cef904..8b552b5 100644
--- a/src/dep/src/irrlicht/CAnimatedMeshMD2.h
+++ b/src/dep/src/irrlicht/CAnimatedMeshMD2.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -28,9 +28,6 @@ namespace scene
 		//! destructor
 		virtual ~CAnimatedMeshMD2();
 
-		//! loads an md2 file
-		virtual bool loadFile(io::IReadFile* file);
-
 		//! returns the amount of frames in milliseconds. If the amount is 1, it is a static (=non animated) mesh.
 		virtual u32 getFrameCount() const;
 
@@ -58,6 +55,12 @@ namespace scene
 		//! sets a flag of all contained materials to a new value
 		virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue);
 
+		//! set the hardware mapping hint, for driver
+		virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX);
+
+		//! flags the meshbuffer as changed, reloads hardware buffers
+		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX);
+
 		//! Returns the type of the animated mesh.
 		virtual E_ANIMATED_MESH_TYPE getMeshType() const;
 
@@ -76,22 +79,16 @@ namespace scene
 		//! \param nr: Zero based index of animation.
 		virtual const c8* getAnimationName(s32 nr) const;
 
-	private:
 
-		//! updates the interpolation buffer
-		void updateInterpolationBuffer(s32 frame, s32 startFrame, s32 endFrame);
+		//
+		// exposed for loader
+		//
 
-		//! calculates the bounding box
-		virtual void calculateBoundingBox();
+		//! the buffer that contains the most recent animation
+		SMeshBuffer* InterpolationBuffer;
 
-		core::array<video::S3DVertex> *FrameList;
-		core::array<core::aabbox3d<f32> > BoxList;
-		u32 FrameCount;
-		s32 TriangleCount;
-
-		SMeshBuffer InterpolationBuffer;
-
-		struct SFrameData
+		//! named animations
+		struct SAnimationData
 		{
 			core::stringc name;
 			s32 begin;
@@ -99,7 +96,44 @@ namespace scene
 			s32 fps;
 		};
 
-		core::array< SFrameData > FrameData;
+		//! scale and translations for keyframes
+		struct SKeyFrameTransform
+		{
+			core::vector3df scale;
+			core::vector3df translate;
+		};
+
+		//! md2 vertex data
+		struct SMD2Vert
+		{
+			core::vector3d<u8> Pos;
+			u8                 NormalIdx;
+		};
+
+		//! keyframe transformations
+		core::array<SKeyFrameTransform> FrameTransforms; 
+
+		//! keyframe vertex data
+		core::array<SMD2Vert> *FrameList;
+		
+		//! bounding boxes for each keyframe
+		core::array<core::aabbox3d<f32> > BoxList;
+
+		//! named animations
+		core::array< SAnimationData > AnimationData;
+
+		//! calculates the bounding box
+		virtual void calculateBoundingBox();
+
+		u32 FrameCount;
+		s32 TriangleCount;
+
+	private:
+
+		//! updates the interpolation buffer
+		void updateInterpolationBuffer(s32 frame, s32 startFrame, s32 endFrame);
+
+
 	};
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CAnimatedMeshMD3.cpp b/src/dep/src/irrlicht/CAnimatedMeshMD3.cpp
index 190987e..28391fb 100644
--- a/src/dep/src/irrlicht/CAnimatedMeshMD3.cpp
+++ b/src/dep/src/irrlicht/CAnimatedMeshMD3.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Fabio Concas / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Fabio Concas / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -58,15 +58,16 @@ struct SMD3Skin
 
 
 //! Constructor
-CAnimatedMeshMD3::CAnimatedMeshMD3 ()
-: Mesh ( 0 )
+CAnimatedMeshMD3::CAnimatedMeshMD3()
+// TODO: Correct initial values needed
+: Mesh(0), IPolShift(0), LoopMode(0), Scaling(1.f)
 {
 #ifdef _DEBUG
 	setDebugName("CAnimatedMeshMD3");
 #endif
 
-	Mesh = new SMD3Mesh ();
-	memset ( &Mesh->MD3Header, 0, sizeof ( Mesh->MD3Header ) );
+	Mesh = new SMD3Mesh();
+	memset( &Mesh->MD3Header, 0, sizeof ( Mesh->MD3Header ) );
 
 	setInterpolationShift ( 0, 0 );
 }
@@ -75,8 +76,8 @@ CAnimatedMeshMD3::CAnimatedMeshMD3 ()
 //! Destructor
 CAnimatedMeshMD3::~CAnimatedMeshMD3()
 {
-	if ( Mesh )
-		Mesh->drop ();
+	if (Mesh)
+		Mesh->drop();
 }
 
 
@@ -91,6 +92,22 @@ u32 CAnimatedMeshMD3::getFrameCount() const
 void CAnimatedMeshMD3::setInterpolationShift ( u32 shift, u32 loopMode )
 {
 	IPolShift = shift;
+	LoopMode = loopMode;
+}
+
+
+//! set the hardware mapping hint, for driver
+void CAnimatedMeshMD3::setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint,
+		E_BUFFER_TYPE buffer)
+{
+	MeshIPol.setHardwareMappingHint(newMappingHint, buffer);
+}
+
+
+//! flags the meshbuffer as changed, reloads hardware buffers
+void CAnimatedMeshMD3::setDirty(E_BUFFER_TYPE buffer)
+{
+	MeshIPol.setDirty(buffer);
 }
 
 
@@ -170,17 +187,18 @@ IMesh* CAnimatedMeshMD3::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop,
 	return &MeshIPol;
 }
 
+
 //! create a Irrlicht MeshBuffer for a MD3 MeshBuffer
-IMeshBuffer * CAnimatedMeshMD3::createMeshBuffer ( const SMD3MeshBuffer * source )
+IMeshBuffer * CAnimatedMeshMD3::createMeshBuffer(const SMD3MeshBuffer* source)
 {
-	SMeshBuffer * dest = new SMeshBuffer ();
-	dest->Vertices.set_used ( source->MeshHeader.numVertices );
-	dest->Indices.set_used ( source->Indices.size () );
+	SMeshBuffer * dest = new SMeshBuffer();
+	dest->Vertices.set_used( source->MeshHeader.numVertices );
+	dest->Indices.set_used( source->Indices.size () );
 
 	u32 i;
 
 	// fill in static face info
-	for ( i = 0; i < source->Indices.size (); i += 3 )
+	for ( i = 0; i < source->Indices.size(); i += 3 )
 	{
 		dest->Indices[i + 0 ] = (u16) source->Indices[i + 0];
 		dest->Indices[i + 1 ] = (u16) source->Indices[i + 1];
@@ -190,7 +208,7 @@ IMeshBuffer * CAnimatedMeshMD3::createMeshBuffer ( const SMD3MeshBuffer * source
 	// fill in static vertex info
 	for ( i = 0; i!= (u32)source->MeshHeader.numVertices; ++i )
 	{
-		video::S3DVertex &v = dest->Vertices [ i ];
+		video::S3DVertex &v = dest->Vertices[i];
 		v.Color = 0xFFFFFFFF;
 		v.TCoords.X = source->Tex[i].u;
 		v.TCoords.Y = source->Tex[i].v;
diff --git a/src/dep/src/irrlicht/CAnimatedMeshMD3.h b/src/dep/src/irrlicht/CAnimatedMeshMD3.h
index aec8161..c5c8445 100644
--- a/src/dep/src/irrlicht/CAnimatedMeshMD3.h
+++ b/src/dep/src/irrlicht/CAnimatedMeshMD3.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -71,8 +71,14 @@ namespace scene
 			return;
 		}
 
+		//! set the hardware mapping hint, for driver
+		virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX);
+
+		//! flags the meshbuffer as changed, reloads hardware buffers
+		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX);
+
 		//! set user axis aligned bounding box
-		virtual void setBoundingBox( const core::aabbox3df& box)
+		virtual void setBoundingBox(const core::aabbox3df& box)
 		{
 			return;
 		}
diff --git a/src/dep/src/irrlicht/CAnimatedMeshSceneNode.cpp b/src/dep/src/irrlicht/CAnimatedMeshSceneNode.cpp
index 0e8f654..e586887 100644
--- a/src/dep/src/irrlicht/CAnimatedMeshSceneNode.cpp
+++ b/src/dep/src/irrlicht/CAnimatedMeshSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -26,20 +26,25 @@ namespace scene
 
 
 //! constructor
-CAnimatedMeshSceneNode::CAnimatedMeshSceneNode(IAnimatedMesh* mesh, ISceneNode* parent, ISceneManager* mgr, s32 id,
-			const core::vector3df& position, const core::vector3df& rotation,	const core::vector3df& scale)
+CAnimatedMeshSceneNode::CAnimatedMeshSceneNode(IAnimatedMesh* mesh,
+		ISceneNode* parent, ISceneManager* mgr, s32 id,
+		const core::vector3df& position,
+		const core::vector3df& rotation,
+		const core::vector3df& scale)
 : IAnimatedMeshSceneNode(parent, mgr, id, position, rotation, scale), Mesh(0),
-	BeginFrameTime(0), StartFrame(0), EndFrame(0), FramesPerSecond(25.f / 1000.f ),
-	CurrentFrameNr(0.f), JointMode(EJUOR_NONE), JointsUsed(false),
+	BeginFrameTime(0), StartFrame(0), EndFrame(0), FramesPerSecond(0.f),
+	CurrentFrameNr(0.f),
+	JointMode(EJUOR_NONE), JointsUsed(false),
 	TransitionTime(0), Transiting(0.f), TransitingBlend(0.f),
-	Looping(true), ReadOnlyMaterials(false),
-	LoopCallBack(0), PassCount(0), Shadow(0), RenderFromIdentity(0)
+	Looping(true), ReadOnlyMaterials(false), RenderFromIdentity(0),
+	LoopCallBack(0), PassCount(0), Shadow(0)
 {
 	#ifdef _DEBUG
 	setDebugName("CAnimatedMeshSceneNode");
 	#endif
 
 	BeginFrameTime = os::Timer::getTime();
+	FramesPerSecond = 25.f/100.f;
 
 	setMesh(mesh);
 }
@@ -75,7 +80,7 @@ void CAnimatedMeshSceneNode::setCurrentFrame(f32 frame)
 }
 
 
-//! Returns the current displayed frame number.
+//! Returns the currently displayed frame number.
 f32 CAnimatedMeshSceneNode::getFrameNr() const
 {
 	return CurrentFrameNr;
@@ -103,15 +108,14 @@ f32 CAnimatedMeshSceneNode::buildFrameNr(u32 timeMs)
 	{
 		// play animation looped
 
+		const s32 lenInMs = abs(s32( (EndFrame - StartFrame) / FramesPerSecond));
 		if (FramesPerSecond > 0.f) //forwards...
 		{
-			const s32 lenInTime = s32( f32(EndFrame - StartFrame) / FramesPerSecond);
-			return StartFrame + ( (timeMs - BeginFrameTime) % lenInTime) *FramesPerSecond;
+			return StartFrame + ( (timeMs - BeginFrameTime) % lenInMs) * FramesPerSecond;
 		}
 		else //backwards...
 		{
-			const s32 lenInTime = s32( f32(EndFrame - StartFrame) / -FramesPerSecond);
-			return EndFrame - ( (timeMs - BeginFrameTime) % lenInTime)*-FramesPerSecond;
+			return EndFrame - ( (timeMs - BeginFrameTime) % lenInMs)* -FramesPerSecond;
 		}
 	}
 	else
@@ -122,7 +126,7 @@ f32 CAnimatedMeshSceneNode::buildFrameNr(u32 timeMs)
 
 		if (FramesPerSecond > 0.f) //forwards...
 		{
-			const f32 deltaFrame = floorf( f32 ( timeMs - BeginFrameTime ) * FramesPerSecond );
+			const f32 deltaFrame = ( timeMs - BeginFrameTime ) * FramesPerSecond;
 
 			frame = StartFrame + deltaFrame;
 
@@ -135,7 +139,7 @@ f32 CAnimatedMeshSceneNode::buildFrameNr(u32 timeMs)
 		}
 		else //backwards... (untested)
 		{
-			const f32 deltaFrame = floorf( f32 ( timeMs - BeginFrameTime ) * -FramesPerSecond );
+			const f32 deltaFrame = ( timeMs - BeginFrameTime ) * -FramesPerSecond;
 
 			frame = EndFrame - deltaFrame;
 
@@ -152,6 +156,7 @@ f32 CAnimatedMeshSceneNode::buildFrameNr(u32 timeMs)
 	}
 }
 
+
 //! frame
 void CAnimatedMeshSceneNode::OnRegisterSceneNode()
 {
@@ -192,51 +197,62 @@ void CAnimatedMeshSceneNode::OnRegisterSceneNode()
 			SceneManager->registerNodeForRendering(this, scene::ESNRP_TRANSPARENT);
 
 		ISceneNode::OnRegisterSceneNode();
-
-		for (u32 j=0; j<JointChildSceneNodes.size(); ++j)
-			if (JointChildSceneNodes[j])
-				JointChildSceneNodes[j]->OnRegisterSceneNode();
 	}
 }
 
+IMesh * CAnimatedMeshSceneNode::getMeshForCurrentFrame(void)
+{
+	if(Mesh->getMeshType() != EAMT_SKINNED)
+	{
+		return Mesh->getMesh((s32)getFrameNr(), 255, StartFrame, EndFrame);
+	}
+	else
+	{
+		// As multiple scene nodes may be sharing the same skinned mesh, we have to
+		// re-animated it every frame to ensure that this node gets the mesh that it needs.
+
+		CSkinnedMesh* skinnedMesh = reinterpret_cast<CSkinnedMesh*>(Mesh);
+
+		if (JointMode == EJUOR_CONTROL)//write to mesh
+			skinnedMesh->transferJointsToMesh(JointChildSceneNodes);
+		else 
+			skinnedMesh->animateMesh(getFrameNr(), 1.0f);
+
+		// Update the skinned mesh for the current joint transforms.
+		skinnedMesh->skinMesh();
+
+		if (JointMode == EJUOR_READ)//read from mesh
+		{
+			skinnedMesh->recoverJointsFromMesh(JointChildSceneNodes);
+
+			//---slow---
+			for (u32 n=0;n<JointChildSceneNodes.size();++n)
+				if (JointChildSceneNodes[n]->getParent()==this)
+				{
+					JointChildSceneNodes[n]->updateAbsolutePositionOfAllChildren(); //temp, should be an option
+				}
+		}
+
+		if(JointMode == EJUOR_CONTROL)
+		{
+			// For meshes other than EJUOR_CONTROL, this is done by calling animateMesh()
+			skinnedMesh->updateBoundingBox();
+		}
+
+		return skinnedMesh;
+	}
+}
 
 
 //! OnAnimate() is called just before rendering the whole scene.
 void CAnimatedMeshSceneNode::OnAnimate(u32 timeMs)
 {
-
-	CurrentFrameNr = buildFrameNr ( timeMs );
-
-	if ( Mesh )
-	{
-		/*
-		scene::IMesh *m = Mesh->getMesh(CurrentFrameNr, 255, StartFrame, EndFrame);
-		if ( m )
-		{
-			Box = m->getBoundingBox();
-		}
-		*/
-	}
-
+	CurrentFrameNr = buildFrameNr ( timeMs ); 
 
 	IAnimatedMeshSceneNode::OnAnimate ( timeMs );
-
 }
 
 
-/*
-	angle = dotproduct ( v(0,1,0), up )
-	axis = crossproduct ( v(0,1,0), up )
-*/
-inline void AlignToUpVector(core::matrix4 &m, const core::vector3df &up )
-{
-	core::quaternion quatRot( up.Z, 0.f, -up.X, 1 + up.Y );
-	quatRot.normalize();
-	quatRot.getMatrix ( m );
-}
-
-
-
 //! renders the node.
 void CAnimatedMeshSceneNode::render()
 {
@@ -251,42 +267,13 @@ void CAnimatedMeshSceneNode::render()
 
 	++PassCount;
 
-	f32 frame = getFrameNr();
+	scene::IMesh* m = getMeshForCurrentFrame();
 
-	scene::IMesh* m;
-
-	if (Mesh->getMeshType() != EAMT_SKINNED)
-		m = Mesh->getMesh((s32)frame, 255, StartFrame, EndFrame);
-	else
+	if(m)
 	{
-		CSkinnedMesh* skinnedMesh = reinterpret_cast<CSkinnedMesh*>(Mesh);
-
-		if (JointMode == EJUOR_CONTROL)//write to mesh
-			skinnedMesh->transferJointsToMesh(JointChildSceneNodes);
-		else
-			skinnedMesh->animateMesh(frame, 1.0f);
-
-		skinnedMesh->skinMesh();
-
-		if (JointMode == EJUOR_READ)//read from mesh
-		{
-			skinnedMesh->recoverJointsFromMesh(JointChildSceneNodes);
-
-			//---slow---
-			for (u32 n=0;n<JointChildSceneNodes.size();++n)
-				if (JointChildSceneNodes[n]->getParent()==this)
-				{
-					JointChildSceneNodes[n]->updateAbsolutePositionOfAllChildren(); //temp, should be an option
-				}
-
-		}
-
-
-		m=skinnedMesh;
+		Box = m->getBoundingBox();
 	}
-
-
-	if ( 0 == m )
+	else
 	{
 		#ifdef _DEBUG
 			os::Printer::log("Animated Mesh returned no mesh to render.", Mesh->getDebugName(), ELL_WARNING);
@@ -297,25 +284,32 @@ void CAnimatedMeshSceneNode::render()
 
 
 	if (Shadow && PassCount==1)
-		Shadow->setMeshToRenderFrom(m);
+		Shadow->updateShadowVolumes();
 
 	// for debug purposes only:
 
-	u32 renderMeshes = 1;
+	bool renderMeshes = true;
 	video::SMaterial mat;
 	if (DebugDataVisible && PassCount==1)
 	{
 		// overwrite half transparency
 		if ( DebugDataVisible & scene::EDS_HALF_TRANSPARENCY )
 		{
-			for (u32 g=0; g<m->getMeshBufferCount(); ++g)
+
+			for (u32 i=0; i<m->getMeshBufferCount(); ++i)
 			{
-				mat = Materials[g];
+				scene::IMeshBuffer* mb = m->getMeshBuffer(i);
+				mat = Materials[i];
 				mat.MaterialType = video::EMT_TRANSPARENT_ADD_COLOR;
+				if (RenderFromIdentity)
+					driver->setTransform(video::ETS_WORLD, core::matrix4() );
+				else if (Mesh->getMeshType() == EAMT_SKINNED)
+					driver->setTransform(video::ETS_WORLD, AbsoluteTransformation * ((SSkinMeshBuffer*)mb)->Transformation);
+
 				driver->setMaterial(mat);
-				driver->drawMeshBuffer ( m->getMeshBuffer(g) );
+				driver->drawMeshBuffer(mb);
 			}
-			renderMeshes = 0;
+			renderMeshes = false;
 		}
 	}
 
@@ -338,7 +332,6 @@ void CAnimatedMeshSceneNode::render()
 				else if (Mesh->getMeshType() == EAMT_SKINNED)
 					driver->setTransform(video::ETS_WORLD, AbsoluteTransformation * ((SSkinMeshBuffer*)mb)->Transformation);
 
-
 				driver->setMaterial(Materials[i]);
 				driver->drawMeshBuffer(mb);
 			}
@@ -350,38 +343,95 @@ void CAnimatedMeshSceneNode::render()
 	// for debug purposes only:
 	if (DebugDataVisible && PassCount==1)
 	{
-		mat.Lighting = false;
-		driver->setMaterial(mat);
+		video::SMaterial debug_mat;
+		debug_mat.Lighting = false;
+		driver->setMaterial(debug_mat);
+		// show normals
+		if ( DebugDataVisible & scene::EDS_NORMALS )
+		{
+			IAnimatedMesh * arrow = SceneManager->addArrowMesh (
+					"__debugnormal", 0xFFECEC00,
+					0xFF999900, 4, 8, 1.f, 0.6f, 0.05f,
+					0.3f);
+			if ( 0 == arrow )
+			{
+				arrow = SceneManager->getMesh ( "__debugnormal" );
+			}
+			const IMesh *mesh = arrow->getMesh ( 0 );
+
+			// find a good scaling factor
+
+			core::matrix4 m2;
+
+			// draw normals
+			for (u32 g=0; g<m->getMeshBufferCount(); ++g)
+			{
+				const scene::IMeshBuffer* mb = m->getMeshBuffer(g);
+				const u32 vSize = video::getVertexPitchFromType(mb->getVertexType());
+				const video::S3DVertex* v = ( const video::S3DVertex*)mb->getVertices();
+				for ( u32 i=0; i != mb->getVertexCount(); ++i )
+				{
+					// Align to v->normal
+					core::quaternion quatRot( v->Normal.Z, 0.f, -v->Normal.X, 1 + v->Normal.Y );
+					quatRot.normalize();
+					quatRot.getMatrix ( m2 );
+
+					m2.setTranslation(v->Pos);
+					if (Mesh->getMeshType() == EAMT_SKINNED)
+					{
+						m2 = (AbsoluteTransformation * ((SSkinMeshBuffer*)mb)->Transformation) * m2;
+					}
+					else
+						m2*=AbsoluteTransformation;
+
+					driver->setTransform(video::ETS_WORLD, m2 );
+					for ( u32 a = 0; a != mesh->getMeshBufferCount(); ++a )
+						driver->drawMeshBuffer ( mesh->getMeshBuffer ( a ) );
+
+					v = (const video::S3DVertex*) ( (u8*) v + vSize );
+				}
+			}
+			driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
+		}
+
+		debug_mat.ZBuffer = false;
+		debug_mat.Lighting = false;
+		driver->setMaterial(debug_mat);
+
+		if ( DebugDataVisible & scene::EDS_BBOX )
+			driver->draw3DBox(Box, video::SColor(255,255,255,255));
 
 		// show bounding box
 		if ( DebugDataVisible & scene::EDS_BBOX_BUFFERS )
 		{
+
 			for (u32 g=0; g< m->getMeshBufferCount(); ++g)
 			{
-				driver->draw3DBox( m->getMeshBuffer(g)->getBoundingBox(),
-						video::SColor(0,190,128,128) );
+				const IMeshBuffer* mb = m->getMeshBuffer(g);
+
+				if (Mesh->getMeshType() == EAMT_SKINNED)
+					driver->setTransform(video::ETS_WORLD, AbsoluteTransformation * ((SSkinMeshBuffer*)mb)->Transformation);
+				driver->draw3DBox( mb->getBoundingBox(),
+						video::SColor(255,190,128,128) );
 			}
 		}
 
-		if ( DebugDataVisible & scene::EDS_BBOX )
-			driver->draw3DBox(Box, video::SColor(0,255,255,255));
-
 		// show skeleton
 		if ( DebugDataVisible & scene::EDS_SKELETON )
 		{
 			if (Mesh->getMeshType() == EAMT_SKINNED)
 			{
-
 				// draw skeleton
 
-
 				for (u32 g=0; g < ((ISkinnedMesh*)Mesh)->getAllJoints().size(); ++g)
 				{
 					ISkinnedMesh::SJoint *joint=((ISkinnedMesh*)Mesh)->getAllJoints()[g];
 
 					for (u32 n=0;n<joint->Children.size();++n)
 					{
-						driver->draw3DLine(joint->GlobalAnimatedMatrix.getTranslation(), joint->Children[n]->GlobalAnimatedMatrix.getTranslation(),  video::SColor(0,51,66,255));
+						driver->draw3DLine(joint->GlobalAnimatedMatrix.getTranslation(),
+								joint->Children[n]->GlobalAnimatedMatrix.getTranslation(),
+								video::SColor(255,51,66,255));
 					}
 				}
 			}
@@ -399,84 +449,44 @@ void CAnimatedMeshSceneNode::render()
 				{
 					arrow = SceneManager->getMesh ( "__tag_show" );
 				}
-				IMesh *arrowMesh = arrow->getMesh ( 0 );
-
-				video::SMaterial material;
-				material.Lighting = false;
-				driver->setMaterial(material);
+				IMesh *arrowMesh = arrow->getMesh(0);
 
 				core::matrix4 matr;
 
-				SMD3QuaterionTagList *taglist = ((IAnimatedMeshMD3*)Mesh)->getTagList (	(s32)getFrameNr(),
-												255,
-												getStartFrame (),
-												getEndFrame ()
-											);
+				SMD3QuaterionTagList *taglist = ((IAnimatedMeshMD3*)Mesh)->getTagList(
+						(s32)getFrameNr(), 255,
+						getStartFrame(), getEndFrame());
 				if ( taglist )
 				{
 					for ( u32 ts = 0; ts != taglist->size(); ++ts )
 					{
-						(*taglist)[ts].setto ( matr );
+						(*taglist)[ts].setto(matr);
 
 						driver->setTransform(video::ETS_WORLD, matr );
 
 						for ( u32 a = 0; a != arrowMesh->getMeshBufferCount(); ++a )
-							driver->drawMeshBuffer ( arrowMesh->getMeshBuffer ( a ) );
+							driver->drawMeshBuffer(arrowMesh->getMeshBuffer(a));
 					}
 				}
 			}
 		}
 
-		// show normals
-		if ( DebugDataVisible & scene::EDS_NORMALS )
-		{
-			IAnimatedMesh * arrow = SceneManager->addArrowMesh (
-					"__debugnormal", 0xFFECEC00,
-					0xFF999900, 4, 8, 1.f, 0.6f, 0.05f,
-					0.3f);
-			if ( 0 == arrow )
-			{
-				arrow = SceneManager->getMesh ( "__debugnormal" );
-			}
-			IMesh *mesh = arrow->getMesh ( 0 );
-
-			// find a good scaling factor
-
-			core::matrix4 m2;
-
-			// draw normals
-			for (u32 g=0; g<m->getMeshBufferCount(); ++g)
-			{
-				const scene::IMeshBuffer* mb = m->getMeshBuffer(g);
-				const u32 vSize = video::getVertexPitchFromType(mb->getVertexType());
-				const video::S3DVertex* v = ( const video::S3DVertex*)mb->getVertices();
-				for ( u32 i=0; i != mb->getVertexCount(); ++i )
-				{
-					AlignToUpVector ( m2, v->Normal );
-
-					m2.setTranslation(v->Pos);
-					m2*=AbsoluteTransformation;
-
-					driver->setTransform(video::ETS_WORLD, m2 );
-					for ( u32 a = 0; a != mesh->getMeshBufferCount(); ++a )
-						driver->drawMeshBuffer ( mesh->getMeshBuffer ( a ) );
-
-					v = (const video::S3DVertex*) ( (u8*) v + vSize );
-				}
-			}
-			driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
-		}
-
 		// show mesh
 		if ( DebugDataVisible & scene::EDS_MESH_WIRE_OVERLAY )
 		{
-			mat.Lighting = false;
-			mat.Wireframe = true;
-			driver->setMaterial(mat);
+			debug_mat.Lighting = false;
+			debug_mat.Wireframe = true;
+			debug_mat.ZBuffer = true;
+			driver->setMaterial(debug_mat);
 
 			for (u32 g=0; g<m->getMeshBufferCount(); ++g)
 			{
-				driver->drawMeshBuffer( m->getMeshBuffer(g) );
+				const IMeshBuffer* mb = m->getMeshBuffer(g);
+				if (RenderFromIdentity)
+					driver->setTransform(video::ETS_WORLD, core::matrix4() );
+				else if (Mesh->getMeshType() == EAMT_SKINNED)
+					driver->setTransform(video::ETS_WORLD, AbsoluteTransformation * ((SSkinMeshBuffer*)mb)->Transformation);
+				driver->drawMeshBuffer(mb);
 			}
 		}
 	}
@@ -489,12 +499,14 @@ s32 CAnimatedMeshSceneNode::getStartFrame() const
 	return StartFrame;
 }
 
+
 //! Returns the current start frame number.
 s32 CAnimatedMeshSceneNode::getEndFrame() const
 {
 	return EndFrame;
 }
 
+
 //! sets the frames between the animation is looped.
 //! the default is 0 - MaximalFrameCount of the mesh.
 bool CAnimatedMeshSceneNode::setFrameLoop(s32 begin, s32 end)
@@ -516,7 +528,6 @@ bool CAnimatedMeshSceneNode::setFrameLoop(s32 begin, s32 end)
 }
 
 
-
 //! sets the speed with witch the animation is played
 void CAnimatedMeshSceneNode::setAnimationSpeed(f32 framesPerSecond)
 {
@@ -524,7 +535,6 @@ void CAnimatedMeshSceneNode::setAnimationSpeed(f32 framesPerSecond)
 }
 
 
-
 //! returns the axis aligned bounding box of this node
 const core::aabbox3d<f32>& CAnimatedMeshSceneNode::getBoundingBox() const
 {
@@ -532,7 +542,6 @@ const core::aabbox3d<f32>& CAnimatedMeshSceneNode::getBoundingBox() const
 }
 
 
-
 //! returns the material based on the zero based index i. To get the amount
 //! of materials used by this scene node, use getMaterialCount().
 //! This function is needed for inserting the node into the scene hirachy on a
@@ -557,8 +566,8 @@ u32 CAnimatedMeshSceneNode::getMaterialCount() const
 
 //! Creates shadow volume scene node as child of this node
 //! and returns a pointer to it.
-IShadowVolumeSceneNode* CAnimatedMeshSceneNode::addShadowVolumeSceneNode(s32 id,
-						 bool zfailmethod, f32 infinity)
+IShadowVolumeSceneNode* CAnimatedMeshSceneNode::addShadowVolumeSceneNode(const IMesh* shadowMesh,
+						 s32 id, bool zfailmethod, f32 infinity)
 {
 	if (!SceneManager->getVideoDriver()->queryFeature(video::EVDF_STENCIL_BUFFER))
 		return 0;
@@ -569,22 +578,29 @@ IShadowVolumeSceneNode* CAnimatedMeshSceneNode::addShadowVolumeSceneNode(s32 id,
 		return 0;
 	}
 
-	Shadow = new CShadowVolumeSceneNode(this, SceneManager, id,  zfailmethod, infinity);
+	if (!shadowMesh)
+		shadowMesh = Mesh; // if null is given, use the mesh of node
+
+	Shadow = new CShadowVolumeSceneNode(shadowMesh, this, SceneManager, id,  zfailmethod, infinity);
 	return Shadow;
 }
 
 
+//! Returns a pointer to a child node, which has the same transformation as
+//! the corresponding joint, if the mesh in this scene node is a skinned mesh.
 IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
 {
 	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
+	{
+		os::Printer::log("No mesh, or mesh not of skinned mesh type", ELL_WARNING);
 		return 0;
+	}
 
 	checkJoints();
 
-
 	ISkinnedMesh *skinnedMesh=(ISkinnedMesh*)Mesh;
 
-	s32 number = skinnedMesh->getJointNumber(jointName);
+	const s32 number = skinnedMesh->getJointNumber(jointName);
 
 	if (number == -1)
 	{
@@ -602,8 +618,18 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
 }
 
 
+//! Returns a pointer to a child node, which has the same transformation as
+//! the corresponding joint, if the mesh in this scene node is a skinned mesh.
 IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(u32 jointID)
 {
+	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
+	{
+		os::Printer::log("No mesh, or mesh not of skinned mesh type", ELL_WARNING);
+		return 0;
+	}
+
+	checkJoints();
+
 	if (JointChildSceneNodes.size() <= jointID)
 	{
 		os::Printer::log("Joint not loaded into node", ELL_WARNING);
@@ -613,9 +639,20 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(u32 jointID)
 	return JointChildSceneNodes[jointID];
 }
 
+//! Gets joint count.
+u32 CAnimatedMeshSceneNode::getJointCount() const
+{
+	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
+		return 0;
+
+	ISkinnedMesh *skinnedMesh=(ISkinnedMesh*)Mesh;
+
+	return skinnedMesh->getJointCount();
+}
+
 
 //! Returns a pointer to a child node, which has the same transformation as
-//! the corrsesponding joint, if the mesh in this scene node is a ms3d mesh.
+//! the corresponding joint, if the mesh in this scene node is a ms3d mesh.
 ISceneNode* CAnimatedMeshSceneNode::getMS3DJointNode(const c8* jointName)
 {
 	return  getJointNode(jointName);
@@ -623,7 +660,7 @@ ISceneNode* CAnimatedMeshSceneNode::getMS3DJointNode(const c8* jointName)
 
 
 //! Returns a pointer to a child node, which has the same transformation as
-//! the corrsesponding joint, if the mesh in this scene node is a ms3d mesh.
+//! the corresponding joint, if the mesh in this scene node is a .x mesh.
 ISceneNode* CAnimatedMeshSceneNode::getXJointNode(const c8* jointName)
 {
 	return  getJointNode(jointName);
@@ -653,7 +690,6 @@ bool CAnimatedMeshSceneNode::removeChild(ISceneNode* child)
 				return true;
 			}
 		}
-
 		return true;
 	}
 
@@ -667,10 +703,10 @@ bool CAnimatedMeshSceneNode::setMD2Animation(EMD2_ANIMATION_TYPE anim)
 	if (!Mesh || Mesh->getMeshType() != EAMT_MD2)
 		return false;
 
-	IAnimatedMeshMD2* m = (IAnimatedMeshMD2*)Mesh;
+	IAnimatedMeshMD2* md = (IAnimatedMeshMD2*)Mesh;
 
 	s32 begin, end, speed;
-	m->getFrameLoop(anim, begin, end, speed);
+	md->getFrameLoop(anim, begin, end, speed);
 
 	setAnimationSpeed( f32(speed) );
 	setFrameLoop(begin, end);
@@ -684,10 +720,10 @@ bool CAnimatedMeshSceneNode::setMD2Animation(const c8* animationName)
 	if (!Mesh || Mesh->getMeshType() != EAMT_MD2)
 		return false;
 
-	IAnimatedMeshMD2* m = (IAnimatedMeshMD2*)Mesh;
+	IAnimatedMeshMD2* md = (IAnimatedMeshMD2*)Mesh;
 
 	s32 begin, end, speed;
-	if (!m->getFrameLoop(animationName, begin, end, speed))
+	if (!md->getFrameLoop(animationName, begin, end, speed))
 		return false;
 
 	setAnimationSpeed( (f32)speed );
@@ -808,6 +844,7 @@ void CAnimatedMeshSceneNode::setMesh(IAnimatedMesh* mesh)
 		Mesh->grab();
 }
 
+
 // returns the absolute transformation for a special MD3 Tag if the mesh is a md3 mesh,
 // or the absolutetransformation if it's a normal scenenode
 const SMD3QuaterionTag& CAnimatedMeshSceneNode::getMD3TagTransformation( const core::stringc & tagname)
@@ -824,11 +861,10 @@ const SMD3QuaterionTag& CAnimatedMeshSceneNode::getMD3TagTransformation( const c
 //! updates the absolute position based on the relative and the parents position
 void CAnimatedMeshSceneNode::updateAbsolutePosition()
 {
+	IAnimatedMeshSceneNode::updateAbsolutePosition();
+
 	if ( 0 == Mesh || Mesh->getMeshType() != EAMT_MD3 )
-	{
-		IAnimatedMeshSceneNode::updateAbsolutePosition();
 		return;
-	}
 
 	SMD3QuaterionTag parent;
 	if ( Parent && Parent->getType () == ESNT_ANIMATED_MESH)
@@ -875,7 +911,7 @@ void CAnimatedMeshSceneNode::setTransitionTime(f32 time)
 	}
 }
 
-//! render mesh ignoring it's transformation. Used with ragdolls. (culling is unaffected)
+//! render mesh ignoring its transformation. Used with ragdolls. (culling is unaffected)
 void CAnimatedMeshSceneNode::setRenderFromIdentity( bool On )
 {
 	RenderFromIdentity=On;
@@ -896,20 +932,12 @@ void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions)
 
 			CSkinnedMesh* skinnedMesh=reinterpret_cast<CSkinnedMesh*>(Mesh);
 
+			skinnedMesh->transferOnlyJointsHintsToMesh( JointChildSceneNodes );
+
 			skinnedMesh->animateMesh(frame, 1.0f);
 
 			skinnedMesh->recoverJointsFromMesh( JointChildSceneNodes);
 
-			if (CalculateAbsolutePositions)
-			{
-				//---slow---
-				for (u32 n=0;n<JointChildSceneNodes.size();++n)
-					if (JointChildSceneNodes[n]->getParent()==this)
-					{
-						JointChildSceneNodes[n]->updateAbsolutePositionOfAllChildren(); //temp, should be an option
-					}
-			}
-
 			//-----------------------------------------
 			//		Transition
 			//-----------------------------------------
@@ -957,13 +985,25 @@ void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions)
 					//			TransitingBlend));
 				}
 			}
+
+
+
+			if (CalculateAbsolutePositions)
+			{
+				//---slow---
+				for (u32 n=0;n<JointChildSceneNodes.size();++n)
+				{
+					if (JointChildSceneNodes[n]->getParent()==this)
+					{
+						JointChildSceneNodes[n]->updateAbsolutePositionOfAllChildren(); //temp, should be an option
+					}
+				}
+			}
 		}
 	}
 }
 
 
-
-
 void CAnimatedMeshSceneNode::checkJoints()
 {
 	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
@@ -981,6 +1021,7 @@ void CAnimatedMeshSceneNode::checkJoints()
 	}
 }
 
+
 void CAnimatedMeshSceneNode::beginTransition()
 {
 	if (!JointsUsed)
@@ -1002,8 +1043,48 @@ void CAnimatedMeshSceneNode::beginTransition()
 
 		Transiting = core::reciprocal((f32)TransitionTime);
 	}
+	TransitingBlend = 0.f;
 }
 
+ISceneNode* CAnimatedMeshSceneNode::clone(ISceneNode* newParent, ISceneManager* newManager)
+{
+	if (!newParent) newParent = Parent;
+	if (!newManager) newManager = SceneManager;
+
+	CAnimatedMeshSceneNode * newNode =
+		new CAnimatedMeshSceneNode(Mesh, newParent, newManager, ID, RelativeTranslation,
+						 RelativeRotation, RelativeScale);
+
+	newNode->cloneMembers(this, newManager);
+
+	newNode->Materials = Materials;
+	newNode->Box = Box;
+	newNode->Mesh = Mesh;
+	newNode->BeginFrameTime = BeginFrameTime;
+	newNode->StartFrame = StartFrame;
+	newNode->EndFrame = EndFrame;
+	newNode->FramesPerSecond = FramesPerSecond;
+	newNode->CurrentFrameNr = CurrentFrameNr;
+	newNode->JointMode = JointMode;
+	newNode->JointsUsed = JointsUsed;
+	newNode->TransitionTime = TransitionTime;
+	newNode->Transiting = Transiting;
+	newNode->TransitingBlend = TransitingBlend;
+	newNode->Looping = Looping;
+	newNode->ReadOnlyMaterials = ReadOnlyMaterials;
+	newNode->LoopCallBack = LoopCallBack;
+	newNode->PassCount = PassCount;
+	newNode->Shadow = Shadow;
+	newNode->JointChildSceneNodes = JointChildSceneNodes;
+	newNode->PretransitingSave = PretransitingSave;
+	newNode->RenderFromIdentity = RenderFromIdentity;
+	newNode->MD3Special = MD3Special;
+
+	(void)newNode->drop();
+	return newNode;
+}
+
+
 
 } // end namespace scene
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/CAnimatedMeshSceneNode.h b/src/dep/src/irrlicht/CAnimatedMeshSceneNode.h
index 8e9b26c..3d4e864 100644
--- a/src/dep/src/irrlicht/CAnimatedMeshSceneNode.h
+++ b/src/dep/src/irrlicht/CAnimatedMeshSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -72,8 +72,8 @@ namespace scene
 
 		//! Creates shadow volume scene node as child of this node
 		//! and returns a pointer to it.
-		virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(s32 id,
-			bool zfailmethod=true, f32 infinity=10000.0f);
+		virtual IShadowVolumeSceneNode* addShadowVolumeSceneNode(const IMesh* shadowMesh,
+			s32 id, bool zfailmethod=true, f32 infinity=10000.0f);
 
 		//! Returns a pointer to a child node, which has the same transformation as
 		//! the corrsesponding joint, if the mesh in this scene node is a skinned mesh.
@@ -82,6 +82,9 @@ namespace scene
 		//! same as getJointNode(const c8* jointName), but based on id
 		virtual IBoneSceneNode* getJointNode(u32 jointID);
 
+		//! Gets joint count.
+		virtual u32 getJointCount() const;
+
 		//! Redundant command, please use getJointNode.
 		virtual ISceneNode* getMS3DJointNode(const c8* jointName);
 
@@ -147,11 +150,20 @@ namespace scene
 		//! updates the joint positions of this mesh
 		virtual void animateJoints(bool CalculateAbsolutePositions=true);
 
-		//! render mesh ignoring it's transformation. Used with ragdolls. (culling is unaffected)
+		//! render mesh ignoring its transformation. Used with ragdolls. (culling is unaffected)
 		virtual void setRenderFromIdentity( bool On );
 
+		//! Creates a clone of this scene node and its children.
+		/** \param newParent An optional new parent.
+		\param newManager An optional new scene manager.
+		\return The newly created clone of this node. */
+		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0);
+
 	private:
 
+		//! Get a static mesh for the current frame of this animated mesh
+		IMesh* getMeshForCurrentFrame(void);
+
 		f32 buildFrameNr( u32 timeMs);
 		void checkJoints();
 		void beginTransition();
@@ -166,16 +178,17 @@ namespace scene
 		f32 FramesPerSecond;
 		f32 CurrentFrameNr;
 
-		E_JOINT_UPDATE_ON_RENDER JointMode; //0-unused, 1-get joints only, 2-set joints only, 3-move and set
+		//0-unused, 1-get joints only, 2-set joints only, 3-move and set
+		E_JOINT_UPDATE_ON_RENDER JointMode;
 		bool JointsUsed;
 
 		u32 TransitionTime; //Transition time in millisecs
-
 		f32 Transiting; //is mesh transiting (plus cache of TransitionTime)
 		f32 TransitingBlend; //0-1, calculated on buildFrameNr
 
 		bool Looping;
 		bool ReadOnlyMaterials;
+		bool RenderFromIdentity;
 
 		IAnimationEndCallBack* LoopCallBack;
 		s32 PassCount;
@@ -185,15 +198,19 @@ namespace scene
 		core::array<IBoneSceneNode* > JointChildSceneNodes;
 		core::array<core::matrix4> PretransitingSave;
 
-		bool RenderFromIdentity;
-
 		struct SMD3Special
 		{
 			core::stringc Tagname;
 			SMD3QuaterionTagList AbsoluteTagList;
+
+			SMD3Special & operator = (const SMD3Special & copyMe)
+			{
+				Tagname = copyMe.Tagname;
+				AbsoluteTagList = copyMe.AbsoluteTagList;
+				return *this;
+			}
 		};
 		SMD3Special MD3Special;
-
 	};
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CAttributeImpl.h b/src/dep/src/irrlicht/CAttributeImpl.h
index b7f6a88..ce00660 100644
--- a/src/dep/src/irrlicht/CAttributeImpl.h
+++ b/src/dep/src/irrlicht/CAttributeImpl.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -613,7 +613,7 @@ public:
 			ret.pointB.Y = Count > 4 ? ValueF[4] : 0.0f;
 			ret.pointB.Z = Count > 5 ? ValueF[5] : 0.0f;
 			ret.pointC.X = Count > 6 ? ValueF[6] : 0.0f;
-			ret.pointC.X = Count > 7 ? ValueF[7] : 0.0f;
+			ret.pointC.Y = Count > 7 ? ValueF[7] : 0.0f;
 			ret.pointC.Z = Count > 8 ? ValueF[8] : 0.0f;
 		}
 		else
@@ -625,7 +625,7 @@ public:
 			ret.pointB.Y = Count > 4 ? (f32)ValueI[4] : 0.0f;
 			ret.pointB.Z = Count > 5 ? (f32)ValueI[5] : 0.0f;
 			ret.pointC.X = Count > 6 ? (f32)ValueI[6] : 0.0f;
-			ret.pointC.X = Count > 7 ? (f32)ValueI[7] : 0.0f;
+			ret.pointC.Y = Count > 7 ? (f32)ValueI[7] : 0.0f;
 			ret.pointC.Z = Count > 8 ? (f32)ValueI[8] : 0.0f;
 		}
 
diff --git a/src/dep/src/irrlicht/CAttributes.cpp b/src/dep/src/irrlicht/CAttributes.cpp
index 9718ea7..62cb9d3 100644
--- a/src/dep/src/irrlicht/CAttributes.cpp
+++ b/src/dep/src/irrlicht/CAttributes.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -1477,7 +1477,7 @@ void CAttributes::readAttributeFromXML(io::IXMLReader* reader)
 		const core::stringw tmpName(L"value");
 		for (; n<count; ++n)
 		{
-			tmpArray.push_back(reader->getAttributeValue((tmpName+n).c_str()));
+			tmpArray.push_back(reader->getAttributeValue((tmpName+core::stringw(n)).c_str()));
 		}
 		addArray(name.c_str(),tmpArray);
 	}
@@ -1523,7 +1523,7 @@ bool CAttributes::write(io::IXMLWriter* writer, bool writeXMLHeader,
 			const core::stringw tmpName(L"value");
 			for (; n < arrayinput.size(); ++n)
 			{
-				arraynames.push_back((tmpName+n).c_str());
+				arraynames.push_back((tmpName+core::stringw(n)).c_str());
 				arrayvalues.push_back(arrayinput[n]);
 			}
 
diff --git a/src/dep/src/irrlicht/CAttributes.h b/src/dep/src/irrlicht/CAttributes.h
index 8ae8a64..09fe8dc 100644
--- a/src/dep/src/irrlicht/CAttributes.h
+++ b/src/dep/src/irrlicht/CAttributes.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CB3DMeshFileLoader.cpp b/src/dep/src/irrlicht/CB3DMeshFileLoader.cpp
index aa1b00b..092cb83 100644
--- a/src/dep/src/irrlicht/CB3DMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/CB3DMeshFileLoader.cpp
@@ -1,7 +1,10 @@
+// Copyright (C) 2006-2009 Luke Hoschke
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
 
 // B3D Mesh loader
-//file format designed by mark sibly for the blitz3d engine and has been declared public domain
-//loader by luke hoschke
+// File format designed by Mark Sibly for the Blitz3D engine and has been
+// declared public domain
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_B3D_LOADER_
@@ -11,6 +14,9 @@
 #include "IVideoDriver.h"
 #include "os.h"
 
+#ifdef _DEBUG
+#define _B3D_READER_DEBUG
+#endif
 
 namespace irr
 {
@@ -19,7 +25,8 @@ namespace scene
 
 //! Constructor
 CB3DMeshFileLoader::CB3DMeshFileLoader(scene::ISceneManager* smgr)
-: B3dStack(), NormalsInFile(false), SceneManager(smgr), AnimatedMesh(0), file(0)
+: SceneManager(smgr), AnimatedMesh(0), B3DFile(0), NormalsInFile(false),
+	ShowWarning(true)
 {
 	#ifdef _DEBUG
 	setDebugName("CB3DMeshFileLoader");
@@ -27,14 +34,6 @@ CB3DMeshFileLoader::CB3DMeshFileLoader(scene::ISceneManager* smgr)
 }
 
 
-//! destructor
-CB3DMeshFileLoader::~CB3DMeshFileLoader()
-{
-	for (s32 n=Materials.size()-1; n>=0; --n)
-		delete Materials[n].Material;
-}
-
-
 //! returns true if the file maybe is able to be loaded by this class
 //! based on the file extension (e.g. ".bsp")
 bool CB3DMeshFileLoader::isALoadableFileExtension(const c8* fileName) const
@@ -52,8 +51,9 @@ IAnimatedMesh* CB3DMeshFileLoader::createMesh(io::IReadFile* f)
 	if (!f)
 		return 0;
 
-	file = f;
+	B3DFile = f;
 	AnimatedMesh = new scene::CSkinnedMesh();
+	ShowWarning = true; // If true a warning is issued if too many textures are used
 
 	Buffers = &AnimatedMesh->getMeshBuffers();
 	AllJoints = &AnimatedMesh->getAllJoints();
@@ -81,78 +81,56 @@ bool CB3DMeshFileLoader::load()
 	//------ Get header ------
 
 	SB3dChunkHeader header;
-	file->read(&header, sizeof(header));
-
-	#ifdef __BIG_ENDIAN__
-		header.size = os::Byteswap::byteswap(header.size);
-	#endif
+	B3DFile->read(&header, sizeof(header));
+#ifdef __BIG_ENDIAN__
+	header.size = os::Byteswap::byteswap(header.size);
+#endif
 
 	if ( strncmp( header.name, "BB3D", 4 ) != 0 )
 	{
-		os::Printer::log("File is not a b3d file. Loading failed (No header found)", file->getFileName(), ELL_ERROR);
+		os::Printer::log("File is not a b3d file. Loading failed (No header found)", B3DFile->getFileName(), ELL_ERROR);
 		return false;
 	}
 
 	// Add main chunk...
-	B3dStack.push_back(SB3dChunk());
-	B3dStack.getLast().name[0] = header.name[0];
-	B3dStack.getLast().name[1] = header.name[1];
-	B3dStack.getLast().name[2] = header.name[2];
-	B3dStack.getLast().name[3] = header.name[3];
-	B3dStack.getLast().startposition = file->getPos()-8;
-	B3dStack.getLast().length = header.size+8;
+	B3dStack.push_back(SB3dChunk(header, B3DFile->getPos()-8));
 
 	// Get file version, but ignore it, as it's not important with b3d files...
-	u32 FileVersion;
-	file->read(&FileVersion, sizeof(FileVersion));
-	#ifdef __BIG_ENDIAN__
-		FileVersion = os::Byteswap::byteswap(FileVersion);
-	#endif
+	s32 fileVersion;
+	B3DFile->read(&fileVersion, sizeof(fileVersion));
+#ifdef __BIG_ENDIAN__
+	fileVersion = os::Byteswap::byteswap(fileVersion);
+#endif
 
 	//------ Read main chunk ------
 
-	while ( B3dStack.getLast().startposition+B3dStack.getLast().length > file->getPos() )
+	while ( (B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos() )
 	{
-		B3dStack.push_back(SB3dChunk());
-
-		file->read(&header, sizeof(header));
-
-		#ifdef __BIG_ENDIAN__
-			header.size = os::Byteswap::byteswap(header.size);
-		#endif
-
-		B3dStack.getLast().name[0] = header.name[0];
-		B3dStack.getLast().name[1] = header.name[1];
-		B3dStack.getLast().name[2] = header.name[2];
-		B3dStack.getLast().name[3] = header.name[3];
-		B3dStack.getLast().startposition = file->getPos() - 8;
-		B3dStack.getLast().length = header.size + 8;
-
-		bool knownChunk = false;
+		B3DFile->read(&header, sizeof(header));
+#ifdef __BIG_ENDIAN__
+		header.size = os::Byteswap::byteswap(header.size);
+#endif
+		B3dStack.push_back(SB3dChunk(header, B3DFile->getPos()-8));
 
 		if ( strncmp( B3dStack.getLast().name, "TEXS", 4 ) == 0 )
 		{
-			knownChunk=true;
 			if (!readChunkTEXS())
 				return false;
 		}
 		else if ( strncmp( B3dStack.getLast().name, "BRUS", 4 ) == 0 )
 		{
-			knownChunk=true;
 			if (!readChunkBRUS())
 				return false;
 		}
 		else if ( strncmp( B3dStack.getLast().name, "NODE", 4 ) == 0 )
 		{
-			knownChunk=true;
 			if (!readChunkNODE((CSkinnedMesh::SJoint*)0) )
 				return false;
 		}
-
-		if (!knownChunk)
+		else
 		{
 			os::Printer::log("Unknown chunk found in mesh base - skipping");
-			file->seek(B3dStack.getLast().startposition + B3dStack.getLast().length);
+			B3DFile->seek(B3dStack.getLast().startposition + B3dStack.getLast().length);
 			B3dStack.erase(B3dStack.size()-1);
 		}
 	}
@@ -175,30 +153,17 @@ bool CB3DMeshFileLoader::load()
 
 bool CB3DMeshFileLoader::readChunkNODE(CSkinnedMesh::SJoint *InJoint)
 {
-	core::stringc JointName = readString();
+	const core::stringc JointName = readString();
+
+#ifdef _B3D_READER_DEBUG
+	os::Printer::log("read ChunkNODE", JointName.c_str());
+#endif
 
 	f32 position[3], scale[3], rotation[4];
-	s32 n;
 
-	for (n=0; n<=2; n++)
-		file->read(&position[n], sizeof(f32));
-
-	for (n=0; n<=2; n++)
-		file->read(&scale[n], sizeof(f32));
-
-	for (n=0; n<=3; n++)
-		file->read(&rotation[n], sizeof(f32));
-
-	#ifdef __BIG_ENDIAN__
-		for (n=0; n<=2; n++)
-			position[n] = os::Byteswap::byteswap(position[n]);
-
-		for (n=0; n<=2; n++)
-			scale[n] = os::Byteswap::byteswap(scale[n]);
-
-		for (n=0; n<=3; n++)
-			rotation[n] = os::Byteswap::byteswap(rotation[n]);
-	#endif
+	readFloats(position, 3);
+	readFloats(scale, 3);
+	readFloats(rotation, 4);
 
 	CSkinnedMesh::SJoint *Joint = AnimatedMesh->createJoint(InJoint);
 
@@ -222,61 +187,45 @@ bool CB3DMeshFileLoader::readChunkNODE(CSkinnedMesh::SJoint *InJoint)
 	else
 		Joint->GlobalMatrix = Joint->LocalMatrix;
 
-	while(B3dStack.getLast().startposition + B3dStack.getLast().length > file->getPos()) // this chunk repeats
+	while(B3dStack.getLast().startposition + B3dStack.getLast().length > B3DFile->getPos()) // this chunk repeats
 	{
-		B3dStack.push_back(SB3dChunk());
-
 		SB3dChunkHeader header;
-		file->read(&header, sizeof(header));
+		B3DFile->read(&header, sizeof(header));
+#ifdef __BIG_ENDIAN__
+		header.size = os::Byteswap::byteswap(header.size);
+#endif
 
-		#ifdef __BIG_ENDIAN__
-			header.size = os::Byteswap::byteswap(header.size);
-		#endif
-
-		B3dStack.getLast().name[0] = header.name[0];
-		B3dStack.getLast().name[1] = header.name[1];
-		B3dStack.getLast().name[2] = header.name[2];
-		B3dStack.getLast().name[3] = header.name[3];
-		B3dStack.getLast().length = header.size+8;
-		B3dStack.getLast().startposition = file->getPos() - 8;
-
-		bool knownChunk = false;
+		B3dStack.push_back(SB3dChunk(header, B3DFile->getPos()-8));
 
 		if ( strncmp( B3dStack.getLast().name, "NODE", 4 ) == 0 )
 		{
-			knownChunk = true;
 			if (!readChunkNODE(Joint))
 				return false;
 		}
 		else if ( strncmp( B3dStack.getLast().name, "MESH", 4 ) == 0 )
 		{
-			knownChunk = true;
 			if (!readChunkMESH(Joint))
 				return false;
 		}
-		else if ( strncmp( B3dStack.getLast().name, "ANIM", 4 ) == 0 )
-		{
-			knownChunk = true;
-			if (!readChunkANIM(Joint))
-				return false;
-		}
 		else if ( strncmp( B3dStack.getLast().name, "BONE", 4 ) == 0 )
 		{
-			knownChunk = true;
 			if (!readChunkBONE(Joint))
 				return false;
 		}
 		else if ( strncmp( B3dStack.getLast().name, "KEYS", 4 ) == 0 )
 		{
-			knownChunk = true;
 			if(!readChunkKEYS(Joint))
 				return false;
 		}
-
-		if (!knownChunk)
+		else if ( strncmp( B3dStack.getLast().name, "ANIM", 4 ) == 0 )
+		{
+			if (!readChunkANIM())
+				return false;
+		}
+		else
 		{
 			os::Printer::log("Unknown chunk found in node chunk - skipping");
-			file->seek(B3dStack.getLast().startposition + B3dStack.getLast().length);
+			B3DFile->seek(B3dStack.getLast().startposition + B3dStack.getLast().length);
 			B3dStack.erase(B3dStack.size()-1);
 		}
 	}
@@ -286,67 +235,60 @@ bool CB3DMeshFileLoader::readChunkNODE(CSkinnedMesh::SJoint *InJoint)
 	return true;
 }
 
+
 bool CB3DMeshFileLoader::readChunkMESH(CSkinnedMesh::SJoint *InJoint)
 {
+#ifdef _B3D_READER_DEBUG
+	os::Printer::log("read ChunkMESH");
+#endif
+
 	const s32 vertices_Start=BaseVertices.size(); //B3Ds have Vertex ID's local within the mesh I don't want this
 
 	s32 brush_id;
-
-	file->read(&brush_id, sizeof(brush_id));
-
-	#ifdef __BIG_ENDIAN__
-		brush_id = os::Byteswap::byteswap(brush_id);
-	#endif
+	B3DFile->read(&brush_id, sizeof(brush_id));
+#ifdef __BIG_ENDIAN__
+	brush_id = os::Byteswap::byteswap(brush_id);
+#endif
 
 	NormalsInFile=false;
 
-	while(B3dStack.getLast().startposition + B3dStack.getLast().length>file->getPos()) //this chunk repeats
+	while((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) //this chunk repeats
 	{
-		B3dStack.push_back(SB3dChunk());
-
 		SB3dChunkHeader header;
-		file->read(&header, sizeof(header));
+		B3DFile->read(&header, sizeof(header));
+#ifdef __BIG_ENDIAN__
+		header.size = os::Byteswap::byteswap(header.size);
+#endif
 
-		#ifdef __BIG_ENDIAN__
-			header.size = os::Byteswap::byteswap(header.size);
-		#endif
-
-		B3dStack.getLast().name[0]=header.name[0];
-		B3dStack.getLast().name[1]=header.name[1]; //Not sure of an easier way
-		B3dStack.getLast().name[2]=header.name[2];
-		B3dStack.getLast().name[3]=header.name[3];
-		B3dStack.getLast().length = header.size + 8;
-		B3dStack.getLast().startposition = file->getPos() - 8;
-
-		bool knownChunk=false;
+		B3dStack.push_back(SB3dChunk(header, B3DFile->getPos()-8));
 
 		if ( strncmp( B3dStack.getLast().name, "VRTS", 4 ) == 0 )
 		{
-			knownChunk=true;
-			if (!readChunkVRTS(InJoint, 0, vertices_Start))
+			if (!readChunkVRTS(InJoint))
 				return false;
 		}
 		else if ( strncmp( B3dStack.getLast().name, "TRIS", 4 ) == 0 )
 		{
-			knownChunk=true;
-
 			scene::SSkinMeshBuffer *MeshBuffer = AnimatedMesh->createBuffer();
 
 			if (brush_id!=-1)
-				MeshBuffer->Material=(*Materials[brush_id].Material);
+			{
+				loadTextures(Materials[brush_id]);
+				MeshBuffer->Material=Materials[brush_id].Material;
+			}
 
-			if(readChunkTRIS(InJoint, MeshBuffer,AnimatedMesh->getMeshBuffers().size()-1, vertices_Start)==false)
+			if(readChunkTRIS(MeshBuffer,AnimatedMesh->getMeshBuffers().size()-1, vertices_Start)==false)
 				return false;
 
-			if (!NormalsInFile && MeshBuffer->Material.Lighting) // No point wasting time on lightmapped levels
+			if (!NormalsInFile)
 			{
 				s32 i;
 
 				for ( i=0; i<(s32)MeshBuffer->Indices.size(); i+=3)
 				{
-					core::plane3d<f32> p(	MeshBuffer->getVertex(MeshBuffer->Indices[i+0])->Pos,
-											MeshBuffer->getVertex(MeshBuffer->Indices[i+1])->Pos,
-											MeshBuffer->getVertex(MeshBuffer->Indices[i+2])->Pos);
+					core::plane3df p(MeshBuffer->getVertex(MeshBuffer->Indices[i+0])->Pos,
+							MeshBuffer->getVertex(MeshBuffer->Indices[i+1])->Pos,
+							MeshBuffer->getVertex(MeshBuffer->Indices[i+2])->Pos);
 
 					MeshBuffer->getVertex(MeshBuffer->Indices[i+0])->Normal += p.Normal;
 					MeshBuffer->getVertex(MeshBuffer->Indices[i+1])->Normal += p.Normal;
@@ -355,16 +297,15 @@ bool CB3DMeshFileLoader::readChunkMESH(CSkinnedMesh::SJoint *InJoint)
 
 				for ( i = 0; i<(s32)MeshBuffer->getVertexCount(); ++i )
 				{
-					MeshBuffer->getVertex(i)->Normal.normalize ();
+					MeshBuffer->getVertex(i)->Normal.normalize();
 					BaseVertices[vertices_Start+i].Normal=MeshBuffer->getVertex(i)->Normal;
 				}
 			}
 		}
-
-		if (!knownChunk)
+		else
 		{
 			os::Printer::log("Unknown chunk found in mesh - skipping");
-			file->seek(B3dStack.getLast().startposition + B3dStack.getLast().length);
+			B3DFile->seek(B3dStack.getLast().startposition + B3dStack.getLast().length);
 			B3dStack.erase(B3dStack.size()-1);
 		}
 	}
@@ -379,6 +320,7 @@ bool CB3DMeshFileLoader::readChunkMESH(CSkinnedMesh::SJoint *InJoint)
 VRTS:
   int flags                   ;1=normal values present, 2=rgba values present
   int tex_coord_sets          ;texture coords per vertex (eg: 1 for simple U/V) max=8
+				but we only support 3
   int tex_coord_set_size      ;components per set (eg: 2 for simple U/V) max=4
   {
   float x,y,z                 ;always present
@@ -387,29 +329,32 @@ VRTS:
   float tex_coords[tex_coord_sets][tex_coord_set_size]	;tex coords
   }
 */
-bool CB3DMeshFileLoader::readChunkVRTS(CSkinnedMesh::SJoint *InJoint, scene::SSkinMeshBuffer* MeshBuffer, s32 vertices_Start)
+bool CB3DMeshFileLoader::readChunkVRTS(CSkinnedMesh::SJoint *InJoint)
 {
+#ifdef _B3D_READER_DEBUG
+	os::Printer::log("read ChunkVRTS");
+#endif
+
+	const s32 max_tex_coords = 3;
 	s32 flags, tex_coord_sets, tex_coord_set_size;
 
-	file->read(&flags, sizeof(flags));
-	file->read(&tex_coord_sets, sizeof(tex_coord_sets));
-	file->read(&tex_coord_set_size, sizeof(tex_coord_set_size));
+	B3DFile->read(&flags, sizeof(flags));
+	B3DFile->read(&tex_coord_sets, sizeof(tex_coord_sets));
+	B3DFile->read(&tex_coord_set_size, sizeof(tex_coord_set_size));
+#ifdef __BIG_ENDIAN__
+	flags = os::Byteswap::byteswap(flags);
+	tex_coord_sets = os::Byteswap::byteswap(tex_coord_sets);
+	tex_coord_set_size = os::Byteswap::byteswap(tex_coord_set_size);
+#endif
 
-	#ifdef __BIG_ENDIAN__
-		flags = os::Byteswap::byteswap(flags);
-		tex_coord_sets = os::Byteswap::byteswap(tex_coord_sets);
-		tex_coord_set_size = os::Byteswap::byteswap(tex_coord_set_size);
-	#endif
-
-	if (tex_coord_sets >= 3 || tex_coord_set_size >= 4) // Something is wrong
+	if (tex_coord_sets >= max_tex_coords || tex_coord_set_size >= 4) // Something is wrong
 	{
-		os::Printer::log("tex_coord_sets or tex_coord_set_size too big", file->getFileName(), ELL_ERROR);
+		os::Printer::log("tex_coord_sets or tex_coord_set_size too big", B3DFile->getFileName(), ELL_ERROR);
 		return false;
 	}
 
 	//------ Allocate Memory, for speed -----------//
 
-	s32 MemoryNeeded = B3dStack.getLast().length / sizeof(f32);
 	s32 NumberOfReads = 3;
 
 	if (flags & 1)
@@ -419,68 +364,33 @@ bool CB3DMeshFileLoader::readChunkVRTS(CSkinnedMesh::SJoint *InJoint, scene::SSk
 
 	NumberOfReads += tex_coord_sets*tex_coord_set_size;
 
-	MemoryNeeded /= NumberOfReads;
+	const s32 memoryNeeded = (B3dStack.getLast().length / sizeof(f32)) / NumberOfReads;
 
-	BaseVertices.reallocate(MemoryNeeded + BaseVertices.size() + 1);
-	AnimatedVertices_VertexID.reallocate(MemoryNeeded + AnimatedVertices_VertexID.size() + 1);
+	BaseVertices.reallocate(memoryNeeded + BaseVertices.size() + 1);
+	AnimatedVertices_VertexID.reallocate(memoryNeeded + AnimatedVertices_VertexID.size() + 1);
 
 	//--------------------------------------------//
 
-	while(B3dStack.getLast().startposition + B3dStack.getLast().length > file->getPos()) // this chunk repeats
+	while( (B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
 	{
-		f32 x=0.0f, y=0.0f, z=0.0f;
-		f32 nx=0.0f, ny=0.0f, nz=0.0f;
-		f32 red=1.0f, green=1.0f, blue=1.0f, alpha=1.0f;
-		f32 tex_coords[3][4];
+		f32 position[3];
+		f32 normal[3]={0.f, 0.f, 0.f};
+		f32 color[4]={1.0f, 1.0f, 1.0f, 1.0f};
+		f32 tex_coords[max_tex_coords][4];
 
-		file->read(&x, sizeof(x));
-		file->read(&y, sizeof(y));
-		file->read(&z, sizeof(z));
+		readFloats(position, 3);
 
 		if (flags & 1)
 		{
 			NormalsInFile = true;
-			file->read(&nx, sizeof(nx));
-			file->read(&ny, sizeof(ny));
-			file->read(&nz, sizeof(nz));
+			readFloats(normal, 3);
 		}
 
 		if (flags & 2)
-		{
-			file->read(&red, sizeof(red));
-			file->read(&green, sizeof(green));
-			file->read(&blue, sizeof(blue));
-			file->read(&alpha, sizeof(alpha));
-		}
+			readFloats(color, 4);
 
 		for (s32 i=0; i<tex_coord_sets; ++i)
-			for (s32 j=0; j<tex_coord_set_size; ++j)
-				file->read(&tex_coords[i][j], sizeof(f32));
-
-		#ifdef __BIG_ENDIAN__
-			x = os::Byteswap::byteswap(x);
-			y = os::Byteswap::byteswap(y);
-			z = os::Byteswap::byteswap(z);
-
-			if (flags&1)
-			{
-				nx = os::Byteswap::byteswap(nx);
-				ny = os::Byteswap::byteswap(ny);
-				nz = os::Byteswap::byteswap(nz);
-			}
-
-			if (flags & 2)
-			{
-				red = os::Byteswap::byteswap(red);
-				green = os::Byteswap::byteswap(green);
-				blue = os::Byteswap::byteswap(blue);
-				alpha = os::Byteswap::byteswap(alpha);
-			}
-
-			for (s32 i=0; i<=tex_coord_sets-1; i++)
-				for (s32 j=0; j<=tex_coord_set_size-1; j++)
-					tex_coords[i][j] = os::Byteswap::byteswap(tex_coords[i][j]);
-		#endif
+			readFloats(tex_coords[i], tex_coord_set_size);
 
 		f32 tu=0.0f, tv=0.0f;
 		if (tex_coord_sets >= 1 && tex_coord_set_size >= 2)
@@ -490,23 +400,23 @@ bool CB3DMeshFileLoader::readChunkVRTS(CSkinnedMesh::SJoint *InJoint, scene::SSk
 		}
 
 		f32 tu2=0.0f, tv2=0.0f;
-		if (tex_coord_sets>=2 && tex_coord_set_size>=2)
+		if (tex_coord_sets>1 && tex_coord_set_size>1)
 		{
 			tu2=tex_coords[1][0];
 			tv2=tex_coords[1][1];
 		}
 
 		// Create Vertex...
-		video::S3DVertex2TCoords Vertex(x, y, z, nx, ny, nz, video::SColorf(red, green, blue, alpha).toSColor(), tu, tv, tu2, tv2);
+		video::S3DVertex2TCoords Vertex(position[0], position[1], position[2],
+				normal[0], normal[1], normal[2],
+				video::SColorf(color[0], color[1], color[2], color[3]).toSColor(),
+				tu, tv, tu2, tv2);
 
 		// Transform the Vertex position by nested node...
 		InJoint->GlobalMatrix.transformVect(Vertex.Pos);
-
-
 		InJoint->GlobalMatrix.rotateVect(Vertex.Normal);
 
 		//Add it...
-
 		BaseVertices.push_back(Vertex);
 
 		AnimatedVertices_VertexID.push_back(-1);
@@ -519,45 +429,44 @@ bool CB3DMeshFileLoader::readChunkVRTS(CSkinnedMesh::SJoint *InJoint, scene::SSk
 }
 
 
-bool CB3DMeshFileLoader::readChunkTRIS(CSkinnedMesh::SJoint *InJoint, scene::SSkinMeshBuffer *MeshBuffer, u32 MeshBufferID, s32 vertices_Start)
+bool CB3DMeshFileLoader::readChunkTRIS(scene::SSkinMeshBuffer *MeshBuffer, u32 MeshBufferID, s32 vertices_Start)
 {
+#ifdef _B3D_READER_DEBUG
+	os::Printer::log("read ChunkTRIS");
+#endif
 
 	bool showVertexWarning=false;
 
-	s32 triangle_brush_id; // Note: Irrlicht can't have different brushes for each triangle (I'm using a workaround)
-
-	file->read(&triangle_brush_id, sizeof(triangle_brush_id));
-
-	#ifdef __BIG_ENDIAN__
-		triangle_brush_id = os::Byteswap::byteswap(triangle_brush_id);
-	#endif
+	s32 triangle_brush_id; // Note: Irrlicht can't have different brushes for each triangle (using a workaround)
+	B3DFile->read(&triangle_brush_id, sizeof(triangle_brush_id));
+#ifdef __BIG_ENDIAN__
+	triangle_brush_id = os::Byteswap::byteswap(triangle_brush_id);
+#endif
 
 	SB3dMaterial *B3dMaterial;
 
 	if (triangle_brush_id != -1)
+	{
+		loadTextures(Materials[triangle_brush_id]);
 		B3dMaterial = &Materials[triangle_brush_id];
+		MeshBuffer->Material = B3dMaterial->Material;
+	}
 	else
 		B3dMaterial = 0;
 
-	if (B3dMaterial)
-		MeshBuffer->Material = (*B3dMaterial->Material);
+	const s32 memoryNeeded = B3dStack.getLast().length / sizeof(s32);
+	MeshBuffer->Indices.reallocate(memoryNeeded + MeshBuffer->Indices.size() + 1);
 
-	s32 MemoryNeeded = B3dStack.getLast().length / sizeof(s32);
-	MeshBuffer->Indices.reallocate(MemoryNeeded + MeshBuffer->Indices.size() + 1);
-
-	while(B3dStack.getLast().startposition + B3dStack.getLast().length > file->getPos()) // this chunk repeats
+	while((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
 	{
 		s32 vertex_id[3];
 
-		file->read(&vertex_id[0], sizeof(s32));
-		file->read(&vertex_id[1], sizeof(s32));
-		file->read(&vertex_id[2], sizeof(s32));
-
-		#ifdef __BIG_ENDIAN__
-			vertex_id[0] = os::Byteswap::byteswap(vertex_id[0]);
-			vertex_id[1] = os::Byteswap::byteswap(vertex_id[1]);
-			vertex_id[2] = os::Byteswap::byteswap(vertex_id[2]);
-		#endif
+		B3DFile->read(vertex_id, 3*sizeof(s32));
+#ifdef __BIG_ENDIAN__
+		vertex_id[0] = os::Byteswap::byteswap(vertex_id[0]);
+		vertex_id[1] = os::Byteswap::byteswap(vertex_id[1]);
+		vertex_id[2] = os::Byteswap::byteswap(vertex_id[2]);
+#endif
 
 		//Make Ids global:
 		vertex_id[0] += vertices_Start;
@@ -567,7 +476,10 @@ bool CB3DMeshFileLoader::readChunkTRIS(CSkinnedMesh::SJoint *InJoint, scene::SSk
 		for(s32 i=0; i<3; ++i)
 		{
 			if ((u32)vertex_id[i] >= AnimatedVertices_VertexID.size())
+			{
+				os::Printer::log("Illegal vertex index found", B3DFile->getFileName(), ELL_ERROR);
 				return false;
+			}
 
 			if (AnimatedVertices_VertexID[ vertex_id[i] ] != -1)
 			{
@@ -580,9 +492,8 @@ bool CB3DMeshFileLoader::readChunkTRIS(CSkinnedMesh::SJoint *InJoint, scene::SSk
 			}
 			if (AnimatedVertices_VertexID[ vertex_id[i] ] == -1) //If this vertex is not in the meshbuffer
 			{
-
 				//Check for lightmapping:
-				if (BaseVertices[ vertex_id[i] ].TCoords2 != core::vector2d<f32>(0,0))
+				if (BaseVertices[ vertex_id[i] ].TCoords2 != core::vector2df(0.f,0.f))
 					MeshBuffer->MoveTo_2TCoords(); //Will only affect the meshbuffer the first time this is called
 
 				//Add the vertex to the meshbuffer:
@@ -600,15 +511,14 @@ bool CB3DMeshFileLoader::readChunkTRIS(CSkinnedMesh::SJoint *InJoint, scene::SSk
 					// Apply Material/Colour/etc...
 					video::S3DVertex *Vertex=MeshBuffer->getVertex(MeshBuffer->getVertexCount()-1);
 
-					if (Vertex->Color.getAlpha() == 255) //Note: Irrlicht docs state that 0 is opaque, are they wrong?
+					if (Vertex->Color.getAlpha() == 255)
 						Vertex->Color.setAlpha( (s32)(B3dMaterial->alpha * 255.0f) );
 
-
 					// Use texture's scale
 					if (B3dMaterial->Textures[0])
 					{
-						Vertex->TCoords.X *=B3dMaterial->Textures[0]->Xscale;
-						Vertex->TCoords.Y *=B3dMaterial->Textures[0]->Yscale;
+						Vertex->TCoords.X *= B3dMaterial->Textures[0]->Xscale;
+						Vertex->TCoords.Y *= B3dMaterial->Textures[0]->Yscale;
 					}
 					/*
 					if (B3dMaterial->Textures[1])
@@ -617,7 +527,6 @@ bool CB3DMeshFileLoader::readChunkTRIS(CSkinnedMesh::SJoint *InJoint, scene::SSk
 						Vertex->TCoords2.Y *=B3dMaterial->Textures[1]->Yscale;
 					}
 					*/
-
 				}
 			}
 		}
@@ -629,8 +538,6 @@ bool CB3DMeshFileLoader::readChunkTRIS(CSkinnedMesh::SJoint *InJoint, scene::SSk
 
 	B3dStack.erase(B3dStack.size()-1);
 
-
-
 	if (showVertexWarning)
 		os::Printer::log("B3dMeshLoader: Warning, different meshbuffers linking to the same vertex, this will cause problems with animated meshes");
 
@@ -640,32 +547,35 @@ bool CB3DMeshFileLoader::readChunkTRIS(CSkinnedMesh::SJoint *InJoint, scene::SSk
 
 bool CB3DMeshFileLoader::readChunkBONE(CSkinnedMesh::SJoint *InJoint)
 {
+#ifdef _B3D_READER_DEBUG
+	os::Printer::log("read ChunkBONE");
+#endif
+
 	if (B3dStack.getLast().length > 8)
 	{
-		while(B3dStack.getLast().startposition + B3dStack.getLast().length>file->getPos()) // this chunk repeats
+		while((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
 		{
-			CSkinnedMesh::SWeight *Weight=AnimatedMesh->createWeight(InJoint);
+			CSkinnedMesh::SWeight *weight=AnimatedMesh->createWeight(InJoint);
 
-			u32 GlobalVertexID;
+			u32 globalVertexID;
 
-			file->read(&GlobalVertexID, sizeof(GlobalVertexID));
-			file->read(&Weight->strength, sizeof(Weight->strength));
+			B3DFile->read(&globalVertexID, sizeof(globalVertexID));
+			B3DFile->read(&weight->strength, sizeof(weight->strength));
+#ifdef __BIG_ENDIAN__
+			globalVertexID = os::Byteswap::byteswap(globalVertexID);
+			weight->strength = os::Byteswap::byteswap(weight->strength);
+#endif
 
-			#ifdef __BIG_ENDIAN__
-				GlobalVertexID = os::Byteswap::byteswap(GlobalVertexID);
-				Weight->strength = os::Byteswap::byteswap(Weight->strength);
-			#endif
-
-			if (AnimatedVertices_VertexID[GlobalVertexID]==-1)
+			if (AnimatedVertices_VertexID[globalVertexID]==-1)
 			{
 				os::Printer::log("B3dMeshLoader: Weight has bad vertex id (no link to meshbuffer index found)");
-				Weight->vertex_id = Weight->buffer_id = 0;
+				weight->vertex_id = weight->buffer_id = 0;
 			}
 			else
 			{
 				//Find the MeshBuffer and Vertex index from the Global Vertex ID:
-				Weight->vertex_id = AnimatedVertices_VertexID[GlobalVertexID];
-				Weight->buffer_id = AnimatedVertices_BufferID[GlobalVertexID];
+				weight->vertex_id = AnimatedVertices_VertexID[globalVertexID];
+				weight->buffer_id = AnimatedVertices_BufferID[globalVertexID];
 			}
 		}
 	}
@@ -677,58 +587,48 @@ bool CB3DMeshFileLoader::readChunkBONE(CSkinnedMesh::SJoint *InJoint)
 
 bool CB3DMeshFileLoader::readChunkKEYS(CSkinnedMesh::SJoint *InJoint)
 {
-	s32 flags;
-	file->read(&flags, sizeof(flags));
-	#ifdef __BIG_ENDIAN__
-		flags = os::Byteswap::byteswap(flags);
-	#endif
+#ifdef _B3D_READER_DEBUG
+//	os::Printer::log("read ChunkKEYS");
+#endif
 
-	while(B3dStack.getLast().startposition + B3dStack.getLast().length>file->getPos()) //this chunk repeats
+	s32 flags;
+	B3DFile->read(&flags, sizeof(flags));
+#ifdef __BIG_ENDIAN__
+	flags = os::Byteswap::byteswap(flags);
+#endif
+
+	while((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) //this chunk repeats
 	{
 		s32 frame;
 
-		f32 positionData[3];
-		f32 scaleData[3];
-		f32 rotationData[4];
-
-		file->read(&frame, sizeof(frame));
-
-		if (flags&1)
-			readFloats(positionData, 3);
-
-		if (flags&2)
-			readFloats(scaleData, 3);
-
-		if (flags&4)
-			readFloats(rotationData, 4);
-
+		B3DFile->read(&frame, sizeof(frame));
 		#ifdef __BIG_ENDIAN__
 		frame = os::Byteswap::byteswap(frame);
 		#endif
 
-		core::vector3df position = core::vector3df(positionData[0], positionData[1], positionData[2]);
-		core::vector3df scale = core::vector3df(scaleData[0], scaleData[1], scaleData[2]);
-		core::quaternion rotation = core::quaternion(rotationData[1], rotationData[2], rotationData[3], rotationData[0]); // meant to be in this order
-
-		// Add key frame
-
+		// Add key frames
+		f32 data[4];
 		if (flags & 1)
 		{
+			readFloats(data, 3);
 			CSkinnedMesh::SPositionKey *Key=AnimatedMesh->createPositionKey(InJoint);
 			Key->frame = (f32)frame;
-			Key->position = position;
+			Key->position.set(data[0], data[1], data[2]);
 		}
 		if (flags & 2)
 		{
+			readFloats(data, 3);
 			CSkinnedMesh::SScaleKey *Key=AnimatedMesh->createScaleKey(InJoint);
 			Key->frame = (f32)frame;
-			Key->scale=scale;
+			Key->scale.set(data[0], data[1], data[2]);
 		}
 		if (flags & 4)
 		{
+			readFloats(data, 4);
 			CSkinnedMesh::SRotationKey *Key=AnimatedMesh->createRotationKey(InJoint);
 			Key->frame = (f32)frame;
-			Key->rotation = rotation;
+			// meant to be in this order since b3d stores W first
+			Key->rotation.set(data[1], data[2], data[3], data[0]);
 		}
 	}
 
@@ -737,124 +637,154 @@ bool CB3DMeshFileLoader::readChunkKEYS(CSkinnedMesh::SJoint *InJoint)
 }
 
 
-bool CB3DMeshFileLoader::readChunkANIM(CSkinnedMesh::SJoint *InJoint)
+bool CB3DMeshFileLoader::readChunkANIM()
 {
-	s32 AnimFlags; //not stored\used
-	s32 AnimFrames;//not stored\used
-	f32 AnimFPS; //not stored\used
+#ifdef _B3D_READER_DEBUG
+	os::Printer::log("read ChunkANIM");
+#endif
 
-	file->read(&AnimFlags, sizeof(s32));
-	file->read(&AnimFrames, sizeof(s32));
-	readFloats(&AnimFPS, 1);
+	s32 animFlags; //not stored\used
+	s32 animFrames;//not stored\used
+	f32 animFPS; //not stored\used
+
+	B3DFile->read(&animFlags, sizeof(s32));
+	B3DFile->read(&animFrames, sizeof(s32));
+	readFloats(&animFPS, 1);
 
 	#ifdef __BIG_ENDIAN__
-		AnimFlags = os::Byteswap::byteswap(AnimFlags);
-		AnimFrames = os::Byteswap::byteswap(AnimFrames);
+		animFlags = os::Byteswap::byteswap(animFlags);
+		animFrames = os::Byteswap::byteswap(animFrames);
 	#endif
 
 	B3dStack.erase(B3dStack.size()-1);
 	return true;
 }
 
+
 bool CB3DMeshFileLoader::readChunkTEXS()
 {
-	bool Previous32BitTextureFlag = SceneManager->getVideoDriver()->getTextureCreationFlag(video::ETCF_ALWAYS_32_BIT);
-	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_ALWAYS_32_BIT, true);
+#ifdef _B3D_READER_DEBUG
+	os::Printer::log("read ChunkTEXS");
+#endif
 
-	while(B3dStack.getLast().startposition + B3dStack.getLast().length>file->getPos()) //this chunk repeats
+	while((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) //this chunk repeats
 	{
-		core::stringc TextureName=readString();
+		Textures.push_back(SB3dTexture());
+		SB3dTexture& B3dTexture = Textures.getLast();
 
-		TextureName=stripPathFromString(file->getFileName(),true) + stripPathFromString(TextureName,false);
+		B3dTexture.TextureName=readString();
+		B3dTexture.TextureName=stripPathFromString(B3DFile->getFileName(),true) + stripPathFromString(B3dTexture.TextureName,false);
+#ifdef _B3D_READER_DEBUG
+		os::Printer::log("read Texture", B3dTexture.TextureName.c_str());
+#endif
 
-		SB3dTexture B3dTexture;
-		B3dTexture.Texture=SceneManager->getVideoDriver()->getTexture ( TextureName.c_str() );
-
-		file->read(&B3dTexture.Flags, sizeof(s32));
-		file->read(&B3dTexture.Blend, sizeof(s32));
+		B3DFile->read(&B3dTexture.Flags, sizeof(s32));
+		B3DFile->read(&B3dTexture.Blend, sizeof(s32));
+#ifdef __BIG_ENDIAN__
+		B3dTexture.Flags = os::Byteswap::byteswap(B3dTexture.Flags);
+		B3dTexture.Blend = os::Byteswap::byteswap(B3dTexture.Blend);
+#endif
+#ifdef _B3D_READER_DEBUG
+		os::Printer::log("Flags", core::stringc(B3dTexture.Flags).c_str());
+		os::Printer::log("Blend", core::stringc(B3dTexture.Blend).c_str());
+#endif
 		readFloats(&B3dTexture.Xpos, 1);
 		readFloats(&B3dTexture.Ypos, 1);
 		readFloats(&B3dTexture.Xscale, 1);
 		readFloats(&B3dTexture.Yscale, 1);
 		readFloats(&B3dTexture.Angle, 1);
-
-		#ifdef __BIG_ENDIAN__
-			B3dTexture.Flags = os::Byteswap::byteswap(B3dTexture.Flags);
-			B3dTexture.Blend = os::Byteswap::byteswap(B3dTexture.Blend);
-		#endif
-
-		Textures.push_back(B3dTexture);
 	}
 
 	B3dStack.erase(B3dStack.size()-1);
 
-	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_ALWAYS_32_BIT, Previous32BitTextureFlag);
-
 	return true;
 }
 
 
 bool CB3DMeshFileLoader::readChunkBRUS()
 {
-	s32 n_texs;
+#ifdef _B3D_READER_DEBUG
+	os::Printer::log("read ChunkBRUS");
+#endif
 
-	file->read(&n_texs, sizeof(s32));
+	u32 n_texs;
+	B3DFile->read(&n_texs, sizeof(u32));
+#ifdef __BIG_ENDIAN__
+	n_texs = os::Byteswap::byteswap(n_texs);
+#endif
 
-	#ifdef __BIG_ENDIAN__
-		n_texs = os::Byteswap::byteswap(n_texs);
-	#endif
+	// number of texture ids read for Irrlicht
+	const u32 num_textures = core::min_(n_texs, video::MATERIAL_MAX_TEXTURES);
+	// number of bytes to skip (for ignored texture ids)
+	const u32 n_texs_offset = (num_textures<n_texs)?(n_texs-num_textures):0;
 
-	while(B3dStack.getLast().startposition + B3dStack.getLast().length>file->getPos()) //this chunk repeats
+	while((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) //this chunk repeats
 	{
 		// This is what blitz basic calls a brush, like a Irrlicht Material
 
-		core::stringc MaterialName=readString(); //Not used but we still need the read it
+		const core::stringc name = readString();
+#ifdef _B3D_READER_DEBUG
+	os::Printer::log("read Material", name.c_str());
+#endif
+		Materials.push_back(SB3dMaterial());
+		SB3dMaterial& B3dMaterial=Materials.getLast();
 
-		SB3dMaterial B3dMaterial;
+		readFloats(&B3dMaterial.red, 1);
+		readFloats(&B3dMaterial.green, 1);
+		readFloats(&B3dMaterial.blue, 1);
+		readFloats(&B3dMaterial.alpha, 1);
+		readFloats(&B3dMaterial.shininess, 1);
 
-		B3dMaterial.Material = new video::SMaterial();
-		B3dMaterial.Textures[0]=0;
-		B3dMaterial.Textures[1]=0;
-
-		s32 texture_id[8];
-		texture_id[0]=-1;
-		texture_id[1]=-1;
-
-		file->read(&B3dMaterial.red, sizeof(B3dMaterial.red));
-		file->read(&B3dMaterial.green, sizeof(B3dMaterial.green));
-		file->read(&B3dMaterial.blue, sizeof(B3dMaterial.blue));
-		file->read(&B3dMaterial.alpha, sizeof(B3dMaterial.alpha));
-		file->read(&B3dMaterial.shininess, sizeof(B3dMaterial.shininess));
-		file->read(&B3dMaterial.blend, sizeof(B3dMaterial.blend));
-		file->read(&B3dMaterial.fx, sizeof(B3dMaterial.fx));
-
-		for (s32 n=0; n < n_texs; ++n)
-			file->read(&texture_id[n], sizeof(s32)); //I'm not sure of getting the sizeof an array
-
-		#ifdef __BIG_ENDIAN__
-			B3dMaterial.red = os::Byteswap::byteswap(B3dMaterial.red);
-			B3dMaterial.green = os::Byteswap::byteswap(B3dMaterial.green);
-			B3dMaterial.blue = os::Byteswap::byteswap(B3dMaterial.blue);
-			B3dMaterial.alpha = os::Byteswap::byteswap(B3dMaterial.alpha);
-			B3dMaterial.shininess = os::Byteswap::byteswap(B3dMaterial.shininess);
-			B3dMaterial.blend = os::Byteswap::byteswap(B3dMaterial.blend);
-			B3dMaterial.fx = os::Byteswap::byteswap(B3dMaterial.fx);
-
-			for (s32 n=0; n < n_texs; ++n)
-				texture_id[n] = os::Byteswap::byteswap(texture_id[n]);
-		#endif
-
-		//------ Get pointers to the texture, based on the IDs ------
-		if (texture_id[0] != -1)
-			B3dMaterial.Textures[0]=&Textures[texture_id[0]];
-		if (texture_id[1] != -1)
-			B3dMaterial.Textures[1]=&Textures[texture_id[1]];
+		B3DFile->read(&B3dMaterial.blend, sizeof(B3dMaterial.blend));
+		B3DFile->read(&B3dMaterial.fx, sizeof(B3dMaterial.fx));
+#ifdef __BIG_ENDIAN__
+		B3dMaterial.blend = os::Byteswap::byteswap(B3dMaterial.blend);
+		B3dMaterial.fx = os::Byteswap::byteswap(B3dMaterial.fx);
+#endif
+#ifdef _B3D_READER_DEBUG
+		os::Printer::log("Blend", core::stringc(B3dMaterial.blend).c_str());
+		os::Printer::log("FX", core::stringc(B3dMaterial.fx).c_str());
+#endif
 
+		u32 i;
+		for (i=0; i<num_textures; ++i)
+		{
+			s32 texture_id=-1;
+			B3DFile->read(&texture_id, sizeof(s32));
+#ifdef __BIG_ENDIAN__
+			texture_id = os::Byteswap::byteswap(texture_id);
+#endif
+			//--- Get pointers to the texture, based on the IDs ---
+			if ((u32)texture_id < Textures.size())
+			{
+				B3dMaterial.Textures[i]=&Textures[texture_id];
+#ifdef _B3D_READER_DEBUG
+				os::Printer::log("Layer", core::stringc(i).c_str());
+				os::Printer::log("using texture", Textures[texture_id].TextureName.c_str());
+#endif
+			}
+			else
+				B3dMaterial.Textures[i]=0;
+		}
+		// skip other texture ids
+		for (i=0; i<n_texs_offset; ++i)
+		{
+			s32 texture_id=-1;
+			B3DFile->read(&texture_id, sizeof(s32));
+#ifdef __BIG_ENDIAN__
+			texture_id = os::Byteswap::byteswap(texture_id);
+#endif
+			if (ShowWarning && (texture_id != -1) && (n_texs>video::MATERIAL_MAX_TEXTURES))
+			{
+				os::Printer::log("Too many textures used in one material", B3DFile->getFileName(), ELL_WARNING);
+				ShowWarning = false;
+			}
+		}
 
 		//Fixes problems when the lightmap is on the first texture:
-		if (texture_id[0] != -1)
+		if (B3dMaterial.Textures[0] != 0)
 		{
-			if (Textures[texture_id[0]].Flags & 65536) // 65536 = secondary UV
+			if (B3dMaterial.Textures[0]->Flags & 65536) // 65536 = secondary UV
 			{
 				SB3dTexture *TmpTexture;
 				TmpTexture = B3dMaterial.Textures[1];
@@ -863,16 +793,17 @@ bool CB3DMeshFileLoader::readChunkBRUS()
 			}
 		}
 
-		if (B3dMaterial.Textures[0] != 0)
-			B3dMaterial.Material->setTexture(0, B3dMaterial.Textures[0]->Texture);
-		if (B3dMaterial.Textures[1] != 0)
-			B3dMaterial.Material->setTexture(1, B3dMaterial.Textures[1]->Texture);
-
-		//If the first texture is empty:
-		if (B3dMaterial.Textures[1] != 0 && B3dMaterial.Textures[0] == 0)
+		//If a preceeding texture slot is empty move the others down:
+		for (i=num_textures; i>0; --i)
 		{
-			B3dMaterial.Textures[0] = B3dMaterial.Textures[1];
-			B3dMaterial.Textures[1] = 0;
+			for (u32 j=i-1; j<num_textures-1; ++j)
+			{
+				if (B3dMaterial.Textures[j+1] != 0 && B3dMaterial.Textures[j] == 0)
+				{
+					B3dMaterial.Textures[j] = B3dMaterial.Textures[j+1];
+					B3dMaterial.Textures[j+1] = 0;
+				}
+			}
 		}
 
 		//------ Convert blitz flags/blend to irrlicht -------
@@ -880,62 +811,80 @@ bool CB3DMeshFileLoader::readChunkBRUS()
 		//Two textures:
 		if (B3dMaterial.Textures[1])
 		{
-			if (B3dMaterial.alpha==1)
+			if (B3dMaterial.alpha==1.f)
 			{
-				if (B3dMaterial.Textures[1]->Blend & 5) //(Multiply 2)
-					B3dMaterial.Material->MaterialType = video::EMT_LIGHTMAP_M2;
+				if (B3dMaterial.Textures[1]->Blend == 5) //(Multiply 2)
+					B3dMaterial.Material.MaterialType = video::EMT_LIGHTMAP_M2;
 				else
-					B3dMaterial.Material->MaterialType = video::EMT_LIGHTMAP;
+					B3dMaterial.Material.MaterialType = video::EMT_LIGHTMAP;
+				B3dMaterial.Material.Lighting = false;
 			}
 			else
-				B3dMaterial.Material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+			{
+				B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+				B3dMaterial.Material.ZWriteEnable = false;
+			}
 		}
 		else if (B3dMaterial.Textures[0]) //One texture:
 		{
-			if (B3dMaterial.Textures[0]->Flags & 2) //(Alpha mapped)
-				B3dMaterial.Material->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-			else if (B3dMaterial.Textures[0]->Flags & 4) //(Masked)
-				B3dMaterial.Material->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; // Todo: create color key texture
-			else if (B3dMaterial.alpha == 1)
-				B3dMaterial.Material->MaterialType = video::EMT_SOLID;
+			// Flags & 0x1 is usual SOLID, 0x8 is mipmap (handled before)
+			if (B3dMaterial.Textures[0]->Flags & 0x2) //(Alpha mapped)
+			{
+				B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+				B3dMaterial.Material.ZWriteEnable = false;
+			}
+			else if (B3dMaterial.Textures[0]->Flags & 0x4) //(Masked)
+				B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; // TODO: create color key texture
+			else if (B3dMaterial.Textures[0]->Flags & 0x40)
+				B3dMaterial.Material.MaterialType = video::EMT_SPHERE_MAP;
+			else if (B3dMaterial.Textures[0]->Flags & 0x80)
+				B3dMaterial.Material.MaterialType = video::EMT_SPHERE_MAP; // TODO: Should be cube map
+			else if (B3dMaterial.alpha == 1.f)
+				B3dMaterial.Material.MaterialType = video::EMT_SOLID;
 			else
-				B3dMaterial.Material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+			{
+				B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+				B3dMaterial.Material.ZWriteEnable = false;
+			}
 		}
 		else //No texture:
 		{
-			if (B3dMaterial.alpha == 1)
-				B3dMaterial.Material->MaterialType = video::EMT_SOLID;
+			if (B3dMaterial.alpha == 1.f)
+				B3dMaterial.Material.MaterialType = video::EMT_SOLID;
 			else
-				B3dMaterial.Material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+			{
+				B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+				B3dMaterial.Material.ZWriteEnable = false;
+			}
 		}
 
-		B3dMaterial.Material->AmbientColor = video::SColorf(B3dMaterial.red, B3dMaterial.green, B3dMaterial.blue, B3dMaterial.alpha).toSColor ();
+		B3dMaterial.Material.DiffuseColor = video::SColorf(B3dMaterial.red, B3dMaterial.green, B3dMaterial.blue, B3dMaterial.alpha).toSColor();
 
 		//------ Material fx ------
 
 		if (B3dMaterial.fx & 1) //full-bright
 		{
-			B3dMaterial.Material->AmbientColor = video::SColor(255, 255, 255, 255);
-			B3dMaterial.Material->Lighting = false;
+			B3dMaterial.Material.AmbientColor = video::SColor(255, 255, 255, 255);
+			B3dMaterial.Material.Lighting = false;
 		}
+		else
+			B3dMaterial.Material.AmbientColor = B3dMaterial.Material.DiffuseColor;
 
 		//if (B3dMaterial.fx & 2) //use vertex colors instead of brush color
 
 		if (B3dMaterial.fx & 4) //flatshaded
-			B3dMaterial.Material->GouraudShading = false;
+			B3dMaterial.Material.GouraudShading = false;
 
 		if (B3dMaterial.fx & 16) //disable backface culling
-			B3dMaterial.Material->BackfaceCulling = false;
+			B3dMaterial.Material.BackfaceCulling = false;
 
-		if (B3dMaterial.fx & 32) //force vertex alpha-blending
-			B3dMaterial.Material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+//		if (B3dMaterial.fx & 32) //force vertex alpha-blending
+//		{
+//			B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+//			B3dMaterial.Material.ZWriteEnable = false;
+//		}
 
-		B3dMaterial.Material->DiffuseColor = video::SColorf(B3dMaterial.red, B3dMaterial.green, B3dMaterial.blue, B3dMaterial.alpha).toSColor ();
-		B3dMaterial.Material->EmissiveColor = video::SColorf(0.5, 0.5, 0.5, 0).toSColor ();
-		B3dMaterial.Material->SpecularColor = video::SColorf(0, 0, 0, 0).toSColor ();
-		B3dMaterial.Material->Shininess = B3dMaterial.shininess;
-
-		Materials.push_back(B3dMaterial);
+		B3dMaterial.Material.Shininess = B3dMaterial.shininess;
 	}
 
 	B3dStack.erase(B3dStack.size()-1);
@@ -943,21 +892,51 @@ bool CB3DMeshFileLoader::readChunkBRUS()
 	return true;
 }
 
+
+void CB3DMeshFileLoader::loadTextures(SB3dMaterial& material) const
+{
+	const bool previous32BitTextureFlag = SceneManager->getVideoDriver()->getTextureCreationFlag(video::ETCF_ALWAYS_32_BIT);
+	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_ALWAYS_32_BIT, true);
+
+	// read texture from disk
+	// note that mipmaps might be disabled by Flags & 0x8
+	const bool doMipMaps = SceneManager->getVideoDriver()->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
+
+	for (u32 i=0; i<video::MATERIAL_MAX_TEXTURES; ++i)
+	{
+		SB3dTexture* B3dTexture = material.Textures[i];
+		if (B3dTexture && B3dTexture->TextureName.size() && !material.Material.getTexture(i))
+		{
+			SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, (B3dTexture->Flags & 0x8) ? true:false);
+			material.Material.setTexture(i, SceneManager->getVideoDriver()->getTexture( B3dTexture->TextureName.c_str() ));
+			if (material.Textures[i]->Flags & 0x10) // Clamp U
+				material.Material.TextureLayer[i].TextureWrap=video::ETC_CLAMP;
+			if (material.Textures[i]->Flags & 0x20) // Clamp V
+				material.Material.TextureLayer[i].TextureWrap=video::ETC_CLAMP;
+		}
+	}
+
+	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, doMipMaps);
+	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_ALWAYS_32_BIT, previous32BitTextureFlag);
+}
+
+
 core::stringc CB3DMeshFileLoader::readString()
 {
 	core::stringc newstring;
-	while (file->getPos() <= file->getSize())
+	while (B3DFile->getPos() <= B3DFile->getSize())
 	{
 		c8 character;
-		file->read(&character, sizeof(character));
+		B3DFile->read(&character, sizeof(character));
 		if (character==0)
-			return newstring;
+			break;
 		newstring.append(character);
 	}
 	return newstring;
 }
 
-core::stringc CB3DMeshFileLoader::stripPathFromString(core::stringc string, bool returnPath)
+
+core::stringc CB3DMeshFileLoader::stripPathFromString(const core::stringc& string, bool returnPath) const
 {
 	s32 slashIndex=string.findLast('/'); // forward slash
 	s32 backSlash=string.findLast('\\'); // back slash
@@ -965,10 +944,12 @@ core::stringc CB3DMeshFileLoader::stripPathFromString(core::stringc string, bool
 	if (backSlash>slashIndex) slashIndex=backSlash;
 
 	if (slashIndex==-1)//no slashes found
+	{
 		if (returnPath)
 			return core::stringc(); //no path to return
 		else
 			return string;
+	}
 
 	if (returnPath)
 		return string.subString(0, slashIndex + 1);
@@ -978,7 +959,7 @@ core::stringc CB3DMeshFileLoader::stripPathFromString(core::stringc string, bool
 
 void CB3DMeshFileLoader::readFloats(f32* vec, u32 count)
 {
-	file->read(vec, count*sizeof(f32));
+	B3DFile->read(vec, count*sizeof(f32));
 	#ifdef __BIG_ENDIAN__
 	for (u32 n=0; n<count; ++n)
 		vec[n] = os::Byteswap::byteswap(vec[n]);
diff --git a/src/dep/src/irrlicht/CB3DMeshFileLoader.h b/src/dep/src/irrlicht/CB3DMeshFileLoader.h
index a79b4bc..5f9099e 100644
--- a/src/dep/src/irrlicht/CB3DMeshFileLoader.h
+++ b/src/dep/src/irrlicht/CB3DMeshFileLoader.h
@@ -1,4 +1,10 @@
-// B3D mesh loader
+// Copyright (C) 2006-2009 Luke Hoschke
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+// B3D Mesh loader
+// File format designed by Mark Sibly for the Blitz3D engine and has been
+// declared public domain
 
 #include "IrrCompileConfig.h"
 
@@ -24,9 +30,6 @@ public:
 	//! Constructor
 	CB3DMeshFileLoader(scene::ISceneManager* smgr);
 
-	//! destructor
-	virtual ~CB3DMeshFileLoader();
-
 	//! returns true if the file maybe is able to be loaded by this class
 	//! based on the file extension (e.g. ".bsp")
 	virtual bool isALoadableFileExtension(const c8* fileName) const;
@@ -47,14 +50,23 @@ private:
 
 	struct SB3dChunk
 	{
+		SB3dChunk(const SB3dChunkHeader& header, long sp)
+			: length(header.size+8), startposition(sp)
+		{
+			name[0]=header.name[0];
+			name[1]=header.name[1];
+			name[2]=header.name[2];
+			name[3]=header.name[3];
+		}
+
 		c8 name[4];
 		s32 length;
-		s32 startposition;
+		long startposition;
 	};
 
 	struct SB3dTexture
 	{
-		video::ITexture* Texture;
+		core::stringc TextureName;
 		s32 Flags;
 		s32 Blend;
 		f32 Xpos;
@@ -66,32 +78,39 @@ private:
 
 	struct SB3dMaterial
 	{
-		video::SMaterial* Material;
+		SB3dMaterial() : red(1.0f), green(1.0f),
+			blue(1.0f), alpha(1.0f), shininess(0.0f), blend(1),
+			fx(0)
+		{
+			for (u32 i=0; i<video::MATERIAL_MAX_TEXTURES; ++i)
+				Textures[i]=0;
+		}
+		video::SMaterial Material;
 		f32 red, green, blue, alpha;
 		f32 shininess;
 		s32 blend,fx;
-		SB3dTexture *Textures[2];
+		SB3dTexture *Textures[video::MATERIAL_MAX_TEXTURES];
 	};
 
 	bool load();
 	bool readChunkNODE(CSkinnedMesh::SJoint* InJoint);
 	bool readChunkMESH(CSkinnedMesh::SJoint* InJoint);
-	bool readChunkVRTS(CSkinnedMesh::SJoint* InJoint, scene::SSkinMeshBuffer *MeshBuffer, s32 Vertices_Start);
-	bool readChunkTRIS(CSkinnedMesh::SJoint* InJoint, scene::SSkinMeshBuffer *MeshBuffer, u32 MeshBufferID, s32 Vertices_Start);
+	bool readChunkVRTS(CSkinnedMesh::SJoint* InJoint);
+	bool readChunkTRIS(scene::SSkinMeshBuffer *MeshBuffer, u32 MeshBufferID, s32 Vertices_Start);
 	bool readChunkBONE(CSkinnedMesh::SJoint* InJoint);
 	bool readChunkKEYS(CSkinnedMesh::SJoint* InJoint);
-	bool readChunkANIM(CSkinnedMesh::SJoint* InJoint);
+	bool readChunkANIM();
 	bool readChunkTEXS();
 	bool readChunkBRUS();
 
+	void loadTextures(SB3dMaterial& material) const;
+
 	core::stringc readString();
-	core::stringc stripPathFromString(core::stringc string, bool returnPath=false);
+	core::stringc stripPathFromString(const core::stringc& string, bool returnPath=false) const;
 	void readFloats(f32* vec, u32 count);
 
 	core::array<SB3dChunk> B3dStack;
 
-	bool NormalsInFile;
-
 	core::array<SB3dMaterial> Materials;
 	core::array<SB3dTexture> Textures;
 
@@ -104,10 +123,12 @@ private:
 	core::array<scene::SSkinMeshBuffer*> *Buffers;
 	core::array<CSkinnedMesh::SJoint*> *AllJoints;
 
-	//
 	ISceneManager*	SceneManager;
 	CSkinnedMesh*	AnimatedMesh;
-	io::IReadFile*	file;
+	io::IReadFile*	B3DFile;
+
+	bool NormalsInFile;
+	bool ShowWarning;
 };
 
 
diff --git a/src/dep/src/irrlicht/CBSPMeshFileLoader.cpp b/src/dep/src/irrlicht/CBSPMeshFileLoader.cpp
index 26f1d8d..daedbff 100644
--- a/src/dep/src/irrlicht/CBSPMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/CBSPMeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,14 +14,17 @@ namespace scene
 {
 
 //! Constructor
-CBSPMeshFileLoader::CBSPMeshFileLoader(io::IFileSystem* fs,video::IVideoDriver* driver, scene::ISceneManager* smgr)
-: FileSystem(fs), Driver(driver), SceneManager(smgr)
+CBSPMeshFileLoader::CBSPMeshFileLoader(scene::ISceneManager* smgr,
+		io::IFileSystem* fs)
+: FileSystem(fs), SceneManager(smgr)
 {
+
+	#ifdef _DEBUG
+	setDebugName("CBSPMeshFileLoader");
+	#endif
+
 	if (FileSystem)
 		FileSystem->grab();
-
-	if (Driver)
-		Driver->grab();
 }
 
 
@@ -30,9 +33,6 @@ CBSPMeshFileLoader::~CBSPMeshFileLoader()
 {
 	if (FileSystem)
 		FileSystem->drop();
-
-	if (Driver)
-		Driver->drop();
 }
 
 
@@ -53,11 +53,11 @@ IAnimatedMesh* CBSPMeshFileLoader::createMesh(io::IReadFile* file)
 	// load quake 3 bsp
 	if (strstr(file->getFileName(), ".bsp"))
 	{
-		CQ3LevelMesh* q = new CQ3LevelMesh(FileSystem, Driver, SceneManager);
+		CQ3LevelMesh* q = new CQ3LevelMesh(FileSystem, SceneManager);
 
-		q->getShader ( "scripts/models.shader", 1 );
-		q->getShader ( "scripts/liquid.shader", 1 );
-		//q->getShader ( "scripts/sky.shader", 1 );
+		q->getShader("scripts/models.shader");
+		q->getShader("scripts/liquid.shader");
+		//q->getShader("scripts/sky.shader");
 
 		if ( q->loadFile(file) )
 			return q;
@@ -68,8 +68,8 @@ IAnimatedMesh* CBSPMeshFileLoader::createMesh(io::IReadFile* file)
 	// load quake 3 shader container
 	if (strstr(file->getFileName(), ".shader"))
 	{
-		CQ3LevelMesh* q = new CQ3LevelMesh(FileSystem, Driver, SceneManager);
-		q->getShader ( file->getFileName(), 1 );
+		CQ3LevelMesh* q = new CQ3LevelMesh(FileSystem, SceneManager);
+		q->getShader(file->getFileName());
 		return q;
 	}
 
diff --git a/src/dep/src/irrlicht/CBSPMeshFileLoader.h b/src/dep/src/irrlicht/CBSPMeshFileLoader.h
index e044dfc..db17392 100644
--- a/src/dep/src/irrlicht/CBSPMeshFileLoader.h
+++ b/src/dep/src/irrlicht/CBSPMeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,7 +21,7 @@ class CBSPMeshFileLoader : public IMeshLoader
 public:
 
 	//! Constructor
-	CBSPMeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver, scene::ISceneManager* smgr);
+	CBSPMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs);
 
 	//! destructor
 	virtual ~CBSPMeshFileLoader();
@@ -39,7 +39,6 @@ public:
 private:
 
 	io::IFileSystem* FileSystem;
-	video::IVideoDriver* Driver;
 	scene::ISceneManager* SceneManager;
 };
 
diff --git a/src/dep/src/irrlicht/CBillboardSceneNode.cpp b/src/dep/src/irrlicht/CBillboardSceneNode.cpp
index 8a62358..2e07989 100644
--- a/src/dep/src/irrlicht/CBillboardSceneNode.cpp
+++ b/src/dep/src/irrlicht/CBillboardSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,8 +15,8 @@ namespace scene
 
 //! constructor
 CBillboardSceneNode::CBillboardSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
-				const core::vector3df& position, const core::dimension2d<f32>& size,
-				video::SColor shade_top, video::SColor shade_down)
+			const core::vector3df& position, const core::dimension2d<f32>& size,
+			video::SColor colorTop, video::SColor colorBottom)
 	: IBillboardSceneNode(parent, mgr, id, position)
 {
 	#ifdef _DEBUG
@@ -33,16 +33,16 @@ CBillboardSceneNode::CBillboardSceneNode(ISceneNode* parent, ISceneManager* mgr,
 	indices[5] = 2;
 
 	vertices[0].TCoords.set(1.0f, 1.0f);
-	vertices[0].Color = shade_down;
+	vertices[0].Color = colorBottom;
 
 	vertices[1].TCoords.set(1.0f, 0.0f);
-	vertices[1].Color = shade_top;
+	vertices[1].Color = colorTop;
 
 	vertices[2].TCoords.set(0.0f, 0.0f);
-	vertices[2].Color = shade_top;
+	vertices[2].Color = colorTop;
 
 	vertices[3].TCoords.set(0.0f, 1.0f);
-	vertices[3].Color = shade_down;
+	vertices[3].Color = colorBottom;
 }
 
 
@@ -50,10 +50,9 @@ CBillboardSceneNode::CBillboardSceneNode(ISceneNode* parent, ISceneManager* mgr,
 void CBillboardSceneNode::OnRegisterSceneNode()
 {
 	if (IsVisible)
-	{
 		SceneManager->registerNodeForRendering(this);
-		ISceneNode::OnRegisterSceneNode();
-	}
+
+	ISceneNode::OnRegisterSceneNode();
 }
 
 
@@ -109,8 +108,7 @@ void CBillboardSceneNode::render()
 		driver->draw3DBox(BBox, video::SColor(0,208,195,152));
 	}
 
-	core::matrix4 mat;
-	driver->setTransform(video::ETS_WORLD, mat);
+	driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
 
 	driver->setMaterial(Material);
 
@@ -193,7 +191,7 @@ void CBillboardSceneNode::deserializeAttributes(io::IAttributes* in, io::SAttrib
 void CBillboardSceneNode::setColor(const video::SColor & overallColor)
 {
 	for(u32 vertex = 0; vertex < 4; ++vertex)
-		vertices[0].Color = overallColor;
+		vertices[vertex].Color = overallColor;
 }
 
 
diff --git a/src/dep/src/irrlicht/CBillboardSceneNode.h b/src/dep/src/irrlicht/CBillboardSceneNode.h
index 1feb93a..ae70526 100644
--- a/src/dep/src/irrlicht/CBillboardSceneNode.h
+++ b/src/dep/src/irrlicht/CBillboardSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,14 +15,14 @@ namespace scene
 
 //! Scene node which is a billboard. A billboard is like a 3d sprite: A 2d element,
 //! which always looks to the camera. 
-class CBillboardSceneNode : public IBillboardSceneNode
+class CBillboardSceneNode : virtual public IBillboardSceneNode
 {
 public:
 
 	//! constructor
 	CBillboardSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,	
 		const core::vector3df& position, const core::dimension2d<f32>& size,
-		video::SColor shade_top=video::SColor(0xFFFFFFFF),video::SColor shade_down=video::SColor(0xFFFFFFFF));
+		video::SColor colorTop=video::SColor(0xFFFFFFFF),video::SColor colorBottom=video::SColor(0xFFFFFFFF));
 
 	//! pre render event
 	virtual void OnRegisterSceneNode();
diff --git a/src/dep/src/irrlicht/CBoneSceneNode.cpp b/src/dep/src/irrlicht/CBoneSceneNode.cpp
index 44fa61c..3363cd2 100644
--- a/src/dep/src/irrlicht/CBoneSceneNode.cpp
+++ b/src/dep/src/irrlicht/CBoneSceneNode.cpp
@@ -1,8 +1,12 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "IrrCompileConfig.h"
+#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
 
 #include "CBoneSceneNode.h"
 
-
-
 namespace irr
 {
 namespace scene
@@ -11,23 +15,15 @@ namespace scene
 //! constructor
 CBoneSceneNode::CBoneSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
 	u32 boneIndex, const c8* boneName)
-: IBoneSceneNode(parent, mgr, id), AnimationMode(EBAM_AUTOMATIC), SkinningSpace(EBSS_LOCAL),
-  BoneIndex(boneIndex), BoneName(boneName)
+: IBoneSceneNode(parent, mgr, id), BoneIndex(boneIndex),
+	AnimationMode(EBAM_AUTOMATIC), SkinningSpace(EBSS_LOCAL)
 {
-
+	#ifdef _DEBUG
+	setDebugName("CBoneSceneNode");
+	#endif
+	setName(boneName);
 }
 
-//! destructor
-CBoneSceneNode::~CBoneSceneNode()
-{
-
-}
-
-//! Returns the name of the bone
-const c8* CBoneSceneNode::getBoneName() const
-{
-	return BoneName.c_str();
-}
 
 //! Returns the index of the bone
 u32 CBoneSceneNode::getBoneIndex() const
@@ -35,6 +31,7 @@ u32 CBoneSceneNode::getBoneIndex() const
 	return BoneIndex;
 }
 
+
 //! Sets the animation mode of the bone. Returns true if successful.
 bool CBoneSceneNode::setAnimationMode(E_BONE_ANIMATION_MODE mode)
 {
@@ -42,17 +39,21 @@ bool CBoneSceneNode::setAnimationMode(E_BONE_ANIMATION_MODE mode)
 	return true;
 }
 
+
 //! Gets the current animation mode of the bone
 E_BONE_ANIMATION_MODE CBoneSceneNode::getAnimationMode() const
 {
 	return AnimationMode;
 }
 
+
 //! returns the axis aligned bounding box of this node
 const core::aabbox3d<f32>& CBoneSceneNode::getBoundingBox() const
 {
 	return Box;
 }
+
+
 /*
 //! Returns the relative transformation of the scene node.
 core::matrix4 CBoneSceneNode::getRelativeTransformation() const
@@ -61,6 +62,7 @@ core::matrix4 CBoneSceneNode::getRelativeTransformation() const
 }
 */
 
+
 void CBoneSceneNode::OnAnimate(u32 timeMs)
 {
 	if (IsVisible)
@@ -82,8 +84,6 @@ void CBoneSceneNode::OnAnimate(u32 timeMs)
 }
 
 
-
-
 void CBoneSceneNode::helper_updateAbsolutePositionOfAllChildren(ISceneNode *Node)
 {
 	Node->updateAbsolutePosition();
@@ -102,23 +102,28 @@ void CBoneSceneNode::updateAbsolutePositionOfAllChildren()
 }
 
 
-
-
-
 void CBoneSceneNode::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const
 {
+	IBoneSceneNode::serializeAttributes(out, options);
 	out->addInt("BoneIndex", BoneIndex);
-	out->addString("BoneName", BoneName.c_str());
 	out->addEnum("AnimationMode", AnimationMode, BoneAnimationModeNames);
 }
 
+
 void CBoneSceneNode::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
 {
 	BoneIndex = in->getAttributeAsInt("BoneIndex");
-	BoneName = in->getAttributeAsString("BoneName");
 	AnimationMode = (E_BONE_ANIMATION_MODE)in->getAttributeAsEnumeration("AnimationMode", BoneAnimationModeNames);
-	// todo: add/replace bone in parent with bone from mesh
+	// for legacy files (before 1.5)
+	const core::stringc boneName = in->getAttributeAsString("BoneName");
+	setName(boneName);
+	IBoneSceneNode::deserializeAttributes(in, options);
+	// TODO: add/replace bone in parent with bone from mesh
 }
 
+
 } // namespace scene
 } // namespace irr
+
+#endif
+
diff --git a/src/dep/src/irrlicht/CBoneSceneNode.h b/src/dep/src/irrlicht/CBoneSceneNode.h
index 6d6bbb5..f6528e7 100644
--- a/src/dep/src/irrlicht/CBoneSceneNode.h
+++ b/src/dep/src/irrlicht/CBoneSceneNode.h
@@ -1,11 +1,13 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
 #ifndef __C_BONE_SCENE_NODE_H_INCLUDED__
 #define __C_BONE_SCENE_NODE_H_INCLUDED__
 
 // Used with SkinnedMesh and IAnimatedMeshSceneNode, for boned meshes
 
 #include "IBoneSceneNode.h"
-#include "irrString.h"
-
 
 namespace irr
 {
@@ -20,12 +22,6 @@ namespace scene
 		CBoneSceneNode(ISceneNode* parent, ISceneManager* mgr,
 			s32 id=-1, u32 boneIndex=0, const c8* boneName=0);
 
-		//! destructor
-		~CBoneSceneNode();
-
-		//! Returns the name of the bone
-		virtual const c8* getBoneName() const;
-
 		//! Returns the index of the bone
 		virtual u32 getBoneIndex() const;
 
@@ -38,14 +34,13 @@ namespace scene
 		//! returns the axis aligned bounding box of this node
 		virtual const core::aabbox3d<f32>& getBoundingBox() const;
 
+		/*
 		//! Returns the relative transformation of the scene node.
 		//virtual core::matrix4 getRelativeTransformation() const;
+		*/
 
 		virtual void OnAnimate(u32 timeMs);
 
-
-		void helper_updateAbsolutePositionOfAllChildren(ISceneNode *Node);
-
 		virtual void updateAbsolutePositionOfAllChildren();
 
 		//! Writes attributes of the scene node.
@@ -60,29 +55,25 @@ namespace scene
 			SkinningSpace=space;
 		}
 
-		virtual E_BONE_SKINNING_SPACE getSkinningSpace()
+		virtual E_BONE_SKINNING_SPACE getSkinningSpace() const
 		{
 			return SkinningSpace;
 		}
 
 	private:
-		E_BONE_ANIMATION_MODE AnimationMode;
-		E_BONE_SKINNING_SPACE SkinningSpace;
+		void helper_updateAbsolutePositionOfAllChildren(ISceneNode *Node);
 
 		u32 BoneIndex;
-		core::stringc BoneName;
-
-
-
-
 
 		core::aabbox3d<f32> Box;
+
+		E_BONE_ANIMATION_MODE AnimationMode;
+		E_BONE_SKINNING_SPACE SkinningSpace;
 	};
 
+
 } // end namespace scene
 } // end namespace irr
 
-
-
 #endif
 
diff --git a/src/dep/src/irrlicht/CCSMLoader.cpp b/src/dep/src/irrlicht/CCSMLoader.cpp
index a75b705..57fb41b 100644
--- a/src/dep/src/irrlicht/CCSMLoader.cpp
+++ b/src/dep/src/irrlicht/CCSMLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 //
@@ -360,6 +360,10 @@ namespace scene
 	CCSMLoader::CCSMLoader(scene::ISceneManager* manager, io::IFileSystem* fs)
 		: FileSystem(fs), SceneManager(manager)
 	{
+
+		#ifdef _DEBUG
+		setDebugName("CCSMLoader");
+		#endif
 	}
 
 	CCSMLoader::~CCSMLoader()
diff --git a/src/dep/src/irrlicht/CCSMLoader.h b/src/dep/src/irrlicht/CCSMLoader.h
index e4275d3..bfa2735 100644
--- a/src/dep/src/irrlicht/CCSMLoader.h
+++ b/src/dep/src/irrlicht/CCSMLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 //
diff --git a/src/dep/src/irrlicht/CCameraFPSSceneNode.cpp b/src/dep/src/irrlicht/CCameraFPSSceneNode.cpp
index a3650a5..e69de29 100644
--- a/src/dep/src/irrlicht/CCameraFPSSceneNode.cpp
+++ b/src/dep/src/irrlicht/CCameraFPSSceneNode.cpp
@@ -1,302 +0,0 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "CCameraFPSSceneNode.h"
-#include "IVideoDriver.h"
-#include "ISceneManager.h"
-#include "os.h"
-#include "Keycodes.h"
-
-namespace irr
-{
-namespace scene
-{
-
-const f32 MAX_VERTICAL_ANGLE = 88.0f;
-
-//! constructor
-CCameraFPSSceneNode::CCameraFPSSceneNode(ISceneNode* parent, ISceneManager* mgr,
-		gui::ICursorControl* cursorControl, s32 id, f32 rotateSpeed , f32 moveSpeed,f32 jumpSpeed,
-		SKeyMap* keyMapArray, s32 keyMapSize, bool noVerticalMovement)
-: CCameraSceneNode(parent, mgr, id), CursorControl(cursorControl),
-	MoveSpeed(moveSpeed), RotateSpeed(rotateSpeed), JumpSpeed(jumpSpeed),
-	firstUpdate(true), LastAnimationTime(0), NoVerticalMovement(noVerticalMovement)
-{
-	#ifdef _DEBUG
-	setDebugName("CCameraFPSSceneNode");
-	#endif
-
-	if (CursorControl)
-		CursorControl->grab();
-
-	MoveSpeed /= 1000.0f;
-
-	recalculateViewArea();
-
-	allKeysUp();
-
-	// create key map
-	if (!keyMapArray || !keyMapSize)
-	{
-		// create default key map
-		KeyMap.push_back(SCamKeyMap(0, irr::KEY_UP));
-		KeyMap.push_back(SCamKeyMap(1, irr::KEY_DOWN));
-		KeyMap.push_back(SCamKeyMap(2, irr::KEY_LEFT));
-		KeyMap.push_back(SCamKeyMap(3, irr::KEY_RIGHT));
-		KeyMap.push_back(SCamKeyMap(4, irr::KEY_KEY_J));
-	}
-	else
-	{
-		// create custom key map
-
-		for (s32 i=0; i<keyMapSize; ++i)
-		{
-			switch(keyMapArray[i].Action)
-			{
-			case EKA_MOVE_FORWARD: KeyMap.push_back(SCamKeyMap(0, keyMapArray[i].KeyCode));
-				break;
-			case EKA_MOVE_BACKWARD: KeyMap.push_back(SCamKeyMap(1, keyMapArray[i].KeyCode));
-				break;
-			case EKA_STRAFE_LEFT: KeyMap.push_back(SCamKeyMap(2, keyMapArray[i].KeyCode));
-				break;
-			case EKA_STRAFE_RIGHT: KeyMap.push_back(SCamKeyMap(3, keyMapArray[i].KeyCode));
-				break;
-			case EKA_JUMP_UP: KeyMap.push_back(SCamKeyMap(4, keyMapArray[i].KeyCode));
-				break;
-			default:
-				break;
-			} // end switch
-		} // end for
-	}// end if
-}
-
-
-//! destructor
-CCameraFPSSceneNode::~CCameraFPSSceneNode()
-{
-	if (CursorControl)
-		CursorControl->drop();
-}
-
-
-//! It is possible to send mouse and key events to the camera. Most cameras
-//! may ignore this input, but camera scene nodes which are created for 
-//! example with scene::ISceneManager::addMayaCameraSceneNode or
-//! scene::ISceneManager::addFPSCameraSceneNode, may want to get this input
-//! for changing their position, look at target or whatever. 
-bool CCameraFPSSceneNode::OnEvent(const SEvent& event)
-{
-	if (event.EventType == EET_KEY_INPUT_EVENT)
-	{
-		const u32 cnt = KeyMap.size();
-		for (u32 i=0; i<cnt; ++i)
-			if (KeyMap[i].keycode == event.KeyInput.Key)
-			{
-				CursorKeys[KeyMap[i].action] = event.KeyInput.PressedDown; 
-
-				if ( InputReceiverEnabled )
-					return true;
-			}
-	}
-
-	return false;
-}
-
-
-
-//! OnAnimate() is called just before rendering the whole scene.
-//! nodes may calculate or store animations here, and may do other useful things,
-//! dependent on what they are.
-void CCameraFPSSceneNode::OnAnimate(u32 timeMs)
-{
-	animate( timeMs );
-
-	core::list<ISceneNodeAnimator*>::Iterator ait = Animators.begin();
-				for (; ait != Animators.end(); ++ait)
-					(*ait)->animateNode(this, timeMs);
-
-	updateAbsolutePosition();
-	Target = getPosition() + TargetVector;
-
-	core::list<ISceneNode*>::Iterator it = Children.begin();
-				for (; it != Children.end(); ++it)
-					(*it)->OnAnimate(timeMs);
-}
-
-
-void CCameraFPSSceneNode::animate( u32 timeMs )
-{
-	const u32 camIsMe = SceneManager->getActiveCamera() == this;
-
-	if (firstUpdate)
-	{
-		if (CursorControl && camIsMe)
-		{
-			CursorControl->setPosition(0.5f, 0.5f);
-			CenterCursor = CursorControl->getRelativePosition();
-		}
-
-		LastAnimationTime = os::Timer::getTime();
-
-		firstUpdate = false;
-	}
-
-	// get time. only operate on valid camera
-	f32 timeDiff = 0.f;
-
-	if ( camIsMe )
-	{
-		timeDiff = (f32) ( timeMs - LastAnimationTime );
-		LastAnimationTime = timeMs;
-	}
-
-
-	// update position
-	core::vector3df pos = getPosition();	
-
-	// Update rotation
-//	if (InputReceiverEnabled)
-	{
-		Target.set(0,0,1);
-
-
-		if (CursorControl && InputReceiverEnabled && camIsMe )
-		{
-			core::position2d<f32> cursorpos = CursorControl->getRelativePosition();
-
-			if (!core::equals(cursorpos.X, CenterCursor.X) ||
-				!core::equals(cursorpos.Y, CenterCursor.Y))
-			{
-				RelativeRotation.X *= -1.0f;
-				RelativeRotation.Y *= -1.0f;
-
-				RelativeRotation.Y += (0.5f - cursorpos.X) * RotateSpeed;
-				RelativeRotation.X = core::clamp (	RelativeRotation.X + (0.5f - cursorpos.Y) * RotateSpeed,
-													-MAX_VERTICAL_ANGLE,
-													+MAX_VERTICAL_ANGLE
-												);
-
-				RelativeRotation.X *= -1.0f;
-				RelativeRotation.Y *= -1.0f;
-
-				CursorControl->setPosition(0.5f, 0.5f);
-				CenterCursor = CursorControl->getRelativePosition();
-			}
-		}
-
-		// set target
-
-		core::matrix4 mat;
-		mat.setRotationDegrees(core::vector3df( RelativeRotation.X, RelativeRotation.Y, 0));
-		mat.transformVect(Target);
-
-		core::vector3df movedir = Target;
-
-		if (NoVerticalMovement)
-			movedir.Y = 0.f;
-
-		movedir.normalize();
-
-		if (InputReceiverEnabled && camIsMe)
-		{
-			if (CursorKeys[0])
-				pos += movedir * timeDiff * MoveSpeed;
-
-			if (CursorKeys[1])
-				pos -= movedir * timeDiff * MoveSpeed;
-
-			// strafing
-
-			core::vector3df strafevect = Target;
-			strafevect = strafevect.crossProduct(UpVector);
-
-			if (NoVerticalMovement)
-				strafevect.Y = 0.0f;
-
-			strafevect.normalize();
-
-			if (CursorKeys[2])
-				pos += strafevect * timeDiff * MoveSpeed;
-
-			if (CursorKeys[3])
-				pos -= strafevect * timeDiff * MoveSpeed;
-
-			// jumping ( need's a gravity , else it's a fly to the World-UpVector )
-			if (CursorKeys[4])
-			{
-				pos += UpVector * timeDiff * JumpSpeed;
-			}
-		}
-
-		// write translation
-
-		setPosition(pos);
-	}
-
-	// write right target
-
-	TargetVector = Target;
-	Target += pos;
-
-}
-
-void CCameraFPSSceneNode::allKeysUp()
-{
-	for (s32 i=0; i<6; ++i)
-		CursorKeys[i] = false;
-}
-
-
-//! sets the look at target of the camera
-//! \param pos: Look at target of the camera.
-void CCameraFPSSceneNode::setTarget(const core::vector3df& tgt)
-{
-	updateAbsolutePosition();
-	core::vector3df vect = tgt - getAbsolutePosition();
-	vect = vect.getHorizontalAngle();
-	RelativeRotation.X = vect.X;
-	RelativeRotation.Y = vect.Y;
-
-	if (RelativeRotation.X > MAX_VERTICAL_ANGLE)
-		 RelativeRotation.X -= 360.0f;
-}
-
-//! Disables or enables the camera to get key or mouse inputs.
-void CCameraFPSSceneNode::setInputReceiverEnabled(bool enabled)
-{
-   // So we don't skip when we return from a non-enabled mode and the
-   // mouse cursor is now not in the middle of the screen
-   if( !InputReceiverEnabled && enabled )
-      firstUpdate = true;
-
-   InputReceiverEnabled = enabled;
-} 
-
-//! Sets the rotation speed
-void CCameraFPSSceneNode::setRotateSpeed(const f32 speed)
-{
-	RotateSpeed = speed;	
-}
-
-//! Sets the movement speed
-void CCameraFPSSceneNode::setMoveSpeed(const f32 speed)
-{
-	MoveSpeed = speed;
-}
-
-//! Gets the rotation speed
-f32 CCameraFPSSceneNode::getRotateSpeed()
-{
-	return RotateSpeed;
-}
-
-// Gets the movement speed
-f32 CCameraFPSSceneNode::getMoveSpeed()
-{
-	return MoveSpeed;
-}
-
-} // end namespace
-} // end namespace
-
diff --git a/src/dep/src/irrlicht/CCameraFPSSceneNode.h b/src/dep/src/irrlicht/CCameraFPSSceneNode.h
index 5bd3df7..e69de29 100644
--- a/src/dep/src/irrlicht/CCameraFPSSceneNode.h
+++ b/src/dep/src/irrlicht/CCameraFPSSceneNode.h
@@ -1,104 +0,0 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_CAMERA_FPS_SCENE_NODE_H_INCLUDED__
-#define __C_CAMERA_FPS_SCENE_NODE_H_INCLUDED__
-
-#include "ICursorControl.h"
-#include "CCameraSceneNode.h"
-#include "vector2d.h"
-#include "SKeyMap.h"
-#include "irrArray.h"
-
-namespace irr
-{
-namespace scene
-{
-
-	class CCameraFPSSceneNode : public CCameraSceneNode
-	{
-	public:
-
-		//! constructor
-		CCameraFPSSceneNode(ISceneNode* parent, ISceneManager* mgr, 
-			gui::ICursorControl* cursorControl, s32 id,
-			f32 rotateSpeed, f32 moveSpeed,f32 jumpSpeed,
-			SKeyMap* keyMapArray, s32 keyMapSize, bool noVerticalMovement = false );
-
-		//! destructor
-		virtual ~CCameraFPSSceneNode();
-
-		//! It is possible to send mouse and key events to the camera. Most cameras
-		//! may ignore this input, but camera scene nodes which are created for 
-		//! example with scene::ISceneManager::addMayaCameraSceneNode or
-		//! scene::ISceneManager::addMeshViewerCameraSceneNode, may want to get this input
-		//! for changing their position, look at target or whatever. 
-		virtual bool OnEvent(const SEvent& event);
-
-		//! OnAnimate() is called just before rendering the whole scene.
-		//! nodes may calculate or store animations here, and may do other useful things,
-		//! dependent on what they are.
-		virtual void OnAnimate(u32 timeMs);
-
-		//! sets the look at target of the camera
-		//! \param pos: Look at target of the camera.
-		virtual void setTarget(const core::vector3df& pos);
-
-		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_CAMERA_FPS; }
-
-		//! Disables or enables the camera to get key or mouse inputs.
-		//! If this is set to true, the camera will respond to key inputs
-		//! otherwise not.
-		virtual void setInputReceiverEnabled(bool enabled);
-
-		//! Sets the speed that this camera rotates
-		virtual void setRotateSpeed(const f32 speed);
-
-		//! Sets the speed that this camera moves
-		virtual void setMoveSpeed(const f32 speed);
-
-		//! Gets the rotation speed
-		virtual f32 getRotateSpeed();
-
-		// Gets the movement speed
-		virtual f32 getMoveSpeed();
-
-	private:
-
-		struct SCamKeyMap
-		{
-			SCamKeyMap() {};
-			SCamKeyMap(s32 a, EKEY_CODE k) : action(a), keycode(k) {}
-
-			s32 action;
-			EKEY_CODE keycode;
-		};
-
-		void allKeysUp();
-		void animate( u32 timeMs );
-
-		bool CursorKeys[6];
-
-		gui::ICursorControl* CursorControl;
-
-		f32 MoveSpeed;
-		f32 RotateSpeed;
-		f32 JumpSpeed;
-
-		bool firstUpdate;
-		s32 LastAnimationTime;
-
-		core::vector3df TargetVector;
-		core::array<SCamKeyMap> KeyMap;
-		core::position2d<f32> CenterCursor;
-
-		bool NoVerticalMovement;
-	};
-
-} // end namespace
-} // end namespace
-
-#endif
-
diff --git a/src/dep/src/irrlicht/CCameraMayaSceneNode.cpp b/src/dep/src/irrlicht/CCameraMayaSceneNode.cpp
index 28760d5..e69de29 100644
--- a/src/dep/src/irrlicht/CCameraMayaSceneNode.cpp
+++ b/src/dep/src/irrlicht/CCameraMayaSceneNode.cpp
@@ -1,329 +0,0 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "CCameraMayaSceneNode.h"
-#include "IVideoDriver.h"
-#include "ISceneManager.h"
-
-namespace irr
-{
-namespace scene
-{
-
-//! constructor
-CCameraMayaSceneNode::CCameraMayaSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
-	 f32 rs, f32 zs, f32 ts)
-: CCameraSceneNode(parent, mgr, id), 
-	Zooming(false), Rotating(false), Moving(false), Translating(false),
-	ZoomSpeed(zs), RotateSpeed(rs), TranslateSpeed(ts),
-	RotateStartX(0.0f), RotateStartY(0.0f), ZoomStartX(0.0f), ZoomStartY(0.0f),
-	TranslateStartX(0.0f), TranslateStartY(0.0f), CurrentZoom(70.0f), RotX(0.0f), RotY(0.0f)
-{
-	#ifdef _DEBUG
-	setDebugName("CCameraMayaSceneNode");
-	#endif
-
-	Target.set(0.0f, 0.0f, 0.0f);
-	OldTarget = Target;
-
-	allKeysUp();
-	recalculateViewArea();
-}
-
-
-//! destructor
-CCameraMayaSceneNode::~CCameraMayaSceneNode()
-{
-}
-
-
-//! It is possible to send mouse and key events to the camera. Most cameras
-//! may ignore this input, but camera scene nodes which are created for 
-//! example with scene::ISceneManager::addMayaCameraSceneNode or
-//! scene::ISceneManager::addMeshViewerCameraSceneNode, may want to get this input
-//! for changing their position, look at target or whatever.
-bool CCameraMayaSceneNode::OnEvent(const SEvent& event)
-{
-	if (event.EventType != EET_MOUSE_INPUT_EVENT ||
-		!InputReceiverEnabled)
-		return false;
-
-	switch(event.MouseInput.Event)
-	{
-	case EMIE_LMOUSE_PRESSED_DOWN:
-		MouseKeys[0] = true;
-		break;
-	case EMIE_RMOUSE_PRESSED_DOWN:
-		MouseKeys[2] = true;
-		break;
-	case EMIE_MMOUSE_PRESSED_DOWN:
-		MouseKeys[1] = true;
-		break;
-	case EMIE_LMOUSE_LEFT_UP:
-		MouseKeys[0] = false;
-		break;
-	case EMIE_RMOUSE_LEFT_UP:
-		MouseKeys[2] = false;
-		break;
-	case EMIE_MMOUSE_LEFT_UP:
-		MouseKeys[1] = false;
-		break;
-	case EMIE_MOUSE_MOVED:
-		{
-			video::IVideoDriver* driver = SceneManager->getVideoDriver();
-			if (driver)
-			{
-				core::dimension2d<s32> ssize = SceneManager->getVideoDriver()->getScreenSize();
-				MousePos.X = event.MouseInput.X / (f32)ssize.Width;
-				MousePos.Y = event.MouseInput.Y / (f32)ssize.Height;
-			}
-		}
-		break;
-	case EMIE_MOUSE_WHEEL:
-	case EMIE_COUNT:
-		break;
-	}
-	return true;
-}
-
-//! OnAnimate() is called just before rendering the whole scene.
-//! nodes may calculate or store animations here, and may do other useful things,
-//! dependent on what they are.
-void CCameraMayaSceneNode::OnAnimate(u32 timeMs)
-{
-	animate();
-
-	ISceneNode::setPosition(Pos);
-	updateAbsolutePosition();
-
-	// This scene node cannot be animated by scene node animators, so
-	// don't invoke them.
-}
-
-
-bool CCameraMayaSceneNode::isMouseKeyDown(s32 key)
-{
-	return MouseKeys[key];
-}
-
-
-
-void CCameraMayaSceneNode::animate()
-{
-	//Alt + LM = Rotate around camera pivot
-	//Alt + LM + MM = Dolly forth/back in view direction (speed % distance camera pivot - max distance to pivot)
-	//Alt + MM = Move on camera plane (Screen center is about the mouse pointer, depending on move speed)
-
-	const SViewFrustum* va = getViewFrustum();
-
-	f32 nRotX = RotX;
-	f32 nRotY = RotY;
-	f32 nZoom = CurrentZoom;
-
-	if ( (isMouseKeyDown(0) && isMouseKeyDown(2)) || isMouseKeyDown(1) )
-	{
-		if (!Zooming)
-		{
-			ZoomStartX = MousePos.X;
-			ZoomStartY = MousePos.Y;
-			Zooming = true;
-			nZoom = CurrentZoom;
-		}
-		else
-		{
-			f32 old = nZoom;
-			nZoom += (ZoomStartX - MousePos.X) * ZoomSpeed;
-
-			f32 targetMinDistance = 0.1f;
-			if (nZoom < targetMinDistance) // jox: fixed bug: bounce back when zooming to close
-				nZoom = targetMinDistance;
-
-			if (nZoom < 0)
-				nZoom = old;
-		}
-	}
-	else
-	{
-		if (Zooming)
-		{
-			f32 old = CurrentZoom;
-			CurrentZoom = CurrentZoom + (ZoomStartX - MousePos.X ) * ZoomSpeed;
-			nZoom = CurrentZoom;
-
-			if (nZoom < 0)
-				nZoom = CurrentZoom = old;
-		}
-
-		Zooming = false;
-	}
-
-	// Translation ---------------------------------
-
-	core::vector3df translate(OldTarget);
-
-	core::vector3df tvectX = Pos - Target;
-	tvectX = tvectX.crossProduct(UpVector);
-	tvectX.normalize();
-
-	core::vector3df tvectY = (va->getFarLeftDown() - va->getFarRightDown());
-	tvectY = tvectY.crossProduct(UpVector.Y > 0 ? Pos - Target : Target - Pos);
-	tvectY.normalize();
-	
-
-	if (isMouseKeyDown(2) && !Zooming)
-	{
-		if (!Translating)
-		{
-			TranslateStartX = MousePos.X;
-			TranslateStartY = MousePos.Y;
-			Translating = true;
-		}
-		else
-		{
-			translate +=	tvectX * (TranslateStartX - MousePos.X)*TranslateSpeed + 
-								tvectY * (TranslateStartY - MousePos.Y)*TranslateSpeed;
-		}
-	}
-	else
-	{
-		if (Translating)
-		{
-			translate +=	tvectX * (TranslateStartX - MousePos.X)*TranslateSpeed + 
-								tvectY * (TranslateStartY - MousePos.Y)*TranslateSpeed;
-			OldTarget = translate;
-		}
-
-		Translating = false;
-	}
-
-	// Rotation ------------------------------------
-
-	if (isMouseKeyDown(0) && !Zooming)
-	{
-		if (!Rotating)
-		{
-			RotateStartX = MousePos.X;
-			RotateStartY = MousePos.Y;
-			Rotating = true;
-			nRotX = RotX;
-			nRotY = RotY;
-		}
-		else
-		{
-			nRotX += (RotateStartX - MousePos.X) * RotateSpeed;
-			nRotY += (RotateStartY - MousePos.Y) * RotateSpeed;
-		}
-	}
-	else
-	{
-		if (Rotating)
-		{
-			RotX = RotX + (RotateStartX - MousePos.X) * RotateSpeed;
-			RotY = RotY + (RotateStartY - MousePos.Y) * RotateSpeed;
-			nRotX = RotX;
-			nRotY = RotY;
-		}
-
-		Rotating = false;
-	}
-
-	// Set Pos ------------------------------------
-
-	Target = translate;
-
-	Pos.X = nZoom + Target.X;
-	Pos.Y = Target.Y;
-	Pos.Z = Target.Z;
-
-	Pos.rotateXYBy(nRotY, Target);
-	Pos.rotateXZBy(-nRotX, Target);
-
-	// Rotation Error ----------------------------
-
-	// jox: fixed bug: jitter when rotating to the top and bottom of y
-	UpVector.set(0,1,0);
-	UpVector.rotateXYBy(-nRotY, core::vector3df(0,0,0));
-	UpVector.rotateXZBy(-nRotX+180.f, core::vector3df(0,0,0));
-
-	/*if (nRotY < 0.0f)
-		nRotY *= -1.0f;
-	
-	nRotY = (f32)fmod(nRotY, 360.0f);
-	
-	
-	if (nRotY >= 90.0f && nRotY <= 270.0f)
-		UpVector.set(0, -1, 0);
-	else
-		UpVector.set(0, 1, 0);*/
-}
-
-
-void CCameraMayaSceneNode::allKeysUp()
-{
-	for (s32 i=0; i<3; ++i)
-		MouseKeys[i] = false;
-}
-
-// function added by jox: fix setPosition()
-void CCameraMayaSceneNode::setPosition(const core::vector3df& pos) 
-{
-	Pos = pos;
-	updateAnimationState();
-
-	ISceneNode::setPosition(pos); 
-}
-
-// function added by jox: fix setTarget()
-void CCameraMayaSceneNode::setTarget(const core::vector3df& pos) 
-{
-	Target = OldTarget = pos;
-	updateAnimationState();
-}
-
-
-// function added by jox
-void CCameraMayaSceneNode::updateAnimationState() 
-{
-	core::vector3df pos(Pos - Target);
-
-	// X rotation
-	core::vector2df vec2d(pos.X, pos.Z);
-	RotX = (f32)vec2d.getAngle();
-
-	// Y rotation
-	pos.rotateXZBy(RotX, core::vector3df());
-	vec2d.set(pos.X, pos.Y);
-	RotY = -(f32)vec2d.getAngle();
-
-	// Zoom
-	CurrentZoom = (f32)Pos.getDistanceFrom(Target);
-}
-
-//! Sets the rotation speed
-void CCameraMayaSceneNode::setRotateSpeed(const f32 speed)
-{
-	RotateSpeed = speed;	
-}
-
-//! Sets the movement speed
-void CCameraMayaSceneNode::setMoveSpeed(const f32 speed)
-{
-	TranslateSpeed = speed;
-}
-
-//! Gets the rotation speed
-f32 CCameraMayaSceneNode::getRotateSpeed()
-{
-	return RotateSpeed;
-}
-
-// Gets the movement speed
-f32 CCameraMayaSceneNode::getMoveSpeed()
-{
-	return TranslateSpeed;
-}
-
-} // end namespace
-} // end namespace
-
diff --git a/src/dep/src/irrlicht/CCameraMayaSceneNode.h b/src/dep/src/irrlicht/CCameraMayaSceneNode.h
index 88c50d2..e69de29 100644
--- a/src/dep/src/irrlicht/CCameraMayaSceneNode.h
+++ b/src/dep/src/irrlicht/CCameraMayaSceneNode.h
@@ -1,90 +0,0 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_CAMERA_MAYA_SCENE_NODE_H_INCLUDED__
-#define __C_CAMERA_MAYA_SCENE_NODE_H_INCLUDED__
-
-#include "CCameraSceneNode.h"
-#include "vector2d.h"
-
-namespace irr
-{
-namespace scene
-{
-
-	class CCameraMayaSceneNode : public CCameraSceneNode
-	{
-	public:
-
-		//! constructor
-		CCameraMayaSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
-			f32 rotateSpeed = -1500.0f, f32 zoomSpeed = 200.0f, f32 translationSpeed = 100.0f);
-
-		//! destructor
-		virtual ~CCameraMayaSceneNode();
-
-		//! It is possible to send mouse and key events to the camera. Most cameras
-		//! may ignore this input, but camera scene nodes which are created for 
-		//! example with scene::ISceneManager::addMayaCameraSceneNode or
-		//! scene::ISceneManager::addMeshViewerCameraSceneNode, may want to get this input
-		//! for changing their position, look at target or whatever. 
-		virtual bool OnEvent(const SEvent& event);
-
-		//! OnAnimate() is called just before rendering the whole scene.
-		//! nodes may calculate or store animations here, and may do other useful things,
-		//! dependent on what they are.
-		virtual void OnAnimate(u32 timeMs);
-
-		//! Sets the position of the node. Note that the position is
-		//! relative to the parent.
-		virtual void setPosition(const core::vector3df& newpos);
-
-		//! Sets the position of the node. Note that the position is
-		//! relative to the parent.
-		virtual void setTarget(const core::vector3df& newpos);
-
-		//! Sets the rotation speed
-		virtual void setRotateSpeed(const f32 speed);
-
-		//! Sets the movement speed
-		virtual void setMoveSpeed(const f32 speed);
-
-		//! Gets the rotation speed
-		virtual f32 getRotateSpeed();
-
-		// Gets the movement speed
-		virtual f32 getMoveSpeed();
-
-		//! Returns type of the scene node
-		virtual ESCENE_NODE_TYPE getType() const { return ESNT_CAMERA_MAYA; }
-
-	private:
-
-		void allKeysUp();
-		void animate();
-		bool isMouseKeyDown(s32 key);
-		void updateAnimationState();
-
-		bool MouseKeys[3];
-
-		core::vector3df Pos;
-		bool Zooming, Rotating, Moving, Translating;
-		f32 ZoomSpeed;
-		f32 RotateSpeed;
-		f32 TranslateSpeed;
-		f32 RotateStartX, RotateStartY;
-		f32 ZoomStartX, ZoomStartY;
-		f32 TranslateStartX, TranslateStartY;
-		f32 CurrentZoom;
-		f32 RotX, RotY;
-		core::vector3df OldTarget;
-
-		core::vector2df MousePos;
-	};
-
-} // end namespace
-} // end namespace
-
-#endif
-
diff --git a/src/dep/src/irrlicht/CCameraSceneNode.cpp b/src/dep/src/irrlicht/CCameraSceneNode.cpp
index 84e70cc..25865fa 100644
--- a/src/dep/src/irrlicht/CCameraSceneNode.cpp
+++ b/src/dep/src/irrlicht/CCameraSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,42 +16,29 @@ namespace scene
 //! constructor
 CCameraSceneNode::CCameraSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id, 
 	const core::vector3df& position, const core::vector3df& lookat)
-	: ICameraSceneNode(parent, mgr, id, position, core::vector3df(0.0f, 0.0f, 0.0f),
-			core::vector3df(1.0f, 1.0f, 1.0f)), InputReceiverEnabled(true)
+	: ICameraSceneNode(parent, mgr, id, position),
+	Target(lookat), UpVector(0.0f, 1.0f, 0.0f), ZNear(1.0f), ZFar(3000.0f),
+	InputReceiverEnabled(true), TargetAndRotationAreBound(false)
 {
 	#ifdef _DEBUG
 	setDebugName("CCameraSceneNode");
 	#endif
 
-	// set default view
-
-	UpVector.set(0.0f, 1.0f, 0.0f);
-	Target.set(lookat);
-
 	// set default projection
-
 	Fovy = core::PI / 2.5f;	// Field of view, in radians. 
-	Aspect = 4.0f / 3.0f;	// Aspect ratio. 
-	ZNear = 1.0f;		// value of the near view-plane. 
-	ZFar = 3000.0f;		// Z-value of the far view-plane. 
 
-	video::IVideoDriver* d = mgr->getVideoDriver();
+	const video::IVideoDriver* const d = mgr?mgr->getVideoDriver():0;
 	if (d)
 		Aspect = (f32)d->getCurrentRenderTargetSize().Width /
 			(f32)d->getCurrentRenderTargetSize().Height;
+	else
+		Aspect = 4.0f / 3.0f;	// Aspect ratio. 
 
 	recalculateProjectionMatrix();
 	recalculateViewArea();
 }
 
 
-
-//! destructor
-CCameraSceneNode::~CCameraSceneNode()
-{
-}
-
-
 //! Disables or enables the camera to get key or mouse inputs.
 void CCameraSceneNode::setInputReceiverEnabled(bool enabled)
 {
@@ -67,17 +54,18 @@ bool CCameraSceneNode::isInputReceiverEnabled() const
 }
 
 
-//! Sets the projection matrix of the camera. The core::matrix4 class has some methods
-//! to build a projection matrix. e.g: core::matrix4::buildProjectionMatrixPerspectiveFovLH
-//! \param projection: The new projection matrix of the camera. 
-void CCameraSceneNode::setProjectionMatrix(const core::matrix4& projection)
+//! Sets the projection matrix of the camera.
+/** The core::matrix4 class has some methods
+to build a projection matrix. e.g: core::matrix4::buildProjectionMatrixPerspectiveFovLH
+\param projection: The new projection matrix of the camera. */
+void CCameraSceneNode::setProjectionMatrix(const core::matrix4& projection, bool isOrthogonal)
 {
+	IsOrthogonal = isOrthogonal;
 	ViewArea.Matrices [ video::ETS_PROJECTION ] = projection;
 	ViewArea.setTransformState ( video::ETS_PROJECTION );
 }
 
 
-
 //! Gets the current projection matrix of the camera
 //! \return Returns the current projection matrix of the camera.
 const core::matrix4& CCameraSceneNode::getProjectionMatrix() const
@@ -86,7 +74,6 @@ const core::matrix4& CCameraSceneNode::getProjectionMatrix() const
 }
 
 
-
 //! Gets the current view matrix of the camera
 //! \return Returns the current view matrix of the camera.
 const core::matrix4& CCameraSceneNode::getViewMatrix() const
@@ -95,7 +82,6 @@ const core::matrix4& CCameraSceneNode::getViewMatrix() const
 }
 
 
-
 //! It is possible to send mouse and key events to the camera. Most cameras
 //! may ignore this input, but camera scene nodes which are created for 
 //! example with scene::ISceneManager::addMayaCameraSceneNode or
@@ -103,29 +89,58 @@ const core::matrix4& CCameraSceneNode::getViewMatrix() const
 //! for changing their position, look at target or whatever. 
 bool CCameraSceneNode::OnEvent(const SEvent& event)
 {
+	if (!InputReceiverEnabled)
+		return false;
+
+	// send events to event receiving animators
+
+	core::list<ISceneNodeAnimator*>::Iterator ait = Animators.begin();
+	
+	for (; ait != Animators.end(); ++ait)
+		if ((*ait)->isEventReceiverEnabled() && (*ait)->OnEvent(event))
+			return true;
+
+	// if nobody processed the event, return false
 	return false;
 }
 
 
-
 //! sets the look at target of the camera
 //! \param pos: Look at target of the camera.
 void CCameraSceneNode::setTarget(const core::vector3df& pos)
 {
 	Target = pos;
+
+	if(TargetAndRotationAreBound)
+	{
+		const core::vector3df toTarget = Target - getAbsolutePosition();
+		ISceneNode::setRotation(toTarget.getHorizontalAngle());
+	}
 }
 
 
+//! Sets the rotation of the node.
+/** This only modifies the relative rotation of the node.
+If the camera's target and rotation are bound ( @see bindTargetAndRotation() )
+then calling this will also change the camera's target to match the rotation.
+\param rotation New rotation of the node in degrees. */
+void CCameraSceneNode::setRotation(const core::vector3df& rotation)
+{
+	if(TargetAndRotationAreBound)
+		Target = getAbsolutePosition() + rotation.rotationToDirection();
+
+	ISceneNode::setRotation(rotation);
+}
+
 
 //! Gets the current look at target of the camera
 //! \return Returns the current look at target of the camera
-core::vector3df CCameraSceneNode::getTarget() const
+const core::vector3df& CCameraSceneNode::getTarget() const
 {
 	return Target;
 }
 
 
-
 //! sets the up vector of the camera
 //! \param pos: New upvector of the camera.
 void CCameraSceneNode::setUpVector(const core::vector3df& pos)
@@ -134,10 +149,9 @@ void CCameraSceneNode::setUpVector(const core::vector3df& pos)
 }
 
 
-
 //! Gets the up vector of the camera.
 //! \return Returns the up vector of the camera.
-core::vector3df CCameraSceneNode::getUpVector() const
+const core::vector3df& CCameraSceneNode::getUpVector() const
 {
 	return UpVector;
 }
@@ -148,45 +162,53 @@ f32 CCameraSceneNode::getNearValue() const
 	return ZNear;
 }
 
+
 f32 CCameraSceneNode::getFarValue() const 
 {
 	return ZFar;
 }
 
+
 f32 CCameraSceneNode::getAspectRatio() const 
 {
 	return Aspect;
 }
 
+
 f32 CCameraSceneNode::getFOV() const 
 {
 	return Fovy;
 }
 
+
 void CCameraSceneNode::setNearValue(f32 f)
 {
 	ZNear = f;
 	recalculateProjectionMatrix();
 }
 
+
 void CCameraSceneNode::setFarValue(f32 f)
 {
 	ZFar = f;
 	recalculateProjectionMatrix();
 }
 
+
 void CCameraSceneNode::setAspectRatio(f32 f)
 {
 	Aspect = f;
 	recalculateProjectionMatrix();
 }
 
+
 void CCameraSceneNode::setFOV(f32 f)
 {
 	Fovy = f;
 	recalculateProjectionMatrix();
 }
 
+
 void CCameraSceneNode::recalculateProjectionMatrix()
 {
 	ViewArea.Matrices [ video::ETS_PROJECTION ].buildProjectionMatrixPerspectiveFovLH(Fovy, Aspect, ZNear, ZFar);
@@ -197,36 +219,33 @@ void CCameraSceneNode::recalculateProjectionMatrix()
 //! prerender
 void CCameraSceneNode::OnRegisterSceneNode()
 {
-	// if upvector and vector to the target are the same, we have a
-	// problem. so solve this problem:
-
 	core::vector3df pos = getAbsolutePosition();
 	core::vector3df tgtv = Target - pos;
 	tgtv.normalize();
 
+	// if upvector and vector to the target are the same, we have a
+	// problem. so solve this problem:
 	core::vector3df up = UpVector;
 	up.normalize();
 
 	f32 dp = tgtv.dotProduct(up);
 
-	if ( core::equals ( fabs ( dp ), 1.f ) )
+	if ( core::equals(fabsf(dp), 1.f) )
 	{
 		up.X += 0.5f;
 	}
 
-	ViewArea.Matrices [ video::ETS_VIEW ].buildCameraLookAtMatrixLH(pos, Target, up);
-	ViewArea.setTransformState ( video::ETS_VIEW );
+	ViewArea.Matrices[video::ETS_VIEW].buildCameraLookAtMatrixLH(pos, Target, up);
+	ViewArea.setTransformState(video::ETS_VIEW);
 	recalculateViewArea();
 
 	if ( SceneManager->getActiveCamera () == this )
 		SceneManager->registerNodeForRendering(this, ESNRP_CAMERA);
 
-	if (IsVisible)
-		ISceneNode::OnRegisterSceneNode();
+	ISceneNode::OnRegisterSceneNode();
 }
 
 
-
 //! render
 void CCameraSceneNode::render()
 {	
@@ -246,30 +265,17 @@ const core::aabbox3d<f32>& CCameraSceneNode::getBoundingBox() const
 }
 
 
-
 //! returns the view frustum. needed sometimes by bsp or lod render nodes.
 const SViewFrustum* CCameraSceneNode::getViewFrustum() const
 {
 	return &ViewArea;
 }
 
-core::vector3df CCameraSceneNode::getAbsolutePosition() const
-{
-	return AbsoluteTransformation.getTranslation();
-}
 
 void CCameraSceneNode::recalculateViewArea()
 {
 	ViewArea.cameraPosition = getAbsolutePosition();
-	ViewArea.setFrom ( ViewArea.Matrices [ SViewFrustum::ETS_VIEW_PROJECTION_3 ] );
-/*
-	video::IVideoDriver* driver = SceneManager->getVideoDriver();
-	if ( driver)
-	{
-		driver->setTransform(video::ETS_PROJECTION, ViewArea.Matrices [ video::ETS_PROJECTION ] );
-		driver->setTransform(video::ETS_VIEW, ViewArea.Matrices [ video::ETS_VIEW ] );
-	}
-*/
+	ViewArea.setFrom(ViewArea.Matrices[SViewFrustum::ETS_VIEW_PROJECTION_3]);
 }
 
 
@@ -284,6 +290,7 @@ void CCameraSceneNode::serializeAttributes(io::IAttributes* out, io::SAttributeR
 	out->addFloat("Aspect", Aspect);
 	out->addFloat("ZNear", ZNear);
 	out->addFloat("ZFar", ZFar);
+	out->addBool("Binding", TargetAndRotationAreBound);
 }
 
 
@@ -298,12 +305,27 @@ void CCameraSceneNode::deserializeAttributes(io::IAttributes* in, io::SAttribute
 	Aspect = in->getAttributeAsFloat("Aspect");
 	ZNear = in->getAttributeAsFloat("ZNear");
 	ZFar = in->getAttributeAsFloat("ZFar");
+	TargetAndRotationAreBound = in->getAttributeAsBool("Binding");
 
 	recalculateProjectionMatrix();
 	recalculateViewArea();	
 }
 
 
+//! Set the binding between the camera's rotation adn target.
+void CCameraSceneNode::bindTargetAndRotation(bool bound)
+{
+	TargetAndRotationAreBound = bound;
+}
+
+
+//! Gets the binding between the camera's rotation and target.
+bool CCameraSceneNode::getTargetAndRotationBinding(void) const
+{
+	return TargetAndRotationAreBound;
+}
+
+
 } // end namespace
 } // end namespace
 
diff --git a/src/dep/src/irrlicht/CCameraSceneNode.h b/src/dep/src/irrlicht/CCameraSceneNode.h
index e280abb..b18e542 100644
--- a/src/dep/src/irrlicht/CCameraSceneNode.h
+++ b/src/dep/src/irrlicht/CCameraSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -22,13 +22,15 @@ namespace scene
 			const core::vector3df& position = core::vector3df(0,0,0),
 			const core::vector3df& lookat = core::vector3df(0,0,100));
 
-		//! destructor
-		virtual ~CCameraSceneNode();
-
-		//! Sets the projection matrix of the camera. The core::matrix4 class has some methods
-		//! to build a projection matrix. e.g: core::matrix4::buildProjectionMatrixPerspectiveFovLH
-		//! \param projection: The new projection matrix of the camera. 
-		virtual void setProjectionMatrix(const core::matrix4& projection);
+		//! Sets the projection matrix of the camera.
+		/** The core::matrix4 class has some methods
+		to build a projection matrix. e.g: core::matrix4::buildProjectionMatrixPerspectiveFovLH.
+		Note that the matrix will only stay as set by this method until one of
+		the following Methods are called: setNearValue, setFarValue, setAspectRatio, setFOV.
+		\param projection The new projection matrix of the camera.
+		\param isOrthogonal Set this to true if the matrix is an orthogonal one (e.g.
+		from matrix4::buildProjectionMatrixOrthoLH(). */
+		virtual void setProjectionMatrix(const core::matrix4& projection, bool isOrthogonal = false);
 
 		//! Gets the current projection matrix of the camera
 		//! \return Returns the current projection matrix of the camera.
@@ -45,13 +47,22 @@ namespace scene
 		//! for changing their position, look at target or whatever. 
 		virtual bool OnEvent(const SEvent& event);
 
-		//! sets the look at target of the camera
-		//! \param pos: Look at target of the camera.
+		//! Sets the look at target of the camera
+		/** If the camera's target and rotation are bound ( @see bindTargetAndRotation() )
+		then calling this will also change the camera's scene node rotation to match the target.
+		\param pos: Look at target of the camera. */
 		virtual void setTarget(const core::vector3df& pos);
 
+		//! Sets the rotation of the node.
+		/** This only modifies the relative rotation of the node.
+		If the camera's target and rotation are bound ( @see bindTargetAndRotation() )
+		then calling this will also change the camera's target to match the rotation.
+		\param rotation New rotation of the node in degrees. */
+		virtual void setRotation(const core::vector3df& rotation);
+
 		//! Gets the current look at target of the camera
-		//! \return Returns the current look at target of the camera
-		virtual core::vector3df getTarget() const;
+		/** \return The current look at target of the camera */
+		virtual const core::vector3df& getTarget() const;
 
 		//! Sets the up vector of the camera.
 		//! \param pos: New upvector of the camera.
@@ -59,7 +70,7 @@ namespace scene
 
 		//! Gets the up vector of the camera.
 		//! \return Returns the up vector of the camera.
-		virtual core::vector3df getUpVector() const;
+		virtual const core::vector3df& getUpVector() const;
 
 		//! Gets distance from the camera to the near plane.
 		//! \return Value of the near plane of the camera.
@@ -118,7 +129,11 @@ namespace scene
 		//! Returns type of the scene node
 		virtual ESCENE_NODE_TYPE getType() const { return ESNT_CAMERA; }
 
-		virtual core::vector3df getAbsolutePosition() const;
+		//! Binds the camera scene node's rotation to its target position and vice vera, or unbinds them.
+		virtual void bindTargetAndRotation(bool bound);
+
+		//! Queries if the camera scene node's rotation and its target position are bound together.
+		virtual bool getTargetAndRotationBinding(void) const;
 
 	protected:
 
@@ -136,6 +151,8 @@ namespace scene
 		SViewFrustum ViewArea;
 
 		bool InputReceiverEnabled;
+
+		bool TargetAndRotationAreBound;
 	};
 
 } // end namespace
diff --git a/src/dep/src/irrlicht/CColladaFileLoader.cpp b/src/dep/src/irrlicht/CColladaFileLoader.cpp
index 3e6c700..87f7947 100644
--- a/src/dep/src/irrlicht/CColladaFileLoader.cpp
+++ b/src/dep/src/irrlicht/CColladaFileLoader.cpp
@@ -1,8 +1,8 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h" 
+#include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_COLLADA_LOADER_
 
 #include "CColladaFileLoader.h"
@@ -20,8 +20,11 @@
 #include "IMeshCache.h"
 #include "IMeshSceneNode.h"
 #include "SMeshBufferLightMap.h"
+#include "irrMap.h"
 
-//#define COLLADA_READER_DEBUG
+#ifdef _DEBUG
+#define COLLADA_READER_DEBUG
+#endif
 namespace irr
 {
 namespace scene
@@ -30,8 +33,17 @@ namespace scene
 
 	const core::stringc colladaSectionName =   "COLLADA";
 	const core::stringc librarySectionName =   "library";
+	const core::stringc libraryNodesSectionName = "library_nodes";
+	const core::stringc libraryGeometriesSectionName = "library_geometries";
+	const core::stringc libraryMaterialsSectionName = "library_materials";
+	const core::stringc libraryImagesSectionName = "library_images";
+	const core::stringc libraryVisualScenesSectionName = "library_visual_scenes";
+	const core::stringc libraryCamerasSectionName = "library_cameras";
+	const core::stringc libraryLightsSectionName = "library_lights";
+	const core::stringc libraryEffectsSectionName = "library_effects";
 	const core::stringc assetSectionName =     "asset";
 	const core::stringc sceneSectionName =     "scene";
+	const core::stringc visualSceneSectionName = "visual_scene";
 
 	const core::stringc lightPrefabName =      "light";
 	const core::stringc cameraPrefabName =     "camera";
@@ -39,15 +51,28 @@ namespace scene
 	const core::stringc geometrySectionName =  "geometry";
 	const core::stringc imageSectionName =     "image";
 	const core::stringc textureSectionName =   "texture";
+	const core::stringc effectSectionName =    "effect";
 
+	const core::stringc pointSectionName =     "point";
+	const core::stringc directionalSectionName ="directional";
+	const core::stringc spotSectionName =      "spot";
+	const core::stringc ambientSectionName =   "ambient";
 	const core::stringc meshSectionName =      "mesh";
-	const core::stringc sourceSectionName =	   "source";
+	const core::stringc sourceSectionName =    "source";
 	const core::stringc arraySectionName =     "array";
+	const core::stringc floatArraySectionName ="float_array";
+	const core::stringc intArraySectionName =  "int_array";
+	const core::stringc techniqueCommonSectionName = "technique_common";
 	const core::stringc accessorSectionName =  "accessor";
 	const core::stringc verticesSectionName =  "vertices";
 	const core::stringc inputTagName =         "input";
+	const core::stringc polylistSectionName =  "polylist";
+	const core::stringc trianglesSectionName = "triangles";
 	const core::stringc polygonsSectionName =  "polygons";
-	const core::stringc polygonName =          "p";
+	const core::stringc primitivesName =       "p";
+	const core::stringc vcountName =           "vcount";
+
+	const core::stringc upAxisNodeName =       "up_axis";
 	const core::stringc nodeSectionName =      "node";
 	const core::stringc lookatNodeName =       "lookat";
 	const core::stringc matrixNodeName =       "matrix";
@@ -56,22 +81,56 @@ namespace scene
 	const core::stringc scaleNodeName =        "scale";
 	const core::stringc translateNodeName =    "translate";
 	const core::stringc skewNodeName =         "skew";
-	const core::stringc instanceNodeName =     "instance";
+	const core::stringc bboxNodeName =         "boundingbox";
+	const core::stringc minNodeName =          "min";
+	const core::stringc maxNodeName =          "max";
+	const core::stringc instanceName =         "instance";
+	const core::stringc instanceGeometryName = "instance_geometry";
+	const core::stringc instanceSceneName =    "instance_visual_scene";
+	const core::stringc instanceEffectName =   "instance_effect";
+	const core::stringc instanceMaterialName = "instance_material";
+	const core::stringc instanceLightName =    "instance_light";
+	const core::stringc instanceNodeName =     "instance_node";
+	const core::stringc bindMaterialName =     "bind_material";
+	const core::stringc extraNodeName =        "extra";
+	const core::stringc techniqueNodeName =    "technique";
+	const core::stringc colorNodeName =        "color";
+	const core::stringc floatNodeName =        "float";
+	const core::stringc float2NodeName =       "float2";
+	const core::stringc float3NodeName =       "float3";
 
+	const core::stringc newParamName =         "newparam";
 	const core::stringc paramTagName =         "param";
+	const core::stringc initFromName =         "init_from";
+	const core::stringc dataName =             "data";
+	const core::stringc wrapsName =            "wrap_s";
+	const core::stringc wraptName =            "wrap_t";
+	const core::stringc minfilterName =        "minfilter";
+	const core::stringc magfilterName =        "magfilter";
+	const core::stringc mipfilterName =        "mipfilter";
+
+	const core::stringc textureNodeName =      "texture";
+	const core::stringc doubleSidedNodeName =  "double_sided";
+	const core::stringc constantAttenuationNodeName = "constant_attenuation";
+	const core::stringc linearAttenuationNodeName = "linear_attenuation";
+	const core::stringc quadraticAttenuationNodeName = "quadratic_attenuation";
+	const core::stringc falloffAngleNodeName = "falloff_angle";
+	const core::stringc falloffExponentNodeName = "falloff_exponent";
+
+	const core::stringc profileCOMMONSectionName = "profile_COMMON";
+	const core::stringc profileCOMMONAttributeName = "COMMON";
 
 	const char* const inputSemanticNames[] = {"POSITION", "VERTEX", "NORMAL", "TEXCOORD",
 		"UV", "TANGENT", "IMAGE", "TEXTURE", 0};
 
-	//! following class is for holding and creating instances of library objects,
-	//! named prefabs in this loader.
+	//! following class is for holding and creating instances of library
+	//! objects, named prefabs in this loader.
 	class CPrefab : public IColladaPrefab
 	{
 	public:
 
-		CPrefab(const char* id)
+		CPrefab(const core::stringc& id) : Id(id)
 		{
-			Id = id;
 		}
 
 		//! creates an instance of this prefab
@@ -83,9 +142,9 @@ namespace scene
 		}
 
 		//! returns id of this prefab
-		virtual const c8* getId()
+		virtual const core::stringc& getId()
 		{
-			return Id.c_str();
+			return Id;
 		}
 
 	protected:
@@ -99,10 +158,10 @@ namespace scene
 	{
 	public:
 
-		CLightPrefab(const char* id) : CPrefab(id)
+		CLightPrefab(const core::stringc& id) : CPrefab(id)
 		{
 			#ifdef COLLADA_READER_DEBUG
-			os::Printer::log("COLLADA: loaded light prefab:", Id.c_str());
+			os::Printer::log("COLLADA: loaded light prefab", Id.c_str());
 			#endif
 		}
 
@@ -113,11 +172,15 @@ namespace scene
 			scene::ISceneManager* mgr)
 		{
 			#ifdef COLLADA_READER_DEBUG
-			os::Printer::log("COLLADA: Constructing light instance:", Id.c_str());
+			os::Printer::log("COLLADA: Constructing light instance", Id.c_str());
 			#endif
 
 			scene::ILightSceneNode* l = mgr->addLightSceneNode(parent);
-			l->setLightData ( LightData );
+			if (l)
+			{
+				l->setLightData ( LightData );
+				l->setName(getId());
+			}
 			return l;
 		}
 	};
@@ -128,21 +191,26 @@ namespace scene
 	{
 	public:
 
-		CGeometryPrefab(const char* id) : CPrefab(id)
+		CGeometryPrefab(const core::stringc& id) : CPrefab(id)
 		{
 		}
 
-		scene::IMesh* Mesh; // public accessible
+		scene::IMesh* Mesh;
 
 		//! creates an instance of this prefab
 		virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
 			scene::ISceneManager* mgr)
 		{
 			#ifdef COLLADA_READER_DEBUG
-			os::Printer::log("COLLADA: Constructing mesh instance:", Id.c_str());
+			os::Printer::log("COLLADA: Constructing mesh instance", Id.c_str());
 			#endif
 
 			scene::ISceneNode* m = mgr->addMeshSceneNode(Mesh, parent);
+			if (m)
+			{
+				m->setName(getId());
+//				m->setDebugDataVisible(scene::EDS_FULL);
+			}
 			return m;
 		}
 	};
@@ -153,15 +221,15 @@ namespace scene
 	{
 	public:
 
-		CCameraPrefab(const char* id)
+		CCameraPrefab(const core::stringc& id)
 			: CPrefab(id), YFov(core::PI / 2.5f), ZNear(1.0f), ZFar(3000.0f)
 		{
 			#ifdef COLLADA_READER_DEBUG
-			os::Printer::log("COLLADA: loaded camera prefab:", Id.c_str());
+			os::Printer::log("COLLADA: loaded camera prefab", Id.c_str());
 			#endif
 		}
 
-		// public accessible data
+		// publicly accessible data
 		f32 YFov;
 		f32 ZNear;
 		f32 ZFar;
@@ -171,24 +239,80 @@ namespace scene
 			scene::ISceneManager* mgr)
 		{
 			#ifdef COLLADA_READER_DEBUG
-			os::Printer::log("COLLADA: Constructing camera instance:", Id.c_str());
+			os::Printer::log("COLLADA: Constructing camera instance", Id.c_str());
 			#endif
 
 			scene::ICameraSceneNode* c = mgr->addCameraSceneNode(parent);
-			c->setFOV(YFov);
-			c->setNearValue(ZNear);
-			c->setFarValue(ZFar);
+			if (c)
+			{
+				c->setFOV(YFov);
+				c->setNearValue(ZNear);
+				c->setFarValue(ZFar);
+				c->setName(getId());
+			}
 			return c;
 		}
 	};
 
+
+	//! prefab for a container scene node
+	//! Collects other prefabs and instantiates them upon instantiation
+	//! Uses a dummy scene node to return the childs as one scene node
+	class CScenePrefab : public CPrefab
+	{
+	public:
+		CScenePrefab(const core::stringc& id) : CPrefab(id)
+		{
+			#ifdef COLLADA_READER_DEBUG
+			os::Printer::log("COLLADA: loaded scene prefab", Id.c_str());
+			#endif
+		}
+
+		//! creates an instance of this prefab
+		virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
+			scene::ISceneManager* mgr)
+		{
+			#ifdef COLLADA_READER_DEBUG
+			os::Printer::log("COLLADA: Constructing scene instance", Id.c_str());
+			#endif
+
+			if (Childs.size()==0)
+				return 0;
+
+			scene::IDummyTransformationSceneNode* s = mgr->addDummyTransformationSceneNode(parent);
+			if (s)
+			{
+				s->setName(getId());
+				s->getRelativeTransformationMatrix() = Transformation;
+				core::stringc t;
+				for (u32 i=0; i<16; ++i)
+				{
+					t+=core::stringc(Transformation[i]);
+					t+=" ";
+				}
+os::Printer::log("COLLADA: Transformation", t.c_str());
+
+				for (u32 i=0; i<Childs.size(); ++i)
+					Childs[i]->addInstance(s, mgr);
+			}
+
+			return s;
+		}
+
+		core::array<IColladaPrefab*> Childs;
+		core::matrix4 Transformation;
+	};
+
+
 //! Constructor
-CColladaFileLoader::CColladaFileLoader(video::IVideoDriver* driver,
-		scene::ISceneManager* smgr, io::IFileSystem* fs)
-: Driver(driver), SceneManager(smgr), FileSystem(fs), DummyMesh(0),
+CColladaFileLoader::CColladaFileLoader(scene::ISceneManager* smgr,
+		io::IFileSystem* fs)
+: SceneManager(smgr), FileSystem(fs), DummyMesh(0),
 	FirstLoadedMesh(0), LoadedMeshCount(0), CreateInstances(false)
 {
-	
+	#ifdef _DEBUG
+	setDebugName("CColladaFileLoader");
+	#endif
 }
 
 
@@ -207,8 +331,7 @@ CColladaFileLoader::~CColladaFileLoader()
 /** This decision should be based only on the file extension (e.g. ".cob") */
 bool CColladaFileLoader::isALoadableFileExtension(const c8* fileName) const
 {
-	return strstr(fileName, ".xml") ||
-		   strstr(fileName, ".dae");
+	return strstr(fileName, ".xml") || strstr(fileName, ".dae");
 }
 
 
@@ -225,6 +348,8 @@ IAnimatedMesh* CColladaFileLoader::createMesh(io::IReadFile* file)
 	CurrentlyLoadingMesh = file->getFileName();
 	CreateInstances = SceneManager->getParameters()->getAttributeAsBool(
 		scene::COLLADA_CREATE_SCENE_INSTANCES);
+	Version = 0;
+	FlipAxis = false;
 
 	// read until COLLADA section, skip other parts
 
@@ -240,17 +365,18 @@ IAnimatedMesh* CColladaFileLoader::createMesh(io::IReadFile* file)
 	}
 
 	reader->drop();
-
-	scene::IAnimatedMesh* returnMesh = DummyMesh;
+	if (!Version)
+		return 0;
 
 	// because this loader loads and creates a complete scene instead of
 	// a single mesh, return an empty dummy mesh to make the scene manager
 	// know that everything went well.
 	if (!DummyMesh)
-	{
 		DummyMesh = new SAnimatedMesh();
-		returnMesh = DummyMesh;
-	}
+	scene::IAnimatedMesh* returnMesh = DummyMesh;
+
+	if (Version < 10400)
+		instantiateNode(SceneManager->getRootSceneNode());
 
 	// add the first loaded mesh into the mesh cache too, if more than one
 	// meshes have been loaded from the file
@@ -277,7 +403,6 @@ IAnimatedMesh* CColladaFileLoader::createMesh(io::IReadFile* file)
 }
 
 
-
 //! skips an (unknown) section in the collada document
 void CColladaFileLoader::skipSection(io::IXMLReaderUTF8* reader, bool reportSkipping)
 {
@@ -300,7 +425,7 @@ void CColladaFileLoader::skipSection(io::IXMLReaderUTF8* reader, bool reportSkip
 		{
 			#ifdef COLLADA_READER_DEBUG
 			if (reportSkipping)
-				os::Printer::log("COLLADA unknown element:", core::stringc(reader->getNodeName()).c_str());
+				os::Printer::log("Skipping COLLADA unknown element", core::stringc(reader->getNodeName()).c_str());
 			#endif // COLLADA_READER_DEBUG
 
 			++tagCounter;
@@ -318,26 +443,57 @@ void CColladaFileLoader::readColladaSection(io::IXMLReaderUTF8* reader)
 	if (reader->isEmptyElement())
 		return;
 
-	// I ignore version information here. Keep on reading content:
+	const f32 version = core::fast_atof(core::stringc(reader->getAttributeValue("version")).c_str());
+	Version = core::floor32(version)*10000+core::floor32(core::fract(version)*1000.0f);
+	// Version 1.4 can be checked for by if (Version >= 10400)
 
 	while(reader->read())
 	if (reader->getNodeType() == io::EXN_ELEMENT)
 	{
+		if (assetSectionName == reader->getNodeName())
+			readAssetSection(reader);
+		else
 		if (librarySectionName == reader->getNodeName())
 			readLibrarySection(reader);
 		else
+		if (libraryNodesSectionName == reader->getNodeName())
+			readLibrarySection(reader);
+		else
+		if (libraryGeometriesSectionName == reader->getNodeName())
+			readLibrarySection(reader);
+		else
+		if (libraryMaterialsSectionName == reader->getNodeName())
+			readLibrarySection(reader);
+		else
+		if (libraryEffectsSectionName == reader->getNodeName())
+			readLibrarySection(reader);
+		else
+		if (libraryImagesSectionName == reader->getNodeName())
+			readLibrarySection(reader);
+		else
+		if (libraryCamerasSectionName == reader->getNodeName())
+			readLibrarySection(reader);
+		else
+		if (libraryLightsSectionName == reader->getNodeName())
+			readLibrarySection(reader);
+		else
+		if (libraryVisualScenesSectionName == reader->getNodeName())
+			readVisualSceneLibrary(reader);
+		else
 		if (assetSectionName == reader->getNodeName())
 			readAssetSection(reader);
 		else
 		if (sceneSectionName == reader->getNodeName())
 			readSceneSection(reader);
 		else
+		{
+			os::Printer::log("COLLADA loader warning: Wrong tag usage found", reader->getNodeName(), ELL_WARNING);
 			skipSection(reader, true); // unknown section
+		}
 	}
 }
 
 
-
 //! reads a <library> section and its content
 void CColladaFileLoader::readLibrarySection(io::IXMLReaderUTF8* reader)
 {
@@ -345,34 +501,108 @@ void CColladaFileLoader::readLibrarySection(io::IXMLReaderUTF8* reader)
 	os::Printer::log("COLLADA reading library");
 	#endif
 
+	if (reader->isEmptyElement())
+		return;
+
 	while(reader->read())
-	if (reader->getNodeType() == io::EXN_ELEMENT)
 	{
-		if (lightPrefabName == reader->getNodeName())
-			readLightPrefab(reader);
+		if (reader->getNodeType() == io::EXN_ELEMENT)
+		{
+			// animation section tbd
+			if (cameraPrefabName == reader->getNodeName())
+				readCameraPrefab(reader);
+			else
+			// code section tbd
+			// controller section tbd
+			if (geometrySectionName == reader->getNodeName())
+				readGeometry(reader);
+			else
+			if (imageSectionName == reader->getNodeName())
+				readImage(reader);
+			else
+			if (lightPrefabName == reader->getNodeName())
+				readLightPrefab(reader);
+			else
+			if (materialSectionName == reader->getNodeName())
+				readMaterial(reader);
+			else
+			if (nodeSectionName == reader->getNodeName())
+			{
+				CScenePrefab p("");
+
+				readNodeSection(reader, SceneManager->getRootSceneNode(), &p);
+			}
+			else
+			if (effectSectionName == reader->getNodeName())
+				readEffect(reader);
+			else
+			// program section tbd
+			if (textureSectionName == reader->getNodeName())
+				readTexture(reader);
+			else
+				skipSection(reader, true); // unknown section, not all allowed supported yet
+		}
 		else
-		if (imageSectionName == reader->getNodeName())
-			readImage(reader);
-		else
-		if (textureSectionName == reader->getNodeName())
-			readTexture(reader);
-		else
-		if (materialSectionName == reader->getNodeName())
-			readMaterial(reader);
-		else
-		if (cameraPrefabName == reader->getNodeName())
-			readCameraPrefab(reader);
-		else
-		if (geometrySectionName == reader->getNodeName())
-			readGeometry(reader);
-		else
-			skipSection(reader, true); // unknown section
+		if (reader->getNodeType() == io::EXN_ELEMENT_END)
+		{
+			if (librarySectionName == reader->getNodeName())
+				break; // end reading.
+			if (libraryNodesSectionName == reader->getNodeName())
+				break; // end reading.
+			if (libraryGeometriesSectionName == reader->getNodeName())
+				break; // end reading.
+			if (libraryMaterialsSectionName == reader->getNodeName())
+				break; // end reading.
+			if (libraryEffectsSectionName == reader->getNodeName())
+				break; // end reading.
+			if (libraryImagesSectionName == reader->getNodeName())
+				break; // end reading.
+			if (libraryLightsSectionName == reader->getNodeName())
+				break; // end reading.
+			if (libraryCamerasSectionName == reader->getNodeName())
+				break; // end reading.
+		}
 	}
-	else
-	if (reader->getNodeType() == io::EXN_ELEMENT_END)
+}
+
+
+//! reads a <visual_scene> element and stores it as a prefab
+void CColladaFileLoader::readVisualSceneLibrary(io::IXMLReaderUTF8* reader)
+{
+	CScenePrefab* p = 0;
+	while(reader->read())
 	{
-		if (librarySectionName == reader->getNodeName())
-			break; // end reading.
+		if (reader->getNodeType() == io::EXN_ELEMENT)
+		{
+			if (visualSceneSectionName == reader->getNodeName())
+				p = new CScenePrefab(readId(reader));
+			else
+			if (p && nodeSectionName == reader->getNodeName()) // as a child of visual_scene
+				readNodeSection(reader, SceneManager->getRootSceneNode(), p);
+			else
+			if (assetSectionName == reader->getNodeName())
+				readAssetSection(reader);
+			else
+			if (extraNodeName == reader->getNodeName())
+				skipSection(reader, false); // ignore all other sections
+			else
+			{
+				os::Printer::log("COLLADA loader warning: Wrong tag usage found", reader->getNodeName(), ELL_WARNING);
+				skipSection(reader, true); // ignore all other sections
+			}
+		}
+		else
+		if (reader->getNodeType() == io::EXN_ELEMENT_END)
+		{
+			if (libraryVisualScenesSectionName == reader->getNodeName())
+				return;
+			else
+			if ((visualSceneSectionName == reader->getNodeName()) && p)
+			{
+				Prefabs.push_back(p);
+				p = 0;
+			}
+		}
 	}
 }
 
@@ -389,16 +619,66 @@ void CColladaFileLoader::readSceneSection(io::IXMLReaderUTF8* reader)
 
 	// read the scene
 
-	while(reader->read())
-	if (reader->getNodeType() == io::EXN_ELEMENT)
-	{
-		if (nodeSectionName == reader->getNodeName())
-			readNodeSection(reader, SceneManager->getRootSceneNode());
-		else
-			skipSection(reader, true); // ignore all other sections
-	}
-}
+	core::matrix4 transform; // transformation of this node
+	core::aabbox3df bbox;
+	scene::IDummyTransformationSceneNode* node = 0;
 
+	while(reader->read())
+	{
+		if (reader->getNodeType() == io::EXN_ELEMENT)
+		{
+			if (lookatNodeName == reader->getNodeName())
+				transform *= readLookAtNode(reader);
+			else
+			if (matrixNodeName == reader->getNodeName())
+				transform *= readMatrixNode(reader);
+			else
+			if (perspectiveNodeName == reader->getNodeName())
+				transform *= readPerspectiveNode(reader);
+			else
+			if (rotateNodeName == reader->getNodeName())
+				transform *= readRotateNode(reader);
+			else
+			if (scaleNodeName == reader->getNodeName())
+				transform *= readScaleNode(reader);
+			else
+			if (skewNodeName == reader->getNodeName())
+				transform *= readSkewNode(reader);
+			else
+			if (translateNodeName == reader->getNodeName())
+				transform *= readTranslateNode(reader);
+			else
+			if (bboxNodeName == reader->getNodeName())
+				readBboxNode(reader, bbox);
+			else
+			if (nodeSectionName == reader->getNodeName())
+			{
+				// create dummy node if there is none yet.
+				if (!node)
+					node = SceneManager->addDummyTransformationSceneNode(SceneManager->getRootSceneNode());
+
+				readNodeSection(reader, node);
+			}
+			else
+			if ((instanceSceneName == reader->getNodeName()))
+				readInstanceNode(reader, SceneManager->getRootSceneNode(), 0);
+			else
+			if (extraNodeName == reader->getNodeName())
+				skipSection(reader, false);
+			else
+			{
+				os::Printer::log("COLLADA loader warning: Wrong tag usage found", reader->getNodeName(), ELL_WARNING);
+				skipSection(reader, true); // ignore all other sections
+			}
+		}
+		else
+		if ((reader->getNodeType() == io::EXN_ELEMENT_END) &&
+			(sceneSectionName == reader->getNodeName()))
+				return;
+	}
+	if (node)
+		node->getRelativeTransformationMatrix() = transform;
+}
 
 
 //! reads a <asset> section and its content
@@ -408,14 +688,29 @@ void CColladaFileLoader::readAssetSection(io::IXMLReaderUTF8* reader)
 	os::Printer::log("COLLADA reading asset");
 	#endif
 
-	// don't need asset data so far, so skip it
-	skipSection(reader, false);
+	if (reader->isEmptyElement())
+		return;
+
+	while(reader->read())
+	{
+		if (reader->getNodeType() == io::EXN_ELEMENT)
+		{
+			if (upAxisNodeName == reader->getNodeName())
+			{
+					reader->read();
+					FlipAxis = (core::stringc("Z_UP") == reader->getNodeData());
+			}
+		}
+		else
+		if ((reader->getNodeType() == io::EXN_ELEMENT_END) &&
+			(assetSectionName == reader->getNodeName()))
+				return;
+	}
 }
 
 
-
 //! reads a <node> section and its content
-void CColladaFileLoader::readNodeSection(io::IXMLReaderUTF8* reader, scene::ISceneNode* parent)
+void CColladaFileLoader::readNodeSection(io::IXMLReaderUTF8* reader, scene::ISceneNode* parent, CScenePrefab* p)
 {
 	#ifdef COLLADA_READER_DEBUG
 	os::Printer::log("COLLADA reading node");
@@ -424,93 +719,117 @@ void CColladaFileLoader::readNodeSection(io::IXMLReaderUTF8* reader, scene::ISce
 	if (reader->isEmptyElement())
 		return;
 
-	core::stringc name = reader->getAttributeValue("name"); // name of the node
+	core::stringc name = readId(reader);
+
 	core::matrix4 transform; // transformation of this node
+	core::aabbox3df bbox;
 	scene::ISceneNode* node = 0; // instance
+	CScenePrefab* nodeprefab = 0; // prefab for library_nodes usage
+
+	if (p)
+	{
+		nodeprefab = new CScenePrefab(readId(reader));
+		p->Childs.push_back(nodeprefab);
+		Prefabs.push_back(nodeprefab); // in order to delete them later on
+	}
 
 	// read the node
 
 	while(reader->read())
-	if (reader->getNodeType() == io::EXN_ELEMENT)
 	{
-		if (lookatNodeName == reader->getNodeName())
-			transform *= readLookAtNode(reader);
-		else
-		if (matrixNodeName == reader->getNodeName())
-			transform *= readMatrixNode(reader);
-		else
-		if (perspectiveNodeName == reader->getNodeName())
-			transform *= readPerspectiveNode(reader);
-		else
-		if (rotateNodeName == reader->getNodeName())
-			transform *= readRotateNode(reader);
-		else
-		if (scaleNodeName == reader->getNodeName())
-			transform *= readScaleNode(reader);
-		else
-		if (translateNodeName == reader->getNodeName())
-			transform *= readTranslateNode(reader);
-		else
-		if (skewNodeName == reader->getNodeName())
-			transform *= readSkewNode(reader);
-		else
-		if (instanceNodeName == reader->getNodeName())
+		if (reader->getNodeType() == io::EXN_ELEMENT)
 		{
-			scene::ISceneNode* newnode = 0;
-			readInstanceNode(reader, parent, &newnode);
-
-			if (node && newnode)
+			if (assetSectionName == reader->getNodeName())
+				readAssetSection(reader);
+			else
+			if (lookatNodeName == reader->getNodeName())
+				transform *= readLookAtNode(reader);
+			else
+			if (matrixNodeName == reader->getNodeName())
+				transform *= readMatrixNode(reader);
+			else
+			if (perspectiveNodeName == reader->getNodeName())
+				transform *= readPerspectiveNode(reader);
+			else
+			if (rotateNodeName == reader->getNodeName())
+				transform *= readRotateNode(reader);
+			else
+			if (scaleNodeName == reader->getNodeName())
+				transform *= readScaleNode(reader);
+			else
+			if (skewNodeName == reader->getNodeName())
+				transform *= readSkewNode(reader);
+			else
+			if (translateNodeName == reader->getNodeName())
+				transform *= readTranslateNode(reader);
+			else
+			if (bboxNodeName == reader->getNodeName())
+				readBboxNode(reader, bbox);
+			else
+			if ((instanceName == reader->getNodeName()) ||
+				(instanceNodeName == reader->getNodeName()) ||
+				(instanceGeometryName == reader->getNodeName()) ||
+				(instanceLightName == reader->getNodeName()))
 			{
-				// move children from dummy to new node
-				core::list<ISceneNode*>::ConstIterator it = node->getChildren().begin();
-				for (; it != node->getChildren().end(); it = node->getChildren().begin())
-					(*it)->setParent(newnode);
+				scene::ISceneNode* newnode = 0;
+				readInstanceNode(reader, parent, &newnode, nodeprefab);
 
-				// remove previous dummy node
-				node->remove();
+				if (node && newnode)
+				{
+					// move children from dummy to new node
+					core::list<ISceneNode*>::ConstIterator it = node->getChildren().begin();
+					for (; it != node->getChildren().end(); it = node->getChildren().begin())
+						(*it)->setParent(newnode);
+
+					// remove previous dummy node
+					node->remove();
+					node = newnode;
+				}
 			}
+			else
+			if (nodeSectionName == reader->getNodeName())
+			{
+				// create dummy node if there is none yet.
+				if (CreateInstances && !node)
+				{
+					scene::IDummyTransformationSceneNode* dummy =
+						SceneManager->addDummyTransformationSceneNode(parent);
+					dummy->getRelativeTransformationMatrix() = transform;
+					node = dummy;
+				}
+				else
+					node = parent;
 
-			node = newnode;
-		}
+				// read and add child
+				readNodeSection(reader, node, nodeprefab);
+			}
+			else
+			if (extraNodeName == reader->getNodeName())
+				skipSection(reader, false);
+			else
+				skipSection(reader, true); // ignore all other sections
+
+		} // end if node
 		else
-		if (nodeSectionName == reader->getNodeName())
+		if (reader->getNodeType() == io::EXN_ELEMENT_END)
 		{
-			// create dummy node if there is none yet.
-			if (!node)
-			{
-				scene::IDummyTransformationSceneNode* dummy =
-					SceneManager->addDummyTransformationSceneNode(parent);
-				dummy->getRelativeTransformationMatrix() = transform;
-				node = dummy;
-			}
-
-			// read and add child
-			readNodeSection(reader, node);
+			if (nodeSectionName == reader->getNodeName())
+				break;
 		}
-		else
-			skipSection(reader, true); // ignore all other sections
-
-	} // end if node
-	else
-	if (reader->getNodeType() == io::EXN_ELEMENT_END)
-	{
-		if (nodeSectionName == reader->getNodeName())
-			break;
 	}
 
+	if (nodeprefab)
+		nodeprefab->Transformation = transform;
+	else
 	if (node)
 	{
-		// TODO: set transformation correctly into node.
-		// currently this isn't done correctly. Need to get transformation,
-		// rotation and scale from the matrix.
-		const core::vector3df& trans = transform.getTranslation();
-		const core::vector3df& rot = transform.getRotationDegrees();
-
-		node->setPosition(trans);
-		node->setRotation(rot);
+		// set transformation correctly into node.
+		node->setPosition(transform.getTranslation());
+		node->setRotation(transform.getRotationDegrees());
+		node->setScale(transform.getScale());
 		node->updateAbsolutePosition();
 
-		node->setName(name.c_str());
+		node->setName(name);
 	}
 }
 
@@ -537,6 +856,7 @@ core::matrix4 CColladaFileLoader::readLookAtNode(io::IXMLReaderUTF8* reader)
 	return mat;
 }
 
+
 //! reads a <skew> element and its content and creates a matrix from it
 core::matrix4 CColladaFileLoader::readSkewNode(io::IXMLReaderUTF8* reader)
 {
@@ -548,16 +868,85 @@ core::matrix4 CColladaFileLoader::readSkewNode(io::IXMLReaderUTF8* reader)
 	if (reader->isEmptyElement())
 		return mat;
 
-	f32 floats[7];
+	f32 floats[7]; // angle rotation-axis translation-axis
 	readFloatsInsideElement(reader, floats, 7);
 
-	// TODO: build skew matrix from these 7 floats
+	// build skew matrix from these 7 floats
+	core::quaternion q;
+	q.fromAngleAxis(floats[0]*core::DEGTORAD, core::vector3df(floats[1], floats[2], floats[3]));
+	mat = q.getMatrix();
 
-	os::Printer::log("COLLADA loader warning: <skew> not implemented yet.", ELL_WARNING);
+	if (floats[4]==1.f) // along x-axis
+	{
+		mat[4]=0.f;
+		mat[6]=0.f;
+		mat[8]=0.f;
+		mat[9]=0.f;
+	}
+	else
+	if (floats[5]==1.f) // along y-axis
+	{
+		mat[1]=0.f;
+		mat[2]=0.f;
+		mat[8]=0.f;
+		mat[9]=0.f;
+	}
+	else
+	if (floats[6]==1.f) // along z-axis
+	{
+		mat[1]=0.f;
+		mat[2]=0.f;
+		mat[4]=0.f;
+		mat[6]=0.f;
+	}
 
 	return mat;
 }
 
+
+//! reads a <boundingbox> element and its content and stores it in bbox
+void CColladaFileLoader::readBboxNode(io::IXMLReaderUTF8* reader,
+		core::aabbox3df& bbox)
+{
+	#ifdef COLLADA_READER_DEBUG
+	os::Printer::log("COLLADA reading boundingbox node");
+	#endif
+
+	bbox.reset(core::aabbox3df());
+
+	if (reader->isEmptyElement())
+		return;
+
+	f32 floats[3];
+
+	while(reader->read())
+	{
+		if (reader->getNodeType() == io::EXN_ELEMENT)
+		{
+			if (minNodeName == reader->getNodeName())
+			{
+				readFloatsInsideElement(reader, floats, 3);
+				bbox.MinEdge.set(floats[0], floats[1], floats[2]);
+			}
+			else
+			if (maxNodeName == reader->getNodeName())
+			{
+				readFloatsInsideElement(reader, floats, 3);
+				bbox.MaxEdge.set(floats[0], floats[1], floats[2]);
+			}
+			else
+				skipSection(reader, true); // ignore all other sections
+		}
+		else
+		if (reader->getNodeType() == io::EXN_ELEMENT_END)
+		{
+			if (bboxNodeName == reader->getNodeName())
+				break;
+		}
+	}
+}
+
+
 //! reads a <matrix> element and its content and creates a matrix from it
 core::matrix4 CColladaFileLoader::readMatrixNode(io::IXMLReaderUTF8* reader)
 {
@@ -570,10 +959,28 @@ core::matrix4 CColladaFileLoader::readMatrixNode(io::IXMLReaderUTF8* reader)
 		return mat;
 
 	readFloatsInsideElement(reader, mat.pointer(), 16);
-
-	return mat;
+	// put translation into the correct place
+	if (FlipAxis)
+	{
+		core::matrix4 mat2(mat, core::matrix4::EM4CONST_TRANSPOSED);
+		mat2[1]=mat[8];
+		mat2[2]=mat[4];
+		mat2[4]=mat[2];
+		mat2[5]=mat[10];
+		mat2[6]=mat[6];
+		mat2[8]=mat[1];
+		mat2[9]=mat[9];
+		mat2[10]=mat[5];
+		mat2[12]=mat[3];
+		mat2[13]=mat[11];
+		mat2[14]=mat[7];
+		return mat2;
+	}
+	else
+		return core::matrix4(mat, core::matrix4::EM4CONST_TRANSPOSED);
 }
 
+
 //! reads a <perspective> element and its content and creates a matrix from it
 core::matrix4 CColladaFileLoader::readPerspectiveNode(io::IXMLReaderUTF8* reader)
 {
@@ -595,6 +1002,7 @@ core::matrix4 CColladaFileLoader::readPerspectiveNode(io::IXMLReaderUTF8* reader
 	return mat;
 }
 
+
 //! reads a <rotate> element and its content and creates a matrix from it
 core::matrix4 CColladaFileLoader::readRotateNode(io::IXMLReaderUTF8* reader)
 {
@@ -609,10 +1017,20 @@ core::matrix4 CColladaFileLoader::readRotateNode(io::IXMLReaderUTF8* reader)
 	f32 floats[4];
 	readFloatsInsideElement(reader, floats, 4);
 
-	core::quaternion q(floats[0], floats[1], floats[2], floats[3]);
-	return q.getMatrix();
+	if (!core::iszero(floats[3]))
+	{
+		core::quaternion q;
+		if (FlipAxis)
+			q.fromAngleAxis(floats[3]*core::DEGTORAD, core::vector3df(floats[0], floats[2], floats[1]));
+		else
+			q.fromAngleAxis(floats[3]*core::DEGTORAD, core::vector3df(floats[0], floats[1], floats[2]));
+		return q.getMatrix();
+	}
+	else
+		return core::IdentityMatrix;
 }
 
+
 //! reads a <scale> element and its content and creates a matrix from it
 core::matrix4 CColladaFileLoader::readScaleNode(io::IXMLReaderUTF8* reader)
 {
@@ -627,7 +1045,10 @@ core::matrix4 CColladaFileLoader::readScaleNode(io::IXMLReaderUTF8* reader)
 	f32 floats[3];
 	readFloatsInsideElement(reader, floats, 3);
 
-	mat.setScale(core::vector3df(floats[0], floats[1], floats[2]));
+	if (FlipAxis)
+		mat.setScale(core::vector3df(floats[0], floats[2], floats[1]));
+	else
+		mat.setScale(core::vector3df(floats[0], floats[1], floats[2]));
 
 	return mat;
 }
@@ -647,14 +1068,18 @@ core::matrix4 CColladaFileLoader::readTranslateNode(io::IXMLReaderUTF8* reader)
 	f32 floats[3];
 	readFloatsInsideElement(reader, floats, 3);
 
-	mat.setTranslation(core::vector3df(floats[0], floats[1], floats[2]));
+	if (FlipAxis)
+		mat.setTranslation(core::vector3df(floats[0], floats[2], floats[1]));
+	else
+		mat.setTranslation(core::vector3df(floats[0], floats[1], floats[2]));
 
 	return mat;
 }
 
-//! reads a <instance> node and creates a scene node from it
-void CColladaFileLoader::readInstanceNode(io::IXMLReaderUTF8* reader, scene::ISceneNode* parent,
-	scene::ISceneNode** outNode)
+
+//! reads any kind of <instance*> node
+void CColladaFileLoader::readInstanceNode(io::IXMLReaderUTF8* reader,
+		scene::ISceneNode* parent, scene::ISceneNode** outNode, CScenePrefab* p)
 {
 	#ifdef COLLADA_READER_DEBUG
 	os::Printer::log("COLLADA reading instance");
@@ -664,17 +1089,58 @@ void CColladaFileLoader::readInstanceNode(io::IXMLReaderUTF8* reader, scene::ISc
 	core::stringc url = reader->getAttributeValue("url");
 	uriToId(url);
 
-	if (CreateInstances)
-	for (u32 i=0; i<Prefabs.size(); ++i)
-		if (url == Prefabs[i]->getId())
+	if (!reader->isEmptyElement())
+	{
+		while(reader->read())
 		{
-			*outNode = Prefabs[i]->addInstance(parent, SceneManager);
-			if (*outNode)
-				(*outNode)->setName(reader->getAttributeValue("id"));
+			if (reader->getNodeType() == io::EXN_ELEMENT)
+			{
+				if (bindMaterialName == reader->getNodeName())
+					readBindMaterialSection(reader,url);
+				else
+				if (extraNodeName == reader->getNodeName())
+					skipSection(reader, false);
+			}
+			else
+			if (reader->getNodeType() == io::EXN_ELEMENT_END)
+				break;
+		}
+	}
+	instantiateNode(parent, outNode, p, url);
+}
+
+
+void CColladaFileLoader::instantiateNode(scene::ISceneNode* parent,
+		scene::ISceneNode** outNode, CScenePrefab* p, const core::stringc& url)
+{
+	#ifdef COLLADA_READER_DEBUG
+	os::Printer::log("COLLADA instantiate node");
+	#endif
+
+	for (u32 i=0; i<Prefabs.size(); ++i)
+	{
+		if (url == "" || url == Prefabs[i]->getId())
+		{
+			if (p)
+				p->Childs.push_back(Prefabs[i]);
+			else
+			if (CreateInstances)
+			{
+				scene::ISceneNode * newNode
+					= Prefabs[i]->addInstance(parent, SceneManager);
+				if (outNode)
+				{
+					*outNode = newNode;
+					if (*outNode)
+						(*outNode)->setName(url);
+				}
+			}
 			return;
 		}
+	}
 }
 
+
 //! reads a <camera> element and stores it as prefab
 void CColladaFileLoader::readCameraPrefab(io::IXMLReaderUTF8* reader)
 {
@@ -682,14 +1148,16 @@ void CColladaFileLoader::readCameraPrefab(io::IXMLReaderUTF8* reader)
 	os::Printer::log("COLLADA reading camera prefab");
 	#endif
 
-	CCameraPrefab* prefab = new CCameraPrefab(reader->getAttributeValue("id"));
+	CCameraPrefab* prefab = new CCameraPrefab(readId(reader));
 
 	if (!reader->isEmptyElement())
 	{
+		// read techniques optics and imager (the latter is completely ignored, though)
 		readColladaParameters(reader, cameraPrefabName);
 
 		SColladaParam* p;
 
+		// XFOV not yet supported
 		p = getColladaParameter(ECPN_YFOV);
 		if (p && p->Type == ECPT_FLOAT)
 			prefab->YFov = p->Floats[0];
@@ -701,6 +1169,7 @@ void CColladaFileLoader::readCameraPrefab(io::IXMLReaderUTF8* reader)
 		p = getColladaParameter(ECPN_ZFAR);
 		if (p && p->Type == ECPT_FLOAT)
 			prefab->ZFar = p->Floats[0];
+		// orthographic camera uses LEFT, RIGHT, TOP, and BOTTOM
 	}
 
 	Prefabs.push_back(prefab);
@@ -714,12 +1183,56 @@ void CColladaFileLoader::readImage(io::IXMLReaderUTF8* reader)
 	os::Printer::log("COLLADA reading image");
 	#endif
 
-	SColladaImage image;
-	image.Id = reader->getAttributeValue("id");
-	image.Filename = reader->getAttributeValue("source");
-
 	// add image to list of loaded images.
-	Images.push_back(image);
+	Images.push_back(SColladaImage());
+	SColladaImage& image=Images.getLast();
+
+	image.Id = readId(reader);
+	image.Dimension.Height = (u32)reader->getAttributeValueAsInt("height");
+	image.Dimension.Width = (u32)reader->getAttributeValueAsInt("width");
+
+	if (Version >= 10400) // start with 1.4
+	{
+		while(reader->read())
+		{
+			if (reader->getNodeType() == io::EXN_ELEMENT)
+			{
+				if (assetSectionName == reader->getNodeName())
+					skipSection(reader, false);
+				else
+				if (initFromName == reader->getNodeName())
+				{
+					reader->read();
+					image.Source = reader->getNodeData();
+					image.Source.trim();
+					image.SourceIsFilename=true;
+				}
+				else
+				if (dataName == reader->getNodeName())
+				{
+					reader->read();
+					image.Source = reader->getNodeData();
+					image.Source.trim();
+					image.SourceIsFilename=false;
+				}
+				else
+				if (extraNodeName == reader->getNodeName())
+					skipSection(reader, false);
+			}
+			else
+			if (reader->getNodeType() == io::EXN_ELEMENT_END)
+			{
+				if (initFromName == reader->getNodeName())
+					return;
+			}
+		}
+	}
+	else
+	{
+		image.Source = reader->getAttributeValue("source");
+		image.Source.trim();
+		image.SourceIsFilename=false;
+	}
 }
 
 
@@ -730,8 +1243,11 @@ void CColladaFileLoader::readTexture(io::IXMLReaderUTF8* reader)
 	os::Printer::log("COLLADA reading texture");
 	#endif
 
-	SColladaTexture texture;
-	texture.Id = reader->getAttributeValue("id");
+	// add texture to list of loaded textures.
+	Textures.push_back(SColladaTexture());
+	SColladaTexture& texture=Textures.getLast();
+
+	texture.Id = readId(reader);
 
 	if (!reader->isEmptyElement())
 	{
@@ -739,19 +1255,10 @@ void CColladaFileLoader::readTexture(io::IXMLReaderUTF8* reader)
 		SColladaInput* input = getColladaInput(ECIS_IMAGE);
 		if (input)
 		{
-			core::stringc imageName = input->Source;
-			uriToId(imageName);
-			for (u32 i=0; i<Images.size(); ++i)
-				if ((imageName == Images[i].Id) && Images[i].Filename.size())
-				{
-					texture.Texture = Driver->getTexture(Images[i].Filename.c_str());
-					break;
-				}
+			const core::stringc imageName = input->Source;
+			texture.Texture = getTextureFromImage(imageName);
 		}
 	}
-
-	// add texture to list of loaded textures.
-	Textures.push_back(texture);
 }
 
 
@@ -762,50 +1269,362 @@ void CColladaFileLoader::readMaterial(io::IXMLReaderUTF8* reader)
 	os::Printer::log("COLLADA reading material");
 	#endif
 
-	SColladaMaterial material;
-	material.Id = reader->getAttributeValue("id");
+	// add material to list of loaded materials.
+	Materials.push_back(SColladaMaterial());
 
-	if (!reader->isEmptyElement())
+	SColladaMaterial& material = Materials.getLast();
+	material.Id = readId(reader);
+
+	if (Version >= 10400)
 	{
-		readColladaInputs(reader, materialSectionName);
-		SColladaInput* input = getColladaInput(ECIS_TEXTURE);
-		if (input)
+		while(reader->read())
 		{
-			core::stringc textureName = input->Source;
-			uriToId(textureName);
-			for (u32 i=0; i<Textures.size(); ++i)
-				if (textureName == Textures[i].Id)
-				{
-					material.Mat.setTexture(0, Textures[i].Texture);
-					break;
-				}
-		}
+			if (reader->getNodeType() == io::EXN_ELEMENT &&
+				instanceEffectName == reader->getNodeName())
+			{
+				material.InstanceEffectId = reader->getAttributeValue("url");
+				uriToId(material.InstanceEffectId);
+			}
+			else
+			if (reader->getNodeType() == io::EXN_ELEMENT_END &&
+				materialSectionName == reader->getNodeName())
+			{
+				break;
+			}
+		} // end while reader->read();
+	}
+	else
+	{
+		if (!reader->isEmptyElement())
+		{
+			readColladaInputs(reader, materialSectionName);
+			SColladaInput* input = getColladaInput(ECIS_TEXTURE);
+			if (input)
+			{
+				core::stringc textureName = input->Source;
+				uriToId(textureName);
+				for (u32 i=0; i<Textures.size(); ++i)
+					if (textureName == Textures[i].Id)
+					{
+						material.Mat.setTexture(0, Textures[i].Texture);
+						break;
+					}
+			}
 
-		//does not work because the wrong start node is chosen due to reading of inputs before
+			//does not work because the wrong start node is chosen due to reading of inputs before
 #if 0
-		readColladaParameters(reader, materialSectionName);
+			readColladaParameters(reader, materialSectionName);
 
-		SColladaParam* p;
+			SColladaParam* p;
 
-		p = getColladaParameter(ECPN_AMBIENT);
-		if (p && p->Type == ECPT_FLOAT3)
-			material.Mat.AmbientColor = video::SColorf(p->Floats[0],p->Floats[1],p->Floats[2]).toSColor();
-		p = getColladaParameter(ECPN_DIFFUSE);
-		if (p && p->Type == ECPT_FLOAT3)
-			material.Mat.DiffuseColor = video::SColorf(p->Floats[0],p->Floats[1],p->Floats[2]).toSColor();
-		p = getColladaParameter(ECPN_SPECULAR);
-		if (p && p->Type == ECPT_FLOAT3)
-			material.Mat.DiffuseColor = video::SColorf(p->Floats[0],p->Floats[1],p->Floats[2]).toSColor();
-		p = getColladaParameter(ECPN_SHININESS);
-		if (p && p->Type == ECPT_FLOAT)
-			material.Mat.Shininess = p->Floats[0];
+			p = getColladaParameter(ECPN_AMBIENT);
+			if (p && p->Type == ECPT_FLOAT3)
+				material.Mat.AmbientColor = video::SColorf(p->Floats[0],p->Floats[1],p->Floats[2]).toSColor();
+			p = getColladaParameter(ECPN_DIFFUSE);
+			if (p && p->Type == ECPT_FLOAT3)
+				material.Mat.DiffuseColor = video::SColorf(p->Floats[0],p->Floats[1],p->Floats[2]).toSColor();
+			p = getColladaParameter(ECPN_SPECULAR);
+			if (p && p->Type == ECPT_FLOAT3)
+				material.Mat.DiffuseColor = video::SColorf(p->Floats[0],p->Floats[1],p->Floats[2]).toSColor();
+			p = getColladaParameter(ECPN_SHININESS);
+			if (p && p->Type == ECPT_FLOAT)
+				material.Mat.Shininess = p->Floats[0];
 #endif
+		}
+	}
+}
+
+void CColladaFileLoader::readEffect(io::IXMLReaderUTF8* reader, SColladaEffect * effect)
+{
+	#ifdef COLLADA_READER_DEBUG
+	if (!effect) os::Printer::log("COLLADA reading effect");
+	#endif
+
+	static const core::stringc constantNode("constant");
+	static const core::stringc lambertNode("lambert");
+	static const core::stringc phongNode("phong");
+	static const core::stringc blinnNode("blinn");
+	static const core::stringc emissionNode("emission");
+	static const core::stringc ambientNode("ambient");
+	static const core::stringc diffuseNode("diffuse");
+	static const core::stringc specularNode("specular");
+	static const core::stringc shininessNode("shininess");
+	static const core::stringc reflectiveNode("reflective");
+	static const core::stringc reflectivityNode("reflectivity");
+	static const core::stringc transparentNode("transparent");
+	static const core::stringc transparencyNode("transparency");
+	static const core::stringc indexOfRefractionNode("index_of_refraction");
+
+	if (!effect)
+	{
+		Effects.push_back(SColladaEffect());
+		effect = &Effects.getLast();
+		effect->Id = readId(reader);
+		effect->Transparency = 1.f;
+		effect->Mat.Lighting=true;
+		effect->Mat.NormalizeNormals=true;
+	}
+	while(reader->read())
+	{
+		if (reader->getNodeType() == io::EXN_ELEMENT)
+		{
+			// first come the tags we descend, but ignore the top-levels
+			if (!reader->isEmptyElement() && ((profileCOMMONSectionName == reader->getNodeName()) ||
+				(techniqueNodeName == reader->getNodeName())))
+				readEffect(reader,effect);
+			else
+			if (newParamName == reader->getNodeName())
+				readParameter(reader);
+			else
+			// these are the actual materials inside technique
+			if (constantNode == reader->getNodeName() ||
+				lambertNode == reader->getNodeName() ||
+				phongNode == reader->getNodeName() ||
+				blinnNode == reader->getNodeName())
+			{
+				#ifdef COLLADA_READER_DEBUG
+				os::Printer::log("COLLADA reading effect part", reader->getNodeName());
+				#endif
+				effect->Mat.setFlag(irr::video::EMF_GOURAUD_SHADING,
+					phongNode == reader->getNodeName() ||
+					blinnNode == reader->getNodeName());
+				while(reader->read())
+				{
+					if (reader->getNodeType() == io::EXN_ELEMENT)
+					{
+						const core::stringc node = reader->getNodeName();
+						if (emissionNode == node || ambientNode == node ||
+							diffuseNode == node || specularNode == node ||
+							reflectiveNode == node || transparentNode == node )
+						{
+							// color or texture types
+							while(reader->read())
+							{
+								if (reader->getNodeType() == io::EXN_ELEMENT &&
+									colorNodeName == reader->getNodeName())
+								{
+									const video::SColorf colorf = readColorNode(reader);
+									const video::SColor color = colorf.toSColor();
+									if (emissionNode == node)
+										effect->Mat.EmissiveColor = color;
+									else
+									if (ambientNode == node)
+										effect->Mat.AmbientColor = color;
+									else
+									if (diffuseNode == node)
+										effect->Mat.DiffuseColor = color;
+									else
+									if (specularNode == node)
+										effect->Mat.SpecularColor = color;
+									else
+									if (transparentNode == node)
+										effect->Transparency = colorf.getAlpha();
+								}
+								else
+								if (reader->getNodeType() == io::EXN_ELEMENT &&
+									textureNodeName == reader->getNodeName())
+								{
+									const core::stringc tname = reader->getAttributeValue("texture");
+									effect->Mat.setTexture(0, getTextureFromImage(tname));
+									break;
+								}
+								else
+								if (reader->getNodeType() == io::EXN_ELEMENT)
+									skipSection(reader, false);
+								else
+								if (reader->getNodeType() == io::EXN_ELEMENT_END &&
+									node == reader->getNodeName())
+									break;
+							}
+						}
+						else
+						if (shininessNode == node || reflectivityNode == node ||
+							transparencyNode == node || indexOfRefractionNode == node )
+						{
+							// float or param types
+							while(reader->read())
+							{
+								if (reader->getNodeType() == io::EXN_ELEMENT &&
+									floatNodeName == reader->getNodeName())
+								{
+									f32 f = readFloatNode(reader);
+									if (shininessNode == node)
+										effect->Mat.Shininess = f;
+									else
+									if (transparencyNode == node)
+										effect->Transparency *= f;
+								}
+								else
+								if (reader->getNodeType() == io::EXN_ELEMENT)
+									skipSection(reader, false);
+								else
+								if (reader->getNodeType() == io::EXN_ELEMENT_END &&
+									node == reader->getNodeName())
+									break;
+							}
+						}
+						else
+							skipSection(reader, true); // ignore all other nodes
+					}
+					else
+					if (reader->getNodeType() == io::EXN_ELEMENT_END && (
+						constantNode == reader->getNodeName() ||
+						lambertNode == reader->getNodeName() ||
+						phongNode == reader->getNodeName() ||
+						blinnNode == reader->getNodeName()
+						))
+						break;
+				}
+			}
+			else
+			if (!reader->isEmptyElement() && (extraNodeName == reader->getNodeName()))
+				readEffect(reader,effect);
+			else
+			if (doubleSidedNodeName == reader->getNodeName())
+			{
+				// read the GoogleEarth extra flag for double sided polys
+				s32 doubleSided = 0;
+				readIntsInsideElement(reader,&doubleSided,1);
+				if (doubleSided)
+				{
+					effect->Mat.setFlag(irr::video::EMF_BACK_FACE_CULLING,false);
+				}
+			}
+			else
+				skipSection(reader, true); // ignore all other sections
+		}
+		else
+		if (reader->getNodeType() == io::EXN_ELEMENT_END)
+		{
+			if (effectSectionName == reader->getNodeName())
+				break;
+			else
+			if (profileCOMMONSectionName == reader->getNodeName())
+				break;
+			else
+			if (techniqueNodeName == reader->getNodeName())
+				break;
+			else
+			if (extraNodeName == reader->getNodeName())
+				break;
+		}
 	}
 
-	// add material to list of loaded materials.
-	Materials.push_back(material);
+	if (effect->Mat.AmbientColor == video::SColor(0) &&
+		effect->Mat.DiffuseColor != video::SColor(0))
+		effect->Mat.AmbientColor = effect->Mat.DiffuseColor;
+	if (effect->Mat.DiffuseColor == video::SColor(0) &&
+		effect->Mat.AmbientColor != video::SColor(0))
+		effect->Mat.DiffuseColor = effect->Mat.AmbientColor;
+	if ((effect->Transparency != 0.0f) && (effect->Transparency != 1.0f))
+	{
+		effect->Mat.MaterialType = irr::video::EMT_TRANSPARENT_VERTEX_ALPHA;
+		effect->Mat.ZWriteEnable = false;
+	}
+	effect->Mat.setFlag(video::EMF_TEXTURE_WRAP, !Parameters.getAttributeAsBool("wrap_s"));
+	effect->Mat.setFlag(video::EMF_BILINEAR_FILTER, Parameters.getAttributeAsBool("bilinear"));
+	effect->Mat.setFlag(video::EMF_TRILINEAR_FILTER, Parameters.getAttributeAsBool("trilinear"));
+	effect->Mat.setFlag(video::EMF_ANISOTROPIC_FILTER, Parameters.getAttributeAsBool("anisotropic"));
 }
 
+
+const SColladaMaterial* CColladaFileLoader::findMaterial(const core::stringc& materialName)
+{
+	// do a quick lookup in the materials
+	SColladaMaterial matToFind;
+	matToFind.Id = materialName;
+	s32 mat = Materials.binary_search(matToFind);
+	if (mat == -1)
+		return 0;
+	// instantiate the material effect if needed
+	if (Materials[mat].InstanceEffectId.size() != 0)
+	{
+		// do a quick lookup in the effects
+		SColladaEffect effectToFind;
+		effectToFind.Id = Materials[mat].InstanceEffectId;
+		s32 effect = Effects.binary_search(effectToFind);
+		if (effect != -1)
+		{
+			// found the effect, instantiate by copying into the material
+			Materials[mat].Mat = Effects[effect].Mat;
+			Materials[mat].Transparency = Effects[effect].Transparency;
+			// and indicate the material is instantiated by removing the effect ref
+			Materials[mat].InstanceEffectId = "";
+		}
+		else
+			return 0;
+	}
+	return &Materials[mat];
+}
+
+
+void CColladaFileLoader::readBindMaterialSection(io::IXMLReaderUTF8* reader, const core::stringc & id)
+{
+	#ifdef COLLADA_READER_DEBUG
+	os::Printer::log("COLLADA reading bind material");
+	#endif
+
+	while(reader->read())
+	{
+		if (reader->getNodeType() == io::EXN_ELEMENT)
+		{
+			if (instanceMaterialName == reader->getNodeName())
+			{
+				// the symbol to retarget, and the target material
+				core::stringc meshbufferReference = reader->getAttributeValue("symbol");
+				if (meshbufferReference.size()==0)
+					continue;
+				core::stringc target = reader->getAttributeValue("target");
+				uriToId(target);
+				if (target.size()==0)
+					continue;
+				const SColladaMaterial * material = findMaterial(target);
+				if (!material)
+					continue;
+				// bind any pending materials for this node
+				meshbufferReference = id+"/"+meshbufferReference;
+#ifdef COLLADA_READER_DEBUG
+				os::Printer::log((core::stringc("Material binding: ")+meshbufferReference+" "+target).c_str());
+#endif
+				if (MaterialsToBind.find(meshbufferReference))
+				{
+					core::array<irr::scene::IMeshBuffer*> & toBind
+						= MeshesToBind[MaterialsToBind[meshbufferReference]];
+#ifdef COLLADA_READER_DEBUG
+				os::Printer::log("Material binding now ",material->Id.c_str());
+				os::Printer::log("#meshbuffers",core::stringc(toBind.size()).c_str());
+#endif
+					SMesh tmpmesh;
+					for (u32 i = 0; i < toBind.size(); ++i)
+					{
+						toBind[i]->getMaterial() = material->Mat;
+						tmpmesh.addMeshBuffer(toBind[i]);
+
+						if ((material->Transparency!=0.0f) && (material->Transparency!=1.0f))
+						{
+							toBind[i]->getMaterial().MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+							toBind[i]->getMaterial().ZWriteEnable = false;
+						}
+					}
+					SceneManager->getMeshManipulator()->setVertexColors(&tmpmesh,material->Mat.DiffuseColor);
+					if ((material->Transparency!=0.0f) && (material->Transparency!=1.0f))
+					{
+						#ifdef COLLADA_READER_DEBUG
+						os::Printer::log("COLLADA found transparency material", core::stringc(material->Transparency).c_str());
+						#endif
+						SceneManager->getMeshManipulator()->setVertexColorAlpha(&tmpmesh, core::floor32(material->Transparency*255.0f));
+					}
+				}
+			}
+		}
+		else
+		if (reader->getNodeType() == io::EXN_ELEMENT_END &&
+			bindMaterialName == reader->getNodeName())
+			break;
+	}
+}
+
+
 //! reads a <geometry> element and stores it as mesh if possible
 void CColladaFileLoader::readGeometry(io::IXMLReaderUTF8* reader)
 {
@@ -813,7 +1632,7 @@ void CColladaFileLoader::readGeometry(io::IXMLReaderUTF8* reader)
 	os::Printer::log("COLLADA reading geometry");
 	#endif
 
-	core::stringc id = reader->getAttributeValue("id");
+	core::stringc id = readId(reader);
 
 	core::stringc VertexPositionSource; // each mesh has exactly one <vertex> member, containing
 										// a POSITION input. This string stores the source of this input.
@@ -824,8 +1643,8 @@ void CColladaFileLoader::readGeometry(io::IXMLReaderUTF8* reader)
 	scene::SMesh* mesh = new SMesh();
 	amesh->addMesh(mesh);
 
+	// handles geometry node and the mesh childs in this loop
 	// read sources with arrays and accessor for each mesh
-
 	if (!reader->isEmptyElement())
 	while(reader->read())
 	{
@@ -841,26 +1660,26 @@ void CColladaFileLoader::readGeometry(io::IXMLReaderUTF8* reader)
 			{
 				// create a new source
 				sources.push_back(SSource());
-				sources.getLast().Id = reader->getAttributeValue("id");
+				sources.getLast().Id = readId(reader);
 
 				#ifdef COLLADA_READER_DEBUG
-				os::Printer::log("Loaded source", sources.getLast().Id.c_str());
+				os::Printer::log("Reading source", sources.getLast().Id.c_str());
 				#endif
 			}
 			else
-			if (arraySectionName == nodeName)
+			if (arraySectionName == nodeName || floatArraySectionName == nodeName || intArraySectionName == nodeName)
 			{
 				// create a new array and read it.
 				if (!sources.empty())
 				{
-					sources.getLast().Array.Name = reader->getAttributeValue("id");
+					sources.getLast().Array.Name = readId(reader);
 
 					int count = reader->getAttributeValueAsInt("count");
 					sources.getLast().Array.Data.set_used(count); // pre allocate
 
 					// check if type of array is ok
 					const char* type = reader->getAttributeValue("type");
-					okToReadArray = (!strcmp("float", type) || !strcmp("int", type));
+					okToReadArray = (type && (!strcmp("float", type) || !strcmp("int", type))) || floatArraySectionName == nodeName || intArraySectionName == nodeName;
 
 					#ifdef COLLADA_READER_DEBUG
 					os::Printer::log("Read array", sources.getLast().Array.Name.c_str());
@@ -868,14 +1687,17 @@ void CColladaFileLoader::readGeometry(io::IXMLReaderUTF8* reader)
 				}
 				#ifdef COLLADA_READER_DEBUG
 				else
-					os::Printer::log("Warning, array found, but no source",
-						reader->getAttributeValue("id"));
+					os::Printer::log("Warning, array outside source found",
+						readId(reader).c_str());
 				#endif
 
 			}
 			else
-			if (accessorSectionName == nodeName)
+			if (accessorSectionName == nodeName) // child of source (below a technique tag)
 			{
+				#ifdef COLLADA_READER_DEBUG
+				os::Printer::log("Reading accessor");
+				#endif
 				SAccessor accessor;
 				accessor.Count = reader->getAttributeValueAsInt("count");
 				accessor.Offset = reader->getAttributeValueAsInt("offset");
@@ -889,12 +1711,15 @@ void CColladaFileLoader::readGeometry(io::IXMLReaderUTF8* reader)
 				if (!sources.empty())
 				{
 					sources.getLast().Accessors.push_back(accessor);
-					sources.getLast().Accessors.getLast().Parameters = Parameters;
+					sources.getLast().Accessors.getLast().Parameters = ColladaParameters;
 				}
 			}
 			else
 			if (verticesSectionName == nodeName)
 			{
+				#ifdef COLLADA_READER_DEBUG
+				os::Printer::log("Reading vertices");
+				#endif
 				// read vertex input position source
 				readColladaInputs(reader, verticesSectionName);
 				SColladaInput* input = getColladaInput(ECIS_POSITION);
@@ -902,12 +1727,27 @@ void CColladaFileLoader::readGeometry(io::IXMLReaderUTF8* reader)
 					VertexPositionSource = input->Source;
 			}
 			else
-			if (polygonsSectionName == nodeName)
+			// lines and linestrips missing
+			if (polygonsSectionName == nodeName ||
+				polylistSectionName == nodeName ||
+				trianglesSectionName == nodeName)
 			{
 				// read polygons section
-				readPolygonSection(reader, VertexPositionSource, sources, mesh);
+				readPolygonSection(reader, VertexPositionSource, sources, mesh, id);
+			}
+			else
+			// trifans, and tristrips missing
+			if (extraNodeName == nodeName)
+				skipSection(reader, false);
+			else
+			 // techniqueCommon or 'technique profile=common' must not be skipped
+			if ((techniqueCommonSectionName != nodeName) // Collada 1.4+
+				&& ((techniqueNodeName != nodeName) ||
+					(profileCOMMONAttributeName != reader->getAttributeValue("profile")))) // Collada 1.2/1.3
+			{
+				os::Printer::log("COLLADA loader warning: Wrong tag usage found in geometry", reader->getNodeName(), ELL_WARNING);
+				skipSection(reader, true); // ignore all other sections
 			}
-
 		} // end if node type is element
 		else
 		if (reader->getNodeType() == io::EXN_TEXT)
@@ -917,6 +1757,7 @@ void CColladaFileLoader::readGeometry(io::IXMLReaderUTF8* reader)
 			{
 				core::array<f32>& a = sources.getLast().Array.Data;
 				core::stringc data = reader->getNodeData();
+				data.trim();
 				const c8* p = &data[0];
 
 				for (u32 i=0; i<a.size(); ++i)
@@ -946,6 +1787,7 @@ void CColladaFileLoader::readGeometry(io::IXMLReaderUTF8* reader)
 	// add mesh as geometry
 
 	mesh->recalculateBoundingBox();
+	amesh->recalculateBoundingBox();
 
 	// create virtual file name
 	core::stringc filename = CurrentlyLoadingMesh;
@@ -983,12 +1825,6 @@ void CColladaFileLoader::readGeometry(io::IXMLReaderUTF8* reader)
 }
 
 
-struct SInputSlot
-{
-	f32* Data; // Pointer to source data
-	ECOLLADA_INPUT_SEMANTIC Semantic;
-};
-
 struct SPolygon
 {
 	core::array<s32> Indices;
@@ -997,30 +1833,26 @@ struct SPolygon
 //! reads a polygons section and creates a mesh from it
 void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
 	const core::stringc& vertexPositionSource, core::array<SSource>& sources,
-	scene::SMesh* mesh)
+	scene::SMesh* mesh, const core::stringc& geometryId)
 {
 	#ifdef COLLADA_READER_DEBUG
 	os::Printer::log("COLLADA reading polygon section");
 	#endif
 
 	core::stringc materialName = reader->getAttributeValue("material");
-	uriToId(materialName);
-	video::SMaterial mat;
 
-	for (u32 matnum=0; matnum<Materials.size(); ++matnum)
-		if (materialName == Materials[matnum].Id)
-		{
-			mat = Materials[matnum].Mat;
-			break;
-		}
-
-	// int polygonCount = reader->getAttributeValueAsInt("count");
-	core::array<SInputSlot> slots;
+	core::stringc polygonType = reader->getNodeName();
+	const int polygonCount = reader->getAttributeValueAsInt("count"); // Not useful because it only determines the number of primitives, which have arbitrary vertices in case of polygon
 	core::array<SPolygon> polygons;
+	core::array<int> vCounts;
 	bool parsePolygonOK = false;
+	bool parseVcountOK = false;
 	u32 inputSemanticCount = 0;
+	bool unresolvedInput=false;
+	u32 maxOffset = 0;
+	Inputs.clear();
 
-	// read all <input> and
+	// read all <input> and primitives
 	if (!reader->isEmptyElement())
 	while(reader->read())
 	{
@@ -1028,112 +1860,169 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
 
 		if (reader->getNodeType() == io::EXN_ELEMENT)
 		{
+			// polygon node may contain params
 			if (inputTagName == nodeName)
 			{
 				// read input tag
 				readColladaInput(reader);
 
-				// create new input slot
-				if (!Inputs.empty())
+				// resolve input source
+				SColladaInput& inp = Inputs.getLast();
+				core::stringc sourceArrayURI;
+
+				// get input source array id, if it is a vertex input, take
+				// the <vertex><input>-source attribute.
+				if (inp.Semantic == ECIS_VERTEX)
+					sourceArrayURI = vertexPositionSource;
+				else
+					sourceArrayURI = inp.Source;
+
+				uriToId(sourceArrayURI);
+
+				// find source array (we'll ignore accessors for this implementation)
+				u32 s;
+				for (s=0; s<sources.size(); ++s)
 				{
-					SInputSlot slot;
-					slot.Data=0;
-					slot.Semantic = Inputs.getLast().Semantic;
-
-					core::stringc sourceArrayURI;
-
-					// get input source array id, if it is a vertex input, take
-					// the <vertex><input>-source attribute.
-					if (slot.Semantic == ECIS_VERTEX)
-						sourceArrayURI = vertexPositionSource;
-					else
-						sourceArrayURI = Inputs.getLast().Source;
-
-					uriToId(sourceArrayURI);
-
-					// find source array (we'll ignore acessors for this implementation)
-					u32 s;
-					for (s=0; s<sources.size(); ++s)
-						if (sources[s].Id == sourceArrayURI)
-						{
-							// slot found
-							slot.Data = sources[s].Array.Data.pointer();
-							break;
-						}
-
-					if (s == sources.size())
-						os::Printer::log("COLLADA Warning, polygon input source not found",
-							sourceArrayURI.c_str());
-					else
-						slots.push_back(slot);
+					if (sources[s].Id == sourceArrayURI)
+					{
+						// slot found
+						inp.Data = sources[s].Array.Data.pointer();
+						inp.Stride = sources[s].Accessors[0].Stride;
+						break;
+					}
+				}
 
+				if (s == sources.size())
+				{
+					os::Printer::log("COLLADA Warning, polygon input source not found",
+						sourceArrayURI.c_str());
+					unresolvedInput=true;
+				}
+				else
+				{
 					#ifdef COLLADA_READER_DEBUG
 					// print slot
-					// core::stringc tmp = "Added slot ";
-					// tmp += inputSemanticNames[Inputs.getLast().Semantic];
-					// tmp += " sourceArray:";
-					// tmp += sourceArrayURI;
-					// os::Printer::log(tmp.c_str());
+					core::stringc tmp = "Added slot ";
+					tmp += inputSemanticNames[inp.Semantic];
+					tmp += " sourceArray:";
+					tmp += sourceArrayURI;
+					os::Printer::log(tmp.c_str());
 					#endif
-
-					++inputSemanticCount;
 				}
-			} // end is input node
+
+				maxOffset = core::max_(maxOffset,inp.Offset);
+				++inputSemanticCount;
+			}
 			else
-			if (polygonName == nodeName)
+			if (primitivesName == nodeName)
 			{
 				parsePolygonOK = true;
 				polygons.push_back(SPolygon());
+			}
+			else
+			if (vcountName == nodeName)
+			{
+				parseVcountOK = true;
 			} // end  is polygon node
-
 		} // end is element node
 		else
 		if (reader->getNodeType() == io::EXN_ELEMENT_END)
 		{
-			if (polygonName == nodeName)
+			if (primitivesName == nodeName)
 				parsePolygonOK = false; // end parsing a polygon
 			else
-			if (polygonsSectionName == nodeName)
+			if (vcountName == nodeName)
+				parseVcountOK = false; // end parsing vcounts
+			else
+			if (polygonType == nodeName)
 				break; // cancel out and create mesh
 
 		} // end is element end
 		else
 		if (reader->getNodeType() == io::EXN_TEXT)
 		{
-			if (parsePolygonOK && polygons.size())
+			if (parseVcountOK)
 			{
-				// parse this text and add it to the last polygon data
 				core::stringc data = reader->getNodeData();
+				data.trim();
 				const c8* p = &data[0];
-				SPolygon& poly = polygons.getLast();
 				while(*p)
 				{
 					findNextNoneWhiteSpace(&p);
 					if (*p)
+						vCounts.push_back(readInt(&p));
+				}
+				parseVcountOK = false;
+			}
+			else
+			if (parsePolygonOK && polygons.size())
+			{
+				core::stringc data = reader->getNodeData();
+				data.trim();
+				const c8* p = &data[0];
+				SPolygon& poly = polygons.getLast();
+				poly.Indices.reallocate(polygonCount*(maxOffset+1)*3);
+
+				if (vCounts.empty())
+				{
+					while(*p)
+					{
+						findNextNoneWhiteSpace(&p);
 						poly.Indices.push_back(readInt(&p));
+					}
+				}
+				else
+				{
+					for (u32 i = 0; i < vCounts.size(); i++)
+					{
+						const int polyVCount = vCounts[i];
+
+						core::array<int> polyCorners;
+
+						for (u32 j = 0; j < polyVCount * inputSemanticCount; j++)
+						{
+							if (!*p)
+								break;
+							findNextNoneWhiteSpace(&p);
+							polyCorners.push_back(readInt(&p));
+						}
+
+						while (polyCorners.size() >= 3 * inputSemanticCount)
+						{
+							// add one triangle's worth of indices
+							for (u32 k = 0; k < inputSemanticCount * 3; ++k)
+							{
+								poly.Indices.push_back(polyCorners[k]);
+							}
+
+							// remove one corner from our poly
+							polyCorners.erase(inputSemanticCount,inputSemanticCount);
+						}
+						polyCorners.clear();
+					}
+					vCounts.clear();
 				}
 				parsePolygonOK = false;
 			}
 		}
-
 	} // end while reader->read()
 
-	if (inputSemanticCount == 0 || inputSemanticCount != slots.size())
+	if (inputSemanticCount == 0 || unresolvedInput)
 		return; // we cannot create the mesh if one of the input semantics wasn't found.
 
 	if (!polygons.size())
 		return; // cancel if there are no polygons anyway.
 
-	// analyze content of slots to create a fitting mesh buffer
+	// analyze content of Inputs to create a fitting mesh buffer
 
 	u32 u;
 	u32 textureCoordSetCount = 0;
 	bool normalSlotCount = false;
 	u32 secondTexCoordSetIndex = 0xFFFFFFFF;
 
-	for (u=0; u<slots.size(); ++u)
+	for (u=0; u<Inputs.size(); ++u)
 	{
-		if (slots[u].Semantic == ECIS_TEXCOORD || slots[u].Semantic == ECIS_UV )
+		if (Inputs[u].Semantic == ECIS_TEXCOORD || Inputs[u].Semantic == ECIS_UV )
 		{
 			++textureCoordSetCount;
 
@@ -1141,7 +2030,7 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
 				secondTexCoordSetIndex = u;
 		}
 		else
-		if (slots[u].Semantic == ECIS_NORMAL)
+		if (Inputs[u].Semantic == ECIS_NORMAL)
 			normalSlotCount=true;
 	}
 
@@ -1149,51 +2038,71 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
 	// otherwise use a standard mesh buffer
 
 	scene::IMeshBuffer* buffer = 0;
+	++maxOffset; // +1 to jump to the next value
 
-	if ( textureCoordSetCount == 0 )
+	if ( textureCoordSetCount < 2 )
 	{
 		// standard mesh buffer
 
 		scene::SMeshBuffer* mbuffer = new SMeshBuffer();
-		mbuffer->Material=mat;
 		buffer = mbuffer;
 
+		core::map<video::S3DVertex, int> vertMap;
+
 		for (u32 i=0; i<polygons.size(); ++i)
 		{
-			u32 vertexCount = polygons[i].Indices.size() / inputSemanticCount;
+			core::array<u16> indices;
+			const u32 vertexCount = polygons[i].Indices.size() / maxOffset;
+			mbuffer->Vertices.reallocate(mbuffer->Vertices.size()+vertexCount);
 
 			// for all index/semantic groups
-			for (u32 v=0; v<polygons[i].Indices.size(); v+=inputSemanticCount)
+			for (u32 v=0; v<polygons[i].Indices.size(); v+=maxOffset)
 			{
 				video::S3DVertex vtx;
 				vtx.Color.set(255,255,255,255);
 
 				// for all input semantics
-				for (u32 k=0; k<slots.size(); ++k)
+				for (u32 k=0; k<Inputs.size(); ++k)
 				{
-					if (!slots[k].Data)
+					if (!Inputs[k].Data)
 						continue;
 					// build vertex from input semantics.
 
-					s32 idx = polygons[i].Indices[v+k];
+					const u32 idx = Inputs[k].Stride*polygons[i].Indices[v+Inputs[k].Offset];
 
-					switch(slots[k].Semantic)
+					switch(Inputs[k].Semantic)
 					{
 					case ECIS_POSITION:
 					case ECIS_VERTEX:
-						vtx.Pos.X = slots[k].Data[(idx*3)+0];
-						vtx.Pos.Y = slots[k].Data[(idx*3)+1];
-						vtx.Pos.Z = slots[k].Data[(idx*3)+2];
+						vtx.Pos.X = Inputs[k].Data[idx+0];
+						if (FlipAxis)
+						{
+							vtx.Pos.Z = Inputs[k].Data[idx+1];
+							vtx.Pos.Y = Inputs[k].Data[idx+2];
+						}
+						else
+						{
+							vtx.Pos.Y = Inputs[k].Data[idx+1];
+							vtx.Pos.Z = Inputs[k].Data[idx+2];
+						}
 						break;
 					case ECIS_NORMAL:
-						vtx.Normal.X = slots[k].Data[(idx*3)+0];
-						vtx.Normal.Y = slots[k].Data[(idx*3)+1];
-						vtx.Normal.Z = slots[k].Data[(idx*3)+2];
+						vtx.Normal.X = Inputs[k].Data[idx+0];
+						if (FlipAxis)
+						{
+							vtx.Normal.Z = Inputs[k].Data[idx+1];
+							vtx.Normal.Y = Inputs[k].Data[idx+2];
+						}
+						else
+						{
+							vtx.Normal.Y = Inputs[k].Data[idx+1];
+							vtx.Normal.Z = Inputs[k].Data[idx+2];
+						}
 						break;
 					case ECIS_TEXCOORD:
 					case ECIS_UV:
-						vtx.TCoords.X = slots[k].Data[(idx*2)+0];
-						vtx.TCoords.Y = slots[k].Data[(idx*2)+1];
+						vtx.TCoords.X = Inputs[k].Data[idx+0];
+						vtx.TCoords.Y = 1-Inputs[k].Data[idx+1];
 						break;
 					case ECIS_TANGENT:
 						break;
@@ -1202,17 +2111,63 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
 					}
 				}
 
-				mbuffer->Vertices.push_back(vtx);
-
+				//first, try to find this vertex in the mesh
+				core::map<video::S3DVertex, int>::Node* n = vertMap.find(vtx);
+				if (n)
+				{
+					indices.push_back(n->getValue());
+				}
+				else
+				{
+					indices.push_back(mbuffer->getVertexCount());
+					mbuffer->Vertices.push_back(vtx);
+					vertMap.insert(vtx, mbuffer->getVertexCount()-1);
+				}
 			} // end for all vertices
 
-			// add vertex indices
-			const u32 oldVertexCount = mbuffer->Vertices.size() - vertexCount;
-			for (u32 face=0; face<vertexCount-2; ++face)
+			if (polygonsSectionName == polygonType &&
+				indices.size() > 3)
 			{
-				mbuffer->Indices.push_back(oldVertexCount + 0);
-				mbuffer->Indices.push_back(oldVertexCount + 1 + face);
-				mbuffer->Indices.push_back(oldVertexCount + 2 + face);
+				// need to tesselate for polygons of 4 or more vertices
+				// for now we naively turn interpret it as a triangle fan
+				// as full tesselation is problematic
+				if (FlipAxis)
+				{
+					for (u32 ind = indices.size()-3; ind>0 ; --ind)
+					{
+						mbuffer->Indices.push_back(indices[0]);
+						mbuffer->Indices.push_back(indices[ind+2]);
+						mbuffer->Indices.push_back(indices[ind+1]);
+					}
+				}
+				else
+				{
+					for (u32 ind = 0; i+2 < indices.size(); ++ind)
+					{
+						mbuffer->Indices.push_back(indices[0]);
+						mbuffer->Indices.push_back(indices[ind+1]);
+						mbuffer->Indices.push_back(indices[ind+2]);
+					}
+				}
+			}
+			else
+			{
+				// it's just triangles
+				for (u32 ind = 0; ind < indices.size(); ind+=3)
+				{
+					if (FlipAxis)
+					{
+						mbuffer->Indices.push_back(indices[ind+2]);
+						mbuffer->Indices.push_back(indices[ind+1]);
+						mbuffer->Indices.push_back(indices[ind+0]);
+					}
+					else
+					{
+						mbuffer->Indices.push_back(indices[ind+0]);
+						mbuffer->Indices.push_back(indices[ind+1]);
+						mbuffer->Indices.push_back(indices[ind+2]);
+					}
+				}
 			}
 
 		} // end for all polygons
@@ -1222,50 +2177,65 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
 		// lightmap mesh buffer
 
 		scene::SMeshBufferLightMap* mbuffer = new SMeshBufferLightMap();
-		mbuffer->Material=mat;
 		buffer = mbuffer;
 
 		for (u32 i=0; i<polygons.size(); ++i)
 		{
-			u32 vertexCount = polygons[i].Indices.size() / inputSemanticCount;
-
+			const u32 vertexCount = polygons[i].Indices.size() / maxOffset;
+			mbuffer->Vertices.reallocate(mbuffer->Vertices.size()+vertexCount);
 			// for all vertices in array
-			for (u32 v=0; v<polygons[i].Indices.size(); v+=inputSemanticCount)
+			for (u32 v=0; v<polygons[i].Indices.size(); v+=maxOffset)
 			{
 				video::S3DVertex2TCoords vtx;
 				vtx.Color.set(100,255,255,255);
 
 				// for all input semantics
-				for (u32 k=0; k<slots.size(); ++k)
+				for (u32 k=0; k<Inputs.size(); ++k)
 				{
 					// build vertex from input semantics.
 
-					u32 idx = polygons[i].Indices[v+k];
+					const u32 idx = Inputs[k].Stride*polygons[i].Indices[v+Inputs[k].Offset];
 
-					switch(slots[k].Semantic)
+					switch(Inputs[k].Semantic)
 					{
 					case ECIS_POSITION:
 					case ECIS_VERTEX:
-						vtx.Pos.X = slots[k].Data[(idx*3)+0];
-						vtx.Pos.Y = slots[k].Data[(idx*3)+1];
-						vtx.Pos.Z = slots[k].Data[(idx*3)+2];
+						vtx.Pos.X = Inputs[k].Data[idx+0];
+						if (FlipAxis)
+						{
+							vtx.Pos.Z = Inputs[k].Data[idx+1];
+							vtx.Pos.Y = Inputs[k].Data[idx+2];
+						}
+						else
+						{
+							vtx.Pos.Y = Inputs[k].Data[idx+1];
+							vtx.Pos.Z = Inputs[k].Data[idx+2];
+						}
 						break;
 					case ECIS_NORMAL:
-						vtx.Normal.X = slots[k].Data[(idx*3)+0];
-						vtx.Normal.Y = slots[k].Data[(idx*3)+1];
-						vtx.Normal.Z = slots[k].Data[(idx*3)+2];
+						vtx.Normal.X = Inputs[k].Data[idx+0];
+						if (FlipAxis)
+						{
+							vtx.Normal.Z = Inputs[k].Data[idx+1];
+							vtx.Normal.Y = Inputs[k].Data[idx+2];
+						}
+						else
+						{
+							vtx.Normal.Y = Inputs[k].Data[idx+1];
+							vtx.Normal.Z = Inputs[k].Data[idx+2];
+						}
 						break;
 					case ECIS_TEXCOORD:
 					case ECIS_UV:
 						if (k==secondTexCoordSetIndex)
 						{
-							vtx.TCoords2.X = slots[k].Data[(idx*2)+0];
-							vtx.TCoords2.Y = slots[k].Data[(idx*2)+1];
+							vtx.TCoords2.X = Inputs[k].Data[idx+0];
+							vtx.TCoords2.Y = 1-Inputs[k].Data[idx+1];
 						}
 						else
 						{
-							vtx.TCoords.X = slots[k].Data[(idx*2)+0];
-							vtx.TCoords.Y = slots[k].Data[(idx*2)+1];
+							vtx.TCoords.X = Inputs[k].Data[idx+0];
+							vtx.TCoords.Y = 1-Inputs[k].Data[idx+1];
 						}
 						break;
 					case ECIS_TANGENT:
@@ -1291,10 +2261,29 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
 		} // end for all polygons
 	}
 
+	const SColladaMaterial* m = findMaterial(materialName);
+	if (m)
+	{
+		buffer->getMaterial() = m->Mat;
+		SMesh tmpmesh;
+		tmpmesh.addMeshBuffer(buffer);
+		SceneManager->getMeshManipulator()->setVertexColors(&tmpmesh,m->Mat.DiffuseColor);
+		if (m->Transparency != 1.0f)
+			SceneManager->getMeshManipulator()->setVertexColorAlpha(&tmpmesh,core::floor32(m->Transparency*255.0f));
+	}
+	// add future bind reference for the material
+	core::stringc meshbufferReference = geometryId+"/"+materialName;
+	if (!MaterialsToBind.find(meshbufferReference))
+	{
+		MaterialsToBind[meshbufferReference] = MeshesToBind.size();
+		MeshesToBind.push_back(core::array<irr::scene::IMeshBuffer*>());
+	}
+	MeshesToBind[MaterialsToBind[meshbufferReference]].push_back(buffer);
+
 	// calculate normals if there is no slot for it
 
 	if (!normalSlotCount)
-		SceneManager->getMeshManipulator()->recalculateNormals(buffer);
+		SceneManager->getMeshManipulator()->recalculateNormals(buffer, true);
 
 	// recalculate bounding box
 	buffer->recalculateBoundingBox();
@@ -1313,15 +2302,68 @@ void CColladaFileLoader::readLightPrefab(io::IXMLReaderUTF8* reader)
 	os::Printer::log("COLLADA reading light prefab");
 	#endif
 
-	CLightPrefab* prefab = new CLightPrefab(reader->getAttributeValue("id"));
+	CLightPrefab* prefab = new CLightPrefab(readId(reader));
 
 	if (!reader->isEmptyElement())
 	{
-		readColladaParameters(reader, lightPrefabName);
+		if (Version >= 10400) // start with 1.4
+		{
+			while(reader->read())
+			{
+				if (reader->getNodeType() == io::EXN_ELEMENT)
+				{
+					if (pointSectionName == reader->getNodeName())
+						prefab->LightData.Type=video::ELT_POINT;
+					else
+					if (directionalSectionName == reader->getNodeName())
+						prefab->LightData.Type=video::ELT_DIRECTIONAL;
+					else
+					if (spotSectionName == reader->getNodeName())
+						prefab->LightData.Type=video::ELT_SPOT;
+					else
+					if (ambientSectionName == reader->getNodeName())
+						prefab->LightData.Type=video::ELT_POINT; // TODO: This needs some change
+					else
+					if (colorNodeName == reader->getNodeName())
+						prefab->LightData.DiffuseColor=readColorNode(reader);
+					else
+					if (constantAttenuationNodeName == reader->getNodeName())
+						readFloatsInsideElement(reader,&prefab->LightData.Attenuation.X,1);
+					else
+					if (linearAttenuationNodeName == reader->getNodeName())
+						readFloatsInsideElement(reader,&prefab->LightData.Attenuation.Y,1);
+					else
+					if (quadraticAttenuationNodeName == reader->getNodeName())
+						readFloatsInsideElement(reader,&prefab->LightData.Attenuation.Z,1);
+					else
+					if (falloffAngleNodeName == reader->getNodeName())
+					{
+						readFloatsInsideElement(reader,&prefab->LightData.OuterCone,1);
+						prefab->LightData.OuterCone *= core::DEGTORAD;
+					}
+					else
+					if (falloffExponentNodeName == reader->getNodeName())
+						readFloatsInsideElement(reader,&prefab->LightData.Falloff,1);
+				}
+				else
+				if (reader->getNodeType() == io::EXN_ELEMENT_END)
+				{
+					if ((pointSectionName == reader->getNodeName()) ||
+						(directionalSectionName == reader->getNodeName()) ||
+						(spotSectionName == reader->getNodeName()) ||
+						(ambientSectionName == reader->getNodeName()))
+						break;
+				}
+			}
+		}
+		else
+		{
+			readColladaParameters(reader, lightPrefabName);
 
-		SColladaParam* p = getColladaParameter(ECPN_COLOR);
-		if (p && p->Type == ECPT_FLOAT3)
-			prefab->LightData.DiffuseColor.set(p->Floats[0], p->Floats[1], p->Floats[2]);
+			SColladaParam* p = getColladaParameter(ECPN_COLOR);
+			if (p && p->Type == ECPT_FLOAT3)
+				prefab->LightData.DiffuseColor.set(p->Floats[0], p->Floats[1], p->Floats[2]);
+		}
 	}
 
 	Prefabs.push_back(prefab);
@@ -1331,9 +2373,9 @@ void CColladaFileLoader::readLightPrefab(io::IXMLReaderUTF8* reader)
 //! returns a collada parameter or none if not found
 SColladaParam* CColladaFileLoader::getColladaParameter(ECOLLADA_PARAM_NAME name)
 {
-	for (u32 i=0; i<Parameters.size(); ++i)
-		if (Parameters[i].Name == name)
-			return &Parameters[i];
+	for (u32 i=0; i<ColladaParameters.size(); ++i)
+		if (ColladaParameters[i].Name == name)
+			return &ColladaParameters[i];
 
 	return 0;
 }
@@ -1358,14 +2400,21 @@ void CColladaFileLoader::readColladaInput(io::IXMLReaderUTF8* reader)
 	// get type
 	core::stringc semanticName = reader->getAttributeValue("semantic");
 	for (u32 i=0; inputSemanticNames[i]; ++i)
+	{
 		if (semanticName == inputSemanticNames[i])
 		{
 			p.Semantic = (ECOLLADA_INPUT_SEMANTIC)i;
 			break;
 		}
+	}
 
 	// get source
 	p.Source = reader->getAttributeValue("source");
+	if (reader->getAttributeValue("offset")) // Collada 1.4+
+		p.Offset = (u32)reader->getAttributeValueAsInt("offset");
+	else // Collada 1.2/1.3
+		p.Offset = (u32)reader->getAttributeValueAsInt("idx");
+	p.Set = (u32)reader->getAttributeValueAsInt("set");
 
 	// add input
 	Inputs.push_back(p);
@@ -1397,7 +2446,7 @@ void CColladaFileLoader::readColladaInputs(io::IXMLReaderUTF8* reader, const cor
 void CColladaFileLoader::readColladaParameters(io::IXMLReaderUTF8* reader,
 		const core::stringc& parentName)
 {
-	Parameters.clear();
+	ColladaParameters.clear();
 
 	const char* const paramNames[] = {"COLOR", "AMBIENT", "DIFFUSE",
 		"SPECULAR", "SHININESS", "YFOV", "ZNEAR", "ZFAR", 0};
@@ -1448,7 +2497,7 @@ void CColladaFileLoader::readColladaParameters(io::IXMLReaderUTF8* reader,
 			}
 
 			// add param
-			Parameters.push_back(p);
+			ColladaParameters.push_back(p);
 		}
 		else
 		if (reader->getNodeType() == io::EXN_ELEMENT_END)
@@ -1470,6 +2519,7 @@ inline f32 CColladaFileLoader::readFloat(const c8** p)
 	return ftmp;
 }
 
+
 //! parses an int from a char pointer and moves the pointer to
 //! the end of the parsed float
 inline s32 CColladaFileLoader::readInt(const c8** p)
@@ -1477,6 +2527,7 @@ inline s32 CColladaFileLoader::readInt(const c8** p)
 	return (s32)readFloat(p);
 }
 
+
 //! places pointer to next begin of a token
 void CColladaFileLoader::findNextNoneWhiteSpace(const c8** start)
 {
@@ -1506,6 +2557,7 @@ void CColladaFileLoader::readFloatsInsideElement(io::IXMLReaderUTF8* reader, f32
 		{
 			// parse float data
 			core::stringc data = reader->getNodeData();
+			data.trim();
 			const c8* p = &data[0];
 
 			for (u32 i=0; i<count; ++i)
@@ -1524,6 +2576,71 @@ void CColladaFileLoader::readFloatsInsideElement(io::IXMLReaderUTF8* reader, f32
 }
 
 
+//! reads ints from inside of xml element until end of xml element
+void CColladaFileLoader::readIntsInsideElement(io::IXMLReaderUTF8* reader, s32* ints, u32 count)
+{
+	if (reader->isEmptyElement())
+		return;
+
+	while(reader->read())
+	{
+		// TODO: check for comments inside the element
+		// and ignore them.
+
+		if (reader->getNodeType() == io::EXN_TEXT)
+		{
+			// parse float data
+			core::stringc data = reader->getNodeData();
+			data.trim();
+			const c8* p = &data[0];
+
+			for (u32 i=0; i<count; ++i)
+			{
+				findNextNoneWhiteSpace(&p);
+				if (*p)
+					ints[i] = readInt(&p);
+				else
+					ints[i] = 0;
+			}
+		}
+		else
+		if (reader->getNodeType() == io::EXN_ELEMENT_END)
+			break; // end parsing text
+	}
+}
+
+
+video::SColorf CColladaFileLoader::readColorNode(io::IXMLReaderUTF8* reader)
+{
+	if (reader->getNodeType() == io::EXN_ELEMENT &&
+		colorNodeName == reader->getNodeName())
+	{
+		f32 color[4];
+		readFloatsInsideElement(reader,color,4);
+		return video::SColorf(color[0], color[1], color[2], color[3]);
+	}
+
+	return video::SColorf();
+}
+
+
+f32 CColladaFileLoader::readFloatNode(io::IXMLReaderUTF8* reader)
+{
+	#ifdef COLLADA_READER_DEBUG
+	os::Printer::log("COLLADA reading <float>");
+	#endif
+
+	f32 result = 0.0f;
+	if (reader->getNodeType() == io::EXN_ELEMENT &&
+		floatNodeName == reader->getNodeName())
+	{
+		readFloatsInsideElement(reader,&result,1);
+	}
+
+	return result;
+}
+
+
 //! clears all loaded data
 void CColladaFileLoader::clearData()
 {
@@ -1535,7 +2652,7 @@ void CColladaFileLoader::clearData()
 	Prefabs.clear();
 
 	// clear all parameters
-	Parameters.clear();
+	ColladaParameters.clear();
 
 	// clear all materials
 	Images.clear();
@@ -1548,8 +2665,16 @@ void CColladaFileLoader::clearData()
 
 	// clear all inputs
 	Inputs.clear();
+
+	// clear all effects
+	Effects.clear();
+
+	// clear all the materials to bind
+	MaterialsToBind.clear();
+	MeshesToBind.clear();
 }
 
+
 //! changes the XML URI into an internal id
 void CColladaFileLoader::uriToId(core::stringc& str)
 {
@@ -1563,9 +2688,169 @@ void CColladaFileLoader::uriToId(core::stringc& str)
 }
 
 
+//! read Collada Id, uses id or name if id is missing
+core::stringc CColladaFileLoader::readId(io::IXMLReaderUTF8* reader)
+{
+	core::stringc id = reader->getAttributeValue("id");
+	if (id.size()==0)
+		id = reader->getAttributeValue("name");
+	return id;
+}
+
+
+//! create an Irrlicht texture from the reference
+video::ITexture* CColladaFileLoader::getTextureFromImage(core::stringc uri)
+{
+	#ifdef COLLADA_READER_DEBUG
+	os::Printer::log("COLLADA searching texture", uri.c_str());
+	#endif
+	video::IVideoDriver* driver = SceneManager->getVideoDriver();
+	for (;;)
+	{
+		uriToId(uri);
+		for (u32 i=0; i<Images.size(); ++i)
+		{
+			if (uri == Images[i].Id)
+			{
+				if (Images[i].Source.size() && Images[i].SourceIsFilename)
+				{
+					if (FileSystem->existFile(Images[i].Source.c_str()))
+						return driver->getTexture(Images[i].Source.c_str());
+					return driver->getTexture((FileSystem->getFileDir(CurrentlyLoadingMesh)+"/"+Images[i].Source).c_str());
+				}
+				else
+				if (Images[i].Source.size())
+				{
+					//const u32 size = Images[i].Dimension.getArea();
+					const u32 size = Images[i].Dimension.Width * Images[i].Dimension.Height;;
+					u32* data = new u32[size]; // we assume RGBA
+					u32* ptrdest = data;
+					const c8* ptrsrc = Images[i].Source.c_str();
+					for (u32 j=0; j<size; ++j)
+					{
+						sscanf(ptrsrc, "%x", ptrdest);
+						++ptrdest;
+						ptrsrc += 4;
+					}
+					video::IImage* img = driver->createImageFromData(video::ECF_A8R8G8B8, Images[i].Dimension, data, true, true);
+					video::ITexture* tex = driver->addTexture((CurrentlyLoadingMesh+"#"+Images[i].Id).c_str(), img);
+					img->drop();
+					return tex;
+				}
+				break;
+			}
+		}
+		if (Parameters.getAttributeType(uri.c_str())==io::EAT_STRING)
+		{
+			uri = Parameters.getAttributeAsString(uri.c_str());
+#ifdef COLLADA_READER_DEBUG
+			os::Printer::log("COLLADA now searching texture", uri.c_str());
+#endif
+		}
+		else
+			break;
+	}
+	return 0;
+}
+
+
+//! read a parameter and value
+void CColladaFileLoader::readParameter(io::IXMLReaderUTF8* reader)
+{
+	#ifdef COLLADA_READER_DEBUG
+	os::Printer::log("COLLADA reading parameter");
+	#endif
+
+	const core::stringc name = reader->getAttributeValue("sid");
+	if (!reader->isEmptyElement())
+	{
+		while(reader->read())
+		{
+			if (reader->getNodeType() == io::EXN_ELEMENT)
+			{
+				if (floatNodeName == reader->getNodeName())
+				{
+					const f32 f = readFloatNode(reader);
+					Parameters.addFloat(name.c_str(), f);
+				}
+				else
+				if (float2NodeName == reader->getNodeName())
+				{
+					f32 f[2];
+					readFloatsInsideElement(reader, f, 2);
+//						Parameters.addVector2d(name.c_str(), core::vector2df(f[0],f[1]));
+				}
+				else
+				if (float3NodeName == reader->getNodeName())
+				{
+					f32 f[3];
+					readFloatsInsideElement(reader, f, 3);
+					Parameters.addVector3d(name.c_str(), core::vector3df(f[0],f[1],f[2]));
+				}
+				else
+				if ((initFromName == reader->getNodeName()) ||
+					(sourceSectionName == reader->getNodeName()))
+				{
+					reader->read();
+					Parameters.addString(name.c_str(), reader->getNodeData());
+				}
+				else
+				if (wrapsName == reader->getNodeName())
+				{
+					reader->read();
+					const core::stringc val = reader->getNodeData();
+					if (val == "WRAP")
+						Parameters.addBool("wrap_s", true);
+				}
+				else
+				if (wraptName == reader->getNodeName())
+				{
+					reader->read();
+					const core::stringc val = reader->getNodeData();
+					if (val == "WRAP")
+						Parameters.addBool("wrap_t", true);
+				}
+				else
+				if (minfilterName == reader->getNodeName())
+				{
+					reader->read();
+					const core::stringc val = reader->getNodeData();
+					if (val == "LINEAR_MIPMAP_LINEAR")
+						Parameters.addBool("trilinear", true);
+					else
+					if (val == "LINEAR_MIPMAP_NEAREST")
+						Parameters.addBool("bilinear", true);
+				}
+				else
+				if (magfilterName == reader->getNodeName())
+				{
+					reader->read();
+					const core::stringc val = reader->getNodeData();
+					if (val != "LINEAR")
+					{
+						Parameters.addBool("bilinear", false);
+						Parameters.addBool("trilinear", false);
+					}
+				}
+				else
+				if (mipfilterName == reader->getNodeName())
+				{
+					Parameters.addBool("anisotropic", true);
+				}
+			}
+			else
+			if(reader->getNodeType() == io::EXN_ELEMENT_END)
+			{
+				if (newParamName == reader->getNodeName())
+					break;
+			}
+		}
+	}
+}
 
 
 } // end namespace scene
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_COLLADA_LOADER_
+
diff --git a/src/dep/src/irrlicht/CColladaFileLoader.h b/src/dep/src/irrlicht/CColladaFileLoader.h
index facd3f9..2c3270d 100644
--- a/src/dep/src/irrlicht/CColladaFileLoader.h
+++ b/src/dep/src/irrlicht/CColladaFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -12,6 +12,8 @@
 #include "SMesh.h"
 #include "SMeshBuffer.h"
 #include "ISceneManager.h"
+#include "irrMap.h"
+#include "CAttributes.h"
 
 namespace irr
 {
@@ -82,19 +84,25 @@ enum ECOLLADA_INPUT_SEMANTIC
 struct SColladaInput
 {
 	SColladaInput()
-		: Semantic(ECIS_COUNT)
+		: Semantic(ECIS_COUNT), Data(0), Offset(0), Set(0), Stride(1)
 	{
 	}
 
 	ECOLLADA_INPUT_SEMANTIC Semantic;
 	core::stringc Source;
+	f32* Data;
+	u32 Offset;
+	u32 Set;
+	u32 Stride;
 };
 
 //! Collada images
 struct SColladaImage
 {
-	core::stringc Filename;
 	core::stringc Id;
+	core::stringc Source;
+	core::dimension2di Dimension;
+	bool SourceIsFilename;
 };
 
 
@@ -111,10 +119,30 @@ struct SColladaMaterial
 {
 	video::SMaterial Mat;
 	core::stringc Id;
+	core::stringc InstanceEffectId;
+	f32 Transparency;
+	
+	inline bool operator< (const SColladaMaterial & other) const
+	{
+		return Id < other.Id;
+	}
+};
+
+//! Collada effect (materials, shaders, and programs)
+struct SColladaEffect
+{
+	video::SMaterial Mat;
+	core::stringc Id;
+	f32 Transparency;
+	
+	inline bool operator< (const SColladaEffect & other) const
+	{
+		return Id < other.Id;
+	}
 };
 
 
-struct SNumberArray // for stroring float and int arrays
+struct SNumberArray // for storing float and int arrays
 {
 	core::stringc Name;
 	core::array<f32> Data;
@@ -141,6 +169,7 @@ struct SSource
 	core::array<SAccessor> Accessors;
 };
 
+class CScenePrefab;
 
 //! Meshloader capable of loading COLLADA meshes and scene descriptions into Irrlicht.
 class CColladaFileLoader : public IMeshLoader
@@ -148,8 +177,7 @@ class CColladaFileLoader : public IMeshLoader
 public:
 
 	//! Constructor
-	CColladaFileLoader(video::IVideoDriver* driver,
-		scene::ISceneManager* smgr, io::IFileSystem* fs);
+	CColladaFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs);
 
 	//! destructor
 	virtual ~CColladaFileLoader();
@@ -175,6 +203,9 @@ private:
 	//! reads a <library> section and its content
 	void readLibrarySection(io::IXMLReaderUTF8* reader);
 
+	//! reads a <visual_scene> element and stores it as a prefab
+	void readVisualSceneLibrary(io::IXMLReaderUTF8* reader);
+
 	//! reads a <scene> section and its content
 	void readSceneSection(io::IXMLReaderUTF8* reader);
 
@@ -182,7 +213,8 @@ private:
 	void readAssetSection(io::IXMLReaderUTF8* reader);
 
 	//! reads a <node> section and its content
-	void readNodeSection(io::IXMLReaderUTF8* reader, scene::ISceneNode* parent);
+	//! if a prefab pointer is passed the nodes are created as scene prefabs childs of that prefab
+	void readNodeSection(io::IXMLReaderUTF8* reader, scene::ISceneNode* parent, CScenePrefab* p=0);
 
 	//! reads a <lookat> element and its content and creates a matrix from it
 	core::matrix4 readLookAtNode(io::IXMLReaderUTF8* reader);
@@ -199,15 +231,28 @@ private:
 	//! reads a <skew> element and its content and creates a matrix from it
 	core::matrix4 readSkewNode(io::IXMLReaderUTF8* reader);
 
+	//! reads a <boundingbox> element and its content and stores it in bbox
+	void readBboxNode(io::IXMLReaderUTF8* reader, core::aabbox3df& bbox);
+
 	//! reads a <scale> element and its content and creates a matrix from it
 	core::matrix4 readScaleNode(io::IXMLReaderUTF8* reader);
 
 	//! reads a <translate> element and its content and creates a matrix from it
 	core::matrix4 readTranslateNode(io::IXMLReaderUTF8* reader);
 
-	//! reads a <instance> node and creates a scene node from it
+	//! reads a <color> element
+	video::SColorf readColorNode(io::IXMLReaderUTF8* reader);
+
+	//! reads a <float> element
+	f32 readFloatNode(io::IXMLReaderUTF8* reader);
+
+	//! reads a <instance> node
 	void readInstanceNode(io::IXMLReaderUTF8* reader, scene::ISceneNode* parent,
-		scene::ISceneNode** outNode);
+		scene::ISceneNode** outNode, CScenePrefab* p=0);
+
+	//! creates a scene node from Prefabs (with name given in 'url')
+	void instantiateNode(scene::ISceneNode* parent, scene::ISceneNode** outNode=0,
+			CScenePrefab* p=0, const core::stringc& url="");
 
 	//! reads a <light> element and stores it as prefab
 	void readLightPrefab(io::IXMLReaderUTF8* reader);
@@ -224,6 +269,9 @@ private:
 	//! reads a <material> element and stores it in the material section
 	void readMaterial(io::IXMLReaderUTF8* reader);
 
+	//! reads a <effect> element and stores it in the effects section
+	void readEffect(io::IXMLReaderUTF8* reader, SColladaEffect * effect = 0);
+
 	//! reads a <geometry> element and stores it as mesh if possible
 	void readGeometry(io::IXMLReaderUTF8* reader);
 
@@ -241,6 +289,9 @@ private:
 	//! reads floats from inside of xml element until end of xml element
 	void readFloatsInsideElement(io::IXMLReaderUTF8* reader, f32* floats, u32 count);
 
+	//! reads ints from inside of xml element until end of xml element
+	void readIntsInsideElement(io::IXMLReaderUTF8* reader, s32* ints, u32 count);
+
 	//! clears all loaded data
 	void clearData();
 
@@ -260,15 +311,29 @@ private:
 	//! returns a collada input or none if not found
 	SColladaInput* getColladaInput(ECOLLADA_INPUT_SEMANTIC input);
 
+	//! read Collada Id, uses id or name if id is missing
+	core::stringc readId(io::IXMLReaderUTF8* reader);
+
 	//! changes the XML URI into an internal id
 	void uriToId(core::stringc& str);
 
 	//! reads a polygons section and creates a mesh from it
 	void readPolygonSection(io::IXMLReaderUTF8* reader,
 		const core::stringc& vertexPositionSource, core::array<SSource>& sources,
-		scene::SMesh* mesh);
+		scene::SMesh* mesh, const core::stringc& geometryId);
+	
+	//! finds a material, possible instancing it
+	const SColladaMaterial * findMaterial(const core::stringc & materialName);
+	
+	//! reads and bind materials as given by the symbol->target bind mapping
+	void readBindMaterialSection(io::IXMLReaderUTF8* reader, const core::stringc & id);
+
+	//! create an Irrlicht texture from the SColladaImage
+	video::ITexture* getTextureFromImage(core::stringc uri);
+
+	//! read a parameter and value
+	void readParameter(io::IXMLReaderUTF8* reader);
 
-	video::IVideoDriver* Driver;
 	scene::ISceneManager* SceneManager;
 	io::IFileSystem* FileSystem;
 
@@ -278,13 +343,19 @@ private:
 	scene::IAnimatedMesh* FirstLoadedMesh;
 	core::stringc FirstLoadedMeshName;
 	s32 LoadedMeshCount;
+	u32 Version;
+	bool FlipAxis;
 
 	core::array<IColladaPrefab*> Prefabs;
-	core::array<SColladaParam> Parameters;
+	core::array<SColladaParam> ColladaParameters;
 	core::array<SColladaImage> Images;
 	core::array<SColladaTexture> Textures;
 	core::array<SColladaMaterial> Materials;
 	core::array<SColladaInput> Inputs;
+	core::array<SColladaEffect> Effects;
+	core::map<core::stringc,u32> MaterialsToBind;
+	core::array< core::array<irr::scene::IMeshBuffer*> > MeshesToBind;
+	io::CAttributes Parameters;
 
 	bool CreateInstances;
 };
@@ -296,13 +367,12 @@ private:
 class IColladaPrefab : public virtual IReferenceCounted
 {
 public:
-
 	//! creates an instance of this prefab
 	virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
 		scene::ISceneManager* mgr) = 0;
 
 	//! returns id of this prefab
-	virtual const c8* getId() = 0;
+	virtual const core::stringc& getId() = 0;
 };
 
 
diff --git a/src/dep/src/irrlicht/CColladaMeshWriter.cpp b/src/dep/src/irrlicht/CColladaMeshWriter.cpp
index 53f140f..0e3ba00 100644
--- a/src/dep/src/irrlicht/CColladaMeshWriter.cpp
+++ b/src/dep/src/irrlicht/CColladaMeshWriter.cpp
@@ -1,3 +1,11 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "IrrCompileConfig.h"
+
+#ifdef _IRR_COMPILE_WITH_COLLADA_WRITER_
+
 #include "CColladaMeshWriter.h"
 #include "os.h"
 #include "IFileSystem.h"
@@ -16,6 +24,11 @@ CColladaMeshWriter::CColladaMeshWriter(video::IVideoDriver* driver,
 					io::IFileSystem* fs)
 	: FileSystem(fs), VideoDriver(driver), Writer(0)
 {
+
+	#ifdef _DEBUG
+	setDebugName("CColladaMeshWriter");
+	#endif
+
 	if (VideoDriver)
 		VideoDriver->grab();
 
@@ -62,8 +75,8 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	Writer->writeXMLHeader();
 
 	Writer->writeElement(L"COLLADA", false,
-		L"xmlns", L"http://www.collada.org/2005/COLLADASchema",
-		L"version", L"1.2.0");
+		L"xmlns", L"http://www.collada.org/2005/11/COLLADASchema",
+		L"version", L"1.4.1");
 	Writer->writeLineBreak();
 
 	// write asset data
@@ -71,23 +84,37 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	Writer->writeElement(L"asset", false);
 	Writer->writeLineBreak();
 
+	Writer->writeElement(L"contributor", false);
+	Writer->writeLineBreak();
+	Writer->writeElement(L"authoring_tool", false);
+	Writer->writeText(L"Irrlicht Engine / irrEdit");  // this code has originated from irrEdit 0.7
+	Writer->writeClosingTag(L"authoring_tool");
+	Writer->writeLineBreak();
+	Writer->writeClosingTag(L"contributor");
+	Writer->writeLineBreak();
+
+	// The next two are required
+	Writer->writeElement(L"created", false);
+	Writer->writeText(L"2008-01-31T00:00:00Z");
+	Writer->writeClosingTag(L"created");
+	Writer->writeLineBreak();
+
+	Writer->writeElement(L"modified", false);
+	Writer->writeText(L"2008-01-31T00:00:00Z");
+	Writer->writeClosingTag(L"modified");
+	Writer->writeLineBreak();
+
 	Writer->writeElement(L"revision", false);
 	Writer->writeText(L"1.0");
 	Writer->writeClosingTag(L"revision");
 	Writer->writeLineBreak();
 
-	Writer->writeElement(L"authoring_tool", false);
-	core::stringw strautoring = L"Irrlicht Engine / irrEdit";  // this code has originated from irrEdit 0.7
-	Writer->writeText(strautoring.c_str());
-	Writer->writeClosingTag(L"authoring_tool");
-	Writer->writeLineBreak();
-
 	Writer->writeClosingTag(L"asset");
 	Writer->writeLineBreak();
 
 	// write all materials
 
-	Writer->writeElement(L"library", false,	L"type", L"MATERIAL");
+	Writer->writeElement(L"library_materials", false);
 	Writer->writeLineBreak();
 
 	u32 i;
@@ -97,8 +124,40 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		strMat += i;
 
 		Writer->writeElement(L"material", false,
-			L"name", strMat.c_str(),
-			L"id", strMat.c_str());
+			L"id", strMat.c_str(),
+			L"name", strMat.c_str());
+		Writer->writeLineBreak();
+
+		strMat += L"-fx";
+		Writer->writeElement(L"instance_effect", true,
+			L"url", (core::stringw(L"#") + strMat).c_str());
+		Writer->writeLineBreak();
+
+		Writer->writeClosingTag(L"material");
+		Writer->writeLineBreak();
+	}
+
+	Writer->writeClosingTag(L"library_materials");
+	Writer->writeLineBreak();
+
+	Writer->writeElement(L"library_effects", false);
+	Writer->writeLineBreak();
+
+	for (i=0; i<mesh->getMeshBufferCount(); ++i)
+	{
+		core::stringw strMat = "mat";
+		strMat += i;
+		strMat += L"-fx";
+
+		Writer->writeElement(L"effect", false,
+			L"id", strMat.c_str(),
+			L"name", strMat.c_str());
+		Writer->writeLineBreak();
+		Writer->writeElement(L"profile_COMMON", false);
+		Writer->writeLineBreak();
+		Writer->writeElement(L"technique", false, L"sid", L"common");
+		Writer->writeLineBreak();
+		Writer->writeElement(L"blinn", false);
 		Writer->writeLineBreak();
 
 		// write all interesting material parameters as parameter
@@ -109,31 +168,109 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		u32 count = attributes->getAttributeCount();
 		for (u32 attridx=0; attridx<count; ++attridx)
 		{
-			core::stringw str = attributes->getAttributeName(attridx);
+			core::stringc str = attributes->getAttributeName(attridx);
+			if (str=="Emissive")
+			{
+				Writer->writeElement(L"emission", false);
+				Writer->writeLineBreak();
+				Writer->writeElement(L"color", false);
+				Writer->writeLineBreak();
 
-			Writer->writeElement(L"param", false,
-				L"name", str.c_str(),
-				L"type", attributes->getAttributeTypeString(attridx) );
+				str = attributes->getAttributeAsString(attridx);
+				str.replace(',',' ');
+				Writer->writeText(core::stringw(str.c_str()).c_str());
 
-			str = attributes->getAttributeAsString(attridx).c_str();
-			Writer->writeText(str.c_str());
+				Writer->writeClosingTag(L"color");
+				Writer->writeLineBreak();
+				Writer->writeClosingTag(L"emission");
+				Writer->writeLineBreak();
+			}
+			else
+			if (str=="Ambient")
+			{
+				Writer->writeElement(L"ambient", false);
+				Writer->writeLineBreak();
+				Writer->writeElement(L"color", false);
+				Writer->writeLineBreak();
 
-			Writer->writeClosingTag(L"param");
-			Writer->writeLineBreak();
+				str = attributes->getAttributeAsString(attridx);
+				str.replace(',',' ');
+				Writer->writeText(core::stringw(str.c_str()).c_str());
+
+				Writer->writeClosingTag(L"color");
+				Writer->writeLineBreak();
+				Writer->writeClosingTag(L"ambient");
+				Writer->writeLineBreak();
+			}
+			else
+			if (str=="Diffuse")
+			{
+				Writer->writeElement(L"diffuse", false);
+				Writer->writeLineBreak();
+				Writer->writeElement(L"color", false);
+				Writer->writeLineBreak();
+
+				str = attributes->getAttributeAsString(attridx);
+				str.replace(',',' ');
+				Writer->writeText(core::stringw(str.c_str()).c_str());
+
+				Writer->writeClosingTag(L"color");
+				Writer->writeLineBreak();
+				Writer->writeClosingTag(L"diffuse");
+				Writer->writeLineBreak();
+			}
+			else
+			if (str=="Specular")
+			{
+				Writer->writeElement(L"specular", false);
+				Writer->writeLineBreak();
+				Writer->writeElement(L"color", false);
+				Writer->writeLineBreak();
+
+				str = attributes->getAttributeAsString(attridx);
+				str.replace(',',' ');
+				Writer->writeText(core::stringw(str.c_str()).c_str());
+
+				Writer->writeClosingTag(L"color");
+				Writer->writeLineBreak();
+				Writer->writeClosingTag(L"specular");
+				Writer->writeLineBreak();
+			}
+			else
+			if (str=="Shininess")
+			{
+				Writer->writeElement(L"shininess", false);
+				Writer->writeLineBreak();
+				Writer->writeElement(L"float", false);
+				Writer->writeLineBreak();
+
+				Writer->writeText(core::stringw(attributes->getAttributeAsString(attridx).c_str()).c_str());
+
+				Writer->writeClosingTag(L"float");
+				Writer->writeLineBreak();
+				Writer->writeClosingTag(L"shininess");
+				Writer->writeLineBreak();
+			}
 		}
 
 		attributes->drop();
 
-		Writer->writeClosingTag(L"material");
+		Writer->writeClosingTag(L"blinn");
+		Writer->writeLineBreak();
+		Writer->writeClosingTag(L"technique");
+		Writer->writeLineBreak();
+		Writer->writeClosingTag(L"profile_COMMON");
+		Writer->writeLineBreak();
+		Writer->writeClosingTag(L"effect");
 		Writer->writeLineBreak();
 	}
 
-	Writer->writeClosingTag(L"library");
+	Writer->writeClosingTag(L"library_effects");
 	Writer->writeLineBreak();
 
 	// write mesh
 
-	Writer->writeElement(L"library", false,	L"type", L"GEOMETRY");
+	Writer->writeElement(L"library_geometries", false);
 	Writer->writeLineBreak();
 
 	Writer->writeElement(L"geometry", false, L"id", L"mesh", L"name", L"mesh");
@@ -170,9 +307,9 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	Writer->writeElement(L"source", false, L"id", L"mesh-Pos");
 	Writer->writeLineBreak();
 
-	core::stringw vertexCountStr = (totalVertexCount*3);
-	Writer->writeElement(L"array", false, L"id", L"mesh-Pos-array",
-							L"type", L"float", L"count", vertexCountStr.c_str());
+	core::stringw vertexCountStr(totalVertexCount*3);
+	Writer->writeElement(L"float_array", false, L"id", L"mesh-Pos-array",
+				L"count", vertexCountStr.c_str());
 	Writer->writeLineBreak();
 
 	for (i=0; i<mesh->getMeshBufferCount(); ++i)
@@ -244,30 +381,30 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		}
 	}
 
-	Writer->writeClosingTag(L"array");
+	Writer->writeClosingTag(L"float_array");
 	Writer->writeLineBreak();
 
-		Writer->writeElement(L"technique", false, L"profile", L"COMMON");
+	Writer->writeElement(L"technique_common", false);
+	Writer->writeLineBreak();
+
+	vertexCountStr = core::stringw(totalVertexCount);
+
+		Writer->writeElement(L"accessor", false, L"source", L"#mesh-Pos-array",
+					L"count", vertexCountStr.c_str(), L"stride", L"3");
 		Writer->writeLineBreak();
 
-		vertexCountStr = totalVertexCount;
-
-			Writer->writeElement(L"accessor", false, L"source", L"#mesh-Pos-array",
-					L"count", vertexCountStr.c_str(), L"stride", L"3");
+			Writer->writeElement(L"param", true, L"name", L"X", L"type", L"float");
 			Writer->writeLineBreak();
-
-			Writer->writeElement(L"param", true, L"name", L"X", L"type", L"float", L"flow", L"OUT");
+			Writer->writeElement(L"param", true, L"name", L"Y", L"type", L"float");
 			Writer->writeLineBreak();
-			Writer->writeElement(L"param", true, L"name", L"Y", L"type", L"float", L"flow", L"OUT");
-			Writer->writeLineBreak();
-			Writer->writeElement(L"param", true, L"name", L"Z", L"type", L"float", L"flow", L"OUT");
+			Writer->writeElement(L"param", true, L"name", L"Z", L"type", L"float");
 			Writer->writeLineBreak();
 
 			Writer->writeClosingTag(L"accessor");
 			Writer->writeLineBreak();
 
-		Writer->writeClosingTag(L"technique");
-		Writer->writeLineBreak();
+	Writer->writeClosingTag(L"technique_common");
+	Writer->writeLineBreak();
 
 	Writer->writeClosingTag(L"source");
 	Writer->writeLineBreak();
@@ -277,9 +414,9 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	Writer->writeElement(L"source", false, L"id", L"mesh-TexCoord0");
 	Writer->writeLineBreak();
 
-	vertexCountStr = (totalVertexCount*2);
-	Writer->writeElement(L"array", false, L"id", L"mesh-TexCoord0-array",
-							L"type", L"float", L"count", vertexCountStr.c_str());
+	vertexCountStr = core::stringw(totalVertexCount*2);
+	Writer->writeElement(L"float_array", false, L"id", L"mesh-TexCoord0-array",
+				L"count", vertexCountStr.c_str());
 	Writer->writeLineBreak();
 
 	for (i=0; i<mesh->getMeshBufferCount(); ++i)
@@ -345,29 +482,29 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		}
 	}
 
-	Writer->writeClosingTag(L"array");
+	Writer->writeClosingTag(L"float_array");
 	Writer->writeLineBreak();
 
-		Writer->writeElement(L"technique", false, L"profile", L"COMMON");
-		Writer->writeLineBreak();
+	Writer->writeElement(L"technique_common", false);
+	Writer->writeLineBreak();
 
-		vertexCountStr = totalVertexCount;
+	vertexCountStr = core::stringw(totalVertexCount);
 
-			Writer->writeElement(L"accessor", false, L"source", L"#mesh-TexCoord0-array",
+		Writer->writeElement(L"accessor", false, L"source", L"#mesh-TexCoord0-array",
 					L"count", vertexCountStr.c_str(), L"stride", L"2");
-			Writer->writeLineBreak();
+		Writer->writeLineBreak();
 
 			Writer->writeElement(L"param", true, L"name", L"U", L"type", L"float", L"flow", L"OUT");
 			Writer->writeLineBreak();
 			Writer->writeElement(L"param", true, L"name", L"V", L"type", L"float", L"flow", L"OUT");
 			Writer->writeLineBreak();
 
-			Writer->writeClosingTag(L"accessor");
-			Writer->writeLineBreak();
-
-		Writer->writeClosingTag(L"technique");
+		Writer->writeClosingTag(L"accessor");
 		Writer->writeLineBreak();
 
+	Writer->writeClosingTag(L"technique_common");
+	Writer->writeLineBreak();
+
 	Writer->writeClosingTag(L"source");
 	Writer->writeLineBreak();
 
@@ -376,9 +513,9 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	Writer->writeElement(L"source", false, L"id", L"mesh-Normal");
 	Writer->writeLineBreak();
 
-	vertexCountStr = (totalVertexCount*3);
-	Writer->writeElement(L"array", false, L"id", L"mesh-Normal-array",
-			L"type", L"float", L"count", vertexCountStr.c_str());
+	vertexCountStr = core::stringw(totalVertexCount*3);
+	Writer->writeElement(L"float_array", false, L"id", L"mesh-Normal-array",
+				L"count", vertexCountStr.c_str());
 	Writer->writeLineBreak();
 
 	for (i=0; i<mesh->getMeshBufferCount(); ++i)
@@ -450,13 +587,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		}
 	}
 
-	Writer->writeClosingTag(L"array");
+	Writer->writeClosingTag(L"float_array");
 	Writer->writeLineBreak();
 
-		Writer->writeElement(L"technique", false, L"profile", L"COMMON");
-		Writer->writeLineBreak();
+	Writer->writeElement(L"technique_common", false);
+	Writer->writeLineBreak();
 
-		vertexCountStr = totalVertexCount;
+	vertexCountStr = core::stringw(totalVertexCount);
 
 		Writer->writeElement(L"accessor", false, L"source", L"#mesh-Normal-array",
 								L"count", vertexCountStr.c_str(), L"stride", L"3");
@@ -472,8 +609,8 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		Writer->writeClosingTag(L"accessor");
 		Writer->writeLineBreak();
 
-		Writer->writeClosingTag(L"technique");
-		Writer->writeLineBreak();
+	Writer->writeClosingTag(L"technique_common");
+	Writer->writeLineBreak();
 
 	Writer->writeClosingTag(L"source");
 	Writer->writeLineBreak();
@@ -485,9 +622,9 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		Writer->writeElement(L"source", false, L"id", L"mesh-TexCoord1");
 		Writer->writeLineBreak();
 
-		vertexCountStr = (totalTCoords2Count*2);
-		Writer->writeElement(L"array", false, L"id", L"mesh-TexCoord1-array",
-								L"type", L"float", L"count", vertexCountStr.c_str());
+		vertexCountStr = core::stringw(totalTCoords2Count*2);
+		Writer->writeElement(L"float_array", false, L"id", L"mesh-TexCoord1-array",
+								L"count", vertexCountStr.c_str());
 		Writer->writeLineBreak();
 
 		for (i=0; i<mesh->getMeshBufferCount(); ++i)
@@ -528,13 +665,13 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 			} // end this buffer has 2 texture coordinates
 		}
 
-		Writer->writeClosingTag(L"array");
+		Writer->writeClosingTag(L"float_array");
 		Writer->writeLineBreak();
 
-			Writer->writeElement(L"technique", false, L"profile", L"COMMON");
-			Writer->writeLineBreak();
+		Writer->writeElement(L"technique_common", false);
+		Writer->writeLineBreak();
 
-			vertexCountStr = totalTCoords2Count;
+		vertexCountStr = core::stringw(totalTCoords2Count);
 
 			Writer->writeElement(L"accessor", false, L"source", L"#mesh-TexCoord1-array",
 									L"count", vertexCountStr.c_str(), L"stride", L"2");
@@ -548,8 +685,8 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 			Writer->writeClosingTag(L"accessor");
 			Writer->writeLineBreak();
 
-			Writer->writeClosingTag(L"technique");
-			Writer->writeLineBreak();
+		Writer->writeClosingTag(L"technique_common");
+		Writer->writeLineBreak();
 
 		Writer->writeClosingTag(L"source");
 		Writer->writeLineBreak();
@@ -576,12 +713,12 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	{
 		scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
 
-		u32 polyCount = buffer->getIndexCount() / 3;
-		core::stringw strPolyCount = polyCount;
+		const u32 polyCount = buffer->getIndexCount() / 3;
+		core::stringw strPolyCount(polyCount);
 		core::stringw strMat = "#mat";
 		strMat += i;
 
-		Writer->writeElement(L"polygons", false, L"count", strPolyCount.c_str(),
+		Writer->writeElement(L"triangles", false, L"count", strPolyCount.c_str(),
 								L"material", strMat.c_str());
 		Writer->writeLineBreak();
 
@@ -606,10 +743,10 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 		s32 normalIdx = globalIndices[i].NormalStartIndex;
 		s32 tCoord2Idx = globalIndices[i].TCoord1StartIndex;
 
+		Writer->writeElement(L"p", false);
+
 		for (u32 p=0; p<polyCount; ++p)
 		{
-			Writer->writeElement(L"p", false);
-
 			core::stringw strP;
 
 			strP += buffer->getIndices()[(p*3) + 0] + posIdx;
@@ -646,16 +783,17 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 				strP += " ";
 				strP += buffer->getIndices()[(p*3) + 2] + tCoord2Idx;
 			}
+			strP += " ";
 
 			Writer->writeText(strP.c_str());
-
-			Writer->writeClosingTag(L"p");
-			Writer->writeLineBreak();
 		}
 
+		Writer->writeClosingTag(L"p");
+		Writer->writeLineBreak();
+
 		// close index buffer section
 
-		Writer->writeClosingTag(L"polygons");
+		Writer->writeClosingTag(L"triangles");
 		Writer->writeLineBreak();
 	}
 
@@ -666,7 +804,7 @@ bool CColladaMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32
 	Writer->writeClosingTag(L"geometry");
 	Writer->writeLineBreak();
 
-	Writer->writeClosingTag(L"library");
+	Writer->writeClosingTag(L"library_geometries");
 	Writer->writeLineBreak();
 
 	// close everything
@@ -688,3 +826,6 @@ bool CColladaMeshWriter::hasSecondTextureCoordinates(video::E_VERTEX_TYPE type)
 
 } // end namespace
 } // end namespace
+
+#endif
+
diff --git a/src/dep/src/irrlicht/CColladaMeshWriter.h b/src/dep/src/irrlicht/CColladaMeshWriter.h
index 79e1660..694c73e 100644
--- a/src/dep/src/irrlicht/CColladaMeshWriter.h
+++ b/src/dep/src/irrlicht/CColladaMeshWriter.h
@@ -1,3 +1,7 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
 #ifndef __IRR_C_COLLADA_MESH_WRITER_H_INCLUDED__
 #define __IRR_C_COLLADA_MESH_WRITER_H_INCLUDED__
 
diff --git a/src/dep/src/irrlicht/CColorConverter.cpp b/src/dep/src/irrlicht/CColorConverter.cpp
index e75b0cc..65e50dd 100644
--- a/src/dep/src/irrlicht/CColorConverter.cpp
+++ b/src/dep/src/irrlicht/CColorConverter.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CColorConverter.h b/src/dep/src/irrlicht/CColorConverter.h
index d3cbf3d..e7ef5f7 100644
--- a/src/dep/src/irrlicht/CColorConverter.h
+++ b/src/dep/src/irrlicht/CColorConverter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CCubeSceneNode.cpp b/src/dep/src/irrlicht/CCubeSceneNode.cpp
index 32bd0ba..65928b0 100644
--- a/src/dep/src/irrlicht/CCubeSceneNode.cpp
+++ b/src/dep/src/irrlicht/CCubeSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,6 +6,7 @@
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
 #include "S3DVertex.h"
+#include "SMeshBuffer.h"
 #include "os.h"
 
 namespace irr
@@ -30,7 +31,7 @@ namespace scene
 CCubeSceneNode::CCubeSceneNode(f32 size, ISceneNode* parent, ISceneManager* mgr,
 		s32 id, const core::vector3df& position,
 		const core::vector3df& rotation, const core::vector3df& scale)
-	: ISceneNode(parent, mgr, id, position, rotation, scale), Size(size)
+	: IMeshSceneNode(parent, mgr, id, position, rotation, scale), Size(size)
 {
 	#ifdef _DEBUG
 	setDebugName("CCubeSceneNode");
@@ -39,19 +40,17 @@ CCubeSceneNode::CCubeSceneNode(f32 size, ISceneNode* parent, ISceneManager* mgr,
 	const u16 u[36] = {   0,2,1,   0,3,2,   1,5,4,   1,2,5,   4,6,7,   4,5,6, 
             7,3,0,   7,6,3,   9,5,2,   9,8,5,   0,11,10,   0,10,7};
 
-	Buffer.Indices.set_used(36);
+	SMeshBuffer* buf = new SMeshBuffer();
+	Mesh.addMeshBuffer(buf);
+	buf->Indices.set_used(36);
 	for (u32 i=0; i<36; ++i)
-		Buffer.Indices[i] = u[i];
+		buf->Indices[i] = u[i];
+	buf->drop();
 
 	setSize();
 }
 
 
-//! destructor
-CCubeSceneNode::~CCubeSceneNode()
-{
-}
-
 void CCubeSceneNode::setSize()
 {
 	// we are creating the cube mesh here. 
@@ -61,27 +60,31 @@ void CCubeSceneNode::setSize()
 
 	video::SColor clr(255,255,255,255);
 
-	Buffer.Vertices.set_used(12);
-	Buffer.Vertices[0]  = video::S3DVertex(0,0,0, -1,-1,-1, clr, 0, 1); 
-	Buffer.Vertices[1]  = video::S3DVertex(1,0,0,  1,-1,-1, clr, 1, 1); 
-	Buffer.Vertices[2]  = video::S3DVertex(1,1,0,  1, 1,-1, clr, 1, 0); 
-	Buffer.Vertices[3]  = video::S3DVertex(0,1,0, -1, 1,-1, clr, 0, 0); 
-	Buffer.Vertices[4]  = video::S3DVertex(1,0,1,  1,-1, 1, clr, 0, 1); 
-	Buffer.Vertices[5]  = video::S3DVertex(1,1,1,  1, 1, 1, clr, 0, 0); 
-	Buffer.Vertices[6]  = video::S3DVertex(0,1,1, -1, 1, 1, clr, 1, 0); 
-	Buffer.Vertices[7]  = video::S3DVertex(0,0,1, -1,-1, 1, clr, 1, 1); 
-	Buffer.Vertices[8]  = video::S3DVertex(0,1,1, -1, 1, 1, clr, 0, 1); 
-	Buffer.Vertices[9]  = video::S3DVertex(0,1,0, -1, 1,-1, clr, 1, 1); 
-	Buffer.Vertices[10] = video::S3DVertex(1,0,1,  1,-1, 1, clr, 1, 0); 
-	Buffer.Vertices[11] = video::S3DVertex(1,0,0,  1,-1,-1, clr, 0, 0); 
+	SMeshBuffer* buf = (SMeshBuffer*)Mesh.getMeshBuffer(0);
 
-	Buffer.BoundingBox.reset(0,0,0); 
+	buf->Vertices.reallocate(12);
+	// Start setting vertices from index 0 to deal with this method being called multiple times.
+	buf->Vertices.set_used(0);
+	buf->Vertices.push_back(video::S3DVertex(0,0,0, -1,-1,-1, clr, 0, 1));
+	buf->Vertices.push_back(video::S3DVertex(1,0,0,  1,-1,-1, clr, 1, 1));
+	buf->Vertices.push_back(video::S3DVertex(1,1,0,  1, 1,-1, clr, 1, 0));
+	buf->Vertices.push_back(video::S3DVertex(0,1,0, -1, 1,-1, clr, 0, 0));
+	buf->Vertices.push_back(video::S3DVertex(1,0,1,  1,-1, 1, clr, 0, 1));
+	buf->Vertices.push_back(video::S3DVertex(1,1,1,  1, 1, 1, clr, 0, 0));
+	buf->Vertices.push_back(video::S3DVertex(0,1,1, -1, 1, 1, clr, 1, 0));
+	buf->Vertices.push_back(video::S3DVertex(0,0,1, -1,-1, 1, clr, 1, 1));
+	buf->Vertices.push_back(video::S3DVertex(0,1,1, -1, 1, 1, clr, 0, 1));
+	buf->Vertices.push_back(video::S3DVertex(0,1,0, -1, 1,-1, clr, 1, 1));
+	buf->Vertices.push_back(video::S3DVertex(1,0,1,  1,-1, 1, clr, 1, 0));
+	buf->Vertices.push_back(video::S3DVertex(1,0,0,  1,-1,-1, clr, 0, 0));
+
+	buf->BoundingBox.reset(0,0,0); 
 
 	for (u32 i=0; i<12; ++i)
 	{
-		Buffer.Vertices[i].Pos -= core::vector3df(0.5f, 0.5f, 0.5f);
-		Buffer.Vertices[i].Pos *= Size;
-		Buffer.BoundingBox.addInternalPoint(Buffer.Vertices[i].Pos);
+		buf->Vertices[i].Pos -= core::vector3df(0.5f, 0.5f, 0.5f);
+		buf->Vertices[i].Pos *= Size;
+		buf->BoundingBox.addInternalPoint(buf->Vertices[i].Pos);
 	}
 }
 
@@ -90,26 +93,24 @@ void CCubeSceneNode::setSize()
 void CCubeSceneNode::render()
 {
 	video::IVideoDriver* driver = SceneManager->getVideoDriver();
-	driver->setMaterial(Buffer.Material);
+	driver->setMaterial(Mesh.getMeshBuffer(0)->getMaterial());
 	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
-	driver->drawMeshBuffer(&Buffer);
+	driver->drawMeshBuffer(Mesh.getMeshBuffer(0));
 }
 
 
 //! returns the axis aligned bounding box of this node
 const core::aabbox3d<f32>& CCubeSceneNode::getBoundingBox() const
 {
-	return Buffer.BoundingBox;
+	return Mesh.getMeshBuffer(0)->getBoundingBox();
 }
 
 
 void CCubeSceneNode::OnRegisterSceneNode()
 {
 	if (IsVisible)
-	{
 		SceneManager->registerNodeForRendering(this);
-		ISceneNode::OnRegisterSceneNode();
-	}
+	ISceneNode::OnRegisterSceneNode();
 }
 
 
@@ -120,7 +121,7 @@ void CCubeSceneNode::OnRegisterSceneNode()
 //! to directly modify the material of a scene node.
 video::SMaterial& CCubeSceneNode::getMaterial(u32 i)
 {
-	return Buffer.Material;
+	return Mesh.getMeshBuffer(0)->getMaterial();
 }
 
 
@@ -161,7 +162,7 @@ ISceneNode* CCubeSceneNode::clone(ISceneNode* newParent, ISceneManager* newManag
 		newManager, ID, RelativeTranslation);
 
 	nb->cloneMembers(this, newManager);
-	nb->Buffer.Material = Buffer.Material;
+	nb->getMaterial(0) = getMaterial(0);
 
 	nb->drop();
 	return nb;
diff --git a/src/dep/src/irrlicht/CCubeSceneNode.h b/src/dep/src/irrlicht/CCubeSceneNode.h
index 853af77..15db555 100644
--- a/src/dep/src/irrlicht/CCubeSceneNode.h
+++ b/src/dep/src/irrlicht/CCubeSceneNode.h
@@ -1,18 +1,18 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __C_TEST_SCENE_NODE_H_INCLUDED__
 #define __C_TEST_SCENE_NODE_H_INCLUDED__
 
-#include "ISceneNode.h"
-#include "SMeshBuffer.h"
+#include "IMeshSceneNode.h"
+#include "SMesh.h"
 
 namespace irr
 {
 namespace scene
 {
-	class CCubeSceneNode : public ISceneNode
+	class CCubeSceneNode : public IMeshSceneNode
 	{
 	public:
 
@@ -22,9 +22,6 @@ namespace scene
 			const core::vector3df& rotation = core::vector3df(0,0,0),
 			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f));
 
-		//! destructor
-		virtual ~CCubeSceneNode();
-
 		virtual void OnRegisterSceneNode();
 
 		//! renders the node.
@@ -55,10 +52,24 @@ namespace scene
 		//! Creates a clone of this scene node and its children.
 		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0);
 
+		//! Sets a new mesh to display
+		virtual void setMesh(IMesh* mesh) {}
+
+		//! Returns the current mesh
+		virtual IMesh* getMesh(void) { return &Mesh; }
+
+		//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
+		/* In this way it is possible to change the materials a mesh causing all mesh scene nodes 
+		referencing this mesh to change too. */
+		virtual void setReadOnlyMaterials(bool readonly) {}
+
+		//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
+		virtual bool isReadOnlyMaterials() const { return false; }
+
 	private:
 		void setSize();
 
-		SMeshBuffer Buffer;
+		SMesh Mesh;
 		f32 Size;
 	};
 
diff --git a/src/dep/src/irrlicht/CD3D8Driver.cpp b/src/dep/src/irrlicht/CD3D8Driver.cpp
index 6e32166..cd67707 100644
--- a/src/dep/src/irrlicht/CD3D8Driver.cpp
+++ b/src/dep/src/irrlicht/CD3D8Driver.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -31,8 +31,10 @@ CD3D8Driver::CD3D8Driver(const core::dimension2d<s32>& screenSize, HWND window,
 : CNullDriver(io, screenSize), CurrentRenderMode(ERM_NONE),
 	ResetRenderStates(true), Transformation3DChanged(false), StencilBuffer(stencilbuffer),
 	D3DLibrary(0), pID3D(0), pID3DDevice(0), PrevRenderTarget(0),
+	WindowId(0), SceneSourceRect(0),
 	LastVertexType((video::E_VERTEX_TYPE)-1), MaxTextureUnits(0), MaxUserClipPlanes(0),
-	MaxLightDistance(sqrtf(FLT_MAX)), LastSetLight(-1), DeviceLost(false)
+	MaxLightDistance(sqrtf(FLT_MAX)), LastSetLight(-1), DeviceLost(false),
+	DriverWasReset(true)
 {
 	#ifdef _DEBUG
 	setDebugName("CD3D8Driver");
@@ -61,7 +63,6 @@ CD3D8Driver::CD3D8Driver(const core::dimension2d<s32>& screenSize, HWND window,
 }
 
 
-
 //! destructor
 CD3D8Driver::~CD3D8Driver()
 {
@@ -142,9 +143,9 @@ void CD3D8Driver::createMaterialRenderers()
 
 
 //! initialises the Direct3D API
-bool CD3D8Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd,
-				u32 bits, bool fullScreen, bool pureSoftware,
-				bool highPrecisionFPU, bool vsync, bool antiAlias)
+bool CD3D8Driver::initDriver(const core::dimension2d<s32>& screenSize,
+		HWND hwnd, u32 bits, bool fullScreen, bool pureSoftware,
+		bool highPrecisionFPU, bool vsync, bool antiAlias)
 {
 	HRESULT hr;
 	D3DLibrary = LoadLibrary( "d3d8.dll" );
@@ -358,7 +359,7 @@ bool CD3D8Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 	// set exposed data
 	ExposedData.D3D8.D3D8 = pID3D;
 	ExposedData.D3D8.D3DDev8 = pID3DDevice;
-	ExposedData.D3D8.HWnd = reinterpret_cast<s32>(hwnd);
+	ExposedData.D3D8.HWnd = hwnd;
 
 	ResetRenderStates = true;
 
@@ -382,27 +383,32 @@ bool CD3D8Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 }
 
 
-
-
 //! applications must call this method before performing any rendering. returns false if failed.
-bool CD3D8Driver::beginScene(bool backBuffer, bool zBuffer, SColor color)
+bool CD3D8Driver::beginScene(bool backBuffer, bool zBuffer, SColor color,
+		void* windowId, core::rect<s32>* sourceRect)
 {
-	CNullDriver::beginScene(backBuffer, zBuffer, color);
-	HRESULT hr;
+	CNullDriver::beginScene(backBuffer, zBuffer, color, windowId, sourceRect);
+	WindowId = windowId;
+	SceneSourceRect = sourceRect;
 
 	if (!pID3DDevice)
 		return false;
 
+	HRESULT hr;
 	if (DeviceLost)
 	{
 		if(FAILED(hr = pID3DDevice->TestCooperativeLevel()))
 		{
 			if (hr == D3DERR_DEVICELOST)
-				return false;
+			{
+				Sleep(100);
+				hr = pID3DDevice->TestCooperativeLevel();
+				if (hr == D3DERR_DEVICELOST)
+					return false;
+			}
 
-			if (hr == D3DERR_DEVICENOTRESET)
-				reset();
-			return false;
+			if ((hr == D3DERR_DEVICENOTRESET) && !reset())
+				return false;
 		}
 	}
 
@@ -432,14 +438,72 @@ bool CD3D8Driver::beginScene(bool backBuffer, bool zBuffer, SColor color)
 }
 
 
+//! applications must call this method after performing any rendering. returns false if failed.
+bool CD3D8Driver::endScene()
+{
+	CNullDriver::endScene();
+	DriverWasReset=false;
+
+	HRESULT hr = pID3DDevice->EndScene();
+	if (FAILED(hr))
+	{
+		os::Printer::log("DIRECT3D8 end scene failed.", ELL_WARNING);
+		return false;
+	}
+
+	RECT* srcRct = 0;
+	RECT sourceRectData;
+	if ( SceneSourceRect)
+	{
+		srcRct = &sourceRectData;
+		sourceRectData.left = SceneSourceRect->UpperLeftCorner.X;
+		sourceRectData.top = SceneSourceRect->UpperLeftCorner.Y;
+		sourceRectData.right = SceneSourceRect->LowerRightCorner.X;
+		sourceRectData.bottom = SceneSourceRect->LowerRightCorner.Y;
+	}
+
+	hr = pID3DDevice->Present(srcRct, NULL, (HWND)WindowId, NULL);
+
+	if (SUCCEEDED(hr))
+		return true;
+
+	if (hr == D3DERR_DEVICELOST)
+	{
+		DeviceLost = true;
+		os::Printer::log("DIRECT3D8 device lost.", ELL_WARNING);
+	}
+	else
+		os::Printer::log("DIRECT3D8 present failed.", ELL_WARNING);
+	return false;
+}
+
 
 //! resets the device
 bool CD3D8Driver::reset()
 {
-	// reset
-	HRESULT hr;
+	u32 i;
 	os::Printer::log("Resetting D3D8 device.", ELL_INFORMATION);
-	if (FAILED(hr = pID3DDevice->Reset(&present)))
+
+	for (i=0; i<Textures.size(); ++i)
+	{
+		if (Textures[i].Surface->isRenderTarget())
+		{
+			IDirect3DTexture8* tex = ((CD3D8Texture*)(Textures[i].Surface))->getDX8Texture();
+			if (tex)
+				tex->Release();
+		}
+	}
+	DriverWasReset=true;
+
+	HRESULT hr = pID3DDevice->Reset(&present);
+
+	for (i=0; i<Textures.size(); ++i)
+	{
+		if (Textures[i].Surface->isRenderTarget())
+			((CD3D8Texture*)(Textures[i].Surface))->createRenderTarget();
+	}
+
+	if (FAILED(hr))
 	{
 		if (hr == D3DERR_DEVICELOST)
 		{
@@ -467,52 +531,12 @@ bool CD3D8Driver::reset()
 }
 
 
-
-//! applications must call this method after performing any rendering. returns false if failed.
-bool CD3D8Driver::endScene( s32 windowId, core::rect<s32>* sourceRect )
-{
-	CNullDriver::endScene();
-
-	HRESULT hr = pID3DDevice->EndScene();
-	if (FAILED(hr))
-	{
-		os::Printer::log("DIRECT3D8 end scene failed.", ELL_WARNING);
-		return false;
-	}
-
-	RECT* srcRct = 0;
-	RECT sourceRectData;
-	if ( sourceRect)
-	{
-		srcRct = &sourceRectData;
-		sourceRectData.left = sourceRect->UpperLeftCorner.X;
-		sourceRectData.top = sourceRect->UpperLeftCorner.Y;
-		sourceRectData.right = sourceRect->LowerRightCorner.X;
-		sourceRectData.bottom = sourceRect->LowerRightCorner.Y;
-	}
-
-	hr = pID3DDevice->Present(srcRct, NULL, (HWND)windowId, NULL);
-
-	if (hr == D3DERR_DEVICELOST)
-	{
-		DeviceLost = true;
-		os::Printer::log("DIRECT3D8 device lost.", ELL_WARNING);
-	}
-	else
-	if (FAILED(hr) && hr != D3DERR_INVALIDCALL)
-	{
-		os::Printer::log("DIRECT3D8 present failed.", ELL_WARNING);
-		return false;
-	}
-
-	return true;
-}
-
-
-
 //! queries the features of the driver, returns true if feature is available
 bool CD3D8Driver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 {
+	if (!FeatureEnabled[feature])
+		return false;
+
 	switch (feature)
 	{
 	case EVDF_RENDER_TO_TARGET:
@@ -543,6 +567,8 @@ bool CD3D8Driver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 		return Caps.PixelShaderVersion >= D3DPS_VERSION(2,0);
 	case EVDF_PIXEL_SHADER_3_0:
 		return Caps.PixelShaderVersion >= D3DPS_VERSION(3,0);
+	case EVDF_TEXTURE_NSQUARE:
+		return (Caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) == 0;
 	case EVDF_TEXTURE_NPOT:
 		return (Caps.TextureCaps & D3DPTEXTURECAPS_POW2) == 0;
 	default:
@@ -551,9 +577,9 @@ bool CD3D8Driver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 }
 
 
-
 //! sets transformation
-void CD3D8Driver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat)
+void CD3D8Driver::setTransform(E_TRANSFORMATION_STATE state,
+		const core::matrix4& mat)
 {
 	switch(state)
 	{
@@ -574,11 +600,8 @@ void CD3D8Driver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4
 	case ETS_TEXTURE_2:
 	case ETS_TEXTURE_3:
 		pID3DDevice->SetTextureStageState( state - ETS_TEXTURE_0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2 );
-		if (mat.isIdentity())
-			pID3DDevice->SetTransform( (D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0+ ( state - ETS_TEXTURE_0 )), &UnitMatrixD3D8 );
-		else
-			pID3DDevice->SetTransform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0+ ( state - ETS_TEXTURE_0 )),
-				(D3DMATRIX*)((void*)mat.pointer()));
+		pID3DDevice->SetTransform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0+ ( state - ETS_TEXTURE_0 )),
+			(D3DMATRIX*)((void*)mat.pointer()));
 		break;
 	case ETS_COUNT:
 		break;
@@ -588,7 +611,6 @@ void CD3D8Driver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4
 }
 
 
-
 //! sets the current Texture
 bool CD3D8Driver::setTexture(s32 stage, const video::ITexture* texture)
 {
@@ -616,7 +638,6 @@ bool CD3D8Driver::setTexture(s32 stage, const video::ITexture* texture)
 }
 
 
-
 //! sets a material
 void CD3D8Driver::setMaterial(const SMaterial& material)
 {
@@ -633,14 +654,16 @@ void CD3D8Driver::setMaterial(const SMaterial& material)
 
 
 //! returns a device dependent texture from a software surface (IImage)
-video::ITexture* CD3D8Driver::createDeviceDependentTexture(IImage* surface, const char* name)
+video::ITexture* CD3D8Driver::createDeviceDependentTexture(IImage* surface,
+		const char* name)
 {
 	return new CD3D8Texture(surface, this, TextureCreationFlags, name);
 }
 
 
 //! Enables or disables a texture creation flag.
-void CD3D8Driver::setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enabled)
+void CD3D8Driver::setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag,
+		bool enabled)
 {
 	if (flag == video::ETCF_CREATE_MIP_MAPS && !queryFeature(EVDF_MIP_MAP))
 		enabled = false;
@@ -651,8 +674,8 @@ void CD3D8Driver::setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enab
 
 
 //! sets a render target
-bool CD3D8Driver::setRenderTarget(video::ITexture* texture, bool clearBackBuffer,
-				bool clearZBuffer, SColor color)
+bool CD3D8Driver::setRenderTarget(video::ITexture* texture,
+		bool clearBackBuffer, bool clearZBuffer, SColor color)
 {
 	// check for right driver type
 
@@ -750,12 +773,18 @@ bool CD3D8Driver::setRenderTarget(video::ITexture* texture, bool clearBackBuffer
 	return ret;
 }
 
-//! Creates a render target texture.
-ITexture* CD3D8Driver::createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name)
-{
-	return new CD3D8Texture(this, size, name);
-}
 
+//! Creates a render target texture.
+ITexture* CD3D8Driver::addRenderTargetTexture(
+		const core::dimension2d<s32>& size, const c8* name)
+{
+	if (!name)
+		name="rt";
+	ITexture* tex = new CD3D8Texture(this, size, name);
+	addTexture(tex);
+	tex->drop();
+	return tex;
+}
 
 
 //! sets a viewport
@@ -784,7 +813,6 @@ void CD3D8Driver::setViewPort(const core::rect<s32>& area)
 }
 
 
-
 //! gets the area of the current viewport
 const core::rect<s32>& CD3D8Driver::getViewPort() const
 {
@@ -792,14 +820,16 @@ const core::rect<s32>& CD3D8Driver::getViewPort() const
 }
 
 
-
 //! draws a vertex primitive list
-void CD3D8Driver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType)
+void CD3D8Driver::drawVertexPrimitiveList(const void* vertices,
+		u32 vertexCount, const void* indexList, u32 primitiveCount,
+		E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType,
+		E_INDEX_TYPE iType)
 {
 	if (!checkPrimitiveCount(primitiveCount))
 		return;
 
-	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType);
+	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType,iType);
 
 	if (!vertexCount || !primitiveCount)
 		return;
@@ -866,12 +896,12 @@ void CD3D8Driver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
 }
 
 
-
 //! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
-void CD3D8Driver::draw2DImage(const video::ITexture* texture, const core::position2d<s32>& pos,
-				const core::rect<s32>& sourceRect,
-				const core::rect<s32>* clipRect, SColor color,
-				bool useAlphaChannelOfTexture)
+void CD3D8Driver::draw2DImage(const video::ITexture* texture,
+		const core::position2d<s32>& pos,
+		const core::rect<s32>& sourceRect,
+		const core::rect<s32>* clipRect, SColor color,
+		bool useAlphaChannelOfTexture)
 {
 	if (!texture)
 		return;
@@ -981,10 +1011,22 @@ void CD3D8Driver::draw2DImage(const video::ITexture* texture, const core::positi
 	setRenderStates2DMode(color.getAlpha()<255, true, useAlphaChannelOfTexture);
 
 	S3DVertex vtx[4];
-	vtx[0] = S3DVertex((f32)(poss.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-poss.UpperLeftCorner.Y ) * yFact , 0.0f, 0.0f, 0.0f, 0.0f, color, tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
-	vtx[1] = S3DVertex((f32)(poss.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus- poss.UpperLeftCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, color, tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
-	vtx[2] = S3DVertex((f32)(poss.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus-poss.LowerRightCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, color, tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
-	vtx[3] = S3DVertex((f32)(poss.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-poss.LowerRightCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, color, tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
+	vtx[0] = S3DVertex((f32)(poss.UpperLeftCorner.X+xPlus) * xFact,
+			(f32)(yPlus-poss.UpperLeftCorner.Y ) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, color,
+			tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
+	vtx[1] = S3DVertex((f32)(poss.LowerRightCorner.X+xPlus) * xFact,
+			(f32)(yPlus- poss.UpperLeftCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, color,
+			tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
+	vtx[2] = S3DVertex((f32)(poss.LowerRightCorner.X+xPlus) * xFact,
+			(f32)(yPlus-poss.LowerRightCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, color,
+			tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
+	vtx[3] = S3DVertex((f32)(poss.UpperLeftCorner.X+xPlus) * xFact,
+			(f32)(yPlus-poss.LowerRightCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, color,
+			tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
 
 	s16 indices[6] = {0,1,2,0,2,3};
 
@@ -995,10 +1037,12 @@ void CD3D8Driver::draw2DImage(const video::ITexture* texture, const core::positi
 }
 
 
-
-void CD3D8Driver::draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
-			const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect,
-			video::SColor* colors, bool useAlphaChannelOfTexture)
+void CD3D8Driver::draw2DImage(const video::ITexture* texture,
+		const core::rect<s32>& destRect,
+		const core::rect<s32>& sourceRect,
+		const core::rect<s32>* clipRect,
+		const video::SColor* const colors,
+		bool useAlphaChannelOfTexture)
 {
 	if(!texture)
 		return;
@@ -1010,16 +1054,38 @@ void CD3D8Driver::draw2DImage(const video::ITexture* texture, const core::rect<s
 	tcoords.LowerRightCorner.X = (f32)sourceRect.LowerRightCorner.X / (f32)ss.Width;
 	tcoords.LowerRightCorner.Y = (f32)sourceRect.LowerRightCorner.Y / (f32)ss.Height;
 
+	core::rect<s32> clippedRect(destRect);
+	if (clipRect)
+	{
+		clippedRect.clipAgainst(*clipRect);
+
+		//tcoords must be clipped by the same factors
+		const f32 tcWidth = tcoords.getWidth();
+		const f32 tcHeight = tcoords.getHeight();
+
+		const f32 invDestRectWidth = 1.f / (f32)(destRect.getWidth());
+		f32 scale = (f32)(clippedRect.UpperLeftCorner.X - destRect.UpperLeftCorner.X) * invDestRectWidth;
+		tcoords.UpperLeftCorner.X += scale * tcWidth;
+		scale = (f32)(destRect.LowerRightCorner.X - clippedRect.LowerRightCorner.X) * invDestRectWidth;
+		tcoords.LowerRightCorner.X -= scale * tcWidth;
+
+		const f32 invDestRectHeight = 1.f / (f32)(destRect.getHeight());
+		scale = (f32)(clippedRect.UpperLeftCorner.Y - destRect.UpperLeftCorner.Y) * invDestRectHeight;
+		tcoords.UpperLeftCorner.Y += scale * tcHeight;
+		scale = (f32)(destRect.LowerRightCorner.Y - clippedRect.LowerRightCorner.Y) * invDestRectHeight;
+		tcoords.LowerRightCorner.Y -= scale * tcHeight;
+	}
+
 	const core::dimension2d<s32>& renderTargetSize = getCurrentRenderTargetSize();
 	core::rect<f32> npos;
 	f32 xFact = 2.0f / ( renderTargetSize.Width );
 	f32 yFact = 2.0f / ( renderTargetSize.Height );
-	npos.UpperLeftCorner.X = ( destRect.UpperLeftCorner.X * xFact ) - 1.0f;
-	npos.UpperLeftCorner.Y = 1.0f - ( destRect.UpperLeftCorner.Y * yFact );
-	npos.LowerRightCorner.X = ( destRect.LowerRightCorner.X * xFact ) - 1.0f;
-	npos.LowerRightCorner.Y = 1.0f - ( destRect.LowerRightCorner.Y * yFact );
+	npos.UpperLeftCorner.X = ( clippedRect.UpperLeftCorner.X * xFact ) - 1.0f;
+	npos.UpperLeftCorner.Y = 1.0f - ( clippedRect.UpperLeftCorner.Y * yFact );
+	npos.LowerRightCorner.X = ( clippedRect.LowerRightCorner.X * xFact ) - 1.0f;
+	npos.LowerRightCorner.Y = 1.0f - ( clippedRect.LowerRightCorner.Y * yFact );
 
-	video::SColor temp[4] =
+	const video::SColor temp[4] =
 	{
 		0xFFFFFFFF,
 		0xFFFFFFFF,
@@ -1027,17 +1093,27 @@ void CD3D8Driver::draw2DImage(const video::ITexture* texture, const core::rect<s
 		0xFFFFFFFF
 	};
 
-	video::SColor* useColor = colors ? colors : temp;
+	const video::SColor* const useColor = colors ? colors : temp;
 
 	S3DVertex vtx[4]; // clock wise
-	vtx[0] = S3DVertex(npos.UpperLeftCorner.X, npos.UpperLeftCorner.Y , 0.0f, 0.0f, 0.0f, 0.0f, useColor[0], tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
-	vtx[1] = S3DVertex(npos.LowerRightCorner.X, npos.UpperLeftCorner.Y , 0.0f, 0.0f, 0.0f, 0.0f, useColor[3], tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
-	vtx[2] = S3DVertex(npos.LowerRightCorner.X, npos.LowerRightCorner.Y, 0.0f, 0.0f, 0.0f, 0.0f, useColor[2], tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
-	vtx[3] = S3DVertex(npos.UpperLeftCorner.X, npos.LowerRightCorner.Y, 0.0f, 0.0f, 0.0f, 0.0f, useColor[1], tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
+	vtx[0] = S3DVertex(npos.UpperLeftCorner.X, npos.UpperLeftCorner.Y, 0.0f,
+			0.0f, 0.0f, 0.0f, useColor[0],
+			tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
+	vtx[1] = S3DVertex(npos.LowerRightCorner.X, npos.UpperLeftCorner.Y, 0.0f,
+			0.0f, 0.0f, 0.0f, useColor[3],
+			tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
+	vtx[2] = S3DVertex(npos.LowerRightCorner.X, npos.LowerRightCorner.Y, 0.0f,
+			0.0f, 0.0f, 0.0f, useColor[2],
+			tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
+	vtx[3] = S3DVertex(npos.UpperLeftCorner.X, npos.LowerRightCorner.Y, 0.0f,
+			0.0f, 0.0f, 0.0f, useColor[1],
+			tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
 
 	s16 indices[6] = {0,1,2,0,2,3};
 
-	setRenderStates2DMode(useColor[0].getAlpha()<255 || useColor[1].getAlpha()<255 || useColor[2].getAlpha()<255 || useColor[3].getAlpha()<255, true, useAlphaChannelOfTexture);
+	setRenderStates2DMode(useColor[0].getAlpha()<255 || useColor[1].getAlpha()<255 ||
+			useColor[2].getAlpha()<255 || useColor[3].getAlpha()<255,
+			true, useAlphaChannelOfTexture);
 
 	setTexture(0, texture);
 
@@ -1048,11 +1124,10 @@ void CD3D8Driver::draw2DImage(const video::ITexture* texture, const core::rect<s
 }
 
 
-
 //!Draws an 2d rectangle with a gradient.
 void CD3D8Driver::draw2DRectangle(const core::rect<s32>& position,
-	SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
-	const core::rect<s32>* clip)
+		SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown,
+		SColor colorRightDown, const core::rect<s32>* clip)
 {
 	core::rect<s32> pos(position);
 
@@ -1070,10 +1145,14 @@ void CD3D8Driver::draw2DRectangle(const core::rect<s32>& position,
 	f32 yFact = 1.0f / (renderTargetSize.Height>>1);
 
 	S3DVertex vtx[4];
-	vtx[0] = S3DVertex((f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.UpperLeftCorner.Y) * yFact , 0.0f, 0.0f, 0.0f, 0.0f, colorLeftUp, 0.0f, 0.0f);
-	vtx[1] = S3DVertex((f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus- pos.UpperLeftCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, colorRightUp, 0.0f, 1.0f);
-	vtx[2] = S3DVertex((f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, colorRightDown, 1.0f, 0.0f);
-	vtx[3] = S3DVertex((f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, colorLeftDown, 1.0f, 1.0f);
+	vtx[0] = S3DVertex((f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.UpperLeftCorner.Y) * yFact , 0.0f,
+			0.0f, 0.0f, 0.0f, colorLeftUp, 0.0f, 0.0f);
+	vtx[1] = S3DVertex((f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus- pos.UpperLeftCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, colorRightUp, 0.0f, 1.0f);
+	vtx[2] = S3DVertex((f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, colorRightDown, 1.0f, 0.0f);
+	vtx[3] = S3DVertex((f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, colorLeftDown, 1.0f, 1.0f);
 
 	s16 indices[6] = {0,1,2,0,2,3};
 
@@ -1132,6 +1211,29 @@ void CD3D8Driver::draw2DLine(const core::position2d<s32>& start,
 	pID3DDevice->DrawPrimitiveUP(D3DPT_LINELIST, 1, &vtx[0], sizeof(S3DVertex));
 }
 
+//! Draws a pixel
+void CD3D8Driver::drawPixel(u32 x, u32 y, const SColor & color)
+{
+	const core::dimension2d<s32>& renderTargetSize = getCurrentRenderTargetSize();
+	if(x > (u32)renderTargetSize.Width || y > (u32)renderTargetSize.Height)
+		return;
+
+	setRenderStates2DMode(color.getAlpha() < 255, false, false);
+	setTexture(0,0);
+
+	setVertexShader(EVT_STANDARD);
+
+	const s32 xPlus = -renderTargetSize.Width / 2;
+	const f32 xFact = 2.0f / renderTargetSize.Width;
+	const s32 yPlus = renderTargetSize.Height / 2;
+	const f32 yFact = 2.0f / renderTargetSize.Height;
+	S3DVertex vertex((f32)((s32)x + xPlus) * xFact,
+					(f32)(yPlus - (s32)y) * yFact,
+					0.f, 0.f, 0.f, 0.f, color, 0.f, 0.f);
+
+	pID3DDevice->DrawPrimitiveUP(D3DPT_POINTLIST, 1, &vertex, sizeof(vertex));
+}
+
 
 
 //! sets right vertex shader
@@ -1294,9 +1396,9 @@ void CD3D8Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 
 
 	// zwrite
-	if (resetAllRenderstates || lastmaterial.ZWriteEnable != material.ZWriteEnable)
+//	if (resetAllRenderstates || lastmaterial.ZWriteEnable != material.ZWriteEnable)
 	{
-		if (material.ZWriteEnable)
+		if (material.ZWriteEnable && (AllowZWriteOnTransparent || !material.isTransparent()))
 			pID3DDevice->SetRenderState( D3DRS_ZWRITEENABLE, TRUE);
 		else
 			pID3DDevice->SetRenderState( D3DRS_ZWRITEENABLE, FALSE);
@@ -1305,12 +1407,18 @@ void CD3D8Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 	// back face culling
 
 
-	if (resetAllRenderstates || lastmaterial.BackfaceCulling != material.BackfaceCulling)
+	if (resetAllRenderstates || (lastmaterial.FrontfaceCulling != material.FrontfaceCulling) || (lastmaterial.BackfaceCulling != material.BackfaceCulling))
 	{
-		if (material.BackfaceCulling)
-			pID3DDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_CCW);
+//		if (material.FrontfaceCulling && material.BackfaceCulling)
+//			pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW|D3DCULL_CCW);
+//		else
+		if (material.FrontfaceCulling)
+			pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW);
 		else
-			pID3DDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_NONE);
+		if (material.BackfaceCulling)
+			pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CCW);
+		else
+			pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
 	}
 
 	// fog
@@ -1375,8 +1483,10 @@ void CD3D8Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 		{
 			if (material.TextureLayer[st].BilinearFilter || material.TextureLayer[st].TrilinearFilter || material.TextureLayer[st].AnisotropicFilter)
 			{
-				D3DTEXTUREFILTERTYPE tftMag = ((Caps.TextureFilterCaps & D3DPTFILTERCAPS_MAGFANISOTROPIC) && material.TextureLayer[st].AnisotropicFilter) ? D3DTEXF_ANISOTROPIC : D3DTEXF_LINEAR;
-				D3DTEXTUREFILTERTYPE tftMin = ((Caps.TextureFilterCaps & D3DPTFILTERCAPS_MINFANISOTROPIC) && material.TextureLayer[st].AnisotropicFilter) ? D3DTEXF_ANISOTROPIC : D3DTEXF_LINEAR;
+				D3DTEXTUREFILTERTYPE tftMag = ((Caps.TextureFilterCaps & D3DPTFILTERCAPS_MAGFANISOTROPIC) &&
+						material.TextureLayer[st].AnisotropicFilter) ? D3DTEXF_ANISOTROPIC : D3DTEXF_LINEAR;
+				D3DTEXTUREFILTERTYPE tftMin = ((Caps.TextureFilterCaps & D3DPTFILTERCAPS_MINFANISOTROPIC) &&
+						material.TextureLayer[st].AnisotropicFilter) ? D3DTEXF_ANISOTROPIC : D3DTEXF_LINEAR;
 				D3DTEXTUREFILTERTYPE tftMip = material.TextureLayer[st].TrilinearFilter ? D3DTEXF_LINEAR : D3DTEXF_POINT;
 
 				pID3DDevice->SetTextureStageState(st, D3DTSS_MAGFILTER, tftMag);
@@ -1484,10 +1594,9 @@ void CD3D8Driver::setRenderStatesStencilFillMode(bool alpha)
 {
 	if (CurrentRenderMode != ERM_STENCIL_FILL || Transformation3DChanged)
 	{
-		core::matrix4 mat;
-		pID3DDevice->SetTransform(D3DTS_VIEW, (D3DMATRIX*)((void*)mat.pointer()));
-		pID3DDevice->SetTransform(D3DTS_WORLD, (D3DMATRIX*)((void*)mat.pointer()));
-		pID3DDevice->SetTransform(D3DTS_PROJECTION, (D3DMATRIX*)((void*)mat.pointer()));
+		pID3DDevice->SetTransform(D3DTS_VIEW, &UnitMatrixD3D8);
+		pID3DDevice->SetTransform(D3DTS_WORLD, &UnitMatrixD3D8);
+		pID3DDevice->SetTransform(D3DTS_PROJECTION, &UnitMatrixD3D8);
 
 		pID3DDevice->SetRenderState(D3DRS_ZENABLE, FALSE);
 		pID3DDevice->SetRenderState(D3DRS_LIGHTING, FALSE);
@@ -1546,10 +1655,9 @@ void CD3D8Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChan
 
 	if (CurrentRenderMode != ERM_2D || Transformation3DChanged)
 	{
-		core::matrix4 mat;
-		pID3DDevice->SetTransform(D3DTS_VIEW, (D3DMATRIX*)((void*)mat.pointer()));
-		pID3DDevice->SetTransform(D3DTS_WORLD, (D3DMATRIX*)((void*)mat.pointer()));
-		pID3DDevice->SetTransform(D3DTS_PROJECTION, (D3DMATRIX*)((void*)mat.pointer()));
+		pID3DDevice->SetTransform(D3DTS_VIEW, &UnitMatrixD3D8);
+		pID3DDevice->SetTransform(D3DTS_WORLD, &UnitMatrixD3D8);
+		pID3DDevice->SetTransform(D3DTS_PROJECTION, &UnitMatrixD3D8);
 
 		pID3DDevice->SetRenderState(D3DRS_ZENABLE, FALSE);
 		//pID3DDevice->SetRenderState(D3DRS_SHADEMODE, D3DSHADE_FLAT);
@@ -1585,8 +1693,8 @@ void CD3D8Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChan
 
 		// unset last 3d material
 		if (CurrentRenderMode == ERM_3D &&
-			Material.MaterialType >= 0 && Material.MaterialType < (s32)MaterialRenderers.size())
-			MaterialRenderers[Material.MaterialType].Renderer->OnUnsetMaterial();
+			Material.MaterialType >= 0 && LastMaterial.MaterialType < (s32)MaterialRenderers.size())
+			MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
 	}
 
 	if (texture)
@@ -2024,12 +2132,28 @@ IImage* CD3D8Driver::createScreenShot()
 	IImage* newImage = new CImage(ECF_A8R8G8B8, ScreenSize);
 
 	// d3d pads the image, so we need to copy the correct number of bytes
-	u32* pPixels = (u32*)newImage->lock();
-	if (pPixels)
-	{
-		u8 * sP = (u8 *)lockedRect.pBits;
-		u32* dP = (u32*)pPixels;
+	u32* dP = (u32*)newImage->lock();
+	u8 * sP = (u8 *)lockedRect.pBits;
 
+	// If the display mode format doesn't promise anything about the Alpha value
+	// and it appears that it's not presenting 255, then we should manually 
+	// set each pixel alpha value to 255.
+	if(D3DFMT_X8R8G8B8 == displayMode.Format && (0xFF000000 != (*dP & 0xFF000000)))
+	{
+		for (s32 y = 0; y < ScreenSize.Height; ++y)
+		{
+			for(s32 x = 0; x < ScreenSize.Width; ++x)
+			{
+				*dP = *((u32*)sP) | 0xFF000000;
+				dP++;
+				sP += 4;
+			}
+
+			sP += lockedRect.Pitch - (4 * ScreenSize.Width);
+		}
+	}
+	else
+	{
 		for (s32 y = 0; y < ScreenSize.Height; ++y)
 		{
 			memcpy(dP, sP, ScreenSize.Width * 4);
@@ -2037,10 +2161,10 @@ IImage* CD3D8Driver::createScreenShot()
 			sP += lockedRect.Pitch;
 			dP += ScreenSize.Width;
 		}
-
-		newImage->unlock();
 	}
 
+	newImage->unlock();
+
 	// we can unlock and release the surface
 	lpSurface->UnlockRect();
 
@@ -2054,7 +2178,7 @@ IImage* CD3D8Driver::createScreenShot()
 
 
 // returns the current size of the screen or rendertarget
-core::dimension2d<s32> CD3D8Driver::getCurrentRenderTargetSize()
+const core::dimension2d<s32>& CD3D8Driver::getCurrentRenderTargetSize() const
 {
 	if ( CurrentRendertargetSize.Width == 0 )
 		return ScreenSize;
@@ -2126,3 +2250,4 @@ IVideoDriver* createDirectX8Driver(const core::dimension2d<s32>& screenSize, HWN
 } // end namespace video
 } // end namespace irr
 
+
diff --git a/src/dep/src/irrlicht/CD3D8Driver.h b/src/dep/src/irrlicht/CD3D8Driver.h
index df66af7..6c1016d 100644
--- a/src/dep/src/irrlicht/CD3D8Driver.h
+++ b/src/dep/src/irrlicht/CD3D8Driver.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -40,10 +40,13 @@ namespace video
 		virtual ~CD3D8Driver();
 
 		//! applications must call this method before performing any rendering. returns false if failed.
-		virtual bool beginScene(bool backBuffer, bool zBuffer, SColor color);
+		virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
+				SColor color=SColor(255,0,0,0),
+				void* windowId=0,
+				core::rect<s32>* sourceRect=0);
 
 		//! applications must call this method after performing any rendering. returns false if failed.
-		virtual bool endScene( s32 windowId, core::rect<s32>* sourceRect=0 );
+		virtual bool endScene();
 
 		//! queries the features of the driver, returns true if feature is available
 		virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const;
@@ -66,7 +69,9 @@ namespace video
 		virtual const core::rect<s32>& getViewPort() const;
 
 		//! draws a vertex primitive list
-		void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType);
+		void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
+		const void* indexList, u32 primitiveCount,
+		E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
 
 		//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
 		virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
@@ -76,7 +81,7 @@ namespace video
 		//! Draws a part of the texture into the rectangle.
 		virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
 			const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
-			video::SColor* colors=0, bool useAlphaChannelOfTexture=false);
+			const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false);
 
 		//!Draws an 2d rectangle with a gradient.
 		virtual void draw2DRectangle(const core::rect<s32>& pos,
@@ -88,6 +93,9 @@ namespace video
 					const core::position2d<s32>& end,
 					SColor color=SColor(255,255,255,255));
 
+		//! Draws a pixel.
+		virtual void drawPixel(u32 x, u32 y, const SColor & color);
+
 		//! Draws a 3d line.
 		virtual void draw3DLine(const core::vector3df& start,
 			const core::vector3df& end, SColor color = SColor(255,255,255,255));
@@ -175,7 +183,8 @@ namespace video
 		virtual IVideoDriver* getVideoDriver();
 
 		//! Creates a render target texture.
-		virtual ITexture* createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name);
+		virtual ITexture* addRenderTargetTexture(const core::dimension2d<s32>& size,
+				const c8* name);
 
 		//! Clears the ZBuffer.
 		virtual void clearZBuffer();
@@ -196,6 +205,7 @@ namespace video
 		//! \param enable: If true, enable the clipping plane else disable it.
 		virtual void enableClipPlane(u32 index, bool enable);
 
+		virtual bool checkDriverReset() {return DriverWasReset;}
 	private:
 
 		// enumeration for rendering modes such as 2d and 3d for minizing the switching of renderStates.
@@ -235,7 +245,7 @@ namespace video
 		virtual video::ITexture* createDeviceDependentTexture(IImage* surface, const char* name);
 
 		// returns the current size of the screen or rendertarget
-		core::dimension2d<s32> getCurrentRenderTargetSize();
+		virtual const core::dimension2d<s32>& getCurrentRenderTargetSize() const;
 
 		//! Adds a new material renderer to the VideoDriver, using pixel and/or
 		//! vertex shaders to render geometry.
@@ -273,6 +283,9 @@ namespace video
 		IDirect3DSurface8* PrevRenderTarget;
 		core::dimension2d<s32> CurrentRendertargetSize;
 
+		void* WindowId;
+		core::rect<s32>* SceneSourceRect;
+
 		D3DCAPS8 Caps;
 
 		E_VERTEX_TYPE LastVertexType;
@@ -284,6 +297,7 @@ namespace video
 		f32 MaxLightDistance;
 		s32 LastSetLight;
 		bool DeviceLost;
+		bool DriverWasReset;
 
 		SColorf AmbientLight;
 	};
diff --git a/src/dep/src/irrlicht/CD3D8MaterialRenderer.h b/src/dep/src/irrlicht/CD3D8MaterialRenderer.h
index af2d8a9..4a3f2c9 100644
--- a/src/dep/src/irrlicht/CD3D8MaterialRenderer.h
+++ b/src/dep/src/irrlicht/CD3D8MaterialRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -85,7 +85,7 @@ public:
 			E_MODULATE_FUNC modulate;
 			unpack_texureBlendFunc ( srcFact, dstFact, modulate, material.MaterialTypeParam );
 
-			if (srcFact == EBF_SRC_COLOR && dstFact == EBF_ZERO) 
+			if (srcFact == EBF_SRC_COLOR && dstFact == EBF_ZERO)
 				pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
 			else
 			{
@@ -116,6 +116,12 @@ public:
 
 	}
 
+	//! Returns if the material is transparent.
+	virtual bool isTransparent() const
+	{
+		return true;
+	}
+
 	private:
 
 		u32 getD3DBlend ( E_BLEND_FACTOR factor ) const
@@ -219,8 +225,6 @@ public:
 			pID3DDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCCOLOR);
 		}
 
-		((SMaterial&)material).ZWriteEnable = false;
-
 		services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 	}
 
@@ -257,8 +261,6 @@ public:
 			pID3DDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
 		}
 
-		((SMaterial&)material).ZWriteEnable = false;
-
 		services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 	}
 
@@ -297,17 +299,11 @@ public:
 			pID3DDevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
 			pID3DDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );
 
-			s32 refValue = core::floor32(material.MaterialTypeParam * 255.f);
-			if ( !refValue )
-				refValue = 127; // default value
-
-			pID3DDevice->SetRenderState(D3DRS_ALPHAREF, refValue);
-            pID3DDevice->SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
+			pID3DDevice->SetRenderState(D3DRS_ALPHAREF, core::floor32(material.MaterialTypeParam * 255.f));
+			pID3DDevice->SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
 			pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, TRUE);
 		}
 
-		((SMaterial&)material).ZWriteEnable = false;
-
 		services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 	}
 
@@ -343,22 +339,17 @@ public:
 			pID3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
 			pID3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
 
-			pID3DDevice->SetTextureStageState( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-			pID3DDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+			pID3DDevice->SetTextureStageState( 1, D3DTSS_COLOROP, D3DTOP_DISABLE );
+			pID3DDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE );
 
 			pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
 
-			s32 refValue = core::floor32(material.MaterialTypeParam * 255.f);
-			if ( !refValue )
-				refValue = 127; // default value
-
-            pID3DDevice->SetRenderState(D3DRS_ALPHAREF,refValue);
-            pID3DDevice->SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
+			// 127 is required by EMT_TRANSPARENT_ALPHA_CHANNEL_REF
+			pID3DDevice->SetRenderState(D3DRS_ALPHAREF, 127);
+			pID3DDevice->SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
 			pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, TRUE);
 		}
 
-		((SMaterial&)material).ZWriteEnable = false;
-
 		services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 	}
 
diff --git a/src/dep/src/irrlicht/CD3D8NormalMapRenderer.cpp b/src/dep/src/irrlicht/CD3D8NormalMapRenderer.cpp
index da197b2..5f03131 100644
--- a/src/dep/src/irrlicht/CD3D8NormalMapRenderer.cpp
+++ b/src/dep/src/irrlicht/CD3D8NormalMapRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -115,6 +115,11 @@ namespace video
 		: CD3D8ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial), 
 		CompiledShaders(true)
 	{
+
+		#ifdef _DEBUG
+		setDebugName("CD3D8NormalMapRenderer");
+		#endif
+
 		// set this as callback. We could have done this in 
 		// the initialization list, but some compilers don't like it.
 
@@ -151,8 +156,12 @@ namespace video
 			// compile shaders on our own
 			init(outMaterialTypeNr, D3D8_NORMAL_MAP_VSH, D3D8_NORMAL_MAP_PSH, EVT_TANGENTS);
 		}
+		// something failed, use base material
+		if (-1==outMaterialTypeNr)
+			driver->addMaterialRenderer(this);
 	}
 
+
 	CD3D8NormalMapRenderer::~CD3D8NormalMapRenderer()
 	{
 		if (CallBack == this)
@@ -166,6 +175,7 @@ namespace video
 		}
 	}
 
+
 	bool CD3D8NormalMapRenderer::OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
 	{
 		if (vtxtype != video::EVT_TANGENTS)
diff --git a/src/dep/src/irrlicht/CD3D8NormalMapRenderer.h b/src/dep/src/irrlicht/CD3D8NormalMapRenderer.h
index f998f42..c4eb526 100644
--- a/src/dep/src/irrlicht/CD3D8NormalMapRenderer.h
+++ b/src/dep/src/irrlicht/CD3D8NormalMapRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CD3D8ParallaxMapRenderer.cpp b/src/dep/src/irrlicht/CD3D8ParallaxMapRenderer.cpp
index ec78e8b..abe64a7 100644
--- a/src/dep/src/irrlicht/CD3D8ParallaxMapRenderer.cpp
+++ b/src/dep/src/irrlicht/CD3D8ParallaxMapRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -149,6 +149,11 @@ namespace video
 		: CD3D8ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial), 
 		CompiledShaders(true), CurrentScale(0.0f)
 	{
+
+		#ifdef _DEBUG
+		setDebugName("CD3D8ParallaxMapRenderer");
+		#endif
+
 		// set this as callback. We could have done this in 
 		// the initialization list, but some compilers don't like it.
 
@@ -185,8 +190,12 @@ namespace video
 			// compile shaders on our own
 			init(outMaterialTypeNr, D3D8_PARALLAX_MAP_VSH, D3D8_PARALLAX_MAP_PSH, EVT_TANGENTS);
 		}
+		// something failed, use base material
+		if (-1==outMaterialTypeNr)
+			driver->addMaterialRenderer(this);
 	}
 
+
 	CD3D8ParallaxMapRenderer::~CD3D8ParallaxMapRenderer()
 	{
 		if (CallBack == this)
@@ -200,6 +209,7 @@ namespace video
 		}
 	}
 
+
 	bool CD3D8ParallaxMapRenderer::OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
 	{
 		if (vtxtype != video::EVT_TANGENTS)
@@ -211,6 +221,7 @@ namespace video
 		return CD3D8ShaderMaterialRenderer::OnRender(service, vtxtype);
 	}
 
+
 	void CD3D8ParallaxMapRenderer::OnSetMaterial(const video::SMaterial& material, 
 		const video::SMaterial& lastMaterial,
 		bool resetAllRenderstates, video::IMaterialRendererServices* services)
@@ -221,6 +232,7 @@ namespace video
 		CurrentScale = material.MaterialTypeParam;
 	}
 
+
 	//! Returns the render capability of the material. 
 	s32 CD3D8ParallaxMapRenderer::getRenderCapability() const
 	{
@@ -232,8 +244,8 @@ namespace video
 	}
 
 
-	//! Called by the engine when the vertex and/or pixel shader constants for an
-	//! material renderer should be set.
+	//! Called by the engine when the vertex and/or pixel shader constants
+	//! for an material renderer should be set.
 	void CD3D8ParallaxMapRenderer::OnSetConstants(IMaterialRendererServices* services, s32 userData)
 	{
 		video::IVideoDriver* driver = services->getVideoDriver();
@@ -263,7 +275,7 @@ namespace video
 		// here we've got to fetch the fixed function lights from the driver
 		// and set them as constants
 
-		u32 cnt = driver->getDynamicLightCount();
+		const u32 cnt = driver->getDynamicLightCount();
 		
 		for (u32 i=0; i<2; ++i)
 		{
@@ -290,7 +302,7 @@ namespace video
 		services->setVertexShaderConstant(c96, 96, 1);
 
 		// set scale factor
-        f32 factor = 0.02f; // default value
+		f32 factor = 0.02f; // default value
 		if (CurrentScale != 0)
 			factor = CurrentScale;
 
diff --git a/src/dep/src/irrlicht/CD3D8ParallaxMapRenderer.h b/src/dep/src/irrlicht/CD3D8ParallaxMapRenderer.h
index cd5d316..53bd89a 100644
--- a/src/dep/src/irrlicht/CD3D8ParallaxMapRenderer.h
+++ b/src/dep/src/irrlicht/CD3D8ParallaxMapRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CD3D8ShaderMaterialRenderer.cpp b/src/dep/src/irrlicht/CD3D8ShaderMaterialRenderer.cpp
index add9eab..88c3a1b 100644
--- a/src/dep/src/irrlicht/CD3D8ShaderMaterialRenderer.cpp
+++ b/src/dep/src/irrlicht/CD3D8ShaderMaterialRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,16 +21,21 @@
 
 namespace irr
 {
-namespace video  
+namespace video
 {
 
 //! Public constructor
-CD3D8ShaderMaterialRenderer::CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev, video::IVideoDriver* driver, 
+CD3D8ShaderMaterialRenderer::CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev, video::IVideoDriver* driver,
 		s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram,
 		IShaderConstantSetCallBack* callback, IMaterialRenderer* baseMaterial, s32 userData)
 : pID3DDevice(d3ddev), Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
 	VertexShader(0), OldVertexShader(0), PixelShader(0), UserData(userData)
 {
+
+	#ifdef _DEBUG
+	setDebugName("CD3D8ShaderMaterialRenderer");
+	#endif
+
 	if (BaseMaterial)
 		BaseMaterial->grab();
 
@@ -43,7 +48,7 @@ CD3D8ShaderMaterialRenderer::CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3dde
 //! constructor only for use by derived classes who want to
 //! create a fall back material for example.
 CD3D8ShaderMaterialRenderer::CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev,
-														 video::IVideoDriver* driver, 
+														 video::IVideoDriver* driver,
 														 IShaderConstantSetCallBack* callback,
 														 IMaterialRenderer* baseMaterial,
 														 s32 userData)
@@ -105,17 +110,17 @@ bool CD3D8ShaderMaterialRenderer::OnRender(IMaterialRendererServices* service, E
 
 
 void CD3D8ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial,
-	bool resetAllRenderstates, video::IMaterialRendererServices* services) 
+	bool resetAllRenderstates, video::IMaterialRendererServices* services)
 {
 	if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
 	{
 		if (VertexShader)
 		{
-			// We do not need to save and reset the old vertex shader, because 
+			// We do not need to save and reset the old vertex shader, because
 			// in D3D8, this is mixed up with the fvf, and this is set by the driver
 			// every time.
 			//pID3DDevice->GetVertexShader(&OldVertexShader);
-			
+
 			// set new vertex shader
 			if (FAILED(pID3DDevice->SetVertexShader(VertexShader)))
 				os::Printer::log("Could not set vertex shader.");
@@ -132,12 +137,16 @@ void CD3D8ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material
 			BaseMaterial->OnSetMaterial(material, material, true, services);
 	}
 
+	//let callback know used material
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
+
 	services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 }
 
-void CD3D8ShaderMaterialRenderer::OnUnsetMaterial() 
+void CD3D8ShaderMaterialRenderer::OnUnsetMaterial()
 {
-	// We do not need to save and reset the old vertex shader, because 
+	// We do not need to save and reset the old vertex shader, because
 	// in D3D8, this is mixed up with the fvf, and this is set by the driver
 	// every time.
 	//	if (VertexShader)
@@ -150,12 +159,12 @@ void CD3D8ShaderMaterialRenderer::OnUnsetMaterial()
 		BaseMaterial->OnUnsetMaterial();
 }
 
-	
+
 //! Returns if the material is transparent. The scene managment needs to know this
 //! for being able to sort the materials by opaque and transparent.
 bool CD3D8ShaderMaterialRenderer::isTransparent()  const
 {
-	return BaseMaterial ? BaseMaterial->isTransparent() : false; 
+	return BaseMaterial ? BaseMaterial->isTransparent() : false;
 }
 
 bool CD3D8ShaderMaterialRenderer::createPixelShader(const c8* pxsh)
@@ -178,7 +187,7 @@ bool CD3D8ShaderMaterialRenderer::createPixelShader(const c8* pxsh)
 		// compile shader and emitt some debug informations to
 		// make it possible to debug the shader in visual studio
 
-		static int irr_dbg_file_nr = 0; 
+		static int irr_dbg_file_nr = 0;
 		++irr_dbg_file_nr;
 		char tmp[32];
 		sprintf(tmp, "irr_d3d8_dbg_shader_%d.psh", irr_dbg_file_nr);
@@ -189,7 +198,7 @@ bool CD3D8ShaderMaterialRenderer::createPixelShader(const c8* pxsh)
 		fclose(f);
 
 		D3DXAssembleShaderFromFile(tmp, D3DXASM_DEBUG, 0, &code, &errors);
-		
+
 	#endif
 
 	if (errors)
@@ -237,7 +246,7 @@ bool CD3D8ShaderMaterialRenderer::createVertexShader(const char* vtxsh, E_VERTEX
 
 		// compile shader and emitt some debug informations to
 		// make it possible to debug the shader in visual studio
-		static int irr_dbg_file_nr = 0; 
+		static int irr_dbg_file_nr = 0;
 		++irr_dbg_file_nr;
 		char tmp[32];
 		sprintf(tmp, "irr_d3d8_dbg_shader_%d.vsh", irr_dbg_file_nr);
@@ -293,7 +302,7 @@ bool CD3D8ShaderMaterialRenderer::createVertexShader(const char* vtxsh, E_VERTEX
 	if (type == EVT_TANGENTS)
 		decl = dwTngtDecl;
 	else
-		decl = dwStdDecl;	
+		decl = dwStdDecl;
 
 	if (FAILED(pID3DDevice->CreateVertexShader(decl,
 		(DWORD*)code->GetBufferPointer(), &VertexShader, 0)))
diff --git a/src/dep/src/irrlicht/CD3D8ShaderMaterialRenderer.h b/src/dep/src/irrlicht/CD3D8ShaderMaterialRenderer.h
index 91bd8a4..a50573d 100644
--- a/src/dep/src/irrlicht/CD3D8ShaderMaterialRenderer.h
+++ b/src/dep/src/irrlicht/CD3D8ShaderMaterialRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CD3D8Texture.cpp b/src/dep/src/irrlicht/CD3D8Texture.cpp
index d073488..e3afb07 100644
--- a/src/dep/src/irrlicht/CD3D8Texture.cpp
+++ b/src/dep/src/irrlicht/CD3D8Texture.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -32,7 +32,7 @@ namespace video
 
 //! rendertarget constructor
 CD3D8Texture::CD3D8Texture(CD3D8Driver* driver, core::dimension2d<s32> size, const char* name)
-: ITexture(name), Image(0), Texture(0), RTTSurface(0), Driver(driver),
+: ITexture(name), Texture(0), RTTSurface(0), Driver(driver),
 	TextureSize(size), ImageSize(size), Pitch(0),
 	HasMipMaps(false), IsRenderTarget(true)
 {
@@ -51,7 +51,7 @@ CD3D8Texture::CD3D8Texture(CD3D8Driver* driver, core::dimension2d<s32> size, con
 //! constructor
 CD3D8Texture::CD3D8Texture(IImage* image, CD3D8Driver* driver,
 				u32 flags, const char* name)
-: ITexture(name), Image(image), Texture(0), RTTSurface(0), Driver(driver),
+: ITexture(name), Texture(0), RTTSurface(0), Driver(driver),
 TextureSize(0,0), ImageSize(0,0), Pitch(0),
 HasMipMaps(false), IsRenderTarget(false)
 {
@@ -65,13 +65,11 @@ HasMipMaps(false), IsRenderTarget(false)
 	if (Device)
 		Device->AddRef();
 
-	if (Image)
+	if (image)
 	{
-		Image->grab();
-
-		if (createTexture(flags))
+		if (createTexture(image, flags))
 		{
-			if (copyTexture() && generateMipLevels)
+			if (copyTexture(image) && generateMipLevels)
 			{
 				// create mip maps.
 
@@ -100,32 +98,29 @@ HasMipMaps(false), IsRenderTarget(false)
 //! destructor
 CD3D8Texture::~CD3D8Texture()
 {
-	if (Device)
-		Device->Release();
-
-	if (Image)
-		Image->drop();
-
 	if (Texture)
 		Texture->Release();
 
 	if (RTTSurface)
 		RTTSurface->Release();
+
+	if (Device)
+		Device->Release();
 }
 
 
 //! creates the hardware texture
-bool CD3D8Texture::createTexture(u32 flags)
+bool CD3D8Texture::createTexture(video::IImage* image, u32 flags)
 {
 	core::dimension2d<s32> optSize;
-	ImageSize = Image->getDimension();
+	ImageSize = image->getDimension();
 
 	if (Driver->queryFeature(EVDF_TEXTURE_NPOT))
 		optSize=ImageSize;
 	else
 	{
-		optSize.Width = getTextureSizeFromImageSize(ImageSize.Width);
-		optSize.Height = getTextureSizeFromImageSize(ImageSize.Height);
+		optSize.Width = getTextureSizeFromSurfaceSize(ImageSize.Width);
+		optSize.Height = getTextureSizeFromSurfaceSize(ImageSize.Height);
 	}
 
 	HRESULT hr;
@@ -139,7 +134,7 @@ bool CD3D8Texture::createTexture(u32 flags)
 		format = D3DFMT_A8R8G8B8; break;
 	case ETCF_OPTIMIZED_FOR_QUALITY:
 		{
-			switch(Image->getColorFormat())
+			switch(image->getColorFormat())
 			{
 			case ECF_R8G8B8:
 			case ECF_A8R8G8B8:
@@ -153,7 +148,7 @@ bool CD3D8Texture::createTexture(u32 flags)
 	case ETCF_OPTIMIZED_FOR_SPEED:
 		format = D3DFMT_A1R5G5B5; break;
 	}
-	if (false && Driver->getTextureCreationFlag(video::ETCF_NO_ALPHA_CHANNEL))
+	if (Driver->getTextureCreationFlag(video::ETCF_NO_ALPHA_CHANNEL))
 	{
 		if (format == D3DFMT_A8R8G8B8)
 			format = D3DFMT_R8G8B8;
@@ -187,11 +182,10 @@ bool CD3D8Texture::createTexture(u32 flags)
 }
 
 
-
 //! copies the image to the texture
-bool CD3D8Texture::copyTexture()
+bool CD3D8Texture::copyTexture(video::IImage* image)
 {
-	if (Texture && Image)
+	if (Texture && image)
 	{
 		D3DSURFACE_DESC desc;
 		Texture->GetLevelDesc(0, &desc);
@@ -208,7 +202,7 @@ bool CD3D8Texture::copyTexture()
 		}
 
 		Pitch = rect.Pitch;
-		Image->copyToScaling(rect.pBits, TextureSize.Width, TextureSize.Height, ColorFormat, Pitch);
+		image->copyToScaling(rect.pBits, TextureSize.Width, TextureSize.Height, ColorFormat, Pitch);
 
 		hr = Texture->UnlockRect(0);
 		if (FAILED(hr))
@@ -223,7 +217,7 @@ bool CD3D8Texture::copyTexture()
 
 
 //! lock function
-void* CD3D8Texture::lock()
+void* CD3D8Texture::lock(bool readOnly)
 {
 	if (!Texture)
 		return 0;
@@ -232,7 +226,7 @@ void* CD3D8Texture::lock()
 	D3DLOCKED_RECT rect;
 	if(!IsRenderTarget)
 	{
-		hr = Texture->LockRect(0, &rect, 0, 0);
+		hr = Texture->LockRect(0, &rect, 0, readOnly?D3DLOCK_READONLY:0);
 	}
 	else
 	{
@@ -248,21 +242,21 @@ void* CD3D8Texture::lock()
 			}
 		}
 
-		IDirect3DSurface8 *surface = NULL;
+		IDirect3DSurface8 *surface = 0;
 		hr = Texture->GetSurfaceLevel(0, &surface);
 		if (FAILED(hr))
 		{
 			os::Printer::log("Could not lock DIRECT3D8 Texture.", ELL_ERROR);
 			return 0;
 		}
-		hr = Device->CopyRects(surface, NULL, 0, RTTSurface, NULL);
+		hr = Device->CopyRects(surface, 0, 0, RTTSurface, 0);
 		surface->Release();
 		if(FAILED(hr))
 		{
 			os::Printer::log("Could not lock DIRECT3D8 Texture.", ELL_ERROR);
 			return 0;
 		}
-		hr = RTTSurface->LockRect(&rect, NULL, 0);
+		hr = RTTSurface->LockRect(&rect, 0, readOnly?D3DLOCK_READONLY:0);
 		if(FAILED(hr))
 		{
 			os::Printer::log("Could not lock DIRECT3D8 Texture.", ELL_ERROR);
@@ -280,7 +274,6 @@ void* CD3D8Texture::lock()
 }
 
 
-
 //! unlock function
 void CD3D8Texture::unlock()
 {
@@ -309,7 +302,7 @@ const core::dimension2d<s32>& CD3D8Texture::getSize() const
 
 
 //! returns the size of a texture which would be the optimize size for rendering it
-inline s32 CD3D8Texture::getTextureSizeFromImageSize(s32 size) const
+inline s32 CD3D8Texture::getTextureSizeFromSurfaceSize(s32 size) const
 {
 	s32 ts = 0x01;
 
@@ -559,8 +552,8 @@ void CD3D8Texture::copy32BitMipMap(char* src, char* tgt,
 
 void CD3D8Texture::createRenderTarget()
 {
-	TextureSize.Width = getTextureSizeFromImageSize(TextureSize.Width);
-	TextureSize.Height = getTextureSizeFromImageSize(TextureSize.Height);
+	TextureSize.Width = getTextureSizeFromSurfaceSize(TextureSize.Width);
+	TextureSize.Height = getTextureSizeFromSurfaceSize(TextureSize.Height);
 
 	// get backbuffer format to create the render target in the
 	// same format
diff --git a/src/dep/src/irrlicht/CD3D8Texture.h b/src/dep/src/irrlicht/CD3D8Texture.h
index a5c2679..41735ef 100644
--- a/src/dep/src/irrlicht/CD3D8Texture.h
+++ b/src/dep/src/irrlicht/CD3D8Texture.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -37,7 +37,7 @@ public:
 	virtual ~CD3D8Texture();
 
 	//! lock function
-	virtual void* lock();
+	virtual void* lock(bool readOnly = false);
 
 	//! unlock function
 	virtual void unlock();
@@ -74,17 +74,18 @@ public:
 	IDirect3DSurface8* getRenderTargetSurface();
 
 private:
+	friend class CD3D8Driver;
 
 	void createRenderTarget();
 
 	//! returns the size of a texture which would be the optimize size for rendering it
-	inline s32 getTextureSizeFromImageSize(s32 size) const;
+	inline s32 getTextureSizeFromSurfaceSize(s32 size) const;
 
 	//! creates the hardware texture
-	bool createTexture(u32 flags);
+	bool createTexture(IImage* Image, u32 flags);
 
 	//! copies the image to the texture
-	bool copyTexture();
+	bool copyTexture(IImage* Image);
 
 	//! convert color formats
 	ECOLOR_FORMAT getColorFormatFromD3DFormat(D3DFORMAT format);
@@ -97,7 +98,6 @@ private:
 	void copy32BitMipMap(char* src, char* tgt,
 		s32 width, s32 height, s32 pitchsrc, s32 pitchtgt) const;
 
-	IImage* Image;
 	IDirect3DDevice8* Device;
 	IDirect3DTexture8* Texture;
 	IDirect3DSurface8* RTTSurface;
diff --git a/src/dep/src/irrlicht/CD3D9Driver.cpp b/src/dep/src/irrlicht/CD3D9Driver.cpp
index e85342d..6993a25 100644
--- a/src/dep/src/irrlicht/CD3D9Driver.cpp
+++ b/src/dep/src/irrlicht/CD3D9Driver.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -30,9 +30,10 @@ CD3D9Driver::CD3D9Driver(const core::dimension2d<s32>& screenSize, HWND window,
 : CNullDriver(io, screenSize), CurrentRenderMode(ERM_NONE),
 	ResetRenderStates(true), Transformation3DChanged(false), StencilBuffer(stencilbuffer),
 	D3DLibrary(0), pID3D(0), pID3DDevice(0), PrevRenderTarget(0),
+	WindowId(0), SceneSourceRect(0),
 	LastVertexType((video::E_VERTEX_TYPE)-1), MaxTextureUnits(0), MaxUserClipPlanes(0),
-	MaxLightDistance(sqrtf(FLT_MAX)), LastSetLight(-1), DeviceLost(false),
-	Fullscreen(fullscreen)
+	MaxLightDistance(sqrtf(FLT_MAX)), LastSetLight(-1), ColorFormat(ECF_A8R8G8B8), DeviceLost(false),
+	Fullscreen(fullscreen), DriverWasReset(true)
 {
 	#ifdef _DEBUG
 	setDebugName("CD3D9Driver");
@@ -64,12 +65,14 @@ CD3D9Driver::CD3D9Driver(const core::dimension2d<s32>& screenSize, HWND window,
 }
 
 
-
 //! destructor
 CD3D9Driver::~CD3D9Driver()
 {
 	deleteMaterialRenders();
 
+	// drop the main depth buffer
+	DepthBuffers[0]->drop();
+
 	// drop d3d9
 
 	if (pID3DDevice)
@@ -80,7 +83,6 @@ CD3D9Driver::~CD3D9Driver()
 }
 
 
-
 void CD3D9Driver::createMaterialRenderers()
 {
 	// create D3D9 material renderers
@@ -150,14 +152,14 @@ void CD3D9Driver::createMaterialRenderers()
 }
 
 
-
 //! initialises the Direct3D API
-bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd,
-				u32 bits, bool fullScreen, bool pureSoftware,
-				bool highPrecisionFPU, bool vsync, bool antiAlias)
+bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize,
+		HWND hwnd, u32 bits, bool fullScreen, bool pureSoftware,
+		bool highPrecisionFPU, bool vsync, bool antiAlias)
 {
 	HRESULT hr;
 	Fullscreen = fullScreen;
+	CurrentDepthBufferSize = screenSize;
 
 	if (!pID3D)
 	{
@@ -202,6 +204,18 @@ bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 		sprintf(tmp, "%s %s %d.%d.%d.%d", dai.Description, dai.Driver, Product, Version,
 			SubVersion, Build);
 		os::Printer::log(tmp, ELL_INFORMATION);
+
+		// Assign vendor name based on vendor id.
+		switch(dai.VendorId)
+		{
+			case 0x1002 : vendorName = "ATI Technologies Inc."; break;
+			case 0x10DE : vendorName = "NVIDIA Corporation"; break;
+			case 0x102B : vendorName = "Matrox Electronic Systems Ltd."; break;
+			case 0x121A : vendorName = "3dfx Interactive Inc"; break;
+			case 0x5333 : vendorName = "S3 Graphics Co., Ltd."; break;
+			case 0x8086 : vendorName = "Intel Corporation"; break;
+			default: vendorName = "Unknown VendorId: ";vendorName += (u32)dai.VendorId; break;
+		}
 	}
 
 	D3DDISPLAYMODE d3ddm;
@@ -241,9 +255,22 @@ bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 		present.Windowed		= TRUE;
 	}
 
+	UINT adapter = D3DADAPTER_DEFAULT;
 	D3DDEVTYPE devtype = D3DDEVTYPE_HAL;
 	#ifndef _IRR_D3D_NO_SHADER_DEBUGGING
 	devtype = D3DDEVTYPE_REF;
+	#elif defined(_IRR_USE_NVIDIA_PERFHUD_)
+	for (UINT adapter_i = 0; adapter_i < pID3D->GetAdapterCount(); ++adapter_i)
+	{
+		D3DADAPTER_IDENTIFIER9 identifier;
+		pID3D->GetAdapterIdentifier(adapter_i,0,&identifier);
+		if (strstr(identifier.Description,"PerfHUD") != 0)
+		{
+			adapter = adapter_i;
+			devtype = D3DDEVTYPE_REF;
+			break;
+		}
+	}
 	#endif
 
 	// enable anti alias if possible and desired
@@ -251,33 +278,33 @@ bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 	{
 		DWORD qualityLevels = 0;
 
-		if (SUCCEEDED(pID3D->CheckDeviceMultiSampleType(D3DADAPTER_DEFAULT,
-		           devtype, present.BackBufferFormat, !fullScreen,
-		           D3DMULTISAMPLE_4_SAMPLES, &qualityLevels)))
+		if (SUCCEEDED(pID3D->CheckDeviceMultiSampleType(adapter,
+				devtype, present.BackBufferFormat, !fullScreen,
+				D3DMULTISAMPLE_4_SAMPLES, &qualityLevels)))
 		{
 			// enable multi sampling
-			present.MultiSampleType    = D3DMULTISAMPLE_4_SAMPLES;
+			present.MultiSampleType	= D3DMULTISAMPLE_4_SAMPLES;
 			present.MultiSampleQuality = qualityLevels-1;
-			present.SwapEffect         = D3DSWAPEFFECT_DISCARD;
+			present.SwapEffect		 = D3DSWAPEFFECT_DISCARD;
 		}
 		else
-		if (SUCCEEDED(pID3D->CheckDeviceMultiSampleType(D3DADAPTER_DEFAULT,
-		           devtype, present.BackBufferFormat, !fullScreen,
-		           D3DMULTISAMPLE_2_SAMPLES, &qualityLevels)))
+		if (SUCCEEDED(pID3D->CheckDeviceMultiSampleType(adapter,
+				devtype, present.BackBufferFormat, !fullScreen,
+				D3DMULTISAMPLE_2_SAMPLES, &qualityLevels)))
 		{
 			// enable multi sampling
-			present.MultiSampleType    = D3DMULTISAMPLE_2_SAMPLES;
+			present.MultiSampleType	= D3DMULTISAMPLE_2_SAMPLES;
 			present.MultiSampleQuality = qualityLevels-1;
-			present.SwapEffect         = D3DSWAPEFFECT_DISCARD;
+			present.SwapEffect		 = D3DSWAPEFFECT_DISCARD;
 		}
 		else
-		if (SUCCEEDED(pID3D->CheckDeviceMultiSampleType(D3DADAPTER_DEFAULT,
+		if (SUCCEEDED(pID3D->CheckDeviceMultiSampleType(adapter,
 					devtype, present.BackBufferFormat, !fullScreen,
 					D3DMULTISAMPLE_NONMASKABLE, &qualityLevels)))
 		{
 			// enable non maskable multi sampling
-			present.SwapEffect         = D3DSWAPEFFECT_DISCARD;
-			present.MultiSampleType    = D3DMULTISAMPLE_NONMASKABLE;
+			present.SwapEffect		 = D3DSWAPEFFECT_DISCARD;
+			present.MultiSampleType	= D3DMULTISAMPLE_NONMASKABLE;
 			present.MultiSampleQuality = qualityLevels-1;
 		}
 		else
@@ -291,17 +318,17 @@ bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 	if (StencilBuffer)
 	{
 		present.AutoDepthStencilFormat = D3DFMT_D24S8;
-		if(FAILED(pID3D->CheckDeviceFormat(D3DADAPTER_DEFAULT, devtype,
+		if(FAILED(pID3D->CheckDeviceFormat(adapter, devtype,
 			present.BackBufferFormat, D3DUSAGE_DEPTHSTENCIL,
 			D3DRTYPE_SURFACE, present.AutoDepthStencilFormat)))
 		{
 			present.AutoDepthStencilFormat = D3DFMT_D24X4S4;
-			if(FAILED(pID3D->CheckDeviceFormat(D3DADAPTER_DEFAULT, devtype,
+			if(FAILED(pID3D->CheckDeviceFormat(adapter, devtype,
 				present.BackBufferFormat, D3DUSAGE_DEPTHSTENCIL,
 				D3DRTYPE_SURFACE, present.AutoDepthStencilFormat)))
 			{
 				present.AutoDepthStencilFormat = D3DFMT_D15S1;
-				if(FAILED(pID3D->CheckDeviceFormat(D3DADAPTER_DEFAULT, devtype,
+				if(FAILED(pID3D->CheckDeviceFormat(adapter, devtype,
 					present.BackBufferFormat, D3DUSAGE_DEPTHSTENCIL,
 					D3DRTYPE_SURFACE, present.AutoDepthStencilFormat)))
 				{
@@ -311,7 +338,7 @@ bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 			}
 		}
 		else
-		if(FAILED(pID3D->CheckDepthStencilMatch(D3DADAPTER_DEFAULT, devtype,
+		if(FAILED(pID3D->CheckDepthStencilMatch(adapter, devtype,
 			present.BackBufferFormat, present.BackBufferFormat, present.AutoDepthStencilFormat)))
 		{
 			os::Printer::log("Depth-stencil format is not compatible with display format, disabling stencil buffer.", ELL_WARNING);
@@ -322,17 +349,17 @@ bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 	if (!StencilBuffer)
 	{
 		present.AutoDepthStencilFormat = D3DFMT_D32;
-		if(FAILED(pID3D->CheckDeviceFormat(D3DADAPTER_DEFAULT, devtype,
+		if(FAILED(pID3D->CheckDeviceFormat(adapter, devtype,
 			present.BackBufferFormat, D3DUSAGE_DEPTHSTENCIL,
 			D3DRTYPE_SURFACE, present.AutoDepthStencilFormat)))
 		{
 			present.AutoDepthStencilFormat = D3DFMT_D24X8;
-			if(FAILED(pID3D->CheckDeviceFormat(D3DADAPTER_DEFAULT, devtype,
+			if(FAILED(pID3D->CheckDeviceFormat(adapter, devtype,
 				present.BackBufferFormat, D3DUSAGE_DEPTHSTENCIL,
 				D3DRTYPE_SURFACE, present.AutoDepthStencilFormat)))
 			{
 				present.AutoDepthStencilFormat = D3DFMT_D16;
-				if(FAILED(pID3D->CheckDeviceFormat(D3DADAPTER_DEFAULT, devtype,
+				if(FAILED(pID3D->CheckDeviceFormat(adapter, devtype,
 					present.BackBufferFormat, D3DUSAGE_DEPTHSTENCIL,
 					D3DRTYPE_SURFACE, present.AutoDepthStencilFormat)))
 				{
@@ -356,15 +383,15 @@ bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 	}
 	else
 	{
-		hr = pID3D->CreateDevice(D3DADAPTER_DEFAULT, devtype, hwnd,
+		hr = pID3D->CreateDevice(adapter, devtype, hwnd,
 				fpuPrecision | D3DCREATE_HARDWARE_VERTEXPROCESSING, &present, &pID3DDevice);
 
 		if(FAILED(hr))
-			hr = pID3D->CreateDevice(D3DADAPTER_DEFAULT, devtype, hwnd,
+			hr = pID3D->CreateDevice(adapter, devtype, hwnd,
 					fpuPrecision | D3DCREATE_MIXED_VERTEXPROCESSING , &present, &pID3DDevice);
 
 		if(FAILED(hr))
-			hr = pID3D->CreateDevice(D3DADAPTER_DEFAULT, devtype, hwnd,
+			hr = pID3D->CreateDevice(adapter, devtype, hwnd,
 					fpuPrecision | D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present, &pID3DDevice);
 
 		if (FAILED(hr))
@@ -403,7 +430,7 @@ bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 	// set exposed data
 	ExposedData.D3D9.D3D9 = pID3D;
 	ExposedData.D3D9.D3DDev9 = pID3DDevice;
-	ExposedData.D3D9.HWnd =  reinterpret_cast<s32>(hwnd);
+	ExposedData.D3D9.HWnd = hwnd;
 
 	ResetRenderStates = true;
 
@@ -422,31 +449,57 @@ bool CD3D9Driver::initDriver(const core::dimension2d<s32>& screenSize, HWND hwnd
 	pID3DDevice->SetSamplerState(2, D3DSAMP_MAXANISOTROPY, min(16ul, Caps.MaxAnisotropy));
 	pID3DDevice->SetSamplerState(3, D3DSAMP_MAXANISOTROPY, min(16ul, Caps.MaxAnisotropy));
 
+	// store the screen's depth buffer
+	DepthBuffers.push_back(new SDepthSurface());
+	pID3DDevice->GetDepthStencilSurface(&(DepthBuffers[0]->Surface));
+	DepthBuffers[0]->Size=ScreenSize;
+
+	D3DColorFormat = D3DFMT_A8R8G8B8;
+	IDirect3DSurface9* bb=0;
+	if (SUCCEEDED(pID3DDevice->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &bb)))
+	{
+		D3DSURFACE_DESC desc;
+		bb->GetDesc(&desc);
+		D3DColorFormat = desc.Format;
+
+		if (D3DColorFormat == D3DFMT_X8R8G8B8)
+			D3DColorFormat = D3DFMT_A8R8G8B8;
+
+		bb->Release();
+	}
+	ColorFormat = getColorFormatFromD3DFormat(D3DColorFormat);
+
 	// so far so good.
 	return true;
 }
 
 
-
 //! applications must call this method before performing any rendering. returns false if failed.
-bool CD3D9Driver::beginScene(bool backBuffer, bool zBuffer, SColor color)
+bool CD3D9Driver::beginScene(bool backBuffer, bool zBuffer, SColor color,
+		void* windowId, core::rect<s32>* sourceRect)
 {
-	CNullDriver::beginScene(backBuffer, zBuffer, color);
-	HRESULT hr;
+	CNullDriver::beginScene(backBuffer, zBuffer, color, windowId, sourceRect);
+	WindowId = windowId;
+	SceneSourceRect = sourceRect;
 
 	if (!pID3DDevice)
 		return false;
 
+	HRESULT hr;
 	if (DeviceLost)
 	{
-		if(FAILED(hr = pID3DDevice->TestCooperativeLevel()))
+		if (FAILED(hr = pID3DDevice->TestCooperativeLevel()))
 		{
 			if (hr == D3DERR_DEVICELOST)
-				return false;
+			{
+				Sleep(100);
+				hr = pID3DDevice->TestCooperativeLevel();
+				if (hr == D3DERR_DEVICELOST)
+					return false;
+			}
 
-			if (hr == D3DERR_DEVICENOTRESET)
-				reset();
-			return false;
+			if ((hr == D3DERR_DEVICENOTRESET) && !reset())
+				return false;
 		}
 	}
 
@@ -476,14 +529,11 @@ bool CD3D9Driver::beginScene(bool backBuffer, bool zBuffer, SColor color)
 }
 
 
-
 //! applications must call this method after performing any rendering. returns false if failed.
-bool CD3D9Driver::endScene( s32 windowId, core::rect<s32>* sourceRect )
+bool CD3D9Driver::endScene()
 {
-	if (DeviceLost)
-		return false;
-
 	CNullDriver::endScene();
+	DriverWasReset=false;
 
 	HRESULT hr = pID3DDevice->EndScene();
 	if (FAILED(hr))
@@ -494,37 +544,47 @@ bool CD3D9Driver::endScene( s32 windowId, core::rect<s32>* sourceRect )
 
 	RECT* srcRct = 0;
 	RECT sourceRectData;
-	if ( sourceRect )
+	if ( SceneSourceRect )
 	{
 		srcRct = &sourceRectData;
-		sourceRectData.left = sourceRect->UpperLeftCorner.X;
-		sourceRectData.top = sourceRect->UpperLeftCorner.Y;
-		sourceRectData.right = sourceRect->LowerRightCorner.X;
-		sourceRectData.bottom = sourceRect->LowerRightCorner.Y;
+		sourceRectData.left = SceneSourceRect->UpperLeftCorner.X;
+		sourceRectData.top = SceneSourceRect->UpperLeftCorner.Y;
+		sourceRectData.right = SceneSourceRect->LowerRightCorner.X;
+		sourceRectData.bottom = SceneSourceRect->LowerRightCorner.Y;
 	}
 
-	hr = pID3DDevice->Present(srcRct, NULL, (HWND)windowId, NULL);
+	hr = pID3DDevice->Present(srcRct, NULL, (HWND)WindowId, NULL);
+
+	if (SUCCEEDED(hr))
+		return true;
 
 	if (hr == D3DERR_DEVICELOST)
 	{
 		DeviceLost = true;
-		os::Printer::log("DIRECT3D9 device lost.", ELL_WARNING);
+		os::Printer::log("Present failed", "DIRECT3D9 device lost.", ELL_WARNING);
+	}
+#ifdef D3DERR_DEVICEREMOVED
+	else if (hr == D3DERR_DEVICEREMOVED)
+	{
+		os::Printer::log("Present failed", "Device removed.", ELL_WARNING);
+	}
+#endif
+	else if (hr == D3DERR_INVALIDCALL)
+	{
+		os::Printer::log("Present failed", "Invalid Call", ELL_WARNING);
 	}
 	else
-	if (FAILED(hr) && hr != D3DERR_INVALIDCALL)
-	{
 		os::Printer::log("DIRECT3D9 present failed.", ELL_WARNING);
-		return false;
-	}
-
-	return true;
+	return false;
 }
 
 
-
 //! queries the features of the driver, returns true if feature is available
 bool CD3D9Driver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 {
+	if (!FeatureEnabled[feature])
+		return false;
+
 	switch (feature)
 	{
 	case EVDF_MULTITEXTURE:
@@ -537,11 +597,11 @@ bool CD3D9Driver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 	case EVDF_MIP_MAP:
 		return (Caps.TextureCaps & D3DPTEXTURECAPS_MIPMAP) != 0;
 	case EVDF_MIP_MAP_AUTO_UPDATE:
-		// always return false because a lot of drivers claim they do 
+		// always return false because a lot of drivers claim they do
 		// this but actually don't do this at all.
 		return false; //(Caps.Caps2 & D3DCAPS2_CANAUTOGENMIPMAP) != 0;
 	case EVDF_STENCIL_BUFFER:
-		return StencilBuffer &&  Caps.StencilCaps;
+		return StencilBuffer && Caps.StencilCaps;
 	case EVDF_VERTEX_SHADER_1_1:
 		return Caps.VertexShaderVersion >= D3DVS_VERSION(1,1);
 	case EVDF_VERTEX_SHADER_2_0:
@@ -562,6 +622,8 @@ bool CD3D9Driver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 		return Caps.PixelShaderVersion >= D3DPS_VERSION(3,0);
 	case EVDF_HLSL:
 		return Caps.VertexShaderVersion >= D3DVS_VERSION(1,1);
+	case EVDF_TEXTURE_NSQUARE:
+		return (Caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) == 0;
 	case EVDF_TEXTURE_NPOT:
 		return (Caps.TextureCaps & D3DPTEXTURECAPS_POW2) == 0;
 	default:
@@ -570,9 +632,9 @@ bool CD3D9Driver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 }
 
 
-
 //! sets transformation
-void CD3D9Driver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat)
+void CD3D9Driver::setTransform(E_TRANSFORMATION_STATE state,
+		const core::matrix4& mat)
 {
 	Transformation3DChanged = true;
 
@@ -592,11 +654,8 @@ void CD3D9Driver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4
 	case ETS_TEXTURE_2:
 	case ETS_TEXTURE_3:
 		pID3DDevice->SetTextureStageState( state - ETS_TEXTURE_0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2 );
-		if (mat.isIdentity())
-			pID3DDevice->SetTransform( (D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0+ ( state - ETS_TEXTURE_0 )), &UnitMatrixD3D9 );
-		else
-			pID3DDevice->SetTransform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0+ ( state - ETS_TEXTURE_0 )),
-				(D3DMATRIX*)((void*)mat.pointer()));
+		pID3DDevice->SetTransform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0+ ( state - ETS_TEXTURE_0 )),
+			(D3DMATRIX*)((void*)mat.pointer()));
 		break;
 	case ETS_COUNT:
 		break;
@@ -606,7 +665,6 @@ void CD3D9Driver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4
 }
 
 
-
 //! sets the current Texture
 bool CD3D9Driver::setTexture(s32 stage, const video::ITexture* texture)
 {
@@ -634,7 +692,6 @@ bool CD3D9Driver::setTexture(s32 stage, const video::ITexture* texture)
 }
 
 
-
 //! sets a material
 void CD3D9Driver::setMaterial(const SMaterial& material)
 {
@@ -649,17 +706,17 @@ void CD3D9Driver::setMaterial(const SMaterial& material)
 }
 
 
-
 //! returns a device dependent texture from a software surface (IImage)
-video::ITexture* CD3D9Driver::createDeviceDependentTexture(IImage* surface, const char* name)
+video::ITexture* CD3D9Driver::createDeviceDependentTexture(IImage* surface,
+		const char* name)
 {
 	return new CD3D9Texture(surface, this, TextureCreationFlags, name);
 }
 
 
-
 //! Enables or disables a texture creation flag.
-void CD3D9Driver::setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enabled)
+void CD3D9Driver::setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag,
+		bool enabled)
 {
 	if (flag == video::ETCF_CREATE_MIP_MAPS && !queryFeature(EVDF_MIP_MAP))
 		enabled = false;
@@ -668,11 +725,9 @@ void CD3D9Driver::setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enab
 }
 
 
-
 //! sets a render target
 bool CD3D9Driver::setRenderTarget(video::ITexture* texture,
-			bool clearBackBuffer, bool clearZBuffer,
-			SColor color)
+		bool clearBackBuffer, bool clearZBuffer, SColor color)
 {
 	// check for right driver type
 
@@ -684,20 +739,13 @@ bool CD3D9Driver::setRenderTarget(video::ITexture* texture,
 
 	// check for valid render target
 
-	CD3D9Texture* tex = (CD3D9Texture*)texture;
-
-	if (texture && !tex->isRenderTarget())
+	if (texture && !texture->isRenderTarget())
 	{
 		os::Printer::log("Fatal Error: Tried to set a non render target texture as render target.", ELL_ERROR);
 		return false;
 	}
 
-	if (texture && (tex->getSize().Width > ScreenSize.Width ||
-		tex->getSize().Height > ScreenSize.Height ))
-	{
-		os::Printer::log("Error: Tried to set a render target texture which is bigger than the screen.", ELL_ERROR);
-		return false;
-	}
+	CD3D9Texture* tex = static_cast<CD3D9Texture*>(texture);
 
 	// check if we should set the previous RT back
 
@@ -712,6 +760,10 @@ bool CD3D9Driver::setRenderTarget(video::ITexture* texture,
 				os::Printer::log("Error: Could not set back to previous render target.", ELL_ERROR);
 				ret = false;
 			}
+			if (FAILED(pID3DDevice->SetDepthStencilSurface(DepthBuffers[0]->Surface)))
+			{
+				os::Printer::log("Error: Could not set main depth buffer.", ELL_ERROR);
+			}
 
 			CurrentRendertargetSize = core::dimension2d<s32>(0,0);
 			PrevRenderTarget->Release();
@@ -725,11 +777,13 @@ bool CD3D9Driver::setRenderTarget(video::ITexture* texture,
 		// store previous target
 
 		if (!PrevRenderTarget)
+		{
 			if (FAILED(pID3DDevice->GetRenderTarget(0, &PrevRenderTarget)))
 			{
 				os::Printer::log("Could not get previous render target.", ELL_ERROR);
 				return false;
 			}
+		}
 
 		// set new render target
 
@@ -738,8 +792,12 @@ bool CD3D9Driver::setRenderTarget(video::ITexture* texture,
 			os::Printer::log("Error: Could not set render target.", ELL_ERROR);
 			return false;
 		}
-
 		CurrentRendertargetSize = tex->getSize();
+
+		if (FAILED(pID3DDevice->SetDepthStencilSurface(tex->DepthSurface->Surface)))
+		{
+			os::Printer::log("Error: Could not set new depth buffer.", ELL_ERROR);
+		}
 	}
 
 	if (clearBackBuffer || clearZBuffer)
@@ -759,12 +817,11 @@ bool CD3D9Driver::setRenderTarget(video::ITexture* texture,
 }
 
 
-
 //! sets a viewport
 void CD3D9Driver::setViewPort(const core::rect<s32>& area)
 {
 	core::rect<s32> vp = area;
-	core::rect<s32> rendert(0,0, ScreenSize.Width, ScreenSize.Height);
+	core::rect<s32> rendert(0,0, getCurrentRenderTargetSize().Width, getCurrentRenderTargetSize().Height);
 	vp.clipAgainst(rendert);
 
 	D3DVIEWPORT9 viewPort;
@@ -786,7 +843,6 @@ void CD3D9Driver::setViewPort(const core::rect<s32>& area)
 }
 
 
-
 //! gets the area of the current viewport
 const core::rect<s32>& CD3D9Driver::getViewPort() const
 {
@@ -794,14 +850,265 @@ const core::rect<s32>& CD3D9Driver::getViewPort() const
 }
 
 
+bool CD3D9Driver::updateVertexHardwareBuffer(SHWBufferLink_d3d9 *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	const scene::IMeshBuffer* mb = HWBuffer->MeshBuffer;
+	const void* vertices=mb->getVertices();
+	const u32 vertexCount=mb->getVertexCount();
+	const E_VERTEX_TYPE vType=mb->getVertexType();
+	const u32 vertexSize = getVertexPitchFromType(vType);
+
+	void* pLockedBuffer = 0;
+
+	if (!HWBuffer->vertexBuffer || vertexSize * vertexCount > HWBuffer->vertexBufferSize)
+	{
+		DWORD flags = 0;
+
+		u32 vertexSize;
+		DWORD FVF;
+
+		// Get the vertex sizes and cvf
+		switch (vType)
+		{
+			case EVT_STANDARD:
+				vertexSize = sizeof(S3DVertex);
+				FVF = D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX1;
+				break;
+			case EVT_2TCOORDS:
+				vertexSize = sizeof(S3DVertex2TCoords);
+				FVF = D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX2;
+				break;
+			case EVT_TANGENTS:
+				vertexSize = sizeof(S3DVertexTangents);
+				FVF = D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX3;
+				break;
+			default:
+				return false;
+		}
+
+		flags = D3DUSAGE_WRITEONLY; // SIO2: Default to D3DUSAGE_WRITEONLY
+		if(HWBuffer->Mapped_Vertex != scene::EHM_STATIC)
+			flags |= D3DUSAGE_DYNAMIC;
+
+		pID3DDevice->CreateVertexBuffer(vertexCount * vertexSize, flags, FVF, D3DPOOL_DEFAULT, &HWBuffer->vertexBuffer, NULL);
+
+		if(!HWBuffer->vertexBuffer)
+			return false;
+
+		flags = 0; // SIO2: Reset flags before Lock
+		if(HWBuffer->Mapped_Vertex != scene::EHM_STATIC)
+			flags = D3DLOCK_DISCARD;
+
+		HWBuffer->vertexBuffer->Lock(0, vertexCount * vertexSize, (void**)&pLockedBuffer, flags);
+		memcpy(pLockedBuffer, vertices, vertexCount * vertexSize);
+		HWBuffer->vertexBuffer->Unlock();
+
+		HWBuffer->vertexBufferSize = vertexCount * vertexSize;
+	}
+	else
+	{
+		HWBuffer->vertexBuffer->Lock(0, vertexCount * vertexSize, (void**)&pLockedBuffer, D3DLOCK_DISCARD);
+		memcpy(pLockedBuffer, vertices, vertexCount * vertexSize);
+		HWBuffer->vertexBuffer->Unlock();
+	}
+
+	return true;
+}
+
+
+bool CD3D9Driver::updateIndexHardwareBuffer(SHWBufferLink_d3d9 *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	const scene::IMeshBuffer* mb = HWBuffer->MeshBuffer;
+	const u16* indices=mb->getIndices();
+	const u32 indexCount=mb->getIndexCount();
+	u32 indexSize = 2;
+	D3DFORMAT indexType=D3DFMT_UNKNOWN;
+	switch (mb->getIndexType())
+	{
+		case (EIT_16BIT):
+		{
+			indexType=D3DFMT_INDEX16;
+			indexSize = 2;
+			break;
+		}
+		case (EIT_32BIT):
+		{
+			indexType=D3DFMT_INDEX32;
+			indexSize = 4;
+			break;
+		}
+	}
+
+	if (!HWBuffer->indexBuffer || indexSize * indexCount > HWBuffer->indexBufferSize)
+	{
+		DWORD flags = 0;
+
+		flags = D3DUSAGE_WRITEONLY; // SIO2: Default to D3DUSAGE_WRITEONLY
+		if(HWBuffer->Mapped_Index != scene::EHM_STATIC)
+			flags |= D3DUSAGE_DYNAMIC; // SIO2: Add DYNAMIC flag for dynamic buffer data
+
+		if(FAILED(pID3DDevice->CreateIndexBuffer( indexCount * indexSize, flags, indexType, D3DPOOL_DEFAULT, &HWBuffer->indexBuffer, NULL)))
+			return false;
+
+		void* pIndices = 0;
+
+		flags = 0; // SIO2: Reset flags before Lock
+		if(HWBuffer->Mapped_Index != scene::EHM_STATIC)
+			flags = D3DLOCK_DISCARD;
+
+		if(FAILED(HWBuffer->indexBuffer->Lock( 0, 0, (void**)&pIndices, flags)))
+			return false;
+
+		memcpy(pIndices, indices, indexCount * indexSize);
+		HWBuffer->indexBuffer->Unlock();
+
+		HWBuffer->indexBufferSize = indexCount * indexSize;
+	}
+	else
+	{
+		void* pIndices = 0;
+		if( SUCCEEDED(HWBuffer->indexBuffer->Lock( 0, 0, (void**)&pIndices, D3DLOCK_DISCARD)))
+		{
+			memcpy(pIndices, indices, indexCount * indexSize);
+			HWBuffer->indexBuffer->Unlock();
+		}
+	}
+
+	return true;
+}
+
+
+//! updates hardware buffer if needed
+bool CD3D9Driver::updateHardwareBuffer(SHWBufferLink *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	if (HWBuffer->Mapped_Vertex!=scene::EHM_NEVER)
+	{
+		if (HWBuffer->ChangedID_Vertex != HWBuffer->MeshBuffer->getChangedID_Vertex()
+			|| !((SHWBufferLink_d3d9*)HWBuffer)->vertexBuffer)
+		{
+
+			HWBuffer->ChangedID_Vertex = HWBuffer->MeshBuffer->getChangedID_Vertex();
+
+			if (!updateVertexHardwareBuffer((SHWBufferLink_d3d9*)HWBuffer))
+				return false;
+		}
+	}
+
+	if (HWBuffer->Mapped_Index!=scene::EHM_NEVER)
+	{
+		if (HWBuffer->ChangedID_Index != HWBuffer->MeshBuffer->getChangedID_Index()
+			|| !((SHWBufferLink_d3d9*)HWBuffer)->indexBuffer)
+		{
+
+			HWBuffer->ChangedID_Index = HWBuffer->MeshBuffer->getChangedID_Index();
+
+			if (!updateIndexHardwareBuffer((SHWBufferLink_d3d9*)HWBuffer))
+				return false;
+		}
+	}
+
+	return true;
+}
+
+
+//! Create hardware buffer from meshbuffer
+CD3D9Driver::SHWBufferLink *CD3D9Driver::createHardwareBuffer(const scene::IMeshBuffer* mb)
+{
+	if (!mb || (mb->getHardwareMappingHint_Index()==scene::EHM_NEVER && mb->getHardwareMappingHint_Vertex()==scene::EHM_NEVER))
+		return 0;
+
+	SHWBufferLink_d3d9 *HWBuffer=new SHWBufferLink_d3d9(mb);
+
+	//add to map
+	HWBufferMap.insert(HWBuffer->MeshBuffer, HWBuffer);
+
+	HWBuffer->ChangedID_Vertex=HWBuffer->MeshBuffer->getChangedID_Vertex();
+	HWBuffer->ChangedID_Index=HWBuffer->MeshBuffer->getChangedID_Index();
+	HWBuffer->Mapped_Vertex=mb->getHardwareMappingHint_Vertex();
+	HWBuffer->Mapped_Index=mb->getHardwareMappingHint_Index();
+	HWBuffer->LastUsed=0;
+	HWBuffer->vertexBuffer=0;
+	HWBuffer->indexBuffer=0;
+	HWBuffer->vertexBufferSize=0;
+	HWBuffer->indexBufferSize=0;
+
+	if (!updateHardwareBuffer(HWBuffer))
+	{
+		deleteHardwareBuffer(HWBuffer);
+		return 0;
+	}
+
+	return HWBuffer;
+}
+
+
+void CD3D9Driver::deleteHardwareBuffer(SHWBufferLink *_HWBuffer)
+{
+	if (!_HWBuffer) return;
+
+	SHWBufferLink_d3d9 *HWBuffer=(SHWBufferLink_d3d9*)_HWBuffer;
+	if (HWBuffer->indexBuffer)
+	{
+		HWBuffer->indexBuffer->Release();
+		HWBuffer->indexBuffer = 0;
+	}
+
+	if (HWBuffer->vertexBuffer)
+	{
+		HWBuffer->vertexBuffer->Release();
+		HWBuffer->vertexBuffer = 0;
+	}
+
+	CNullDriver::deleteHardwareBuffer(_HWBuffer);
+}
+
+
+//! Draw hardware buffer
+void CD3D9Driver::drawHardwareBuffer(SHWBufferLink *_HWBuffer)
+{
+	if (!_HWBuffer)
+		return;
+
+	SHWBufferLink_d3d9 *HWBuffer=(SHWBufferLink_d3d9*)_HWBuffer;
+
+	updateHardwareBuffer(HWBuffer); //check if update is needed
+
+	HWBuffer->LastUsed=0;//reset count
+
+	const scene::IMeshBuffer* mb = HWBuffer->MeshBuffer;
+	const E_VERTEX_TYPE vType = mb->getVertexType();
+	const u32 stride = getVertexPitchFromType(vType);
+	if (HWBuffer->vertexBuffer) pID3DDevice->SetStreamSource(0, HWBuffer->vertexBuffer, 0, stride);
+	if (HWBuffer->indexBuffer) pID3DDevice->SetIndices(HWBuffer->indexBuffer);
+
+	drawVertexPrimitiveList(0, mb->getVertexCount(), 0, mb->getIndexCount()/3, mb->getVertexType(), scene::EPT_TRIANGLES, mb->getIndexType());
+
+	if (HWBuffer->vertexBuffer)
+		pID3DDevice->SetStreamSource(0, 0, 0, 0);
+	if (HWBuffer->indexBuffer)
+		pID3DDevice->SetIndices(0);
+}
+
 
 //! draws a vertex primitive list
-void CD3D9Driver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType)
+void CD3D9Driver::drawVertexPrimitiveList(const void* vertices,
+		u32 vertexCount, const void* indexList, u32 primitiveCount,
+		E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType,
+		E_INDEX_TYPE iType)
 {
 	if (!checkPrimitiveCount(primitiveCount))
 		return;
 
-	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType);
+	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType,iType);
 
 	if (!vertexCount || !primitiveCount)
 		return;
@@ -810,6 +1117,25 @@ void CD3D9Driver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
 
 	const u32 stride = getVertexPitchFromType(vType);
 
+
+	D3DFORMAT indexType=D3DFMT_UNKNOWN;
+
+
+
+	switch (iType)
+	{
+		case (EIT_16BIT):
+		{
+			indexType=D3DFMT_INDEX16;
+			break;
+		}
+		case (EIT_32BIT):
+		{
+			indexType=D3DFMT_INDEX32;
+			break;
+		}
+	}
+
 	if (setRenderStates3DMode())
 	{
 		switch (pType)
@@ -827,51 +1153,93 @@ void CD3D9Driver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
 				pID3DDevice->SetRenderState(D3DRS_POINTSIZE_MIN, *(DWORD*)(&tmp));
 				pID3DDevice->SetRenderState(D3DRS_POINTSCALE_A, *(DWORD*)(&tmp));
 				pID3DDevice->SetRenderState(D3DRS_POINTSCALE_B, *(DWORD*)(&tmp));
-				pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_POINTLIST, 0, vertexCount,
-					primitiveCount, indexList, D3DFMT_INDEX16, vertices, stride);
+
+				if (!vertices)
+				{
+					pID3DDevice->DrawIndexedPrimitive(D3DPT_POINTLIST, 0, 0, vertexCount, 0, primitiveCount);
+				}
+				else
+				{
+					pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_POINTLIST, 0, vertexCount,
+					primitiveCount, indexList, indexType, vertices, stride);
+				}
+
 				pID3DDevice->SetRenderState(D3DRS_POINTSCALEENABLE, FALSE);
 				if (pType==scene::EPT_POINT_SPRITES)
 					pID3DDevice->SetRenderState(D3DRS_POINTSPRITEENABLE, FALSE);
 			}
 				break;
 			case scene::EPT_LINE_STRIP:
-				pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_LINESTRIP, 0, vertexCount,
-					primitiveCount, indexList, D3DFMT_INDEX16, vertices, stride);
+				if(!vertices)
+					pID3DDevice->DrawIndexedPrimitive(D3DPT_LINESTRIP, 0, 0, vertexCount, 0, primitiveCount);
+				else
+					pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_LINESTRIP, 0, vertexCount,
+						primitiveCount, indexList, indexType, vertices, stride);
 				break;
 			case scene::EPT_LINE_LOOP:
-			{
-				pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_LINESTRIP, 0, vertexCount,
-					primitiveCount, indexList, D3DFMT_INDEX16, vertices, stride);
-				u16 tmpIndices[] = {0, primitiveCount};
-				pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_LINELIST, 0, vertexCount,
-					1, tmpIndices, D3DFMT_INDEX16, vertices, stride);
-			}
+				if(!vertices)
+				{
+					// TODO: Implement proper hardware support for this primitive type.
+					// (No looping occurs currently because this would require a way to
+					// draw the hardware buffer with a custom set of indices. We may even
+					// need to create a new mini index buffer specifically for this
+					// primitive type.)
+					pID3DDevice->DrawIndexedPrimitive(D3DPT_LINELIST, 0, 0, vertexCount, 0, primitiveCount);
+				}
+				else
+				{
+					pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_LINESTRIP, 0, vertexCount,
+					primitiveCount, indexList, indexType, vertices, stride);
+
+					u16 tmpIndices[] = {0, primitiveCount};
+
+					pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_LINELIST, 0, vertexCount,
+						1, tmpIndices, indexType, vertices, stride);
+				}
 				break;
 			case scene::EPT_LINES:
-				pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_LINELIST, 0, vertexCount,
-					primitiveCount, indexList, D3DFMT_INDEX16, vertices, stride);
+				if(!vertices)
+					pID3DDevice->DrawIndexedPrimitive(D3DPT_LINELIST, 0, 0, vertexCount, 0, primitiveCount);
+				else
+					pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_LINELIST, 0, vertexCount,
+						primitiveCount, indexList, indexType, vertices, stride);
 				break;
 			case scene::EPT_TRIANGLE_STRIP:
-				pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_TRIANGLESTRIP, 0, vertexCount,
-					primitiveCount, indexList, D3DFMT_INDEX16, vertices, stride);
+				if(!vertices)
+					pID3DDevice->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP, 0, 0, vertexCount, 0, primitiveCount);
+				else
+					pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_TRIANGLESTRIP, 0, vertexCount, primitiveCount,
+							indexList, indexType, vertices, stride);
 				break;
 			case scene::EPT_TRIANGLE_FAN:
-				pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_TRIANGLEFAN, 0, vertexCount,
-					primitiveCount, indexList, D3DFMT_INDEX16, vertices, stride);
-				break;
+				if(!vertices)
+					pID3DDevice->DrawIndexedPrimitive(D3DPT_TRIANGLEFAN, 0, 0, vertexCount, 0, primitiveCount);
+				else
+					pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_TRIANGLEFAN, 0, vertexCount, primitiveCount,
+							indexList, indexType, vertices, stride);
+					break;
 			case scene::EPT_TRIANGLES:
-				pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_TRIANGLELIST, 0, vertexCount,
-					primitiveCount, indexList, D3DFMT_INDEX16, vertices, stride);
+				if(!vertices)
+				{
+					pID3DDevice->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, 0, 0, vertexCount, 0, primitiveCount);
+				}
+				else
+				{
+					pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_TRIANGLELIST, 0, vertexCount,
+						primitiveCount, indexList, indexType, vertices, stride);
+				}
 				break;
 		}
 	}
 }
 
 
-
-void CD3D9Driver::draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
-		const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect,
-		video::SColor* colors, bool useAlphaChannelOfTexture)
+void CD3D9Driver::draw2DImage(const video::ITexture* texture,
+		const core::rect<s32>& destRect,
+		const core::rect<s32>& sourceRect,
+		const core::rect<s32>* clipRect,
+		const video::SColor* const colors,
+		bool useAlphaChannelOfTexture)
 {
 	if(!texture)
 		return;
@@ -890,9 +1258,9 @@ void CD3D9Driver::draw2DImage(const video::ITexture* texture, const core::rect<s
 	npos.UpperLeftCorner.X = ( destRect.UpperLeftCorner.X * xFact ) - 1.0f;
 	npos.UpperLeftCorner.Y = 1.0f - ( destRect.UpperLeftCorner.Y * yFact );
 	npos.LowerRightCorner.X = ( destRect.LowerRightCorner.X * xFact ) - 1.0f;
-	npos.LowerRightCorner.Y = 1.0f - ( destRect.LowerRightCorner.Y * yFact ); 
+	npos.LowerRightCorner.Y = 1.0f - ( destRect.LowerRightCorner.Y * yFact );
 
-	video::SColor temp[4] =
+	const video::SColor temp[4] =
 	{
 		0xFFFFFFFF,
 		0xFFFFFFFF,
@@ -900,29 +1268,51 @@ void CD3D9Driver::draw2DImage(const video::ITexture* texture, const core::rect<s
 		0xFFFFFFFF
 	};
 
-	video::SColor* useColor = colors ? colors : temp;
+	const video::SColor* const useColor = colors ? colors : temp;
 
 	S3DVertex vtx[4]; // clock wise
-	vtx[0] = S3DVertex(npos.UpperLeftCorner.X, npos.UpperLeftCorner.Y , 0.0f, 0.0f, 0.0f, 0.0f, useColor[0], tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
-	vtx[1] = S3DVertex(npos.LowerRightCorner.X, npos.UpperLeftCorner.Y , 0.0f, 0.0f, 0.0f, 0.0f, useColor[3], tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
-	vtx[2] = S3DVertex(npos.LowerRightCorner.X, npos.LowerRightCorner.Y, 0.0f, 0.0f, 0.0f, 0.0f, useColor[2], tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
-	vtx[3] = S3DVertex(npos.UpperLeftCorner.X, npos.LowerRightCorner.Y, 0.0f, 0.0f, 0.0f, 0.0f, useColor[1], tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
+	vtx[0] = S3DVertex(npos.UpperLeftCorner.X, npos.UpperLeftCorner.Y, 0.0f,
+			0.0f, 0.0f, 0.0f, useColor[0],
+			tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
+	vtx[1] = S3DVertex(npos.LowerRightCorner.X, npos.UpperLeftCorner.Y, 0.0f,
+			0.0f, 0.0f, 0.0f, useColor[3],
+			tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
+	vtx[2] = S3DVertex(npos.LowerRightCorner.X, npos.LowerRightCorner.Y, 0.0f,
+			0.0f, 0.0f, 0.0f, useColor[2],
+			tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
+	vtx[3] = S3DVertex(npos.UpperLeftCorner.X, npos.LowerRightCorner.Y, 0.0f,
+			0.0f, 0.0f, 0.0f, useColor[1],
+			tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
 
 	s16 indices[6] = {0,1,2,0,2,3};
 
-	setRenderStates2DMode(useColor[0].getAlpha()<255 || useColor[1].getAlpha()<255 || useColor[2].getAlpha()<255 || useColor[3].getAlpha()<255, true, useAlphaChannelOfTexture);
+	setRenderStates2DMode(useColor[0].getAlpha()<255 || useColor[1].getAlpha()<255 ||
+			useColor[2].getAlpha()<255 || useColor[3].getAlpha()<255,
+			true, useAlphaChannelOfTexture);
 
 	setTexture(0, const_cast<video::ITexture*>(texture));
 
 	setVertexShader(EVT_STANDARD);
 
+	if (clipRect)
+	{
+		pID3DDevice->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE);
+		RECT scissor;
+		scissor.left = clipRect->UpperLeftCorner.X;
+		scissor.top = clipRect->UpperLeftCorner.Y;
+		scissor.right = clipRect->LowerRightCorner.X;
+		scissor.bottom = clipRect->LowerRightCorner.Y;
+		pID3DDevice->SetScissorRect(&scissor);
+	}
+
 	pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_TRIANGLELIST, 0, 4, 2, &indices[0],
 				D3DFMT_INDEX16,&vtx[0], sizeof(S3DVertex));
 
+	if (clipRect)
+		pID3DDevice->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);
 }
 
 
-
 //! draws a 2d image, using a color and the alpha channel of the texture if
 //! desired. The image is drawn at pos and clipped against clipRect (if != 0).
 void CD3D9Driver::draw2DImage(const video::ITexture* texture,
@@ -1039,10 +1429,18 @@ void CD3D9Driver::draw2DImage(const video::ITexture* texture,
 	setRenderStates2DMode(color.getAlpha()<255, true, useAlphaChannelOfTexture);
 
 	S3DVertex vtx[4];
-	vtx[0] = S3DVertex((f32)(poss.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-poss.UpperLeftCorner.Y ) * yFact , 0.0f, 0.0f, 0.0f, 0.0f, color, tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
-	vtx[1] = S3DVertex((f32)(poss.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus- poss.UpperLeftCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, color, tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
-	vtx[2] = S3DVertex((f32)(poss.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus-poss.LowerRightCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, color, tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
-	vtx[3] = S3DVertex((f32)(poss.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-poss.LowerRightCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, color, tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
+	vtx[0] = S3DVertex((f32)(poss.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-poss.UpperLeftCorner.Y ) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, color,
+			tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
+	vtx[1] = S3DVertex((f32)(poss.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus- poss.UpperLeftCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, color,
+			tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
+	vtx[2] = S3DVertex((f32)(poss.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus-poss.LowerRightCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, color,
+			tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
+	vtx[3] = S3DVertex((f32)(poss.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-poss.LowerRightCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, color,
+			tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
 
 	s16 indices[6] = {0,1,2,0,2,3};
 
@@ -1053,7 +1451,6 @@ void CD3D9Driver::draw2DImage(const video::ITexture* texture,
 }
 
 
-
 //!Draws a 2d rectangle with a gradient.
 void CD3D9Driver::draw2DRectangle(const core::rect<s32>& position,
 	SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
@@ -1076,10 +1473,14 @@ void CD3D9Driver::draw2DRectangle(const core::rect<s32>& position,
 	f32 yFact = 2.0f / renderTargetSize.Height;
 
 	S3DVertex vtx[4];
-	vtx[0] = S3DVertex((f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.UpperLeftCorner.Y) * yFact , 0.0f, 0.0f, 0.0f, 0.0f, colorLeftUp, 0.0f, 0.0f);
-	vtx[1] = S3DVertex((f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus- pos.UpperLeftCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, colorRightUp, 0.0f, 1.0f);
-	vtx[2] = S3DVertex((f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, colorRightDown, 1.0f, 0.0f);
-	vtx[3] = S3DVertex((f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.0f, 0.0f, 0.0f, 0.0f, colorLeftDown, 1.0f, 1.0f);
+	vtx[0] = S3DVertex((f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.UpperLeftCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, colorLeftUp, 0.0f, 0.0f);
+	vtx[1] = S3DVertex((f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus- pos.UpperLeftCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, colorRightUp, 0.0f, 1.0f);
+	vtx[2] = S3DVertex((f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, colorRightDown, 1.0f, 0.0f);
+	vtx[3] = S3DVertex((f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.0f,
+			0.0f, 0.0f, 0.0f, colorLeftDown, 1.0f, 1.0f);
 
 	s16 indices[6] = {0,1,2,0,2,3};
 
@@ -1138,6 +1539,28 @@ void CD3D9Driver::draw2DLine(const core::position2d<s32>& start,
 					&vtx[0], sizeof(S3DVertex) );
 }
 
+//! Draws a pixel
+void CD3D9Driver::drawPixel(u32 x, u32 y, const SColor & color)
+{
+	const core::dimension2d<s32>& renderTargetSize = getCurrentRenderTargetSize();
+	if(x > (u32)renderTargetSize.Width || y > (u32)renderTargetSize.Height)
+		return;
+
+	setRenderStates2DMode(color.getAlpha() < 255, false, false);
+	setTexture(0,0);
+
+	setVertexShader(EVT_STANDARD);
+
+	const s32 xPlus = -renderTargetSize.Width / 2;
+	const f32 xFact = 2.0f / renderTargetSize.Width;
+	const s32 yPlus = renderTargetSize.Height / 2;
+	const f32 yFact = 2.0f / renderTargetSize.Height;
+	S3DVertex vertex((f32)((s32)x + xPlus) * xFact,
+					(f32)(yPlus - (s32)y) * yFact,
+					0.f, 0.f, 0.f, 0.f, color, 0.f, 0.f);
+
+	pID3DDevice->DrawPrimitiveUP(D3DPT_POINTLIST, 1, &vertex, sizeof(vertex));
+}
 
 
 //! sets right vertex shader
@@ -1160,7 +1583,7 @@ void CD3D9Driver::setVertexShader(E_VERTEX_TYPE newType)
 			hr = pID3DDevice->SetFVF(D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX3 |
 				D3DFVF_TEXCOORDSIZE2(0) | // real texture coord
 				D3DFVF_TEXCOORDSIZE3(1) | // misuse texture coord 2 for tangent
-				D3DFVF_TEXCOORDSIZE3(2)   // misuse texture coord 3 for binormal
+				D3DFVF_TEXCOORDSIZE3(2) // misuse texture coord 3 for binormal
 				);
 			break;
 		}
@@ -1223,7 +1646,6 @@ bool CD3D9Driver::setRenderStates3DMode()
 }
 
 
-
 //! Can be called by an IMaterialRenderer to make its work easier.
 void CD3D9Driver::setBasicRenderStates(const SMaterial& material, const SMaterial& lastmaterial,
 	bool resetAllRenderstates)
@@ -1297,9 +1719,9 @@ void CD3D9Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 	}
 
 	// zwrite
-	if (resetAllRenderstates || lastmaterial.ZWriteEnable != material.ZWriteEnable)
+//	if (resetAllRenderstates || (lastmaterial.ZWriteEnable != material.ZWriteEnable))
 	{
-		if ( material.ZWriteEnable )
+		if ( material.ZWriteEnable && (AllowZWriteOnTransparent || !material.isTransparent()))
 			pID3DDevice->SetRenderState( D3DRS_ZWRITEENABLE, TRUE);
 		else
 			pID3DDevice->SetRenderState( D3DRS_ZWRITEENABLE, FALSE);
@@ -1307,12 +1729,18 @@ void CD3D9Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 
 	// back face culling
 
-	if (resetAllRenderstates || lastmaterial.BackfaceCulling != material.BackfaceCulling)
+	if (resetAllRenderstates || (lastmaterial.FrontfaceCulling != material.FrontfaceCulling) || (lastmaterial.BackfaceCulling != material.BackfaceCulling))
 	{
-		if (material.BackfaceCulling)
-			pID3DDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_CCW);
+//		if (material.FrontfaceCulling && material.BackfaceCulling)
+//			pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW|D3DCULL_CCW);
+//		else
+		if (material.FrontfaceCulling)
+			pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW);
 		else
-			pID3DDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_NONE);
+		if (material.BackfaceCulling)
+			pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CCW);
+		else
+			pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
 	}
 
 	// fog
@@ -1326,20 +1754,19 @@ void CD3D9Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 	{
 		bool enable = (material.Shininess!=0.0f);
 		pID3DDevice->SetRenderState(D3DRS_SPECULARENABLE, enable);
-		pID3DDevice->SetRenderState(D3DRS_NORMALIZENORMALS, enable);
 		pID3DDevice->SetRenderState(D3DRS_SPECULARMATERIALSOURCE, D3DMCS_MATERIAL);
 	}
 
 	// normalization
 	if (resetAllRenderstates || lastmaterial.NormalizeNormals != material.NormalizeNormals)
 	{
-		pID3DDevice->SetRenderState(D3DRS_NORMALIZENORMALS,  material.NormalizeNormals);
+		pID3DDevice->SetRenderState(D3DRS_NORMALIZENORMALS, material.NormalizeNormals);
 	}
 
 	// thickness
 	if (resetAllRenderstates || lastmaterial.Thickness != material.Thickness)
 	{
-		pID3DDevice->SetRenderState(D3DRS_POINTSIZE,  *((DWORD*)&material.Thickness));
+		pID3DDevice->SetRenderState(D3DRS_POINTSIZE, *((DWORD*)&material.Thickness));
 	}
 
 	// texture address mode
@@ -1364,7 +1791,7 @@ void CD3D9Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 					mode=D3DTADDRESS_BORDER;
 					break;
 			}
-	
+
 			pID3DDevice->SetSamplerState(st, D3DSAMP_ADDRESSU, mode );
 			pID3DDevice->SetSamplerState(st, D3DSAMP_ADDRESSV, mode );
 		}
@@ -1377,8 +1804,10 @@ void CD3D9Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 		{
 			if (material.TextureLayer[st].BilinearFilter || material.TextureLayer[st].TrilinearFilter || material.TextureLayer[st].AnisotropicFilter)
 			{
-				D3DTEXTUREFILTERTYPE tftMag = ((Caps.TextureFilterCaps & D3DPTFILTERCAPS_MAGFANISOTROPIC) && material.TextureLayer[st].AnisotropicFilter) ? D3DTEXF_ANISOTROPIC : D3DTEXF_LINEAR;
-				D3DTEXTUREFILTERTYPE tftMin = ((Caps.TextureFilterCaps & D3DPTFILTERCAPS_MINFANISOTROPIC) && material.TextureLayer[st].AnisotropicFilter) ? D3DTEXF_ANISOTROPIC : D3DTEXF_LINEAR;
+				D3DTEXTUREFILTERTYPE tftMag = ((Caps.TextureFilterCaps & D3DPTFILTERCAPS_MAGFANISOTROPIC) &&
+						material.TextureLayer[st].AnisotropicFilter) ? D3DTEXF_ANISOTROPIC : D3DTEXF_LINEAR;
+				D3DTEXTUREFILTERTYPE tftMin = ((Caps.TextureFilterCaps & D3DPTFILTERCAPS_MINFANISOTROPIC) &&
+						material.TextureLayer[st].AnisotropicFilter) ? D3DTEXF_ANISOTROPIC : D3DTEXF_LINEAR;
 				D3DTEXTUREFILTERTYPE tftMip = material.TextureLayer[st].TrilinearFilter ? D3DTEXF_LINEAR : D3DTEXF_POINT;
 
 				pID3DDevice->SetSamplerState(st, D3DSAMP_MAGFILTER, tftMag);
@@ -1396,7 +1825,6 @@ void CD3D9Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 }
 
 
-
 //! sets the needed renderstates
 void CD3D9Driver::setRenderStatesStencilShadowMode(bool zfail)
 {
@@ -1428,7 +1856,7 @@ void CD3D9Driver::setRenderStatesStencilShadowMode(bool zfail)
 		pID3DDevice->SetFVF(D3DFVF_XYZ);
 		LastVertexType = (video::E_VERTEX_TYPE)(-1);
 
-		pID3DDevice->SetRenderState( D3DRS_ZWRITEENABLE,  FALSE );
+		pID3DDevice->SetRenderState( D3DRS_ZWRITEENABLE, FALSE );
 		pID3DDevice->SetRenderState( D3DRS_STENCILENABLE, TRUE );
 		pID3DDevice->SetRenderState( D3DRS_SHADEMODE, D3DSHADE_FLAT);
 
@@ -1445,16 +1873,16 @@ void CD3D9Driver::setRenderStatesStencilShadowMode(bool zfail)
 	{
 		// USE THE ZPASS METHOD
 
-		pID3DDevice->SetRenderState( D3DRS_STENCILFUNC,  D3DCMP_ALWAYS );
+		pID3DDevice->SetRenderState( D3DRS_STENCILFUNC, D3DCMP_ALWAYS );
 		pID3DDevice->SetRenderState( D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP );
-		pID3DDevice->SetRenderState( D3DRS_STENCILFAIL,  D3DSTENCILOP_KEEP );
+		pID3DDevice->SetRenderState( D3DRS_STENCILFAIL, D3DSTENCILOP_KEEP );
 
-		pID3DDevice->SetRenderState( D3DRS_STENCILREF,       0x1 );
-		pID3DDevice->SetRenderState( D3DRS_STENCILMASK,      0xffffffff );
+		pID3DDevice->SetRenderState( D3DRS_STENCILREF, 0x1 );
+		pID3DDevice->SetRenderState( D3DRS_STENCILMASK, 0xffffffff );
 		pID3DDevice->SetRenderState( D3DRS_STENCILWRITEMASK, 0xffffffff );
 
 		pID3DDevice->SetRenderState( D3DRS_ALPHABLENDENABLE, TRUE);
-		pID3DDevice->SetRenderState( D3DRS_SRCBLEND,  D3DBLEND_ZERO );
+		pID3DDevice->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_ZERO );
 		pID3DDevice->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_ONE );
 	}
 	else
@@ -1462,17 +1890,17 @@ void CD3D9Driver::setRenderStatesStencilShadowMode(bool zfail)
 	{
 		// USE THE ZFAIL METHOD
 
-		pID3DDevice->SetRenderState( D3DRS_STENCILFUNC,  D3DCMP_ALWAYS );
+		pID3DDevice->SetRenderState( D3DRS_STENCILFUNC, D3DCMP_ALWAYS );
 		pID3DDevice->SetRenderState( D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP );
-		pID3DDevice->SetRenderState( D3DRS_STENCILFAIL,  D3DSTENCILOP_KEEP );
-		pID3DDevice->SetRenderState( D3DRS_STENCILPASS,  D3DSTENCILOP_KEEP );
+		pID3DDevice->SetRenderState( D3DRS_STENCILFAIL, D3DSTENCILOP_KEEP );
+		pID3DDevice->SetRenderState( D3DRS_STENCILPASS, D3DSTENCILOP_KEEP );
 
-		pID3DDevice->SetRenderState( D3DRS_STENCILREF,       0x0 );
-		pID3DDevice->SetRenderState( D3DRS_STENCILMASK,      0xffffffff );
+		pID3DDevice->SetRenderState( D3DRS_STENCILREF, 0x0 );
+		pID3DDevice->SetRenderState( D3DRS_STENCILMASK, 0xffffffff );
 		pID3DDevice->SetRenderState( D3DRS_STENCILWRITEMASK, 0xffffffff );
 
 		pID3DDevice->SetRenderState( D3DRS_ALPHABLENDENABLE, TRUE );
-		pID3DDevice->SetRenderState( D3DRS_SRCBLEND,  D3DBLEND_ZERO );
+		pID3DDevice->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_ZERO );
 		pID3DDevice->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_ONE );
 	}
 
@@ -1480,16 +1908,15 @@ void CD3D9Driver::setRenderStatesStencilShadowMode(bool zfail)
 }
 
 
-
 //! sets the needed renderstates
 void CD3D9Driver::setRenderStatesStencilFillMode(bool alpha)
 {
 	if (CurrentRenderMode != ERM_STENCIL_FILL || Transformation3DChanged)
 	{
 		core::matrix4 mat;
-		pID3DDevice->SetTransform(D3DTS_VIEW, (D3DMATRIX*)((void*)mat.pointer()));
-		pID3DDevice->SetTransform(D3DTS_WORLD, (D3DMATRIX*)((void*)mat.pointer()));
-		pID3DDevice->SetTransform(D3DTS_PROJECTION, (D3DMATRIX*)((void*)mat.pointer()));
+		pID3DDevice->SetTransform(D3DTS_VIEW, &UnitMatrixD3D9);
+		pID3DDevice->SetTransform(D3DTS_WORLD, &UnitMatrixD3D9);
+		pID3DDevice->SetTransform(D3DTS_PROJECTION, &UnitMatrixD3D9);
 
 		pID3DDevice->SetRenderState(D3DRS_ZENABLE, FALSE);
 		pID3DDevice->SetRenderState(D3DRS_LIGHTING, FALSE);
@@ -1507,7 +1934,7 @@ void CD3D9Driver::setRenderStatesStencilFillMode(bool alpha)
 		//pID3DDevice->SetRenderState(D3DRS_STENCILFUNC, D3DCMP_GREATEREQUAL);
 		pID3DDevice->SetRenderState(D3DRS_STENCILPASS, D3DSTENCILOP_KEEP );
 		pID3DDevice->SetRenderState(D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP );
-		pID3DDevice->SetRenderState(D3DRS_STENCILMASK,      0xffffffff );
+		pID3DDevice->SetRenderState(D3DRS_STENCILMASK, 0xffffffff );
 		pID3DDevice->SetRenderState(D3DRS_STENCILWRITEMASK, 0xffffffff );
 
 		pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CCW);
@@ -1516,10 +1943,10 @@ void CD3D9Driver::setRenderStatesStencilFillMode(bool alpha)
 
 		if (alpha)
 		{
-			pID3DDevice->SetTextureStageState(0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			pID3DDevice->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_MODULATE );
 			pID3DDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
 			pID3DDevice->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			pID3DDevice->SetTextureStageState(0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
+			pID3DDevice->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
 			pID3DDevice->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE );
 			pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
 			pID3DDevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
@@ -1527,10 +1954,10 @@ void CD3D9Driver::setRenderStatesStencilFillMode(bool alpha)
 		}
 		else
 		{
-			pID3DDevice->SetTextureStageState(0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			pID3DDevice->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_MODULATE );
 			pID3DDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
 			pID3DDevice->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			pID3DDevice->SetTextureStageState(0, D3DTSS_ALPHAOP,  D3DTOP_DISABLE );
+			pID3DDevice->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_DISABLE );
 			pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
 		}
 	}
@@ -1539,7 +1966,6 @@ void CD3D9Driver::setRenderStatesStencilFillMode(bool alpha)
 }
 
 
-
 //! sets the needed renderstates
 void CD3D9Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChannel)
 {
@@ -1548,42 +1974,40 @@ void CD3D9Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChan
 
 	if (CurrentRenderMode != ERM_2D || Transformation3DChanged)
 	{
-		core::matrix4 mat;
-		pID3DDevice->SetTransform(D3DTS_VIEW, (D3DMATRIX*)((void*)mat.pointer()));
-		pID3DDevice->SetTransform(D3DTS_WORLD, (D3DMATRIX*)((void*)mat.pointer()));
-		pID3DDevice->SetTransform(D3DTS_PROJECTION, (D3DMATRIX*)((void*)mat.pointer()));
+		// unset last 3d material
+		if (CurrentRenderMode != ERM_2D)
+		{
+			if (static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
+				MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
+			setBasicRenderStates(SMaterial(), SMaterial(), true);
+			// everything that is wrongly set by SMaterial default
+			pID3DDevice->SetRenderState(D3DRS_ZENABLE, FALSE);
+			pID3DDevice->SetRenderState(D3DRS_LIGHTING, FALSE);
 
-		pID3DDevice->SetRenderState(D3DRS_ZENABLE, FALSE);
-		//pID3DDevice->SetRenderState(D3DRS_SHADEMODE, D3DSHADE_FLAT);
-		pID3DDevice->SetRenderState(D3DRS_FILLMODE, D3DFILL_SOLID);
-		pID3DDevice->SetRenderState(D3DRS_LIGHTING, FALSE);
-		pID3DDevice->SetRenderState(D3DRS_FOGENABLE, FALSE);
-		pID3DDevice->SetRenderState(D3DRS_SPECULARENABLE, FALSE);
+			pID3DDevice->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_DISABLE);
+			pID3DDevice->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+			pID3DDevice->SetTextureStageState(2, D3DTSS_COLOROP, D3DTOP_DISABLE);
+			pID3DDevice->SetTextureStageState(2, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+			pID3DDevice->SetTextureStageState(3, D3DTSS_COLOROP, D3DTOP_DISABLE);
+			pID3DDevice->SetTextureStageState(3, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
 
-		pID3DDevice->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_DISABLE);
-		pID3DDevice->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-		pID3DDevice->SetTextureStageState(2, D3DTSS_COLOROP, D3DTOP_DISABLE);
-		pID3DDevice->SetTextureStageState(2, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-		pID3DDevice->SetTextureStageState(3, D3DTSS_COLOROP, D3DTOP_DISABLE);
-		pID3DDevice->SetTextureStageState(3, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+			pID3DDevice->SetRenderState( D3DRS_STENCILENABLE, FALSE );
 
-		pID3DDevice->SetRenderState( D3DRS_STENCILENABLE, FALSE );
+			pID3DDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_CCW );
 
-		pID3DDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_CCW );
+			pID3DDevice->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_WRAP );
+			pID3DDevice->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_WRAP );
 
-		pID3DDevice->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_WRAP );
-		pID3DDevice->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_WRAP );
+			pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE );
+			pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, 0);
+			pID3DDevice->SetTransform( D3DTS_TEXTURE0, &UnitMatrixD3D9 );
+		}
 
-		pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE );
-		pID3DDevice->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, 0);
-		pID3DDevice->SetTransform( D3DTS_TEXTURE0, &UnitMatrixD3D9 );
+		pID3DDevice->SetTransform(D3DTS_VIEW, &UnitMatrixD3D9);
+		pID3DDevice->SetTransform(D3DTS_WORLD, &UnitMatrixD3D9);
+		pID3DDevice->SetTransform(D3DTS_PROJECTION, &UnitMatrixD3D9);
 
 		Transformation3DChanged = false;
-
-		// unset last 3d material
-		if (CurrentRenderMode == ERM_3D &&
-			Material.MaterialType >= 0 && Material.MaterialType < (s32)MaterialRenderers.size())
-			MaterialRenderers[Material.MaterialType].Renderer->OnUnsetMaterial();
 	}
 
 	if (texture)
@@ -1594,19 +2018,19 @@ void CD3D9Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChan
 
 		if (alphaChannel)
 		{
-			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_MODULATE );
 			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
 			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
 
 			if (alpha)
 			{
-				pID3DDevice->SetTextureStageState (0, D3DTSS_ALPHAOP,  D3DTOP_MODULATE );
+				pID3DDevice->SetTextureStageState (0, D3DTSS_ALPHAOP, D3DTOP_MODULATE );
 				pID3DDevice->SetTextureStageState (0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
 				pID3DDevice->SetTextureStageState (0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE );
 			}
 			else
 			{
-				pID3DDevice->SetTextureStageState (0, D3DTSS_ALPHAOP,  D3DTOP_SELECTARG1 );
+				pID3DDevice->SetTextureStageState (0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1 );
 				pID3DDevice->SetTextureStageState (0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
 			}
 
@@ -1626,10 +2050,10 @@ void CD3D9Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChan
 			}
 			else
 			{
-				pID3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+				pID3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_MODULATE );
 				pID3DDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
 				pID3DDevice->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-				pID3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP,  D3DTOP_DISABLE);
+				pID3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
 				pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
 			}
 		}
@@ -1638,10 +2062,10 @@ void CD3D9Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChan
 	{
 		if (alpha)
 		{
-			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_MODULATE );
 			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
 			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			pID3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP,  D3DTOP_SELECTARG1);
+			pID3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
 			pID3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE );
 			pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
 			pID3DDevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
@@ -1649,10 +2073,10 @@ void CD3D9Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChan
 		}
 		else
 		{
-			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_MODULATE );
 			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
 			pID3DDevice->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			pID3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP,  D3DTOP_DISABLE);
+			pID3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
 			pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
 		}
 	}
@@ -1661,7 +2085,6 @@ void CD3D9Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChan
 }
 
 
-
 //! deletes all dynamic lights there are
 void CD3D9Driver::deleteAllDynamicLights()
 {
@@ -1674,7 +2097,6 @@ void CD3D9Driver::deleteAllDynamicLights()
 }
 
 
-
 //! adds a dynamic light
 void CD3D9Driver::addDynamicLight(const SLight& dl)
 {
@@ -1721,7 +2143,6 @@ void CD3D9Driver::addDynamicLight(const SLight& dl)
 }
 
 
-
 //! returns the maximal amount of dynamic lights the device can handle
 u32 CD3D9Driver::getMaximalDynamicLightAmount() const
 {
@@ -1729,7 +2150,6 @@ u32 CD3D9Driver::getMaximalDynamicLightAmount() const
 }
 
 
-
 //! Sets the dynamic ambient light color. The default color is
 //! (0,0,0,0) which means it is dark.
 //! \param color: New color of the ambient light.
@@ -1744,7 +2164,6 @@ void CD3D9Driver::setAmbientLight(const SColorf& color)
 }
 
 
-
 //! \return Returns the name of the video driver. Example: In case of the DIRECT3D9
 //! driver, it would return "Direct3D9.0".
 const wchar_t* CD3D9Driver::getName() const
@@ -1753,7 +2172,6 @@ const wchar_t* CD3D9Driver::getName() const
 }
 
 
-
 //! Draws a shadow volume into the stencil buffer. To draw a stencil shadow, do
 //! this: Frist, draw all geometry. Then use this method, to draw the shadow
 //! volume. Then, use IVideoDriver::drawStencilShadow() to visualize the shadow.
@@ -1774,7 +2192,7 @@ void CD3D9Driver::drawStencilShadowVolume(const core::vector3df* triangles, s32
 		pID3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLELIST, count / 3, triangles, sizeof(core::vector3df));
 
 		// Now reverse cull order so front sides of shadow volume are written.
-		pID3DDevice->SetRenderState( D3DRS_CULLMODE,   D3DCULL_CW );
+		pID3DDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_CW );
 		pID3DDevice->SetRenderState( D3DRS_STENCILPASS, D3DSTENCILOP_DECRSAT);
 		pID3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLELIST, count / 3, triangles, sizeof(core::vector3df));
 	}
@@ -1788,14 +2206,13 @@ void CD3D9Driver::drawStencilShadowVolume(const core::vector3df* triangles, s32
 		pID3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLELIST, count / 3, triangles, sizeof(core::vector3df));
 
 		// Now reverse cull order so front sides of shadow volume are written.
-		pID3DDevice->SetRenderState( D3DRS_CULLMODE,   D3DCULL_CCW );
-		pID3DDevice->SetRenderState( D3DRS_STENCILZFAIL,  D3DSTENCILOP_DECRSAT );
+		pID3DDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_CCW );
+		pID3DDevice->SetRenderState( D3DRS_STENCILZFAIL, D3DSTENCILOP_DECRSAT );
 		pID3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLELIST, count / 3, triangles, sizeof(core::vector3df));
 	}
 }
 
 
-
 //! Fills the stencil shadow with color. After the shadow volume has been drawn
 //! into the stencil buffer using IVideoDriver::drawStencilShadowVolume(), use this
 //! to draw the color of the shadow.
@@ -1831,7 +2248,6 @@ void CD3D9Driver::drawStencilShadow(bool clearStencilBuffer, video::SColor leftU
 }
 
 
-
 //! Returns the maximum amount of primitives (mostly vertices) which
 //! the device is able to render with one drawIndexedTriangleList
 //! call.
@@ -1841,7 +2257,6 @@ u32 CD3D9Driver::getMaximalPrimitiveCount() const
 }
 
 
-
 //! Sets the fog mode.
 void CD3D9Driver::setFog(SColor color, bool linearFog, f32 start,
 	f32 end, f32 density, bool pixelFog, bool rangeFog)
@@ -1854,7 +2269,7 @@ void CD3D9Driver::setFog(SColor color, bool linearFog, f32 start,
 	pID3DDevice->SetRenderState(D3DRS_FOGCOLOR, color.color);
 
 	pID3DDevice->SetRenderState(
-		pixelFog  ? D3DRS_FOGTABLEMODE : D3DRS_FOGVERTEXMODE,
+		pixelFog ? D3DRS_FOGTABLEMODE : D3DRS_FOGVERTEXMODE,
 		linearFog ? D3DFOG_LINEAR : D3DFOG_EXP);
 
 	if(linearFog)
@@ -1870,7 +2285,6 @@ void CD3D9Driver::setFog(SColor color, bool linearFog, f32 start,
 }
 
 
-
 //! Draws a 3d line.
 void CD3D9Driver::draw3DLine(const core::vector3df& start,
 	const core::vector3df& end, SColor color)
@@ -1887,22 +2301,91 @@ void CD3D9Driver::draw3DLine(const core::vector3df& start,
 }
 
 
-
 //! resets the device
 bool CD3D9Driver::reset()
 {
-	// reset
-	HRESULT hr;
+	u32 i;
 	os::Printer::log("Resetting D3D9 device.", ELL_INFORMATION);
-	if (FAILED(hr = pID3DDevice->Reset(&present)))
+
+	for (i=0; i<Textures.size(); ++i)
+	{
+		if (Textures[i].Surface->isRenderTarget())
+		{
+			IDirect3DBaseTexture9* tex = ((CD3D9Texture*)(Textures[i].Surface))->getDX9Texture();
+			if (tex)
+				tex->Release();
+		}
+	}
+	for (i=0; i<DepthBuffers.size(); ++i)
+	{
+		if(DepthBuffers[i]->Surface)
+			DepthBuffers[i]->Surface->Release();
+	}
+	// this does not require a restore in the reset method, it's updated
+	// automatically in the next render cycle.
+	removeAllHardwareBuffers();
+
+	DriverWasReset=true;
+
+	HRESULT hr = pID3DDevice->Reset(&present);
+
+	// restore screen depthbuffer
+	pID3DDevice->GetDepthStencilSurface(&(DepthBuffers[0]->Surface));
+	D3DSURFACE_DESC desc;
+	DepthBuffers[0]->Surface->GetDesc(&desc);
+	// restore other depth buffers
+	for (i=1; i<DepthBuffers.size(); ++i)
+	{
+		HRESULT hr=pID3DDevice->CreateDepthStencilSurface(DepthBuffers[i]->Size.Width,
+				DepthBuffers[i]->Size.Height,
+				desc.Format,
+				desc.MultiSampleType,
+				desc.MultiSampleQuality,
+				TRUE,
+				&(DepthBuffers[i]->Surface),
+				NULL); 
+	}
+
+	// restore RTTs
+	for (i=0; i<Textures.size(); ++i)
+	{
+		if (Textures[i].Surface->isRenderTarget())
+			((CD3D9Texture*)(Textures[i].Surface))->createRenderTarget();
+	}
+
+	if (FAILED(hr))
 	{
 		if (hr == D3DERR_DEVICELOST)
 		{
 			DeviceLost = true;
 			os::Printer::log("Resetting failed due to device lost.", ELL_WARNING);
 		}
+#ifdef D3DERR_DEVICEREMOVED
+		else if (hr == D3DERR_DEVICEREMOVED)
+		{
+			os::Printer::log("Resetting failed due to device removed.", ELL_WARNING);
+		}
+#endif
+		else if (hr == D3DERR_DRIVERINTERNALERROR)
+		{
+			os::Printer::log("Resetting failed due to internal error.", ELL_WARNING);
+		}
+		else if (hr == D3DERR_OUTOFVIDEOMEMORY)
+		{
+			os::Printer::log("Resetting failed due to out of memory.", ELL_WARNING);
+		}
+		else if (hr == D3DERR_DEVICENOTRESET)
+		{
+			os::Printer::log("Resetting failed due to not reset.", ELL_WARNING);
+		}
+		else if (hr == D3DERR_INVALIDCALL)
+		{
+			os::Printer::log("Resetting failed due to invalid call", "You need to release some more surfaces.", ELL_WARNING);
+		}
 		else
-			os::Printer::log("Resetting failed.", ELL_WARNING);
+		{
+			os::Printer::log("Resetting failed due to unknown reason.", core::stringc((int)hr).c_str(), ELL_WARNING);
+		}
 		return false;
 	}
 
@@ -1922,7 +2405,6 @@ bool CD3D9Driver::reset()
 }
 
 
-
 void CD3D9Driver::OnResize(const core::dimension2d<s32>& size)
 {
 	if (!pID3DDevice)
@@ -1936,7 +2418,6 @@ void CD3D9Driver::OnResize(const core::dimension2d<s32>& size)
 }
 
 
-
 //! Returns type of video driver
 E_DRIVER_TYPE CD3D9Driver::getDriverType() const
 {
@@ -1944,7 +2425,6 @@ E_DRIVER_TYPE CD3D9Driver::getDriverType() const
 }
 
 
-
 //! Returns the transformation set by setTransform
 const core::matrix4& CD3D9Driver::getTransform(E_TRANSFORMATION_STATE state) const
 {
@@ -1952,7 +2432,6 @@ const core::matrix4& CD3D9Driver::getTransform(E_TRANSFORMATION_STATE state) con
 }
 
 
-
 //! Sets a vertex shader constant.
 void CD3D9Driver::setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount)
 {
@@ -1960,6 +2439,7 @@ void CD3D9Driver::setVertexShaderConstant(const f32* data, s32 startRegister, s3
 		pID3DDevice->SetVertexShaderConstantF(startRegister, data, constantAmount);
 }
 
+
 //! Sets a pixel shader constant.
 void CD3D9Driver::setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount)
 {
@@ -1967,6 +2447,7 @@ void CD3D9Driver::setPixelShaderConstant(const f32* data, s32 startRegister, s32
 		pID3DDevice->SetPixelShaderConstantF(startRegister, data, constantAmount);
 }
 
+
 //! Sets a constant for the vertex shader based on a name.
 bool CD3D9Driver::setVertexShaderConstant(const c8* name, const f32* floats, int count)
 {
@@ -1979,6 +2460,7 @@ bool CD3D9Driver::setVertexShaderConstant(const c8* name, const f32* floats, int
 	return false;
 }
 
+
 //! Sets a constant for the pixel shader based on a name.
 bool CD3D9Driver::setPixelShaderConstant(const c8* name, const f32* floats, int count)
 {
@@ -1991,12 +2473,14 @@ bool CD3D9Driver::setPixelShaderConstant(const c8* name, const f32* floats, int
 	return false;
 }
 
+
 //! Returns pointer to the IGPUProgrammingServices interface.
 IGPUProgrammingServices* CD3D9Driver::getGPUProgrammingServices()
 {
 	return this;
 }
 
+
 //! Adds a new material renderer to the VideoDriver, using pixel and/or
 //! vertex shaders to render geometry.
 s32 CD3D9Driver::addShaderMaterial(const c8* vertexShaderProgram,
@@ -2017,15 +2501,14 @@ s32 CD3D9Driver::addShaderMaterial(const c8* vertexShaderProgram,
 //! Adds a new material renderer to the VideoDriver, based on a high level shading
 //! language.
 s32 CD3D9Driver::addHighLevelShaderMaterial(
-	const c8* vertexShaderProgram,
-	const c8* vertexShaderEntryPointName,
-	E_VERTEX_SHADER_TYPE vsCompileTarget,
-	const c8* pixelShaderProgram,
-	const c8* pixelShaderEntryPointName,
-	E_PIXEL_SHADER_TYPE psCompileTarget,
-	IShaderConstantSetCallBack* callback,
-	E_MATERIAL_TYPE baseMaterial,
-	s32 userData)
+		const c8* vertexShaderProgram,
+		const c8* vertexShaderEntryPointName,
+		E_VERTEX_SHADER_TYPE vsCompileTarget,
+		const c8* pixelShaderProgram,
+		const c8* pixelShaderEntryPointName,
+		E_PIXEL_SHADER_TYPE psCompileTarget,
+		IShaderConstantSetCallBack* callback,
+		E_MATERIAL_TYPE baseMaterial, s32 userData)
 {
 	s32 nr = -1;
 
@@ -2055,9 +2538,20 @@ IVideoDriver* CD3D9Driver::getVideoDriver()
 
 
 //! Creates a render target texture.
-ITexture* CD3D9Driver::createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name)
+ITexture* CD3D9Driver::addRenderTargetTexture(
+		const core::dimension2d<s32>& size,
+		const c8* name)
 {
-	return new CD3D9Texture(this, size, name);
+	if (!name)
+		name="rt";
+	ITexture* tex = new CD3D9Texture(this, size, name);
+	if (tex)
+	{
+		checkDepthBuffer(tex);
+		addTexture(tex);
+		tex->drop();
+	}
+	return tex;
 }
 
 
@@ -2101,7 +2595,7 @@ IImage* CD3D9Driver::createScreenShot()
 		ClientToScreen((HWND)getExposedVideoData().D3D9.HWnd, &clientPoint);
 
 		clientRect.left   = clientPoint.x;
-		clientRect.top    = clientPoint.y;
+		clientRect.top	= clientPoint.y;
 		clientRect.right  = clientRect.left + ScreenSize.Width;
 		clientRect.bottom = clientRect.top  + ScreenSize.Height;
 	}
@@ -2121,12 +2615,32 @@ IImage* CD3D9Driver::createScreenShot()
 	u32* dP = (u32*)newImage->lock();
 	u8 * sP = (u8 *)lockedRect.pBits;
 
-	for (s32 y = 0; y < ScreenSize.Height; ++y)
+	// If the display mode format doesn't promise anything about the Alpha value
+	// and it appears that it's not presenting 255, then we should manually 
+	// set each pixel alpha value to 255.
+	if(D3DFMT_X8R8G8B8 == displayMode.Format && (0xFF000000 != (*dP & 0xFF000000)))
 	{
-		memcpy(dP, sP, ScreenSize.Width * 4);
+		for (s32 y = 0; y < ScreenSize.Height; ++y)
+		{
+			for(s32 x = 0; x < ScreenSize.Width; ++x)
+			{
+				*dP = *((u32*)sP) | 0xFF000000;
+				dP++;
+				sP += 4;
+			}
 
-		sP += lockedRect.Pitch;
-		dP += ScreenSize.Width;
+			sP += lockedRect.Pitch - (4 * ScreenSize.Width);
+		}
+	}
+	else
+	{
+		for (s32 y = 0; y < ScreenSize.Height; ++y)
+		{
+			memcpy(dP, sP, ScreenSize.Width * 4);
+
+			sP += lockedRect.Pitch;
+			dP += ScreenSize.Width;
+		}
 	}
 
 	newImage->unlock();
@@ -2142,8 +2656,22 @@ IImage* CD3D9Driver::createScreenShot()
 }
 
 
+//! returns color format
+ECOLOR_FORMAT CD3D9Driver::getColorFormat() const
+{
+	return ColorFormat;
+}
+
+
+//! returns color format
+D3DFORMAT CD3D9Driver::getD3DColorFormat() const
+{
+	return D3DColorFormat;
+}
+
+
 // returns the current size of the screen or rendertarget
-core::dimension2d<s32> CD3D9Driver::getCurrentRenderTargetSize()
+const core::dimension2d<s32>& CD3D9Driver::getCurrentRenderTargetSize() const
 {
 	if ( CurrentRendertargetSize.Width == 0 )
 		return ScreenSize;
@@ -2152,7 +2680,6 @@ core::dimension2d<s32> CD3D9Driver::getCurrentRenderTargetSize()
 }
 
 
-
 // Set/unset a clipping plane.
 bool CD3D9Driver::setClipPlane(u32 index, const core::plane3df& plane, bool enable)
 {
@@ -2180,6 +2707,119 @@ void CD3D9Driver::enableClipPlane(u32 index, bool enable)
 }
 
 
+D3DFORMAT CD3D9Driver::getD3DFormatFromColorFormat(ECOLOR_FORMAT format) const
+{
+	switch(format)
+	{
+		case ECF_A1R5G5B5:
+			return D3DFMT_A1R5G5B5;
+		case ECF_R5G6B5:
+			return D3DFMT_R5G6B5;
+		case ECF_R8G8B8:
+			return D3DFMT_R8G8B8;
+		case ECF_A8R8G8B8:
+			return D3DFMT_A8R8G8B8;
+	}
+	return D3DFMT_UNKNOWN;
+}
+
+
+ECOLOR_FORMAT CD3D9Driver::getColorFormatFromD3DFormat(D3DFORMAT format) const
+{
+	switch(format)
+	{
+	case D3DFMT_X1R5G5B5:
+	case D3DFMT_A1R5G5B5:
+		return ECF_A1R5G5B5;
+	case D3DFMT_A8B8G8R8:
+	case D3DFMT_A8R8G8B8:
+	case D3DFMT_X8R8G8B8:
+		return ECF_A8R8G8B8;
+	case D3DFMT_R5G6B5:
+		return ECF_R5G6B5;
+	case D3DFMT_R8G8B8:
+		return ECF_R8G8B8;
+	default:
+		return (ECOLOR_FORMAT)0;
+	};
+}
+
+
+void CD3D9Driver::checkDepthBuffer(ITexture* tex)
+{
+	if (!tex)
+		return;
+	const core::dimension2di optSize = tex->getSize().getOptimalSize(
+			!queryFeature(EVDF_TEXTURE_NPOT),
+			!queryFeature(EVDF_TEXTURE_NSQUARE), true);
+	SDepthSurface* depth=0;
+	core::dimension2di destSize(0x7fffffff, 0x7fffffff);
+	for (u32 i=0; i<DepthBuffers.size(); ++i)
+	{
+		if ((DepthBuffers[i]->Size.Width>=optSize.Width) &&
+			(DepthBuffers[i]->Size.Height>=optSize.Height))
+		{
+			if ((DepthBuffers[i]->Size.Width<destSize.Width) &&
+				(DepthBuffers[i]->Size.Height<destSize.Height))
+			{
+				depth = DepthBuffers[i];
+				destSize=DepthBuffers[i]->Size;
+			}
+		}
+	}
+	if (!depth)
+	{
+		D3DSURFACE_DESC desc;
+		DepthBuffers[0]->Surface->GetDesc(&desc);
+		DepthBuffers.push_back(new SDepthSurface());
+		HRESULT hr=pID3DDevice->CreateDepthStencilSurface(optSize.Width,
+				optSize.Height,
+				desc.Format,
+				desc.MultiSampleType,
+				desc.MultiSampleQuality,
+				TRUE,
+				&(DepthBuffers.getLast()->Surface),
+				NULL); 
+		if (SUCCEEDED(hr))
+		{
+			depth=DepthBuffers.getLast();
+			depth->Size=optSize;
+		}
+		else
+		{
+			if (hr == D3DERR_OUTOFVIDEOMEMORY)
+				os::Printer::log("Could not create DepthBuffer","out of video memory",ELL_ERROR);
+			else if( hr == E_OUTOFMEMORY )
+				os::Printer::log("Could not create DepthBuffer","out of memory",ELL_ERROR);
+			else
+			{
+				char buffer[128];
+				sprintf(buffer,"Could not create DepthBuffer of %ix%i",destSize.Width,destSize.Height);
+				os::Printer::log(buffer,ELL_ERROR);
+			} 
+			DepthBuffers.erase(DepthBuffers.size()-1);
+		}
+	}
+	else
+		depth->grab();
+
+	static_cast<CD3D9Texture*>(tex)->DepthSurface=depth;
+}
+
+
+void CD3D9Driver::removeDepthSurface(SDepthSurface* depth)
+{
+	for (u32 i=0; i<DepthBuffers.size(); ++i)
+	{
+		if (DepthBuffers[i]==depth)
+		{
+			DepthBuffers.erase(i);
+			return;
+		}
+	}
+}
+
+
 } // end namespace video
 } // end namespace irr
 
@@ -2194,12 +2834,12 @@ namespace video
 
 #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
 //! creates a video driver
-IVideoDriver* createDirectX9Driver(const core::dimension2d<s32>& screenSize, HWND window,
-				u32 bits, bool fullscreen, bool stencilbuffer,
-				io::IFileSystem* io, bool pureSoftware, bool highPrecisionFPU,
-				bool vsync, bool antiAlias)
+IVideoDriver* createDirectX9Driver(const core::dimension2d<s32>& screenSize,
+		HWND window, u32 bits, bool fullscreen, bool stencilbuffer,
+		io::IFileSystem* io, bool pureSoftware, bool highPrecisionFPU,
+		bool vsync, bool antiAlias)
 {
-	CD3D9Driver* dx9 =  new CD3D9Driver(screenSize, window, fullscreen, stencilbuffer, io, pureSoftware);
+	CD3D9Driver* dx9 = new CD3D9Driver(screenSize, window, fullscreen, stencilbuffer, io, pureSoftware);
 	if (!dx9->initDriver(screenSize, window, bits, fullscreen, pureSoftware, highPrecisionFPU, vsync, antiAlias))
 	{
 		dx9->drop();
diff --git a/src/dep/src/irrlicht/CD3D9Driver.h b/src/dep/src/irrlicht/CD3D9Driver.h
index c736376..ca4bc55 100644
--- a/src/dep/src/irrlicht/CD3D9Driver.h
+++ b/src/dep/src/irrlicht/CD3D9Driver.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,12 +16,25 @@
 
 #include "CNullDriver.h"
 #include "IMaterialRendererServices.h"
-#include "d3d9.h"
+#include <d3d9.h>
 
 namespace irr
 {
 namespace video
 {
+	struct SDepthSurface : public IReferenceCounted
+	{
+		SDepthSurface() : Surface(0) {}
+		~SDepthSurface()
+		{
+			if (Surface)
+				Surface->Release();
+		}
+
+		IDirect3DSurface9* Surface;
+		core::dimension2di Size;
+	};
+
 	class CD3D9Driver : public CNullDriver, IMaterialRendererServices
 	{
 	public:
@@ -34,10 +47,13 @@ namespace video
 		virtual ~CD3D9Driver();
 
 		//! applications must call this method before performing any rendering. returns false if failed.
-		virtual bool beginScene(bool backBuffer, bool zBuffer, SColor color);
+		virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
+				SColor color=SColor(255,0,0,0),
+				void* windowId=0,
+				core::rect<s32>* sourceRect=0);
 
 		//! applications must call this method after performing any rendering. returns false if failed.
-		virtual bool endScene( s32 windowId = 0, core::rect<s32>* sourceRect=0 );
+		virtual bool endScene();
 
 		//! queries the features of the driver, returns true if feature is available
 		virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const;
@@ -59,8 +75,36 @@ namespace video
 		//! gets the area of the current viewport
 		virtual const core::rect<s32>& getViewPort() const;
 
+		struct SHWBufferLink_d3d9 : public SHWBufferLink
+		{
+			SHWBufferLink_d3d9(const scene::IMeshBuffer *_MeshBuffer): SHWBufferLink(_MeshBuffer), vertexBuffer(0), indexBuffer(0){}
+
+			IDirect3DVertexBuffer9* vertexBuffer;
+			IDirect3DIndexBuffer9* indexBuffer;
+
+			u32 vertexBufferSize;
+            u32 indexBufferSize;
+ 		};
+
+		bool updateVertexHardwareBuffer(SHWBufferLink_d3d9 *HWBuffer);
+		bool updateIndexHardwareBuffer(SHWBufferLink_d3d9 *HWBuffer);
+
+		//! updates hardware buffer if needed
+		virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer);
+
+		//! Create hardware buffer from mesh
+		virtual SHWBufferLink *createHardwareBuffer(const scene::IMeshBuffer* mb);
+
+		//! Delete hardware buffer (only some drivers can)
+		virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer);
+
+		//! Draw hardware buffer
+		virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer);
+
 		//! draws a vertex primitive list
-		virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType);
+		virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
+				const void* indexList, u32 primitiveCount,
+				E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
 
 		//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
 		virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
@@ -70,7 +114,7 @@ namespace video
 		//! Draws a part of the texture into the rectangle.
 		virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
 			const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
-			video::SColor* colors=0, bool useAlphaChannelOfTexture=false);
+			const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false);
 
 		//!Draws an 2d rectangle with a gradient.
 		virtual void draw2DRectangle(const core::rect<s32>& pos,
@@ -82,6 +126,9 @@ namespace video
 					const core::position2d<s32>& end,
 					SColor color=SColor(255,255,255,255));
 
+		//! Draws a pixel.
+		virtual void drawPixel(u32 x, u32 y, const SColor & color);
+
 		//! Draws a 3d line.
 		virtual void draw3DLine(const core::vector3df& start,
 			const core::vector3df& end, SColor color = SColor(255,255,255,255));
@@ -109,14 +156,10 @@ namespace video
 		//! \param color: New color of the ambient light.
 		virtual void setAmbientLight(const SColorf& color);
 
-		//! Draws a shadow volume into the stencil buffer. To draw a stencil shadow, do
-		//! this: Frist, draw all geometry. Then use this method, to draw the shadow
-		//! volume. Then, use IVideoDriver::drawStencilShadow() to visualize the shadow.
+		//! Draws a shadow volume into the stencil buffer.
 		virtual void drawStencilShadowVolume(const core::vector3df* triangles, s32 count, bool zfail);
 
-		//! Fills the stencil shadow with color. After the shadow volume has been drawn
-		//! into the stencil buffer using IVideoDriver::drawStencilShadowVolume(), use this
-		//! to draw the color of the shadow.
+		//! Fills the stencil shadow with color.
 		virtual void drawStencilShadow(bool clearStencilBuffer=false,
 			video::SColor leftUpEdge = video::SColor(0,0,0,0),
 			video::SColor rightUpEdge = video::SColor(0,0,0,0),
@@ -169,7 +212,8 @@ namespace video
 		virtual IVideoDriver* getVideoDriver();
 
 		//! Creates a render target texture.
-		virtual ITexture* createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name);
+		virtual ITexture* addRenderTargetTexture(const core::dimension2d<s32>& size,
+				const c8* name);
 
 		//! Clears the ZBuffer.
 		virtual void clearZBuffer();
@@ -178,21 +222,37 @@ namespace video
 		virtual IImage* createScreenShot();
 
 		//! Set/unset a clipping plane.
-		//! There are at least 6 clipping planes available for the user to set at will.
-		//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
-		//! \param plane: The plane itself.
-		//! \param enable: If true, enable the clipping plane else disable it.
 		virtual bool setClipPlane(u32 index, const core::plane3df& plane, bool enable=false);
 
 		//! Enable/disable a clipping plane.
-		//! There are at least 6 clipping planes available for the user to set at will.
-		//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
-		//! \param enable: If true, enable the clipping plane else disable it.
 		virtual void enableClipPlane(u32 index, bool enable);
 
+		//! Returns the graphics card vendor name.
+		virtual core::stringc getVendorInfo() {return vendorName;}
+
+		//! Check if the driver was recently reset.
+		virtual bool checkDriverReset() {return DriverWasReset;}
+
+		// removes the depth struct from the DepthSurface array
+		void removeDepthSurface(SDepthSurface* depth);
+
+		//! Get the current color format of the color buffer
+		/** \return Color format of the color buffer. */
+		virtual ECOLOR_FORMAT getColorFormat() const;
+
+		//! Get the current color format of the color buffer
+		/** \return Color format of the color buffer as D3D color value. */
+		D3DFORMAT getD3DColorFormat() const;
+
+		//! Get D3D color format from Irrlicht color format.
+		D3DFORMAT getD3DFormatFromColorFormat(ECOLOR_FORMAT format) const;
+
+		//! Get Irrlicht color format from D3D color format.
+		ECOLOR_FORMAT getColorFormatFromD3DFormat(D3DFORMAT format) const;
+
 	private:
 
-		// enumeration for rendering modes such as 2d and 3d for minizing the switching of renderStates.
+		//! enumeration for rendering modes such as 2d and 3d for minizing the switching of renderStates.
 		enum E_RENDER_MODE
 		{
 			ERM_NONE = 0,	// no render state has been set yet.
@@ -228,9 +288,12 @@ namespace video
 		//! THIS METHOD HAS TO BE OVERRIDDEN BY DERIVED DRIVERS WITH OWN TEXTURES
 		virtual video::ITexture* createDeviceDependentTexture(IImage* surface, const char* name);
 
-		// returns the current size of the screen or rendertarget
-		core::dimension2d<s32> getCurrentRenderTargetSize();
+		//! returns the current size of the screen or rendertarget
+		virtual const core::dimension2d<s32>& getCurrentRenderTargetSize() const;
 
+		//! Check if a proper depth buffer for the RTT is available, otherwise create it.
+		void checkDepthBuffer(ITexture* tex);
+		
 		//! Adds a new material renderer to the VideoDriver, using pixel and/or
 		//! vertex shaders to render geometry.
 		s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram,
@@ -280,19 +343,31 @@ namespace video
 
 		IDirect3DSurface9* PrevRenderTarget;
 		core::dimension2d<s32> CurrentRendertargetSize;
+		core::dimension2d<s32> CurrentDepthBufferSize;
+
+		void* WindowId;
+		core::rect<s32>* SceneSourceRect;
 
 		D3DCAPS9 Caps;
 
 		E_VERTEX_TYPE LastVertexType;
 
+		SColorf AmbientLight;
+
+		core::stringc vendorName;
+
+		core::array<SDepthSurface*> DepthBuffers;
+
 		u32 MaxTextureUnits;
 		u32 MaxUserClipPlanes;
 		f32 MaxLightDistance;
 		s32 LastSetLight;
+
+		ECOLOR_FORMAT ColorFormat;
+		D3DFORMAT D3DColorFormat;
 		bool DeviceLost;
 		bool Fullscreen;
-
-		SColorf AmbientLight;
+		bool DriverWasReset;
 	};
 
 
@@ -301,5 +376,5 @@ namespace video
 
 
 #endif // _IRR_COMPILE_WITH_DIRECT3D_9_
-#endif // __C_VIDEO_DIRECTX_8_H_INCLUDED__
+#endif // __C_VIDEO_DIRECTX_9_H_INCLUDED__
 
diff --git a/src/dep/src/irrlicht/CD3D9HLSLMaterialRenderer.cpp b/src/dep/src/irrlicht/CD3D9HLSLMaterialRenderer.cpp
index 00df36c..f369c64 100644
--- a/src/dep/src/irrlicht/CD3D9HLSLMaterialRenderer.cpp
+++ b/src/dep/src/irrlicht/CD3D9HLSLMaterialRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -37,6 +37,11 @@ CD3D9HLSLMaterialRenderer::CD3D9HLSLMaterialRenderer(IDirect3DDevice9* d3ddev,
 	: CD3D9ShaderMaterialRenderer(d3ddev, driver, callback, baseMaterial, userData),
 	VSConstantsTable(0), PSConstantsTable(0)
 {
+
+	#ifdef _DEBUG
+	setDebugName("CD3D9HLSLMaterialRenderer");
+	#endif
+
 	outMaterialTypeNr = -1;
 
 	// now create shaders
diff --git a/src/dep/src/irrlicht/CD3D9HLSLMaterialRenderer.h b/src/dep/src/irrlicht/CD3D9HLSLMaterialRenderer.h
index 06f1227..9174473 100644
--- a/src/dep/src/irrlicht/CD3D9HLSLMaterialRenderer.h
+++ b/src/dep/src/irrlicht/CD3D9HLSLMaterialRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CD3D9MaterialRenderer.h b/src/dep/src/irrlicht/CD3D9MaterialRenderer.h
index 4e8835b..84e983c 100644
--- a/src/dep/src/irrlicht/CD3D9MaterialRenderer.h
+++ b/src/dep/src/irrlicht/CD3D9MaterialRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,7 +9,7 @@
 #ifdef _IRR_WINDOWS_
 
 #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-#include "d3d9.h"
+#include <d3d9.h>
 
 #include "IMaterialRenderer.h"
 
@@ -101,8 +101,10 @@ public:
 			E_MODULATE_FUNC modulate;
 			unpack_texureBlendFunc ( srcFact, dstFact, modulate, material.MaterialTypeParam );
 
-			if (srcFact == EBF_SRC_COLOR && dstFact == EBF_ZERO) 
+			if (srcFact == EBF_SRC_COLOR && dstFact == EBF_ZERO)
+			{
 				pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
+			}
 			else
 			{
 				pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
@@ -132,12 +134,22 @@ public:
 
 	}
 
+	//! Returns if the material is transparent.
+	/** The scene management needs to know this for being able to sort the
+	materials by opaque and transparent.
+	The return value could be optimized, but we'd need to know the
+	MaterialTypeParam for it. */
+	virtual bool isTransparent() const
+	{
+		return true;
+	}
+
 	private:
 
 		u32 getD3DBlend ( E_BLEND_FACTOR factor ) const
 		{
 			u32 r = 0;
-		switch ( factor )
+			switch ( factor )
 			{
 				case EBF_ZERO:					r = D3DBLEND_ZERO; break;
 				case EBF_ONE:					r = D3DBLEND_ONE; break;
@@ -157,7 +169,7 @@ public:
 		u32 getTexelAlpha ( E_BLEND_FACTOR factor ) const
 		{
 			u32 r = 0;
-		switch ( factor )
+			switch ( factor )
 			{
 				case EBF_SRC_ALPHA:				r = 1; break;
 				case EBF_ONE_MINUS_SRC_ALPHA:	r = 1; break;
@@ -180,6 +192,8 @@ public:
 			return r;
 		}
 
+		bool transparent;
+
 };
 
 
@@ -236,8 +250,6 @@ public:
 			pID3DDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCCOLOR);
 		}
 
-		((SMaterial&)material).ZWriteEnable = false;
-
 		services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 	}
 
@@ -277,8 +289,6 @@ public:
 			pID3DDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
 		}
 
-		((SMaterial&)material).ZWriteEnable = false;
-
 		services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 	}
 
@@ -318,18 +328,11 @@ public:
 			pID3DDevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
 			pID3DDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );
 
-			s32 refValue = core::floor32(material.MaterialTypeParam * 255.f);
-			if ( !refValue )
-				refValue = 127; // default value
-
-			pID3DDevice->SetRenderState(D3DRS_ALPHAREF, refValue);
+			pID3DDevice->SetRenderState(D3DRS_ALPHAREF, core::floor32(material.MaterialTypeParam * 255.f));
 			pID3DDevice->SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
 			pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, TRUE);
-
 		}
 
-		((SMaterial&)material).ZWriteEnable = false;
-
 		services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 	}
 
@@ -372,17 +375,12 @@ public:
 
 			pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
 
-			s32 refValue = core::floor32(material.MaterialTypeParam * 255);
-			if ( !refValue )
-				refValue = 127; // default value
-
-			pID3DDevice->SetRenderState(D3DRS_ALPHAREF,refValue);
+			// 127 is required by EMT_TRANSPARENT_ALPHA_CHANNEL_REF
+			pID3DDevice->SetRenderState(D3DRS_ALPHAREF, 127); 
 			pID3DDevice->SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
 			pID3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE, TRUE);
 		}
 
-		((SMaterial&)material).ZWriteEnable = false;
-
 		services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 	}
 
diff --git a/src/dep/src/irrlicht/CD3D9NormalMapRenderer.cpp b/src/dep/src/irrlicht/CD3D9NormalMapRenderer.cpp
index 558a0f1..c175d93 100644
--- a/src/dep/src/irrlicht/CD3D9NormalMapRenderer.cpp
+++ b/src/dep/src/irrlicht/CD3D9NormalMapRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -168,13 +168,18 @@ namespace video
 		s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial)
 		: CD3D9ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial)
 	{
+		#ifdef _DEBUG
+		setDebugName("CD3D9NormalMapRenderer");
+		#endif
+	
 		// set this as callback. We could have done this in 
 		// the initialization list, but some compilers don't like it.
 
 		CallBack = this;
 
-		// basicly, this thing simply compiles these hardcoded shaders if the
-		// hardware is able to do them, otherwise it maps to the base material
+		// basically, this thing simply compiles the hardcoded shaders
+		// if the hardware is able to do them, otherwise it maps to the
+		// base material
 
 		if (!driver->queryFeature(video::EVDF_PIXEL_SHADER_1_1) ||
 			!driver->queryFeature(video::EVDF_VERTEX_SHADER_1_1))
@@ -185,7 +190,7 @@ namespace video
 			return;
 		}
 
-        // check if already compiled normal map shaders are there.
+		// check if already compiled normal map shaders are there.
 
 		video::IMaterialRenderer* renderer = driver->getMaterialRenderer(EMT_NORMAL_MAP_SOLID);
 		if (renderer)
@@ -214,14 +219,19 @@ namespace video
 				init(outMaterialTypeNr, D3D9_NORMAL_MAP_VSH, D3D9_NORMAL_MAP_PSH_1_1);
 			}
 		}
+		// something failed, use base material
+		if (-1==outMaterialTypeNr)
+			driver->addMaterialRenderer(this);
 	}
 
+
 	CD3D9NormalMapRenderer::~CD3D9NormalMapRenderer()
 	{
 		if (CallBack == this)
 			CallBack = 0;
 	}
 
+
 	bool CD3D9NormalMapRenderer::OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
 	{
 		if (vtxtype != video::EVT_TANGENTS)
@@ -245,8 +255,8 @@ namespace video
 	}
 
 
-	//! Called by the engine when the vertex and/or pixel shader constants for an
-	//! material renderer should be set.
+	//! Called by the engine when the vertex and/or pixel shader constants
+	//! for an material renderer should be set.
 	void CD3D9NormalMapRenderer::OnSetConstants(IMaterialRendererServices* services, s32 userData)
 	{
 		video::IVideoDriver* driver = services->getVideoDriver();
@@ -260,8 +270,8 @@ namespace video
 		worldViewProj *= driver->getTransform(video::ETS_WORLD);
 		services->setVertexShaderConstant(worldViewProj.getTransposed().pointer(), 8, 4);
 
-		// here we've got to fetch the fixed function lights from the driver
-		// and set them as constants
+		// here we've got to fetch the fixed function lights from the
+		// driver and set them as constants
 
 		u32 cnt = driver->getDynamicLightCount();
 
diff --git a/src/dep/src/irrlicht/CD3D9NormalMapRenderer.h b/src/dep/src/irrlicht/CD3D9NormalMapRenderer.h
index 0f84ea2..7f9f88b 100644
--- a/src/dep/src/irrlicht/CD3D9NormalMapRenderer.h
+++ b/src/dep/src/irrlicht/CD3D9NormalMapRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,7 +9,7 @@
 #ifdef _IRR_WINDOWS_
 
 #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-#include "d3d9.h"
+#include <d3d9.h>
 
 #include "CD3D9ShaderMaterialRenderer.h"
 #include "IShaderConstantSetCallBack.h"
diff --git a/src/dep/src/irrlicht/CD3D9ParallaxMapRenderer.cpp b/src/dep/src/irrlicht/CD3D9ParallaxMapRenderer.cpp
index 5a0423d..e4920d2 100644
--- a/src/dep/src/irrlicht/CD3D9ParallaxMapRenderer.cpp
+++ b/src/dep/src/irrlicht/CD3D9ParallaxMapRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -227,6 +227,11 @@ namespace video
 		: CD3D9ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial),
 		CurrentScale(0.0f)
 	{
+	
+		#ifdef _DEBUG
+		setDebugName("CD3D9ParallaxMapRenderer");
+		#endif
+	
 		// set this as callback. We could have done this in
 		// the initialization list, but some compilers don't like it.
 
@@ -284,8 +289,12 @@ namespace video
 
 			#endif // SHADER_EXTERNAL_DEBUG
 		}
+		// something failed, use base material
+		if (-1==outMaterialTypeNr)
+			driver->addMaterialRenderer(this);
 	}
 
+
 	CD3D9ParallaxMapRenderer::~CD3D9ParallaxMapRenderer()
 	{
 		if (CallBack == this)
@@ -303,6 +312,7 @@ namespace video
 		return CD3D9ShaderMaterialRenderer::OnRender(service, vtxtype);
 	}
 
+
 	void CD3D9ParallaxMapRenderer::OnSetMaterial(const video::SMaterial& material,
 		const video::SMaterial& lastMaterial,
 		bool resetAllRenderstates, video::IMaterialRendererServices* services)
@@ -313,6 +323,7 @@ namespace video
 		CurrentScale = material.MaterialTypeParam;
 	}
 
+
 	//! Returns the render capability of the material.
 	s32 CD3D9ParallaxMapRenderer::getRenderCapability() const
 	{
@@ -324,8 +335,8 @@ namespace video
 	}
 
 
-	//! Called by the engine when the vertex and/or pixel shader constants for an
-	//! material renderer should be set.
+	//! Called by the engine when the vertex and/or pixel shader constants
+	//! for an material renderer should be set.
 	void CD3D9ParallaxMapRenderer::OnSetConstants(IMaterialRendererServices* services, s32 userData)
 	{
 		video::IVideoDriver* driver = services->getVideoDriver();
@@ -353,12 +364,12 @@ namespace video
 		worldViewProj *= driver->getTransform(video::ETS_WORLD);
 		services->setVertexShaderConstant(worldViewProj.getTransposed().pointer(), 8, 4);
 
-		// here we've got to fetch the fixed function lights from the driver
-		// and set them as constants
+		// here we've got to fetch the fixed function lights from the
+		// driver and set them as constants
 
-		int cnt = driver->getDynamicLightCount();
+		const u32 cnt = driver->getDynamicLightCount();
 
-		for (int i=0; i<2; ++i)
+		for (u32 i=0; i<2; ++i)
 		{
 			SLight light;
 
diff --git a/src/dep/src/irrlicht/CD3D9ParallaxMapRenderer.h b/src/dep/src/irrlicht/CD3D9ParallaxMapRenderer.h
index 28a2891..54719e7 100644
--- a/src/dep/src/irrlicht/CD3D9ParallaxMapRenderer.h
+++ b/src/dep/src/irrlicht/CD3D9ParallaxMapRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,7 +9,7 @@
 #ifdef _IRR_WINDOWS_
 
 #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-#include "d3d9.h"
+#include <d3d9.h>
 
 #include "CD3D9ShaderMaterialRenderer.h"
 #include "IShaderConstantSetCallBack.h"
diff --git a/src/dep/src/irrlicht/CD3D9ShaderMaterialRenderer.cpp b/src/dep/src/irrlicht/CD3D9ShaderMaterialRenderer.cpp
index 45bb3bb..89127b9 100644
--- a/src/dep/src/irrlicht/CD3D9ShaderMaterialRenderer.cpp
+++ b/src/dep/src/irrlicht/CD3D9ShaderMaterialRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,12 +23,17 @@ namespace video
 {
 
 //! Public constructor
-CD3D9ShaderMaterialRenderer::CD3D9ShaderMaterialRenderer(IDirect3DDevice9* d3ddev, video::IVideoDriver* driver, 
+CD3D9ShaderMaterialRenderer::CD3D9ShaderMaterialRenderer(IDirect3DDevice9* d3ddev, video::IVideoDriver* driver,
 		s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram,
 		IShaderConstantSetCallBack* callback, IMaterialRenderer* baseMaterial, s32 userData)
 : pID3DDevice(d3ddev), Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
 	VertexShader(0), OldVertexShader(0), PixelShader(0), UserData(userData)
 {
+
+	#ifdef _DEBUG
+	setDebugName("CD3D9ShaderMaterialRenderer");
+	#endif
+
 	if (BaseMaterial)
 		BaseMaterial->grab();
 
@@ -43,13 +48,18 @@ CD3D9ShaderMaterialRenderer::CD3D9ShaderMaterialRenderer(IDirect3DDevice9* d3dde
 //! constructor only for use by derived classes who want to
 //! create a fall back material for example.
 CD3D9ShaderMaterialRenderer::CD3D9ShaderMaterialRenderer(IDirect3DDevice9* d3ddev,
-						video::IVideoDriver* driver, 
+						video::IVideoDriver* driver,
 						IShaderConstantSetCallBack* callback,
 						IMaterialRenderer* baseMaterial,
 						s32 userData)
 : pID3DDevice(d3ddev), Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
 	VertexShader(0), OldVertexShader(0), PixelShader(0), UserData(userData)
 {
+
+	#ifdef _DEBUG
+	setDebugName("CD3D9ShaderMaterialRenderer");
+	#endif
+
 	if (BaseMaterial)
 		BaseMaterial->grab();
 
@@ -103,15 +113,15 @@ bool CD3D9ShaderMaterialRenderer::OnRender(IMaterialRendererServices* service, E
 }
 
 void CD3D9ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial,
-	bool resetAllRenderstates, video::IMaterialRendererServices* services) 
+	bool resetAllRenderstates, video::IMaterialRendererServices* services)
 {
 	if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-	{		
+	{
 		if (VertexShader)
 		{
 			// save old vertex shader
 			pID3DDevice->GetVertexShader(&OldVertexShader);
-			
+
 			// set new vertex shader
 			if (FAILED(pID3DDevice->SetVertexShader(VertexShader)))
 				os::Printer::log("Could not set vertex shader.");
@@ -128,10 +138,14 @@ void CD3D9ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material
 			BaseMaterial->OnSetMaterial(material, material, true, services);
 	}
 
+	//let callback know used material
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
+
 	services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 }
 
-void CD3D9ShaderMaterialRenderer::OnUnsetMaterial() 
+void CD3D9ShaderMaterialRenderer::OnUnsetMaterial()
 {
 	if (VertexShader)
 		pID3DDevice->SetVertexShader(OldVertexShader);
@@ -143,12 +157,12 @@ void CD3D9ShaderMaterialRenderer::OnUnsetMaterial()
 		BaseMaterial->OnUnsetMaterial();
 }
 
-	
+
 //! Returns if the material is transparent. The scene managment needs to know this
 //! for being able to sort the materials by opaque and transparent.
 bool CD3D9ShaderMaterialRenderer::isTransparent() const
 {
-	return BaseMaterial ? BaseMaterial->isTransparent() : false; 
+	return BaseMaterial ? BaseMaterial->isTransparent() : false;
 }
 
 bool CD3D9ShaderMaterialRenderer::createPixelShader(const c8* pxsh)
@@ -170,7 +184,7 @@ bool CD3D9ShaderMaterialRenderer::createPixelShader(const c8* pxsh)
 		// compile shader and emitt some debug informations to
 		// make it possible to debug the shader in visual studio
 
-		static int irr_dbg_file_nr = 0; 
+		static int irr_dbg_file_nr = 0;
 		++irr_dbg_file_nr;
 		char tmp[32];
 		sprintf(tmp, "irr_d3d9_dbg_shader_%d.psh", irr_dbg_file_nr);
@@ -231,7 +245,7 @@ bool CD3D9ShaderMaterialRenderer::createVertexShader(const char* vtxsh)
 		// compile shader and emitt some debug informations to
 		// make it possible to debug the shader in visual studio
 
-		static int irr_dbg_file_nr = 0; 
+		static int irr_dbg_file_nr = 0;
 		++irr_dbg_file_nr;
 		char tmp[32];
 		sprintf(tmp, "irr_d3d9_dbg_shader_%d.vsh", irr_dbg_file_nr);
@@ -244,7 +258,7 @@ bool CD3D9ShaderMaterialRenderer::createVertexShader(const char* vtxsh)
         stubD3DXAssembleShaderFromFile(tmp, 0, 0, D3DXSHADER_DEBUG, &code, &errors);
 
 	#endif
-	
+
 
 	if (errors)
 	{
@@ -273,7 +287,7 @@ bool CD3D9ShaderMaterialRenderer::createVertexShader(const char* vtxsh)
 
 HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShader(LPCSTR pSrcData,  UINT SrcDataLen,
 								   CONST D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude,
-								   DWORD Flags, LPD3DXBUFFER* ppShader, 
+								   DWORD Flags, LPD3DXBUFFER* ppShader,
 								   LPD3DXBUFFER* ppErrorMsgs)
 {
 	// Because Irrlicht needs to be able to start up even without installed d3d dlls, it
@@ -283,11 +297,11 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShader(LPCSTR pSrcData,  UI
 	// February 2005:	d3dx9_24.dll  24
 	// April 2005:		d3dx9_25.dll  25
 	// June 2005:		d3dx9_26.dll  26
-	// August 2005:		d3dx9_27.dll  27 
-	// October 2005,		
+	// August 2005:		d3dx9_27.dll  27
+	// October 2005,
 	// December 2005:	d3dx9_28.dll  28
 
-	#if ( D3DX_SDK_VERSION < 24 ) 
+	#if ( D3DX_SDK_VERSION < 24 )
 		// directly link functions, old d3d sdks didn't try to load external dlls
 		// when linking to the d3dx9.lib
 		#ifdef _MSC_VER
@@ -295,16 +309,16 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShader(LPCSTR pSrcData,  UI
 		#endif
 
 		// invoke static linked function
-		return D3DXAssembleShader(pSrcData, SrcDataLen, pDefines, pInclude, 
+		return D3DXAssembleShader(pSrcData, SrcDataLen, pDefines, pInclude,
 								  Flags, ppShader, ppErrorMsgs);
 	#else
 	{
 		// try to load shader functions from the dll and print error if failed.
-	
+
 		// D3DXAssembleShader signature
 		typedef HRESULT (WINAPI *AssembleShaderFunction)(LPCSTR pSrcData,  UINT SrcDataLen,
 									CONST D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude,
-									DWORD Flags, LPD3DXBUFFER* ppShader, 
+									DWORD Flags, LPD3DXBUFFER* ppShader,
 									LPD3DXBUFFER* ppErrorMsgs);
 
 		static bool LoadFailed = false;
@@ -324,8 +338,8 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShader(LPCSTR pSrcData,  UI
 			if (!pFn)
 			{
 				LoadFailed = true;
-				os::Printer::log("Could not load shader function D3DXAssembleShader from dll, shaders disabled", 
-					strDllName.c_str(), ELL_ERROR);				
+				os::Printer::log("Could not load shader function D3DXAssembleShader from dll, shaders disabled",
+					strDllName.c_str(), ELL_ERROR);
 			}
 		}
 
@@ -347,7 +361,7 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShaderFromFile(LPCSTR pSrcF
 	// wondering what I'm doing here?
 	// see comment in CD3D9ShaderMaterialRenderer::stubD3DXAssembleShader()
 
-	#if ( D3DX_SDK_VERSION < 24 ) 
+	#if ( D3DX_SDK_VERSION < 24 )
 		// directly link functions, old d3d sdks didn't try to load external dlls
 		// when linking to the d3dx9.lib
 		#ifdef _MSC_VER
@@ -355,14 +369,14 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShaderFromFile(LPCSTR pSrcF
 		#endif
 
 		// invoke static linked function
-		return D3DXAssembleShaderFromFile(pSrcFile, pDefines, pInclude, Flags, 
+		return D3DXAssembleShaderFromFile(pSrcFile, pDefines, pInclude, Flags,
 										  ppShader, ppErrorMsgs);
 	#else
 	{
 		// try to load shader functions from the dll and print error if failed.
-	
+
 		// D3DXAssembleShaderFromFileA signature
-		typedef HRESULT (WINAPI *AssembleShaderFromFileFunction)(LPCSTR pSrcFile, 
+		typedef HRESULT (WINAPI *AssembleShaderFromFileFunction)(LPCSTR pSrcFile,
 									CONST D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude, DWORD Flags,
 									LPD3DXBUFFER* ppShader, LPD3DXBUFFER* ppErrorMsgs);
 
@@ -383,8 +397,8 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXAssembleShaderFromFile(LPCSTR pSrcF
 			if (!pFn)
 			{
 				LoadFailed = true;
-				os::Printer::log("Could not load shader function D3DXAssembleShaderFromFileA from dll, shaders disabled", 
-					strDllName.c_str(), ELL_ERROR);				
+				os::Printer::log("Could not load shader function D3DXAssembleShaderFromFileA from dll, shaders disabled",
+					strDllName.c_str(), ELL_ERROR);
 			}
 		}
 
@@ -408,7 +422,7 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShader(LPCSTR pSrcData, UINT
 	// wondering what I'm doing here?
 	// see comment in CD3D9ShaderMaterialRenderer::stubD3DXAssembleShader()
 
-	#if ( D3DX_SDK_VERSION < 24 ) 
+	#if ( D3DX_SDK_VERSION < 24 )
 		// directly link functions, old d3d sdks didn't try to load external dlls
 		// when linking to the d3dx9.lib
 		#ifdef _MSC_VER
@@ -420,7 +434,7 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShader(LPCSTR pSrcData, UINT
 	#else
 	{
 		// try to load shader functions from the dll and print error if failed.
-	
+
 		// D3DXCompileShader
 		typedef HRESULT (WINAPI *D3DXCompileShaderFunction)(LPCSTR pSrcData, UINT SrcDataLen, CONST D3DXMACRO* pDefines,
 								LPD3DXINCLUDE pInclude, LPCSTR pFunctionName,
@@ -444,8 +458,8 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShader(LPCSTR pSrcData, UINT
 			if (!pFn)
 			{
 				LoadFailed = true;
-				os::Printer::log("Could not load shader function D3DXCompileShader from dll, shaders disabled", 
-					strDllName.c_str(), ELL_ERROR);				
+				os::Printer::log("Could not load shader function D3DXCompileShader from dll, shaders disabled",
+					strDllName.c_str(), ELL_ERROR);
 			}
 		}
 
@@ -460,7 +474,7 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShader(LPCSTR pSrcData, UINT
 	return 0;
 }
 
-HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShaderFromFile(LPCSTR pSrcFile, CONST D3DXMACRO* pDefines, 
+HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShaderFromFile(LPCSTR pSrcFile, CONST D3DXMACRO* pDefines,
 								LPD3DXINCLUDE pInclude, LPCSTR pFunctionName,
 								LPCSTR pProfile, DWORD Flags, LPD3DXBUFFER* ppShader, LPD3DXBUFFER* ppErrorMsgs,
 								LPD3DXCONSTANTTABLE* ppConstantTable)
@@ -468,7 +482,7 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShaderFromFile(LPCSTR pSrcFi
 	// wondering what I'm doing here?
 	// see comment in CD3D9ShaderMaterialRenderer::stubD3DXAssembleShader()
 
-	#if ( D3DX_SDK_VERSION < 24 ) 
+	#if ( D3DX_SDK_VERSION < 24 )
 		// directly link functions, old d3d sdks didn't try to load external dlls
 		// when linking to the d3dx9.lib
 		#ifdef _MSC_VER
@@ -480,7 +494,7 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShaderFromFile(LPCSTR pSrcFi
 	#else
 	{
 		// try to load shader functions from the dll and print error if failed.
-	
+
 		// D3DXCompileShaderFromFileA
 		typedef HRESULT (WINAPI *D3DXCompileShaderFromFileFunction)(LPCSTR pSrcFile,
 			CONST D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude, LPCSTR pFunctionName,
@@ -504,8 +518,8 @@ HRESULT CD3D9ShaderMaterialRenderer::stubD3DXCompileShaderFromFile(LPCSTR pSrcFi
 			if (!pFn)
 			{
 				LoadFailed = true;
-				os::Printer::log("Could not load shader function D3DXCompileShaderFromFileA from dll, shaders disabled", 
-					strDllName.c_str(), ELL_ERROR);				
+				os::Printer::log("Could not load shader function D3DXCompileShaderFromFileA from dll, shaders disabled",
+					strDllName.c_str(), ELL_ERROR);
 			}
 		}
 
diff --git a/src/dep/src/irrlicht/CD3D9ShaderMaterialRenderer.h b/src/dep/src/irrlicht/CD3D9ShaderMaterialRenderer.h
index 35ca974..b035eb6 100644
--- a/src/dep/src/irrlicht/CD3D9ShaderMaterialRenderer.h
+++ b/src/dep/src/irrlicht/CD3D9ShaderMaterialRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,7 +9,7 @@
 #ifdef _IRR_WINDOWS_
 
 #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-#include "d3d9.h"
+#include <d3d9.h>
 #include <d3dx9shader.h>
 
 #include "IMaterialRenderer.h"
diff --git a/src/dep/src/irrlicht/CD3D9Texture.cpp b/src/dep/src/irrlicht/CD3D9Texture.cpp
index 56abaf4..f35d5e5 100644
--- a/src/dep/src/irrlicht/CD3D9Texture.cpp
+++ b/src/dep/src/irrlicht/CD3D9Texture.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -30,8 +30,8 @@ namespace video
 {
 
 //! rendertarget constructor
-CD3D9Texture::CD3D9Texture(CD3D9Driver* driver, core::dimension2d<s32> size, const char* name)
-: ITexture(name), Image(0), Texture(0), RTTSurface(0), Driver(driver),
+CD3D9Texture::CD3D9Texture(CD3D9Driver* driver, const core::dimension2d<s32>& size, const char* name)
+: ITexture(name), Texture(0), RTTSurface(0), Driver(driver), DepthSurface(0),
 	TextureSize(size), ImageSize(size), Pitch(0),
 	HasMipMaps(false), HardwareMipMaps(false), IsRenderTarget(true)
 {
@@ -50,7 +50,7 @@ CD3D9Texture::CD3D9Texture(CD3D9Driver* driver, core::dimension2d<s32> size, con
 //! constructor
 CD3D9Texture::CD3D9Texture(IImage* image, CD3D9Driver* driver,
 					   u32 flags, const char* name)
-: ITexture(name), Image(image), Texture(0), RTTSurface(0), Driver(driver),
+: ITexture(name), Texture(0), RTTSurface(0), Driver(driver), DepthSurface(0),
 TextureSize(0,0), ImageSize(0,0), Pitch(0),
 HasMipMaps(false), HardwareMipMaps(false), IsRenderTarget(false)
 {
@@ -64,13 +64,11 @@ HasMipMaps(false), HardwareMipMaps(false), IsRenderTarget(false)
 	if (Device)
 		Device->AddRef();
 
-	if (Image)
+	if (image)
 	{
-		Image->grab();
-
-		if (createTexture(flags))
+		if (createTexture(flags, image))
 		{
-			if (copyTexture() && generateMipLevels)
+			if (copyTexture(image) && generateMipLevels)
 			{
 				// create mip maps.
 				#ifdef _IRR_USE_D3DXFilterTexture_
@@ -97,49 +95,40 @@ HasMipMaps(false), HardwareMipMaps(false), IsRenderTarget(false)
 //! destructor
 CD3D9Texture::~CD3D9Texture()
 {
-	if (Device)
-		Device->Release();
-
-	if (Image)
-		Image->drop();
-
 	if (Texture)
 		Texture->Release();
 
 	if (RTTSurface)
 		RTTSurface->Release();
+
+	// if this texture was the last one using the depth buffer
+	// we can release the surface. We only use the value of the pointer
+	// hence it is safe to use the dropped pointer...
+	if (DepthSurface)
+		if (DepthSurface->drop())
+			Driver->removeDepthSurface(DepthSurface);
+
+	if (Device)
+		Device->Release();
 }
 
 
 void CD3D9Texture::createRenderTarget()
 {
-	TextureSize.Width = getTextureSizeFromImageSize(TextureSize.Width);
-	TextureSize.Height = getTextureSizeFromImageSize(TextureSize.Height);
-
-	// get backbuffer format to create the render target in the
-	// same format
-
-	IDirect3DSurface9* bb;
-	D3DFORMAT d3DFormat = D3DFMT_A8R8G8B8;
-
-	if (!FAILED(Device->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &bb)))
+	// are texture size restrictions there ?
+	if(!Driver->queryFeature(EVDF_TEXTURE_NPOT))
 	{
-		D3DSURFACE_DESC desc;
-		bb->GetDesc(&desc);
-		d3DFormat = desc.Format;
-
-		if (d3DFormat == D3DFMT_X8R8G8B8)
-			d3DFormat = D3DFMT_A8R8G8B8;
-
-		bb->Release();
-	}
-	else
-	{
-		os::Printer::log("Could not create RenderTarget texture: could not get BackBuffer.",
-			ELL_WARNING);
-		return;
+		TextureSize.Width = getTextureSizeFromSurfaceSize(TextureSize.Width);
+		TextureSize.Height = getTextureSizeFromSurfaceSize(TextureSize.Height);
+		if (TextureSize != ImageSize)
+			os::Printer::log("RenderTarget size has to be a power of two", ELL_INFORMATION);
 	}
 
+	// get irrlicht format from backbuffer
+	ColorFormat = Driver->getColorFormat();
+	D3DFORMAT d3dformat = Driver->getD3DColorFormat();
+	setPitch(d3dformat);
+
 	// create texture
 	HRESULT hr;
 
@@ -148,16 +137,24 @@ void CD3D9Texture::createRenderTarget()
 		TextureSize.Height,
 		1, // mip map level count, we don't want mipmaps here
 		D3DUSAGE_RENDERTARGET,
-		d3DFormat,
+		d3dformat,
 		D3DPOOL_DEFAULT,
 		&Texture,
 		NULL);
 
-	// get irrlicht format from D3D format
-	ColorFormat = getColorFormatFromD3DFormat(d3DFormat);
-
 	if (FAILED(hr))
-		os::Printer::log("Could not create render target texture");
+	{
+		if (D3DERR_INVALIDCALL == hr)
+			os::Printer::log("Could not create render target texture", "Invalid Call");
+		else
+		if (D3DERR_OUTOFVIDEOMEMORY == hr)
+			os::Printer::log("Could not create render target texture", "Out of Video Memory");
+		else
+		if (E_OUTOFMEMORY == hr)
+			os::Printer::log("Could not create render target texture", "Out of Memory");
+		else
+			os::Printer::log("Could not create render target texture");
+	}
 }
 
 
@@ -250,7 +247,7 @@ bool CD3D9Texture::createMipMaps(u32 level)
 	upperSurface->Release();
 	lowerSurface->Release();
 
-	if (!result || (upperDesc.Width < 3 && upperDesc.Height < 3))
+	if (!result || (upperDesc.Width <= 3 && upperDesc.Height <= 3))
 		return result; // stop generating levels
 
 	// generate next level
@@ -259,17 +256,17 @@ bool CD3D9Texture::createMipMaps(u32 level)
 
 
 //! creates the hardware texture
-bool CD3D9Texture::createTexture(u32 flags)
+bool CD3D9Texture::createTexture(u32 flags, IImage * image)
 {
 	core::dimension2d<s32> optSize;
-	ImageSize = Image->getDimension();
+	ImageSize = image->getDimension();
 
 	if (Driver->queryFeature(EVDF_TEXTURE_NPOT))
 		optSize=ImageSize;
 	else
 	{
-		optSize.Width = getTextureSizeFromImageSize(ImageSize.Width);
-		optSize.Height = getTextureSizeFromImageSize(ImageSize.Height);
+		optSize.Width = getTextureSizeFromSurfaceSize(ImageSize.Width);
+		optSize.Height = getTextureSizeFromSurfaceSize(ImageSize.Height);
 	}
 
 	HRESULT hr;
@@ -283,7 +280,7 @@ bool CD3D9Texture::createTexture(u32 flags)
 		format = D3DFMT_A8R8G8B8; break;
 	case ETCF_OPTIMIZED_FOR_QUALITY:
 		{
-			switch(Image->getColorFormat())
+			switch(image->getColorFormat())
 			{
 			case ECF_R8G8B8:
 			case ECF_A8R8G8B8:
@@ -347,57 +344,16 @@ bool CD3D9Texture::createTexture(u32 flags)
 			0, format, D3DPOOL_MANAGED, &Texture, NULL);
 	}
 
-	ColorFormat = getColorFormatFromD3DFormat(format);
+	ColorFormat = Driver->getColorFormatFromD3DFormat(format);
+	setPitch(format);
 	return (SUCCEEDED(hr));
 }
 
 
-D3DFORMAT CD3D9Texture::getD3DFormatFromColorFormat(ECOLOR_FORMAT format) const
-{
-	switch(format)
-	{
-		case ECF_A1R5G5B5:
-			return D3DFMT_A1R5G5B5;
-		case ECF_R5G6B5:
-			return D3DFMT_R5G6B5;
-		case ECF_R8G8B8:
-			return D3DFMT_R8G8B8;
-		case ECF_A8R8G8B8:
-			return D3DFMT_A8R8G8B8;
-	}
-	return D3DFMT_UNKNOWN;
-}
-
-
-ECOLOR_FORMAT CD3D9Texture::getColorFormatFromD3DFormat(D3DFORMAT format)
-{
-	switch(format)
-	{
-	case D3DFMT_X1R5G5B5:
-	case D3DFMT_A1R5G5B5:
-		Pitch = TextureSize.Width * 2;
-		return ECF_A1R5G5B5;
-	case D3DFMT_A8B8G8R8:
-	case D3DFMT_A8R8G8B8:
-	case D3DFMT_X8R8G8B8:
-		Pitch = TextureSize.Width * 4;
-		return ECF_A8R8G8B8;
-	case D3DFMT_R5G6B5:
-		Pitch = TextureSize.Width * 2;
-		return ECF_R5G6B5;
-	case D3DFMT_R8G8B8:
-		Pitch = TextureSize.Width * 3;
-		return ECF_R8G8B8;
-	default:
-		return (ECOLOR_FORMAT)0;
-	};
-}
-
-
 //! copies the image to the texture
-bool CD3D9Texture::copyTexture()
+bool CD3D9Texture::copyTexture(IImage * image)
 {
-	if (Texture && Image)
+	if (Texture && image)
 	{
 		D3DSURFACE_DESC desc;
 		Texture->GetLevelDesc(0, &desc);
@@ -409,17 +365,17 @@ bool CD3D9Texture::copyTexture()
 		HRESULT hr = Texture->LockRect(0, &rect, 0, 0);
 		if (FAILED(hr))
 		{
-			os::Printer::log("Could not lock D3D9 Texture.", ELL_ERROR);
+			os::Printer::log("Texture data not copied", "Could not LockRect D3D9 Texture.", ELL_ERROR);
 			return false;
 		}
 
 		Pitch = rect.Pitch;
-		Image->copyToScaling(rect.pBits, TextureSize.Width, TextureSize.Height, ColorFormat, Pitch);
+		image->copyToScaling(rect.pBits, TextureSize.Width, TextureSize.Height, ColorFormat, Pitch);
 
 		hr = Texture->UnlockRect(0);
 		if (FAILED(hr))
 		{
-			os::Printer::log("Could not unlock D3D9 Texture.", ELL_ERROR);
+			os::Printer::log("Texture data not copied", "Could not UnlockRect D3D9 Texture.", ELL_ERROR);
 			return false;
 		}
 	}
@@ -429,7 +385,7 @@ bool CD3D9Texture::copyTexture()
 
 
 //! lock function
-void* CD3D9Texture::lock()
+void* CD3D9Texture::lock(bool readOnly)
 {
 	if (!Texture)
 		return 0;
@@ -438,7 +394,14 @@ void* CD3D9Texture::lock()
 	D3DLOCKED_RECT rect;
 	if(!IsRenderTarget)
 	{
-		hr = Texture->LockRect(0, &rect, 0, 0);
+		hr = Texture->LockRect(0, &rect, 0, readOnly?D3DLOCK_READONLY:0);
+		if (FAILED(hr))
+		{
+			os::Printer::log("Could not lock DIRECT3D9 Texture.", ELL_ERROR);
+			return 0;
+		}
+
+		return rect.pBits;
 	}
 	else
 	{
@@ -446,47 +409,39 @@ void* CD3D9Texture::lock()
 		Texture->GetLevelDesc(0, &desc);
 		if (!RTTSurface)
 		{
-			hr = Device->CreateOffscreenPlainSurface(desc.Width, desc.Height, desc.Format, D3DPOOL_SYSTEMMEM, &RTTSurface, NULL);
+			hr = Device->CreateOffscreenPlainSurface(desc.Width, desc.Height, desc.Format, D3DPOOL_SYSTEMMEM, &RTTSurface, 0);
 			if (FAILED(hr))
 			{
-				os::Printer::log("Could not lock DIRECT3D9 Texture.", ELL_ERROR);
+				os::Printer::log("Could not lock DIRECT3D9 Texture", "Offscreen surface creation failed.", ELL_ERROR);
 				return 0;
 			}
 		}
 
-		IDirect3DSurface9 *surface = NULL;
+		IDirect3DSurface9 *surface = 0;
 		hr = Texture->GetSurfaceLevel(0, &surface);
 		if (FAILED(hr))
 		{
-			os::Printer::log("Could not lock DIRECT3D9 Texture.", ELL_ERROR);
+			os::Printer::log("Could not lock DIRECT3D9 Texture", "Could not get surface.", ELL_ERROR);
 			return 0;
 		}
 		hr = Device->GetRenderTargetData(surface, RTTSurface);
 		surface->Release();
 		if(FAILED(hr))
 		{
-			os::Printer::log("Could not lock DIRECT3D9 Texture.", ELL_ERROR);
+			os::Printer::log("Could not lock DIRECT3D9 Texture", "Data copy failed.", ELL_ERROR);
 			return 0;
 		}
-		hr = RTTSurface->LockRect(&rect, NULL, 0);
+		hr = RTTSurface->LockRect(&rect, 0, readOnly?D3DLOCK_READONLY:0);
 		if(FAILED(hr))
 		{
-			os::Printer::log("Could not lock DIRECT3D9 Texture.", ELL_ERROR);
+			os::Printer::log("Could not lock DIRECT3D9 Texture", "LockRect failed.", ELL_ERROR);
 			return 0;
 		}
 		return rect.pBits;
 	}
-	if (FAILED(hr))
-	{
-		os::Printer::log("Could not lock DIRECT3D9 Texture.", ELL_ERROR);
-		return 0;
-	}
-
-	return rect.pBits;
 }
 
 
-
 //! unlock function
 void CD3D9Texture::unlock()
 {
@@ -515,7 +470,7 @@ const core::dimension2d<s32>& CD3D9Texture::getSize() const
 
 
 //! returns the size of a texture which would be the optimize size for rendering it
-inline s32 CD3D9Texture::getTextureSizeFromImageSize(s32 size) const
+inline s32 CD3D9Texture::getTextureSizeFromSurfaceSize(s32 size) const
 {
 	s32 ts = 0x01;
 
@@ -552,7 +507,7 @@ u32 CD3D9Texture::getPitch() const
 
 
 //! returns the DIRECT3D9 Texture
-IDirect3DTexture9* CD3D9Texture::getDX9Texture() const
+IDirect3DBaseTexture9* CD3D9Texture::getDX9Texture() const
 {
 	return Texture;
 }
@@ -665,6 +620,7 @@ bool CD3D9Texture::isRenderTarget() const
 	return IsRenderTarget;
 }
 
+
 //! Returns pointer to the render target surface
 IDirect3DSurface9* CD3D9Texture::getRenderTargetSurface()
 {
@@ -682,8 +638,34 @@ IDirect3DSurface9* CD3D9Texture::getRenderTargetSurface()
 }
 
 
+void CD3D9Texture::setPitch(D3DFORMAT d3dformat)
+{
+	switch(d3dformat)
+	{
+	case D3DFMT_X1R5G5B5:
+	case D3DFMT_A1R5G5B5:
+		Pitch = TextureSize.Width * 2;
+	break;
+	case D3DFMT_A8B8G8R8:
+	case D3DFMT_A8R8G8B8:
+	case D3DFMT_X8R8G8B8:
+		Pitch = TextureSize.Width * 4;
+	break;
+	case D3DFMT_R5G6B5:
+		Pitch = TextureSize.Width * 2;
+	break;
+	case D3DFMT_R8G8B8:
+		Pitch = TextureSize.Width * 3;
+	break;
+	default:
+		Pitch = 0;
+	};
+}
+
+
 } // end namespace video
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_DIRECT3D_9_
 
+
diff --git a/src/dep/src/irrlicht/CD3D9Texture.h b/src/dep/src/irrlicht/CD3D9Texture.h
index 802b8f5..40c0508 100644
--- a/src/dep/src/irrlicht/CD3D9Texture.h
+++ b/src/dep/src/irrlicht/CD3D9Texture.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,7 +10,7 @@
 
 #include "ITexture.h"
 #include "IImage.h"
-#include "d3d9.h"
+#include <d3d9.h>
 
 namespace irr
 {
@@ -18,6 +18,8 @@ namespace video
 {
 
 class CD3D9Driver;
+// forward declaration for RTT depth buffer handling
+struct SDepthSurface;
 /*!
 	interface for a Video Driver dependent Texture.
 */
@@ -30,13 +32,13 @@ public:
 		u32 flags, const char* name);
 
 	//! rendertarget constructor
-	CD3D9Texture(CD3D9Driver* driver, core::dimension2d<s32> size, const char* name);
+	CD3D9Texture(CD3D9Driver* driver, const core::dimension2d<s32>& size, const char* name);
 
 	//! destructor
 	virtual ~CD3D9Texture();
 
 	//! lock function
-	virtual void* lock();
+	virtual void* lock(bool readOnly = false);
 
 	//! unlock function
 	virtual void unlock();
@@ -57,7 +59,7 @@ public:
 	virtual u32 getPitch() const;
 
 	//! returns the DIRECT3D9 Texture
-	IDirect3DTexture9* getDX9Texture() const;
+	IDirect3DBaseTexture9* getDX9Texture() const;
 
 	//! returns if texture has mipmap levels
 	bool hasMipMaps() const;
@@ -73,23 +75,18 @@ public:
 	IDirect3DSurface9* getRenderTargetSurface();
 
 private:
+	friend class CD3D9Driver;
 
 	void createRenderTarget();
 
 	//! returns the size of a texture which would be the optimize size for rendering it
-	inline s32 getTextureSizeFromImageSize(s32 size) const;
+	inline s32 getTextureSizeFromSurfaceSize(s32 size) const;
 
 	//! creates the hardware texture
-	bool createTexture(u32 flags);
+	bool createTexture(u32 flags, IImage * image);
 
 	//! copies the image to the texture
-	bool copyTexture();
-
-	//! Get D3D color format from Irrlicht color format.
-	D3DFORMAT getD3DFormatFromColorFormat(ECOLOR_FORMAT format) const;
-
-	//! Get Irrlicht color format from D3D color format.
-	ECOLOR_FORMAT getColorFormatFromD3DFormat(D3DFORMAT format);
+	bool copyTexture(IImage * image);
 
 	//! Helper function for mipmap generation.
 	bool createMipMaps(u32 level=1);
@@ -102,11 +99,14 @@ private:
 	void copy32BitMipMap(char* src, char* tgt,
 		s32 width, s32 height,  s32 pitchsrc, s32 pitchtgt) const;
 
-	IImage* Image;
+	//! set Pitch based on the d3d format
+	void setPitch(D3DFORMAT d3dformat);
+
 	IDirect3DDevice9* Device;
 	IDirect3DTexture9* Texture;
 	IDirect3DSurface9* RTTSurface;
 	CD3D9Driver* Driver;
+	SDepthSurface* DepthSurface;
 	core::dimension2d<s32> TextureSize;
 	core::dimension2d<s32> ImageSize;
 	s32 Pitch;
@@ -125,3 +125,4 @@ private:
 
 #endif // __C_DIRECTX9_TEXTURE_H_INCLUDED__
 
+
diff --git a/src/dep/src/irrlicht/CDMFLoader.cpp b/src/dep/src/irrlicht/CDMFLoader.cpp
index 6090d63..b247029 100644
--- a/src/dep/src/irrlicht/CDMFLoader.cpp
+++ b/src/dep/src/irrlicht/CDMFLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 //
@@ -16,6 +16,11 @@
 #include "IrrCompileConfig.h" 
 #ifdef _IRR_COMPILE_WITH_DMF_LOADER_
 
+#ifdef _DEBUG
+#define _IRR_DMF_DEBUG_
+#include "os.h"
+#endif
+
 #include "CDMFLoader.h"
 #include "ISceneManager.h"
 #include "IAttributes.h"
@@ -24,6 +29,7 @@
 #include "irrString.h"
 #include "irrMath.h"
 #include "dmfsupport.h"
+#include "CImage.h"
 
 namespace irr
 {
@@ -31,55 +37,12 @@ namespace scene
 {
 
 /** Constructor*/
-CDMFLoader::CDMFLoader(video::IVideoDriver* driver, ISceneManager* smgr)
-: Driver(driver) , SceneMgr(smgr)
+CDMFLoader::CDMFLoader(ISceneManager* smgr, io::IFileSystem* filesys)
+: SceneMgr(smgr), FileSystem(filesys)
 {
 	#ifdef _DEBUG
 	IReferenceCounted::setDebugName("CDMFLoader");
 	#endif
-
-	if (Driver)
-		Driver->grab();
-}
-
-
-/** Destructor*/
-CDMFLoader::~CDMFLoader()
-{
-	if (Driver)
-		Driver->drop();
-}
-
-
-
-/** Given first three points of a face, returns a face normal*/
-void CDMFLoader::GetFaceNormal(	f32 a[3], //First point
-				f32 b[3], //Second point
-				f32 c[3], //Third point
-				f32 out[3]) //Normal computed
-{
-	f32 v1[3], v2[3];
-
-	v1[0] = a[0] - b[0];
-	v1[1] = a[1] - b[1];
-	v1[2] = a[2] - b[2];
-
-	v2[0] = b[0] - c[0];
-	v2[1] = b[1] - c[1];
-	v2[2] = b[2] - c[2];
-
-	out[0] = (v1[1] * v2[2]) - (v1[2] * v2[1]);
-	out[1] = (v1[2] * v2[0]) - (v1[0] * v2[2]);
-	out[2] = (v1[0] * v2[1]) - (v1[1] * v2[0]);
-
-	f32 dist = (f32)sqrtf((out[0] * out[0]) + (out[1] * out[1]) + (out[2] * out[2]));
-
-	if (dist == 0.0f)
-		dist = 0.001f;
-
-	out[0] /= dist;
-	out[1] /= dist;
-	out[2] /= dist;
 }
 
 
@@ -91,6 +54,7 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 {
 	if (!file)
 		return 0;
+	video::IVideoDriver* driver = SceneMgr->getVideoDriver();
 
 	//Load stringlist
 	StringList dmfRawFile(file);
@@ -98,7 +62,7 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 	if (dmfRawFile.size()==0)
 		return 0;
 
-	SMesh * Mesh = new SMesh();
+	SMesh * mesh = new SMesh();
 
 	u32 i;
 
@@ -108,23 +72,31 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 	if (GetDMFHeader(dmfRawFile, header))
 	{
 		//let's set ambient light
-		SceneMgr->setAmbientLight( header.dmfAmbient);
+		SceneMgr->setAmbientLight(header.dmfAmbient);
 
 		//let's create the correct number of materials, vertices and faces
-		dmfMaterial *materiali=new dmfMaterial[header.numMaterials];
+		core::array<dmfMaterial> materiali;
 		dmfVert *verts=new dmfVert[header.numVertices];
 		dmfFace *faces=new dmfFace[header.numFaces];
 
 		//let's get the materials
-		bool use_mat_dirs=false;
-		use_mat_dirs=SceneMgr->getParameters()->getAttributeAsBool(DMF_USE_MATERIALS_DIRS);
+		const bool use_mat_dirs=SceneMgr->getParameters()->getAttributeAsBool(DMF_USE_MATERIALS_DIRS);
 
-		GetDMFMaterials(dmfRawFile , materiali,header.numMaterials,use_mat_dirs);
+#ifdef _IRR_DMF_DEBUG_
+		os::Printer::log("Loading materials", core::stringc(header.numMaterials).c_str());
+#endif
+		GetDMFMaterials(dmfRawFile, materiali, header.numMaterials, use_mat_dirs);
 
 		//let's get vertices and faces
-		GetDMFVerticesFaces(dmfRawFile, verts,faces);
+#ifdef _IRR_DMF_DEBUG_
+		os::Printer::log("Loading geometry");
+#endif
+		GetDMFVerticesFaces(dmfRawFile, verts, faces);
 
 		//create a meshbuffer for each material, then we'll remove empty ones
+#ifdef _IRR_DMF_DEBUG_
+		os::Printer::log("Creating meshbuffers.");
+#endif
 		for (i=0; i<header.numMaterials; i++)
 		{
 			//create a new SMeshBufferLightMap for each material
@@ -132,43 +104,43 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 			buffer->Material.MaterialType = video::EMT_LIGHTMAP_LIGHTING;
 			buffer->Material.Wireframe = false;
 			buffer->Material.Lighting = true;
-			Mesh->addMeshBuffer(buffer);
+			mesh->addMeshBuffer(buffer);
 			buffer->drop();
 		}
 
 		// Build the mesh buffers
+#ifdef _IRR_DMF_DEBUG_
+		os::Printer::log("Adding geometry to mesh.");
+#endif
 		for (i = 0; i < header.numFaces; i++)
 		{
+#ifdef _IRR_DMF_DEBUG_
+		os::Printer::log("Polygon with #vertices", core::stringc(faces[i].numVerts).c_str());
+#endif
 			if (faces[i].numVerts < 3)
 				continue;
 
-			f32 normal[3];
+			const core::vector3df normal =
+				core::triangle3df(verts[faces[i].firstVert].pos,
+						verts[faces[i].firstVert+1].pos,
+						verts[faces[i].firstVert+2].pos).getNormal().normalize();
 
-			GetFaceNormal(verts[faces[i].firstVert].pos,
-					verts[faces[i].firstVert+1].pos, verts[faces[i].firstVert+2].pos, normal);
-
-			SMeshBufferLightMap * meshBuffer = (SMeshBufferLightMap*)Mesh->getMeshBuffer(
+			SMeshBufferLightMap * meshBuffer = (SMeshBufferLightMap*)mesh->getMeshBuffer(
 					faces[i].materialID);
 
-			u32 base = meshBuffer->Vertices.size();
+			const u32 base = meshBuffer->Vertices.size();
 
 			// Add this face's verts
 			u32 v;
 			for (v = 0; v < faces[i].numVerts; v++)
 			{
-				dmfVert * vv = &verts[faces[i].firstVert + v];
-				video::S3DVertex2TCoords vert(vv->pos[0], vv->pos[1], vv->pos[2],
-					normal[0], normal[1], normal[2], video::SColor(0,255,255,255), 0.0f, 0.0f);
-				if ( materiali[faces[i].materialID].textureBlend==4 &&
-					SceneMgr->getParameters()->getAttributeAsBool(DMF_FLIP_ALPHA_TEXTURES))
+				const dmfVert& vv = verts[faces[i].firstVert + v];
+				video::S3DVertex2TCoords vert(vv.pos,
+					normal, video::SColor(255,255,255,255), vv.tc, vv.lc);
+				if (materiali[faces[i].materialID].textureBlend==4 &&
+						SceneMgr->getParameters()->getAttributeAsBool(DMF_FLIP_ALPHA_TEXTURES))
 				{
-					vert.TCoords.set(vv->tc[0],-vv->tc[1]);
-					vert.TCoords2.set(vv->lc[0],vv->lc[1]);
-				}
-				else
-				{
-					vert.TCoords.set(vv->tc[0], vv->tc[1]);
-					vert.TCoords2.set(vv->lc[0], vv->lc[1]);
+					vert.TCoords.set(vv.tc.X,-vv.tc.Y);
 				}
 				meshBuffer->Vertices.push_back(vert);
 			}
@@ -176,22 +148,22 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 			// Now add the indices
 			// This weird loop turns convex polygons into triangle strips.
 			// I do it this way instead of a simple fan because it usually
-			// looks  a lot better in wireframe, for example.
+			// looks a lot better in wireframe, for example.
 			u32 h = faces[i].numVerts - 1, l = 0, c; // High, Low, Center
 			for (v = 0; v < faces[i].numVerts - 2; v++)
 			{
-				if (v & 1)
+				if (v & 1) // odd
 					c = h - 1;
-				else
+				else // even
 					c = l + 1;
 
 				meshBuffer->Indices.push_back(base + h);
 				meshBuffer->Indices.push_back(base + l);
 				meshBuffer->Indices.push_back(base + c);
 
-				if (v & 1)
+				if (v & 1) // odd
 					h--;
-				else
+				else // even
 					l++;
 			}
 		}
@@ -199,73 +171,58 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 		//load textures and lightmaps in materials.
 		//don't worry if you receive a could not load texture, cause if you don't need
 		//a particular material in your scene it will be loaded and then destroyed.
+#ifdef _IRR_DMF_DEBUG_
+		os::Printer::log("Loading textures.");
+#endif
 		for (i=0; i<header.numMaterials; i++)
 		{
-			String path = "";
-			if ( !SceneMgr->getParameters()->existsAttribute(DMF_TEXTURE_PATH) )
-			{
-				//get the right path for textures
-				StringList filepath = SubdivideString(String(file->getFileName()),"\\");
-				StringList filepath1 = SubdivideString(String(file->getFileName()),"/");
-				if(filepath1.size()>filepath.size())
-				{
-					filepath.clear();
-					filepath=filepath1;
-				}
-
-				for (u32 j=0; j<filepath.size()-1; ++j)
-					path = path + filepath[j] + String("\\");
-			}
+			core::stringc path;
+			if ( SceneMgr->getParameters()->existsAttribute(DMF_TEXTURE_PATH) )
+				path = SceneMgr->getParameters()->getAttributeAsString(DMF_TEXTURE_PATH);
 			else
-				path = path +
-						String( SceneMgr->getParameters()->getAttributeAsString(DMF_TEXTURE_PATH)) + String("\\");
+				path = FileSystem->getFileDir(file->getFileName());
+			path += ('/');
 
 			//texture and lightmap
 			ITexture *tex = 0;
 			ITexture *lig = 0;
 
 			//current buffer to apply material
-			SMeshBufferLightMap* buffer = (SMeshBufferLightMap*)Mesh->getMeshBuffer(i);
+			SMeshBufferLightMap* buffer = (SMeshBufferLightMap*)mesh->getMeshBuffer(i);
 
 			//Primary texture is normal
-			if ((materiali[i].textureFlag==0) || (materiali[i].textureBlend==4))
-				Driver->setTextureCreationFlag(ETCF_ALWAYS_32_BIT,true);
-			tex = Driver->getTexture((path+String(materiali[i].textureName)).c_str());
-
-			//Primary texture is just a colour
-			if(materiali[i].textureFlag==1)
+			if (materiali[i].textureFlag==0)
 			{
-				String colour(materiali[i].textureName);
-				String alpha,red,green,blue;
-
-				alpha.append((char*)&colour[0]);
-				alpha.append((char*)&colour[1]);
-				blue.append((char*)&colour[2]);
-				blue.append((char*)&colour[3]);
-				green.append((char*)&colour[4]);
-				green.append((char*)&colour[5]);
-				red.append((char*)&colour[6]);
-				red.append((char*)&colour[7]);
-
-				SColor color(axtoi(alpha.c_str()),
-					axtoi(red.c_str()),axtoi(green.c_str()),
-					axtoi(blue.c_str()));
-
-				s32 col = color.color;
-				s32 buf[64];
-
-				for (int k=0; k<64; k++)
-					buf[k]=col;
+				if (materiali[i].textureBlend==4)
+					driver->setTextureCreationFlag(ETCF_ALWAYS_32_BIT,true);
+				if (FileSystem->existFile(path+materiali[i].textureName))
+					tex = driver->getTexture((path+materiali[i].textureName).c_str());
+				else if (FileSystem->existFile(path+FileSystem->getFileBasename(materiali[i].textureName)))
+					tex = driver->getTexture((path+FileSystem->getFileBasename(materiali[i].textureName)).c_str());
+				else if (FileSystem->existFile(materiali[i].textureName))
+					tex = driver->getTexture(materiali[i].textureName.c_str());
+				else if (FileSystem->existFile(FileSystem->getFileBasename(materiali[i].textureName)))
+					tex = driver->getTexture(FileSystem->getFileBasename(materiali[i].textureName).c_str());
+#ifdef _IRR_DMF_DEBUG_
+				else
+					os::Printer::log("Could not load texture", materiali[i].textureName.c_str());
+#endif // _IRR_DMF_DEBUG_
+			}
+			//Primary texture is just a colour
+			else if(materiali[i].textureFlag==1)
+			{
+				SColor color(axtoi(materiali[i].textureName.c_str()));
 
 				//just for compatibility with older Irrlicht versions
 				//to support transparent materials
 				if (color.getAlpha()!=255 && materiali[i].textureBlend==4)
-					Driver->setTextureCreationFlag(ETCF_ALWAYS_32_BIT,true);
+					driver->setTextureCreationFlag(ETCF_ALWAYS_32_BIT,true);
 
-				IImage *immagine=Driver->createImageFromData(ECF_A8R8G8B8,
-					core::dimension2d<s32>(8,8),buf);
-
-				tex = Driver->addTexture("", immagine);
+				CImage *immagine= new CImage(ECF_A8R8G8B8,
+					core::dimension2d<s32>(8,8));
+				immagine->fill(color);
+				tex = driver->addTexture("", immagine);
+				immagine->drop();
 
 				//to support transparent materials
 				if(color.getAlpha()!=255 && materiali[i].textureBlend==4)
@@ -273,42 +230,33 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 					buffer->Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 					buffer->Material.MaterialTypeParam =(((f32) (color.getAlpha()-1))/255.0f);
 				}
-				immagine->drop();
 			}
 
 			//Lightmap is present
 			if (materiali[i].lightmapFlag == 0)
-				lig = Driver->getTexture((path+String(materiali[i].lightmapName)).c_str());
+				lig = driver->getTexture((path+materiali[i].lightmapName).c_str());
 			else //no lightmap
 			{
-				lig = 0;
 				buffer->Material.MaterialType = video::EMT_SOLID;
 				const f32 mult = 100.0f - header.dmfShadow;
 				buffer->Material.AmbientColor=header.dmfAmbient.getInterpolated(SColor(255,0,0,0),mult/100.f);
 			}
 
-			if(materiali[i].textureBlend==4)
+			if (materiali[i].textureBlend==4)
 			{
 				buffer->Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-				buffer->Material.MaterialTypeParam =SceneMgr->getParameters()->getAttributeAsFloat(DMF_ALPHA_CHANNEL_REF);
+				buffer->Material.MaterialTypeParam =
+					SceneMgr->getParameters()->getAttributeAsFloat(DMF_ALPHA_CHANNEL_REF);
 			}
 
-			core::dimension2d<s32> texsize;
-			core::dimension2d<s32> ligsize;
-
-			if (tex && header.dmfVersion<1.1)
-				texsize=tex->getSize();
-
-			if (lig && header.dmfVersion<1.1)
-				ligsize=lig->getSize();
-
-			//if texture is present mirror vertically owing to DeleD rapresentation
+			//if texture is present mirror vertically owing to DeleD representation
 			if (tex && header.dmfVersion<1.1)
 			{
+				const core::dimension2d<s32> texsize = tex->getSize();
 				void* pp = tex->lock();
 				if (pp)
 				{
-					video::ECOLOR_FORMAT format = tex->getColorFormat();
+					const video::ECOLOR_FORMAT format = tex->getColorFormat();
 					if (format == video::ECF_A1R5G5B5)
 					{
 						s16* p = (s16*)pp;
@@ -335,10 +283,6 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 							}
 					}
 				}
-			}
-
-			if(tex && header.dmfVersion<1.1)
-			{
 				tex->unlock();
 				tex->regenerateMipMapLevels();
 			}
@@ -346,6 +290,7 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 			//if lightmap is present mirror vertically owing to DeleD rapresentation
 			if (lig && header.dmfVersion<1.1)
 			{
+				const core::dimension2d<s32> ligsize=lig->getSize();
 				void* pp = lig->lock();
 				if (pp)
 				{
@@ -379,10 +324,6 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 						}
 					}
 				}
-			}
-
-			if (lig && header.dmfVersion<1.1)
-			{
 				lig->unlock();
 				lig->regenerateMipMapLevels();
 			}
@@ -393,20 +334,21 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 
 		delete verts;
 		delete faces;
-		delete materiali;
 	}
 
 	// delete all buffers without geometry in it.
+#ifdef _IRR_DMF_DEBUG_
+	os::Printer::log("Cleaning meshbuffers.");
+#endif
 	i = 0;
-	while(i < Mesh->MeshBuffers.size())
+	while(i < mesh->MeshBuffers.size())
 	{
-		if (Mesh->MeshBuffers[i]->getVertexCount() == 0 ||
-			Mesh->MeshBuffers[i]->getIndexCount() == 0 ||
-			Mesh->MeshBuffers[i]->getMaterial().getTexture(0) == 0)
+		if (mesh->MeshBuffers[i]->getVertexCount() == 0 ||
+			mesh->MeshBuffers[i]->getIndexCount() == 0)
 		{
 			// Meshbuffer is empty -- drop it
-			Mesh->MeshBuffers[i]->drop();
-			Mesh->MeshBuffers.erase(i);
+			mesh->MeshBuffers[i]->drop();
+			mesh->MeshBuffers.erase(i);
 		}
 		else
 		{
@@ -415,18 +357,18 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
 	}
 
 	// create bounding box
-	for (i = 0; i < Mesh->MeshBuffers.size(); i++)
+	for (i = 0; i < mesh->MeshBuffers.size(); ++i)
 	{
-		((SMeshBufferLightMap*)Mesh->MeshBuffers[i])->recalculateBoundingBox();
+		mesh->MeshBuffers[i]->recalculateBoundingBox();
 	}
-	Mesh->recalculateBoundingBox();
+	mesh->recalculateBoundingBox();
 
 	// Set up an animated mesh to hold the mesh
 	SAnimatedMesh* AMesh = new SAnimatedMesh();
 	AMesh->Type = EAMT_UNKNOWN;
-	AMesh->addMesh(Mesh);
+	AMesh->addMesh(mesh);
 	AMesh->recalculateBoundingBox();
-	Mesh->drop();
+	mesh->drop();
 
 	return AMesh;
 }
diff --git a/src/dep/src/irrlicht/CDMFLoader.h b/src/dep/src/irrlicht/CDMFLoader.h
index 65db4e0..7d23bd5 100644
--- a/src/dep/src/irrlicht/CDMFLoader.h
+++ b/src/dep/src/irrlicht/CDMFLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // 
@@ -19,12 +19,9 @@
   This loader is used to load DMF files in Irrlicht.
   Look at the documentation for a sample application.
   
-  Parts of this code are from Irrlicht's CQ3LevelMesh and C3DSMeshFileLoader,
-  and are Copyright (C) 2002-2004 Nikolaus Gebhardt.
-  
-  Parts of this code are from Murphy McCauley COCTLoader just like GetFaceNormal() or indexes
-  creation routines and a routine to add faces. So please refer to COCTLoader.h to know more
-  about rights granted.
+  Parts of this code are from Murphy McCauley COCTLoader just like
+  GetFaceNormal() or indexes creation routines and a routine to add faces. So
+  please refer to COCTLoader.h to know more about rights granted.
   
   You can use this software as you wish but you must not remove these notes about license nor
   credits to others for parts of this code.
@@ -35,6 +32,7 @@
 
 #include "IMeshLoader.h"
 #include "IReadFile.h"
+#include "IFileSystem.h"
 #include "SMesh.h"
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
@@ -50,44 +48,38 @@ namespace scene
 	public:
 
 		/** constructor*/
-		CDMFLoader(video::IVideoDriver* driver, ISceneManager* smgr);
-
-		/** destructor*/
-		virtual ~CDMFLoader();
+		CDMFLoader(ISceneManager* smgr, io::IFileSystem* filesys);
 
 		//! returns true if the file maybe is able to be loaded by this class
 		//! based on the file extension (e.g. ".cob")
 		virtual bool isALoadableFileExtension(const c8* fileName) const;
 
 		/** creates/loads an animated mesh from the file.
-		 \return Pointer to the created mesh. Returns 0 if loading failed.
-		 If you no longer need the mesh, you should call IAnimatedMesh::drop().
-		 See IReferenceCounted::drop() for more information.*/
+		\return Pointer to the created mesh. Returns 0 if loading failed.
+		If you no longer need the mesh, you should call IAnimatedMesh::drop().
+		See IReferenceCounted::drop() for more information.*/
 		virtual IAnimatedMesh* createMesh(io::IReadFile* file);
 		
 		/** loads dynamic lights present in this scene.
-        Note that loaded lights from DeleD must have the suffix \b dynamic_ and must be \b pointlight.
-        Irrlicht correctly loads specular color, diffuse color , position and distance of object affected by light.
-        \return number of lights loaded or 0 if loading failed.*/
-        int loadLights(const c8 * filename, ISceneManager* smgr,
+		Note that loaded lights from DeleD must have the suffix \b dynamic_ and must be \b pointlight.
+		Irrlicht correctly loads specular color, diffuse color , position and distance of object affected by light.
+		\return number of lights loaded or 0 if loading failed.*/
+		int loadLights(const c8 * filename, ISceneManager* smgr,
 			ISceneNode*  parent = 0, s32 base_id = 1000);
 
-        /** loads water plains present in this scene.
-        Note that loaded water plains from DeleD must have the suffix \b water_ and must be \b rectangle (with just 1 rectangular face).
-        Irrlicht correctly loads position and rotation of water plain as well as texture layers.
-        \return number of water plains loaded or 0 if loading failed.*/
-        int loadWaterPlains ( const c8 *filename,
-                              ISceneManager* smgr,
-                              ISceneNode * parent = 0,
-                              s32 base_id = 2000,
-                              bool mode = true);
-    
-	private:
-		
-        void GetFaceNormal(f32 a[3], f32 b[3], f32 c[3], f32 out[3]);
+		/** loads water plains present in this scene.
+		Note that loaded water plains from DeleD must have the suffix \b water_ and must be \b rectangle (with just 1 rectangular face).
+		Irrlicht correctly loads position and rotation of water plain as well as texture layers.
+		\return number of water plains loaded or 0 if loading failed.*/
+		int loadWaterPlains(const c8 *filename,
+				ISceneManager* smgr,
+				ISceneNode * parent = 0,
+				s32 base_id = 2000,
+				bool mode = true);
 
-		video::IVideoDriver* Driver;
+	private:
 		ISceneManager* SceneMgr;
+		io::IFileSystem* FileSystem;
 	};
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CDefaultGUIElementFactory.cpp b/src/dep/src/irrlicht/CDefaultGUIElementFactory.cpp
index 534c77a..f0a831d 100644
--- a/src/dep/src/irrlicht/CDefaultGUIElementFactory.cpp
+++ b/src/dep/src/irrlicht/CDefaultGUIElementFactory.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -7,26 +7,26 @@
 #ifdef _IRR_COMPILE_WITH_GUI_
 
 #include "IGUIEnvironment.h"
+
 #include "IGUIButton.h"
 #include "IGUICheckBox.h"
+#include "IGUIColorSelectDialog.h"
 #include "IGUIComboBox.h"
 #include "IGUIContextMenu.h"
 #include "IGUIEditBox.h"
-#include "IGUISpinBox.h"
 #include "IGUIFileOpenDialog.h"
-#include "IGUIColorSelectDialog.h"
 #include "IGUIInOutFader.h"
 #include "IGUIImage.h"
 #include "IGUIListBox.h"
 #include "IGUIMeshViewer.h"
 #include "IGUIScrollBar.h"
+#include "IGUISpinBox.h"
 #include "IGUIStaticText.h"
 #include "IGUITabControl.h"
+#include "IGUITable.h"
 #include "IGUIToolbar.h"
 #include "IGUIWindow.h"
 
-#include <string.h>
-
 namespace irr
 {
 namespace gui
@@ -35,6 +35,11 @@ namespace gui
 CDefaultGUIElementFactory::CDefaultGUIElementFactory(IGUIEnvironment* env)
 : Environment(env)
 {
+
+	#ifdef _DEBUG
+	setDebugName("CDefaultGUIElementFactory");
+	#endif
+
 	// don't grab the gui environment here to prevent cyclic references
 }
 
@@ -80,6 +85,8 @@ IGUIElement* CDefaultGUIElementFactory::addGUIElement(EGUI_ELEMENT_TYPE type, IG
 			return Environment->addTab(core::rect<s32>(0,0,100,100),parent);
 		case EGUIET_TAB_CONTROL:
 			return Environment->addTabControl(core::rect<s32>(0,0,100,100),parent);
+		case EGUIET_TABLE:
+			return Environment->addTable(core::rect<s32>(0,0,100,100), parent);
 		case EGUIET_TOOL_BAR:
 			return Environment->addToolBar(parent);
 		case EGUIET_WINDOW:
diff --git a/src/dep/src/irrlicht/CDefaultGUIElementFactory.h b/src/dep/src/irrlicht/CDefaultGUIElementFactory.h
index 860561a..5a8b142 100644
--- a/src/dep/src/irrlicht/CDefaultGUIElementFactory.h
+++ b/src/dep/src/irrlicht/CDefaultGUIElementFactory.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CDefaultSceneNodeAnimatorFactory.cpp b/src/dep/src/irrlicht/CDefaultSceneNodeAnimatorFactory.cpp
index 107a032..ef913f6 100644
--- a/src/dep/src/irrlicht/CDefaultSceneNodeAnimatorFactory.cpp
+++ b/src/dep/src/irrlicht/CDefaultSceneNodeAnimatorFactory.cpp
@@ -1,8 +1,11 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CDefaultSceneNodeAnimatorFactory.h"
+#include "CSceneNodeAnimatorCameraFPS.h"
+#include "CSceneNodeAnimatorCameraMaya.h"
+#include "ICursorControl.h"
 #include "ISceneNodeAnimatorCollisionResponse.h"
 #include "ISceneManager.h"
 
@@ -21,16 +24,29 @@ const c8* const SceneNodeAnimatorTypeNames[] =
 	"texture",
 	"deletion",
 	"collisionResponse",
+	"cameraFPS",
+	"cameraMaya",
 	0
 };
 
 
-CDefaultSceneNodeAnimatorFactory::CDefaultSceneNodeAnimatorFactory(ISceneManager* mgr)
-: Manager(mgr)
+CDefaultSceneNodeAnimatorFactory::CDefaultSceneNodeAnimatorFactory(ISceneManager* mgr, gui::ICursorControl* crs)
+: Manager(mgr), CursorControl(crs)
 {
+	#ifdef _DEBUG
+	setDebugName("CDefaultSceneNodeAnimatorFactory");
+	#endif
+
 	// don't grab the scene manager here to prevent cyclic references
+	if (CursorControl)
+		CursorControl->grab();
 }
 
+CDefaultSceneNodeAnimatorFactory::~CDefaultSceneNodeAnimatorFactory()
+{
+	if (CursorControl)
+		CursorControl->drop();
+}
 
 //! creates a scene node animator based on its type id
 ISceneNodeAnimator* CDefaultSceneNodeAnimatorFactory::createSceneNodeAnimator(ESCENE_NODE_ANIMATOR_TYPE type, ISceneNode* target)
@@ -68,6 +84,12 @@ ISceneNodeAnimator* CDefaultSceneNodeAnimatorFactory::createSceneNodeAnimator(ES
 	case ESNAT_COLLISION_RESPONSE:
 		anim = Manager->createCollisionResponseAnimator(0, target);
 		break;
+	case ESNAT_CAMERA_FPS:
+		anim = new CSceneNodeAnimatorCameraFPS(CursorControl);
+		break;
+	case ESNAT_CAMERA_MAYA:
+		anim = new CSceneNodeAnimatorCameraMaya(CursorControl);
+		break;
 	default:
 		break;
 	}
diff --git a/src/dep/src/irrlicht/CDefaultSceneNodeAnimatorFactory.h b/src/dep/src/irrlicht/CDefaultSceneNodeAnimatorFactory.h
index 71332e0..d9f59c1 100644
--- a/src/dep/src/irrlicht/CDefaultSceneNodeAnimatorFactory.h
+++ b/src/dep/src/irrlicht/CDefaultSceneNodeAnimatorFactory.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,6 +9,10 @@
 
 namespace irr
 {
+namespace gui
+{
+	class ICursorControl;
+}
 namespace scene
 {
 	class ISceneNodeAnimator;
@@ -19,7 +23,9 @@ namespace scene
 	{
 	public:
 
-		CDefaultSceneNodeAnimatorFactory(ISceneManager* mgr);
+		CDefaultSceneNodeAnimatorFactory(ISceneManager* mgr, gui::ICursorControl* crs);
+
+		virtual ~CDefaultSceneNodeAnimatorFactory();
 
 		//! creates a scene node animator based on its type id
 		/** \param type: Type of the scene node animator to add.
@@ -58,6 +64,7 @@ namespace scene
 		ESCENE_NODE_ANIMATOR_TYPE getTypeFromName(const c8* name) const;
 
 		ISceneManager* Manager;
+		gui::ICursorControl* CursorControl;
 	};
 
 
diff --git a/src/dep/src/irrlicht/CDefaultSceneNodeFactory.cpp b/src/dep/src/irrlicht/CDefaultSceneNodeFactory.cpp
index 91370b2..84364d7 100644
--- a/src/dep/src/irrlicht/CDefaultSceneNodeFactory.cpp
+++ b/src/dep/src/irrlicht/CDefaultSceneNodeFactory.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,6 +23,11 @@ namespace scene
 CDefaultSceneNodeFactory::CDefaultSceneNodeFactory(ISceneManager* mgr)
 : Manager(mgr)
 {
+
+	#ifdef _DEBUG
+	setDebugName("CDefaultSceneNodeFactory");
+	#endif
+
 	// don't grab the scene manager here to prevent cyclic references
 
 	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_CUBE, "cube"));
@@ -38,12 +43,14 @@ CDefaultSceneNodeFactory::CDefaultSceneNodeFactory(ISceneManager* mgr)
 	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_EMPTY, "empty"));
 	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_DUMMY_TRANSFORMATION, "dummyTransformation"));
 	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_CAMERA, "camera"));
-	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_CAMERA_MAYA, "cameraMaya"));
-	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_CAMERA_FPS, "cameraFPS"));
 	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_BILLBOARD, "billBoard"));
 	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_ANIMATED_MESH, "animatedMesh"));
 	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_PARTICLE_SYSTEM, "particleSystem"));
 	// SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_MD3_SCENE_NODE, "md3"));
+
+	// legacy, for version <= 1.4.x irr files
+	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_CAMERA_MAYA, "cameraMaya"));
+	SupportedSceneNodeTypes.push_back(SSceneNodeTypePair(ESNT_CAMERA_FPS, "cameraFPS"));
 }
 
 
diff --git a/src/dep/src/irrlicht/CDefaultSceneNodeFactory.h b/src/dep/src/irrlicht/CDefaultSceneNodeFactory.h
index 5eb1a6f..a3bad9c 100644
--- a/src/dep/src/irrlicht/CDefaultSceneNodeFactory.h
+++ b/src/dep/src/irrlicht/CDefaultSceneNodeFactory.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CDepthBuffer.cpp b/src/dep/src/irrlicht/CDepthBuffer.cpp
index 74d6479..f98151a 100644
--- a/src/dep/src/irrlicht/CDepthBuffer.cpp
+++ b/src/dep/src/irrlicht/CDepthBuffer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -65,7 +65,8 @@ void CDepthBuffer::setSize(const core::dimension2d<s32>& size)
 	if (Buffer)
 		delete [] Buffer;
 
-	TotalSize = size.Width * size.Height * sizeof ( fp24 );
+	Pitch = size.Width * sizeof ( fp24 );
+	TotalSize = Pitch * size.Height;
 	Buffer = new u8[TotalSize];
 }
 
@@ -79,19 +80,6 @@ const core::dimension2d<s32>& CDepthBuffer::getSize() const
 
 
 
-//! locks the zbuffer
-fp24* CDepthBuffer::lock()
-{
-	return (fp24*) Buffer;
-}
-
-
-
-//! unlocks the zbuffer
-void CDepthBuffer::unlock()
-{
-}
-
 } // end namespace video
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/CDepthBuffer.h b/src/dep/src/irrlicht/CDepthBuffer.h
index 799053d..ba8d3d1 100644
--- a/src/dep/src/irrlicht/CDepthBuffer.h
+++ b/src/dep/src/irrlicht/CDepthBuffer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -32,16 +32,29 @@ namespace video
 		virtual const core::dimension2d<s32>& getSize() const;
 
 		//! locks the zbuffer
-		virtual fp24* lock();
+		virtual void* lock()
+		{
+			return (void*) Buffer;
+		}
 
 		//! unlocks the zbuffer
-		virtual void unlock();
+		virtual void unlock()
+		{
+		}
+
+		//! returns pitch of depthbuffer (in bytes)
+		virtual u32 getPitch() const
+		{
+			return Pitch;
+		}
+
 
 	private:
 
 		u8* Buffer;
 		core::dimension2d<s32> Size;
 		u32 TotalSize;
+		u32 Pitch;
 	};
 	
 } // end namespace video
diff --git a/src/dep/src/irrlicht/CDummyTransformationSceneNode.cpp b/src/dep/src/irrlicht/CDummyTransformationSceneNode.cpp
index 2aee01e..64cb179 100644
--- a/src/dep/src/irrlicht/CDummyTransformationSceneNode.cpp
+++ b/src/dep/src/irrlicht/CDummyTransformationSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -22,14 +22,6 @@ CDummyTransformationSceneNode::CDummyTransformationSceneNode(
 }
 
 
-
-//! destructor
-CDummyTransformationSceneNode::~CDummyTransformationSceneNode()
-{
-}
-
-
-
 //! returns the axis aligned bounding box of this node
 const core::aabbox3d<f32>& CDummyTransformationSceneNode::getBoundingBox() const
 {
diff --git a/src/dep/src/irrlicht/CDummyTransformationSceneNode.h b/src/dep/src/irrlicht/CDummyTransformationSceneNode.h
index eb3c432..379a485 100644
--- a/src/dep/src/irrlicht/CDummyTransformationSceneNode.h
+++ b/src/dep/src/irrlicht/CDummyTransformationSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,9 +19,6 @@ namespace scene
 		//! constructor
 		CDummyTransformationSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id);
 
-		//! destructor
-		~CDummyTransformationSceneNode();
-
 		//! returns the axis aligned bounding box of this node
 		virtual const core::aabbox3d<f32>& getBoundingBox() const;
 
diff --git a/src/dep/src/irrlicht/CEmptySceneNode.cpp b/src/dep/src/irrlicht/CEmptySceneNode.cpp
index 4b21672..473425f 100644
--- a/src/dep/src/irrlicht/CEmptySceneNode.cpp
+++ b/src/dep/src/irrlicht/CEmptySceneNode.cpp
@@ -1,9 +1,8 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CEmptySceneNode.h"
-#include "IVideoDriver.h"
 #include "ISceneManager.h"
 
 namespace irr
@@ -27,10 +26,9 @@ CEmptySceneNode::CEmptySceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id)
 void CEmptySceneNode::OnRegisterSceneNode()
 {
 	if (IsVisible)
-	{
 		SceneManager->registerNodeForRendering(this);
-		ISceneNode::OnRegisterSceneNode();
-	}
+
+	ISceneNode::OnRegisterSceneNode();
 }
 
 
diff --git a/src/dep/src/irrlicht/CEmptySceneNode.h b/src/dep/src/irrlicht/CEmptySceneNode.h
index 186192d..9f5c33b 100644
--- a/src/dep/src/irrlicht/CEmptySceneNode.h
+++ b/src/dep/src/irrlicht/CEmptySceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CFPSCounter.cpp b/src/dep/src/irrlicht/CFPSCounter.cpp
index c3abe00..2466f75 100644
--- a/src/dep/src/irrlicht/CFPSCounter.cpp
+++ b/src/dep/src/irrlicht/CFPSCounter.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CFPSCounter.h b/src/dep/src/irrlicht/CFPSCounter.h
index f5341e3..358ee6d 100644
--- a/src/dep/src/irrlicht/CFPSCounter.h
+++ b/src/dep/src/irrlicht/CFPSCounter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CFileList.cpp b/src/dep/src/irrlicht/CFileList.cpp
index bd786f7..7fee16e 100644
--- a/src/dep/src/irrlicht/CFileList.cpp
+++ b/src/dep/src/irrlicht/CFileList.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -7,14 +7,8 @@
 #include "irrArray.h"
 #include <stdlib.h>
 
-namespace irr
-{
-namespace io
-{
-
-#if (defined(_IRR_POSIX_API_) || defined(MACOSX))
+#if (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_))
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
@@ -24,10 +18,17 @@ namespace io
 #endif
 
 #ifdef _IRR_WINDOWS_API_
-#include <io.h>
-#include <direct.h>
+	#if !defined ( _WIN32_WCE )
+		#include <io.h>
+		#include <direct.h>
+	#endif
 #endif
 
+namespace irr
+{
+namespace io
+{
+
 
 CFileList::CFileList()
 {
@@ -38,7 +39,7 @@ CFileList::CFileList()
 	// --------------------------------------------
 	// Windows version
 	#ifdef _IRR_WINDOWS_API_
-
+	#if !defined ( _WIN32_WCE )
 	char tmp[_MAX_PATH];
 	_getcwd(tmp, _MAX_PATH);
 	Path = tmp;
@@ -60,6 +61,7 @@ CFileList::CFileList()
 
 		_findclose( hFile );
 	}
+	#endif
 
 	//TODO add drives
 	//entry.Name = "E:\\";
@@ -69,7 +71,7 @@ CFileList::CFileList()
 
 	// --------------------------------------------
 	// Linux version
-	#if (defined(_IRR_POSIX_API_) || defined(MACOSX))
+	#if (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_))
 
 	FileEntry entry;
 
@@ -168,10 +170,8 @@ const c8* CFileList::getFullFileName(u32 index)
 
 bool CFileList::isDirectory(u32 index) const
 {
-	bool ret;
-	if (index >= Files.size())
-		ret = false;
-	else
+	bool ret = false;
+	if (index < Files.size())
 		ret = Files[index].isDirectory;
 
 	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
diff --git a/src/dep/src/irrlicht/CFileList.h b/src/dep/src/irrlicht/CFileList.h
index a6c9753..1940ecb 100644
--- a/src/dep/src/irrlicht/CFileList.h
+++ b/src/dep/src/irrlicht/CFileList.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -26,26 +26,22 @@ public:
 	CFileList();
 
 	//! Returns the amount of files in the filelist.
-	//! \return
-	//! Returns the amount of files and directories in the file list.
+	/** \return Amount of files and directories in the file list. */
 	virtual u32 getFileCount() const;
 
 	//! Gets the name of a file in the list, based on an index.
-	//! \param index is the zero based index of the file which name should
-	//!   be returned. The index has to be smaller than the amount getFileCount() returns.
-	//! \return
-	//! Returns the file name of the file. Returns 0, if an error occured.
+	/** \param index is the zero based index of the file which name should
+	be returned. The index has to be smaller than the amount getFileCount() returns.
+	\return The file name of the file. Returns 0, if an error occured. */
 	virtual const c8* getFileName(u32 index) const;
 
 	//! Gets the full name of a file in the list, path included, based on an index.
 	virtual const c8* getFullFileName(u32 index);
 
 	//! Returns of the file is a directory
-	//! \param index is the zero based index of the file which name should
-	//!  be returned. The index has to be smaller than the amount getFileCount() returns.
-	//! \return
-	//! Returns true, if the file is a directory, and false, if it is not.
-	//!  If an error occurs, the result is undefined.
+	/** \param index is the zero based index of the file which name should
+	be returned. The index has to be smaller than the amount getFileCount() returns.
+	\return True if the file is a directory, else false. */
 	virtual bool isDirectory(u32 index) const;
 
 private:
diff --git a/src/dep/src/irrlicht/CFileSystem.cpp b/src/dep/src/irrlicht/CFileSystem.cpp
index 0b2dcfa..9d77a5e 100644
--- a/src/dep/src/irrlicht/CFileSystem.cpp
+++ b/src/dep/src/irrlicht/CFileSystem.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,12 +16,14 @@
 #include "CAttributes.h"
 #include "CMemoryReadFile.h"
 
-#ifdef _IRR_WINDOWS_API_
-#include <direct.h> // for _chdir
+#if defined (_IRR_WINDOWS_API_)
+	#if !defined ( _WIN32_WCE )
+		#include <direct.h> // for _chdir
+	#endif
 #else
-#include <unistd.h>
-#include <limits.h>
-#include <stdlib.h>
+	#include <unistd.h>
+	#include <limits.h>
+	#include <stdlib.h>
 #endif
 
 namespace irr
@@ -39,7 +41,6 @@ CFileSystem::CFileSystem()
 }
 
 
-
 //! destructor
 CFileSystem::~CFileSystem()
 {
@@ -56,7 +57,6 @@ CFileSystem::~CFileSystem()
 }
 
 
-
 //! opens a file for read access
 IReadFile* CFileSystem::createAndOpenFile(const c8* filename)
 {
@@ -84,10 +84,12 @@ IReadFile* CFileSystem::createAndOpenFile(const c8* filename)
 			return file;
 	}
 
-	file = createReadFile(filename);
-	return file;
+	// Create the file using an absolute path so that it matches
+	// the scheme used by CNullDriver::getTexture().
+	return createReadFile(getAbsolutePath(filename).c_str());
 }
 
+
 //! Creates an IReadFile interface for treating memory like a file.
 IReadFile* CFileSystem::createMemoryReadFile(void* memory, s32 len, 
 			const c8* fileName, bool deleteMemoryWhenDropped)
@@ -98,6 +100,7 @@ IReadFile* CFileSystem::createMemoryReadFile(void* memory, s32 len,
 		return new CMemoryReadFile(memory, len, fileName, deleteMemoryWhenDropped);
 }
 
+
 //! Opens a file for write access.
 IWriteFile* CFileSystem::createAndWriteFile(const c8* filename, bool append)
 {
@@ -107,76 +110,64 @@ IWriteFile* CFileSystem::createAndWriteFile(const c8* filename, bool append)
 
 bool CFileSystem::addFolderFileArchive(const c8* filename, bool ignoreCase, bool ignorePaths)
 {
-	bool ret = false;
-
-	CUnZipReader* zr = new CUnZipReader( this, filename, ignoreCase, ignorePaths);
+	CUnZipReader* zr = new CUnZipReader(this, filename, ignoreCase, ignorePaths);
 	if (zr)
-	{
 		UnZipFileSystems.push_back(zr);
-		ret = true;
-	}
-
 	#ifdef _DEBUG
-	if ( false == ret )
+	else
 	{
-		os::Printer::log("Could not open file. UnZipfile not added", filename, ELL_ERROR);
+		os::Printer::log("Could not open file. Folderfile not added", filename, ELL_ERROR);
 	}
 	#endif
 
-	return ret;
-
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return (zr!=0);
 }
 
 
 //! adds an zip archive to the filesystem
 bool CFileSystem::addZipFileArchive(const c8* filename, bool ignoreCase, bool ignorePaths)
 {
-	IReadFile* file = createReadFile(filename);
+	CZipReader* zr = 0;
+	IReadFile* file = createAndOpenFile(filename);
 	if (file)
 	{
-		CZipReader* zr = new CZipReader(file, ignoreCase, ignorePaths);
+		zr = new CZipReader(file, ignoreCase, ignorePaths);
 		if (zr)
 			ZipFileSystems.push_back(zr);
 
 		file->drop();
-
-		bool ret = (zr != 0);
-		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-		return ret;
 	}
-
 	#ifdef _DEBUG
-	os::Printer::log("Could not open file. Zipfile not added", filename, ELL_ERROR);
+	else
+		os::Printer::log("Could not open file. Zipfile not added", filename, ELL_ERROR);
 	#endif
 
 	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return false;
+	return (zr != 0);
 }
 
 
 //! adds an pak archive to the filesystem
 bool CFileSystem::addPakFileArchive(const c8* filename, bool ignoreCase, bool ignorePaths)
 {
-	IReadFile* file = createReadFile(filename);
+	CPakReader* zr = 0;
+	IReadFile* file = createAndOpenFile(filename);
 	if (file)
 	{
-		CPakReader* zr = new CPakReader(file, ignoreCase, ignorePaths);
+		zr = new CPakReader(file, ignoreCase, ignorePaths);
 		if (zr)
 			PakFileSystems.push_back(zr);
 
 		file->drop();
-
-		bool ret = (zr != 0);
-		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-		return ret;
 	}
-
 	#ifdef _DEBUG
-	os::Printer::log("Could not open file. Pakfile not added", filename, ELL_ERROR);
+	else
+		os::Printer::log("Could not open file. Pakfile not added", filename, ELL_ERROR);
 	#endif
 
 	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return false;
+	return (zr != 0);
 }
 
 
@@ -184,10 +175,12 @@ bool CFileSystem::addPakFileArchive(const c8* filename, bool ignoreCase, bool ig
 const c8* CFileSystem::getWorkingDirectory()
 {
 #ifdef _IRR_WINDOWS_API_
-	_getcwd(WorkingDirectory, FILE_SYSTEM_MAX_PATH);
+	#if !defined ( _WIN32_WCE )
+		_getcwd(WorkingDirectory, FILE_SYSTEM_MAX_PATH);
+	#endif
 #endif
 
-#if (defined(_IRR_POSIX_API_) || defined(MACOSX))
+#if (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_))
 	getcwd(WorkingDirectory, (size_t)FILE_SYSTEM_MAX_PATH);
 #endif
 	return WorkingDirectory;
@@ -195,42 +188,60 @@ const c8* CFileSystem::getWorkingDirectory()
 
 
 //! Changes the current Working Directory to the given string.
-//! The string is operating system dependent. Under Windows it will look
-//! like this: "drive:\directory\sudirectory\"
-//! \return Returns true if successful, otherwise false.
 bool CFileSystem::changeWorkingDirectoryTo(const c8* newDirectory)
 {
 	bool success=false;
 #ifdef _MSC_VER
-	success=(_chdir(newDirectory) == 0);
+	#if !defined ( _WIN32_WCE )
+		success=(_chdir(newDirectory) == 0);
+	#endif
 #else
 	success=(chdir(newDirectory) == 0);
 #endif
 	return success;
 }
 
+
 core::stringc CFileSystem::getAbsolutePath(const core::stringc& filename) const
 {
 	c8 *p=0;
-	core::stringc ret;
 
 #ifdef _IRR_WINDOWS_API_
-
+	#if defined ( _WIN32_WCE )
+	return filename;
+	#else
 	c8 fpath[_MAX_PATH];
 	p = _fullpath( fpath, filename.c_str(), _MAX_PATH);
-	ret = p;
-
-#elif (defined(_IRR_POSIX_API_) || defined(MACOSX))
+	#endif
 
+#elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_))
 	c8 fpath[4096];
+	fpath[0]=0;
 	p = realpath(filename.c_str(), fpath);
-	ret = p;
+	if (!p)
+	{
+		// content in fpath is undefined at this point
+		if ('0'==fpath[0]) // seems like fpath wasn't altered
+		{
+			// at least remove a ./ prefix
+			if ('.'==filename[0] && '/'==filename[1])
+				return filename.subString(2, filename.size()-2);
+			else
+				return filename;
+		}
+		else
+			return core::stringc(fpath);
+	}
 
 #endif
 
-	return ret;
+	return core::stringc(p);
 }
 
+
+//! returns the directory part of a filename, i.e. all until the first
+//! slash or backslash, excluding it. If no directory path is prefixed, a '.'
+//! is returned.
 core::stringc CFileSystem::getFileDir(const core::stringc& filename) const
 {
 	// find last forward or backslash
@@ -244,6 +255,34 @@ core::stringc CFileSystem::getFileDir(const core::stringc& filename) const
 		return ".";
 }
 
+
+//! returns the base part of a filename, i.e. all except for the directory
+//! part. If no directory path is prefixed, the full name is returned.
+core::stringc CFileSystem::getFileBasename(const core::stringc& filename, bool keepExtension) const
+{
+	// find last forward or backslash
+	s32 lastSlash = filename.findLast('/');
+	const s32 lastBackSlash = filename.findLast('\\');
+	lastSlash = core::max_(lastSlash, lastBackSlash);
+	s32 end = 0;
+	if (!keepExtension)
+	{
+		end = filename.findLast('.');
+		if (end == -1)
+			end=0;
+		else
+			end = filename.size()-end;
+	}
+
+	if ((u32)lastSlash < filename.size())
+		return filename.subString(lastSlash+1, filename.size()-lastSlash-1-end);
+	else if (end != 0)
+		return filename.subString(0, filename.size()-end);
+	else
+		return filename;
+}
+
+
 //! Creates a list of files and directories in the current working directory 
 IFileList* CFileSystem::createFileList() const
 {
@@ -302,6 +341,7 @@ IXMLReader* CFileSystem::createXMLReader(IReadFile* file)
 	return createIXMLReader(file);
 }
 
+
 //! Creates a XML Reader from a file.
 IXMLReaderUTF8* CFileSystem::createXMLReaderUTF8(const c8* filename)
 {
@@ -314,6 +354,7 @@ IXMLReaderUTF8* CFileSystem::createXMLReaderUTF8(const c8* filename)
 	return reader;
 }
 
+
 //! Creates a XML Reader from a file.
 IXMLReaderUTF8* CFileSystem::createXMLReaderUTF8(IReadFile* file)
 {
@@ -348,12 +389,14 @@ IFileSystem* createFileSystem()
 	return new CFileSystem();
 }
 
+
 //! Creates a new empty collection of attributes, usable for serialization and more.
 IAttributes* CFileSystem::createEmptyAttributes(video::IVideoDriver* driver)
 {
 	return new CAttributes(driver);
 }
 
+
 } // end namespace irr
 } // end namespace io
 
diff --git a/src/dep/src/irrlicht/CFileSystem.h b/src/dep/src/irrlicht/CFileSystem.h
index ad8a2d2..7d89807 100644
--- a/src/dep/src/irrlicht/CFileSystem.h
+++ b/src/dep/src/irrlicht/CFileSystem.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -62,6 +62,11 @@ public:
 	/** \param filename: The file to get the directory from */
 	virtual core::stringc getFileDir(const core::stringc& filename) const;
 
+	//! Returns the base part of a filename, i.e. the name without the directory
+	//! part. If no directory is prefixed, the full name is returned.
+	/** \param filename: The file to get the basename from */
+	core::stringc getFileBasename(const core::stringc& filename, bool keepExtension=true) const;
+
 	//! Creates a list of files and directories in the current working directory 
 	//! and returns it.
 	virtual IFileList* createFileList() const;
@@ -69,6 +74,12 @@ public:
 	//! determinates if a file exists and would be able to be opened.
 	virtual bool existFile(const c8* filename) const;
 
+	//! determines if a file exists and would be able to be opened.
+	bool existFile(const core::stringc& filename) const
+	{
+		return existFile(filename.c_str());
+	}
+
 	//! Creates a XML Reader from a file.
 	virtual IXMLReader* createXMLReader(const c8* filename);
 
diff --git a/src/dep/src/irrlicht/CGUIButton.cpp b/src/dep/src/irrlicht/CGUIButton.cpp
index 21ca02e..e9f113a 100644
--- a/src/dep/src/irrlicht/CGUIButton.cpp
+++ b/src/dep/src/irrlicht/CGUIButton.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,11 +18,10 @@ namespace gui
 
 //! constructor
 CGUIButton::CGUIButton(IGUIEnvironment* environment, IGUIElement* parent,
-			   s32 id, core::rect<s32> rectangle, bool noclip)
+			s32 id, core::rect<s32> rectangle, bool noclip)
 : IGUIButton(environment, parent, id, rectangle), Pressed(false),
 	IsPushButton(false), UseAlphaChannel(false), Border(true),
-	MouseOverTime(0), FocusTime(0), ClickTime(0), SpriteBank(0),
-	OverrideFont(0), Image(0), PressedImage(0)
+	ClickTime(0), SpriteBank(0), OverrideFont(0), Image(0), PressedImage(0)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUIButton");
@@ -39,7 +38,6 @@ CGUIButton::CGUIButton(IGUIEnvironment* environment, IGUIElement* parent,
 }
 
 
-
 //! destructor
 CGUIButton::~CGUIButton()
 {
@@ -56,12 +54,14 @@ CGUIButton::~CGUIButton()
 		SpriteBank->drop();
 }
 
+
 //! Sets if the button should use the skin to draw its border
 void CGUIButton::setDrawBorder(bool border)
 {
 	Border = border;
 }
 
+
 void CGUIButton::setSpriteBank(IGUISpriteBank* sprites)
 {
 	if (sprites)
@@ -73,6 +73,7 @@ void CGUIButton::setSpriteBank(IGUISpriteBank* sprites)
 	SpriteBank = sprites;
 }
 
+
 void CGUIButton::setSprite(EGUI_BUTTON_STATE state, s32 index, video::SColor color, bool loop)
 {
 	if (SpriteBank)
@@ -87,18 +88,18 @@ void CGUIButton::setSprite(EGUI_BUTTON_STATE state, s32 index, video::SColor col
 	}
 }
 
+
 //! called if an event happened.
 bool CGUIButton::OnEvent(const SEvent& event)
 {
 	if (!IsEnabled)
-		return Parent ? Parent->OnEvent(event) : false;
+		return IGUIElement::OnEvent(event);
 
 	switch(event.EventType)
 	{
 	case EET_KEY_INPUT_EVENT:
 		if (event.KeyInput.PressedDown &&
-			(event.KeyInput.Key == KEY_RETURN || 
-			 event.KeyInput.Key == KEY_SPACE))
+			(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
 		{
 			if (!IsPushButton)
 				setPressed(true);
@@ -114,14 +115,13 @@ bool CGUIButton::OnEvent(const SEvent& event)
 		}
 		else
 		if (!event.KeyInput.PressedDown && Pressed &&
-			(event.KeyInput.Key == KEY_RETURN || 
-			 event.KeyInput.Key == KEY_SPACE))
+			(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
 		{
 			//Environment->removeFocus(this);
 
 			if (!IsPushButton)
 				setPressed(false);
-			
+
 			if (Parent)
 			{
 				SEvent newEvent;
@@ -145,7 +145,7 @@ bool CGUIButton::OnEvent(const SEvent& event)
 		if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
 		{
 			if (Environment->hasFocus(this) &&
-			    !AbsoluteClippingRect.isPointInside(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y)))
+				!AbsoluteClippingRect.isPointInside(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y)))
 			{
 					Environment->removeFocus(this);
 					return false;
@@ -153,7 +153,7 @@ bool CGUIButton::OnEvent(const SEvent& event)
 
 			if (!IsPushButton)
 				setPressed(true);
-			
+
 			Environment->setFocus(this);
 			return true;
 		}
@@ -176,7 +176,7 @@ bool CGUIButton::OnEvent(const SEvent& event)
 			{
 				setPressed(!Pressed);
 			}
-			
+
 			if ((!IsPushButton && wasPressed && Parent) ||
 				(IsPushButton && wasPressed != Pressed))
 			{
@@ -199,7 +199,6 @@ bool CGUIButton::OnEvent(const SEvent& event)
 }
 
 
-
 //! draws the element and its children
 void CGUIButton::draw()
 {
@@ -216,7 +215,7 @@ void CGUIButton::draw()
 	core::rect<s32> rect = AbsoluteRect;
 
 	// todo:	move sprite up and text down if the pressed state has a sprite
-	//			draw sprites for focused and mouse-over 
+	//			draw sprites for focused and mouse-over
 	core::position2di spritePos = AbsoluteRect.getCenter();
 
 	if (!Pressed)
@@ -230,14 +229,14 @@ void CGUIButton::draw()
 			pos.X -= ImageRect.getWidth() / 2;
 			pos.Y -= ImageRect.getHeight() / 2;
 
-			driver->draw2DImage(Image, pos, ImageRect, &AbsoluteClippingRect, 
+			driver->draw2DImage(Image, pos, ImageRect, &AbsoluteClippingRect,
 				video::SColor(255,255,255,255), UseAlphaChannel);
 		}
 		if (SpriteBank && ButtonSprites[EGBS_BUTTON_UP].Index != -1)
 		{
 			// draw pressed sprite
-			SpriteBank->draw2DSprite(ButtonSprites[EGBS_BUTTON_UP].Index, spritePos, 
-				&AbsoluteClippingRect, ButtonSprites[EGBS_BUTTON_UP].Color, ClickTime, os::Timer::getTime(), 
+			SpriteBank->draw2DSprite(ButtonSprites[EGBS_BUTTON_UP].Index, spritePos,
+				&AbsoluteClippingRect, ButtonSprites[EGBS_BUTTON_UP].Color, ClickTime, os::Timer::getTime(),
 				ButtonSprites[EGBS_BUTTON_UP].Loop, true);
 		}
 	}
@@ -264,8 +263,8 @@ void CGUIButton::draw()
 		if (SpriteBank && ButtonSprites[EGBS_BUTTON_DOWN].Index != -1)
 		{
 			// draw sprite
-			SpriteBank->draw2DSprite(ButtonSprites[EGBS_BUTTON_DOWN].Index, spritePos, 
-				&AbsoluteClippingRect, ButtonSprites[EGBS_BUTTON_DOWN].Color, ClickTime, os::Timer::getTime(), 
+			SpriteBank->draw2DSprite(ButtonSprites[EGBS_BUTTON_DOWN].Index, spritePos,
+				&AbsoluteClippingRect, ButtonSprites[EGBS_BUTTON_DOWN].Color, ClickTime, os::Timer::getTime(),
 				ButtonSprites[EGBS_BUTTON_DOWN].Loop, true);
 		}
 
@@ -279,7 +278,7 @@ void CGUIButton::draw()
 
 		if (font)
 			font->draw(Text.c_str(), rect,
-				skin->getColor(IsEnabled ? EGDC_BUTTON_TEXT : EGDC_GRAY_TEXT), true, true, 
+				skin->getColor(IsEnabled ? EGDC_BUTTON_TEXT : EGDC_GRAY_TEXT), true, true,
 					&AbsoluteClippingRect);
 	}
 
@@ -287,10 +286,12 @@ void CGUIButton::draw()
 }
 
 
-
 //! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
 void CGUIButton::setOverrideFont(IGUIFont* font)
 {
+	if (OverrideFont == font)
+		return;
+
 	if (OverrideFont)
 		OverrideFont->drop();
 
@@ -301,7 +302,7 @@ void CGUIButton::setOverrideFont(IGUIFont* font)
 }
 
 
-//! Sets an image which should be displayed on the button when it is in normal state. 
+//! Sets an image which should be displayed on the button when it is in normal state.
 void CGUIButton::setImage(video::ITexture* image)
 {
 	if (Image)
@@ -318,6 +319,7 @@ void CGUIButton::setImage(video::ITexture* image)
 		setPressedImage(Image);
 }
 
+
 //! Sets the image which should be displayed on the button when it is in its normal state.
 void CGUIButton::setImage(video::ITexture* image, const core::rect<s32>& pos)
 {
@@ -334,7 +336,8 @@ void CGUIButton::setImage(video::ITexture* image, const core::rect<s32>& pos)
 		setPressedImage(Image, pos);
 }
 
-//! Sets an image which should be displayed on the button when it is in pressed state. 
+
+//! Sets an image which should be displayed on the button when it is in pressed state.
 void CGUIButton::setPressedImage(video::ITexture* image)
 {
 	if (PressedImage)
@@ -348,6 +351,7 @@ void CGUIButton::setPressedImage(video::ITexture* image)
 		PressedImage->grab();
 }
 
+
 //! Sets the image which should be displayed on the button when it is in its pressed state.
 void CGUIButton::setPressedImage(video::ITexture* image, const core::rect<s32>& pos)
 {
@@ -378,6 +382,7 @@ bool CGUIButton::isPressed() const
 	return Pressed;
 }
 
+
 //! Sets the pressed state of the button if this is a pushbutton
 void CGUIButton::setPressed(bool pressed)
 {
@@ -388,6 +393,7 @@ void CGUIButton::setPressed(bool pressed)
 	}
 }
 
+
 //! Returns whether the button is a push button
 bool CGUIButton::isPushButton() const
 {
@@ -395,12 +401,14 @@ bool CGUIButton::isPushButton() const
 	return IsPushButton;
 }
 
+
 //! Sets if the alpha channel should be used for drawing images on the button (default is false)
 void CGUIButton::setUseAlphaChannel(bool useAlphaChannel)
 {
 	UseAlphaChannel = useAlphaChannel;
 }
 
+
 //! Returns if the alpha channel should be used for drawing images on the button
 bool CGUIButton::isAlphaChannelUsed() const
 {
@@ -408,16 +416,17 @@ bool CGUIButton::isAlphaChannelUsed() const
 	return UseAlphaChannel;
 }
 
+
 bool CGUIButton::isDrawingBorder() const
 {
 	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return Border;
 }
 
+
 //! Writes attributes of the element.
 void CGUIButton::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
 {
-
 	IGUIButton::serializeAttributes(out,options);
 
 	out->addBool	("PushButton",		IsPushButton );
@@ -435,6 +444,7 @@ void CGUIButton::serializeAttributes(io::IAttributes* out, io::SAttributeReadWri
 	//   out->addString  ("OverrideFont",	OverrideFont);
 }
 
+
 //! Reads attributes of the element
 void CGUIButton::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
 {
@@ -463,7 +473,9 @@ void CGUIButton::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWr
 	updateAbsolutePosition();
 }
 
+
 } // end namespace gui
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_GUI_
+
diff --git a/src/dep/src/irrlicht/CGUIButton.h b/src/dep/src/irrlicht/CGUIButton.h
index 4b6e12d..5b7530e 100644
--- a/src/dep/src/irrlicht/CGUIButton.h
+++ b/src/dep/src/irrlicht/CGUIButton.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -37,16 +37,16 @@ namespace gui
 		//! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
 		virtual void setOverrideFont(IGUIFont* font=0);
 
-		//! Sets an image which should be displayed on the button when it is in normal state. 
+		//! Sets an image which should be displayed on the button when it is in normal state.
 		virtual void setImage(video::ITexture* image);
 
-		//! Sets an image which should be displayed on the button when it is in normal state. 
+		//! Sets an image which should be displayed on the button when it is in normal state.
 		virtual void setImage(video::ITexture* image, const core::rect<s32>& pos);
 
-		//! Sets an image which should be displayed on the button when it is in pressed state. 
+		//! Sets an image which should be displayed on the button when it is in pressed state.
 		virtual void setPressedImage(video::ITexture* image);
 
-		//! Sets an image which should be displayed on the button when it is in pressed state. 
+		//! Sets an image which should be displayed on the button when it is in pressed state.
 		virtual void setPressedImage(video::ITexture* image, const core::rect<s32>& pos);
 
 		//! Sets the sprite bank used by the button
@@ -58,7 +58,7 @@ namespace gui
 		\param index: The sprite number from the current sprite bank
 		\param color: The color of the sprite
 		*/
-		virtual void setSprite(EGUI_BUTTON_STATE state, s32 index, 
+		virtual void setSprite(EGUI_BUTTON_STATE state, s32 index,
 				video::SColor color=video::SColor(255,255,255,255), bool loop=false);
 
 		//! Sets if the button should behave like a push button. Which means it
@@ -74,7 +74,7 @@ namespace gui
 
 		//! Sets if the button should use the skin to draw its border
 		virtual void setDrawBorder(bool border);
-		
+
 		//! Sets if the alpha channel should be used for drawing images on the button (default is false)
 		virtual void setUseAlphaChannel(bool useAlphaChannel);
 
@@ -105,11 +105,8 @@ namespace gui
 		bool Pressed;
 		bool IsPushButton;
 		bool UseAlphaChannel;
-		
 		bool Border;
 
-		u32 MouseOverTime;
-		u32 FocusTime;
 		u32 ClickTime;
 
 		IGUISpriteBank* SpriteBank;
diff --git a/src/dep/src/irrlicht/CGUICheckBox.cpp b/src/dep/src/irrlicht/CGUICheckBox.cpp
index a99735f..f1791cc 100644
--- a/src/dep/src/irrlicht/CGUICheckBox.cpp
+++ b/src/dep/src/irrlicht/CGUICheckBox.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,7 +19,7 @@ namespace gui
 
 //! constructor
 CGUICheckBox::CGUICheckBox(bool checked, IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-: IGUICheckBox(environment, parent, id, rectangle), Pressed(false), Checked(checked), checkTime(0)
+: IGUICheckBox(environment, parent, id, rectangle), checkTime(0), Pressed(false), Checked(checked)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUICheckBox");
@@ -31,96 +31,95 @@ CGUICheckBox::CGUICheckBox(bool checked, IGUIEnvironment* environment, IGUIEleme
 }
 
 
-
 //! called if an event happened.
 bool CGUICheckBox::OnEvent(const SEvent& event)
 {
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_KEY_INPUT_EVENT:
-		if (event.KeyInput.PressedDown &&
-			(event.KeyInput.Key == KEY_RETURN || 
-			 event.KeyInput.Key == KEY_SPACE))
+		switch(event.EventType)
 		{
-			Pressed = true;
-			return true;
-		}
-		else
-		if (Pressed && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE)
-		{
-			Pressed = false;
-			return true;
-		}
-		else
-		if (!event.KeyInput.PressedDown && Pressed &&
-			(event.KeyInput.Key == KEY_RETURN || 
-			 event.KeyInput.Key == KEY_SPACE))
-		{
-			Pressed = false;
-			if (Parent)
+		case EET_KEY_INPUT_EVENT:
+			if (event.KeyInput.PressedDown &&
+				(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
 			{
-				SEvent newEvent;
-				newEvent.EventType = EET_GUI_EVENT;
-				newEvent.GUIEvent.Caller = this;
-				newEvent.GUIEvent.Element = 0;
-				Checked = !Checked;
-				newEvent.GUIEvent.EventType = EGET_CHECKBOX_CHANGED;
-				Parent->OnEvent(newEvent);
+				Pressed = true;
+				return true;
 			}
-			return true;
-		}
-		break;
-	case EET_GUI_EVENT:
-		if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
-		{
-			if (event.GUIEvent.Caller == this)
-				Pressed = false;
-		}
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-		if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
-		{
-			Pressed = true;
-			checkTime = os::Timer::getTime();
-			Environment->setFocus(this);
-			return true;
-		}
-		else
-		if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
-		{
-			bool wasPressed = Pressed;
-			Environment->removeFocus(this);
-			Pressed = false;
-
-			if (wasPressed && Parent)
+			else
+			if (Pressed && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE)
 			{
-				if ( !AbsoluteClippingRect.isPointInside( core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y) ) )
+				Pressed = false;
+				return true;
+			}
+			else
+			if (!event.KeyInput.PressedDown && Pressed &&
+				(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
+			{
+				Pressed = false;
+				if (Parent)
 				{
+					SEvent newEvent;
+					newEvent.EventType = EET_GUI_EVENT;
+					newEvent.GUIEvent.Caller = this;
+					newEvent.GUIEvent.Element = 0;
+					Checked = !Checked;
+					newEvent.GUIEvent.EventType = EGET_CHECKBOX_CHANGED;
+					Parent->OnEvent(newEvent);
+				}
+				return true;
+			}
+			break;
+		case EET_GUI_EVENT:
+			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
+			{
+				if (event.GUIEvent.Caller == this)
 					Pressed = false;
-					return true;
+			}
+			break;
+		case EET_MOUSE_INPUT_EVENT:
+			if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
+			{
+				Pressed = true;
+				checkTime = os::Timer::getTime();
+				Environment->setFocus(this);
+				return true;
+			}
+			else
+			if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
+			{
+				bool wasPressed = Pressed;
+				Environment->removeFocus(this);
+				Pressed = false;
+
+				if (wasPressed && Parent)
+				{
+					if ( !AbsoluteClippingRect.isPointInside( core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y) ) )
+					{
+						Pressed = false;
+						return true;
+					}
+
+					SEvent newEvent;
+					newEvent.EventType = EET_GUI_EVENT;
+					newEvent.GUIEvent.Caller = this;
+					newEvent.GUIEvent.Element = 0;
+					Checked = !Checked;
+					newEvent.GUIEvent.EventType = EGET_CHECKBOX_CHANGED;
+					Parent->OnEvent(newEvent);
 				}
 
-				SEvent newEvent;
-				newEvent.EventType = EET_GUI_EVENT;
-				newEvent.GUIEvent.Caller = this;
-				newEvent.GUIEvent.Element = 0;
-				Checked = !Checked;
-				newEvent.GUIEvent.EventType = EGET_CHECKBOX_CHANGED;
-				Parent->OnEvent(newEvent);
+				return true;
 			}
-
-			return true;
+			break;
+		default:
+			break;
 		}
-		break;
-	default:
-		break;
 	}
 
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
-
 //! draws the element and its children
 void CGUICheckBox::draw()
 {
@@ -134,17 +133,17 @@ void CGUICheckBox::draw()
 	s32 height = skin->getSize(EGDS_CHECK_BOX_WIDTH);
 
 	core::rect<s32> checkRect(AbsoluteRect.UpperLeftCorner.X,
-								((AbsoluteRect.getHeight() - height) / 2) + AbsoluteRect.UpperLeftCorner.Y,
-								 0, 0);
+				((AbsoluteRect.getHeight() - height) / 2) + AbsoluteRect.UpperLeftCorner.Y,
+				0, 0);
 
 	checkRect.LowerRightCorner.X = checkRect.UpperLeftCorner.X + height;
 	checkRect.LowerRightCorner.Y = checkRect.UpperLeftCorner.Y + height;
 
-	skin->draw3DSunkenPane(this, skin->getColor(Pressed ? EGDC_3D_FACE : EGDC_ACTIVE_CAPTION),
+	skin->draw3DSunkenPane(this, skin->getColor(Pressed || !IsEnabled ? EGDC_3D_FACE : EGDC_ACTIVE_CAPTION),
 		false, true, checkRect, &AbsoluteClippingRect);
 
 	if (Checked && Environment->getSkin())
-		Environment->getSkin()->drawIcon(this, EGDI_CHECK_BOX_CHECKED, checkRect.getCenter(), 
+		Environment->getSkin()->drawIcon(this, EGDI_CHECK_BOX_CHECKED, checkRect.getCenter(),
 			checkTime, os::Timer::getTime(), false, &AbsoluteClippingRect);
 
 	if (Text.size())
@@ -154,7 +153,7 @@ void CGUICheckBox::draw()
 
 		IGUIFont* font = skin->getFont();
 		if (font)
-			font->draw(Text.c_str(), checkRect, 
+			font->draw(Text.c_str(), checkRect,
 			skin->getColor(EGDC_BUTTON_TEXT), false, true, &AbsoluteClippingRect);
 	}
 
@@ -176,13 +175,15 @@ bool CGUICheckBox::isChecked() const
 	return Checked;
 }
 
+
 //! Writes attributes of the element.
 void CGUICheckBox::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
 {
 	IGUICheckBox::serializeAttributes(out,options);
-	out->addBool	("Checked",	Checked );
+	out->addBool("Checked",	Checked);
 }
 
+
 //! Reads attributes of the element
 void CGUICheckBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
 {
@@ -196,3 +197,4 @@ void CGUICheckBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRead
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_GUI_
+
diff --git a/src/dep/src/irrlicht/CGUICheckBox.h b/src/dep/src/irrlicht/CGUICheckBox.h
index 140ce74..ced97bf 100644
--- a/src/dep/src/irrlicht/CGUICheckBox.h
+++ b/src/dep/src/irrlicht/CGUICheckBox.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -42,9 +42,9 @@ namespace gui
 
 	private:
 
+		u32 checkTime;
 		bool Pressed;
 		bool Checked;
-		u32 checkTime;
 	};
 
 } // end namespace gui
diff --git a/src/dep/src/irrlicht/CGUIColorSelectDialog.cpp b/src/dep/src/irrlicht/CGUIColorSelectDialog.cpp
index a58d567..96d5c71 100644
--- a/src/dep/src/irrlicht/CGUIColorSelectDialog.cpp
+++ b/src/dep/src/irrlicht/CGUIColorSelectDialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -46,14 +46,15 @@ static const sTemplate Template [] =
 	{ L"L:", L"0", L"%",180,255, 0, 100 },
 };
 
+
 //! constructor
-CGUIColorSelectDialog::CGUIColorSelectDialog( const wchar_t* title, IGUIEnvironment* environment, IGUIElement* parent, s32 id)
-: IGUIColorSelectDialog(environment, parent, id,
- core::rect<s32>((parent->getAbsolutePosition().getWidth()-CSD_WIDTH)/2,
-					(parent->getAbsolutePosition().getHeight()-CSD_HEIGHT)/2,	
-					(parent->getAbsolutePosition().getWidth()-CSD_WIDTH)/2+CSD_WIDTH,
-					(parent->getAbsolutePosition().getHeight()-CSD_HEIGHT)/2+CSD_HEIGHT)),	
-  Dragging(false)
+CGUIColorSelectDialog::CGUIColorSelectDialog(const wchar_t* title, IGUIEnvironment* environment, IGUIElement* parent, s32 id)
+	: IGUIColorSelectDialog(environment, parent, id,
+		core::rect<s32>((parent->getAbsolutePosition().getWidth()-CSD_WIDTH)/2,
+			(parent->getAbsolutePosition().getHeight()-CSD_HEIGHT)/2,
+			(parent->getAbsolutePosition().getWidth()-CSD_WIDTH)/2+CSD_WIDTH,
+			(parent->getAbsolutePosition().getHeight()-CSD_HEIGHT)/2+CSD_HEIGHT)),
+	Dragging(false)
 {
 	#ifdef _DEBUG
 	IGUIElement::setDebugName("CGUIColorSelectDialog");
@@ -62,12 +63,11 @@ CGUIColorSelectDialog::CGUIColorSelectDialog( const wchar_t* title, IGUIEnvironm
 	Text = title;
 
 	IGUISkin* skin = Environment->getSkin();
-	core::rect<s32> rec;
 
-	s32 buttonw = environment->getSkin()->getSize(EGDS_WINDOW_BUTTON_WIDTH);
-	s32 posx = RelativeRect.getWidth() - buttonw - 4;
+	const s32 buttonw = environment->getSkin()->getSize(EGDS_WINDOW_BUTTON_WIDTH);
+	const s32 posx = RelativeRect.getWidth() - buttonw - 4;
 
-	CloseButton = Environment->addButton(core::rect<s32>(posx, 3, posx + buttonw, 3 + buttonw), 
+	CloseButton = Environment->addButton(core::rect<s32>(posx, 3, posx + buttonw, 3 + buttonw),
 		this, -1, L"", skin ? skin->getDefaultText(EGDT_WINDOW_CLOSE) : L"Close");
 	if (skin && skin->getSpriteBank())
 	{
@@ -77,35 +77,33 @@ CGUIColorSelectDialog::CGUIColorSelectDialog( const wchar_t* title, IGUIEnvironm
 	}
 	CloseButton->setSubElement(true);
 	CloseButton->setTabStop(false);
-	CloseButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT); 
+	CloseButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
 	CloseButton->grab();
 
 	OKButton = Environment->addButton(
 		core::rect<s32>(RelativeRect.getWidth()-80, 30, RelativeRect.getWidth()-10, 50),
 		this, -1, skin ? skin->getDefaultText(EGDT_MSG_BOX_OK) : L"OK");
 	OKButton->setSubElement(true);
-	OKButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT); 
+	OKButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
 	OKButton->grab();
 
 	CancelButton = Environment->addButton(
-		core::rect<s32>(RelativeRect.getWidth()-80, 55, RelativeRect.getWidth()-10, 75), 
+		core::rect<s32>(RelativeRect.getWidth()-80, 55, RelativeRect.getWidth()-10, 75),
 		this, -1, skin ? skin->getDefaultText(EGDT_MSG_BOX_CANCEL) : L"Cancel");
 	CancelButton->setSubElement(true);
-	CancelButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT); 
+	CancelButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
 	CancelButton->grab();
 
-	core::rect<s32> r;
-
 	video::IVideoDriver* driver = Environment->getVideoDriver();
 	ColorRing.Texture = driver->getTexture ( "#colorring" );
 	if ( 0 == ColorRing.Texture )
 	{
-		buildColorRing(core::dimension2d<s32>(128, 128), 1,  
+		buildColorRing(core::dimension2d<s32>(128, 128), 1,
 			Environment->getSkin()->getColor(EGDC_3D_SHADOW).color);
 	}
 
-	r.UpperLeftCorner.X = 20;
-	r.UpperLeftCorner.Y = 20;
+	core::rect<s32> r(20,20, 0,0);
+
 	ColorRing.Control = Environment->addImage(ColorRing.Texture, r.UpperLeftCorner, true, this);
 	ColorRing.Control->setSubElement(true);
 	ColorRing.Control->grab();
@@ -118,7 +116,7 @@ CGUIColorSelectDialog::CGUIColorSelectDialog( const wchar_t* title, IGUIEnvironm
 			r.UpperLeftCorner.Y = Template[i].y;
 			r.LowerRightCorner.X = r.UpperLeftCorner.X + 15;
 			r.LowerRightCorner.Y = r.UpperLeftCorner.Y + 20;
-			IGUIElement *t = Environment->addStaticText( Template[i].pre, r, false, false, this);
+			IGUIElement *t = Environment->addStaticText(Template[i].pre, r, false, false, this);
 			t->setSubElement(true);
 		}
 
@@ -162,7 +160,6 @@ CGUIColorSelectDialog::CGUIColorSelectDialog( const wchar_t* title, IGUIEnvironm
 }
 
 
-
 //! destructor
 CGUIColorSelectDialog::~CGUIColorSelectDialog()
 {
@@ -177,47 +174,34 @@ CGUIColorSelectDialog::~CGUIColorSelectDialog()
 
 	for ( u32 i = 0; i != Battery.size ();++i )
 	{
-		Battery[i].Edit->drop ();
-		Battery[i].Scrollbar->drop ();
+		Battery[i].Edit->drop();
+		Battery[i].Scrollbar->drop();
 	}
 
-	if ( ColorRing.Control )
-	{
-		ColorRing.Control->drop ();
-	}
+	if (ColorRing.Control)
+		ColorRing.Control->drop();
 }
 
+
 //! renders a antialiased, colored ring
 void CGUIColorSelectDialog::buildColorRing( const core::dimension2d<s32> & dim, s32 supersample, const u32 borderColor )
 {
-	video::CImage *RawTexture;
-
-	core::dimension2d<s32> d;
-	d.Width = dim.Width * supersample;
-	d.Height = dim.Height * supersample;
-
-	RawTexture = new video::CImage ( video::ECF_A8R8G8B8, d );
+	const core::dimension2d<s32> d(dim.Width * supersample, dim.Height * supersample);
+	video::CImage *RawTexture = new video::CImage(video::ECF_A8R8G8B8, d);
 
 	RawTexture->fill ( 0x00808080 );
 
-
 	u8 * data= (u8*) RawTexture->lock();
-	const u32 pitch = RawTexture->getPitch ();
-
-	s32 radiusOut = ( d.Width / 2 ) - 4;
+	const u32 pitch = RawTexture->getPitch();
 
+	const s32 radiusOut = ( d.Width / 2 ) - 4;
 	const s32 fullR2 = radiusOut * radiusOut;
 
-
+	video::SColor rgb(0xFF000000);
 	video::SColorHSL hsl;
-	video::SColor rgb;
-
-	rgb.color = 0xFF000000;
 	hsl.Luminance = 0.5f;
 	hsl.Saturation = 1.f;
 
-	
-
 	core::position2d<s32> p;
 	u32 *dst;
 	for ( p.Y = -radiusOut;  p.Y <= radiusOut;  p.Y += 1  )
@@ -237,25 +221,24 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d<s32> & dim,
 			{
 				// dotproduct u ( x,y ) * v ( 1, 0 ) = cosinus(a)
 
-				f32 r = (f32) sqrt ( (f32) r2 );
+				const f32 r = sqrtf((f32) r2);
 
 				// normalize, dotproduct = xnorm
-				f32 t = (f32) 1.0 / r;
-				f32 xn = -p.X * t;
+				const f32 xn = -p.X * core::reciprocal(r);
 
-				hsl.Hue = (f32) acos ( xn );
+				hsl.Hue = acosf(xn);
 				if ( p.Y > 0 )
 					hsl.Hue = (2.f * core::PI ) - hsl.Hue;
 
 				hsl.Hue -= core::PI / 2.f;
 
-				f32 rTest = r / radiusOut;
+				const f32 rTest = r / radiusOut;
 /*
 				if ( rTest < 0.25f )
 				{
 					hsl.Luminance = rTest / 0.25f;
 					hsl.Saturation = 0.f;
-					hsl.settoRGB  ( rgb );
+					hsl.toRGB  ( rgb );
 					*dst = rgb.color;
 				}
 				else
@@ -264,7 +247,7 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d<s32> & dim,
 					hsl.Saturation = ( rTest - 0.25f ) / 0.15f;
 					hsl.Luminance = 1.f - ( hsl.Saturation / 2.4f );
 					hsl.Luminance = 0.5f;
-					hsl.settoRGB  ( rgb );
+					hsl.toRGB  ( rgb );
 					// *dst = rgb.color;
 				}
 				else
@@ -272,7 +255,7 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d<s32> & dim,
 				{
 					hsl.Luminance = 0.5f;
 					hsl.Saturation = 1.f;
-					hsl.settoRGB  ( rgb );
+					hsl.toRGB  ( rgb );
 					*dst = rgb.color;
 				}
 				else
@@ -280,7 +263,7 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d<s32> & dim,
 				{
 					hsl.Luminance = 0.5f - ( ( rTest - 0.75f ) / 0.75f );
 					hsl.Saturation = 1.f;
-					hsl.settoRGB  ( rgb );
+					hsl.toRGB  ( rgb );
 					*dst = rgb.color;
 				}
 */
@@ -289,26 +272,24 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d<s32> & dim,
 				{
 					hsl.Luminance = 0.5f;
 					hsl.Saturation = 1.f;
-					hsl.settoRGB  ( rgb );
+					hsl.toRGB(rgb);
 					*dst = rgb.color;
 				}
 
 				if ( rTest >= 0.5f && rTest <= 0.55f )
 				{
 					u32 alpha = (s32) ( (rTest - 0.5f ) * ( 255.f / 0.05f ) );
-					*dst = *dst & 0x00ffffff | (alpha << 24);
+					*dst = (*dst & 0x00ffffff) | (alpha << 24);
 				}
 
 				if ( rTest >= 0.95f )
 				{
 					u32 alpha = (s32) ( (rTest - 0.95f ) * ( 255.f / 0.05f ) );
 					alpha = 255 - alpha;
-					*dst = *dst & 0x00ffffff | (alpha << 24);
+					*dst = (*dst & 0x00ffffff) | (alpha << 24);
 				}
-
 			}
 		}
-
 	}
 
 	RawTexture->unlock ();
@@ -316,115 +297,111 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d<s32> & dim,
 	if ( supersample > 1 )
 	{
 		video::CImage * filter = new video::CImage(video::ECF_A8R8G8B8, dim );
-		RawTexture->copyToScalingBoxFilter ( filter, 0 );
-		RawTexture->drop ();
+		RawTexture->copyToScalingBoxFilter(filter, 0);
+		RawTexture->drop();
 		RawTexture = filter;
 	}
-	
 
 	video::IVideoDriver* driver = Environment->getVideoDriver();
 
-	bool generateMipLevels = driver->getTextureCreationFlag( video::ETCF_CREATE_MIP_MAPS );
+	bool generateMipLevels = driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
 	driver->setTextureCreationFlag( video::ETCF_CREATE_MIP_MAPS, false);
 
-	ColorRing.Texture = driver->addTexture ( "#colorring", RawTexture  );
-	RawTexture->drop ();
-
-	driver->setTextureCreationFlag( video::ETCF_CREATE_MIP_MAPS, generateMipLevels);
+	ColorRing.Texture = driver->addTexture ("#colorring", RawTexture);
+	RawTexture->drop();
 
+	driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, generateMipLevels);
 }
 
 
-
 //! called if an event happened.
 bool CGUIColorSelectDialog::OnEvent(const SEvent& event)
 {
-
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-		case EET_GUI_EVENT:
-		switch(event.GUIEvent.EventType)
+		switch(event.EventType)
 		{
-			case EGET_SCROLL_BAR_CHANGED:
+			case EET_GUI_EVENT:
+			switch(event.GUIEvent.EventType)
 			{
-				for ( u32 i = 0; i!= Battery.size (); ++i )
+				case EGET_SCROLL_BAR_CHANGED:
 				{
-					if ( event.GUIEvent.Caller == Battery[i].Scrollbar )
+					for ( u32 i = 0; i!= Battery.size (); ++i )
 					{
-						s32 pos = Battery[i].Scrollbar->getPos ();
-						s32 value = Template[i].range_down + ( pos );
-						core::stringw s ( value );
-						Battery[i].Edit->setText ( s.c_str() );
+						if ( event.GUIEvent.Caller == Battery[i].Scrollbar )
+						{
+							const s32 value = Template[i].range_down + Battery[i].Scrollbar->getPos();
+							Battery[i].Edit->setText(core::stringw(value).c_str());
+						}
 					}
+					return true;
 				}
-				return true;
-			}
 
-		case EGET_ELEMENT_FOCUS_LOST:
-			Dragging = false;
-			break;
-		case EGET_BUTTON_CLICKED:
-			if (event.GUIEvent.Caller == CloseButton ||
-				event.GUIEvent.Caller == CancelButton)
-			{
-				sendCancelEvent();
-				remove();
-				return true;
-			}
-			else
-			if (event.GUIEvent.Caller == OKButton)
-			{
-				sendSelectedEvent();
-				remove();
-				return true;
+			case EGET_ELEMENT_FOCUS_LOST:
+				Dragging = false;
+				break;
+			case EGET_BUTTON_CLICKED:
+				if (event.GUIEvent.Caller == CloseButton ||
+					event.GUIEvent.Caller == CancelButton)
+				{
+					sendCancelEvent();
+					remove();
+					return true;
+				}
+				else
+				if (event.GUIEvent.Caller == OKButton)
+				{
+					sendSelectedEvent();
+					remove();
+					return true;
+				}
+				break;
+
+			case EGET_LISTBOX_CHANGED:
+			case EGET_LISTBOX_SELECTED_AGAIN:
+			default:
+				break;
 			}
 			break;
-
-		case EGET_LISTBOX_CHANGED:
-		case EGET_LISTBOX_SELECTED_AGAIN:
-		default:
-			break;
-			
-		}
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-		switch(event.MouseInput.Event)
-		{
-		case EMIE_LMOUSE_PRESSED_DOWN:
-			DragStart.X = event.MouseInput.X;
-			DragStart.Y = event.MouseInput.Y;
-			Dragging = true;
-			Environment->setFocus(this);
-			return true;
-		case EMIE_LMOUSE_LEFT_UP:
-			Dragging = false;
-			Environment->removeFocus(this);
-			return true;
-		case EMIE_MOUSE_MOVED:
-			if (Dragging)
+		case EET_MOUSE_INPUT_EVENT:
+			switch(event.MouseInput.Event)
 			{
-				// gui window should not be dragged outside its parent
-				if (Parent)
-					if (event.MouseInput.X < Parent->getAbsolutePosition().UpperLeftCorner.X +1 ||
-						event.MouseInput.Y < Parent->getAbsolutePosition().UpperLeftCorner.Y +1 ||
-						event.MouseInput.X > Parent->getAbsolutePosition().LowerRightCorner.X -1 ||
-						event.MouseInput.Y > Parent->getAbsolutePosition().LowerRightCorner.Y -1)
-
-						return true;
-
-				move(core::position2d<s32>(event.MouseInput.X - DragStart.X, event.MouseInput.Y - DragStart.Y));
+			case EMIE_LMOUSE_PRESSED_DOWN:
 				DragStart.X = event.MouseInput.X;
 				DragStart.Y = event.MouseInput.Y;
+				Dragging = true;
+				Environment->setFocus(this);
 				return true;
+			case EMIE_LMOUSE_LEFT_UP:
+				Dragging = false;
+				Environment->removeFocus(this);
+				return true;
+			case EMIE_MOUSE_MOVED:
+				if (Dragging)
+				{
+					// gui window should not be dragged outside its parent
+					if (Parent)
+						if (event.MouseInput.X < Parent->getAbsolutePosition().UpperLeftCorner.X +1 ||
+							event.MouseInput.Y < Parent->getAbsolutePosition().UpperLeftCorner.Y +1 ||
+							event.MouseInput.X > Parent->getAbsolutePosition().LowerRightCorner.X -1 ||
+							event.MouseInput.Y > Parent->getAbsolutePosition().LowerRightCorner.Y -1)
+
+							return true;
+
+					move(core::position2d<s32>(event.MouseInput.X - DragStart.X, event.MouseInput.Y - DragStart.Y));
+					DragStart.X = event.MouseInput.X;
+					DragStart.Y = event.MouseInput.Y;
+					return true;
+				}
+			default:
+				break;
 			}
 		default:
 			break;
 		}
-	default:
-		break;
 	}
 
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
@@ -435,11 +412,8 @@ void CGUIColorSelectDialog::draw()
 		return;
 
 	IGUISkin* skin = Environment->getSkin();
-
-	core::rect<s32> rect = AbsoluteRect;
-
-	rect = skin->draw3DWindowBackground(this, true, skin->getColor(EGDC_ACTIVE_BORDER), 
-		rect, &AbsoluteClippingRect);
+	core::rect<s32> rect = skin->draw3DWindowBackground(this, true, skin->getColor(EGDC_ACTIVE_BORDER),
+		AbsoluteRect, &AbsoluteClippingRect);
 
 	if (Text.size())
 	{
@@ -448,16 +422,18 @@ void CGUIColorSelectDialog::draw()
 
 		IGUIFont* font = skin->getFont(EGDF_WINDOW);
 		if (font)
-			font->draw(Text.c_str(), rect, skin->getColor(EGDC_ACTIVE_CAPTION), false, true, 
+			font->draw(Text.c_str(), rect, skin->getColor(EGDC_ACTIVE_CAPTION), false, true,
 			&AbsoluteClippingRect);
 	}
+	IGUIFont* font = Environment->getBuiltInFont();
+	if (font)
+		font->draw(L"+", core::rect<s32>(20,20,50,50), video::SColor(), false, false,
+		&AbsoluteClippingRect);
 
 	IGUIElement::draw();
 }
 
 
-
-
 //! sends the event that the file has been selected.
 void CGUIColorSelectDialog::sendSelectedEvent()
 {
@@ -469,6 +445,7 @@ void CGUIColorSelectDialog::sendSelectedEvent()
 	Parent->OnEvent(event);
 }
 
+
 //! sends the event that the file choose process has been canceld
 void CGUIColorSelectDialog::sendCancelEvent()
 {
@@ -480,7 +457,9 @@ void CGUIColorSelectDialog::sendCancelEvent()
 	Parent->OnEvent(event);
 }
 
+
 } // end namespace gui
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_GUI_
+
diff --git a/src/dep/src/irrlicht/CGUIColorSelectDialog.h b/src/dep/src/irrlicht/CGUIColorSelectDialog.h
index f037015..97a97ab 100644
--- a/src/dep/src/irrlicht/CGUIColorSelectDialog.h
+++ b/src/dep/src/irrlicht/CGUIColorSelectDialog.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -68,7 +68,6 @@ namespace gui
 		SColorCircle ColorRing;
 
 		void buildColorRing( const core::dimension2d<s32> & dim, s32 supersample, const u32 borderColor );
-		
 	};
 
 
@@ -78,3 +77,4 @@ namespace gui
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif // __C_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
+
diff --git a/src/dep/src/irrlicht/CGUIComboBox.cpp b/src/dep/src/irrlicht/CGUIComboBox.cpp
index 60fb2d6..0ae795a 100644
--- a/src/dep/src/irrlicht/CGUIComboBox.cpp
+++ b/src/dep/src/irrlicht/CGUIComboBox.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,10 +23,11 @@ namespace gui
 CGUIComboBox::CGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent,
 	s32 id, core::rect<s32> rectangle)
 	: IGUIComboBox(environment, parent, id, rectangle),
-	ListButton(0), ListBox(0), Selected(-1), HasFocus(false), LastFocus(0)
+	ListButton(0), SelectedText(0), ListBox(0), LastFocus(0),
+	Selected(-1), HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_CENTER), HasFocus(false)
 {
 	#ifdef _DEBUG
-	setDebugName("CGUICheckBox");
+	setDebugName("CGUIComboBox");
 	#endif
 
 	IGUISkin* skin = Environment->getSkin();
@@ -38,7 +39,7 @@ CGUIComboBox::CGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent,
 	core::rect<s32> r;
 	r.UpperLeftCorner.X = rectangle.getWidth() - width - 2;
 	r.LowerRightCorner.X = rectangle.getWidth() - 2;
-	
+
 	r.UpperLeftCorner.Y = 2;
 	r.LowerRightCorner.Y = rectangle.getHeight() - 2;
 
@@ -49,9 +50,21 @@ CGUIComboBox::CGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent,
 		ListButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_DOWN), skin->getColor(EGDC_WINDOW_SYMBOL));
 		ListButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_DOWN), skin->getColor(EGDC_WINDOW_SYMBOL));
 	}
+	ListButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
 	ListButton->setSubElement(true);
 	ListButton->setTabStop(false);
 
+	r.UpperLeftCorner.X = 2;
+	r.UpperLeftCorner.Y = 2;
+	r.LowerRightCorner.X = RelativeRect.getWidth() - (ListButton->getAbsolutePosition().getWidth() + 2);
+	r.LowerRightCorner.Y = RelativeRect.getHeight() - 2;
+
+	SelectedText = Environment->addStaticText(L"", r, false, false, this, -1, false);
+	SelectedText->setSubElement(true);
+	SelectedText->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+	SelectedText->setTextAlignment(EGUIA_UPPERLEFT, EGUIA_CENTER);
+	SelectedText->enableOverrideColor(true);
+
 	setNotClipped(true);
 
 	// this element can be tabbed to
@@ -60,6 +73,14 @@ CGUIComboBox::CGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent,
 }
 
 
+void CGUIComboBox::setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical)
+{
+	HAlign = horizontal;
+	VAlign = vertical;
+	SelectedText->setTextAlignment(horizontal, vertical);
+}
+
+
 //! Returns amount of items in box
 u32 CGUIComboBox::getItemCount() const
 {
@@ -84,11 +105,12 @@ void CGUIComboBox::removeItem(u32 idx)
 		return;
 
 	if (Selected == (s32)idx)
-		Selected = -1;
+		setSelected(-1);
 
 	Items.erase(idx);
 }
 
+
 //! Returns caption of this element.
 const wchar_t* CGUIComboBox::getText() const
 {
@@ -102,22 +124,20 @@ u32 CGUIComboBox::addItem(const wchar_t* text)
 	Items.push_back(core::stringw(text));
 
 	if (Selected == -1)
-		Selected = 0;
+		setSelected(0);
 
 	return Items.size() - 1;
 }
 
 
-
 //! deletes all items in the combo box
 void CGUIComboBox::clear()
 {
 	Items.clear();
-	Selected = -1;
+	setSelected(-1);
 }
 
 
-
 //! returns id of selected item. returns -1 if no item is selected.
 s32 CGUIComboBox::getSelected() const
 {
@@ -125,183 +145,174 @@ s32 CGUIComboBox::getSelected() const
 }
 
 
-
 //! sets the selected item. Set this to -1 if no item should be selected
-void CGUIComboBox::setSelected(s32 id)
+void CGUIComboBox::setSelected(s32 idx)
 {
-	if (id < -1 || id >= (s32)Items.size())
+	if (idx < -1 || idx >= (s32)Items.size())
 		return;
 
-	Selected = id;
-}
-
-void CGUIComboBox::updateAbsolutePosition()
-{
-	IGUIElement::updateAbsolutePosition();
-
-	const s32 width = Environment->getSkin()->getSize(EGDS_WINDOW_BUTTON_WIDTH);
-
-	ListButton->setRelativePosition(core::rect<s32>(RelativeRect.getWidth() - width - 2, 2,
-													RelativeRect.getWidth() - 2, RelativeRect.getHeight() - 2));
+	Selected = idx;
+	if (Selected == -1)
+		SelectedText->setText(L"");
+	else
+		SelectedText->setText(Items[Selected].c_str());
 }
 
 
 //! called if an event happened.
 bool CGUIComboBox::OnEvent(const SEvent& event)
 {
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-
-	case EET_KEY_INPUT_EVENT:
-		if (ListBox && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE)
+		switch(event.EventType)
 		{
-			// hide list box
-			openCloseMenu();
-			return true;
-		}
-		else
-		if (event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE)
-		{
-			if (!event.KeyInput.PressedDown)
-				openCloseMenu();
 
-			ListButton->setPressed(ListBox == 0);
-
-			return true;
-		}
-		else
-		if (event.KeyInput.PressedDown)
-		{
-			s32 oldSelected = Selected;
-			bool absorb = true;
-			switch (event.KeyInput.Key)
-			{
-				case KEY_DOWN: 
-					Selected += 1; 
-					break;
-				case KEY_UP: 
-					Selected -= 1;
-					break;
-				case KEY_HOME:
-				case KEY_PRIOR:
-					Selected = 0;
-					break;
-				case KEY_END:
-				case KEY_NEXT:
-					Selected = (s32)Items.size()-1;
-					break;
-				default:
-					absorb = false;
-			}
-
-			if (Selected <0)
-				Selected = 0;
-
-			if (Selected >= (s32)Items.size())
-				Selected = (s32)Items.size() -1;
-
-			if (Selected != oldSelected)
-				sendSelectionChangedEvent();
-
-			if (absorb)
-				return true;
-		}
-		break;
-
-	case EET_GUI_EVENT:
-
-		switch(event.GUIEvent.EventType)
-		{
-		case EGET_ELEMENT_FOCUS_LOST:
-			if (ListBox && 
-				(Environment->hasFocus(ListBox) || ListBox->isMyChild(event.GUIEvent.Caller) ) && 
-				event.GUIEvent.Element != this && 
-				event.GUIEvent.Element != ListButton && 
-				event.GUIEvent.Element != ListBox && 
-				!ListBox->isMyChild(event.GUIEvent.Element))
-			{
-				openCloseMenu();
-			}
-			break;
-		case EGET_BUTTON_CLICKED:
-			if (event.GUIEvent.Caller == ListButton)
+		case EET_KEY_INPUT_EVENT:
+			if (ListBox && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE)
 			{
+				// hide list box
 				openCloseMenu();
 				return true;
 			}
-			break;
-		case EGET_LISTBOX_SELECTED_AGAIN:
-		case EGET_LISTBOX_CHANGED:
-			if (event.GUIEvent.Caller == ListBox)
+			else
+			if (event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE)
 			{
-				Selected = ListBox->getSelected();
-				if (Selected <0 || Selected >= (s32)Items.size())
-					Selected = -1;
-				openCloseMenu();
+				if (!event.KeyInput.PressedDown)
+					openCloseMenu();
 
-				sendSelectionChangedEvent();
+				ListButton->setPressed(ListBox == 0);
+
+				return true;
 			}
-			return true;
-		default:
-			break;
-		}
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-
-		switch(event.MouseInput.Event)
-		{
-		case EMIE_LMOUSE_PRESSED_DOWN:
+			else
+			if (event.KeyInput.PressedDown)
 			{
-				core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
-				
-				// send to list box
-				if (ListBox && ListBox->isPointInside(p) && ListBox->OnEvent(event))
+				s32 oldSelected = Selected;
+				bool absorb = true;
+				switch (event.KeyInput.Key)
+				{
+					case KEY_DOWN:
+						setSelected(Selected+1);
+						break;
+					case KEY_UP:
+						setSelected(Selected-1);
+						break;
+					case KEY_HOME:
+					case KEY_PRIOR:
+						setSelected(0);
+						break;
+					case KEY_END:
+					case KEY_NEXT:
+						setSelected((s32)Items.size()-1);
+						break;
+					default:
+						absorb = false;
+				}
+
+				if (Selected <0)
+					setSelected(0);
+
+				if (Selected >= (s32)Items.size())
+					setSelected((s32)Items.size() -1);
+
+				if (Selected != oldSelected)
+					sendSelectionChangedEvent();
+
+				if (absorb)
 					return true;
-
-				return true;
 			}
-		case EMIE_LMOUSE_LEFT_UP:
-			{
-				core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
+			break;
 
-				// send to list box
-				if (ListBox && ListBox->getAbsolutePosition().isPointInside(p) &&
-					ListBox->OnEvent(event))
-					return true;
-				else
+		case EET_GUI_EVENT:
+
+			switch(event.GUIEvent.EventType)
+			{
+			case EGET_ELEMENT_FOCUS_LOST:
+				if (ListBox &&
+					(Environment->hasFocus(ListBox) || ListBox->isMyChild(event.GUIEvent.Caller) ) &&
+					event.GUIEvent.Element != this &&
+					event.GUIEvent.Element != ListButton &&
+					event.GUIEvent.Element != ListBox &&
+					!ListBox->isMyChild(event.GUIEvent.Element))
+				{
+					openCloseMenu();
+				}
+				break;
+			case EGET_BUTTON_CLICKED:
+				if (event.GUIEvent.Caller == ListButton)
 				{
 					openCloseMenu();
 					return true;
 				}
+				break;
+			case EGET_LISTBOX_SELECTED_AGAIN:
+			case EGET_LISTBOX_CHANGED:
+				if (event.GUIEvent.Caller == ListBox)
+				{
+					setSelected(ListBox->getSelected());
+					if (Selected <0 || Selected >= (s32)Items.size())
+						setSelected(-1);
+					openCloseMenu();
+
+					sendSelectionChangedEvent();
+				}
+				return true;
+			default:
+				break;
 			}
 			break;
-		case EMIE_MOUSE_WHEEL:
+		case EET_MOUSE_INPUT_EVENT:
+
+			switch(event.MouseInput.Event)
 			{
-				s32 oldSelected = Selected;
-				Selected += (event.MouseInput.Wheel < 0) ? 1 : -1;
+			case EMIE_LMOUSE_PRESSED_DOWN:
+				{
+					core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
 
-				if (Selected <0)
-					Selected = 0;
+					// send to list box
+					if (ListBox && ListBox->isPointInside(p) && ListBox->OnEvent(event))
+						return true;
 
-				if (Selected >= (s32)Items.size())
-					Selected = (s32)Items.size() -1;
+					return true;
+				}
+			case EMIE_LMOUSE_LEFT_UP:
+				{
+					core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
 
-				if (Selected != oldSelected)
-					sendSelectionChangedEvent();
+					// send to list box
+					if (!(ListBox &&
+							ListBox->getAbsolutePosition().isPointInside(p) &&
+							ListBox->OnEvent(event)))
+						openCloseMenu();
+					return true;
+				}
+			case EMIE_MOUSE_WHEEL:
+				{
+					s32 oldSelected = Selected;
+					setSelected( Selected +(event.MouseInput.Wheel < 0) ? 1 : -1);
+
+					if (Selected <0)
+						setSelected(0);
+
+					if (Selected >= (s32)Items.size())
+						setSelected((s32)Items.size() -1);
+
+					if (Selected != oldSelected)
+						sendSelectionChangedEvent();
+				}
+			default:
+				break;
 			}
+			break;
 		default:
 			break;
 		}
-		break;
-	default:
-		break;
 	}
 
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
-
 void CGUIComboBox::sendSelectionChangedEvent()
 {
 	if (Parent)
@@ -317,7 +328,6 @@ void CGUIComboBox::sendSelectionChangedEvent()
 }
 
 
-
 //! draws the element and its children
 void CGUIComboBox::draw()
 {
@@ -330,6 +340,10 @@ void CGUIComboBox::draw()
 	{
 		HasFocus = currentFocus == this || isMyChild(currentFocus);
 		LastFocus = currentFocus;
+
+		SelectedText->setBackgroundColor(skin->getColor(EGDC_HIGH_LIGHT));
+		SelectedText->setDrawBackground(HasFocus);
+		SelectedText->setOverrideColor(skin->getColor(HasFocus ? EGDC_HIGH_LIGHT_TEXT : EGDC_BUTTON_TEXT));
 	}
 
 	core::rect<s32> frameRect(AbsoluteRect);
@@ -339,26 +353,7 @@ void CGUIComboBox::draw()
 	skin->draw3DSunkenPane(this, skin->getColor(EGDC_3D_HIGH_LIGHT),
 		true, true, frameRect, &AbsoluteClippingRect);
 
-	// Draw text
-
-	if (Selected != -1)
-	{
-		frameRect = AbsoluteRect;
-		frameRect.UpperLeftCorner.X += 2;
-		frameRect.UpperLeftCorner.Y += 2;
-		frameRect.LowerRightCorner.X -= ListButton->getAbsolutePosition().getWidth() + 2;
-		frameRect.LowerRightCorner.Y -= 2;
-		if (HasFocus)
-			skin->draw2DRectangle(this, skin->getColor(EGDC_HIGH_LIGHT), frameRect, &AbsoluteClippingRect);
-
-		IGUIFont* font = skin->getFont();
-		if (font)
-			font->draw(Items[Selected].c_str(), frameRect, 
-				skin->getColor(HasFocus ? EGDC_HIGH_LIGHT_TEXT : EGDC_BUTTON_TEXT),
-				false, true, &AbsoluteClippingRect);
-	}
-
-	// draw buttons
+	// draw children
 	IGUIElement::draw();
 }
 
@@ -377,7 +372,7 @@ void CGUIComboBox::openCloseMenu()
 		if (Parent)
 			Parent->bringToFront(this);
 
-		IGUISkin* skin = Environment->getSkin();		
+		IGUISkin* skin = Environment->getSkin();
 		s32 h = Items.size();
 
 		if (h > 5)
@@ -407,21 +402,48 @@ void CGUIComboBox::openCloseMenu()
 	}
 }
 
+
 //! Writes attributes of the element.
 void CGUIComboBox::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
 {
 	IGUIComboBox::serializeAttributes(out,options);
 
+	out->addEnum ("HTextAlign", HAlign, GUIAlignmentNames);
+	out->addEnum ("VTextAlign", VAlign, GUIAlignmentNames);
+
 	out->addInt	("Selected",	Selected );
-	out->addArray	("Items",	Items);
+	out->addInt	("ItemCount",	Items.size());
+	for (u32 i=0; i < Items.size(); ++i)
+	{
+		core::stringc s = "Item";
+		s += i;
+		s += "Text";
+		out->addString(s.c_str(), Items[i].c_str());
+	}
 }
 
+
 //! Reads attributes of the element
 void CGUIComboBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
 {
-	Items = in->getAttributeAsArray("Items");
 	IGUIComboBox::deserializeAttributes(in,options);
 
+	setTextAlignment( (EGUI_ALIGNMENT) in->getAttributeAsEnumeration("HTextAlign", GUIAlignmentNames),
+                      (EGUI_ALIGNMENT) in->getAttributeAsEnumeration("VTextAlign", GUIAlignmentNames));
+
+	// clear the list
+	clear();
+	// get item count
+	u32 c = in->getAttributeAsInt("ItemCount");
+	// add items
+	for (u32 i=0; i < c; ++i)
+	{
+		core::stringc s = "Item";
+		s += i;
+		s += "Text";
+		addItem(in->getAttributeAsStringW(s.c_str()).c_str());
+	}
+
 	setSelected(in->getAttributeAsInt("Selected"));
 }
 
diff --git a/src/dep/src/irrlicht/CGUIComboBox.h b/src/dep/src/irrlicht/CGUIComboBox.h
index f6e4a86..ac8b4ae 100644
--- a/src/dep/src/irrlicht/CGUIComboBox.h
+++ b/src/dep/src/irrlicht/CGUIComboBox.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,6 +9,7 @@
 #ifdef _IRR_COMPILE_WITH_GUI_
 
 #include "IGUIComboBox.h"
+#include "IGUIStaticText.h"
 #include "irrString.h"
 #include "irrArray.h"
 
@@ -50,10 +51,10 @@ namespace gui
 		virtual s32 getSelected() const;
 
 		//! sets the selected item. Set this to -1 if no item should be selected
-		virtual void setSelected(s32 id);
+		virtual void setSelected(s32 idx);
 
-		//! update the position
-		virtual void updateAbsolutePosition();
+		//! sets the text alignment of the text part
+		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical);
 
 		//! called if an event happened.
 		virtual bool OnEvent(const SEvent& event);
@@ -73,11 +74,13 @@ namespace gui
 		void sendSelectionChangedEvent();
 
 		IGUIButton* ListButton;
+		IGUIStaticText* SelectedText;
 		IGUIListBox* ListBox;
+		IGUIElement *LastFocus;
 		core::array< core::stringw > Items;
 		s32 Selected;
+		EGUI_ALIGNMENT HAlign, VAlign;
 		bool HasFocus;
-		IGUIElement *LastFocus;
 	};
 
 
diff --git a/src/dep/src/irrlicht/CGUIContextMenu.cpp b/src/dep/src/irrlicht/CGUIContextMenu.cpp
index ef2efe9..65bb9f0 100644
--- a/src/dep/src/irrlicht/CGUIContextMenu.cpp
+++ b/src/dep/src/irrlicht/CGUIContextMenu.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,8 +23,8 @@ namespace gui
 CGUIContextMenu::CGUIContextMenu(IGUIEnvironment* environment,
 				IGUIElement* parent, s32 id,
 				core::rect<s32> rectangle, bool getFocus, bool allowFocus)
-	: IGUIContextMenu(environment, parent, id, rectangle), HighLighted(-1),
-		ChangeTime(0), EventParent(0), AllowFocus(allowFocus), LastFont(0)
+	: IGUIContextMenu(environment, parent, id, rectangle), EventParent(0), LastFont(0),
+		HighLighted(-1), ChangeTime(0), AllowFocus(allowFocus)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUIContextMenu");
@@ -218,61 +218,62 @@ void CGUIContextMenu::removeAllItems()
 //! called if an event happened.
 bool CGUIContextMenu::OnEvent(const SEvent& event)
 {
-	if (!IsEnabled)
-		return Parent ? Parent->OnEvent(event) : false;
-
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_GUI_EVENT:
-		switch(event.GUIEvent.EventType)
+
+		switch(event.EventType)
 		{
-		case EGET_ELEMENT_FOCUS_LOST:
-			if (event.GUIEvent.Caller == this && !isMyChild(event.GUIEvent.Element) && AllowFocus)
+		case EET_GUI_EVENT:
+			switch(event.GUIEvent.EventType)
 			{
-				// set event parent of submenus
-				setEventParent(Parent);
-				remove();
-				return false;
+			case EGET_ELEMENT_FOCUS_LOST:
+				if (event.GUIEvent.Caller == this && !isMyChild(event.GUIEvent.Element) && AllowFocus)
+				{
+					// set event parent of submenus
+					setEventParent(Parent);
+					remove();
+					return false;
+				}
+				break;
+			case EGET_ELEMENT_FOCUSED:
+				if (event.GUIEvent.Caller == this && !AllowFocus)
+				{
+					return true;
+				}
+				break;
+			default:
+				break;
 			}
 			break;
-		case EGET_ELEMENT_FOCUSED:
-			if (event.GUIEvent.Caller == this && !AllowFocus)
+		case EET_MOUSE_INPUT_EVENT:
+			switch(event.MouseInput.Event)
 			{
+			case EMIE_LMOUSE_LEFT_UP:
+				{
+					// menu might be removed if it loses focus in sendClick, so grab a reference
+					grab();
+					const u32 t = sendClick(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y));
+					if ((t==0 || t==1) && Environment->hasFocus(this))
+						Environment->removeFocus(this);
+					drop();
+				}
 				return true;
+			case EMIE_LMOUSE_PRESSED_DOWN:
+				return true;
+			case EMIE_MOUSE_MOVED:
+				if (Environment->hasFocus(this))
+					highlight(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y), true);
+				return true;
+			default:
+				break;
 			}
 			break;
 		default:
- 			break;
+			break;
 		}
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-		switch(event.MouseInput.Event)
-		{
-		case EMIE_LMOUSE_LEFT_UP:
-			{
-				// menu might be removed if it loses focus in sendClick, so grab a reference
-				grab();
-				const u32 t = sendClick(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y));
-				if ((t==0 || t==1) && Environment->hasFocus(this))
-					Environment->removeFocus(this);
-				drop();
-			}
-			return true;
-		case EMIE_LMOUSE_PRESSED_DOWN:
-			return true;
-		case EMIE_MOUSE_MOVED:
-			if (Environment->hasFocus(this))
-				highlight(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y), true);
-			return true;
-		default:
- 			break;
-		}
-		break;
-	default:
-		break;
 	}
 
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
@@ -377,7 +378,7 @@ bool CGUIContextMenu::highlight(const core::position2d<s32>& p, bool canOpenSubM
 				for (s32 j=0; j<(s32)Items.size(); ++j)
 					if (Items[j].SubMenu)
 					{
-						if ( j == i && canOpenSubMenu )
+						if ( j == i && canOpenSubMenu && Items[j].Enabled )
 							Items[j].SubMenu->setVisible(true);
 						else if ( j != i )
 							Items[j].SubMenu->setVisible(false);
@@ -529,8 +530,7 @@ void CGUIContextMenu::draw()
 
 void CGUIContextMenu::recalculateSize()
 {
-	IGUISkin* skin = Environment->getSkin();
-	IGUIFont* font = skin->getFont(EGDF_MENU);
+	IGUIFont* font = Environment->getSkin()->getFont(EGDF_MENU);
 
 	if (!font)
 		return;
@@ -730,9 +730,9 @@ void CGUIContextMenu::setEventParent(IGUIElement *parent)
 bool CGUIContextMenu::hasOpenSubMenu() const
 {
 	for (u32 i=0; i<Items.size(); ++i)
-		if (Items[i].SubMenu)
-			if ( Items[i].SubMenu->isVisible() )
-				return true;
+		if (Items[i].SubMenu && Items[i].SubMenu->isVisible())
+			return true;
+
 	return false;
 }
 
diff --git a/src/dep/src/irrlicht/CGUIContextMenu.h b/src/dep/src/irrlicht/CGUIContextMenu.h
index 2ff910f..bf55a0c 100644
--- a/src/dep/src/irrlicht/CGUIContextMenu.h
+++ b/src/dep/src/irrlicht/CGUIContextMenu.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -132,13 +132,13 @@ namespace gui
 
 		void setEventParent(IGUIElement *parent);
 
-		s32 HighLighted;
 		core::array<SItem> Items;
 		core::position2d<s32> Pos;
-		u32 ChangeTime;
 		IGUIElement* EventParent;
-		bool AllowFocus;
 		IGUIFont *LastFont;
+		s32 HighLighted;
+		u32 ChangeTime;
+		bool AllowFocus;
 	};
 
 
diff --git a/src/dep/src/irrlicht/CGUIEditBox.cpp b/src/dep/src/irrlicht/CGUIEditBox.cpp
index 7fe7ce8..f4619df 100644
--- a/src/dep/src/irrlicht/CGUIEditBox.cpp
+++ b/src/dep/src/irrlicht/CGUIEditBox.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -33,12 +33,11 @@ CGUIEditBox::CGUIEditBox(const wchar_t* text, bool border, IGUIEnvironment* envi
 			const core::rect<s32>& rectangle)
 : IGUIEditBox(environment, parent, id, rectangle), MouseMarking(false),
 	Border(border), OverrideColorEnabled(false), MarkBegin(0), MarkEnd(0),
-	OverrideColor(video::SColor(101,255,255,255)),
-	OverrideFont(0), LastBreakFont(0), CursorPos(0), HScrollPos(0), VScrollPos(0), Max(0),
+	OverrideColor(video::SColor(101,255,255,255)), OverrideFont(0), LastBreakFont(0),
+	Operator(0), BlinkStartTime(0), CursorPos(0), HScrollPos(0), VScrollPos(0), Max(0),
 	WordWrap(false), MultiLine(false), AutoScroll(true), PasswordBox(false),
-	PasswordChar(L'*'),
-	HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_CENTER)
-
+	PasswordChar(L'*'), HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_CENTER),
+	CurrentTextRect(0,0,1,1), FrameRect(rectangle)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUIEditBox");
@@ -46,7 +45,8 @@ CGUIEditBox::CGUIEditBox(const wchar_t* text, bool border, IGUIEnvironment* envi
 
 	Text = text;
 
-	Operator = environment->getOSOperator();
+	if (Environment)
+		Operator = Environment->getOSOperator();
 
 	if (Operator)
 		Operator->grab();
@@ -55,7 +55,19 @@ CGUIEditBox::CGUIEditBox(const wchar_t* text, bool border, IGUIEnvironment* envi
 	setTabStop(true);
 	setTabOrder(-1);
 
+	IGUISkin *skin = 0;
+	if (Environment)
+		skin = Environment->getSkin();
+	if (Border && skin)
+	{
+		FrameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
+		FrameRect.UpperLeftCorner.Y += skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
+		FrameRect.LowerRightCorner.X -= skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
+		FrameRect.LowerRightCorner.Y -= skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
+	}
+
 	breakText();
+	calculateScrollPos();
 }
 
 
@@ -73,6 +85,9 @@ CGUIEditBox::~CGUIEditBox()
 //! Sets another skin independent font.
 void CGUIEditBox::setOverrideFont(IGUIFont* font)
 {
+	if (OverrideFont == font)
+		return;
+
 	if (OverrideFont)
 		OverrideFont->drop();
 
@@ -176,32 +191,36 @@ void CGUIEditBox::setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT ver
 //! called if an event happened.
 bool CGUIEditBox::OnEvent(const SEvent& event)
 {
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_GUI_EVENT:
-		if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
+
+		switch(event.EventType)
 		{
-			if (event.GUIEvent.Caller == this)
+		case EET_GUI_EVENT:
+			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
 			{
-				MouseMarking = false;
-				MarkBegin = 0;
-				MarkEnd = 0;
+				if (event.GUIEvent.Caller == this)
+				{
+					MouseMarking = false;
+					MarkBegin = 0;
+					MarkEnd = 0;
+				}
 			}
+			break;
+		case EET_KEY_INPUT_EVENT:
+			if (processKey(event))
+				return true;
+			break;
+		case EET_MOUSE_INPUT_EVENT:
+			if (processMouse(event))
+				return true;
+			break;
+		default:
+			break;
 		}
-		break;
-	case EET_KEY_INPUT_EVENT:
-		if (processKey(event))
-			return true;
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-		if (processMouse(event))
-			return true;
-		break;
-	default:
-		break;
 	}
 
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
@@ -646,6 +665,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
 	return true;
 }
 
+
 //! draws the element and its children
 void CGUIEditBox::draw()
 {
@@ -658,21 +678,21 @@ void CGUIEditBox::draw()
 	if (!skin)
 		return;
 
-	frameRect = AbsoluteRect;
+	FrameRect = AbsoluteRect;
 
 	// draw the border
 
 	if (Border)
 	{
 		skin->draw3DSunkenPane(this, skin->getColor(EGDC_WINDOW),
-			false, true, frameRect, &AbsoluteClippingRect);
+			false, true, FrameRect, &AbsoluteClippingRect);
 
-		frameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
-		frameRect.UpperLeftCorner.Y += skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
-		frameRect.LowerRightCorner.X -= skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
-		frameRect.LowerRightCorner.Y -= skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
+		FrameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
+		FrameRect.UpperLeftCorner.Y += skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
+		FrameRect.LowerRightCorner.X -= skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
+		FrameRect.LowerRightCorner.Y -= skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
 	}
-	core::rect<s32> localClipRect = frameRect;
+	core::rect<s32> localClipRect = FrameRect;
 	localClipRect.clipAgainst(AbsoluteClippingRect);
 
 	// draw the text
@@ -825,6 +845,9 @@ void CGUIEditBox::draw()
 				false, true, &localClipRect);
 		}
 	}
+
+	// draw children
+	IGUIElement::draw();
 }
 
 
@@ -856,6 +879,7 @@ bool CGUIEditBox::isAutoScrollEnabled() const
 	return AutoScroll;
 }
 
+
 //! Gets the area of the text in the edit box
 //! \return Returns the size in pixels of the text
 core::dimension2di CGUIEditBox::getTextDimension()
@@ -924,9 +948,7 @@ bool CGUIEditBox::processMouse(const SEvent& event)
 	case EMIE_LMOUSE_PRESSED_DOWN:
 		if (!Environment->hasFocus(this))
 		{
-			// get focus
 			BlinkStartTime = os::Timer::getTime();
-			Environment->setFocus(this);
 			MouseMarking = true;
 			CursorPos = getCursorPos(event.MouseInput.X, event.MouseInput.Y);
 			MarkBegin = CursorPos;
@@ -937,7 +959,7 @@ bool CGUIEditBox::processMouse(const SEvent& event)
 		else
 		{
 			if (!AbsoluteClippingRect.isPointInside(
-			core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y)))
+				core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y)))
 			{
 				return false;
 			}
@@ -1132,7 +1154,7 @@ void CGUIEditBox::setTextRect(s32 line)
 
 	IGUIFont* font = OverrideFont;
 	IGUISkin* skin = Environment->getSkin();
-	if (!OverrideFont)
+	if (!font)
 		font = skin->getFont();
 
 	// get text dimension
@@ -1153,13 +1175,13 @@ void CGUIEditBox::setTextRect(s32 line)
 	{
 	case EGUIA_CENTER:
 		// align to h centre
-		CurrentTextRect.UpperLeftCorner.X = (frameRect.getWidth()/2) - (d.Width/2);
-		CurrentTextRect.LowerRightCorner.X = (frameRect.getWidth()/2) + (d.Width/2);
+		CurrentTextRect.UpperLeftCorner.X = (FrameRect.getWidth()/2) - (d.Width/2);
+		CurrentTextRect.LowerRightCorner.X = (FrameRect.getWidth()/2) + (d.Width/2);
 		break;
 	case EGUIA_LOWERRIGHT:
 		// align to right edge
-		CurrentTextRect.UpperLeftCorner.X = frameRect.getWidth() - d.Width;
-		CurrentTextRect.LowerRightCorner.X = frameRect.getWidth();
+		CurrentTextRect.UpperLeftCorner.X = FrameRect.getWidth() - d.Width;
+		CurrentTextRect.LowerRightCorner.X = FrameRect.getWidth();
 		break;
 	default:
 		// align to left edge
@@ -1173,12 +1195,12 @@ void CGUIEditBox::setTextRect(s32 line)
 	case EGUIA_CENTER:
 		// align to v centre
 		CurrentTextRect.UpperLeftCorner.Y =
-			(frameRect.getHeight()/2) - (lineCount*d.Height)/2 + d.Height*line;
+			(FrameRect.getHeight()/2) - (lineCount*d.Height)/2 + d.Height*line;
 		break;
 	case EGUIA_LOWERRIGHT:
 		// align to bottom edge
 		CurrentTextRect.UpperLeftCorner.Y =
-			frameRect.getHeight() - lineCount*d.Height + d.Height*line;
+			FrameRect.getHeight() - lineCount*d.Height + d.Height*line;
 		break;
 	default:
 		// align to top edge
@@ -1191,7 +1213,7 @@ void CGUIEditBox::setTextRect(s32 line)
 	CurrentTextRect.UpperLeftCorner.Y  -= VScrollPos;
 	CurrentTextRect.LowerRightCorner.Y = CurrentTextRect.UpperLeftCorner.Y + d.Height;
 
-	CurrentTextRect += frameRect.UpperLeftCorner;
+	CurrentTextRect += FrameRect.UpperLeftCorner;
 
 }
 
@@ -1256,7 +1278,6 @@ void CGUIEditBox::inputChar(wchar_t c)
 
 void CGUIEditBox::calculateScrollPos()
 {
-
 	if (!AutoScroll)
 		return;
 
@@ -1281,10 +1302,10 @@ void CGUIEditBox::calculateScrollPos()
 
 		s32 cEnd = cStart + font->getDimension(L"_ ").Width;
 
-		if (frameRect.LowerRightCorner.X < cEnd)
-			HScrollPos = cEnd - frameRect.LowerRightCorner.X;
-		else if (frameRect.UpperLeftCorner.X > cStart)
-			HScrollPos = cStart - frameRect.UpperLeftCorner.X;
+		if (FrameRect.LowerRightCorner.X < cEnd)
+			HScrollPos = cEnd - FrameRect.LowerRightCorner.X;
+		else if (FrameRect.UpperLeftCorner.X > cStart)
+			HScrollPos = cStart - FrameRect.UpperLeftCorner.X;
 		else
 			HScrollPos = 0;
 
@@ -1293,11 +1314,11 @@ void CGUIEditBox::calculateScrollPos()
 	}
 
 	// vertical scroll position
-	if (frameRect.LowerRightCorner.Y < CurrentTextRect.LowerRightCorner.Y + VScrollPos)
-		VScrollPos = CurrentTextRect.LowerRightCorner.Y - frameRect.LowerRightCorner.Y + VScrollPos;
+	if (FrameRect.LowerRightCorner.Y < CurrentTextRect.LowerRightCorner.Y + VScrollPos)
+		VScrollPos = CurrentTextRect.LowerRightCorner.Y - FrameRect.LowerRightCorner.Y + VScrollPos;
 
-	else if (frameRect.UpperLeftCorner.Y > CurrentTextRect.UpperLeftCorner.Y + VScrollPos)
-		VScrollPos = CurrentTextRect.UpperLeftCorner.Y - frameRect.UpperLeftCorner.Y + VScrollPos;
+	else if (FrameRect.UpperLeftCorner.Y > CurrentTextRect.UpperLeftCorner.Y + VScrollPos)
+		VScrollPos = CurrentTextRect.UpperLeftCorner.Y - FrameRect.UpperLeftCorner.Y + VScrollPos;
 	else
 		VScrollPos = 0;
 
@@ -1347,7 +1368,7 @@ void CGUIEditBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadW
 		setPasswordBox(in->getAttributeAsBool("PasswordBox"), ch[0]);
 
 	setTextAlignment( (EGUI_ALIGNMENT) in->getAttributeAsEnumeration("HTextAlign", GUIAlignmentNames),
-                      (EGUI_ALIGNMENT) in->getAttributeAsEnumeration("VTextAlign", GUIAlignmentNames));
+			(EGUI_ALIGNMENT) in->getAttributeAsEnumeration("VTextAlign", GUIAlignmentNames));
 
 	// setOverrideFont(in->getAttributeAsFont("OverrideFont"));
 }
diff --git a/src/dep/src/irrlicht/CGUIEditBox.h b/src/dep/src/irrlicht/CGUIEditBox.h
index d5135b0..09c118e 100644
--- a/src/dep/src/irrlicht/CGUIEditBox.h
+++ b/src/dep/src/irrlicht/CGUIEditBox.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -81,14 +81,14 @@ namespace gui
 		virtual void setText(const wchar_t* text);
 
 		//! Sets the maximum amount of characters which may be entered in the box.
-		//! \param max: Maximum amount of characters. If 0, the character amount is 
+		//! \param max: Maximum amount of characters. If 0, the character amount is
 		//! infinity.
 		virtual void setMax(u32 max);
 
 		//! Returns maximum amount of characters, previously set by setMax();
 		virtual u32 getMax() const;
 
-		//! Sets whether the edit box is a password box. Setting this to true will 
+		//! Sets whether the edit box is a password box. Setting this to true will
 		/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
 		\param passwordBox: true to enable password, false to disable
 		\param passwordChar: the character that is displayed instead of letters */
@@ -144,7 +144,7 @@ namespace gui
 		core::array< core::stringw > BrokenText;
 		core::array< s32 > BrokenTextPositions;
 
-		core::rect<s32> CurrentTextRect, frameRect; // temporary values
+		core::rect<s32> CurrentTextRect, FrameRect; // temporary values
 	};
 
 
diff --git a/src/dep/src/irrlicht/CGUIEnvironment.cpp b/src/dep/src/irrlicht/CGUIEnvironment.cpp
index 7fa6287..24ebaef 100644
--- a/src/dep/src/irrlicht/CGUIEnvironment.cpp
+++ b/src/dep/src/irrlicht/CGUIEnvironment.cpp
@@ -1,5 +1,5 @@
 
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -32,6 +32,7 @@
 #include "CGUIComboBox.h"
 #include "CGUIMenu.h"
 #include "CGUIToolBar.h"
+#include "CGUITable.h"
 
 #include "CDefaultGUIElementFactory.h"
 #include "IWriteFile.h"
@@ -136,9 +137,14 @@ CGUIEnvironment::~CGUIEnvironment()
 		CurrentSkin = 0;
 	}
 
-	// delete all fonts
 	u32 i;
 
+	// delete all sprite banks
+	for (i=0; i<Banks.size(); ++i)
+		if (Banks[i].Bank)
+			Banks[i].Bank->drop();
+
+	// delete all fonts
 	for (i=0; i<Fonts.size(); ++i)
 		Fonts[i].Font->drop();
 
@@ -156,7 +162,7 @@ void CGUIEnvironment::loadBuiltInFont()
 	CGUIFont* font = new CGUIFont(this, "#DefaultFont");
 	if (!font->load(file))
 	{
-		os::Printer::log("Error: Could not load built-in Font.", ELL_ERROR);
+		os::Printer::log("Error: Could not load built-in Font. Did you compile without the BMP loader?", ELL_ERROR);
 		font->drop();
 		file->drop();
 		return;
@@ -186,7 +192,7 @@ void CGUIEnvironment::drawAll()
 			AbsoluteClippingRect = DesiredRect;
 			AbsoluteRect = DesiredRect;
 			updateAbsolutePosition();
-		}		
+		}
 	}
 
 	// make sure tooltip is always on top
@@ -237,7 +243,7 @@ bool CGUIEnvironment::setFocus(IGUIElement* element)
 		currentFocus->drop();
 		currentFocus = 0;
 	}
-	
+
 	if (element)
 	{
 		currentFocus = Focus;
@@ -269,8 +275,7 @@ bool CGUIEnvironment::setFocus(IGUIElement* element)
 
 	// element is the new focus so it doesn't have to be dropped
 	Focus = element;
-	
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+
 	return true;
 }
 
@@ -303,8 +308,7 @@ bool CGUIEnvironment::removeFocus(IGUIElement* element)
 		Focus->drop();
 		Focus = 0;
 	}
-	
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+
 	return true;
 }
 
@@ -313,7 +317,7 @@ bool CGUIEnvironment::removeFocus(IGUIElement* element)
 bool CGUIEnvironment::hasFocus(IGUIElement* element) const
 {
 	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return (element == Focus); 
+	return (element == Focus);
 }
 
 
@@ -323,18 +327,21 @@ video::IVideoDriver* CGUIEnvironment::getVideoDriver() const
 	return Driver;
 }
 
+
 //! returns the current file system
 io::IFileSystem* CGUIEnvironment::getFileSystem() const
 {
 	return FileSystem;
 }
 
+
 //! returns the current file system
 IOSOperator* CGUIEnvironment::getOSOperator() const
 {
 	return Operator;
 }
 
+
 //! clear all GUI elements
 void CGUIEnvironment::clear()
 {
@@ -362,13 +369,17 @@ void CGUIEnvironment::clear()
 //! called by ui if an event happened.
 bool CGUIEnvironment::OnEvent(const SEvent& event)
 {
-	if (UserReceiver && (event.EventType != EET_MOUSE_INPUT_EVENT) &&
-		(event.EventType != EET_GUI_EVENT || event.GUIEvent.Caller != this))
+	bool ret = false;
+	if (UserReceiver
+		&& (event.EventType != EET_MOUSE_INPUT_EVENT)
+		&& (event.EventType != EET_KEY_INPUT_EVENT)
+		&& (event.EventType != EET_GUI_EVENT || event.GUIEvent.Caller != this))
 	{
-		return UserReceiver->OnEvent(event);
+		ret = UserReceiver->OnEvent(event);
 	}
 
-	return false;
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return ret;
 }
 
 
@@ -383,7 +394,7 @@ void CGUIEnvironment::OnPostRender( u32 time )
 		ToolTip.Element == 0 &&
 		Hovered != ToolTip.Element &&
 		Hovered->getToolTipText().size() &&
-		getSkin() && 
+		getSkin() &&
 		getSkin()->getFont(EGDF_TOOLTIP)
 		)
 	{
@@ -435,7 +446,7 @@ void CGUIEnvironment::updateHoveredElement(core::position2d<s32> mousePos)
 
 		if (Hovered != lastHovered)
 		{
-			SEvent event; 
+			SEvent event;
 			event.EventType = EET_GUI_EVENT;
 
 			if (lastHovered)
@@ -470,7 +481,7 @@ void CGUIEnvironment::updateHoveredElement(core::position2d<s32> mousePos)
 			event.GUIEvent.EventType = EGET_ELEMENT_HOVERED;
 			Hovered->OnEvent(event);
 		}
-	}	
+	}
 
 	if (lastHovered && lastHovered != this)
 		lastHovered->drop();
@@ -509,14 +520,17 @@ bool CGUIEnvironment::postEventFromUser(const SEvent& event)
 
 		// focus could have died in last call
 		if (!Focus && Hovered)
+		{
+			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 			return Hovered->OnEvent(event);
+		}
 
 		break;
 	case EET_KEY_INPUT_EVENT:
 		{
 			// send focus changing event
-			if (event.EventType == EET_KEY_INPUT_EVENT && 
-				event.KeyInput.PressedDown && 
+			if (event.EventType == EET_KEY_INPUT_EVENT &&
+				event.KeyInput.PressedDown &&
 				event.KeyInput.Key == KEY_TAB)
 			{
 				IGUIElement *next = getNextElement(event.KeyInput.Shift, event.KeyInput.Control);
@@ -527,13 +541,17 @@ bool CGUIEnvironment::postEventFromUser(const SEvent& event)
 				}
 			}
 			if (Focus)
+			{
+				_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 				return Focus->OnEvent(event);
+			}
 		}
 		break;
 	default:
 		break;
 	} // end switch
 
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return false;
 }
 
@@ -548,6 +566,9 @@ IGUISkin* CGUIEnvironment::getSkin() const
 //! Sets a new GUI Skin
 void CGUIEnvironment::setSkin(IGUISkin* skin)
 {
+	if (CurrentSkin==skin)
+		return;
+
 	if (CurrentSkin)
 		CurrentSkin->drop();
 
@@ -641,10 +662,14 @@ bool CGUIEnvironment::saveGUI(const c8* filename, IGUIElement* start)
 {
 	io::IWriteFile* file = FileSystem->createAndWriteFile(filename);
 	if (!file)
+	{
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
+	}
 
 	bool ret = saveGUI(file, start);
 	file->drop();
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return ret;
 }
 
@@ -653,11 +678,17 @@ bool CGUIEnvironment::saveGUI(const c8* filename, IGUIElement* start)
 bool CGUIEnvironment::saveGUI(io::IWriteFile* file, IGUIElement* start)
 {
 	if (!file)
+	{
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
+	}
 
 	io::IXMLWriter* writer = FileSystem->createXMLWriter(file);
 	if (!writer)
+	{
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
+	}
 
 	writer->writeXMLHeader();
 	writeGUIElement(writer, start ? start : this);
@@ -675,12 +706,14 @@ bool CGUIEnvironment::loadGUI(const c8* filename, IGUIElement* parent)
 	if (!read)
 	{
 		os::Printer::log("Unable to open gui file", filename, ELL_ERROR);
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
 	}
 
 	bool ret = loadGUI(read, parent);
 	read->drop();
 
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return ret;
 }
 
@@ -691,6 +724,7 @@ bool CGUIEnvironment::loadGUI(io::IReadFile* file, IGUIElement* parent)
 	if (!file)
 	{
 		os::Printer::log("Unable to open GUI file", ELL_ERROR);
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
 	}
 
@@ -698,9 +732,10 @@ bool CGUIEnvironment::loadGUI(io::IReadFile* file, IGUIElement* parent)
 	if (!reader)
 	{
 		os::Printer::log("GUI is not a valid XML file", file->getFileName(), ELL_ERROR);
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
 	}
-	
+
 	// read file
 	while(reader->read())
 	{
@@ -709,8 +744,8 @@ bool CGUIEnvironment::loadGUI(io::IReadFile* file, IGUIElement* parent)
 
 	// finish up
 
-	reader->drop(); 
-	return true; 
+	reader->drop();
+	return true;
 }
 
 
@@ -778,7 +813,7 @@ void CGUIEnvironment::readGUIElement(io::IXMLReader* reader, IGUIElement* parent
 			else
 			{
 				os::Printer::log("Found unknown element in irrlicht GUI file",
-								 core::stringc(reader->getNodeName()).c_str());
+						core::stringc(reader->getNodeName()).c_str());
 			}
 
 			break;
@@ -886,8 +921,8 @@ void CGUIEnvironment::deserializeAttributes(io::IAttributes* in, io::SAttributeR
 
 	}
 
-	RelativeRect = AbsoluteRect = 
-			core::rect<s32>(core::position2d<s32>(0,0), 
+	RelativeRect = AbsoluteRect =
+			core::rect<s32>(core::position2d<s32>(0,0),
 					Driver ? Driver->getScreenSize() : core::dimension2d<s32>(0,0));
 }
 
@@ -908,7 +943,7 @@ IGUIButton* CGUIEnvironment::addButton(const core::rect<s32>& rectangle, IGUIEle
 
 
 //! adds a window. The returned pointer must not be dropped.
-IGUIWindow* CGUIEnvironment::addWindow(const core::rect<s32>& rectangle, bool modal, 
+IGUIWindow* CGUIEnvironment::addWindow(const core::rect<s32>& rectangle, bool modal,
 		const wchar_t* text, IGUIElement* parent, s32 id)
 {
 	parent = parent ? parent : this;
@@ -985,7 +1020,15 @@ IGUIScrollBar* CGUIEnvironment::addScrollBar(bool horizontal, const core::rect<s
 }
 
 
-//! Adds an image element. 
+IGUITable* CGUIEnvironment::addTable(const core::rect<s32>& rectangle, IGUIElement* parent, s32 id, bool drawBackground)
+{
+	CGUITable* b = new CGUITable(this, parent ? parent : this, id, rectangle, true, drawBackground, false);
+	b->drop();
+	return b;
+}
+
+
+//! Adds an image element.
 IGUIImage* CGUIEnvironment::addImage(video::ITexture* image, core::position2d<s32> pos,
 	bool useAlphaChannel, IGUIElement* parent, s32 id, const wchar_t* text)
 {
@@ -1041,7 +1084,7 @@ IGUIMeshViewer* CGUIEnvironment::addMeshViewer(const core::rect<s32>& rectangle,
 //! adds a checkbox
 IGUICheckBox* CGUIEnvironment::addCheckBox(bool checked, const core::rect<s32>& rectangle, IGUIElement* parent, s32 id, const wchar_t* text)
 {
-	IGUICheckBox* b = new CGUICheckBox(checked, this, 
+	IGUICheckBox* b = new CGUICheckBox(checked, this,
 		parent ? parent : this , id , rectangle);
 
 	if (text)
@@ -1053,9 +1096,8 @@ IGUICheckBox* CGUIEnvironment::addCheckBox(bool checked, const core::rect<s32>&
 
 
 //! adds a list box
-IGUIListBox* CGUIEnvironment::addListBox(const core::rect<s32>& rectangle, 
-					 IGUIElement* parent, s32 id,
-					 bool drawBackground)
+IGUIListBox* CGUIEnvironment::addListBox(const core::rect<s32>& rectangle,
+					IGUIElement* parent, s32 id, bool drawBackground)
 {
 	IGUIListBox* b = new CGUIListBox(this, parent ? parent : this, id, rectangle,
 		true, drawBackground, false);
@@ -1075,9 +1117,8 @@ IGUIListBox* CGUIEnvironment::addListBox(const core::rect<s32>& rectangle,
 
 
 //! adds a file open dialog. The returned pointer must not be dropped.
-IGUIFileOpenDialog* CGUIEnvironment::addFileOpenDialog(const wchar_t* title, 
-						   bool modal,
-						   IGUIElement* parent, s32 id)
+IGUIFileOpenDialog* CGUIEnvironment::addFileOpenDialog(const wchar_t* title,
+				bool modal, IGUIElement* parent, s32 id)
 {
 	parent = parent ? parent : this;
 
@@ -1095,9 +1136,8 @@ IGUIFileOpenDialog* CGUIEnvironment::addFileOpenDialog(const wchar_t* title,
 
 
 //! adds a color select dialog. The returned pointer must not be dropped.
-IGUIColorSelectDialog* CGUIEnvironment::addColorSelectDialog(const wchar_t* title, 
-						   bool modal,
-						   IGUIElement* parent, s32 id)
+IGUIColorSelectDialog* CGUIEnvironment::addColorSelectDialog(const wchar_t* title,
+				bool modal, IGUIElement* parent, s32 id)
 {
 	parent = parent ? parent : this;
 
@@ -1116,11 +1156,10 @@ IGUIColorSelectDialog* CGUIEnvironment::addColorSelectDialog(const wchar_t* titl
 
 
 //! adds a static text. The returned pointer must not be dropped.
-IGUIStaticText* CGUIEnvironment::addStaticText(const wchar_t* text,  
-					   const core::rect<s32>& rectangle,
-					   bool border, bool wordWrap,
-					   IGUIElement* parent, s32 id,
-					   bool background)
+IGUIStaticText* CGUIEnvironment::addStaticText(const wchar_t* text,
+				const core::rect<s32>& rectangle,
+				bool border, bool wordWrap,
+				IGUIElement* parent, s32 id, bool background)
 {
 	IGUIStaticText* d = new CGUIStaticText(text, border, this,
 			parent ? parent : this, id, rectangle, background);
@@ -1133,10 +1172,9 @@ IGUIStaticText* CGUIEnvironment::addStaticText(const wchar_t* text,
 
 
 //! Adds an edit box. The returned pointer must not be dropped.
-IGUIEditBox* CGUIEnvironment::addEditBox(const wchar_t* text, 
-					 const core::rect<s32>& rectangle, 
-					 bool border, IGUIElement* parent,
-					 s32 id)
+IGUIEditBox* CGUIEnvironment::addEditBox(const wchar_t* text,
+			const core::rect<s32>& rectangle, bool border,
+			IGUIElement* parent, s32 id)
 {
 	IGUIEditBox* d = new CGUIEditBox(text, border, this,
 			parent ? parent : this, id, rectangle);
@@ -1147,9 +1185,9 @@ IGUIEditBox* CGUIEnvironment::addEditBox(const wchar_t* text,
 
 
 //! Adds a spin box to the environment
-IGUISpinBox* CGUIEnvironment::addSpinBox(const wchar_t* text, 
-					 const core::rect<s32> &rectangle, 
-					 IGUIElement* parent, s32 id)
+IGUISpinBox* CGUIEnvironment::addSpinBox(const wchar_t* text,
+				const core::rect<s32> &rectangle,
+				IGUIElement* parent, s32 id)
 {
 	IGUISpinBox* d = new CGUISpinBox(text, this, parent ? parent : this, id, rectangle);
 
@@ -1169,7 +1207,7 @@ IGUITabControl* CGUIEnvironment::addTabControl(const core::rect<s32>& rectangle,
 }
 
 
-//! Adds tab to the environment. 
+//! Adds tab to the environment.
 IGUITab* CGUIEnvironment::addTab(const core::rect<s32>& rectangle,
 	IGUIElement* parent, s32 id)
 {
@@ -1184,7 +1222,7 @@ IGUITab* CGUIEnvironment::addTab(const core::rect<s32>& rectangle,
 IGUIContextMenu* CGUIEnvironment::addContextMenu(const core::rect<s32>& rectangle,
 	IGUIElement* parent, s32 id)
 {
-	IGUIContextMenu* c = new CGUIContextMenu(this, 
+	IGUIContextMenu* c = new CGUIContextMenu(this,
 		parent ? parent : this, id, rectangle, true);
 	c->drop();
 	return c;
@@ -1197,7 +1235,7 @@ IGUIContextMenu* CGUIEnvironment::addMenu(IGUIElement* parent, s32 id)
 	if (!parent)
 		parent = this;
 
-	IGUIContextMenu* c = new CGUIMenu(this, 
+	IGUIContextMenu* c = new CGUIMenu(this,
 		parent, id, core::rect<s32>(0,0,
 				parent->getAbsolutePosition().getWidth(),
 				parent->getAbsolutePosition().getHeight()));
@@ -1227,9 +1265,8 @@ IGUIInOutFader* CGUIEnvironment::addInOutFader(const core::rect<s32>* rectangle,
 
 	if (rectangle)
 		rect = *rectangle;
-	else
-		if (Driver)
-			rect = core::rect<s32>(core::position2d<s32>(0,0), Driver->getScreenSize());
+	else if (Driver)
+		rect = core::rect<s32>(core::position2d<s32>(0,0), Driver->getScreenSize());
 
 	if (!parent)
 		parent = this;
@@ -1399,10 +1436,9 @@ IGUISpriteBank* CGUIEnvironment::addEmptySpriteBank(const c8 *name)
 	else
 		b.Filename = name;
 
-	s32 index = Banks.binary_search(b);
+	const s32 index = Banks.binary_search(b);
 	if (index != -1)
-		return 0; 
-
+		return 0;
 
 	// create a new sprite bank
 
@@ -1424,8 +1460,7 @@ IGUIFont* CGUIEnvironment::getBuiltInFont() const
 }
 
 
-
-//! Returns the root gui element. 
+//! Returns the root gui element.
 IGUIElement* CGUIEnvironment::getRootGUIElement()
 {
 	return this;
@@ -1444,13 +1479,13 @@ IGUIElement* CGUIEnvironment::getNextElement(bool reverse, bool group)
 	{
 		startOrder = startPos->getTabOrder();
 	}
-	else 
+	else
 	if (!group && Focus && !Focus->isTabGroup())
 	{
 		startOrder = Focus->getTabOrder();
 		if (startOrder == -1)
 		{
-			// this element is not part of the tab cycle, 
+			// this element is not part of the tab cycle,
 			// but its parent might be...
 			IGUIElement *el = Focus;
 			while (el && el->getParent() && startOrder == -1)
diff --git a/src/dep/src/irrlicht/CGUIEnvironment.h b/src/dep/src/irrlicht/CGUIEnvironment.h
index aa43a07..158dce7 100644
--- a/src/dep/src/irrlicht/CGUIEnvironment.h
+++ b/src/dep/src/irrlicht/CGUIEnvironment.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_ENVIRNMENT_H_INCLUDED__
-#define __C_GUI_ENVIRNMENT_H_INCLUDED__
+#ifndef __C_GUI_ENVIRONMENT_H_INCLUDED__
+#define __C_GUI_ENVIRONMENT_H_INCLUDED__
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -83,7 +83,7 @@ public:
 	virtual IGUIButton* addButton(const core::rect<s32>& rectangle, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext = 0);
 
 	//! adds a window. The returned pointer must not be dropped.
-	virtual IGUIWindow* addWindow(const core::rect<s32>& rectangle, bool modal = false, 
+	virtual IGUIWindow* addWindow(const core::rect<s32>& rectangle, bool modal = false,
 		const wchar_t* text=0, IGUIElement* parent=0, s32 id=-1);
 
 	//! adds a modal screen. The returned pointer must not be dropped.
@@ -96,12 +96,12 @@ public:
 	//! adds a scrollbar. The returned pointer must not be dropped.
 	virtual IGUIScrollBar* addScrollBar(bool horizontal, const core::rect<s32>& rectangle, IGUIElement* parent=0, s32 id=-1);
 
-	//! Adds an image element. 
+	//! Adds an image element.
 	virtual IGUIImage* addImage(video::ITexture* image, core::position2d<s32> pos,
 		bool useAlphaChannel=true, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0);
 
 	//! adds an image. The returned pointer must not be dropped.
-	virtual IGUIImage* addImage(const core::rect<s32>& rectangle, 
+	virtual IGUIImage* addImage(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0);
 
 	//! adds a checkbox
@@ -125,18 +125,18 @@ public:
 		bool border=false, bool wordWrap=true, IGUIElement* parent=0, s32 id=-1, bool drawBackground = false);
 
 	//! Adds an edit box. The returned pointer must not be dropped.
-	virtual IGUIEditBox* addEditBox(const wchar_t* text, const core::rect<s32>& rectangle, 
+	virtual IGUIEditBox* addEditBox(const wchar_t* text, const core::rect<s32>& rectangle,
 		bool border=false, IGUIElement* parent=0, s32 id=-1);
 
 	//! Adds a spin box to the environment
-	virtual IGUISpinBox* addSpinBox(const wchar_t* text, const core::rect<s32>& rectangle, 
+	virtual IGUISpinBox* addSpinBox(const wchar_t* text, const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1);
 
 	//! Adds a tab control to the environment.
 	virtual IGUITabControl* addTabControl(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, bool fillbackground=false, bool border=true, s32 id=-1);
 
-	//! Adds tab to the environment. 
+	//! Adds tab to the environment.
 	virtual IGUITab* addTab(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1);
 
@@ -155,6 +155,10 @@ public:
 	virtual IGUIComboBox* addComboBox(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1);
 
+	//! Adds a table element.
+	virtual IGUITable* addTable(const core::rect<s32>& rectangle,
+		IGUIElement* parent=0, s32 id=-1, bool drawBackground=false);
+
 	//! sets the focus to an element
 	virtual bool setFocus(IGUIElement* element);
 
@@ -173,7 +177,7 @@ public:
 	//! Adds an element for fading in or out.
 	virtual IGUIInOutFader* addInOutFader(const core::rect<s32>* rectangle=0, IGUIElement* parent=0, s32 id=-1);
 
-	//! Returns the root gui element. 
+	//! Returns the root gui element.
 	virtual IGUIElement* getRootGUIElement();
 
 	virtual void OnPostRender( u32 time );
@@ -197,27 +201,27 @@ public:
 
 	//! Saves the current gui into a file.
 	/** \param filename: Name of the file.
-	\param start: The element to start saving from. 
-	if not specified, the root element will be used */ 
+	\param start: The element to start saving from.
+	if not specified, the root element will be used */
 	virtual bool saveGUI(const c8* filename, IGUIElement* start=0);
 
 	//! Saves the current gui into a file.
 	/** \param file: The file to save the GUI to.
-	\param start: The element to start saving from. 
+	\param start: The element to start saving from.
 	if not specified, the root element will be used */
 	virtual bool saveGUI(io::IWriteFile* file, IGUIElement* start=0);
 
 	//! Loads the gui. Note that the current gui is not cleared before.
 	/** \param filename: Name of the file.
-	\param parent: The parent of all loaded GUI elements, 
+	\param parent: The parent of all loaded GUI elements,
 	if not specified, the root element will be used */
 	virtual bool loadGUI(const c8* filename, IGUIElement* parent=0);
 
 	//! Loads the gui. Note that the current gui is not cleared before.
 	/** \param file: IReadFile to load the GUI from
-	\param parent: The parent of all loaded GUI elements, 
+	\param parent: The parent of all loaded GUI elements,
 	if not specified, the root element will be used */
-	virtual bool loadGUI(io::IReadFile* file, IGUIElement* parent=0);	
+	virtual bool loadGUI(io::IReadFile* file, IGUIElement* parent=0);
 
 	//! Writes attributes of the environment
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const;
@@ -231,7 +235,6 @@ public:
 	//! reads an element
 	virtual void readGUIElement(io::IXMLReader* reader, IGUIElement* parent);
 
-
 private:
 
 	IGUIElement* getNextElement(bool reverse=false, bool group=false);
@@ -264,9 +267,9 @@ private:
 
 	struct SToolTip
 	{
+		IGUIStaticText* Element;
 		u32 LastTime;
 		u32 LaunchTime;
-		IGUIStaticText* Element;
 	};
 
 	SToolTip ToolTip;
@@ -290,5 +293,6 @@ private:
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif // __C_GUI_ENVIRNMENT_H_INCLUDED__
+#endif // __C_GUI_ENVIRONMENT_H_INCLUDED__
+
 
diff --git a/src/dep/src/irrlicht/CGUIFileOpenDialog.cpp b/src/dep/src/irrlicht/CGUIFileOpenDialog.cpp
index d7dd05a..5b6a41d 100644
--- a/src/dep/src/irrlicht/CGUIFileOpenDialog.cpp
+++ b/src/dep/src/irrlicht/CGUIFileOpenDialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -32,7 +32,7 @@ CGUIFileOpenDialog::CGUIFileOpenDialog(const wchar_t* title,
 					(parent->getAbsolutePosition().getHeight()-FOD_HEIGHT)/2,
 					(parent->getAbsolutePosition().getWidth()-FOD_WIDTH)/2+FOD_WIDTH,
 					(parent->getAbsolutePosition().getHeight()-FOD_HEIGHT)/2+FOD_HEIGHT)),
-	Dragging(false), FileNameText(0), FileList(0)
+	FileNameText(0), FileList(0), Dragging(false)
 {
 	#ifdef _DEBUG
 	IGUIElement::setDebugName("CGUIFileOpenDialog");
@@ -49,8 +49,8 @@ CGUIFileOpenDialog::CGUIFileOpenDialog(const wchar_t* title,
 		color = skin->getColor(EGDC_WINDOW_SYMBOL);
 	}
 
-	s32 buttonw = environment->getSkin()->getSize(EGDS_WINDOW_BUTTON_WIDTH);
-	s32 posx = RelativeRect.getWidth() - buttonw - 4;
+	const s32 buttonw = environment->getSkin()->getSize(EGDS_WINDOW_BUTTON_WIDTH);
+	const s32 posx = RelativeRect.getWidth() - buttonw - 4;
 
 	CloseButton = Environment->addButton(core::rect<s32>(posx, 3, posx + buttonw, 3 + buttonw), this, -1,
 		L"", skin ? skin->getDefaultText(EGDT_WINDOW_CLOSE) : L"Close");
@@ -136,107 +136,110 @@ const wchar_t* CGUIFileOpenDialog::getFileName() const
 //! called if an event happened.
 bool CGUIFileOpenDialog::OnEvent(const SEvent& event)
 {
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_GUI_EVENT:
-		switch(event.GUIEvent.EventType)
+		switch(event.EventType)
 		{
-		case EGET_ELEMENT_FOCUS_LOST:
-			Dragging = false;
-			break;
-		case EGET_BUTTON_CLICKED:
-			if (event.GUIEvent.Caller == CloseButton ||
-				event.GUIEvent.Caller == CancelButton)
+		case EET_GUI_EVENT:
+			switch(event.GUIEvent.EventType)
 			{
-				sendCancelEvent();
-				remove();
-				return true;
-			}
-			else
-			if (event.GUIEvent.Caller == OKButton && FileName != L"")
-			{
-				sendSelectedEvent();
-				remove();
-				return true;
-			}
-			break;
-
-		case EGET_LISTBOX_CHANGED:
-			{
-				s32 selected = FileBox->getSelected();
-				if (FileList && FileSystem)
+			case EGET_ELEMENT_FOCUS_LOST:
+				Dragging = false;
+				break;
+			case EGET_BUTTON_CLICKED:
+				if (event.GUIEvent.Caller == CloseButton ||
+					event.GUIEvent.Caller == CancelButton)
 				{
-					if (FileList->isDirectory(selected))
-						FileName = L"";
-					else
-						FileName = FileList->getFullFileName(selected);
+					sendCancelEvent();
+					remove();
+					return true;
 				}
-			}
-			break;
-
-		case EGET_LISTBOX_SELECTED_AGAIN:
-			{
-				const s32 selected = FileBox->getSelected();
-				if (FileList && FileSystem)
+				else
+				if (event.GUIEvent.Caller == OKButton && FileName != L"")
 				{
-					if (FileList->isDirectory(selected))
+					sendSelectedEvent();
+					remove();
+					return true;
+				}
+				break;
+
+			case EGET_LISTBOX_CHANGED:
+				{
+					s32 selected = FileBox->getSelected();
+					if (FileList && FileSystem)
 					{
-						FileSystem->changeWorkingDirectoryTo(FileList->getFileName(selected));
-						fillListBox();
-						FileName = L"";
-					}
-					else
-					{
-						FileName = FileList->getFullFileName(selected);
-						return true;
+						if (FileList->isDirectory(selected))
+							FileName = L"";
+						else
+							FileName = FileList->getFullFileName(selected);
 					}
 				}
+				break;
+
+			case EGET_LISTBOX_SELECTED_AGAIN:
+				{
+					const s32 selected = FileBox->getSelected();
+					if (FileList && FileSystem)
+					{
+						if (FileList->isDirectory(selected))
+						{
+							FileSystem->changeWorkingDirectoryTo(FileList->getFileName(selected));
+							fillListBox();
+							FileName = L"";
+						}
+						else
+						{
+							FileName = FileList->getFullFileName(selected);
+							return true;
+						}
+					}
+				}
+				break;
+			default:
+				break;
 			}
 			break;
-		default:
-			break;
-		}
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-		switch(event.MouseInput.Event)
-		{
-		case EMIE_MOUSE_WHEEL:
-			return FileBox->OnEvent(event);
-		case EMIE_LMOUSE_PRESSED_DOWN:
-			DragStart.X = event.MouseInput.X;
-			DragStart.Y = event.MouseInput.Y;
-			Dragging = true;
-			Environment->setFocus(this);
-			return true;
-		case EMIE_LMOUSE_LEFT_UP:
-			Dragging = false;
-			return true;
-		case EMIE_MOUSE_MOVED:
-			if (Dragging)
+		case EET_MOUSE_INPUT_EVENT:
+			switch(event.MouseInput.Event)
 			{
-				// gui window should not be dragged outside its parent
-				if (Parent)
-					if (event.MouseInput.X < Parent->getAbsolutePosition().UpperLeftCorner.X +1 ||
-						event.MouseInput.Y < Parent->getAbsolutePosition().UpperLeftCorner.Y +1 ||
-						event.MouseInput.X > Parent->getAbsolutePosition().LowerRightCorner.X -1 ||
-						event.MouseInput.Y > Parent->getAbsolutePosition().LowerRightCorner.Y -1)
-
-						return true;
-
-				move(core::position2d<s32>(event.MouseInput.X - DragStart.X, event.MouseInput.Y - DragStart.Y));
+			case EMIE_MOUSE_WHEEL:
+				return FileBox->OnEvent(event);
+			case EMIE_LMOUSE_PRESSED_DOWN:
 				DragStart.X = event.MouseInput.X;
 				DragStart.Y = event.MouseInput.Y;
+				Dragging = true;
+				Environment->setFocus(this);
 				return true;
+			case EMIE_LMOUSE_LEFT_UP:
+				Dragging = false;
+				return true;
+			case EMIE_MOUSE_MOVED:
+				if (Dragging)
+				{
+					// gui window should not be dragged outside its parent
+					if (Parent)
+						if (event.MouseInput.X < Parent->getAbsolutePosition().UpperLeftCorner.X +1 ||
+							event.MouseInput.Y < Parent->getAbsolutePosition().UpperLeftCorner.Y +1 ||
+							event.MouseInput.X > Parent->getAbsolutePosition().LowerRightCorner.X -1 ||
+							event.MouseInput.Y > Parent->getAbsolutePosition().LowerRightCorner.Y -1)
+
+							return true;
+
+					move(core::position2d<s32>(event.MouseInput.X - DragStart.X, event.MouseInput.Y - DragStart.Y));
+					DragStart.X = event.MouseInput.X;
+					DragStart.Y = event.MouseInput.Y;
+					return true;
+				}
+				break;
+			default:
+				break;
 			}
-			break;
 		default:
 			break;
 		}
-	default:
-		break;
 	}
 
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
diff --git a/src/dep/src/irrlicht/CGUIFileOpenDialog.h b/src/dep/src/irrlicht/CGUIFileOpenDialog.h
index c33f3dc..43d7a9f 100644
--- a/src/dep/src/irrlicht/CGUIFileOpenDialog.h
+++ b/src/dep/src/irrlicht/CGUIFileOpenDialog.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -50,7 +50,6 @@ namespace gui
 
 		core::position2d<s32> DragStart;
 		core::stringw FileName;
-		bool Dragging;
 		IGUIButton* CloseButton;
 		IGUIButton* OKButton;
 		IGUIButton* CancelButton;
@@ -58,8 +57,8 @@ namespace gui
 		IGUIElement* FileNameText;
 		IGUIElement* EventParent;
 		io::IFileSystem* FileSystem;
-
 		io::IFileList* FileList;
+		bool Dragging;
 	};
 
 
diff --git a/src/dep/src/irrlicht/CGUIFont.cpp b/src/dep/src/irrlicht/CGUIFont.cpp
index c1f481e..5c74c91 100644
--- a/src/dep/src/irrlicht/CGUIFont.cpp
+++ b/src/dep/src/irrlicht/CGUIFont.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -33,6 +33,8 @@ CGUIFont::CGUIFont(IGUIEnvironment *env, const c8* filename)
 		Driver = Environment->getVideoDriver();
 
 		SpriteBank = Environment->addEmptySpriteBank(filename);
+		if (SpriteBank)
+			SpriteBank->grab();
 	}
 
 	if (Driver)
@@ -48,7 +50,6 @@ CGUIFont::~CGUIFont()
 
 	if (SpriteBank)
 		SpriteBank->drop();
-
 }
 
 
@@ -95,7 +96,7 @@ bool CGUIFont::load(io::IXMLReader* xml)
 					if (alpha == core::stringw("false"))
 						Driver->makeColorKeyTexture(SpriteBank->getTexture(i), core::position2di(0,0));
 				}
-			} 
+			}
 			else if (core::stringw(L"c") == xml->getNodeName())
 			{
 				// adding a character to this font
@@ -111,45 +112,45 @@ bool CGUIFont::load(io::IXMLReader* xml)
 
 				// parse rectangle
 				core::stringc rectstr	= xml->getAttributeValue(L"r");
-				wchar_t ch				= xml->getAttributeValue(L"c")[0];
+				wchar_t ch		= xml->getAttributeValue(L"c")[0];
 
 				const c8 *c = rectstr.c_str();
 				s32 val;
 				val = 0;
-				while (*c >= '0' && *c <= '9') 
-				{ 
-					val *= 10; 
-					val += *c - '0'; 
+				while (*c >= '0' && *c <= '9')
+				{
+					val *= 10;
+					val += *c - '0';
 					c++;
 				}
 				rectangle.UpperLeftCorner.X = val;
 				while (*c == L' ' || *c == L',') c++;
 
 				val = 0;
-				while (*c >= '0' && *c <= '9') 
-				{ 
-					val *= 10; 
-					val += *c - '0'; 
+				while (*c >= '0' && *c <= '9')
+				{
+					val *= 10;
+					val += *c - '0';
 					c++;
 				}
 				rectangle.UpperLeftCorner.Y = val;
 				while (*c == L' ' || *c == L',') c++;
 
 				val = 0;
-				while (*c >= '0' && *c <= '9') 
-				{ 
-					val *= 10; 
-					val += *c - '0'; 
+				while (*c >= '0' && *c <= '9')
+				{
+					val *= 10;
+					val += *c - '0';
 					c++;
 				}
 				rectangle.LowerRightCorner.X = val;
 				while (*c == L' ' || *c == L',') c++;
 
 				val = 0;
-				while (*c >= '0' && *c <= '9') 
-				{ 
-					val *= 10; 
-					val += *c - '0'; 
+				while (*c >= '0' && *c <= '9')
+				{
+					val *= 10;
+					val += *c - '0';
 					c++;
 				}
 				rectangle.LowerRightCorner.Y = val;
@@ -157,7 +158,7 @@ bool CGUIFont::load(io::IXMLReader* xml)
 				CharacterMap.insert(ch,Areas.size());
 
 				// make frame
-				f.rectNumber = 	SpriteBank->getPositions().size();
+				f.rectNumber = SpriteBank->getPositions().size();
 				f.textureNumber = texno;
 
 				// add frame to sprite
@@ -254,7 +255,7 @@ bool CGUIFont::loadTexture(video::IImage* image, const c8* name)
 
 	// output warnings
 	if (!lowerRightPositions || !SpriteBank->getSprites().size())
-		os::Printer::log("The amount of upper corner pixels or lower corner pixels is == 0, font file may be corrupted.", ELL_ERROR);
+		os::Printer::log("Either no upper or lower corner pixels in the font file. If this font was made using the new font tool, please load the XML file instead. If not, the font may be corrupted.", ELL_ERROR);
 	else
 	if (lowerRightPositions != (s32)SpriteBank->getPositions().size())
 		os::Printer::log("The amount of upper corner pixels and the lower corner pixels is not equal, font file may be corrupted.", ELL_ERROR);
@@ -480,7 +481,7 @@ core::dimension2d<s32> CGUIFont::getDimension(const wchar_t* text) const
 
 
 //! set an Pixel Offset on Drawing ( scale position on width )
-void CGUIFont::setKerningWidth ( s32 kerning )
+void CGUIFont::setKerningWidth(s32 kerning)
 {
 	GlobalKerningWidth = kerning;
 }
@@ -506,7 +507,7 @@ s32 CGUIFont::getKerningWidth(const wchar_t* thisLetter, const wchar_t* previous
 
 
 //! set an Pixel Offset on Drawing ( scale position on height )
-void CGUIFont::setKerningHeight ( s32 kerning )
+void CGUIFont::setKerningHeight(s32 kerning)
 {
 	GlobalKerningHeight = kerning;
 }
@@ -581,7 +582,6 @@ void CGUIFont::draw(const wchar_t* text, const core::rect<s32>& position, video:
 
 	core::dimension2d<s32> textDimension;
 	core::position2d<s32> offset = position.UpperLeftCorner;
-	core::rect<s32> pos;
 
 	if (hcenter || vcenter || clip)
 		textDimension = getDimension(text);
@@ -646,3 +646,4 @@ IGUISpriteBank* CGUIFont::getSpriteBank() const
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_GUI_
+
diff --git a/src/dep/src/irrlicht/CGUIFont.h b/src/dep/src/irrlicht/CGUIFont.h
index aba88ef..30bd074 100644
--- a/src/dep/src/irrlicht/CGUIFont.h
+++ b/src/dep/src/irrlicht/CGUIFont.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -49,7 +49,9 @@ public:
 	bool load(io::IXMLReader* xml);
 
 	//! draws an text and clips it to the specified rectangle if wanted
-	virtual void draw(const wchar_t* text, const core::rect<s32>& position, video::SColor color, bool hcenter=false, bool vcenter=false, const core::rect<s32>* clip=0);
+	virtual void draw(const wchar_t* text, const core::rect<s32>& position,
+			video::SColor color, bool hcenter=false,
+			bool vcenter=false, const core::rect<s32>* clip=0);
 
 	//! returns the dimension of a text
 	virtual core::dimension2d<s32> getDimension(const wchar_t* text) const;
diff --git a/src/dep/src/irrlicht/CGUIImage.cpp b/src/dep/src/irrlicht/CGUIImage.cpp
index ddb6add..e532ac9 100644
--- a/src/dep/src/irrlicht/CGUIImage.cpp
+++ b/src/dep/src/irrlicht/CGUIImage.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,11 +15,10 @@ namespace gui
 {
 
 
-
 //! constructor
 CGUIImage::CGUIImage(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-: IGUIImage(environment, parent, id, rectangle), Color(255,255,255,255),
-	Texture(0), UseAlphaChannel(false), ScaleImage(false)
+: IGUIImage(environment, parent, id, rectangle), Texture(0), Color(255,255,255,255),
+	UseAlphaChannel(false), ScaleImage(false)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUIImage");
@@ -27,7 +26,6 @@ CGUIImage::CGUIImage(IGUIEnvironment* environment, IGUIElement* parent, s32 id,
 }
 
 
-
 //! destructor
 CGUIImage::~CGUIImage()
 {
@@ -36,10 +34,12 @@ CGUIImage::~CGUIImage()
 }
 
 
-
 //! sets an image
 void CGUIImage::setImage(video::ITexture* image)
 {
+	if (image == Texture)
+		return;
+
 	if (Texture)
 		Texture->drop();
 
@@ -72,19 +72,15 @@ void CGUIImage::draw()
 	{
 		if (ScaleImage)
 		{
-			video::SColor Colors[4];
-			Colors[0] = Color;
-			Colors[1] = Color;
-			Colors[2] = Color;
-			Colors[3] = Color;
+			const video::SColor Colors[] = {Color,Color,Color,Color};
 
-			driver->draw2DImage(Texture, AbsoluteRect, 
+			driver->draw2DImage(Texture, AbsoluteRect,
 				core::rect<s32>(core::position2d<s32>(0,0), Texture->getOriginalSize()),
 				&AbsoluteClippingRect, Colors, UseAlphaChannel);
 		}
 		else
 		{
-			driver->draw2DImage(Texture, AbsoluteRect.UpperLeftCorner, 
+			driver->draw2DImage(Texture, AbsoluteRect.UpperLeftCorner,
 				core::rect<s32>(core::position2d<s32>(0,0), Texture->getOriginalSize()),
 				&AbsoluteClippingRect, Color, UseAlphaChannel);
 		}
@@ -104,12 +100,14 @@ void CGUIImage::setUseAlphaChannel(bool use)
 	UseAlphaChannel = use;
 }
 
+
 //! sets if the image should use its alpha channel to draw itself
 void CGUIImage::setScaleImage(bool scale)
 {
 	ScaleImage = scale;
 }
 
+
 //! Returns true if the image is scaled to fit, false if not
 bool CGUIImage::isImageScaled() const
 {
@@ -137,6 +135,7 @@ void CGUIImage::serializeAttributes(io::IAttributes* out, io::SAttributeReadWrit
 
 }
 
+
 //! Reads attributes of the element
 void CGUIImage::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
 {
@@ -149,10 +148,9 @@ void CGUIImage::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWri
 }
 
 
-
-
 } // end namespace gui
 } // end namespace irr
 
 
 #endif // _IRR_COMPILE_WITH_GUI_
+
diff --git a/src/dep/src/irrlicht/CGUIImage.h b/src/dep/src/irrlicht/CGUIImage.h
index d5b4bd3..f0a9d69 100644
--- a/src/dep/src/irrlicht/CGUIImage.h
+++ b/src/dep/src/irrlicht/CGUIImage.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -52,10 +52,9 @@ namespace gui
 		//! Reads attributes of the element
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
 
-
 	private:
-		video::SColor Color;
 		video::ITexture* Texture;
+		video::SColor Color;
 		bool UseAlphaChannel;
 		bool ScaleImage;
 
diff --git a/src/dep/src/irrlicht/CGUIInOutFader.cpp b/src/dep/src/irrlicht/CGUIInOutFader.cpp
index ced2b9d..bf513ad 100644
--- a/src/dep/src/irrlicht/CGUIInOutFader.cpp
+++ b/src/dep/src/irrlicht/CGUIInOutFader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -63,7 +63,6 @@ void CGUIInOutFader::draw()
 }
 
 
-
 //! Gets the color to fade out to or to fade in from.
 video::SColor CGUIInOutFader::getColor() const
 {
@@ -71,7 +70,6 @@ video::SColor CGUIInOutFader::getColor() const
 }
 
 
-
 //! Sets the color to fade out to or to fade in from.
 void CGUIInOutFader::setColor(video::SColor color)
 {
@@ -90,7 +88,7 @@ void CGUIInOutFader::setColor(video::SColor color)
 
 	if (Action == EFA_FADE_OUT)
 	{
-		FullColor.setAlpha(0);	
+		FullColor.setAlpha(0);
 		TransColor.setAlpha(255);
 	}
 	else
@@ -102,6 +100,7 @@ void CGUIInOutFader::setColor(video::SColor color)
 */
 }
 
+
 void CGUIInOutFader::setColor(video::SColor source, video::SColor dest)
 {
 	Color[0] = source;
@@ -123,7 +122,7 @@ void CGUIInOutFader::setColor(video::SColor source, video::SColor dest)
 
 
 //! Returns if the fade in or out process is done.
-bool CGUIInOutFader::isReady() const 
+bool CGUIInOutFader::isReady() const
 {
 	u32 now = os::Timer::getTime();
 	bool ret = (now > EndTime);
@@ -132,7 +131,6 @@ bool CGUIInOutFader::isReady() const
 }
 
 
-
 //! Starts the fade in process.
 void CGUIInOutFader::fadeIn(u32 time)
 {
@@ -152,6 +150,7 @@ void CGUIInOutFader::fadeOut(u32 time)
 	setColor(Color[0],Color[1]);
 }
 
+
 //! Writes attributes of the element.
 void CGUIInOutFader::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
 {
@@ -162,6 +161,7 @@ void CGUIInOutFader::serializeAttributes(io::IAttributes* out, io::SAttributeRea
 
 }
 
+
 //! Reads attributes of the element
 void CGUIInOutFader::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
 {
@@ -172,7 +172,6 @@ void CGUIInOutFader::deserializeAttributes(io::IAttributes* in, io::SAttributeRe
 }
 
 
-
 } // end namespace gui
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/CGUIInOutFader.h b/src/dep/src/irrlicht/CGUIInOutFader.h
index 5297a5e..6e9ba3e 100644
--- a/src/dep/src/irrlicht/CGUIInOutFader.h
+++ b/src/dep/src/irrlicht/CGUIInOutFader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -59,12 +59,11 @@ namespace gui
 
 		u32 StartTime;
 		u32 EndTime;
-		EFadeAction Action;		
+		EFadeAction Action;
 
 		video::SColor Color[2];
 		video::SColor FullColor;
 		video::SColor TransColor;
-
 	};
 
 } // end namespace gui
diff --git a/src/dep/src/irrlicht/CGUIListBox.cpp b/src/dep/src/irrlicht/CGUIListBox.cpp
index e4ac6f4..6113290 100644
--- a/src/dep/src/irrlicht/CGUIListBox.cpp
+++ b/src/dep/src/irrlicht/CGUIListBox.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -25,9 +25,8 @@ CGUIListBox::CGUIListBox(IGUIEnvironment* environment, IGUIElement* parent,
 			bool drawBack, bool moveOverSelect)
 : IGUIListBox(environment, parent, id, rectangle), Selected(-1), ItemHeight(0),
 	TotalItemHeight(0), ItemsIconWidth(0), Font(0), IconBank(0),
-	ScrollBar(0), Selecting(false), DrawBack(drawBack),
-	MoveOverSelect(moveOverSelect), selectTime(0), AutoScroll(true),
-	KeyBuffer(), LastKeyTime(0), HighlightWhenNotFocused(true)
+	ScrollBar(0), selectTime(0), LastKeyTime(0), Selecting(false), DrawBack(drawBack),
+	MoveOverSelect(moveOverSelect), AutoScroll(true), HighlightWhenNotFocused(true)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUIListBox");
@@ -195,218 +194,223 @@ void CGUIListBox::setSelected(s32 id)
 //! called if an event happened.
 bool CGUIListBox::OnEvent(const SEvent& event)
 {
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_KEY_INPUT_EVENT:
-		if (event.KeyInput.PressedDown &&
-			(event.KeyInput.Key == KEY_DOWN ||
-			event.KeyInput.Key == KEY_UP   ||
-			event.KeyInput.Key == KEY_HOME ||
-			event.KeyInput.Key == KEY_END  ||
-			event.KeyInput.Key == KEY_NEXT ||
-			event.KeyInput.Key == KEY_PRIOR ) )
+		switch(event.EventType)
 		{
-			s32 oldSelected = Selected;
-			switch (event.KeyInput.Key)
+		case EET_KEY_INPUT_EVENT:
+			if (event.KeyInput.PressedDown &&
+				(event.KeyInput.Key == KEY_DOWN ||
+				event.KeyInput.Key == KEY_UP   ||
+				event.KeyInput.Key == KEY_HOME ||
+				event.KeyInput.Key == KEY_END  ||
+				event.KeyInput.Key == KEY_NEXT ||
+				event.KeyInput.Key == KEY_PRIOR ) )
 			{
-				case KEY_DOWN:
-					Selected += 1;
-					break;
-				case KEY_UP:
-					Selected -= 1;
-					break;
-				case KEY_HOME:
+				s32 oldSelected = Selected;
+				switch (event.KeyInput.Key)
+				{
+					case KEY_DOWN:
+						Selected += 1;
+						break;
+					case KEY_UP:
+						Selected -= 1;
+						break;
+					case KEY_HOME:
+						Selected = 0;
+						break;
+					case KEY_END:
+						Selected = (s32)Items.size()-1;
+						break;
+					case KEY_NEXT:
+						Selected += AbsoluteRect.getHeight() / ItemHeight;
+						break;
+					case KEY_PRIOR:
+						Selected -= AbsoluteRect.getHeight() / ItemHeight;
+						break;
+					default:
+						break;
+				}
+				if (Selected >= (s32)Items.size())
+					Selected = Items.size() - 1;
+				else
+				if (Selected<0)
 					Selected = 0;
-					break;
-				case KEY_END:
-					Selected = (s32)Items.size()-1;
-					break;
-				case KEY_NEXT:
-					Selected += AbsoluteRect.getHeight() / ItemHeight;
-					break;
-				case KEY_PRIOR:
-					Selected -= AbsoluteRect.getHeight() / ItemHeight;
-					break;
-				default:
-					break;
-			}
-			if (Selected >= (s32)Items.size())
-				Selected = Items.size() - 1;
-			else
-			if (Selected<0)
-				Selected = 0;
 
-			recalculateScrollPos();
+				recalculateScrollPos();
 
-			// post the news
+				// post the news
 
-			if (oldSelected != Selected && Parent && !Selecting && !MoveOverSelect)
-			{
-				SEvent e;
-				e.EventType = EET_GUI_EVENT;
-				e.GUIEvent.Caller = this;
-				e.GUIEvent.Element = 0;
-				e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
-				Parent->OnEvent(e);
-			}
-
-			return true;
-		}
-		else
-		if (!event.KeyInput.PressedDown && ( event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE ) )
-		{
-			if (Parent)
-			{
-				SEvent e;
-				e.EventType = EET_GUI_EVENT;
-				e.GUIEvent.Caller = this;
-				e.GUIEvent.Element = 0;
-				e.GUIEvent.EventType = EGET_LISTBOX_SELECTED_AGAIN;
-				Parent->OnEvent(e);
-			}
-			return true;
-		}
-		else if (event.KeyInput.PressedDown && event.KeyInput.Char)
-		{
-			// change selection based on text as it is typed.
-			u32 now = os::Timer::getTime();
-
-			if (now - LastKeyTime < 500)
-			{
-				// add to key buffer if it isn't a key repeat
-				if (!(KeyBuffer.size() == 1 && KeyBuffer[0] == event.KeyInput.Char))
+				if (oldSelected != Selected && Parent && !Selecting && !MoveOverSelect)
 				{
-					KeyBuffer += L" ";
-					KeyBuffer[KeyBuffer.size()-1] = event.KeyInput.Char;
+					SEvent e;
+					e.EventType = EET_GUI_EVENT;
+					e.GUIEvent.Caller = this;
+					e.GUIEvent.Element = 0;
+					e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
+					Parent->OnEvent(e);
 				}
-			}
-			else
-			{
-				KeyBuffer = L" ";
-				KeyBuffer[0] = event.KeyInput.Char;
-			}
-			LastKeyTime = now;
 
-			// find the selected item, starting at the current selection
-			s32 start = Selected;
-			// dont change selection if the key buffer matches the current item
-			if (Selected > -1 && KeyBuffer.size() > 1)
-			{
-				if (Items[Selected].text.size() >= KeyBuffer.size() &&
-					KeyBuffer.equals_ignore_case(Items[Selected].text.subString(0,KeyBuffer.size())))
-					return true;
-			}
-
-			s32 current;
-			for (current = start+1; current < (s32)Items.size(); ++current)
-			{
-				if (Items[current].text.size() >= KeyBuffer.size())
-				{
-					if (KeyBuffer.equals_ignore_case(Items[current].text.subString(0,KeyBuffer.size())))
-					{
-						if (Parent && Selected != current && !Selecting && !MoveOverSelect)
-						{
-							SEvent e;
-							e.EventType = EET_GUI_EVENT;
-							e.GUIEvent.Caller = this;
-							e.GUIEvent.Element = 0;
-							e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
-							Parent->OnEvent(e);
-						}
-						setSelected(current);
-						return true;
-					}
-				}
-			}
-			for (current = 0; current <= start; ++current)
-			{
-				if (Items[current].text.size() >= KeyBuffer.size())
-				{
-					if (KeyBuffer.equals_ignore_case(Items[current].text.subString(0,KeyBuffer.size())))
-					{
-						if (Parent && Selected != current && !Selecting && !MoveOverSelect)
-						{
-							Selected = current;
-							SEvent e;
-							e.EventType = EET_GUI_EVENT;
-							e.GUIEvent.Caller = this;
-							e.GUIEvent.Element = 0;
-							e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
-							Parent->OnEvent(e);
-						}
-						setSelected(current);
-						return true;
-					}
-				}
-			}
-
-			return true;
-		}
-		break;
-
-	case EET_GUI_EVENT:
-		switch(event.GUIEvent.EventType)
-		{
-		case gui::EGET_SCROLL_BAR_CHANGED:
-			if (event.GUIEvent.Caller == ScrollBar)
 				return true;
+			}
+			else
+			if (!event.KeyInput.PressedDown && ( event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE ) )
+			{
+				if (Parent)
+				{
+					SEvent e;
+					e.EventType = EET_GUI_EVENT;
+					e.GUIEvent.Caller = this;
+					e.GUIEvent.Element = 0;
+					e.GUIEvent.EventType = EGET_LISTBOX_SELECTED_AGAIN;
+					Parent->OnEvent(e);
+				}
+				return true;
+			}
+			else if (event.KeyInput.PressedDown && event.KeyInput.Char)
+			{
+				// change selection based on text as it is typed.
+				u32 now = os::Timer::getTime();
+
+				if (now - LastKeyTime < 500)
+				{
+					// add to key buffer if it isn't a key repeat
+					if (!(KeyBuffer.size() == 1 && KeyBuffer[0] == event.KeyInput.Char))
+					{
+						KeyBuffer += L" ";
+						KeyBuffer[KeyBuffer.size()-1] = event.KeyInput.Char;
+					}
+				}
+				else
+				{
+					KeyBuffer = L" ";
+					KeyBuffer[0] = event.KeyInput.Char;
+				}
+				LastKeyTime = now;
+
+				// find the selected item, starting at the current selection
+				s32 start = Selected;
+				// dont change selection if the key buffer matches the current item
+				if (Selected > -1 && KeyBuffer.size() > 1)
+				{
+					if (Items[Selected].text.size() >= KeyBuffer.size() &&
+						KeyBuffer.equals_ignore_case(Items[Selected].text.subString(0,KeyBuffer.size())))
+						return true;
+				}
+
+				s32 current;
+				for (current = start+1; current < (s32)Items.size(); ++current)
+				{
+					if (Items[current].text.size() >= KeyBuffer.size())
+					{
+						if (KeyBuffer.equals_ignore_case(Items[current].text.subString(0,KeyBuffer.size())))
+						{
+							if (Parent && Selected != current && !Selecting && !MoveOverSelect)
+							{
+								SEvent e;
+								e.EventType = EET_GUI_EVENT;
+								e.GUIEvent.Caller = this;
+								e.GUIEvent.Element = 0;
+								e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
+								Parent->OnEvent(e);
+							}
+							setSelected(current);
+							return true;
+						}
+					}
+				}
+				for (current = 0; current <= start; ++current)
+				{
+					if (Items[current].text.size() >= KeyBuffer.size())
+					{
+						if (KeyBuffer.equals_ignore_case(Items[current].text.subString(0,KeyBuffer.size())))
+						{
+							if (Parent && Selected != current && !Selecting && !MoveOverSelect)
+							{
+								Selected = current;
+								SEvent e;
+								e.EventType = EET_GUI_EVENT;
+								e.GUIEvent.Caller = this;
+								e.GUIEvent.Element = 0;
+								e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
+								Parent->OnEvent(e);
+							}
+							setSelected(current);
+							return true;
+						}
+					}
+				}
+
+				return true;
+			}
 			break;
-		case gui::EGET_ELEMENT_FOCUS_LOST:
+
+		case EET_GUI_EVENT:
+			switch(event.GUIEvent.EventType)
 			{
-				if (event.GUIEvent.Caller == this)
-					Selecting = false;
-			}
-		default:
-		break;
-		}
-		break;
-
-	case EET_MOUSE_INPUT_EVENT:
-		{
-			core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
-
-			switch(event.MouseInput.Event)
-			{
-			case EMIE_MOUSE_WHEEL:
-				ScrollBar->setPos(ScrollBar->getPos() + (s32)event.MouseInput.Wheel*-10);
-				return true;
-
-			case EMIE_LMOUSE_PRESSED_DOWN:
-			{
-				Selecting = true;
-				return true;
-			}
-
-			case EMIE_LMOUSE_LEFT_UP:
-			{
-				Selecting = false;
-
-				if (isPointInside(p))
-					selectNew(event.MouseInput.Y);
-
-				return true;
-			}
-
-			case EMIE_MOUSE_MOVED:
-				if (Selecting || MoveOverSelect)
+			case gui::EGET_SCROLL_BAR_CHANGED:
+				if (event.GUIEvent.Caller == ScrollBar)
+					return true;
+				break;
+			case gui::EGET_ELEMENT_FOCUS_LOST:
 				{
-					if (isPointInside(p))
-					{
-						selectNew(event.MouseInput.Y, true);
-						return true;
-					}
+					if (event.GUIEvent.Caller == this)
+						Selecting = false;
 				}
 			default:
 			break;
 			}
+			break;
+
+		case EET_MOUSE_INPUT_EVENT:
+			{
+				core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
+
+				switch(event.MouseInput.Event)
+				{
+				case EMIE_MOUSE_WHEEL:
+					ScrollBar->setPos(ScrollBar->getPos() + (s32)event.MouseInput.Wheel*-10);
+					return true;
+
+				case EMIE_LMOUSE_PRESSED_DOWN:
+				{
+					Selecting = true;
+					return true;
+				}
+
+				case EMIE_LMOUSE_LEFT_UP:
+				{
+					Selecting = false;
+
+					if (isPointInside(p))
+						selectNew(event.MouseInput.Y);
+
+					return true;
+				}
+
+				case EMIE_MOUSE_MOVED:
+					if (Selecting || MoveOverSelect)
+					{
+						if (isPointInside(p))
+						{
+							selectNew(event.MouseInput.Y, true);
+							return true;
+						}
+					}
+				default:
+				break;
+				}
+			}
+			break;
+		case EET_LOG_TEXT_EVENT:
+		case EET_USER_EVENT:
+		case EET_JOYSTICK_INPUT_EVENT:
+		case EGUIET_FORCE_32_BIT:
+			break;
 		}
-		break;
-	case EET_LOG_TEXT_EVENT:
-	case EET_USER_EVENT:
-		break;
 	}
 
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
@@ -515,7 +519,8 @@ void CGUIListBox::draw()
 					if ( i==Selected && hl )
 					{
 						IconBank->draw2DSprite( (u32)Items[i].icon, iconPos, &clientClip,
-							hasItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) ? getItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_ICON_HIGHLIGHT),
+							hasItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) ?
+							getItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_ICON_HIGHLIGHT),
 							selectTime, os::Timer::getTime(), false, true);
 					}
 					else
@@ -531,7 +536,8 @@ void CGUIListBox::draw()
 				if ( i==Selected && hl )
 				{
 					Font->draw(Items[i].text.c_str(), textRect,
-						hasItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) ? getItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_TEXT_HIGHLIGHT),
+						hasItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) ?
+						getItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_TEXT_HIGHLIGHT),
 						false, true, &clientClip);
 				}
 				else
diff --git a/src/dep/src/irrlicht/CGUIListBox.h b/src/dep/src/irrlicht/CGUIListBox.h
index 3929655..798e561 100644
--- a/src/dep/src/irrlicht/CGUIListBox.h
+++ b/src/dep/src/irrlicht/CGUIListBox.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,7 +23,7 @@ namespace gui
 	{
 	public:
 		//! constructor
-		CGUIListBox(IGUIEnvironment* environment, IGUIElement* parent, 
+		CGUIListBox(IGUIEnvironment* environment, IGUIElement* parent,
 			s32 id, core::rect<s32> rectangle, bool clip=true,
 			bool drawBack=false, bool moveOverSelect=false);
 
@@ -72,7 +72,7 @@ namespace gui
 		//! An icon is an index within the icon sprite bank. Several default icons are available in the
 		//! skin through getIcon
 		virtual void setSpriteBank(IGUISpriteBank* bank);
-		
+
 		//! sets if automatic scrolling is enabled or not. Default is true.
 		virtual void setAutoScrollEnabled(bool scroll);
 
@@ -97,22 +97,22 @@ namespace gui
 		//! clear all item colors at index
 		virtual void clearItemOverrideColor(u32 index);
 
-		//! clear item color at index for given colortype 
+		//! clear item color at index for given colortype
 		virtual void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType);
 
-		//! has the item at index it's color overwritten?
+		//! has the item at index its color overwritten?
 		virtual bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const;
 
-		//! return the overwrite color at given item index. 
+		//! return the overwrite color at given item index.
 		virtual video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const;
 
 		//! return the default color which is used for the given colorType
 		virtual video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const;
 
-		//! set the item at the given index 
+		//! set the item at the given index
 		virtual void setItem(u32 index, const wchar_t* text, s32 icon);
 
-		//! Insert the item at the given index 
+		//! Insert the item at the given index
 		//! Return the index on success or -1 on failure.
 		virtual s32 insertItem(u32 index, const wchar_t* text, s32 icon);
 
@@ -123,7 +123,7 @@ namespace gui
 
 		struct ListItem
 		{
-			ListItem() : icon(-1) 
+			ListItem() : icon(-1)
 			{}
 
 			core::stringw text;
@@ -157,13 +157,13 @@ namespace gui
 		gui::IGUIFont* Font;
 		gui::IGUISpriteBank* IconBank;
 		gui::IGUIScrollBar* ScrollBar;
+		u32 selectTime;
+		u32 LastKeyTime;
+		core::stringw KeyBuffer;
 		bool Selecting;
 		bool DrawBack;
 		bool MoveOverSelect;
-		u32 selectTime;
 		bool AutoScroll;
-		core::stringw KeyBuffer;
-		u32 LastKeyTime;
 		bool HighlightWhenNotFocused;
 	};
 
diff --git a/src/dep/src/irrlicht/CGUIMenu.cpp b/src/dep/src/irrlicht/CGUIMenu.cpp
index c42a4e5..1993037 100644
--- a/src/dep/src/irrlicht/CGUIMenu.cpp
+++ b/src/dep/src/irrlicht/CGUIMenu.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,8 +19,8 @@ namespace gui
 
 //! constructor
 CGUIMenu::CGUIMenu(IGUIEnvironment* environment, IGUIElement* parent,
-		 s32 id, core::rect<s32> rectangle)
-		 : CGUIContextMenu(environment, parent, id, rectangle, false, true)
+		s32 id, core::rect<s32> rectangle)
+	: CGUIContextMenu(environment, parent, id, rectangle, false, true)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUIMenu");
@@ -28,6 +28,8 @@ CGUIMenu::CGUIMenu(IGUIEnvironment* environment, IGUIElement* parent,
 
 	Type = EGUIET_MENU;
 
+	setNotClipped(false);
+
 	recalculateSize();
 }
 
@@ -40,7 +42,7 @@ void CGUIMenu::draw()
 
 	IGUISkin* skin = Environment->getSkin();
 	IGUIFont* font = skin->getFont(EGDF_MENU);
-	
+
 	if (font != LastFont)
 	{
 		if (LastFont)
@@ -85,7 +87,7 @@ void CGUIMenu::draw()
 				c = EGDC_GRAY_TEXT;
 
 			if (font)
-				font->draw(Items[i].Text.c_str(), rect, 
+				font->draw(Items[i].Text.c_str(), rect,
 					skin->getColor(c), true, true, &AbsoluteClippingRect);
 		}
 	}
@@ -97,72 +99,73 @@ void CGUIMenu::draw()
 //! called if an event happened.
 bool CGUIMenu::OnEvent(const SEvent& event)
 {
-	if (!IsEnabled)
-		return Parent ? Parent->OnEvent(event) : false;
-
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_GUI_EVENT:
-		switch(event.GUIEvent.EventType)
+
+		switch(event.EventType)
 		{
-		case gui::EGET_ELEMENT_FOCUS_LOST:
-			if (event.GUIEvent.Caller == this && !isMyChild(event.GUIEvent.Element))
+		case EET_GUI_EVENT:
+			switch(event.GUIEvent.EventType)
 			{
-				closeAllSubMenus();
-				HighLighted = -1;
+			case gui::EGET_ELEMENT_FOCUS_LOST:
+				if (event.GUIEvent.Caller == this && !isMyChild(event.GUIEvent.Element))
+				{
+					closeAllSubMenus();
+					HighLighted = -1;
+				}
+				break;
+			case gui::EGET_ELEMENT_FOCUSED:
+				if (event.GUIEvent.Caller == this && Parent)
+				{
+					Parent->bringToFront(this);
+				}
+				break;
+			default:
+				break;
 			}
 			break;
-		case gui::EGET_ELEMENT_FOCUSED:
-			if (event.GUIEvent.Caller == this && Parent)
+		case EET_MOUSE_INPUT_EVENT:
+			switch(event.MouseInput.Event)
 			{
-				Parent->bringToFront(this);
+			case EMIE_LMOUSE_PRESSED_DOWN:
+			{
+				if (!Environment->hasFocus(this))
+				{
+					Environment->setFocus(this);
+				}
+
+				if (Parent)
+					Parent->bringToFront(this);
+
+				core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
+				bool shouldCloseSubMenu = hasOpenSubMenu();
+				if (!AbsoluteClippingRect.isPointInside(p))
+				{
+					shouldCloseSubMenu = false;
+					s32 t = sendClick(p);
+					if ((t==0 || t==1) && Environment->hasFocus(this))
+						Environment->removeFocus(this);
+				}
+				highlight(core::position2d<s32>(event.MouseInput.X,	event.MouseInput.Y), true);
+				if ( shouldCloseSubMenu )
+					closeAllSubMenus();
+				
+				return true;
+			}
+			case EMIE_MOUSE_MOVED:
+				if (Environment->hasFocus(this))
+					highlight(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y), hasOpenSubMenu());
+				return true;
+			default:
+				break;
 			}
 			break;
 		default:
 			break;
 		}
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-		switch(event.MouseInput.Event)
-		{
-		case EMIE_LMOUSE_PRESSED_DOWN:
-		{
-			if (!Environment->hasFocus(this))
-			{
-				Environment->setFocus(this);
-			}
-
-			if (Parent)
-				Parent->bringToFront(this); 
-
-			core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
-			bool shouldCloseSubMenu = hasOpenSubMenu();
-			if (!AbsoluteClippingRect.isPointInside(p))
-			{
-				shouldCloseSubMenu = false;
-				s32 t = sendClick(p);
-				if ((t==0 || t==1) && Environment->hasFocus(this))
-					Environment->removeFocus(this);
-			}
-			highlight(core::position2d<s32>(event.MouseInput.X,	event.MouseInput.Y), true);
-			if ( shouldCloseSubMenu )
-				closeAllSubMenus();
-			
-			return true;
-		}
-		case EMIE_MOUSE_MOVED:
-			if (Environment->hasFocus(this))
-				highlight(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y), hasOpenSubMenu());
-			return true;
-		default:
-			break;
-		}
-		break;
-	default:
-		break;
 	}
 
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
@@ -238,12 +241,14 @@ core::rect<s32> CGUIMenu::getHRect(const SItem& i, const core::rect<s32>& absolu
 	return r;
 }
 
+
 //! Gets drawing rect of Item
 core::rect<s32> CGUIMenu::getRect(const SItem& i, const core::rect<s32>& absolute) const
 {
 	return getHRect(i, absolute);
 }
 
+
 void CGUIMenu::updateAbsolutePosition()
 {
 	if (Parent)
diff --git a/src/dep/src/irrlicht/CGUIMenu.h b/src/dep/src/irrlicht/CGUIMenu.h
index 844922c..c7168f7 100644
--- a/src/dep/src/irrlicht/CGUIMenu.h
+++ b/src/dep/src/irrlicht/CGUIMenu.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -49,3 +49,4 @@ namespace gui
 
 #endif //  __C_GUI_MENU_H_INCLUDED__
 #endif // _IRR_COMPILE_WITH_GUI_
+
diff --git a/src/dep/src/irrlicht/CGUIMeshViewer.cpp b/src/dep/src/irrlicht/CGUIMeshViewer.cpp
index 0bc3599..501218d 100644
--- a/src/dep/src/irrlicht/CGUIMeshViewer.cpp
+++ b/src/dep/src/irrlicht/CGUIMeshViewer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,7 +9,6 @@
 #include "IVideoDriver.h"
 #include "IAnimatedMesh.h"
 #include "IMesh.h"
-#include "irrMath.h"
 #include "os.h"
 #include "IGUISkin.h"
 
@@ -47,18 +46,16 @@ void CGUIMeshViewer::setMesh(scene::IAnimatedMesh* mesh)
 	Mesh = mesh;
 	if (!Mesh)
 		return;
+	else
+		Mesh->grab();
 
+	/* This might be used for proper transformation etc.
 	core::vector3df center(0.0f,0.0f,0.0f);
 	core::aabbox3d<f32> box;
 
-	if (mesh->getFrameCount())
-	{
-		box = mesh->getMesh(0)->getBoundingBox();
-		center = (box.MaxEdge + box.MinEdge) / 2;
-	}
-
-	if (Mesh)
-		Mesh->grab();
+	box = Mesh->getMesh(0)->getBoundingBox();
+	center = (box.MaxEdge + box.MinEdge) / 2;
+	*/
 }
 
 
@@ -86,7 +83,7 @@ const video::SMaterial& CGUIMeshViewer::getMaterial() const
 //! called if an event happened.
 bool CGUIMeshViewer::OnEvent(const SEvent& event)
 {
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
@@ -107,7 +104,7 @@ void CGUIMeshViewer::draw()
 	viewPort.clipAgainst(AbsoluteClippingRect);
 
 	// draw the frame
-	
+
 	core::rect<s32> frameRect(AbsoluteRect);
 	frameRect.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y + 1;
 	skin->draw2DRectangle(this, skin->getColor(EGDC_3D_SHADOW), frameRect, &AbsoluteClippingRect);
@@ -150,11 +147,17 @@ void CGUIMeshViewer::draw()
 
 		driver->setMaterial(Material);
 
-		scene::IMesh* m = Mesh->getMesh(os::Timer::getTime()/20);
+		u32 frame = 0;
+		if(Mesh->getFrameCount())
+			frame = (os::Timer::getTime()/20)%Mesh->getFrameCount();
+		const scene::IMesh* const m = Mesh->getMesh(frame);
 		for (u32 i=0; i<m->getMeshBufferCount(); ++i)
 		{
 			scene::IMeshBuffer* mb = m->getMeshBuffer(i);
-			driver->drawVertexPrimitiveList(mb->getVertices(), mb->getVertexCount(), mb->getIndices(), mb->getIndexCount()/ 3, mb->getVertexType(), scene::EPT_TRIANGLES);
+			driver->drawVertexPrimitiveList(mb->getVertices(),
+					mb->getVertexCount(), mb->getIndices(),
+					mb->getIndexCount()/ 3, mb->getVertexType(),
+					scene::EPT_TRIANGLES, mb->getIndexType());
 		}
 
 		driver->setViewPort(oldViewPort);
diff --git a/src/dep/src/irrlicht/CGUIMeshViewer.h b/src/dep/src/irrlicht/CGUIMeshViewer.h
index a8e595c..cf6d148 100644
--- a/src/dep/src/irrlicht/CGUIMeshViewer.h
+++ b/src/dep/src/irrlicht/CGUIMeshViewer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,7 +10,6 @@
 
 #include "IGUIMeshViewer.h"
 #include "SMaterial.h"
-#include "vector3d.h"
 
 namespace irr
 {
diff --git a/src/dep/src/irrlicht/CGUIMessageBox.cpp b/src/dep/src/irrlicht/CGUIMessageBox.cpp
index 0e4bb94..57e524a 100644
--- a/src/dep/src/irrlicht/CGUIMessageBox.cpp
+++ b/src/dep/src/irrlicht/CGUIMessageBox.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -254,146 +254,150 @@ void CGUIMessageBox::refreshControls()
 //! called if an event happened.
 bool CGUIMessageBox::OnEvent(const SEvent& event)
 {
-	SEvent outevent;
-	outevent.EventType = EET_GUI_EVENT;
-	outevent.GUIEvent.Caller = this;
-	outevent.GUIEvent.Element = 0;
-
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_KEY_INPUT_EVENT:
+		SEvent outevent;
+		outevent.EventType = EET_GUI_EVENT;
+		outevent.GUIEvent.Caller = this;
+		outevent.GUIEvent.Element = 0;
 
-		if (event.KeyInput.PressedDown)
+		switch(event.EventType)
 		{
-			switch (event.KeyInput.Key)
+		case EET_KEY_INPUT_EVENT:
+
+			if (event.KeyInput.PressedDown)
 			{
-			case KEY_RETURN:
-				if (OkButton)
+				switch (event.KeyInput.Key)
 				{
-					OkButton->setPressed(true);
-					Pressed = true;
+				case KEY_RETURN:
+					if (OkButton)
+					{
+						OkButton->setPressed(true);
+						Pressed = true;
+					}
+					break;
+				case KEY_KEY_Y:
+					if (YesButton)
+					{
+						YesButton->setPressed(true);
+						Pressed = true;
+					}
+					break;
+				case KEY_KEY_N:
+					if (NoButton)
+					{
+						NoButton->setPressed(true);
+						Pressed = true;
+					}
+					break;
+				case KEY_ESCAPE:
+					if (Pressed)
+					{
+						// cancel press
+						if (OkButton) OkButton->setPressed(false);
+						if (YesButton) YesButton->setPressed(false);
+						if (NoButton) NoButton->setPressed(false);
+						Pressed = false;
+					}
+					else
+					if (CancelButton)
+					{
+						CancelButton->setPressed(true);
+						Pressed = true;
+					}
+					else
+					if (CloseButton && CloseButton->isVisible())
+					{
+						CloseButton->setPressed(true);
+						Pressed = true;
+					}
+					break;
+				default: // no other key is handled here
+					break;
 				}
-				break;
-			case KEY_KEY_Y:
-				if (YesButton)
+			}
+			else
+			if (Pressed)
+			{
+				if (OkButton && event.KeyInput.Key == KEY_RETURN)
 				{
-					YesButton->setPressed(true);
-					Pressed = true;
-				}
-				break;
-			case KEY_KEY_N:
-				if (NoButton)
-				{
-					NoButton->setPressed(true);
-					Pressed = true;
-				}
-				break;
-			case KEY_ESCAPE:
-				if (Pressed)
-				{
-					// cancel press
-					if (OkButton) OkButton->setPressed(false);
-					if (YesButton) OkButton->setPressed(false);
-					if (NoButton) OkButton->setPressed(false);
-					Pressed = false;
+					outevent.GUIEvent.EventType = EGET_MESSAGEBOX_OK;
+					Parent->OnEvent(outevent);
+					remove();
+					return true;
 				}
 				else
-				if (CancelButton)
+				if ((CancelButton || CloseButton) && event.KeyInput.Key == KEY_ESCAPE)
 				{
-					CancelButton->setPressed(true);
-					Pressed = true;
+					outevent.GUIEvent.EventType = EGET_MESSAGEBOX_CANCEL;
+					Parent->OnEvent(outevent);
+					remove();
+					return true;
 				}
 				else
-				if (CloseButton && CloseButton->isVisible())
+				if (YesButton && event.KeyInput.Key == KEY_KEY_Y)
 				{
-					CloseButton->setPressed(true);
-					Pressed = true;
+					outevent.GUIEvent.EventType = EGET_MESSAGEBOX_YES;
+					Parent->OnEvent(outevent);
+					remove();
+					return true;
+				}
+				else
+				if (NoButton && event.KeyInput.Key == KEY_KEY_N)
+				{
+					outevent.GUIEvent.EventType = EGET_MESSAGEBOX_NO;
+					Parent->OnEvent(outevent);
+					remove();
+					return true;
 				}
-				break;
-			default: // no other key is handled here
-				break;
 			}
+			break;
+		case EET_GUI_EVENT:
+			if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED)
+			{
+				if (event.GUIEvent.Caller == OkButton)
+				{
+					outevent.GUIEvent.EventType = EGET_MESSAGEBOX_OK;
+					Parent->OnEvent(outevent);
+					remove();
+					return true;
+				}
+				else
+				if (event.GUIEvent.Caller == CancelButton ||
+					event.GUIEvent.Caller == CloseButton)
+				{
+					outevent.GUIEvent.EventType = EGET_MESSAGEBOX_CANCEL;
+					Parent->OnEvent(outevent);
+					remove();
+					return true;
+				}
+				else
+				if (event.GUIEvent.Caller == YesButton)
+				{
+					outevent.GUIEvent.EventType = EGET_MESSAGEBOX_YES;
+					Parent->OnEvent(outevent);
+					remove();
+					return true;
+				}
+				else
+				if (event.GUIEvent.Caller == NoButton)
+				{
+					outevent.GUIEvent.EventType = EGET_MESSAGEBOX_NO;
+					Parent->OnEvent(outevent);
+					remove();
+					return true;
+				}
+			}
+			break;
+		default:
+			break;
 		}
-		else
-		if (Pressed)
-		{
-			if (OkButton && event.KeyInput.Key == KEY_RETURN)
-			{
-				outevent.GUIEvent.EventType = EGET_MESSAGEBOX_OK;
-				Parent->OnEvent(outevent);
-				remove();
-				return true;
-			}
-			else
-			if ((CancelButton || CloseButton) && event.KeyInput.Key == KEY_ESCAPE)
-			{
-				outevent.GUIEvent.EventType = EGET_MESSAGEBOX_CANCEL;
-				Parent->OnEvent(outevent);
-				remove();
-				return true;
-			}
-			else
-			if (YesButton && event.KeyInput.Key == KEY_KEY_Y)
-			{
-				outevent.GUIEvent.EventType = EGET_MESSAGEBOX_YES;
-				Parent->OnEvent(outevent);
-				remove();
-				return true;
-			}
-			else
-			if (NoButton && event.KeyInput.Key == KEY_KEY_N)
-			{
-				outevent.GUIEvent.EventType = EGET_MESSAGEBOX_NO;
-				Parent->OnEvent(outevent);
-				remove();
-				return true;
-			}
-		}
-		break;
-	case EET_GUI_EVENT:
-		if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED)
-		{
-			if (event.GUIEvent.Caller == OkButton)
-			{
-				outevent.GUIEvent.EventType = EGET_MESSAGEBOX_OK;
-				Parent->OnEvent(outevent);
-				remove();
-				return true;
-			}
-			else
-			if (event.GUIEvent.Caller == CancelButton ||
-				event.GUIEvent.Caller == CloseButton)
-			{
-				outevent.GUIEvent.EventType = EGET_MESSAGEBOX_CANCEL;
-				Parent->OnEvent(outevent);
-				remove();
-				return true;
-			}
-			else
-			if (event.GUIEvent.Caller == YesButton)
-			{
-				outevent.GUIEvent.EventType = EGET_MESSAGEBOX_YES;
-				Parent->OnEvent(outevent);
-				remove();
-				return true;
-			}
-			else
-			if (event.GUIEvent.Caller == NoButton)
-			{
-				outevent.GUIEvent.EventType = EGET_MESSAGEBOX_NO;
-				Parent->OnEvent(outevent);
-				remove();
-				return true;
-			}
-		}
-		break;
-	default:
-		break;
 	}
 
 	return CGUIWindow::OnEvent(event);
 }
 
+
 //! Writes attributes of the element.
 void CGUIMessageBox::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
 {
@@ -407,6 +411,7 @@ void CGUIMessageBox::serializeAttributes(io::IAttributes* out, io::SAttributeRea
 	out->addString	("MessageText",		MessageText.c_str());
 }
 
+
 //! Reads attributes of the element
 void CGUIMessageBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
 {
@@ -428,6 +433,5 @@ void CGUIMessageBox::deserializeAttributes(io::IAttributes* in, io::SAttributeRe
 } // end namespace gui
 } // end namespace irr
 
-
 #endif // _IRR_COMPILE_WITH_GUI_
 
diff --git a/src/dep/src/irrlicht/CGUIMessageBox.h b/src/dep/src/irrlicht/CGUIMessageBox.h
index 99154e8..5686e02 100644
--- a/src/dep/src/irrlicht/CGUIMessageBox.h
+++ b/src/dep/src/irrlicht/CGUIMessageBox.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -57,4 +57,4 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif 
+#endif
diff --git a/src/dep/src/irrlicht/CGUIModalScreen.cpp b/src/dep/src/irrlicht/CGUIModalScreen.cpp
index cb64baa..e69c843 100644
--- a/src/dep/src/irrlicht/CGUIModalScreen.cpp
+++ b/src/dep/src/irrlicht/CGUIModalScreen.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -24,7 +24,7 @@ CGUIModalScreen::CGUIModalScreen(IGUIEnvironment* environment, IGUIElement* pare
 	setDebugName("CGUIModalScreen");
 	#endif
 	setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
-	
+
 	// this element is a tab group
 	setTabGroup(true);
 }
@@ -69,7 +69,7 @@ bool CGUIModalScreen::OnEvent(const SEvent& event)
 	default:
 		break;
 	}
-	
+
 	IGUIElement::OnEvent(event);
 
 	return true; // absorb everything else
@@ -93,13 +93,16 @@ void CGUIModalScreen::draw()
 
 		for (; it != Children.end(); ++it)
 		{
-			r = (*it)->getAbsolutePosition();
-			r.LowerRightCorner.X += 1;
-			r.LowerRightCorner.Y += 1;
-			r.UpperLeftCorner.X -= 1;
-			r.UpperLeftCorner.Y -= 1;
+			if ((*it)->isVisible())
+			{
+				r = (*it)->getAbsolutePosition();
+				r.LowerRightCorner.X += 1;
+				r.LowerRightCorner.Y += 1;
+				r.UpperLeftCorner.X -= 1;
+				r.UpperLeftCorner.Y -= 1;
 
-			skin->draw2DRectangle(this, c, r, &AbsoluteClippingRect);
+				skin->draw2DRectangle(this, c, r, &AbsoluteClippingRect);
+			}
 		}
 	}
 
@@ -107,7 +110,6 @@ void CGUIModalScreen::draw()
 }
 
 
-
 //! Removes a child.
 void CGUIModalScreen::removeChild(IGUIElement* child)
 {
@@ -117,6 +119,7 @@ void CGUIModalScreen::removeChild(IGUIElement* child)
 		remove();
 }
 
+
 //! adds a child
 void CGUIModalScreen::addChild(IGUIElement* child)
 {
@@ -141,6 +144,7 @@ void CGUIModalScreen::updateAbsolutePosition()
 	IGUIElement::updateAbsolutePosition();
 }
 
+
 //! Writes attributes of the element.
 void CGUIModalScreen::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
 {
@@ -158,3 +162,4 @@ void CGUIModalScreen::deserializeAttributes(io::IAttributes* in, io::SAttributeR
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_GUI_
+
diff --git a/src/dep/src/irrlicht/CGUIModalScreen.h b/src/dep/src/irrlicht/CGUIModalScreen.h
index 3ef7df6..d87da73 100644
--- a/src/dep/src/irrlicht/CGUIModalScreen.h
+++ b/src/dep/src/irrlicht/CGUIModalScreen.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -56,3 +56,4 @@ namespace gui
 #endif // _IRR_COMPILE_WITH_GUI_
 
 #endif
+
diff --git a/src/dep/src/irrlicht/CGUIScrollBar.cpp b/src/dep/src/irrlicht/CGUIScrollBar.cpp
index 7017701..09bee5b 100644
--- a/src/dep/src/irrlicht/CGUIScrollBar.cpp
+++ b/src/dep/src/irrlicht/CGUIScrollBar.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -59,140 +59,43 @@ CGUIScrollBar::~CGUIScrollBar()
 //! called if an event happened.
 bool CGUIScrollBar::OnEvent(const SEvent& event)
 {
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_KEY_INPUT_EVENT:
-		if (event.KeyInput.PressedDown)
-		{
-			const s32 oldPos = Pos;
-			bool absorb = true;
-			switch (event.KeyInput.Key)
-			{
-			case KEY_LEFT:
-			case KEY_UP:
-				setPos(Pos-SmallStep);
-				break;
-			case KEY_RIGHT:
-			case KEY_DOWN:
-				setPos(Pos+SmallStep);
-				break;
-			case KEY_HOME:
-				setPos(0);
-				break;
-			case KEY_PRIOR:
-				setPos(Pos-LargeStep);
-				break;
-			case KEY_END:
-				setPos(Max);
-				break;
-			case KEY_NEXT:
-				setPos(Pos+LargeStep);
-				break;
-			default:
-				absorb = false;
-			}
 
-			if (Pos != oldPos)
+		switch(event.EventType)
+		{
+		case EET_KEY_INPUT_EVENT:
+			if (event.KeyInput.PressedDown)
 			{
-				SEvent newEvent;
-				newEvent.EventType = EET_GUI_EVENT;
-				newEvent.GUIEvent.Caller = this;
-				newEvent.GUIEvent.Element = 0;
-				newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
-				Parent->OnEvent(newEvent);
-			}
-			if (absorb)
-				return true;
-		}
-		break;
-	case EET_GUI_EVENT:
-		if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED)
-		{
-			if (event.GUIEvent.Caller == UpButton)
-				setPos(Pos-SmallStep);
-			else
-			if (event.GUIEvent.Caller == DownButton)
-				setPos(Pos+SmallStep);
-
-			SEvent newEvent;
-			newEvent.EventType = EET_GUI_EVENT;
-			newEvent.GUIEvent.Caller = this;
-			newEvent.GUIEvent.Element = 0;
-			newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
-			Parent->OnEvent(newEvent);
-
-			return true;
-		}
-		else
-		if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
-		{
-			if (event.GUIEvent.Caller == this)
-				Dragging = false;
-		}
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-		switch(event.MouseInput.Event)
-		{
-		case EMIE_MOUSE_WHEEL:
-			if (Environment->hasFocus(this))
-			{ // thanks to a bug report by REAPER
-				setPos(getPos() + (s32)event.MouseInput.Wheel* -SmallStep);
-				SEvent newEvent;
-				newEvent.EventType = EET_GUI_EVENT;
-				newEvent.GUIEvent.Caller = this;
-				newEvent.GUIEvent.Element = 0;
-				newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
-				Parent->OnEvent(newEvent);
-				return true;
-			}
-			break;
-		case EMIE_LMOUSE_PRESSED_DOWN:
-		{
-			if (AbsoluteClippingRect.isPointInside(core::position2di(event.MouseInput.X, event.MouseInput.Y)))
-			{
-				Dragging = true;
-				DraggedBySlider = SliderRect.isPointInside(core::position2di(event.MouseInput.X, event.MouseInput.Y));
-				TrayClick = !DraggedBySlider;
-				DesiredPos = getPosFromMousePos(event.MouseInput.X, event.MouseInput.Y);
-				return true;
-			}
-			break;
-		}
-		case EMIE_LMOUSE_LEFT_UP:
-		case EMIE_MOUSE_MOVED:
-			if (Dragging)
-			{
-				if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
-					Dragging = false;
-
-				const s32 newPos = getPosFromMousePos(event.MouseInput.X, event.MouseInput.Y);
 				const s32 oldPos = Pos;
-
-				if (!DraggedBySlider)
+				bool absorb = true;
+				switch (event.KeyInput.Key)
 				{
-					if (AbsoluteClippingRect.isPointInside(core::position2di(event.MouseInput.X, event.MouseInput.Y)))
-					{
-						DraggedBySlider = SliderRect.isPointInside(core::position2di(event.MouseInput.X, event.MouseInput.Y));
-						TrayClick = !DraggedBySlider;
-					}
-					else
-					{
-						TrayClick = false;
-						if (event.MouseInput.Event == EMIE_MOUSE_MOVED)
-							return true;
-					}
-				}
-				
-				if (DraggedBySlider)
-				{
-					setPos(newPos);
-				}
-				else
-				{
-					DesiredPos = newPos;
+				case KEY_LEFT:
+				case KEY_UP:
+					setPos(Pos-SmallStep);
+					break;
+				case KEY_RIGHT:
+				case KEY_DOWN:
+					setPos(Pos+SmallStep);
+					break;
+				case KEY_HOME:
+					setPos(0);
+					break;
+				case KEY_PRIOR:
+					setPos(Pos-LargeStep);
+					break;
+				case KEY_END:
+					setPos(Max);
+					break;
+				case KEY_NEXT:
+					setPos(Pos+LargeStep);
+					break;
+				default:
+					absorb = false;
 				}
 
-				if (Pos != oldPos && Parent)
+				if (Pos != oldPos)
 				{
 					SEvent newEvent;
 					newEvent.EventType = EET_GUI_EVENT;
@@ -201,20 +104,122 @@ bool CGUIScrollBar::OnEvent(const SEvent& event)
 					newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
 					Parent->OnEvent(newEvent);
 				}
+				if (absorb)
+					return true;
+			}
+			break;
+		case EET_GUI_EVENT:
+			if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED)
+			{
+				if (event.GUIEvent.Caller == UpButton)
+					setPos(Pos-SmallStep);
+				else
+				if (event.GUIEvent.Caller == DownButton)
+					setPos(Pos+SmallStep);
+
+				SEvent newEvent;
+				newEvent.EventType = EET_GUI_EVENT;
+				newEvent.GUIEvent.Caller = this;
+				newEvent.GUIEvent.Element = 0;
+				newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
+				Parent->OnEvent(newEvent);
+
 				return true;
 			}
+			else
+			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
+			{
+				if (event.GUIEvent.Caller == this)
+					Dragging = false;
+			}
+			break;
+		case EET_MOUSE_INPUT_EVENT:
+			switch(event.MouseInput.Event)
+			{
+			case EMIE_MOUSE_WHEEL:
+				if (Environment->hasFocus(this))
+				{ // thanks to a bug report by REAPER
+					setPos(getPos() + (s32)event.MouseInput.Wheel* -SmallStep);
+					SEvent newEvent;
+					newEvent.EventType = EET_GUI_EVENT;
+					newEvent.GUIEvent.Caller = this;
+					newEvent.GUIEvent.Element = 0;
+					newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
+					Parent->OnEvent(newEvent);
+					return true;
+				}
+				break;
+			case EMIE_LMOUSE_PRESSED_DOWN:
+			{
+				if (AbsoluteClippingRect.isPointInside(core::position2di(event.MouseInput.X, event.MouseInput.Y)))
+				{
+					Dragging = true;
+					DraggedBySlider = SliderRect.isPointInside(core::position2di(event.MouseInput.X, event.MouseInput.Y));
+					TrayClick = !DraggedBySlider;
+					DesiredPos = getPosFromMousePos(event.MouseInput.X, event.MouseInput.Y);
+					return true;
+				}
+				break;
+			}
+			case EMIE_LMOUSE_LEFT_UP:
+			case EMIE_MOUSE_MOVED:
+				if (Dragging)
+				{
+					if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
+						Dragging = false;
+
+					const s32 newPos = getPosFromMousePos(event.MouseInput.X, event.MouseInput.Y);
+					const s32 oldPos = Pos;
+
+					if (!DraggedBySlider)
+					{
+						if (AbsoluteClippingRect.isPointInside(core::position2di(event.MouseInput.X, event.MouseInput.Y)))
+						{
+							DraggedBySlider = SliderRect.isPointInside(core::position2di(event.MouseInput.X, event.MouseInput.Y));
+							TrayClick = !DraggedBySlider;
+						}
+						else
+						{
+							TrayClick = false;
+							if (event.MouseInput.Event == EMIE_MOUSE_MOVED)
+								return true;
+						}
+					}
+
+					if (DraggedBySlider)
+					{
+						setPos(newPos);
+					}
+					else
+					{
+						DesiredPos = newPos;
+					}
+
+					if (Pos != oldPos && Parent)
+					{
+						SEvent newEvent;
+						newEvent.EventType = EET_GUI_EVENT;
+						newEvent.GUIEvent.Caller = this;
+						newEvent.GUIEvent.Element = 0;
+						newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
+						Parent->OnEvent(newEvent);
+					}
+					return true;
+				}
+				break;
+			default:
+				break;
+			}
 			break;
 		default:
 			break;
 		}
-		break;
-	default:
-		break;
 	}
 
 	return IGUIElement::OnEvent(event);
 }
 
+
 //! draws the element and its children
 void CGUIScrollBar::draw()
 {
@@ -235,10 +240,10 @@ void CGUIScrollBar::draw()
 
 		if (DesiredPos >= Pos + LargeStep)
 			setPos(Pos + LargeStep);
-		else 
+		else
 		if (DesiredPos <= Pos - LargeStep)
 			setPos(Pos - LargeStep);
-		else 
+		else
 		if (DesiredPos >= Pos - LargeStep && DesiredPos <= Pos + LargeStep)
 			setPos(DesiredPos);
 
@@ -279,6 +284,7 @@ void CGUIScrollBar::draw()
 	IGUIElement::draw();
 }
 
+
 void CGUIScrollBar::updateAbsolutePosition()
 {
 	IGUIElement::updateAbsolutePosition();
@@ -319,7 +325,6 @@ s32 CGUIScrollBar::getPosFromMousePos(s32 x, s32 y) const
 }
 
 
-
 //! sets the position of the scrollbar
 void CGUIScrollBar::setPos(s32 pos)
 {
@@ -364,6 +369,7 @@ void CGUIScrollBar::setSmallStep(s32 step)
 		SmallStep = 10;
 }
 
+
 //! gets the small step value
 s32 CGUIScrollBar::getLargeStep() const
 {
@@ -381,7 +387,6 @@ void CGUIScrollBar::setLargeStep(s32 step)
 }
 
 
-
 //! gets the maximum value of the scrollbar.
 s32 CGUIScrollBar::getMax() const
 {
@@ -515,7 +520,6 @@ void CGUIScrollBar::deserializeAttributes(io::IAttributes* in, io::SAttributeRea
 	setPos(in->getAttributeAsInt("Value"));
 	setSmallStep(in->getAttributeAsInt("SmallStep"));
 	setLargeStep(in->getAttributeAsInt("LargeStep"));
-	NoClip = in->getAttributeAsBool("NoClip");
 
 	refreshControls();
 }
diff --git a/src/dep/src/irrlicht/CGUIScrollBar.h b/src/dep/src/irrlicht/CGUIScrollBar.h
index 6ec7baf..258e273 100644
--- a/src/dep/src/irrlicht/CGUIScrollBar.h
+++ b/src/dep/src/irrlicht/CGUIScrollBar.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CGUISkin.cpp b/src/dep/src/irrlicht/CGUISkin.cpp
index f69f664..95edab8 100644
--- a/src/dep/src/irrlicht/CGUISkin.cpp
+++ b/src/dep/src/irrlicht/CGUISkin.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,9 +23,7 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
 	setDebugName("CGUISkin");
 	#endif
 
-	if (	(Type == EGST_WINDOWS_CLASSIC) |
-			(Type == EGST_WINDOWS_METALLIC)
-		)
+	if ((Type == EGST_WINDOWS_CLASSIC) || (Type == EGST_WINDOWS_METALLIC))
 	{
 		Colors[EGDC_3D_DARK_SHADOW]   = video::SColor(101,50,50,50);
 		Colors[EGDC_3D_SHADOW]        = video::SColor(101,130,130,130);
@@ -57,7 +55,7 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
 		Sizes[EGDS_MESSAGE_BOX_HEIGHT] = 200;
 		Sizes[EGDS_BUTTON_WIDTH] = 80;
 		Sizes[EGDS_BUTTON_HEIGHT] = 30;
-	
+
 		Sizes[EGDS_TEXT_DISTANCE_X] = 2;
 		Sizes[EGDS_TEXT_DISTANCE_Y] = 0;
 	}
@@ -68,7 +66,7 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
 		//Colors[EGDC_3D_FACE]		=	0xc0c9ccd4;		// tab background
 		Colors[EGDC_3D_FACE]		=	0xc0cbd2d9;		// tab background
 		Colors[EGDC_3D_SHADOW]		=	0x50e4e8f1;		// tab background, and left-top highlight
-		Colors[EGDC_3D_HIGH_LIGHT]	=	0x40c7ccdc;	
+		Colors[EGDC_3D_HIGH_LIGHT]	=	0x40c7ccdc;
 		Colors[EGDC_3D_LIGHT]		=	0x802e313a;
 		Colors[EGDC_ACTIVE_BORDER]	=	0x80404040;		// window title
 		Colors[EGDC_ACTIVE_CAPTION] =	0xf0d0d0d0;
@@ -137,8 +135,7 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
 	for (u32 i=0; i<EGDF_COUNT; ++i)
 		Fonts[i] = 0;
 
-	UseGradient = (Type == EGST_WINDOWS_METALLIC) ||
-				  (Type == EGST_BURNING_SKIN) ;
+	UseGradient = (Type == EGST_WINDOWS_METALLIC) || (Type == EGST_BURNING_SKIN) ;
 }
 
 
@@ -156,7 +153,6 @@ CGUISkin::~CGUISkin()
 }
 
 
-
 //! returns default color
 video::SColor CGUISkin::getColor(EGUI_DEFAULT_COLOR color) const
 {
@@ -193,7 +189,6 @@ void CGUISkin::setSize(EGUI_DEFAULT_SIZE which, s32 size)
 }
 
 
-
 //! returns the default font
 IGUIFont* CGUISkin::getFont(EGUI_DEFAULT_FONT which) const
 {
@@ -203,6 +198,7 @@ IGUIFont* CGUISkin::getFont(EGUI_DEFAULT_FONT which) const
 		return Fonts[EGDF_DEFAULT];
 }
 
+
 //! sets a default font
 void CGUISkin::setFont(IGUIFont* font, EGUI_DEFAULT_FONT which)
 {
@@ -248,6 +244,7 @@ u32 CGUISkin::getIcon(EGUI_DEFAULT_ICON icon) const
 		return 0;
 }
 
+
 //! Sets a default icon
 void CGUISkin::setIcon(EGUI_DEFAULT_ICON icon, u32 index)
 {
@@ -255,6 +252,7 @@ void CGUISkin::setIcon(EGUI_DEFAULT_ICON icon, u32 index)
 		Icons[icon] = index;
 }
 
+
 //! Returns a default text. For example for Message box button captions:
 //! "OK", "Cancel", "Yes", "No" and so on.
 const wchar_t* CGUISkin::getDefaultText(EGUI_DEFAULT_TEXT text) const
@@ -274,6 +272,7 @@ void CGUISkin::setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText)
 		Texts[which] = newText;
 }
 
+
 //! draws a standard 3d button pane
 /**	Used for drawing for example buttons in normal state.
 It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
@@ -380,7 +379,7 @@ is usually not used by ISkin, but can be used for example by more complex
 implementations to find out how to draw the part exactly.
 \param bgcolor: Background color.
 \param flat: Specifies if the sunken pane should be flat or displayed as sunken
- deep into the ground.
+deep into the ground.
 \param rect: Defining area where to draw.
 \param clip: Clip area.	*/
 void CGUISkin::draw3DSunkenPane(IGUIElement* element, video::SColor bgcolor,
@@ -562,7 +561,7 @@ void CGUISkin::draw3DMenuPane(IGUIElement* element,
 	core::rect<s32> rect = r;
 
 	if ( Type == EGST_BURNING_SKIN )
-	{	
+	{
 		rect.UpperLeftCorner.Y -= 3;
 		draw3DButtonPaneStandard(element, rect, clip);
 		return;
@@ -680,41 +679,75 @@ implementations to find out how to draw the part exactly.
 \param rect: Defining area where to draw.
 \param clip: Clip area.	*/
 void CGUISkin::draw3DTabButton(IGUIElement* element, bool active,
-				const core::rect<s32>& frameRect,
-				const core::rect<s32>* clip)
+	const core::rect<s32>& frameRect, const core::rect<s32>* clip, EGUI_ALIGNMENT alignment)
 {
 	if (!Driver)
 		return;
 
 	core::rect<s32> tr = frameRect;
 
-	tr.LowerRightCorner.X -= 2;
-	tr.LowerRightCorner.Y = tr.UpperLeftCorner.Y + 1;
-	tr.UpperLeftCorner.X += 1;
-	Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+	if ( alignment == EGUIA_UPPERLEFT )
+	{
+		tr.LowerRightCorner.X -= 2;
+		tr.LowerRightCorner.Y = tr.UpperLeftCorner.Y + 1;
+		tr.UpperLeftCorner.X += 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
 
-	// draw left highlight
-	tr = frameRect;
-	tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
-	tr.UpperLeftCorner.Y += 1;
-	Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+		// draw left highlight
+		tr = frameRect;
+		tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+		tr.UpperLeftCorner.Y += 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
 
-	// draw grey background
-	tr = frameRect;
-	tr.UpperLeftCorner.X += 1;
-	tr.UpperLeftCorner.Y += 1;
-	tr.LowerRightCorner.X -= 2;
-	Driver->draw2DRectangle(getColor(EGDC_3D_FACE), tr, clip);
+		// draw grey background
+		tr = frameRect;
+		tr.UpperLeftCorner.X += 1;
+		tr.UpperLeftCorner.Y += 1;
+		tr.LowerRightCorner.X -= 2;
+		Driver->draw2DRectangle(getColor(EGDC_3D_FACE), tr, clip);
 
-	// draw right middle gray shadow
-	tr.LowerRightCorner.X += 1;
-	tr.UpperLeftCorner.X = tr.LowerRightCorner.X - 1;
-	Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+		// draw right middle gray shadow
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X = tr.LowerRightCorner.X - 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
 
-	tr.LowerRightCorner.X += 1;
-	tr.UpperLeftCorner.X += 1;
-	tr.UpperLeftCorner.Y += 1;
-	Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), tr, clip);
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X += 1;
+		tr.UpperLeftCorner.Y += 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), tr, clip);
+	}
+	else
+	{
+		tr.LowerRightCorner.X -= 2;
+		tr.UpperLeftCorner.Y = tr.LowerRightCorner.Y - 1;
+		tr.UpperLeftCorner.X += 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+
+		// draw left highlight
+		tr = frameRect;
+		tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+		tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+
+		// draw grey background
+		tr = frameRect;
+		tr.UpperLeftCorner.X += 1;
+		tr.UpperLeftCorner.Y -= 1;
+		tr.LowerRightCorner.X -= 2;
+		tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_FACE), tr, clip);
+
+		// draw right middle gray shadow
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X = tr.LowerRightCorner.X - 1;
+		//tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X += 1;
+		tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), tr, clip);
+	}
 }
 
 
@@ -727,46 +760,81 @@ implementations to find out how to draw the part exactly.
 \param rect: Defining area where to draw.
 \param clip: Clip area.	*/
 void CGUISkin::draw3DTabBody(IGUIElement* element, bool border, bool background,
-	const core::rect<s32>& rect, const core::rect<s32>* clip)
+	const core::rect<s32>& rect, const core::rect<s32>* clip, s32 tabHeight, EGUI_ALIGNMENT alignment)
 {
 	if (!Driver)
 		return;
 
 	core::rect<s32> tr = rect;
 
+	if ( tabHeight == -1 )
+		tabHeight = getSize(gui::EGDS_BUTTON_HEIGHT);
+
 	// draw border.
 	if (border)
 	{
-		// draw left hightlight
-		tr.UpperLeftCorner.Y += getSize(gui::EGDS_BUTTON_HEIGHT) + 2;
-		tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
-		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+		if ( alignment == EGUIA_UPPERLEFT )
+		{
+			// draw left hightlight
+			tr.UpperLeftCorner.Y += tabHeight + 2;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
 
-		// draw right shadow
-		tr.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
-		tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
-		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+			// draw right shadow
+			tr.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
 
-		// draw lower shadow
-		tr = rect;
-		tr.UpperLeftCorner.Y = tr.LowerRightCorner.Y - 1;
-		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+			// draw lower shadow
+			tr = rect;
+			tr.UpperLeftCorner.Y = tr.LowerRightCorner.Y - 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+		}
+		else
+		{
+			// draw left hightlight
+			tr.LowerRightCorner.Y -= tabHeight + 2;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+
+			// draw right shadow
+			tr.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+
+			// draw lower shadow
+			tr = rect;
+			tr.LowerRightCorner.Y = tr.UpperLeftCorner.Y + 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+		}
 	}
 
 	if (background)
 	{
-		tr = rect;
-		tr.UpperLeftCorner.Y += getSize(gui::EGDS_BUTTON_HEIGHT) + 2;
-		tr.LowerRightCorner.X -= 1;
-		tr.UpperLeftCorner.X += 1;
-		tr.LowerRightCorner.Y -= 1;
+		if ( alignment == EGUIA_UPPERLEFT )
+		{
+			tr = rect;
+			tr.UpperLeftCorner.Y += tabHeight + 2;
+			tr.LowerRightCorner.X -= 1;
+			tr.UpperLeftCorner.X += 1;
+			tr.LowerRightCorner.Y -= 1;
+		}
+		else
+		{
+			tr = rect;
+			tr.UpperLeftCorner.X += 1;
+			tr.UpperLeftCorner.Y -= 1;
+			tr.LowerRightCorner.X -= 1;
+			tr.LowerRightCorner.Y -= tabHeight + 2;
+			//tr.UpperLeftCorner.X += 1;
+		}
 
 		if (!UseGradient)
 			Driver->draw2DRectangle(getColor(EGDC_3D_FACE), tr, clip);
 		else
 		{
-			const video::SColor c1 = getColor(EGDC_3D_FACE);
-			const video::SColor c2 = getColor(EGDC_3D_SHADOW);
+			video::SColor c1 = getColor(EGDC_3D_FACE);
+			video::SColor c2 = getColor(EGDC_3D_SHADOW);
 			Driver->draw2DRectangle(tr, c1, c1, c2, c2, clip);
 		}
 	}
@@ -774,9 +842,9 @@ void CGUISkin::draw3DTabBody(IGUIElement* element, bool border, bool background,
 
 
 //! draws an icon, usually from the skin's sprite bank
-/**	\param parent: Pointer to the element which wishes to draw this icon. 
-This parameter is usually not used by IGUISkin, but can be used for example 
-by more complex implementations to find out how to draw the part exactly. 
+/**	\param parent: Pointer to the element which wishes to draw this icon.
+This parameter is usually not used by IGUISkin, but can be used for example
+by more complex implementations to find out how to draw the part exactly.
 \param icon: Specifies the icon to be drawn.
 \param position: The position to draw the icon
 \param starttime: The time at the start of the animation
@@ -785,13 +853,13 @@ by more complex implementations to find out how to draw the part exactly.
 \param clip: Clip area.	*/
 void CGUISkin::drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
 			const core::position2di position,
-			u32 starttime, u32 currenttime, 
+			u32 starttime, u32 currenttime,
 			bool loop, const core::rect<s32>* clip)
 {
 	if (!SpriteBank)
 		return;
 
-	SpriteBank->draw2DSprite(Icons[icon], position, clip, 
+	SpriteBank->draw2DSprite(Icons[icon], position, clip,
 			video::SColor(255,0,0,0), starttime, currenttime, loop, true);
 }
 
@@ -812,7 +880,7 @@ void CGUISkin::draw2DRectangle(IGUIElement* element,
 
 
 //! Writes attributes of the object.
-//! Implement this to expose the attributes of your scene node animator for 
+//! Implement this to expose the attributes of your scene node animator for
 //! scripting languages, editors, debuggers or xml serialization purposes.
 void CGUISkin::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const
 {
@@ -832,7 +900,7 @@ void CGUISkin::serializeAttributes(io::IAttributes* out, io::SAttributeReadWrite
 
 
 //! Reads attributes of the object.
-//! Implement this to set the attributes of your scene node animator for 
+//! Implement this to set the attributes of your scene node animator for
 //! scripting languages, editors, debuggers or xml deserialization purposes.
 void CGUISkin::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
 {
diff --git a/src/dep/src/irrlicht/CGUISkin.h b/src/dep/src/irrlicht/CGUISkin.h
index 7a6b955..8ac2c20 100644
--- a/src/dep/src/irrlicht/CGUISkin.h
+++ b/src/dep/src/irrlicht/CGUISkin.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -58,56 +58,56 @@ namespace gui
 		virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const;
 
 		//! Sets a default icon
-		/** Sets the sprite index used for drawing icons like arrows, 
-		close buttons and ticks in checkboxes 
+		/** Sets the sprite index used for drawing icons like arrows,
+		close buttons and ticks in checkboxes
 		\param icon: Enum specifying which icon to change
 		\param index: The sprite index used to draw this icon */
 		virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index);
 
 		//! Returns a default text.
 		/** For example for Message box button captions:
-		 "OK", "Cancel", "Yes", "No" and so on. */
+		"OK", "Cancel", "Yes", "No" and so on. */
 		virtual const wchar_t* getDefaultText(EGUI_DEFAULT_TEXT text) const;
 
-		//! Sets a default text. 
+		//! Sets a default text.
 		/** For example for Message box button captions:
-		 "OK", "Cancel", "Yes", "No" and so on. */
+		"OK", "Cancel", "Yes", "No" and so on. */
 		virtual void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText);
 
 		//! draws a standard 3d button pane
-		/**	Used for drawing for example buttons in normal state. 
+		/** Used for drawing for example buttons in normal state.
 		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details. 
+		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
 		\param rect: Defining area where to draw.
 		\param clip: Clip area.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex 
+		is usually not used by ISkin, but can be used for example by more complex
 		implementations to find out how to draw the part exactly. */
-		virtual void draw3DButtonPaneStandard(IGUIElement* element, 
+		virtual void draw3DButtonPaneStandard(IGUIElement* element,
 				const core::rect<s32>& rect,
 				const core::rect<s32>* clip=0);
 
 		//! draws a pressed 3d button pane
-		/**	Used for drawing for example buttons in pressed state. 
+		/** Used for drawing for example buttons in pressed state.
 		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details. 
+		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
 		\param rect: Defining area where to draw.
 		\param clip: Clip area.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex 
+		is usually not used by ISkin, but can be used for example by more complex
 		implementations to find out how to draw the part exactly. */
-		virtual void draw3DButtonPanePressed(IGUIElement* element, 
+		virtual void draw3DButtonPanePressed(IGUIElement* element,
 				const core::rect<s32>& rect,
 				const core::rect<s32>* clip=0);
 
 		//! draws a sunken 3d pane
 		/** Used for drawing the background of edit, combo or check boxes.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param bgcolor: Background color.
-		\param flat: Specifies if the sunken pane should be flat or displayed as sunken 
-		 deep into the ground.
+		\param flat: Specifies if the sunken pane should be flat or displayed as sunken
+		deep into the ground.
 		\param rect: Defining area where to draw.
 		\param clip: Clip area.	*/
 		virtual void draw3DSunkenPane(IGUIElement* element,
@@ -119,8 +119,8 @@ namespace gui
 		//! draws a window background
 		/** Used for drawing the background of dialogs and windows.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param titleBarColor: Title color.
 		\param drawTitleBar: True to enable title drawing.
 		\param rect: Defining area where to draw.
@@ -132,12 +132,12 @@ namespace gui
 				const core::rect<s32>* clip=0);
 
 		//! draws a standard 3d menu pane
-		/**	Used for drawing for menus and context menus. 
+		/** Used for drawing for menus and context menus.
 		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details. 
+		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param rect: Defining area where to draw.
 		\param clip: Clip area.	*/
 		virtual void draw3DMenuPane(IGUIElement* element,
@@ -145,10 +145,10 @@ namespace gui
 				const core::rect<s32>* clip=0);
 
 		//! draws a standard 3d tool bar
-		/**	Used for drawing for toolbars and menus.
+		/** Used for drawing for toolbars and menus.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param rect: Defining area where to draw.
 		\param clip: Clip area.	*/
 		virtual void draw3DToolBar(IGUIElement* element,
@@ -156,34 +156,31 @@ namespace gui
 				const core::rect<s32>* clip=0);
 
 		//! draws a tab button
-		/**	Used for drawing for tab buttons on top of tabs.
+		/** Used for drawing for tab buttons on top of tabs.
 		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param active: Specifies if the tab is currently active.
 		\param rect: Defining area where to draw.
 		\param clip: Clip area.	*/
 		virtual void draw3DTabButton(IGUIElement* element, bool active,
-						const core::rect<s32>& rect,
-						const core::rect<s32>* clip=0);
+			const core::rect<s32>& rect, const core::rect<s32>* clip=0, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT);
 
 		//! draws a tab control body
-		/**	\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex 
-		implementations to find out how to draw the part exactly. 
+		/** \param element: Pointer to the element which wishes to draw this. This parameter
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
 		\param border: Specifies if the border should be drawn.
 		\param background: Specifies if the background should be drawn.
 		\param rect: Defining area where to draw.
 		\param clip: Clip area.	*/
-		virtual void draw3DTabBody(IGUIElement* element, bool border,
-						bool background,
-						const core::rect<s32>& rect,
-						const core::rect<s32>* clip=0);
+		virtual void draw3DTabBody(IGUIElement* element, bool border, bool background,
+			const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT);
 
 		//! draws an icon, usually from the skin's sprite bank
-		/**	\param element: Pointer to the element which wishes to draw this icon. 
-		This parameter is usually not used by IGUISkin, but can be used for example 
-		by more complex implementations to find out how to draw the part exactly. 
+		/** \param element: Pointer to the element which wishes to draw this icon.
+		This parameter is usually not used by IGUISkin, but can be used for example
+		by more complex implementations to find out how to draw the part exactly.
 		\param icon: Specifies the icon to be drawn.
 		\param position: The position to draw the icon
 		\param starttime: The time at the start of the animation
@@ -192,20 +189,20 @@ namespace gui
 		\param clip: Clip area.	*/
 		virtual void drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
 				const core::position2di position,
-				u32 starttime=0, u32 currenttime=0, 
+				u32 starttime=0, u32 currenttime=0,
 				bool loop=false, const core::rect<s32>* clip=0);
 
 
 		//! draws a 2d rectangle.
-		/** \param element: Pointer to the element which wishes to draw this icon. 
-		This parameter is usually not used by IGUISkin, but can be used for example 
-		by more complex implementations to find out how to draw the part exactly. 
-		\param color: Color of the rectangle to draw. The alpha component specifies how 
+		/** \param element: Pointer to the element which wishes to draw this icon.
+		This parameter is usually not used by IGUISkin, but can be used for example
+		by more complex implementations to find out how to draw the part exactly.
+		\param color: Color of the rectangle to draw. The alpha component specifies how
 		transparent the rectangle will be.
 		\param pos: Position of the rectangle.
 		\param clip: Pointer to rectangle against which the rectangle will be clipped.
 		If the pointer is null, no clipping will be performed. */
-		virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color, 
+		virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color,
 				const core::rect<s32>& pos, const core::rect<s32>* clip = 0);
 
 
@@ -213,12 +210,12 @@ namespace gui
 		virtual EGUI_SKIN_TYPE getType() const;
 
 		//! Writes attributes of the object.
-		//! Implement this to expose the attributes of your scene node animator for 
+		//! Implement this to expose the attributes of your scene node animator for
 		//! scripting languages, editors, debuggers or xml serialization purposes.
 		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const;
 
 		//! Reads attributes of the object.
-		//! Implement this to set the attributes of your scene node animator for 
+		//! Implement this to set the attributes of your scene node animator for
 		//! scripting languages, editors, debuggers or xml deserialization purposes.
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
@@ -244,3 +241,4 @@ namespace gui
 
 #endif
 
+
diff --git a/src/dep/src/irrlicht/CGUISpinBox.cpp b/src/dep/src/irrlicht/CGUISpinBox.cpp
index 2748632..1aeeadc 100644
--- a/src/dep/src/irrlicht/CGUISpinBox.cpp
+++ b/src/dep/src/irrlicht/CGUISpinBox.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2006 Michael Zeilfelder
+// Copyright (C) 2006-2009 Michael Zeilfelder
 // This file uses the licence of the Irrlicht Engine.
 
 #include "CGUISpinBox.h"
@@ -161,51 +161,54 @@ void CGUISpinBox::setDecimalPlaces(s32 places)
 
 bool CGUISpinBox::OnEvent(const SEvent& event)
 {
-	bool changeEvent = false;
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_GUI_EVENT:
-		if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED)
+		bool changeEvent = false;
+		switch(event.EventType)
 		{
-			if (event.GUIEvent.Caller == ButtonSpinUp)
+		case EET_GUI_EVENT:
+			if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED)
 			{
-				f32 val = getValue();
-				val += StepSize;
-				setValue(val);
-				changeEvent = true;
+				if (event.GUIEvent.Caller == ButtonSpinUp)
+				{
+					f32 val = getValue();
+					val += StepSize;
+					setValue(val);
+					changeEvent = true;
+				}
+				else if ( event.GUIEvent.Caller == ButtonSpinDown)
+				{
+					f32 val = getValue();
+					val -= StepSize;
+					setValue(val);
+					changeEvent = true;
+				}
 			}
-			else if ( event.GUIEvent.Caller == ButtonSpinDown)
+			if ( event.GUIEvent.EventType == EGET_EDITBOX_ENTER )
 			{
-				f32 val = getValue();
-				val -= StepSize;
-				setValue(val);
-				changeEvent = true;
+				if (event.GUIEvent.Caller == EditBox)
+				{
+					verifyValueRange();
+					changeEvent = true;
+				}
 			}
-		}
-		if ( event.GUIEvent.EventType == EGET_EDITBOX_ENTER )
-		{
-			if (event.GUIEvent.Caller == EditBox)
-			{
-				verifyValueRange();
-				changeEvent = true;
-			}
-		}
+			break;
+		default:
 		break;
-	default:
-	break;
-	}
+		}
 
-	if ( changeEvent )
-	{
-		SEvent e;
-		e.EventType = EET_GUI_EVENT;
-		e.GUIEvent.Caller = this;
-		e.GUIEvent.Element = 0;
+		if ( changeEvent )
+		{
+			SEvent e;
+			e.EventType = EET_GUI_EVENT;
+			e.GUIEvent.Caller = this;
+			e.GUIEvent.Element = 0;
 
-		e.GUIEvent.EventType = EGET_SPINBOX_CHANGED;
-		if ( Parent )
-			Parent->OnEvent(e);
-		return true;
+			e.GUIEvent.EventType = EGET_SPINBOX_CHANGED;
+			if ( Parent )
+				Parent->OnEvent(e);
+			return true;
+		}
 	}
 
 	return IGUIElement::OnEvent(event);
@@ -252,6 +255,7 @@ void CGUISpinBox::serializeAttributes(io::IAttributes* out, io::SAttributeReadWr
 	out->addInt("DecimalPlaces", DecimalPlaces);
 }
 
+
 //! Reads attributes of the element
 void CGUISpinBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
 {
diff --git a/src/dep/src/irrlicht/CGUISpinBox.h b/src/dep/src/irrlicht/CGUISpinBox.h
index 3e8279d..559ff53 100644
--- a/src/dep/src/irrlicht/CGUISpinBox.h
+++ b/src/dep/src/irrlicht/CGUISpinBox.h
@@ -1,5 +1,6 @@
-// Copyright (C) 2006 Michael Zeilfelder
-// This file uses the licence of the Irrlicht Engine.
+// Copyright (C) 2006-2009 Michael Zeilfelder
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __C_GUI_SPIN_BOX_H_INCLUDED__
 #define __C_GUI_SPIN_BOX_H_INCLUDED__
diff --git a/src/dep/src/irrlicht/CGUISpriteBank.cpp b/src/dep/src/irrlicht/CGUISpriteBank.cpp
index 9c4cf9b..06ffbc5 100644
--- a/src/dep/src/irrlicht/CGUISpriteBank.cpp
+++ b/src/dep/src/irrlicht/CGUISpriteBank.cpp
@@ -1,3 +1,6 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CGUISpriteBank.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -103,7 +106,7 @@ void CGUISpriteBank::draw2DSprite(u32 index, const core::position2di& pos,
 		if (loop)
 			frame = f % Sprites[index].Frames.size();
 		else
-			frame = (f >= Sprites[index].Frames.size()) ? Sprites[index].Frames.size() : f;
+			frame = (f >= Sprites[index].Frames.size()) ? Sprites[index].Frames.size()-1 : f;
 	}
 
 	const video::ITexture* tex = Textures[Sprites[index].Frames[frame].textureNumber];
diff --git a/src/dep/src/irrlicht/CGUISpriteBank.h b/src/dep/src/irrlicht/CGUISpriteBank.h
index b907a45..075b472 100644
--- a/src/dep/src/irrlicht/CGUISpriteBank.h
+++ b/src/dep/src/irrlicht/CGUISpriteBank.h
@@ -1,3 +1,6 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __C_GUI_SPRITE_BANK_H_INCLUDED__
 #define __C_GUI_SPRITE_BANK_H_INCLUDED__
@@ -44,12 +47,11 @@ public:
 
 protected:
 
-	core::array<SGUISprite>  Sprites;
+	core::array<SGUISprite> Sprites;
 	core::array< core::rect<s32> > Rectangles;
 	core::array<video::ITexture*> Textures;
 	IGUIEnvironment* Environment;
 	video::IVideoDriver* Driver;
-
 };
 
 } // end namespace gui
@@ -59,4 +61,3 @@ protected:
 
 #endif // __C_GUI_SPRITE_BANK_H_INCLUDED__
 
-
diff --git a/src/dep/src/irrlicht/CGUIStaticText.cpp b/src/dep/src/irrlicht/CGUIStaticText.cpp
index c26ea30..6a4d624 100644
--- a/src/dep/src/irrlicht/CGUIStaticText.cpp
+++ b/src/dep/src/irrlicht/CGUIStaticText.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,9 +21,9 @@ CGUIStaticText::CGUIStaticText(const wchar_t* text, bool border,
 			IGUIEnvironment* environment, IGUIElement* parent,
 			s32 id, const core::rect<s32>& rectangle,
 			bool background)
-: IGUIStaticText(environment, parent, id, rectangle), Border(border), 
+: IGUIStaticText(environment, parent, id, rectangle),
 	HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_UPPERLEFT),
-	OverrideColorEnabled(false), WordWrap(false), Background(background),
+	Border(border), OverrideColorEnabled(false), WordWrap(false), Background(background),
 	OverrideColor(video::SColor(101,255,255,255)), BGColor(video::SColor(101,210,210,210)),
 	OverrideFont(0), LastBreakFont(0)
 {
@@ -88,12 +88,12 @@ void CGUIStaticText::draw()
 			{
 				if (VAlign == EGUIA_LOWERRIGHT)
 				{
-					frameRect.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y - 
+					frameRect.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y -
 						font->getDimension(L"A").Height - font->getKerningHeight();
 				}
 				if (HAlign == EGUIA_LOWERRIGHT)
 				{
-					frameRect.UpperLeftCorner.X = frameRect.LowerRightCorner.X - 
+					frameRect.UpperLeftCorner.X = frameRect.LowerRightCorner.X -
 						font->getDimension(Text.c_str()).Width;
 				}
 
@@ -122,7 +122,7 @@ void CGUIStaticText::draw()
 				{
 					if (HAlign == EGUIA_LOWERRIGHT)
 					{
-						r.UpperLeftCorner.X = frameRect.LowerRightCorner.X - 
+						r.UpperLeftCorner.X = frameRect.LowerRightCorner.X -
 							font->getDimension(BrokenText[i].c_str()).Width;
 					}
 
@@ -144,6 +144,9 @@ void CGUIStaticText::draw()
 //! Sets another skin independent font.
 void CGUIStaticText::setOverrideFont(IGUIFont* font)
 {
+	if (OverrideFont == font)
+		return;
+
 	if (OverrideFont)
 		OverrideFont->drop();
 
@@ -346,6 +349,7 @@ void CGUIStaticText::setText(const wchar_t* text)
 	breakText();
 }
 
+
 void CGUIStaticText::updateAbsolutePosition()
 {
 	IGUIElement::updateAbsolutePosition();
diff --git a/src/dep/src/irrlicht/CGUIStaticText.h b/src/dep/src/irrlicht/CGUIStaticText.h
index 637a45c..ec37fa2 100644
--- a/src/dep/src/irrlicht/CGUIStaticText.h
+++ b/src/dep/src/irrlicht/CGUIStaticText.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -91,8 +91,8 @@ namespace gui
 		//! Breaks the single text line.
 		void breakText();
 
-		bool Border;
 		EGUI_ALIGNMENT HAlign, VAlign;
+		bool Border;
 		bool OverrideColorEnabled;
 		bool WordWrap;
 		bool Background;
diff --git a/src/dep/src/irrlicht/CGUITabControl.cpp b/src/dep/src/irrlicht/CGUITabControl.cpp
index 9b8360a..2c6da28 100644
--- a/src/dep/src/irrlicht/CGUITabControl.cpp
+++ b/src/dep/src/irrlicht/CGUITabControl.cpp
@@ -1,10 +1,11 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CGUITabControl.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
 
+#include "CGUIButton.h"
 #include "IGUISkin.h"
 #include "IGUIEnvironment.h"
 #include "IGUIFont.h"
@@ -23,14 +24,19 @@ namespace gui
 
 //! constructor
 CGUITab::CGUITab(s32 number, IGUIEnvironment* environment,
-	IGUIElement* parent, const core::rect<s32>& rectangle, 
+	IGUIElement* parent, const core::rect<s32>& rectangle,
 	s32 id)
 	: IGUITab(environment, parent, id, rectangle), Number(number),
-		DrawBackground(false), BackColor(0,0,0,0)
+		BackColor(0,0,0,0), TextColor(255,0,0,0),
+		DrawBackground(false)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUITab");
 	#endif
+
+	const IGUISkin* const skin = environment->getSkin();
+	if (skin)
+		TextColor = skin->getColor(EGDC_BUTTON_TEXT);
 }
 
 
@@ -78,6 +84,19 @@ void CGUITab::setBackgroundColor(video::SColor c)
 }
 
 
+//! sets the color of the text
+void CGUITab::setTextColor(video::SColor c)
+{
+	TextColor = c;
+}
+
+
+video::SColor CGUITab::getTextColor() const
+{
+	return TextColor;
+}
+
+
 //! returns true if the tab is drawing its background, false if not
 bool CGUITab::isDrawingBackground() const
 {
@@ -98,9 +117,10 @@ void CGUITab::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteO
 {
 	IGUITab::serializeAttributes(out,options);
 
-	out->addInt	("TabNumber",		Number);
+	out->addInt		("TabNumber",		Number);
 	out->addBool	("DrawBackground",	DrawBackground);
 	out->addColor	("BackColor",		BackColor);
+	out->addColor	("TextColor",		TextColor);
 
 }
 
@@ -113,6 +133,7 @@ void CGUITab::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWrite
 	setNumber(in->getAttributeAsInt("TabNumber"));
 	setDrawBackground(in->getAttributeAsBool("DrawBackground"));
 	setBackgroundColor(in->getAttributeAsColor("BackColor"));
+	setTextColor(in->getAttributeAsColor("TextColor"));
 
 	if (Parent && Parent->getType() == EGUIET_TAB_CONTROL)
 	{
@@ -127,25 +148,77 @@ void CGUITab::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWrite
 // Tabcontrol
 // ------------------------------------------------------------------
 
-//! destructor
+//! constructor
 CGUITabControl::CGUITabControl(IGUIEnvironment* environment,
-	IGUIElement* parent, const core::rect<s32>& rectangle, 
+	IGUIElement* parent, const core::rect<s32>& rectangle,
 	bool fillbackground, bool border, s32 id)
 	: IGUITabControl(environment, parent, id, rectangle), ActiveTab(-1),
-	Border(border), FillBackground(fillbackground)
+	Border(border), FillBackground(fillbackground), ScrollControl(false), TabHeight(0), VerticalAlignment(EGUIA_UPPERLEFT),
+	UpButton(0), DownButton(0), TabMaxWidth(0), CurrentScrollTabIndex(0), TabExtraWidth(20)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUITabControl");
 	#endif
+
+	video::SColor color(255,255,255,255);
+	IGUISkin* skin = Environment->getSkin();
+	IGUISpriteBank* sprites = 0;
+
+	TabHeight = 32;
+
+	if (skin)
+	{
+		sprites = skin->getSpriteBank();
+		color = skin->getColor(EGDC_WINDOW_SYMBOL);
+		TabHeight = skin->getSize(gui::EGDS_BUTTON_HEIGHT) + 2;
+	}
+
+	UpButton = Environment->addButton(core::rect<s32>(0,0,10,10), this);
+
+	if (UpButton)
+	{
+		UpButton->setSpriteBank(sprites);
+		UpButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_LEFT), color);
+		UpButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_LEFT), color);
+		UpButton->setVisible(false);
+		UpButton->setSubElement(true);
+		UpButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+		UpButton->setOverrideFont(Environment->getBuiltInFont());
+		UpButton->grab();
+	}
+
+	DownButton = Environment->addButton(core::rect<s32>(0,0,10,10), this);
+
+	if (DownButton)
+	{
+		DownButton->setSpriteBank(sprites);
+		DownButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_RIGHT), color);
+		DownButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_RIGHT), color);
+		DownButton->setVisible(false);
+		DownButton->setSubElement(true);
+		DownButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+		DownButton->setOverrideFont(Environment->getBuiltInFont());
+		DownButton->grab();
+	}
+
+	setTabVerticalAlignment(EGUIA_UPPERLEFT);
 }
 
 
 //! destructor
 CGUITabControl::~CGUITabControl()
 {
-	for (s32 i=0; i<(s32)Tabs.size(); ++i)
+	for (u32 i=0; i<Tabs.size(); ++i)
+	{
 		if (Tabs[i])
 			Tabs[i]->drop();
+	}
+
+	if (UpButton)
+		UpButton->drop();
+
+	if (DownButton)
+		DownButton->drop();
 }
 
 
@@ -156,16 +229,28 @@ IGUITab* CGUITabControl::addTab(const wchar_t* caption, s32 id)
 	if (!skin)
 		return 0;
 
-	s32 tabheight = skin->getSize(gui::EGDS_BUTTON_HEIGHT) + 2;
-	core::rect<s32> r(1,tabheight,
-		AbsoluteRect.getWidth()-1,
-		AbsoluteRect.getHeight()-1);
+	core::rect<s32> r;
+	if ( VerticalAlignment == EGUIA_UPPERLEFT )
+	{
+		r.UpperLeftCorner.X = 1;
+		r.UpperLeftCorner.Y = TabHeight;
 
-	CGUITab* tab = new CGUITab(Tabs.size(), Environment, this, 
-		r, id);
-	tab->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+		r.LowerRightCorner.X = AbsoluteRect.getWidth()-1;
+		r.LowerRightCorner.Y = AbsoluteRect.getHeight()-1;
+	}
+	else
+	{
+		r.UpperLeftCorner.X = 1;
+		r.UpperLeftCorner.Y = 1;
+
+		r.LowerRightCorner.X = AbsoluteRect.getWidth()-1;
+		r.LowerRightCorner.Y = AbsoluteRect.getHeight()-TabHeight;
+	}
+
+	CGUITab* tab = new CGUITab(Tabs.size(), Environment, this, r, id);
 
 	tab->setText(caption);
+	tab->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
 	tab->setVisible(false);
 	Tabs.push_back(tab);
 
@@ -175,6 +260,8 @@ IGUITab* CGUITabControl::addTab(const wchar_t* caption, s32 id)
 		tab->setVisible(true);
 	}
 
+	recalculateScrollBar();
+
 	return tab;
 }
 
@@ -186,9 +273,11 @@ void CGUITabControl::addTab(CGUITab* tab)
 		return;
 
 	// check if its already added
-	for (s32 i=0; i < (s32)Tabs.size(); ++i)
+	for (u32 i=0; i < Tabs.size(); ++i)
+	{
 		if (Tabs[i] == tab)
 			return;
+	}
 
 	tab->grab();
 
@@ -226,7 +315,7 @@ s32 CGUITabControl::getTabCount() const
 //! Returns a tab based on zero based index
 IGUITab* CGUITabControl::getTab(s32 idx) const
 {
-	if (idx < 0 || idx >= (s32)Tabs.size())
+	if ((u32)idx >= Tabs.size())
 		return 0;
 
 	return Tabs[idx];
@@ -236,46 +325,98 @@ IGUITab* CGUITabControl::getTab(s32 idx) const
 //! called if an event happened.
 bool CGUITabControl::OnEvent(const SEvent& event)
 {
-	if (!IsEnabled)
-		return Parent ? Parent->OnEvent(event) : false;
-
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_MOUSE_INPUT_EVENT:
-		switch(event.MouseInput.Event)
+
+		switch(event.EventType)
 		{
-		case EMIE_LMOUSE_PRESSED_DOWN:
-			Environment->setFocus(this);
-			return true;
-		case EMIE_LMOUSE_LEFT_UP:
-			Environment->removeFocus(this);
-			selectTab(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y));
-			return true;
+		case EET_GUI_EVENT:
+			switch(event.GUIEvent.EventType)
+			{
+			case EGET_BUTTON_CLICKED:
+				if (event.GUIEvent.Caller == UpButton)
+				{
+					scrollLeft();
+					return true;
+				}
+				else if (event.GUIEvent.Caller == DownButton)
+				{
+					scrollRight();
+					return true;
+				}
+
+			break;
+			default:
+			break;
+			}
+			break;
+		case EET_MOUSE_INPUT_EVENT:
+			switch(event.MouseInput.Event)
+			{
+			case EMIE_LMOUSE_PRESSED_DOWN:
+				// todo: dragging tabs around
+				return true;
+			case EMIE_LMOUSE_LEFT_UP:
+				if (selectTab(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y)))
+					return true;
+				break;
+			default:
+				break;
+			}
+			break;
 		default:
 			break;
 		}
-		break;
-	default:
-		break;
 	}
 
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
-void CGUITabControl::selectTab(core::position2d<s32> p)
+void CGUITabControl::scrollLeft()
 {
+	if ( CurrentScrollTabIndex > 0 )
+		--CurrentScrollTabIndex;
+	recalculateScrollBar();
+}
+
+
+void CGUITabControl::scrollRight()
+{
+	if ( CurrentScrollTabIndex < (s32)(Tabs.size()) - 1 )
+	{
+		if ( needScrollControl(CurrentScrollTabIndex, true) )
+			++CurrentScrollTabIndex;
+	}
+	recalculateScrollBar();
+}
+
+
+bool CGUITabControl::needScrollControl(s32 startIndex, bool withScrollControl)
+{
+	if ( startIndex >= (s32)Tabs.size() )
+		startIndex -= 1;
+
+	if ( startIndex < 0 )
+		startIndex = 0;
+
 	IGUISkin* skin = Environment->getSkin();
+	if (!skin)
+		return false;
+
 	IGUIFont* font = skin->getFont();
 
 	core::rect<s32> frameRect(AbsoluteRect);
 
-	s32 tabheight = skin->getSize(gui::EGDS_BUTTON_HEIGHT);
-	frameRect.UpperLeftCorner.Y += 2;
-	frameRect.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y + tabheight;
+	if (Tabs.empty())
+		return false;
+
+	if (!font)
+		return false;
+
 	s32 pos = frameRect.UpperLeftCorner.X + 2;
 
-	for (u32 i=0; i<Tabs.size(); ++i)
+	for (s32 i=startIndex; i<(s32)Tabs.size(); ++i)
 	{
 		// get Text
 		const wchar_t* text = 0;
@@ -283,20 +424,71 @@ void CGUITabControl::selectTab(core::position2d<s32> p)
 			text = Tabs[i]->getText();
 
 		// get text length
-		s32 len = 20;
-		if (font)
-			len += font->getDimension(text).Width;
+		s32 len = font->getDimension(text).Width + TabExtraWidth;
+
+		frameRect.LowerRightCorner.X += len;
 
 		frameRect.UpperLeftCorner.X = pos;
 		frameRect.LowerRightCorner.X = frameRect.UpperLeftCorner.X + len;
 		pos += len;
 
+		if ( withScrollControl && pos > AbsoluteRect.LowerRightCorner.X - TabMaxWidth)
+			return true;
+
+		if ( !withScrollControl && pos > AbsoluteRect.LowerRightCorner.X )
+			return true;
+	}
+
+	return false;
+}
+
+
+bool CGUITabControl::selectTab(core::position2d<s32> p)
+{
+	IGUISkin* skin = Environment->getSkin();
+	IGUIFont* font = skin->getFont();
+
+	core::rect<s32> frameRect(AbsoluteRect);
+
+	if ( VerticalAlignment == EGUIA_UPPERLEFT )
+	{
+		frameRect.UpperLeftCorner.Y += 2;
+		frameRect.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y + TabHeight;
+	}
+	else
+	{
+		frameRect.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y - TabHeight;
+	}
+
+	s32 pos = frameRect.UpperLeftCorner.X + 2;
+
+	if (!frameRect.isPointInside(p))
+		return false;
+
+	for (s32 i=CurrentScrollTabIndex; i<(s32)Tabs.size(); ++i)
+	{
+		// get Text
+		const wchar_t* text = 0;
+		if (Tabs[i])
+			text = Tabs[i]->getText();
+
+		// get text length
+		s32 len = font->getDimension(text).Width + TabExtraWidth;
+		frameRect.UpperLeftCorner.X = pos;
+		frameRect.LowerRightCorner.X = frameRect.UpperLeftCorner.X + len;
+
+		if ( ScrollControl && pos > AbsoluteRect.LowerRightCorner.X)
+			return false;
+
+		pos += len;
+
 		if (frameRect.isPointInside(p))
 		{
 			setActiveTab(i);
-			return;
+			return true;
 		}
 	}
+	return false;
 }
 
 
@@ -311,28 +503,38 @@ void CGUITabControl::draw()
 		return;
 
 	IGUIFont* font = skin->getFont();
+	video::IVideoDriver* driver = Environment->getVideoDriver();
 
 	core::rect<s32> frameRect(AbsoluteRect);
 
 	if (Tabs.empty())
-		skin->draw2DRectangle(this, skin->getColor(EGDC_3D_HIGH_LIGHT),
-		frameRect, &AbsoluteClippingRect);
+		driver->draw2DRectangle(skin->getColor(EGDC_3D_HIGH_LIGHT), frameRect, &AbsoluteClippingRect);
 
 	if (!font)
 		return;
 
-	s32 tabheight = skin->getSize(gui::EGDS_BUTTON_HEIGHT);
-	frameRect.UpperLeftCorner.Y += 2;
-	frameRect.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y + tabheight;
+	if ( VerticalAlignment == EGUIA_UPPERLEFT )
+	{
+		frameRect.UpperLeftCorner.Y += 2;
+		frameRect.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y + TabHeight;
+	}
+	else
+	{
+		frameRect.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y - TabHeight - 1;
+		frameRect.LowerRightCorner.Y -= 2;
+	}
+
 	core::rect<s32> tr;
 	s32 pos = frameRect.UpperLeftCorner.X + 2;
 
 	// left and right pos of the active tab
 	s32 left = 0;
 	s32 right = 0;
-	const wchar_t* activetext = 0;
-	
-	for (s32 i=0; i<(s32)Tabs.size(); ++i)
+
+	//const wchar_t* activetext = 0;
+	CGUITab *activeTab = 0;
+
+	for (u32 i=0; i<Tabs.size(); ++i)
 	{
 		// get Text
 		const wchar_t* text = 0;
@@ -340,58 +542,217 @@ void CGUITabControl::draw()
 			text = Tabs[i]->getText();
 
 		// get text length
-		s32 len = font->getDimension(text).Width + 20;
+		s32 len = font->getDimension(text).Width + TabExtraWidth;
+
+		frameRect.LowerRightCorner.X += len;
+
 		frameRect.UpperLeftCorner.X = pos;
 		frameRect.LowerRightCorner.X = frameRect.UpperLeftCorner.X + len;
+
+		if ( ScrollControl && pos > frameRect.LowerRightCorner.X )
+			break;
+
 		pos += len;
 
-		if (i == ActiveTab)
+		if ((s32)i == ActiveTab)
 		{
 			left = frameRect.UpperLeftCorner.X;
 			right = frameRect.LowerRightCorner.X;
-			activetext = text;
+			//activetext = text;
+			activeTab = Tabs[i];
 		}
 		else
 		{
-			skin->draw3DTabButton(this, false, frameRect, &AbsoluteClippingRect);
-					
+			skin->draw3DTabButton(this, false, frameRect, &AbsoluteClippingRect, VerticalAlignment);
+
 			// draw text
-			font->draw(text, frameRect, skin->getColor(EGDC_BUTTON_TEXT),
+			font->draw(text, frameRect, Tabs[i]->getTextColor(),
 				true, true, &AbsoluteClippingRect);
 		}
 	}
 
 	// draw active tab
-	if (left != 0 && right != 0)
+	if (left != 0 && right != 0 && activeTab != 0)
 	{
-		frameRect.UpperLeftCorner.X = left-2;
-		frameRect.LowerRightCorner.X = right+2;
-		frameRect.UpperLeftCorner.Y -= 2;
-
-		skin->draw3DTabButton(this, true, frameRect, &AbsoluteClippingRect);
-		
-		// draw text
-		font->draw(activetext, frameRect, skin->getColor(EGDC_BUTTON_TEXT),
-			true, true, &AbsoluteClippingRect);
-
 		// draw upper highlight frame
-		tr.UpperLeftCorner.X = AbsoluteRect.UpperLeftCorner.X;
-		tr.LowerRightCorner.X = left - 1;
-		tr.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y - 1;
-		tr.LowerRightCorner.Y = frameRect.LowerRightCorner.Y;
-		skin->draw2DRectangle(this, skin->getColor(EGDC_3D_HIGH_LIGHT), tr, &AbsoluteClippingRect);
+		if ( VerticalAlignment == EGUIA_UPPERLEFT )
+		{
+			frameRect.UpperLeftCorner.X = left-2;
+			frameRect.LowerRightCorner.X = right+2;
+			frameRect.UpperLeftCorner.Y -= 2;
 
-		tr.UpperLeftCorner.X = right;
-		tr.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X;
-		skin->draw2DRectangle(this, skin->getColor(EGDC_3D_HIGH_LIGHT), tr, &AbsoluteClippingRect);
+			skin->draw3DTabButton(this, true, frameRect, &AbsoluteClippingRect, VerticalAlignment);
+
+			// draw text
+			font->draw(activeTab->getText(), frameRect, activeTab->getTextColor(),
+				true, true, &AbsoluteClippingRect);
+
+			tr.UpperLeftCorner.X = AbsoluteRect.UpperLeftCorner.X;
+			tr.LowerRightCorner.X = left - 1;
+			tr.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y - 1;
+			tr.LowerRightCorner.Y = frameRect.LowerRightCorner.Y;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_HIGH_LIGHT), tr, &AbsoluteClippingRect);
+
+			tr.UpperLeftCorner.X = right;
+			tr.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_HIGH_LIGHT), tr, &AbsoluteClippingRect);
+		}
+		else
+		{
+
+			frameRect.UpperLeftCorner.X = left-2;
+			frameRect.LowerRightCorner.X = right+2;
+			frameRect.LowerRightCorner.Y += 2;
+
+			skin->draw3DTabButton(this, true, frameRect, &AbsoluteClippingRect, VerticalAlignment);
+
+			// draw text
+			font->draw(activeTab->getText(), frameRect, activeTab->getTextColor(),
+				true, true, &AbsoluteClippingRect);
+
+			tr.UpperLeftCorner.X = AbsoluteRect.UpperLeftCorner.X;
+			tr.LowerRightCorner.X = left - 1;
+			tr.UpperLeftCorner.Y = frameRect.UpperLeftCorner.Y - 1;
+			tr.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_DARK_SHADOW), tr, &AbsoluteClippingRect);
+
+			tr.UpperLeftCorner.X = right;
+			tr.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_DARK_SHADOW), tr, &AbsoluteClippingRect);
+		}
+	}
+	else
+	{
+		if ( VerticalAlignment == EGUIA_UPPERLEFT )
+		{
+			tr.UpperLeftCorner.X = AbsoluteRect.UpperLeftCorner.X;
+			tr.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X;
+			tr.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y - 1;
+			tr.LowerRightCorner.Y = frameRect.LowerRightCorner.Y;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_HIGH_LIGHT), tr, &AbsoluteClippingRect);
+		}
+		else
+		{
+			tr.UpperLeftCorner.X = AbsoluteRect.UpperLeftCorner.X;
+			tr.LowerRightCorner.X = 1000;
+			tr.UpperLeftCorner.Y = frameRect.UpperLeftCorner.Y - 1;
+			tr.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_DARK_SHADOW), tr, &AbsoluteClippingRect);
+		}
 	}
 
-	skin->draw3DTabBody(this, Border, FillBackground, AbsoluteRect, &AbsoluteClippingRect);
+	skin->draw3DTabBody(this, Border, FillBackground, AbsoluteRect, &AbsoluteClippingRect, TabHeight, VerticalAlignment);
 
 	IGUIElement::draw();
 }
 
 
+//! Set the height of the tabs
+void CGUITabControl::setTabHeight( s32 height )
+{
+	if ( height < 0 )
+		height = 0;
+
+	TabHeight = height;
+
+	TabMaxWidth =  2 * TabHeight;
+
+	recalculateScrollBar();
+}
+
+
+//! Get the height of the tabs
+s32 CGUITabControl::getTabHeight() const
+{
+	return TabHeight;
+}
+
+
+//! Set the extra width added to tabs on each side of the text
+void CGUITabControl::setTabExtraWidth( s32 extraWidth )
+{
+	if ( extraWidth < 0 )
+		extraWidth = 0;
+
+	TabExtraWidth = extraWidth;
+
+	recalculateScrollBar();
+}
+
+
+//! Get the extra width added to tabs on each side of the text
+s32 CGUITabControl::getTabExtraWidth() const
+{
+	return TabExtraWidth;
+}
+
+
+void CGUITabControl::recalculateScrollBar()
+{
+	ScrollControl = needScrollControl() || CurrentScrollTabIndex > 0;
+
+	if (ScrollControl)
+	{
+		UpButton->setVisible( true );
+		DownButton->setVisible( true );
+	}
+	else
+	{
+		UpButton->setVisible( false );
+		DownButton->setVisible( false );
+	}
+
+	this->bringToFront( UpButton );
+	this->bringToFront( DownButton );
+}
+
+
+//! Set the alignment of the tabs
+void CGUITabControl::setTabVerticalAlignment( EGUI_ALIGNMENT alignment )
+{
+	VerticalAlignment = alignment;
+
+	IGUISkin* skin = Environment->getSkin();
+	s32 ButtonSize = 16;
+	if (skin)
+	{
+		ButtonSize = skin->getSize(EGDS_WINDOW_BUTTON_WIDTH);
+		if (ButtonSize > TabHeight)
+			ButtonSize = TabHeight;
+	}
+
+	TabMaxWidth = s32(f32(ButtonSize) * 2.5f);
+	s32 ButtonX = RelativeRect.getWidth() - TabMaxWidth - 1;
+	s32 ButtonY = 0;
+
+	if (VerticalAlignment == EGUIA_UPPERLEFT)
+	{
+		ButtonY = (TabHeight / 2) - (ButtonSize / 2);
+		UpButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+		DownButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+	}
+	else
+	{
+		ButtonY = RelativeRect.getHeight() - (TabHeight / 2) - (ButtonSize / 2);
+		UpButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT);
+		DownButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT);
+	}
+
+	UpButton->setRelativePosition(core::rect<s32>(ButtonX, ButtonY, ButtonX+ButtonSize, ButtonY+ButtonSize));
+	ButtonX += ButtonSize + 1;
+	DownButton->setRelativePosition(core::rect<s32>(ButtonX, ButtonY, ButtonX+ButtonSize, ButtonY+ButtonSize));
+
+	recalculateScrollBar();
+}
+
+
+//! Get the alignment of the tabs
+EGUI_ALIGNMENT CGUITabControl::getTabVerticalAlignment() const
+{
+	return VerticalAlignment;
+}
+
+
 //! Returns which tab is currently active
 s32 CGUITabControl::getActiveTab() const
 {
@@ -399,15 +760,6 @@ s32 CGUITabControl::getActiveTab() const
 }
 
 
-bool CGUITabControl::setActiveTab(IGUIElement *tab)
-{
-	for (s32 i=0; i<(s32)Tabs.size(); ++i)
-		if (Tabs[i] == tab)
-			return setActiveTab(i);
-	return false;
-}
-
-
 //! Brings a tab to front.
 bool CGUITabControl::setActiveTab(s32 idx)
 {
@@ -429,13 +781,22 @@ bool CGUITabControl::setActiveTab(s32 idx)
 		event.GUIEvent.Caller = this;
 		event.GUIEvent.Element = 0;
 		event.GUIEvent.EventType = EGET_TAB_CHANGED;
-		Parent->OnEvent(event);		
+		Parent->OnEvent(event);
 	}
 
 	return true;
 }
 
 
+bool CGUITabControl::setActiveTab(IGUIElement *tab)
+{
+	for (s32 i=0; i<(s32)Tabs.size(); ++i)
+		if (Tabs[i] == tab)
+			return setActiveTab(i);
+	return false;
+}
+
+
 //! Removes a child.
 void CGUITabControl::removeChild(IGUIElement* child)
 {
@@ -465,6 +826,16 @@ void CGUITabControl::removeChild(IGUIElement* child)
 
 	// remove real element
 	IGUIElement::removeChild(child);
+
+	recalculateScrollBar();
+}
+
+
+//! Update the position of the element, decides scroll button status
+void CGUITabControl::updateAbsolutePosition()
+{
+	IGUIElement::updateAbsolutePosition();
+	recalculateScrollBar();
 }
 
 
@@ -473,23 +844,28 @@ void CGUITabControl::serializeAttributes(io::IAttributes* out, io::SAttributeRea
 {
 	IGUITabControl::serializeAttributes(out,options);
 
-	out->addInt("ActiveTab",	ActiveTab);
+	out->addInt ("ActiveTab",	ActiveTab);
 	out->addBool("Border",		Border);
 	out->addBool("FillBackground",	FillBackground);
+	out->addInt ("TabHeight",	TabHeight);
+	out->addEnum("TabVerticalAlignment", s32(VerticalAlignment), GUIAlignmentNames);
 }
 
 
 //! Reads attributes of the element
 void CGUITabControl::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
 {
-	Border		= in->getAttributeAsBool("Border");
+	Border          = in->getAttributeAsBool("Border");
 	FillBackground  = in->getAttributeAsBool("FillBackground");
 
 	ActiveTab = -1;
 
+	setTabHeight(in->getAttributeAsInt("TabHeight"));
+
 	IGUITabControl::deserializeAttributes(in,options);
 
 	setActiveTab(in->getAttributeAsInt("ActiveTab"));
+	setTabVerticalAlignment( static_cast<EGUI_ALIGNMENT>(in->getAttributeAsEnumeration("TabVerticalAlignment" , GUIAlignmentNames)) );
 }
 
 
diff --git a/src/dep/src/irrlicht/CGUITabControl.h b/src/dep/src/irrlicht/CGUITabControl.h
index 76375d1..83a7b64 100644
--- a/src/dep/src/irrlicht/CGUITabControl.h
+++ b/src/dep/src/irrlicht/CGUITabControl.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,11 +10,15 @@
 
 #include "IGUITabControl.h"
 #include "irrArray.h"
+#include "IGUISkin.h"
 
 namespace irr
 {
 namespace gui
 {
+	class CGUITabControl;
+	class IGUIButton;
+
 	// A tab, onto which other gui elements could be added.
 	class CGUITab : public IGUITab
 	{
@@ -25,6 +29,9 @@ namespace gui
 			IGUIElement* parent, const core::rect<s32>& rectangle,
 			s32 id);
 
+		//! destructor
+		//virtual ~CGUITab();
+
 		//! Returns number of this tab in tabcontrol. Can be accessed
 		//! later IGUITabControl::getTab() by this number.
 		virtual s32 getNumber() const;
@@ -41,12 +48,17 @@ namespace gui
 		//! sets the color of the background, if it should be drawn.
 		virtual void setBackgroundColor(video::SColor c);
 
+		//! sets the color of the text
+		virtual void setTextColor(video::SColor c);
+
 		//! returns true if the tab is drawing its background, false if not
 		virtual bool isDrawingBackground() const;
 
 		//! returns the color of the background
 		virtual video::SColor getBackgroundColor() const;
 
+		virtual video::SColor getTextColor() const;
+
 		//! Writes attributes of the element.
 		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;
 
@@ -57,12 +69,12 @@ namespace gui
 	private:
 
 		s32 Number;
-		bool DrawBackground;
 		video::SColor BackColor;
+		video::SColor TextColor;
+		bool DrawBackground;
 	};
 
 
-
 	//! A standard tab control
 	class CGUITabControl : public IGUITabControl
 	{
@@ -108,18 +120,51 @@ namespace gui
 
 		//! Writes attributes of the element.
 		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;
+		//! Set the height of the tabs
+		virtual void setTabHeight( s32 height );
 
 		//! Reads attributes of the element
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
+		//! Get the height of the tabs
+		virtual s32 getTabHeight() const;
+
+		//! Set the alignment of the tabs
+		//! note: EGUIA_CENTER is not an option
+		virtual void setTabVerticalAlignment( gui::EGUI_ALIGNMENT alignment );
+
+		//! Get the alignment of the tabs
+		virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const;
+
+		//! Set the extra width added to tabs on each side of the text
+		virtual void setTabExtraWidth( s32 extraWidth );
+
+		//! Get the extra width added to tabs on each side of the text
+		virtual s32 getTabExtraWidth() const;
+
+		//! Update the position of the element, decides scroll button status
+		virtual void updateAbsolutePosition();
 
 	private:
 
-		void selectTab(core::position2d<s32> p);
+		bool selectTab(core::position2d<s32> p);
+		void scrollLeft();
+		void scrollRight();
+		bool needScrollControl( s32 startIndex=0, bool withScrollControl=false );
+
+		void recalculateScrollBar();
 
 		core::array<CGUITab*> Tabs;
 		s32 ActiveTab;
 		bool Border;
 		bool FillBackground;
+		bool ScrollControl;
+		s32 TabHeight;
+		gui::EGUI_ALIGNMENT VerticalAlignment;
+		IGUIButton* UpButton;
+		IGUIButton* DownButton;
+		s32 TabMaxWidth;
+		s32 CurrentScrollTabIndex;
+		s32 TabExtraWidth;
 	};
 
 
diff --git a/src/dep/src/irrlicht/CGUIToolBar.cpp b/src/dep/src/irrlicht/CGUIToolBar.cpp
index 2430172..e2d06f3 100644
--- a/src/dep/src/irrlicht/CGUIToolBar.cpp
+++ b/src/dep/src/irrlicht/CGUIToolBar.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -67,14 +67,17 @@ CGUIToolBar::CGUIToolBar(IGUIEnvironment* environment, IGUIElement* parent, s32
 //! called if an event happened.
 bool CGUIToolBar::OnEvent(const SEvent& event)
 {
-	if (event.EventType == EET_MOUSE_INPUT_EVENT && 
-		event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
+	if (IsEnabled)
 	{
-		if (AbsoluteClippingRect.isPointInside(core::position2di(event.MouseInput.X, event.MouseInput.Y)))
-			return true;
+		if (event.EventType == EET_MOUSE_INPUT_EVENT &&
+			event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
+		{
+			if (AbsoluteClippingRect.isPointInside(core::position2di(event.MouseInput.X, event.MouseInput.Y)))
+				return true;
+		}
 	}
 
-	return Parent ? Parent->OnEvent(event) : false;
+	return IGUIElement::OnEvent(event);
 }
 
 
@@ -89,7 +92,7 @@ void CGUIToolBar::draw()
 		return;
 
 	core::rect<s32> rect = AbsoluteRect;
-	core::rect<s32>* clip = 0;
+	core::rect<s32>* clip = &AbsoluteClippingRect;
 
 	// draw frame
 	skin->draw3DToolBar(this, rect, clip);
@@ -113,7 +116,7 @@ void CGUIToolBar::updateAbsolutePosition()
 
 //! Adds a button to the tool bar
 IGUIButton* CGUIToolBar::addButton(s32 id, const wchar_t* text,const wchar_t* tooltiptext,
-	video::ITexture* img, video::ITexture* pressed, bool isPushButton, 
+	video::ITexture* img, video::ITexture* pressed, bool isPushButton,
 	bool useAlphaChannel)
 {
 	ButtonX += 3;
@@ -148,10 +151,10 @@ IGUIButton* CGUIToolBar::addButton(s32 id, const wchar_t* text,const wchar_t* to
 
 	if (useAlphaChannel)
 		button->setUseAlphaChannel(useAlphaChannel);
-	
+
 	return button;
 }
-	
+
 } // end namespace gui
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/CGUIToolBar.h b/src/dep/src/irrlicht/CGUIToolBar.h
index 3f2fced..3f6eaf9 100644
--- a/src/dep/src/irrlicht/CGUIToolBar.h
+++ b/src/dep/src/irrlicht/CGUIToolBar.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CGUIWindow.cpp b/src/dep/src/irrlicht/CGUIWindow.cpp
index e479c67..ae6a610 100644
--- a/src/dep/src/irrlicht/CGUIWindow.cpp
+++ b/src/dep/src/irrlicht/CGUIWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -31,7 +31,7 @@ CGUIWindow::CGUIWindow(IGUIEnvironment* environment, IGUIElement* parent, s32 id
 
 	IGUISpriteBank* sprites = 0;
 	video::SColor color(255,255,255,255);
-	
+
 	s32 buttonw = 15;
 	if (skin)
 	{
@@ -41,7 +41,7 @@ CGUIWindow::CGUIWindow(IGUIEnvironment* environment, IGUIElement* parent, s32 id
 	}
 	s32 posx = RelativeRect.getWidth() - buttonw - 4;
 
-	CloseButton = Environment->addButton(core::rect<s32>(posx, 3, posx + buttonw, 3 + buttonw), this, -1, 
+	CloseButton = Environment->addButton(core::rect<s32>(posx, 3, posx + buttonw, 3 + buttonw), this, -1,
 		L"", skin ? skin->getDefaultText(EGDT_WINDOW_CLOSE) : L"Close" );
 	CloseButton->setSubElement(true);
 	CloseButton->setTabStop(false);
@@ -54,7 +54,7 @@ CGUIWindow::CGUIWindow(IGUIEnvironment* environment, IGUIElement* parent, s32 id
 	}
 	posx -= buttonw + 2;
 
-	RestoreButton = Environment->addButton(core::rect<s32>(posx, 3, posx + buttonw, 3 + buttonw), this, -1, 
+	RestoreButton = Environment->addButton(core::rect<s32>(posx, 3, posx + buttonw, 3 + buttonw), this, -1,
 		L"", skin ? skin->getDefaultText(EGDT_WINDOW_RESTORE) : L"Restore" );
 	RestoreButton->setVisible(false);
 	RestoreButton->setSubElement(true);
@@ -68,7 +68,7 @@ CGUIWindow::CGUIWindow(IGUIEnvironment* environment, IGUIElement* parent, s32 id
 	}
 	posx -= buttonw + 2;
 
-	MinButton = Environment->addButton(core::rect<s32>(posx, 3, posx + buttonw, 3 + buttonw), this, -1, 
+	MinButton = Environment->addButton(core::rect<s32>(posx, 3, posx + buttonw, 3 + buttonw), this, -1,
 		L"", skin ? skin->getDefaultText(EGDT_WINDOW_MINIMIZE) : L"Minimize" );
 	MinButton->setVisible(false);
 	MinButton->setSubElement(true);
@@ -109,92 +109,87 @@ CGUIWindow::~CGUIWindow()
 //! called if an event happened.
 bool CGUIWindow::OnEvent(const SEvent& event)
 {
-	switch(event.EventType)
+	if (IsEnabled)
 	{
-	case EET_GUI_EVENT:
-		if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
-		{
-			Dragging = false;
-		}
-		else
-		if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUSED)
-		{
-			if (event.GUIEvent.Caller == this && Parent)
-			{
-				Parent->bringToFront(this);
-			}
-		}
-		else
-		if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED)
-		{
-			if (event.GUIEvent.Caller == CloseButton)
-			{
-				if (Parent)
-				{
-					// send close event to parent
-					SEvent e;
-					e.EventType = EET_GUI_EVENT;
-					e.GUIEvent.Caller = this;
-					e.GUIEvent.Element = 0;
-					e.GUIEvent.EventType = EGET_ELEMENT_CLOSED;
 
-					// if the event was not absorbed
-					if (!Parent->OnEvent(e))
-					{
-						remove();
-					}
-					return true;
-
-				}
-				else
-				{
-					remove();
-					return true;
-				}
-			}
-		}
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-		switch(event.MouseInput.Event)
+		switch(event.EventType)
 		{
-		case EMIE_LMOUSE_PRESSED_DOWN:
-			DragStart.X = event.MouseInput.X;
-			DragStart.Y = event.MouseInput.Y;
-			Dragging = true;
-			if (!Environment->hasFocus(this))
+		case EET_GUI_EVENT:
+			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
 			{
-				Environment->setFocus(this);
-				if (Parent)
+				Dragging = false;
+			}
+			else
+			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUSED)
+			{
+				if (Parent && ((event.GUIEvent.Caller == this) || isMyChild(event.GUIEvent.Caller)))
 					Parent->bringToFront(this);
 			}
-			return true;
-		case EMIE_LMOUSE_LEFT_UP:
-			Dragging = false;
-			return true;
-		case EMIE_MOUSE_MOVED:
-			if (Dragging)
+			else
+			if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED)
 			{
-				// gui window should not be dragged outside its parent
-				if (Parent)
-					if (event.MouseInput.X < Parent->getAbsolutePosition().UpperLeftCorner.X +1 ||
-						event.MouseInput.Y < Parent->getAbsolutePosition().UpperLeftCorner.Y +1 ||
-						event.MouseInput.X > Parent->getAbsolutePosition().LowerRightCorner.X -1 ||
-						event.MouseInput.Y > Parent->getAbsolutePosition().LowerRightCorner.Y -1)
+				if (event.GUIEvent.Caller == CloseButton)
+				{
+					if (Parent)
+					{
+						// send close event to parent
+						SEvent e;
+						e.EventType = EET_GUI_EVENT;
+						e.GUIEvent.Caller = this;
+						e.GUIEvent.Element = 0;
+						e.GUIEvent.EventType = EGET_ELEMENT_CLOSED;
+
+						// if the event was not absorbed
+						if (!Parent->OnEvent(e))
+							remove();
 
 						return true;
-					
 
-				move(core::position2d<s32>(event.MouseInput.X - DragStart.X, event.MouseInput.Y - DragStart.Y));
-				DragStart.X = event.MouseInput.X;
-				DragStart.Y = event.MouseInput.Y;
-				return true;
+					}
+					else
+					{
+						remove();
+						return true;
+					}
+				}
 			}
 			break;
+		case EET_MOUSE_INPUT_EVENT:
+			switch(event.MouseInput.Event)
+			{
+			case EMIE_LMOUSE_PRESSED_DOWN:
+				DragStart.X = event.MouseInput.X;
+				DragStart.Y = event.MouseInput.Y;
+				Dragging = true;
+				if (Parent)
+					Parent->bringToFront(this);
+				return true;
+			case EMIE_LMOUSE_LEFT_UP:
+				Dragging = false;
+				return true;
+			case EMIE_MOUSE_MOVED:
+				if (Dragging)
+				{
+					// gui window should not be dragged outside its parent
+					if (Parent &&
+						(event.MouseInput.X < Parent->getAbsolutePosition().UpperLeftCorner.X +1 ||
+							event.MouseInput.Y < Parent->getAbsolutePosition().UpperLeftCorner.Y +1 ||
+							event.MouseInput.X > Parent->getAbsolutePosition().LowerRightCorner.X -1 ||
+							event.MouseInput.Y > Parent->getAbsolutePosition().LowerRightCorner.Y -1))
+						return true;
+
+					move(core::position2d<s32>(event.MouseInput.X - DragStart.X, event.MouseInput.Y - DragStart.Y));
+					DragStart.X = event.MouseInput.X;
+					DragStart.Y = event.MouseInput.Y;
+					return true;
+				}
+				break;
+			default:
+				break;
+			}
 		default:
 			break;
 		}
-	default:
-		break;
 	}
 
 	return IGUIElement::OnEvent(event);
diff --git a/src/dep/src/irrlicht/CGUIWindow.h b/src/dep/src/irrlicht/CGUIWindow.h
index 136635d..10cdb52 100644
--- a/src/dep/src/irrlicht/CGUIWindow.h
+++ b/src/dep/src/irrlicht/CGUIWindow.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -46,12 +46,12 @@ namespace gui
 
 	protected:
 
-		core::position2d<s32> DragStart;
-		bool Dragging;
-
 		IGUIButton* CloseButton;
 		IGUIButton* MinButton;
 		IGUIButton* RestoreButton;
+
+		core::position2d<s32> DragStart;
+		bool Dragging;
 	};
 
 } // end namespace gui
@@ -59,5 +59,5 @@ namespace gui
 
 #endif // _IRR_COMPILE_WITH_GUI_
 
-#endif 
+#endif
 
diff --git a/src/dep/src/irrlicht/CGeometryCreator.cpp b/src/dep/src/irrlicht/CGeometryCreator.cpp
index fd83063..ef009ed 100644
--- a/src/dep/src/irrlicht/CGeometryCreator.cpp
+++ b/src/dep/src/irrlicht/CGeometryCreator.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,6 +6,7 @@
 #include "SAnimatedMesh.h"
 #include "SMeshBuffer.h"
 #include "SMesh.h"
+#include "IMesh.h"
 #include "IVideoDriver.h"
 #include "CImage.h"
 #include "os.h"
@@ -31,7 +32,7 @@ IMesh* CGeometryCreator::createHillPlaneMesh(
 		countHills.Height = 1.f;
 
 	// center
-	const core::position2d<f32> center((tileSize.Width * tileCount.Width) / 2.0f, (tileSize.Height * tileCount.Height) / 2.0f);
+	const core::position2d<f32> center((tileSize.Width * tileCount.Width) * 0.5f, (tileSize.Height * tileCount.Height) * 0.5f);
 
 	// texture coord step
 	const core::dimension2d<f32> tx(
@@ -59,9 +60,9 @@ IMesh* CGeometryCreator::createHillPlaneMesh(
 			vtx.TCoords.set(tsx, 1.0f - tsy);
 
 			if (hillHeight != 0.0f)
-				vtx.Pos.Y = (f32)(sin(vtx.Pos.X * countHills.Width * core::PI / center.X) *
-					cos(vtx.Pos.Z * countHills.Height * core::PI / center.Y))
-					*hillHeight;
+				vtx.Pos.Y = sinf(vtx.Pos.X * countHills.Width * core::PI / center.X) *
+					cosf(vtx.Pos.Z * countHills.Height * core::PI / center.Y) *
+					hillHeight;
 
 			buffer->Vertices.push_back(vtx);
 			sy += tileSize.Height;
@@ -92,14 +93,14 @@ IMesh* CGeometryCreator::createHillPlaneMesh(
 	// recalculate normals
 	for (u32 i=0; i<buffer->Indices.size(); i+=3)
 	{
-		core::plane3d<f32> p(
+		const core::vector3df normal = core::plane3d<f32>(
 			buffer->Vertices[buffer->Indices[i+0]].Pos,
 			buffer->Vertices[buffer->Indices[i+1]].Pos,
-			buffer->Vertices[buffer->Indices[i+2]].Pos);
+			buffer->Vertices[buffer->Indices[i+2]].Pos).Normal;
 
-		buffer->Vertices[buffer->Indices[i+0]].Normal = p.Normal;
-		buffer->Vertices[buffer->Indices[i+1]].Normal = p.Normal;
-		buffer->Vertices[buffer->Indices[i+2]].Normal = p.Normal;
+		buffer->Vertices[buffer->Indices[i+0]].Normal = normal;
+		buffer->Vertices[buffer->Indices[i+1]].Normal = normal;
+		buffer->Vertices[buffer->Indices[i+2]].Normal = normal;
 	}
 
 	if (material)
@@ -115,11 +116,10 @@ IMesh* CGeometryCreator::createHillPlaneMesh(
 }
 
 
-
 IMesh* CGeometryCreator::createTerrainMesh(video::IImage* texture,
 		video::IImage* heightmap, const core::dimension2d<f32>& stretchSize,
 		f32 maxHeight, video::IVideoDriver* driver,
-		const core::dimension2d<s32> maxVtxBlockSize,
+		const core::dimension2d<s32>& maxVtxBlockSize,
 		bool debugBorders)
 {
 	if (!texture || !heightmap)
@@ -136,9 +136,8 @@ IMesh* CGeometryCreator::createTerrainMesh(video::IImage* texture,
 	const u32 tm = os::Timer::getRealTime()/1000;
 	const core::dimension2d<s32> hMapSize= heightmap->getDimension();
 	const core::dimension2d<s32> tMapSize= texture->getDimension();
-	const core::position2d<f32> thRel((f32)tMapSize.Width / hMapSize.Width, (f32)tMapSize.Height / hMapSize.Height);
-
-	video::SMaterial material;
+	const core::position2d<f32> thRel(static_cast<f32>(tMapSize.Width) / hMapSize.Width, static_cast<f32>(tMapSize.Height) / hMapSize.Height);
+	maxHeight /= 255.0f; // height step per color value
 
 	core::position2d<s32> processed(0,0);
 	while (processed.Y<hMapSize.Height)
@@ -152,32 +151,39 @@ IMesh* CGeometryCreator::createTerrainMesh(video::IImage* texture,
 				blockSize.Height = hMapSize.Height - processed.Y;
 
 			SMeshBuffer* buffer = new SMeshBuffer();
-
+			buffer->setHardwareMappingHint(scene::EHM_STATIC);
+			buffer->Vertices.reallocate(blockSize.getArea());
 			// add vertices of vertex block
 			s32 y;
-
+			core::vector2df pos(0.f, processed.Y*stretchSize.Height);
+			const core::vector2df bs(1.f/blockSize.Width, 1.f/blockSize.Height);
+			core::vector2df tc(0.f, 0.5f*bs.Y);
 			for (y=0; y<blockSize.Height; ++y)
 			{
+				pos.X=processed.X*stretchSize.Width;
+				tc.X=0.5f*bs.X;
 				for (s32 x=0; x<blockSize.Width; ++x)
 				{
-					video::SColor clr = heightmap->getPixel(x+processed.X, y+processed.Y);
-					const f32 height = ((clr.getRed() + clr.getGreen() + clr.getBlue()) / 3.0f)/255.0f * maxHeight;
+					const f32 height = heightmap->getPixel(x+processed.X, y+processed.Y).getAverage() * maxHeight;
 
-					vtx.Pos.set((f32)(x+processed.X) * stretchSize.Width,
-						height, (f32)(y+processed.Y) * stretchSize.Height);
-
-					vtx.TCoords.set((x+0.5f) / blockSize.Width,
-						(y+0.5f) / blockSize.Height);
+					vtx.Pos.set(pos.X, height, pos.Y);
+					vtx.TCoords.set(tc);
 					buffer->Vertices.push_back(vtx);
+					pos.X += stretchSize.Width;
+					tc.X += bs.X;
 				}
+				pos.Y += stretchSize.Height;
+				tc.Y += bs.Y;
 			}
 
+			buffer->Indices.reallocate((blockSize.Height-1)*(blockSize.Width-1)*6);
 			// add indices of vertex block
+			s32 c1 = 0;
 			for (y=0; y<blockSize.Height-1; ++y)
 			{
 				for (s32 x=0; x<blockSize.Width-1; ++x)
 				{
-					s32 c = (y*blockSize.Width) + x;
+					const s32 c = c1 + x;
 
 					buffer->Indices.push_back(c);
 					buffer->Indices.push_back(c + blockSize.Width);
@@ -187,20 +193,20 @@ IMesh* CGeometryCreator::createTerrainMesh(video::IImage* texture,
 					buffer->Indices.push_back(c + blockSize.Width);
 					buffer->Indices.push_back(c + 1 + blockSize.Width);
 				}
+				c1 += blockSize.Width;
 			}
 
 			// recalculate normals
-			for (s32 i=0; i<(s32)buffer->Indices.size(); i+=3)
+			for (u32 i=0; i<buffer->Indices.size(); i+=3)
 			{
-				core::plane3d<f32> p(
+				const core::vector3df normal = core::plane3d<f32>(
 					buffer->Vertices[buffer->Indices[i+0]].Pos,
 					buffer->Vertices[buffer->Indices[i+1]].Pos,
-					buffer->Vertices[buffer->Indices[i+2]].Pos);
-				p.Normal.normalize();
+					buffer->Vertices[buffer->Indices[i+2]].Pos).Normal;
 
-				buffer->Vertices[buffer->Indices[i+0]].Normal = p.Normal;
-				buffer->Vertices[buffer->Indices[i+1]].Normal = p.Normal;
-				buffer->Vertices[buffer->Indices[i+2]].Normal = p.Normal;
+				buffer->Vertices[buffer->Indices[i+0]].Normal = normal;
+				buffer->Vertices[buffer->Indices[i+1]].Normal = normal;
+				buffer->Vertices[buffer->Indices[i+2]].Normal = normal;
 			}
 
 			if (buffer->Vertices.size())
@@ -213,21 +219,20 @@ IMesh* CGeometryCreator::createTerrainMesh(video::IImage* texture,
 
 				sprintf(textureName, "terrain%u_%u", tm, mesh->getMeshBufferCount());
 
-				material.setTexture(0, driver->addTexture(textureName, img));
+				buffer->Material.setTexture(0, driver->addTexture(textureName, img));
 
-				if (material.getTexture(0))
+				if (buffer->Material.getTexture(0))
 				{
 					c8 tmp[255];
 					sprintf(tmp, "Generated terrain texture (%dx%d): %s",
-						material.getTexture(0)->getSize().Width,
-						material.getTexture(0)->getSize().Height,
+						buffer->Material.getTexture(0)->getSize().Width,
+						buffer->Material.getTexture(0)->getSize().Height,
 						textureName);
 					os::Printer::log(tmp);
 				}
 				else
 					os::Printer::log("Could not create terrain texture.", textureName, ELL_ERROR);
 
-				buffer->Material = material;
 				img->drop();
 			}
 
@@ -248,6 +253,7 @@ IMesh* CGeometryCreator::createTerrainMesh(video::IImage* texture,
 	return mesh;
 }
 
+
 /*
 	a cylinder, a cone and a cross
 	point up on (0,1.f, 0.f )
@@ -261,211 +267,22 @@ IMesh* CGeometryCreator::createArrowMesh(const u32 tesselationCylinder,
 						const video::SColor vtxColor0,
 						const video::SColor vtxColor1)
 {
-	SMeshBuffer* buffer;
-	video::S3DVertex v;
-	u32 i;
+	SMesh* mesh = (SMesh*)createCylinderMesh(width0, cylinderHeight, tesselationCylinder, vtxColor0, false);
 
-	v.Color = vtxColor0;
-
-	// cylinder
-	buffer = new SMeshBuffer();
-
-	// floor, bottom
-	f32 angleStep = (core::PI * 2.f ) / tesselationCylinder;
-
-	for ( i = 0; i != tesselationCylinder; ++i )
+	IMesh* mesh2 = createConeMesh(width1, height-cylinderHeight, tesselationCone, vtxColor1, vtxColor0);
+	for (u32 i=0; i<mesh2->getMeshBufferCount(); ++i)
 	{
-		f32 angle = angleStep * f32(i);
-		v.Color = vtxColor0;
-		v.Pos.X = width0 * cosf ( angle );
-		v.Pos.Y = 0.f;
-		v.Pos.Z = width0 * sinf ( angle );
-		v.Normal = v.Pos;
-		v.Normal.normalize ();
-		buffer->Vertices.push_back ( v );
-
-		v.Pos.X = width0 * 0.5f * cosf ( angle );
-		v.Pos.Y = cylinderHeight;
-		v.Pos.Z = width0 * 0.5f * sinf ( angle );
-		v.Normal = v.Pos;
-		v.Normal.normalize ();
-		buffer->Vertices.push_back ( v );
-
-		angle += ( angleStep / 2.f );
-		v.Color = vtxColor1;
-		v.Pos.X = ( width0 * 0.75f ) * cosf ( angle );
-		v.Pos.Y = 0.f;
-		v.Pos.Z = ( width0 * 0.75f ) * sinf ( angle );
-		v.Normal = v.Pos;
-		v.Normal.normalize ();
-		buffer->Vertices.push_back ( v );
-
-		v.Pos.X = ( width0 * 0.25f ) * cosf ( angle );
-		v.Pos.Y = cylinderHeight;
-		v.Pos.Z = ( width0 * 0.25f ) * sinf ( angle );
-		v.Normal = v.Pos;
-		v.Normal.normalize ();
-		buffer->Vertices.push_back ( v );
-
+		scene::IMeshBuffer* buffer = mesh2->getMeshBuffer(i);
+		for (u32 j=0; j<buffer->getVertexCount(); ++j)
+			buffer->getPosition(j).Y += cylinderHeight;
+		mesh->addMeshBuffer(buffer);
 	}
+	mesh2->drop();
 
-	u32 nonWrappedSize = ( ( tesselationCylinder * 2 ) - 1 ) * 2;
-	for ( i = 0; i != nonWrappedSize; i += 2 )
-	{
-		buffer->Indices.push_back ( i + 2 );
-		buffer->Indices.push_back ( i + 0 );
-		buffer->Indices.push_back ( i + 1 );
-
-		buffer->Indices.push_back ( i + 2 );
-		buffer->Indices.push_back ( i + 1 );
-		buffer->Indices.push_back ( i + 3 );
-	}
-
-	buffer->Indices.push_back ( 0 );
-	buffer->Indices.push_back ( i + 0 );
-	buffer->Indices.push_back ( i + 1 );
-
-	buffer->Indices.push_back ( 0 );
-	buffer->Indices.push_back ( i + 1 );
-	buffer->Indices.push_back ( 1 );
-
-	// close down
-	v.Pos.X = 0.f;
-	v.Pos.Y = 0.f;
-	v.Pos.Z = 0.f;
-	v.Normal.X = 0.f;
-	v.Normal.Y = -1.f;
-	v.Normal.Z = 0.f;
-	buffer->Vertices.push_back ( v );
-
-	u32 index = buffer->Vertices.size () - 1;
-
-	for ( i = 0; i != nonWrappedSize; i += 2 )
-	{
-		buffer->Indices.push_back ( index );
-		buffer->Indices.push_back ( i + 0 );
-		buffer->Indices.push_back ( i + 2 );
-	}
-
-	buffer->Indices.push_back ( index );
-	buffer->Indices.push_back ( i + 0 );
-	buffer->Indices.push_back ( 0 );
-
-/*
-	// close top
-	v.Pos.X = 0.f;
-	v.Pos.Y = cylinderHeight;
-	v.Pos.Z = 0.f;
-	v.Normal.X = 0.f;
-	v.Normal.Y = 1.f;
-	v.Normal.Z = 0.f;
-	buffer->Vertices.push_back ( v );
-
-	index = buffer->Vertices.size () - 1;
-
-	for ( i = 0; i != nonWrappedSize; i += 2 )
-	{
-		buffer->Indices.push_back ( i + 1 );
-		buffer->Indices.push_back ( index );
-		buffer->Indices.push_back ( i + 3 );
-	}
-
-	buffer->Indices.push_back ( i + 1 );
-	buffer->Indices.push_back ( index );
-	buffer->Indices.push_back ( 1 );
-*/
-	// add to mesh
-	SMesh* mesh = new SMesh();
-	buffer->recalculateBoundingBox();
-	mesh->addMeshBuffer(buffer);
-	buffer->drop();
-
-	// cone
-	buffer = new SMeshBuffer();
-
-	angleStep = (core::PI * 2.f ) / tesselationCone;
-
-	v.Color = vtxColor0;
-	for ( i = 0; i != tesselationCone; ++i )
-	{
-		f32 angle = angleStep * f32(i);
-
-		v.Color = vtxColor0;
-		v.Pos.X = width1 * cosf ( angle );
-		v.Pos.Y = cylinderHeight;
-		v.Pos.Z = width1 * sinf ( angle );
-		v.Normal = v.Pos;
-		v.Normal.normalize ();
-
-		buffer->Vertices.push_back ( v );
-
-		angle += angleStep / 2.f;
-		v.Color = vtxColor1;
-		v.Pos.X = (width1 * 0.75f ) * cosf ( angle );
-		v.Pos.Y = cylinderHeight;
-		v.Pos.Z = (width1 * 0.75f ) * sinf ( angle );
-		v.Normal = v.Pos;
-		v.Normal.normalize ();
-
-		buffer->Vertices.push_back ( v );
-	}
-	nonWrappedSize = buffer->Vertices.size () - 1;
-
-	// close top
-	v.Pos.X = 0.f;
-	v.Pos.Y = height;
-	v.Pos.Z = 0.f;
-	v.Normal.X = 0.f;
-	v.Normal.Y = 1.f;
-	v.Normal.Z = 0.f;
-	buffer->Vertices.push_back ( v );
-
-	index = buffer->Vertices.size () - 1;
-
-	for ( i = 0; i != nonWrappedSize; i += 1 )
-	{
-		buffer->Indices.push_back ( i + 0 );
-		buffer->Indices.push_back ( index );
-		buffer->Indices.push_back ( i + 1 );
-	}
-
-	buffer->Indices.push_back ( i + 0 );
-	buffer->Indices.push_back ( index );
-	buffer->Indices.push_back ( 0 );
-
-	// close down
-	v.Pos.X = 0.f;
-	v.Pos.Y = cylinderHeight;
-	v.Pos.Z = 0.f;
-	v.Normal.X = 0.f;
-	v.Normal.Y = -1.f;
-	v.Normal.Z = 0.f;
-	buffer->Vertices.push_back ( v );
-
-	index = buffer->Vertices.size () - 1;
-
-	for ( i = 0; i != nonWrappedSize; i += 1 )
-	{
-		buffer->Indices.push_back ( index );
-		buffer->Indices.push_back ( i + 0 );
-		buffer->Indices.push_back ( i + 1 );
-	}
-
-	buffer->Indices.push_back ( index );
-	buffer->Indices.push_back ( i + 0 );
-	buffer->Indices.push_back ( 0 );
-
-	// add to already existing mesh
-	buffer->recalculateBoundingBox();
-	mesh->addMeshBuffer(buffer);
-	buffer->drop();
-
-	mesh->recalculateBoundingBox();
 	return mesh;
 }
 
 
-
 /* A sphere with proper normals and texture coords */
 IMesh* CGeometryCreator::createSphereMesh(f32 radius, u32 polyCountX, u32 polyCountY)
 {
@@ -481,16 +298,18 @@ IMesh* CGeometryCreator::createSphereMesh(f32 radius, u32 polyCountX, u32 polyCo
 	if (polyCountY < 2)
 		polyCountY = 2;
 	if (polyCountX * polyCountY > 32767) // prevent u16 overflow
+	{
 		if (polyCountX > polyCountY) // prevent u16 overflow
 			polyCountX = 32767/polyCountY-1;
 		else
 			polyCountY = 32767/(polyCountX+1);
+	}
 
 	u32 polyCountXPitch = polyCountX+1; // get to same vertex on next level
 	buffer->Vertices.set_used((polyCountXPitch * polyCountY) + 2);
 	buffer->Indices.set_used((polyCountX * polyCountY) * 6);
 
-	video::SColor clr(100, 255,255,255);
+	const video::SColor clr(100, 255,255,255);
 
 	u32 i=0;
 	u32 level = 0;
@@ -579,9 +398,9 @@ IMesh* CGeometryCreator::createSphereMesh(f32 radius, u32 polyCountX, u32 polyCo
 		{
 			// calculate points position
 
-			const core::vector3df pos((f32)(radius * cos(axz) * sinay),
-						(f32)(radius * cos(ay)),
-						(f32)(radius * sin(axz) * sinay));
+			const core::vector3df pos(static_cast<f32>(radius * cos(axz) * sinay),
+						static_cast<f32>(radius * cos(ay)),
+						static_cast<f32>(radius * sin(axz) * sinay));
 			// for spheres the normal is the position
 			core::vector3df normal(pos);
 			normal.normalize();
@@ -592,7 +411,7 @@ IMesh* CGeometryCreator::createSphereMesh(f32 radius, u32 polyCountX, u32 polyCo
 			if (y==0)
 			{
 				if (normal.Y != -1.0f && normal.Y != 1.0f)
-					tu = (f32)(acos(core::clamp(normal.X/sinay, -1.0, 1.0)) * 0.5 *core::RECIPROCAL_PI64);
+					tu = static_cast<f32>(acos(core::clamp(normal.X/sinay, -1.0, 1.0)) * 0.5 *core::RECIPROCAL_PI64);
 				if (normal.Z < 0.0f)
 					tu=1-tu;
 			}
@@ -601,7 +420,7 @@ IMesh* CGeometryCreator::createSphereMesh(f32 radius, u32 polyCountX, u32 polyCo
 			buffer->Vertices[i] = video::S3DVertex(pos.X, pos.Y, pos.Z,
 						normal.X, normal.Y, normal.Z,
 						clr, tu,
-						(f32)(ay*core::RECIPROCAL_PI64));
+						static_cast<f32>(ay*core::RECIPROCAL_PI64));
 			++i;
 			axz += AngleX;
 		}
@@ -635,5 +454,228 @@ IMesh* CGeometryCreator::createSphereMesh(f32 radius, u32 polyCountX, u32 polyCo
 	return mesh;
 }
 
+
+/* A cylinder with proper normals and texture coords */
+IMesh* CGeometryCreator::createCylinderMesh(f32 radius, f32 length, u32 tesselation, const video::SColor& color, bool closeTop, f32 oblique)
+{
+	SMeshBuffer* buffer = new SMeshBuffer();
+
+	const f32 recTesselation = core::reciprocal((f32)tesselation);
+	const f32 recTesselationHalf = recTesselation * 0.5f;
+	const f32 angleStep = (core::PI * 2.f ) * recTesselation;
+	const f32 angleStepHalf = angleStep*0.5f;
+
+	u32 i;
+	video::S3DVertex v;
+	v.Color = color;
+	buffer->Vertices.reallocate(tesselation*4+(closeTop?2:1));
+	buffer->Indices.reallocate((tesselation*2)*(closeTop?12:9));
+	f32 tcx = 0.f;
+	for ( i = 0; i != tesselation; ++i )
+	{
+		const f32 angle = angleStep * i;
+		v.Pos.X = radius * cosf(angle);
+		v.Pos.Y = 0.f;
+		v.Pos.Z = radius * sinf(angle);
+		v.Normal = v.Pos;
+		v.Normal.normalize();
+		v.TCoords.X=tcx;
+		v.TCoords.Y=0.f;
+		buffer->Vertices.push_back(v);
+
+		v.Pos.X += oblique;
+		v.Pos.Y = length;
+		v.Normal = v.Pos;
+		v.Normal.normalize();
+		v.TCoords.Y=1.f;
+		buffer->Vertices.push_back(v);
+
+		v.Pos.X = radius * cosf(angle + angleStepHalf);
+		v.Pos.Y = 0.f;
+		v.Pos.Z = radius * sinf(angle + angleStepHalf);
+		v.Normal = v.Pos;
+		v.Normal.normalize();
+		v.TCoords.X=tcx+recTesselationHalf;
+		v.TCoords.Y=0.f;
+		buffer->Vertices.push_back(v);
+
+		v.Pos.X += oblique;
+		v.Pos.Y = length;
+		v.Normal = v.Pos;
+		v.Normal.normalize();
+		v.TCoords.Y=1.f;
+		buffer->Vertices.push_back(v);
+		tcx += recTesselation;
+	}
+
+	const u32 nonWrappedSize = ( tesselation* 4 ) - 2;
+	for ( i = 0; i != nonWrappedSize; i += 2 )
+	{
+		buffer->Indices.push_back ( i + 2 );
+		buffer->Indices.push_back ( i + 0 );
+		buffer->Indices.push_back ( i + 1 );
+
+		buffer->Indices.push_back ( i + 2 );
+		buffer->Indices.push_back ( i + 1 );
+		buffer->Indices.push_back ( i + 3 );
+	}
+
+	buffer->Indices.push_back ( 0 );
+	buffer->Indices.push_back ( i + 0 );
+	buffer->Indices.push_back ( i + 1 );
+
+	buffer->Indices.push_back ( 0 );
+	buffer->Indices.push_back ( i + 1 );
+	buffer->Indices.push_back ( 1 );
+
+	// close down
+	v.Pos.X = 0.f;
+	v.Pos.Y = 0.f;
+	v.Pos.Z = 0.f;
+	v.Normal.X = 0.f;
+	v.Normal.Y = -1.f;
+	v.Normal.Z = 0.f;
+	v.TCoords.X = 1.f;
+	v.TCoords.Y = 1.f;
+	buffer->Vertices.push_back ( v );
+
+	u32 index = buffer->Vertices.size () - 1;
+
+	for ( i = 0; i != nonWrappedSize; i += 2 )
+	{
+		buffer->Indices.push_back ( index );
+		buffer->Indices.push_back ( i + 0 );
+		buffer->Indices.push_back ( i + 2 );
+	}
+
+	buffer->Indices.push_back ( index );
+	buffer->Indices.push_back ( i + 0 );
+	buffer->Indices.push_back ( 0 );
+
+	if (closeTop)
+	{
+		// close top
+		v.Pos.X = oblique;
+		v.Pos.Y = length;
+		v.Pos.Z = 0.f;
+		v.Normal.X = 0.f;
+		v.Normal.Y = 1.f;
+		v.Normal.Z = 0.f;
+		v.TCoords.X = 0.f;
+		v.TCoords.Y = 0.f;
+		buffer->Vertices.push_back ( v );
+
+		index = buffer->Vertices.size () - 1;
+
+		for ( i = 0; i != nonWrappedSize; i += 2 )
+		{
+			buffer->Indices.push_back ( i + 1 );
+			buffer->Indices.push_back ( index );
+			buffer->Indices.push_back ( i + 3 );
+		}
+
+		buffer->Indices.push_back ( i + 1 );
+		buffer->Indices.push_back ( index );
+		buffer->Indices.push_back ( 1 );
+	}
+
+	buffer->recalculateBoundingBox();
+	SMesh* mesh = new SMesh();
+	mesh->addMeshBuffer(buffer);
+	mesh->recalculateBoundingBox();
+	buffer->drop();
+	return mesh;
+}
+
+
+/* A cone with proper normals and texture coords */
+IMesh* CGeometryCreator::createConeMesh(f32 radius, f32 length, u32 tesselation, const video::SColor& colorTop, const video::SColor& colorBottom, f32 oblique)
+{
+	SMeshBuffer* buffer = new SMeshBuffer();
+
+	const f32 angleStep = (core::PI * 2.f ) / tesselation;
+	const f32 angleStepHalf = angleStep*0.5f;
+
+	video::S3DVertex v;
+	u32 i;
+
+	v.Color = colorTop;
+	for ( i = 0; i != tesselation; ++i )
+	{
+		f32 angle = angleStep * f32(i);
+
+		v.Pos.X = radius * cosf(angle);
+		v.Pos.Y = 0.f;
+		v.Pos.Z = radius * sinf(angle);
+		v.Normal = v.Pos;
+		v.Normal.normalize();
+		buffer->Vertices.push_back(v);
+
+		angle += angleStepHalf;
+		v.Pos.X = radius * cosf(angle);
+		v.Pos.Y = 0.f;
+		v.Pos.Z = radius * sinf(angle);
+		v.Normal = v.Pos;
+		v.Normal.normalize();
+		buffer->Vertices.push_back(v);
+	}
+	const u32 nonWrappedSize = buffer->Vertices.size() - 1;
+
+	// close top
+	v.Pos.X = oblique;
+	v.Pos.Y = length;
+	v.Pos.Z = 0.f;
+	v.Normal.X = 0.f;
+	v.Normal.Y = 1.f;
+	v.Normal.Z = 0.f;
+	buffer->Vertices.push_back(v);
+
+	u32 index = buffer->Vertices.size() - 1;
+
+	for ( i = 0; i != nonWrappedSize; i += 1 )
+	{
+		buffer->Indices.push_back ( i + 0 );
+		buffer->Indices.push_back ( index );
+		buffer->Indices.push_back ( i + 1 );
+	}
+
+	buffer->Indices.push_back(i + 0);
+	buffer->Indices.push_back(index);
+	buffer->Indices.push_back(0);
+
+	// close down
+	v.Color = colorBottom;
+	v.Pos.X = 0.f;
+	v.Pos.Y = 0.f;
+	v.Pos.Z = 0.f;
+	v.Normal.X = 0.f;
+	v.Normal.Y = -1.f;
+	v.Normal.Z = 0.f;
+	buffer->Vertices.push_back(v);
+
+	index = buffer->Vertices.size() - 1;
+
+	for ( i = 0; i != nonWrappedSize; i += 1 )
+	{
+		buffer->Indices.push_back(index);
+		buffer->Indices.push_back(i + 0);
+		buffer->Indices.push_back(i + 1);
+	}
+
+	buffer->Indices.push_back(index);
+	buffer->Indices.push_back(i + 0);
+	buffer->Indices.push_back(0);
+
+	buffer->recalculateBoundingBox();
+	SMesh* mesh = new SMesh();
+	mesh->addMeshBuffer(buffer);
+	buffer->drop();
+
+	mesh->recalculateBoundingBox();
+	return mesh;
+}
+
+
 } // end namespace scene
 } // end namespace irr
+
diff --git a/src/dep/src/irrlicht/CGeometryCreator.h b/src/dep/src/irrlicht/CGeometryCreator.h
index 4e310cc..fdad142 100644
--- a/src/dep/src/irrlicht/CGeometryCreator.h
+++ b/src/dep/src/irrlicht/CGeometryCreator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -34,7 +34,7 @@ public:
 	static IMesh* createTerrainMesh(video::IImage* texture,
 		video::IImage* heightmap, const core::dimension2d<f32>& stretchSize,
 		f32 maxHeight, video::IVideoDriver* driver,
-		const core::dimension2d<s32> defaultVertexBlockSize,
+		const core::dimension2d<s32>& defaultVertexBlockSize,
 		bool debugBorders=false);
 
 	static IMesh* createArrowMesh(const u32 tesselationCylinder,
@@ -44,6 +44,10 @@ public:
 			const video::SColor vtxColor1);
 
 	static IMesh* createSphereMesh(f32 radius, u32 polyCountX, u32 polyCountY);
+
+	static IMesh* createCylinderMesh(f32 radius, f32 length, u32 tesselation, const video::SColor& color=video::SColor(0xffffffff), bool closeTop=true, f32 oblique=0.f);
+
+	static IMesh* createConeMesh(f32 radius, f32 length, u32 tesselation, const video::SColor& colorTop=video::SColor(0xffffffff), const video::SColor& colorBottom=video::SColor(0xffffffff), f32 oblique=0.f);
 };
 
 
diff --git a/src/dep/src/irrlicht/CImage.cpp b/src/dep/src/irrlicht/CImage.cpp
index 8a0353d..916bf4b 100644
--- a/src/dep/src/irrlicht/CImage.cpp
+++ b/src/dep/src/irrlicht/CImage.cpp
@@ -1,1436 +1,1487 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "CImage.h"
-#include "irrString.h"
-#include "SoftwareDriver2_helper.h"
-#include "CColorConverter.h"
-
-namespace irr
-{
-
-	struct SBlitJob
-	{
-		AbsRectangle Dest;
-		AbsRectangle Source;
-
-		u32 argb;
-
-		void * src;
-		void * dst;
-
-		s32 width;
-		s32 height;
-
-		u32 srcPitch;
-		u32 dstPitch;
-
-		u32 srcPixelMul;
-		u32 dstPixelMul;
-	};
-
-	// Blitter Operation
-	enum eBlitter
-	{
-		BLITTER_INVALID = 0,
-		BLITTER_COLOR,
-		BLITTER_COLOR_ALPHA,
-		BLITTER_TEXTURE,
-		BLITTER_TEXTURE_ALPHA_BLEND,
-		BLITTER_TEXTURE_ALPHA_COLOR_BLEND
-	};
-
-	typedef void (*tExecuteBlit) ( const SBlitJob * job );
-
-
-	// Bitfields Cohen Sutherland
-	enum eClipCode
-	{
-		CLIPCODE_EMPTY	=	0,
-		CLIPCODE_BOTTOM	=	1,
-		CLIPCODE_TOP	=	2,
-		CLIPCODE_LEFT	=	4,
-		CLIPCODE_RIGHT	=	8
-	};
-
-inline u32 GetClipCode ( const AbsRectangle &r, const core::position2d<s32> &p )
-{
-	u32 code = CLIPCODE_EMPTY;
-
-	if ( p.X < r.x0 )
-		code = CLIPCODE_LEFT;
-	else
-	if ( p.X > r.x1 )
-		code = CLIPCODE_RIGHT;
-
-	if ( p.Y < r.y0 )
-		code |= CLIPCODE_TOP;
-	else
-	if ( p.Y > r.y1 )
-		code |= CLIPCODE_BOTTOM;
-
-	return code;
-}
-
-
-/*!
-	Cohen Sutherland clipping
-	@return: 1 if valid
-*/
-
-static int ClipLine (const AbsRectangle &clipping,
-			core::position2d<s32> &p0,
-			core::position2d<s32> &p1,
-			const core::position2d<s32>& p0_in,
-			const core::position2d<s32>& p1_in)
-{
-	u32 code0;
-	u32 code1;
-	u32 code;
-
-	p0 = p0_in;
-	p1 = p1_in;
-
-	code0 = GetClipCode ( clipping, p0 );
-	code1 = GetClipCode ( clipping, p1 );
-
-	// trivial accepted
-	while ( code0 | code1 )
-	{
-		s32 x=0;
-		s32 y=0;
-
-		// trivial reject
-		if ( code0 & code1 )
-			return 0;
-
-		if ( code0 )
-		{
-			// clip first point
-			code = code0;
-		}
-		else
-		{
-			// clip last point
-			code = code1;
-		}
-
-		if ( (code & CLIPCODE_BOTTOM) == CLIPCODE_BOTTOM )
-		{
-			// clip bottom viewport
-			y = clipping.y1;
-			x = p0.X + ( p1.X - p0.X ) * ( y - p0.Y ) / ( p1.Y - p0.Y );
-		}
-		else
-		if ( (code & CLIPCODE_TOP) == CLIPCODE_TOP )
-		{
-			// clip to viewport
-			y = clipping.y0;
-			x = p0.X + ( p1.X - p0.X ) * ( y - p0.Y ) / ( p1.Y - p0.Y );
-		}
-		else
-		if ( (code & CLIPCODE_RIGHT) == CLIPCODE_RIGHT )
-		{
-			// clip right viewport
-			x = clipping.x1;
-			y = p0.Y + ( p1.Y - p0.Y ) * ( x - p0.X ) / ( p1.X - p0.X );
-		}
-		else
-		if ( (code & CLIPCODE_LEFT) == CLIPCODE_LEFT )
-		{
-			// clip left viewport
-			x = clipping.x0;
-			y = p0.Y + ( p1.Y - p0.Y ) * ( x - p0.X ) / ( p1.X - p0.X );
-		}
-
-		if ( code == code0 )
-		{
-			// modify first point
-			p0.X = x;
-			p0.Y = y;
-			code0 = GetClipCode ( clipping, p0 );
-		}
-		else
-		{
-			// modify second point
-			p1.X = x;
-			p1.Y = y;
-			code1 = GetClipCode ( clipping, p1 );
-		}
-	}
-
-	return 1;
-}
-
-/*
-*/
-inline void GetClip(AbsRectangle &clipping, video::IImage * t)
-{
-	clipping.x0 = 0;
-	clipping.y0 = 0;
-	clipping.x1 = t->getDimension().Width - 1;
-	clipping.y1 = t->getDimension().Height - 1;
-}
-
-/*
-*/
-static void RenderLine32_Decal(video::IImage *t,
-				const core::position2d<s32> &p0,
-				const core::position2d<s32> &p1,
-				u32 argb )
-{
-	s32 dx = p1.X - p0.X;
-	s32 dy = p1.Y - p0.Y;
-
-	s32 c;
-	s32 m;
-	s32 d = 0;
-	s32 run;
-
-	s32 xInc = 4;
-	s32 yInc = (s32) t->getPitch();
-
-	if ( dx < 0 )
-	{
-		xInc = -xInc;
-		dx = -dx;
-	}
-
-	if ( dy < 0 )
-	{
-		yInc = -yInc;
-		dy = -dy;
-	}
-
-	u32 *dst;
-	dst = (u32*) ( (u8*) t->lock() + ( p0.Y * t->getPitch() ) + ( p0.X << 2 ) );
-
-	if ( dy > dx )
-	{
-		s32 tmp;
-		tmp = dx;
-		dx = dy;
-		dy = tmp;
-		tmp = xInc;
-		xInc = yInc;
-		yInc = tmp;
-	}
-
-	c = dx << 1;
-	m = dy << 1;
-
-	run = dx;
-	while ( run )
-	{
-		*dst = argb;
-
-		dst = (u32*) ( (u8*) dst + xInc );	// x += xInc
-		d += m;
-		if ( d > dx )
-		{
-			dst = (u32*) ( (u8*) dst + yInc );	// y += yInc
-			d -= c;
-		}
-		run -= 1;
-	}
-
-	t->unlock();
-}
-
-
-/*
-*/
-static void RenderLine32_Blend(video::IImage *t,
-				const core::position2d<s32> &p0,
-				const core::position2d<s32> &p1,
-				u32 argb, u32 alpha)
-{
-	s32 dx = p1.X - p0.X;
-	s32 dy = p1.Y - p0.Y;
-
-	s32 c;
-	s32 m;
-	s32 d = 0;
-	s32 run;
-
-	s32 xInc = 4;
-	s32 yInc = (s32) t->getPitch();
-
-	if ( dx < 0 )
-	{
-		xInc = -xInc;
-		dx = -dx;
-	}
-
-	if ( dy < 0 )
-	{
-		yInc = -yInc;
-		dy = -dy;
-	}
-
-	u32 *dst;
-	dst = (u32*) ( (u8*) t->lock() + ( p0.Y * t->getPitch() ) + ( p0.X << 2 ) );
-
-	if ( dy > dx )
-	{
-		s32 tmp;
-		tmp = dx;
-		dx = dy;
-		dy = tmp;
-		tmp = xInc;
-		xInc = yInc;
-		yInc = tmp;
-	}
-
-	c = dx << 1;
-	m = dy << 1;
-
-	run = dx;
-	while ( run )
-	{
-		*dst = PixelBlend32 ( *dst, argb, alpha );
-
-		dst = (u32*) ( (u8*) dst + xInc );	// x += xInc
-		d += m;
-		if ( d > dx )
-		{
-			dst = (u32*) ( (u8*) dst + yInc );	// y += yInc
-			d -= c;
-		}
-		run -= 1;
-	}
-
-	t->unlock();
-}
-
-/*
-*/
-static void RenderLine16_Decal (video::IImage *t,
-				const core::position2d<s32> &p0,
-				const core::position2d<s32> &p1,
-				u32 argb )
-{
-	s32 dx = p1.X - p0.X;
-	s32 dy = p1.Y - p0.Y;
-
-	s32 c;
-	s32 m;
-	s32 d = 0;
-	s32 run;
-
-	s32 xInc = 2;
-	s32 yInc = (s32) t->getPitch();
-
-	if ( dx < 0 )
-	{
-		xInc = -xInc;
-		dx = -dx;
-	}
-
-	if ( dy < 0 )
-	{
-		yInc = -yInc;
-		dy = -dy;
-	}
-
-	u16 *dst;
-	dst = (u16*) ( (u8*) t->lock() + ( p0.Y * t->getPitch() ) + ( p0.X << 1 ) );
-
-	if ( dy > dx )
-	{
-		s32 tmp;
-		tmp = dx;
-		dx = dy;
-		dy = tmp;
-		tmp = xInc;
-		xInc = yInc;
-		yInc = tmp;
-	}
-
-	c = dx << 1;
-	m = dy << 1;
-
-	run = dx;
-	while ( run )
-	{
-		*dst = argb;
-
-		dst = (u16*) ( (u8*) dst + xInc );	// x += xInc
-		d += m;
-		if ( d > dx )
-		{
-			dst = (u16*) ( (u8*) dst + yInc );	// y += yInc
-			d -= c;
-		}
-		run -= 1;
-	}
-
-	t->unlock();
-}
-
-/*
-*/
-static void RenderLine16_Blend (video::IImage *t,
-				const core::position2d<s32> &p0,
-				const core::position2d<s32> &p1,
-				u32 argb,
-				u32 alpha)
-{
-	s32 dx = p1.X - p0.X;
-	s32 dy = p1.Y - p0.Y;
-
-	s32 c;
-	s32 m;
-	s32 d = 0;
-	s32 run;
-
-	s32 xInc = 2;
-	s32 yInc = (s32) t->getPitch();
-
-	if ( dx < 0 )
-	{
-		xInc = -xInc;
-		dx = -dx;
-	}
-
-	if ( dy < 0 )
-	{
-		yInc = -yInc;
-		dy = -dy;
-	}
-
-	u16 *dst;
-	dst = (u16*) ( (u8*) t->lock() + ( p0.Y * t->getPitch() ) + ( p0.X << 1 ) );
-
-	if ( dy > dx )
-	{
-		s32 tmp;
-		tmp = dx;
-		dx = dy;
-		dy = tmp;
-		tmp = xInc;
-		xInc = yInc;
-		yInc = tmp;
-	}
-
-	c = dx << 1;
-	m = dy << 1;
-
-	run = dx;
-	while ( run )
-	{
-		*dst = PixelBlend16 ( *dst, argb, alpha );
-
-		dst = (u16*) ( (u8*) dst + xInc );	// x += xInc
-		d += m;
-		if ( d > dx )
-		{
-			dst = (u16*) ( (u8*) dst + yInc );	// y += yInc
-			d -= c;
-		}
-		run -= 1;
-	}
-
-	t->unlock();
-}
-
-
-/*!
-*/
-static void executeBlit_TextureCopy_x_to_x ( const SBlitJob * job )
-{
-	const void *src = (void*) job->src;
-	void *dst = (void*) job->dst;
-
-	const u32 widthPitch = job->width * job->dstPixelMul;
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		memcpy ( dst, src, widthPitch );
-
-		src = (void*) ( (u8*) (src) + job->srcPitch );
-		dst = (void*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-
-/*!
-*/
-static void executeBlit_TextureCopy_32_to_16 ( const SBlitJob * job )
-{
-	const u32 *src = static_cast<const u32*>(job->src);
-	u16 *dst = static_cast<u16*>(job->dst);
-
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		for ( s32 dx = 0; dx != job->width; ++dx )
-		{
-			//16 bit Blitter depends on pre-multiplied color
-			const u32 s = PixelLerp32 ( src[dx] | 0xFF000000, extractAlpha ( src[dx] ) );
-			dst[dx] = video::A8R8G8B8toA1R5G5B5 ( s );
-		}
-
-		src = (u32*) ( (u8*) (src) + job->srcPitch );
-		dst = (u16*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-/*!
-*/
-static void executeBlit_TextureCopy_24_to_16 ( const SBlitJob * job )
-{
-	const void *src = (void*) job->src;
-	u16 *dst = (u16*) job->dst;
-
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		u8 * s = (u8*) src;
-
-		for ( s32 dx = 0; dx != job->width; ++dx )
-		{
-			dst[dx] = video::RGB16(s[0], s[1], s[2]);
-			s += 3;
-		}
-
-		src = (void*) ( (u8*) (src) + job->srcPitch );
-		dst = (u16*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-
-/*!
-*/
-static void executeBlit_TextureCopy_16_to_32 ( const SBlitJob * job )
-{
-	const u16 *src = (u16*) job->src;
-	u32 *dst = (u32*) job->dst;
-
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		for ( s32 dx = 0; dx != job->width; ++dx )
-		{
-			dst[dx] = video::A1R5G5B5toA8R8G8B8 ( src[dx] );
-		}
-
-		src = (u16*) ( (u8*) (src) + job->srcPitch );
-		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-/*!
-*/
-static void executeBlit_TextureCopy_24_to_32 ( const SBlitJob * job )
-{
-	void *src = (void*) job->src;
-	u32 *dst = (u32*) job->dst;
-
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		u8 * s = (u8*) src;
-
-		for ( s32 dx = 0; dx != job->width; ++dx )
-		{
-			dst[dx] = 0xFF000000 | s[0] << 16 | s[1] << 8 | s[2];
-			s += 3;
-		}
-
-		src = (void*) ( (u8*) (src) + job->srcPitch );
-		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-
-/*!
-*/
-static void executeBlit_TextureBlend_16_to_16 ( const SBlitJob * job )
-{
-	u32 dx;
-	s32 dy;
-
-	u32 *src = (u32*) job->src;
-	u32 *dst = (u32*) job->dst;
-
-
-	const u32 rdx = job->width >> 1;
-	const u32 off = core::if_c_a_else_b ( job->width & 1 ,job->width - 1, 0 );
-
-
-	if ( 0 == off )
-	{
-		for ( dy = 0; dy != job->height; ++dy )
-		{
-			for ( dx = 0; dx != rdx; ++dx )
-			{
-				dst[dx] = PixelBlend16_simd ( dst[dx], src[dx] );
-			}
-
-			src = (u32*) ( (u8*) (src) + job->srcPitch );
-			dst = (u32*) ( (u8*) (dst) + job->dstPitch );
-		}
-
-	}
-	else
-	{
-		for ( dy = 0; dy != job->height; ++dy )
-		{
-			for ( dx = 0; dx != rdx; ++dx )
-			{
-				dst[dx] = PixelBlend16_simd ( dst[dx], src[dx] );
-			}
-
-			((u16*) dst)[off] = PixelBlend16 ( ((u16*) dst)[off], ((u16*) src)[off] );
-
-			src = (u32*) ( (u8*) (src) + job->srcPitch );
-			dst = (u32*) ( (u8*) (dst) + job->dstPitch );
-		}
-
-	}
-}
-
-/*!
-*/
-static void executeBlit_TextureBlend_32_to_32 ( const SBlitJob * job )
-{
-	u32 *src = (u32*) job->src;
-	u32 *dst = (u32*) job->dst;
-
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		for ( s32 dx = 0; dx != job->width; ++dx )
-		{
-			dst[dx] = PixelBlend32 ( dst[dx], src[dx] );
-		}
-		src = (u32*) ( (u8*) (src) + job->srcPitch );
-		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-/*!
-*/
-static void executeBlit_TextureBlendColor_16_to_16 ( const SBlitJob * job )
-{
-	u16 *src = (u16*) job->src;
-	u16 *dst = (u16*) job->dst;
-
-	u16 blend = video::A8R8G8B8toA1R5G5B5 ( job->argb );
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		for ( s32 dx = 0; dx != job->width; ++dx )
-		{
-			dst[dx] = PixelBlend16 ( dst[dx], PixelMul16_2 ( src[dx], blend ) );
-		}
-		src = (u16*) ( (u8*) (src) + job->srcPitch );
-		dst = (u16*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-
-/*!
-*/
-static void executeBlit_TextureBlendColor_32_to_32 ( const SBlitJob * job )
-{
-	u32 *src = (u32*) job->src;
-	u32 *dst = (u32*) job->dst;
-
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		for ( s32 dx = 0; dx != job->width; ++dx )
-		{
-			dst[dx] = PixelBlend32 ( dst[dx], PixelMul32_2 ( src[dx], job->argb ) );
-		}
-		src = (u32*) ( (u8*) (src) + job->srcPitch );
-		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-/*!
-*/
-static void executeBlit_Color_16_to_16 ( const SBlitJob * job )
-{
-	u16 *dst = (u16*) job->dst;
-
-	u16 c0 = video::A8R8G8B8toA1R5G5B5 ( job->argb );
-	u32 c = c0 | c0 << 16;
-
-	if ( 0 == (job->srcPitch & 3 ) )
-	{
-		for ( s32 dy = 0; dy != job->height; ++dy )
-		{
-			memset32 ( dst, c, job->srcPitch );
-			dst = (u16*) ( (u8*) (dst) + job->dstPitch );
-		}
-	}
-	else
-	{
-		s32 dx = job->width - 1;
-
-		for ( s32 dy = 0; dy != job->height; ++dy )
-		{
-			memset32 ( dst, c, job->srcPitch );
-			dst[dx] = c0;
-			dst = (u16*) ( (u8*) (dst) + job->dstPitch );
-		}
-
-	}
-}
-
-/*!
-*/
-static void executeBlit_Color_32_to_32 ( const SBlitJob * job )
-{
-	u32 *dst = (u32*) job->dst;
-
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		memset32 ( dst, job->argb, job->srcPitch );
-		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-/*!
-*/
-static void executeBlit_ColorAlpha_16_to_16 ( const SBlitJob * job )
-{
-	u16 *dst = (u16*) job->dst;
-
-	const u32 alpha = extractAlpha ( job->argb ) >> 3;
-	const u32 src = video::A8R8G8B8toA1R5G5B5 ( job->argb );
-
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		for ( s32 dx = 0; dx != job->width; ++dx )
-		{
-			dst[dx] = PixelBlend16 ( dst[dx], src, alpha );
-		}
-		dst = (u16*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-/*!
-*/
-static void executeBlit_ColorAlpha_32_to_32 ( const SBlitJob * job )
-{
-	u32 *dst = (u32*) job->dst;
-
-	const u32 alpha = extractAlpha ( job->argb );
-	const u32 src = job->argb;
-
-	for ( s32 dy = 0; dy != job->height; ++dy )
-	{
-		for ( s32 dx = 0; dx != job->width; ++dx )
-		{
-			dst[dx] = PixelBlend32 ( dst[dx], src, alpha );
-		}
-		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
-	}
-}
-
-/*!
-*/
-static tExecuteBlit getBlitter ( eBlitter operation,const video::IImage * dest,const video::IImage * source )
-{
-	video::ECOLOR_FORMAT sourceFormat = (video::ECOLOR_FORMAT) -1;
-	video::ECOLOR_FORMAT destFormat = (video::ECOLOR_FORMAT) -1;
-
-	if ( source )
-		sourceFormat = source->getColorFormat ();
-
-	if ( dest )
-		destFormat = dest->getColorFormat ();
-
-	switch ( operation )
-	{
-		case BLITTER_TEXTURE:
-		{
-			if ( sourceFormat == destFormat )
-				return executeBlit_TextureCopy_x_to_x;
-
-			if ( destFormat == video::ECF_A1R5G5B5 && sourceFormat == video::ECF_A8R8G8B8 )
-				return executeBlit_TextureCopy_32_to_16;
-
-			if ( destFormat == video::ECF_A1R5G5B5 && sourceFormat == video::ECF_R8G8B8 )
-				return executeBlit_TextureCopy_24_to_16;
-
-			if ( destFormat == video::ECF_A8R8G8B8 && sourceFormat == video::ECF_A1R5G5B5 )
-				return executeBlit_TextureCopy_16_to_32;
-
-			if ( destFormat == video::ECF_A8R8G8B8 && sourceFormat == video::ECF_R8G8B8 )
-				return executeBlit_TextureCopy_24_to_32;
-
-		} break;
-
-		case BLITTER_TEXTURE_ALPHA_BLEND:
-		{
-			if ( destFormat == video::ECF_A1R5G5B5 && sourceFormat == video::ECF_A1R5G5B5 )
-				return executeBlit_TextureBlend_16_to_16;
-
-			if ( destFormat == video::ECF_A8R8G8B8 && sourceFormat == video::ECF_A8R8G8B8 )
-				return executeBlit_TextureBlend_32_to_32;
-
-		} break;
-
-		case BLITTER_TEXTURE_ALPHA_COLOR_BLEND:
-		{
-			if ( destFormat == video::ECF_A1R5G5B5 && sourceFormat == video::ECF_A1R5G5B5 )
-				return executeBlit_TextureBlendColor_16_to_16;
-
-			if ( destFormat == video::ECF_A8R8G8B8 && sourceFormat == video::ECF_A8R8G8B8 )
-				return executeBlit_TextureBlendColor_32_to_32;
-		} break;
-
-		case BLITTER_COLOR:
-		{
-			if ( destFormat == video::ECF_A1R5G5B5 )
-				return executeBlit_Color_16_to_16;
-
-			if ( destFormat == video::ECF_A8R8G8B8 )
-				return executeBlit_Color_32_to_32;
-		} break;
-
-		case BLITTER_COLOR_ALPHA:
-		{
-			if ( destFormat == video::ECF_A1R5G5B5 )
-				return executeBlit_ColorAlpha_16_to_16;
-
-			if ( destFormat == video::ECF_A8R8G8B8 )
-				return executeBlit_ColorAlpha_32_to_32;
-
-		} break;
-
-		case BLITTER_INVALID:
-		break;
-	}
-/*
-	char buf[64];
-	sprintf ( buf, "Blit: %d %d->%d unsupported",operation,sourceFormat,destFormat );
-	os::Printer::log (buf );
-*/
-	return 0;
-
-}
-
-
-
-/*!
-	a generic 2D Blitter
-*/
-static s32 Blit (	eBlitter operation,
-			video::IImage * dest,
-			const core::rect<s32> *destClipping,
-			const core::position2d<s32> *destPos,
-			video::IImage * const source,
-			const core::rect<s32> *sourceClipping,
-			u32 argb
-			)
-{
-	tExecuteBlit blitter = getBlitter ( operation, dest, source );
-	if ( 0 == blitter )
-	{
-		return 0;
-	}
-
-	// Clipping
-	AbsRectangle sourceClip;
-	AbsRectangle destClip;
-	AbsRectangle v;
-
-	SBlitJob job;
-
-	if ( sourceClipping )
-	{
-		sourceClip.x0 = sourceClipping->UpperLeftCorner.X;
-		sourceClip.y0 = sourceClipping->UpperLeftCorner.Y;
-		sourceClip.x1 = sourceClipping->LowerRightCorner.X;
-		sourceClip.y1 = sourceClipping->LowerRightCorner.Y;
-	}
-	else
-	{
-		sourceClip.x0 = 0;
-		sourceClip.y0 = 0;
-		sourceClip.x1 = source ? source->getDimension().Width : 0;
-		sourceClip.y1 = source ? source->getDimension().Height : 0;
-	}
-
-	if ( destClipping )
-	{
-		destClip.x0 = destClipping->UpperLeftCorner.X;
-		destClip.y0 = destClipping->UpperLeftCorner.Y;
-		destClip.x1 = destClipping->LowerRightCorner.X;
-		destClip.y1 = destClipping->LowerRightCorner.Y;
-	}
-	else
-	{
-		destClip.x0 = 0;
-		destClip.y0 = 0;
-		destClip.x1 = dest ? dest->getDimension().Width : 0;
-		destClip.y1 = dest ? dest->getDimension().Height : 0;
-	}
-
-	v.x0 = destPos ? destPos->X : 0;
-	v.y0 = destPos ? destPos->Y : 0;
-	v.x1 = v.x0 + ( sourceClip.x1 - sourceClip.x0 );
-	v.y1 = v.y0 + ( sourceClip.y1 - sourceClip.y0 );
-
-	intersect ( job.Dest, destClip, v );
-	if ( !isValid ( job.Dest ) )
-		return 0;
-
-	job.width = job.Dest.x1 - job.Dest.x0;
-	job.height = job.Dest.y1 - job.Dest.y0;
-
-
-	job.Source.x0 = sourceClip.x0 + ( job.Dest.x0 - v.x0 );
-	job.Source.x1 = job.Source.x0 + job.width;
-
-	job.Source.y0 = sourceClip.y0 + ( job.Dest.y0 - v.y0 );
-	job.Source.y1 = job.Source.y0 + job.height;
-
-	job.argb = argb;
-
-	if ( source )
-	{
-		job.srcPitch = source->getPitch();
-		job.srcPixelMul = source->getBytesPerPixel();
-		job.src = (void*) ( (u8*) source->lock() + ( job.Source.y0 * job.srcPitch ) + ( job.Source.x0 * job.srcPixelMul ) );
-	}
-	else
-	{
-		// use srcPitch for color operation on dest
-		job.srcPitch = job.width * dest->getBytesPerPixel();
-	}
-
-	job.dstPitch = dest->getPitch();
-	job.dstPixelMul = dest->getBytesPerPixel();
-	job.dst = (void*) ( (u8*) dest->lock() + ( job.Dest.y0 * job.dstPitch ) + ( job.Dest.x0 * job.dstPixelMul ) );
-
-	blitter ( &job );
-
-	if ( source )
-		source->unlock ();
-
-	if ( dest )
-		dest->unlock();
-
-	return 1;
-}
-
-}
-
-namespace irr
-{
-namespace video
-{
-
-//! constructor
-CImage::CImage(ECOLOR_FORMAT format, const core::dimension2d<s32>& size)
-:Data(0), Size(size), Format(format), DeleteMemory(true)
-{
-	initData();
-}
-
-
-//! constructor
-CImage::CImage(ECOLOR_FORMAT format, const core::dimension2d<s32>& size, void* data,
-			bool ownForeignMemory, bool deleteForeignMemory)
-: Data(0), Size(size), Format(format), DeleteMemory(deleteForeignMemory)
-{
-	if (ownForeignMemory)
-	{
-		Data = (void*)0xbadf00d;
-		initData();
-		Data = data;
-	}
-	else
-	{
-		Data = 0;
-		initData();
-		memcpy(Data, data, Size.Height * Pitch);
-	}
-}
-
-
-
-//! constructor
-CImage::CImage(ECOLOR_FORMAT format, IImage* imageToCopy)
-: Data(0), Format(format), DeleteMemory(true)
-{
-	if (!imageToCopy)
-		return;
-
-	Size = imageToCopy->getDimension();
-	initData();
-
-	// now copy data from other image
-
-	Blit ( BLITTER_TEXTURE, this, 0, 0, imageToCopy, 0,0 );
-}
-
-
-
-//! constructor
-CImage::CImage(IImage* imageToCopy, const core::position2d<s32>& pos,
-		const core::dimension2d<s32>& size)
-	: Data(0), Size(0,0), DeleteMemory(true)
-{
-	if (!imageToCopy)
-		return;
-
-	Format = imageToCopy->getColorFormat();
-	Size = size;
-
-	initData();
-
-	core::rect<s32> sClip( pos.X, pos.Y, pos.X + size.Width,pos.Y + size.Height );
-	Blit (	BLITTER_TEXTURE, this, 0, 0, imageToCopy, &sClip,0 );
-}
-
-
-
-//! assumes format and size has been set and creates the rest
-void CImage::initData()
-{
-	setBitMasks();
-	BitsPerPixel = getBitsPerPixelFromFormat(Format);
-	BytesPerPixel = BitsPerPixel / 8;
-
-	// Pitch should be aligned...
-	Pitch = BytesPerPixel * Size.Width;
-
-	if (!Data)
-		Data = new s8[Size.Height * Pitch];
-}
-
-
-//! destructor
-CImage::~CImage()
-{
-	if ( DeleteMemory )
-		delete [] (s8*)Data;
-}
-
-
-//! Returns width and height of image data.
-const core::dimension2d<s32>& CImage::getDimension() const
-{
-	return Size;
-}
-
-
-
-//! Returns bits per pixel.
-u32 CImage::getBitsPerPixel() const
-{
-	return BitsPerPixel;
-}
-
-
-//! Returns bytes per pixel
-u32 CImage::getBytesPerPixel() const
-{
-	return BytesPerPixel;
-}
-
-
-
-//! Returns image data size in bytes
-u32 CImage::getImageDataSizeInBytes() const
-{
-	return Pitch * Size.Height;
-}
-
-
-
-//! Returns image data size in pixels
-u32 CImage::getImageDataSizeInPixels() const
-{
-	return Size.Width * Size.Height;
-}
-
-
-
-//! returns mask for red value of a pixel
-u32 CImage::getRedMask() const
-{
-	return RedMask;
-}
-
-
-
-//! returns mask for green value of a pixel
-u32 CImage::getGreenMask() const
-{
-	return GreenMask;
-}
-
-
-
-//! returns mask for blue value of a pixel
-u32 CImage::getBlueMask() const
-{
-	return BlueMask;
-}
-
-
-
-//! returns mask for alpha value of a pixel
-u32 CImage::getAlphaMask() const
-{
-	return AlphaMask;
-}
-
-
-void CImage::setBitMasks()
-{
-	switch(Format)
-	{
-	case ECF_A1R5G5B5:
-		AlphaMask = 0x1<<15;
-		RedMask = 0x1F<<10;
-		GreenMask = 0x1F<<5;
-		BlueMask = 0x1F;
-	break;
-	case ECF_R5G6B5:
-		AlphaMask = 0x0;
-		RedMask = 0x1F<<11;
-		GreenMask = 0x3F<<5;
-		BlueMask = 0x1F;
-	break;
-	case ECF_R8G8B8:
-		AlphaMask = 0x0;
-		RedMask   = 0x00FF0000;
-		GreenMask = 0x0000FF00;
-		BlueMask  = 0x000000FF;
-	break;
-	case ECF_A8R8G8B8:
-		AlphaMask = 0xFF000000;
-		RedMask   = 0x00FF0000;
-		GreenMask = 0x0000FF00;
-		BlueMask  = 0x000000FF;
-	break;
-	}
-}
-
-
-u32 CImage::getBitsPerPixelFromFormat(ECOLOR_FORMAT format)
-{
-	switch(format)
-	{
-	case ECF_A1R5G5B5:
-		return 16;
-	case ECF_R5G6B5:
-		return 16;
-	case ECF_R8G8B8:
-		return 24;
-	case ECF_A8R8G8B8:
-		return 32;
-	}
-
-	return 0;
-}
-
-//! sets a pixel
-void CImage::setPixel(u32 x, u32 y, const SColor &color )
-{
-	if (x >= (u32)Size.Width || y >= (u32)Size.Height)
-		return;
-
-	switch(Format)
-	{
-		case ECF_A1R5G5B5:
-		{
-			u16 * dest = (u16*) ((u8*) Data + ( y * Pitch ) + ( x << 1 ));
-			*dest = video::A8R8G8B8toA1R5G5B5 ( color.color );
-		} break;
-
-		case ECF_R5G6B5:
-		{
-			u16 * dest = (u16*) ((u8*) Data + ( y * Pitch ) + ( x << 1 ));
-			*dest = video::A8R8G8B8toR5G6B5 ( color.color );
-		} break;
-
-		case ECF_R8G8B8:
-		{
-			u8* dest = (u8*) Data + ( y * Pitch ) + ( x * 3 );
-			dest[0] = color.getRed();
-			dest[1] = color.getGreen();
-			dest[2] = color.getBlue();
-		} break;
-
-		case ECF_A8R8G8B8:
-		{
-			u32 * dest = (u32*) ((u8*) Data + ( y * Pitch ) + ( x << 2 ));
-			*dest = color.color;
-		} break;
-	}
-}
-
-
-//! returns a pixel
-SColor CImage::getPixel(u32 x, u32 y) const
-{
-	if (x >= (u32)Size.Width || y >= (u32)Size.Height)
-		return SColor(0);
-
-	switch(Format)
-	{
-	case ECF_A1R5G5B5:
-		return A1R5G5B5toA8R8G8B8(((u16*)Data)[y*Size.Width + x]);
-	case ECF_R5G6B5:
-		return R5G6B5toA8R8G8B8(((u16*)Data)[y*Size.Width + x]);
-	case ECF_A8R8G8B8:
-		return ((u32*)Data)[y*Size.Width + x];
-	case ECF_R8G8B8:
-		{
-			u8* p = &((u8*)Data)[(y*3)*Size.Width + (x*3)];
-			return SColor(255,p[0],p[1],p[2]);
-		}
-	}
-
-	return SColor(0);
-}
-
-
-//! returns the color format
-ECOLOR_FORMAT CImage::getColorFormat() const
-{
-	return Format;
-}
-
-//! draws a rectangle
-void CImage::drawRectangle(const core::rect<s32>& rect, const SColor &color)
-{
-	Blit (	color.getAlpha() == 0xFF ? BLITTER_COLOR : BLITTER_COLOR_ALPHA,
-			this, 0, &rect.UpperLeftCorner, 0, &rect, color.color );
-}
-
-
-//! copies this surface into another
-void CImage::copyTo(IImage* target, const core::position2d<s32>& pos)
-{
-	Blit (	BLITTER_TEXTURE, target, 0, &pos, this, 0, 0 );
-}
-
-
-//! copies this surface into another
-void CImage::copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect)
-{
-	Blit (	BLITTER_TEXTURE, target, clipRect, &pos, this, &sourceRect, 0 );
-}
-
-
-
-//! copies this surface into another, using the alpha mask, an cliprect and a color to add with
-void CImage::copyToWithAlpha(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const SColor &color, const core::rect<s32>* clipRect)
-{
-	// color blend only necessary on not full spectrum aka. color.color != 0xFFFFFFFF
-	Blit (	color.color == 0xFFFFFFFF ? BLITTER_TEXTURE_ALPHA_BLEND: BLITTER_TEXTURE_ALPHA_COLOR_BLEND,
-			target, clipRect, &pos, this, &sourceRect, color.color );
-}
-
-
-
-//! draws a line from to with color
-void CImage::drawLine(const core::position2d<s32>& from, const core::position2d<s32>& to, const SColor &color)
-{
-	AbsRectangle clip;
-	GetClip ( clip, this );
-
-	core::position2d<s32> p[2];
-
-	if ( ClipLine ( clip, p[0], p[1], from, to ) )
-	{
-		u32 alpha = extractAlpha ( color.color );
-
-		switch ( Format )
-		{
-			case ECF_A1R5G5B5:
-				if ( alpha == 256 )
-				{
-					RenderLine16_Decal ( this, p[0], p[1], video::A8R8G8B8toA1R5G5B5 ( color.color ) );
-				}
-				else
-				{
-					RenderLine16_Blend ( this, p[0], p[1], video::A8R8G8B8toA1R5G5B5 ( color.color ), alpha >> 3 );
-				}
-				break;
-			case ECF_A8R8G8B8:
-				if ( alpha == 256 )
-				{
-					RenderLine32_Decal ( this, p[0], p[1], color.color );
-				}
-				else
-				{
-					RenderLine32_Blend ( this, p[0], p[1], color.color, alpha );
-				}
-				break;
-		}
-	}
-}
-
-
-
-//! copies this surface into another, scaling it to the target image size
-// note: this is very very slow. (i didn't want to write a fast version.
-// but hopefully, nobody wants to scale surfaces every frame.
-void CImage::copyToScaling(void* target, s32 width, s32 height, ECOLOR_FORMAT format, u32 pitch)
-{
-	if (!target || !width || !height)
-		return;
-
-	const u32 bpp=getBitsPerPixelFromFormat(format)/8;
-	if (0==pitch)
-		pitch = width*bpp;
-
-	if (Format==format && Size.Width==width && Size.Height==height)
-	{
-		if (pitch==Pitch)
-		{
-			memcpy(target, Data, height*pitch);
-			return;
-		}
-		else
-		{
-			u8* tgtpos = (u8*) target;
-			u8* dstpos = (u8*) Data;
-			const u32 bwidth = width*bpp;
-			for (s32 y=0; y<height; ++y)
-			{
-				memcpy(target, Data, height*pitch);
-				memset(tgtpos+width, 0, pitch-bwidth);
-				tgtpos += pitch;
-				dstpos += Pitch;
-			}
-			return;
-		}
-	}
-
-	const f32 sourceXStep = (f32)Size.Width / (f32)width;
-	const f32 sourceYStep = (f32)Size.Height / (f32)height;
-	s32 yval=0, syval=0;
-	f32 sy = 0.0f;
-	for (s32 y=0; y<height; ++y)
-	{
-		f32 sx = 0.0f;
-		for (s32 x=0; x<width; ++x)
-		{
-			CColorConverter::convert_viaFormat(((u8*)Data)+ syval + ((s32)sx)*BytesPerPixel, Format, 1, ((u8*)target)+ yval + (x*bpp), format);
-			sx+=sourceXStep;
-		}
-		sy+=sourceYStep;
-		syval=((s32)sy)*Pitch;
-		yval+=pitch;
-	}
-}
-
-//! copies this surface into another, scaling it to the target image size
-// note: this is very very slow. (i didn't want to write a fast version.
-// but hopefully, nobody wants to scale surfaces every frame.
-void CImage::copyToScaling(IImage* target)
-{
-	if (!target)
-		return;
-
-	const core::dimension2d<s32>& targetSize = target->getDimension();
-
-	if (targetSize==Size)
-	{
-		copyTo(target);
-		return;
-	}
-
-	copyToScaling(target->lock(), targetSize.Width, targetSize.Height, target->getColorFormat());
-	target->unlock();
-}
-
-//! copies this surface into another, scaling it to fit it.
-void CImage::copyToScalingBoxFilter(IImage* target, s32 bias)
-{
-	const core::dimension2d<s32> destSize = target->getDimension();
-
-	const f32 sourceXStep = (f32) Size.Width / (f32) destSize.Width;
-	const f32 sourceYStep = (f32) Size.Height / (f32) destSize.Height;
-
-	target->lock();
-
-	s32 fx = core::ceil32 ( sourceXStep );
-	s32 fy = core::ceil32 ( sourceYStep );
-	f32 sx;
-	f32 sy;
-
-	sy = 0.f;
-	for ( s32 y = 0; y != destSize.Height; ++y )
-	{
-		sx = 0.f;
-		for ( s32 x = 0; x != destSize.Width; ++x )
-		{
-			target->setPixel ( x, y, getPixelBox( core::floor32 ( sx ), core::floor32 ( sy ), fx, fy, bias ) );
-			sx += sourceXStep;
-		}
-		sy += sourceYStep;
-	}
-
-	target->unlock ();
-}
-
-
-//! fills the surface with given color
-void CImage::fill(const SColor &color)
-{
-	u32 c;
-
-	switch ( Format )
-	{
-		case ECF_A1R5G5B5:
-			c = video::A8R8G8B8toA1R5G5B5 ( color.color );
-			c |= c << 16;
-			break;
-		case ECF_R5G6B5:
-			c = video::A8R8G8B8toR5G6B5 ( color.color );
-			c |= c << 16;
-			break;
-		case ECF_A8R8G8B8:
-			c = color.color;
-			break;
-		default:
-//			os::Printer::log("CImage::Format not supported", ELL_ERROR);
-			return;
-	}
-
-	memset32 ( Data, c, getImageDataSizeInBytes () );
-}
-
-
-//! get a filtered pixel
-inline SColor CImage::getPixelBox ( s32 x, s32 y, s32 fx, s32 fy, s32 bias ) const
-{
-	SColor c;
-	s32 a = 0, r = 0, g = 0, b = 0;
-
-	for ( s32 dx = 0; dx != fx; ++dx )
-	{
-		for ( s32 dy = 0; dy != fy; ++dy )
-		{
-			c = getPixel ( x + dx , y + dy );
-
-			a += c.getAlpha ();
-			r += c.getRed();
-			g += c.getGreen();
-			b += c.getBlue();
-		}
-	}
-
-	s32 sdiv = s32_log2_s32(fx * fy);
-
-	a = core::s32_clamp ( ( a >> sdiv ) + bias, 0, 255 );
-	r = core::s32_clamp ( ( r >> sdiv ) + bias, 0, 255 );
-	g = core::s32_clamp ( ( g >> sdiv ) + bias, 0, 255 );
-	b = core::s32_clamp ( ( b >> sdiv ) + bias, 0, 255 );
-
-	c.set ( a, r, g, b );
-	return c;
-}
-
-
-} // end namespace video
-} // end namespace irr
-
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CImage.h"
+#include "irrString.h"
+#include "SoftwareDriver2_helper.h"
+#include "CColorConverter.h"
+
+namespace irr
+{
+
+	struct SBlitJob
+	{
+		AbsRectangle Dest;
+		AbsRectangle Source;
+
+		u32 argb;
+
+		void * src;
+		void * dst;
+
+		s32 width;
+		s32 height;
+
+		u32 srcPitch;
+		u32 dstPitch;
+
+		u32 srcPixelMul;
+		u32 dstPixelMul;
+	};
+
+	// Blitter Operation
+	enum eBlitter
+	{
+		BLITTER_INVALID = 0,
+		BLITTER_COLOR,
+		BLITTER_COLOR_ALPHA,
+		BLITTER_TEXTURE,
+		BLITTER_TEXTURE_ALPHA_BLEND,
+		BLITTER_TEXTURE_ALPHA_COLOR_BLEND
+	};
+
+	typedef void (*tExecuteBlit) ( const SBlitJob * job );
+
+
+	// Bitfields Cohen Sutherland
+	enum eClipCode
+	{
+		CLIPCODE_EMPTY	=	0,
+		CLIPCODE_BOTTOM	=	1,
+		CLIPCODE_TOP	=	2,
+		CLIPCODE_LEFT	=	4,
+		CLIPCODE_RIGHT	=	8
+	};
+
+inline u32 GetClipCode( const AbsRectangle &r, const core::position2d<s32> &p )
+{
+	u32 code = CLIPCODE_EMPTY;
+
+	if ( p.X < r.x0 )
+		code = CLIPCODE_LEFT;
+	else
+	if ( p.X > r.x1 )
+		code = CLIPCODE_RIGHT;
+
+	if ( p.Y < r.y0 )
+		code |= CLIPCODE_TOP;
+	else
+	if ( p.Y > r.y1 )
+		code |= CLIPCODE_BOTTOM;
+
+	return code;
+}
+
+
+/*!
+	Cohen Sutherland clipping
+	@return: 1 if valid
+*/
+
+static int ClipLine(const AbsRectangle &clipping,
+			core::position2d<s32> &p0,
+			core::position2d<s32> &p1,
+			const core::position2d<s32>& p0_in,
+			const core::position2d<s32>& p1_in)
+{
+	u32 code0;
+	u32 code1;
+	u32 code;
+
+	p0 = p0_in;
+	p1 = p1_in;
+
+	code0 = GetClipCode( clipping, p0 );
+	code1 = GetClipCode( clipping, p1 );
+
+	// trivial accepted
+	while ( code0 | code1 )
+	{
+		s32 x=0;
+		s32 y=0;
+
+		// trivial reject
+		if ( code0 & code1 )
+			return 0;
+
+		if ( code0 )
+		{
+			// clip first point
+			code = code0;
+		}
+		else
+		{
+			// clip last point
+			code = code1;
+		}
+
+		if ( (code & CLIPCODE_BOTTOM) == CLIPCODE_BOTTOM )
+		{
+			// clip bottom viewport
+			y = clipping.y1;
+			x = p0.X + ( p1.X - p0.X ) * ( y - p0.Y ) / ( p1.Y - p0.Y );
+		}
+		else
+		if ( (code & CLIPCODE_TOP) == CLIPCODE_TOP )
+		{
+			// clip to viewport
+			y = clipping.y0;
+			x = p0.X + ( p1.X - p0.X ) * ( y - p0.Y ) / ( p1.Y - p0.Y );
+		}
+		else
+		if ( (code & CLIPCODE_RIGHT) == CLIPCODE_RIGHT )
+		{
+			// clip right viewport
+			x = clipping.x1;
+			y = p0.Y + ( p1.Y - p0.Y ) * ( x - p0.X ) / ( p1.X - p0.X );
+		}
+		else
+		if ( (code & CLIPCODE_LEFT) == CLIPCODE_LEFT )
+		{
+			// clip left viewport
+			x = clipping.x0;
+			y = p0.Y + ( p1.Y - p0.Y ) * ( x - p0.X ) / ( p1.X - p0.X );
+		}
+
+		if ( code == code0 )
+		{
+			// modify first point
+			p0.X = x;
+			p0.Y = y;
+			code0 = GetClipCode( clipping, p0 );
+		}
+		else
+		{
+			// modify second point
+			p1.X = x;
+			p1.Y = y;
+			code1 = GetClipCode( clipping, p1 );
+		}
+	}
+
+	return 1;
+}
+
+/*
+*/
+inline void GetClip(AbsRectangle &clipping, video::IImage * t)
+{
+	clipping.x0 = 0;
+	clipping.y0 = 0;
+	clipping.x1 = t->getDimension().Width - 1;
+	clipping.y1 = t->getDimension().Height - 1;
+}
+
+/*
+*/
+static void RenderLine32_Decal(video::IImage *t,
+				const core::position2d<s32> &p0,
+				const core::position2d<s32> &p1,
+				u32 argb )
+{
+	s32 dx = p1.X - p0.X;
+	s32 dy = p1.Y - p0.Y;
+
+	s32 c;
+	s32 m;
+	s32 d = 0;
+	s32 run;
+
+	s32 xInc = 4;
+	s32 yInc = (s32) t->getPitch();
+
+	if ( dx < 0 )
+	{
+		xInc = -xInc;
+		dx = -dx;
+	}
+
+	if ( dy < 0 )
+	{
+		yInc = -yInc;
+		dy = -dy;
+	}
+
+	u32 *dst;
+	dst = (u32*) ( (u8*) t->lock() + ( p0.Y * t->getPitch() ) + ( p0.X << 2 ) );
+
+	if ( dy > dx )
+	{
+		s32 tmp;
+		tmp = dx;
+		dx = dy;
+		dy = tmp;
+		tmp = xInc;
+		xInc = yInc;
+		yInc = tmp;
+	}
+
+	c = dx << 1;
+	m = dy << 1;
+
+	run = dx;
+	while ( run )
+	{
+		*dst = argb;
+
+		dst = (u32*) ( (u8*) dst + xInc );	// x += xInc
+		d += m;
+		if ( d > dx )
+		{
+			dst = (u32*) ( (u8*) dst + yInc );	// y += yInc
+			d -= c;
+		}
+		run -= 1;
+	}
+
+	t->unlock();
+}
+
+
+/*
+*/
+static void RenderLine32_Blend(video::IImage *t,
+				const core::position2d<s32> &p0,
+				const core::position2d<s32> &p1,
+				u32 argb, u32 alpha)
+{
+	s32 dx = p1.X - p0.X;
+	s32 dy = p1.Y - p0.Y;
+
+	s32 c;
+	s32 m;
+	s32 d = 0;
+	s32 run;
+
+	s32 xInc = 4;
+	s32 yInc = (s32) t->getPitch();
+
+	if ( dx < 0 )
+	{
+		xInc = -xInc;
+		dx = -dx;
+	}
+
+	if ( dy < 0 )
+	{
+		yInc = -yInc;
+		dy = -dy;
+	}
+
+	u32 *dst;
+	dst = (u32*) ( (u8*) t->lock() + ( p0.Y * t->getPitch() ) + ( p0.X << 2 ) );
+
+	if ( dy > dx )
+	{
+		s32 tmp;
+		tmp = dx;
+		dx = dy;
+		dy = tmp;
+		tmp = xInc;
+		xInc = yInc;
+		yInc = tmp;
+	}
+
+	c = dx << 1;
+	m = dy << 1;
+
+	run = dx;
+	while ( run )
+	{
+		*dst = PixelBlend32( *dst, argb, alpha );
+
+		dst = (u32*) ( (u8*) dst + xInc );	// x += xInc
+		d += m;
+		if ( d > dx )
+		{
+			dst = (u32*) ( (u8*) dst + yInc );	// y += yInc
+			d -= c;
+		}
+		run -= 1;
+	}
+
+	t->unlock();
+}
+
+/*
+*/
+static void RenderLine16_Decal(video::IImage *t,
+				const core::position2d<s32> &p0,
+				const core::position2d<s32> &p1,
+				u32 argb )
+{
+	s32 dx = p1.X - p0.X;
+	s32 dy = p1.Y - p0.Y;
+
+	s32 c;
+	s32 m;
+	s32 d = 0;
+	s32 run;
+
+	s32 xInc = 2;
+	s32 yInc = (s32) t->getPitch();
+
+	if ( dx < 0 )
+	{
+		xInc = -xInc;
+		dx = -dx;
+	}
+
+	if ( dy < 0 )
+	{
+		yInc = -yInc;
+		dy = -dy;
+	}
+
+	u16 *dst;
+	dst = (u16*) ( (u8*) t->lock() + ( p0.Y * t->getPitch() ) + ( p0.X << 1 ) );
+
+	if ( dy > dx )
+	{
+		s32 tmp;
+		tmp = dx;
+		dx = dy;
+		dy = tmp;
+		tmp = xInc;
+		xInc = yInc;
+		yInc = tmp;
+	}
+
+	c = dx << 1;
+	m = dy << 1;
+
+	run = dx;
+	while ( run )
+	{
+		*dst = (u16)argb;
+
+		dst = (u16*) ( (u8*) dst + xInc );	// x += xInc
+		d += m;
+		if ( d > dx )
+		{
+			dst = (u16*) ( (u8*) dst + yInc );	// y += yInc
+			d -= c;
+		}
+		run -= 1;
+	}
+
+	t->unlock();
+}
+
+/*
+*/
+static void RenderLine16_Blend(video::IImage *t,
+				const core::position2d<s32> &p0,
+				const core::position2d<s32> &p1,
+				u32 argb,
+				u32 alpha)
+{
+	s32 dx = p1.X - p0.X;
+	s32 dy = p1.Y - p0.Y;
+
+	s32 c;
+	s32 m;
+	s32 d = 0;
+	s32 run;
+
+	s32 xInc = 2;
+	s32 yInc = (s32) t->getPitch();
+
+	if ( dx < 0 )
+	{
+		xInc = -xInc;
+		dx = -dx;
+	}
+
+	if ( dy < 0 )
+	{
+		yInc = -yInc;
+		dy = -dy;
+	}
+
+	u16 *dst;
+	dst = (u16*) ( (u8*) t->lock() + ( p0.Y * t->getPitch() ) + ( p0.X << 1 ) );
+
+	if ( dy > dx )
+	{
+		s32 tmp;
+		tmp = dx;
+		dx = dy;
+		dy = tmp;
+		tmp = xInc;
+		xInc = yInc;
+		yInc = tmp;
+	}
+
+	c = dx << 1;
+	m = dy << 1;
+
+	run = dx;
+	while ( run )
+	{
+		*dst = PixelBlend16( *dst, argb, alpha );
+
+		dst = (u16*) ( (u8*) dst + xInc );	// x += xInc
+		d += m;
+		if ( d > dx )
+		{
+			dst = (u16*) ( (u8*) dst + yInc );	// y += yInc
+			d -= c;
+		}
+		run -= 1;
+	}
+
+	t->unlock();
+}
+
+
+/*!
+*/
+static void executeBlit_TextureCopy_x_to_x( const SBlitJob * job )
+{
+	const void *src = (void*) job->src;
+	void *dst = (void*) job->dst;
+
+	const u32 widthPitch = job->width * job->dstPixelMul;
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		memcpy( dst, src, widthPitch );
+
+		src = (void*) ( (u8*) (src) + job->srcPitch );
+		dst = (void*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+
+/*!
+*/
+static void executeBlit_TextureCopy_32_to_16( const SBlitJob * job )
+{
+	const u32 *src = static_cast<const u32*>(job->src);
+	u16 *dst = static_cast<u16*>(job->dst);
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			//16 bit Blitter depends on pre-multiplied color
+			const u32 s = PixelLerp32( src[dx] | 0xFF000000, extractAlpha( src[dx] ) );
+			dst[dx] = video::A8R8G8B8toA1R5G5B5( s );
+		}
+
+		src = (u32*) ( (u8*) (src) + job->srcPitch );
+		dst = (u16*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+/*!
+*/
+static void executeBlit_TextureCopy_24_to_16( const SBlitJob * job )
+{
+	const void *src = (void*) job->src;
+	u16 *dst = (u16*) job->dst;
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		u8 * s = (u8*) src;
+
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			dst[dx] = video::RGB16(s[0], s[1], s[2]);
+			s += 3;
+		}
+
+		src = (void*) ( (u8*) (src) + job->srcPitch );
+		dst = (u16*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+
+/*!
+*/
+static void executeBlit_TextureCopy_16_to_32( const SBlitJob * job )
+{
+	const u16 *src = (u16*) job->src;
+	u32 *dst = (u32*) job->dst;
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			dst[dx] = video::A1R5G5B5toA8R8G8B8( src[dx] );
+		}
+
+		src = (u16*) ( (u8*) (src) + job->srcPitch );
+		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+static void executeBlit_TextureCopy_16_to_24( const SBlitJob * job )
+{
+	const u16 *src = (u16*) job->src;
+	u8 *dst = (u8*) job->dst;
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			u32 colour = video::A1R5G5B5toA8R8G8B8( src[dx] );
+			u8 * writeTo = &dst[dx * 3];
+			*writeTo++ = (colour >> 16)& 0xFF;
+			*writeTo++ = (colour >> 8) & 0xFF;
+			*writeTo++ = colour & 0xFF;
+		}
+
+		src = (u16*) ( (u8*) (src) + job->srcPitch );
+		dst += job->dstPitch;
+	}
+}
+
+
+/*!
+*/
+static void executeBlit_TextureCopy_24_to_32( const SBlitJob * job )
+{
+	void *src = (void*) job->src;
+	u32 *dst = (u32*) job->dst;
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		u8 * s = (u8*) src;
+
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			dst[dx] = 0xFF000000 | s[0] << 16 | s[1] << 8 | s[2];
+			s += 3;
+		}
+
+		src = (void*) ( (u8*) (src) + job->srcPitch );
+		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+static void executeBlit_TextureCopy_32_to_24( const SBlitJob * job )
+{
+	const u32 * src = (u32*) job->src;
+	u8 * dst = (u8*) job->dst;
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			u8 * writeTo = &dst[dx * 3];
+			*writeTo++ = (src[dx] >> 16)& 0xFF;
+			*writeTo++ = (src[dx] >> 8) & 0xFF;
+			*writeTo++ = src[dx] & 0xFF;
+		}
+
+		src = (u32*) ( (u8*) (src) + job->srcPitch );
+		dst += job->dstPitch ;
+	}
+
+}
+
+
+/*!
+*/
+static void executeBlit_TextureBlend_16_to_16( const SBlitJob * job )
+{
+	u32 dx;
+	s32 dy;
+
+	u32 *src = (u32*) job->src;
+	u32 *dst = (u32*) job->dst;
+
+
+	const u32 rdx = job->width >> 1;
+	const u32 off = core::if_c_a_else_b( job->width & 1 ,job->width - 1, 0 );
+
+
+	if ( 0 == off )
+	{
+		for ( dy = 0; dy != job->height; ++dy )
+		{
+			for ( dx = 0; dx != rdx; ++dx )
+			{
+				dst[dx] = PixelBlend16_simd( dst[dx], src[dx] );
+			}
+
+			src = (u32*) ( (u8*) (src) + job->srcPitch );
+			dst = (u32*) ( (u8*) (dst) + job->dstPitch );
+		}
+
+	}
+	else
+	{
+		for ( dy = 0; dy != job->height; ++dy )
+		{
+			for ( dx = 0; dx != rdx; ++dx )
+			{
+				dst[dx] = PixelBlend16_simd( dst[dx], src[dx] );
+			}
+
+			((u16*) dst)[off] = PixelBlend16( ((u16*) dst)[off], ((u16*) src)[off] );
+
+			src = (u32*) ( (u8*) (src) + job->srcPitch );
+			dst = (u32*) ( (u8*) (dst) + job->dstPitch );
+		}
+
+	}
+}
+
+/*!
+*/
+static void executeBlit_TextureBlend_32_to_32( const SBlitJob * job )
+{
+	u32 *src = (u32*) job->src;
+	u32 *dst = (u32*) job->dst;
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			dst[dx] = PixelBlend32( dst[dx], src[dx] );
+		}
+		src = (u32*) ( (u8*) (src) + job->srcPitch );
+		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+/*!
+*/
+static void executeBlit_TextureBlendColor_16_to_16( const SBlitJob * job )
+{
+	u16 *src = (u16*) job->src;
+	u16 *dst = (u16*) job->dst;
+
+	u16 blend = video::A8R8G8B8toA1R5G5B5 ( job->argb );
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			dst[dx] = PixelBlend16( dst[dx], PixelMul16_2( src[dx], blend ) );
+		}
+		src = (u16*) ( (u8*) (src) + job->srcPitch );
+		dst = (u16*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+
+/*!
+*/
+static void executeBlit_TextureBlendColor_32_to_32( const SBlitJob * job )
+{
+	u32 *src = (u32*) job->src;
+	u32 *dst = (u32*) job->dst;
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			dst[dx] = PixelBlend32( dst[dx], PixelMul32_2( src[dx], job->argb ) );
+		}
+		src = (u32*) ( (u8*) (src) + job->srcPitch );
+		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+/*!
+*/
+static void executeBlit_Color_16_to_16( const SBlitJob * job )
+{
+	u16 *dst = (u16*) job->dst;
+
+	u16 c0 = video::A8R8G8B8toA1R5G5B5( job->argb );
+	u32 c = c0 | c0 << 16;
+
+	if ( 0 == (job->srcPitch & 3 ) )
+	{
+		for ( s32 dy = 0; dy != job->height; ++dy )
+		{
+			memset32( dst, c, job->srcPitch );
+			dst = (u16*) ( (u8*) (dst) + job->dstPitch );
+		}
+	}
+	else
+	{
+		s32 dx = job->width - 1;
+
+		for ( s32 dy = 0; dy != job->height; ++dy )
+		{
+			memset32( dst, c, job->srcPitch );
+			dst[dx] = c0;
+			dst = (u16*) ( (u8*) (dst) + job->dstPitch );
+		}
+
+	}
+}
+
+/*!
+*/
+static void executeBlit_Color_32_to_32( const SBlitJob * job )
+{
+	u32 *dst = (u32*) job->dst;
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		memset32( dst, job->argb, job->srcPitch );
+		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+/*!
+*/
+static void executeBlit_ColorAlpha_16_to_16( const SBlitJob * job )
+{
+	u16 *dst = (u16*) job->dst;
+
+	const u32 alpha = extractAlpha( job->argb ) >> 3;
+	const u32 src = video::A8R8G8B8toA1R5G5B5( job->argb );
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			dst[dx] = PixelBlend16( dst[dx], src, alpha );
+		}
+		dst = (u16*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+/*!
+*/
+static void executeBlit_ColorAlpha_32_to_32( const SBlitJob * job )
+{
+	u32 *dst = (u32*) job->dst;
+
+	const u32 alpha = extractAlpha( job->argb );
+	const u32 src = job->argb;
+
+	for ( s32 dy = 0; dy != job->height; ++dy )
+	{
+		for ( s32 dx = 0; dx != job->width; ++dx )
+		{
+			dst[dx] = PixelBlend32( dst[dx], src, alpha );
+		}
+		dst = (u32*) ( (u8*) (dst) + job->dstPitch );
+	}
+}
+
+/*!
+*/
+static tExecuteBlit getBlitter( eBlitter operation,const video::IImage * dest,const video::IImage * source )
+{
+	video::ECOLOR_FORMAT sourceFormat = (video::ECOLOR_FORMAT) -1;
+	video::ECOLOR_FORMAT destFormat = (video::ECOLOR_FORMAT) -1;
+
+	if ( source )
+		sourceFormat = source->getColorFormat();
+
+	if ( dest )
+		destFormat = dest->getColorFormat();
+
+	switch ( operation )
+	{
+		case BLITTER_TEXTURE:
+		{
+			if ( sourceFormat == destFormat )
+				return executeBlit_TextureCopy_x_to_x;
+
+			if ( destFormat == video::ECF_A1R5G5B5 && sourceFormat == video::ECF_A8R8G8B8 )
+				return executeBlit_TextureCopy_32_to_16;
+
+			if ( destFormat == video::ECF_A1R5G5B5 && sourceFormat == video::ECF_R8G8B8 )
+				return executeBlit_TextureCopy_24_to_16;
+
+			if ( destFormat == video::ECF_A8R8G8B8 && sourceFormat == video::ECF_A1R5G5B5 )
+				return executeBlit_TextureCopy_16_to_32;
+
+			if ( destFormat == video::ECF_R8G8B8 && sourceFormat == video::ECF_A1R5G5B5 )
+				return executeBlit_TextureCopy_16_to_24;
+
+			if ( destFormat == video::ECF_A8R8G8B8 && sourceFormat == video::ECF_R8G8B8 )
+				return executeBlit_TextureCopy_24_to_32;
+
+			if ( destFormat == video::ECF_R8G8B8 && sourceFormat == video::ECF_A8R8G8B8 )
+				return executeBlit_TextureCopy_32_to_24;
+
+		} break;
+
+		case BLITTER_TEXTURE_ALPHA_BLEND:
+		{
+			if ( destFormat == video::ECF_A1R5G5B5 && sourceFormat == video::ECF_A1R5G5B5 )
+				return executeBlit_TextureBlend_16_to_16;
+
+			if ( destFormat == video::ECF_A8R8G8B8 && sourceFormat == video::ECF_A8R8G8B8 )
+				return executeBlit_TextureBlend_32_to_32;
+
+		} break;
+
+		case BLITTER_TEXTURE_ALPHA_COLOR_BLEND:
+		{
+			if ( destFormat == video::ECF_A1R5G5B5 && sourceFormat == video::ECF_A1R5G5B5 )
+				return executeBlit_TextureBlendColor_16_to_16;
+
+			if ( destFormat == video::ECF_A8R8G8B8 && sourceFormat == video::ECF_A8R8G8B8 )
+				return executeBlit_TextureBlendColor_32_to_32;
+		} break;
+
+		case BLITTER_COLOR:
+		{
+			if ( destFormat == video::ECF_A1R5G5B5 )
+				return executeBlit_Color_16_to_16;
+
+			if ( destFormat == video::ECF_A8R8G8B8 )
+				return executeBlit_Color_32_to_32;
+		} break;
+
+		case BLITTER_COLOR_ALPHA:
+		{
+			if ( destFormat == video::ECF_A1R5G5B5 )
+				return executeBlit_ColorAlpha_16_to_16;
+
+			if ( destFormat == video::ECF_A8R8G8B8 )
+				return executeBlit_ColorAlpha_32_to_32;
+
+		} break;
+
+		case BLITTER_INVALID:
+		break;
+	}
+/*
+	char buf[64];
+	sprintf( buf, "Blit: %d %d->%d unsupported",operation,sourceFormat,destFormat );
+	os::Printer::log(buf );
+*/
+	return 0;
+
+}
+
+
+
+/*!
+	a generic 2D Blitter
+*/
+static s32 Blit(eBlitter operation,
+		video::IImage * dest,
+		const core::rect<s32> *destClipping,
+		const core::position2d<s32> *destPos,
+		video::IImage * const source,
+		const core::rect<s32> *sourceClipping,
+		u32 argb)
+{
+	tExecuteBlit blitter = getBlitter( operation, dest, source );
+	if ( 0 == blitter )
+	{
+		return 0;
+	}
+
+	// Clipping
+	AbsRectangle sourceClip;
+	AbsRectangle destClip;
+	AbsRectangle v;
+
+	SBlitJob job;
+
+	if ( sourceClipping )
+	{
+		sourceClip.x0 = sourceClipping->UpperLeftCorner.X;
+		sourceClip.y0 = sourceClipping->UpperLeftCorner.Y;
+		sourceClip.x1 = sourceClipping->LowerRightCorner.X;
+		sourceClip.y1 = sourceClipping->LowerRightCorner.Y;
+	}
+	else
+	{
+		sourceClip.x0 = 0;
+		sourceClip.y0 = 0;
+		sourceClip.x1 = source ? source->getDimension().Width : 0;
+		sourceClip.y1 = source ? source->getDimension().Height : 0;
+	}
+
+	if ( destClipping )
+	{
+		destClip.x0 = destClipping->UpperLeftCorner.X;
+		destClip.y0 = destClipping->UpperLeftCorner.Y;
+		destClip.x1 = destClipping->LowerRightCorner.X;
+		destClip.y1 = destClipping->LowerRightCorner.Y;
+	}
+	else
+	{
+		destClip.x0 = 0;
+		destClip.y0 = 0;
+		destClip.x1 = dest ? dest->getDimension().Width : 0;
+		destClip.y1 = dest ? dest->getDimension().Height : 0;
+	}
+
+	v.x0 = destPos ? destPos->X : 0;
+	v.y0 = destPos ? destPos->Y : 0;
+	v.x1 = v.x0 + ( sourceClip.x1 - sourceClip.x0 );
+	v.y1 = v.y0 + ( sourceClip.y1 - sourceClip.y0 );
+
+	intersect( job.Dest, destClip, v );
+	if ( !isValid( job.Dest ) )
+		return 0;
+
+	job.width = job.Dest.x1 - job.Dest.x0;
+	job.height = job.Dest.y1 - job.Dest.y0;
+
+
+	job.Source.x0 = sourceClip.x0 + ( job.Dest.x0 - v.x0 );
+	job.Source.x1 = job.Source.x0 + job.width;
+
+	job.Source.y0 = sourceClip.y0 + ( job.Dest.y0 - v.y0 );
+	job.Source.y1 = job.Source.y0 + job.height;
+
+	job.argb = argb;
+
+	if ( source )
+	{
+		job.srcPitch = source->getPitch();
+		job.srcPixelMul = source->getBytesPerPixel();
+		job.src = (void*) ( (u8*) source->lock() + ( job.Source.y0 * job.srcPitch ) + ( job.Source.x0 * job.srcPixelMul ) );
+	}
+	else
+	{
+		// use srcPitch for color operation on dest
+		job.srcPitch = job.width * dest->getBytesPerPixel();
+	}
+
+	job.dstPitch = dest->getPitch();
+	job.dstPixelMul = dest->getBytesPerPixel();
+	job.dst = (void*) ( (u8*) dest->lock() + ( job.Dest.y0 * job.dstPitch ) + ( job.Dest.x0 * job.dstPixelMul ) );
+
+	blitter( &job );
+
+	if ( source )
+		source->unlock();
+
+	if ( dest )
+		dest->unlock();
+
+	return 1;
+}
+
+}
+
+namespace irr
+{
+namespace video
+{
+
+//! constructor
+CImage::CImage(ECOLOR_FORMAT format, const core::dimension2d<s32>& size)
+:Data(0), Size(size), Format(format), DeleteMemory(true)
+{
+	initData();
+}
+
+
+//! constructor
+CImage::CImage(ECOLOR_FORMAT format, const core::dimension2d<s32>& size, void* data,
+			bool ownForeignMemory, bool deleteForeignMemory)
+: Data(0), Size(size), Format(format), DeleteMemory(deleteForeignMemory)
+{
+	if (ownForeignMemory)
+	{
+		Data = (void*)0xbadf00d;
+		initData();
+		Data = data;
+	}
+	else
+	{
+		Data = 0;
+		initData();
+		memcpy(Data, data, Size.Height * Pitch);
+	}
+}
+
+
+
+//! constructor
+CImage::CImage(ECOLOR_FORMAT format, IImage* imageToCopy)
+: Data(0), Format(format), DeleteMemory(true)
+{
+	if (!imageToCopy)
+		return;
+
+	Size = imageToCopy->getDimension();
+	initData();
+
+	// now copy data from other image
+
+	Blit ( BLITTER_TEXTURE, this, 0, 0, imageToCopy, 0,0 );
+}
+
+
+
+//! constructor
+CImage::CImage(IImage* imageToCopy, const core::position2d<s32>& pos,
+		const core::dimension2d<s32>& size)
+	: Data(0), Size(0,0), DeleteMemory(true)
+{
+	if (!imageToCopy)
+		return;
+
+	Format = imageToCopy->getColorFormat();
+	Size = size;
+
+	initData();
+
+	core::rect<s32> sClip( pos.X, pos.Y, pos.X + size.Width,pos.Y + size.Height );
+	Blit (BLITTER_TEXTURE, this, 0, 0, imageToCopy, &sClip, 0);
+}
+
+
+
+//! assumes format and size has been set and creates the rest
+void CImage::initData()
+{
+	setBitMasks();
+	BitsPerPixel = getBitsPerPixelFromFormat(Format);
+	BytesPerPixel = BitsPerPixel / 8;
+
+	// Pitch should be aligned...
+	Pitch = BytesPerPixel * Size.Width;
+
+	if (!Data)
+		Data = new s8[Size.Height * Pitch];
+}
+
+
+//! destructor
+CImage::~CImage()
+{
+	if ( DeleteMemory )
+		delete [] (s8*)Data;
+}
+
+
+//! Returns width and height of image data.
+const core::dimension2d<s32>& CImage::getDimension() const
+{
+	return Size;
+}
+
+
+
+//! Returns bits per pixel.
+u32 CImage::getBitsPerPixel() const
+{
+	return BitsPerPixel;
+}
+
+
+//! Returns bytes per pixel
+u32 CImage::getBytesPerPixel() const
+{
+	return BytesPerPixel;
+}
+
+
+
+//! Returns image data size in bytes
+u32 CImage::getImageDataSizeInBytes() const
+{
+	return Pitch * Size.Height;
+}
+
+
+
+//! Returns image data size in pixels
+u32 CImage::getImageDataSizeInPixels() const
+{
+	return Size.Width * Size.Height;
+}
+
+
+
+//! returns mask for red value of a pixel
+u32 CImage::getRedMask() const
+{
+	return RedMask;
+}
+
+
+
+//! returns mask for green value of a pixel
+u32 CImage::getGreenMask() const
+{
+	return GreenMask;
+}
+
+
+
+//! returns mask for blue value of a pixel
+u32 CImage::getBlueMask() const
+{
+	return BlueMask;
+}
+
+
+
+//! returns mask for alpha value of a pixel
+u32 CImage::getAlphaMask() const
+{
+	return AlphaMask;
+}
+
+
+void CImage::setBitMasks()
+{
+	switch(Format)
+	{
+	case ECF_A1R5G5B5:
+		AlphaMask = 0x1<<15;
+		RedMask = 0x1F<<10;
+		GreenMask = 0x1F<<5;
+		BlueMask = 0x1F;
+	break;
+	case ECF_R5G6B5:
+		AlphaMask = 0x0;
+		RedMask = 0x1F<<11;
+		GreenMask = 0x3F<<5;
+		BlueMask = 0x1F;
+	break;
+	case ECF_R8G8B8:
+		AlphaMask = 0x0;
+		RedMask   = 0x00FF0000;
+		GreenMask = 0x0000FF00;
+		BlueMask  = 0x000000FF;
+	break;
+	case ECF_A8R8G8B8:
+		AlphaMask = 0xFF000000;
+		RedMask   = 0x00FF0000;
+		GreenMask = 0x0000FF00;
+		BlueMask  = 0x000000FF;
+	break;
+	}
+}
+
+
+u32 CImage::getBitsPerPixelFromFormat(ECOLOR_FORMAT format)
+{
+	switch(format)
+	{
+	case ECF_A1R5G5B5:
+		return 16;
+	case ECF_R5G6B5:
+		return 16;
+	case ECF_R8G8B8:
+		return 24;
+	case ECF_A8R8G8B8:
+		return 32;
+	}
+
+	return 0;
+}
+
+//! sets a pixel
+void CImage::setPixel(u32 x, u32 y, const SColor &color )
+{
+	if (x >= (u32)Size.Width || y >= (u32)Size.Height)
+		return;
+
+	switch(Format)
+	{
+		case ECF_A1R5G5B5:
+		{
+			u16 * dest = (u16*) ((u8*) Data + ( y * Pitch ) + ( x << 1 ));
+			*dest = video::A8R8G8B8toA1R5G5B5( color.color );
+		} break;
+
+		case ECF_R5G6B5:
+		{
+			u16 * dest = (u16*) ((u8*) Data + ( y * Pitch ) + ( x << 1 ));
+			*dest = video::A8R8G8B8toR5G6B5( color.color );
+		} break;
+
+		case ECF_R8G8B8:
+		{
+			u8* dest = (u8*) Data + ( y * Pitch ) + ( x * 3 );
+			dest[0] = (u8)color.getRed();
+			dest[1] = (u8)color.getGreen();
+			dest[2] = (u8)color.getBlue();
+		} break;
+
+		case ECF_A8R8G8B8:
+		{
+			u32 * dest = (u32*) ((u8*) Data + ( y * Pitch ) + ( x << 2 ));
+			*dest = color.color;
+		} break;
+	}
+}
+
+
+//! returns a pixel
+SColor CImage::getPixel(u32 x, u32 y) const
+{
+	if (x >= (u32)Size.Width || y >= (u32)Size.Height)
+		return SColor(0);
+
+	switch(Format)
+	{
+	case ECF_A1R5G5B5:
+		return A1R5G5B5toA8R8G8B8(((u16*)Data)[y*Size.Width + x]);
+	case ECF_R5G6B5:
+		return R5G6B5toA8R8G8B8(((u16*)Data)[y*Size.Width + x]);
+	case ECF_A8R8G8B8:
+		return ((u32*)Data)[y*Size.Width + x];
+	case ECF_R8G8B8:
+		{
+			u8* p = &((u8*)Data)[(y*3)*Size.Width + (x*3)];
+			return SColor(255,p[0],p[1],p[2]);
+		}
+	}
+
+	return SColor(0);
+}
+
+
+//! returns the color format
+ECOLOR_FORMAT CImage::getColorFormat() const
+{
+	return Format;
+}
+
+
+//! draws a rectangle
+void CImage::drawRectangle(const core::rect<s32>& rect, const SColor &color)
+{
+	Blit(color.getAlpha() == 0xFF ? BLITTER_COLOR : BLITTER_COLOR_ALPHA,
+			this, 0, &rect.UpperLeftCorner, 0, &rect, color.color);
+}
+
+
+//! copies this surface into another
+void CImage::copyTo(IImage* target, const core::position2d<s32>& pos)
+{
+	Blit(BLITTER_TEXTURE, target, 0, &pos, this, 0, 0);
+}
+
+
+//! copies this surface into another
+void CImage::copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect)
+{
+	Blit(BLITTER_TEXTURE, target, clipRect, &pos, this, &sourceRect, 0);
+}
+
+
+
+//! copies this surface into another, using the alpha mask, an cliprect and a color to add with
+void CImage::copyToWithAlpha(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const SColor &color, const core::rect<s32>* clipRect)
+{
+	// color blend only necessary on not full spectrum aka. color.color != 0xFFFFFFFF
+	Blit(color.color == 0xFFFFFFFF ? BLITTER_TEXTURE_ALPHA_BLEND: BLITTER_TEXTURE_ALPHA_COLOR_BLEND,
+			target, clipRect, &pos, this, &sourceRect, color.color);
+}
+
+
+
+//! draws a line from to with color
+void CImage::drawLine(const core::position2d<s32>& from, const core::position2d<s32>& to, const SColor &color)
+{
+	AbsRectangle clip;
+	GetClip( clip, this );
+
+	core::position2d<s32> p[2];
+
+	if ( ClipLine( clip, p[0], p[1], from, to ) )
+	{
+		u32 alpha = extractAlpha( color.color );
+
+		switch ( Format )
+		{
+			case ECF_A1R5G5B5:
+				if ( alpha == 256 )
+				{
+					RenderLine16_Decal( this, p[0], p[1], video::A8R8G8B8toA1R5G5B5( color.color ) );
+				}
+				else
+				{
+					RenderLine16_Blend( this, p[0], p[1], video::A8R8G8B8toA1R5G5B5( color.color ), alpha >> 3 );
+				}
+				break;
+			case ECF_A8R8G8B8:
+				if ( alpha == 256 )
+				{
+					RenderLine32_Decal( this, p[0], p[1], color.color );
+				}
+				else
+				{
+					RenderLine32_Blend( this, p[0], p[1], color.color, alpha );
+				}
+				break;
+			default:
+				break;
+		}
+	}
+}
+
+
+
+//! copies this surface into another, scaling it to the target image size
+// note: this is very very slow. (i didn't want to write a fast version.
+// but hopefully, nobody wants to scale surfaces every frame.
+void CImage::copyToScaling(void* target, s32 width, s32 height, ECOLOR_FORMAT format, u32 pitch)
+{
+	if (!target || !width || !height)
+		return;
+
+	const u32 bpp=getBitsPerPixelFromFormat(format)/8;
+	if (0==pitch)
+		pitch = width*bpp;
+
+	if (Format==format && Size.Width==width && Size.Height==height)
+	{
+		if (pitch==Pitch)
+		{
+			memcpy(target, Data, height*pitch);
+			return;
+		}
+		else
+		{
+			u8* tgtpos = (u8*) target;
+			u8* dstpos = (u8*) Data;
+			const u32 bwidth = width*bpp;
+			for (s32 y=0; y<height; ++y)
+			{
+				memcpy(target, Data, height*pitch);
+				memset(tgtpos+width, 0, pitch-bwidth);
+				tgtpos += pitch;
+				dstpos += Pitch;
+			}
+			return;
+		}
+	}
+
+	const f32 sourceXStep = (f32)Size.Width / (f32)width;
+	const f32 sourceYStep = (f32)Size.Height / (f32)height;
+	s32 yval=0, syval=0;
+	f32 sy = 0.0f;
+	for (s32 y=0; y<height; ++y)
+	{
+		f32 sx = 0.0f;
+		for (s32 x=0; x<width; ++x)
+		{
+			CColorConverter::convert_viaFormat(((u8*)Data)+ syval + ((s32)sx)*BytesPerPixel, Format, 1, ((u8*)target)+ yval + (x*bpp), format);
+			sx+=sourceXStep;
+		}
+		sy+=sourceYStep;
+		syval=((s32)sy)*Pitch;
+		yval+=pitch;
+	}
+}
+
+//! copies this surface into another, scaling it to the target image size
+// note: this is very very slow. (i didn't want to write a fast version.
+// but hopefully, nobody wants to scale surfaces every frame.
+void CImage::copyToScaling(IImage* target)
+{
+	if (!target)
+		return;
+
+	const core::dimension2d<s32>& targetSize = target->getDimension();
+
+	if (targetSize==Size)
+	{
+		copyTo(target);
+		return;
+	}
+
+	copyToScaling(target->lock(), targetSize.Width, targetSize.Height, target->getColorFormat());
+	target->unlock();
+}
+
+//! copies this surface into another, scaling it to fit it.
+void CImage::copyToScalingBoxFilter(IImage* target, s32 bias)
+{
+	const core::dimension2d<s32> destSize = target->getDimension();
+
+	const f32 sourceXStep = (f32) Size.Width / (f32) destSize.Width;
+	const f32 sourceYStep = (f32) Size.Height / (f32) destSize.Height;
+
+	target->lock();
+
+	s32 fx = core::ceil32( sourceXStep );
+	s32 fy = core::ceil32( sourceYStep );
+	f32 sx;
+	f32 sy;
+
+	sy = 0.f;
+	for ( s32 y = 0; y != destSize.Height; ++y )
+	{
+		sx = 0.f;
+		for ( s32 x = 0; x != destSize.Width; ++x )
+		{
+			target->setPixel( x, y, getPixelBox( core::floor32(sx), core::floor32(sy), fx, fy, bias ) );
+			sx += sourceXStep;
+		}
+		sy += sourceYStep;
+	}
+
+	target->unlock();
+}
+
+
+//! fills the surface with given color
+void CImage::fill(const SColor &color)
+{
+	u32 c;
+
+	switch ( Format )
+	{
+		case ECF_A1R5G5B5:
+			c = video::A8R8G8B8toA1R5G5B5( color.color );
+			c |= c << 16;
+			break;
+		case ECF_R5G6B5:
+			c = video::A8R8G8B8toR5G6B5( color.color );
+			c |= c << 16;
+			break;
+		case ECF_A8R8G8B8:
+			c = color.color;
+			break;
+		default:
+//			os::Printer::log("CImage::Format not supported", ELL_ERROR);
+			return;
+	}
+
+	memset32( Data, c, getImageDataSizeInBytes() );
+}
+
+
+//! get a filtered pixel
+inline SColor CImage::getPixelBox( s32 x, s32 y, s32 fx, s32 fy, s32 bias ) const
+{
+	SColor c;
+	s32 a = 0, r = 0, g = 0, b = 0;
+
+	for ( s32 dx = 0; dx != fx; ++dx )
+	{
+		for ( s32 dy = 0; dy != fy; ++dy )
+		{
+			c = getPixel( x + dx , y + dy );
+
+			a += c.getAlpha();
+			r += c.getRed();
+			g += c.getGreen();
+			b += c.getBlue();
+		}
+	}
+
+	s32 sdiv = s32_log2_s32(fx * fy);
+
+	a = core::s32_clamp( ( a >> sdiv ) + bias, 0, 255 );
+	r = core::s32_clamp( ( r >> sdiv ) + bias, 0, 255 );
+	g = core::s32_clamp( ( g >> sdiv ) + bias, 0, 255 );
+	b = core::s32_clamp( ( b >> sdiv ) + bias, 0, 255 );
+
+	c.set( a, r, g, b );
+	return c;
+}
+
+
+} // end namespace video
+} // end namespace irr
+
diff --git a/src/dep/src/irrlicht/CImage.h b/src/dep/src/irrlicht/CImage.h
index 4cf97c9..52c19b4 100644
--- a/src/dep/src/irrlicht/CImage.h
+++ b/src/dep/src/irrlicht/CImage.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -43,10 +43,10 @@ public:
 	virtual void* lock()
 	{
 		return Data;
-	};
+	}
 
 	//! Unlock function.
-	virtual void unlock() {};
+	virtual void unlock() {}
 
 	//! Returns width and height of image data.
 	virtual const core::dimension2d<s32>& getDimension() const;
@@ -84,42 +84,40 @@ public:
 	//! returns the color format
 	virtual ECOLOR_FORMAT getColorFormat() const;
 
-	//! draws a rectangle
-	void drawRectangle(const core::rect<s32>& rect, const SColor &color);
+	//! returns pitch of image
+	virtual u32 getPitch() const { return Pitch; }
+
+	//! copies this surface into another, scaling it to fit.
+	virtual void copyToScaling(void* target, s32 width, s32 height, ECOLOR_FORMAT format, u32 pitch=0);
+
+	//! copies this surface into another, scaling it to fit.
+	virtual void copyToScaling(IImage* target);
 
 	//! copies this surface into another
-	void copyTo(IImage* target, const core::position2d<s32>& pos=core::position2d<s32>(0,0));
+	virtual void copyTo(IImage* target, const core::position2d<s32>& pos=core::position2d<s32>(0,0));
 
 	//! copies this surface into another
-	void copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect=0);
+	virtual void copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect=0);
 
 	//! copies this surface into another, using the alpha mask, an cliprect and a color to add with
-	void copyToWithAlpha(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const SColor &color, const core::rect<s32>* clipRect = 0);
-
-	//! copies this surface into another, scaling it to fit.
-	void copyToScaling(void* target, s32 width, s32 height, ECOLOR_FORMAT format, u32 pitch=0);
-
-	//! copies this surface into another, scaling it to fit.
-	void copyToScaling(IImage* target);
+	virtual void copyToWithAlpha(IImage* target, const core::position2d<s32>& pos,
+			const core::rect<s32>& sourceRect, const SColor &color,
+			const core::rect<s32>* clipRect = 0);
 
 	//! copies this surface into another, scaling it to fit, appyling a box filter
 	void copyToScalingBoxFilter(IImage* target, s32 bias = 0);
 
+	//! fills the surface with black or white
+	virtual void fill(const SColor &color);
+
+	//! draws a rectangle
+	void drawRectangle(const core::rect<s32>& rect, const SColor &color);
+
 	//! draws a line from to
 	void drawLine(const core::position2d<s32>& from, const core::position2d<s32>& to, const SColor &color);
 
-	//! fills the surface with black or white
-	void fill(const SColor &color);
-
-	//! returns pitch of image
-	virtual u32 getPitch() const
-	{
-		return Pitch;
-	}
-
 	static u32 getBitsPerPixelFromFormat(ECOLOR_FORMAT format);
 
-
 private:
 
 	//! assumes format and size has been set and creates the rest
diff --git a/src/dep/src/irrlicht/CImageLoaderBMP.cpp b/src/dep/src/irrlicht/CImageLoaderBMP.cpp
index 2d6e94c..1aec5fa 100644
--- a/src/dep/src/irrlicht/CImageLoaderBMP.cpp
+++ b/src/dep/src/irrlicht/CImageLoaderBMP.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -100,7 +100,7 @@ void CImageLoaderBMP::decompress8BitRLE(u8*& bmpData, s32 size, s32 width, s32 h
 		else
 		{
 			s32 count = (u8)*p; ++p;
-			s32 color = (u8)*p; ++p;
+			u8 color = *p; ++p;
 			for (s32 i=0; i<count; ++i)
 			{
 				*d = color;
diff --git a/src/dep/src/irrlicht/CImageLoaderBMP.h b/src/dep/src/irrlicht/CImageLoaderBMP.h
index c4de366..e7e4076 100644
--- a/src/dep/src/irrlicht/CImageLoaderBMP.h
+++ b/src/dep/src/irrlicht/CImageLoaderBMP.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageLoaderJPG.cpp b/src/dep/src/irrlicht/CImageLoaderJPG.cpp
index fb4a6b2..2aac25b 100644
--- a/src/dep/src/irrlicht/CImageLoaderJPG.cpp
+++ b/src/dep/src/irrlicht/CImageLoaderJPG.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageLoaderJPG.h b/src/dep/src/irrlicht/CImageLoaderJPG.h
index 83d15f3..472c9b2 100644
--- a/src/dep/src/irrlicht/CImageLoaderJPG.h
+++ b/src/dep/src/irrlicht/CImageLoaderJPG.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageLoaderPCX.cpp b/src/dep/src/irrlicht/CImageLoaderPCX.cpp
index 596989f..2bd0600 100644
--- a/src/dep/src/irrlicht/CImageLoaderPCX.cpp
+++ b/src/dep/src/irrlicht/CImageLoaderPCX.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -72,7 +72,7 @@ IImage* CImageLoaderPCX::loadImage(io::IReadFile* file) const
 		return 0;
 
 	// return if this isn't a supported type
-	if( (header.BitsPerPixel != 8) && (header.BitsPerPixel != 24) )
+	if ((header.BitsPerPixel != 8) && (header.BitsPerPixel != 4) && (header.BitsPerPixel != 1))
 	{
 		os::Printer::log("Unsupported bits per pixel in PCX file.",
 			file->getFileName(), irr::ELL_WARNING);
@@ -80,7 +80,7 @@ IImage* CImageLoaderPCX::loadImage(io::IReadFile* file) const
 	}
 
 	// read palette
-	if( header.BitsPerPixel == 8 )
+	if( (header.BitsPerPixel == 8) && (header.Planes == 1) )
 	{
 		// the palette indicator (usually a 0x0c is found infront of the actual palette data)
 		// is ignored because some exporters seem to forget to write it. This would result in
@@ -102,7 +102,7 @@ IImage* CImageLoaderPCX::loadImage(io::IReadFile* file) const
 
 		delete [] tempPalette;
 
-		file->seek( pos );
+		file->seek(pos);
 	}
 	else if( header.BitsPerPixel == 4 )
 	{
@@ -117,16 +117,16 @@ IImage* CImageLoaderPCX::loadImage(io::IReadFile* file) const
 	}
 
 	// read image data
-	s32 width, height, imagebytes;
-	width = header.XMax - header.XMin + 1;
-	height = header.YMax - header.YMin + 1;
-	imagebytes = header.BytesPerLine * height * header.Planes * header.BitsPerPixel / 8;
+	const s32 width = header.XMax - header.XMin + 1;
+	const s32 height = header.YMax - header.YMin + 1;
+	const s32 imagebytes = header.BytesPerLine * header.Planes * header.BitsPerPixel * height / 8;
 	u8* PCXData = new u8[imagebytes];
 
 	u8 cnt, value;
-	for( s32 offset = 0; offset < imagebytes; )
+	s32 lineoffset=0, linestart=0, nextmode=1;
+	for(s32 offset = 0; offset < imagebytes; offset += cnt)
 	{
-		file->read( &cnt, 1 );
+		file->read(&cnt, 1);
 		if( !((cnt & 0xc0) == 0xc0) )
 		{
 			value = cnt;
@@ -135,32 +135,75 @@ IImage* CImageLoaderPCX::loadImage(io::IReadFile* file) const
 		else
 		{
 			cnt &= 0x3f;
-			file->read( &value, 1 );
+			file->read(&value, 1);
+		}
+		if (header.Planes==1)
+			memset(PCXData+offset, value, cnt);
+		else
+		{
+			for (u32 i=0; i<cnt; ++i)
+			{
+				PCXData[linestart+lineoffset]=value;
+				lineoffset += 3;
+				if (lineoffset>=3*header.BytesPerLine)
+				{
+					lineoffset=nextmode;
+					if (++nextmode==3)
+						nextmode=0;
+					if (lineoffset==0)
+						linestart += 3*header.BytesPerLine;
+				}
+			}
 		}
-		memset(PCXData+offset, value, cnt);
-		offset += cnt;
 	}
 
 	// create image
 	video::IImage* image = 0;
-	s32 pitch = header.BytesPerLine - width * header.Planes * header.BitsPerPixel / 8;
+	s32 pad = (header.BytesPerLine - width * header.BitsPerPixel / 8) * header.Planes;
 
-	if (pitch < 0)
-		pitch = -pitch;
+	if (pad < 0)
+		pad = -pad;
 
-	switch(header.BitsPerPixel) // TODO: Other formats
+	if (header.BitsPerPixel==8)
 	{
-	case 8:
-		image = new CImage(ECF_A1R5G5B5, core::dimension2d<s32>(width, height));
-		if (image)
-			CColorConverter::convert8BitTo16Bit(PCXData, (s16*)image->lock(), width, height, paletteData, pitch);
-		break;
-	case 24:
-		image = new CImage(ECF_R8G8B8, core::dimension2d<s32>(width, height));
-		if (image)
-			CColorConverter::convert24BitTo24Bit(PCXData, (u8*)image->lock(), width, height, pitch);
-		break;
-	};
+		switch(header.Planes) // TODO: Other formats
+		{
+		case 1:
+			image = new CImage(ECF_A1R5G5B5, core::dimension2d<s32>(width, height));
+			if (image)
+				CColorConverter::convert8BitTo16Bit(PCXData, (s16*)image->lock(), width, height, paletteData, pad);
+			break;
+		case 3:
+			image = new CImage(ECF_R8G8B8, core::dimension2d<s32>(width, height));
+			if (image)
+				CColorConverter::convert24BitTo24Bit(PCXData, (u8*)image->lock(), width, height, pad);
+			break;
+		}
+	}
+	else if (header.BitsPerPixel==4)
+	{
+		if (header.Planes==1)
+		{
+			image = new CImage(ECF_A1R5G5B5, core::dimension2d<s32>(width, height));
+			if (image)
+				CColorConverter::convert4BitTo16Bit(PCXData, (s16*)image->lock(), width, height, paletteData, pad);
+		}
+	}
+	else if (header.BitsPerPixel==1)
+	{
+		if (header.Planes==4)
+		{
+			image = new CImage(ECF_A1R5G5B5, core::dimension2d<s32>(width, height));
+			if (image)
+				CColorConverter::convert4BitTo16Bit(PCXData, (s16*)image->lock(), width, height, paletteData, pad);
+		}
+		else if (header.Planes==1)
+		{
+			image = new CImage(ECF_A1R5G5B5, core::dimension2d<s32>(width, height));
+			if (image)
+				CColorConverter::convert1BitTo16Bit(PCXData, (s16*)image->lock(), width, height, pad);
+		}
+	}
 	if (image)
 		image->unlock();
 
diff --git a/src/dep/src/irrlicht/CImageLoaderPCX.h b/src/dep/src/irrlicht/CImageLoaderPCX.h
index 268ad61..1024e2c 100644
--- a/src/dep/src/irrlicht/CImageLoaderPCX.h
+++ b/src/dep/src/irrlicht/CImageLoaderPCX.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageLoaderPNG.cpp b/src/dep/src/irrlicht/CImageLoaderPNG.cpp
index 52827a9..398a3f1 100644
--- a/src/dep/src/irrlicht/CImageLoaderPNG.cpp
+++ b/src/dep/src/irrlicht/CImageLoaderPNG.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -184,9 +184,16 @@ IImage* CImageLoaderPng::loadImage(io::IReadFile* file) const
 
 	// Update the changes
 	png_read_update_info(png_ptr, info_ptr);
-	png_get_IHDR(png_ptr, info_ptr,
-		(png_uint_32*)&Width, (png_uint_32*)&Height,
-		&BitDepth, &ColorType, NULL, NULL, NULL);
+	{
+		// Use temporary variables to avoid passing casted pointers
+		png_uint_32 w,h;
+		// Extract info
+		png_get_IHDR(png_ptr, info_ptr,
+			&w, &h,
+			&BitDepth, &ColorType, NULL, NULL, NULL);
+		Width=w;
+		Height=h;
+	}
 
 	// Convert RGBA to BGRA
 	if (ColorType==PNG_COLOR_TYPE_RGB_ALPHA)
@@ -199,9 +206,16 @@ IImage* CImageLoaderPng::loadImage(io::IReadFile* file) const
 	}
 
 	// Update the changes
-	png_get_IHDR(png_ptr, info_ptr,
-		(png_uint_32*)&Width, (png_uint_32*)&Height,
-		&BitDepth, &ColorType, NULL, NULL, NULL);
+	{
+		// Use temporary variables to avoid passing casted pointers
+		png_uint_32 w,h;
+		// Extract info
+		png_get_IHDR(png_ptr, info_ptr,
+			&w, &h,
+			&BitDepth, &ColorType, NULL, NULL, NULL);
+		Width=w;
+		Height=h;
+	}
 
 	// Create the image structure to be filled by png data
 	if (ColorType==PNG_COLOR_TYPE_RGB_ALPHA)
diff --git a/src/dep/src/irrlicht/CImageLoaderPNG.h b/src/dep/src/irrlicht/CImageLoaderPNG.h
index fc49b02..d10d1e6 100644
--- a/src/dep/src/irrlicht/CImageLoaderPNG.h
+++ b/src/dep/src/irrlicht/CImageLoaderPNG.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageLoaderPPM.cpp b/src/dep/src/irrlicht/CImageLoaderPPM.cpp
index cab1122..25630ab 100644
--- a/src/dep/src/irrlicht/CImageLoaderPPM.cpp
+++ b/src/dep/src/irrlicht/CImageLoaderPPM.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2007 Christian Stehno
+// Copyright (C) 2007-2009 Christian Stehno
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -39,7 +39,7 @@ bool CImageLoaderPPM::isALoadableFileExtension(const c8* fileName) const
 //! returns true if the file maybe is able to be loaded by this class
 bool CImageLoaderPPM::isALoadableFileFormat(io::IReadFile* file) const
 {
-	c8 id[2];
+	c8 id[2]={0};
 	file->read(&id, 2);
 	return (id[0]=='P' && id[1]>'0' && id[1]<'7');
 }
@@ -144,7 +144,7 @@ IImage* CImageLoaderPPM::loadImage(io::IReadFile* file) const
 					for (u32 i=0; i<size; ++i)
 					{
 						getNextToken(file, token);
-						const u32 num = core::strtol10(token.c_str());
+						const u8 num = (u8)core::strtol10(token.c_str());
 						*ptr++ = num;
 						*ptr++ = num;
 						*ptr++ = num;
@@ -186,11 +186,11 @@ IImage* CImageLoaderPPM::loadImage(io::IReadFile* file) const
 					for (u32 i=0; i<size; ++i)
 					{
 						getNextToken(file, token);
-						*ptr++ = core::strtol10(token.c_str());
+						*ptr++ = (u8)core::strtol10(token.c_str());
 						getNextToken(file, token);
-						*ptr++ = core::strtol10(token.c_str());
+						*ptr++ = (u8)core::strtol10(token.c_str());
 						getNextToken(file, token);
-						*ptr++ = core::strtol10(token.c_str());
+						*ptr++ = (u8)core::strtol10(token.c_str());
 						*ptr++ = 255;
 					}
 				}
diff --git a/src/dep/src/irrlicht/CImageLoaderPPM.h b/src/dep/src/irrlicht/CImageLoaderPPM.h
index b1b7561..af71299 100644
--- a/src/dep/src/irrlicht/CImageLoaderPPM.h
+++ b/src/dep/src/irrlicht/CImageLoaderPPM.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007 Christian Stehno
+// Copyright (C) 2007-2009 Christian Stehno
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageLoaderPSD.cpp b/src/dep/src/irrlicht/CImageLoaderPSD.cpp
index 9ba417a..9268152 100644
--- a/src/dep/src/irrlicht/CImageLoaderPSD.cpp
+++ b/src/dep/src/irrlicht/CImageLoaderPSD.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -175,7 +175,7 @@ bool CImageLoaderPSD::readRawImageData(io::IReadFile* file, const PsdHeader& hea
 			break;
 		}
 
-		s16 shift = getShiftFromChannel(channel, header);
+		s16 shift = getShiftFromChannel((c8)channel, header);
 		if (shift != -1)
 		{
 			u32 mask = 0xff << shift;
@@ -316,7 +316,7 @@ bool CImageLoaderPSD::readRLEImageData(io::IReadFile* file, const PsdHeader& hea
 			}
 		}
 
-		s16 shift = getShiftFromChannel(channel, header);
+		s16 shift = getShiftFromChannel((c8)channel, header);
 
 		if (shift != -1)
 		{
diff --git a/src/dep/src/irrlicht/CImageLoaderPSD.h b/src/dep/src/irrlicht/CImageLoaderPSD.h
index 62db7b3..6b6cad0 100644
--- a/src/dep/src/irrlicht/CImageLoaderPSD.h
+++ b/src/dep/src/irrlicht/CImageLoaderPSD.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageLoaderTGA.cpp b/src/dep/src/irrlicht/CImageLoaderTGA.cpp
index 9a4e734..e2e36c8 100644
--- a/src/dep/src/irrlicht/CImageLoaderTGA.cpp
+++ b/src/dep/src/irrlicht/CImageLoaderTGA.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,7 +23,7 @@ namespace video
 //! based on the file extension (e.g. ".tga")
 bool CImageLoaderTGA::isALoadableFileExtension(const c8* fileName) const
 {
-	return strstr(fileName, ".tga") != 0;
+	return (strstr(fileName, ".tga") != 0) || (strstr(fileName, ".TGA") != 0);
 }
 
 
diff --git a/src/dep/src/irrlicht/CImageLoaderTGA.h b/src/dep/src/irrlicht/CImageLoaderTGA.h
index b37002b..26429d8 100644
--- a/src/dep/src/irrlicht/CImageLoaderTGA.h
+++ b/src/dep/src/irrlicht/CImageLoaderTGA.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageWriterBMP.cpp b/src/dep/src/irrlicht/CImageWriterBMP.cpp
index 2bd1a38..f4c7689 100644
--- a/src/dep/src/irrlicht/CImageWriterBMP.cpp
+++ b/src/dep/src/irrlicht/CImageWriterBMP.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageWriterBMP.h b/src/dep/src/irrlicht/CImageWriterBMP.h
index ddd4f1e..759c183 100644
--- a/src/dep/src/irrlicht/CImageWriterBMP.h
+++ b/src/dep/src/irrlicht/CImageWriterBMP.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageWriterJPG.cpp b/src/dep/src/irrlicht/CImageWriterJPG.cpp
index a30f3a6..df7b12e 100644
--- a/src/dep/src/irrlicht/CImageWriterJPG.cpp
+++ b/src/dep/src/irrlicht/CImageWriterJPG.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,7 +9,6 @@
 #include "CColorConverter.h"
 #include "IWriteFile.h"
 #include "CImage.h"
-#include "CColorConverter.h"
 #include "irrString.h"
 
 #ifdef _IRR_COMPILE_WITH_LIBJPEG_
@@ -23,7 +22,6 @@ extern "C"
 	#include "jpeglib/jpeglib.h"
 	#include "jpeglib/jerror.h"
 #endif
-#include <setjmp.h>
 }
 
 
@@ -32,118 +30,156 @@ namespace irr
 namespace video
 {
 
-
+// The writer uses a 4k buffer and flushes to disk each time it's filled
+#define OUTPUT_BUF_SIZE 4096
 typedef struct
 {
-  struct jpeg_destination_mgr pub; /* public fields */
+	struct jpeg_destination_mgr pub;/* public fields */
 
-  JOCTET * buffer;              /* image buffer */
-  u32 buffer_size;				/* image buffer size */
+	io::IWriteFile* file;		/* target file */
+	JOCTET buffer[OUTPUT_BUF_SIZE];	/* image buffer */
 } mem_destination_mgr;
 
 
 typedef mem_destination_mgr * mem_dest_ptr;
 
-void init_destination (j_compress_ptr cinfo)
+
+// init
+static void jpeg_init_destination(j_compress_ptr cinfo)
+{
+	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
+	dest->pub.next_output_byte = dest->buffer;
+	dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+}
+
+
+// flush to disk and reset buffer
+static boolean jpeg_empty_output_buffer(j_compress_ptr cinfo)
 {
 	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
 
-	/* image buffer must be allocated before mem_dest routines are called.  */
-	if(dest->buffer == NULL) {
-		//fprintf(stderr, "jmem_dest: init_destination: buffer not allocated\n");
-	}
+	// for now just exit upon file error
+	if (dest->file->write(dest->buffer, OUTPUT_BUF_SIZE) != OUTPUT_BUF_SIZE)
+		ERREXIT (cinfo, JERR_FILE_WRITE);
 
 	dest->pub.next_output_byte = dest->buffer;
-	dest->pub.free_in_buffer = dest->buffer_size;
+	dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+
+	return TRUE;
 }
 
 
-boolean empty_output_buffer (j_compress_ptr cinfo)
-{
-	/*
-	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
-	*/
-	// empty_output_buffer: buffer should not ever be full\n");
-	return FALSE;
-}
-
-
-void term_destination (j_compress_ptr cinfo)
+static void jpeg_term_destination(j_compress_ptr cinfo)
 {
 	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
-	size_t datacount = dest->buffer_size - dest->pub.free_in_buffer;
+	const s32 datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
+	// for now just exit upon file error
+	if (dest->file->write(dest->buffer, datacount) != datacount)
+		ERREXIT (cinfo, JERR_FILE_WRITE);
 }
 
-void jpeg_memory_dest (j_compress_ptr cinfo, u8 *jfif_buffer,
-                  s32 buf_size)
+
+// set up buffer data
+static void jpeg_file_dest(j_compress_ptr cinfo, io::IWriteFile* file)
 {
-  mem_dest_ptr dest;
+	if (cinfo->dest == NULL)
+	{ /* first time for this JPEG object? */
+		cinfo->dest = (struct jpeg_destination_mgr *)
+			(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,
+						JPOOL_PERMANENT,
+						sizeof(mem_destination_mgr));
+	}
 
-  if(jfif_buffer == NULL) {
-    //fprintf(stderr, "jpeg_memory_dest: memory buffer needs to be allocated\n");
-    //ERREXIT(cinfo, JERR_BUFFER_SIZE);
-	  return;
-  }
+	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;  /* for casting */
 
-  if (cinfo->dest == NULL) {    /* first time for this JPEG object? */
-    cinfo->dest = (struct jpeg_destination_mgr *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-                                  (size_t) sizeof(mem_destination_mgr));
-  }
+	/* Initialize method pointers */
+	dest->pub.init_destination = jpeg_init_destination;
+	dest->pub.empty_output_buffer = jpeg_empty_output_buffer;
+	dest->pub.term_destination = jpeg_term_destination;
 
-  dest = (mem_dest_ptr) cinfo->dest;  /* for casting */
-
-  /* Initialize method pointers */
-  dest->pub.init_destination = init_destination;
-  dest->pub.empty_output_buffer = empty_output_buffer;
-  dest->pub.term_destination = term_destination;
-
-  /* Initialize private member */
-  dest->buffer = (JOCTET*)jfif_buffer;
-  dest->buffer_size = buf_size;
+	/* Initialize private member */
+	dest->file = file;
 }
 
+
 /* write_JPEG_memory: store JPEG compressed image into memory.
 */
-void write_JPEG_memory (void *img_buf, s32 width, s32 height, u32 bpp, u32 pitch,
-					u8 *jpeg_buffer, u32 jpeg_buffer_size,
-					s32 quality, u32 *jpeg_comp_size)
+static bool writeJPEGFile(io::IWriteFile* file, IImage* image, u32 quality)
 {
+	void (*format)(const void*, s32, void*) = 0;
+	switch( image->getColorFormat () )
+	{
+		case ECF_R8G8B8:
+			format = CColorConverter::convert_R8G8B8toR8G8B8;
+			break;
+		case ECF_A8R8G8B8:
+			format = CColorConverter::convert_A8R8G8B8toR8G8B8;
+			break;
+		case ECF_A1R5G5B5:
+			format = CColorConverter::convert_A1R5G5B5toB8G8R8;
+			break;
+		case ECF_R5G6B5:
+			format = CColorConverter::convert_R5G6B5toR8G8B8;
+			break;
+	}
+
+	// couldn't find a color converter
+	if ( 0 == format )
+		return false;
+
+	const core::dimension2di dim = image->getDimension();
+	
 	struct jpeg_compress_struct cinfo;
 	struct jpeg_error_mgr jerr;
-
-	/* More stuff */
-	JSAMPROW row_pointer[1];      /* pointer to JSAMPLE row[s] */
-
 	cinfo.err = jpeg_std_error(&jerr);
+
 	jpeg_create_compress(&cinfo);
-	jpeg_memory_dest(&cinfo, jpeg_buffer, jpeg_buffer_size);
-	cinfo.image_width = width;
-	cinfo.image_height = height;
-	cinfo.input_components = bpp;
+	jpeg_file_dest(&cinfo, file);
+	cinfo.image_width = dim.Width;
+	cinfo.image_height = dim.Height;
+	cinfo.input_components = 3;
 	cinfo.in_color_space = JCS_RGB;
 
 	jpeg_set_defaults(&cinfo);
+
+	if ( 0 == quality )
+		quality = 75;
+
 	jpeg_set_quality(&cinfo, quality, TRUE);
 	jpeg_start_compress(&cinfo, TRUE);
 
-	while (cinfo.next_scanline < cinfo.image_height)
+	u8 * dest = new u8[dim.Width*3];
+
+	if (dest)
 	{
-		row_pointer[0] = (u8*) img_buf + (cinfo.next_scanline * pitch );
-		jpeg_write_scanlines(&cinfo, row_pointer, 1);
-	}
-
-	/* Step 6: Finish compression */
-	jpeg_finish_compress(&cinfo);
-
-	{
-		mem_dest_ptr dest = (mem_dest_ptr) cinfo.dest;
-		*jpeg_comp_size = dest->buffer_size - dest->pub.free_in_buffer;
+		const u32 pitch = image->getPitch();
+		JSAMPROW row_pointer[1];      /* pointer to JSAMPLE row[s] */
+		row_pointer[0] = dest;
+
+		u8* src = (u8*)image->lock();
+
+		while (cinfo.next_scanline < cinfo.image_height)
+		{
+			// convert next line
+			format( src, dim.Width, dest );
+			src += pitch;
+			jpeg_write_scanlines(&cinfo, row_pointer, 1);
+		}
+		image->unlock();
+
+		delete [] dest;
+
+		/* Step 6: Finish compression */
+		jpeg_finish_compress(&cinfo);
 	}
 
+	/* Step 7: Destroy */
 	jpeg_destroy_compress(&cinfo);
+
+	return (dest != 0);
 }
 
+
 } // namespace video
 } // namespace irr
 
@@ -169,63 +205,17 @@ CImageWriterJPG::CImageWriterJPG()
 
 bool CImageWriterJPG::isAWriteableFileExtension(const c8* fileName) const
 {
-	return strstr(fileName, ".jpg") != 0 || strstr(fileName, ".jpeg") != 0;
+	const char* dot = strrchr (fileName, '.');
+	return dot && (!strcmp (dot, ".jpg") || !strcmp (dot, ".jpeg"));
 }
 
 
-bool CImageWriterJPG::writeImage(io::IWriteFile *file, IImage *input,u32 quality) const
+bool CImageWriterJPG::writeImage(io::IWriteFile *file, IImage *image, u32 quality) const
 {
 #ifndef _IRR_COMPILE_WITH_LIBJPEG_
 	return false;
 #else
-
-	core::dimension2di dim = input->getDimension();
-	IImage * image = new CImage(ECF_R8G8B8, dim );
-
-	void (*format)(const void*, s32, void*) = 0;
-	switch( input->getColorFormat () )
-	{
-		case ECF_R8G8B8:	format = CColorConverter::convert_R8G8B8toR8G8B8; break;
-		case ECF_A8R8G8B8:	format = CColorConverter::convert_A8R8G8B8toR8G8B8; break;
-		case ECF_A1R5G5B5:	format = CColorConverter::convert_A1R5G5B5toB8G8R8; break;
-		case ECF_R5G6B5:	format = CColorConverter::convert_R5G6B5toR8G8B8; break;
-	}
-
-	// couldn't find a color converter
-	if ( 0 == format )
-		return false;
-
-	s32 y;
-	void *src = input->lock();
-	void *dst = image->lock();
-	for ( y = 0; y!= dim.Height; ++y )
-	{
-		format( src, dim.Width, dst );
-		src = (void*) ( (u8*) src + input->getPitch () );
-		dst = (void*) ( (u8*) dst + image->getPitch () );
-	}
-	input->unlock ();
-	image->unlock ();
-
-	// temp buffer
-	u32 destSize = image->getImageDataSizeInBytes ();
-	u8 * dest = new u8 [ destSize ];
-	
-	if ( 0 == quality )
-		quality = 75;
-
-	write_JPEG_memory ( image->lock (), dim.Width, dim.Height,
-				image->getBytesPerPixel(), image->getPitch(),
-				dest, destSize,
-				quality,
-				&destSize);
-
-	file->write ( dest, destSize );
-
-	image->drop ();
-	delete [] dest;
-
-	return true;
+	return writeJPEGFile(file, image, quality);
 #endif
 }
 
diff --git a/src/dep/src/irrlicht/CImageWriterJPG.h b/src/dep/src/irrlicht/CImageWriterJPG.h
index a990a8a..f44cd56 100644
--- a/src/dep/src/irrlicht/CImageWriterJPG.h
+++ b/src/dep/src/irrlicht/CImageWriterJPG.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageWriterPCX.cpp b/src/dep/src/irrlicht/CImageWriterPCX.cpp
index 8d23a88..d942e0b 100644
--- a/src/dep/src/irrlicht/CImageWriterPCX.cpp
+++ b/src/dep/src/irrlicht/CImageWriterPCX.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -35,8 +35,124 @@ bool CImageWriterPCX::isAWriteableFileExtension(const c8* fileName) const
 
 bool CImageWriterPCX::writeImage(io::IWriteFile *file, IImage *image,u32 param) const
 {
-	os::Printer::log("PCX writer not yet implemented. Image not written.", ELL_WARNING);
-	return false;
+	if (!file || !image)
+		return false;
+
+	u8 d1;
+	u16 d2;
+	s32 i;
+
+	d1 = 10; // Manufacturer
+	file->write(&d1, 1);
+	d1 = 5; // Version
+	file->write(&d1, 1);
+	d1 = 1; // Encoding
+	file->write(&d1, 1);
+	d1 = 8; // Bits per Pixel
+	file->write(&d1, 1);
+	d2 = 0; // pixel origin
+	file->write(&d2, 2);
+	file->write(&d2, 2);
+	d2 = image->getDimension().Width-1; // width
+#ifdef __BIG_ENDIAN__
+	d2 = os::Byteswap::byteswap(d2);
+#endif
+	file->write(&d2, 2);
+	d2 = image->getDimension().Height-1; // height
+#ifdef __BIG_ENDIAN__
+	d2 = os::Byteswap::byteswap(d2);
+#endif
+	file->write(&d2, 2);
+	d2 = 300; // dpi
+#ifdef __BIG_ENDIAN__
+	d2 = os::Byteswap::byteswap(d2);
+#endif
+	file->write(&d2, 2);
+	file->write(&d2, 2);
+	d2 = 0; // palette (not used)
+	for (i=0; i<24; ++i)
+	{
+		file->write(&d2, 2);
+	}
+	d1 = 0; // reserved
+	file->write(&d1, 1);
+	d1 = 3; // planes
+	file->write(&d1, 1);
+	d2 = image->getDimension().Width; // pitch
+	if (d2&0x0001) // must be even
+		++d2;
+#ifdef __BIG_ENDIAN__
+	d2 = os::Byteswap::byteswap(d2);
+#endif
+	file->write(&d2, 2);
+	d2 = 1; // color mode
+#ifdef __BIG_ENDIAN__
+	d2 = os::Byteswap::byteswap(d2);
+#endif
+	file->write(&d2, 2);
+	d2 = 800; // screen width
+#ifdef __BIG_ENDIAN__
+	d2 = os::Byteswap::byteswap(d2);
+#endif
+	file->write(&d2, 2);
+	d2 = 600; // screen height
+#ifdef __BIG_ENDIAN__
+	d2 = os::Byteswap::byteswap(d2);
+#endif
+	file->write(&d2, 2);
+	d2 = 0; // filler (not used)
+	for (i=0; i<27; ++i)
+	{
+		file->write(&d2, 2);
+	}
+
+	u8 cnt, value;
+	for (i=0; i<image->getDimension().Height; ++i)
+	{
+		cnt = 0;
+		value = 0;
+		for (u32 j=0; j<3; ++j) // color planes
+		{
+			for (s32 k=0; k<image->getDimension().Width; ++k)
+			{
+				const SColor pix = image->getPixel(k,i);
+				if ((cnt!=0) && (cnt<63) &&
+					(((j==0) && (value==pix.getRed())) ||
+					((j==1) && (value==pix.getGreen())) ||
+					((j==2) && (value==pix.getBlue()))))
+				{
+					++cnt;
+				}
+				else
+				{
+					if (cnt!=0)
+					{
+						if ((cnt>1) || ((value&0xc0)==0xc0))
+						{
+							cnt |= 0xc0;
+							file->write(&cnt, 1);
+						}
+						file->write(&value, 1);
+					}
+					cnt=1;
+					if (j==0)
+						value=(u8)pix.getRed();
+					else if (j==1)
+						value=(u8)pix.getGreen();
+					else if (j==2)
+						value=(u8)pix.getBlue();
+				}
+			}
+		}
+		if ((cnt>1) || ((value&0xc0)==0xc0))
+		{
+			cnt |= 0xc0;
+			file->write(&cnt, 1);
+		}
+		file->write(&value, 1);
+	}
+
+	return true;
 }
 
 } // namespace video
diff --git a/src/dep/src/irrlicht/CImageWriterPCX.h b/src/dep/src/irrlicht/CImageWriterPCX.h
index 70ce87a..7cf09f1 100644
--- a/src/dep/src/irrlicht/CImageWriterPCX.h
+++ b/src/dep/src/irrlicht/CImageWriterPCX.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageWriterPNG.cpp b/src/dep/src/irrlicht/CImageWriterPNG.cpp
index 9d2eb07..805d233 100644
--- a/src/dep/src/irrlicht/CImageWriterPNG.cpp
+++ b/src/dep/src/irrlicht/CImageWriterPNG.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -78,7 +78,7 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
 		NULL, (png_error_ptr)png_cpexcept_error, NULL);
 	if (!png_ptr)
 	{
-		os::Printer::log("LOAD PNG: Internal PNG create write struct failure\n", file->getFileName(), ELL_ERROR);
+		os::Printer::log("PNGWriter: Internal PNG create write struct failure\n", file->getFileName(), ELL_ERROR);
 		return false;
 	}
 
@@ -86,7 +86,7 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
 	png_infop info_ptr = png_create_info_struct(png_ptr);
 	if (!info_ptr)
 	{
-		os::Printer::log("LOAD PNG: Internal PNG create info struct failure\n", file->getFileName(), ELL_ERROR);
+		os::Printer::log("PNGWriter: Internal PNG create info struct failure\n", file->getFileName(), ELL_ERROR);
 		png_destroy_write_struct(&png_ptr, NULL);
 		return false;
 	}
@@ -132,7 +132,7 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
 	u8* tmpImage = new u8[image->getDimension().Height*lineWidth];
 	if (!tmpImage)
 	{
-		os::Printer::log("LOAD PNG: Internal PNG create image failure\n", file->getFileName(), ELL_ERROR);
+		os::Printer::log("PNGWriter: Internal PNG create image failure\n", file->getFileName(), ELL_ERROR);
 		png_destroy_write_struct(&png_ptr, &info_ptr);
 		return false;
 	}
@@ -161,7 +161,7 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
 	u8** RowPointers = new png_bytep[image->getDimension().Height];
 	if (!RowPointers)
 	{
-		os::Printer::log("LOAD PNG: Internal PNG create row pointers failure\n", file->getFileName(), ELL_ERROR);
+		os::Printer::log("PNGWriter: Internal PNG create row pointers failure\n", file->getFileName(), ELL_ERROR);
 		png_destroy_write_struct(&png_ptr, &info_ptr);
 		delete [] tmpImage;
 		return false;
diff --git a/src/dep/src/irrlicht/CImageWriterPNG.h b/src/dep/src/irrlicht/CImageWriterPNG.h
index a13a940..0b45ed8 100644
--- a/src/dep/src/irrlicht/CImageWriterPNG.h
+++ b/src/dep/src/irrlicht/CImageWriterPNG.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageWriterPPM.cpp b/src/dep/src/irrlicht/CImageWriterPPM.cpp
index 2a3fd11..a686d9e 100644
--- a/src/dep/src/irrlicht/CImageWriterPPM.cpp
+++ b/src/dep/src/irrlicht/CImageWriterPPM.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -40,7 +40,7 @@ bool CImageWriterPPM::isAWriteableFileExtension(const c8* fileName) const
 bool CImageWriterPPM::writeImage(io::IWriteFile *file, IImage *image, u32 param) const
 {
 	char cache[70];
-	char size;
+	int size;
 
 	const core::dimension2d<s32>& imageSize = image->getDimension();
 
@@ -69,9 +69,9 @@ bool CImageWriterPPM::writeImage(io::IWriteFile *file, IImage *image, u32 param)
 			for (s32 c = 0; c < imageSize.Width; ++c)
 			{
 				const video::SColor& pixel = image->getPixel(c, h);
-				const u8 r = pixel.getRed() & 0xff;
-				const u8 g = pixel.getGreen() & 0xff;
-				const u8 b = pixel.getBlue() & 0xff;
+				const u8 r = (u8)(pixel.getRed() & 0xff);
+				const u8 g = (u8)(pixel.getGreen() & 0xff);
+				const u8 b = (u8)(pixel.getBlue() & 0xff);
 				file->write(&r, 1);
 				file->write(&g, 1);
 				file->write(&b, 1);
diff --git a/src/dep/src/irrlicht/CImageWriterPPM.h b/src/dep/src/irrlicht/CImageWriterPPM.h
index c09bc36..99a68a9 100644
--- a/src/dep/src/irrlicht/CImageWriterPPM.h
+++ b/src/dep/src/irrlicht/CImageWriterPPM.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageWriterPSD.cpp b/src/dep/src/irrlicht/CImageWriterPSD.cpp
index 9471f71..25c4d5b 100644
--- a/src/dep/src/irrlicht/CImageWriterPSD.cpp
+++ b/src/dep/src/irrlicht/CImageWriterPSD.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageWriterPSD.h b/src/dep/src/irrlicht/CImageWriterPSD.h
index 9028a6f..bf0be8d 100644
--- a/src/dep/src/irrlicht/CImageWriterPSD.h
+++ b/src/dep/src/irrlicht/CImageWriterPSD.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageWriterTGA.cpp b/src/dep/src/irrlicht/CImageWriterTGA.cpp
index 6a9b358..7016c67 100644
--- a/src/dep/src/irrlicht/CImageWriterTGA.cpp
+++ b/src/dep/src/irrlicht/CImageWriterTGA.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CImageWriterTGA.h b/src/dep/src/irrlicht/CImageWriterTGA.h
index e74ae88..7f24338 100644
--- a/src/dep/src/irrlicht/CImageWriterTGA.h
+++ b/src/dep/src/irrlicht/CImageWriterTGA.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CIrrDeviceLinux.cpp b/src/dep/src/irrlicht/CIrrDeviceLinux.cpp
index 1941b24..c1254e1 100644
--- a/src/dep/src/irrlicht/CIrrDeviceLinux.cpp
+++ b/src/dep/src/irrlicht/CIrrDeviceLinux.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -20,12 +20,26 @@
 #include "SIrrCreationParameters.h"
 #include <X11/XKBlib.h>
 
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+#include <fcntl.h>
+#include <unistd.h>
+
+// linux/joystick.h includes linux/input.h, which #defines values for various KEY_FOO keys.
+// These override the irr::KEY_FOO equivalents, which stops key handling from working.
+// As a workaround, defining _INPUT_H stops linux/input.h from being included; it
+// doesn't actually seem to be necessary except to pull in sys/ioctl.h.
+#define _INPUT_H
+#include <sys/ioctl.h> // Would normally be included in linux/input.h
+#include <linux/joystick.h>
+#undef _INPUT_H
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
 namespace irr
 {
 	namespace video
 	{
-		IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize,
-			bool fullscreen, bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias);
+		IVideoDriver* createOpenGLDriver(const SIrrlichtCreationParameters& params,
+				io::IFileSystem* io);
 	}
 } // end namespace irr
 
@@ -37,19 +51,18 @@ namespace irr
 const char* wmDeleteWindow = "WM_DELETE_WINDOW";
 
 //! constructor
-CIrrDeviceLinux::CIrrDeviceLinux(video::E_DRIVER_TYPE driverType,
-	const core::dimension2d<s32>& windowSize,
-	u32 bits, bool fullscreen,
-	bool sbuffer, bool vsync, bool antiAlias,
-	IEventReceiver* receiver,
-	const char* version)
- : CIrrDeviceStub(version, receiver),
+CIrrDeviceLinux::CIrrDeviceLinux(const SIrrlichtCreationParameters& param)
+ : CIrrDeviceStub(param),
 #ifdef _IRR_COMPILE_WITH_X11_
 	display(0), visual(0), screennr(0), window(0), StdHints(0), SoftwareImage(0),
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+	Context(0),
 #endif
-	Fullscreen(fullscreen), StencilBuffer(sbuffer), AntiAlias(antiAlias), DriverType(driverType),
-	Width(windowSize.Width), Height(windowSize.Height), Depth(24), 
-	Close(false), WindowActive(false), WindowMinimized(false), UseXVidMode(false), UseXRandR(false), UseGLXWindow(false), AutorepeatSupport(0)
+#endif
+	Width(param.WindowSize.Width), Height(param.WindowSize.Height),
+	Close(false), WindowHasFocus(false), WindowMinimized(false),
+	UseXVidMode(false), UseXRandR(false), UseGLXWindow(false),
+	AutorepeatSupport(0)
 {
 	#ifdef _DEBUG
 	setDebugName("CIrrDeviceLinux");
@@ -58,7 +71,7 @@ CIrrDeviceLinux::CIrrDeviceLinux(video::E_DRIVER_TYPE driverType,
 	// print version, distribution etc.
 	// thx to LynxLuna for pointing me to the uname function
 	core::stringc linuxversion;
-	struct utsname LinuxInfo; 
+	struct utsname LinuxInfo;
 	uname(&LinuxInfo);
 
 	linuxversion += LinuxInfo.sysname;
@@ -76,18 +89,18 @@ CIrrDeviceLinux::CIrrDeviceLinux(video::E_DRIVER_TYPE driverType,
 	createKeyMap();
 
 	// create window
-	if (driverType != video::EDT_NULL)
+	if (CreationParams.DriverType != video::EDT_NULL)
 	{
 		// create the window, only if we do not use the null device
-		if (!createWindow(windowSize, bits))
+		if (!createWindow())
 			return;
 	}
 
 	// create cursor control
-	CursorControl = new CCursorControl(this, driverType == video::EDT_NULL);
+	CursorControl = new CCursorControl(this, CreationParams.DriverType == video::EDT_NULL);
 
 	// create driver
-	createDriver(windowSize, vsync);
+	createDriver();
 
 	if (!VideoDriver)
 		return;
@@ -96,7 +109,6 @@ CIrrDeviceLinux::CIrrDeviceLinux(video::E_DRIVER_TYPE driverType,
 }
 
 
-
 //! destructor
 CIrrDeviceLinux::~CIrrDeviceLinux()
 {
@@ -108,24 +120,31 @@ CIrrDeviceLinux::~CIrrDeviceLinux()
 		#ifdef _IRR_COMPILE_WITH_OPENGL_
 		if (Context)
 		{
-			if (!glXMakeCurrent(display, None, NULL))
-				os::Printer::log("Could not release glx context.", ELL_WARNING);
+			if (glxWin)
+			{
+				if (!glXMakeContextCurrent(display, None, None, NULL))
+					os::Printer::log("Could not release glx context.", ELL_WARNING);
+			}
+			else
+			{
+				if (!glXMakeCurrent(display, None, NULL))
+					os::Printer::log("Could not release glx context.", ELL_WARNING);
+			}
 			glXDestroyContext(display, Context);
-			if (UseGLXWindow)
+			if (glxWin)
 				glXDestroyWindow(display, glxWin);
-			Context = 0;
 		}
 		#endif // #ifdef _IRR_COMPILE_WITH_OPENGL_
 
 		#ifdef _IRR_LINUX_X11_VIDMODE_
-		if (UseXVidMode && Fullscreen)
+		if (UseXVidMode && CreationParams.Fullscreen)
 		{
 			XF86VidModeSwitchToMode(display, screennr, &oldVideoMode);
 			XF86VidModeSetViewPort(display, screennr, 0, 0);
 		}
 		#endif
 		#ifdef _IRR_LINUX_X11_RANDR_
-		if (UseXRandR && Fullscreen)
+		if (UseXRandR && CreationParams.Fullscreen)
 		{
 			XRRScreenConfiguration *config=XRRGetScreenInfo(display,DefaultRootWindow(display));
 			XRRSetScreenConfig(display,config,DefaultRootWindow(display),oldRandrMode,oldRandrRotation,CurrentTime);
@@ -133,7 +152,7 @@ CIrrDeviceLinux::~CIrrDeviceLinux()
 		}
 		#endif
 
-		if (DriverType == video::EDT_SOFTWARE || DriverType == video::EDT_BURNINGSVIDEO)
+		if (SoftwareImage)
 			XDestroyImage(SoftwareImage);
 		XDestroyWindow(display,window);
 		XCloseDisplay(display);
@@ -142,29 +161,37 @@ CIrrDeviceLinux::~CIrrDeviceLinux()
 		XFree(visual);
 
 #endif // #ifdef _IRR_COMPILE_WITH_X11_
-}
 
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	for(u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
+	{
+		if(ActiveJoysticks[joystick].fd >= 0)
+		{
+			close(ActiveJoysticks[joystick].fd);
+		}
+	}
+#endif
+}
 
 
 #if defined(_IRR_COMPILE_WITH_X11_) && defined(_DEBUG)
 int IrrPrintXError(Display *display, XErrorEvent *event)
 {
 	char msg[256];
+	char msg2[256];
 
+	snprintf(msg, 256, "%d", event->request_code);
+	XGetErrorDatabaseText(display, "XRequest", msg, "unknown", msg2, 256);
 	XGetErrorText(display, event->error_code, msg, 256);
-	os::Printer::log("XErrorEvent", msg, ELL_WARNING);
+	os::Printer::log("X Error", msg, ELL_WARNING);
+	os::Printer::log("From call ", msg2, ELL_WARNING);
 	return 0;
 }
 #endif
 
 
-
-bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
-						u32 bits)
+bool CIrrDeviceLinux::createWindow()
 {
-	Width = windowSize.Width;
-	Height = windowSize.Height;
-
 #ifdef _IRR_COMPILE_WITH_X11_
 #ifdef _DEBUG
 	os::Printer::log("Creating X window...", ELL_INFORMATION);
@@ -175,6 +202,7 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 	if (!display)
 	{
 		os::Printer::log("Error: Need running XServer to start Irrlicht Engine.", ELL_ERROR);
+		os::Printer::log("Could not open display", XDisplayName(0), ELL_ERROR);
 		return false;
 	}
 
@@ -182,11 +210,13 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 
 	// query extension
 
-	if (Fullscreen)
+	if (CreationParams.Fullscreen)
 	{
+		getVideoModeList();
+		#if defined(_IRR_LINUX_X11_VIDMODE_) || defined(_IRR_LINUX_X11_RANDR_)
 		s32 eventbase, errorbase;
 		s32 bestMode = -1;
-		s32 defaultDepth=DefaultDepth(display,screennr);
+		#endif
 
 		#ifdef _IRR_LINUX_X11_VIDMODE_
 		if (XF86VidModeQueryExtension(display, &eventbase, &errorbase))
@@ -197,21 +227,17 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 
 			XF86VidModeGetAllModeLines(display, screennr, &modeCount, &modes);
 
-			// save current video mode
-			oldVideoMode = *modes[0];
-
 			// find fitting mode
-
-			VideoModeList.setDesktop(defaultDepth, core::dimension2d<s32>(
-				modes[0]->hdisplay, modes[0]->vdisplay));
 			for (s32 i = 0; i<modeCount; ++i)
 			{
 				if (bestMode==-1 && modes[i]->hdisplay >= Width && modes[i]->vdisplay >= Height)
 					bestMode = i;
-				else if (bestMode!=-1 && modes[i]->hdisplay >= Width && modes[i]->vdisplay >= Height && modes[i]->hdisplay < modes[bestMode]->hdisplay && modes[i]->vdisplay < modes[bestMode]->vdisplay)
+				else if (bestMode!=-1 &&
+						modes[i]->hdisplay >= Width &&
+						modes[i]->vdisplay >= Height &&
+						modes[i]->hdisplay < modes[bestMode]->hdisplay &&
+						modes[i]->vdisplay < modes[bestMode]->vdisplay)
 					bestMode = i;
-				VideoModeList.addMode(core::dimension2d<s32>(
-					modes[i]->hdisplay, modes[i]->vdisplay), defaultDepth);
 			}
 			if (bestMode != -1)
 			{
@@ -223,7 +249,7 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 			else
 			{
 				os::Printer::log("Could not find specified video mode, running windowed.", ELL_WARNING);
-				Fullscreen = false;
+				CreationParams.Fullscreen = false;
 			}
 
 			XFree(modes);
@@ -235,18 +261,17 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 		{
 			s32 modeCount;
 			XRRScreenConfiguration *config=XRRGetScreenInfo(display,DefaultRootWindow(display));
-			oldRandrMode=XRRConfigCurrentConfiguration(config,&oldRandrRotation);
 			XRRScreenSize *modes=XRRConfigSizes(config,&modeCount);
-			VideoModeList.setDesktop(defaultDepth, core::dimension2d<s32>(
-				modes[oldRandrMode].width, modes[oldRandrMode].height));
 			for (s32 i = 0; i<modeCount; ++i)
 			{
 				if (bestMode==-1 && (u32)modes[i].width >= Width && (u32)modes[i].height >= Height)
 					bestMode = i;
-				else if (bestMode!=-1 && (u32)modes[i].width >= Width && (u32)modes[i].height >= Height && modes[i].width < modes[bestMode].width && modes[i].height < modes[bestMode].height)
+				else if (bestMode!=-1 &&
+						(u32)modes[i].width >= Width &&
+						(u32)modes[i].height >= Height &&
+						modes[i].width < modes[bestMode].width &&
+						modes[i].height < modes[bestMode].height)
 					bestMode = i;
-				VideoModeList.addMode(core::dimension2d<s32>(
-					modes[i].width, modes[i].height), defaultDepth);
 			}
 			if (bestMode != -1)
 			{
@@ -260,17 +285,16 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 		{
 			os::Printer::log("VidMode or RandR extension must be installed to allow Irrlicht "
 			"to switch to fullscreen mode. Running in windowed mode instead.", ELL_WARNING);
-			Fullscreen = false;
+			CreationParams.Fullscreen = false;
 		}
 	}
-	
+
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-	Context=0;
 	GLXFBConfig glxFBConfig;
 	int major, minor;
 	bool isAvailableGLX=false;
-	if (DriverType==video::EDT_OPENGL)
+	if (CreationParams.DriverType==video::EDT_OPENGL)
 	{
 		isAvailableGLX=glXQueryExtension(display,&major,&minor);
 		if (isAvailableGLX && glXQueryVersion(display, &major, &minor))
@@ -281,30 +305,30 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 				// attribute array for the draw buffer
 				int visualAttrBuffer[] =
 				{
-				    GLX_RENDER_TYPE, GLX_RGBA_BIT,
-				    GLX_RED_SIZE, 4,
-				    GLX_GREEN_SIZE, 4,
-				    GLX_BLUE_SIZE, 4,
-				    GLX_ALPHA_SIZE, 4,
-				    GLX_DEPTH_SIZE, 16,
-				    GLX_DOUBLEBUFFER, GL_TRUE,
-				    GLX_STENCIL_SIZE, 1,
-				    GLX_SAMPLE_BUFFERS_ARB, GL_TRUE,
-				    GLX_SAMPLES_ARB, MAX_SAMPLES,
-				    None
+					GLX_RENDER_TYPE, GLX_RGBA_BIT,
+					GLX_RED_SIZE, 4,
+					GLX_GREEN_SIZE, 4,
+					GLX_BLUE_SIZE, 4,
+					GLX_ALPHA_SIZE, CreationParams.WithAlphaChannel?1:0,
+					GLX_DEPTH_SIZE, CreationParams.ZBufferBits,
+					GLX_DOUBLEBUFFER, GL_TRUE,
+					GLX_STENCIL_SIZE, 1,
+					GLX_SAMPLE_BUFFERS_ARB, 1,
+					GLX_SAMPLES_ARB, MAX_SAMPLES,
+					None
 				};
 
 				GLXFBConfig *configList=0;
 				int nitems=0;
-				if (!AntiAlias)
+				if (!CreationParams.AntiAlias)
 				{
-					visualAttrBuffer[17] = GL_FALSE;
+					visualAttrBuffer[17] = 0;
 					visualAttrBuffer[19] = 0;
 				}
-				if (StencilBuffer)
+				if (CreationParams.Stencilbuffer)
 				{
 					configList=glXChooseFBConfig(display, screennr, visualAttrBuffer,&nitems);
-					if (!configList && AntiAlias)
+					if (!configList && CreationParams.AntiAlias)
 					{
 						while (!configList && (visualAttrBuffer[19]>1))
 						{
@@ -313,18 +337,18 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 						}
 						if (!configList)
 						{
-							visualAttrBuffer[17] = GL_FALSE;
+							visualAttrBuffer[17] = 0;
 							visualAttrBuffer[19] = 0;
 							configList=glXChooseFBConfig(display, screennr, visualAttrBuffer,&nitems);
 							if (configList)
 							{
 								os::Printer::log("No FSAA available.", ELL_WARNING);
-								AntiAlias=false;
+								CreationParams.AntiAlias=false;
 							}
 							else
 							{
 								//reenable multisampling
-								visualAttrBuffer[17] = GL_TRUE;
+								visualAttrBuffer[17] = 1;
 								visualAttrBuffer[19] = MAX_SAMPLES;
 							}
 						}
@@ -333,13 +357,13 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 				// Next try without stencil buffer
 				if (!configList)
 				{
-					if (StencilBuffer)
+					if (CreationParams.Stencilbuffer)
 						os::Printer::log("No stencilbuffer available, disabling stencil shadows.", ELL_WARNING);
-					StencilBuffer = false;
+					CreationParams.Stencilbuffer = false;
 					visualAttrBuffer[15]=0;
 
 					configList=glXChooseFBConfig(display, screennr, visualAttrBuffer,&nitems);
-					if (!configList && AntiAlias)
+					if (!configList && CreationParams.AntiAlias)
 					{
 						while (!configList && (visualAttrBuffer[19]>1))
 						{
@@ -348,18 +372,18 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 						}
 						if (!configList)
 						{
-							visualAttrBuffer[17] = GL_FALSE;
+							visualAttrBuffer[17] = 0;
 							visualAttrBuffer[19] = 0;
 							configList=glXChooseFBConfig(display, screennr, visualAttrBuffer,&nitems);
 							if (configList)
 							{
 								os::Printer::log("No FSAA available.", ELL_WARNING);
-								AntiAlias=false;
+								CreationParams.AntiAlias=false;
 							}
 							else
 							{
 								//reenable multisampling
-								visualAttrBuffer[17] = GL_TRUE;
+								visualAttrBuffer[17] = 1;
 								visualAttrBuffer[19] = MAX_SAMPLES;
 							}
 						}
@@ -371,7 +395,7 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 					os::Printer::log("No doublebuffering available.", ELL_WARNING);
 					visualAttrBuffer[13] = GL_FALSE;
 					configList=glXChooseFBConfig(display, screennr, visualAttrBuffer,&nitems);
-					if (!configList && AntiAlias)
+					if (!configList && CreationParams.AntiAlias)
 					{
 						while (!configList && (visualAttrBuffer[19]>1))
 						{
@@ -380,18 +404,18 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 						}
 						if (!configList)
 						{
-							visualAttrBuffer[17] = GL_FALSE;
+							visualAttrBuffer[17] = 0;
 							visualAttrBuffer[19] = 0;
 							configList=glXChooseFBConfig(display, screennr, visualAttrBuffer,&nitems);
 							if (configList)
 							{
 								os::Printer::log("No FSAA available.", ELL_WARNING);
-								AntiAlias=false;
+								CreationParams.AntiAlias=false;
 							}
 							else
 							{
 								//reenable multisampling
-								visualAttrBuffer[17] = GL_TRUE;
+								visualAttrBuffer[17] = 1;
 								visualAttrBuffer[19] = MAX_SAMPLES;
 							}
 						}
@@ -410,25 +434,25 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 				// attribute array for the draw buffer
 				int visualAttrBuffer[] =
 				{
-				    GLX_RGBA, GL_TRUE,
-				    GLX_RED_SIZE, 4,
-				    GLX_GREEN_SIZE, 4,
-				    GLX_BLUE_SIZE, 4,
-				    GLX_ALPHA_SIZE, 4,
-				    GLX_DEPTH_SIZE, 16,
-				    GLX_DOUBLEBUFFER, GL_TRUE,
-				    GLX_STENCIL_SIZE, 1,
-				    None
+					GLX_RGBA, GL_TRUE,
+					GLX_RED_SIZE, 4,
+					GLX_GREEN_SIZE, 4,
+					GLX_BLUE_SIZE, 4,
+					GLX_ALPHA_SIZE, CreationParams.WithAlphaChannel?1:0,
+					GLX_DEPTH_SIZE, CreationParams.ZBufferBits,
+					GLX_DOUBLEBUFFER, GL_TRUE,
+					GLX_STENCIL_SIZE, 1,
+					None
 				};
 
-				if (StencilBuffer)
+				if (CreationParams.Stencilbuffer)
 					visual=glXChooseVisual(display, screennr, visualAttrBuffer);
 				if (!visual)
 				{
-					if (StencilBuffer)
+					if (CreationParams.Stencilbuffer)
 					{
-						os::Printer::log("No stencilbuffer available, disabling stencil shadows.", ELL_WARNING);
-						StencilBuffer = false;
+						os::Printer::log("No stencilbuffer available, disabling.", ELL_WARNING);
+						CreationParams.Stencilbuffer = false;
 					}
 					visualAttrBuffer[15]=0;
 
@@ -445,7 +469,7 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 		else
 			os::Printer::log("No GLX support available. OpenGL driver will not work.", ELL_WARNING);
 	}
-	
+
 #endif // _IRR_COMPILE_WITH_OPENGL_
 
 	// create visual with standard X methods
@@ -455,12 +479,13 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 		int visNumber; // Return value of available visuals
 
 		visTempl.screen = screennr;
-		visTempl.depth = 16;
-		while ((!visual) && (visTempl.depth<=32))
+		// ARGB visuals should be avoided for usual applications
+		visTempl.depth = CreationParams.WithAlphaChannel?32:24;
+		while ((!visual) && (visTempl.depth>=16))
 		{
 			visual = XGetVisualInfo(display, VisualScreenMask|VisualDepthMask,
 				&visTempl, &visNumber);
-			visTempl.depth+=8;
+			visTempl.depth -= 8;
 		}
 	}
 
@@ -471,21 +496,27 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 		display=0;
 		return false;
 	}
+#ifdef _DEBUG
+	else
+		os::Printer::log("Visual chosen: ", core::stringc(static_cast<u32>(visual->visualid)).c_str(), ELL_INFORMATION);
+#endif
 
 	// create color map
 	Colormap colormap;
 	colormap = XCreateColormap(display,
-			    RootWindow(display, visual->screen),
-			    visual->visual, AllocNone);
+			RootWindow(display, visual->screen),
+			visual->visual, AllocNone);
 
 	attributes.colormap = colormap;
 	attributes.border_pixel = 0;
-	attributes.event_mask = KeyPressMask | ButtonPressMask |
-			StructureNotifyMask | PointerMotionMask |
-			ButtonReleaseMask | KeyReleaseMask;
+	attributes.event_mask = StructureNotifyMask | FocusChangeMask;
+	if (!CreationParams.IgnoreInput)
+		attributes.event_mask |= PointerMotionMask |
+				ButtonPressMask | KeyPressMask |
+				ButtonReleaseMask | KeyReleaseMask;
 
 	// create Window, either for Fullscreen or windowed mode
-	if (Fullscreen)
+	if (CreationParams.Fullscreen)
 	{
 		attributes.override_redirect = True;
 
@@ -493,8 +524,9 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 				RootWindow(display, visual->screen),
 				0, 0, Width, Height, 0, visual->depth,
 				InputOutput, visual->visual,
-				CWBorderPixel | CWColormap | CWEventMask |
-				CWOverrideRedirect, &attributes);
+				CWBorderPixel | CWColormap | CWEventMask | CWOverrideRedirect,
+				&attributes);
+		CreationParams.WindowId = (void*)window;
 
 		XWarpPointer(display, None, window, 0, 0, 0, 0, 0, 0);
 		XMapRaised(display, window);
@@ -508,25 +540,39 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 		attributes.event_mask |= ExposureMask;
 		attributes.event_mask |= FocusChangeMask;
 
-		window = XCreateWindow(display,
-				RootWindow(display, visual->screen),
-				0, 0, Width, Height, 0, visual->depth,
-				InputOutput, visual->visual,
-				CWBorderPixel | CWColormap | CWEventMask,
-				&attributes);
+		if(!CreationParams.WindowId)
+		{
+			window = XCreateWindow(display,
+					RootWindow(display, visual->screen),
+					0, 0, Width, Height, 0, visual->depth,
+					InputOutput, visual->visual,
+					CWBorderPixel | CWColormap | CWEventMask,
+					&attributes);
+		}
+		else
+		{
+			window = XCreateWindow(display,
+					(Window)CreationParams.WindowId,
+					0, 0, Width, Height, 0, visual->depth,
+					InputOutput, visual->visual,
+					CWBorderPixel | CWColormap | CWEventMask,
+					&attributes);
+		}
+		CreationParams.WindowId = (void*)window;
 
 		Atom wmDelete;
 		wmDelete = XInternAtom(display, wmDeleteWindow, True);
 		XSetWMProtocols(display, window, &wmDelete, 1);
 		XMapRaised(display, window);
 	}
-	WindowActive=true;
+	WindowMinimized=false;
 	XkbSetDetectableAutoRepeat(display, True, &AutorepeatSupport);
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
 	// connect glx context to window
-	if (isAvailableGLX && DriverType==video::EDT_OPENGL)
+	Context=0;
+	if (isAvailableGLX && CreationParams.DriverType==video::EDT_OPENGL)
 	{
 	if (UseGLXWindow)
 	{
@@ -575,25 +621,28 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 	Window tmp;
 	u32 borderWidth;
 	int x,y;
+	unsigned int bits;
 
-	XGetGeometry(display, window, &tmp, &x, &y, &Width, &Height, &borderWidth, &Depth);
+	XGetGeometry(display, window, &tmp, &x, &y, &Width, &Height, &borderWidth, &bits);
+	CreationParams.Bits = bits;
 	StdHints = XAllocSizeHints();
 	long num;
 	XGetWMNormalHints(display, window, StdHints, &num);
 
-	// create an XImage for the software renderer 
+	// create an XImage for the software renderer
 	//(thx to Nadav for some clues on how to do that!)
 
-	if (DriverType == video::EDT_SOFTWARE || DriverType == video::EDT_BURNINGSVIDEO)
+	if (CreationParams.DriverType == video::EDT_SOFTWARE || CreationParams.DriverType == video::EDT_BURNINGSVIDEO)
 	{
-		SoftwareImage = XCreateImage(display, 
-			visual->visual, visual->depth, 
+		SoftwareImage = XCreateImage(display,
+			visual->visual, visual->depth,
 			ZPixmap, 0, 0, Width, Height,
 			BitmapPad(display), 0);
 
 		// use malloc because X will free it later on
-		SoftwareImage->data = (char*) malloc(SoftwareImage->bytes_per_line * SoftwareImage->height * sizeof(char));
-	} 
+		if (SoftwareImage)
+			SoftwareImage->data = (char*) malloc(SoftwareImage->bytes_per_line * SoftwareImage->height * sizeof(char));
+	}
 
 #endif // #ifdef _IRR_COMPILE_WITH_X11_
 	return true;
@@ -601,24 +650,23 @@ bool CIrrDeviceLinux::createWindow(const core::dimension2d<s32>& windowSize,
 
 
 //! create the driver
-void CIrrDeviceLinux::createDriver(const core::dimension2d<s32>& windowSize,
-				   bool vsync)
+void CIrrDeviceLinux::createDriver()
 {
-	switch(DriverType)
+	switch(CreationParams.DriverType)
 	{
 #ifdef _IRR_COMPILE_WITH_X11_
 
 	case video::EDT_SOFTWARE:
 		#ifdef _IRR_COMPILE_WITH_SOFTWARE_
-		VideoDriver = video::createSoftwareDriver(windowSize, Fullscreen, FileSystem, this);
+		VideoDriver = video::createSoftwareDriver(CreationParams.WindowSize, CreationParams.Fullscreen, FileSystem, this);
 		#else
 		os::Printer::log("No Software driver support compiled in.", ELL_ERROR);
 		#endif
 		break;
-		
+
 	case video::EDT_BURNINGSVIDEO:
 		#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
-		VideoDriver = video::createSoftwareDriver2(windowSize, Fullscreen, FileSystem, this);
+		VideoDriver = video::createSoftwareDriver2(CreationParams.WindowSize, CreationParams.Fullscreen, FileSystem, this);
 		#else
 		os::Printer::log("Burning's video driver was not compiled in.", ELL_ERROR);
 		#endif
@@ -627,7 +675,7 @@ void CIrrDeviceLinux::createDriver(const core::dimension2d<s32>& windowSize,
 	case video::EDT_OPENGL:
 	#ifdef _IRR_COMPILE_WITH_OPENGL_
 		if (Context)
-			VideoDriver = video::createOpenGLDriver(windowSize, Fullscreen, StencilBuffer, FileSystem, vsync, AntiAlias);
+			VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem);
 	#else
 		os::Printer::log("No OpenGL support compiled in.", ELL_ERROR);
 	#endif
@@ -640,7 +688,7 @@ void CIrrDeviceLinux::createDriver(const core::dimension2d<s32>& windowSize,
 		break;
 
 	case video::EDT_NULL:
-		VideoDriver = video::createNullDriver(FileSystem, windowSize);
+		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
 		break;
 
 	default:
@@ -648,7 +696,7 @@ void CIrrDeviceLinux::createDriver(const core::dimension2d<s32>& windowSize,
 		break;
 #else
 	case video::EDT_NULL:
-		VideoDriver = video::createNullDriver(FileSystem, windowSize);
+		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
 		break;
 	default:
 		os::Printer::log("No X11 support compiled in. Only Null driver available.", ELL_ERROR);
@@ -658,14 +706,13 @@ void CIrrDeviceLinux::createDriver(const core::dimension2d<s32>& windowSize,
 }
 
 
-
 //! runs the device. Returns false if device wants to be deleted
 bool CIrrDeviceLinux::run()
 {
 	os::Timer::tick();
 
 #ifdef _IRR_COMPILE_WITH_X11_
-	if (DriverType != video::EDT_NULL)
+	if ((CreationParams.DriverType != video::EDT_NULL) && display)
 	{
 		SEvent irrevent;
 
@@ -685,18 +732,19 @@ bool CIrrDeviceLinux::run()
 					Height = event.xconfigure.height;
 
 					// resize image data
-					if (DriverType == video::EDT_SOFTWARE || DriverType == video::EDT_BURNINGSVIDEO)
+					if (SoftwareImage)
 					{
 						XDestroyImage(SoftwareImage);
 
-						SoftwareImage = XCreateImage(display, 
-							visual->visual, visual->depth, 
+						SoftwareImage = XCreateImage(display,
+							visual->visual, visual->depth,
 							ZPixmap, 0, 0, Width, Height,
 							BitmapPad(display), 0);
 
 						// use malloc because X will free it later on
-						SoftwareImage->data = (char*) malloc(SoftwareImage->bytes_per_line * SoftwareImage->height * sizeof(char));
-					} 
+						if (SoftwareImage)
+							SoftwareImage->data = (char*) malloc(SoftwareImage->bytes_per_line * SoftwareImage->height * sizeof(char));
+					}
 
 					if (VideoDriver)
 						VideoDriver->OnResize(core::dimension2d<s32>(Width, Height));
@@ -712,11 +760,11 @@ bool CIrrDeviceLinux::run()
 				break;
 
 			case FocusIn:
-				WindowActive=true;
+				WindowHasFocus=true;
 				break;
 
 			case FocusOut:
-				WindowActive=false;
+				WindowHasFocus=false;
 				break;
 
 			case MotionNotify:
@@ -793,11 +841,10 @@ bool CIrrDeviceLinux::run()
 			case KeyPress:
 				{
 					SKeyMap mp;
-					//mp.X11Key = XLookupKeysym(&event.xkey, 0);
-					char buf[5]="\0\0\0\0";
-					XLookupString (&event.xkey, buf, 4, &mp.X11Key, NULL) ;
+					char buf[8]={0};
+					XLookupString(&event.xkey, buf, sizeof(buf), &mp.X11Key, NULL);
 
-					s32 idx = KeyMap.binary_search(mp);
+					const s32 idx = KeyMap.binary_search(mp);
 
 					if (idx != -1)
 						irrevent.KeyInput.Key = (EKEY_CODE)KeyMap[idx].Win32Key;
@@ -808,7 +855,8 @@ bool CIrrDeviceLinux::run()
 					}
 					irrevent.EventType = irr::EET_KEY_INPUT_EVENT;
 					irrevent.KeyInput.PressedDown = (event.type == KeyPress);
-					mbtowc(&irrevent.KeyInput.Char, buf, 4);
+//					mbtowc(&irrevent.KeyInput.Char, buf, sizeof(buf));
+					irrevent.KeyInput.Char = ((wchar_t*)(buf))[0];
 					irrevent.KeyInput.Control = (event.xkey.state & ControlMask) != 0;
 					irrevent.KeyInput.Shift = (event.xkey.state & ShiftMask) != 0;
 					postEventFromUser(irrevent);
@@ -823,6 +871,14 @@ bool CIrrDeviceLinux::run()
 						os::Printer::log("Quit message received.", ELL_INFORMATION);
 						Close = true;
 					}
+					else
+					{
+						// we assume it's a user message
+						irrevent.EventType = irr::EET_USER_EVENT;
+						irrevent.UserEvent.UserData1 = (s32)event.xclient.data.l[0];
+						irrevent.UserEvent.UserData2 = (s32)event.xclient.data.l[1];
+						postEventFromUser(irrevent);
+					}
 					XFree(atom);
 				}
 				break;
@@ -835,6 +891,9 @@ bool CIrrDeviceLinux::run()
 	}
 #endif //_IRR_COMPILE_WITH_X11_
 
+	if(!Close)
+		pollJoysticks();
+
 	return !Close;
 }
 
@@ -846,11 +905,12 @@ void CIrrDeviceLinux::yield()
 	nanosleep(&ts, NULL);
 }
 
+
 //! Pause execution and let other processes to run for a specified amount of time.
 void CIrrDeviceLinux::sleep(u32 timeMs, bool pauseTimer=false)
 {
-	bool wasStopped = Timer ? Timer->isStopped() : true;
-	
+	const bool wasStopped = Timer ? Timer->isStopped() : true;
+
 	struct timespec ts;
 	ts.tv_sec = (time_t) (timeMs / 1000);
 	ts.tv_nsec = (long) (timeMs % 1000) * 1000000;
@@ -864,133 +924,78 @@ void CIrrDeviceLinux::sleep(u32 timeMs, bool pauseTimer=false)
 		Timer->start();
 }
 
+
 //! sets the caption of the window
 void CIrrDeviceLinux::setWindowCaption(const wchar_t* text)
 {
 #ifdef _IRR_COMPILE_WITH_X11_
-	if (DriverType == video::EDT_NULL)
+	if (CreationParams.DriverType == video::EDT_NULL)
 		return;
 
 	XTextProperty txt;
 	XwcTextListToTextProperty(display, const_cast<wchar_t**>(&text), 1, XStdICCTextStyle, &txt);
 	XSetWMName(display, window, &txt);
 	XSetWMIconName(display, window, &txt);
+	XFree(txt.value);
 #endif
 }
 
 
-
 //! presents a surface in the client area
-void CIrrDeviceLinux::present(video::IImage* image, s32 windowId, core::rect<s32>* src )
+bool CIrrDeviceLinux::present(video::IImage* image, void* windowId, core::rect<s32>* srcRect)
 {
 #ifdef _IRR_COMPILE_WITH_X11_
 	// this is only necessary for software drivers.
-	if (DriverType != video::EDT_SOFTWARE && DriverType != video::EDT_BURNINGSVIDEO)
-		return;
+	if (!SoftwareImage)
+		return true;
 
-	// thx to Nadav, who send me some clues of how to display the image 
+	// thx to Nadav, who send me some clues of how to display the image
 	// to the X Server.
 
-	if (image->getColorFormat() != video::ECF_A1R5G5B5 &&
-	    image->getColorFormat() != video::ECF_A8R8G8B8)
+	const int destwidth = SoftwareImage->width;
+	const int minWidth = core::min_(image->getDimension().Width, destwidth);
+	const int destPitch = SoftwareImage->bytes_per_line;
+
+	video::ECOLOR_FORMAT destColor;
+	switch (SoftwareImage->bits_per_pixel)
 	{
-		os::Printer::log("Internal error, can only present A1R5G5B5 and A8R8G8B8 pictures.");
-		return;
-	}
-	
-	int destwidth = SoftwareImage->width;
-	int destheight = SoftwareImage->height;
-	int srcwidth = image->getDimension().Width;
-	int srcheight = image->getDimension().Height;
-	// clip images
-	srcheight = srcheight < destheight ? srcheight : destheight;
-	
-	if ( image->getColorFormat() == video::ECF_A8R8G8B8 )
-	{
-		// display 24/32 bit image
-		
-		s32* srcdata = (s32*)image->lock();
-		
-		if ((Depth == 32)||(Depth == 24))
-		{	
-			int destPitch = SoftwareImage->bytes_per_line;
-			u8* destData = reinterpret_cast<u8*>(SoftwareImage->data);
-			
-			for (int y=0; y<srcheight; ++y)
-			{
-				video::CColorConverter::convert_A8R8G8B8toA8R8G8B8(srcdata,srcwidth<destwidth?srcwidth:destwidth,destData);
-				srcdata+=srcwidth;
-				destData+=destPitch;
-			}
-		}
-		else
-		if (Depth == 16)
-		{
-			// convert to R5G6B6
-			
-			int destPitch = SoftwareImage->bytes_per_line;
-			u8* destData = reinterpret_cast<u8*>(SoftwareImage->data);
-			
-			for (int y=0; y<srcheight; ++y)
-			{
-				video::CColorConverter::convert_A8R8G8B8toR5G6B5(srcdata,srcwidth<destwidth?srcwidth:destwidth,destData);
-				srcdata+=srcwidth;
-				destData+=destPitch;
-			}
-		}
-		else
+		case 16:
+			if (SoftwareImage->depth==16)
+				destColor = video::ECF_R5G6B5;
+			else
+				destColor = video::ECF_A1R5G5B5;
+		break;
+		case 24: destColor = video::ECF_R8G8B8; break;
+		case 32: destColor = video::ECF_A8R8G8B8; break;
+		default:
 			os::Printer::log("Unsupported screen depth.");
-		
-		image->unlock();
+			return false;
 	}
-	else
+
+	u8* srcdata = reinterpret_cast<u8*>(image->lock());
+	u8* destData = reinterpret_cast<u8*>(SoftwareImage->data);
+
+	const int destheight = SoftwareImage->height;
+	const int srcheight = core::min_(image->getDimension().Height, destheight);
+	const int srcPitch = image->getPitch();
+	for (int y=0; y!=srcheight; ++y)
 	{
-		// display 16 bit image
-	
-		s16* srcdata = (s16*)image->lock();
-	
-		if (Depth == 16)
-		{
-			// convert from A1R5G5B5 to R5G6B6
-			
-			int destPitch = SoftwareImage->bytes_per_line;
-			u8* destData = reinterpret_cast<u8*>(SoftwareImage->data);
-			
-			for (int y=0; y<srcheight; ++y)
-			{
-				video::CColorConverter::convert_A1R5G5B5toR5G6B5(srcdata,srcwidth<destwidth?srcwidth:destwidth,destData);
-				srcdata+=srcwidth;
-				destData+=destPitch;
-			}
-		}
-		else
-		if ((Depth == 32)||(Depth == 24))
-		{
-			// convert from A1R5G5B5 to X8R8G8B8
-				
-			int destPitch = SoftwareImage->bytes_per_line;
-			u8* destData = reinterpret_cast<u8*>(SoftwareImage->data);
-			
-			for (int y=0; y<srcheight; ++y)
-			{
-				video::CColorConverter::convert_A1R5G5B5toA8R8G8B8(srcdata,srcwidth<destwidth?srcwidth:destwidth,destData);
-				srcdata+=srcwidth;
-				destData+=destPitch;
-			}
-		}
-		else
-			os::Printer::log("Unsupported screen depth.");
-	
-		image->unlock();
+		video::CColorConverter::convert_viaFormat(srcdata,image->getColorFormat(), minWidth, destData, destColor);
+		srcdata+=srcPitch;
+		destData+=destPitch;
 	}
+	image->unlock();
 
 	GC gc = DefaultGC(display, DefaultScreen(display));
-	XPutImage(display, window, gc, SoftwareImage, 0, 0, 0, 0, destwidth, destheight);
+	Window myWindow=window;
+	if (windowId)
+		myWindow = reinterpret_cast<Window>(windowId);
+	XPutImage(display, myWindow, gc, SoftwareImage, 0, 0, 0, 0, destwidth, destheight);
 #endif
+	return true;
 }
 
 
-
 //! notifies the device that it should close itself
 void CIrrDeviceLinux::closeDevice()
 {
@@ -998,20 +1003,44 @@ void CIrrDeviceLinux::closeDevice()
 }
 
 
-
 //! returns if window is active. if not, nothing need to be drawn
 bool CIrrDeviceLinux::isWindowActive() const
 {
-	return WindowActive;
+	return (WindowHasFocus && !WindowMinimized);
 }
 
 
+//! returns if window has focus.
+bool CIrrDeviceLinux::isWindowFocused() const
+{
+	return WindowHasFocus;
+}
+
+
+//! returns if window is minimized.
+bool CIrrDeviceLinux::isWindowMinimized() const
+{
+	return WindowMinimized;
+}
+
+
+//! returns color format of the window.
+video::ECOLOR_FORMAT CIrrDeviceLinux::getColorFormat() const
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (visual && (visual->depth != 16))
+		return video::ECF_R8G8B8;
+	else
+#endif
+		return video::ECF_R5G6B5;
+}
+
 
 //! Sets if the window should be resizeable in windowed mode.
 void CIrrDeviceLinux::setResizeAble(bool resize)
 {
 #ifdef _IRR_COMPILE_WITH_X11_
-	if (DriverType == video::EDT_NULL)
+	if (CreationParams.DriverType == video::EDT_NULL)
 		return;
 
 	XUnmapWindow(display, window);
@@ -1035,11 +1064,10 @@ void CIrrDeviceLinux::setResizeAble(bool resize)
 }
 
 
-//! \return Returns a pointer to a list with all video modes supported
-//! by the gfx adapter.
+//! Return pointer to a list with all video modes supported by the gfx adapter.
 video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 {
-
+#ifdef _IRR_COMPILE_WITH_X11_
 	if (!VideoModeList.getVideoModeCount())
 	{
 		bool temporaryDisplay = false;
@@ -1051,8 +1079,10 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 		}
 		if (display)
 		{
+			#if defined(_IRR_LINUX_X11_VIDMODE_) || defined(_IRR_LINUX_X11_RANDR_)
 			s32 eventbase, errorbase;
 			s32 defaultDepth=DefaultDepth(display,screennr);
+			#endif
 
 			#ifdef _IRR_LINUX_X11_VIDMODE_
 			if (XF86VidModeQueryExtension(display, &eventbase, &errorbase))
@@ -1104,14 +1134,15 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
 		if (display && temporaryDisplay)
 		{
 			XCloseDisplay(display);
+			display=0;
 		}
 	}
+#endif
 
 	return &VideoModeList;
 }
 
 
-
 void CIrrDeviceLinux::createKeyMap()
 {
 	// I don't know if this is the best method  to create
@@ -1119,6 +1150,7 @@ void CIrrDeviceLinux::createKeyMap()
 	// I find a better version.
 
 #ifdef _IRR_COMPILE_WITH_X11_
+	KeyMap.reallocate(84);
 	KeyMap.push_back(SKeyMap(XK_BackSpace, KEY_BACK));
 	KeyMap.push_back(SKeyMap(XK_Tab, KEY_TAB));
 	KeyMap.push_back(SKeyMap(XK_Linefeed, 0)); // ???
@@ -1128,6 +1160,7 @@ void CIrrDeviceLinux::createKeyMap()
 	KeyMap.push_back(SKeyMap(XK_Scroll_Lock, KEY_SCROLL));
 	KeyMap.push_back(SKeyMap(XK_Sys_Req, 0)); // ???
 	KeyMap.push_back(SKeyMap(XK_Escape, KEY_ESCAPE));
+	KeyMap.push_back(SKeyMap(XK_Insert, KEY_INSERT));
 	KeyMap.push_back(SKeyMap(XK_Delete, KEY_DELETE));
 	KeyMap.push_back(SKeyMap(XK_Home, KEY_HOME));
 	KeyMap.push_back(SKeyMap(XK_Left, KEY_LEFT));
@@ -1215,7 +1248,7 @@ void CIrrDeviceLinux::createKeyMap()
 	KeyMap.push_back(SKeyMap(XK_plus, KEY_PLUS)); //?
 	KeyMap.push_back(SKeyMap(XK_comma, KEY_COMMA)); //?
 	KeyMap.push_back(SKeyMap(XK_minus, KEY_MINUS)); //?
-	KeyMap.push_back(SKeyMap(XK_period, KEY_PERIOD)); //? 
+	KeyMap.push_back(SKeyMap(XK_period, KEY_PERIOD)); //?
 	KeyMap.push_back(SKeyMap(XK_slash, 0)); //?
 	KeyMap.push_back(SKeyMap(XK_0, KEY_KEY_0));
 	KeyMap.push_back(SKeyMap(XK_1, KEY_KEY_1));
@@ -1309,20 +1342,121 @@ void CIrrDeviceLinux::createKeyMap()
 #endif
 }
 
+bool CIrrDeviceLinux::activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
+{
+#if defined (_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+
+	joystickInfo.clear();
+
+	u32 joystick;
+	for(joystick = 0; joystick < 32; ++joystick)
+	{
+		// The joystick device could be here...
+		core::stringc devName = "/dev/js";
+		devName += joystick;
+
+		SJoystickInfo returnInfo;
+		JoystickInfo info;
+
+		info.fd = open(devName.c_str(), O_RDONLY);
+		if(-1 == info.fd)
+		{
+			// ...but Ubuntu and possibly other distros 
+			// create the devices in /dev/input
+			devName = "/dev/input/js";
+			devName += joystick;
+			info.fd = open(devName.c_str(), O_RDONLY);
+		}
+
+		if(-1 == info.fd)
+			continue;
+
+		ioctl( info.fd, JSIOCGAXES, &(info.axes) );
+		ioctl( info.fd, JSIOCGBUTTONS, &(info.buttons) );
+
+		fcntl( info.fd, F_SETFL, O_NONBLOCK );
+
+		(void)memset(&info.persistentData, 0, sizeof(info.persistentData));
+		info.persistentData.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+		info.persistentData.JoystickEvent.Joystick = ActiveJoysticks.size();
+
+		// There's no obvious way to determine which (if any) axes represent a POV
+		// hat, so we'll just set it to "not used" and forget about it.
+		info.persistentData.JoystickEvent.POV = 65535;
+
+		ActiveJoysticks.push_back(info);
+
+		returnInfo.Joystick = joystick;
+		returnInfo.PovHat = SJoystickInfo::POV_HAT_UNKNOWN;
+		returnInfo.Axes = info.axes;
+		returnInfo.Buttons = info.buttons;
+
+		char name[80];
+		ioctl( info.fd, JSIOCGNAME(80), name);
+		returnInfo.Name = name;
+	
+		joystickInfo.push_back(returnInfo);
+	}
+
+	for(joystick = 0; joystick < joystickInfo.size(); ++joystick)
+	{
+		char logString[256];
+		(void)sprintf(logString, "Found joystick %u, %u axes, %u buttons '%s'",
+			joystick, joystickInfo[joystick].Axes, 
+			joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
+		os::Printer::log(logString, ELL_INFORMATION);
+	}
+
+	return true;
+#else
+	return false;
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+}
+
+
+void CIrrDeviceLinux::pollJoysticks()
+{
+#if defined (_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	if(0 == ActiveJoysticks.size())
+		return;
+
+	u32 joystick;
+	for(joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
+	{
+		JoystickInfo & info =  ActiveJoysticks[joystick];
+
+		struct js_event event;
+		while(sizeof(event) == read(info.fd, &event, sizeof(event)))
+		{
+			switch(event.type & ~JS_EVENT_INIT)
+			{
+			case JS_EVENT_BUTTON:
+				if (event.value)
+	        			info.persistentData.JoystickEvent.ButtonStates |= (1 << event.number);
+	   			else
+	      				info.persistentData.JoystickEvent.ButtonStates &= ~(1 << event.number);
+				break;
+
+			case JS_EVENT_AXIS:
+				info.persistentData.JoystickEvent.Axis[event.number] = event.value;
+				break;
+
+			default:
+				break;
+			}
+		}
+
+		// Send an irrlicht joystick event once per ::run() even if no new data were received.
+		(void)postEventFromUser(info.persistentData);
+	}
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+} 
+
 
 IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDeviceEx(const SIrrlichtCreationParameters& param)
 {
-	CIrrDeviceLinux* dev = new CIrrDeviceLinux(
-		param.DriverType,
-		param.WindowSize,
-		param.Bits,
-		param.Fullscreen,
-		param.Stencilbuffer,
-		param.Vsync,
-		param.AntiAlias,
-		param.EventReceiver,
-		param.SDK_version_do_not_use);
-	
+	CIrrDeviceLinux* dev = new CIrrDeviceLinux(param);
+
 	if (dev && !dev->getVideoDriver() && param.DriverType != video::EDT_NULL)
 	{
 		dev->drop();
diff --git a/src/dep/src/irrlicht/CIrrDeviceLinux.h b/src/dep/src/irrlicht/CIrrDeviceLinux.h
index 5d5f14b..cfc44cc 100644
--- a/src/dep/src/irrlicht/CIrrDeviceLinux.h
+++ b/src/dep/src/irrlicht/CIrrDeviceLinux.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -47,10 +47,7 @@ namespace irr
 	public:
 
 		//! constructor
-		CIrrDeviceLinux(video::E_DRIVER_TYPE deviceType,
-			const core::dimension2d<s32>& windowSize, u32 bits,
-			bool fullscreen, bool stencilbuffer, bool vsync, bool antiAlias, IEventReceiver* receiver,
-			const char* version);
+		CIrrDeviceLinux(const SIrrlichtCreationParameters& param);
 
 		//! destructor
 		virtual ~CIrrDeviceLinux();
@@ -71,8 +68,17 @@ namespace irr
 		//! returns if window is active. if not, nothing need to be drawn
 		virtual bool isWindowActive() const;
 
+		//! returns if window has focus.
+		virtual bool isWindowFocused() const;
+
+		//! returns if window is minimized.
+		virtual bool isWindowMinimized() const;
+
+		//! returns color format of the window.
+		virtual video::ECOLOR_FORMAT getColorFormat() const;
+
 		//! presents a surface in the client area
-		virtual void present(video::IImage* surface, s32 windowId = 0, core::rect<s32>* src=0 );
+		virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0 );
 
 		//! notifies the device that it should close itself
 		virtual void closeDevice();
@@ -84,16 +90,20 @@ namespace irr
 		//! Sets if the window should be resizeable in windowed mode.
 		virtual void setResizeAble(bool resize=false);
 
+		//! Activate any joysticks, and generate events for them.
+		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
+
 	private:
 
 		//! create the driver
-		void createDriver(const core::dimension2d<s32>& windowSize,
-					bool vsync);
+		void createDriver();
 
-		bool createWindow(const core::dimension2d<s32>& windowSize, u32 bits);
+		bool createWindow();
 
 		void createKeyMap();
 
+		void pollJoysticks(); 
+
 		//! Implementation of the linux cursor control
 		class CCursorControl : public gui::ICursorControl
 		{
@@ -184,20 +194,20 @@ namespace irr
 					{
 						XWarpPointer(Device->display,
 							None,
-				 			Device->window, 0, 0,
-				 			Device->Width,
-				 			Device->Height, 
+							Device->window, 0, 0,
+							Device->Width,
+							Device->Height,
 							ReferenceRect.UpperLeftCorner.X + x,
 							ReferenceRect.UpperLeftCorner.Y + y);
-						
+
 					}
 					else
 					{
 						XWarpPointer(Device->display,
 							None,
-				 			Device->window, 0, 0,
-				 			Device->Width,
-				 			Device->Height, x, y);
+							Device->window, 0, 0,
+							Device->Width,
+							Device->Height, x, y);
 					}
 					XFlush(Device->display);
 				}
@@ -217,7 +227,7 @@ namespace irr
 			virtual core::position2d<f32> getRelativePosition()
 			{
 				updateCursorPos();
-				
+
 				if (!UseReferenceRect)
 				{
 					return core::position2d<f32>(CursorPos.X / (f32)Device->Width,
@@ -274,15 +284,15 @@ namespace irr
 #endif
 			}
 
-			core::position2d<s32> CursorPos;
 			CIrrDeviceLinux* Device;
-			bool IsVisible;
-			bool Null;
-			bool UseReferenceRect;
+			core::position2d<s32> CursorPos;
 			core::rect<s32> ReferenceRect;
 #ifdef _IRR_COMPILE_WITH_X11_
 			Cursor invisCursor;
 #endif
+			bool IsVisible;
+			bool Null;
+			bool UseReferenceRect;
 		};
 
 		friend class CCursorControl;
@@ -307,14 +317,9 @@ namespace irr
 		GLXContext Context;
 		#endif
 #endif
-		bool Fullscreen;
-		bool StencilBuffer;
-		bool AntiAlias;
-		video::E_DRIVER_TYPE DriverType;
-
-		u32 Width, Height, Depth;
+		u32 Width, Height;
 		bool Close;
-		bool WindowActive;
+		bool WindowHasFocus;
 		bool WindowMinimized;
 		bool UseXVidMode;
 		bool UseXRandR;
@@ -339,6 +344,20 @@ namespace irr
 		};
 
 		core::array<SKeyMap> KeyMap;
+
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+		struct JoystickInfo
+		{
+			int	fd;
+			int	axes;
+			int	buttons;
+
+			SEvent persistentData;
+
+			JoystickInfo() : fd(-1), axes(0), buttons(0) { }
+		};
+		core::array<JoystickInfo> ActiveJoysticks;
+#endif
 	};
 
 
diff --git a/src/dep/src/irrlicht/CIrrDeviceSDL.cpp b/src/dep/src/irrlicht/CIrrDeviceSDL.cpp
index 8eea325..5e09c30 100644
--- a/src/dep/src/irrlicht/CIrrDeviceSDL.cpp
+++ b/src/dep/src/irrlicht/CIrrDeviceSDL.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,36 +19,34 @@
 #include "SIrrCreationParameters.h"
 #include <SDL/SDL_syswm.h>
 
+#ifdef _MSC_VER
+#pragma comment(lib, "SDL.lib")
+#endif // _MSC_VER
+
 namespace irr
 {
 	namespace video
 	{
-		IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize,
-			bool fullscreen, bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias);
-	}
+		IVideoDriver* createOpenGLDriver(const SIrrlichtCreationParameters& params,
+				io::IFileSystem* io);
+	} // end namespace video
 
 } // end namespace irr
 
 
-
 namespace irr
 {
 
 const char* wmDeleteWindow = "WM_DELETE_WINDOW";
 
 //! constructor
-CIrrDeviceSDL::CIrrDeviceSDL(video::E_DRIVER_TYPE driverType,
-				const core::dimension2d<s32>& windowSize,
-				u32 bits,
-				bool fullscreen, bool stencilbuffer, bool vsync,
-				bool antiAlias, IEventReceiver* receiver,
-				void* windowID, const char* version)
-	: CIrrDeviceStub(version, receiver), Depth(bits),
-	Fullscreen(fullscreen), Stencilbuffer(stencilbuffer), Vsync(vsync),
-	AntiAlias(antiAlias), Resizeable(false),
-	Screen((SDL_Surface*)windowID), SDL_Flags(SDL_HWSURFACE|SDL_ANYFORMAT),
-	Width(windowSize.Width), Height(windowSize.Height), Close(0),
-	WindowActive(false)
+CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters& param)
+	: CIrrDeviceStub(param),
+	Screen((SDL_Surface*)param.WindowId), SDL_Flags(SDL_HWSURFACE|SDL_ANYFORMAT),
+	MouseX(0), MouseY(0),
+	Width(param.WindowSize.Width), Height(param.WindowSize.Height),
+	Close(0), Resizeable(false),
+	WindowHasFocus(false), WindowMinimized(false)
 {
 	#ifdef _DEBUG
 	setDebugName("CIrrDeviceSDL");
@@ -56,7 +54,11 @@ CIrrDeviceSDL::CIrrDeviceSDL(video::E_DRIVER_TYPE driverType,
 
 	// Initialize SDL... Timer for sleep, video for the obvious, and
 	// noparachute prevents SDL from catching fatal errors.
-	if ( SDL_Init( SDL_INIT_TIMER|SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE ) < 0 )
+	if (SDL_Init( SDL_INIT_TIMER|SDL_INIT_VIDEO|
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+				SDL_INIT_JOYSTICK|
+#endif
+				SDL_INIT_NOPARACHUTE ) < 0)
 	{
 		os::Printer::log( "Unable to initialize SDL!", SDL_GetError());
 		Close = 1;
@@ -78,67 +80,74 @@ CIrrDeviceSDL::CIrrDeviceSDL(video::E_DRIVER_TYPE driverType,
 
 	// create keymap
 	createKeyMap();
+	// enable key to character translation
+	SDL_EnableUNICODE(1);
 
-	if ( Fullscreen )
+	(void)SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+	
+	if ( CreationParams.Fullscreen )
 		SDL_Flags |= SDL_FULLSCREEN;
-	if (driverType == video::EDT_OPENGL)
+	if (CreationParams.DriverType == video::EDT_OPENGL)
 		SDL_Flags |= SDL_OPENGL;
 	else
 		SDL_Flags |= SDL_DOUBLEBUF;
 	// create window
-	if (driverType != video::EDT_NULL)
+	if (CreationParams.DriverType != video::EDT_NULL)
 	{
 		// create the window, only if we do not use the null device
-		createWindow(driverType);
+		createWindow();
 	}
 
 	// create cursor control
 	CursorControl = new CCursorControl(this);
 
 	// create driver
-	createDriver(driverType, windowSize);
+	createDriver();
 
 	if (VideoDriver)
 		createGUIAndScene();
 }
 
 
-
 //! destructor
 CIrrDeviceSDL::~CIrrDeviceSDL()
 {
-	if (Screen)
-		SDL_FreeSurface(Screen);
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	const u32 numJoysticks = Joysticks.size();
+	for (u32 i=0; i<numJoysticks; ++i)
+		SDL_JoystickClose(Joysticks[i]);
+#endif
 	SDL_Quit();
 }
 
 
-
-bool CIrrDeviceSDL::createWindow(video::E_DRIVER_TYPE driverType)
+bool CIrrDeviceSDL::createWindow()
 {
 	if ( Close )
 		return false;
 
-	if (driverType == video::EDT_OPENGL)
+	if (CreationParams.DriverType == video::EDT_OPENGL)
 	{
-		if (Depth==16)
+		if (CreationParams.Bits==16)
 		{
-			SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 5 );
-			SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 5 );
-			SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 5 );
+			SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 4 );
+			SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 4 );
+			SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 4 );
+			SDL_GL_SetAttribute( SDL_GL_ALPHA_SIZE, CreationParams.WithAlphaChannel?1:0 );
 		}
 		else
 		{
 			SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 8 );
 			SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 8 );
 			SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 8 );
+			SDL_GL_SetAttribute( SDL_GL_ALPHA_SIZE, CreationParams.WithAlphaChannel?8:0 );
 		}
-		SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, Depth);
+		SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, CreationParams.ZBufferBits);
 		SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
 	}
 
 	if ( !Screen )
-		Screen = SDL_SetVideoMode( Width, Height, Depth, SDL_Flags );
+		Screen = SDL_SetVideoMode( Width, Height, CreationParams.Bits, SDL_Flags );
 	if ( !Screen )
 	{
 		os::Printer::log( "Could not initialize display!" );
@@ -150,10 +159,9 @@ bool CIrrDeviceSDL::createWindow(video::E_DRIVER_TYPE driverType)
 
 
 //! create the driver
-void CIrrDeviceSDL::createDriver(video::E_DRIVER_TYPE driverType,
-				const core::dimension2d<s32>& windowSize)
+void CIrrDeviceSDL::createDriver()
 {
-	switch(driverType)
+	switch(CreationParams.DriverType)
 	{
 	case video::EDT_DIRECT3D8:
 	case video::EDT_DIRECT3D9:
@@ -162,7 +170,7 @@ void CIrrDeviceSDL::createDriver(video::E_DRIVER_TYPE driverType,
 
 	case video::EDT_SOFTWARE:
 		#ifdef _IRR_COMPILE_WITH_SOFTWARE_
-		VideoDriver = video::createSoftwareDriver(windowSize, Fullscreen, FileSystem, this);
+		VideoDriver = video::createSoftwareDriver(CreationParams.WindowSize, CreationParams.Fullscreen, FileSystem, this);
 		#else
 		os::Printer::log("No Software driver support compiled in.", ELL_ERROR);
 		#endif
@@ -170,7 +178,7 @@ void CIrrDeviceSDL::createDriver(video::E_DRIVER_TYPE driverType,
 		
 	case video::EDT_BURNINGSVIDEO:
 		#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
-		VideoDriver = video::createSoftwareDriver2(windowSize, Fullscreen, FileSystem, this);
+		VideoDriver = video::createSoftwareDriver2(CreationParams.WindowSize, CreationParams.Fullscreen, FileSystem, this);
 		#else
 		os::Printer::log("Burning's video driver was not compiled in.", ELL_ERROR);
 		#endif
@@ -178,14 +186,14 @@ void CIrrDeviceSDL::createDriver(video::E_DRIVER_TYPE driverType,
 
 	case video::EDT_OPENGL:
 	#ifdef _IRR_COMPILE_WITH_OPENGL_
-		VideoDriver = video::createOpenGLDriver(windowSize, Fullscreen, Stencilbuffer, FileSystem, Vsync, AntiAlias);
+		VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem);
 	#else
 		os::Printer::log("No OpenGL support compiled in.", ELL_ERROR);
 	#endif
 		break;
 
 	case video::EDT_NULL:
-		VideoDriver = video::createNullDriver(FileSystem, windowSize);
+		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
 		break;
 
 	default:
@@ -195,13 +203,13 @@ void CIrrDeviceSDL::createDriver(video::E_DRIVER_TYPE driverType,
 }
 
 
-
 //! runs the device. Returns false if device wants to be deleted
 bool CIrrDeviceSDL::run()
 {
 	os::Timer::tick();
 
 	SEvent irrevent;
+	SDL_Event SDL_event;
 
 	while ( !Close && SDL_PollEvent( &SDL_event ) )
 	{
@@ -257,8 +265,11 @@ bool CIrrDeviceSDL::run()
 				if (idx != -1)
 				{
 					irrevent.EventType = irr::EET_KEY_INPUT_EVENT;
+					irrevent.KeyInput.Char = SDL_event.key.keysym.unicode;
 					irrevent.KeyInput.Key = (EKEY_CODE)KeyMap[idx].Win32Key;
 					irrevent.KeyInput.PressedDown = (SDL_event.type == SDL_KEYDOWN);
+					irrevent.KeyInput.Shift = SDL_event.key.keysym.mod & KMOD_SHIFT;
+					irrevent.KeyInput.Control = SDL_event.key.keysym.mod & KMOD_CTRL;
 					postEventFromUser(irrevent);
 				}
 				else
@@ -271,8 +282,31 @@ bool CIrrDeviceSDL::run()
 			break;
 
 		case SDL_ACTIVEEVENT:
-			if (SDL_event.active.state == SDL_APPMOUSEFOCUS)
-				WindowActive = (SDL_event.active.gain==1);
+			if ((SDL_event.active.state == SDL_APPMOUSEFOCUS) ||
+					(SDL_event.active.state == SDL_APPINPUTFOCUS))
+				WindowHasFocus = (SDL_event.active.gain==1);
+			else
+			if (SDL_event.active.state == SDL_APPACTIVE)
+				WindowMinimized = (SDL_event.active.gain!=1);
+			break;
+
+		case SDL_VIDEORESIZE:
+			if ((SDL_event.resize.w != (int)Width) || (SDL_event.resize.h != (int)Height))
+			{
+				Width = SDL_event.resize.w;
+				Height = SDL_event.resize.h;
+				Screen = SDL_SetVideoMode( Width, Height, CreationParams.Bits, SDL_Flags );
+				if (VideoDriver)
+					VideoDriver->OnResize(core::dimension2d<s32>(Width, Height));
+			}
+			break;
+
+		case SDL_USEREVENT:
+			irrevent.EventType = irr::EET_USER_EVENT;
+			irrevent.UserEvent.UserData1 = reinterpret_cast<s32>(SDL_event.user.data1);
+			irrevent.UserEvent.UserData2 = reinterpret_cast<s32>(SDL_event.user.data2);
+
+			postEventFromUser(irrevent);
 			break;
 
 		default:
@@ -281,9 +315,133 @@ bool CIrrDeviceSDL::run()
 
 	} // end while
 
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	// TODO: Check if the multiple open/close calls are too expensive, then
+        // open/close in the constructor/destructor instead
+
+	// update joystick states manually
+	SDL_JoystickUpdate();
+	// we'll always send joystick input events...
+	SEvent joyevent;
+	joyevent.EventType = EET_JOYSTICK_INPUT_EVENT;
+	for (u32 i=0; i<Joysticks.size(); ++i)
+	{
+		SDL_Joystick* joystick = Joysticks[i];
+		if (joystick)
+		{
+			int j;
+			// query all buttons
+			const int numButtons = core::min_(SDL_JoystickNumButtons(joystick), 32);
+			joyevent.JoystickEvent.ButtonStates=0;
+			for (j=0; j<numButtons; ++j)
+				joyevent.JoystickEvent.ButtonStates |= (SDL_JoystickGetButton(joystick, j)<<j);
+
+			// query all axes, already in correct range
+			const int numAxes = core::min_(SDL_JoystickNumAxes(joystick), 6);
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X]=0;
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Y]=0;
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Z]=0;
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R]=0;
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U]=0;
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V]=0;
+			for (j=0; j<numAxes; ++j)
+				joyevent.JoystickEvent.Axis[j] = SDL_JoystickGetAxis(joystick, j);
+
+			// we can only query one hat, SDL only supports 8 directions
+			if (SDL_JoystickNumHats(joystick)>0)
+			{
+				switch (SDL_JoystickGetHat(joystick, 0))
+				{
+					case SDL_HAT_UP:
+						joyevent.JoystickEvent.POV=0;
+						break;
+					case SDL_HAT_RIGHTUP:
+						joyevent.JoystickEvent.POV=4500;
+						break;
+					case SDL_HAT_RIGHT:
+						joyevent.JoystickEvent.POV=9000;
+						break;
+					case SDL_HAT_RIGHTDOWN:
+						joyevent.JoystickEvent.POV=13500;
+						break;
+					case SDL_HAT_DOWN:
+						joyevent.JoystickEvent.POV=18000;
+						break;
+					case SDL_HAT_LEFTDOWN:
+						joyevent.JoystickEvent.POV=22500;
+						break;
+					case SDL_HAT_LEFT:
+						joyevent.JoystickEvent.POV=27000;
+						break;
+					case SDL_HAT_LEFTUP:
+						joyevent.JoystickEvent.POV=31500;
+						break;
+					case SDL_HAT_CENTERED:
+					default:
+						joyevent.JoystickEvent.POV=65535;
+						break;
+				}
+			}
+			else
+			{
+				joyevent.JoystickEvent.POV=65535;
+			}
+			
+			// we map the number directly
+			joyevent.JoystickEvent.Joystick=static_cast<u8>(i);
+			// now post the event
+			postEventFromUser(joyevent);
+			// and close the joystick
+		}
+	}
+#endif
 	return !Close;
 }
 
+//! Activate any joysticks, and generate events for them.
+bool CIrrDeviceSDL::activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
+{
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	joystickInfo.clear();
+
+	// we can name up to 256 different joysticks
+	const int numJoysticks = core::min_(SDL_NumJoysticks(), 256);
+	Joysticks.reallocate(numJoysticks);
+	joystickInfo.reallocate(numJoysticks);
+
+	int joystick = 0;
+	for (; joystick<numJoysticks; ++joystick)
+	{
+		Joysticks.push_back(SDL_JoystickOpen(joystick));
+		SJoystickInfo info;
+
+		info.Joystick = joystick;
+		info.Axes = SDL_JoystickNumAxes(Joysticks[joystick]);
+		info.Buttons = SDL_JoystickNumButtons(Joysticks[joystick]);
+		info.Name = SDL_JoystickName(joystick);
+		info.PovHat = (SDL_JoystickNumHats(Joysticks[joystick]) > 0)
+						? SJoystickInfo::POV_HAT_PRESENT : SJoystickInfo::POV_HAT_ABSENT;
+
+		joystickInfo.push_back(info);
+	}
+
+	for(joystick = 0; joystick < (int)joystickInfo.size(); ++joystick)
+	{
+		char logString[256];
+		(void)sprintf(logString, "Found joystick %d, %d axes, %d buttons '%s'",
+		 joystick, joystickInfo[joystick].Axes,
+   joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
+		os::Printer::log(logString, ELL_INFORMATION);
+	}
+
+	return true;
+
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+	return false;
+}
+
+
 
 //! pause execution temporarily
 void CIrrDeviceSDL::yield()
@@ -295,7 +453,7 @@ void CIrrDeviceSDL::yield()
 //! pause execution for a specified time
 void CIrrDeviceSDL::sleep(u32 timeMs, bool pauseTimer)
 {
-	bool wasStopped = Timer ? Timer->isStopped() : true;
+	const bool wasStopped = Timer ? Timer->isStopped() : true;
 	if (pauseTimer && !wasStopped)
 		Timer->stop();
 	
@@ -314,29 +472,87 @@ void CIrrDeviceSDL::setWindowCaption(const wchar_t* text)
 }
 
 
-
 //! presents a surface in the client area
-void CIrrDeviceSDL::present(video::IImage* surface, s32 windowId, core::rect<s32>* src)
+bool CIrrDeviceSDL::present(video::IImage* surface, void* windowId, core::rect<s32>* srcClip)
 {
-	SDL_Rect srcClip;
-	SDL_Surface *sdlSurface = SDL_CreateRGBSurfaceFrom (surface->lock(), surface->getDimension().Width, surface->getDimension().Height, surface->getBitsPerPixel(), surface->getPitch(), surface->getRedMask(), surface->getGreenMask(), surface->getBlueMask(), 0);
-	if (src)
+	SDL_Surface *sdlSurface = SDL_CreateRGBSurfaceFrom(
+			surface->lock(), surface->getDimension().Width, surface->getDimension().Height,
+			surface->getBitsPerPixel(), surface->getPitch(),
+			surface->getRedMask(), surface->getGreenMask(), surface->getBlueMask(), surface->getAlphaMask());
+	if (!sdlSurface)
+		return false;
+	SDL_SetAlpha(sdlSurface, 0, 0);
+	SDL_SetColorKey(sdlSurface, 0, 0);
+	sdlSurface->format->BitsPerPixel=surface->getBitsPerPixel();
+	sdlSurface->format->BytesPerPixel=surface->getBytesPerPixel();
+	if ((surface->getColorFormat()==video::ECF_R8G8B8) ||
+			(surface->getColorFormat()==video::ECF_A8R8G8B8))
 	{
-		srcClip.x = src->UpperLeftCorner.X;
-		srcClip.y = src->UpperLeftCorner.Y;
-		srcClip.w = src->getWidth();
-		srcClip.h = src->getHeight();
-		SDL_BlitSurface(sdlSurface, &srcClip, Screen, NULL);
+		sdlSurface->format->Rloss=0;
+		sdlSurface->format->Gloss=0;
+		sdlSurface->format->Bloss=0;
+		sdlSurface->format->Rshift=16;
+		sdlSurface->format->Gshift=8;
+		sdlSurface->format->Bshift=0;
+		if (surface->getColorFormat()==video::ECF_R8G8B8)
+		{
+			sdlSurface->format->Aloss=8;
+			sdlSurface->format->Ashift=32;
+		}
+		else
+		{
+			sdlSurface->format->Aloss=0;
+			sdlSurface->format->Ashift=24;
+		}
 	}
-	else
-		SDL_BlitSurface(sdlSurface, NULL, Screen, NULL);
-	SDL_UpdateRect(Screen, 0, 0, surface->getDimension().Width, surface->getDimension().Height);
+	else if (surface->getColorFormat()==video::ECF_R5G6B5)
+	{
+		sdlSurface->format->Rloss=3;
+		sdlSurface->format->Gloss=2;
+		sdlSurface->format->Bloss=3;
+		sdlSurface->format->Aloss=8;
+		sdlSurface->format->Rshift=11;
+		sdlSurface->format->Gshift=5;
+		sdlSurface->format->Bshift=0;
+		sdlSurface->format->Ashift=16;
+	}
+	else if (surface->getColorFormat()==video::ECF_A1R5G5B5)
+	{
+		sdlSurface->format->Rloss=3;
+		sdlSurface->format->Gloss=3;
+		sdlSurface->format->Bloss=3;
+		sdlSurface->format->Aloss=7;
+		sdlSurface->format->Rshift=10;
+		sdlSurface->format->Gshift=5;
+		sdlSurface->format->Bshift=0;
+		sdlSurface->format->Ashift=15;
+	}
+
+	SDL_Surface* scr = (SDL_Surface* )windowId;
+	if (!scr)
+		scr = Screen;
+	if (scr)
+	{
+		if (srcClip)
+		{
+			SDL_Rect sdlsrcClip;
+			sdlsrcClip.x = srcClip->UpperLeftCorner.X;
+			sdlsrcClip.y = srcClip->UpperLeftCorner.Y;
+			sdlsrcClip.w = srcClip->getWidth();
+			sdlsrcClip.h = srcClip->getHeight();
+			SDL_BlitSurface(sdlSurface, &sdlsrcClip, scr, NULL);
+		}
+		else
+			SDL_BlitSurface(sdlSurface, NULL, scr, NULL);
+		SDL_UpdateRect(scr, 0, 0, surface->getDimension().Width, surface->getDimension().Height);
+	}
+
 	SDL_FreeSurface(sdlSurface);
 	surface->unlock();
+	return (scr != 0);
 }
 
 
-
 //! notifies the device that it should close itself
 void CIrrDeviceSDL::closeDevice()
 {
@@ -344,8 +560,7 @@ void CIrrDeviceSDL::closeDevice()
 }
 
 
-
-//! \return Returns a pointer to a list with all video modes supported
+//! \return Pointer to a list with all video modes supported
 video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
 {
 	if (!VideoModeList.getVideoModeCount())
@@ -353,7 +568,7 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
 		// enumerate video modes.
 		const SDL_VideoInfo *vi = SDL_GetVideoInfo();
 		SDL_Rect **modes = SDL_ListModes(vi->vfmt, SDL_Flags);
-		if (modes != (SDL_Rect **)0)
+		if (modes != 0)
 		{
 			if (modes == (SDL_Rect **)-1)
 				os::Printer::log("All modes available.\n");
@@ -369,7 +584,6 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
 }
 
 
-
 //! Sets if the window should be resizeable in windowed mode.
 void CIrrDeviceSDL::setResizeAble(bool resize)
 {
@@ -379,18 +593,55 @@ void CIrrDeviceSDL::setResizeAble(bool resize)
 			SDL_Flags |= SDL_RESIZABLE;
 		else
 			SDL_Flags &= ~SDL_RESIZABLE;
-		SDL_FreeSurface(Screen);
-		Screen = SDL_SetVideoMode( Width, Height, Depth, SDL_Flags );
+		Screen = SDL_SetVideoMode( Width, Height, CreationParams.Bits, SDL_Flags );
 		Resizeable = resize;
 	}
 }
 
 
-
 //! returns if window is active. if not, nothing need to be drawn
 bool CIrrDeviceSDL::isWindowActive() const
 {
-	return WindowActive;
+	return (WindowHasFocus && !WindowMinimized);
+}
+
+
+//! returns if window has focus.
+bool CIrrDeviceSDL::isWindowFocused() const
+{
+	return WindowHasFocus;
+}
+
+
+//! returns if window is minimized.
+bool CIrrDeviceSDL::isWindowMinimized() const
+{
+	return WindowMinimized;
+}
+
+
+//! returns color format of the window.
+video::ECOLOR_FORMAT CIrrDeviceSDL::getColorFormat() const
+{
+	if (Screen)
+	{
+		if (Screen->format->BitsPerPixel==16)
+		{
+			if (Screen->format->Amask != 0)
+				return video::ECF_A1R5G5B5;
+			else
+				return video::ECF_R5G6B5;
+		}
+		else
+		{
+			if (Screen->format->Amask != 0)
+				return video::ECF_A8R8G8B8;
+			else
+				return video::ECF_R8G8B8;
+		}
+	}
+	else
+		return CIrrDeviceStub::getColorFormat();
 }
 
 
@@ -400,51 +651,44 @@ void CIrrDeviceSDL::createKeyMap()
 	// the lookuptable, but I'll leave it like that until
 	// I find a better version.
 
+	KeyMap.reallocate(105);
+
+	// buttons missing
+
 	KeyMap.push_back(SKeyMap(SDLK_BACKSPACE, KEY_BACK));
 	KeyMap.push_back(SKeyMap(SDLK_TAB, KEY_TAB));
-
-	//KeyMap.push_back(SKeyMap(XK_Linefeed, 0)); // ???
-
 	KeyMap.push_back(SKeyMap(SDLK_CLEAR, KEY_CLEAR));
 	KeyMap.push_back(SKeyMap(SDLK_RETURN, KEY_RETURN));
-	KeyMap.push_back(SKeyMap(SDLK_PAUSE, KEY_PAUSE));
 
-	//KeyMap.push_back(SKeyMap(XK_Scroll_Lock, 0)); // ???
-	//KeyMap.push_back(SKeyMap(XK_Sys_Req, 0)); // ???
+	// combined modifiers missing
+
+	KeyMap.push_back(SKeyMap(SDLK_PAUSE, KEY_PAUSE));
+	KeyMap.push_back(SKeyMap(SDLK_CAPSLOCK, KEY_CAPITAL));
+
+	// asian letter keys missing
 
 	KeyMap.push_back(SKeyMap(SDLK_ESCAPE, KEY_ESCAPE));
-	KeyMap.push_back(SKeyMap(SDLK_DELETE, KEY_DELETE));
+
+	// asian letter keys missing
+
+	KeyMap.push_back(SKeyMap(SDLK_SPACE, KEY_SPACE));
+	KeyMap.push_back(SKeyMap(SDLK_PAGEUP, KEY_PRIOR));
+	KeyMap.push_back(SKeyMap(SDLK_PAGEDOWN, KEY_NEXT));
+	KeyMap.push_back(SKeyMap(SDLK_END, KEY_END));
 	KeyMap.push_back(SKeyMap(SDLK_HOME, KEY_HOME));
 	KeyMap.push_back(SKeyMap(SDLK_LEFT, KEY_LEFT));
 	KeyMap.push_back(SKeyMap(SDLK_UP, KEY_UP));
 	KeyMap.push_back(SKeyMap(SDLK_RIGHT, KEY_RIGHT));
 	KeyMap.push_back(SKeyMap(SDLK_DOWN, KEY_DOWN));
 
-	KeyMap.push_back(SKeyMap(SDLK_PAGEUP, KEY_PRIOR));
-	KeyMap.push_back(SKeyMap(SDLK_PAGEDOWN, KEY_NEXT));
-	KeyMap.push_back(SKeyMap(SDLK_END, KEY_END));
-	KeyMap.push_back(SKeyMap(SDLK_HOME, KEY_HOME));
-	KeyMap.push_back(SKeyMap(SDLK_SPACE, KEY_SPACE));
-	KeyMap.push_back(SKeyMap(SDLK_TAB, KEY_TAB));
-	KeyMap.push_back(SKeyMap(SDLK_RETURN, KEY_RETURN));
+	// select missing
+	KeyMap.push_back(SKeyMap(SDLK_PRINT, KEY_PRINT));
+	// execute missing
+	KeyMap.push_back(SKeyMap(SDLK_PRINT, KEY_SNAPSHOT));
 
-	KeyMap.push_back(SKeyMap(SDLK_F1,  KEY_F1));
-	KeyMap.push_back(SKeyMap(SDLK_F2,  KEY_F2));
-	KeyMap.push_back(SKeyMap(SDLK_F3,  KEY_F3));
-	KeyMap.push_back(SKeyMap(SDLK_F4,  KEY_F4));
-	KeyMap.push_back(SKeyMap(SDLK_F5,  KEY_F5));
-	KeyMap.push_back(SKeyMap(SDLK_F6,  KEY_F6));
-	KeyMap.push_back(SKeyMap(SDLK_F7,  KEY_F7));
-	KeyMap.push_back(SKeyMap(SDLK_F8,  KEY_F8));
-	KeyMap.push_back(SKeyMap(SDLK_F9,  KEY_F9));
-	KeyMap.push_back(SKeyMap(SDLK_F10, KEY_F10));
-	KeyMap.push_back(SKeyMap(SDLK_F11, KEY_F11));
-	KeyMap.push_back(SKeyMap(SDLK_F12, KEY_F12));
-
-	KeyMap.push_back(SKeyMap(SDLK_LSHIFT, KEY_LSHIFT));
-	KeyMap.push_back(SKeyMap(SDLK_RSHIFT, KEY_RSHIFT));
-	KeyMap.push_back(SKeyMap(SDLK_LCTRL,  KEY_LCONTROL));
-	KeyMap.push_back(SKeyMap(SDLK_RCTRL,  KEY_RCONTROL));
+	KeyMap.push_back(SKeyMap(SDLK_INSERT, KEY_INSERT));
+	KeyMap.push_back(SKeyMap(SDLK_DELETE, KEY_DELETE));
+	KeyMap.push_back(SKeyMap(SDLK_HELP, KEY_HELP));
 
 	KeyMap.push_back(SKeyMap(SDLK_0, KEY_KEY_0));
 	KeyMap.push_back(SKeyMap(SDLK_1, KEY_KEY_1));
@@ -457,14 +701,6 @@ void CIrrDeviceSDL::createKeyMap()
 	KeyMap.push_back(SKeyMap(SDLK_8, KEY_KEY_8));
 	KeyMap.push_back(SKeyMap(SDLK_9, KEY_KEY_9));
 
-	//KeyMap.push_back(SKeyMap(XK_colon, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_semicolon, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_less, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_equal, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_greater, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_question, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_at, 0)); //?
-
 	KeyMap.push_back(SKeyMap(SDLK_a, KEY_KEY_A));
 	KeyMap.push_back(SKeyMap(SDLK_b, KEY_KEY_B));
 	KeyMap.push_back(SKeyMap(SDLK_c, KEY_KEY_C));
@@ -492,30 +728,67 @@ void CIrrDeviceSDL::createKeyMap()
 	KeyMap.push_back(SKeyMap(SDLK_y, KEY_KEY_Y));
 	KeyMap.push_back(SKeyMap(SDLK_z, KEY_KEY_Z));
 
-	//KeyMap.push_back(SKeyMap(XK_bracketleft, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_backslash, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_bracketright, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_asciicircum, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_underscore, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_grave, 0)); //?
-	//KeyMap.push_back(SKeyMap(XK_quoteleft, 0)); //?
+	KeyMap.push_back(SKeyMap(SDLK_LSUPER, KEY_LWIN));
+	KeyMap.push_back(SKeyMap(SDLK_RSUPER, KEY_RWIN));
+	// apps missing
+	KeyMap.push_back(SKeyMap(SDLK_POWER, KEY_SLEEP)); //??
+
+	KeyMap.push_back(SKeyMap(SDLK_KP0, KEY_NUMPAD0));
+	KeyMap.push_back(SKeyMap(SDLK_KP1, KEY_NUMPAD1));
+	KeyMap.push_back(SKeyMap(SDLK_KP2, KEY_NUMPAD2));
+	KeyMap.push_back(SKeyMap(SDLK_KP3, KEY_NUMPAD3));
+	KeyMap.push_back(SKeyMap(SDLK_KP4, KEY_NUMPAD4));
+	KeyMap.push_back(SKeyMap(SDLK_KP5, KEY_NUMPAD5));
+	KeyMap.push_back(SKeyMap(SDLK_KP6, KEY_NUMPAD6));
+	KeyMap.push_back(SKeyMap(SDLK_KP7, KEY_NUMPAD7));
+	KeyMap.push_back(SKeyMap(SDLK_KP8, KEY_NUMPAD8));
+	KeyMap.push_back(SKeyMap(SDLK_KP9, KEY_NUMPAD9));
+	KeyMap.push_back(SKeyMap(SDLK_KP_MULTIPLY, KEY_MULTIPLY));
+	KeyMap.push_back(SKeyMap(SDLK_KP_PLUS, KEY_ADD));
+//	KeyMap.push_back(SKeyMap(SDLK_KP_, KEY_SEPARATOR));
+	KeyMap.push_back(SKeyMap(SDLK_KP_MINUS, KEY_SUBTRACT));
+	KeyMap.push_back(SKeyMap(SDLK_KP_PERIOD, KEY_DECIMAL));
+	KeyMap.push_back(SKeyMap(SDLK_KP_DIVIDE, KEY_DIVIDE));
+
+	KeyMap.push_back(SKeyMap(SDLK_F1,  KEY_F1));
+	KeyMap.push_back(SKeyMap(SDLK_F2,  KEY_F2));
+	KeyMap.push_back(SKeyMap(SDLK_F3,  KEY_F3));
+	KeyMap.push_back(SKeyMap(SDLK_F4,  KEY_F4));
+	KeyMap.push_back(SKeyMap(SDLK_F5,  KEY_F5));
+	KeyMap.push_back(SKeyMap(SDLK_F6,  KEY_F6));
+	KeyMap.push_back(SKeyMap(SDLK_F7,  KEY_F7));
+	KeyMap.push_back(SKeyMap(SDLK_F8,  KEY_F8));
+	KeyMap.push_back(SKeyMap(SDLK_F9,  KEY_F9));
+	KeyMap.push_back(SKeyMap(SDLK_F10, KEY_F10));
+	KeyMap.push_back(SKeyMap(SDLK_F11, KEY_F11));
+	KeyMap.push_back(SKeyMap(SDLK_F12, KEY_F12));
+	KeyMap.push_back(SKeyMap(SDLK_F13, KEY_F13));
+	KeyMap.push_back(SKeyMap(SDLK_F14, KEY_F14));
+	KeyMap.push_back(SKeyMap(SDLK_F15, KEY_F15));
+	// no higher F-keys
+
+	KeyMap.push_back(SKeyMap(SDLK_NUMLOCK, KEY_NUMLOCK));
+	KeyMap.push_back(SKeyMap(SDLK_SCROLLOCK, KEY_SCROLL));
+	KeyMap.push_back(SKeyMap(SDLK_LSHIFT, KEY_LSHIFT));
+	KeyMap.push_back(SKeyMap(SDLK_RSHIFT, KEY_RSHIFT));
+	KeyMap.push_back(SKeyMap(SDLK_LCTRL,  KEY_LCONTROL));
+	KeyMap.push_back(SKeyMap(SDLK_RCTRL,  KEY_RCONTROL));
+	KeyMap.push_back(SKeyMap(SDLK_LALT,  KEY_LMENU));
+	KeyMap.push_back(SKeyMap(SDLK_RALT,  KEY_RMENU));
+
+	KeyMap.push_back(SKeyMap(SDLK_PLUS,   KEY_PLUS));
+	KeyMap.push_back(SKeyMap(SDLK_COMMA,  KEY_COMMA));
+	KeyMap.push_back(SKeyMap(SDLK_MINUS,  KEY_MINUS));
+	KeyMap.push_back(SKeyMap(SDLK_PERIOD, KEY_PERIOD));
+
+	// some special keys missing
 
 	KeyMap.sort();
 }
 
 IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDeviceEx(const SIrrlichtCreationParameters& param)
 {
-	CIrrDeviceSDL* dev = new CIrrDeviceSDL(
-		param.DriverType,
-		param.WindowSize,
-		param.Bits,
-		param.Fullscreen,
-		param.Stencilbuffer,
-		param.Vsync,
-		param.AntiAlias,
-		param.EventReceiver,
-		param.WindowId,
-		param.SDK_version_do_not_use);
+	CIrrDeviceSDL* dev = new CIrrDeviceSDL(param);
 
 	if (dev && !dev->getVideoDriver() && param.DriverType != video::EDT_NULL)
 	{
diff --git a/src/dep/src/irrlicht/CIrrDeviceSDL.h b/src/dep/src/irrlicht/CIrrDeviceSDL.h
index 6bf4faf..b6e87cb 100644
--- a/src/dep/src/irrlicht/CIrrDeviceSDL.h
+++ b/src/dep/src/irrlicht/CIrrDeviceSDL.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // This device code is based on the original SDL device implementation
@@ -26,11 +26,7 @@ namespace irr
 	public:
 
 		//! constructor
-		CIrrDeviceSDL(video::E_DRIVER_TYPE deviceType, 
-			const core::dimension2d<s32>& windowSize, u32 bits,
-			bool fullscreen, bool stencilbuffer, bool vsync,
-			bool antiAlias, IEventReceiver* receiver,
-			void* windowID, const char* version);
+		CIrrDeviceSDL(const SIrrlichtCreationParameters& param);
 
 		//! destructor
 		virtual ~CIrrDeviceSDL();
@@ -50,8 +46,17 @@ namespace irr
 		//! returns if window is active. if not, nothing need to be drawn
 		virtual bool isWindowActive() const;
 
+		//! returns if window has focus.
+		bool isWindowFocused() const;
+
+		//! returns if window is minimized.
+		bool isWindowMinimized() const;
+			
+		//! returns color format of the window.
+		video::ECOLOR_FORMAT getColorFormat() const;
+
 		//! presents a surface in the client area
-		virtual void present(video::IImage* surface, s32 windowId = 0, core::rect<s32>* src=0);
+		virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0);
 
 		//! notifies the device that it should close itself
 		virtual void closeDevice();
@@ -62,6 +67,9 @@ namespace irr
 		//! Sets if the window should be resizeable in windowed mode.
 		virtual void setResizeAble(bool resize=false);
 
+		//! Activate any joysticks, and generate events for them.
+		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
+
 		//! Implementation of the linux cursor control
 		class CCursorControl : public gui::ICursorControl
 		{
@@ -156,28 +164,26 @@ namespace irr
 	private:
 
 		//! create the driver
-		void createDriver(video::E_DRIVER_TYPE driverType,
-			const core::dimension2d<s32>& windowSize);
+		void createDriver();
 
-		bool createWindow(video::E_DRIVER_TYPE driverType);
+		bool createWindow();
 
 		void createKeyMap();
 
-		s32 MouseX, MouseY;
-		u32 Depth;
-		bool Fullscreen;
-		bool Stencilbuffer;
-		bool Vsync;
-		bool AntiAlias;
-		bool Resizeable;
-		
 		SDL_Surface* Screen;
-		SDL_Event SDL_event;
 		int SDL_Flags;
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+		core::array<SDL_Joystick*> Joysticks;
+#endif
 
+		s32 MouseX, MouseY;
+		
 		u32 Width, Height;
+
 		bool Close;
-		bool WindowActive;
+		bool Resizeable;
+		bool WindowHasFocus;
+		bool WindowMinimized;
 
 		struct SKeyMap
 		{
diff --git a/src/dep/src/irrlicht/CIrrDeviceStub.cpp b/src/dep/src/irrlicht/CIrrDeviceStub.cpp
index c1b18a9..87cd5f1 100644
--- a/src/dep/src/irrlicht/CIrrDeviceStub.cpp
+++ b/src/dep/src/irrlicht/CIrrDeviceStub.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,20 +17,32 @@ namespace irr
 {
 
 //! constructor
-CIrrDeviceStub::CIrrDeviceStub(const char* version, IEventReceiver* recv)
+CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params)
 : IrrlichtDevice(), VideoDriver(0), GUIEnvironment(0), SceneManager(0), 
-	Timer(0), CursorControl(0), UserReceiver(recv), Logger(0), Operator(0),
-	FileSystem(io::createFileSystem()), InputReceivingSceneManager(0)
+	Timer(0), CursorControl(0), UserReceiver(params.EventReceiver), Logger(0), Operator(0),
+	FileSystem(0), InputReceivingSceneManager(0), CreationParams(params)
 {
 	Timer = new CTimer();
-	Logger = new CLogger(UserReceiver);
+	if (os::Printer::Logger)
+	{
+		os::Printer::Logger->grab();
+		Logger = (CLogger*)os::Printer::Logger;
+		Logger->setReceiver(UserReceiver);
+	}
+	else
+	{
+		Logger = new CLogger(UserReceiver);
+		os::Printer::Logger = Logger;
+	}
+
 	os::Printer::Logger = Logger;
 
+	FileSystem = io::createFileSystem();
 	core::stringc s = "Irrlicht Engine version ";
 	s.append(getVersion());
 	os::Printer::log(s.c_str(), ELL_INFORMATION);
 
-	checkVersion(version);
+	checkVersion(params.SDK_version_do_not_use);
 }
 
 
@@ -60,7 +72,8 @@ CIrrDeviceStub::~CIrrDeviceStub()
 
 	Timer->drop();
 
-	Logger->drop();
+	if (Logger->drop())
+		os::Printer::Logger = 0;
 }
 
 
@@ -150,6 +163,7 @@ bool CIrrDeviceStub::checkVersion(const char* version)
 		w += version;
 		w += "). This may cause problems.";
 		os::Printer::log(w.c_str(), ELL_WARNING);
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
 	}
 
@@ -158,7 +172,7 @@ bool CIrrDeviceStub::checkVersion(const char* version)
 
 
 //! send the event to the right receiver
-void CIrrDeviceStub::postEventFromUser(const SEvent& event)
+bool CIrrDeviceStub::postEventFromUser(const SEvent& event)
 {
 	bool absorbed = false;
 
@@ -174,6 +188,9 @@ void CIrrDeviceStub::postEventFromUser(const SEvent& event)
 
 	if (!absorbed && inputReceiver)
 		absorbed = inputReceiver->postEventFromUser(event);
+
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return absorbed;
 }
 
 
@@ -221,6 +238,24 @@ void CIrrDeviceStub::setInputReceivingSceneManager(scene::ISceneManager* sceneMa
 }
 
 
+//! Checks if the window is running in fullscreen mode
+bool CIrrDeviceStub::isFullscreen() const
+{
+	return CreationParams.Fullscreen;
+}
+
+
+//! returns color format
+video::ECOLOR_FORMAT CIrrDeviceStub::getColorFormat() const
+{
+	return video::ECF_R5G6B5;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
+{
+	return false;
+}
 
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/CIrrDeviceStub.h b/src/dep/src/irrlicht/CIrrDeviceStub.h
index 5a1d049..5e49475 100644
--- a/src/dep/src/irrlicht/CIrrDeviceStub.h
+++ b/src/dep/src/irrlicht/CIrrDeviceStub.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -7,6 +7,7 @@
 
 #include "IrrlichtDevice.h"
 #include "IImagePresenter.h"
+#include "SIrrCreationParameters.h"
 #include "CVideoModeList.h"
 
 namespace irr
@@ -35,8 +36,12 @@ namespace irr
 
 	namespace video
 	{
-		IVideoDriver* createSoftwareDriver(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter);
-		IVideoDriver* createSoftwareDriver2(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter);
+		IVideoDriver* createSoftwareDriver(const core::dimension2d<s32>& windowSize,
+				bool fullscreen, io::IFileSystem* io,
+				video::IImagePresenter* presenter);
+		IVideoDriver* createSoftwareDriver2(const core::dimension2d<s32>& windowSize,
+				bool fullscreen, io::IFileSystem* io,
+				video::IImagePresenter* presenter);
 		IVideoDriver* createNullDriver(io::IFileSystem* io, const core::dimension2d<s32>& screenSize);
 	}
 
@@ -48,7 +53,7 @@ namespace irr
 	public:
 
 		//! constructor
-		CIrrDeviceStub(const char* version, IEventReceiver* resv);
+		CIrrDeviceStub(const SIrrlichtCreationParameters& param);
 
 		//! destructor
 		virtual ~CIrrDeviceStub();
@@ -68,41 +73,48 @@ namespace irr
 		//! \return Returns a pointer to the mouse cursor control interface.
 		virtual gui::ICursorControl* getCursorControl();
 
-		//! \return Returns a pointer to a list with all video modes supported
-		//! by the gfx adapter.
+		//! Returns a pointer to a list with all video modes supported by the gfx adapter.
 		virtual video::IVideoModeList* getVideoModeList();
 
-		//! \return Returns a pointer to the ITimer object. With it the
-		//! current Time can be received.
+		//! Returns a pointer to the ITimer object. With it the current Time can be received.
 		virtual ITimer* getTimer();
 
 		//! Returns the version of the engine. 
 		virtual const char* getVersion() const;
 
 		//! send the event to the right receiver
-		virtual void postEventFromUser(const SEvent& event);
+		virtual bool postEventFromUser(const SEvent& event);
 
 		//! Sets a new event receiver to receive events
 		virtual void setEventReceiver(IEventReceiver* receiver);
 
-		//! Returns poinhter to the current event receiver. Returns 0 if there is none.
+		//! Returns pointer to the current event receiver. Returns 0 if there is none.
 		virtual IEventReceiver* getEventReceiver();
 
 		//! Sets the input receiving scene manager. 
 		/** If set to null, the main scene manager (returned by GetSceneManager()) will receive the input */
 		virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager);
 
-		//! \return Returns a pointer to the logger.
+		//! Returns a pointer to the logger.
 		virtual ILogger* getLogger();
 
 		//! Returns the operation system opertator object.
 		virtual IOSOperator* getOSOperator();
 
+		//! Checks if the window is running in fullscreen mode.
+		virtual bool isFullscreen() const;
+
+		//! get color format of the current window
+		virtual video::ECOLOR_FORMAT getColorFormat() const;
+
+		//! Activate any joysticks, and generate events for them.
+		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
+
 	protected:
 
 		void createGUIAndScene();
 
-		//! checks version of sdk and prints warning if there might be a problem
+		//! checks version of SDK and prints warning if there might be a problem
 		bool checkVersion(const char* version);
 
 		video::IVideoDriver* VideoDriver;
@@ -110,12 +122,13 @@ namespace irr
 		scene::ISceneManager* SceneManager;
 		ITimer* Timer;
 		gui::ICursorControl* CursorControl;
-		video::CVideoModeList VideoModeList;
 		IEventReceiver* UserReceiver;
 		CLogger* Logger;
 		IOSOperator* Operator;
 		io::IFileSystem* FileSystem;
 		scene::ISceneManager* InputReceivingSceneManager;
+		video::CVideoModeList VideoModeList;
+		SIrrlichtCreationParameters CreationParams;
 	};
 
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/CIrrDeviceWin32.cpp b/src/dep/src/irrlicht/CIrrDeviceWin32.cpp
index 2ffa0bd..33e3e95 100644
--- a/src/dep/src/irrlicht/CIrrDeviceWin32.cpp
+++ b/src/dep/src/irrlicht/CIrrDeviceWin32.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,7 +18,6 @@
 #include <winuser.h>
 #include "irrlicht.h"
 
-
 namespace irr
 {
 	namespace video
@@ -36,15 +35,12 @@ namespace irr
 		#endif
 
 		#ifdef _IRR_COMPILE_WITH_OPENGL_
-		IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize, HWND window,
-			u32 bits, bool fullscreen, bool stencilBuffer, io::IFileSystem* io,
-			bool vsync, bool antiAlias);
+		IVideoDriver* createOpenGLDriver(const irr::SIrrlichtCreationParameters& params, io::IFileSystem* io);
 		#endif
 	}
 } // end namespace irr
 
 
-
 struct SEnvMapper
 {
 	HWND hWnd;
@@ -63,6 +59,7 @@ SEnvMapper* getEnvMapperFromHWnd(HWND hWnd)
 	return 0;
 }
 
+
 irr::CIrrDeviceWin32* getDeviceFromHWnd(HWND hWnd)
 {
 	irr::core::list<SEnvMapper>::Iterator it = EnvMap.begin();
@@ -85,9 +82,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
 	irr::CIrrDeviceWin32* dev = 0;
 	irr::SEvent event;
-	SEnvMapper* envm = 0;
-
-	BYTE allKeys[256];
 
 	static irr::s32 ClickCount=0;
 	if (GetCapture() != hWnd && ClickCount > 0)
@@ -107,12 +101,14 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 		return 0;
 
 	case WM_SETCURSOR:
-		envm = getEnvMapperFromHWnd(hWnd);
+	{
+		SEnvMapper* envm = getEnvMapperFromHWnd(hWnd);
 		if (envm && !envm->irrDev->getWin32CursorControl()->isVisible())
 		{
 			SetCursor(NULL);
 			return 0;
 		}
+	}
 		break;
 
 	case WM_MOUSEWHEEL:
@@ -230,6 +226,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 	case WM_KEYDOWN:
 	case WM_KEYUP:
 		{
+			BYTE allKeys[256];
+
 			event.EventType = irr::EET_KEY_INPUT_EVENT;
 			event.KeyInput.Key = (irr::EKEY_CODE)wParam;
 			event.KeyInput.PressedDown = (message==WM_KEYDOWN);
@@ -237,7 +235,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
 			WORD KeyAsc=0;
 			GetKeyboardState(allKeys);
-			ToAscii(wParam,lParam,allKeys,&KeyAsc,0);
+			ToAscii((UINT)wParam,(UINT)lParam,allKeys,&KeyAsc,0);
 
 			event.KeyInput.Shift = ((allKeys[VK_SHIFT] & 0x80)!=0);
 			event.KeyInput.Control = ((allKeys[VK_CONTROL] & 0x80)!=0);
@@ -268,43 +266,46 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 			(wParam & 0xFFF0) == SC_MONITORPOWER)
 			return 0;
 		break;
-	}
 
+	case WM_USER:
+		event.EventType = irr::EET_USER_EVENT;
+		event.UserEvent.UserData1 = (irr::s32)wParam;
+		event.UserEvent.UserData2 = (irr::s32)lParam;
+		dev = getDeviceFromHWnd(hWnd);
+
+		if (dev)
+			dev->postEventFromUser(event);
+
+		return 0;
+	}
 	return DefWindowProc(hWnd, message, wParam, lParam);
 }
 
+
 namespace irr
 {
 
 //! constructor
-CIrrDeviceWin32::CIrrDeviceWin32(video::E_DRIVER_TYPE driverType,
-				 core::dimension2d<s32> windowSize,
-				 u32 bits, bool fullscreen,
-				 bool stencilbuffer, bool vsync,
-				 bool antiAlias,
-				 bool highPrecisionFPU,
-				 IEventReceiver* receiver,
-				 HWND externalWindow,
-				 const char* version)
-: CIrrDeviceStub(version, receiver), HWnd(0), ChangedToFullScreen(false),
-	FullScreen(fullscreen), IsNonNTWindows(false), Resized(false),
+CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params)
+: CIrrDeviceStub(params), HWnd(0), ChangedToFullScreen(false),
+	IsNonNTWindows(false), Resized(false),
 	ExternalWindow(false), Win32CursorControl(0)
 {
+	#ifdef _DEBUG
+	setDebugName("CIrrDeviceWin32");
+	#endif
+
+	// get windows version and create OS operator
 	core::stringc winversion;
 	getWindowsVersion(winversion);
 	Operator = new COSOperator(winversion.c_str());
 	os::Printer::log(winversion.c_str(), ELL_INFORMATION);
 
-	// create window
-
+	// get handle to exe file
 	HINSTANCE hInstance = GetModuleHandle(0);
 
-	#ifdef _DEBUG
-	setDebugName("CIrrDeviceWin32");
-	#endif
-
-	// create the window, only if we do not use the null device
-	if (driverType != video::EDT_NULL && externalWindow==0)
+	// create the window if we need to and we do not use the null device
+	if (!CreationParams.WindowId && CreationParams.DriverType != video::EDT_NULL)
 	{
 		const c8* ClassName = "CIrrDeviceWin32";
 
@@ -333,23 +334,23 @@ CIrrDeviceWin32::CIrrDeviceWin32(video::E_DRIVER_TYPE driverType,
 		RECT clientSize;
 		clientSize.top = 0;
 		clientSize.left = 0;
-		clientSize.right = windowSize.Width;
-		clientSize.bottom = windowSize.Height;
+		clientSize.right = CreationParams.WindowSize.Width;
+		clientSize.bottom = CreationParams.WindowSize.Height;
 
 		DWORD style = WS_POPUP;
 
-		if (!fullscreen)
+		if (!CreationParams.Fullscreen)
 			style = WS_SYSMENU | WS_BORDER | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
 
 		AdjustWindowRect(&clientSize, style, FALSE);
 
-		s32 realWidth = clientSize.right - clientSize.left;
-		s32 realHeight = clientSize.bottom - clientSize.top;
+		const s32 realWidth = clientSize.right - clientSize.left;
+		const s32 realHeight = clientSize.bottom - clientSize.top;
 
 		s32 windowLeft = (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2;
 		s32 windowTop = (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2;
 
-		if (fullscreen)
+		if (CreationParams.Fullscreen)
 		{
 			windowLeft = 0;
 			windowTop = 0;
@@ -358,35 +359,35 @@ CIrrDeviceWin32::CIrrDeviceWin32(video::E_DRIVER_TYPE driverType,
 		// create window
 
 		HWnd = CreateWindow( ClassName, "", style, windowLeft, windowTop,
-					realWidth, realHeight,	NULL, NULL, hInstance, NULL);
+					realWidth, realHeight, NULL, NULL, hInstance, NULL);
+		CreationParams.WindowId = HWnd;
 
-		ShowWindow(HWnd , SW_SHOW);
+		ShowWindow(HWnd, SW_SHOW);
 		UpdateWindow(HWnd);
 
 		// fix ugly ATI driver bugs. Thanks to ariaci
 		MoveWindow(HWnd, windowLeft, windowTop, realWidth, realHeight, TRUE);
 	}
-
-	// attach external window
-	if (externalWindow)
+	else if (CreationParams.WindowId)
 	{
-		HWnd = externalWindow;
+		// attach external window
+		HWnd = static_cast<HWND>(CreationParams.WindowId);
 		RECT r;
 		GetWindowRect(HWnd, &r);
-		windowSize.Width = r.right - r.left;
-		windowSize.Height = r.bottom - r.top;
-		fullscreen = false;
+		CreationParams.WindowSize.Width = r.right - r.left;
+		CreationParams.WindowSize.Height = r.bottom - r.top;
+		CreationParams.Fullscreen = false;
 		ExternalWindow = true;
 	}
 
 	// create cursor control
 
-	Win32CursorControl = new CCursorControl(windowSize, HWnd, fullscreen);
+	Win32CursorControl = new CCursorControl(CreationParams.WindowSize, HWnd, CreationParams.Fullscreen);
 	CursorControl = Win32CursorControl;
 
 	// create driver
 
-	createDriver(driverType, windowSize, bits, fullscreen, stencilbuffer, vsync, antiAlias, highPrecisionFPU);
+	createDriver();
 
 	if (VideoDriver)
 		createGUIAndScene();
@@ -404,7 +405,6 @@ CIrrDeviceWin32::CIrrDeviceWin32(video::E_DRIVER_TYPE driverType,
 }
 
 
-
 //! destructor
 CIrrDeviceWin32::~CIrrDeviceWin32()
 {
@@ -412,34 +412,32 @@ CIrrDeviceWin32::~CIrrDeviceWin32()
 
 	irr::core::list<SEnvMapper>::Iterator it = EnvMap.begin();
 	for (; it!= EnvMap.end(); ++it)
+	{
 		if ((*it).hWnd == HWnd)
 		{
 			EnvMap.erase(it);
 			break;
 		}
+	}
 
 	if (ChangedToFullScreen)
 		ChangeDisplaySettings(NULL,0);
 }
 
 
-
 //! create the driver
-void CIrrDeviceWin32::createDriver(video::E_DRIVER_TYPE driverType,
-				   const core::dimension2d<s32>& windowSize,
-				   u32 bits,
-				   bool fullscreen,
-				   bool stencilbuffer,
-				   bool vsync,
-				   bool antiAlias,
-				   bool highPrecisionFPU)
+void CIrrDeviceWin32::createDriver()
 {
-	switch(driverType)
+	switch(CreationParams.DriverType)
 	{
 	case video::EDT_DIRECT3D8:
 		#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
-		VideoDriver = video::createDirectX8Driver(windowSize, HWnd, bits, fullscreen,
-			stencilbuffer, FileSystem, false, highPrecisionFPU, vsync, antiAlias);
+
+		VideoDriver = video::createDirectX8Driver(CreationParams.WindowSize, HWnd, 
+			CreationParams.Bits, CreationParams.Fullscreen, CreationParams.Stencilbuffer, 
+			FileSystem, false, CreationParams.HighPrecisionFPU, CreationParams.Vsync, 
+			CreationParams.AntiAlias);
+
 		if (!VideoDriver)
 		{
 			os::Printer::log("Could not create DIRECT3D8 Driver.", ELL_ERROR);
@@ -452,8 +450,12 @@ void CIrrDeviceWin32::createDriver(video::E_DRIVER_TYPE driverType,
 
 	case video::EDT_DIRECT3D9:
 		#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-		VideoDriver = video::createDirectX9Driver(windowSize, HWnd, bits, fullscreen,
-			stencilbuffer, FileSystem, false, highPrecisionFPU, vsync, antiAlias);
+
+		VideoDriver = video::createDirectX9Driver(CreationParams.WindowSize, HWnd, 
+			CreationParams.Bits, CreationParams.Fullscreen, CreationParams.Stencilbuffer, 
+			FileSystem, false, CreationParams.HighPrecisionFPU, CreationParams.Vsync, 
+			CreationParams.AntiAlias);
+
 		if (!VideoDriver)
 		{
 			os::Printer::log("Could not create DIRECT3D9 Driver.", ELL_ERROR);
@@ -467,9 +469,11 @@ void CIrrDeviceWin32::createDriver(video::E_DRIVER_TYPE driverType,
 	case video::EDT_OPENGL:
 
 		#ifdef _IRR_COMPILE_WITH_OPENGL_
-		if (fullscreen)	switchToFullScreen(windowSize.Width, windowSize.Height, bits);
-		VideoDriver = video::createOpenGLDriver(windowSize, HWnd, bits, fullscreen, stencilbuffer, FileSystem,
-			vsync, antiAlias);
+
+		if (CreationParams.Fullscreen)
+			switchToFullScreen(CreationParams.WindowSize.Width, CreationParams.WindowSize.Height, CreationParams.Bits);
+
+		VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem);
 		if (!VideoDriver)
 		{
 			os::Printer::log("Could not create OpenGL driver.", ELL_ERROR);
@@ -482,8 +486,10 @@ void CIrrDeviceWin32::createDriver(video::E_DRIVER_TYPE driverType,
 	case video::EDT_SOFTWARE:
 
 		#ifdef _IRR_COMPILE_WITH_SOFTWARE_
-		if (fullscreen)	switchToFullScreen(windowSize.Width, windowSize.Height, bits);
-		VideoDriver = video::createSoftwareDriver(windowSize, fullscreen, FileSystem, this);
+		if (CreationParams.Fullscreen)
+			switchToFullScreen(CreationParams.WindowSize.Width, CreationParams.WindowSize.Height, CreationParams.Bits);
+
+		VideoDriver = video::createSoftwareDriver(CreationParams.WindowSize, CreationParams.Fullscreen, FileSystem, this);
 		#else
 		os::Printer::log("Software driver was not compiled in.", ELL_ERROR);
 		#endif
@@ -492,8 +498,10 @@ void CIrrDeviceWin32::createDriver(video::E_DRIVER_TYPE driverType,
 
 	case video::EDT_BURNINGSVIDEO:
 		#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
-		if (fullscreen)	switchToFullScreen(windowSize.Width, windowSize.Height, bits);
-		VideoDriver = video::createSoftwareDriver2(windowSize, fullscreen, FileSystem, this);
+		if (CreationParams.Fullscreen)
+			switchToFullScreen(CreationParams.WindowSize.Width, CreationParams.WindowSize.Height, CreationParams.Bits);
+
+		VideoDriver = video::createSoftwareDriver2(CreationParams.WindowSize, CreationParams.Fullscreen, FileSystem, this);
 		#else
 		os::Printer::log("Burning's Video driver was not compiled in.", ELL_ERROR);
 		#endif 
@@ -501,7 +509,7 @@ void CIrrDeviceWin32::createDriver(video::E_DRIVER_TYPE driverType,
 
 	case video::EDT_NULL:
 		// create null driver
-		VideoDriver = video::createNullDriver(FileSystem, windowSize);
+		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
 		break;
 
 	default:
@@ -511,7 +519,6 @@ void CIrrDeviceWin32::createDriver(video::E_DRIVER_TYPE driverType,
 }
 
 
-
 //! runs the device. Returns false if device wants to be deleted
 bool CIrrDeviceWin32::run()
 {
@@ -537,6 +544,9 @@ bool CIrrDeviceWin32::run()
 	if (!quit)
 		resizeIfNecessary();
 
+	if(!quit)
+		pollJoysticks();
+
 	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return !quit;
 }
@@ -552,7 +562,7 @@ void CIrrDeviceWin32::yield()
 //! Pause execution and let other processes to run for a specified amount of time.
 void CIrrDeviceWin32::sleep(u32 timeMs, bool pauseTimer)
 {
-	bool wasStopped = Timer ? Timer->isStopped() : true;
+	const bool wasStopped = Timer ? Timer->isStopped() : true;
 	if (pauseTimer && !wasStopped)
 		Timer->stop();
 	
@@ -590,27 +600,30 @@ void CIrrDeviceWin32::resizeIfNecessary()
 }
 
 
-
 //! sets the caption of the window
 void CIrrDeviceWin32::setWindowCaption(const wchar_t* text)
 {
+	DWORD dwResult;
 	if (IsNonNTWindows)
 	{
-		core::stringc s = text;
-		SetWindowTextA(HWnd, s.c_str());
+		const core::stringc s = text;
+		SendMessageTimeout(HWnd, WM_SETTEXT, 0,
+				reinterpret_cast<LPARAM>(s.c_str()),
+				SMTO_ABORTIFHUNG, 2000, &dwResult);
 	}
 	else
-		SetWindowTextW(HWnd, text);
+		SendMessageTimeoutW(HWnd, WM_SETTEXT, 0,
+				reinterpret_cast<LPARAM>(text),
+				SMTO_ABORTIFHUNG, 2000, &dwResult);
 }
 
 
-
 //! presents a surface in the client area
-void CIrrDeviceWin32::present(video::IImage* image, s32 windowId, core::rect<s32>* src )
+bool CIrrDeviceWin32::present(video::IImage* image, void* windowId, core::rect<s32>* src)
 {
 	HWND hwnd = HWnd;
 	if ( windowId )
-		hwnd = (HWND)windowId;
+		hwnd = reinterpret_cast<HWND>(windowId);
 
 	HDC dc = GetDC(hwnd);
 
@@ -623,13 +636,13 @@ void CIrrDeviceWin32::present(video::IImage* image, s32 windowId, core::rect<s32
 		BITMAPV4HEADER bi;
 		ZeroMemory (&bi, sizeof(bi));
 		bi.bV4Size          = sizeof(BITMAPINFOHEADER);
-		bi.bV4BitCount      = image->getBitsPerPixel();
+		bi.bV4BitCount      = (WORD)image->getBitsPerPixel();
 		bi.bV4Planes        = 1;
 		bi.bV4Width         = image->getDimension().Width;
 		bi.bV4Height        = -image->getDimension().Height;
 		bi.bV4V4Compression = BI_BITFIELDS;
-		bi.bV4AlphaMask     = image->getAlphaMask ();
-		bi.bV4RedMask       = image->getRedMask ();
+		bi.bV4AlphaMask     = image->getAlphaMask();
+		bi.bV4RedMask       = image->getRedMask();
 		bi.bV4GreenMask     = image->getGreenMask();
 		bi.bV4BlueMask      = image->getBlueMask();
 
@@ -651,10 +664,10 @@ void CIrrDeviceWin32::present(video::IImage* image, s32 windowId, core::rect<s32
 
 		ReleaseDC(hwnd, dc);
 	}
+	return true;
 }
 
 
-
 //! notifies the device that it should close itself
 void CIrrDeviceWin32::closeDevice()
 {
@@ -666,16 +679,35 @@ void CIrrDeviceWin32::closeDevice()
 }
 
 
-
-//! returns if window is active. if not, nothing need to be drawn
+//! returns if window is active. if not, nothing needs to be drawn
 bool CIrrDeviceWin32::isWindowActive() const
 {
-	bool ret = (GetActiveWindow() == HWnd);
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return (GetActiveWindow() == HWnd);
+}
+
+
+//! returns if window has focus
+bool CIrrDeviceWin32::isWindowFocused() const
+{
+	bool ret = (GetFocus() == HWnd);
 	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return ret;
 }
 
 
+//! returns if window is minimized
+bool CIrrDeviceWin32::isWindowMinimized() const
+{
+	WINDOWPLACEMENT plc;
+	plc.length=sizeof(WINDOWPLACEMENT);
+	bool ret=false;
+	if (GetWindowPlacement(HWnd,&plc))
+		ret=(plc.showCmd & SW_SHOWMINIMIZED)!=0;
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return ret;
+}
+
 
 //! switches to fullscreen
 bool CIrrDeviceWin32::switchToFullScreen(s32 width, s32 height, s32 bits)
@@ -686,41 +718,45 @@ bool CIrrDeviceWin32::switchToFullScreen(s32 width, s32 height, s32 bits)
 	// use default values from current setting
 	EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm);
 	dm.dmPelsWidth = width;
-	dm.dmPelsHeight	= height;
-	dm.dmBitsPerPel	= bits;
+	dm.dmPelsHeight = height;
+	dm.dmBitsPerPel = bits;
 	dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY;
 
-	LONG ret = ChangeDisplaySettings(&dm, CDS_FULLSCREEN);
-	if (ret != DISP_CHANGE_SUCCESSFUL)
+	LONG res = ChangeDisplaySettings(&dm, CDS_FULLSCREEN);
+	if (res != DISP_CHANGE_SUCCESSFUL)
 	{ // try again without forcing display frequency
 		dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-		ret = ChangeDisplaySettings(&dm, CDS_FULLSCREEN);
+		res = ChangeDisplaySettings(&dm, CDS_FULLSCREEN);
 	}
 
-	switch(ret)
+	bool ret = false;
+	switch(res)
 	{
 	case DISP_CHANGE_SUCCESSFUL:
 		ChangedToFullScreen = true;
-		return true;
+		ret = true;
+		break;
 	case DISP_CHANGE_RESTART:
 		os::Printer::log("Switch to fullscreen: The computer must be restarted in order for the graphics mode to work.", ELL_ERROR);
-		return false;
+		break;
 	case DISP_CHANGE_BADFLAGS:
 		os::Printer::log("Switch to fullscreen: An invalid set of flags was passed in.", ELL_ERROR);
-		return false;
+		break;
 	case DISP_CHANGE_BADPARAM:
 		os::Printer::log("Switch to fullscreen: An invalid parameter was passed in. This can include an invalid flag or combination of flags.", ELL_ERROR);
-		return false;
+		break;
 	case DISP_CHANGE_FAILED:
 		os::Printer::log("Switch to fullscreen: The display driver failed the specified graphics mode.", ELL_ERROR);
-		return false;
+		break;
 	case DISP_CHANGE_BADMODE:
 		os::Printer::log("Switch to fullscreen: The graphics mode is not supported.", ELL_ERROR);
-		return false;
+		break;
+	default:
+		os::Printer::log("An unknown error occured while changing to fullscreen.", ELL_ERROR);
+		break;
 	}
-
-	os::Printer::log("An unknown error occured while changing to fullscreen.", ELL_ERROR);
-	return false;
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return ret;
 }
 
 
@@ -767,10 +803,11 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
 	ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
 	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
 
-	if(!(bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO*) &osvi)))
+	bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi);
+	if (!bOsVersionInfoEx)
 	{
 		osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-		if (! GetVersionEx ( (OSVERSIONINFO *) &osvi) )
+		if (! GetVersionEx((OSVERSIONINFO *) &osvi))
 			return;
 	}
 
@@ -779,14 +816,17 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
 	case VER_PLATFORM_WIN32_NT:
 		if (osvi.dwMajorVersion <= 4)
 			out.append("Microsoft Windows NT ");
+		else
 		if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
 			out.append("Microsoft Windows 2000 ");
-		if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1 )
+		else
+		if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)
 			out.append("Microsoft Windows XP ");
-		if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0 )
+		else
+		if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0)
 			out.append("Microsoft Windows Vista ");
 
-		if( bOsVersionInfoEx )
+		if (bOsVersionInfoEx)
 		{
 			#ifdef VER_SUITE_ENTERPRISE
 			if (osvi.wProductType == VER_NT_WORKSTATION)
@@ -824,9 +864,9 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
 
 			if (lstrcmpi( "WINNT", szProductType) == 0 )
 				out.append("Professional ");
-			if ( lstrcmpi( "LANMANNT", szProductType) == 0 )
-				out.append("Server " );
-			if ( lstrcmpi( "SERVERNT", szProductType) == 0 )
+			if (lstrcmpi( "LANMANNT", szProductType) == 0)
+				out.append("Server ");
+			if (lstrcmpi( "SERVERNT", szProductType) == 0)
 				out.append("Advanced Server ");
 		}
 
@@ -836,7 +876,7 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
 
 		if (osvi.dwMajorVersion <= 4 )
 		{
-			sprintf (tmp, "version %ld.%ld %s (Build %ld)",
+			sprintf(tmp, "version %ld.%ld %s (Build %ld)",
 				osvi.dwMajorVersion,
 				osvi.dwMinorVersion,
 				osvi.szCSDVersion,
@@ -844,7 +884,7 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
 		}
 		else
 		{
-			sprintf (tmp, "%s (Build %ld)", osvi.szCSDVersion,
+			sprintf(tmp, "%s (Build %ld)", osvi.szCSDVersion,
 				osvi.dwBuildNumber & 0xFFFF);
 		}
 
@@ -891,17 +931,17 @@ void CIrrDeviceWin32::OnResized()
 //! Sets if the window should be resizeable in windowed mode.
 void CIrrDeviceWin32::setResizeAble(bool resize)
 {
-	if (ExternalWindow || !getVideoDriver() || FullScreen)
+	if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
 		return;
 
-	LONG style = WS_POPUP;
+	LONG_PTR style = WS_POPUP;
 
 	if (!resize)
 		style = WS_SYSMENU | WS_BORDER | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
 	else
-		style = WS_THICKFRAME | WS_SYSMENU | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_MAXIMIZEBOX;
+		style = WS_THICKFRAME | WS_SYSMENU | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
 
-	if (!SetWindowLong(HWnd, GWL_STYLE, style))
+	if (!SetWindowLongPtr(HWnd, GWL_STYLE, style))
 		os::Printer::log("Could not change window style.");
 
 	RECT clientSize;
@@ -912,32 +952,140 @@ void CIrrDeviceWin32::setResizeAble(bool resize)
 
 	AdjustWindowRect(&clientSize, style, FALSE);
 
-	s32 realWidth = clientSize.right - clientSize.left;
-	s32 realHeight = clientSize.bottom - clientSize.top;
+	const s32 realWidth = clientSize.right - clientSize.left;
+	const s32 realHeight = clientSize.bottom - clientSize.top;
 
-	s32 windowLeft = (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2;
-	s32 windowTop = (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2;
+	const s32 windowLeft = (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2;
+	const s32 windowTop = (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2;
 
 	SetWindowPos(HWnd, HWND_TOP, windowLeft, windowTop, realWidth, realHeight,
 		SWP_FRAMECHANGED | SWP_NOMOVE | SWP_SHOWWINDOW);
 }
 
 
+bool CIrrDeviceWin32::activateJoysticks(core::array<SJoystickInfo> & joystickInfo)
+{
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+	joystickInfo.clear();
+	ActiveJoysticks.clear();
+
+	const u32 numberOfJoysticks = ::joyGetNumDevs();
+	JOYINFOEX info;
+	info.dwSize = sizeof(info);
+	info.dwFlags = JOY_RETURNALL;
+
+	JoystickInfo activeJoystick;
+	SJoystickInfo returnInfo;
+
+	joystickInfo.reallocate(numberOfJoysticks);
+	ActiveJoysticks.reallocate(numberOfJoysticks);
+
+	u32 joystick = 0;
+	for(; joystick < numberOfJoysticks; ++joystick)
+	{
+		if(JOYERR_NOERROR == joyGetPosEx(joystick, &info)
+			&&
+			JOYERR_NOERROR == joyGetDevCaps(joystick, 
+											&activeJoystick.Caps,
+											sizeof(activeJoystick.Caps)))
+		{
+			activeJoystick.Index = joystick;
+			ActiveJoysticks.push_back(activeJoystick);
+
+			returnInfo.Joystick = (u8)joystick;
+			returnInfo.Axes = activeJoystick.Caps.wNumAxes;
+			returnInfo.Buttons = activeJoystick.Caps.wNumButtons;
+			returnInfo.Name = activeJoystick.Caps.szPname;
+			returnInfo.PovHat = ((activeJoystick.Caps.wCaps & JOYCAPS_HASPOV) == JOYCAPS_HASPOV)
+								? SJoystickInfo::POV_HAT_PRESENT : SJoystickInfo::POV_HAT_ABSENT;
+
+			joystickInfo.push_back(returnInfo);
+		}
+	}
+
+	for(joystick = 0; joystick < joystickInfo.size(); ++joystick)
+	{
+		char logString[256];
+		(void)sprintf(logString, "Found joystick %d, %d axes, %d buttons '%s'",
+			joystick, joystickInfo[joystick].Axes, 
+			joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
+		os::Printer::log(logString, ELL_INFORMATION);
+	}
+
+	return true;
+#else
+	return false;
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+}
+
+void CIrrDeviceWin32::pollJoysticks()
+{
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+	if(0 == ActiveJoysticks.size())
+		return;
+
+	u32 joystick;
+	JOYINFOEX info;
+	info.dwSize = sizeof(info);
+	info.dwFlags = JOY_RETURNALL;
+
+	for(joystick = 0; joystick < ActiveJoysticks.size(); ++joystick)
+	{
+		if(JOYERR_NOERROR == joyGetPosEx(ActiveJoysticks[joystick].Index, &info))
+		{
+			SEvent event;
+			const JOYCAPS & caps = ActiveJoysticks[joystick].Caps;
+
+			event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+			event.JoystickEvent.Joystick = (u8)joystick;
+
+			event.JoystickEvent.POV = (u16)info.dwPOV;
+			if(event.JoystickEvent.POV > 35900)
+				event.JoystickEvent.POV = 65535;
+
+			for(int axis = 0; axis < SEvent::SJoystickEvent::NUMBER_OF_AXES; ++axis)
+				event.JoystickEvent.Axis[axis] = 0;
+
+			switch(caps.wNumAxes)
+			{
+			default:
+			case 6:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V] = 
+					(s16)((65535 * (info.dwVpos - caps.wVmin)) / (caps.wVmax - caps.wVmin) - 32768);
+
+			case 5:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U] = 
+					(s16)((65535 * (info.dwUpos - caps.wUmin)) / (caps.wUmax - caps.wUmin) - 32768);
+
+			case 4:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R] =
+					(s16)((65535 * (info.dwRpos - caps.wRmin)) / (caps.wRmax - caps.wRmin) - 32768);
+
+			case 3:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Z] = 
+					(s16)((65535 * (info.dwZpos - caps.wZmin)) / (caps.wZmax - caps.wZmin) - 32768);
+			
+			case 2:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Y] =
+					(s16)((65535 * (info.dwYpos - caps.wYmin)) / (caps.wYmax - caps.wYmin) - 32768);
+
+			case 1:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X] = 
+					(s16)((65535 * (info.dwXpos - caps.wXmin)) / (caps.wXmax - caps.wXmin) - 32768);
+			}
+			
+			event.JoystickEvent.ButtonStates = info.dwButtons;
+
+			(void)postEventFromUser(event);
+		}
+	}
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+} 
+
 IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDeviceEx(
 	const SIrrlichtCreationParameters& parameters)
 {
-	CIrrDeviceWin32* dev = new CIrrDeviceWin32(
-		parameters.DriverType,
-		parameters.WindowSize,
-		parameters.Bits,
-		parameters.Fullscreen,
-		parameters.Stencilbuffer,
-		parameters.Vsync,
-		parameters.AntiAlias,
-		parameters.HighPrecisionFPU,
-		parameters.EventReceiver,
-		reinterpret_cast<HWND>(parameters.WindowId),
-		parameters.SDK_version_do_not_use);
+	CIrrDeviceWin32* dev = new CIrrDeviceWin32(parameters);
 
 	if (dev && !dev->getVideoDriver() && parameters.DriverType != video::EDT_NULL)
 	{
diff --git a/src/dep/src/irrlicht/CIrrDeviceWin32.h b/src/dep/src/irrlicht/CIrrDeviceWin32.h
index 5bf59ba..0bb53c1 100644
--- a/src/dep/src/irrlicht/CIrrDeviceWin32.h
+++ b/src/dep/src/irrlicht/CIrrDeviceWin32.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,6 +15,9 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+#include <mmsystem.h> // For JOYCAPS
+
+
 namespace irr
 {
 	class CIrrDeviceWin32 : public CIrrDeviceStub, video::IImagePresenter
@@ -22,13 +25,7 @@ namespace irr
 	public:
 
 		//! constructor
-		CIrrDeviceWin32(video::E_DRIVER_TYPE deviceType, 
-			core::dimension2d<s32> windowSize, u32 bits,
-			bool fullscreen, bool stencilbuffer, bool vsync, 
-			bool antiAlias, bool highPrecisionFPU,
-			IEventReceiver* receiver,
-			HWND window,
-			const char* version);
+		CIrrDeviceWin32(const SIrrlichtCreationParameters& params);
 
 		//! destructor
 		virtual ~CIrrDeviceWin32();
@@ -49,8 +46,14 @@ namespace irr
 		//! returns if window is active. if not, nothing need to be drawn
 		virtual bool isWindowActive() const;
 
+		//! returns if window has focus
+		virtual bool isWindowFocused() const;
+
+		//! returns if window is minimized
+		virtual bool isWindowMinimized() const;
+
 		//! presents a surface in the client area
-		virtual void present(video::IImage* surface, s32 windowId = 0, core::rect<s32>* src=0 );
+		virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0);
 
 		//! notifies the device that it should close itself
 		virtual void closeDevice();
@@ -65,6 +68,9 @@ namespace irr
 		//! Sets if the window should be resizeable in windowed mode.
 		virtual void setResizeAble(bool resize=false);
 
+		//! Activate any joysticks, and generate events for them.
+		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
+
 		//! Implementation of the win32 cursor control
 		class CCursorControl : public gui::ICursorControl
 		{
@@ -90,7 +96,12 @@ namespace irr
 			//! Changes the visible state of the mouse cursor.
 			virtual void setVisible(bool visible)
 			{
-				IsVisible = visible;
+				if(visible != IsVisible)
+				{
+					IsVisible = visible;
+					updateInternalCursorPosition();
+					setPosition(CursorPos.X, CursorPos.Y);
+				}
 			}
 
 			//! Returns if the cursor is currently visible.
@@ -225,16 +236,13 @@ namespace irr
 			core::rect<s32> ReferenceRect;
 		};
 
-
 		//! returns the win32 cursor control
 		CCursorControl* getWin32CursorControl();
 
 	private:
 
 		//! create the driver
-		void createDriver(video::E_DRIVER_TYPE driverType,
-			const core::dimension2d<s32>& windowSize, u32 bits, bool fullscreen,
-			bool stencilbuffer, bool vsync, bool antiAlias, bool highPrecisionFPU);
+		void createDriver();
 
 		//! switchs to fullscreen
 		bool switchToFullScreen(s32 width, s32 height, s32 bits);
@@ -243,16 +251,23 @@ namespace irr
 
 		void resizeIfNecessary();
 
+		void pollJoysticks(); 
+
 		HWND HWnd;
 
 		bool ChangedToFullScreen;
-		bool FullScreen;
 		bool IsNonNTWindows;
 		bool Resized;
 		bool ExternalWindow;
 		CCursorControl* Win32CursorControl;
-	};
 
+		struct JoystickInfo
+		{
+			u32		Index;
+			JOYCAPS Caps;
+		};
+		core::array<JoystickInfo> ActiveJoysticks;
+	};
 
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/CIrrMeshFileLoader.cpp b/src/dep/src/irrlicht/CIrrMeshFileLoader.cpp
index b7c6bcc..0bba98a 100644
--- a/src/dep/src/irrlicht/CIrrMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/CIrrMeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -22,16 +22,15 @@ namespace scene
 
 
 //! Constructor
-CIrrMeshFileLoader::CIrrMeshFileLoader(video::IVideoDriver* driver,
-		scene::ISceneManager* smgr, io::IFileSystem* fs)
-	: Driver(driver), SceneManager(smgr), FileSystem(fs)
+CIrrMeshFileLoader::CIrrMeshFileLoader(scene::ISceneManager* smgr,
+		io::IFileSystem* fs)
+	: SceneManager(smgr), FileSystem(fs)
 {
-}
 
+	#ifdef _DEBUG
+	setDebugName("CIrrMeshFileLoader");
+	#endif
 
-//! destructor
-CIrrMeshFileLoader::~CIrrMeshFileLoader()
-{
 }
 
 
@@ -175,10 +174,10 @@ IMeshBuffer* CIrrMeshFileLoader::readMeshBuffer(io::IXMLReader* reader)
 			{
 				//we've got a material
 
-				io::IAttributes* attributes = FileSystem->createEmptyAttributes(Driver);
+				io::IAttributes* attributes = FileSystem->createEmptyAttributes(SceneManager->getVideoDriver());
 				attributes->read(reader, true, L"material");
 
-				Driver->fillMaterialStructureFromAttributes(material, attributes);
+				SceneManager->getVideoDriver()->fillMaterialStructureFromAttributes(material, attributes);
 				attributes->drop();
 			}
 			else
@@ -256,7 +255,7 @@ IMeshBuffer* CIrrMeshFileLoader::readMeshBuffer(io::IXMLReader* reader)
 				if (sbuffer2)
 					readIndices(reader, indexCount, sbuffer2->Indices);
 				else
-				if (sbuffer2)
+				if (sbuffer3)
 					readIndices(reader, indexCount, sbuffer3->Indices);
 
 				insideIndexSection = false;
diff --git a/src/dep/src/irrlicht/CIrrMeshFileLoader.h b/src/dep/src/irrlicht/CIrrMeshFileLoader.h
index c242569..abcff37 100644
--- a/src/dep/src/irrlicht/CIrrMeshFileLoader.h
+++ b/src/dep/src/irrlicht/CIrrMeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -25,11 +25,7 @@ class CIrrMeshFileLoader : public IMeshLoader
 public:
 
 	//! Constructor
-	CIrrMeshFileLoader(video::IVideoDriver* driver,
-		scene::ISceneManager* smgr, io::IFileSystem* fs);
-
-	//! destructor
-	virtual ~CIrrMeshFileLoader();
+	CIrrMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs);
 
 	//! returns true if the file maybe is able to be loaded by this class
 	//! based on the file extension (e.g. ".cob")
@@ -83,7 +79,6 @@ private:
 
 	// member variables
 
-	video::IVideoDriver* Driver;
 	scene::ISceneManager* SceneManager;
 	io::IFileSystem* FileSystem;
 };
diff --git a/src/dep/src/irrlicht/CIrrMeshWriter.cpp b/src/dep/src/irrlicht/CIrrMeshWriter.cpp
index 9a6399e..451a959 100644
--- a/src/dep/src/irrlicht/CIrrMeshWriter.cpp
+++ b/src/dep/src/irrlicht/CIrrMeshWriter.cpp
@@ -1,3 +1,11 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "IrrCompileConfig.h" 
+
+#ifdef _IRR_COMPILE_WITH_IRR_WRITER_
+
 #include "CIrrMeshWriter.h"
 #include "os.h"
 #include "IWriteFile.h"
@@ -15,6 +23,10 @@ CIrrMeshWriter::CIrrMeshWriter(video::IVideoDriver* driver,
 				io::IFileSystem* fs)
 	: FileSystem(fs), VideoDriver(driver), Writer(0)
 {
+	#ifdef _DEBUG
+	setDebugName("CIrrMeshWriter");
+	#endif
+
 	if (VideoDriver)
 		VideoDriver->grab();
 
@@ -81,7 +93,7 @@ bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
 	Writer->writeLineBreak();
 
 	// write mesh buffers
-	
+
 	for (int i=0; i<(int)mesh->getMeshBufferCount(); ++i)
 	{
 		scene::IMeshBuffer* buffer = mesh->getMeshBuffer(i);
@@ -102,8 +114,8 @@ bool CIrrMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
 void CIrrMeshWriter::writeBoundingBox(const core::aabbox3df& box)
 {
 	Writer->writeElement(L"boundingBox", true,
-        L"minEdge", getVectorAsStringLine(box.MinEdge).c_str(),
-		L"maxEdge", getVectorAsStringLine(box.MaxEdge).c_str()	);
+		L"minEdge", getVectorAsStringLine(box.MinEdge).c_str(),
+		L"maxEdge", getVectorAsStringLine(box.MaxEdge).c_str());
 }
 
 
@@ -116,7 +128,7 @@ core::stringw CIrrMeshWriter::getVectorAsStringLine(const core::vector3df& v) co
 	str += core::stringw(v.Y);
 	str += L" ";
 	str += core::stringw(v.Z);
-	
+
 	return str;
 }
 
@@ -128,7 +140,7 @@ core::stringw CIrrMeshWriter::getVectorAsStringLine(const core::vector2df& v) co
 	str = core::stringw(v.X);
 	str += L" ";
 	str += core::stringw(v.Y);
-	
+
 	return str;
 }
 
@@ -151,7 +163,7 @@ void CIrrMeshWriter::writeMeshBuffer(const scene::IMeshBuffer* buffer)
 
 	const core::stringw vertexTypeStr = video::sBuiltInVertexTypeNames[buffer->getVertexType()];
 
-	Writer->writeElement(L"vertices", false, 
+	Writer->writeElement(L"vertices", false,
 		L"type", vertexTypeStr.c_str(),
 		L"vertexCount", core::stringw(buffer->getVertexCount()).c_str());
 
@@ -176,7 +188,7 @@ void CIrrMeshWriter::writeMeshBuffer(const scene::IMeshBuffer* buffer)
 
 				str += getVectorAsStringLine(vtx[j].TCoords);
 
-                Writer->writeText(str.c_str());
+				Writer->writeText(str.c_str());
 				Writer->writeLineBreak();
 			}
 		}
@@ -198,7 +210,7 @@ void CIrrMeshWriter::writeMeshBuffer(const scene::IMeshBuffer* buffer)
 				str += L" ";
 				str += getVectorAsStringLine(vtx[j].TCoords2);
 
-                Writer->writeText(str.c_str());
+				Writer->writeText(str.c_str());
 				Writer->writeLineBreak();
 			}
 		}
@@ -222,7 +234,7 @@ void CIrrMeshWriter::writeMeshBuffer(const scene::IMeshBuffer* buffer)
 				str += L" ";
 				str += getVectorAsStringLine(vtx[j].Binormal);
 
-                Writer->writeText(str.c_str());
+				Writer->writeText(str.c_str());
 				Writer->writeLineBreak();
 			}
 		}
@@ -234,7 +246,7 @@ void CIrrMeshWriter::writeMeshBuffer(const scene::IMeshBuffer* buffer)
 
 	// write indices
 
-	Writer->writeElement(L"indices", false, 
+	Writer->writeElement(L"indices", false,
 		L"indexCount", core::stringw(buffer->getIndexCount()).c_str());
 
 	Writer->writeLineBreak();
@@ -247,7 +259,7 @@ void CIrrMeshWriter::writeMeshBuffer(const scene::IMeshBuffer* buffer)
 	{
 		core::stringw str((int)idx[i]);
 		Writer->writeText(str.c_str());
-		
+
 		if (i % maxIndicesPerLine != maxIndicesPerLine)
 		{
 			if (i % maxIndicesPerLine == maxIndicesPerLine-1)
@@ -273,7 +285,7 @@ void CIrrMeshWriter::writeMaterial(const video::SMaterial& material)
 {
 	// simply use irrlichts built-in attribute serialization capabilities here:
 
-	io::IAttributes* attributes = 
+	io::IAttributes* attributes =
 		VideoDriver->createAttributesFromMaterial(material);
 
 	if (attributes)
@@ -287,3 +299,5 @@ void CIrrMeshWriter::writeMaterial(const video::SMaterial& material)
 } // end namespace
 } // end namespace
 
+#endif
+
diff --git a/src/dep/src/irrlicht/CIrrMeshWriter.h b/src/dep/src/irrlicht/CIrrMeshWriter.h
index e3336b4..94cf6f3 100644
--- a/src/dep/src/irrlicht/CIrrMeshWriter.h
+++ b/src/dep/src/irrlicht/CIrrMeshWriter.h
@@ -1,3 +1,7 @@
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
 #ifndef __IRR_IRR_MESH_WRITER_H_INCLUDED__
 #define __IRR_IRR_MESH_WRITER_H_INCLUDED__
 
diff --git a/src/dep/src/irrlicht/CLMTSMeshFileLoader.cpp b/src/dep/src/irrlicht/CLMTSMeshFileLoader.cpp
index da073a0..dff5d0b 100644
--- a/src/dep/src/irrlicht/CLMTSMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/CLMTSMeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // This file was written by Jonas Petersen and modified by Nikolaus Gebhardt.
@@ -14,18 +14,11 @@ Version 1.5 - 15 March 2005
 
 Get the latest version here: http://development.mindfloaters.de/
 
-This is an addon class for the Irrlicht engine by Nikolaus Gebhardt (http://irrlicht.sourceforge.net).
-With this release the Irrlicht engine is at version 0.6
-
 This class allows loading meshes with lightmaps (*.lmts + *.tga files) that were created
 using Pulsar LMTools by Lord Trancos (http://www.geocities.com/dxlab/index_en.html)
 
 Notes:
-- This version does not recognice/support user data in the *.lmts files.
-- The lightmap TGA's generated by LMTools doesn't work in Irrlicht for some reason (the
-  lightmaps look messed up). Opening and resaving them in a graphics app will solve
-  the problem (tested only with Photoshop).
-
+- This version does not support user data in the *.lmts files, but still loads those files (by skipping the extra data).
 
 License:
 --------
@@ -90,11 +83,15 @@ namespace irr
 namespace scene
 {
 
-CLMTSMeshFileLoader::CLMTSMeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver,
-										 io::IAttributes* parameters)
+CLMTSMeshFileLoader::CLMTSMeshFileLoader(io::IFileSystem* fs,
+		video::IVideoDriver* driver, io::IAttributes* parameters)
 	: Textures(0), Subsets(0), Triangles(0),
-	Parameters(parameters), Driver(driver), FileSystem(fs)
+	Parameters(parameters), Driver(driver), FileSystem(fs), FlipEndianess(false)
 {
+	#ifdef _DEBUG
+	setDebugName("CLMTSMeshFileLoader");
+	#endif
+
 	if (Driver)
 		Driver->grab();
 
@@ -105,6 +102,8 @@ CLMTSMeshFileLoader::CLMTSMeshFileLoader(io::IFileSystem* fs, video::IVideoDrive
 
 CLMTSMeshFileLoader::~CLMTSMeshFileLoader()
 {
+	cleanup();
+
 	if (Driver)
 		Driver->drop();
 
@@ -112,11 +111,15 @@ CLMTSMeshFileLoader::~CLMTSMeshFileLoader()
 		FileSystem->drop();
 }
 
+
 void CLMTSMeshFileLoader::cleanup()
 {
 	delete [] Textures;
+	Textures = 0;
 	delete [] Subsets;
+	Subsets = 0;
 	delete [] Triangles;
+	Triangles = 0;
 }
 
 
@@ -134,38 +137,53 @@ IAnimatedMesh* CLMTSMeshFileLoader::createMesh(io::IReadFile* file)
 	// HEADER
 
 	file->read(&Header, sizeof(SLMTSHeader));
+	if (Header.MagicID == 0x4C4D5354)
+	{
+		FlipEndianess = true;
+		Header.MagicID = os::Byteswap::byteswap(Header.MagicID);
+		Header.Version = os::Byteswap::byteswap(Header.Version);
+		Header.HeaderSize = os::Byteswap::byteswap(Header.HeaderSize);
+		Header.TextureCount = os::Byteswap::byteswap(Header.TextureCount);
+		Header.SubsetCount = os::Byteswap::byteswap(Header.SubsetCount);
+		Header.TriangleCount = os::Byteswap::byteswap(Header.TriangleCount);
+		Header.SubsetSize = os::Byteswap::byteswap(Header.SubsetSize);
+		Header.VertexSize = os::Byteswap::byteswap(Header.VertexSize);
+	}
 	if (Header.MagicID != 0x53544D4C) { // "LMTS"
 		os::Printer::log("LMTS ERROR: wrong header magic id!", ELL_ERROR);
 		return 0;
 	}
 
+	//Skip any User Data (arbitrary app specific data)
+
+	const s32 userSize = Header.HeaderSize - sizeof(SLMTSHeader);
+	if (userSize>0)
+		file->seek(userSize,true);
+
 	// TEXTURES
 
 	file->read(&id, sizeof(u32));
+	if (FlipEndianess)
+		id = os::Byteswap::byteswap(id);
 	if (id != 0x54584554) { // "TEXT"
 		os::Printer::log("LMTS ERROR: wrong texture magic id!", ELL_ERROR);
 		return 0;
 	}
 
 	Textures = new SLMTSTextureInfoEntry[Header.TextureCount];
-	core::array<u32> textureIDs;
-	textureIDs.reallocate(Header.TextureCount);
 
-	u32 numLightMaps = 0;
-	u32 numTextures = 0;
-
-	for (i=0; i<Header.TextureCount; ++i)
+	file->read(Textures, sizeof(SLMTSTextureInfoEntry)*Header.TextureCount);
+	if (FlipEndianess)
 	{
-		file->read(&Textures[i], sizeof(SLMTSTextureInfoEntry));
-		if (Textures[i].Flags & 1)
-			textureIDs.push_back(numLightMaps++);
-		else
-			textureIDs.push_back(numTextures++);
+		for (i=0; i<Header.TextureCount; ++i)
+			Textures[i].Flags = os::Byteswap::byteswap(Textures[i].Flags);
 	}
-
+	
 	// SUBSETS
 
 	file->read(&id, sizeof(u32));
+	if (FlipEndianess)
+		id = os::Byteswap::byteswap(id);
 	if (id != 0x53425553) // "SUBS"
 	{
 		os::Printer::log("LMTS ERROR: wrong subset magic id!", ELL_ERROR);
@@ -174,13 +192,27 @@ IAnimatedMesh* CLMTSMeshFileLoader::createMesh(io::IReadFile* file)
 	}
 
 	Subsets = new SLMTSSubsetInfoEntry[Header.SubsetCount];
+	const s32 subsetUserSize = Header.SubsetSize - sizeof(SLMTSSubsetInfoEntry);
 
 	for (i=0; i<Header.SubsetCount; ++i)
+	{
 		file->read(&Subsets[i], sizeof(SLMTSSubsetInfoEntry));
+		if (FlipEndianess)
+		{
+			Subsets[i].Offset = os::Byteswap::byteswap(Subsets[i].Offset);
+			Subsets[i].Count = os::Byteswap::byteswap(Subsets[i].Count);
+			Subsets[i].TextID1 = os::Byteswap::byteswap(Subsets[i].TextID1);
+			Subsets[i].TextID2 = os::Byteswap::byteswap(Subsets[i].TextID2);
+		}
+		if (subsetUserSize>0)
+			file->seek(subsetUserSize,true);
+	}
 
 	// TRIANGLES
 
 	file->read(&id, sizeof(u32));
+	if (FlipEndianess)
+		id = os::Byteswap::byteswap(id);
 	if (id != 0x53495254) // "TRIS"
 	{
 		os::Printer::log("LMTS ERROR: wrong triangle magic id!", ELL_ERROR);
@@ -189,9 +221,24 @@ IAnimatedMesh* CLMTSMeshFileLoader::createMesh(io::IReadFile* file)
 	}
 
 	Triangles = new SLMTSTriangleDataEntry[(Header.TriangleCount*3)];
+	const s32 triUserSize = Header.VertexSize - sizeof(SLMTSTriangleDataEntry);
 
 	for (i=0; i<(Header.TriangleCount*3); ++i)
+	{
 		file->read(&Triangles[i], sizeof(SLMTSTriangleDataEntry));
+		if (FlipEndianess)
+		{
+			Triangles[i].X = os::Byteswap::byteswap(Triangles[i].X);
+			Triangles[i].Y = os::Byteswap::byteswap(Triangles[i].Y);
+			Triangles[i].Z = os::Byteswap::byteswap(Triangles[i].Z);
+			Triangles[i].U1 = os::Byteswap::byteswap(Triangles[i].U1);
+			Triangles[i].V1 = os::Byteswap::byteswap(Triangles[i].U2);
+			Triangles[i].U2 = os::Byteswap::byteswap(Triangles[i].V1);
+			Triangles[i].V2 = os::Byteswap::byteswap(Triangles[i].V2);
+		}
+		if (triUserSize>0)
+			file->seek(triUserSize,true);
+	}
 
 	/////////////////////////////////////////////////////////////////
 
@@ -199,7 +246,7 @@ IAnimatedMesh* CLMTSMeshFileLoader::createMesh(io::IReadFile* file)
 
 	constructMesh(mesh);
 
-	loadTextures(mesh, numLightMaps, numTextures, textureIDs);
+	loadTextures(mesh);
 
 	cleanup();
 
@@ -219,7 +266,8 @@ void CLMTSMeshFileLoader::constructMesh(SMesh* mesh)
 	{
 		scene::SMeshBufferLightMap* meshBuffer = new scene::SMeshBufferLightMap();
 
-		meshBuffer->Material.MaterialType = video::EMT_LIGHTMAP; // EMT_LIGHTMAP_M2/EMT_LIGHTMAP_M4 also possible
+		// EMT_LIGHTMAP_M2/EMT_LIGHTMAP_M4 also possible
+		meshBuffer->Material.MaterialType = video::EMT_LIGHTMAP;
 		meshBuffer->Material.Wireframe = false;
 		meshBuffer->Material.Lighting = false;
 
@@ -263,54 +311,55 @@ void CLMTSMeshFileLoader::constructMesh(SMesh* mesh)
 }
 
 
-void CLMTSMeshFileLoader::loadTextures(SMesh* mesh, u32 numTextures, u32 numLightMaps, const core::array<u32>& textureIDs)
+void CLMTSMeshFileLoader::loadTextures(SMesh* mesh)
 {
 	if (!Driver || !FileSystem)
 		return;
 
-	core::stringc s;
-
 	// load textures
 
+	// a little too much space, but won't matter here
 	core::array<video::ITexture*> tex;
-	tex.set_used(numTextures);
-
+	tex.reallocate(Header.TextureCount);
 	core::array<video::ITexture*> lig;
-	lig.set_used(numLightMaps);
+	lig.reallocate(Header.TextureCount);
+	core::array<u32> id2id;
+	id2id.reallocate(Header.TextureCount);
 
-	s32 tx_count = 0;
-	s32 lm_count = 0;
 	const core::stringc Path = Parameters->getAttributeAsString(LMTS_TEXTURE_PATH);
 
-	for (s32 t=0; t<Header.TextureCount; ++t)
+	core::stringc s;
+	for (u32 t=0; t<Header.TextureCount; ++t)
 	{
 		video::ITexture* tmptex = 0;
 		s = Path;
 		s.append(Textures[t].Filename);
 
-		if (FileSystem->existFile(s.c_str()))
-			tmptex = Driver->getTexture(s.c_str());
+		if (FileSystem->existFile(s))
+			tmptex = Driver->getTexture(s);
+		else
+			os::Printer::log("LMTS WARNING: Texture does not exist", s.c_str(), ELL_WARNING);
+
+		if (Textures[t].Flags & 0x01)
+		{
+			id2id.push_back(lig.size());
+			lig.push_back(tmptex);
+		}
 		else
 		{
-			char buf[512]; // filenames may be 256 bytes long
-			sprintf(buf, "LMTS WARNING: Texture does not exist: %s", s.c_str());
-			os::Printer::log(buf, ELL_WARNING);
+			id2id.push_back(tex.size());
+			tex.push_back(tmptex);
 		}
-
-		if (Textures[t].Flags & 1)
-			lig[lm_count++] = tmptex;
-		else
-			tex[tx_count++] = tmptex;
 	}
 
 	// attach textures to materials.
 
-	for (s32 i=0; i<Header.SubsetCount; ++i)
+	for (u32 i=0; i<Header.SubsetCount; ++i)
 	{
-		if (Subsets[i].TextID1 < Header.TextureCount)
-			mesh->getMeshBuffer(i)->getMaterial().setTexture(0, tex[textureIDs[Subsets[i].TextID1]]);
-		if (Subsets[i].TextID2 < Header.TextureCount)
-			mesh->getMeshBuffer(i)->getMaterial().setTexture(1, lig[textureIDs[Subsets[i].TextID2]]);
+		if (Subsets[i].TextID1 < Header.TextureCount && id2id[Subsets[i].TextID1] < tex.size())
+			mesh->getMeshBuffer(i)->getMaterial().setTexture(0, tex[id2id[Subsets[i].TextID1]]);
+		if (Subsets[i].TextID2 < Header.TextureCount && id2id[Subsets[i].TextID2] < lig.size())
+			mesh->getMeshBuffer(i)->getMaterial().setTexture(1, lig[id2id[Subsets[i].TextID2]]);
 
 		if (!mesh->getMeshBuffer(i)->getMaterial().getTexture(1))
 			mesh->getMeshBuffer(i)->getMaterial().MaterialType = video::EMT_SOLID;
@@ -322,4 +371,3 @@ void CLMTSMeshFileLoader::loadTextures(SMesh* mesh, u32 numTextures, u32 numLigh
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_LMTS_LOADER_
-
diff --git a/src/dep/src/irrlicht/CLMTSMeshFileLoader.h b/src/dep/src/irrlicht/CLMTSMeshFileLoader.h
index dcbe85d..8d17e53 100644
--- a/src/dep/src/irrlicht/CLMTSMeshFileLoader.h
+++ b/src/dep/src/irrlicht/CLMTSMeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // 
@@ -46,7 +46,7 @@ public:
 	
 private:
 	void constructMesh(SMesh* mesh);
-	void loadTextures(SMesh* mesh, u32 numTextures, u32 numLightMaps, const core::array<u32>& textureIDs);
+	void loadTextures(SMesh* mesh);
 	void cleanup();
 
 // byte-align structures
@@ -60,10 +60,6 @@ private:
 #	error compiler not supported
 #endif
 
-	struct SLMTSMagigID {
-		u32 ID;
-	} PACK_STRUCT;
-
 	struct SLMTSHeader
 	{
 		u32 MagicID;
@@ -116,10 +112,10 @@ private:
 	io::IAttributes* Parameters;
 	video::IVideoDriver* Driver;
 	io::IFileSystem* FileSystem;
+	bool FlipEndianess;
 };
 
 } // end namespace scene
 } // end namespace irr
 
 #endif // !defined(__C_LMTS_MESH_FILE_LOADER_H_INCLUDED__)
-
diff --git a/src/dep/src/irrlicht/CLightSceneNode.cpp b/src/dep/src/irrlicht/CLightSceneNode.cpp
index 98d5b06..22be4d6 100644
--- a/src/dep/src/irrlicht/CLightSceneNode.cpp
+++ b/src/dep/src/irrlicht/CLightSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,20 +15,19 @@ namespace scene
 {
 
 //! constructor
-CLightSceneNode::CLightSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,	
-	const core::vector3df& position, video::SColorf color,f32 radius)
+CLightSceneNode::CLightSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
+		const core::vector3df& position, video::SColorf color, f32 radius)
 : ILightSceneNode(parent, mgr, id, position)
 {
 	#ifdef _DEBUG
 	setDebugName("CLightSceneNode");
 	#endif
 
-	LightData.Radius = radius;
 	LightData.DiffuseColor = color;
-
 	// set some useful specular color
 	LightData.SpecularColor = color.getInterpolated(video::SColor(255,255,255,255),0.7f);
 
+	setRadius(radius);
 	doLightRecalc();
 }
 
@@ -39,10 +38,9 @@ void CLightSceneNode::OnRegisterSceneNode()
 	doLightRecalc();
 
 	if (IsVisible)
-	{
 		SceneManager->registerNodeForRendering(this, ESNRP_LIGHT);
-		ISceneNode::OnRegisterSceneNode();
-	}
+
+	ISceneNode::OnRegisterSceneNode();
 }
 
 
@@ -106,6 +104,62 @@ const core::aabbox3d<f32>& CLightSceneNode::getBoundingBox() const
 }
 
 
+//! Sets the light's radius of influence.
+/** Outside this radius the light won't lighten geometry and cast no
+shadows. Setting the radius will also influence the attenuation, setting
+it to (0,1/radius,0). If you want to override this behavior, set the
+attenuation after the radius.
+\param radius The new radius. */
+void CLightSceneNode::setRadius(f32 radius)
+{
+	LightData.Radius=radius;
+	LightData.Attenuation.set(0.f, 1.f/radius, 0.f);
+}
+
+
+//! Gets the light's radius of influence.
+/** \return The current radius. */
+f32 CLightSceneNode::getRadius() const
+{
+	return LightData.Radius;
+}
+
+
+//! Sets the light type.
+/** \param type The new type. */
+void CLightSceneNode::setLightType(video::E_LIGHT_TYPE type)
+{
+	LightData.Type=type;
+}
+
+
+//! Gets the light type.
+/** \return The current light type. */
+video::E_LIGHT_TYPE CLightSceneNode::getLightType() const
+{
+	return LightData.Type;
+}
+
+
+//! Sets whether this light casts shadows.
+/** Enabling this flag won't automatically cast shadows, the meshes
+will still need shadow scene nodes attached. But one can enable or
+disable distinct lights for shadow casting for performance reasons.
+\param shadow True if this light shall cast shadows. */
+void CLightSceneNode::enableCastShadow(bool shadow)
+{
+	LightData.CastShadows=shadow;
+}
+
+
+//! Check whether this light casts shadows.
+/** \return True if light would cast shadows, else false. */
+bool CLightSceneNode::getCastShadow() const
+{
+	return LightData.CastShadows;
+}
+
+
 void CLightSceneNode::doLightRecalc()
 {
 	if ((LightData.Type == video::ELT_SPOT) || (LightData.Type == video::ELT_DIRECTIONAL))
@@ -176,7 +230,7 @@ ISceneNode* CLightSceneNode::clone(ISceneNode* newParent, ISceneManager* newMana
 	if (!newManager)
 		newManager = SceneManager;
 
-	CLightSceneNode* nb = new CLightSceneNode(newParent, 
+	CLightSceneNode* nb = new CLightSceneNode(newParent,
 		newManager, ID, RelativeTranslation, LightData.DiffuseColor, LightData.Radius);
 
 	nb->cloneMembers(this, newManager);
diff --git a/src/dep/src/irrlicht/CLightSceneNode.h b/src/dep/src/irrlicht/CLightSceneNode.h
index 7fa23e1..c4f629a 100644
--- a/src/dep/src/irrlicht/CLightSceneNode.h
+++ b/src/dep/src/irrlicht/CLightSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -54,6 +54,37 @@ public:
 	//! Creates a clone of this scene node and its children.
 	virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0); 
 
+
+	//! Sets the light's radius of influence.
+	/** Outside this radius the light won't lighten geometry and cast no
+	shadows. Setting the radius will also influence the attenuation, setting
+	it to (0,1/radius,0). If you want to override this behavior, set the
+	attenuation after the radius.
+	\param radius The new radius. */
+	virtual void setRadius(f32 radius);
+
+	//! Gets the light's radius of influence.
+	/** \return The current radius. */
+	virtual f32 getRadius() const;
+
+	//! Sets the light type.
+	/** \param type The new type. */
+	virtual void setLightType(video::E_LIGHT_TYPE type);
+
+	//! Gets the light type.
+	/** \return The current light type. */
+	virtual video::E_LIGHT_TYPE getLightType() const;
+
+	//! Sets whether this light casts shadows.
+	/** Enabling this flag won't automatically cast shadows, the meshes
+	will still need shadow scene nodes attached. But one can enable or
+	disable distinct lights for shadow casting for performance reasons.
+	\param shadow True if this light shall cast shadows. */
+	virtual void enableCastShadow(bool shadow=true);
+
+	//! Check whether this light casts shadows.
+	/** \return True if light would cast shadows, else false. */
+	virtual bool getCastShadow() const;
 private:
 
 	video::SLight LightData;
diff --git a/src/dep/src/irrlicht/CLimitReadFile.cpp b/src/dep/src/irrlicht/CLimitReadFile.cpp
index b82107d..2127f82 100644
--- a/src/dep/src/irrlicht/CLimitReadFile.cpp
+++ b/src/dep/src/irrlicht/CLimitReadFile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CLimitReadFile.h b/src/dep/src/irrlicht/CLimitReadFile.h
index 947e6d7..b543605 100644
--- a/src/dep/src/irrlicht/CLimitReadFile.h
+++ b/src/dep/src/irrlicht/CLimitReadFile.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CLogger.cpp b/src/dep/src/irrlicht/CLogger.cpp
index 4d4eb68..dafcd3b 100644
--- a/src/dep/src/irrlicht/CLogger.cpp
+++ b/src/dep/src/irrlicht/CLogger.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,6 +10,9 @@ namespace irr
 	CLogger::CLogger(IEventReceiver* r)
 		: LogLevel(ELL_INFORMATION), Receiver(r)
 	{
+		#ifdef _DEBUG
+		setDebugName("CLogger");
+		#endif
 	}
 
 	//! Returns the current set log level.
diff --git a/src/dep/src/irrlicht/CLogger.h b/src/dep/src/irrlicht/CLogger.h
index fc1c63b..a311ba8 100644
--- a/src/dep/src/irrlicht/CLogger.h
+++ b/src/dep/src/irrlicht/CLogger.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CMD2MeshFileLoader.cpp b/src/dep/src/irrlicht/CMD2MeshFileLoader.cpp
index 4e07a34..583ff15 100644
--- a/src/dep/src/irrlicht/CMD2MeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/CMD2MeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -7,15 +7,96 @@
 
 #include "CMD2MeshFileLoader.h"
 #include "CAnimatedMeshMD2.h"
+#include "os.h"
 
 namespace irr
 {
 namespace scene
 {
 
+
+#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__) 
+#	pragma pack( push, packing )
+#	pragma pack( 1 )
+#	define PACK_STRUCT
+#elif defined( __GNUC__ )
+#	define PACK_STRUCT	__attribute__((packed))
+#else
+#	error compiler not supported
+#endif
+
+	// structs needed to load the md2-format
+
+	const s32 MD2_MAGIC_NUMBER  = 844121161;
+	const s32 MD2_VERSION       = 8;
+	const s32 MD2_MAX_VERTS     = 2048;
+
+	struct SMD2Header
+	{
+		s32 magic;           // four character code "IDP2"
+		s32 version;         // must be 8
+		s32 skinWidth;	     // width of the texture
+		s32 skinHeight;      // height of the texture
+		s32 frameSize;       // size in bytes of an animation frame
+		s32 numSkins;        // number of textures
+		s32 numVertices;     // total number of vertices
+		s32 numTexcoords;    // number of vertices with texture coords
+		s32 numTriangles;    // number of triangles 
+		s32 numGlCommands;   // number of opengl commands (triangle strip or triangle fan)
+		s32 numFrames;       // animation keyframe count
+		s32 offsetSkins;     // offset in bytes to 64 character skin names
+		s32 offsetTexcoords; // offset in bytes to texture coordinate list
+		s32 offsetTriangles; // offset in bytes to triangle list
+		s32 offsetFrames;    // offset in bytes to frame list
+		s32 offsetGlCommands;// offset in bytes to opengl commands
+		s32 offsetEnd;       // offset in bytes to end of file
+	} PACK_STRUCT;
+
+	struct SMD2Vertex
+	{
+		u8 vertex[3];        // [0] = X, [1] = Z, [2] = Y
+		u8 lightNormalIndex; // index in the normal table
+	} PACK_STRUCT;
+
+	struct SMD2Frame
+	{
+		f32	scale[3];           // first scale the vertex position
+		f32	translate[3];       // then translate the position
+		c8	name[16];           // the name of the animation that this key belongs to
+		SMD2Vertex vertices[1]; // vertex 1 of SMD2Header.numVertices
+	} PACK_STRUCT;
+
+	struct SMD2Triangle
+	{
+		u16 vertexIndices[3];
+		u16 textureIndices[3];  
+	} PACK_STRUCT;
+
+	struct SMD2TextureCoordinate
+	{
+		s16 s;
+		s16 t;
+	} PACK_STRUCT;
+
+	struct SMD2GLCommand
+	{
+		f32 s, t;
+		s32 vertexIndex;
+	} PACK_STRUCT;
+
+// Default alignment
+#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__) 
+#	pragma pack( pop, packing )
+#endif
+
+#undef PACK_STRUCT
+
 //! Constructor
 CMD2MeshFileLoader::CMD2MeshFileLoader()
 {
+	#ifdef _DEBUG
+	setDebugName("CMD2MeshFileLoader");
+	#endif
 }
 
 
@@ -36,7 +117,7 @@ IAnimatedMesh* CMD2MeshFileLoader::createMesh(io::IReadFile* file)
 	IAnimatedMesh* msh = new CAnimatedMeshMD2();
 	if (msh)
 	{
-		if (((CAnimatedMeshMD2*)msh)->loadFile(file))
+		if (loadFile(file, (CAnimatedMeshMD2*)msh) )
 			return msh;
 
 		msh->drop();
@@ -45,6 +126,246 @@ IAnimatedMesh* CMD2MeshFileLoader::createMesh(io::IReadFile* file)
 	return 0;
 }
 
+//! loads an md2 file
+bool CMD2MeshFileLoader::loadFile(io::IReadFile* file, CAnimatedMeshMD2* mesh)
+{
+	if (!file)
+		return false;
+
+	SMD2Header header;
+
+	file->read(&header, sizeof(SMD2Header));
+
+#ifdef __BIG_ENDIAN__
+	header.magic = os::Byteswap::byteswap(header.magic);
+	header.version = os::Byteswap::byteswap(header.version);
+	header.skinWidth = os::Byteswap::byteswap(header.skinWidth);
+	header.skinHeight = os::Byteswap::byteswap(header.skinHeight);
+	header.frameSize = os::Byteswap::byteswap(header.frameSize);
+	header.numSkins = os::Byteswap::byteswap(header.numSkins);
+	header.numVertices = os::Byteswap::byteswap(header.numVertices);
+	header.numTexcoords = os::Byteswap::byteswap(header.numTexcoords);
+	header.numTriangles = os::Byteswap::byteswap(header.numTriangles);
+	header.numGlCommands = os::Byteswap::byteswap(header.numGlCommands);
+	header.numFrames = os::Byteswap::byteswap(header.numFrames);
+	header.offsetSkins = os::Byteswap::byteswap(header.offsetSkins);
+	header.offsetTexcoords = os::Byteswap::byteswap(header.offsetTexcoords);
+	header.offsetTriangles = os::Byteswap::byteswap(header.offsetTriangles);
+	header.offsetFrames = os::Byteswap::byteswap(header.offsetFrames);
+	header.offsetGlCommands = os::Byteswap::byteswap(header.offsetGlCommands);
+	header.offsetEnd = os::Byteswap::byteswap(header.offsetEnd);
+#endif
+
+	if (header.magic != MD2_MAGIC_NUMBER || header.version != MD2_VERSION)
+	{
+		os::Printer::log("MD2 Loader: Wrong file header", file->getFileName(), ELL_WARNING);
+		return false;
+	}
+
+	//
+	// prepare mesh and allocate memory 
+	//
+
+	mesh->FrameCount = header.numFrames;
+
+	// create keyframes
+	mesh->FrameTransforms.set_used(header.numFrames);
+
+	// create vertex arrays for each keyframe
+	if (mesh->FrameList)
+		delete [] mesh->FrameList;
+	mesh->FrameList = new core::array<CAnimatedMeshMD2::SMD2Vert>[header.numFrames];
+
+	// allocate space in vertex arrays
+	s32 i;
+	for (i=0; i<header.numFrames; ++i)
+		mesh->FrameList[i].reallocate(header.numVertices);
+
+	// allocate interpolation buffer vertices
+	mesh->InterpolationBuffer->Vertices.set_used(header.numTriangles*3);
+
+	// populate triangles
+	mesh->InterpolationBuffer->Indices.reallocate(header.numTriangles*3);
+	const s32 count = header.numTriangles*3;
+	for (i=0; i<count; i+=3)
+	{
+		mesh->InterpolationBuffer->Indices.push_back(i);
+		mesh->InterpolationBuffer->Indices.push_back(i+1);
+		mesh->InterpolationBuffer->Indices.push_back(i+2);
+	}
+
+	//
+	// read texture coordinates
+	//
+
+	file->seek(header.offsetTexcoords);
+	SMD2TextureCoordinate* textureCoords = new SMD2TextureCoordinate[header.numTexcoords];
+
+	if (!file->read(textureCoords, sizeof(SMD2TextureCoordinate)*header.numTexcoords))
+	{
+		os::Printer::log("MD2 Loader: Error reading TextureCoords.", file->getFileName(), ELL_ERROR);
+		return false;
+	}
+
+#ifdef __BIG_ENDIAN__
+	for (i=0; i<header.numTexcoords; ++i)
+	{
+		textureCoords[i].s = os::Byteswap::byteswap(textureCoords[i].s);
+		textureCoords[i].t = os::Byteswap::byteswap(textureCoords[i].t);
+	}
+#endif
+
+	// read Triangles
+
+	file->seek(header.offsetTriangles);
+
+	SMD2Triangle *triangles = new SMD2Triangle[header.numTriangles];
+	if (!file->read(triangles, header.numTriangles *sizeof(SMD2Triangle)))
+	{
+		os::Printer::log("MD2 Loader: Error reading triangles.", file->getFileName(), ELL_ERROR);
+		return false;
+	}
+
+#ifdef __BIG_ENDIAN__
+	for (i=0; i<header.numTriangles; ++i)
+	{
+		triangles[i].vertexIndices[0] = os::Byteswap::byteswap(triangles[i].vertexIndices[0]);
+		triangles[i].vertexIndices[1] = os::Byteswap::byteswap(triangles[i].vertexIndices[1]);
+		triangles[i].vertexIndices[2] = os::Byteswap::byteswap(triangles[i].vertexIndices[2]);
+		triangles[i].textureIndices[0] = os::Byteswap::byteswap(triangles[i].textureIndices[0]);
+		triangles[i].textureIndices[1] = os::Byteswap::byteswap(triangles[i].textureIndices[1]);
+		triangles[i].textureIndices[2] = os::Byteswap::byteswap(triangles[i].textureIndices[2]);
+	}
+#endif
+
+	// read Vertices
+
+	u8 buffer[MD2_MAX_VERTS*4+128];
+	SMD2Frame* frame = (SMD2Frame*)buffer;
+
+	file->seek(header.offsetFrames);
+
+	for (i = 0; i<header.numFrames; ++i)
+	{
+		// read vertices
+
+		file->read(frame, header.frameSize);
+
+#ifdef __BIG_ENDIAN__
+		frame->scale[0] = os::Byteswap::byteswap(frame->scale[0]);
+		frame->scale[1] = os::Byteswap::byteswap(frame->scale[1]);
+		frame->scale[2] = os::Byteswap::byteswap(frame->scale[2]);
+		frame->translate[0] = os::Byteswap::byteswap(frame->translate[0]);
+		frame->translate[1] = os::Byteswap::byteswap(frame->translate[1]);
+		frame->translate[2] = os::Byteswap::byteswap(frame->translate[2]);
+#endif
+		//
+		// store frame data
+		//
+
+		CAnimatedMeshMD2::SAnimationData adata;
+		adata.begin = i;
+		adata.end = i;
+		adata.fps = 7;
+
+		// Add new named animation if necessary
+		if (frame->name[0])
+		{
+			// get animation name
+			for (s32 s = 0; s < 16 && frame->name[s]!=0 && (frame->name[s] < '0' || frame->name[s] > '9'); ++s)
+			{
+				adata.name += frame->name[s];
+			}
+
+			// Does this keyframe have the same animation name as the current animation?
+			if (!mesh->AnimationData.empty() && mesh->AnimationData[mesh->AnimationData.size()-1].name == adata.name)
+			{
+				// Increase the length of the animation
+				++mesh->AnimationData[mesh->AnimationData.size() - 1].end;
+			}
+			else
+			{
+				// Add the new animation
+				mesh->AnimationData.push_back(adata);
+			}
+		}
+
+		// save keyframe scale and translation
+
+		mesh->FrameTransforms[i].scale.X = frame->scale[0];
+		mesh->FrameTransforms[i].scale.Z = frame->scale[1];
+		mesh->FrameTransforms[i].scale.Y = frame->scale[2];
+		mesh->FrameTransforms[i].translate.X = frame->translate[0];
+		mesh->FrameTransforms[i].translate.Z = frame->translate[1];
+		mesh->FrameTransforms[i].translate.Y = frame->translate[2];
+
+		// add vertices
+		for (s32 j=0; j<header.numTriangles; ++j)
+		{
+			for (u32 ti=0; ti<3; ++ti)
+			{
+				CAnimatedMeshMD2::SMD2Vert v;
+				u32 num = triangles[j].vertexIndices[ti];
+				v.Pos.X = frame->vertices[num].vertex[0];
+				v.Pos.Z = frame->vertices[num].vertex[1];
+				v.Pos.Y = frame->vertices[num].vertex[2];
+				v.NormalIdx = frame->vertices[num].lightNormalIndex;
+				
+				mesh->FrameList[i].push_back(v);
+			}
+		}
+
+		// calculate bounding boxes
+		if (header.numVertices)
+		{
+			core::aabbox3d<f32> box;
+			core::vector3df pos;
+			pos.X = f32(mesh->FrameList[i] [0].Pos.X) * mesh->FrameTransforms[i].scale.X + mesh->FrameTransforms[i].translate.X;
+			pos.Y = f32(mesh->FrameList[i] [0].Pos.Y) * mesh->FrameTransforms[i].scale.Y + mesh->FrameTransforms[i].translate.Y;
+			pos.Z = f32(mesh->FrameList[i] [0].Pos.Z) * mesh->FrameTransforms[i].scale.Z + mesh->FrameTransforms[i].translate.Z;
+
+			box.reset(pos);
+
+			for (s32 j=1; j<header.numTriangles*3; ++j)
+			{
+				pos.X = f32(mesh->FrameList[i] [j].Pos.X) * mesh->FrameTransforms[i].scale.X + mesh->FrameTransforms[i].translate.X;
+				pos.Y = f32(mesh->FrameList[i] [j].Pos.Y) * mesh->FrameTransforms[i].scale.Y + mesh->FrameTransforms[i].translate.Y;
+				pos.Z = f32(mesh->FrameList[i] [j].Pos.Z) * mesh->FrameTransforms[i].scale.Z + mesh->FrameTransforms[i].translate.Z;
+
+				box.addInternalPoint(pos);
+			}
+			mesh->BoxList.push_back(box);
+		}
+	}
+
+	// populate interpolation buffer with texture coordinates and colours
+	if (header.numFrames)
+	{
+		f32 dmaxs = 1.0f/(header.skinWidth);
+		f32 dmaxt = 1.0f/(header.skinHeight);
+
+		for (s32 t=0; t<header.numTriangles; ++t)
+		{
+			for (s32 n=0; n<3; ++n)
+			{
+				mesh->InterpolationBuffer->Vertices[t*3 + n].TCoords.X = (textureCoords[triangles[t].textureIndices[n]].s + 0.5f) * dmaxs;
+				mesh->InterpolationBuffer->Vertices[t*3 + n].TCoords.Y = (textureCoords[triangles[t].textureIndices[n]].t + 0.5f) * dmaxt;
+				mesh->InterpolationBuffer->Vertices[t*3 + n].Color = video::SColor(255,255,255,255);
+			}
+		}
+	}
+
+	// clean up
+	delete [] triangles;
+	delete [] textureCoords;
+
+	// return
+
+	mesh->calculateBoundingBox();
+
+	return true;
+}
+
 } // end namespace scene
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/CMD2MeshFileLoader.h b/src/dep/src/irrlicht/CMD2MeshFileLoader.h
index 4bca556..b6b828a 100644
--- a/src/dep/src/irrlicht/CMD2MeshFileLoader.h
+++ b/src/dep/src/irrlicht/CMD2MeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,6 +11,8 @@ namespace irr
 {
 namespace scene
 {
+	
+class CAnimatedMeshMD2;
 
 //! Meshloader capable of loading MD2 files
 class CMD2MeshFileLoader : public IMeshLoader
@@ -30,6 +32,10 @@ public:
 	//! See IReferenceCounted::drop() for more information.
 	virtual IAnimatedMesh* createMesh(io::IReadFile* file);
 
+private:
+	//! Loads the file data into the mesh
+	bool loadFile(io::IReadFile* file, CAnimatedMeshMD2* mesh);
+
 };
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CMD3MeshFileLoader.cpp b/src/dep/src/irrlicht/CMD3MeshFileLoader.cpp
index c408000..dc622ac 100644
--- a/src/dep/src/irrlicht/CMD3MeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/CMD3MeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,18 +14,6 @@ namespace irr
 namespace scene
 {
 
-//! Constructor
-CMD3MeshFileLoader::CMD3MeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver)
-{
-}
-
-
-//! destructor
-CMD3MeshFileLoader::~CMD3MeshFileLoader()
-{
-}
-
-
 //! returns true if the file maybe is able to be loaded by this class
 //! based on the file extension (e.g. ".bsp")
 bool CMD3MeshFileLoader::isALoadableFileExtension(const c8* filename) const
diff --git a/src/dep/src/irrlicht/CMD3MeshFileLoader.h b/src/dep/src/irrlicht/CMD3MeshFileLoader.h
index a32faf4..25dcec2 100644
--- a/src/dep/src/irrlicht/CMD3MeshFileLoader.h
+++ b/src/dep/src/irrlicht/CMD3MeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,10 +6,6 @@
 #define __C_MD3_MESH_FILE_LOADER_H_INCLUDED__
 
 #include "IMeshLoader.h"
-#include "IFileSystem.h"
-#include "IVideoDriver.h"
-#include "IAnimatedMeshMD3.h"
-#include "IQ3Shader.h"
 
 namespace irr
 {
@@ -21,12 +17,6 @@ class CMD3MeshFileLoader : public IMeshLoader
 {
 public:
 
-	//! Constructor
-	CMD3MeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver);
-
-	//! destructor
-	virtual ~CMD3MeshFileLoader();
-
 	//! returns true if the file maybe is able to be loaded by this class
 	//! based on the file extension (e.g. ".bsp")
 	virtual bool isALoadableFileExtension(const c8* fileName) const;
@@ -37,8 +27,6 @@ public:
 	//! See IReferenceCounted::drop() for more information.
 	virtual IAnimatedMesh* createMesh(io::IReadFile* file);
 
-private:
-
 };
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CMS3DMeshFileLoader.cpp b/src/dep/src/irrlicht/CMS3DMeshFileLoader.cpp
index c8bb517..074f6e5 100644
--- a/src/dep/src/irrlicht/CMS3DMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/CMS3DMeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,7 +11,6 @@
 #include "CSkinnedMesh.h"
 
 
-
 namespace irr
 {
 namespace scene
@@ -31,16 +30,16 @@ namespace scene
 // File header
 struct MS3DHeader
 {
-	c8 ID[10];
-	s32 Version;
+	char ID[10];
+	int Version;
 } PACK_STRUCT;
 
 // Vertex information
 struct MS3DVertex
 {
 	u8 Flags;
-	f32 Vertex[3];
-	s8 BoneID;
+	float Vertex[3];
+	char BoneID;
 	u8 RefCount;
 } PACK_STRUCT;
 
@@ -49,8 +48,8 @@ struct MS3DTriangle
 {
 	u16 Flags;
 	u16 VertexIndices[3];
-	f32 VertexNormals[3][3];
-	f32 S[3], T[3];
+	float VertexNormals[3][3];
+	float S[3], T[3];
 	u8 SmoothingGroup;
 	u8 GroupIndex;
 } PACK_STRUCT;
@@ -58,26 +57,26 @@ struct MS3DTriangle
 // Material information
 struct MS3DMaterial
 {
-    s8 Name[32];
-    f32 Ambient[4];
-    f32 Diffuse[4];
-    f32 Specular[4];
-    f32 Emissive[4];
-    f32 Shininess;	// 0.0f - 128.0f
-    f32 Transparency;	// 0.0f - 1.0f
+    char Name[32];
+    float Ambient[4];
+    float Diffuse[4];
+    float Specular[4];
+    float Emissive[4];
+    float Shininess;	// 0.0f - 128.0f
+    float Transparency;	// 0.0f - 1.0f
     u8 Mode;	// 0, 1, 2 is unused now
-    s8 Texture[128];
-    s8 Alphamap[128];
+    char Texture[128];
+    char Alphamap[128];
 } PACK_STRUCT;
 
 // Joint information
 struct MS3DJoint
 {
 	u8 Flags;
-	s8 Name[32];
-	s8 ParentName[32];
-	f32 Rotation[3];
-	f32 Translation[3];
+	char Name[32];
+	char ParentName[32];
+	float Rotation[3];
+	float Translation[3];
 	u16 NumRotationKeyframes;
 	u16 NumTranslationKeyframes;
 } PACK_STRUCT;
@@ -85,8 +84,15 @@ struct MS3DJoint
 // Keyframe data
 struct MS3DKeyframe
 {
-	f32 Time;
-	f32 Parameter[3];
+	float Time;
+	float Parameter[3];
+} PACK_STRUCT;
+
+// vertex weights in 1.8.x
+struct MS3DVertexWeights
+{
+	char boneIds[3];
+	u8 weights[3];
 } PACK_STRUCT;
 
 // Default alignment
@@ -96,10 +102,20 @@ struct MS3DKeyframe
 
 #undef PACK_STRUCT
 
+struct SGroup
+{
+	core::stringc Name;
+	core::array<u16> VertexIds;
+	u16 MaterialIdx;
+};
+
 //! Constructor
 CMS3DMeshFileLoader::CMS3DMeshFileLoader(video::IVideoDriver *driver)
 : Driver(driver), AnimatedMesh(0)
 {
+	#ifdef _DEBUG
+	setDebugName("CMS3DMeshFileLoader");
+	#endif
 }
 
 
@@ -137,7 +153,7 @@ IAnimatedMesh* CMS3DMeshFileLoader::createMesh(io::IReadFile* file)
 }
 
 
-//! loads an md2 file
+//! loads a milkshape file
 bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 {
 	if (!file)
@@ -180,11 +196,6 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 		return false;
 	}
 
-	if ( pHeader->Version == 4 )
-	{
-		os::Printer::log("Milkshape3D version 4 (1.8) is not fully supported. Some features may not be available.", file->getFileName(), ELL_WARNING);
-	}
-
 	// get pointers to data
 
 	// vertices
@@ -195,11 +206,22 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 	pPtr += sizeof(u16);
 	MS3DVertex *vertices = (MS3DVertex*)pPtr;
 	pPtr += sizeof(MS3DVertex) * numVertices;
-#ifdef __BIG_ENDIAN__
+	if (pPtr > buffer+fileSize)
+	{
+		delete [] buffer;
+		os::Printer::log("Loading failed. Corrupted data found.", file->getFileName(), ELL_ERROR);
+		return false;
+	}
 	for (u16 tmp=0; tmp<numVertices; ++tmp)
-		for (u16 j=0; j<3; ++j)
-			vertices[tmp].Vertex[j] = os::Byteswap::byteswap(vertices[tmp].Vertex[j]);
+	{
+#ifdef __BIG_ENDIAN__
+		vertices[tmp].Vertex[0] = os::Byteswap::byteswap(vertices[tmp].Vertex[0]);
+		vertices[tmp].Vertex[1] = os::Byteswap::byteswap(vertices[tmp].Vertex[1]);
+		vertices[tmp].Vertex[2] = -os::Byteswap::byteswap(vertices[tmp].Vertex[2]);
+#else
+		vertices[tmp].Vertex[2] = -vertices[tmp].Vertex[2];
 #endif
+	}
 
 	// triangles
 	u16 numTriangles = *(u16*)pPtr;
@@ -209,20 +231,31 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 	pPtr += sizeof(u16);
 	MS3DTriangle *triangles = (MS3DTriangle*)pPtr;
 	pPtr += sizeof(MS3DTriangle) * numTriangles;
-#ifdef __BIG_ENDIAN__
+	if (pPtr > buffer+fileSize)
+	{
+		delete [] buffer;
+		os::Printer::log("Loading failed. Corrupted data found.", file->getFileName(), ELL_ERROR);
+		return false;
+	}
 	for (u16 tmp=0; tmp<numTriangles; ++tmp)
 	{
+#ifdef __BIG_ENDIAN__
 		triangles[tmp].Flags = os::Byteswap::byteswap(triangles[tmp].Flags);
 		for (u16 j=0; j<3; ++j)
 		{
 			triangles[tmp].VertexIndices[j] = os::Byteswap::byteswap(triangles[tmp].VertexIndices[j]);
-			for (u16 k=0; k<3; ++k)
-				triangles[tmp].VertexNormals[j][k] = os::Byteswap::byteswap(triangles[tmp].VertexNormals[j][k]);
+			triangles[tmp].VertexNormals[j][0] = os::Byteswap::byteswap(triangles[tmp].VertexNormals[j][0]);
+			triangles[tmp].VertexNormals[j][1] = os::Byteswap::byteswap(triangles[tmp].VertexNormals[j][1]);
+			triangles[tmp].VertexNormals[j][2] = -os::Byteswap::byteswap(triangles[tmp].VertexNormals[j][2]);
 			triangles[tmp].S[j] = os::Byteswap::byteswap(triangles[tmp].S[j]);
 			triangles[tmp].T[j] = os::Byteswap::byteswap(triangles[tmp].T[j]);
 		}
-	}
+#else
+		triangles[tmp].VertexNormals[0][2] = -triangles[tmp].VertexNormals[0][2];
+		triangles[tmp].VertexNormals[1][2] = -triangles[tmp].VertexNormals[1][2];
+		triangles[tmp].VertexNormals[2][2] = -triangles[tmp].VertexNormals[2][2];
 #endif
+	}
 
 	// groups
 	u16 numGroups = *(u16*)pPtr;
@@ -230,13 +263,16 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 	numGroups = os::Byteswap::byteswap(numGroups);
 #endif
 	pPtr += sizeof(u16);
+	
+	core::array<SGroup> groups;
+	groups.reallocate(numGroups);
 
-	//skip groups
+	//store groups
 	u32 i;
 	for (i=0; i<numGroups; ++i)
 	{
-		Groups.push_back(SGroup());
-		SGroup& grp = Groups.getLast();
+		groups.push_back(SGroup());
+		SGroup& grp = groups.getLast();
 
 		// The byte flag is before the name, so add 1
 		grp.Name = ((const c8*) pPtr) + 1;
@@ -247,6 +283,7 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 		triangleCount = os::Byteswap::byteswap(triangleCount);
 #endif
 		pPtr += sizeof(u16);
+		grp.VertexIds.reallocate(triangleCount);
 
 		//pPtr += sizeof(u16) * triangleCount; // triangle indices
 		for (u16 j=0; j<triangleCount; ++j)
@@ -264,6 +301,12 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 			grp.MaterialIdx = 0;
 
 		pPtr += sizeof(c8); // material index
+		if (pPtr > buffer+fileSize)
+		{
+			delete [] buffer;
+			os::Printer::log("Loading failed. Corrupted data found.", file->getFileName(), ELL_ERROR);
+			return false;
+		}
 	}
 
 	// skip materials
@@ -276,12 +319,10 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 	// MS3DMaterial *materials = (MS3DMaterial*)pPtr;
 	// pPtr += sizeof(MS3DMaterial) * numMaterials;
 
-	if(numMaterials <= 0)
+	if(numMaterials == 0)
 	{
 		// if there are no materials, add at least one buffer
-
 		AnimatedMesh->createBuffer();
-
 	}
 
 	for (i=0; i<numMaterials; ++i)
@@ -300,7 +341,12 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 		material->Transparency = os::Byteswap::byteswap(material->Transparency);
 #endif
 		pPtr += sizeof(MS3DMaterial);
-
+		if (pPtr > buffer+fileSize)
+		{
+			delete [] buffer;
+			os::Printer::log("Loading failed. Corrupted data found.", file->getFileName(), ELL_ERROR);
+			return false;
+		}
 
 		scene::SSkinMeshBuffer *tmpBuffer = AnimatedMesh->createBuffer();
 
@@ -312,17 +358,15 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 		tmpBuffer->Material.SpecularColor = video::SColorf(material->Specular[0], material->Specular[1], material->Specular[2], material->Specular[3]).toSColor ();
 		tmpBuffer->Material.Shininess = material->Shininess;
 
-		core::stringc TexturePath=(const c8*)material->Texture;
-		TexturePath.trim();
-		if (TexturePath!="")
+		core::stringc TexturePath(material->Texture);
+		if (TexturePath.trim()!="")
 		{
 			TexturePath=stripPathFromString(file->getFileName(),true) + stripPathFromString(TexturePath,false);
 			tmpBuffer->Material.setTexture(0, Driver->getTexture(TexturePath.c_str()) );
 		}
 
 		core::stringc AlphamapPath=(const c8*)material->Alphamap;
-		AlphamapPath.trim();
-		if (AlphamapPath!="")
+		if (AlphamapPath.trim()!="")
 		{
 			AlphamapPath=stripPathFromString(file->getFileName(),true) + stripPathFromString(AlphamapPath,false);
 			tmpBuffer->Material.setTexture(2, Driver->getTexture(AlphamapPath.c_str()) );
@@ -331,31 +375,36 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 	}
 
 	// animation time
-	f32 framesPerSecond = *(f32*)pPtr;
+	f32 framesPerSecond = *(float*)pPtr;
 #ifdef __BIG_ENDIAN__
 	framesPerSecond = os::Byteswap::byteswap(framesPerSecond);
 #endif
-	pPtr += sizeof(f32) * 2; // fps and current time
+	pPtr += sizeof(float) * 2; // fps and current time
 
+	if (framesPerSecond<1.f)
+		framesPerSecond=1.f;
 
-	if (framesPerSecond==0)
-		framesPerSecond=1;
-
-	s32 frameCount = *(s32*)pPtr;
+// calculated inside SkinnedMesh
+//	s32 frameCount = *(int*)pPtr;
 #ifdef __BIG_ENDIAN__
-	frameCount = os::Byteswap::byteswap(frameCount);
+//	frameCount = os::Byteswap::byteswap(frameCount);
 #endif
-	pPtr += sizeof(s32);
-
+	pPtr += sizeof(int);
 
 	u16 jointCount = *(u16*)pPtr;
 #ifdef __BIG_ENDIAN__
 	jointCount = os::Byteswap::byteswap(jointCount);
 #endif
 	pPtr += sizeof(u16);
+	if (pPtr > buffer+fileSize)
+	{
+		delete [] buffer;
+		os::Printer::log("Loading failed. Corrupted data found.", file->getFileName(), ELL_ERROR);
+		return false;
+	}
 
-
-	core::array<core::stringc> ParentNames;
+	core::array<core::stringc> parentNames;
+	parentNames.reallocate(jointCount);
 
 	// load joints
 	for (i=0; i<jointCount; ++i)
@@ -371,47 +420,38 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 		pJoint->NumTranslationKeyframes = os::Byteswap::byteswap(pJoint->NumTranslationKeyframes);
 #endif
 		pPtr += sizeof(MS3DJoint);
-
-
+		if (pPtr > buffer+fileSize)
+		{
+			delete [] buffer;
+			os::Printer::log("Loading failed. Corrupted data found.", file->getFileName(), ELL_ERROR);
+			return false;
+		}
 
 		ISkinnedMesh::SJoint *jnt = AnimatedMesh->createJoint();
 
-		/*
-		jnt.Name = pJoint->Name;
-		jnt.Index = i;
-		jnt.Rotation.X = pJoint->Rotation[0];
-		jnt.Rotation.Y = pJoint->Rotation[1];
-		jnt.Rotation.Z = pJoint->Rotation[2];
-		jnt.Translation.X = pJoint->Translation[0];
-		jnt.Translation.Y = pJoint->Translation[1];
-		jnt.Translation.Z = pJoint->Translation[2];
-		jnt.ParentName = pJoint->ParentName;
-		jnt.Parent = -1;
-		*/
-
 		jnt->Name = pJoint->Name;
-
 		jnt->LocalMatrix.makeIdentity();
-
-
 		jnt->LocalMatrix.setRotationRadians(
 			core::vector3df(pJoint->Rotation[0], pJoint->Rotation[1], pJoint->Rotation[2]) );
+		// convert right-handed to left-handed
+		jnt->LocalMatrix[2]=-jnt->LocalMatrix[2];
+		jnt->LocalMatrix[6]=-jnt->LocalMatrix[6];
+		jnt->LocalMatrix[8]=-jnt->LocalMatrix[8];
+		jnt->LocalMatrix[9]=-jnt->LocalMatrix[9];
 
 		jnt->LocalMatrix.setTranslation(
-			core::vector3df(pJoint->Translation[0], pJoint->Translation[1], pJoint->Translation[2]) );
+			core::vector3df(pJoint->Translation[0], pJoint->Translation[1], -pJoint->Translation[2]) );
 
-
-		ParentNames.push_back( (c8*)pJoint->ParentName );
+		parentNames.push_back( (c8*)pJoint->ParentName );
 
 		/*if (pJoint->NumRotationKeyframes ||
 			pJoint->NumTranslationKeyframes)
-			HasAnimation = true;*/
-
-
-
+			HasAnimation = true;
+		 */
 
 		// get rotation keyframes
-		for (j=0; j < pJoint->NumRotationKeyframes; ++j)
+		const u16 numRotationKeyframes = pJoint->NumRotationKeyframes;
+		for (j=0; j < numRotationKeyframes; ++j)
 		{
 			MS3DKeyframe* kf = (MS3DKeyframe*)pPtr;
 #ifdef __BIG_ENDIAN__
@@ -420,6 +460,12 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 				kf->Parameter[l] = os::Byteswap::byteswap(kf->Parameter[l]);
 #endif
 			pPtr += sizeof(MS3DKeyframe);
+			if (pPtr > buffer+fileSize)
+			{
+				delete [] buffer;
+				os::Printer::log("Loading failed. Corrupted data found.", file->getFileName(), ELL_ERROR);
+				return false;
+			}
 
 			ISkinnedMesh::SRotationKey *k=AnimatedMesh->createRotationKey(jnt);
 			k->frame = kf->Time * framesPerSecond;
@@ -428,21 +474,20 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 
 			tmpMatrix.setRotationRadians(
 				core::vector3df(kf->Parameter[0], kf->Parameter[1], kf->Parameter[2]) );
+			// convert right-handed to left-handed
+			tmpMatrix[2]=-tmpMatrix[2];
+			tmpMatrix[6]=-tmpMatrix[6];
+			tmpMatrix[8]=-tmpMatrix[8];
+			tmpMatrix[9]=-tmpMatrix[9];
 
 			tmpMatrix=jnt->LocalMatrix*tmpMatrix;
 
 			k->rotation  = core::quaternion(tmpMatrix);
-
-			//fix
-			//k->rotation  = core::vector3df
-			//	(kf->Parameter[0],//+pJoint->Rotation[0]*core::RADTODEG,
-			//	 kf->Parameter[1],//+pJoint->Rotation[1]*core::RADTODEG,
-			//	 kf->Parameter[2]);//+pJoint->Rotation[2]*core::RADTODEG);
-
 		}
 
 		// get translation keyframes
-		for (j=0; j<pJoint->NumTranslationKeyframes; ++j)
+		const u16 numTranslationKeyframes = pJoint->NumTranslationKeyframes;
+		for (j=0; j<numTranslationKeyframes; ++j)
 		{
 			MS3DKeyframe* kf = (MS3DKeyframe*)pPtr;
 #ifdef __BIG_ENDIAN__
@@ -451,6 +496,12 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 				kf->Parameter[l] = os::Byteswap::byteswap(kf->Parameter[l]);
 #endif
 			pPtr += sizeof(MS3DKeyframe);
+			if (pPtr > buffer+fileSize)
+			{
+				delete [] buffer;
+				os::Printer::log("Loading failed. Corrupted data found.", file->getFileName(), ELL_ERROR);
+				return false;
+			}
 
 			ISkinnedMesh::SPositionKey *k=AnimatedMesh->createPositionKey(jnt);
 			k->frame = kf->Time * framesPerSecond;
@@ -458,9 +509,98 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 			k->position = core::vector3df
 				(kf->Parameter[0]+pJoint->Translation[0],
 				 kf->Parameter[1]+pJoint->Translation[1],
-				 kf->Parameter[2]+pJoint->Translation[2]);
+				 -kf->Parameter[2]-pJoint->Translation[2]);
+		}
+	}
 
+	core::array<MS3DVertexWeights> vertexWeights;
 
+	if ((pHeader->Version == 4) && (pPtr < buffer+fileSize))
+	{
+		s32 subVersion = *(s32*)pPtr; // comment subVersion, always 1
+#ifdef __BIG_ENDIAN__
+		subVersion = os::Byteswap::byteswap(subVersion);
+#endif
+		pPtr += sizeof(s32);
+
+		for (u32 j=0; j<4; ++j) // four comment groups
+		{
+			u32 numComments = *(u32*)pPtr;
+#ifdef __BIG_ENDIAN__
+			numComments = os::Byteswap::byteswap(numComments);
+#endif
+			pPtr += sizeof(u32);
+			for (i=0; i<numComments; ++i)
+			{
+				pPtr += sizeof(s32); // index
+				s32 commentLength = *(s32*)pPtr;
+#ifdef __BIG_ENDIAN__
+				commentLength = os::Byteswap::byteswap(commentLength);
+#endif
+				pPtr += sizeof(s32);
+				pPtr += commentLength;
+			}
+
+			if (pPtr > buffer+fileSize)
+			{
+				delete [] buffer;
+				os::Printer::log("Loading failed. Corrupted data found.", file->getFileName(), ELL_ERROR);
+				return false;
+			}
+		}
+
+		if (pPtr < buffer+fileSize)
+		{
+			subVersion = *(s32*)pPtr; // vertex subVersion, 1 or 2
+#ifdef __BIG_ENDIAN__
+			subVersion = os::Byteswap::byteswap(subVersion);
+#endif
+			pPtr += sizeof(s32);
+
+			// read vertex weights, ignoring data 'extra' from 1.8.2
+			vertexWeights.reallocate(numVertices);
+			const char offset = (subVersion==1)?6:10;
+			for (i=0; i<numVertices; ++i)
+			{
+				vertexWeights.push_back(*(MS3DVertexWeights*)pPtr);
+				pPtr += offset;
+			}
+
+			if (pPtr > buffer+fileSize)
+			{
+				delete [] buffer;
+				os::Printer::log("Loading failed. Corrupted data found.", file->getFileName(), ELL_ERROR);
+				return false;
+			}
+		}
+
+		if (pPtr < buffer+fileSize)
+		{
+			subVersion = *(s32*)pPtr; // joint subVersion, 1 or 2
+#ifdef __BIG_ENDIAN__
+			subVersion = os::Byteswap::byteswap(subVersion);
+#endif
+			pPtr += sizeof(s32);
+			// skip joint colors
+			pPtr += 3*sizeof(float)*jointCount;
+
+			if (pPtr > buffer+fileSize)
+			{
+				delete [] buffer;
+				os::Printer::log("Loading failed. Corrupted data found", file->getFileName(), ELL_ERROR);
+				return false;
+			}
+		}
+
+		if (pPtr < buffer+fileSize)
+		{
+			subVersion = *(s32*)pPtr; // model subVersion, 1 or 2
+#ifdef __BIG_ENDIAN__
+			subVersion = os::Byteswap::byteswap(subVersion);
+#endif
+			pPtr += sizeof(s32);
+			// now the model extra information would follow
+			// we also skip this for now
 		}
 	}
 
@@ -469,16 +609,13 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 	{
 		for (u32 j2=0; j2<AnimatedMesh->getAllJoints().size(); ++j2)
 		{
-			if (jointnum != j2 && ParentNames[jointnum] == AnimatedMesh->getAllJoints()[j2]->Name )
+			if (jointnum != j2 && parentNames[jointnum] == AnimatedMesh->getAllJoints()[j2]->Name )
 			{
 				AnimatedMesh->getAllJoints()[j2]->Children.push_back(AnimatedMesh->getAllJoints()[jointnum]);
 				break;
 			}
 		}
 	}
-			/*if (Joints[jointnum].Parent == -1)
-				os::Printer::log("Found joint in model without parent.", ELL_WARNING);*/
-
 
 	// create vertices and indices, attach them to the joints.
 	video::S3DVertex v;
@@ -487,11 +624,13 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 
 	for (i=0; i<numTriangles; ++i)
 	{
-		u32 tmp = Groups[triangles[i].GroupIndex].MaterialIdx;
+		u32 tmp = groups[triangles[i].GroupIndex].MaterialIdx;
 		Vertices = &AnimatedMesh->getMeshBuffers()[tmp]->Vertices_Standard;
 
-		for (u16 j = 0; j<3; ++j)
+		for (s32 j = 2; j!=-1; --j)
 		{
+			const u32 vertidx = triangles[i].VertexIndices[j];
+
 			v.TCoords.X = triangles[i].S[j];
 			v.TCoords.Y = triangles[i].T[j];
 
@@ -499,13 +638,15 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 			v.Normal.Y = triangles[i].VertexNormals[j][1];
 			v.Normal.Z = triangles[i].VertexNormals[j][2];
 
-			if(triangles[i].GroupIndex < Groups.size() && Groups[triangles[i].GroupIndex].MaterialIdx < AnimatedMesh->getMeshBuffers().size())
-				v.Color = AnimatedMesh->getMeshBuffers()[Groups[triangles[i].GroupIndex].MaterialIdx]->Material.DiffuseColor;
+			if(triangles[i].GroupIndex < groups.size() &&
+					groups[triangles[i].GroupIndex].MaterialIdx < AnimatedMesh->getMeshBuffers().size())
+				v.Color = AnimatedMesh->getMeshBuffers()[groups[triangles[i].GroupIndex].MaterialIdx]->Material.DiffuseColor;
 			else
 				v.Color.set(255,255,255,255);
-			v.Pos.X = vertices[triangles[i].VertexIndices[j]].Vertex[0];
-			v.Pos.Y = vertices[triangles[i].VertexIndices[j]].Vertex[1];
-			v.Pos.Z = vertices[triangles[i].VertexIndices[j]].Vertex[2];
+
+			v.Pos.X = vertices[vertidx].Vertex[0];
+			v.Pos.Y = vertices[vertidx].Vertex[1];
+			v.Pos.Z = vertices[vertidx].Vertex[2];
 
 			// check if we already have this vertex in our vertex array
 			s32 index = -1;
@@ -517,22 +658,69 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 					break;
 				}
 			}
+
 			if (index == -1)
 			{
-				s32 boneid = vertices[triangles[i].VertexIndices[j]].BoneID;
-				if (boneid>=0 && boneid<(s32)AnimatedMesh->getAllJoints().size())
+				index = Vertices->size();
+				const u32 matidx = groups[triangles[i].GroupIndex].MaterialIdx;
+				if (vertexWeights.size()==0)
 				{
-					ISkinnedMesh::SWeight *w=AnimatedMesh->createWeight(AnimatedMesh->getAllJoints()[boneid]);
-					w->buffer_id = Groups[triangles[i].GroupIndex].MaterialIdx;
-					w->strength = 1.0f;
-					w->vertex_id = Vertices->size();
-					//Joints[boneid]->VertexIds.push_back(Vertices.size());
-
-
+					const s32 boneid = vertices[vertidx].BoneID;
+					if ((u32)boneid < AnimatedMesh->getAllJoints().size())
+					{
+						ISkinnedMesh::SWeight *w=AnimatedMesh->createWeight(AnimatedMesh->getAllJoints()[boneid]);
+						w->buffer_id = matidx;
+						w->strength = 1.0f;
+						w->vertex_id = index;
+					}
+				}
+				else // new weights from 1.8.x
+				{
+					f32 sum = 1.0f;
+					s32 boneid = vertices[vertidx].BoneID;
+					if (((u32)boneid < AnimatedMesh->getAllJoints().size()) && (vertexWeights[vertidx].weights[0] != 0))
+					{
+						ISkinnedMesh::SWeight *w=AnimatedMesh->createWeight(AnimatedMesh->getAllJoints()[boneid]);
+						w->buffer_id = matidx;
+						sum -= (w->strength = vertexWeights[vertidx].weights[0]/100.f);
+						w->vertex_id = index;
+					}
+					boneid = vertexWeights[vertidx].boneIds[0];
+					if (((u32)boneid < AnimatedMesh->getAllJoints().size()) && (vertexWeights[vertidx].weights[1] != 0))
+					{
+						ISkinnedMesh::SWeight *w=AnimatedMesh->createWeight(AnimatedMesh->getAllJoints()[boneid]);
+						w->buffer_id = matidx;
+						sum -= (w->strength = vertexWeights[vertidx].weights[1]/100.f);
+						w->vertex_id = index;
+					}
+					boneid = vertexWeights[vertidx].boneIds[1];
+					if (((u32)boneid < AnimatedMesh->getAllJoints().size()) && (vertexWeights[vertidx].weights[2] != 0))
+					{
+						ISkinnedMesh::SWeight *w=AnimatedMesh->createWeight(AnimatedMesh->getAllJoints()[boneid]);
+						w->buffer_id = matidx;
+						sum -= (w->strength = vertexWeights[vertidx].weights[2]/100.f);
+						w->vertex_id = index;
+					}
+					boneid = vertexWeights[vertidx].boneIds[2];
+					if (((u32)boneid < AnimatedMesh->getAllJoints().size()) && (sum > 0.f))
+					{
+						ISkinnedMesh::SWeight *w=AnimatedMesh->createWeight(AnimatedMesh->getAllJoints()[boneid]);
+						w->buffer_id = matidx;
+						w->strength = sum;
+						w->vertex_id = index;
+					}
+					// fallback, if no bone chosen. Seems to be an error in the specs
+					boneid = vertices[vertidx].BoneID;
+					if ((sum == 1.f) && ((u32)boneid < AnimatedMesh->getAllJoints().size()))
+					{
+						ISkinnedMesh::SWeight *w=AnimatedMesh->createWeight(AnimatedMesh->getAllJoints()[boneid]);
+						w->buffer_id = matidx;
+						w->strength = 1.f;
+						w->vertex_id = index;
+					}
 				}
 
 				Vertices->push_back(v);
-				index = Vertices->size() - 1;
 			}
 			Indices.push_back(index);
 		}
@@ -540,9 +728,9 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 
 	//create groups
 	s32 iIndex = -1;
-	for (i=0; i<Groups.size(); ++i)
+	for (i=0; i<groups.size(); ++i)
 	{
-		SGroup& grp = Groups[i];
+		SGroup& grp = groups[i];
 
 		if (grp.MaterialIdx >= AnimatedMesh->getMeshBuffers().size())
 			grp.MaterialIdx = 0;
@@ -554,53 +742,31 @@ bool CMS3DMeshFileLoader::load(io::IReadFile* file)
 				indices.push_back(Indices[++iIndex]);
 	}
 
-	// calculate bounding box
-/*
-	// inverse translate and rotate all vertices for making animation easier
-	if (HasAnimation)
-	for (i=0; i<Joints.size(); ++i)
-	{
-		for (u32 j=0; j<Joints[i].VertexIds.size(); ++j)
-		{
-			Joints[i].AbsoluteTransformation.inverseTranslateVect(
-				Vertices[Joints[i].VertexIds[j]].Pos);
-
-			Joints[i].AbsoluteTransformation.inverseRotateVect(
-				Vertices[Joints[i].VertexIds[j]].Pos);
-
-			Joints[i].AbsoluteTransformation.inverseRotateVect(
-				Vertices[Joints[i].VertexIds[j]].Normal);
-		}
-	}
-
-	AnimatedVertices = Vertices;
-*/
-
 	delete [] buffer;
-	// clear arrays
-	Groups.clear();
 
 	return true;
 }
 
 
-core::stringc CMS3DMeshFileLoader::stripPathFromString(core::stringc string, bool returnPath)
+core::stringc CMS3DMeshFileLoader::stripPathFromString(const core::stringc& inString, bool returnPath) const
 {
-	s32 slashIndex=string.findLast('/'); // forward slash
-	s32 backSlash=string.findLast('\\'); // back slash
+	s32 slashIndex=inString.findLast('/'); // forward slash
+	s32 backSlash=inString.findLast('\\'); // back slash
 
 	if (backSlash>slashIndex) slashIndex=backSlash;
 
 	if (slashIndex==-1)//no slashes found
+	{
 		if (returnPath)
 			return core::stringc(); //no path to return
 		else
-			return string;
+			return inString;
+	}
 
 	if (returnPath)
-		return string.subString(0, slashIndex + 1);
+		return inString.subString(0, slashIndex + 1);
 	else
-		return string.subString(slashIndex+1, string.size() - (slashIndex+1));
+		return inString.subString(slashIndex+1, inString.size() - (slashIndex+1));
 }
 
 
diff --git a/src/dep/src/irrlicht/CMS3DMeshFileLoader.h b/src/dep/src/irrlicht/CMS3DMeshFileLoader.h
index 06a108e..a4483f8 100644
--- a/src/dep/src/irrlicht/CMS3DMeshFileLoader.h
+++ b/src/dep/src/irrlicht/CMS3DMeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -22,7 +22,7 @@ public:
 	//! Constructor
 	CMS3DMeshFileLoader(video::IVideoDriver* driver);
 
-	//! returns true if the file maybe is able to be loaded by this class
+	//! returns true if the file might be loadable by this class
 	//! based on the file extension (e.g. ".bsp")
 	virtual bool isALoadableFileExtension(const c8* fileName) const;
 
@@ -34,21 +34,11 @@ public:
 
 private:
 
-	core::stringc stripPathFromString(core::stringc string, bool returnPath);
+	core::stringc stripPathFromString(const core::stringc& inString, bool returnPath) const;
 
 	bool load(io::IReadFile* file);
 	video::IVideoDriver* Driver;
 	CSkinnedMesh* AnimatedMesh;
-
-	struct SGroup
-	{
-		core::stringc Name;
-		core::array<u16> VertexIds;
-		u16 MaterialIdx;
-	};
-
-	core::array<SGroup> Groups;
-
 };
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CMY3DHelper.h b/src/dep/src/irrlicht/CMY3DHelper.h
index 4b9f164..dcbb8c6 100644
--- a/src/dep/src/irrlicht/CMY3DHelper.h
+++ b/src/dep/src/irrlicht/CMY3DHelper.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 //
@@ -18,7 +18,131 @@
 #ifndef __C_MY3D_HELPER_H_INCLUDED__
 #define __C_MY3D_HELPER_H_INCLUDED__
 
-//--------------------------------------------------------------------------------
+#include <irrTypes.h>
+
+namespace irr
+{
+namespace scene
+{
+
+//**********************************************************************
+//                      MY3D stuff
+//**********************************************************************
+
+//--------------------------------------------------------------------
+// byte-align structures
+#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
+#   pragma pack( push, packing )
+#   pragma pack( 1 )
+#   define PACK_STRUCT
+#elif defined( __GNUC__ )
+#   define PACK_STRUCT  __attribute__((packed))
+#else
+#   error compiler not supported
+#endif
+//----------------------------------------------------------------------
+
+struct SMyVector3
+{   SMyVector3 () {;}
+    SMyVector3 (f32 __X, f32 __Y, f32 __Z)
+        : X(__X), Y(__Y), Z(__Z) {}
+    f32 X, Y, Z;
+} PACK_STRUCT;
+
+struct SMyVector2
+{   SMyVector2 () {;}
+    SMyVector2(f32 __X, f32 __Y)
+        : X(__X), Y(__Y) {}
+    f32 X, Y;
+} PACK_STRUCT;
+
+struct SMyVertex
+{   SMyVertex () {;}
+    SMyVertex (SMyVector3 _Coord, SMyColor _Color, SMyVector3 _Normal)
+        :Coord(_Coord), Color(_Color), Normal(_Normal) {;}
+    SMyVector3 Coord;
+    SMyColor   Color;
+    SMyVector3 Normal;
+} PACK_STRUCT;
+
+struct SMyTVertex
+{   SMyTVertex () {;}
+    SMyTVertex (SMyVector2 _TCoord)
+        : TCoord(_TCoord) {;}
+    SMyVector2 TCoord;
+} PACK_STRUCT;
+
+struct SMyFace
+{   SMyFace() {;}
+    SMyFace(u32 __A, u32 __B, u32 __C)
+        : A(__A), B(__B), C(__C) {}
+    u32 A, B, C;
+} PACK_STRUCT;
+
+// file header (6 bytes)
+struct SMyFileHeader
+{   u32 MyId; // MY3D
+    u16 Ver;  // Version
+} PACK_STRUCT;
+
+// scene header
+struct SMySceneHeader
+{   SMyColor BackgrColor;  // background color
+    SMyColor AmbientColor; // ambient color
+    s32 MaterialCount;     // material count
+    s32 MeshCount;         // mesh count
+} PACK_STRUCT;
+
+// mesh header
+struct SMyMeshHeader
+{   c8  Name[256];   // material name
+    u32 MatIndex;    // index of the mesh material
+    u32 TChannelCnt; // mesh mapping channels count
+} PACK_STRUCT;
+
+// texture data header
+struct SMyTexDataHeader
+{   c8  Name[256]; // texture name
+    u32 ComprMode; //compression mode
+    u32 PixelFormat;
+    u32 Width;   // image width
+    u32 Height;  // image height
+} PACK_STRUCT;
+
+// pixel color 24bit (R8G8B8)
+struct SMyPixelColor24
+{   SMyPixelColor24() {;}
+    SMyPixelColor24(u8 __r, u8 __g, u8 __b)
+        : r(__r), g(__g), b(__b) {}
+    u8 r, g, b;
+} PACK_STRUCT;
+
+// pixel color 16bit (A1R5G5B5)
+struct SMyPixelColor16
+{   SMyPixelColor16() {;}
+    SMyPixelColor16(s16 _argb): argb(_argb) {;}
+    SMyPixelColor16(u8 r, u8 g, u8 b)
+    {   argb = ((r&0x1F)<<10) | ((g&0x1F)<<5) | (b&0x1F);
+    }
+    s16 argb;
+} PACK_STRUCT;
+
+// RLE Header
+struct SMyRLEHeader
+{   SMyRLEHeader() {}
+    u32 nEncodedBytes;
+    u32 nDecodedBytes;
+} PACK_STRUCT;
+
+// Default alignment
+#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
+#   pragma pack( pop, packing )
+#endif
+
+} // end namespace
+} // end namespace
+
+//-----------------------------------------------------------------------------
 namespace irr
 {
 namespace core
@@ -55,17 +179,17 @@ const unsigned long EOD_FOUND = 3; // was: #define EOD_FOUND 3
 const unsigned long EOD = 0x00454f44; // was: #define EOD       'EOD'
 //-----------------------------------------------------------
 // number of decoded bytes
-int nDecodedBytes=0;
+static int nDecodedBytes=0;
 // number of coded bytes
-int nCodedBytes=0;
+static int nCodedBytes=0;
 // number of read bytes
-int nReadedBytes=0;
+static int nReadedBytes=0;
 // table used to look for sequences of repeating bytes
-unsigned char tmpbuf[4];  // we use subscripts 1 - 3
-int tmpbuf_cnt;
+static unsigned char tmpbuf[4];  // we use subscripts 1 - 3
+static int tmpbuf_cnt;
 // output buffer for non-compressed output data
-unsigned char outbuf[128];
-int outbuf_cnt;
+static unsigned char outbuf[128];
+static int outbuf_cnt;
 
 
 //-----------------------------------------------------------
diff --git a/src/dep/src/irrlicht/CMY3DMeshFileLoader.cpp b/src/dep/src/irrlicht/CMY3DMeshFileLoader.cpp
index f97a27b..f8e56ca 100644
--- a/src/dep/src/irrlicht/CMY3DMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/CMY3DMeshFileLoader.cpp
@@ -1,12 +1,12 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 //
 // This file was originally written by ZDimitor.
 
-//--------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // This tool created by ZDimitor everyone can use it as wants
-//--------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 
 #include "IrrCompileConfig.h" 
 #ifdef _IRR_COMPILE_WITH_MY3D_LOADER_
@@ -30,34 +30,48 @@ namespace irr
 namespace scene
 {
 
+static const u32 MY3D_ID = 0x4d593344;
+static const u16 MY3D_VER = 0x0003;
+static const u16 MY3D_SCENE_HEADER_ID = 0x1000;
+static const u16 MY3D_MAT_LIST_ID = 0x2000;
+static const u16 MY3D_MAT_HEADER_ID = 0x2100;
+static const u16 MY3D_TEX_FNAME_ID = 0x2101;
+static const u16 MY3D_TEXDATA_HEADER_ID = 0x2501;
+static const u16 MY3D_TEXDATA_RLE_HEADER_ID = 0x2502;
+static const u16 MY3D_MESH_LIST_ID =  0x3000;
+static const u16 MY3D_MESH_HEADER_ID = 0x3100;
+static const u16 MY3D_VERTS_ID = 0x3101;
+static const u16 MY3D_FACES_ID = 0x3102;
+static const u16 MY3D_TVERTS_ID = 0x3103;
+static const u16 MY3D_TFACES_ID = 0x3104;
+static const u16 MY3D_FILE_END_ID = 0xFFFF;
 
-CMY3DMeshFileLoader::CMY3DMeshFileLoader(
-	io::IFileSystem* fs, video::IVideoDriver* driver, ISceneManager *scmgr)
-	: Mesh(0), Driver(driver), FileSystem(fs), SceneManager(scmgr)
+static const unsigned long MY3D_TEXDATA_COMPR_NONE_ID = 0x4e4f4e45;
+static const unsigned long MY3D_TEXDATA_COMPR_SIMPLE_ID = 0x53494d50;
+static const unsigned long MY3D_TEXDATA_COMPR_RLE_ID = 0x20524c45;
+
+static const unsigned long MY3D_PIXEL_FORMAT_24 = 0x5f32345f;
+static const unsigned long MY3D_PIXEL_FORMAT_16 = 0x5f31365f;
+
+CMY3DMeshFileLoader::CMY3DMeshFileLoader(ISceneManager* scmgr, io::IFileSystem* fs)
+	: SceneManager(scmgr), FileSystem(fs)
 {
-	if (Driver)
-		Driver->grab();
-
+	#ifdef _DEBUG
+	setDebugName("CMY3DMeshFileLoader");
+	#endif
+	
 	if (FileSystem)
 		FileSystem->grab();
 }
 
 
-
 CMY3DMeshFileLoader::~CMY3DMeshFileLoader()
 {
-	if (Mesh)
-		Mesh->drop();
-
-	if (Driver)
-		Driver->drop();
-
 	if (FileSystem)
 		FileSystem->drop();
 }
 
 
-
 bool CMY3DMeshFileLoader::isALoadableFileExtension(const c8* filename) const
 {
 	return strstr(filename, ".my3d") != 0;
@@ -70,19 +84,22 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 	MeshBufferEntry.clear();
 	ChildNodes.clear();
 
-	core::stringc file_name = file->getFileName();
-
 	// working directory (from which we load the scene)
-	core::stringc filepath = FileSystem->getFileDir(file_name);
-	filepath.append("/");
-
-	core::stringc msg="";
+	core::stringc filepath = FileSystem->getFileDir(file->getFileName());
+	if (filepath==".")
+		filepath="";
+	else
+		filepath.append("/");
 
 	// read file into memory
 	SMyFileHeader fileHeader;
 	file->read(&fileHeader, sizeof(SMyFileHeader));
+#ifdef __BIG_ENDIAN__
+	fileHeader.MyId = os::Byteswap::byteswap(fileHeader.MyId);
+	fileHeader.Ver = os::Byteswap::byteswap(fileHeader.Ver);
+#endif
 
-	if (fileHeader.MyId!=MY_ID || fileHeader.Ver!=MY_VER)
+	if (fileHeader.MyId!=MY3D_ID || fileHeader.Ver!=MY3D_VER)
 	{
 		os::Printer::log("Bad MY3D file header, loading failed!", ELL_ERROR);
 		return 0;
@@ -91,29 +108,31 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 	u16 id;
 
 	file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+	id = os::Byteswap::byteswap(id);
+#endif
 
-	if (id!=MY_SCENE_HEADER_ID)
+	if (id!=MY3D_SCENE_HEADER_ID)
 	{
-		os::Printer::log("Cannot find MY_SCENE_HEADER_ID, loading failed!", ELL_ERROR);
+		os::Printer::log("Cannot find MY3D_SCENE_HEADER_ID, loading failed!", ELL_ERROR);
 		return 0;
 	}
 
 	SMySceneHeader sceneHeader;
 	file->read(&sceneHeader, sizeof(SMySceneHeader));
-
-	SceneBackgrColor = video::SColor(
-		sceneHeader.BackgrColor.R, sceneHeader.BackgrColor.G,
-		sceneHeader.BackgrColor.B, sceneHeader.BackgrColor.A);
-
-	SceneAmbientColor = video::SColor(
-		sceneHeader.AmbientColor.R, sceneHeader.AmbientColor.G,
-		sceneHeader.AmbientColor.B, sceneHeader.AmbientColor.A);
+#ifdef __BIG_ENDIAN__
+	sceneHeader.MaterialCount = os::Byteswap::byteswap(sceneHeader.MaterialCount);
+	sceneHeader.MeshCount = os::Byteswap::byteswap(sceneHeader.MeshCount);
+#endif
 
 	file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+	id = os::Byteswap::byteswap(id);
+#endif
 
-	if (id!=MY_MAT_LIST_ID)
+	if (id!=MY3D_MAT_LIST_ID)
 	{
-		os::Printer::log("Can not find MY_MAT_LIST_ID, loading failed!", ELL_ERROR);
+		os::Printer::log("Can not find MY3D_MAT_LIST_ID, loading failed!", ELL_ERROR);
 		return 0;
 	}
 
@@ -121,267 +140,100 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 		SceneManager->getParameters()->getAttributeAsString(MY3D_TEXTURE_PATH);
 
 	file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+	id = os::Byteswap::byteswap(id);
+#endif
 
-	s32 texCount=0, matCount=0;
-	c8 name[256];
+	c8 namebuf[256];
 	for (s32 m=0; m<sceneHeader.MaterialCount; ++m)
 	{
-		if (id!=MY_MAT_HEADER_ID)
+		if (id != MY3D_MAT_HEADER_ID)
 		{
-			os::Printer::log("Cannot find MY_MAT_HEADER_ID, loading failed!", ELL_ERROR);
+			os::Printer::log("Cannot find MY3D_MAT_HEADER_ID, loading failed!", ELL_ERROR);
 			return 0;
 		}
 
-		matCount++;
-
 		// read material header
-		SMyMaterialHeader materialHeader;
-		file->read(&materialHeader, sizeof(SMyMaterialHeader));
-
-		SMyMaterialEntry me;
-		me.Header = materialHeader;
+		MaterialEntry.push_back(SMyMaterialEntry());
+		SMyMaterialEntry& me=MaterialEntry.getLast();
+		file->read(&(me.Header), sizeof(SMyMaterialHeader));
 
 		// read next identificator
 		file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+		id = os::Byteswap::byteswap(id);
+#endif
 
-		bool GetLightMap=false, GetMainMap=false;
-		static int LightMapIndex=0;
+		bool gotLightMap=false, gotMainMap=false;
 
-		for (int t=0; t<materialHeader.TextureCount; t++)
+		for (u32 t=0; t<me.Header.TextureCount; ++t)
 		{
-			if (id==MY_TEX_FNAME_ID)
-				file->read(name, 256);
+			if (id==MY3D_TEX_FNAME_ID)
+				file->read(namebuf, 256);
 			else
 			{
-				file->read(&id, sizeof(id));
-				if (id!=MY_TEXDATA_HEADER_ID)
-				{
-					os::Printer::log("Can not find MY_TEXDATA_HEADER_ID, loading failed!", ELL_ERROR);
+				me.Texture2 = readEmbeddedLightmap(file, namebuf);
+				if (!me.Texture2)
 					return 0;
-				}
-
-				SMyTexDataHeader texDataHeader;
-
-				file->read(&texDataHeader, sizeof(SMyTexDataHeader));
-
-				strcpy(texDataHeader.Name, name);
-
-				char LightMapName[255];
-				sprintf(LightMapName,"My3D.Lightmap.%d",++LightMapIndex);
-
-				core::stringc pixFormatStr;
-				if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
-					pixFormatStr = "24bit,";
-				else
-				if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_16)
-					pixFormatStr = "16bit,";
-				else
-				{
-					msg="Unknown format of image data (";
-					msg.append(LightMapName);
-					msg.append("), loading failed!");
-					os::Printer::log(msg.c_str(), ELL_ERROR);
-					return 0;
-				}
-
-				if (texDataHeader.ComprMode != MY_TEXDATA_COMPR_NONE_ID &&
-						texDataHeader.ComprMode != MY_TEXDATA_COMPR_RLE_ID &&
-						texDataHeader.ComprMode != MY_TEXDATA_COMPR_SIMPLE_ID )
-				{
-					os::Printer::log("Unknown method of compression image data, loading failed!", ELL_ERROR);
-					return 0;
-				}
-
-				u32 num_pixels = texDataHeader.Width*texDataHeader.Height;
-
-				void* data = 0;
-
-				if (texDataHeader.ComprMode==MY_TEXDATA_COMPR_NONE_ID)
-				{
-					// none compressed image data
-					if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
-					{
-						data = (void*) new SMyPixelColor24[num_pixels];
-						file->read(data, sizeof(SMyPixelColor24)*num_pixels);
-					}
-					else
-					{
-						data = (void*) new SMyPixelColor16[num_pixels];
-						file->read(data, sizeof(SMyPixelColor16)*num_pixels);
-					}
-				}
-				else
-				if (texDataHeader.ComprMode==MY_TEXDATA_COMPR_RLE_ID)
-				{
-					// read RLE header identificator
-					file->read(&id, sizeof(id));
-					if (id!=MY_TEXDATA_RLE_HEADER_ID)
-					{
-						os::Printer::log("Can not find MY_TEXDATA_RLE_HEADER_ID, loading failed!", ELL_ERROR);
-						return 0;
-					}
-
-					// read RLE header
-					SMyRLEHeader rleHeader;
-					file->read(&rleHeader, sizeof(SMyRLEHeader));
-
-					//allocate memory for input and output buffers
-					void *input_buffer  = (void*) new unsigned char[rleHeader.nEncodedBytes];
-					void *output_buffer = (void*) new unsigned char[rleHeader.nDecodedBytes];
-
-					// read encoded data
-					file->read(input_buffer, rleHeader.nEncodedBytes);
-
-					// decode data
-					data = 0;//(void*) new unsigned char[rleHeader.nDecodedBytes];
-					s32 decodedBytes = core::rle_decode(
-						(unsigned char*)input_buffer,  rleHeader.nEncodedBytes,
-						(unsigned char*)output_buffer, rleHeader.nDecodedBytes);
-
-					if (decodedBytes!=(s32)rleHeader.nDecodedBytes)
-					{
-						os::Printer::log("Error extracting data from RLE compression, loading failed!", ELL_ERROR);
-						return 0;
-					}
-
-					// free input buffer
-					delete [] (unsigned char*)input_buffer;
-
-					// here decoded data
-					data = output_buffer;
-				}
-				else if (texDataHeader.ComprMode==MY_TEXDATA_COMPR_SIMPLE_ID)
-				{
-					// simple compressed image data
-					if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
-						data = (void*) new SMyPixelColor24[num_pixels];
-					else
-						data = (void*) new SMyPixelColor16[num_pixels];
-
-					u32 nReadedPixels=0, nToRead=0;
-					while (true)
-					{
-						file->read(&nToRead, sizeof(nToRead));
-
-						if ((nReadedPixels+nToRead) > num_pixels)
-							break;
-
-						if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
-						{
-							SMyPixelColor24 col24;
-							file->read(&col24, sizeof(SMyPixelColor24));
-							for (u32 p=0; p<nToRead; p++)
-							{
-								((SMyPixelColor24*)data)[nReadedPixels+p] =
-									SMyPixelColor24(col24.r, col24.g, col24.b);
-							}
-						}
-						else
-						{
-							SMyPixelColor16 col16;
-							file->read(&col16, sizeof(SMyPixelColor16));
-							for (u32 p=0; p<nToRead; p++)
-								((SMyPixelColor16*)data)[nReadedPixels+p].argb = col16.argb;
-						}
-
-						nReadedPixels+=nToRead;
-
-						if (nReadedPixels >= num_pixels)
-							break;
-					}
-
-					if (nReadedPixels != num_pixels)
-					{
-						os::Printer::log("Image data seems to be corrupted, loading failed!", ELL_ERROR);
-						return 0;
-					}
-				}
-
-				//! Creates a software image from a byte array.
-				video::IImage* light_img = 0;
-
-				if (texDataHeader.PixelFormat == MY_PIXEL_FORMAT_24)
-				{
-					// 24 bit lightmap format
-					light_img = Driver->createImageFromData(
-					video::ECF_R8G8B8, 
-					core::dimension2d<s32>(texDataHeader.Width, texDataHeader.Height), 
-						data, true);
-				}
-				else
-				{
-					// 16 bit lightmap format
-					light_img = Driver->createImageFromData(
-						video::ECF_A1R5G5B5,
-						core::dimension2d<s32>(texDataHeader.Width, texDataHeader.Height),
-						data, true);
-				}
-
-				const bool oldMipMapState = Driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
-				Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
-				me.Texture2 = Driver->addTexture(LightMapName, light_img);
-				Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState);
-
-				light_img->drop();
-				GetLightMap = true;
+				gotLightMap = true;
 			}
 
-			const core::stringc Name = name;
-			const s32 pos2 = Name.findLast('.');
+			const core::stringc name = namebuf;
+			const s32 pos = name.findLast('.');
 			const core::stringc LightingMapStr = "LightingMap";
-			const u32 ls = LightingMapStr.size();
-			const bool isSubString = (LightingMapStr == Name.subString(core::max_(0u, (pos2 - ls)), ls));
-			if ((isSubString || (Name[pos2-1]=='m' &&
-				Name[pos2-2]=='l' && Name[pos2-3]=='_')) &&
-				!GetLightMap)
+			const s32 ls = LightingMapStr.size();
+			const bool isSubString = (LightingMapStr == name.subString(core::max_(0, (pos - ls)), ls));
+			if ((isSubString || (name[pos-1]=='m' &&
+				name[pos-2]=='l' && name[pos-3]=='_')) &&
+				!gotLightMap)
 			{
-				const bool oldMipMapState = Driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
-				Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
+				const bool oldMipMapState = SceneManager->getVideoDriver()->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
+				SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
 
 				me.Texture2FileName = texturePath.size() ? texturePath : filepath;
 				me.Texture2FileName.append("Lightmaps/");
-				me.Texture2FileName.append(Name);
+				me.Texture2FileName.append(name);
 
-				if (Name.size())
-					me.Texture2 = Driver->getTexture(me.Texture2FileName.c_str());
+				if (name.size())
+					me.Texture2 = SceneManager->getVideoDriver()->getTexture(me.Texture2FileName.c_str());
 
 				me.MaterialType = video::EMT_LIGHTMAP_M2;
-				GetLightMap = true;
+				gotLightMap = true;
 
-				Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState);
+				SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState);
 			}
 			else
-			if (!GetLightMap&&GetMainMap)
+			if (!gotLightMap && gotMainMap)
 			{
 				me.Texture2FileName = texturePath.size() ? texturePath : filepath;
-				me.Texture2FileName.append(Name);
+				me.Texture2FileName.append(name);
 
-				if (Name.size())
-					me.Texture2 = Driver->getTexture(me.Texture2FileName.c_str());
+				if (name.size())
+					me.Texture2 = SceneManager->getVideoDriver()->getTexture(me.Texture2FileName.c_str());
 
 				me.MaterialType = video::EMT_REFLECTION_2_LAYER;
 			}
 			else
-			if (!GetMainMap && !GetLightMap )
+			if (!gotMainMap && !gotLightMap)
 			{
 				me.Texture1FileName = filepath;
-				me.Texture1FileName.append(Name);
-				if (Name.size())
-				{
-					me.Texture1 = Driver->getTexture(me.Texture1FileName.c_str());
-					texCount++;
-				}
+				me.Texture1FileName.append(name);
+				if (name.size())
+					me.Texture1 = SceneManager->getVideoDriver()->getTexture(me.Texture1FileName.c_str());
 
-				GetMainMap = true;
+				gotMainMap = true;
 				me.MaterialType = video::EMT_SOLID;
 			}
 			else
-			if (GetLightMap)
+			if (gotLightMap)
 			{
 				me.MaterialType = video::EMT_LIGHTMAP_M2;
 			}
 
 			file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+			id = os::Byteswap::byteswap(id);
+#endif
 		}
 
 		// override material types based on their names
@@ -390,36 +242,34 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 		else
 		if (!strncmp(me.Header.Name, "SphereMap-", 10))
 			me.MaterialType = video::EMT_SPHERE_MAP;
-
-		MaterialEntry.push_back(me);
 	}
 
 	// loading meshes
 
-	if (Mesh)
-		Mesh->drop();
+	SMesh* mesh = new SMesh();
 
-	Mesh = new SMesh();
-
-	if (id!=MY_MESH_LIST_ID)
+	if (id!=MY3D_MESH_LIST_ID)
 	{
-		os::Printer::log("Can not find MY_MESH_LIST_ID, loading failed!", ELL_ERROR);
+		os::Printer::log("Can not find MY3D_MESH_LIST_ID, loading failed!", ELL_ERROR);
 		return 0;
 	}
 
 	file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+	id = os::Byteswap::byteswap(id);
+#endif
 
 	for (s32 mesh_id=0; mesh_id<sceneHeader.MeshCount; mesh_id++)
 	{
 		// Warning!!! In some cases MY3D exporter uncorrectly calculates
 		// MeshCount (it's a problem, has to be solved) thats why
 		// i added this code line
-		if (id!=MY_MESH_HEADER_ID)
+		if (id!=MY3D_MESH_HEADER_ID)
 			break;
 
-		if (id!=MY_MESH_HEADER_ID)
+		if (id!=MY3D_MESH_HEADER_ID)
 		{
-			os::Printer::log("Can not find MY_MESH_HEADER_ID, loading failed!", ELL_ERROR);
+			os::Printer::log("Can not find MY3D_MESH_HEADER_ID, loading failed!", ELL_ERROR);
 			return 0;
 		}
 
@@ -436,29 +286,33 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 
 		// vertices
 		file->read(&id, sizeof(id));
-		if (id!=MY_VERTS_ID)
+#ifdef __BIG_ENDIAN__
+	id = os::Byteswap::byteswap(id);
+#endif
+		if (id!=MY3D_VERTS_ID)
 		{
-			os::Printer::log("Can not find MY_VERTS_ID, loading failed!", ELL_ERROR);
+			os::Printer::log("Can not find MY3D_VERTS_ID, loading failed!", ELL_ERROR);
 			return 0;
 		}
 
 		file->read(&vertsNum, sizeof(vertsNum));
-		Vertex.reallocate(vertsNum);
-		file->read(Vertex.pointer(), sizeof(SMyVertex)*vertsNum);
 		Vertex.set_used(vertsNum);
+		file->read(Vertex.pointer(), sizeof(SMyVertex)*vertsNum);
 
 		// faces
 		file->read(&id, sizeof(id));
-		if (id!=MY_FACES_ID)
+#ifdef __BIG_ENDIAN__
+		id = os::Byteswap::byteswap(id);
+#endif
+		if (id!=MY3D_FACES_ID)
 		{
-			os::Printer::log("Can not find MY_FACES_ID, loading failed!", ELL_ERROR);
+			os::Printer::log("Can not find MY3D_FACES_ID, loading failed!", ELL_ERROR);
 			return 0;
 		}
 
 		file->read(&facesNum, sizeof(facesNum));
-		Face.reallocate(facesNum);
-		file->read(Face.pointer(), sizeof(SMyFace)*facesNum);
 		Face.set_used(facesNum);
+		file->read(Face.pointer(), sizeof(SMyFace)*facesNum);
 
 		// reading texture channels
 		for (s32 tex=0; tex<(s32)meshHeader.TChannelCnt; tex++)
@@ -468,11 +322,14 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 
 			// reading texture coords
 			file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+			id = os::Byteswap::byteswap(id);
+#endif
 
-			if (id!=MY_TVERTS_ID)
+			if (id!=MY3D_TVERTS_ID)
 			{
-				msg="Can not find MY_TVERTS_ID (";
-				msg.append(tex);
+				core::stringc msg="Can not find MY3D_TVERTS_ID (";
+				msg.append(core::stringc(tex));
 				msg.append("texture channel), loading failed!");
 				os::Printer::log(msg.c_str(), ELL_ERROR);
 				return 0;
@@ -483,17 +340,15 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 			if (tex==0)
 			{
 				// 1st texture channel
-				TVertex1.reallocate(tVertsNum);
-				file->read(TVertex1.pointer(), sizeof(SMyTVertex)*tVertsNum);
 				TVertex1.set_used(tVertsNum);
+				file->read(TVertex1.pointer(), sizeof(SMyTVertex)*tVertsNum);
 			}
 			else
 			if (tex==1)
 			{
 				// 2nd texture channel
-				TVertex2.reallocate(tVertsNum);
-				file->read(TVertex2.pointer(), sizeof(SMyTVertex)*tVertsNum);
 				TVertex2.set_used(tVertsNum);
+				file->read(TVertex2.pointer(), sizeof(SMyTVertex)*tVertsNum);
 			}
 			else
 			{
@@ -503,11 +358,14 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 
 			// reading texture faces
 			file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+			id = os::Byteswap::byteswap(id);
+#endif
 
-			if (id!=MY_TFACES_ID)
+			if (id!=MY3D_TFACES_ID)
 			{
-				msg="Can not find MY_TFACES_ID (";
-				msg.append(tex);
+				core::stringc msg="Can not find MY3D_TFACES_ID (";
+				msg.append(core::stringc(tex));
 				msg.append("texture channel), loading failed!");
 				os::Printer::log(msg.c_str(), ELL_ERROR);
 				return 0;
@@ -518,16 +376,14 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 			if (tex==0)
 			{
 				// 1st texture channel
-				TFace1.reallocate(tFacesNum);
-				file->read(TFace1.pointer(), sizeof(SMyFace)*tFacesNum);
 				TFace1.set_used(tFacesNum);
+				file->read(TFace1.pointer(), sizeof(SMyFace)*tFacesNum);
 			}
 			else if (tex==1)
 			{
 				// 2nd texture channel
-				TFace2.reallocate(tFacesNum);
-				file->read(TFace2.pointer(), sizeof(SMyFace)*tFacesNum);
 				TFace2.set_used(tFacesNum);
+				file->read(TFace2.pointer(), sizeof(SMyFace)*tFacesNum);
 			}
 			else
 			{
@@ -546,7 +402,7 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 		SMeshBufferLightMap* buffer = getMeshBufferByMaterialIndex(meshHeader.MatIndex);
 
 		if (!buffer ||
-			(buffer->Vertices.size()+vertsNum) > Driver->getMaximalPrimitiveCount())
+			(buffer->Vertices.size()+vertsNum) > SceneManager->getVideoDriver()->getMaximalPrimitiveCount())
 		{
 			// creating new mesh buffer for this material
 			buffer = new scene::SMeshBufferLightMap();
@@ -639,31 +495,39 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 		}
 
 		video::S3DVertex2TCoords VertexA, VertexB, VertexC;
-		video::SColor vert_color;
-		core::triangle3df face;
 
+		// vertices (A, B, C) color
+		video::SColor vert_color;
+		if (matEnt &&
+			(buffer->Material.MaterialType == video::EMT_TRANSPARENT_VERTEX_ALPHA ||
+			buffer->Material.MaterialType == video::EMT_TRANSPARENT_REFLECTION_2_LAYER))
+		{
+			video::SColor color(
+			matEnt->Header.DiffuseColor.A, matEnt->Header.DiffuseColor.R,
+			matEnt->Header.DiffuseColor.G, matEnt->Header.DiffuseColor.B);
+
+			vert_color = color.getInterpolated(video::SColor(0,0,0,0),
+				1-matEnt->Header.Transparency);
+		}
+		else
+		{
+			vert_color = buffer->Material.DiffuseColor;
+		}
+
+		VertexA.Color = VertexB.Color = VertexC.Color = vert_color;
+
+		if (buffer->Material.MaterialType == video::EMT_TRANSPARENT_ALPHA_CHANNEL)
+		{
+			buffer->Indices.reallocate(buffer->Indices.size()+6*facesNum);
+			buffer->Vertices.reallocate(buffer->Vertices.size()+6*facesNum);
+		}
+		else
+		{
+			buffer->Indices.reallocate(buffer->Indices.size()+3*facesNum);
+			buffer->Vertices.reallocate(buffer->Vertices.size()+3*facesNum);
+		}
 		for (int f=0; f<facesNum; f++)
 		{
-			// vertices (A, B, C) color
-
-			if (matEnt &&
-				(buffer->Material.MaterialType == video::EMT_TRANSPARENT_VERTEX_ALPHA ||
-				buffer->Material.MaterialType == video::EMT_TRANSPARENT_REFLECTION_2_LAYER))
-			{
-				video::SColor color(
-				matEnt->Header.DiffuseColor.A, matEnt->Header.DiffuseColor.R,
-				matEnt->Header.DiffuseColor.G, matEnt->Header.DiffuseColor.B);
-
-				vert_color = color.getInterpolated(video::SColor(0,0,0,0),
-					1-matEnt->Header.Transparency);
-			}
-			else
-			{
-				vert_color = buffer->Material.DiffuseColor;
-			}
-
-			VertexA.Color = VertexB.Color = VertexC.Color = vert_color;
-
 			// vertex A
 
 			VertexA.Pos.X = Vertex[Face[f].C].Coord.X;
@@ -767,6 +631,9 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 			}
 		}
 		file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+		id = os::Byteswap::byteswap(id);
+#endif
 	}
 
 	// creating mesh
@@ -778,35 +645,211 @@ IAnimatedMesh* CMY3DMeshFileLoader::createMesh(io::IReadFile* file)
 		if (!buffer)
 			continue;
 
-		Mesh->addMeshBuffer(buffer);
+		mesh->addMeshBuffer(buffer);
 
 		buffer->recalculateBoundingBox();
 		buffer->drop();
 	}
 
-	Mesh->recalculateBoundingBox();
+	mesh->recalculateBoundingBox();
 
-	//sprintf(ch, "Loaded: meshes (%d).", MeshBufferEntry.size());
-	//os::Printer::log(ch, ELL_INFORMATION);
-
-	if (id != MY_FILE_END_ID)
-		os::Printer::log("Loading finished, but can not find MY_FILE_END_ID token.", ELL_WARNING);
+	if (id != MY3D_FILE_END_ID)
+		os::Printer::log("Loading finished, but can not find MY3D_FILE_END_ID token.", ELL_WARNING);
 
 	SAnimatedMesh* am = new SAnimatedMesh();
 
-	// you have to add this type in IAnimatedMesh.h
-	//am->Type = EAMT_MY3D;
-
-	am->addMesh(Mesh);
+	am->addMesh(mesh);
+	mesh->drop();
 	am->recalculateBoundingBox();
 
-	Mesh->drop();
-	Mesh = 0;
-
 	return am;
 }
 
 
+video::ITexture* CMY3DMeshFileLoader::readEmbeddedLightmap(io::IReadFile* file, char* namebuf)
+{
+	static int LightMapIndex=0;
+	u16 id;
+	file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+	id = os::Byteswap::byteswap(id);
+#endif
+	if (id!=MY3D_TEXDATA_HEADER_ID)
+	{
+		os::Printer::log("Can not find MY3D_TEXDATA_HEADER_ID, loading failed!", ELL_ERROR);
+		return 0;
+	}
+
+	SMyTexDataHeader texDataHeader;
+
+	file->read(&texDataHeader, sizeof(SMyTexDataHeader));
+
+	strcpy(texDataHeader.Name, namebuf);
+
+	char LightMapName[255];
+	sprintf(LightMapName,"My3D.Lightmap.%d",++LightMapIndex);
+
+	core::stringc pixFormatStr;
+	if (texDataHeader.PixelFormat == MY3D_PIXEL_FORMAT_24)
+		pixFormatStr = "24bit,";
+	else
+	if (texDataHeader.PixelFormat == MY3D_PIXEL_FORMAT_16)
+		pixFormatStr = "16bit,";
+	else
+	{
+		core::stringc msg="Unknown format of image data (";
+		msg.append(LightMapName);
+		msg.append("), loading failed!");
+		os::Printer::log(msg.c_str(), ELL_ERROR);
+		return 0;
+	}
+
+	if (texDataHeader.ComprMode != MY3D_TEXDATA_COMPR_NONE_ID &&
+			texDataHeader.ComprMode != MY3D_TEXDATA_COMPR_RLE_ID &&
+			texDataHeader.ComprMode != MY3D_TEXDATA_COMPR_SIMPLE_ID )
+	{
+		os::Printer::log("Unknown method of compression image data, loading failed!", ELL_ERROR);
+		return 0;
+	}
+
+	const u32 num_pixels = texDataHeader.Width*texDataHeader.Height;
+
+	void* data = 0;
+
+	if (texDataHeader.ComprMode==MY3D_TEXDATA_COMPR_NONE_ID)
+	{
+		// none compressed image data
+		if (texDataHeader.PixelFormat == MY3D_PIXEL_FORMAT_24)
+		{
+			data = (void*) new SMyPixelColor24[num_pixels];
+			file->read(data, sizeof(SMyPixelColor24)*num_pixels);
+		}
+		else
+		{
+			data = (void*) new SMyPixelColor16[num_pixels];
+			file->read(data, sizeof(SMyPixelColor16)*num_pixels);
+		}
+	}
+	else
+	if (texDataHeader.ComprMode==MY3D_TEXDATA_COMPR_RLE_ID)
+	{
+		// read RLE header identificator
+		file->read(&id, sizeof(id));
+#ifdef __BIG_ENDIAN__
+		id = os::Byteswap::byteswap(id);
+#endif
+		if (id!=MY3D_TEXDATA_RLE_HEADER_ID)
+		{
+			os::Printer::log("Can not find MY3D_TEXDATA_RLE_HEADER_ID, loading failed!", ELL_ERROR);
+			return 0;
+		}
+
+		// read RLE header
+		SMyRLEHeader rleHeader;
+		file->read(&rleHeader, sizeof(SMyRLEHeader));
+
+		//allocate memory for input and output buffers
+		void *input_buffer  = (void*) new unsigned char[rleHeader.nEncodedBytes];
+		void *output_buffer = (void*) new unsigned char[rleHeader.nDecodedBytes];
+
+		// read encoded data
+		file->read(input_buffer, rleHeader.nEncodedBytes);
+
+		// decode data
+		data = 0;//(void*) new unsigned char[rleHeader.nDecodedBytes];
+		s32 decodedBytes = core::rle_decode(
+			(unsigned char*)input_buffer,  rleHeader.nEncodedBytes,
+			(unsigned char*)output_buffer, rleHeader.nDecodedBytes);
+
+		if (decodedBytes!=(s32)rleHeader.nDecodedBytes)
+		{
+			os::Printer::log("Error extracting data from RLE compression, loading failed!", ELL_ERROR);
+			return 0;
+		}
+
+		// free input buffer
+		delete [] (unsigned char*)input_buffer;
+
+		// here decoded data
+		data = output_buffer;
+	}
+	else if (texDataHeader.ComprMode==MY3D_TEXDATA_COMPR_SIMPLE_ID)
+	{
+		// simple compressed image data
+		if (texDataHeader.PixelFormat == MY3D_PIXEL_FORMAT_24)
+			data = (void*) new SMyPixelColor24[num_pixels];
+		else
+			data = (void*) new SMyPixelColor16[num_pixels];
+
+		u32 nReadedPixels=0, nToRead=0;
+		while (true)
+		{
+			file->read(&nToRead, sizeof(nToRead));
+
+			if ((nReadedPixels+nToRead) > num_pixels)
+				break;
+
+			if (texDataHeader.PixelFormat == MY3D_PIXEL_FORMAT_24)
+			{
+				SMyPixelColor24 col24;
+				file->read(&col24, sizeof(SMyPixelColor24));
+				for (u32 p=0; p<nToRead; p++)
+				{
+					((SMyPixelColor24*)data)[nReadedPixels+p] =
+						SMyPixelColor24(col24.r, col24.g, col24.b);
+				}
+			}
+			else
+			{
+				SMyPixelColor16 col16;
+				file->read(&col16, sizeof(SMyPixelColor16));
+				for (u32 p=0; p<nToRead; p++)
+					((SMyPixelColor16*)data)[nReadedPixels+p].argb = col16.argb;
+			}
+
+			nReadedPixels+=nToRead;
+
+			if (nReadedPixels >= num_pixels)
+				break;
+		}
+
+		if (nReadedPixels != num_pixels)
+		{
+			os::Printer::log("Image data seems to be corrupted, loading failed!", ELL_ERROR);
+			return 0;
+		}
+	}
+
+	//! Creates a software image from a byte array.
+	video::IImage* light_img = 0;
+
+	if (texDataHeader.PixelFormat == MY3D_PIXEL_FORMAT_24)
+	{
+		// 24 bit lightmap format
+		light_img = SceneManager->getVideoDriver()->createImageFromData(
+		video::ECF_R8G8B8, 
+		core::dimension2d<s32>(texDataHeader.Width, texDataHeader.Height), 
+			data, true);
+	}
+	else
+	{
+		// 16 bit lightmap format
+		light_img = SceneManager->getVideoDriver()->createImageFromData(
+			video::ECF_A1R5G5B5,
+			core::dimension2d<s32>(texDataHeader.Width, texDataHeader.Height),
+			data, true);
+	}
+
+	const bool oldMipMapState = SceneManager->getVideoDriver()->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
+	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
+	video::ITexture* lmtex = SceneManager->getVideoDriver()->addTexture(LightMapName, light_img);
+	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState);
+
+	light_img->drop();
+	return lmtex;
+}
+
+
 CMY3DMeshFileLoader::SMyMaterialEntry* CMY3DMeshFileLoader::getMaterialEntryByIndex(u32 matInd)
 {
 	for (u32 m=0; m<MaterialEntry.size(); ++m)
@@ -829,8 +872,7 @@ SMeshBufferLightMap* CMY3DMeshFileLoader::getMeshBufferByMaterialIndex(u32 matIn
 }
 
 
-
-core::array<ISceneNode*>& CMY3DMeshFileLoader::getChildNodes()
+const core::array<ISceneNode*>& CMY3DMeshFileLoader::getChildNodes() const
 {
 	return ChildNodes;
 }
@@ -840,3 +882,4 @@ core::array<ISceneNode*>& CMY3DMeshFileLoader::getChildNodes()
 } // end namespace irr
 
 #endif // _IRR_COMPILE_WITH_MY3D_LOADER_
+
diff --git a/src/dep/src/irrlicht/CMY3DMeshFileLoader.h b/src/dep/src/irrlicht/CMY3DMeshFileLoader.h
index 0291acf..ab94d53 100644
--- a/src/dep/src/irrlicht/CMY3DMeshFileLoader.h
+++ b/src/dep/src/irrlicht/CMY3DMeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 //
@@ -39,19 +39,52 @@
 #include "irrString.h"
 #include "ISceneManager.h"
 
-#include "CMY3DStuff.h"
-
 namespace irr
 {
 namespace scene
 {
 
+//--------------------------------------------------------------------
+// byte-align structures
+#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
+#   pragma pack( push, packing )
+#   pragma pack( 1 )
+#   define PACK_STRUCT
+#elif defined( __GNUC__ )
+#   define PACK_STRUCT  __attribute__((packed))
+#else
+#   error compiler not supported
+#endif
+//----------------------------------------------------------------------
+struct SMyColor
+{   SMyColor () {;}
+    SMyColor (s32 __R, s32 __G, s32 __B, s32 __A)
+        : R(__R), G(__G), B(__B), A(__A) {}
+    s32 R, G, B, A;
+} PACK_STRUCT;
+
+// material header
+struct SMyMaterialHeader
+{   c8  Name[256];           // material name
+    u32 Index;
+    SMyColor AmbientColor;
+    SMyColor DiffuseColor;
+    SMyColor EmissiveColor;
+    SMyColor SpecularColor;
+    f32 Shininess;
+    f32 Transparency;
+    u32 TextureCount;        // texture count
+} PACK_STRUCT;
+
+// Default alignment
+#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
+#   pragma pack( pop, packing )
+#endif
 
 class CMY3DMeshFileLoader : public IMeshLoader
 {
 public:
-	CMY3DMeshFileLoader(
-	io::IFileSystem* fs, video::IVideoDriver* driver, ISceneManager *scmgr);
+	CMY3DMeshFileLoader(ISceneManager *scmgr, io::IFileSystem* fs);
 	virtual ~CMY3DMeshFileLoader();
 
 	virtual bool isALoadableFileExtension(const c8* fileName) const;
@@ -60,18 +93,14 @@ public:
 
 	//! getting access to the nodes (with transparent material), creating
 	//! while loading .my3d file
-	core::array<ISceneNode*>& getChildNodes();
+	const core::array<ISceneNode*>& getChildNodes() const;
 
 private:
 
-	scene::SMesh* Mesh;
+	video::ITexture* readEmbeddedLightmap(io::IReadFile* file, char* namebuf);
 
-	video::IVideoDriver* Driver;
+	scene::ISceneManager* SceneManager;
 	io::IFileSystem* FileSystem;
-	ISceneManager *SceneManager;
-
-	video::SColor SceneBackgrColor;
-	video::SColor SceneAmbientColor;
 
 	struct SMyMaterialEntry
 	{
diff --git a/src/dep/src/irrlicht/CMY3DStuff.h b/src/dep/src/irrlicht/CMY3DStuff.h
index f562465..e69de29 100644
--- a/src/dep/src/irrlicht/CMY3DStuff.h
+++ b/src/dep/src/irrlicht/CMY3DStuff.h
@@ -1,188 +0,0 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-//
-// This file was originally written by ZDimitor.
-
-//----------------------------------------------------------------------
-//  my3d-stuff.h -  part of the My3D Tools
-//
-//  This tool was created by Zhuck Dmitry (ZDimitor).
-//  Everyone can use it as wants ( i'll be happy if it helps to someone :) ).
-//----------------------------------------------------------------------
-
-#ifndef __C_MY_3D_STUFF_H_INCLUDED__
-#define __C_MY_3D_STUFF_H_INCLUDED__
-
-#include <irrTypes.h>
-
-namespace irr
-{
-namespace scene
-{
-
-//**********************************************************************
-//                      MY3D stuff
-//**********************************************************************
-
-const unsigned long MY_ID = 0x4d593344; // was: #define MY_ID 'MY3D'
-#define MY_VER             0x0003
-
-#define MY_SCENE_HEADER_ID 0x1000
-
-#define MY_MAT_LIST_ID       0x2000
-#define MY_MAT_HEADER_ID     0x2100
-#define MY_TEX_FNAME_ID      0x2101
-#define MY_TEXDATA_ID        0x2500
-#define MY_TEXDATA_HEADER_ID 0x2501
-#define MY_TEXDATA_RLE_HEADER_ID 0x2502
-
-#define MY_MESH_LIST_ID    0x3000
-#define MY_MESH_HEADER_ID  0x3100
-#define MY_VERTS_ID        0x3101
-#define MY_FACES_ID        0x3102
-#define MY_TVERTS_ID       0x3103
-#define MY_TFACES_ID       0x3104
-
-#define MY_FILE_END_ID     0xFFFF
-
-const unsigned long MY_TEXDATA_COMPR_NONE_ID = 0x4e4f4e45; // was: MY_TEXDATA_COMPR_NONE_ID   'NONE'
-const unsigned long MY_TEXDATA_COMPR_SIMPLE_ID = 0x53494d50; // was: #define MY_TEXDATA_COMPR_SIMPLE_ID 'SIMP'
-const unsigned long MY_TEXDATA_COMPR_RLE_ID = 0x20524c45; // was: #define MY_TEXDATA_COMPR_RLE_ID ' RLE'
-
-const unsigned long MY_PIXEL_FORMAT_24 = 0x5f32345f; // was: #define MY_PIXEL_FORMAT_24 '_24_'
-const unsigned long MY_PIXEL_FORMAT_16 = 0x5f31365f; // was: #define MY_PIXEL_FORMAT_16 '_16_'
-//--------------------------------------------------------------------
-// byte-align structures
-#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
-#   pragma pack( push, packing )
-#   pragma pack( 1 )
-#   define PACK_STRUCT
-#elif defined( __GNUC__ )
-#   define PACK_STRUCT  __attribute__((packed))
-#else
-#   error compiler not supported
-#endif
-//----------------------------------------------------------------------
-struct SMyColor
-{   SMyColor () {;}
-    SMyColor (s32 __R, s32 __G, s32 __B, s32 __A)
-        : R(__R), G(__G), B(__B), A(__A) {}
-    s32 R, G, B, A;
-} PACK_STRUCT;
-
-struct SMyVector3
-{   SMyVector3 () {;}
-    SMyVector3 (f32 __X, f32 __Y, f32 __Z)
-        : X(__X), Y(__Y), Z(__Z) {}
-    f32 X, Y, Z;
-} PACK_STRUCT;
-
-struct SMyVector2
-{   SMyVector2 () {;}
-    SMyVector2(f32 __X, f32 __Y)
-        : X(__X), Y(__Y) {}
-    f32 X, Y;
-} PACK_STRUCT;
-
-struct SMyVertex
-{   SMyVertex () {;}
-    SMyVertex (SMyVector3 _Coord, SMyColor _Color, SMyVector3 _Normal)
-        :Coord(_Coord), Color(_Color), Normal(_Normal) {;}
-    SMyVector3 Coord;
-    SMyColor   Color;
-    SMyVector3 Normal;
-} PACK_STRUCT;
-
-struct SMyTVertex
-{   SMyTVertex () {;}
-    SMyTVertex (SMyVector2 _TCoord)
-        : TCoord(_TCoord) {;}
-    SMyVector2 TCoord;
-} PACK_STRUCT;
-
-struct SMyFace
-{   SMyFace() {;}
-    SMyFace(u32 __A, u32 __B, u32 __C)
-        : A(__A), B(__B), C(__C) {}
-    u32 A, B, C;
-} PACK_STRUCT;
-
-// file header (6 bytes)
-struct SMyFileHeader
-{   u32 MyId; // MY3D
-    u16 Ver;  // Version
-} PACK_STRUCT;
-
-// scene header
-struct SMySceneHeader
-{   SMyColor BackgrColor;  // background color
-    SMyColor AmbientColor; // ambient color
-    s32 MaterialCount;     // material count
-    s32 MeshCount;         // mesh count
-} PACK_STRUCT;
-
-// material header
-struct SMyMaterialHeader
-{   c8  Name[256];           // material name
-    u32 Index;
-    SMyColor AmbientColor;
-    SMyColor DiffuseColor;
-    SMyColor EmissiveColor;
-    SMyColor SpecularColor;
-    f32 Shininess;
-    f32 Transparency;
-    s32 TextureCount;        // texture count
-} PACK_STRUCT;
-
-// mesh header
-struct SMyMeshHeader
-{   c8  Name[256];   // material name
-    u32 MatIndex;    // index of the mesh material
-    u32 TChannelCnt; // mesh mapping channels count
-} PACK_STRUCT;
-
-// texture data header
-struct SMyTexDataHeader
-{   c8  Name[256]; // texture name
-    u32 ComprMode; //compression mode
-    u32 PixelFormat;
-    u32 Width;   // image width
-    u32 Height;  // image height
-} PACK_STRUCT;
-
-// pixel color 24bit (R8G8B8)
-struct SMyPixelColor24
-{   SMyPixelColor24() {;}
-    SMyPixelColor24(u8 __r, u8 __g, u8 __b)
-        : r(__r), g(__g), b(__b) {}
-    u8 r, g, b;
-} PACK_STRUCT;
-
-// pixel color 16bit (A1R5G5B5)
-struct SMyPixelColor16
-{   SMyPixelColor16() {;}
-    SMyPixelColor16(s16 _argb): argb(_argb) {;}
-    SMyPixelColor16(u8 r, u8 g, u8 b)
-    {   argb = ((r&0x1F)<<10) | ((g&0x1F)<<5) | (b&0x1F);
-    }
-    s16 argb;
-} PACK_STRUCT;
-
-// RLE Header
-struct SMyRLEHeader
-{   SMyRLEHeader() {}
-    u32 nEncodedBytes;
-    u32 nDecodedBytes;
-} PACK_STRUCT;
-
-// Default alignment
-#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
-#   pragma pack( pop, packing )
-#endif
-
-} // end namespace
-} // end namespace
-
-#endif
-
diff --git a/src/dep/src/irrlicht/CMemoryReadFile.cpp b/src/dep/src/irrlicht/CMemoryReadFile.cpp
index 2679b92..8581956 100644
--- a/src/dep/src/irrlicht/CMemoryReadFile.cpp
+++ b/src/dep/src/irrlicht/CMemoryReadFile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -12,17 +12,14 @@ namespace io
 
 
 CMemoryReadFile::CMemoryReadFile(void* memory, long len, const c8* fileName, bool d)
-: Buffer(memory), Len(len), Pos(0), deleteMemoryWhenDropped(d)
+: Buffer(memory), Len(len), Pos(0), Filename(fileName), deleteMemoryWhenDropped(d)
 {
 	#ifdef _DEBUG
-	setDebugName("CReadFile");
+	setDebugName("CMemoryReadFile");
 	#endif
-
-	Filename = fileName;
 }
 
 
-
 CMemoryReadFile::~CMemoryReadFile()
 {
 	if (deleteMemoryWhenDropped)
@@ -30,7 +27,6 @@ CMemoryReadFile::~CMemoryReadFile()
 }
 
 
-
 //! returns how much was read
 s32 CMemoryReadFile::read(void* buffer, u32 sizeToRead)
 {
@@ -74,7 +70,6 @@ bool CMemoryReadFile::seek(long finalPos, bool relativeMovement)
 }
 
 
-
 //! returns size of file
 long CMemoryReadFile::getSize() const
 {
@@ -82,7 +77,6 @@ long CMemoryReadFile::getSize() const
 }
 
 
-
 //! returns where in the file we are.
 long CMemoryReadFile::getPos() const
 {
@@ -90,7 +84,6 @@ long CMemoryReadFile::getPos() const
 }
 
 
-
 //! returns name of file
 const c8* CMemoryReadFile::getFileName() const
 {
@@ -98,7 +91,6 @@ const c8* CMemoryReadFile::getFileName() const
 }
 
 
-
 IReadFile* createMemoryReadFile(void* memory, long size, const c8* fileName, bool deleteMemoryWhenDropped)
 {
 	CMemoryReadFile* file = new CMemoryReadFile(memory, size, fileName, deleteMemoryWhenDropped);
diff --git a/src/dep/src/irrlicht/CMemoryReadFile.h b/src/dep/src/irrlicht/CMemoryReadFile.h
index 7c4503d..a5a274b 100644
--- a/src/dep/src/irrlicht/CMemoryReadFile.h
+++ b/src/dep/src/irrlicht/CMemoryReadFile.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,16 +21,16 @@ namespace io
 	{
 	public:
 
+		//! Constructor
 		CMemoryReadFile(void* memory, long len, const c8* fileName, bool deleteMemoryWhenDropped);
 
+		//! Destructor
 		virtual ~CMemoryReadFile();
 
 		//! returns how much was read
 		virtual s32 read(void* buffer, u32 sizeToRead);
 
 		//! changes position in file, returns true if successful
-		//! if relativeMovement==true, the pos is changed relative to current pos,
-		//! otherwise from begin of file
 		virtual bool seek(long finalPos, bool relativeMovement = false);
 
 		//! returns size of file
@@ -44,10 +44,10 @@ namespace io
 
 	private:
 
-		core::stringc Filename;
 		void *Buffer;
 		long Len;
 		long Pos;
+		core::stringc Filename;
 		bool deleteMemoryWhenDropped;
 	};
 
diff --git a/src/dep/src/irrlicht/CMeshCache.cpp b/src/dep/src/irrlicht/CMeshCache.cpp
index 306cb2d..4651398 100644
--- a/src/dep/src/irrlicht/CMeshCache.cpp
+++ b/src/dep/src/irrlicht/CMeshCache.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -133,6 +133,9 @@ const c8* CMeshCache::getMeshFilename(u32 number) const
 //! Returns the filename of a loaded mesh, if there is any. Returns 0 if there is none.
 const c8* CMeshCache::getMeshFilename(const IAnimatedMesh* const mesh) const
 {
+	if(!mesh)
+		return 0;
+
 	for (u32 i=0; i<Meshes.size(); ++i)
 	{
 		if (Meshes[i].Mesh == mesh)
@@ -146,10 +149,15 @@ const c8* CMeshCache::getMeshFilename(const IAnimatedMesh* const mesh) const
 //! Returns the filename of a loaded mesh, if there is any. Returns 0 if there is none.
 const c8* CMeshCache::getMeshFilename(const IMesh* const mesh) const
 {
+	if(!mesh)
+		return 0;
+
 	for (u32 i=0; i<Meshes.size(); ++i)
 	{
-		if (Meshes[i].Mesh && Meshes[i].Mesh->getMesh(0) == mesh)
-			return Meshes[i].Name.c_str();
+		// IMesh may actually be an IAnimatedMesh, so do a direct comparison
+		// as well as getting an IMesh from our stored IAnimatedMeshes
+		if (Meshes[i].Mesh && (Meshes[i].Mesh == mesh || Meshes[i].Mesh->getMesh(0) == mesh))
+			return Meshes[i].Name.c_str(); 
 	}
 
 	return 0;
diff --git a/src/dep/src/irrlicht/CMeshCache.h b/src/dep/src/irrlicht/CMeshCache.h
index e73bb05..ff85ca3 100644
--- a/src/dep/src/irrlicht/CMeshCache.h
+++ b/src/dep/src/irrlicht/CMeshCache.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CMeshManipulator.cpp b/src/dep/src/irrlicht/CMeshManipulator.cpp
index 497b669..d4d1834 100644
--- a/src/dep/src/irrlicht/CMeshManipulator.cpp
+++ b/src/dep/src/irrlicht/CMeshManipulator.cpp
@@ -1,14 +1,10 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CMeshManipulator.h"
-#include "IMesh.h"
 #include "SMesh.h"
-#include "SMeshBuffer.h"
-#include "SMeshBufferLightMap.h"
-#include "SMeshBufferTangents.h"
-#include "IAnimatedMesh.h"
+#include "CMeshBuffer.h"
 #include "SAnimatedMesh.h"
 #include "os.h"
 
@@ -17,89 +13,24 @@ namespace irr
 namespace scene
 {
 
-//! Recalculates the normals in vertex array.
-//! This template function was a member of the CMeshManipulator class, but
-//! visual studio 6.0 didn't like it.
-template<class VTXTYPE>
-inline void recalculateNormalsT_Flat(VTXTYPE* v, int vtxcnt,
-					u16* idx, int idxcnt)
+static inline core::vector3df getAngleWeight(const core::vector3df& v1,
+		const core::vector3df& v2,
+		const core::vector3df& v3)
 {
-	for (int i=0; i<idxcnt; i+=3)
-	{
-		const core::plane3d<f32> p(v[idx[i+0]].Pos, v[idx[i+1]].Pos, v[idx[i+2]].Pos);
-		v[idx[i+0]].Normal = p.Normal;
-		v[idx[i+1]].Normal = p.Normal;
-		v[idx[i+2]].Normal = p.Normal;
-	}
-}
+	// Calculate this triangle's weight for each of its three vertices
+	// start by calculating the lengths of its sides
+	const f32 a = v2.getDistanceFromSQ(v3);
+	const f32 asqrt = sqrtf(a);
+	const f32 b = v1.getDistanceFromSQ(v3);
+	const f32 bsqrt = sqrtf(b);
+	const f32 c = v1.getDistanceFromSQ(v2);
+	const f32 csqrt = sqrtf(c);
 
-template<class VTXTYPE>
-inline void recalculateNormalsT_Smooth(VTXTYPE* v, int vtxcnt,
-					u16* idx, int idxcnt)
-{
-	s32 i;
-
-	for ( i = 0; i!= vtxcnt; ++i )
-	{
-		v[i].Normal.set ( 0.f, 0.f, 0.f );
-	}
-
-	for ( i=0; i<idxcnt; i+=3)
-	{
-		const core::plane3d<f32> p(v[idx[i+0]].Pos, v[idx[i+1]].Pos, v[idx[i+2]].Pos);
-		v[idx[i+0]].Normal += p.Normal;
-		v[idx[i+1]].Normal += p.Normal;
-		v[idx[i+2]].Normal += p.Normal;
-	}
-
-	for ( i = 0; i!= vtxcnt; ++i )
-	{
-		v[i].Normal.normalize ();
-	}
-}
-
-//! Recalculates normals in a vertex array.
-//! This template function was a member of the CMeshManipulator class, but
-//! visual studio 6.0 didn't like it.
-template<class VERTEXTYPE>
-inline void makePlanarMappingT(VERTEXTYPE *v,
-				   int vtxcnt,
-				   u16* idx, int idxcnt, f32 resolution)
-{
-	for (int i=0; i<idxcnt; i+=3)
-	{
-		core::plane3d<f32> p(v[idx[i+0]].Pos, v[idx[i+1]].Pos, v[idx[i+2]].Pos);
-		p.Normal.X = fabsf(p.Normal.X);
-		p.Normal.Y = fabsf(p.Normal.Y);
-		p.Normal.Z = fabsf(p.Normal.Z);
-		// calculate planar mapping worldspace coordinates
-
-		if (p.Normal.X > p.Normal.Y && p.Normal.X > p.Normal.Z)
-		{
-			for (s32 o=0; o<3; ++o)
-			{
-				v[idx[i+o]].TCoords.X = v[idx[i+o]].Pos.Y * resolution;
-				v[idx[i+o]].TCoords.Y = v[idx[i+o]].Pos.Z * resolution;
-			}
-		}
-		else
-		if (p.Normal.Y > p.Normal.X && p.Normal.Y > p.Normal.Z)
-		{
-			for (s32 o=0; o<3; ++o)
-			{
-				v[idx[i+o]].TCoords.X = v[idx[i+o]].Pos.X * resolution;
-				v[idx[i+o]].TCoords.Y = v[idx[i+o]].Pos.Z * resolution;
-			}
-		}
-		else
-		{
-			for (s32 o=0; o<3; ++o)
-			{
-				v[idx[i+o]].TCoords.X = v[idx[i+o]].Pos.X * resolution;
-				v[idx[i+o]].TCoords.Y = v[idx[i+o]].Pos.Y * resolution;
-			}
-		}
-	}
+	// use them to find the angle at each vertex
+	return core::vector3df(
+		acosf((b + c - a) / (2.f * bsqrt * csqrt)),
+		acosf((-b + c + a) / (2.f * asqrt * csqrt)),
+		acosf((b - c + a) / (2.f * bsqrt * asqrt)));
 }
 
 
@@ -129,7 +60,6 @@ void CMeshManipulator::flipSurfaces(scene::IMesh* mesh) const
 }
 
 
-
 //! Sets the alpha vertex color value of the whole mesh to a new value
 //! \param mesh: Mesh on which the operation is performed.
 void CMeshManipulator::setVertexColorAlpha(scene::IMesh* mesh, s32 alpha) const
@@ -171,7 +101,6 @@ void CMeshManipulator::setVertexColorAlpha(scene::IMesh* mesh, s32 alpha) const
 }
 
 
-
 //! Sets the colors of all vertices to one color
 void CMeshManipulator::setVertexColors(IMesh* mesh, video::SColor color) const
 {
@@ -211,193 +140,207 @@ void CMeshManipulator::setVertexColors(IMesh* mesh, video::SColor color) const
 }
 
 
-
 //! Recalculates all normals of the mesh buffer.
 /** \param buffer: Mesh buffer on which the operation is performed. */
-void CMeshManipulator::recalculateNormals(IMeshBuffer* buffer, bool smooth) const
+void CMeshManipulator::recalculateNormals(IMeshBuffer* buffer, bool smooth, bool angleWeighted) const
 {
 	if (!buffer)
 		return;
 
-	u32 vtxcnt = buffer->getVertexCount();
-	u32 idxcnt = buffer->getIndexCount();
-	u16* idx = buffer->getIndices();
+	const u32 vtxcnt = buffer->getVertexCount();
+	const u32 idxcnt = buffer->getIndexCount();
+	const u16* idx = buffer->getIndices();
 
-	switch(buffer->getVertexType())
+	if (!smooth)
 	{
-	case video::EVT_STANDARD:
+		for (u32 i=0; i<idxcnt; i+=3)
 		{
-			video::S3DVertex* v = (video::S3DVertex*)buffer->getVertices();
+			const core::vector3df& v1 = buffer->getPosition(idx[i+0]);
+			const core::vector3df& v2 = buffer->getPosition(idx[i+1]);
+			const core::vector3df& v3 = buffer->getPosition(idx[i+2]);
+			const core::vector3df normal = core::plane3d<f32>(v1, v2, v3).Normal;
+			buffer->getNormal(idx[i+0]) = normal;
+			buffer->getNormal(idx[i+1]) = normal;
+			buffer->getNormal(idx[i+2]) = normal;
+		}
+	}
+	else
+	{
+		u32 i;
 
-			if (!smooth)
-				recalculateNormalsT_Flat(v, vtxcnt, idx, idxcnt);
-			else
-				recalculateNormalsT_Smooth(v, vtxcnt, idx, idxcnt);
-		}
-		break;
-	case video::EVT_2TCOORDS:
-		{
-			video::S3DVertex2TCoords* v = (video::S3DVertex2TCoords*)buffer->getVertices();
+		for ( i = 0; i!= vtxcnt; ++i )
+			buffer->getNormal(i).set( 0.f, 0.f, 0.f );
 
-			if (!smooth)
-				recalculateNormalsT_Flat(v, vtxcnt, idx, idxcnt);
-			else
-				recalculateNormalsT_Smooth(v, vtxcnt, idx, idxcnt);
-		}
-		break;
-	case video::EVT_TANGENTS:
+		for ( i=0; i<idxcnt; i+=3)
 		{
-			// TODO: recalculate tangent and binormal
-			video::S3DVertexTangents* v = (video::S3DVertexTangents*)buffer->getVertices();
-			if (!smooth)
-				recalculateNormalsT_Flat(v, vtxcnt, idx, idxcnt);
-			else
-				recalculateNormalsT_Smooth(v, vtxcnt, idx, idxcnt);
+			const core::vector3df& v1 = buffer->getPosition(idx[i+0]);
+			const core::vector3df& v2 = buffer->getPosition(idx[i+1]);
+			const core::vector3df& v3 = buffer->getPosition(idx[i+2]);
+			core::vector3df normal = core::plane3d<f32>(v1, v2, v3).Normal;
+
+			if (angleWeighted)
+				normal *= getAngleWeight(v1,v2,v3);
+
+			buffer->getNormal(idx[i+0]) += normal;
+			buffer->getNormal(idx[i+1]) += normal;
+			buffer->getNormal(idx[i+2]) += normal;
 		}
+
+		for ( i = 0; i!= vtxcnt; ++i )
+			buffer->getNormal(i).normalize();
 	}
 }
 
 
-
 //! Recalculates all normals of the mesh.
 //! \param mesh: Mesh on which the operation is performed.
-void CMeshManipulator::recalculateNormals(scene::IMesh* mesh, bool smooth) const
+void CMeshManipulator::recalculateNormals(scene::IMesh* mesh, bool smooth, bool angleWeighted) const
 {
 	if (!mesh)
 		return;
 
 	const u32 bcount = mesh->getMeshBufferCount();
 	for ( u32 b=0; b<bcount; ++b)
-		recalculateNormals(mesh->getMeshBuffer(b), smooth);
+		recalculateNormals(mesh->getMeshBuffer(b), smooth, angleWeighted);
+}
+
+
+//! Applies a transformation
+/** \param buffer: Meshbuffer on which the operation is performed.
+	\param m: matrix. */
+void CMeshManipulator::transform(scene::IMeshBuffer* buffer, const core::matrix4& m) const
+{
+	const u32 vtxcnt = buffer->getVertexCount();
+	if (!vtxcnt)
+		return;
+
+	core::aabbox3df bufferbox;
+	// first transform
+	{
+		m.transformVect(buffer->getPosition(0));
+		m.rotateVect(buffer->getNormal(0));
+		buffer->getNormal(0).normalize();
+
+		bufferbox.reset(buffer->getPosition(0));
+	}
+
+	for ( u32 i=1 ;i < vtxcnt; ++i)
+	{
+		m.transformVect(buffer->getPosition(i));
+		m.rotateVect(buffer->getNormal(i));
+		buffer->getNormal(i).normalize();
+
+		bufferbox.addInternalPoint(buffer->getPosition(i));
+	}
+
+	buffer->setBoundingBox(bufferbox);
 }
 
 
 //! Applies a transformation
 /** \param mesh: Mesh on which the operation is performed.
 	\param m: matrix. */
-void CMeshManipulator::transformMesh(scene::IMesh* mesh, const core::matrix4& m) const
+void CMeshManipulator::transform(scene::IMesh* mesh, const core::matrix4& m) const
 {
 	if (!mesh)
 		return;
 
 	core::aabbox3df meshbox;
+
+	const u32 bcount = mesh->getMeshBufferCount();
+	for ( u32 b=0; b<bcount; ++b)
+	{
+		IMeshBuffer* buffer = mesh->getMeshBuffer(b);
+		transform(buffer, m);
+
+		if (b == 0)
+			meshbox.reset(buffer->getBoundingBox());
+		else
+			meshbox.addInternalBox(buffer->getBoundingBox());
+	}
+
+	mesh->setBoundingBox( meshbox );
+}
+
+
+//! Scales the actual mesh, not a scene node.
+void CMeshManipulator::scale(scene::IMesh* mesh, const core::vector3df& factor) const
+{
+	if (!mesh)
+		return;
+
+	core::aabbox3df meshbox;
+
+	const u32 bcount = mesh->getMeshBufferCount();
+	for ( u32 b=0; b<bcount; ++b)
+	{
+		IMeshBuffer* buffer = mesh->getMeshBuffer(b);
+		scale(buffer, factor);
+
+		if (b == 0)
+			meshbox.reset(buffer->getBoundingBox());
+		else
+			meshbox.addInternalBox(buffer->getBoundingBox());
+	}
+
+	mesh->setBoundingBox( meshbox );
+}
+
+
+//! Scales the actual meshbuffer, not a scene node.
+void CMeshManipulator::scale(scene::IMeshBuffer* buffer, const core::vector3df& factor) const
+{
+	if (!buffer)
+		return;
+
+	const u32 vtxcnt = buffer->getVertexCount();
 	core::aabbox3df bufferbox;
-	u32 i;
 
-	const u32 bcount = mesh->getMeshBufferCount();
-	for ( u32 b=0; b<bcount; ++b)
+	if (vtxcnt != 0)
+		bufferbox.reset(buffer->getPosition(0) * factor);
+
+	for (u32 i=0; i<vtxcnt; ++i)
 	{
-		IMeshBuffer* buffer = mesh->getMeshBuffer(b);
-
-		const u32 vtxcnt = buffer->getVertexCount();
-		const u32 vtxPitch = video::getVertexPitchFromType(buffer->getVertexType());
-
-		video::S3DVertex* v = (video::S3DVertex*) buffer->getVertices();
-
-		for ( i=0; i < 1; ++i)
-		{
-			m.transformVect ( v->Pos);
-			m.rotateVect ( v->Normal );
-			v->Normal.normalize();
-
-			bufferbox.reset( v->Pos);
-			v = (video::S3DVertex*) ((u8*) v + vtxPitch);
-		}
-
-		for ( ;i < vtxcnt; ++i)
-		{
-			m.transformVect ( v->Pos);
-			m.rotateVect ( v->Normal );
-			v->Normal.normalize();
-
-			bufferbox.addInternalPoint( v->Pos);
-			v = (video::S3DVertex*) ((u8*) v + vtxPitch);
-		}
-
-		buffer->setBoundingBox(bufferbox);
-
-		if (b == 0)
-			meshbox.reset(buffer->getBoundingBox());
-		else
-			meshbox.addInternalBox(buffer->getBoundingBox());
+		buffer->getPosition(i) *= factor;
+			bufferbox.addInternalPoint(buffer->getPosition(i));
 	}
 
-	mesh->setBoundingBox( meshbox );
+	buffer->setBoundingBox(bufferbox);
 }
 
 
-//! Scales the whole mesh.
-//! \param mesh: Mesh on which the operation is performed.
-void CMeshManipulator::scaleMesh(scene::IMesh* mesh, const core::vector3df& scale) const
+//! Scale the texture coords of a mesh.
+void CMeshManipulator::scaleTCoords(scene::IMesh* mesh, const core::vector2df& factor, u32 layer) const
 {
 	if (!mesh)
 		return;
 
-	core::aabbox3df meshbox;
-
 	const u32 bcount = mesh->getMeshBufferCount();
-	for ( u32 b=0; b<bcount; ++b)
-	{
-		IMeshBuffer* buffer = mesh->getMeshBuffer(b);
-		void* v = buffer->getVertices();
-		const u32 vtxcnt = buffer->getVertexCount();
-		core::aabbox3df bufferbox;
-		u32 i;
-
-		switch(buffer->getVertexType())
-		{
-		case video::EVT_STANDARD:
-			{
-				if (vtxcnt != 0)
-					bufferbox.reset(((video::S3DVertex*)v)[0].Pos * scale);
-
-				for ( i=0; i<vtxcnt; ++i)
-				{
-					((video::S3DVertex*)v)[i].Pos *= scale;
-					bufferbox.addInternalPoint(((video::S3DVertex*)v)[i].Pos);
-				}
-			}
-			break;
-
-		case video::EVT_2TCOORDS:
-			{
-				if (vtxcnt != 0)
-					bufferbox.reset(((video::S3DVertex2TCoords*)v)[0].Pos * scale);
-
-				for ( i=0; i<vtxcnt; ++i)
-				{
-					((video::S3DVertex2TCoords*)v)[i].Pos *= scale;
-					bufferbox.addInternalPoint(((video::S3DVertex2TCoords*)v)[i].Pos);
-				}
-			}
-			break;
-
-		case video::EVT_TANGENTS:
-			{
-				if (vtxcnt != 0)
-					bufferbox.reset(((video::S3DVertexTangents*)v)[0].Pos * scale);
-
-				for ( i=0; i<vtxcnt; ++i)
-				{
-					((video::S3DVertexTangents*)v)[i].Pos *= scale;
-					bufferbox.addInternalPoint(((video::S3DVertexTangents*)v)[i].Pos);
-				}
-			}
-			break;
-		}
-
-		buffer->setBoundingBox( bufferbox );
-
-		if (b == 0)
-			meshbox.reset(buffer->getBoundingBox());
-		else
-			meshbox.addInternalBox(buffer->getBoundingBox());
-	}
-
-	mesh->setBoundingBox( meshbox );
+	for (u32 b=0; b<bcount; ++b)
+		scaleTCoords(mesh->getMeshBuffer(b), factor, layer);
 }
 
 
+//! Scale the level-th texture coords of a meshbuffer.
+void CMeshManipulator::scaleTCoords(scene::IMeshBuffer* buffer, const core::vector2df& factor, u32 level) const
+{
+	if (!buffer || ((level>1) && (buffer->getVertexType() != video::EVT_2TCOORDS)))
+		return;
+
+	const u32 vtxcnt = buffer->getVertexCount();
+
+	if (level==1)
+	{
+		for (u32 i=0; i<vtxcnt; ++i)
+			buffer->getTCoords(i) *= factor;
+	}
+	else
+	{
+		for (u32 i=0; i<vtxcnt; ++i)
+			((SMeshBufferLightMap*)buffer)->Vertices[i].TCoords2 *= factor;
+	}
+}
+
 
 //! Clones a static IMesh into a modifyable SMesh.
 SMesh* CMeshManipulator::createMeshCopy(scene::IMesh* mesh) const
@@ -411,69 +354,25 @@ SMesh* CMeshManipulator::createMeshCopy(scene::IMesh* mesh) const
 
 	for ( u32 b=0; b<meshBufferCount; ++b)
 	{
-		const u32 vtxCnt = mesh->getMeshBuffer(b)->getVertexCount();
-		const u32 idxCnt = mesh->getMeshBuffer(b)->getIndexCount();
-		const u16* idx = mesh->getMeshBuffer(b)->getIndices();
-		u32 i;
-
 		switch(mesh->getMeshBuffer(b)->getVertexType())
 		{
 		case video::EVT_STANDARD:
 			{
-				SMeshBuffer* buffer = new SMeshBuffer();
-				buffer->Material = mesh->getMeshBuffer(b)->getMaterial();
-
-				video::S3DVertex* v =
-					(video::S3DVertex*)mesh->getMeshBuffer(b)->getVertices();
-
-				buffer->Vertices.reallocate(vtxCnt);
-				for (i=0; i<vtxCnt; ++i)
-					buffer->Vertices.push_back(v[i]);
-
-				buffer->Indices.reallocate(idxCnt);
-				for (i=0; i<idxCnt; ++i)
-					buffer->Indices.push_back(idx[i]);
-
+				SMeshBuffer* buffer = new SMeshBuffer(*(SMeshBuffer*)mesh->getMeshBuffer(b));
 				clone->addMeshBuffer(buffer);
 				buffer->drop();
 			}
 			break;
 		case video::EVT_2TCOORDS:
 			{
-				SMeshBufferLightMap* buffer = new SMeshBufferLightMap();
-				buffer->Material = mesh->getMeshBuffer(b)->getMaterial();
-
-				video::S3DVertex2TCoords* v =
-					(video::S3DVertex2TCoords*)mesh->getMeshBuffer(b)->getVertices();
-
-				buffer->Vertices.reallocate(vtxCnt);
-				for (i=0; i<vtxCnt; ++i)
-					buffer->Vertices.push_back(v[i]);
-
-				buffer->Indices.reallocate(idxCnt);
-				for (i=0; i<idxCnt; ++i)
-					buffer->Indices.push_back(idx[i]);
-
+				SMeshBufferLightMap* buffer = new SMeshBufferLightMap(*(SMeshBufferLightMap*)mesh->getMeshBuffer(b));
 				clone->addMeshBuffer(buffer);
 				buffer->drop();
 			}
 			break;
 		case video::EVT_TANGENTS:
 			{
-				SMeshBufferTangents* buffer = new SMeshBufferTangents();
-				buffer->Material = mesh->getMeshBuffer(b)->getMaterial();
-
-				video::S3DVertexTangents* v =
-					(video::S3DVertexTangents*)mesh->getMeshBuffer(b)->getVertices();
-
-				buffer->Vertices.reallocate(vtxCnt);
-				for (i=0; i<vtxCnt; ++i)
-					buffer->Vertices.push_back(v[i]);
-
-				buffer->Indices.reallocate(idxCnt);
-				for (i=0; i<idxCnt; ++i)
-					buffer->Indices.push_back(idx[i]);
-
+				SMeshBufferTangents* buffer = new SMeshBufferTangents(*(SMeshBufferTangents*)mesh->getMeshBuffer(b));
 				clone->addMeshBuffer(buffer);
 				buffer->drop();
 			}
@@ -487,7 +386,6 @@ SMesh* CMeshManipulator::createMeshCopy(scene::IMesh* mesh) const
 }
 
 
-
 //! Creates a planar texture mapping on the mesh
 //! \param mesh: Mesh on which the operation is performed.
 //! \param resolution: resolution of the planar mapping. This is the value
@@ -502,36 +400,47 @@ void CMeshManipulator::makePlanarTextureMapping(scene::IMesh* mesh, f32 resoluti
 	for ( u32 b=0; b<bcount; ++b)
 	{
 		IMeshBuffer* buffer = mesh->getMeshBuffer(b);
-		u32 vtxcnt = buffer->getVertexCount();
 		u32 idxcnt = buffer->getIndexCount();
 		u16* idx = buffer->getIndices();
 
-		switch(buffer->getVertexType())
+		for (u32 i=0; i<idxcnt; i+=3)
 		{
-		case video::EVT_STANDARD:
+			core::plane3df p(buffer->getPosition(idx[i+0]), buffer->getPosition(idx[i+1]), buffer->getPosition(idx[i+2]));
+			p.Normal.X = fabsf(p.Normal.X);
+			p.Normal.Y = fabsf(p.Normal.Y);
+			p.Normal.Z = fabsf(p.Normal.Z);
+			// calculate planar mapping worldspace coordinates
+
+			if (p.Normal.X > p.Normal.Y && p.Normal.X > p.Normal.Z)
 			{
-				video::S3DVertex* v = (video::S3DVertex*)buffer->getVertices();
-				makePlanarMappingT(v, vtxcnt, idx, idxcnt, resolution);
+				for (u32 o=0; o!=3; ++o)
+				{
+					buffer->getTCoords(idx[i+o]).X = buffer->getPosition(idx[i+o]).Y * resolution;
+					buffer->getTCoords(idx[i+o]).Y = buffer->getPosition(idx[i+o]).Z * resolution;
+				}
 			}
-			break;
-		case video::EVT_2TCOORDS:
+			else
+			if (p.Normal.Y > p.Normal.X && p.Normal.Y > p.Normal.Z)
 			{
-				video::S3DVertex2TCoords* v = (video::S3DVertex2TCoords*)buffer->getVertices();
-				makePlanarMappingT(v, vtxcnt, idx, idxcnt, resolution);
+				for (u32 o=0; o!=3; ++o)
+				{
+					buffer->getTCoords(idx[i+o]).X = buffer->getPosition(idx[i+o]).X * resolution;
+					buffer->getTCoords(idx[i+o]).Y = buffer->getPosition(idx[i+o]).Z * resolution;
+				}
 			}
-			break;
-		case video::EVT_TANGENTS:
+			else
 			{
-				video::S3DVertexTangents* v = (video::S3DVertexTangents*)buffer->getVertices();
-				makePlanarMappingT(v, vtxcnt, idx, idxcnt, resolution);
+				for (u32 o=0; o!=3; ++o)
+				{
+					buffer->getTCoords(idx[i+o]).X = buffer->getPosition(idx[i+o]).X * resolution;
+					buffer->getTCoords(idx[i+o]).Y = buffer->getPosition(idx[i+o]).Y * resolution;
+				}
 			}
-			break;
 		}
 	}
 }
 
 
-
 //! Creates a copy of the mesh, which will only consist of unique primitives
 IMesh* CMeshManipulator::createMeshUniquePrimitives(IMesh* mesh) const
 {
@@ -570,6 +479,7 @@ IMesh* CMeshManipulator::createMeshUniquePrimitives(IMesh* mesh) const
 					buffer->Indices.push_back( i + 2 );
 				}
 
+				buffer->setBoundingBox(mesh->getMeshBuffer(b)->getBoundingBox());
 				clone->addMeshBuffer(buffer);
 				buffer->drop();
 			}
@@ -594,6 +504,7 @@ IMesh* CMeshManipulator::createMeshUniquePrimitives(IMesh* mesh) const
 					buffer->Indices.push_back( i + 1 );
 					buffer->Indices.push_back( i + 2 );
 				}
+				buffer->setBoundingBox(mesh->getMeshBuffer(b)->getBoundingBox());
 				clone->addMeshBuffer(buffer);
 				buffer->drop();
 			}
@@ -619,6 +530,7 @@ IMesh* CMeshManipulator::createMeshUniquePrimitives(IMesh* mesh) const
 					buffer->Indices.push_back( i + 2 );
 				}
 
+				buffer->setBoundingBox(mesh->getMeshBuffer(b)->getBoundingBox());
 				clone->addMeshBuffer(buffer);
 				buffer->drop();
 			}
@@ -799,7 +711,7 @@ IMesh* CMeshManipulator::createMeshWelded(IMesh *mesh, f32 tolerance) const
 
 
 //! Creates a copy of the mesh, which will only consist of S3DVertexTangents vertices.
-IMesh* CMeshManipulator::createMeshWithTangents(IMesh* mesh) const
+IMesh* CMeshManipulator::createMeshWithTangents(IMesh* mesh, bool recalculateNormals, bool smooth, bool angleWeighted) const
 {
 	if (!mesh)
 		return 0;
@@ -812,7 +724,7 @@ IMesh* CMeshManipulator::createMeshWithTangents(IMesh* mesh) const
 
 	for (b=0; b<meshBufferCount; ++b)
 	{
-		const s32 idxCnt = mesh->getMeshBuffer(b)->getIndexCount();
+		const u32 idxCnt = mesh->getMeshBuffer(b)->getIndexCount();
 		const u16* idx = mesh->getMeshBuffer(b)->getIndices();
 
 		SMeshBufferTangents* buffer = new SMeshBufferTangents();
@@ -828,10 +740,10 @@ IMesh* CMeshManipulator::createMeshWithTangents(IMesh* mesh) const
 				video::S3DVertex* v =
 					(video::S3DVertex*)mesh->getMeshBuffer(b)->getVertices();
 
-				for (s32 i=0; i<idxCnt; ++i)
+				for (u32 i=0; i<idxCnt; ++i)
 					buffer->Vertices.push_back(
 						video::S3DVertexTangents(
-							v[idx[i]].Pos, v[idx[i]].Color, v[idx[i]].TCoords));
+							v[idx[i]].Pos, v[idx[i]].Normal, v[idx[i]].Color, v[idx[i]].TCoords));
 			}
 			break;
 		case video::EVT_2TCOORDS:
@@ -839,9 +751,9 @@ IMesh* CMeshManipulator::createMeshWithTangents(IMesh* mesh) const
 				video::S3DVertex2TCoords* v =
 					(video::S3DVertex2TCoords*)mesh->getMeshBuffer(b)->getVertices();
 
-				for (s32 i=0; i<idxCnt; ++i)
+				for (u32 i=0; i<idxCnt; ++i)
 					buffer->Vertices.push_back(video::S3DVertexTangents(
-						v[idx[i]].Pos, v[idx[i]].Color, v[idx[i]].TCoords));
+						v[idx[i]].Pos, v[idx[i]].Normal, v[idx[i]].Color, v[idx[i]].TCoords));
 			}
 			break;
 		case video::EVT_TANGENTS:
@@ -849,7 +761,7 @@ IMesh* CMeshManipulator::createMeshWithTangents(IMesh* mesh) const
 				video::S3DVertexTangents* v =
 					(video::S3DVertexTangents*)mesh->getMeshBuffer(b)->getVertices();
 
-				for (s32 i=0; i<idxCnt; ++i)
+				for (u32 i=0; i<idxCnt; ++i)
 					buffer->Vertices.push_back(v[idx[i]]);
 			}
 			break;
@@ -858,9 +770,10 @@ IMesh* CMeshManipulator::createMeshWithTangents(IMesh* mesh) const
 		// create new indices
 
 		buffer->Indices.set_used(idxCnt);
-		for (s32 i=0; i<idxCnt; ++i)
+		for (u32 i=0; i<idxCnt; ++i)
 			buffer->Indices[i] = i;
 
+		buffer->setBoundingBox(mesh->getMeshBuffer(b)->getBoundingBox());
 		// add new buffer
 		clone->addMeshBuffer(buffer);
 		buffer->drop();
@@ -871,46 +784,152 @@ IMesh* CMeshManipulator::createMeshWithTangents(IMesh* mesh) const
 	// now calculate tangents
 	for (b=0; b<meshBufferCount; ++b)
 	{
-		const s32 idxCnt = clone->getMeshBuffer(b)->getIndexCount();
+		const u32 vtxCnt = mesh->getMeshBuffer(b)->getVertexCount();
+		const u32 idxCnt = clone->getMeshBuffer(b)->getIndexCount();
 
 		u16* idx = clone->getMeshBuffer(b)->getIndices();
 		video::S3DVertexTangents* v =
 			(video::S3DVertexTangents*)clone->getMeshBuffer(b)->getVertices();
 
-		for (s32 i=0; i<idxCnt; i+=3)
+		if (smooth)
 		{
-			calculateTangents(
-				v[idx[i+0]].Normal,
-				v[idx[i+0]].Tangent,
-				v[idx[i+0]].Binormal,
-				v[idx[i+0]].Pos,
-				v[idx[i+1]].Pos,
-				v[idx[i+2]].Pos,
-				v[idx[i+0]].TCoords,
-				v[idx[i+1]].TCoords,
-				v[idx[i+2]].TCoords);
+			u32 i;
 
-			calculateTangents(
-				v[idx[i+1]].Normal,
-				v[idx[i+1]].Tangent,
-				v[idx[i+1]].Binormal,
-				v[idx[i+1]].Pos,
-				v[idx[i+2]].Pos,
-				v[idx[i+0]].Pos,
-				v[idx[i+1]].TCoords,
-				v[idx[i+2]].TCoords,
-				v[idx[i+0]].TCoords);
+			for ( i = 0; i!= vtxCnt; ++i )
+			{
+				if (recalculateNormals)
+					v[i].Normal.set( 0.f, 0.f, 0.f );
+				v[i].Tangent.set( 0.f, 0.f, 0.f );
+				v[i].Binormal.set( 0.f, 0.f, 0.f );
+			}
 
-			calculateTangents(
-				v[idx[i+2]].Normal,
-				v[idx[i+2]].Tangent,
-				v[idx[i+2]].Binormal,
-				v[idx[i+2]].Pos,
-				v[idx[i+0]].Pos,
-				v[idx[i+1]].Pos,
-				v[idx[i+2]].TCoords,
-				v[idx[i+0]].TCoords,
-				v[idx[i+1]].TCoords);
+			//Each vertex gets the sum of the tangents and binormals from the faces around it
+			for ( i=0; i<idxCnt; i+=3)
+			{
+				// if this triangle is degenerate, skip it!
+				if (v[idx[i+0]].Pos == v[idx[i+1]].Pos || 
+					v[idx[i+0]].Pos == v[idx[i+2]].Pos || 
+					v[idx[i+1]].Pos == v[idx[i+2]].Pos 
+					/*||
+					v[idx[i+0]].TCoords == v[idx[i+1]].TCoords || 
+					v[idx[i+0]].TCoords == v[idx[i+2]].TCoords || 
+					v[idx[i+1]].TCoords == v[idx[i+2]].TCoords */
+					) 
+					continue;
+
+				//Angle-weighted normals look better, but are slightly more CPU intensive to calculate
+				core::vector3df weight(1.f,1.f,1.f);
+				if (angleWeighted)
+					weight = getAngleWeight(v[i+0].Pos,v[i+1].Pos,v[i+2].Pos);
+				core::vector3df localNormal; 
+				core::vector3df localTangent;
+				core::vector3df localBinormal;
+
+				calculateTangents(
+					localNormal,
+					localTangent,
+					localBinormal,
+					v[idx[i+0]].Pos,
+					v[idx[i+1]].Pos,
+					v[idx[i+2]].Pos,
+					v[idx[i+0]].TCoords,
+					v[idx[i+1]].TCoords,
+					v[idx[i+2]].TCoords);
+
+				if (recalculateNormals)
+					v[idx[i+0]].Tangent += localTangent * weight.X;
+				v[idx[i+0]].Binormal += localBinormal * weight.X;
+				v[idx[i+0]].Normal += localNormal * weight.X;
+				
+				calculateTangents(
+					localNormal,
+					localTangent,
+					localBinormal,
+					v[idx[i+1]].Pos,
+					v[idx[i+2]].Pos,
+					v[idx[i+0]].Pos,
+					v[idx[i+1]].TCoords,
+					v[idx[i+2]].TCoords,
+					v[idx[i+0]].TCoords);
+
+				if (recalculateNormals)
+					v[idx[i+1]].Tangent += localTangent * weight.Y;
+				v[idx[i+1]].Binormal += localBinormal * weight.Y;
+				v[idx[i+1]].Normal += localNormal * weight.Y;
+
+				calculateTangents(
+					localNormal,
+					localTangent,
+					localBinormal,
+					v[idx[i+2]].Pos,
+					v[idx[i+0]].Pos,
+					v[idx[i+1]].Pos,
+					v[idx[i+2]].TCoords,
+					v[idx[i+0]].TCoords,
+					v[idx[i+1]].TCoords);
+
+				if (recalculateNormals)
+					v[idx[i+2]].Tangent += localTangent * weight.Z;
+				v[idx[i+2]].Binormal += localBinormal * weight.Z;
+				v[idx[i+2]].Normal += localNormal * weight.Z;
+			}
+
+			// Normalize the tangents and binormals
+			if (recalculateNormals)
+			{
+				for ( i = 0; i!= vtxCnt; ++i )
+					v[i].Normal.normalize();
+			}
+			for ( i = 0; i!= vtxCnt; ++i )
+			{
+				v[i].Tangent.normalize();
+				v[i].Binormal.normalize();
+			}
+		}
+		else
+		{
+			core::vector3df localNormal; 
+			for (u32 i=0; i<idxCnt; i+=3)
+			{
+				calculateTangents(
+					localNormal,
+					v[idx[i+0]].Tangent,
+					v[idx[i+0]].Binormal,
+					v[idx[i+0]].Pos,
+					v[idx[i+1]].Pos,
+					v[idx[i+2]].Pos,
+					v[idx[i+0]].TCoords,
+					v[idx[i+1]].TCoords,
+					v[idx[i+2]].TCoords);
+				if (recalculateNormals)
+					v[idx[i+0]].Normal=localNormal;
+
+				calculateTangents(
+					localNormal,
+					v[idx[i+1]].Tangent,
+					v[idx[i+1]].Binormal,
+					v[idx[i+1]].Pos,
+					v[idx[i+2]].Pos,
+					v[idx[i+0]].Pos,
+					v[idx[i+1]].TCoords,
+					v[idx[i+2]].TCoords,
+					v[idx[i+0]].TCoords);
+				if (recalculateNormals)
+					v[idx[i+1]].Normal=localNormal;
+
+				calculateTangents(
+					localNormal,
+					v[idx[i+2]].Tangent,
+					v[idx[i+2]].Binormal,
+					v[idx[i+2]].Pos,
+					v[idx[i+0]].Pos,
+					v[idx[i+1]].Pos,
+					v[idx[i+2]].TCoords,
+					v[idx[i+0]].TCoords,
+					v[idx[i+1]].TCoords);
+				if (recalculateNormals)
+					v[idx[i+2]].Normal=localNormal;
+			}
 		}
 	}
 
@@ -918,7 +937,6 @@ IMesh* CMeshManipulator::createMeshWithTangents(IMesh* mesh) const
 }
 
 
-
 //! Creates a copy of the mesh, which will only consist of S3DVertex2TCoords vertices.
 IMesh* CMeshManipulator::createMeshWith2TCoords(IMesh* mesh) const
 {
@@ -933,7 +951,7 @@ IMesh* CMeshManipulator::createMeshWith2TCoords(IMesh* mesh) const
 
 	for (b=0; b<meshBufferCount; ++b)
 	{
-		const s32 idxCnt = mesh->getMeshBuffer(b)->getIndexCount();
+		const u32 idxCnt = mesh->getMeshBuffer(b)->getIndexCount();
 		const u16* idx = mesh->getMeshBuffer(b)->getIndices();
 
 		SMeshBufferLightMap* buffer = new SMeshBufferLightMap();
@@ -949,7 +967,7 @@ IMesh* CMeshManipulator::createMeshWith2TCoords(IMesh* mesh) const
 				video::S3DVertex* v =
 					(video::S3DVertex*)mesh->getMeshBuffer(b)->getVertices();
 
-				for (s32 i=0; i<idxCnt; ++i)
+				for (u32 i=0; i<idxCnt; ++i)
 					buffer->Vertices.push_back(
 						video::S3DVertex2TCoords(
 							v[idx[i]].Pos, v[idx[i]].Color, v[idx[i]].TCoords, v[idx[i]].TCoords));
@@ -960,7 +978,7 @@ IMesh* CMeshManipulator::createMeshWith2TCoords(IMesh* mesh) const
 				video::S3DVertex2TCoords* v =
 					(video::S3DVertex2TCoords*)mesh->getMeshBuffer(b)->getVertices();
 
-				for (s32 i=0; i<idxCnt; ++i)
+				for (u32 i=0; i<idxCnt; ++i)
 					buffer->Vertices.push_back(v[idx[i]]);
 			}
 			break;
@@ -969,7 +987,7 @@ IMesh* CMeshManipulator::createMeshWith2TCoords(IMesh* mesh) const
 				video::S3DVertexTangents* v =
 					(video::S3DVertexTangents*)mesh->getMeshBuffer(b)->getVertices();
 
-				for (s32 i=0; i<idxCnt; ++i)
+				for (u32 i=0; i<idxCnt; ++i)
 					buffer->Vertices.push_back(video::S3DVertex2TCoords(
 						v[idx[i]].Pos, v[idx[i]].Color, v[idx[i]].TCoords, v[idx[i]].TCoords));
 			}
@@ -979,9 +997,10 @@ IMesh* CMeshManipulator::createMeshWith2TCoords(IMesh* mesh) const
 		// create new indices
 
 		buffer->Indices.set_used(idxCnt);
-		for (s32 i=0; i<idxCnt; ++i)
+		for (u32 i=0; i<idxCnt; ++i)
 			buffer->Indices[i] = i;
 
+		buffer->setBoundingBox(mesh->getMeshBuffer(b)->getBoundingBox());
 		// add new buffer
 		clone->addMeshBuffer(buffer);
 		buffer->drop();
@@ -993,7 +1012,6 @@ IMesh* CMeshManipulator::createMeshWith2TCoords(IMesh* mesh) const
 }
 
 
-
 void CMeshManipulator::calculateTangents(
 	core::vector3df& normal,
 	core::vector3df& tangent,
@@ -1106,7 +1124,6 @@ s32 CMeshManipulator::getPolyCount(scene::IMesh* mesh) const
 }
 
 
-
 //! Returns amount of polygons in mesh.
 s32 CMeshManipulator::getPolyCount(scene::IAnimatedMesh* mesh) const
 {
@@ -1116,6 +1133,7 @@ s32 CMeshManipulator::getPolyCount(scene::IAnimatedMesh* mesh) const
 	return 0;
 }
 
+
 //! create a new AnimatedMesh and adds the mesh to it
 IAnimatedMesh * CMeshManipulator::createAnimatedMesh(scene::IMesh* mesh, scene::E_ANIMATED_MESH_TYPE type) const
 {
diff --git a/src/dep/src/irrlicht/CMeshManipulator.h b/src/dep/src/irrlicht/CMeshManipulator.h
index 352a90f..606ecc1 100644
--- a/src/dep/src/irrlicht/CMeshManipulator.h
+++ b/src/dep/src/irrlicht/CMeshManipulator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,25 +13,21 @@ namespace scene
 {
 
 //! An interface for easy manipulation of meshes.
-/** Scale, set alpha value, flip surfaces, and so on. This exists for fixing problems 
- with wrong imported or exported meshes quickly after loading. It is not intended for doing mesh
- modifications and/or animations during runtime.
+/** Scale, set alpha value, flip surfaces, and so on. This exists for fixing
+problems with wrong imported or exported meshes quickly after loading. It is
+not intended for doing mesh modifications and/or animations during runtime.
 */
 class CMeshManipulator : public IMeshManipulator
 {
 public:
-
-	//! destructor
-	virtual ~CMeshManipulator() {}
-
-	//! Flips the direction of surfaces. Changes backfacing triangles to frontfacing
-	//! triangles and vice versa.
-	//! \param mesh: Mesh on which the operation is performed.
+	//! Flips the direction of surfaces.
+	/** Changes backfacing triangles to frontfacing triangles and vice versa.
+	\param mesh: Mesh on which the operation is performed. */
 	virtual void flipSurfaces(scene::IMesh* mesh) const;
 
 	//! Sets the alpha vertex color value of the whole mesh to a new value
-	//! \param mesh: Mesh on which the operation is performed.
-	//! \param alpha: New alpha for the vertex color.
+	/** \param mesh: Mesh on which the operation is performed.
+	\param alpha: New alpha for the vertex color. */
 	virtual void setVertexColorAlpha(scene::IMesh* mesh, s32 alpha) const;
 
 	//! Sets the colors of all vertices to one color
@@ -40,45 +36,65 @@ public:
 	//! Recalculates all normals of the mesh.
 	/** \param mesh: Mesh on which the operation is performed.
 	    \param smooth: Whether to use smoothed normals. */
-	virtual void recalculateNormals(scene::IMesh* mesh, bool smooth = false) const;
+	virtual void recalculateNormals(scene::IMesh* mesh, bool smooth = false, bool angleWeighted = false) const;
 
 	//! Recalculates all normals of the mesh buffer.
 	/** \param buffer: Mesh buffer on which the operation is performed.
 	    \param smooth: Whether to use smoothed normals. */
-	virtual void recalculateNormals(IMeshBuffer* buffer, bool smooth = false) const;
+	virtual void recalculateNormals(IMeshBuffer* buffer, bool smooth = false, bool angleWeighted = false) const;
 
-	//! Scales the whole mesh.
-	//! \param mesh: Mesh on which the operation is performed.
-	//! \param scale: 3D Vector, defining the value, for each axis, to scale the mesh by.
-	virtual void scaleMesh(scene::IMesh* mesh, const core::vector3df& scale) const;
+	//! Scales the actual mesh, not the scene node.
+	/** \param mesh Mesh on which the operation is performed.
+	\param factor Vector which defines the scale for each axis. */
+	virtual void scale(scene::IMesh* mesh, const core::vector3df& factor) const;
 
-	//! Applies a transformation
+	//! Scales the actual meshbuffer, not the scene node.
+	/** \param buffer MeshBuffer on which the operation is performed.
+	\param factor Vector which defines the scale for each axis. */
+	virtual void scale(scene::IMeshBuffer* buffer, const core::vector3df& factor) const;
+
+	//! Scale the texture coords of a mesh.
+	/** \param mesh Mesh on which the operation is performed.
+	\param factor Vector which defines the scale for each axis.
+	\param level Number of texture coord, starting from 1. Support for level 2 exists for LightMap buffers. */
+	virtual void scaleTCoords(scene::IMesh* mesh, const core::vector2df& factor, u32 layer=1) const;
+
+	//! Scale the texture coords of a meshbuffer.
+	/** \param mesh Mesh on which the operation is performed.
+	\param factor Vector which defines the scale for each axis.
+	\param level Number of texture coord, starting from 1. Support for level 2 exists for LightMap buffers. */
+	virtual void scaleTCoords(scene::IMeshBuffer* buffer, const core::vector2df& factor, u32 level=1) const;
+
+	//! Applies a transformation to a meshbuffer
+	/** \param buffer: Meshbuffer on which the operation is performed.
+		\param m: matrix. */
+	void transform(scene::IMeshBuffer* buffer, const core::matrix4& m) const;
+
+	//! Applies a transformation to a mesh
 	/** \param mesh: Mesh on which the operation is performed.
 		\param m: transformation matrix. */
-	virtual void transformMesh(scene::IMesh* mesh, const core::matrix4& m) const;
+	virtual void transform(scene::IMesh* mesh, const core::matrix4& m) const;
 
 	//! Clones a static IMesh into a modifiable SMesh.
 	virtual SMesh* createMeshCopy(scene::IMesh* mesh) const;
 
 	//! Creates a planar texture mapping on the mesh
-	//! \param mesh: Mesh on which the operation is performed.
-	//! \param resolution: resolution of the planar mapping. This is the value
-	//! specifying which is the relation between world space and 
-	//! texture coordinate space.
+	/** \param mesh: Mesh on which the operation is performed.
+	\param resolution: resolution of the planar mapping. This is the value
+	specifying which is the relation between world space and 
+	texture coordinate space. */
 	virtual void makePlanarTextureMapping(scene::IMesh* mesh, f32 resolution) const;
 
 	//! Creates a copy of the mesh, which will only consist of S3DVertexTangents vertices.
-	//! This is useful if you want to draw tangent space normal mapped geometry because
-	//! it calculates the tangent and binormal data which is needed there.
-	//! \param mesh: Input mesh
-	//! \return Mesh consiting only of S3DVertexNormalMapped vertices.
-	//! If you no longer need the cloned mesh, you should call IMesh::drop().
-	//! See IReferenceCounted::drop() for more information.
-	virtual IMesh* createMeshWithTangents(IMesh* mesh) const;
+	virtual IMesh* createMeshWithTangents(IMesh* mesh, bool recalculateNormals=false, bool smooth=false, bool angleWeighted=false) const;
+
+	//! Creates a copy of the mesh, which will only consist of S3D2TCoords vertices.
 	virtual IMesh* createMeshWith2TCoords(IMesh* mesh) const;
 
+	//! Creates a copy of the mesh, which will only consist of unique triangles, i.e. no vertices are shared.
 	virtual IMesh* createMeshUniquePrimitives(IMesh* mesh) const;
 
+	//! Creates a copy of the mesh, which will have all duplicated vertices removed, i.e. maximal amount of vertices are shared via indexing.
 	virtual IMesh* createMeshWelded(IMesh *mesh, f32 tolerance=core::ROUNDING_ERROR_32) const;
 
 	//! Returns amount of polygons in mesh.
diff --git a/src/dep/src/irrlicht/CMeshSceneNode.cpp b/src/dep/src/irrlicht/CMeshSceneNode.cpp
index 9e510d0..d99f9f9 100644
--- a/src/dep/src/irrlicht/CMeshSceneNode.cpp
+++ b/src/dep/src/irrlicht/CMeshSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -128,69 +128,123 @@ void CMeshSceneNode::render()
 	Box = Mesh->getBoundingBox();
 
 	// for debug purposes only:
-	if ( DebugDataVisible && PassCount==1)
+
+	bool renderMeshes = true;
+	video::SMaterial mat;
+	if (DebugDataVisible && PassCount==1)
 	{
-		if ( DebugDataVisible & scene::EDS_BBOX )
+		// overwrite half transparency
+		if ( DebugDataVisible & scene::EDS_HALF_TRANSPARENCY )
 		{
-			video::SMaterial m;
-			m.Lighting = false;
-			driver->setMaterial(m);
-			driver->draw3DBox(Box, video::SColor(0,255,255,255));
-		}
-		if ( DebugDataVisible & scene::EDS_BBOX_BUFFERS )
-		{
-			video::SMaterial m;
-			m.Lighting = false;
-			driver->setMaterial(m);
 			for (u32 g=0; g<Mesh->getMeshBufferCount(); ++g)
 			{
-				driver->draw3DBox(
-					Mesh->getMeshBuffer(g)->getBoundingBox(), 
-					video::SColor(0,255,255,255));
+				mat = Materials[g];
+				mat.MaterialType = video::EMT_TRANSPARENT_ADD_COLOR;
+				driver->setMaterial(mat);
+				driver->drawMeshBuffer(Mesh->getMeshBuffer(g));
 			}
+			renderMeshes = false;
 		}
-		if ( DebugDataVisible & scene::EDS_NORMALS )
+	}
+
+	// render original meshes
+	if ( renderMeshes )
+	{
+		for (u32 i=0; i<Mesh->getMeshBufferCount(); ++i)
 		{
-			for (u32 g=0; g<Mesh->getMeshBufferCount(); ++g)
+			scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
+			if (mb)
 			{
-				scene::IMeshBuffer* mb = Mesh->getMeshBuffer(g);
+				const video::SMaterial& material = ReadOnlyMaterials ? mb->getMaterial() : Materials[i];
 
-				u32 vSize;
-				u32 i;
-				vSize = video::getVertexPitchFromType(mb->getVertexType());
+				video::IMaterialRenderer* rnd = driver->getMaterialRenderer(material.MaterialType);
+				bool transparent = (rnd && rnd->isTransparent());
 
-				const video::S3DVertex* v = ( const video::S3DVertex*)mb->getVertices();
-				video::SColor c ( 255, 128 ,0, 0 );
-				video::SColor c1 ( 255, 255 ,0, 0 );
-				for ( i = 0; i != mb->getVertexCount(); ++i )
+				// only render transparent buffer if this is the transparent render pass
+				// and solid only in solid pass
+				if (transparent == isTransparentPass) 
 				{
-					core::vector3df h = v->Normal * 5.f;
-					core::vector3df h1 = h.crossProduct ( core::vector3df ( 0.f, 1.f, 0.f ) );
-
-					driver->draw3DLine ( v->Pos, v->Pos + h, c );
-					driver->draw3DLine ( v->Pos + h, v->Pos + h + h1, c1 );
-					v = (const video::S3DVertex*) ( (u8*) v + vSize );
+					driver->setMaterial(material);
+					driver->drawMeshBuffer(mb);
 				}
 			}
 		}
 	}
 
-	for (u32 i=0; i<Mesh->getMeshBufferCount(); ++i)
+	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
+
+	// for debug purposes only:
+	if ( DebugDataVisible && PassCount==1)
 	{
-		scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
-		if (mb)
+		video::SMaterial m;
+		m.Lighting = false;
+		driver->setMaterial(m);
+
+		if ( DebugDataVisible & scene::EDS_BBOX )
 		{
-			const video::SMaterial& material = ReadOnlyMaterials ? mb->getMaterial() : Materials[i];
-
-			video::IMaterialRenderer* rnd = driver->getMaterialRenderer(material.MaterialType);
-			bool transparent = (rnd && rnd->isTransparent());
-
-			// only render transparent buffer if this is the transparent render pass
-			// and solid only in solid pass
-			if (transparent == isTransparentPass) 
+			driver->draw3DBox(Box, video::SColor(255,255,255,255));
+		}
+		if ( DebugDataVisible & scene::EDS_BBOX_BUFFERS )
+		{
+			for (u32 g=0; g<Mesh->getMeshBufferCount(); ++g)
 			{
-				driver->setMaterial(material);
-				driver->drawMeshBuffer(mb);
+				driver->draw3DBox(
+					Mesh->getMeshBuffer(g)->getBoundingBox(),
+					video::SColor(255,190,128,128));
+			}
+		}
+
+		if ( DebugDataVisible & scene::EDS_NORMALS )
+		{
+			IAnimatedMesh * arrow = SceneManager->addArrowMesh (
+					"__debugnormal", 0xFFECEC00,
+					0xFF999900, 4, 8, 1.f, 0.6f, 0.05f,
+					0.3f);
+			if ( 0 == arrow )
+			{
+				arrow = SceneManager->getMesh ( "__debugnormal" );
+			}
+			IMesh *mesh = arrow->getMesh(0);
+
+			// find a good scaling factor
+
+			core::matrix4 m2;
+
+			// draw normals
+			for (u32 g=0; g<Mesh->getMeshBufferCount(); ++g)
+			{
+				const scene::IMeshBuffer* mb = Mesh->getMeshBuffer(g);
+				const u32 vSize = video::getVertexPitchFromType(mb->getVertexType());
+				const video::S3DVertex* v = ( const video::S3DVertex*)mb->getVertices();
+				for ( u32 i=0; i != mb->getVertexCount(); ++i )
+				{
+					// align to v->Normal
+					core::quaternion quatRot(v->Normal.X, 0.f, -v->Normal.X, 1+v->Normal.Y);
+					quatRot.normalize();
+					quatRot.getMatrix(m2);
+
+					m2.setTranslation(v->Pos);
+					m2*=AbsoluteTransformation;
+
+					driver->setTransform(video::ETS_WORLD, m2);
+					for (u32 a = 0; a != mesh->getMeshBufferCount(); ++a)
+						driver->drawMeshBuffer(mesh->getMeshBuffer(a));
+
+					v = (const video::S3DVertex*) ( (u8*) v + vSize );
+				}
+			}
+			driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
+		}
+
+		// show mesh
+		if ( DebugDataVisible & scene::EDS_MESH_WIRE_OVERLAY )
+		{
+			m.Wireframe = true;
+			driver->setMaterial(m);
+
+			for (u32 g=0; g<Mesh->getMeshBufferCount(); ++g)
+			{
+				driver->drawMeshBuffer( Mesh->getMeshBuffer(g) );
 			}
 		}
 	}
diff --git a/src/dep/src/irrlicht/CMeshSceneNode.h b/src/dep/src/irrlicht/CMeshSceneNode.h
index 5bff6b2..f96ecb1 100644
--- a/src/dep/src/irrlicht/CMeshSceneNode.h
+++ b/src/dep/src/irrlicht/CMeshSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CMetaTriangleSelector.cpp b/src/dep/src/irrlicht/CMetaTriangleSelector.cpp
index e444de3..c7719e8 100644
--- a/src/dep/src/irrlicht/CMetaTriangleSelector.cpp
+++ b/src/dep/src/irrlicht/CMetaTriangleSelector.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,6 +17,7 @@ CMetaTriangleSelector::CMetaTriangleSelector()
 	#endif
 }
 
+
 //! destructor
 CMetaTriangleSelector::~CMetaTriangleSelector()
 {
@@ -24,45 +25,42 @@ CMetaTriangleSelector::~CMetaTriangleSelector()
 }
 
 
-
 //! Returns amount of all available triangles in this selector
 s32 CMetaTriangleSelector::getTriangleCount() const
 {
 	s32 count = 0;
-	for (s32 i=0; i<(s32)TriangleSelectors.size(); ++i)
+	for (u32 i=0; i<TriangleSelectors.size(); ++i)
 		count += TriangleSelectors[i]->getTriangleCount();
 
 	return count;
 }
 
 
-
 //! Gets all triangles.
 void CMetaTriangleSelector::getTriangles(core::triangle3df* triangles, s32 arraySize,
-	s32& outTriangleCount, const core::matrix4* transform) const
+		s32& outTriangleCount, const core::matrix4* transform) const
 {
 	s32 outWritten = 0;
 
-	for (s32 i=0; i<(s32)TriangleSelectors.size(); ++i)
+	for (u32 i=0; i<TriangleSelectors.size(); ++i)
 	{
 		s32 t = 0;
 		TriangleSelectors[i]->getTriangles(triangles + outWritten, arraySize - outWritten, t, transform);
 		outWritten += t;
 	}
 
-    outTriangleCount = outWritten;
+	outTriangleCount = outWritten;
 }
 
 
-
 //! Gets all triangles which lie within a specific bounding box.
 void CMetaTriangleSelector::getTriangles(core::triangle3df* triangles, s32 arraySize,
-	s32& outTriangleCount, const core::aabbox3d<f32>& box, 
-	const core::matrix4* transform) const
+		s32& outTriangleCount, const core::aabbox3d<f32>& box,
+		const core::matrix4* transform) const
 {
 	s32 outWritten = 0;
 
-	for (s32 i=0; i<(s32)TriangleSelectors.size(); ++i)
+	for (u32 i=0; i<TriangleSelectors.size(); ++i)
 	{
 		s32 t = 0;
 		TriangleSelectors[i]->getTriangles(triangles + outWritten, arraySize - outWritten, t,
@@ -70,19 +68,18 @@ void CMetaTriangleSelector::getTriangles(core::triangle3df* triangles, s32 array
 		outWritten += t;
 	}
 
-    outTriangleCount = outWritten;
+	outTriangleCount = outWritten;
 }
 
 
-
 //! Gets all triangles which have or may have contact with a 3d line.
 void CMetaTriangleSelector::getTriangles(core::triangle3df* triangles, s32 arraySize,
-	s32& outTriangleCount, const core::line3d<f32>& line, 
-	const core::matrix4* transform) const
+		s32& outTriangleCount, const core::line3d<f32>& line,
+		const core::matrix4* transform) const
 {
 	s32 outWritten = 0;
 
-	for (s32 i=0; i<(s32)TriangleSelectors.size(); ++i)
+	for (u32 i=0; i<TriangleSelectors.size(); ++i)
 	{
 		s32 t = 0;
 		TriangleSelectors[i]->getTriangles(triangles + outWritten, arraySize - outWritten, t,
@@ -90,11 +87,10 @@ void CMetaTriangleSelector::getTriangles(core::triangle3df* triangles, s32 array
 		outWritten += t;
 	}
 
-    outTriangleCount = outWritten;
+	outTriangleCount = outWritten;
 }
 
 
-
 //! Adds a triangle selector to the collection of triangle selectors
 //! in this metaTriangleSelector.
 void CMetaTriangleSelector::addTriangleSelector(ITriangleSelector* toAdd)
@@ -107,34 +103,33 @@ void CMetaTriangleSelector::addTriangleSelector(ITriangleSelector* toAdd)
 }
 
 
-
 //! Removes a specific triangle selector which was added before	from the collection.
 bool CMetaTriangleSelector::removeTriangleSelector(ITriangleSelector* toRemove)
 {
-	for (s32 i=0; i<(s32)TriangleSelectors.size(); ++i)
+	for (u32 i=0; i<TriangleSelectors.size(); ++i)
+	{
 		if (toRemove == TriangleSelectors[i])
 		{
 			TriangleSelectors[i]->drop();
 			TriangleSelectors.erase(i);
 			return true;
 		}
+	}
 
-    return false;
+	return false;
 }
 
 
-
 //! Removes all triangle selectors from the collection.
 void CMetaTriangleSelector::removeAllTriangleSelectors()
 {
-	for (s32 i=0; i<(s32)TriangleSelectors.size(); ++i)
+	for (u32 i=0; i<TriangleSelectors.size(); ++i)
 		TriangleSelectors[i]->drop();
 
 	TriangleSelectors.clear();
 }
 
 
-
 } // end namespace scene
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/CMetaTriangleSelector.h b/src/dep/src/irrlicht/CMetaTriangleSelector.h
index 12ad0a3..17a8449 100644
--- a/src/dep/src/irrlicht/CMetaTriangleSelector.h
+++ b/src/dep/src/irrlicht/CMetaTriangleSelector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CNullDriver.cpp b/src/dep/src/irrlicht/CNullDriver.cpp
index c5332cb..b16c791 100644
--- a/src/dep/src/irrlicht/CNullDriver.cpp
+++ b/src/dep/src/irrlicht/CNullDriver.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -12,6 +12,7 @@
 #include "IImageLoader.h"
 #include "IImageWriter.h"
 #include "IMaterialRenderer.h"
+#include "CMeshManipulator.h"
 
 
 namespace irr
@@ -37,6 +38,9 @@ IImageLoader* createImageLoaderPCX();
 //! creates a loader which is able to load png images
 IImageLoader* createImageLoaderPNG();
 
+//! creates a loader which is able to load WAL images
+IImageLoader* createImageLoaderWAL();
+
 //! creates a loader which is able to load ppm/pgm/pbm images
 IImageLoader* createImageLoaderPPM();
 
@@ -65,8 +69,8 @@ IImageWriter* createImageWriterPPM();
 
 //! constructor
 CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<s32>& screenSize)
-: FileSystem(io), ViewPort(0,0,0,0), ScreenSize(screenSize),
-	PrimitivesDrawn(0), TextureCreationFlags(0)
+: FileSystem(io), MeshManipulator(0), ViewPort(0,0,0,0), ScreenSize(screenSize),
+	PrimitivesDrawn(0), TextureCreationFlags(0), AllowZWriteOnTransparent(false)
 {
 	#ifdef _DEBUG
 	setDebugName("CNullDriver");
@@ -79,6 +83,9 @@ CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<s32>& scre
 
 	ViewPort = core::rect<s32>(core::position2d<s32>(0,0), screenSize);
 
+	// create manipulator
+	MeshManipulator = new scene::CMeshManipulator();
+
 	if (FileSystem)
 		FileSystem->grab();
 
@@ -102,6 +109,9 @@ CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<s32>& scre
 #ifdef _IRR_COMPILE_WITH_PNG_LOADER_
 	SurfaceLoader.push_back(video::createImageLoaderPNG());
 #endif
+#ifdef _IRR_COMPILE_WITH_WAL_LOADER_
+	SurfaceLoader.push_back(video::createImageLoaderWAL());
+#endif
 #ifdef _IRR_COMPILE_WITH_PPM_LOADER_
 	SurfaceLoader.push_back(video::createImageLoaderPPM());
 #endif
@@ -130,34 +140,33 @@ CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<s32>& scre
 
 	// set ExposedData to 0
 	memset(&ExposedData, 0, sizeof(ExposedData));
+	for (u32 i=0; i<video::EVDF_COUNT; ++i)
+		FeatureEnabled[i]=true;
 }
 
 
-
 //! destructor
 CNullDriver::~CNullDriver()
 {
-	// delete file system
-
 	if (FileSystem)
 		FileSystem->drop();
 
-	// delete textures
-
+	if (MeshManipulator)
+		MeshManipulator->drop();
 	deleteAllTextures();
 
-	// delete surface loader
-
 	u32 i;
 	for (i=0; i<SurfaceLoader.size(); ++i)
 		SurfaceLoader[i]->drop();
 
-	// delete surface writer
-
 	for (i=0; i<SurfaceWriter.size(); ++i)
 		SurfaceWriter[i]->drop();
 
+	// delete material renderers
 	deleteMaterialRenders();
+
+	// delete hardware mesh buffers
+	removeAllHardwareBuffers();
 }
 
 
@@ -186,6 +195,10 @@ void CNullDriver::addExternalImageWriter(IImageWriter* writer)
 //! deletes all textures
 void CNullDriver::deleteAllTextures()
 {
+	// we need to remove previously set textures which might otherwise be kept in the
+	// last set material member. Could be optimized to reduce state changes.
+	setMaterial(SMaterial());
+
 	for (u32 i=0; i<Textures.size(); ++i)
 		Textures[i].Surface->drop();
 
@@ -195,23 +208,30 @@ void CNullDriver::deleteAllTextures()
 
 
 //! applications must call this method before performing any rendering. returns false if failed.
-bool CNullDriver::beginScene(bool backBuffer, bool zBuffer, SColor color)
+bool CNullDriver::beginScene(bool backBuffer, bool zBuffer, SColor color,
+		void* windowId, core::rect<s32>* sourceRect)
 {
-	core::clearFPUException ();
+	core::clearFPUException();
 	PrimitivesDrawn = 0;
 	return true;
 }
 
 
-
 //! applications must call this method after performing any rendering. returns false if failed.
-bool CNullDriver::endScene( s32 windowId, core::rect<s32>* sourceRect )
+bool CNullDriver::endScene()
 {
 	FPSCounter.registerFrame(os::Timer::getRealTime(), PrimitivesDrawn);
+	updateAllHardwareBuffers();
 	return true;
 }
 
 
+//! Disable a feature of the driver.
+void CNullDriver::disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag)
+{
+	FeatureEnabled[feature]=!flag;
+}
+ 
 
 //! queries the features of the driver, returns true if feature is available
 bool CNullDriver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
@@ -250,11 +270,13 @@ void CNullDriver::removeTexture(ITexture* texture)
 		return;
 
 	for (u32 i=0; i<Textures.size(); ++i)
+	{
 		if (Textures[i].Surface == texture)
 		{
 			texture->drop();
 			Textures.erase(i);
 		}
+	}
 }
 
 
@@ -300,17 +322,30 @@ void CNullDriver::renameTexture(ITexture* texture, const c8* newName)
 //! loads a Texture
 ITexture* CNullDriver::getTexture(const c8* filename)
 {
-	ITexture* texture = findTexture(filename);
+	// Identify textures by their absolute filenames if possible.
+	core::stringc absolutePath = FileSystem->getAbsolutePath(filename);
 
+	ITexture* texture = findTexture(absolutePath.c_str());
 	if (texture)
 		return texture;
 
-	io::IReadFile* file = FileSystem->createAndOpenFile(filename);
-	bool errorReported = false;
+	// Then try the raw filename, which might be in an Archive
+	texture = findTexture(filename);
+	if (texture)
+		return texture;
+
+	// Now try to open the file using the complete path.
+	io::IReadFile* file = FileSystem->createAndOpenFile(absolutePath.c_str());
+
+	if(!file)
+	{
+		// Try to open it using the raw filename.
+		file = FileSystem->createAndOpenFile(filename);
+	}
 
 	if (file)
 	{
-		texture = loadTextureFromFile(file, filename);
+		texture = loadTextureFromFile(file);
 		file->drop();
 
 		if (texture)
@@ -318,21 +353,18 @@ ITexture* CNullDriver::getTexture(const c8* filename)
 			addTexture(texture);
 			texture->drop(); // drop it because we created it, one grab too much
 		}
+		else
+			os::Printer::log("Could not load texture", filename, ELL_ERROR);
+		return texture;
 	}
 	else
 	{
-		errorReported = true;
-		os::Printer::log("Could not open file of texture", filename, ELL_ERROR);
+		os::Printer::log("Could not open file of texture", filename, ELL_WARNING);
+		return 0;
 	}
-
-	if (!texture && !errorReported)
-		os::Printer::log("Could not load texture", filename, ELL_ERROR);
-
-	return texture;
 }
 
 
-
 //! loads a Texture
 ITexture* CNullDriver::getTexture(io::IReadFile* file)
 {
@@ -355,13 +387,12 @@ ITexture* CNullDriver::getTexture(io::IReadFile* file)
 	}
 
 	if (!texture)
-		os::Printer::log("Could not load texture", file->getFileName(), ELL_ERROR);
+		os::Printer::log("Could not load texture", file->getFileName(), ELL_WARNING);
 
 	return texture;
 }
 
 
-
 //! opens the file and loads it into the surface
 video::ITexture* CNullDriver::loadTextureFromFile(io::IReadFile* file, const c8 *hashName )
 {
@@ -497,7 +528,7 @@ const core::rect<s32>& CNullDriver::getViewPort() const
 
 
 //! draws a vertex primitive list
-void CNullDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType)
+void CNullDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const void* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
 {
 	PrimitivesDrawn += primitiveCount;
 }
@@ -507,7 +538,7 @@ void CNullDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
 //! draws an indexed triangle list
 inline void CNullDriver::drawIndexedTriangleList(const S3DVertex* vertices, u32 vertexCount, const u16* indexList, u32 triangleCount)
 {
-	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_STANDARD, scene::EPT_TRIANGLES);
+	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_STANDARD, scene::EPT_TRIANGLES, EIT_16BIT);
 }
 
 
@@ -515,7 +546,7 @@ inline void CNullDriver::drawIndexedTriangleList(const S3DVertex* vertices, u32
 //! draws an indexed triangle list
 inline void CNullDriver::drawIndexedTriangleList(const S3DVertex2TCoords* vertices, u32 vertexCount, const u16* indexList, u32 triangleCount)
 {
-	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_2TCOORDS, scene::EPT_TRIANGLES);
+	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_2TCOORDS, scene::EPT_TRIANGLES, EIT_16BIT);
 }
 
 
@@ -523,7 +554,7 @@ inline void CNullDriver::drawIndexedTriangleList(const S3DVertex2TCoords* vertic
 inline void CNullDriver::drawIndexedTriangleList(const S3DVertexTangents* vertices,
 	u32 vertexCount, const u16* indexList, u32 triangleCount)
 {
-	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_TANGENTS, scene::EPT_TRIANGLES);
+	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_TANGENTS, scene::EPT_TRIANGLES, EIT_16BIT);
 }
 
 
@@ -532,7 +563,7 @@ inline void CNullDriver::drawIndexedTriangleList(const S3DVertexTangents* vertic
 inline void CNullDriver::drawIndexedTriangleFan(const S3DVertex* vertices,
 	u32 vertexCount, const u16* indexList, u32 triangleCount)
 {
-	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_STANDARD, scene::EPT_TRIANGLE_FAN);
+	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_STANDARD, scene::EPT_TRIANGLE_FAN, EIT_16BIT);
 }
 
 
@@ -541,7 +572,7 @@ inline void CNullDriver::drawIndexedTriangleFan(const S3DVertex* vertices,
 inline void CNullDriver::drawIndexedTriangleFan(const S3DVertex2TCoords* vertices,
 	u32 vertexCount, const u16* indexList, u32 triangleCount)
 {
-	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_2TCOORDS, scene::EPT_TRIANGLE_FAN);
+	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_2TCOORDS, scene::EPT_TRIANGLE_FAN, EIT_16BIT);
 }
 
 
@@ -550,7 +581,7 @@ inline void CNullDriver::drawIndexedTriangleFan(const S3DVertex2TCoords* vertice
 inline void CNullDriver::drawIndexedTriangleFan(const S3DVertexTangents* vertices,
 	u32 vertexCount, const u16* indexList, u32 triangleCount)
 {
-	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_TANGENTS, scene::EPT_TRIANGLE_FAN);
+	drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_TANGENTS, scene::EPT_TRIANGLE_FAN, EIT_16BIT);
 }
 
 
@@ -637,13 +668,12 @@ void CNullDriver::draw2DImage(const video::ITexture* texture,
 //! Draws a part of the texture into the rectangle.
 void CNullDriver::draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
 	const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect,
-	video::SColor* colors, bool useAlphaChannelOfTexture)
+	const video::SColor* const colors, bool useAlphaChannelOfTexture)
 {
 }
 
 
-
-//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
+//! Draws a 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
 void CNullDriver::draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
 				const core::rect<s32>& sourceRect,
 				const core::rect<s32>* clipRect, SColor color,
@@ -652,8 +682,17 @@ void CNullDriver::draw2DImage(const video::ITexture* texture, const core::positi
 }
 
 
+//! Draws the outline of a 2d rectangle
+void CNullDriver::draw2DRectangleOutline(const core::recti& pos, SColor color)
+{
+	draw2DLine(pos.UpperLeftCorner, core::position2di(pos.LowerRightCorner.X, pos.UpperLeftCorner.Y), color);
+	draw2DLine(core::position2di(pos.LowerRightCorner.X, pos.UpperLeftCorner.Y), pos.LowerRightCorner, color);
+	draw2DLine(pos.LowerRightCorner, core::position2di(pos.UpperLeftCorner.X, pos.LowerRightCorner.Y), color);
+	draw2DLine(core::position2di(pos.UpperLeftCorner.X, pos.LowerRightCorner.Y), pos.UpperLeftCorner, color);
+}
 
-//! draw an 2d rectangle
+
+//! Draw a 2d rectangle
 void CNullDriver::draw2DRectangle(SColor color, const core::rect<s32>& pos, const core::rect<s32>* clip)
 {
 	draw2DRectangle(pos, color, color, color, color, clip);
@@ -661,7 +700,7 @@ void CNullDriver::draw2DRectangle(SColor color, const core::rect<s32>& pos, cons
 
 
 
-//!Draws an 2d rectangle with a gradient.
+//! Draws a 2d rectangle with a gradient.
 void CNullDriver::draw2DRectangle(const core::rect<s32>& pos,
 	SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
 	const core::rect<s32>* clip)
@@ -676,6 +715,10 @@ void CNullDriver::draw2DLine(const core::position2d<s32>& start,
 {
 }
 
+//! Draws a pixel
+void CNullDriver::drawPixel(u32 x, u32 y, const SColor & color)
+{
+}
 
 
 //! Draws a non filled concyclic regular 2d polyon.
@@ -705,6 +748,11 @@ void CNullDriver::draw2DPolygon(core::position2d<s32> center,
 }
 
 
+//! returns color format
+ECOLOR_FORMAT CNullDriver::getColorFormat() const
+{
+	return ECF_R5G6B5;
+}
 
 
 //! returns screen size
@@ -713,6 +761,7 @@ const core::dimension2d<s32>& CNullDriver::getScreenSize() const
 	return ScreenSize;
 }
 
+
 //! returns the current render target size,
 //! or the screen size if render targets are not implemented
 const core::dimension2d<s32>& CNullDriver::getCurrentRenderTargetSize() const
@@ -1141,7 +1190,7 @@ IImage* CNullDriver::createImageFromFile(const char* filename)
 		file->drop();
 	}
 	else
-		os::Printer::log("Could not open file of image", filename, ELL_ERROR);
+		os::Printer::log("Could not open file of image", filename, ELL_WARNING);
 
 	return image;
 }
@@ -1188,7 +1237,6 @@ IImage* CNullDriver::createImageFromFile(io::IReadFile* file)
 }
 
 
-
 //! Writes the provided image to disk file
 bool CNullDriver::writeImageToFile(IImage* image, const char* filename,u32 param)
 {
@@ -1210,7 +1258,6 @@ bool CNullDriver::writeImageToFile(IImage* image, const char* filename,u32 param
 }
 
 
-
 //! Creates a software image from a byte array.
 IImage* CNullDriver::createImageFromData(ECOLOR_FORMAT format,
 					const core::dimension2d<s32>& size,
@@ -1221,9 +1268,30 @@ IImage* CNullDriver::createImageFromData(ECOLOR_FORMAT format,
 }
 
 
+//! Creates an empty software image.
+IImage* CNullDriver::createImage(ECOLOR_FORMAT format, const core::dimension2d<s32>& size)
+{
+        return new CImage(format, size);
+}
+
+
+//! Creates a software image from another image.
+IImage* CNullDriver::createImage(ECOLOR_FORMAT format, IImage *imageToCopy)
+{
+        return new CImage(format, imageToCopy);
+}
+
+
+//! Creates a software image from part of another image.
+IImage* CNullDriver::createImage(IImage* imageToCopy, const core::position2d<s32>& pos, const core::dimension2d<s32>& size)
+{
+        return new CImage(imageToCopy, pos, size);
+}
+
+
 //! Sets the fog mode.
-void CNullDriver::setFog(SColor color, bool linearFog, f32 start, f32 end, f32 density,
-						bool pixelFog, bool rangeFog)
+void CNullDriver::setFog(SColor color, bool linearFog, f32 start, f32 end,
+		f32 density, bool pixelFog, bool rangeFog)
 {
 	FogColor = color;
 	LinearFog = linearFog;
@@ -1241,10 +1309,88 @@ void CNullDriver::drawMeshBuffer(const scene::IMeshBuffer* mb)
 	if (!mb)
 		return;
 
-	drawVertexPrimitiveList(mb->getVertices(), mb->getVertexCount(), mb->getIndices(), mb->getIndexCount()/3, mb->getVertexType(), scene::EPT_TRIANGLES);
+	//IVertexBuffer and IIndexBuffer later
+	SHWBufferLink *HWBuffer=getBufferLink(mb);
+
+	if (HWBuffer)
+		drawHardwareBuffer(HWBuffer);
+	else
+		drawVertexPrimitiveList(mb->getVertices(), mb->getVertexCount(), mb->getIndices(), mb->getIndexCount()/3, mb->getVertexType(), scene::EPT_TRIANGLES, mb->getIndexType());
 }
 
 
+CNullDriver::SHWBufferLink *CNullDriver::getBufferLink(const scene::IMeshBuffer* mb)
+{
+	if (!mb || !isHardwareBufferRecommend(mb))
+		return 0;
+
+	//search for hardware links
+	core::map< const scene::IMeshBuffer*,SHWBufferLink* >::Node* node = HWBufferMap.find(mb);
+	if (node)
+		return node->getValue();
+
+	return createHardwareBuffer(mb); //no hardware links, and mesh wants one, create it
+}
+
+
+//! Update all hardware buffers, remove unused ones
+void CNullDriver::updateAllHardwareBuffers()
+{
+	core::map<const scene::IMeshBuffer*,SHWBufferLink*>::ParentFirstIterator Iterator=HWBufferMap.getParentFirstIterator();
+
+	for (;!Iterator.atEnd();Iterator++)
+	{
+		SHWBufferLink *Link=Iterator.getNode()->getValue();
+
+		Link->LastUsed++;
+		if (Link->LastUsed>20000)
+		{
+			deleteHardwareBuffer(Link);
+
+			// todo: needs better fix
+			Iterator = HWBufferMap.getParentFirstIterator();
+		}
+	}
+}
+
+
+void CNullDriver::deleteHardwareBuffer(SHWBufferLink *HWBuffer)
+{
+	if (!HWBuffer)
+		return;
+	HWBufferMap.remove(HWBuffer->MeshBuffer);
+	delete HWBuffer;
+}
+
+
+//! Remove hardware buffer
+void CNullDriver::removeHardwareBuffer(const scene::IMeshBuffer* mb)
+{
+	core::map<const scene::IMeshBuffer*,SHWBufferLink*>::Node* node = HWBufferMap.find(mb);
+	if (node)
+		deleteHardwareBuffer(node->getValue());
+}
+
+
+//! Remove all hardware buffers
+void CNullDriver::removeAllHardwareBuffers()
+{
+	while (HWBufferMap.size())
+		deleteHardwareBuffer(HWBufferMap.getRoot()->getValue());
+}
+
+
+bool CNullDriver::isHardwareBufferRecommend(const scene::IMeshBuffer* mb)
+{
+	if (!mb || (mb->getHardwareMappingHint_Index()==scene::EHM_NEVER && mb->getHardwareMappingHint_Vertex()==scene::EHM_NEVER))
+		return false;
+
+	if (mb->getVertexCount()<500) //todo: tweak and make user definable
+		return false;
+
+	return true;
+}
+
 
 //! Only used by the internal engine. Used to notify the driver that
 //! the window was resized.
@@ -1257,6 +1403,7 @@ void CNullDriver::OnResize(const core::dimension2d<s32>& size)
 	ScreenSize = size;
 }
 
+
 // adds a material renderer and drops it afterwards. To be used for internal creation
 s32 CNullDriver::addAndDropMaterialRenderer(IMaterialRenderer* m)
 {
@@ -1323,7 +1470,7 @@ io::IAttributes* CNullDriver::createAttributesFromMaterial(const video::SMateria
 	core::stringc prefix="Texture";
 	u32 i;
 	for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-		attr->addTexture((prefix+(i+1)).c_str(), material.getTexture(i));
+		attr->addTexture((prefix+core::stringc(i+1)).c_str(), material.getTexture(i));
 
 	attr->addBool("Wireframe", material.Wireframe);
 	attr->addBool("GouraudShading", material.GouraudShading);
@@ -1331,21 +1478,22 @@ io::IAttributes* CNullDriver::createAttributesFromMaterial(const video::SMateria
 	attr->addBool("ZWriteEnable", material.ZWriteEnable);
 	attr->addInt("ZBuffer", material.ZBuffer);
 	attr->addBool("BackfaceCulling", material.BackfaceCulling);
+	attr->addBool("FrontfaceCulling", material.FrontfaceCulling);
 	attr->addBool("FogEnable", material.FogEnable);
 	attr->addBool("NormalizeNormals", material.NormalizeNormals);
 
 	prefix = "BilinearFilter";
 	for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-		attr->addBool((prefix+(i+1)).c_str(), material.TextureLayer[i].BilinearFilter);
+		attr->addBool((prefix+core::stringc(i+1)).c_str(), material.TextureLayer[i].BilinearFilter);
 	prefix = "TrilinearFilter";
 	for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-		attr->addBool((prefix+(i+1)).c_str(), material.TextureLayer[i].TrilinearFilter);
+		attr->addBool((prefix+core::stringc(i+1)).c_str(), material.TextureLayer[i].TrilinearFilter);
 	prefix = "AnisotropicFilter";
 	for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-		attr->addBool((prefix+(i+1)).c_str(), material.TextureLayer[i].AnisotropicFilter);
+		attr->addBool((prefix+core::stringc(i+1)).c_str(), material.TextureLayer[i].AnisotropicFilter);
 	prefix="TextureWrap";
 	for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-		attr->addEnum((prefix+(i+1)).c_str(), material.TextureLayer[i].TextureWrap, aTextureClampNames);
+		attr->addEnum((prefix+core::stringc(i+1)).c_str(), material.TextureLayer[i].TextureWrap, aTextureClampNames);
 
 	return attr;
 }
@@ -1378,14 +1526,15 @@ void CNullDriver::fillMaterialStructureFromAttributes(video::SMaterial& outMater
 
 	core::stringc prefix="Texture";
 	for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-		outMaterial.setTexture(i, attr->getAttributeAsTexture((prefix+(i+1)).c_str()));
+		outMaterial.setTexture(i, attr->getAttributeAsTexture((prefix+core::stringc(i+1)).c_str()));
 
 	outMaterial.Wireframe = attr->getAttributeAsBool("Wireframe");
 	outMaterial.GouraudShading = attr->getAttributeAsBool("GouraudShading");
 	outMaterial.Lighting = attr->getAttributeAsBool("Lighting");
 	outMaterial.ZWriteEnable = attr->getAttributeAsBool("ZWriteEnable");
-	outMaterial.ZBuffer = attr->getAttributeAsInt("ZBuffer");
+	outMaterial.ZBuffer = (char)attr->getAttributeAsInt("ZBuffer");
 	outMaterial.BackfaceCulling = attr->getAttributeAsBool("BackfaceCulling");
+	outMaterial.FrontfaceCulling = attr->getAttributeAsBool("FrontfaceCulling");
 	outMaterial.FogEnable = attr->getAttributeAsBool("FogEnable");
 	outMaterial.NormalizeNormals = attr->getAttributeAsBool("NormalizeNormals");
 	prefix = "BilinearFilter";
@@ -1393,25 +1542,25 @@ void CNullDriver::fillMaterialStructureFromAttributes(video::SMaterial& outMater
 		outMaterial.setFlag(EMF_BILINEAR_FILTER, attr->getAttributeAsBool(prefix.c_str()));
 	else
 		for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-			outMaterial.TextureLayer[i].BilinearFilter = attr->getAttributeAsBool((prefix+(i+1)).c_str());
+			outMaterial.TextureLayer[i].BilinearFilter = attr->getAttributeAsBool((prefix+core::stringc(i+1)).c_str());
 
 	prefix = "TrilinearFilter";
 	if (attr->existsAttribute(prefix.c_str())) // legacy
 		outMaterial.setFlag(EMF_TRILINEAR_FILTER, attr->getAttributeAsBool(prefix.c_str()));
 	else
 		for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-			outMaterial.TextureLayer[i].TrilinearFilter = attr->getAttributeAsBool((prefix+(i+1)).c_str());
+			outMaterial.TextureLayer[i].TrilinearFilter = attr->getAttributeAsBool((prefix+core::stringc(i+1)).c_str());
 
 	prefix = "AnisotropicFilter";
 	if (attr->existsAttribute(prefix.c_str())) // legacy
 		outMaterial.setFlag(EMF_ANISOTROPIC_FILTER, attr->getAttributeAsBool(prefix.c_str()));
 	else
 		for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-			outMaterial.TextureLayer[i].AnisotropicFilter = attr->getAttributeAsBool((prefix+(i+1)).c_str());
+			outMaterial.TextureLayer[i].AnisotropicFilter = attr->getAttributeAsBool((prefix+core::stringc(i+1)).c_str());
 
 	prefix = "TextureWrap";
 	for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-		outMaterial.TextureLayer[i].TextureWrap = (E_TEXTURE_CLAMP)attr->getAttributeAsEnumeration((prefix+(i+1)).c_str(), aTextureClampNames);
+		outMaterial.TextureLayer[i].TextureWrap = (E_TEXTURE_CLAMP)attr->getAttributeAsEnumeration((prefix+core::stringc(i+1)).c_str(), aTextureClampNames);
 }
 
 
@@ -1428,17 +1577,19 @@ E_DRIVER_TYPE CNullDriver::getDriverType() const
 	return EDT_NULL;
 }
 
+
 //! deletes all material renderers
 void CNullDriver::deleteMaterialRenders()
 {
 	// delete material renderers
-	for (int i=0; i<(int)MaterialRenderers.size(); ++i)
+	for (u32 i=0; i<MaterialRenderers.size(); ++i)
 		if (MaterialRenderers[i].Renderer)
 			MaterialRenderers[i].Renderer->drop();
 
 	MaterialRenderers.clear();
 }
 
+
 //! Returns pointer to material renderer or null
 IMaterialRenderer* CNullDriver::getMaterialRenderer(u32 idx)
 {
@@ -1449,7 +1600,6 @@ IMaterialRenderer* CNullDriver::getMaterialRenderer(u32 idx)
 }
 
 
-
 //! Returns amount of currently available material renderers.
 u32 CNullDriver::getMaterialRendererCount() const
 {
@@ -1473,6 +1623,7 @@ IGPUProgrammingServices* CNullDriver::getGPUProgrammingServices()
 	return 0;
 }
 
+
 //! Adds a new material renderer to the VideoDriver, based on a high level shading
 //! language. Currently only HLSL in D3D9 is supported.
 s32 CNullDriver::addHighLevelShaderMaterial(
@@ -1490,6 +1641,7 @@ s32 CNullDriver::addHighLevelShaderMaterial(
 	return -1;
 }
 
+
 //! Like IGPUProgrammingServices::addShaderMaterial() (look there for a detailed description),
 //! but tries to load the programs from files.
 s32 CNullDriver::addHighLevelShaderMaterialFromFiles(
@@ -1544,6 +1696,7 @@ s32 CNullDriver::addHighLevelShaderMaterialFromFiles(
 	return result;
 }
 
+
 //! Like IGPUProgrammingServices::addShaderMaterial() (look there for a detailed description),
 //! but tries to load the programs from files.
 s32 CNullDriver::addHighLevelShaderMaterialFromFiles(
@@ -1576,6 +1729,9 @@ s32 CNullDriver::addHighLevelShaderMaterialFromFiles(
 		const long size = pixelShaderProgram->getSize();
 		if (size)
 		{
+			// if both handles are the same we must reset the file
+			if (pixelShaderProgram==vertexShaderProgram)
+				pixelShaderProgram->seek(0);
 			ps = new c8[size+1];
 			pixelShaderProgram->read(ps, size);
 			ps[size] = 0;
@@ -1593,6 +1749,7 @@ s32 CNullDriver::addHighLevelShaderMaterialFromFiles(
 	return result;
 }
 
+
 //! Adds a new material renderer to the VideoDriver, using pixel and/or
 //! vertex shaders to render geometry.
 s32 CNullDriver::addShaderMaterial(const c8* vertexShaderProgram,
@@ -1605,6 +1762,7 @@ s32 CNullDriver::addShaderMaterial(const c8* vertexShaderProgram,
 	return -1;
 }
 
+
 //! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the
 //! programs from files.
 s32 CNullDriver::addShaderMaterialFromFiles(io::IReadFile* vertexShaderProgram,
@@ -1647,7 +1805,6 @@ s32 CNullDriver::addShaderMaterialFromFiles(io::IReadFile* vertexShaderProgram,
 }
 
 
-
 //! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the
 //! programs from files.
 s32 CNullDriver::addShaderMaterialFromFiles(const c8* vertexShaderProgramFileName,
@@ -1695,23 +1852,35 @@ s32 CNullDriver::addShaderMaterialFromFiles(const c8* vertexShaderProgramFileNam
 	return result;
 }
 
+
 //! Creates a render target texture.
-ITexture* CNullDriver::createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name)
+ITexture* CNullDriver::addRenderTargetTexture(const core::dimension2d<s32>& size,
+		const c8* name)
 {
 	return 0;
 }
 
+
 //! Clears the ZBuffer.
 void CNullDriver::clearZBuffer()
 {
 }
 
+
+//! Returns a pointer to the mesh manipulator.
+scene::IMeshManipulator* CNullDriver::getMeshManipulator()
+{
+	return MeshManipulator;
+}
+
+
 //! Returns an image created from the last rendered frame.
 IImage* CNullDriver::createScreenShot()
 {
 	return 0;
 }
 
+
 // prints renderer version
 void CNullDriver::printVersion()
 {
@@ -1724,7 +1893,17 @@ void CNullDriver::printVersion()
 //! creates a video driver
 IVideoDriver* createNullDriver(io::IFileSystem* io, const core::dimension2d<s32>& screenSize)
 {
-	return new CNullDriver(io, screenSize);
+	CNullDriver* nullDriver = new CNullDriver(io, screenSize);
+
+	// create empty material renderers
+	for(u32 i=0; sBuiltInMaterialTypeNames[i]; ++i)
+	{
+		IMaterialRenderer* imr = new IMaterialRenderer();
+		nullDriver->addMaterialRenderer(imr);
+		imr->drop();
+	}
+
+	return nullDriver;
 }
 
 
@@ -1738,6 +1917,7 @@ bool CNullDriver::setClipPlane(u32 index, const core::plane3df& plane, bool enab
 	return false;
 }
 
+
 //! Enable/disable a clipping plane.
 //! There are at least 6 clipping planes available for the user to set at will.
 //! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
@@ -1748,6 +1928,14 @@ void CNullDriver::enableClipPlane(u32 index, bool enable)
 }
 
 
-} // end namespace
-} // end namespace
+ITexture* CNullDriver::createRenderTargetTexture(const core::dimension2d<s32>& size,
+		const c8* name)
+{
+	os::Printer::log("createRenderTargetTexture is deprecated, use addRenderTargetTexture instead");
+	ITexture* tex = addRenderTargetTexture(size, name);
+	tex->grab();
+	return tex;
+}
 
+} // end namespace
+} // end namespace
diff --git a/src/dep/src/irrlicht/CNullDriver.h b/src/dep/src/irrlicht/CNullDriver.h
index ce08f73..b85785f 100644
--- a/src/dep/src/irrlicht/CNullDriver.h
+++ b/src/dep/src/irrlicht/CNullDriver.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,10 +11,12 @@
 #include "IGPUProgrammingServices.h"
 #include "irrArray.h"
 #include "irrString.h"
+#include "irrMap.h"
 #include "IAttributes.h"
 #include "IMeshBuffer.h"
 #include "CFPSCounter.h"
 #include "S3DVertex.h"
+#include "SVertexIndex.h"
 #include "SLight.h"
 #include "SExposedVideoData.h"
 
@@ -30,6 +32,8 @@ namespace video
 	class IImageLoader;
 	class IImageWriter;
 
+
+
 	class CNullDriver : public IVideoDriver, public IGPUProgrammingServices
 	{
 	public:
@@ -40,9 +44,15 @@ namespace video
 		//! destructor
 		virtual ~CNullDriver();
 
-		virtual bool beginScene(bool backBuffer, bool zBuffer, SColor color);
+		virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
+				SColor color=SColor(255,0,0,0),
+				void* windowId=0,
+				core::rect<s32>* sourceRect=0);
 
-		virtual bool endScene( s32 windowId = 0, core::rect<s32>* sourceRect=0 );
+		virtual bool endScene();
+
+		//! Disable a feature of the driver.
+		virtual void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag=true);
 
 		//! queries the features of the driver, returns true if feature is available
 		virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const;
@@ -56,6 +66,10 @@ namespace video
 		//! loads a Texture
 		virtual ITexture* getTexture(const c8* filename);
 
+		//! loads a Texture
+		virtual ITexture* getTexture(const core::stringc& filename)
+		{ return getTexture(filename.c_str()); }
+
 		//! loads a Texture
 		virtual ITexture* getTexture(io::IReadFile* file);
 
@@ -72,8 +86,8 @@ namespace video
 		virtual ITexture* addTexture(const core::dimension2d<s32>& size, const c8* name, ECOLOR_FORMAT format = ECF_A8R8G8B8);
 
 		//! sets a render target
-		virtual bool setRenderTarget(video::ITexture* texture, bool clearBackBuffer, 
-						 bool clearZBuffer, SColor color);
+		virtual bool setRenderTarget(video::ITexture* texture, bool clearBackBuffer,
+						bool clearZBuffer, SColor color);
 
 		//! sets a viewport
 		virtual void setViewPort(const core::rect<s32>& area);
@@ -82,7 +96,9 @@ namespace video
 		virtual const core::rect<s32>& getViewPort() const;
 
 		//! draws a vertex primitive list
-		virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType);
+		virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
+				const void* indexList, u32 primitiveCount,
+				E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
 
 		//! draws an indexed triangle list
 		virtual void drawIndexedTriangleList(const S3DVertex* vertices, u32 vertexCount, const u16* indexList, u32 triangleCount);
@@ -147,44 +163,53 @@ namespace video
 				SColor color=SColor(255,255,255,255),
 				bool useAlphaChannelOfTexture=false);
 
-		//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
-		virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos, 
+		//! Draws a 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
+		virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
 			const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
 			SColor color=SColor(255,255,255,255), bool useAlphaChannelOfTexture=false);
 
 		//! Draws a part of the texture into the rectangle.
 		virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
 			const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
-			video::SColor* colors=0, bool useAlphaChannelOfTexture=false);
+			const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false);
 
-		//! draw an 2d rectangle
+		//! Draws a 2d rectangle
 		virtual void draw2DRectangle(SColor color, const core::rect<s32>& pos, const core::rect<s32>* clip = 0);
 
-		//!Draws an 2d rectangle with a gradient.
+		//! Draws a 2d rectangle with a gradient.
 		virtual void draw2DRectangle(const core::rect<s32>& pos,
 			SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
 			const core::rect<s32>* clip = 0);
 
-		//! Draws a 2d line. 
+		//! Draws the outline of a 2d rectangle
+		virtual void draw2DRectangleOutline(const core::recti& pos, SColor color=SColor(255,255,255,255));
+
+		//! Draws a 2d line.
 		virtual void draw2DLine(const core::position2d<s32>& start,
 					const core::position2d<s32>& end,
 					SColor color=SColor(255,255,255,255));
 
+		//! Draws a pixel
+		virtual void drawPixel(u32 x, u32 y, const SColor & color); 
+
 		//! Draws a non filled concyclic reqular 2d polyon.
-		virtual void draw2DPolygon(core::position2d<s32> center, 
+		virtual void draw2DPolygon(core::position2d<s32> center,
 			f32 radius, video::SColor Color, s32 vertexCount);
 
 		virtual void setFog(SColor color=SColor(0,255,255,255), bool linearFog=true,
-			f32 start=50.0f, f32 end=100.0f, 
+			f32 start=50.0f, f32 end=100.0f,
 			f32 density=0.01f, bool pixelFog=false, bool rangeFog=false);
 
-		//! returns screen size
+		//! get color format of the current color buffer
+		virtual ECOLOR_FORMAT getColorFormat() const;
+
+		//! get screen size
 		virtual const core::dimension2d<s32>& getScreenSize() const;
 
-		//! returns screen size
+		//! get render target size
 		virtual const core::dimension2d<s32>& getCurrentRenderTargetSize() const;
 
-		// returns current frames per second value
+		// get current frames per second value
 		virtual s32 getFPS() const;
 
 		//! returns amount of primitives (mostly triangles) were drawn in the last frame.
@@ -222,9 +247,9 @@ namespace video
 
 		//! Fills the stencil shadow with color. After the shadow volume has been drawn
 		//! into the stencil buffer using IVideoDriver::drawStencilShadowVolume(), use this
-		//! to draw the color of the shadow. 
-		virtual void drawStencilShadow(bool clearStencilBuffer=false, 
-			video::SColor leftUpEdge = video::SColor(0,0,0,0), 
+		//! to draw the color of the shadow.
+		virtual void drawStencilShadow(bool clearStencilBuffer=false,
+			video::SColor leftUpEdge = video::SColor(0,0,0,0),
 			video::SColor rightUpEdge = video::SColor(0,0,0,0),
 			video::SColor leftDownEdge = video::SColor(0,0,0,0),
 			video::SColor rightDownEdge = video::SColor(0,0,0,0));
@@ -240,15 +265,16 @@ namespace video
 		virtual const SLight& getDynamicLight(u32 idx) const;
 
 		//! Removes a texture from the texture cache and deletes it, freeing lot of
-		//! memory. 
+		//! memory.
 		virtual void removeTexture(ITexture* texture);
 
 		//! Removes all texture from the texture cache and deletes them, freeing lot of
-		//! memory. 
+		//! memory.
 		virtual void removeAllTextures();
 
 		//! Creates a render target texture.
-		virtual ITexture* createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name);
+		virtual ITexture* addRenderTargetTexture(const core::dimension2d<s32>& size,
+				const c8* name);
 
 		//! Creates an 1bit alpha channel of the texture based of an color key.
 		virtual void makeColorKeyTexture(video::ITexture* texture, video::SColor color) const;
@@ -256,7 +282,7 @@ namespace video
 		//! Creates an 1bit alpha channel of the texture based of an color key position.
 		virtual void makeColorKeyTexture(video::ITexture* texture, core::position2d<s32> colorKeyPixelPos) const;
 
-		//! Creates a normal map from a height map texture. 
+		//! Creates a normal map from a height map texture.
 		//! \param amplitude: Constant value by which the height information is multiplied.
 		virtual void makeNormalMapTexture(video::ITexture* texture, f32 amplitude=1.0f) const;
 
@@ -271,25 +297,89 @@ namespace video
 		//! Returns if a texture creation flag is enabled or disabled.
 		virtual bool getTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag) const;
 
-		//! Creates a software image from a file. 
+		//! Creates a software image from a file.
 		virtual IImage* createImageFromFile(const char* filename);
 
-		//! Creates a software image from a file. 
+		//! Creates a software image from a file.
 		virtual IImage* createImageFromFile(io::IReadFile* file);
 
 		//! Creates a software image from a byte array.
-		//! \param useForeignMemory: If true, the image will use the data pointer
-		//! directly and own it from now on, which means it will also try to delete [] the
-		//! data when the image will be destructed. If false, the memory will by copied.
-		virtual IImage* createImageFromData(ECOLOR_FORMAT format, 
+		/** \param useForeignMemory: If true, the image will use the data pointer
+		directly and own it from now on, which means it will also try to delete [] the
+		data when the image will be destructed. If false, the memory will by copied. */
+		virtual IImage* createImageFromData(ECOLOR_FORMAT format,
 			const core::dimension2d<s32>& size, void *data,
 			bool ownForeignMemory=true, bool deleteForeignMemory = true);
 
+		//! Creates an empty software image.
+		virtual IImage* createImage(ECOLOR_FORMAT format, const core::dimension2d<s32>& size);
+
+
+		//! Creates a software image from another image.
+		virtual IImage* createImage(ECOLOR_FORMAT format, IImage *imageToCopy);
+
+		//! Creates a software image from part of another image.
+		virtual IImage* createImage(IImage* imageToCopy,
+				const core::position2d<s32>& pos,
+				const core::dimension2d<s32>& size);
+
 		//! Draws a mesh buffer
 		virtual void drawMeshBuffer(const scene::IMeshBuffer* mb);
 
-		//! Only used by the internal engine. Used to notify the driver that
-		//! the window was resized.
+	protected:
+		struct SHWBufferLink
+		{
+			SHWBufferLink(const scene::IMeshBuffer *_MeshBuffer):MeshBuffer(_MeshBuffer),ChangedID_Vertex(0),ChangedID_Index(0),LastUsed(0),Mapped_Vertex(scene::EHM_NEVER),Mapped_Index(scene::EHM_NEVER)
+			{
+				if (MeshBuffer)
+					MeshBuffer->grab();
+			}
+
+			virtual ~SHWBufferLink()
+			{
+				if (MeshBuffer)
+					MeshBuffer->drop();
+			}
+
+			scene::E_BUFFER_TYPE Contains;
+			const scene::IMeshBuffer *MeshBuffer;
+			u32 ChangedID_Vertex;
+			u32 ChangedID_Index;
+			u32 LastUsed;
+			scene::E_HARDWARE_MAPPING Mapped_Vertex;
+			scene::E_HARDWARE_MAPPING Mapped_Index;
+		};
+
+		//! Gets hardware buffer link from a meshbuffer (may create or update buffer)
+		virtual SHWBufferLink *getBufferLink(const scene::IMeshBuffer* mb);
+
+		//! updates hardware buffer if needed  (only some drivers can)
+		virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) {return false;}
+
+		//! Create hardware buffer from mesh (only some drivers can)
+		virtual SHWBufferLink *createHardwareBuffer(const scene::IMeshBuffer* mb) {return 0;}
+
+		//! Draw hardware buffer (only some drivers can)
+		virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) {}
+
+		//! Update all hardware buffers, remove unused ones
+		virtual void updateAllHardwareBuffers();
+
+		//! Delete hardware buffer
+		virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer);
+
+		//! Remove hardware buffer
+		virtual void removeHardwareBuffer(const scene::IMeshBuffer* mb);
+
+		//! Remove all hardware buffers
+		virtual void removeAllHardwareBuffers();
+
+		//! is vbo recommended on this mesh?
+		virtual bool isHardwareBufferRecommend(const scene::IMeshBuffer* mb);
+
+	public:
+		//! Only used by the engine internally.
+		/** Used to notify the driver that the window was resized. */
 		virtual void OnResize(const core::dimension2d<s32>& size);
 
 		//! Adds a new material renderer to the video device.
@@ -307,8 +397,8 @@ namespace video
 
 		//! Returns pointer to the IGPUProgrammingServices interface.
 		virtual IGPUProgrammingServices* getGPUProgrammingServices();
-		
-		//! Adds a new material renderer to the VideoDriver, using pixel and/or 
+
+		//! Adds a new material renderer to the VideoDriver, using pixel and/or
 		//! vertex shaders to render geometry.
 		virtual s32 addShaderMaterial(const c8* vertexShaderProgram = 0,
 			const c8* pixelShaderProgram = 0,
@@ -316,7 +406,7 @@ namespace video
 			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
 			s32 userData=0);
 
-		//! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the 
+		//! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the
 		//! programs from files.
 		virtual s32 addShaderMaterialFromFiles(io::IReadFile* vertexShaderProgram = 0,
 			io::IReadFile* pixelShaderProgram = 0,
@@ -324,7 +414,7 @@ namespace video
 			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
 			s32 userData=0);
 
-		//! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the 
+		//! Like IGPUProgrammingServices::addShaderMaterial(), but tries to load the
 		//! programs from files.
 		virtual s32 addShaderMaterialFromFiles(const c8* vertexShaderProgramFileName = 0,
 			const c8* pixelShaderProgramFileName = 0,
@@ -341,46 +431,49 @@ namespace video
 		//! Returns name of the material renderer
 		virtual const char* getMaterialRendererName(u32 idx) const;
 
-		//! Adds a new material renderer to the VideoDriver, based on a high level shading 
-		//! language. Currently only HLSL in D3D9 is supported. 
+		//! Adds a new material renderer to the VideoDriver, based on a high level shading
+		//! language. Currently only HLSL in D3D9 is supported.
 		virtual s32 addHighLevelShaderMaterial(
 			const c8* vertexShaderProgram,
 			const c8* vertexShaderEntryPointName = 0,
 			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-			const c8* pixelShaderProgram = 0, 
+			const c8* pixelShaderProgram = 0,
 			const c8* pixelShaderEntryPointName = 0,
 			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
 			IShaderConstantSetCallBack* callback = 0,
 			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-			s32 userData=0);   
+			s32 userData=0);
 
 		//! Like IGPUProgrammingServices::addShaderMaterial() (look there for a detailed description),
-		//! but tries to load the programs from files. 
+		//! but tries to load the programs from files.
 		virtual s32 addHighLevelShaderMaterialFromFiles(
 			const c8* vertexShaderProgram,
 			const c8* vertexShaderEntryPointName = "main",
 			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-			const c8* pixelShaderProgram = 0, 
+			const c8* pixelShaderProgram = 0,
 			const c8* pixelShaderEntryPointName = "main",
 			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
 			IShaderConstantSetCallBack* callback = 0,
 			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-			s32 userData=0); 
+			s32 userData=0);
 
 		//! Like IGPUProgrammingServices::addShaderMaterial() (look there for a detailed description),
-		//! but tries to load the programs from files. 
+		//! but tries to load the programs from files.
 		virtual s32 addHighLevelShaderMaterialFromFiles(
 			io::IReadFile* vertexShaderProgram,
 			const c8* vertexShaderEntryPointName = "main",
 			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-			io::IReadFile* pixelShaderProgram = 0, 
+			io::IReadFile* pixelShaderProgram = 0,
 			const c8* pixelShaderEntryPointName = "main",
 			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
 			IShaderConstantSetCallBack* callback = 0,
 			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-			s32 userData=0); 
+			s32 userData=0);
 
-		//! Clears the ZBuffer. 
+		//! Returns a pointer to the mesh manipulator.
+		virtual scene::IMeshManipulator* getMeshManipulator();
+
+		//! Clears the ZBuffer.
 		virtual void clearZBuffer();
 
 		//! Returns an image created from the last rendered frame.
@@ -389,7 +482,7 @@ namespace video
 		//! Writes the provided image to disk file
 		virtual bool writeImageToFile(IImage* image, const char* filename, u32 param = 0);
 
-		//! Sets the name of a material renderer. 
+		//! Sets the name of a material renderer.
 		virtual void setMaterialRendererName(s32 idx, const char* name);
 
 		//! Creates material attributes list from a material, usable for serialization and more.
@@ -414,6 +507,18 @@ namespace video
 		//! \param enable: If true, enable the clipping plane else disable it.
 		virtual void enableClipPlane(u32 index, bool enable);
 
+		//! Returns the graphics card vendor name.
+		virtual core::stringc getVendorInfo() {return "Not available on this driver.";}
+
+		//! Only used by the engine internally.
+		virtual void setAllowZWriteOnTransparent(bool flag)
+		{ AllowZWriteOnTransparent=flag; }
+
+		//! deprecated method
+		virtual ITexture* createRenderTargetTexture(const core::dimension2d<s32>& size,
+				const c8* name=0);
+
+		virtual bool checkDriverReset() {return false;}
 	protected:
 
 		//! deletes all textures
@@ -457,7 +562,7 @@ namespace video
 		{
 			if (x < 0) x = pitch-1; if (x >= pitch) x = 0;
 			if (y < 0) y = height-1; if (y >= height) y = 0;
-			
+
 			return (f32) getAverage ( p[(y * pitch) + x] );
 		}
 
@@ -481,7 +586,7 @@ namespace video
 		{
 			SDummyTexture(const char* name) : ITexture(name), size(0,0) {};
 
-			virtual void* lock() { return 0; };
+			virtual void* lock(bool readOnly = false) { return 0; };
 			virtual void unlock(){}
 			virtual const core::dimension2d<s32>& getOriginalSize() const { return size; }
 			virtual const core::dimension2d<s32>& getSize() const { return size; }
@@ -492,14 +597,22 @@ namespace video
 			core::dimension2d<s32> size;
 		};
 
+
+
 		core::array<SSurface> Textures;
 		core::array<video::IImageLoader*> SurfaceLoader;
 		core::array<video::IImageWriter*> SurfaceWriter;
 		core::array<SLight> Lights;
 		core::array<SMaterialRenderer> MaterialRenderers;
 
+		//core::array<SHWBufferLink*> HWBufferLinks;
+		core::map< const scene::IMeshBuffer* , SHWBufferLink* > HWBufferMap;
+
 		io::IFileSystem* FileSystem;
 
+		//! mesh manipulator
+		scene::IMeshManipulator* MeshManipulator;
+
 		core::rect<s32> ViewPort;
 		core::dimension2d<s32> ScreenSize;
 		core::matrix4 TransformationMatrix;
@@ -510,15 +623,19 @@ namespace video
 
 		u32 TextureCreationFlags;
 
-		bool LinearFog;
 		f32 FogStart;
 		f32 FogEnd;
 		f32 FogDensity;
+		SColor FogColor;
+		bool LinearFog;
 		bool PixelFog;
 		bool RangeFog;
-		SColor FogColor;
+
+		bool AllowZWriteOnTransparent;
 
 		SExposedVideoData ExposedData;
+
+		bool FeatureEnabled[video::EVDF_COUNT];
 	};
 
 } // end namespace video
@@ -527,3 +644,5 @@ namespace video
 
 #endif
 
+
+
diff --git a/src/dep/src/irrlicht/COBJMeshFileLoader.cpp b/src/dep/src/irrlicht/COBJMeshFileLoader.cpp
index 6cc63c8..8734125 100644
--- a/src/dep/src/irrlicht/COBJMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/COBJMeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,43 +6,45 @@
 #ifdef _IRR_COMPILE_WITH_OBJ_LOADER_
 
 #include "COBJMeshFileLoader.h"
+#include "IMeshManipulator.h"
+#include "IVideoDriver.h"
 #include "SMesh.h"
 #include "SMeshBuffer.h"
 #include "SAnimatedMesh.h"
 #include "IReadFile.h"
+#include "IAttributes.h"
 #include "fast_atof.h"
 #include "coreutil.h"
+#include "os.h"
 
 namespace irr
 {
 namespace scene
 {
 
+#ifdef _DEBUG
+#define _IRR_DEBUG_OBJ_LOADER_
+#endif
+
+static const u32 WORD_BUFFER_LENGTH = 512;
+
 //! Constructor
-COBJMeshFileLoader::COBJMeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver)
-: FileSystem(fs), Driver(driver)
+COBJMeshFileLoader::COBJMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs)
+: SceneManager(smgr), FileSystem(fs)
 {
 	if (FileSystem)
 		FileSystem->grab();
-
-	if (Driver)
-		Driver->grab();
 }
 
 
-
 //! destructor
 COBJMeshFileLoader::~COBJMeshFileLoader()
 {
 	if (FileSystem)
 		FileSystem->drop();
-
-	if (Driver)
-		Driver->drop();
 }
 
 
-
 //! returns true if the file maybe is able to be loaded by this class
 //! based on the file extension (e.g. ".bsp")
 bool COBJMeshFileLoader::isALoadableFileExtension(const c8* filename) const
@@ -51,7 +53,6 @@ bool COBJMeshFileLoader::isALoadableFileExtension(const c8* filename) const
 }
 
 
-
 //! creates/loads an animated mesh from the file.
 //! \return Pointer to the created mesh. Returns 0 if loading failed.
 //! If you no longer need the mesh, you should call IAnimatedMesh::drop().
@@ -64,51 +65,38 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 
 	const u32 WORD_BUFFER_LENGTH = 512;
 
-	SMesh* mesh = new SMesh();
-
 	core::array<core::vector3df> vertexBuffer;
-	core::array<core::vector2df> textureCoordBuffer;
 	core::array<core::vector3df> normalsBuffer;
+	core::array<core::vector2df> textureCoordBuffer;
+
 	SObjMtl * currMtl = new SObjMtl();
-	currMtl->name="";
-	materials.push_back(currMtl);
+	Materials.push_back(currMtl);
 	u32 smoothingGroup=0;
 
-	// ********************************************************************
-	// Patch to locate the file in the same folder as the .obj.
-	// If you load the file as "data/some.obj" and mtllib contains
-	// "mtlname test.mtl" (as usual), the loading will fail. Instead it
-	// must look for data/test.tml. This patch does exactly that.
-	//
-	// patch by mandrav@codeblocks.org
-	// ********************************************************************
-	core::stringc obj_fullname = file->getFileName();
-	core::stringc obj_relpath = "";
-	s32 pathend = obj_fullname.findLast('/');
-	if (pathend == -1)
-		pathend = obj_fullname.findLast('\\');
-	if (pathend != -1)
-		obj_relpath = obj_fullname.subString(0, pathend + 1);
-	// ********************************************************************
-	// end of mtl folder patch
-	// ********************************************************************
+	const core::stringc fullName = file->getFileName();
+	const core::stringc relPath = FileSystem->getFileDir(fullName)+"/";
 
-	c8* pBuf = new c8[filesize];
-	memset(pBuf, 0, filesize);
-	file->read((void*)pBuf, filesize);
-	const c8* const pBufEnd = pBuf+filesize;
+	c8* buf = new c8[filesize];
+	memset(buf, 0, filesize);
+	file->read((void*)buf, filesize);
+	const c8* const bufEnd = buf+filesize;
 
 	// Process obj information
-	const c8* bufPtr = pBuf;
-	while(bufPtr != pBufEnd)
+	const c8* bufPtr = buf;
+	core::stringc grpName;
+	bool useGroups = !SceneManager->getParameters()->getAttributeAsBool(OBJ_LOADER_IGNORE_GROUPS);
+	while(bufPtr != bufEnd)
 	{
 		switch(bufPtr[0])
 		{
 		case 'm':	// mtllib (material)
 		{
 			c8 name[WORD_BUFFER_LENGTH];
-			bufPtr = goAndCopyNextWord(name, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-			readMTL(name, obj_relpath);
+			bufPtr = goAndCopyNextWord(name, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+#ifdef _IRR_DEBUG_OBJ_LOADER_
+	os::Printer::log("Reading material file",name);
+#endif
+			readMTL(name, relPath);
 		}
 			break;
 
@@ -118,7 +106,7 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 			case ' ':          // vertex
 				{
 					core::vector3df vec;
-					bufPtr = readVec3(bufPtr, vec, pBufEnd);
+					bufPtr = readVec3(bufPtr, vec, bufEnd);
 					vertexBuffer.push_back(vec);
 				}
 				break;
@@ -126,7 +114,7 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 			case 'n':       // normal
 				{
 					core::vector3df vec;
-					bufPtr = readVec3(bufPtr, vec, pBufEnd);
+					bufPtr = readVec3(bufPtr, vec, bufEnd);
 					normalsBuffer.push_back(vec);
 				}
 				break;
@@ -134,22 +122,37 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 			case 't':       // texcoord
 				{
 					core::vector2df vec;
-					bufPtr = readVec2(bufPtr, vec, pBufEnd);
+					bufPtr = readUV(bufPtr, vec, bufEnd);
 					textureCoordBuffer.push_back(vec);
 				}
 				break;
 			}
 			break;
 
-		case 'g': // group names skipped
+		case 'g': // group name
 			{
+				c8 grp[WORD_BUFFER_LENGTH];
+				bufPtr = goAndCopyNextWord(grp, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+#ifdef _IRR_DEBUG_OBJ_LOADER_
+	os::Printer::log("Loaded group start",grp);
+#endif
+				if (useGroups)
+				{
+					if (0 != grp[0])
+						grpName = grp;
+					else
+						grpName = "default";
+				}
 			}
 			break;
 
 		case 's': // smoothing can be a group or off (equiv. to 0)
 			{
 				c8 smooth[WORD_BUFFER_LENGTH];
-				bufPtr = goAndCopyNextWord(smooth, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
+				bufPtr = goAndCopyNextWord(smooth, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+#ifdef _IRR_DEBUG_OBJ_LOADER_
+	os::Printer::log("Loaded smoothing group start",smooth);
+#endif
 				if (core::stringc("off")==smooth)
 					smoothingGroup=0;
 				else
@@ -161,12 +164,15 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 			// get name of material
 			{
 				c8 matName[WORD_BUFFER_LENGTH];
-				bufPtr = goAndCopyNextWord(matName, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
+				bufPtr = goAndCopyNextWord(matName, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+#ifdef _IRR_DEBUG_OBJ_LOADER_
+	os::Printer::log("Loaded material start",matName);
+#endif
 				// retrieve the material
-				SObjMtl *pUseMtl = findMtl(matName);
+				SObjMtl *useMtl = findMtl(matName, grpName);
 				// only change material if we found it
-				if (pUseMtl)
-					currMtl = pUseMtl;
+				if (useMtl)
+					currMtl = useMtl;
 			}
 			break;
 
@@ -174,18 +180,18 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 		{
 			c8 vertexWord[WORD_BUFFER_LENGTH]; // for retrieving vertex data
 			video::S3DVertex v;
-			u32 currentVertexCount = currMtl->Meshbuffer->Vertices.size();
-			u32 facePointCount = 0;	// number of vertices in this face
-
 			// Assign vertex color from currently active material's diffuse colour
 			if (currMtl)
 				v.Color = currMtl->Meshbuffer->Material.DiffuseColor;
 
 			// get all vertices data in this face (current line of obj file)
-			const core::stringc wordBuffer = copyLine(bufPtr, pBufEnd);
+			const core::stringc wordBuffer = copyLine(bufPtr, bufEnd);
 			const c8* linePtr = wordBuffer.c_str();
 			const c8* const endPtr = linePtr+wordBuffer.size();
 
+			core::array<int> faceCorners;
+			faceCorners.reallocate(32); // should be large enough
+
 			// read in all vertices
 			linePtr = goNextWord(linePtr, endPtr);
 			while (0 != linePtr[0])
@@ -197,7 +203,7 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 				Idx[1] = Idx[2] = -1;
 
 				// read in next vertex's data
-				u32 wlength = copyWord(vertexWord, linePtr, WORD_BUFFER_LENGTH, pBufEnd);
+				u32 wlength = copyWord(vertexWord, linePtr, WORD_BUFFER_LENGTH, bufEnd);
 				// this function will also convert obj's 1-based index to c++'s 0-based index
 				retrieveVertexIndices(vertexWord, Idx, vertexWord+wlength+1, vertexBuffer.size(), textureCoordBuffer.size(), normalsBuffer.size());
 				v.Pos = vertexBuffer[Idx[0]];
@@ -208,25 +214,40 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 				if ( -1 != Idx[2] )
 					v.Normal = normalsBuffer[Idx[2]];
 				else
+				{
 					v.Normal.set(0.0f,0.0f,0.0f);
-				currMtl->Meshbuffer->Vertices.push_back(v);
-				++facePointCount;
+					currMtl->RecalculateNormals=true;
+				}
+
+				int vertLocation;
+				core::map<video::S3DVertex, int>::Node* n = currMtl->VertMap.find(v);
+				if (n)
+				{
+					vertLocation = n->getValue();
+				}
+				else
+				{
+					currMtl->Meshbuffer->Vertices.push_back(v);
+					vertLocation = currMtl->Meshbuffer->Vertices.size() -1;
+					currMtl->VertMap.insert(v, vertLocation);
+				}
+				
+				faceCorners.push_back(vertLocation);
 
 				// go to next vertex
 				linePtr = goNextWord(linePtr, endPtr);
 			}
 
-			// Add indices for first 3 vertices
-			currMtl->Meshbuffer->Indices.push_back( currentVertexCount );
-			currMtl->Meshbuffer->Indices.push_back( ( facePointCount - 1 ) + currentVertexCount );
-			currMtl->Meshbuffer->Indices.push_back( ( facePointCount - 2 ) + currentVertexCount );
-			// Add indices for subsequent vertices
-			for ( u32 i = 0; i < facePointCount - 3; ++i )
+			// triangulate the face
+			for ( u32 i = 1; i < faceCorners.size() - 1; ++i )
 			{
-				currMtl->Meshbuffer->Indices.push_back( currentVertexCount );
-				currMtl->Meshbuffer->Indices.push_back( ( facePointCount - 2 - i ) + currentVertexCount );
-				currMtl->Meshbuffer->Indices.push_back( ( facePointCount - 3 - i ) + currentVertexCount );
+				// Add a triangle
+				currMtl->Meshbuffer->Indices.push_back( faceCorners[i+1] );
+				currMtl->Meshbuffer->Indices.push_back( faceCorners[i] );
+				currMtl->Meshbuffer->Indices.push_back( faceCorners[0] );
 			}
+			faceCorners.set_used(0); // fast clear
+			faceCorners.reallocate(32);
 		}
 		break;
 
@@ -235,260 +256,323 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 			break;
 		}	// end switch(bufPtr[0])
 		// eat up rest of line
-		bufPtr = goNextLine(bufPtr, pBufEnd);
-	}	// end while(bufPtr && (bufPtr-pBuf<filesize))
+		bufPtr = goNextLine(bufPtr, bufEnd);
+	}	// end while(bufPtr && (bufPtr-buf<filesize))
+
+	SMesh* mesh = new SMesh();
 
 	// Combine all the groups (meshbuffers) into the mesh
-	for ( u32 m = 0; m < materials.size(); ++m )
+	for ( u32 m = 0; m < Materials.size(); ++m )
 	{
-		if ( materials[m]->Meshbuffer->getIndexCount() > 0 )
+		if ( Materials[m]->Meshbuffer->getIndexCount() > 0 )
 		{
-			materials[m]->Meshbuffer->recalculateBoundingBox();
-			mesh->addMeshBuffer( materials[m]->Meshbuffer );
+			Materials[m]->Meshbuffer->recalculateBoundingBox();
+			if (Materials[m]->RecalculateNormals)
+				SceneManager->getMeshManipulator()->recalculateNormals(Materials[m]->Meshbuffer);
+			if (Materials[m]->Meshbuffer->Material.MaterialType == video::EMT_PARALLAX_MAP_SOLID)
+			{
+				SMesh tmp;
+				tmp.addMeshBuffer(Materials[m]->Meshbuffer);
+				IMesh* tangentMesh = SceneManager->getMeshManipulator()->createMeshWithTangents(&tmp);
+				mesh->addMeshBuffer(tangentMesh->getMeshBuffer(0));
+				tangentMesh->drop();
+			}
+			else
+				mesh->addMeshBuffer( Materials[m]->Meshbuffer );
 		}
 	}
 
 	// Create the Animated mesh if there's anything in the mesh
-	SAnimatedMesh* pAM = 0;
+	SAnimatedMesh* animMesh = 0;
 	if ( 0 != mesh->getMeshBufferCount() )
 	{
 		mesh->recalculateBoundingBox();
-		pAM = new SAnimatedMesh();
-		pAM->Type = EAMT_OBJ;
-		pAM->addMesh(mesh);
-		pAM->recalculateBoundingBox();
+		animMesh = new SAnimatedMesh();
+		animMesh->Type = EAMT_OBJ;
+		animMesh->addMesh(mesh);
+		animMesh->recalculateBoundingBox();
 	}
 
 	// Clean up the allocate obj file contents
-	delete [] pBuf;
+	delete [] buf;
 	// more cleaning up
 	cleanUp();
 	mesh->drop();
 
-	return pAM;
+	return animMesh;
 }
 
 
-void COBJMeshFileLoader::readMTL(const c8* pFileName, core::stringc relPath)
+const c8* COBJMeshFileLoader::readTextures(const c8* bufPtr, const c8* const bufEnd, SObjMtl* currMaterial, const core::stringc& relPath)
 {
-	const u32 WORD_BUFFER_LENGTH = 512;
+	u8 type=0; // map_Kd - diffuse color texture map
+	// map_Ks - specular color texture map
+	// map_Ka - ambient color texture map
+	if ((!strncmp(bufPtr,"map_bump",8)) || (!strncmp(bufPtr,"bump",4)))
+		type=1; // normal map
+	else if (!strncmp(bufPtr,"map_d",5))
+		type=2; // opactity map
+	else if (!strncmp(bufPtr,"map_refl",8))
+		type=3; // reflection map
+	// extract new material's name
+	c8 textureNameBuf[WORD_BUFFER_LENGTH];
+	bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
 
-	io::IReadFile * pMtlReader;
-	if (FileSystem->existFile(pFileName))
-		pMtlReader = FileSystem->createAndOpenFile(pFileName);
+	f32 bumpiness = 6.0f;
+	bool clamp = false;
+	// handle options
+	while (textureNameBuf[0]=='-')
+	{
+		if (!strncmp(bufPtr,"-bm",3))
+		{
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			currMaterial->Meshbuffer->Material.MaterialTypeParam=core::fast_atof(textureNameBuf);
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			continue;
+		}
+		else
+		if (!strncmp(bufPtr,"-blendu",7))
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+		else
+		if (!strncmp(bufPtr,"-blendv",7))
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+		else
+		if (!strncmp(bufPtr,"-cc",3))
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+		else
+		if (!strncmp(bufPtr,"-clamp",6))
+			bufPtr = readBool(bufPtr, clamp, bufEnd);
+		else
+		if (!strncmp(bufPtr,"-texres",7))
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+		else
+		if (!strncmp(bufPtr,"-type",5))
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+		else
+		if (!strncmp(bufPtr,"-mm",3))
+		{
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+		}
+		else
+		if (!strncmp(bufPtr,"-o",2)) // texture coord translation
+		{
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			// next parameters are optional, so skip rest of loop if no number is found
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			if (!core::isdigit(textureNameBuf[0]))
+				continue;
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			if (!core::isdigit(textureNameBuf[0]))
+				continue;
+		}
+		else
+		if (!strncmp(bufPtr,"-s",2)) // texture coord scale
+		{
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			// next parameters are optional, so skip rest of loop if no number is found
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			if (!core::isdigit(textureNameBuf[0]))
+				continue;
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			if (!core::isdigit(textureNameBuf[0]))
+				continue;
+		}
+		else
+		if (!strncmp(bufPtr,"-t",2))
+		{
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			// next parameters are optional, so skip rest of loop if no number is found
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			if (!core::isdigit(textureNameBuf[0]))
+				continue;
+			bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+			if (!core::isdigit(textureNameBuf[0]))
+				continue;
+		}
+		// get next word
+		bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+	}
+
+	if ((type==1) && (core::isdigit(textureNameBuf[0])))
+	{
+		currMaterial->Meshbuffer->Material.MaterialTypeParam=core::fast_atof(textureNameBuf);
+		bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+	}
+	if (clamp)
+		currMaterial->Meshbuffer->Material.setFlag(video::EMF_TEXTURE_WRAP, video::ETC_CLAMP);
+
+	core::stringc texname(textureNameBuf);
+	texname.replace('\\', '/');
+
+	video::ITexture * texture = 0;
+	if (FileSystem->existFile(texname.c_str()))
+		texture = SceneManager->getVideoDriver()->getTexture(texname.c_str());
 	else
 		// try to read in the relative path, the .obj is loaded from
-		pMtlReader = FileSystem->createAndOpenFile((relPath + pFileName).c_str());
-	if (!pMtlReader)	// fail to open and read file
+		texture = SceneManager->getVideoDriver()->getTexture( (relPath + texname).c_str() );
+	if ( texture )
+	{
+		if (type==0)
+			currMaterial->Meshbuffer->Material.setTexture(0, texture);
+		else if (type==1)
+		{
+			SceneManager->getVideoDriver()->makeNormalMapTexture(texture, bumpiness);
+			currMaterial->Meshbuffer->Material.setTexture(1, texture);
+			currMaterial->Meshbuffer->Material.MaterialType=video::EMT_PARALLAX_MAP_SOLID;
+			currMaterial->Meshbuffer->Material.MaterialTypeParam=0.035f;
+		}
+		else if (type==2)
+		{
+			currMaterial->Meshbuffer->Material.setTexture(0, texture);
+			currMaterial->Meshbuffer->Material.MaterialType=video::EMT_TRANSPARENT_ADD_COLOR;
+		}
+		else if (type==3)
+		{
+//						currMaterial->Meshbuffer->Material.Textures[1] = texture;
+//						currMaterial->Meshbuffer->Material.MaterialType=video::EMT_REFLECTION_2_LAYER;
+		}
+		// Set diffuse material colour to white so as not to affect texture colour
+		// Because Maya set diffuse colour Kd to black when you use a diffuse colour map
+		// But is this the right thing to do?
+		currMaterial->Meshbuffer->Material.DiffuseColor.set(
+			currMaterial->Meshbuffer->Material.DiffuseColor.getAlpha(), 255, 255, 255 );
+	}
+	return bufPtr;
+}
+
+
+void COBJMeshFileLoader::readMTL(const c8* fileName, const core::stringc& relPath)
+{
+	io::IReadFile * mtlReader;
+	if (FileSystem->existFile(fileName))
+		mtlReader = FileSystem->createAndOpenFile(fileName);
+	else
+		// try to read in the relative path, the .obj is loaded from
+		mtlReader = FileSystem->createAndOpenFile((relPath + fileName).c_str());
+	if (!mtlReader)	// fail to open and read file
 		return;
 
-	const long filesize = pMtlReader->getSize();
+	const long filesize = mtlReader->getSize();
 	if (!filesize)
 		return;
 
-	c8* pBuf = new c8[filesize];
-	pMtlReader->read((void*)pBuf, filesize);
-	const c8* pBufEnd = pBuf+filesize;
+	c8* buf = new c8[filesize];
+	mtlReader->read((void*)buf, filesize);
+	const c8* bufEnd = buf+filesize;
 
-	SObjMtl* pCurrMaterial = 0;
+	SObjMtl* currMaterial = 0;
 
-	const c8* bufPtr = pBuf;
-	while(bufPtr != pBufEnd)
+	const c8* bufPtr = buf;
+	while(bufPtr != bufEnd)
 	{
 		switch(*bufPtr)
 		{
 			case 'n': // newmtl
 			{
 				// if there's an existing material, store it first
-				if ( pCurrMaterial )
-					materials.push_back( pCurrMaterial );
+				if ( currMaterial )
+					Materials.push_back( currMaterial );
 
 				// extract new material's name
 				c8 mtlNameBuf[WORD_BUFFER_LENGTH];
-				bufPtr = goAndCopyNextWord(mtlNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
+				bufPtr = goAndCopyNextWord(mtlNameBuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
 
-				pCurrMaterial = new SObjMtl;
-				pCurrMaterial->name = mtlNameBuf;
+				currMaterial = new SObjMtl;
+				currMaterial->Name = mtlNameBuf;
 			}
 			break;
 			case 'i': // illum - illumination
-			if ( pCurrMaterial )
+			if ( currMaterial )
 			{
 				const u32 COLOR_BUFFER_LENGTH = 16;
 				c8 illumStr[COLOR_BUFFER_LENGTH];
 
-				bufPtr = goAndCopyNextWord(illumStr, bufPtr, COLOR_BUFFER_LENGTH, pBufEnd);
-				pCurrMaterial->illumination = (c8)atol(illumStr);
+				bufPtr = goAndCopyNextWord(illumStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
+				currMaterial->Illumination = (c8)atol(illumStr);
 			}
 			break;
-			case 'N': // Ns - shininess
-			if ( pCurrMaterial )
+			case 'N':
+			if ( currMaterial )
 			{
-				const u32 COLOR_BUFFER_LENGTH = 16;
-				c8 nsStr[COLOR_BUFFER_LENGTH];
+				switch(bufPtr[1])
+				{
+				case 's': // Ns - shininess
+					{
+						const u32 COLOR_BUFFER_LENGTH = 16;
+						c8 nsStr[COLOR_BUFFER_LENGTH];
 
-				bufPtr = goAndCopyNextWord(nsStr, bufPtr, COLOR_BUFFER_LENGTH, pBufEnd);
-				f32 shininessValue = core::fast_atof(nsStr);
+						bufPtr = goAndCopyNextWord(nsStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
+						f32 shininessValue = core::fast_atof(nsStr);
 
-				// wavefront shininess is from [0, 1000], so scale for OpenGL
-				shininessValue *= 0.128f;
-				pCurrMaterial->Meshbuffer->Material.Shininess = shininessValue;
+						// wavefront shininess is from [0, 1000], so scale for OpenGL
+						shininessValue *= 0.128f;
+						currMaterial->Meshbuffer->Material.Shininess = shininessValue;
+					}
+				break;
+				case 'i': // Ni - refraction index
+					{
+						c8 tmpbuf[WORD_BUFFER_LENGTH];
+						bufPtr = goAndCopyNextWord(tmpbuf, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+					}
+				break;
+				}
 			}
 			break;
 			case 'K':
-			if ( pCurrMaterial )
+			if ( currMaterial )
 			{
 				switch(bufPtr[1])
 				{
 				case 'd':		// Kd = diffuse
 					{
-						bufPtr = readColor(bufPtr, pCurrMaterial->Meshbuffer->Material.DiffuseColor, pBufEnd);
+						bufPtr = readColor(bufPtr, currMaterial->Meshbuffer->Material.DiffuseColor, bufEnd);
 
 					}
 					break;
 
 				case 's':		// Ks = specular
 					{
-						bufPtr = readColor(bufPtr, pCurrMaterial->Meshbuffer->Material.SpecularColor, pBufEnd);
+						bufPtr = readColor(bufPtr, currMaterial->Meshbuffer->Material.SpecularColor, bufEnd);
 					}
 					break;
 
 				case 'a':		// Ka = ambience
 					{
-						bufPtr=readColor(bufPtr, pCurrMaterial->Meshbuffer->Material.AmbientColor, pBufEnd);
+						bufPtr=readColor(bufPtr, currMaterial->Meshbuffer->Material.AmbientColor, bufEnd);
 					}
 					break;
 				case 'e':		// Ke = emissive
 					{
-						bufPtr=readColor(bufPtr, pCurrMaterial->Meshbuffer->Material.EmissiveColor, pBufEnd);
+						bufPtr=readColor(bufPtr, currMaterial->Meshbuffer->Material.EmissiveColor, bufEnd);
 					}
 					break;
 				}	// end switch(bufPtr[1])
-			}	// end case 'K': if ( 0 != pCurrMaterial )...
+			}	// end case 'K': if ( 0 != currMaterial )...
 			break;
+			case 'b': // bump
 			case 'm': // texture maps
-			if (pCurrMaterial)
+			if (currMaterial)
 			{
-				u8 type=0; // map_Kd - diffuse texture map
-				if (!strncmp(bufPtr,"map_bump",8))
-					type=1;
-				else if (!strncmp(bufPtr,"map_d",5))
-					type=2;
-				else if (!strncmp(bufPtr,"map_refl",8))
-					type=3;
-				// extract new material's name
-				c8 textureNameBuf[WORD_BUFFER_LENGTH];
-				bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-				// handle options
-				while (textureNameBuf[0]=='-')
-				{
-					if (!strncmp(bufPtr,"-blendu",7))
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-					if (!strncmp(bufPtr,"-blendv",7))
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-					if (!strncmp(bufPtr,"-cc",3))
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-					if (!strncmp(bufPtr,"-clamp",6))
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-					if (!strncmp(bufPtr,"-texres",7))
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-					if (!strncmp(bufPtr,"-mm",3))
-					{
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-					}
-					if (!strncmp(bufPtr,"-o",2))
-					{
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-						// next parameters are optional, so skip rest of loop if no number is found
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-						if (!core::isdigit(textureNameBuf[0]))
-							continue;
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-						if (!core::isdigit(textureNameBuf[0]))
-							continue;
-					}
-					if (!strncmp(bufPtr,"-s",2))
-					{
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-						// next parameters are optional, so skip rest of loop if no number is found
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-						if (!core::isdigit(textureNameBuf[0]))
-							continue;
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-						if (!core::isdigit(textureNameBuf[0]))
-							continue;
-					}
-					if (!strncmp(bufPtr,"-t",2))
-					{
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-						// next parameters are optional, so skip rest of loop if no number is found
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-						if (!core::isdigit(textureNameBuf[0]))
-							continue;
-						bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-						if (!core::isdigit(textureNameBuf[0]))
-							continue;
-					}
-					// get next word
-					bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-				}
-				if (type==1)
-				{
-					pCurrMaterial->Meshbuffer->Material.MaterialTypeParam=core::fast_atof(textureNameBuf);
-					bufPtr = goAndCopyNextWord(textureNameBuf, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-				}
-
-				video::ITexture * pTexture;
-				if (FileSystem->existFile(textureNameBuf))
-					pTexture = Driver->getTexture( textureNameBuf );
-				else
-					// try to read in the relative path, the .obj is loaded from
-					pTexture = Driver->getTexture( (relPath + textureNameBuf).c_str() );
-				if ( pTexture )
-				{
-					if (type==0)
-						pCurrMaterial->Meshbuffer->Material.setTexture(0, pTexture);
-					else if (type==1)
-					{
-						Driver->makeNormalMapTexture(pTexture);
-						pCurrMaterial->Meshbuffer->Material.setTexture(1, pTexture);
-						pCurrMaterial->Meshbuffer->Material.MaterialType=video::EMT_PARALLAX_MAP_SOLID;
-					}
-					else if (type==2)
-					{
-						pCurrMaterial->Meshbuffer->Material.setTexture(0, pTexture);
-						pCurrMaterial->Meshbuffer->Material.MaterialType=video::EMT_TRANSPARENT_ADD_COLOR;
-					}
-					else if (type==3)
-					{
-//						pCurrMaterial->Meshbuffer->Material.Textures[1] = pTexture;
-//						pCurrMaterial->Meshbuffer->Material.MaterialType=video::EMT_REFLECTION_2_LAYER;
-					}
-					// Set diffuse material colour to white so as not to affect texture colour
-					// Because Maya set diffuse colour Kd to black when you use a diffuse colour map
-					// But is this the right thing to do?
-					pCurrMaterial->Meshbuffer->Material.DiffuseColor.set(
-						pCurrMaterial->Meshbuffer->Material.DiffuseColor.getAlpha(), 255, 255, 255 );
-				}
+				bufPtr=readTextures(bufPtr, bufEnd, currMaterial, relPath);
 			}
 			break;
 			case 'd': // d - transparency
-			if ( pCurrMaterial )
+			if ( currMaterial )
 			{
 				const u32 COLOR_BUFFER_LENGTH = 16;
 				c8 dStr[COLOR_BUFFER_LENGTH];
 
-				bufPtr = goAndCopyNextWord(dStr, bufPtr, COLOR_BUFFER_LENGTH, pBufEnd);
+				bufPtr = goAndCopyNextWord(dStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
 				f32 dValue = core::fast_atof(dStr);
 
-				pCurrMaterial->Meshbuffer->Material.DiffuseColor.setAlpha( (s32)(dValue * 255) );
+				currMaterial->Meshbuffer->Material.DiffuseColor.setAlpha( (s32)(dValue * 255) );
 				if (dValue<1.0f)
-					pCurrMaterial->Meshbuffer->Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+					currMaterial->Meshbuffer->Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
 			}
 			break;
 			case 'T':
-			if ( pCurrMaterial )
+			if ( currMaterial )
 			{
 				switch ( bufPtr[1] )
 				{
@@ -498,15 +582,15 @@ void COBJMeshFileLoader::readMTL(const c8* pFileName, core::stringc relPath)
 					c8 greenStr[COLOR_BUFFER_LENGTH];
 					c8 blueStr[COLOR_BUFFER_LENGTH];
 
-					bufPtr = goAndCopyNextWord(redStr,   bufPtr, COLOR_BUFFER_LENGTH, pBufEnd);
-					bufPtr = goAndCopyNextWord(greenStr, bufPtr, COLOR_BUFFER_LENGTH, pBufEnd);
-					bufPtr = goAndCopyNextWord(blueStr,  bufPtr, COLOR_BUFFER_LENGTH, pBufEnd);
+					bufPtr = goAndCopyNextWord(redStr,   bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
+					bufPtr = goAndCopyNextWord(greenStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
+					bufPtr = goAndCopyNextWord(blueStr,  bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
 
 					f32 transparency = ( core::fast_atof(redStr) + core::fast_atof(greenStr) + core::fast_atof(blueStr) ) / 3;
 
-					pCurrMaterial->Meshbuffer->Material.DiffuseColor.setAlpha( (s32)(transparency * 255) );
+					currMaterial->Meshbuffer->Material.DiffuseColor.setAlpha( (s32)(transparency * 255) );
 					if (transparency < 1.0f)
-						pCurrMaterial->Meshbuffer->Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+						currMaterial->Meshbuffer->Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
 				}
 			}
 			break;
@@ -514,129 +598,143 @@ void COBJMeshFileLoader::readMTL(const c8* pFileName, core::stringc relPath)
 			break;
 		} // end switch(bufPtr[0])
 		// go to next line
-		bufPtr = goNextLine(bufPtr, pBufEnd);
+		bufPtr = goNextLine(bufPtr, bufEnd);
 	}	// end while (bufPtr)
 
 	// end of file. if there's an existing material, store it
-	if ( pCurrMaterial )
-	{
-		materials.push_back( pCurrMaterial );
-		pCurrMaterial = 0;
-	}
+	if ( currMaterial )
+		Materials.push_back( currMaterial );
 
-	delete [] pBuf;
-	pMtlReader->drop();
+	delete [] buf;
+	mtlReader->drop();
 }
 
+
 //! Read RGB color
-const c8* COBJMeshFileLoader::readColor(const c8* bufPtr, video::SColor& color, const c8* const pBufEnd)
+const c8* COBJMeshFileLoader::readColor(const c8* bufPtr, video::SColor& color, const c8* const bufEnd)
 {
 	const u32 COLOR_BUFFER_LENGTH = 16;
 	c8 colStr[COLOR_BUFFER_LENGTH];
 
 	color.setAlpha(255);
-	bufPtr = goAndCopyNextWord(colStr, bufPtr, COLOR_BUFFER_LENGTH, pBufEnd);
+	bufPtr = goAndCopyNextWord(colStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
 	color.setRed((s32)(core::fast_atof(colStr) * 255.0f));
-	bufPtr = goAndCopyNextWord(colStr,   bufPtr, COLOR_BUFFER_LENGTH, pBufEnd);
+	bufPtr = goAndCopyNextWord(colStr,   bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
 	color.setGreen((s32)(core::fast_atof(colStr) * 255.0f));
-	bufPtr = goAndCopyNextWord(colStr,   bufPtr, COLOR_BUFFER_LENGTH, pBufEnd);
+	bufPtr = goAndCopyNextWord(colStr,   bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
 	color.setBlue((s32)(core::fast_atof(colStr) * 255.0f));
 	return bufPtr;
 }
 
 
 //! Read 3d vector of floats
-const c8* COBJMeshFileLoader::readVec3(const c8* bufPtr, core::vector3df& vec, const c8* const pBufEnd)
+const c8* COBJMeshFileLoader::readVec3(const c8* bufPtr, core::vector3df& vec, const c8* const bufEnd)
 {
 	const u32 WORD_BUFFER_LENGTH = 256;
 	c8 wordBuffer[WORD_BUFFER_LENGTH];
 
-	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
+	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
 	vec.X=-core::fast_atof(wordBuffer); // change handedness
-	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
+	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
 	vec.Y=core::fast_atof(wordBuffer);
-	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
+	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
 	vec.Z=core::fast_atof(wordBuffer);
 	return bufPtr;
 }
 
 
 //! Read 2d vector of floats
-const c8* COBJMeshFileLoader::readVec2(const c8* bufPtr, core::vector2df& vec, const c8* const pBufEnd)
+const c8* COBJMeshFileLoader::readUV(const c8* bufPtr, core::vector2df& vec, const c8* const bufEnd)
 {
 	const u32 WORD_BUFFER_LENGTH = 256;
 	c8 wordBuffer[WORD_BUFFER_LENGTH];
 
-	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
+	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
 	vec.X=core::fast_atof(wordBuffer);
-	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, pBufEnd);
-	vec.Y=-core::fast_atof(wordBuffer); // change handedness
+	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+	vec.Y=1-core::fast_atof(wordBuffer); // change handedness
 	return bufPtr;
 }
 
 
 //! Read boolean value represented as 'on' or 'off'
-const c8* COBJMeshFileLoader::readBool(const c8* bufPtr, bool& tf, const c8* const pBufEnd)
+const c8* COBJMeshFileLoader::readBool(const c8* bufPtr, bool& tf, const c8* const bufEnd)
 {
 	const u32 BUFFER_LENGTH = 8;
 	c8 tfStr[BUFFER_LENGTH];
 
-	bufPtr = goAndCopyNextWord(tfStr, bufPtr, BUFFER_LENGTH, pBufEnd);
+	bufPtr = goAndCopyNextWord(tfStr, bufPtr, BUFFER_LENGTH, bufEnd);
 	tf = strcmp(tfStr, "off") != 0;
 	return bufPtr;
 }
 
 
-COBJMeshFileLoader::SObjMtl* COBJMeshFileLoader::findMtl(const c8* pMtlName)
+COBJMeshFileLoader::SObjMtl* COBJMeshFileLoader::findMtl(const core::stringc& mtlName, const core::stringc& grpName)
 {
-	for (u32 i = 0; i < materials.size(); ++i)
+	COBJMeshFileLoader::SObjMtl* defMaterial = 0;
+	for (u32 i = 0; i < Materials.size(); ++i)
 	{
-		if ( materials[i]->name == pMtlName )
-			return materials[i];
+		if ( Materials[i]->Name == mtlName )
+		{
+			if ( Materials[i]->Group == grpName )
+				return Materials[i];
+			else
+			if ( Materials[i]->Group == "" )
+				defMaterial = Materials[i];
+		}
+	}
+	if (defMaterial)
+	{
+		Materials.push_back(new SObjMtl(*defMaterial));
+		Materials.getLast()->Group = grpName;
+		return Materials.getLast();
 	}
 	return 0;
 }
 
 
-
 //! skip space characters and stop on first non-space
-const c8* COBJMeshFileLoader::goFirstWord(const c8* buf, const c8* const pBufEnd)
+const c8* COBJMeshFileLoader::goFirstWord(const c8* buf, const c8* const bufEnd, bool acrossNewlines)
 {
 	// skip space characters
-	while((buf != pBufEnd) && core::isspace(*buf))
-		++buf;
+	if (acrossNewlines)
+		while((buf != bufEnd) && core::isspace(*buf))
+			++buf;
+	else
+		while((buf != bufEnd) && core::isspace(*buf) && (*buf != '\n'))
+			++buf;
 
 	return buf;
 }
 
 
 //! skip current word and stop at beginning of next one
-const c8* COBJMeshFileLoader::goNextWord(const c8* buf, const c8* const pBufEnd)
+const c8* COBJMeshFileLoader::goNextWord(const c8* buf, const c8* const bufEnd, bool acrossNewlines)
 {
 	// skip current word
-	while(( buf != pBufEnd ) && !core::isspace(*buf))
+	while(( buf != bufEnd ) && !core::isspace(*buf))
 		++buf;
 
-	return goFirstWord(buf, pBufEnd);
+	return goFirstWord(buf, bufEnd, acrossNewlines);
 }
 
 
 //! Read until line break is reached and stop at the next non-space character
-const c8* COBJMeshFileLoader::goNextLine(const c8* buf, const c8* const pBufEnd)
+const c8* COBJMeshFileLoader::goNextLine(const c8* buf, const c8* const bufEnd)
 {
 	// look for newline characters
-	while(buf != pBufEnd)
+	while(buf != bufEnd)
 	{
 		// found it, so leave
 		if (*buf=='\n' || *buf=='\r')
 			break;
 		++buf;
 	}
-	return goFirstWord(buf, pBufEnd);
+	return goFirstWord(buf, bufEnd);
 }
 
 
-u32 COBJMeshFileLoader::copyWord(c8* outBuf, const c8* const inBuf, u32 outBufLength, const c8* const pBufEnd)
+u32 COBJMeshFileLoader::copyWord(c8* outBuf, const c8* const inBuf, u32 outBufLength, const c8* const bufEnd)
 {
 	if (!outBufLength)
 		return 0;
@@ -649,7 +747,7 @@ u32 COBJMeshFileLoader::copyWord(c8* outBuf, const c8* const inBuf, u32 outBufLe
 	u32 i = 0;
 	while(inBuf[i])
 	{
-		if (core::isspace(inBuf[i]) || &(inBuf[i]) == pBufEnd)
+		if (core::isspace(inBuf[i]) || &(inBuf[i]) == bufEnd)
 			break;
 		++i;
 	}
@@ -663,75 +761,75 @@ u32 COBJMeshFileLoader::copyWord(c8* outBuf, const c8* const inBuf, u32 outBufLe
 }
 
 
-core::stringc COBJMeshFileLoader::copyLine(const c8* inBuf, const c8* pBufEnd)
+core::stringc COBJMeshFileLoader::copyLine(const c8* inBuf, const c8* bufEnd)
 {
 	if (!inBuf)
 		return core::stringc();
 
 	const c8* ptr = inBuf;
-	while (ptr<pBufEnd)
+	while (ptr<bufEnd)
 	{
 		if (*ptr=='\n' || *ptr=='\r')
 			break;
 		++ptr;
 	}
-	return core::stringc(inBuf, ptr-inBuf+1);
+	return core::stringc(inBuf, (u32)(ptr-inBuf+1));
 }
 
 
-const c8* COBJMeshFileLoader::goAndCopyNextWord(c8* outBuf, const c8* inBuf, u32 outBufLength, const c8* pBufEnd)
+const c8* COBJMeshFileLoader::goAndCopyNextWord(c8* outBuf, const c8* inBuf, u32 outBufLength, const c8* bufEnd)
 {
-	inBuf = goNextWord(inBuf, pBufEnd);
-	copyWord(outBuf, inBuf, outBufLength, pBufEnd);
+	inBuf = goNextWord(inBuf, bufEnd, false);
+	copyWord(outBuf, inBuf, outBufLength, bufEnd);
 	return inBuf;
 }
 
 
-bool COBJMeshFileLoader::retrieveVertexIndices(c8* pVertexData, s32* pIdx, const c8* pBufEnd, u32 vbsize, u32 vtsize, u32 vnsize)
+bool COBJMeshFileLoader::retrieveVertexIndices(c8* vertexData, s32* idx, const c8* bufEnd, u32 vbsize, u32 vtsize, u32 vnsize)
 {
 	c8 word[16] = "";
-	const c8* pChar = goFirstWord(pVertexData, pBufEnd);
+	const c8* p = goFirstWord(vertexData, bufEnd);
 	u32 idxType = 0;	// 0 = posIdx, 1 = texcoordIdx, 2 = normalIdx
 
 	u32 i = 0;
-	while ( pChar != pBufEnd )
+	while ( p != bufEnd )
 	{
-		if ( ( core::isdigit(*pChar)) || (*pChar == '-') )
+		if ( ( core::isdigit(*p)) || (*p == '-') )
 		{
 			// build up the number
-			word[i++] = *pChar;
+			word[i++] = *p;
 		}
-		else if ( *pChar == '/' || *pChar == ' ' || *pChar == '\0' )
+		else if ( *p == '/' || *p == ' ' || *p == '\0' )
 		{
 			// number is completed. Convert and store it
 			word[i] = '\0';
 			// if no number was found index will become 0 and later on -1 by decrement
 			if (word[0]=='-')
 			{
-				pIdx[idxType] = core::strtol10(word+1,0);
-				pIdx[idxType] *= -1;
+				idx[idxType] = core::strtol10(word+1,0);
+				idx[idxType] *= -1;
 				switch (idxType)
 				{
 					case 0:
-						pIdx[idxType] += vbsize;
+						idx[idxType] += vbsize;
 						break;
 					case 1:
-						pIdx[idxType] += vtsize;
+						idx[idxType] += vtsize;
 						break;
 					case 2:
-						pIdx[idxType] += vnsize;
+						idx[idxType] += vnsize;
 						break;
 				}
 			}
 			else
-				pIdx[idxType] = core::strtol10(word,0)-1;
+				idx[idxType] = core::strtol10(word,0)-1;
 
 			// reset the word
 			word[0] = '\0';
 			i = 0;
 
 			// go to the next kind of index type
-			if (*pChar == '/')
+			if (*p == '/')
 			{
 				if ( ++idxType > 2 )
 				{
@@ -743,14 +841,14 @@ bool COBJMeshFileLoader::retrieveVertexIndices(c8* pVertexData, s32* pIdx, const
 			{
 				// set all missing values to disable (=-1)
 				while (++idxType < 3)
-					pIdx[idxType]=-1;
-				++pChar;
+					idx[idxType]=-1;
+				++p;
 				break; // while
 			}
 		}
 
 		// go to the next char
-		++pChar;
+		++p;
 	}
 
 	return true;
@@ -759,20 +857,18 @@ bool COBJMeshFileLoader::retrieveVertexIndices(c8* pVertexData, s32* pIdx, const
 
 void COBJMeshFileLoader::cleanUp()
 {
-	u32 i;
-
-	for (i = 0; i < materials.size(); ++i )
+	for (u32 i=0; i < Materials.size(); ++i )
 	{
-		materials[i]->Meshbuffer->drop();
-		delete materials[i];
+		Materials[i]->Meshbuffer->drop();
+		delete Materials[i];
 	}
 
-	materials.clear();
+	Materials.clear();
 }
 
 
 } // end namespace scene
 } // end namespace irr
 
-
 #endif // _IRR_COMPILE_WITH_OBJ_LOADER_
+
diff --git a/src/dep/src/irrlicht/COBJMeshFileLoader.h b/src/dep/src/irrlicht/COBJMeshFileLoader.h
index 6853eee..2e10594 100644
--- a/src/dep/src/irrlicht/COBJMeshFileLoader.h
+++ b/src/dep/src/irrlicht/COBJMeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -7,9 +7,10 @@
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
-#include "IVideoDriver.h"
+#include "ISceneManager.h"
 #include "irrString.h"
 #include "SMeshBuffer.h"
+#include "irrMap.h"
 
 namespace irr
 {
@@ -22,7 +23,7 @@ class COBJMeshFileLoader : public IMeshLoader
 public:
 
 	//! Constructor
-	COBJMeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver);
+	COBJMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs);
 
 	//! destructor
 	virtual ~COBJMeshFileLoader();
@@ -41,7 +42,9 @@ private:
 
 	struct SObjMtl
 	{
-		SObjMtl() : Meshbuffer(0), illumination(0) {
+		SObjMtl() : Meshbuffer(0), Bumpiness (1.0f), Illumination(0),
+			RecalculateNormals(false)
+		{
 			Meshbuffer = new SMeshBuffer();
 			Meshbuffer->Material.Shininess = 0.0f;
 			Meshbuffer->Material.AmbientColor = video::SColorf(0.2f, 0.2f, 0.2f, 1.0f).toSColor();
@@ -49,51 +52,65 @@ private:
 			Meshbuffer->Material.SpecularColor = video::SColorf(1.0f, 1.0f, 1.0f, 1.0f).toSColor();
 		}
 
-		SObjMtl(SObjMtl& o) : Meshbuffer(o.Meshbuffer), name(o.name), illumination(o.illumination) { o.Meshbuffer->grab(); }
+		SObjMtl(const SObjMtl& o)
+			: Name(o.Name), Group(o.Group),
+			Bumpiness(o.Bumpiness), Illumination(o.Illumination),
+			RecalculateNormals(false)
+		{
+			Meshbuffer = new SMeshBuffer();
+			Meshbuffer->Material = o.Meshbuffer->Material;
+		}
 
+		core::map<video::S3DVertex, int> VertMap;
 		scene::SMeshBuffer *Meshbuffer;
-		core::stringc name;
-		c8 illumination;
+		core::stringc Name;
+		core::stringc Group;
+		f32 Bumpiness;
+		c8 Illumination;
+		bool RecalculateNormals;
 	};
 
+	// helper method for material reading
+	const c8* readTextures(const c8* bufPtr, const c8* const bufEnd, SObjMtl* currMaterial, const core::stringc& relPath);
+
 	// returns a pointer to the first printable character available in the buffer
-	const c8* goFirstWord(const c8* buf, const c8* const pBufEnd);
+	const c8* goFirstWord(const c8* buf, const c8* const bufEnd, bool acrossNewlines=true);
 	// returns a pointer to the first printable character after the first non-printable
-	const c8* goNextWord(const c8* buf, const c8* const pBufEnd);
+	const c8* goNextWord(const c8* buf, const c8* const bufEnd, bool acrossNewlines=true);
 	// returns a pointer to the next printable character after the first line break
-	const c8* goNextLine(const c8* buf, const c8* const pBufEnd);
+	const c8* goNextLine(const c8* buf, const c8* const bufEnd);
 	// copies the current word from the inBuf to the outBuf
 	u32 copyWord(c8* outBuf, const c8* inBuf, u32 outBufLength, const c8* const pBufEnd);
 	// copies the current line from the inBuf to the outBuf
-	core::stringc copyLine(const c8* inBuf, const c8* const pBufEnd);
+	core::stringc copyLine(const c8* inBuf, const c8* const bufEnd);
 	// combination of goNextWord followed by copyWord
 	const c8* goAndCopyNextWord(c8* outBuf, const c8* inBuf, u32 outBufLength, const c8* const pBufEnd);
 
 	//! Read the material from the given file
-	void readMTL(const c8* pFileName, core::stringc relPath);
+	void readMTL(const c8* fileName, const core::stringc& relPath);
 	//! Find and return the material with the given name
-	SObjMtl * findMtl(const c8* pMtlName);
+	SObjMtl* findMtl(const core::stringc& mtlName, const core::stringc& grpName);
 
 	//! Read RGB color
-	const c8* readColor(const c8* pBufPtr, video::SColor& color, const c8* const pBufEnd);
+	const c8* readColor(const c8* bufPtr, video::SColor& color, const c8* const pBufEnd);
 	//! Read 3d vector of floats
-	const c8* readVec3(const c8* pBufPtr, core::vector3df& vec, const c8* const pBufEnd);
+	const c8* readVec3(const c8* bufPtr, core::vector3df& vec, const c8* const pBufEnd);
 	//! Read 2d vector of floats
-	const c8* readVec2(const c8* pBufPtr, core::vector2df& vec, const c8* const pBufEnd);
+	const c8* readUV(const c8* bufPtr, core::vector2df& vec, const c8* const pBufEnd);
 	//! Read boolean value represented as 'on' or 'off'
-	const c8* readBool(const c8* pBufPtr, bool& tf, const c8* const pBufEnd);
+	const c8* readBool(const c8* bufPtr, bool& tf, const c8* const bufEnd);
 
 	// reads and convert to integer the vertex indices in a line of obj file's face statement
 	// -1 for the index if it doesn't exist
 	// indices are changed to 0-based index instead of 1-based from the obj file
-	bool retrieveVertexIndices(c8* pVertexData, s32* Idx, const c8* pBufEnd, u32 vbsize, u32 vtsize, u32 vnsize);
+	bool retrieveVertexIndices(c8* vertexData, s32* idx, const c8* bufEnd, u32 vbsize, u32 vtsize, u32 vnsize);
 
 	void cleanUp();
 
+	scene::ISceneManager* SceneManager;
 	io::IFileSystem* FileSystem;
-	video::IVideoDriver* Driver;
 
-	core::array<SObjMtl*> materials;
+	core::array<SObjMtl*> Materials;
 };
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/COCTLoader.cpp b/src/dep/src/irrlicht/COCTLoader.cpp
index 145e8d6..ca986b1 100644
--- a/src/dep/src/irrlicht/COCTLoader.cpp
+++ b/src/dep/src/irrlicht/COCTLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 //
@@ -9,15 +9,18 @@
 //
 // See the header file for additional information including use and distribution rights.
 
-#include "IrrCompileConfig.h" 
+#include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_OCT_LOADER_
 
 #include "COCTLoader.h"
-#include "ISceneManager.h"
+#include "IVideoDriver.h"
+#include "IFileSystem.h"
 #include "os.h"
 #include "SAnimatedMesh.h"
 #include "SMeshBufferLightMap.h"
 #include "irrString.h"
+#include "CImage.h"
+#include "ISceneManager.h"
 
 namespace irr
 {
@@ -25,36 +28,34 @@ namespace scene
 {
 
 //! constructor
-COCTLoader::COCTLoader(video::IVideoDriver* driver)
-: Driver(driver)
+COCTLoader::COCTLoader(ISceneManager* smgr, io::IFileSystem* fs)
+	: SceneManager(smgr), FileSystem(fs)
 {
 	#ifdef _DEBUG
-	IReferenceCounted::setDebugName("COCTLoader");
-	#endif	
-
-	if (Driver) 
-		Driver->grab();
+	setDebugName("COCTLoader");
+	#endif
+	if (FileSystem)
+		FileSystem->grab();
 }
 
 
 //! destructor
 COCTLoader::~COCTLoader()
 {
-	if (Driver) 
-		Driver->drop();
+	if (FileSystem)
+		FileSystem->drop();
 }
 
 
-
 // Doesn't really belong here, but it's jammed in for now.
-void COCTLoader::OCTLoadLights(io::IReadFile* file, scene::ISceneManager * scene, scene::ISceneNode * parent, f32 radius, f32 intensityScale, bool rewind)
+void COCTLoader::OCTLoadLights(io::IReadFile* file, scene::ISceneNode * parent, f32 radius, f32 intensityScale, bool rewind)
 {
 	if (rewind)
 		file->seek(0);
 
 	octHeader header;
 	file->read(&header, sizeof(octHeader));
- 	
+
 	file->seek(sizeof(octVert)*header.numVerts, true);
 	file->seek(sizeof(octFace)*header.numFaces, true);
 	file->seek(sizeof(octTexture)*header.numTextures, true);
@@ -69,24 +70,18 @@ void COCTLoader::OCTLoadLights(io::IReadFile* file, scene::ISceneManager * scene
 	{
 		const f32 intensity = lights[i].intensity * intensityScale;
 
-		scene->addLightSceneNode(parent, core::vector3df(lights[i].pos[0], lights[i].pos[2], lights[i].pos[1]), 
+		SceneManager->addLightSceneNode(parent, core::vector3df(lights[i].pos[0], lights[i].pos[2], lights[i].pos[1]),
 			video::SColorf(lights[i].color[0] * intensity, lights[i].color[1] * intensity, lights[i].color[2] * intensity, 1.0f),
 			radius);
 	}
 }
 
 
-//! given three points representing a face, return a face normal
-core::vector3df COCTLoader::GetFaceNormal(f32 a[3], f32 b[3], f32 c[3]) {
-	return core::plane3df(core::vector3df(a[0],a[1],a[2]), core::vector3df(b[0],c[1],c[2]), core::vector3df(c[0],c[1],c[2])).Normal;
-}
-
-
 //! creates/loads an animated mesh from the file.
 //! \return Pointer to the created mesh. Returns 0 if loading failed.
 //! If you no longer need the mesh, you should call IAnimatedMesh::drop().
 //! See IReferenceCounted::drop() for more information.
-IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file) 
+IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 {
 	if (!file)
 		return 0;
@@ -109,7 +104,7 @@ IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 		octTexture t;
 		file->read(&t, sizeof(octTexture));
 		textures[t.id] = t;
-	}	
+	}
 	for (i = 0; i < header.numLightmaps; i++) {
 		octLightmap t;
 		file->read(&t, sizeof(octLightmap));
@@ -118,7 +113,7 @@ IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 	file->read(lights, sizeof(octLight) * header.numLights);
 
 	//TODO: Now read in my extended OCT header (flexible lightmaps and vertex normals)
-	
+
 
 	// This is the method Nikolaus Gebhardt used in the Q3 loader -- create a
 	// meshbuffer for every possible combination of lightmap and texture including
@@ -136,23 +131,24 @@ IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 		buffer->drop();
 	}
 
-	
+
 	// Build the mesh buffers
 	for (i = 0; i < header.numFaces; i++)
 	{
 		if (faces[i].numVerts < 3)
 			continue;
 
+		const f32* const a = verts[faces[i].firstVert].pos;
+		const f32* const b = verts[faces[i].firstVert+1].pos;
+		const f32* const c = verts[faces[i].firstVert+2].pos;
 		const core::vector3df normal =
-			GetFaceNormal(verts[faces[i].firstVert].pos,
-					verts[faces[i].firstVert+1].pos,
-					verts[faces[i].firstVert+2].pos);
+			core::plane3df(core::vector3df(a[0],a[1],a[2]), core::vector3df(b[0],c[1],c[2]), core::vector3df(c[0],c[1],c[2])).Normal;
 
 		const u32 textureID = core::min_(s32(faces[i].textureID), s32(header.numTextures - 1)) + 1;
 		const u32 lightmapID = core::min_(s32(faces[i].lightmapID),s32(header.numLightmaps - 1)) + 1;
 		SMeshBufferLightMap * meshBuffer = (SMeshBufferLightMap*)Mesh->getMeshBuffer(lightmapID * (header.numTextures + 1) + textureID);
 		const u32 base = meshBuffer->Vertices.size();
-		
+
 		// Add this face's verts
 		u32 v;
 		for (v = 0; v < faces[i].numVerts; ++v)
@@ -181,110 +177,77 @@ IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 		// Now add the indices
 		// This weird loop turns convex polygons into triangle strips.
 		// I do it this way instead of a simple fan because it usually looks a lot better in wireframe, for example.
-		u32 h = faces[i].numVerts - 1, l = 0, c; // High, Low, Center
+		// High, Low
+		u32 h = faces[i].numVerts - 1;
+		u32 l = 0;
 		for (v = 0; v < faces[i].numVerts - 2; ++v)
 		{
-			if (v & 1)
-				c = h - 1;
-			else
-				c = l + 1;
+			const u32 center = (v & 1)? h - 1: l + 1;
 
 			meshBuffer->Indices.push_back(base + h);
 			meshBuffer->Indices.push_back(base + l);
-			meshBuffer->Indices.push_back(base + c);
+			meshBuffer->Indices.push_back(base + center);
 
 			if (v & 1)
 				--h;
 			else
 				++l;
 		}
-	} 
-
+	}
 
 	// load textures
 	core::array<video::ITexture*> tex;
-	tex.set_used(header.numTextures + 1);
-	tex[0] = 0;
-	
+	tex.reallocate(header.numTextures + 1);
+	tex.push_back(0);
+
+	const core::stringc relpath = FileSystem->getFileDir(file->getFileName())+"/";
 	for (i = 1; i < (header.numTextures + 1); i++)
 	{
-		tex[i] = Driver->getTexture(textures[i-1].fileName);
+		core::stringc path(textures[i-1].fileName);
+		path.replace('\\','/');
+		if (FileSystem->existFile(path))
+			tex.push_back(SceneManager->getVideoDriver()->getTexture(path));
+		else
+			// try to read in the relative path of the OCT file
+			tex.push_back(SceneManager->getVideoDriver()->getTexture( (relpath + path).c_str() ));
 	}
 
-
 	// prepare lightmaps
 	core::array<video::ITexture*> lig;
 	lig.set_used(header.numLightmaps + 1);
-
-	u32 lightmapWidth = 128, lightmapHeight = 128;
 	lig[0] = 0;
-	core::dimension2d<s32> lmapsize(lightmapWidth, lightmapHeight);
 
-	bool oldMipMapState = Driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
-	Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
+	const u32 lightmapWidth = 128;
+	const u32 lightmapHeight = 128;
+	const core::dimension2d<s32> lmapsize(lightmapWidth, lightmapHeight);
 
-	for (i = 1; i < (header.numLightmaps + 1); i++)
+	bool oldMipMapState = SceneManager->getVideoDriver()->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
+	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
+
+	video::CImage tmpImage(video::ECF_R8G8B8, lmapsize);
+	for (i = 1; i < (header.numLightmaps + 1); ++i)
 	{
 		core::stringc lightmapname = file->getFileName();
 		lightmapname += ".lightmap.";
 		lightmapname += (int)i;
-		lig[i] = Driver->addTexture(lmapsize, lightmapname.c_str());
 
-		if (lig[i]->getSize() != lmapsize)
-			os::Printer::log("OCTLoader: Created lightmap is not of the requested size", ELL_ERROR);
+		const octLightmap* lm = &lightmaps[i-1];
 
-		if (lig[i])
+		for (u32 x=0; x<lightmapWidth; ++x)
 		{
-			void* pp = lig[i]->lock();
-
-			if (pp)
+			for (u32 y=0; y<lightmapHeight; ++y)
 			{
-				video::ECOLOR_FORMAT format = lig[i]->getColorFormat();
-				if (format == video::ECF_A1R5G5B5)
-				{
-					s16* p = (s16*)pp;
-
-					octLightmap * lm;					
-					lm = &lightmaps[i-1];
-
-					for (u32 x=0; x<lightmapWidth; ++x)
-						for (u32 y=0; y<lightmapHeight; ++y)
-						{
-							p[x*128 + y] = video::RGB16(
-								lm->data[x][y][2],
-								lm->data[x][y][1],
-								lm->data[x][y][0]);
-						}
-				}
-				else
-				if (format == video::ECF_A8R8G8B8)
-				{
-					s32* p = (s32*)pp;
-
-					octLightmap* lm;
-					lm = &lightmaps[i-1];
-
-					for (u32 x=0; x<lightmapWidth; ++x)
-						for (u32 y=0; y<lightmapHeight; ++y)
-						{
-							p[x*128 + y] = video::SColor(255,
-								lm->data[x][y][2],
-								lm->data[x][y][1],
-								lm->data[x][y][0]).color;
-						}
-				}
-				else
-					os::Printer::log(
-						"OCTLoader: Could not create lightmap, unsupported texture format.", ELL_ERROR);
+				tmpImage.setPixel(x, y,
+						video::SColor(255,
+						lm->data[x][y][2],
+						lm->data[x][y][1],
+						lm->data[x][y][0]));
 			}
-
-			lig[i]->unlock();
 		}
-		else
-			os::Printer::log("OCTLoader: Could not create lightmap, driver created no texture.", ELL_ERROR);
-	}
-	Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState);
 
+		lig[i] = SceneManager->getVideoDriver()->addTexture(lightmapname.c_str(), &tmpImage);
+	}
+	SceneManager->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState);
 
 	// Free stuff
 	delete [] verts;
@@ -293,7 +256,6 @@ IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 	delete [] lightmaps;
 	delete [] lights;
 
-
 	// attach materials
 	for (i = 0; i < header.numLightmaps + 1; i++)
 	{
@@ -321,7 +283,6 @@ IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 		}
 	}
 
-
 	// delete all buffers without geometry in it.
 	i = 0;
 	while(i < Mesh->MeshBuffers.size())
@@ -332,7 +293,7 @@ IAnimatedMesh* COCTLoader::createMesh(io::IReadFile* file)
 		{
 			// Meshbuffer is empty -- drop it
 			Mesh->MeshBuffers[i]->drop();
-			Mesh->MeshBuffers.erase(i);		
+			Mesh->MeshBuffers.erase(i);
 		}
 		else
 		{
diff --git a/src/dep/src/irrlicht/COCTLoader.h b/src/dep/src/irrlicht/COCTLoader.h
index 4b50436..6e08c78 100644
--- a/src/dep/src/irrlicht/COCTLoader.h
+++ b/src/dep/src/irrlicht/COCTLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 //
@@ -46,23 +46,24 @@
 #include "IMeshLoader.h"
 #include "IReadFile.h"
 #include "SMesh.h"
-#include "IVideoDriver.h"
 #include "irrString.h"
 
-#include "ISceneManager.h"
-
 namespace irr
 {
+namespace io
+{
+	class IFileSystem;
+} // end namespace io
 namespace scene
 {
+	class ISceneManager;
+	class ISceneNode;
 
 	class COCTLoader : public IMeshLoader
 	{
 	public:
-		void OCTLoadLights(io::IReadFile* file, ISceneManager * scene, ISceneNode * parent = 0, f32 radius = 500.0f, f32 intensityScale = 0.0000001f*2.5, bool rewind = true);
-
 		//! constructor
-		COCTLoader(video::IVideoDriver* driver);
+		COCTLoader(ISceneManager* smgr, io::IFileSystem* fs);
 
 		//! destructor
 		virtual ~COCTLoader();
@@ -77,9 +78,12 @@ namespace scene
 		//! See IReferenceCounted::drop() for more information.
 		virtual IAnimatedMesh* createMesh(io::IReadFile* file);
 
-	private:
-		core::vector3df GetFaceNormal(f32 a[3], f32 b[3], f32 c[3]);
+		void OCTLoadLights(io::IReadFile* file,
+				ISceneNode * parent = 0, f32 radius = 500.0f,
+				f32 intensityScale = 0.0000001f*2.5,
+				bool rewind = true);
 
+	private:
 		struct octHeader {
 			u32 numVerts;
 			u32 numFaces;
@@ -126,7 +130,8 @@ namespace scene
 			u32 intensity;
 		};
 
-		video::IVideoDriver* Driver;
+		ISceneManager* SceneManager;
+		io::IFileSystem* FileSystem;
 	};
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/COSOperator.cpp b/src/dep/src/irrlicht/COSOperator.cpp
index 4f0e347..3e0a7f7 100644
--- a/src/dep/src/irrlicht/COSOperator.cpp
+++ b/src/dep/src/irrlicht/COSOperator.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,8 +10,10 @@
 #else
 #include <string.h>
 #include <unistd.h>
-#ifdef MACOSX
-#include "OSXClipboard.h"
+#ifdef _IRR_USE_OSX_DEVICE_
+#include "MacOSX/OSXClipboard.h"
+#endif
+#ifdef _IRR_OSX_PLATFORM_
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif
@@ -23,7 +25,11 @@ namespace irr
 
 // constructor
 COSOperator::COSOperator(const c8* osVersion) : OperatingSystem(osVersion)
-{ }
+{
+	#ifdef _DEBUG
+	setDebugName("COSOperator");
+	#endif
+}
 
 
 //! returns the current operating system version as string.
@@ -59,9 +65,10 @@ void COSOperator::copyToClipboard(const c8* text) const
 	CloseClipboard();
 
 // MacOSX version
-#elif defined(MACOSX)
+#elif defined(_IRR_USE_OSX_DEVICE_)
 
 	OSXCopyToClipboard(text);
+#else
 
 // todo: Linux version
 #endif
@@ -84,7 +91,7 @@ c8* COSOperator::getTextFromClipboard() const
 	CloseClipboard();
 	return buffer;
 
-#elif defined(MACOSX)
+#elif defined(_IRR_USE_OSX_DEVICE_)
 	return (OSXCopyFromClipboard());
 #else
 
@@ -97,7 +104,7 @@ c8* COSOperator::getTextFromClipboard() const
 
 bool COSOperator::getProcessorSpeedMHz(u32* MHz) const
 {
-#if defined(_IRR_WINDOWS_API_)
+#if defined(_IRR_WINDOWS_API_) && !defined(_WIN32_WCE )
 	LONG Error;
 	
 	HKEY Key;
@@ -121,7 +128,7 @@ bool COSOperator::getProcessorSpeedMHz(u32* MHz) const
 	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return true;
 
-#elif defined(MACOSX)
+#elif defined(_IRR_OSX_PLATFORM_)
 	struct clockinfo CpuClock;
 	size_t Size = sizeof(clockinfo);
 
@@ -164,9 +171,9 @@ bool COSOperator::getSystemMemory(u32* Total, u32* Avail) const
 		return false;
 
 	if (Total)
-		*Total = ((ps*(long long)pp)>>10);
+		*Total = (u32)((ps*(long long)pp)>>10);
 	if (Avail)
-		*Avail = ((ps*(long long)ap)>>10);
+		*Avail = (u32)((ps*(long long)ap)>>10);
 	return true;
 #else
 	// TODO: implement for non-availablity of symbols/features
diff --git a/src/dep/src/irrlicht/COSOperator.h b/src/dep/src/irrlicht/COSOperator.h
index 04cb00c..9f5a464 100644
--- a/src/dep/src/irrlicht/COSOperator.h
+++ b/src/dep/src/irrlicht/COSOperator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/COctTreeSceneNode.cpp b/src/dep/src/irrlicht/COctTreeSceneNode.cpp
index 2490782..2e9ffac 100644
--- a/src/dep/src/irrlicht/COctTreeSceneNode.cpp
+++ b/src/dep/src/irrlicht/COctTreeSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -22,9 +22,8 @@ namespace scene
 //! constructor
 COctTreeSceneNode::COctTreeSceneNode(ISceneNode* parent, ISceneManager* mgr,
 					 s32 id, s32 minimalPolysPerNode)
-: ISceneNode(parent, mgr, id), StdOctTree(0), LightMapOctTree(0),
+: ISceneNode(parent, mgr, id), StdOctTree(0), LightMapOctTree(0), TangentsOctTree(0),
 	MinimalPolysPerNode(minimalPolysPerNode)
-	//,Mesh(0)
 {
 #ifdef _DEBUG
 	setDebugName("COctTreeSceneNode");
@@ -34,18 +33,13 @@ COctTreeSceneNode::COctTreeSceneNode(ISceneNode* parent, ISceneManager* mgr,
 }
 
 
-
 //! destructor
 COctTreeSceneNode::~COctTreeSceneNode()
 {
-	//if (Mesh)
-	//	Mesh->drop();
-
 	deleteTree();
 }
 
 
-
 void COctTreeSceneNode::OnRegisterSceneNode()
 {
 	if (IsVisible)
@@ -58,13 +52,13 @@ void COctTreeSceneNode::OnRegisterSceneNode()
 		video::IVideoDriver* driver = SceneManager->getVideoDriver();
 
 		PassCount = 0;
-		int transparentCount = 0;
-		int solidCount = 0;
+		u32 transparentCount = 0;
+		u32 solidCount = 0;
 
 		// count transparent and solid materials in this scene node
 		for (u32 i=0; i<Materials.size(); ++i)
 		{
-			video::IMaterialRenderer* rnd =
+			const video::IMaterialRenderer* const rnd =
 				driver->getMaterialRenderer(Materials[i].MaterialType);
 
 			if (rnd && rnd->isTransparent())
@@ -89,7 +83,6 @@ void COctTreeSceneNode::OnRegisterSceneNode()
 }
 
 
-
 //! renders the node.
 void COctTreeSceneNode::render()
 {
@@ -113,12 +106,11 @@ void COctTreeSceneNode::render()
 	//transform the frustum to the current absolute transformation
 	core::matrix4 invTrans(AbsoluteTransformation);
 	invTrans.makeInverse();
-	/*
-	//frust.transform(invTrans);
-	//const core::aabbox3d<float> &box = frust.getBoundingBox();
-	*/
 
 	frust.transform(invTrans);
+	/*
+	//const core::aabbox3d<float> &box = frust.getBoundingBox();
+	*/
 
 	switch(vertexType)
 	{
@@ -127,15 +119,15 @@ void COctTreeSceneNode::render()
 			//StdOctTree->calculatePolys(box);
 			StdOctTree->calculatePolys(frust);
 
-			OctTree<video::S3DVertex>::SIndexData* d =  StdOctTree->getIndexData();
+			const OctTree<video::S3DVertex>::SIndexData* d = StdOctTree->getIndexData();
 
 			for (u32 i=0; i<Materials.size(); ++i)
 			{
 				if ( 0 == d[i].CurrentSize )
 					continue;
 
-				video::IMaterialRenderer* rnd = driver->getMaterialRenderer(Materials[i].MaterialType);
-				bool transparent = (rnd && rnd->isTransparent());
+				const video::IMaterialRenderer* const rnd = driver->getMaterialRenderer(Materials[i].MaterialType);
+				const bool transparent = (rnd && rnd->isTransparent());
 
 				// only render transparent buffer if this is the transparent render pass
 				// and solid only in solid pass
@@ -149,40 +141,39 @@ void COctTreeSceneNode::render()
 			}
 
 			// for debug purposes only
-			if ( DebugDataVisible && !Materials.empty() && PassCount==1)
+			if (DebugDataVisible && !Materials.empty() && PassCount==1)
 			{
-				const core::aabbox3d<float> &box = frust.getBoundingBox();
-				core::array< core::aabbox3d<f32> > boxes;
+				const core::aabbox3df& box = frust.getBoundingBox();
+				core::array< const core::aabbox3d<f32>* > boxes;
 				video::SMaterial m;
 				m.Lighting = false;
 				driver->setMaterial(m);
 				if ( DebugDataVisible & scene::EDS_BBOX_BUFFERS )
 				{
-					StdOctTree->renderBoundingBoxes(box, boxes);
-					for (u32 b=0; b<boxes.size(); ++b)
-						driver->draw3DBox(boxes[b], video::SColor(0,255,255,255));
+					StdOctTree->getBoundingBoxes(box, boxes);
+					for (u32 b=0; b!=boxes.size(); ++b)
+						driver->draw3DBox(*boxes[b]);
 				}
 
 				if ( DebugDataVisible & scene::EDS_BBOX )
 					driver->draw3DBox(Box,video::SColor(0,255,0,0));
 			}
-			break;
-
 		}
+		break;
 	case video::EVT_2TCOORDS:
 		{
 			//LightMapOctTree->calculatePolys(box);
 			LightMapOctTree->calculatePolys(frust);
 
-			OctTree<video::S3DVertex2TCoords>::SIndexData* d =  LightMapOctTree->getIndexData();
+			const OctTree<video::S3DVertex2TCoords>::SIndexData* d = LightMapOctTree->getIndexData();
 
 			for (u32 i=0; i<Materials.size(); ++i)
 			{
 				if ( 0 == d[i].CurrentSize )
 					continue;
 
-				video::IMaterialRenderer* rnd = driver->getMaterialRenderer(Materials[i].MaterialType);
-				bool transparent = (rnd && rnd->isTransparent());
+				const video::IMaterialRenderer* const rnd = driver->getMaterialRenderer(Materials[i].MaterialType);
+				const bool transparent = (rnd && rnd->isTransparent());
 
 				// only render transparent buffer if this is the transparent render pass
 				// and solid only in solid pass
@@ -199,15 +190,61 @@ void COctTreeSceneNode::render()
 			if (DebugDataVisible && !Materials.empty() && PassCount==1)
 			{
 				const core::aabbox3d<float> &box = frust.getBoundingBox();
-				core::array< core::aabbox3d<f32> > boxes;
+				core::array< const core::aabbox3d<f32>* > boxes;
 				video::SMaterial m;
 				m.Lighting = false;
 				driver->setMaterial(m);
 				if ( DebugDataVisible & scene::EDS_BBOX_BUFFERS )
 				{
-					LightMapOctTree->renderBoundingBoxes(box, boxes);
+					LightMapOctTree->getBoundingBoxes(box, boxes);
 					for (u32 b=0; b<boxes.size(); ++b)
-						driver->draw3DBox(boxes[b], video::SColor(0,255,255,255));
+						driver->draw3DBox(*boxes[b]);
+				}
+
+				if ( DebugDataVisible & scene::EDS_BBOX )
+					driver->draw3DBox(Box,video::SColor(0,255,0,0));
+			}
+		}
+		break;
+	case video::EVT_TANGENTS:
+		{
+			//TangentsOctTree->calculatePolys(box);
+			TangentsOctTree->calculatePolys(frust);
+
+			const OctTree<video::S3DVertexTangents>::SIndexData* d =  TangentsOctTree->getIndexData();
+
+			for (u32 i=0; i<Materials.size(); ++i)
+			{
+				if ( 0 == d[i].CurrentSize )
+					continue;
+
+				const video::IMaterialRenderer* const rnd = driver->getMaterialRenderer(Materials[i].MaterialType);
+				const bool transparent = (rnd && rnd->isTransparent());
+
+				// only render transparent buffer if this is the transparent render pass
+				// and solid only in solid pass
+				if (transparent == isTransparentPass)
+				{
+					driver->setMaterial(Materials[i]);
+					driver->drawIndexedTriangleList(
+						&TangentsMeshes[i].Vertices[0], TangentsMeshes[i].Vertices.size(),
+						d[i].Indices, d[i].CurrentSize / 3);
+				}
+			}
+
+			// for debug purposes only
+			if (DebugDataVisible && !Materials.empty() && PassCount==1)
+			{
+				const core::aabbox3d<float> &box = frust.getBoundingBox();
+				core::array< const core::aabbox3d<f32>* > boxes;
+				video::SMaterial m;
+				m.Lighting = false;
+				driver->setMaterial(m);
+				if ( DebugDataVisible & scene::EDS_BBOX_BUFFERS )
+				{
+					TangentsOctTree->getBoundingBoxes(box, boxes);
+					for (u32 b=0; b<boxes.size(); ++b)
+						driver->draw3DBox(*boxes[b]);
 				}
 
 				if ( DebugDataVisible & scene::EDS_BBOX )
@@ -232,12 +269,7 @@ bool COctTreeSceneNode::createTree(IMesh* mesh)
 	if (!mesh)
 		return false;
 
-	//if (Mesh)
-//		Mesh->drop();
-
 	MeshName = SceneManager->getMeshCache()->getMeshFilename( mesh );
-//	Mesh = mesh;
-//	Mesh->grab();
 
 	deleteTree();
 
@@ -263,25 +295,25 @@ bool COctTreeSceneNode::createTree(IMesh* mesh)
 					{
 						Materials.push_back(b->getMaterial());
 
-						OctTree<video::S3DVertex>::SMeshChunk chunk;
-						chunk.MaterialId = Materials.size() - 1;
-						StdMeshes.push_back(chunk);
-						OctTree<video::S3DVertex>::SMeshChunk &nchunk = StdMeshes[StdMeshes.size()-1];
+						StdMeshes.push_back(OctTree<video::S3DVertex>::SMeshChunk());
+						OctTree<video::S3DVertex>::SMeshChunk &nchunk = StdMeshes.getLast();
+						nchunk.MaterialId = Materials.size() - 1;
 
 						u32 v;
-
+						nchunk.Vertices.reallocate(b->getVertexCount());
 						for (v=0; v<b->getVertexCount(); ++v)
 							nchunk.Vertices.push_back(((video::S3DVertex*)b->getVertices())[v]);
 
 						polyCount += b->getIndexCount();
 
+						nchunk.Indices.reallocate(b->getIndexCount());
 						for (v=0; v<b->getIndexCount(); ++v)
 							nchunk.Indices.push_back(b->getIndices()[v]);
 					}
 				}
 
 				StdOctTree = new OctTree<video::S3DVertex>(StdMeshes, MinimalPolysPerNode);
-				nodeCount = StdOctTree->nodeCount;
+				nodeCount = StdOctTree->getNodeCount();
 			}
 			break;
 		case video::EVT_2TCOORDS:
@@ -293,27 +325,53 @@ bool COctTreeSceneNode::createTree(IMesh* mesh)
 					if (b->getVertexCount() && b->getIndexCount()) 
 					{
 						Materials.push_back(b->getMaterial());
-
-						OctTree<video::S3DVertex2TCoords>::SMeshChunk chunk;
-						chunk.MaterialId = Materials.size() - 1;
-						LightMapMeshes.push_back(chunk);
-						OctTree<video::S3DVertex2TCoords>::SMeshChunk& nchunk =
-							LightMapMeshes[LightMapMeshes.size()-1];
+						LightMapMeshes.push_back(OctTree<video::S3DVertex2TCoords>::SMeshChunk());
+						OctTree<video::S3DVertex2TCoords>::SMeshChunk& nchunk = LightMapMeshes.getLast();
+						nchunk.MaterialId = Materials.size() - 1;
 
 						u32 v;
-
+						nchunk.Vertices.reallocate(b->getVertexCount());
 						for (v=0; v<b->getVertexCount(); ++v)
 							nchunk.Vertices.push_back(((video::S3DVertex2TCoords*)b->getVertices())[v]);
 
 						polyCount += b->getIndexCount();
-
+						nchunk.Indices.reallocate(b->getIndexCount());
 						for (v=0; v<b->getIndexCount(); ++v)
 							nchunk.Indices.push_back(b->getIndices()[v]);
 					}
 				}
 
 				LightMapOctTree = new OctTree<video::S3DVertex2TCoords>(LightMapMeshes, MinimalPolysPerNode);
-				nodeCount = LightMapOctTree->nodeCount;
+				nodeCount = LightMapOctTree->getNodeCount();
+			}
+			break;
+		case video::EVT_TANGENTS:
+			{
+				for (u32 i=0; i<mesh->getMeshBufferCount(); ++i)
+				{
+					IMeshBuffer* b = mesh->getMeshBuffer(i);
+
+					if (b->getVertexCount() && b->getIndexCount()) 
+					{
+						Materials.push_back(b->getMaterial());
+						TangentsMeshes.push_back(OctTree<video::S3DVertexTangents>::SMeshChunk());
+						OctTree<video::S3DVertexTangents>::SMeshChunk& nchunk = TangentsMeshes.getLast();
+						nchunk.MaterialId = Materials.size() - 1;
+
+						u32 v;
+						nchunk.Vertices.reallocate(b->getVertexCount());
+						for (v=0; v<b->getVertexCount(); ++v)
+							nchunk.Vertices.push_back(((video::S3DVertexTangents*)b->getVertices())[v]);
+
+						polyCount += b->getIndexCount();
+						nchunk.Indices.reallocate(b->getIndexCount());
+						for (v=0; v<b->getIndexCount(); ++v)
+							nchunk.Indices.push_back(b->getIndices()[v]);
+					}
+				}
+
+				TangentsOctTree = new OctTree<video::S3DVertexTangents>(TangentsMeshes, MinimalPolysPerNode);
+				nodeCount = TangentsOctTree->getNodeCount();
 			}
 			break;
 		}
@@ -342,6 +400,7 @@ video::SMaterial& COctTreeSceneNode::getMaterial(u32 i)
 	return Materials[i];
 }
 
+
 //! returns amount of materials used by this scene node.
 u32 COctTreeSceneNode::getMaterialCount() const
 {
@@ -354,50 +413,33 @@ void COctTreeSceneNode::serializeAttributes(io::IAttributes* out, io::SAttribute
 {
 	ISceneNode::serializeAttributes(out, options);
 
-	out->addInt	("MinimalPolysPerNode", MinimalPolysPerNode);
-	//out->addString("Mesh", SceneManager->getMeshCache()->getMeshFilename(Mesh));
+	out->addInt("MinimalPolysPerNode", MinimalPolysPerNode);
 	out->addString("Mesh", MeshName.c_str());
 }
 
+
 //! Reads attributes of the scene node.
 void COctTreeSceneNode::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
 {
-	int oldMinimal = MinimalPolysPerNode;
-	//core::stringc oldMeshStr = SceneManager->getMeshCache()->getMeshFilename(Mesh);
-	core::stringc oldMeshStr = MeshName;
+	const s32 oldMinimal = MinimalPolysPerNode;
 
 	MinimalPolysPerNode = in->getAttributeAsInt("MinimalPolysPerNode");
 	core::stringc newMeshStr = in->getAttributeAsString("Mesh");
 
-	bool loadedNewMesh = false;
-
 	IMesh* newMesh = 0;
 
-	if (newMeshStr != "" && oldMeshStr != newMeshStr)
-	{
-		IAnimatedMesh* newAnimatedMesh = SceneManager->getMesh(newMeshStr.c_str());
+	if (newMeshStr == "")
+		newMeshStr = MeshName;
 
-		if (newAnimatedMesh)
-			newMesh = newAnimatedMesh->getMesh(0);
+	IAnimatedMesh* newAnimatedMesh = SceneManager->getMesh(newMeshStr.c_str());
 
-		if (newMesh)
-		{
-		//	if (Mesh)
-		//		Mesh->drop();
+	if (newAnimatedMesh)
+		newMesh = newAnimatedMesh->getMesh(0);
 
-		//	Mesh = newMesh;
-		//	Mesh->grab();
-
-			loadedNewMesh = true;
-		}
-	}
-
-	if (loadedNewMesh || MinimalPolysPerNode != oldMinimal)
+	if (newMesh && ((MeshName != newMeshStr) || (MinimalPolysPerNode != oldMinimal)))
 	{
 		// recalculate tree
-		//createTree(Mesh);
-		createTree ( newMesh );
-		// newMesh->drop ();
+		createTree(newMesh);
 	}
 
 	ISceneNode::deserializeAttributes(in, options);
@@ -414,8 +456,13 @@ void COctTreeSceneNode::deleteTree()
 	LightMapOctTree = 0;
 	LightMapMeshes.clear();
 
+	delete TangentsOctTree;
+	TangentsOctTree = 0;
+	TangentsMeshes.clear();
+
 	Materials.clear();
 }
 
 } // end namespace scene
 } // end namespace irr
+
diff --git a/src/dep/src/irrlicht/COctTreeSceneNode.h b/src/dep/src/irrlicht/COctTreeSceneNode.h
index 87f6718..d5d7151 100644
--- a/src/dep/src/irrlicht/COctTreeSceneNode.h
+++ b/src/dep/src/irrlicht/COctTreeSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -20,7 +20,7 @@ namespace scene
 
 		//! constructor
 		COctTreeSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id, 
-			s32 minimalPolysPerNode=128);
+			s32 minimalPolysPerNode=512);
 
 		//! destructor
 		virtual ~COctTreeSceneNode();
@@ -67,10 +67,12 @@ namespace scene
 		OctTree<video::S3DVertex2TCoords>* LightMapOctTree;
 		core::array< OctTree<video::S3DVertex2TCoords>::SMeshChunk > LightMapMeshes;
 
+		OctTree<video::S3DVertexTangents>* TangentsOctTree;
+		core::array< OctTree<video::S3DVertexTangents>::SMeshChunk > TangentsMeshes;
+
 		video::E_VERTEX_TYPE vertexType;
 		core::array< video::SMaterial > Materials;
 
-		//IMesh* Mesh;
 		core::stringc MeshName;
 		s32 MinimalPolysPerNode;
 		s32 PassCount;
diff --git a/src/dep/src/irrlicht/COctTreeTriangleSelector.cpp b/src/dep/src/irrlicht/COctTreeTriangleSelector.cpp
index 1e75c45..316ef7f 100644
--- a/src/dep/src/irrlicht/COctTreeTriangleSelector.cpp
+++ b/src/dep/src/irrlicht/COctTreeTriangleSelector.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,8 +13,8 @@ namespace scene
 {
 
 //! constructor
-COctTreeTriangleSelector::COctTreeTriangleSelector(IMesh* mesh,
-		ISceneNode* node, s32 minimalPolysPerNode)
+COctTreeTriangleSelector::COctTreeTriangleSelector(const IMesh* mesh,
+		const ISceneNode* node, s32 minimalPolysPerNode)
 	: CTriangleSelector(mesh, node), Root(0), NodeCount(0),
 	 MinimalPolysPerNode(minimalPolysPerNode)
 {
@@ -108,7 +108,6 @@ void COctTreeTriangleSelector::constructOctTree(SOctTreeNode* node)
 }
 
 
-
 //! Gets all triangles which lie within a specific bounding box.
 void COctTreeTriangleSelector::getTriangles(core::triangle3df* triangles, 
 					s32 arraySize, s32& outTriangleCount, 
@@ -122,7 +121,7 @@ void COctTreeTriangleSelector::getTriangles(core::triangle3df* triangles,
 	{
 		mat = SceneNode->getAbsoluteTransformation();
 		mat.makeInverse();
-		mat.transformBox(invbox);
+		mat.transformBoxEx(invbox);
 	}
 
 	mat.makeIdentity();
diff --git a/src/dep/src/irrlicht/COctTreeTriangleSelector.h b/src/dep/src/irrlicht/COctTreeTriangleSelector.h
index 42f5954..1e11efb 100644
--- a/src/dep/src/irrlicht/COctTreeTriangleSelector.h
+++ b/src/dep/src/irrlicht/COctTreeTriangleSelector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -20,12 +20,12 @@ class COctTreeTriangleSelector : public CTriangleSelector
 public:
 
 	//! Constructs a selector based on a mesh
-	COctTreeTriangleSelector(IMesh* mesh, ISceneNode* node, s32 minimalPolysPerNode);
+	COctTreeTriangleSelector(const IMesh* mesh, const ISceneNode* node, s32 minimalPolysPerNode);
 
-	~COctTreeTriangleSelector();
+	virtual ~COctTreeTriangleSelector();
 
 	//! Gets all triangles which lie within a specific bounding box.
-	void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, 
+	virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, 
 		const core::aabbox3d<f32>& box, const core::matrix4* transform=0) const;
 
 	//! Gets all triangles which have or may have contact with a 3d line.
@@ -39,13 +39,13 @@ private:
 	{
 		SOctTreeNode()
 		{
-			for (s32 i=0; i<8; ++i)
+			for (u32 i=0; i!=8; ++i)
 				Child[i] = 0;
 		}
 
 		~SOctTreeNode()
 		{
-			for (s32 i=0; i<8; ++i)
+			for (u32 i=0; i!=8; ++i)
 				delete Child[i];
 		}
 
@@ -57,14 +57,14 @@ private:
 
 	void constructOctTree(SOctTreeNode* node);
 	void deleteEmptyNodes(SOctTreeNode* node);
-	void getTrianglesFromOctTree(SOctTreeNode* node, s32& trianglesWritten, s32 maximumSize, 
-		const core::aabbox3d<f32>& box, const core::matrix4* transform,
-		core::triangle3df* triangles) const;
+	void getTrianglesFromOctTree(SOctTreeNode* node, s32& trianglesWritten,
+			s32 maximumSize, const core::aabbox3d<f32>& box,
+			const core::matrix4* transform,
+			core::triangle3df* triangles) const;
 
 	SOctTreeNode* Root;
 	s32 NodeCount;
 	s32 MinimalPolysPerNode;
-
 };
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/COgreMeshFileLoader.cpp b/src/dep/src/irrlicht/COgreMeshFileLoader.cpp
index 1933672..6379acb 100644
--- a/src/dep/src/irrlicht/COgreMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/COgreMeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // orginally written by Christian Stehno, modified by Nikolaus Gebhardt
@@ -14,6 +14,10 @@
 #include "fast_atof.h"
 #include "coreutil.h"
 
+#ifdef _DEBUG
+#define IRR_OGRE_LOADER_DEBUG
+#endif
+
 namespace irr
 {
 namespace scene
@@ -44,10 +48,16 @@ const u16 COGRE_SUBMESH_OPERATION= 0x4010;
 const u16 COGRE_SUBMESH_BONE_ASSIGNMENT= 0x4100;
 const u16 COGRE_SUBMESH_TEXTURE_ALIAS= 0x4200;
 
+
 //! Constructor
-COgreMeshFileLoader::COgreMeshFileLoader(IMeshManipulator* manip,io::IFileSystem* fs, video::IVideoDriver* driver)
-: FileSystem(fs), Driver(driver), SwapEndian(false), Mesh(0), Manipulator(manip), NumUV(0)
+COgreMeshFileLoader::COgreMeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver)
+: FileSystem(fs), Driver(driver), SwapEndian(false), Mesh(0), NumUV(0)
 {
+
+	#ifdef _DEBUG
+	setDebugName("COgreMeshFileLoader");
+	#endif
+
 	if (FileSystem)
 		FileSystem->grab();
 
@@ -56,7 +66,6 @@ COgreMeshFileLoader::COgreMeshFileLoader(IMeshManipulator* manip,io::IFileSystem
 }
 
 
-
 //! destructor
 COgreMeshFileLoader::~COgreMeshFileLoader()
 {
@@ -73,7 +82,6 @@ COgreMeshFileLoader::~COgreMeshFileLoader()
 }
 
 
-
 //! returns true if the file maybe is able to be loaded by this class
 //! based on the file extension (e.g. ".bsp")
 bool COgreMeshFileLoader::isALoadableFileExtension(const c8* filename) const
@@ -82,7 +90,6 @@ bool COgreMeshFileLoader::isALoadableFileExtension(const c8* filename) const
 }
 
 
-
 //! creates/loads an animated mesh from the file.
 //! \return Pointer to the created mesh. Returns 0 if loading failed.
 //! If you no longer need the mesh, you should call IAnimatedMesh::drop().
@@ -164,6 +171,9 @@ bool COgreMeshFileLoader::readChunk(io::IReadFile* file)
 
 bool COgreMeshFileLoader::readObjectChunk(io::IReadFile* file, ChunkData& parent, OgreMesh& mesh)
 {
+#ifdef IRR_OGRE_LOADER_DEBUG
+	os::Printer::log("Read Object Chunk");
+#endif
 	readBool(file, parent, mesh.SkeletalAnimation);
 	while ((parent.read < parent.header.length)&&(file->getPos() < file->getSize()))
 	{
@@ -210,6 +220,9 @@ bool COgreMeshFileLoader::readObjectChunk(io::IReadFile* file, ChunkData& parent
 
 bool COgreMeshFileLoader::readGeometry(io::IReadFile* file, ChunkData& parent, OgreGeometry& geometry)
 {
+#ifdef IRR_OGRE_LOADER_DEBUG
+	os::Printer::log("Read Geometry");
+#endif
 	readInt(file, parent, geometry.NumVertex);
 	while(parent.read < parent.header.length)
 	{
@@ -237,6 +250,9 @@ bool COgreMeshFileLoader::readGeometry(io::IReadFile* file, ChunkData& parent, O
 
 bool COgreMeshFileLoader::readVertexDeclaration(io::IReadFile* file, ChunkData& parent, OgreGeometry& geometry)
 {
+#ifdef IRR_OGRE_LOADER_DEBUG
+	os::Printer::log("Read Vertex Declaration");
+#endif
 	NumUV = 0;
 	while(parent.read < parent.header.length)
 	{
@@ -274,6 +290,9 @@ bool COgreMeshFileLoader::readVertexDeclaration(io::IReadFile* file, ChunkData&
 
 bool COgreMeshFileLoader::readVertexBuffer(io::IReadFile* file, ChunkData& parent, OgreGeometry& geometry)
 {
+#ifdef IRR_OGRE_LOADER_DEBUG
+	os::Printer::log("Read Vertex Buffer");
+#endif
 	OgreVertexBuffer buf;
 	readShort(file, parent, buf.BindIndex);
 	readShort(file, parent, buf.VertexSize);
@@ -296,6 +315,9 @@ bool COgreMeshFileLoader::readVertexBuffer(io::IReadFile* file, ChunkData& paren
 
 bool COgreMeshFileLoader::readSubMesh(io::IReadFile* file, ChunkData& parent, OgreSubMesh& subMesh)
 {
+#ifdef IRR_OGRE_LOADER_DEBUG
+	os::Printer::log("Read Submesh");
+#endif
 	readString(file, parent, subMesh.Material);
 	readBool(file, parent, subMesh.SharedVertices);
 
@@ -362,7 +384,6 @@ bool COgreMeshFileLoader::readSubMesh(io::IReadFile* file, ChunkData& parent, Og
 }
 
 
-
 void COgreMeshFileLoader::composeMeshBufferMaterial(scene::IMeshBuffer* mb, const core::stringc& materialName)
 {
 	video::SMaterial& material=mb->getMaterial();
@@ -393,7 +414,6 @@ void COgreMeshFileLoader::composeMeshBufferMaterial(scene::IMeshBuffer* mb, cons
 }
 
 
-
 scene::SMeshBuffer* COgreMeshFileLoader::composeMeshBuffer(const core::array<s32>& indices, const OgreGeometry& geom)
 {
 	scene::SMeshBuffer *mb=new scene::SMeshBuffer();
@@ -410,7 +430,7 @@ scene::SMeshBuffer* COgreMeshFileLoader::composeMeshBuffer(const core::array<s32
 		{
 			for (u32 j=0; j<geom.Buffers.size(); ++j)
 			{
-				if (geom.Elements[i].Index==geom.Buffers[j].BindIndex)
+				if (geom.Elements[i].Source==geom.Buffers[j].BindIndex)
 				{
 					u32 eSize=geom.Buffers[j].VertexSize;
 					u32 ePos=geom.Elements[i].Offset;
@@ -428,7 +448,7 @@ scene::SMeshBuffer* COgreMeshFileLoader::composeMeshBuffer(const core::array<s32
 		{
 			for (u32 j=0; j<geom.Buffers.size(); ++j)
 			{
-				if (geom.Elements[i].Index==geom.Buffers[j].BindIndex)
+				if (geom.Elements[i].Source==geom.Buffers[j].BindIndex)
 				{
 					u32 eSize=geom.Buffers[j].VertexSize;
 					u32 ePos=geom.Elements[i].Offset;
@@ -445,7 +465,7 @@ scene::SMeshBuffer* COgreMeshFileLoader::composeMeshBuffer(const core::array<s32
 		{
 			for (u32 j=0; j<geom.Buffers.size(); ++j)
 			{
-				if (geom.Elements[i].Index==geom.Buffers[j].BindIndex)
+				if (geom.Elements[i].Source==geom.Buffers[j].BindIndex)
 				{
 					u32 eSize=geom.Buffers[j].VertexSize;
 					u32 ePos=geom.Elements[i].Offset;
@@ -462,7 +482,6 @@ scene::SMeshBuffer* COgreMeshFileLoader::composeMeshBuffer(const core::array<s32
 }
 
 
-
 scene::SMeshBufferLightMap* COgreMeshFileLoader::composeMeshBufferLightMap(const core::array<s32>& indices, const OgreGeometry& geom)
 {
 	scene::SMeshBufferLightMap *mb=new scene::SMeshBufferLightMap();
@@ -480,7 +499,7 @@ scene::SMeshBufferLightMap* COgreMeshFileLoader::composeMeshBufferLightMap(const
 		{
 			for (u32 j=0; j<geom.Buffers.size(); ++j)
 			{
-				if (geom.Elements[i].Index==geom.Buffers[j].BindIndex)
+				if (geom.Elements[i].Source==geom.Buffers[j].BindIndex)
 				{
 					u32 eSize=geom.Buffers[j].VertexSize;
 					u32 ePos=geom.Elements[i].Offset;
@@ -498,7 +517,7 @@ scene::SMeshBufferLightMap* COgreMeshFileLoader::composeMeshBufferLightMap(const
 		{
 			for (u32 j=0; j<geom.Buffers.size(); ++j)
 			{
-				if (geom.Elements[i].Index==geom.Buffers[j].BindIndex)
+				if (geom.Elements[i].Source==geom.Buffers[j].BindIndex)
 				{
 					u32 eSize=geom.Buffers[j].VertexSize;
 					u32 ePos=geom.Elements[i].Offset;
@@ -515,7 +534,7 @@ scene::SMeshBufferLightMap* COgreMeshFileLoader::composeMeshBufferLightMap(const
 		{
 			for (u32 j=0; j<geom.Buffers.size(); ++j)
 			{
-				if (geom.Elements[i].Index==geom.Buffers[j].BindIndex)
+				if (geom.Elements[i].Source==geom.Buffers[j].BindIndex)
 				{
 					u32 eSize=geom.Buffers[j].VertexSize;
 					u32 ePos=geom.Elements[i].Offset;
@@ -535,7 +554,6 @@ scene::SMeshBufferLightMap* COgreMeshFileLoader::composeMeshBufferLightMap(const
 }
 
 
-
 void COgreMeshFileLoader::composeObject(void)
 {
 	for (u32 i=0; i<Meshes.size(); ++i)
@@ -597,10 +615,15 @@ core::stringc COgreMeshFileLoader::getTextureFileName(const core::stringc& textu
 
 void COgreMeshFileLoader::getMaterialToken(io::IReadFile* file, core::stringc& token, bool noNewLine)
 {
+	bool parseString=false;
 	c8 c=0;
 	token = "";
 
+	if (file->getPos() >= file->getSize())
+		return;
+
 	file->read(&c, sizeof(c8));
+	// search for word beginning
 	while ( core::isspace(c) && (file->getPos() < file->getSize()))
 	{
 		if (noNewLine && c=='\n')
@@ -610,33 +633,60 @@ void COgreMeshFileLoader::getMaterialToken(io::IReadFile* file, core::stringc& t
 		}
 		file->read(&c, sizeof(c8));
 	}
+	// check if we read a string
+	if (c=='"')
+	{
+		parseString = true;
+		file->read(&c, sizeof(c8));
+	}
 	do
 	{
 		if (c=='/')
 		{
 			file->read(&c, sizeof(c8));
-			if (c=='/')
-			{ // skip comments
+			// check for comments, cannot be part of strings
+			if (!parseString && (c=='/'))
+			{
+				// skip comments
 				while(c!='\n')
 					file->read(&c, sizeof(c8));
+				if (!token.size())
+				{
+					// if we start with a comment we need to skip
+					// following whitespaces, so restart
+					getMaterialToken(file, token, noNewLine);
+					return;
+				}
+				else
+				{
+					// else continue with next character
+					file->read(&c, sizeof(c8));
+					continue;
+				}
 			}
 			else
 			{
+				// else append first slash and check if second char
+				// ends this token
 				token.append('/');
-				if (core::isspace(c))
+				if ((!parseString && core::isspace(c)) ||
+						(parseString && (c=='"')))
 					return;
 			}
 		}
 		token.append(c);
 		file->read(&c, sizeof(c8));
+		// read until a token delimiter is found
 	}
-	while ((!core::isspace(c)) && (file->getPos() < file->getSize()));
-	if (c == '\n' && noNewLine)
+	while (((!parseString && !core::isspace(c)) || (parseString && (c!='"'))) &&
+			(file->getPos() < file->getSize()));
+	// we want to skip the last quotes of a string , but other chars might be the next
+	// token already.
+	if (!parseString)
 		file->seek(-1, true);
 }
 
 
-
 bool COgreMeshFileLoader::readColor(io::IReadFile* file, video::SColor& col)
 {
 	core::stringc token;
@@ -667,6 +717,9 @@ bool COgreMeshFileLoader::readColor(io::IReadFile* file, video::SColor& col)
 
 void COgreMeshFileLoader::readPass(io::IReadFile* file, OgreTechnique& technique)
 {
+#ifdef IRR_OGRE_LOADER_DEBUG
+	os::Printer::log("Read Pass");
+#endif
 	core::stringc token;
 	technique.Passes.push_back(OgrePass());
 	OgrePass& pass=technique.Passes.getLast();
@@ -785,6 +838,9 @@ void COgreMeshFileLoader::readPass(io::IReadFile* file, OgreTechnique& technique
 		}
 		else if (token=="texture_unit")
 		{
+#ifdef IRR_OGRE_LOADER_DEBUG
+			os::Printer::log("Read Texture unit");
+#endif
 			getMaterialToken(file, token); //open brace
 			getMaterialToken(file, token);
 			while(token != "}")
@@ -792,6 +848,9 @@ void COgreMeshFileLoader::readPass(io::IReadFile* file, OgreTechnique& technique
 				if (token=="texture")
 				{
 					getMaterialToken(file, pass.Texture.Filename);
+#ifdef IRR_OGRE_LOADER_DEBUG
+					os::Printer::log("Read Texture", pass.Texture.Filename.c_str());
+#endif
 					getMaterialToken(file, pass.Texture.CoordsType, true);
 					getMaterialToken(file, pass.Texture.MipMaps, true);
 					getMaterialToken(file, pass.Texture.Alpha, true);
@@ -815,6 +874,22 @@ void COgreMeshFileLoader::readPass(io::IReadFile* file, OgreTechnique& technique
 				getMaterialToken(file, token);
 			}
 		}
+		else if (token=="shadow_caster_program_ref")
+		{
+			do
+			{
+				getMaterialToken(file, token);
+			} while (token != "}");
+			getMaterialToken(file, token);
+		}
+		else if (token=="vertex_program_ref")
+		{
+			do
+			{
+				getMaterialToken(file, token);
+			} while (token != "}");
+			getMaterialToken(file, token);
+		}
 		//fog_override, iteration, point_size_attenuation
 		//not considered yet!
 		getMaterialToken(file, token);
@@ -826,9 +901,11 @@ void COgreMeshFileLoader::readPass(io::IReadFile* file, OgreTechnique& technique
 }
 
 
-
 void COgreMeshFileLoader::readTechnique(io::IReadFile* file, OgreMaterial& mat)
 {
+#ifdef IRR_OGRE_LOADER_DEBUG
+	os::Printer::log("Read Technique");
+#endif
 	core::stringc token;
 	mat.Techniques.push_back(OgreTechnique());
 	OgreTechnique& technique=mat.Techniques.getLast();
@@ -856,6 +933,9 @@ void COgreMeshFileLoader::readTechnique(io::IReadFile* file, OgreMaterial& mat)
 
 void COgreMeshFileLoader::loadMaterials(io::IReadFile* meshFile)
 {
+#ifdef IRR_OGRE_LOADER_DEBUG
+	os::Printer::log("Load Materials");
+#endif
 	core::stringc token,filename=meshFile->getFileName();
 	core::stringc material = filename.subString(0, filename.size()-4) + "material";
 	io::IReadFile* file = FileSystem->createAndOpenFile(material.c_str());
@@ -870,12 +950,39 @@ void COgreMeshFileLoader::loadMaterials(io::IReadFile* meshFile)
 
 	while (file->getPos() < file->getSize())
 	{
+		if ((token == "fragment_program") || (token == "vertex_program"))
+		{
+			// skip whole block
+			u32 blocks=1;
+			do
+			{
+				getMaterialToken(file, token);
+			} while (token != "{");
+			do
+			{
+				getMaterialToken(file, token);
+				if (token == "{")
+					++blocks;
+				else if (token == "}")
+					--blocks;
+			} while (blocks);
+			getMaterialToken(file, token);
+			continue;
+		}
+		if (token != "material")
+		{
+			if (token.trim().size())
+				os::Printer::log("Unknown material group", token.c_str());
+			break;
+		}
+
 		Materials.push_back(OgreMaterial());
 		OgreMaterial& mat = Materials.getLast();
 
-		if (token != "material")
-			return;
 		getMaterialToken(file, mat.Name);
+#ifdef IRR_OGRE_LOADER_DEBUG
+	os::Printer::log("Load Material", mat.Name.c_str());
+#endif
 		getMaterialToken(file, token); //open brace
 		getMaterialToken(file, token);
 		while(token != "}")
@@ -905,10 +1012,12 @@ void COgreMeshFileLoader::loadMaterials(io::IReadFile* meshFile)
 	}
 
 	file->drop();
+#ifdef IRR_OGRE_LOADER_DEBUG
+	os::Printer::log("Finished loading Materials");
+#endif
 }
 
 
-
 void COgreMeshFileLoader::readChunkData(io::IReadFile* file, ChunkData& data)
 {
 	file->read(&data.header, sizeof(ChunkHeader));
diff --git a/src/dep/src/irrlicht/COgreMeshFileLoader.h b/src/dep/src/irrlicht/COgreMeshFileLoader.h
index bc2bc55..29adf0f 100644
--- a/src/dep/src/irrlicht/COgreMeshFileLoader.h
+++ b/src/dep/src/irrlicht/COgreMeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // orginally written by Christian Stehno, modified by Nikolaus Gebhardt
@@ -27,7 +27,7 @@ class COgreMeshFileLoader : public IMeshLoader
 public:
 
 	//! Constructor
-	COgreMeshFileLoader(IMeshManipulator* manip,io::IFileSystem* fs, video::IVideoDriver* driver);
+	COgreMeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver);
 
 	//! destructor
 	virtual ~COgreMeshFileLoader();
@@ -135,7 +135,7 @@ private:
 	struct OgreVertexBuffer
 	{
 		OgreVertexBuffer() : BindIndex(0), VertexSize(0), Data(0) {}
-		void destroy() { delete [] Data; Data = 0; };
+		void destroy() { delete [] Data; Data = 0; }
 
 		u16 BindIndex,
 		VertexSize;
@@ -230,7 +230,6 @@ private:
 	core::array<OgreMaterial> Materials;
 
 	SMesh* Mesh;
-	IMeshManipulator* Manipulator;
 	u32 NumUV;
 };
 
diff --git a/src/dep/src/irrlicht/COpenGLDriver.cpp b/src/dep/src/irrlicht/COpenGLDriver.cpp
index 89dd042..0b57df5 100644
--- a/src/dep/src/irrlicht/COpenGLDriver.cpp
+++ b/src/dep/src/irrlicht/COpenGLDriver.cpp
@@ -1,9 +1,10 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 #include "COpenGLDriver.h"
+// needed here also because of the create methods' parameters
+#include "CNullDriver.h"
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
@@ -30,12 +31,13 @@ namespace video
 // -----------------------------------------------------------------------
 #ifdef _IRR_USE_WINDOWS_DEVICE_
 //! Windows constructor and init code
-COpenGLDriver::COpenGLDriver(const core::dimension2d<s32>& screenSize, HWND window, bool fullscreen, bool stencilBuffer, io::IFileSystem* io, bool antiAlias)
-: CNullDriver(io, screenSize), COpenGLExtensionHandler(),
+COpenGLDriver::COpenGLDriver(const irr::SIrrlichtCreationParameters& params,
+		io::IFileSystem* io)
+: CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(),
 	CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true),
-	AntiAlias(antiAlias), RenderTargetTexture(0), LastSetLight(-1),
+	AntiAlias(params.AntiAlias), RenderTargetTexture(0), LastSetLight(-1),
 	CurrentRendertargetSize(0,0),
-	HDc(0), Window(window), HRc(0)
+	HDc(0), Window(static_cast<HWND>(params.WindowId)), HRc(0)
 {
 	#ifdef _DEBUG
 	setDebugName("COpenGLDriver");
@@ -43,112 +45,294 @@ COpenGLDriver::COpenGLDriver(const core::dimension2d<s32>& screenSize, HWND wind
 }
 
 //! inits the open gl driver
-bool COpenGLDriver::initDriver(const core::dimension2d<s32>& screenSize,
-				HWND window, u32 bits, bool fullscreen, bool vsync, bool stencilBuffer)
+bool COpenGLDriver::initDriver(irr::SIrrlichtCreationParameters params)
 {
-	static	PIXELFORMATDESCRIPTOR pfd =	{
+	// Set up ixel format descriptor with desired parameters
+	PIXELFORMATDESCRIPTOR pfd = {
 		sizeof(PIXELFORMATDESCRIPTOR),	// Size Of This Pixel Format Descriptor
 		1,				// Version Number
 		PFD_DRAW_TO_WINDOW |		// Format Must Support Window
 		PFD_SUPPORT_OPENGL |		// Format Must Support OpenGL
 		PFD_DOUBLEBUFFER,		// Must Support Double Buffering
 		PFD_TYPE_RGBA,			// Request An RGBA Format
-		bits,				// Select Our Color Depth
+		params.Bits,				// Select Our Color Depth
 		0, 0, 0, 0, 0, 0,		// Color Bits Ignored
 		0,				// No Alpha Buffer
 		0,				// Shift Bit Ignored
 		0,				// No Accumulation Buffer
 		0, 0, 0, 0,			// Accumulation Bits Ignored
 		24,				// Z-Buffer (Depth Buffer)
-		stencilBuffer ? 1 : 0,		// Stencil Buffer Depth
+		params.Stencilbuffer ? 1 : 0,	// Stencil Buffer Depth
 		0,				// No Auxiliary Buffer
 		PFD_MAIN_PLANE,			// Main Drawing Layer
 		0,				// Reserved
 		0, 0, 0				// Layer Masks Ignored
 	};
 
-	for (u32 i=0; i<5; ++i)
+	GLuint PixelFormat;
+
+	if (AntiAlias)
 	{
-		if (i == 1)
+		// Create a window to test antialiasing support
+		const c8* ClassName = "GLCIrrDeviceWin32";
+		HINSTANCE lhInstance = GetModuleHandle(0);
+
+		// Register Class
+		WNDCLASSEX wcex;
+		wcex.cbSize          = sizeof(WNDCLASSEX);
+		wcex.style          = CS_HREDRAW | CS_VREDRAW;
+		wcex.lpfnWndProc   = (WNDPROC)DefWindowProc;
+		wcex.cbClsExtra      = 0;
+		wcex.cbWndExtra      = 0;
+		wcex.hInstance      = lhInstance;
+		wcex.hIcon          = NULL;
+		wcex.hCursor      = LoadCursor(NULL, IDC_ARROW);
+		wcex.hbrBackground   = (HBRUSH)(COLOR_WINDOW+1);
+		wcex.lpszMenuName   = 0;
+		wcex.lpszClassName   = ClassName;
+		wcex.hIconSm      = 0;
+		wcex.hIcon          = 0;
+
+		RegisterClassEx(&wcex);
+		RECT clientSize;
+		clientSize.top = 0;
+		clientSize.left = 0;
+		clientSize.right = params.WindowSize.Width;
+		clientSize.bottom = params.WindowSize.Height;
+
+		DWORD style = WS_POPUP;
+
+		if (!params.Fullscreen)
+			style = WS_SYSMENU | WS_BORDER | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+
+		AdjustWindowRect(&clientSize, style, FALSE);
+
+		const s32 realWidth = clientSize.right - clientSize.left;
+		const s32 realHeight = clientSize.bottom - clientSize.top;
+
+		const s32 windowLeft = (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2;
+		const s32 windowTop = (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2;
+
+		HWND temporary_wnd=CreateWindow(ClassName, "", style, windowLeft, windowTop,
+			realWidth, realHeight,   NULL, NULL, lhInstance, NULL);
+
+		if (!temporary_wnd)
 		{
-			if (stencilBuffer)
-			{
-				os::Printer::log("Cannot create a GL device with stencil buffer, disabling stencil shadows.", ELL_WARNING);
-				stencilBuffer = false;
-				pfd.cStencilBits = 0;
-			}
-			else
-				continue;
-		}
-		else
-		if (i == 2)
-		{
-			pfd.cDepthBits = 24;
-		}
-		if (i == 3)
-		{
-			if (bits!=16)
-				pfd.cDepthBits = 16;
-			else
-				continue;
-		}
-		else
-		if (i == 4)
-		{
-			os::Printer::log("Cannot create a GL device context.", ELL_ERROR);
+			os::Printer::log("Cannot create a temporary window.", ELL_ERROR);
 			return false;
 		}
 
-		// get hdc
-		if (!(HDc=GetDC(window)))
+		HDc = GetDC(temporary_wnd);
+		for (u32 i=0; i<5; ++i)
 		{
-			os::Printer::log("Cannot create a GL device context.", ELL_ERROR);
-			continue;
+			if (i == 1)
+			{
+				if (params.Stencilbuffer)
+				{
+					os::Printer::log("Cannot create a GL device with stencil buffer, disabling stencil shadows.", ELL_WARNING);
+					params.Stencilbuffer = false;
+					pfd.cStencilBits = 0;
+				}
+				else
+					continue;
+			}
+			else
+			if (i == 2)
+			{
+				pfd.cDepthBits = 24;
+			}
+			if (i == 3)
+			{
+				if (params.Bits!=16)
+					pfd.cDepthBits = 16;
+				else
+					continue;
+			}
+			else
+			if (i == 4)
+			{
+				os::Printer::log("Cannot create a GL device context", "No suitable format for temporary window.", ELL_ERROR);
+				ReleaseDC(temporary_wnd, HDc);
+				DestroyWindow(temporary_wnd);
+				return false;
+			}
+
+			// choose pixelformat
+			PixelFormat = ChoosePixelFormat(HDc, &pfd);
+			if (PixelFormat)
+				break;
 		}
 
-		GLuint PixelFormat;
-
-		// choose pixelformat
-		if (!(PixelFormat = ChoosePixelFormat(HDc, &pfd)))
+		SetPixelFormat(HDc, PixelFormat, &pfd);
+		HRc=wglCreateContext(HDc);
+		if (!HRc)
 		{
-			os::Printer::log("Cannot find a suitable pixelformat.", ELL_ERROR);
-			continue;
+			os::Printer::log("Cannot create a temporary GL rendering context.", ELL_ERROR);
+			ReleaseDC(temporary_wnd, HDc);
+			DestroyWindow(temporary_wnd);
+			return false;
 		}
 
-		// set pixel format
-		if(!SetPixelFormat(HDc, PixelFormat, &pfd))
+		if (!wglMakeCurrent(HDc, HRc))
 		{
-			os::Printer::log("Cannot set the pixel format.", ELL_ERROR);
-			continue;
+			os::Printer::log("Cannot activate a temporary GL rendering context.", ELL_ERROR);
+			wglDeleteContext(HRc);
+			ReleaseDC(temporary_wnd, HDc);
+			DestroyWindow(temporary_wnd);
+			return false;
 		}
 
-		// create rendering context
-		if (!(HRc=wglCreateContext(HDc)))
+		PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormat_ARB = (PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB");
+		if (wglChoosePixelFormat_ARB)
 		{
-			os::Printer::log("Cannot create a GL rendering context.", ELL_ERROR);
-			continue;
+			// This value determines the number of samples used for antialiasing
+			// valid numbers are 2, 4, 8.  My experience is that 8 does not
+			// show a big improvement over 4, but 4 shows a big improvement over
+			// 2.
+			const s32 numSamples = 4;
+			f32 fAttributes[] =
+			{
+				0.0, 0.0
+			};
+
+			s32 iAttributes[] =
+			{
+				WGL_DRAW_TO_WINDOW_ARB,GL_TRUE,
+				WGL_SUPPORT_OPENGL_ARB,GL_TRUE,
+				WGL_ACCELERATION_ARB,WGL_FULL_ACCELERATION_ARB,
+				WGL_COLOR_BITS_ARB,(params.Bits==32) ? 24 : 15,
+				WGL_ALPHA_BITS_ARB,(params.Bits==32) ? 8 : 1,
+				WGL_DEPTH_BITS_ARB,params.ZBufferBits,
+				WGL_STENCIL_BITS_ARB,(params.Stencilbuffer) ? 1 : 0,
+				WGL_DOUBLE_BUFFER_ARB,GL_TRUE,
+				WGL_SAMPLE_BUFFERS_ARB,GL_TRUE,
+				WGL_SAMPLES_ARB,numSamples,
+				0,0
+			};
+			s32 rv=0;
+
+			// Try to get an acceptable pixel format
+			while(rv==0 && iAttributes[19]>1)
+			{
+				s32 pixelFormat=0;
+				u32 numFormats=0;
+				const s32 valid = wglChoosePixelFormat_ARB(HDc,iAttributes,fAttributes,1,&pixelFormat,&numFormats);
+
+				if (valid && numFormats>0)
+					rv = pixelFormat;
+				else
+					iAttributes[19] >>= 1;
+			}
+			if (rv)
+				PixelFormat=rv;
 		}
 
-		// activate rendering context
-		if(!wglMakeCurrent(HDc, HRc))
-		{
-			os::Printer::log("Cannot activate GL rendering context", ELL_ERROR);
-			continue;
-		}
-
-		break;
+		wglMakeCurrent(HDc, NULL);
+		wglDeleteContext(HRc);
+		ReleaseDC(temporary_wnd, HDc);
+		DestroyWindow(temporary_wnd);
 	}
 
-	genericDriverInit(screenSize, stencilBuffer);
+	// get hdc
+	HDc=GetDC(Window);
+	if (!HDc)
+	{
+		os::Printer::log("Cannot create a GL device context.", ELL_ERROR);
+		return false;
+	}
+
+	// search for pixel format the simple way
+	if (!AntiAlias)
+	{
+		for (u32 i=0; i<5; ++i)
+		{
+			if (i == 1)
+			{
+				if (params.Stencilbuffer)
+				{
+					os::Printer::log("Cannot create a GL device with stencil buffer, disabling stencil shadows.", ELL_WARNING);
+					params.Stencilbuffer = false;
+					pfd.cStencilBits = 0;
+				}
+				else
+					continue;
+			}
+			else
+			if (i == 2)
+			{
+				pfd.cDepthBits = 24;
+			}
+			if (i == 3)
+			{
+				if (params.Bits!=16)
+					pfd.cDepthBits = 16;
+				else
+					continue;
+			}
+			else
+			if (i == 4)
+			{
+				os::Printer::log("Cannot create a GL device context", "No suitable format.", ELL_ERROR);
+				return false;
+			}
+
+			// choose pixelformat
+			PixelFormat = ChoosePixelFormat(HDc, &pfd);
+			if (PixelFormat)
+				break;
+		}
+	}
+
+	// set pixel format
+	if (!SetPixelFormat(HDc, PixelFormat, &pfd))
+	{
+		os::Printer::log("Cannot set the pixel format.", ELL_ERROR);
+		return false;
+	}
+
+	// create rendering context
+	HRc=wglCreateContext(HDc);
+	if (!HRc)
+	{
+		os::Printer::log("Cannot create a GL rendering context.", ELL_ERROR);
+		return false;
+	}
+
+	// activate rendering context
+	if (!wglMakeCurrent(HDc, HRc))
+	{
+		os::Printer::log("Cannot activate GL rendering context", ELL_ERROR);
+		wglDeleteContext(HRc);
+		return false;
+	}
+
+	int pf = GetPixelFormat(HDc);
+	DescribePixelFormat(HDc, pf, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
+	if (pfd.cAlphaBits != 0)
+	{
+		if (pfd.cRedBits == 8)
+			ColorFormat = ECF_A8R8G8B8;
+		else
+			ColorFormat = ECF_A1R5G5B5;
+	}
+	else
+	{
+		if (pfd.cRedBits == 8)
+			ColorFormat = ECF_R8G8B8;
+		else
+			ColorFormat = ECF_R5G6B5;
+	}
+
+	genericDriverInit(params.WindowSize, params.Stencilbuffer);
 
 	// set vsync
 	if (wglSwapIntervalEXT)
-		wglSwapIntervalEXT(vsync ? 1 : 0);
+		wglSwapIntervalEXT(params.Vsync ? 1 : 0);
 
 	// set exposed data
-	ExposedData.OpenGLWin32.HDc = reinterpret_cast<s32>(HDc);
-	ExposedData.OpenGLWin32.HRc = reinterpret_cast<s32>(HRc);
-	ExposedData.OpenGLWin32.HWnd = reinterpret_cast<s32>(Window);
+	ExposedData.OpenGLWin32.HDc = HDc;
+	ExposedData.OpenGLWin32.HRc = HRc;
+	ExposedData.OpenGLWin32.HWnd = Window;
 
 	return true;
 }
@@ -156,20 +340,21 @@ bool COpenGLDriver::initDriver(const core::dimension2d<s32>& screenSize,
 #endif //IRR_USE_WINDOWS_DEVICE_
 
 // -----------------------------------------------------------------------
-// MACOSX CONSTRUCTOR
+// MacOSX CONSTRUCTOR
 // -----------------------------------------------------------------------
-#ifdef MACOSX
+#ifdef _IRR_USE_OSX_DEVICE_
 //! Windows constructor and init code
-COpenGLDriver::COpenGLDriver(const core::dimension2d<s32>& screenSize, bool fullscreen, bool stencilBuffer, CIrrDeviceMacOSX *device, io::IFileSystem* io, bool vsync, bool antiAlias)
-: CNullDriver(io, screenSize), COpenGLExtensionHandler(),
+COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
+		io::IFileSystem* io, CIrrDeviceMacOSX *device)
+: CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(),
 	CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true),
-	AntiAlias(antiAlias), RenderTargetTexture(0), LastSetLight(-1),
-	CurrentRendertargetSize(0,0), _device(device)
+	AntiAlias(params.AntiAlias), RenderTargetTexture(0), LastSetLight(-1),
+	CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8), _device(device)
 {
 	#ifdef _DEBUG
 	setDebugName("COpenGLDriver");
 	#endif
-	genericDriverInit(screenSize, stencilBuffer);
+	genericDriverInit(params.WindowSize, params.Stencilbuffer);
 }
 
 #endif
@@ -179,28 +364,30 @@ COpenGLDriver::COpenGLDriver(const core::dimension2d<s32>& screenSize, bool full
 // -----------------------------------------------------------------------
 #ifdef _IRR_USE_LINUX_DEVICE_
 //! Linux constructor and init code
-COpenGLDriver::COpenGLDriver(const core::dimension2d<s32>& screenSize, bool fullscreen, bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias)
-: CNullDriver(io, screenSize), COpenGLExtensionHandler(),
+COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
+		io::IFileSystem* io)
+: CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(),
 	CurrentRenderMode(ERM_NONE), ResetRenderStates(true),
-	Transformation3DChanged(true), AntiAlias(antiAlias),
-	RenderTargetTexture(0), LastSetLight(-1), CurrentRendertargetSize(0,0)
+	Transformation3DChanged(true), AntiAlias(params.AntiAlias),
+	RenderTargetTexture(0), LastSetLight(-1), CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8)
 {
 	#ifdef _DEBUG
 	setDebugName("COpenGLDriver");
 	#endif
-	XWindow = glXGetCurrentDrawable();
-	XDisplay = glXGetCurrentDisplay();
-	ExposedData.OpenGLLinux.X11Display = XDisplay;
-	ExposedData.OpenGLLinux.X11Window = XWindow;
-	genericDriverInit(screenSize, stencilBuffer);
+	ExposedData.OpenGLLinux.X11Context = glXGetCurrentContext();
+	ExposedData.OpenGLLinux.X11Display = glXGetCurrentDisplay();
+	ExposedData.OpenGLLinux.X11Window = (unsigned long)params.WindowId;
+	Drawable = glXGetCurrentDrawable();
+
+	genericDriverInit(params.WindowSize, params.Stencilbuffer);
 
 	// set vsync
 #ifdef GLX_SGI_swap_control
 #ifdef _IRR_OPENGL_USE_EXTPOINTER_
-	if (vsync && glxSwapIntervalSGI)
+	if (params.Vsync && glxSwapIntervalSGI)
 		glxSwapIntervalSGI(1);
 #else
-	if (vsync)
+	if (params.Vsync)
 		glXSwapIntervalSGI(1);
 #endif
 #endif
@@ -214,17 +401,18 @@ COpenGLDriver::COpenGLDriver(const core::dimension2d<s32>& screenSize, bool full
 // -----------------------------------------------------------------------
 #ifdef _IRR_USE_SDL_DEVICE_
 //! SDL constructor and init code
-COpenGLDriver::COpenGLDriver(const core::dimension2d<s32>& screenSize, bool fullscreen, bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias)
-: CNullDriver(io, screenSize), COpenGLExtensionHandler(),
+COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
+		io::IFileSystem* io)
+: CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(),
 	CurrentRenderMode(ERM_NONE), ResetRenderStates(true),
-	Transformation3DChanged(true), AntiAlias(antiAlias),
-	RenderTargetTexture(0), LastSetLight(-1), CurrentRendertargetSize(0,0)
+	Transformation3DChanged(true), AntiAlias(params.AntiAlias),
+	RenderTargetTexture(0), LastSetLight(-1), CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8)
 {
 	#ifdef _DEBUG
 	setDebugName("COpenGLDriver");
 	#endif
 
-	genericDriverInit(screenSize, stencilBuffer);
+	genericDriverInit(params.WindowSize, params.Stencilbuffer);
 }
 
 #endif // _IRR_USE_SDL_DEVICE_
@@ -272,7 +460,10 @@ bool COpenGLDriver::genericDriverInit(const core::dimension2d<s32>& screenSize,
 	const GLubyte* renderer = glGetString(GL_RENDERER);
 	const GLubyte* vendor = glGetString(GL_VENDOR);
 	if (renderer && vendor)
+	{
 		os::Printer::log(reinterpret_cast<const c8*>(renderer), reinterpret_cast<const c8*>(vendor), ELL_INFORMATION);
+		vendorName = reinterpret_cast<const c8*>(vendor);
+	}
 
 	u32 i;
 	for (i=0; i<MATERIAL_MAX_TEXTURES; ++i)
@@ -289,28 +480,42 @@ bool COpenGLDriver::genericDriverInit(const core::dimension2d<s32>& screenSize,
 	else
 		os::Printer::log("GLSL not available.", ELL_INFORMATION);
 
-	glViewport(0, 0, screenSize.Width, screenSize.Height); // Reset The Current Viewport
+	glPixelStorei(GL_PACK_ALIGNMENT, 1);
+
+	// Reset The Current Viewport
+	glViewport(0, 0, screenSize.Width, screenSize.Height);
+
+// This needs an SMaterial flag to enable/disable later on, but should become default sometimes
+//	glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+//	glEnable(GL_COLOR_MATERIAL);
+
 	setAmbientLight(SColorf(0.0f,0.0f,0.0f,0.0f));
 #ifdef GL_EXT_separate_specular_color
 	if (FeatureAvailable[IRR_EXT_separate_specular_color])
 		glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
 #endif
 	glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
+
 // This is a fast replacement for NORMALIZE_NORMALS
 //	if ((Version>101) || FeatureAvailable[IRR_EXT_rescale_normal])
 //		glEnable(GL_RESCALE_NORMAL_EXT);
+
 	glClearDepth(1.0);
 	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 	glDepthFunc(GL_LEQUAL);
-	glFrontFace( GL_CW );
+	glFrontFace(GL_CW);
+
+	if (AntiAlias)
+	{
+		if (MultiSamplingExtension)
+			glEnable(GL_MULTISAMPLE_ARB);
+
+		glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
+		glEnable(GL_LINE_SMOOTH);
+	}
 // currently disabled, because often in software, and thus very slow
 //	glHint(GL_POINT_SMOOTH_HINT, GL_FASTEST);
-//	glHint(GL_LINE_SMOOTH_HINT, GL_FASTEST);
 //	glEnable(GL_POINT_SMOOTH);
-//	glEnable(GL_LINE_SMOOTH);
-
-	if (AntiAlias && MultiSamplingExtension)
-		glEnable(GL_MULTISAMPLE_ARB);
 
 	UserClipPlane.reallocate(MaxUserClipPlanes);
 	UserClipPlaneEnabled.reallocate(MaxUserClipPlanes);
@@ -324,12 +529,16 @@ bool COpenGLDriver::genericDriverInit(const core::dimension2d<s32>& screenSize,
 	createMaterialRenderers();
 
 	// set the renderstates
-	ResetRenderStates = true;
 	setRenderStates3DMode();
 
+	glAlphaFunc(GL_GREATER, 0.f);
+
 	// set fog mode
 	setFog(FogColor, LinearFog, FogStart, FogEnd, FogDensity, PixelFog, RangeFog);
 
+	// create matrix for flipping textures
+	TextureFlipMatrix.buildTextureTransform(0.0f, core::vector2df(0,0), core::vector2df(0,1.0f), core::vector2df(1.0f,-1.0f));
+
 	return true;
 }
 
@@ -338,11 +547,11 @@ void COpenGLDriver::createMaterialRenderers()
 {
 	// create OpenGL material renderers
 
-	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_SOLID( this));
-	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_SOLID_2_LAYER( this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_SOLID(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_SOLID_2_LAYER(this));
 
 	// add the same renderer for all lightmap types
-	COpenGLMaterialRenderer_LIGHTMAP* lmr = new COpenGLMaterialRenderer_LIGHTMAP( this);
+	COpenGLMaterialRenderer_LIGHTMAP* lmr = new COpenGLMaterialRenderer_LIGHTMAP(this);
 	addMaterialRenderer(lmr); // for EMT_LIGHTMAP:
 	addMaterialRenderer(lmr); // for EMT_LIGHTMAP_ADD:
 	addMaterialRenderer(lmr); // for EMT_LIGHTMAP_M2:
@@ -353,14 +562,14 @@ void COpenGLDriver::createMaterialRenderers()
 	lmr->drop();
 
 	// add remaining material renderer
-	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_DETAIL_MAP( this));
-	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_SPHERE_MAP( this));
-	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_REFLECTION_2_LAYER( this));
-	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_ADD_COLOR( this));
-	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL( this));
-	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF( this));
-	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_VERTEX_ALPHA( this));
-	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_REFLECTION_2_LAYER( this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_DETAIL_MAP(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_SPHERE_MAP(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_REFLECTION_2_LAYER(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_ADD_COLOR(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_VERTEX_ALPHA(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_REFLECTION_2_LAYER(this));
 
 	// add normal map renderers
 	s32 tmp = 0;
@@ -386,18 +595,18 @@ void COpenGLDriver::createMaterialRenderers()
 
 
 //! presents the rendered scene on the screen, returns false if failed
-bool COpenGLDriver::endScene( s32 windowId, core::rect<s32>* sourceRect )
+bool COpenGLDriver::endScene()
 {
-	CNullDriver::endScene( windowId );
+	CNullDriver::endScene();
 
 	glFlush();
 
 #ifdef _IRR_USE_WINDOWS_DEVICE_
 	return SwapBuffers(HDc) == TRUE;
 #elif defined(_IRR_USE_LINUX_DEVICE_)
-	glXSwapBuffers(XDisplay, XWindow);
+	glXSwapBuffers((Display*)ExposedData.OpenGLLinux.X11Display, Drawable);
 	return true;
-#elif defined(MACOSX)
+#elif defined(_IRR_USE_OSX_DEVICE_)
 	_device->flush();
 	return true;
 #elif defined(_IRR_USE_SDL_DEVICE_)
@@ -409,11 +618,11 @@ bool COpenGLDriver::endScene( s32 windowId, core::rect<s32>* sourceRect )
 }
 
 
-
 //! clears the zbuffer
-bool COpenGLDriver::beginScene(bool backBuffer, bool zBuffer, SColor color)
+bool COpenGLDriver::beginScene(bool backBuffer, bool zBuffer, SColor color,
+		void* windowId, core::rect<s32>* sourceRect)
 {
-	CNullDriver::beginScene(backBuffer, zBuffer, color);
+	CNullDriver::beginScene(backBuffer, zBuffer, color, windowId, sourceRect);
 
 	GLbitfield mask = 0;
 
@@ -429,6 +638,7 @@ bool COpenGLDriver::beginScene(bool backBuffer, bool zBuffer, SColor color)
 	if (zBuffer)
 	{
 		glDepthMask(GL_TRUE);
+		LastMaterial.ZWriteEnable=true;
 		mask |= GL_DEPTH_BUFFER_BIT;
 	}
 
@@ -437,7 +647,6 @@ bool COpenGLDriver::beginScene(bool backBuffer, bool zBuffer, SColor color)
 }
 
 
-
 //! Returns the transformation set by setTransform
 const core::matrix4& COpenGLDriver::getTransform(E_TRANSFORMATION_STATE state) const
 {
@@ -445,23 +654,20 @@ const core::matrix4& COpenGLDriver::getTransform(E_TRANSFORMATION_STATE state) c
 }
 
 
-
 //! sets transformation
 void COpenGLDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat)
 {
-	GLfloat glmat[16];
 	Matrices[state] = mat;
 	Transformation3DChanged = true;
 
-	switch(state)
+	switch (state)
 	{
 	case ETS_VIEW:
 	case ETS_WORLD:
 		{
 			// OpenGL only has a model matrix, view and world is not existent. so lets fake these two.
-			createGLMatrix(glmat, Matrices[ETS_VIEW] * Matrices[ETS_WORLD]);
 			glMatrixMode(GL_MODELVIEW);
-			glLoadMatrixf(glmat);
+			glLoadMatrixf((Matrices[ETS_VIEW] * Matrices[ETS_WORLD]).pointer());
 			// we have to update the clip planes to the latest view matrix
 			for (u32 i=0; i<MaxUserClipPlanes; ++i)
 				if (UserClipPlaneEnabled[i])
@@ -469,11 +675,14 @@ void COpenGLDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matri
 		}
 		break;
 	case ETS_PROJECTION:
-		createGLMatrix(glmat, mat);
-		// flip z to compensate OpenGLs right-hand coordinate system
-		glmat[12] *= -1.0f;
-		glMatrixMode(GL_PROJECTION);
-		glLoadMatrixf(glmat);
+		{
+			GLfloat glmat[16];
+			createGLMatrix(glmat, mat);
+			// flip z to compensate OpenGLs right-hand coordinate system
+			glmat[12] *= -1.0f;
+			glMatrixMode(GL_PROJECTION);
+			glLoadMatrixf(glmat);
+		}
 		break;
 	case ETS_TEXTURE_0:
 	case ETS_TEXTURE_1:
@@ -491,9 +700,12 @@ void COpenGLDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matri
 			glLoadIdentity();
 		else
 		{
-			createGLTextureMatrix(glmat, mat);
+			GLfloat glmat[16];
 			if (isRTT)
-				glmat[5] *= -1.0f;
+				createGLTextureMatrix(glmat, mat * TextureFlipMatrix);
+			else
+				createGLTextureMatrix(glmat, mat);
+
 			glLoadMatrixf(glmat);
 		}
 		break;
@@ -504,9 +716,323 @@ void COpenGLDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matri
 }
 
 
+bool COpenGLDriver::updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	if (!FeatureAvailable[IRR_ARB_vertex_buffer_object])
+		return false;
+
+#if defined(GL_ARB_vertex_buffer_object)
+	const scene::IMeshBuffer* mb = HWBuffer->MeshBuffer;
+	const void* vertices=mb->getVertices();
+	const u32 vertexCount=mb->getVertexCount();
+	const E_VERTEX_TYPE vType=mb->getVertexType();
+	const u32 vertexSize = getVertexPitchFromType(vType);
+
+	//buffer vertex data, and convert colours...
+	core::array<c8> buffer(vertexSize * vertexCount);
+	memcpy(buffer.pointer(), vertices, vertexSize * vertexCount);
+
+	// in order to convert the colors into opengl format (RGBA)
+	switch (vType)
+	{
+		case EVT_STANDARD:
+		{
+			S3DVertex* pb = reinterpret_cast<S3DVertex*>(buffer.pointer());
+			const S3DVertex* po = static_cast<const S3DVertex*>(vertices);
+			for (u32 i=0; i<vertexCount; i++)
+			{
+				po[i].Color.toOpenGLColor((u8*)&(pb[i].Color.color));
+			}
+		}
+		break;
+		case EVT_2TCOORDS:
+		{
+			S3DVertex2TCoords* pb = reinterpret_cast<S3DVertex2TCoords*>(buffer.pointer());
+			const S3DVertex2TCoords* po = static_cast<const S3DVertex2TCoords*>(vertices);
+			for (u32 i=0; i<vertexCount; i++)
+			{
+				po[i].Color.toOpenGLColor((u8*)&(pb[i].Color.color));
+			}
+		}
+		break;
+		case EVT_TANGENTS:
+		{
+			S3DVertexTangents* pb = reinterpret_cast<S3DVertexTangents*>(buffer.pointer());
+			const S3DVertexTangents* po = static_cast<const S3DVertexTangents*>(vertices);
+			for (u32 i=0; i<vertexCount; i++)
+			{
+				po[i].Color.toOpenGLColor((u8*)&(pb[i].Color.color));
+			}
+		}
+		break;
+		default:
+		{
+			return false;
+		}
+	}
+
+	//get or create buffer
+	bool newBuffer=false;
+	if (!HWBuffer->vbo_verticesID)
+	{
+		extGlGenBuffers(1, &HWBuffer->vbo_verticesID);
+		if (!HWBuffer->vbo_verticesID)
+			return false;
+		newBuffer=true;
+	}
+	else if (HWBuffer->vbo_verticesSize < vertexCount*vertexSize)
+	{
+		newBuffer=true;
+	}
+
+	extGlBindBuffer(GL_ARRAY_BUFFER, HWBuffer->vbo_verticesID);
+
+	//copy data to graphics card
+	glGetError(); // clear error storage
+	if (!newBuffer)
+		extGlBufferSubData(GL_ARRAY_BUFFER, 0, vertexCount * vertexSize, buffer.const_pointer());
+	else
+	{
+		HWBuffer->vbo_verticesSize = vertexCount*vertexSize;
+
+		if (HWBuffer->Mapped_Vertex==scene::EHM_STATIC)
+			extGlBufferData(GL_ARRAY_BUFFER, vertexCount * vertexSize, buffer.const_pointer(), GL_STATIC_DRAW);
+		else if (HWBuffer->Mapped_Vertex==scene::EHM_DYNAMIC)
+			extGlBufferData(GL_ARRAY_BUFFER, vertexCount * vertexSize, buffer.const_pointer(), GL_DYNAMIC_DRAW);
+		else //scene::EHM_STREAM
+			extGlBufferData(GL_ARRAY_BUFFER, vertexCount * vertexSize, buffer.const_pointer(), GL_STREAM_DRAW);
+	}
+
+	extGlBindBuffer(GL_ARRAY_BUFFER, 0);
+
+	return (glGetError() == GL_NO_ERROR);
+#else
+	return false;
+#endif
+}
+
+
+bool COpenGLDriver::updateIndexHardwareBuffer(SHWBufferLink_opengl *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	if (!FeatureAvailable[IRR_ARB_vertex_buffer_object])
+		return false;
+
+#if defined(GL_ARB_vertex_buffer_object)
+	const scene::IMeshBuffer* mb = HWBuffer->MeshBuffer;
+
+	const void* indices=mb->getIndices();
+	u32 indexCount= mb->getIndexCount();
+
+	GLenum indexSize;
+	switch (mb->getIndexType())
+	{
+		case EIT_16BIT:
+		{
+			indexSize=sizeof(u16);
+			break;
+		}
+		case EIT_32BIT:
+		{
+			indexSize=sizeof(u32);
+			break;
+		}
+		default:
+		{
+			return false;
+		}
+	}
+
+
+	//get or create buffer
+	bool newBuffer=false;
+	if (!HWBuffer->vbo_indicesID)
+	{
+		extGlGenBuffers(1, &HWBuffer->vbo_indicesID);
+		if (!HWBuffer->vbo_indicesID)
+			return false;
+		newBuffer=true;
+	}
+	else if (HWBuffer->vbo_indicesSize < indexCount*indexSize)
+	{
+		newBuffer=true;
+	}
+
+	extGlBindBuffer(GL_ELEMENT_ARRAY_BUFFER, HWBuffer->vbo_indicesID);
+
+	//copy data to graphics card
+	glGetError(); // clear error storage
+	if (!newBuffer)
+		extGlBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, indexCount * indexSize, indices);
+	else
+	{
+		HWBuffer->vbo_indicesSize = indexCount*indexSize;
+
+		if (HWBuffer->Mapped_Index==scene::EHM_STATIC)
+			extGlBufferData(GL_ELEMENT_ARRAY_BUFFER, indexCount * indexSize, indices, GL_STATIC_DRAW);
+		else if (HWBuffer->Mapped_Index==scene::EHM_DYNAMIC)
+			extGlBufferData(GL_ELEMENT_ARRAY_BUFFER, indexCount * indexSize, indices, GL_DYNAMIC_DRAW);
+		else //scene::EHM_STREAM
+			extGlBufferData(GL_ELEMENT_ARRAY_BUFFER, indexCount * indexSize, indices, GL_STREAM_DRAW);
+	}
+
+	extGlBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+
+	return (glGetError() == GL_NO_ERROR);
+#else
+	return false;
+#endif
+}
+
+
+//! updates hardware buffer if needed
+bool COpenGLDriver::updateHardwareBuffer(SHWBufferLink *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	if (HWBuffer->Mapped_Vertex!=scene::EHM_NEVER)
+	{
+		if (HWBuffer->ChangedID_Vertex != HWBuffer->MeshBuffer->getChangedID_Vertex()
+			|| !((SHWBufferLink_opengl*)HWBuffer)->vbo_verticesID)
+		{
+
+			HWBuffer->ChangedID_Vertex = HWBuffer->MeshBuffer->getChangedID_Vertex();
+
+			if (!updateVertexHardwareBuffer((SHWBufferLink_opengl*)HWBuffer))
+				return false;
+		}
+	}
+
+	if (HWBuffer->Mapped_Index!=scene::EHM_NEVER)
+	{
+		if (HWBuffer->ChangedID_Index != HWBuffer->MeshBuffer->getChangedID_Index()
+			|| !((SHWBufferLink_opengl*)HWBuffer)->vbo_indicesID)
+		{
+
+			HWBuffer->ChangedID_Index = HWBuffer->MeshBuffer->getChangedID_Index();
+
+			if (!updateIndexHardwareBuffer((SHWBufferLink_opengl*)HWBuffer))
+				return false;
+		}
+	}
+
+	return true;
+}
+
+
+//! Create hardware buffer from meshbuffer
+COpenGLDriver::SHWBufferLink *COpenGLDriver::createHardwareBuffer(const scene::IMeshBuffer* mb)
+{
+#if defined(GL_ARB_vertex_buffer_object)
+	if (!mb || (mb->getHardwareMappingHint_Index()==scene::EHM_NEVER && mb->getHardwareMappingHint_Vertex()==scene::EHM_NEVER))
+		return 0;
+
+	SHWBufferLink_opengl *HWBuffer=new SHWBufferLink_opengl(mb);
+
+	//add to map
+	HWBufferMap.insert(HWBuffer->MeshBuffer, HWBuffer);
+
+	HWBuffer->ChangedID_Vertex=HWBuffer->MeshBuffer->getChangedID_Vertex();
+	HWBuffer->ChangedID_Index=HWBuffer->MeshBuffer->getChangedID_Index();
+	HWBuffer->Mapped_Vertex=mb->getHardwareMappingHint_Vertex();
+	HWBuffer->Mapped_Index=mb->getHardwareMappingHint_Index();
+	HWBuffer->LastUsed=0;
+	HWBuffer->vbo_verticesID=0;
+	HWBuffer->vbo_indicesID=0;
+	HWBuffer->vbo_verticesSize=0;
+	HWBuffer->vbo_indicesSize=0;
+
+	if (!updateHardwareBuffer(HWBuffer))
+	{
+		deleteHardwareBuffer(HWBuffer);
+		return 0;
+	}
+
+	return HWBuffer;
+#else
+	return 0;
+#endif
+}
+
+
+void COpenGLDriver::deleteHardwareBuffer(SHWBufferLink *_HWBuffer)
+{
+	if (!_HWBuffer)
+		return;
+
+#if defined(GL_ARB_vertex_buffer_object)
+	SHWBufferLink_opengl *HWBuffer=(SHWBufferLink_opengl*)_HWBuffer;
+	if (HWBuffer->vbo_verticesID)
+	{
+		extGlDeleteBuffers(1, &HWBuffer->vbo_verticesID);
+		HWBuffer->vbo_verticesID=0;
+	}
+	if (HWBuffer->vbo_indicesID)
+	{
+		extGlDeleteBuffers(1, &HWBuffer->vbo_indicesID);
+		HWBuffer->vbo_indicesID=0;
+	}
+#endif
+
+	CNullDriver::deleteHardwareBuffer(_HWBuffer);
+}
+
+
+//! Draw hardware buffer
+void COpenGLDriver::drawHardwareBuffer(SHWBufferLink *_HWBuffer)
+{
+	if (!_HWBuffer)
+		return;
+
+	updateHardwareBuffer(_HWBuffer); //check if update is needed
+	_HWBuffer->LastUsed=0; //reset count
+
+#if defined(GL_ARB_vertex_buffer_object)
+	SHWBufferLink_opengl *HWBuffer=(SHWBufferLink_opengl*)_HWBuffer;
+
+	const scene::IMeshBuffer* mb = HWBuffer->MeshBuffer;
+	const void *vertices=mb->getVertices();
+	const void *indexList=mb->getIndices();
+
+	if (HWBuffer->Mapped_Vertex!=scene::EHM_NEVER)
+	{
+		extGlBindBuffer(GL_ARRAY_BUFFER, HWBuffer->vbo_verticesID);
+		vertices=0;
+	}
+
+	if (HWBuffer->Mapped_Index!=scene::EHM_NEVER)
+	{
+		extGlBindBuffer(GL_ELEMENT_ARRAY_BUFFER, HWBuffer->vbo_indicesID);
+		indexList=0;
+	}
+
+	drawVertexPrimitiveList(vertices, mb->getVertexCount(), indexList, mb->getIndexCount()/3, mb->getVertexType(), scene::EPT_TRIANGLES, mb->getIndexType());
+
+	if (HWBuffer->Mapped_Vertex!=scene::EHM_NEVER)
+		extGlBindBuffer(GL_ARRAY_BUFFER, 0);
+	if (HWBuffer->Mapped_Index!=scene::EHM_NEVER)
+		extGlBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+#endif
+}
+
+
+// small helper function to create vertex buffer object adress offsets
+static inline u8* buffer_offset(const long offset)
+{
+	return ((u8*)0 + offset);
+}
+
 
 //! draws a vertex primitive list
-void COpenGLDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType)
+void COpenGLDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
+		const void* indexList, u32 primitiveCount,
+		E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
 {
 	if (!primitiveCount || !vertexCount)
 		return;
@@ -514,49 +1040,51 @@ void COpenGLDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCoun
 	if (!checkPrimitiveCount(primitiveCount))
 		return;
 
-	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType);
+	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType, iType);
 
-	// convert colors to gl color format.
-	vertexCount *= 4; //reused as color component count
-	ColorBuffer.set_used(vertexCount);
-	u32 i;
-
-	switch (vType)
+	if (vertices)
 	{
-		case EVT_STANDARD:
+		// convert colors to gl color format.
+		vertexCount *= 4; //reused as color component count
+		ColorBuffer.set_used(vertexCount);
+		u32 i;
+
+		switch (vType)
 		{
-			const S3DVertex* p = reinterpret_cast<const S3DVertex*>(vertices);
-			for ( i=0; i<vertexCount; i+=4)
+			case EVT_STANDARD:
 			{
-				p->Color.toOpenGLColor(&ColorBuffer[i]);
-				++p;
+				const S3DVertex* p = static_cast<const S3DVertex*>(vertices);
+				for (i=0; i<vertexCount; i+=4)
+				{
+					p->Color.toOpenGLColor(&ColorBuffer[i]);
+					++p;
+				}
 			}
-		}
-		break;
-		case EVT_2TCOORDS:
-		{
-			const S3DVertex2TCoords* p = reinterpret_cast<const S3DVertex2TCoords*>(vertices);
-			for ( i=0; i<vertexCount; i+=4)
+			break;
+			case EVT_2TCOORDS:
 			{
-				p->Color.toOpenGLColor(&ColorBuffer[i]);
-				++p;
+				const S3DVertex2TCoords* p = static_cast<const S3DVertex2TCoords*>(vertices);
+				for (i=0; i<vertexCount; i+=4)
+				{
+					p->Color.toOpenGLColor(&ColorBuffer[i]);
+					++p;
+				}
 			}
-		}
-		break;
-		case EVT_TANGENTS:
-		{
-			const S3DVertexTangents* p = reinterpret_cast<const S3DVertexTangents*>(vertices);
-			for ( i=0; i<vertexCount; i+=4)
+			break;
+			case EVT_TANGENTS:
 			{
-				p->Color.toOpenGLColor(&ColorBuffer[i]);
-				++p;
+				const S3DVertexTangents* p = static_cast<const S3DVertexTangents*>(vertices);
+				for (i=0; i<vertexCount; i+=4)
+				{
+					p->Color.toOpenGLColor(&ColorBuffer[i]);
+					++p;
+				}
 			}
+			break;
 		}
-		break;
 	}
 
 	// draw everything
-
 	setRenderStates3DMode();
 
 	if (MultiTextureExtension)
@@ -569,50 +1097,112 @@ void COpenGLDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCoun
 	if ((pType!=scene::EPT_POINTS) && (pType!=scene::EPT_POINT_SPRITES))
 		glEnableClientState(GL_NORMAL_ARRAY);
 
-	glColorPointer(4, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+	if (vertices)
+		glColorPointer(4, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+
 	switch (vType)
 	{
 		case EVT_STANDARD:
-			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex), &(reinterpret_cast<const S3DVertex*>(vertices))[0].Pos);
-			glNormalPointer(GL_FLOAT, sizeof(S3DVertex), &(reinterpret_cast<const S3DVertex*>(vertices))[0].Normal);
-			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(reinterpret_cast<const S3DVertex*>(vertices))[0].TCoords);
+			if (vertices)
+			{
+				glNormalPointer(GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex*>(vertices))[0].Normal);
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex*>(vertices))[0].TCoords);
+				glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex*>(vertices))[0].Pos);
+			}
+			else
+			{
+				glNormalPointer(GL_FLOAT, sizeof(S3DVertex), buffer_offset(12));
+				glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(S3DVertex), buffer_offset(24));
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), buffer_offset(28));
+				glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex), 0);
+			}
+
 			if (MultiTextureExtension && CurrentTexture[1])
 			{
 				extGlClientActiveTexture(GL_TEXTURE1_ARB);
 				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(reinterpret_cast<const S3DVertex*>(vertices))[0].TCoords);
+				if (vertices)
+					glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex*>(vertices))[0].TCoords);
+				else
+					glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), buffer_offset(28));
 			}
 			break;
 		case EVT_2TCOORDS:
-			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex2TCoords), &(reinterpret_cast<const S3DVertex2TCoords*>(vertices))[0].Pos);
-			glNormalPointer(GL_FLOAT, sizeof(S3DVertex2TCoords), &(reinterpret_cast<const S3DVertex2TCoords*>(vertices))[0].Normal);
-			// texture coordinates
-			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(reinterpret_cast<const S3DVertex2TCoords*>(vertices))[0].TCoords);
+			if (vertices)
+			{
+				glNormalPointer(GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords*>(vertices))[0].Normal);
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords*>(vertices))[0].TCoords);
+				glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords*>(vertices))[0].Pos);
+			}
+			else
+			{
+				glNormalPointer(GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(12));
+				glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(S3DVertex2TCoords), buffer_offset(24));
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(28));
+				glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(0));
+			}
+
+
 			if (MultiTextureExtension)
 			{
 				extGlClientActiveTexture(GL_TEXTURE1_ARB);
 				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(reinterpret_cast<const S3DVertex2TCoords*>(vertices))[0].TCoords2);
+				if (vertices)
+					glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords*>(vertices))[0].TCoords2);
+				else
+					glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(36));
 			}
 			break;
 		case EVT_TANGENTS:
-			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(reinterpret_cast<const S3DVertexTangents*>(vertices))[0].Pos);
-			glNormalPointer(GL_FLOAT, sizeof(S3DVertexTangents), &(reinterpret_cast<const S3DVertexTangents*>(vertices))[0].Normal);
-			// texture coordinates
-			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), &(reinterpret_cast<const S3DVertexTangents*>(vertices))[0].TCoords);
+			if (vertices)
+			{
+				glNormalPointer(GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents*>(vertices))[0].Normal);
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents*>(vertices))[0].TCoords);
+				glVertexPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents*>(vertices))[0].Pos);
+			}
+			else
+			{
+				glNormalPointer(GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(12));
+				glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(S3DVertexTangents), buffer_offset(24));
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(28));
+				glVertexPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(0));
+			}
+
 			if (MultiTextureExtension)
 			{
 				extGlClientActiveTexture(GL_TEXTURE1_ARB);
 				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-				glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(reinterpret_cast<const S3DVertexTangents*>(vertices))[0].Tangent);
+				if (vertices)
+					glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents*>(vertices))[0].Tangent);
+				else
+					glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(36));
 
 				extGlClientActiveTexture(GL_TEXTURE2_ARB);
-				glEnableClientState ( GL_TEXTURE_COORD_ARRAY );
-				glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(reinterpret_cast<const S3DVertexTangents*>(vertices))[0].Binormal);
+				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+				if (vertices)
+					glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents*>(vertices))[0].Binormal);
+				else
+					glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(48));
 			}
 			break;
 	}
 
+	GLenum indexSize=0;
+
+	switch (iType)
+	{
+		case EIT_16BIT:
+		{
+			indexSize=GL_UNSIGNED_SHORT;
+			break;
+		}
+		case EIT_32BIT:
+		{
+			indexSize=GL_UNSIGNED_INT;
+			break;
+		}
+	}
+
 	switch (pType)
 	{
 		case scene::EPT_POINTS:
@@ -646,31 +1236,31 @@ void COpenGLDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCoun
 		}
 			break;
 		case scene::EPT_LINE_STRIP:
-			glDrawElements(GL_LINE_STRIP, primitiveCount+1, GL_UNSIGNED_SHORT, indexList);
+			glDrawElements(GL_LINE_STRIP, primitiveCount+1, indexSize, indexList);
 			break;
 		case scene::EPT_LINE_LOOP:
-			glDrawElements(GL_LINE_LOOP, primitiveCount, GL_UNSIGNED_SHORT, indexList);
+			glDrawElements(GL_LINE_LOOP, primitiveCount, indexSize, indexList);
 			break;
 		case scene::EPT_LINES:
-			glDrawElements(GL_LINES, primitiveCount*2, GL_UNSIGNED_SHORT, indexList);
+			glDrawElements(GL_LINES, primitiveCount*2, indexSize, indexList);
 			break;
 		case scene::EPT_TRIANGLE_STRIP:
-			glDrawElements(GL_TRIANGLE_STRIP, primitiveCount+2, GL_UNSIGNED_SHORT, indexList);
+			glDrawElements(GL_TRIANGLE_STRIP, primitiveCount+2, indexSize, indexList);
 			break;
 		case scene::EPT_TRIANGLE_FAN:
-			glDrawElements(GL_TRIANGLE_FAN, primitiveCount+2, GL_UNSIGNED_SHORT, indexList);
+			glDrawElements(GL_TRIANGLE_FAN, primitiveCount+2, indexSize, indexList);
 			break;
 		case scene::EPT_TRIANGLES:
-			glDrawElements(GL_TRIANGLES, primitiveCount*3, GL_UNSIGNED_SHORT, indexList);
+			glDrawElements(GL_TRIANGLES, primitiveCount*3, indexSize, indexList);
 			break;
 		case scene::EPT_QUAD_STRIP:
-			glDrawElements(GL_QUAD_STRIP, primitiveCount*2+2, GL_UNSIGNED_SHORT, indexList);
+			glDrawElements(GL_QUAD_STRIP, primitiveCount*2+2, indexSize, indexList);
 			break;
 		case scene::EPT_QUADS:
-			glDrawElements(GL_QUADS, primitiveCount*4, GL_UNSIGNED_SHORT, indexList);
+			glDrawElements(GL_QUADS, primitiveCount*4, indexSize, indexList);
 			break;
 		case scene::EPT_POLYGON:
-			glDrawElements(GL_POLYGON, primitiveCount, GL_UNSIGNED_SHORT, indexList);
+			glDrawElements(GL_POLYGON, primitiveCount, indexSize, indexList);
 			break;
 	}
 
@@ -695,7 +1285,6 @@ void COpenGLDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCoun
 }
 
 
-
 //! draws a 2d image, using a color and the alpha channel of the texture if
 //! desired. The image is drawn at pos, clipped against clipRect (if != 0).
 //! Only the subtexture defined by sourceRect is used.
@@ -792,20 +1381,23 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture,
 	// ok, we've clipped everything.
 	// now draw it.
 
+	// texcoords need to be flipped horizontally for RTTs
+	const bool isRTT = texture->isRenderTarget();
 	const core::dimension2d<s32>& ss = texture->getOriginalSize();
-	core::rect<f32> tcoords;
-
-	tcoords.UpperLeftCorner.X = sourcePos.X / static_cast<f32>(ss.Width);
-	tcoords.UpperLeftCorner.Y = sourcePos.Y / static_cast<f32>(ss.Height);
-	tcoords.LowerRightCorner.X = (sourcePos.X + sourceSize.Width) / static_cast<f32>(ss.Width);
-	tcoords.LowerRightCorner.Y = (sourcePos.Y + sourceSize.Height) / static_cast<f32>(ss.Height);
+	const f32 invW = 1.f / static_cast<f32>(ss.Width);
+	const f32 invH = 1.f / static_cast<f32>(ss.Height);
+	const core::rect<f32> tcoords(
+			sourcePos.X * invW,
+			(isRTT?(sourcePos.Y + sourceSize.Height):sourcePos.Y) * invH,
+			(sourcePos.X + sourceSize.Width) * invW,
+			(isRTT?sourcePos.Y:(sourcePos.Y + sourceSize.Height)) * invH);
 
 	const core::rect<s32> poss(targetPos, sourceSize);
 
-	setRenderStates2DMode(color.getAlpha()<255, true, useAlphaChannelOfTexture);
 	disableTextures(1);
 	if (!setTexture(0, texture))
 		return;
+	setRenderStates2DMode(color.getAlpha()<255, true, useAlphaChannelOfTexture);
 
 	glColor4ub(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
 	glBegin(GL_QUADS);
@@ -826,23 +1418,26 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture,
 }
 
 
-
 //! The same, but with a four element array of colors, one for each vertex
 void COpenGLDriver::draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
 		const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect,
-		video::SColor* colors, bool useAlphaChannelOfTexture)
+		const video::SColor* const colors, bool useAlphaChannelOfTexture)
 {
 	if (!texture)
 		return;
 
+	// texcoords need to be flipped horizontally for RTTs
+	const bool isRTT = texture->isRenderTarget();
 	const core::dimension2d<s32>& ss = texture->getOriginalSize();
-	core::rect<f32> tcoords;
-	tcoords.UpperLeftCorner.X = sourceRect.UpperLeftCorner.X / static_cast<f32>(ss.Width);
-	tcoords.UpperLeftCorner.Y = sourceRect.UpperLeftCorner.Y / static_cast<f32>(ss.Height);
-	tcoords.LowerRightCorner.X = sourceRect.LowerRightCorner.X / static_cast<f32>(ss.Width);
-	tcoords.LowerRightCorner.Y = sourceRect.LowerRightCorner.Y / static_cast<f32>(ss.Height);
+	const f32 invW = 1.f / static_cast<f32>(ss.Width);
+	const f32 invH = 1.f / static_cast<f32>(ss.Height);
+	const core::rect<f32> tcoords(
+			sourceRect.UpperLeftCorner.X * invW,
+			(isRTT?sourceRect.LowerRightCorner.Y:sourceRect.UpperLeftCorner.Y) * invH,
+			sourceRect.LowerRightCorner.X * invW,
+			(isRTT?sourceRect.UpperLeftCorner.Y:sourceRect.LowerRightCorner.Y) *invH);
 
-	video::SColor temp[4] =
+	const video::SColor temp[4] =
 	{
 		0xFFFFFFFF,
 		0xFFFFFFFF,
@@ -850,21 +1445,22 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture, const core::rect
 		0xFFFFFFFF
 	};
 
-	video::SColor* useColor = colors ? colors : temp;
-
-	setRenderStates2DMode(useColor[0].getAlpha()<255 || useColor[1].getAlpha()<255 || useColor[2].getAlpha()<255 || useColor[3].getAlpha()<255, true, useAlphaChannelOfTexture);
+	const video::SColor* const useColor = colors ? colors : temp;
 
 	disableTextures(1);
 	setTexture(0, texture);
+	setRenderStates2DMode(useColor[0].getAlpha()<255 || useColor[1].getAlpha()<255 ||
+			useColor[2].getAlpha()<255 || useColor[3].getAlpha()<255,
+			true, useAlphaChannelOfTexture);
 
 	if (clipRect)
 	{
 		if (!clipRect->isValid())
 			return;
- 
+
 		glEnable(GL_SCISSOR_TEST);
 		const core::dimension2d<s32>& renderTargetSize = getCurrentRenderTargetSize();
-		glScissor(clipRect->UpperLeftCorner.X, renderTargetSize.Height-clipRect->LowerRightCorner.Y, 
+		glScissor(clipRect->UpperLeftCorner.X, renderTargetSize.Height-clipRect->LowerRightCorner.Y,
 			clipRect->getWidth(), clipRect->getHeight());
 	}
 
@@ -893,7 +1489,6 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture, const core::rect
 }
 
 
-
 //! draws a set of 2d images, using a color and the alpha channel of the
 //! texture if desired. The images are drawn beginning at pos and concatenated
 //! in one line. All drawings are clipped against clipRect (if != 0).
@@ -909,10 +1504,10 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture,
 	if (!texture)
 		return;
 
-	setRenderStates2DMode(color.getAlpha()<255, true, useAlphaChannelOfTexture);
 	disableTextures(1);
 	if (!setTexture(0, texture))
 		return;
+	setRenderStates2DMode(color.getAlpha()<255, true, useAlphaChannelOfTexture);
 
 	glColor4ub(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
 	if (clipRect)
@@ -928,24 +1523,24 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture,
 
 	const core::dimension2d<s32>& ss = texture->getOriginalSize();
 	core::position2d<s32> targetPos(pos);
-	core::position2d<s32> sourcePos;
-	core::dimension2d<s32> sourceSize;
-	core::rect<f32> tcoords;
+	// texcoords need to be flipped horizontally for RTTs
+	const bool isRTT = texture->isRenderTarget();
+	const f32 invW = 1.f / static_cast<f32>(ss.Width);
+	const f32 invH = 1.f / static_cast<f32>(ss.Height);
 
 	for (u32 i=0; i<indices.size(); ++i)
 	{
-		s32 currentIndex(indices[i]);
+		const s32 currentIndex = indices[i];
 		if (!sourceRects[currentIndex].isValid())
 			break;
-		sourcePos=sourceRects[currentIndex].UpperLeftCorner;
-		sourceSize=sourceRects[currentIndex].getSize();
 
-		tcoords.UpperLeftCorner.X = sourceRects[currentIndex].UpperLeftCorner.X / static_cast<f32>(ss.Width);
-		tcoords.UpperLeftCorner.Y = sourceRects[currentIndex].UpperLeftCorner.Y / static_cast<f32>(ss.Height);
-		tcoords.LowerRightCorner.X = sourceRects[currentIndex].LowerRightCorner.X / static_cast<f32>(ss.Width);
-		tcoords.LowerRightCorner.Y = sourceRects[currentIndex].LowerRightCorner.Y / static_cast<f32>(ss.Height);
+		const core::rect<f32> tcoords(
+				sourceRects[currentIndex].UpperLeftCorner.X * invW,
+				(isRTT?sourceRects[currentIndex].LowerRightCorner.Y:sourceRects[currentIndex].UpperLeftCorner.Y) * invH,
+				sourceRects[currentIndex].LowerRightCorner.X * invW,
+				(isRTT?sourceRects[currentIndex].UpperLeftCorner.Y:sourceRects[currentIndex].LowerRightCorner.Y) * invH);
 
-		const core::rect<s32> poss(targetPos, sourceSize);
+		const core::rect<s32> poss(targetPos, sourceRects[currentIndex].getSize());
 
 		glBegin(GL_QUADS);
 
@@ -956,7 +1551,7 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture,
 		glVertex2f(GLfloat(poss.LowerRightCorner.X), GLfloat(poss.UpperLeftCorner.Y));
 
 		glTexCoord2f(tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
-		glVertex2f(GLfloat(poss.LowerRightCorner.X), GLfloat(poss.LowerRightCorner.Y)); 
+		glVertex2f(GLfloat(poss.LowerRightCorner.X), GLfloat(poss.LowerRightCorner.Y));
 
 		glTexCoord2f(tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
 		glVertex2f(GLfloat(poss.UpperLeftCorner.X), GLfloat(poss.LowerRightCorner.Y));
@@ -969,13 +1564,12 @@ void COpenGLDriver::draw2DImage(const video::ITexture* texture,
 }
 
 
-
 //! draw a 2d rectangle
 void COpenGLDriver::draw2DRectangle(SColor color, const core::rect<s32>& position,
 		const core::rect<s32>* clip)
 {
-	setRenderStates2DMode(color.getAlpha() < 255, false, false);
 	disableTextures();
+	setRenderStates2DMode(color.getAlpha() < 255, false, false);
 
 	core::rect<s32> pos = position;
 
@@ -991,7 +1585,6 @@ void COpenGLDriver::draw2DRectangle(SColor color, const core::rect<s32>& positio
 }
 
 
-
 //! draw an 2d rectangle
 void COpenGLDriver::draw2DRectangle(const core::rect<s32>& position,
 			SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
@@ -1005,13 +1598,13 @@ void COpenGLDriver::draw2DRectangle(const core::rect<s32>& position,
 	if (!pos.isValid())
 		return;
 
+	disableTextures();
+
 	setRenderStates2DMode(colorLeftUp.getAlpha() < 255 ||
 		colorRightUp.getAlpha() < 255 ||
 		colorLeftDown.getAlpha() < 255 ||
 		colorRightDown.getAlpha() < 255, false, false);
 
-	disableTextures();
-
 	glBegin(GL_QUADS);
 	glColor4ub(colorLeftUp.getRed(), colorLeftUp.getGreen(),
 		colorLeftUp.getBlue(), colorLeftUp.getAlpha());
@@ -1033,14 +1626,13 @@ void COpenGLDriver::draw2DRectangle(const core::rect<s32>& position,
 }
 
 
-
 //! Draws a 2d line.
 void COpenGLDriver::draw2DLine(const core::position2d<s32>& start,
 				const core::position2d<s32>& end,
 				SColor color)
 {
-	setRenderStates2DMode(color.getAlpha() < 255, false, false);
 	disableTextures();
+	setRenderStates2DMode(color.getAlpha() < 255, false, false);
 
 	glBegin(GL_LINES);
 	glColor4ub(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
@@ -1049,7 +1641,21 @@ void COpenGLDriver::draw2DLine(const core::position2d<s32>& start,
 	glEnd();
 }
 
+//! Draws a pixel
+void COpenGLDriver::drawPixel(u32 x, u32 y, const SColor &color)
+{
+	const core::dimension2d<s32>& renderTargetSize = getCurrentRenderTargetSize();
+	if (x > (u32)renderTargetSize.Width || y > (u32)renderTargetSize.Height)
+		return;
 
+	disableTextures();
+	setRenderStates2DMode(color.getAlpha() < 255, false, false);
+
+	glBegin(GL_POINTS);
+	glColor4ub(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
+	glVertex2i(x, y);
+	glEnd();
+} 
 
 bool COpenGLDriver::setTexture(u32 stage, const video::ITexture* texture)
 {
@@ -1086,7 +1692,6 @@ bool COpenGLDriver::setTexture(u32 stage, const video::ITexture* texture)
 }
 
 
-
 //! disables all textures beginning with the optional fromStage parameter. Otherwise all texture stages are disabled.
 //! Returns whether disabling was successful or not.
 bool COpenGLDriver::disableTextures(u32 fromStage)
@@ -1098,11 +1703,10 @@ bool COpenGLDriver::disableTextures(u32 fromStage)
 }
 
 
-
 //! creates a matrix in supplied GLfloat array to pass to OpenGL
 inline void COpenGLDriver::createGLMatrix(GLfloat gl_matrix[16], const core::matrix4& m)
 {
-	memcpy ( gl_matrix, m.pointer(), 16 * sizeof(f32) );
+	memcpy(gl_matrix, m.pointer(), 16 * sizeof(f32));
 }
 
 
@@ -1137,6 +1741,7 @@ video::ITexture* COpenGLDriver::createDeviceDependentTexture(IImage* surface, co
 	return new COpenGLTexture(surface, name, this);
 }
 
+
 //! Sets a material. All 3d drawing functions draw geometry now
 //! using this material.
 //! \param material: Material to be used from now on.
@@ -1146,19 +1751,18 @@ void COpenGLDriver::setMaterial(const SMaterial& material)
 
 	for (s32 i = MaxTextureUnits-1; i>= 0; --i)
 	{
-		setTransform ((E_TRANSFORMATION_STATE) ( ETS_TEXTURE_0 + i ),
+		setTransform ((E_TRANSFORMATION_STATE) (ETS_TEXTURE_0 + i),
 				material.getTextureMatrix(i));
 	}
 }
 
 
-
 //! prints error if an error happened.
 bool COpenGLDriver::testGLError()
 {
 #ifdef _DEBUG
 	GLenum g = glGetError();
-	switch(g)
+	switch (g)
 	{
 	case GL_NO_ERROR:
 		return false;
@@ -1176,6 +1780,10 @@ bool COpenGLDriver::testGLError()
 		os::Printer::log("GL_OUT_OF_MEMORY", ELL_ERROR); break;
 	case GL_TABLE_TOO_LARGE:
 		os::Printer::log("GL_TABLE_TOO_LARGE", ELL_ERROR); break;
+#if defined(GL_EXT_framebuffer_object)
+	case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
+		os::Printer::log("GL_INVALID_FRAMEBUFFER_OPERATION", ELL_ERROR); break;
+#endif
 	};
 	return true;
 #else
@@ -1184,26 +1792,21 @@ bool COpenGLDriver::testGLError()
 }
 
 
-
 //! sets the needed renderstates
 void COpenGLDriver::setRenderStates3DMode()
 {
 	if (CurrentRenderMode != ERM_3D)
 	{
 		// Reset Texture Stages
-		if (FeatureAvailable[IRR_ARB_texture_env_combine])
-			glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_MODULATE );
+		glDisable(GL_BLEND);
 		glDisable(GL_ALPHA_TEST);
-		glDisable( GL_BLEND );
-		glBlendFunc( GL_ONE, GL_ONE_MINUS_SRC_COLOR );
+		glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
 
 		// switch back the matrices
-		GLfloat glmat[16];
-
-		createGLMatrix(glmat, Matrices[ETS_VIEW] * Matrices[ETS_WORLD]);
 		glMatrixMode(GL_MODELVIEW);
-		glLoadMatrixf(glmat);
+		glLoadMatrixf((Matrices[ETS_VIEW] * Matrices[ETS_WORLD]).pointer());
 
+		GLfloat glmat[16];
 		createGLMatrix(glmat, Matrices[ETS_PROJECTION]);
 		glmat[12] *= -1.0f;
 		glMatrixMode(GL_PROJECTION);
@@ -1212,16 +1815,16 @@ void COpenGLDriver::setRenderStates3DMode()
 		ResetRenderStates = true;
 	}
 
-	if ( ResetRenderStates || LastMaterial != Material)
+	if (ResetRenderStates || LastMaterial != Material)
 	{
 		// unset old material
 
 		if (LastMaterial.MaterialType != Material.MaterialType &&
-			LastMaterial.MaterialType >= 0 && LastMaterial.MaterialType < static_cast<s32>(MaterialRenderers.size()))
+				static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
 			MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
 
 		// set new material.
-		if (Material.MaterialType >= 0 && Material.MaterialType < static_cast<s32>(MaterialRenderers.size()))
+		if (static_cast<u32>(Material.MaterialType) < MaterialRenderers.size())
 			MaterialRenderers[Material.MaterialType].Renderer->OnSetMaterial(
 				Material, LastMaterial, ResetRenderStates, this);
 
@@ -1229,13 +1832,92 @@ void COpenGLDriver::setRenderStates3DMode()
 		ResetRenderStates = false;
 	}
 
-	if (Material.MaterialType >= 0 && Material.MaterialType < static_cast<s32>(MaterialRenderers.size()))
+	if (static_cast<u32>(Material.MaterialType) < MaterialRenderers.size())
 		MaterialRenderers[Material.MaterialType].Renderer->OnRender(this, video::EVT_STANDARD);
 
 	CurrentRenderMode = ERM_3D;
 }
 
 
+void COpenGLDriver::setWrapMode(const SMaterial& material)
+{
+	// texture address mode
+	// Has to be checked always because it depends on the textures
+	for (u32 u=0; u<MaxTextureUnits; ++u)
+	{
+		if (MultiTextureExtension)
+			extGlActiveTexture(GL_TEXTURE0_ARB + u);
+		else if (u>0)
+			break; // stop loop
+
+		GLint mode=GL_REPEAT;
+		switch (material.TextureLayer[u].TextureWrap)
+		{
+			case ETC_REPEAT:
+				mode=GL_REPEAT;
+				break;
+			case ETC_CLAMP:
+				mode=GL_CLAMP;
+				break;
+			case ETC_CLAMP_TO_EDGE:
+#ifdef GL_VERSION_1_2
+				if (Version>101)
+					mode=GL_CLAMP_TO_EDGE;
+				else
+#endif
+#ifdef GL_SGIS_texture_edge_clamp
+				if (FeatureAvailable[IRR_SGIS_texture_edge_clamp])
+					mode=GL_CLAMP_TO_EDGE_SGIS;
+				else
+#endif
+					// fallback
+					mode=GL_CLAMP;
+				break;
+			case ETC_CLAMP_TO_BORDER:
+#ifdef GL_VERSION_1_3
+				if (Version>102)
+					mode=GL_CLAMP_TO_BORDER;
+				else
+#endif
+#ifdef GL_ARB_texture_border_clamp
+				if (FeatureAvailable[IRR_ARB_texture_border_clamp])
+					mode=GL_CLAMP_TO_BORDER_ARB;
+				else
+#endif
+#ifdef GL_SGIS_texture_border_clamp
+				if (FeatureAvailable[IRR_SGIS_texture_border_clamp])
+					mode=GL_CLAMP_TO_BORDER_SGIS;
+				else
+#endif
+					// fallback
+					mode=GL_CLAMP;
+				break;
+			case ETC_MIRROR:
+#ifdef GL_VERSION_1_4
+				if (Version>103)
+					mode=GL_MIRRORED_REPEAT;
+				else
+#endif
+#ifdef GL_ARB_texture_border_clamp
+				if (FeatureAvailable[IRR_ARB_texture_mirrored_repeat])
+					mode=GL_MIRRORED_REPEAT_ARB;
+				else
+#endif
+#ifdef GL_IBM_texture_mirrored_repeat
+				if (FeatureAvailable[IRR_IBM_texture_mirrored_repeat])
+					mode=GL_MIRRORED_REPEAT_IBM;
+				else
+#endif
+					mode=GL_REPEAT;
+				break;
+		}
+
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, mode);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, mode);
+	}
+}
+
+
 //! Can be called by an IMaterialRenderer to make its work easier.
 void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMaterial& lastmaterial,
 	bool resetAllRenderStates)
@@ -1295,37 +1977,36 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
 	// Filtering has to be set for each texture layer
 	for (u32 i=0; i<MaxTextureUnits; ++i)
 	{
-		if (!material.getTexture(i))
-			continue;
 		if (MultiTextureExtension)
 			extGlActiveTexture(GL_TEXTURE0_ARB + i);
 		else if (i>0)
 			break;
 
-		glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
 			(material.TextureLayer[i].BilinearFilter || material.TextureLayer[i].TrilinearFilter) ? GL_LINEAR : GL_NEAREST);
 
 		if (material.getTexture(i) && material.getTexture(i)->hasMipMaps())
-			glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-				material.TextureLayer[i].TrilinearFilter ? GL_LINEAR_MIPMAP_LINEAR : material.TextureLayer[i].BilinearFilter ? GL_LINEAR_MIPMAP_NEAREST : GL_NEAREST_MIPMAP_NEAREST );
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+				material.TextureLayer[i].TrilinearFilter ? GL_LINEAR_MIPMAP_LINEAR :
+				material.TextureLayer[i].BilinearFilter ? GL_LINEAR_MIPMAP_NEAREST :
+				GL_NEAREST_MIPMAP_NEAREST);
 		else
-			glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
 				(material.TextureLayer[i].BilinearFilter || material.TextureLayer[i].TrilinearFilter) ? GL_LINEAR : GL_NEAREST);
 
 #ifdef GL_EXT_texture_filter_anisotropic
 		if (AnisotropyExtension)
 			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
-				material.TextureLayer[i].AnisotropicFilter ? MaxAnisotropy : 1.0f );
+				material.TextureLayer[i].AnisotropicFilter ? MaxAnisotropy : 1.0f);
 #endif
 	}
 
 	// fillmode
-	if (resetAllRenderStates || lastmaterial.Wireframe != material.Wireframe || lastmaterial.PointCloud != material.PointCloud)
+	if (resetAllRenderStates || (lastmaterial.Wireframe != material.Wireframe) || (lastmaterial.PointCloud != material.PointCloud))
 		glPolygonMode(GL_FRONT_AND_BACK, material.Wireframe ? GL_LINE : material.PointCloud? GL_POINT : GL_FILL);
 
 	// shademode
-
-	if (resetAllRenderStates || lastmaterial.GouraudShading != material.GouraudShading)
+	if (resetAllRenderStates || (lastmaterial.GouraudShading != material.GouraudShading))
 	{
 		if (material.GouraudShading)
 			glShadeModel(GL_SMOOTH);
@@ -1334,8 +2015,7 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
 	}
 
 	// lighting
-
-	if (resetAllRenderStates || lastmaterial.Lighting != material.Lighting)
+	if (resetAllRenderStates || (lastmaterial.Lighting != material.Lighting))
 	{
 		if (material.Lighting)
 			glEnable(GL_LIGHTING);
@@ -1353,19 +2033,19 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
 				break;
 			case 1:
 				glEnable(GL_DEPTH_TEST);
-				glDepthFunc ( GL_LEQUAL );
+				glDepthFunc(GL_LEQUAL);
 				break;
 			case 2:
 				glEnable(GL_DEPTH_TEST);
-				glDepthFunc ( GL_EQUAL );
+				glDepthFunc(GL_EQUAL);
 				break;
 		}
 	}
 
 	// zwrite
-	if (resetAllRenderStates || lastmaterial.ZWriteEnable != material.ZWriteEnable)
+//	if (resetAllRenderStates || lastmaterial.ZWriteEnable != material.ZWriteEnable)
 	{
-		if (material.ZWriteEnable)
+		if (material.ZWriteEnable && (AllowZWriteOnTransparent || !material.isTransparent()))
 		{
 			glDepthMask(GL_TRUE);
 		}
@@ -1374,11 +2054,25 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
 	}
 
 	// back face culling
-
-	if (resetAllRenderStates || lastmaterial.BackfaceCulling != material.BackfaceCulling)
+	if (resetAllRenderStates || (lastmaterial.FrontfaceCulling != material.FrontfaceCulling) || (lastmaterial.BackfaceCulling != material.BackfaceCulling))
 	{
-		if (material.BackfaceCulling)
+		if ((material.FrontfaceCulling) && (material.BackfaceCulling))
+		{
+			glCullFace(GL_FRONT_AND_BACK);
 			glEnable(GL_CULL_FACE);
+		}
+		else
+		if (material.BackfaceCulling)
+		{
+			glCullFace(GL_BACK);
+			glEnable(GL_CULL_FACE);
+		}
+		else
+		if (material.FrontfaceCulling)
+		{
+			glCullFace(GL_FRONT);
+			glEnable(GL_CULL_FACE);
+		}
 		else
 			glDisable(GL_CULL_FACE);
 	}
@@ -1408,160 +2102,88 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
 		glLineWidth(material.Thickness);
 	}
 
-	// texture address mode
-	for (u32 u=0; u<MaxTextureUnits; ++u)
-	{
-		if (resetAllRenderStates || lastmaterial.TextureLayer[u].TextureWrap != material.TextureLayer[u].TextureWrap)
-		{
-			GLint mode=GL_REPEAT;
-			switch (material.TextureLayer[u].TextureWrap)
-			{
-				case ETC_REPEAT:
-					mode=GL_REPEAT;
-					break;
-				case ETC_CLAMP:
-					mode=GL_CLAMP;
-					break;
-				case ETC_CLAMP_TO_EDGE:
-#ifdef GL_VERSION_1_2
-					if (Version>101)
-						mode=GL_CLAMP_TO_EDGE;
-					else
-#endif
-#ifdef GL_SGIS_texture_edge_clamp
-					if (FeatureAvailable[IRR_SGIS_texture_edge_clamp])
-						mode=GL_CLAMP_TO_EDGE_SGIS;
-					else
-#endif
-						// fallback
-						mode=GL_CLAMP;
-					break;
-				case ETC_CLAMP_TO_BORDER:
-#ifdef GL_VERSION_1_3
-					if (Version>102)
-						mode=GL_CLAMP_TO_BORDER;
-					else
-#endif
-#ifdef GL_ARB_texture_border_clamp
-					if (FeatureAvailable[IRR_ARB_texture_border_clamp])
-						mode=GL_CLAMP_TO_BORDER_ARB;
-					else
-#endif
-#ifdef GL_SGIS_texture_border_clamp
-					if (FeatureAvailable[IRR_SGIS_texture_border_clamp])
-						mode=GL_CLAMP_TO_BORDER_SGIS;
-					else
-#endif
-						// fallback
-						mode=GL_CLAMP_TO_EDGE;
-					break;
-				case ETC_MIRROR:
-#ifdef GL_VERSION_1_4
-					if (Version>103)
-						mode=GL_MIRRORED_REPEAT;
-					else
-#endif
-#ifdef GL_ARB_texture_border_clamp
-					if (FeatureAvailable[IRR_ARB_texture_mirrored_repeat])
-						mode=GL_MIRRORED_REPEAT_ARB;
-					else
-#endif
-#ifdef GL_IBM_texture_mirrored_repeat
-					if (FeatureAvailable[IRR_IBM_texture_mirrored_repeat])
-						mode=GL_MIRRORED_REPEAT_IBM;
-					else
-#endif
-						mode=GL_REPEAT;
-					break;
-			}
+	setWrapMode(material);
 
-			if (MultiTextureExtension)
-				extGlActiveTexture(GL_TEXTURE0_ARB + u);
-			else if (u>0)
-				break;
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, mode);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, mode);
-		}
-	}
 	// be sure to leave in texture stage 0
 	if (MultiTextureExtension)
 		extGlActiveTexture(GL_TEXTURE0_ARB);
 }
 
 
-
 //! sets the needed renderstates
 void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChannel)
 {
 	if (CurrentRenderMode != ERM_2D || Transformation3DChanged)
 	{
 		// unset last 3d material
-		if (CurrentRenderMode == ERM_3D && Material.MaterialType >= 0 &&
-				Material.MaterialType < static_cast<s32>(MaterialRenderers.size()))
-			MaterialRenderers[Material.MaterialType].Renderer->OnUnsetMaterial();
-
-		GLfloat glmat[16];
-		core::matrix4 m;
+		if (CurrentRenderMode == ERM_3D)
+		{
+			if (static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
+				MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
+			SMaterial mat;
+			mat.ZBuffer=0;
+			mat.Lighting=false;
+			mat.TextureLayer[0].BilinearFilter=false;
+			setBasicRenderStates(mat, mat, true);
+			LastMaterial = mat;
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		}
 
 		glMatrixMode(GL_PROJECTION);
 
 		const core::dimension2d<s32>& renderTargetSize = getCurrentRenderTargetSize();
-		m.buildProjectionMatrixOrthoLH(f32(renderTargetSize.Width), f32(-renderTargetSize.Height), -1.0, 1.0); 
+		core::matrix4 m;
+		m.buildProjectionMatrixOrthoLH(f32(renderTargetSize.Width), f32(-renderTargetSize.Height), -1.0, 1.0);
 		m.setTranslation(core::vector3df(-1,1,0));
-
-		createGLMatrix(glmat, m);
-		glLoadMatrixf(glmat);
+		glLoadMatrixf(m.pointer());
 
 		glMatrixMode(GL_MODELVIEW);
 		glLoadIdentity();
-		glTranslatef (0.375, 0.375, 0.0); 
+		glTranslatef(0.375, 0.375, 0.0);
 
 		glMatrixMode(GL_TEXTURE);
 		glLoadIdentity();
 
 		Transformation3DChanged = false;
+	}
 
-		glDisable(GL_DEPTH_TEST);
-		glDisable(GL_FOG);
-		glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-		glDisable(GL_LIGHTING);
-
-		glDisable(GL_TEXTURE_GEN_S);
-		glDisable(GL_TEXTURE_GEN_T);
-
+	if (alphaChannel || alpha)
+	{
+		glEnable(GL_BLEND);
+		glEnable(GL_ALPHA_TEST);
+		glAlphaFunc(GL_GREATER, 0.f);
+	}
+	else
+	{
+		glDisable(GL_BLEND);
 		glDisable(GL_ALPHA_TEST);
-		glCullFace(GL_BACK);
 	}
 
 	if (texture)
 	{
-		glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
 		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
 		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
 		if (alphaChannel)
 		{
+			// if alpha and alpha texture just modulate, otherwise use only the alpha channel
 			if (alpha)
 			{
-				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_MODULATE);
-				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE);
-				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_EXT, GL_PRIMARY_COLOR_EXT);
+				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 			}
 			else
 			{
+				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
 				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
 				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE);
+				// rgb always modulates
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PRIMARY_COLOR_EXT);
 			}
-
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			glEnable(GL_BLEND);
-
-			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PRIMARY_COLOR_EXT);
 		}
 		else
 		{
@@ -1570,43 +2192,23 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
 				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
 				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
 				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PRIMARY_COLOR_EXT);
-				glDisable(GL_ALPHA_TEST);
-				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-				glEnable(GL_BLEND);
+				// rgb always modulates
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PRIMARY_COLOR_EXT);
 			}
 			else
 			{
 				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-				glDisable(GL_ALPHA_TEST);
-				glDisable(GL_BLEND);
 			}
 		}
 	}
-	else
-	{
-		if (alpha)
-		{
-			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PRIMARY_COLOR_EXT);
-			glEnable(GL_BLEND);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-			glDisable(GL_ALPHA_TEST);
-		}
-		else
-		{
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-			glDisable(GL_BLEND);
-			glDisable(GL_ALPHA_TEST);
-		}
-	}
 
 	CurrentRenderMode = ERM_2D;
 }
 
 
-//! \return Returns the name of the video driver. Example: In case of the Direct3D8
-//! driver, it would return "Direct3D8.1".
+//! \return Returns the name of the video driver.
 const wchar_t* COpenGLDriver::getName() const
 {
 	return Name.c_str();
@@ -1741,12 +2343,13 @@ void COpenGLDriver::setViewPort(const core::rect<s32>& area)
 
 	if (vp.getHeight()>0 && vp.getWidth()>0)
 		glViewport(vp.UpperLeftCorner.X,
-		           getCurrentRenderTargetSize().Height - vp.UpperLeftCorner.Y - vp.getHeight(),
-			   vp.getWidth(), vp.getHeight());
+				getCurrentRenderTargetSize().Height - vp.UpperLeftCorner.Y - vp.getHeight(),
+				vp.getWidth(), vp.getHeight());
 
 	ViewPort = vp;
 }
 
+
 //! Draws a shadow volume into the stencil buffer. To draw a stencil shadow, do
 //! this: First, draw all geometry. Then use this method, to draw the shadow
 //! volume. Next use IVideoDriver::drawStencilShadow() to visualize the shadow.
@@ -1757,7 +2360,7 @@ void COpenGLDriver::drawStencilShadowVolume(const core::vector3df* triangles, s3
 
 	// unset last 3d material
 	if (CurrentRenderMode == ERM_3D &&
-	Material.MaterialType >= 0 && Material.MaterialType < static_cast<s32>(MaterialRenderers.size()))
+		static_cast<u32>(Material.MaterialType) < MaterialRenderers.size())
 	{
 		MaterialRenderers[Material.MaterialType].Renderer->OnUnsetMaterial();
 		ResetRenderStates = true;
@@ -1771,8 +2374,10 @@ void COpenGLDriver::drawStencilShadowVolume(const core::vector3df* triangles, s3
 	glDisable(GL_FOG);
 	glDepthFunc(GL_LEQUAL);
 	glDepthMask(GL_FALSE); // no depth buffer writing
-	glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE ); // no color buffer drawing
+	glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); // no color buffer drawing
 	glEnable(GL_STENCIL_TEST);
+	glEnable(GL_POLYGON_OFFSET_FILL);
+	glPolygonOffset(0.0f, 1.0f);
 
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glVertexPointer(3,GL_FLOAT,sizeof(core::vector3df),&triangles[0]);
@@ -1907,19 +2512,19 @@ void COpenGLDriver::drawStencilShadow(bool clearStencilBuffer, video::SColor lef
 	disableTextures();
 
 	// store attributes
-	glPushAttrib( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_ENABLE_BIT | GL_POLYGON_BIT | GL_STENCIL_BUFFER_BIT );
+	glPushAttrib(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_ENABLE_BIT | GL_POLYGON_BIT | GL_STENCIL_BUFFER_BIT);
 
-	glDisable( GL_LIGHTING );
+	glDisable(GL_LIGHTING);
 	glDisable(GL_FOG);
 	glDepthMask(GL_FALSE);
 
-	glShadeModel( GL_FLAT );
-	glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
+	glShadeModel(GL_FLAT);
+	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-	glEnable( GL_STENCIL_TEST );
+	glEnable(GL_STENCIL_TEST);
 	glStencilFunc(GL_NOTEQUAL, 0, ~0);
 	glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
 
@@ -1930,17 +2535,17 @@ void COpenGLDriver::drawStencilShadow(bool clearStencilBuffer, video::SColor lef
 
 	glBegin(GL_QUADS);
 
-	glColor4ub (leftDownEdge.getRed(), leftDownEdge.getGreen(), leftDownEdge.getBlue(), leftDownEdge.getAlpha() );
+	glColor4ub(leftDownEdge.getRed(), leftDownEdge.getGreen(), leftDownEdge.getBlue(), leftDownEdge.getAlpha());
 	glVertex3f(-1.1f,-1.1f,0.9f);
 
-	glColor4ub (leftUpEdge.getRed(), leftUpEdge.getGreen(), leftUpEdge.getBlue(), leftUpEdge.getAlpha() );
+	glColor4ub(leftUpEdge.getRed(), leftUpEdge.getGreen(), leftUpEdge.getBlue(), leftUpEdge.getAlpha());
 	glVertex3f(-1.1f, 1.1f,0.9f);
 
-	glColor4ub (rightUpEdge.getRed(), rightUpEdge.getGreen(), rightUpEdge.getBlue(), rightUpEdge.getAlpha() );
-	glVertex3f( 1.1f, 1.1f,0.9f);
+	glColor4ub(rightUpEdge.getRed(), rightUpEdge.getGreen(), rightUpEdge.getBlue(), rightUpEdge.getAlpha());
+	glVertex3f(1.1f, 1.1f,0.9f);
 
-	glColor4ub (rightDownEdge.getRed(), rightDownEdge.getGreen(), rightDownEdge.getBlue(), rightDownEdge.getAlpha() );
-	glVertex3f( 1.1f,-1.1f,0.9f);
+	glColor4ub(rightDownEdge.getRed(), rightDownEdge.getGreen(), rightDownEdge.getBlue(), rightDownEdge.getAlpha());
+	glVertex3f(1.1f,-1.1f,0.9f);
 
 	glEnd();
 
@@ -1959,13 +2564,13 @@ void COpenGLDriver::setFog(SColor c, bool linearFog, f32 start,
 {
 	CNullDriver::setFog(c, linearFog, start, end, density, pixelFog, rangeFog);
 
-	glFogi(GL_FOG_MODE, linearFog ? GL_LINEAR : GL_EXP);
+	glFogf(GL_FOG_MODE, GLfloat(linearFog ? GL_LINEAR : GL_EXP));
 #ifdef GL_EXT_fog_coord
 	if (FeatureAvailable[IRR_EXT_fog_coord])
 		glFogi(GL_FOG_COORDINATE_SOURCE, GL_FRAGMENT_DEPTH);
 #endif
 
-	if(linearFog)
+	if (linearFog)
 	{
 		glFogf(GL_FOG_START, start);
 		glFogf(GL_FOG_END, end);
@@ -2007,10 +2612,10 @@ void COpenGLDriver::OnResize(const core::dimension2d<s32>& size)
 {
 	CNullDriver::OnResize(size);
 	glViewport(0, 0, size.Width, size.Height);
+	Transformation3DChanged = true;
 }
 
 
-
 //! Returns type of video driver
 E_DRIVER_TYPE COpenGLDriver::getDriverType() const
 {
@@ -2018,6 +2623,12 @@ E_DRIVER_TYPE COpenGLDriver::getDriverType() const
 }
 
 
+//! returns color format
+ECOLOR_FORMAT COpenGLDriver::getColorFormat() const
+{
+	return ColorFormat;
+}
+
 
 //! Sets a vertex shader constant.
 void COpenGLDriver::setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount)
@@ -2068,6 +2679,7 @@ s32 COpenGLDriver::addShaderMaterial(const c8* vertexShaderProgram,
 	return nr;
 }
 
+
 //! Adds a new material renderer to the VideoDriver, using GLSL to render geometry.
 s32 COpenGLDriver::addHighLevelShaderMaterial(
 	const c8* vertexShaderProgram,
@@ -2106,7 +2718,7 @@ IGPUProgrammingServices* COpenGLDriver::getGPUProgrammingServices()
 }
 
 
-ITexture* COpenGLDriver::createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name)
+ITexture* COpenGLDriver::addRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name)
 {
 	//disable mip-mapping
 	bool generateMipLevels = getTextureCreationFlag(ETCF_CREATE_MIP_MAPS);
@@ -2118,15 +2730,37 @@ ITexture* COpenGLDriver::createRenderTargetTexture(const core::dimension2d<s32>&
 #if defined(GL_EXT_framebuffer_object)
 	// if driver supports FrameBufferObjects, use them
 	if (queryFeature(EVDF_FRAMEBUFFER_OBJECT))
-        	rtt = new COpenGLTexture(size, PackedDepthStencilExtension, name, this);
+	{
+		rtt = new COpenGLFBOTexture(size, name, this);
+		if (rtt)
+		{
+			bool success = false;
+			addTexture(rtt);
+			ITexture* tex = createDepthTexture(rtt);
+			if (tex)
+			{
+				success = static_cast<video::COpenGLFBODepthTexture*>(tex)->attach(rtt);
+				tex->drop();
+			}
+			rtt->drop();
+			if (!success)
+			{
+				removeTexture(rtt);
+				rtt=0;
+			}
+		}
+	}
 	else
 #endif
 	{
-		rtt = addTexture(size, name);
+		// the simple texture is only possible for size <= screensize
+		// we try to find an optimal size with the original constraints
+		core::dimension2di destSize(core::min_(size.Width,ScreenSize.Width), core::min_(size.Height,ScreenSize.Height));
+		destSize = destSize.getOptimalSize((size==size.getOptimalSize()), false, false);
+		rtt = addTexture(destSize, name, ECF_A8R8G8B8);
 		if (rtt)
 		{
-			rtt->grab();
-			static_cast<video::COpenGLTexture*>(rtt)->setRenderTarget(true);
+			static_cast<video::COpenGLTexture*>(rtt)->setIsRenderTarget(true);
 		}
 	}
 
@@ -2142,13 +2776,13 @@ ITexture* COpenGLDriver::createRenderTargetTexture(const core::dimension2d<s32>&
 //! call.
 u32 COpenGLDriver::getMaximalPrimitiveCount() const
 {
-	return 65535;// TODO: Fix all loaders to auto-split and then return the correct value: MaxIndices;
+	return 0x7fffffff;
 }
 
 
-//! checks triangle count and print warning if wrong
+//! set or reset render target
 bool COpenGLDriver::setRenderTarget(video::ITexture* texture, bool clearBackBuffer,
-								 bool clearZBuffer, SColor color)
+					bool clearZBuffer, SColor color)
 {
 	// check for right driver type
 
@@ -2160,24 +2794,11 @@ bool COpenGLDriver::setRenderTarget(video::ITexture* texture, bool clearBackBuff
 
 	// check if we should set the previous RT back
 
-	bool ret = true;
-
 	setTexture(0, 0);
 	ResetRenderStates=true;
 	if (RenderTargetTexture!=0)
 	{
-		if (RenderTargetTexture->isFrameBufferObject())
-		{
-			RenderTargetTexture->unbindFrameBufferObject();
-		}
-		else
-		{
-			glBindTexture(GL_TEXTURE_2D, RenderTargetTexture->getOpenGLTextureName());
-
-			// Copy Our ViewPort To The Texture
-			glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0,
-			RenderTargetTexture->getSize().Width, RenderTargetTexture->getSize().Height);
-		}
+		RenderTargetTexture->unbindRTT();
 	}
 
 	if (texture)
@@ -2185,12 +2806,8 @@ bool COpenGLDriver::setRenderTarget(video::ITexture* texture, bool clearBackBuff
 		// we want to set a new target. so do this.
 		glViewport(0, 0, texture->getSize().Width, texture->getSize().Height);
 		RenderTargetTexture = static_cast<COpenGLTexture*>(texture);
+		RenderTargetTexture->bindRTT();
 		CurrentRendertargetSize = texture->getSize();
-
-		if (RenderTargetTexture->isFrameBufferObject())
-		{
-			RenderTargetTexture->bindFrameBufferObject();
-		}
 	}
 	else
 	{
@@ -2211,63 +2828,82 @@ bool COpenGLDriver::setRenderTarget(video::ITexture* texture, bool clearBackBuff
 	if (clearZBuffer)
 	{
 		glDepthMask(GL_TRUE);
+		LastMaterial.ZWriteEnable=true;
 		mask |= GL_DEPTH_BUFFER_BIT;
 	}
 
 	glClear(mask);
 
-	return ret;
+	return true;
 }
 
 
 // returns the current size of the screen or rendertarget
 const core::dimension2d<s32>& COpenGLDriver::getCurrentRenderTargetSize() const
 {
-	if ( CurrentRendertargetSize.Width == 0 )
+	if (CurrentRendertargetSize.Width == 0)
 		return ScreenSize;
 	else
 		return CurrentRendertargetSize;
 }
 
+
 //! Clears the ZBuffer.
 void COpenGLDriver::clearZBuffer()
 {
-   GLboolean enabled = GL_TRUE;
-   glGetBooleanv(GL_DEPTH_WRITEMASK, &enabled);
+	GLboolean enabled = GL_TRUE;
+	glGetBooleanv(GL_DEPTH_WRITEMASK, &enabled);
 
-   glDepthMask(GL_TRUE);
-   glClear(GL_DEPTH_BUFFER_BIT);
+	glDepthMask(GL_TRUE);
+	glClear(GL_DEPTH_BUFFER_BIT);
+
+	glDepthMask(enabled);
+}
 
-   glDepthMask(enabled);
-} 
 
 //! Returns an image created from the last rendered frame.
 IImage* COpenGLDriver::createScreenShot()
 {
 	IImage* newImage = new CImage(ECF_R8G8B8, ScreenSize);
 
-	u8* pPixels = reinterpret_cast<u8*>(newImage->lock());
-	if (!pPixels)
+	u8* pixels = static_cast<u8*>(newImage->lock());
+	if (!pixels)
 	{
 		newImage->drop();
 		return 0;
 	}
 
-	glReadPixels(0, 0, ScreenSize.Width, ScreenSize.Height, GL_RGB, GL_UNSIGNED_BYTE, pPixels);
+	// allows to read pixels in top-to-bottom order
+#ifdef GL_MESA_pack_invert
+	if (FeatureAvailable[IRR_MESA_pack_invert])
+		glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+#endif
 
-	// opengl images are inverted, so we have to fix that here.
-	s32 pitch=newImage->getPitch();
-	u8* p2 = pPixels + (ScreenSize.Height - 1) * pitch;
-	u8* tmpBuffer = new u8[pitch];
-	for (s32 i=0; i < ScreenSize.Height; i += 2)
+	// We want to read the front buffer to get the latest render finished.
+	glReadBuffer(GL_FRONT);
+	glReadPixels(0, 0, ScreenSize.Width, ScreenSize.Height, GL_RGB, GL_UNSIGNED_BYTE, pixels);
+	glReadBuffer(GL_BACK);
+
+#ifdef GL_MESA_pack_invert
+	if (FeatureAvailable[IRR_MESA_pack_invert])
+		glPixelStorei(GL_PACK_INVERT_MESA, GL_FALSE);
+	else
+#endif
 	{
-		memcpy(tmpBuffer, pPixels, pitch);
-		memcpy(pPixels, p2, pitch);
-		memcpy(p2, tmpBuffer, pitch);
-		pPixels += pitch;
-		p2 -= pitch;
+		// opengl images are horizontally flipped, so we have to fix that here.
+		const s32 pitch=newImage->getPitch();
+		u8* p2 = pixels + (ScreenSize.Height - 1) * pitch;
+		u8* tmpBuffer = new u8[pitch];
+		for (s32 i=0; i < ScreenSize.Height; i += 2)
+		{
+			memcpy(tmpBuffer, pixels, pitch);
+			memcpy(pixels, p2, pitch);
+			memcpy(p2, tmpBuffer, pitch);
+			pixels += pitch;
+			p2 -= pitch;
+		}
+		delete [] tmpBuffer;
 	}
-	delete [] tmpBuffer;
 
 	newImage->unlock();
 
@@ -2281,11 +2917,47 @@ IImage* COpenGLDriver::createScreenShot()
 }
 
 
+//! get depth texture for the given render target texture
+ITexture* COpenGLDriver::createDepthTexture(ITexture* texture, bool shared)
+{
+	if ((texture->getDriverType() != EDT_OPENGL) || (!texture->isRenderTarget()))
+		return 0;
+	COpenGLTexture* tex = static_cast<COpenGLTexture*>(texture);
+
+	if (!tex->isFrameBufferObject())
+		return 0;
+
+	if (shared)
+	{
+		for (u32 i=0; i<DepthTextures.size(); ++i)
+		{
+			if (DepthTextures[i]->getSize()==texture->getSize())
+			{
+				DepthTextures[i]->grab();
+				return DepthTextures[i];
+			}
+		}
+		DepthTextures.push_back(new COpenGLFBODepthTexture(texture->getSize(), "depth1", this));
+		return DepthTextures.getLast();
+	}
+	return (new COpenGLFBODepthTexture(texture->getSize(), "depth1", this));
+}
+
+
+void COpenGLDriver::removeDepthTexture(ITexture* texture)
+{
+	for (u32 i=0; i<DepthTextures.size(); ++i)
+	{
+		if (texture==DepthTextures[i])
+		{
+			DepthTextures.erase(i);
+			return;
+		}
+	}
+}
+
+
 //! Set/unset a clipping plane.
-//! There are at least 6 clipping planes available for the user to set at will.
-//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
-//! \param plane: The plane itself.
-//! \param enable: If true, enable the clipping plane else disable it.
 bool COpenGLDriver::setClipPlane(u32 index, const core::plane3df& plane, bool enable)
 {
 	if (index >= MaxUserClipPlanes)
@@ -2296,6 +2968,7 @@ bool COpenGLDriver::setClipPlane(u32 index, const core::plane3df& plane, bool en
 	return true;
 }
 
+
 void COpenGLDriver::uploadClipPlane(u32 index)
 {
 	// opengl needs an array of doubles for the plane equation
@@ -2307,10 +2980,8 @@ void COpenGLDriver::uploadClipPlane(u32 index)
 	glClipPlane(GL_CLIP_PLANE0 + index, clip_plane);
 }
 
+
 //! Enable/disable a clipping plane.
-//! There are at least 6 clipping planes available for the user to set at will.
-//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
-//! \param enable: If true, enable the clipping plane else disable it.
 void COpenGLDriver::enableClipPlane(u32 index, bool enable)
 {
 	if (index >= MaxUserClipPlanes)
@@ -2333,6 +3004,7 @@ void COpenGLDriver::enableClipPlane(u32 index, bool enable)
 } // end namespace
 } // end namespace
 
+#endif // _IRR_COMPILE_WITH_OPENGL_
 
 namespace irr
 {
@@ -2344,12 +3016,12 @@ namespace video
 // WINDOWS VERSION
 // -----------------------------------
 #ifdef _IRR_USE_WINDOWS_DEVICE_
-IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize,
-	HWND window, u32 bits, bool fullscreen, bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias)
+IVideoDriver* createOpenGLDriver(const irr::SIrrlichtCreationParameters& params,
+	io::IFileSystem* io)
 {
 #ifdef _IRR_COMPILE_WITH_OPENGL_
-	COpenGLDriver* ogl =  new COpenGLDriver(screenSize, window, fullscreen, stencilBuffer, io, antiAlias);
-	if (!ogl->initDriver(screenSize, window, bits, fullscreen, vsync, stencilBuffer))
+	COpenGLDriver* ogl =  new COpenGLDriver(params, io);
+	if (!ogl->initDriver(params))
 	{
 		ogl->drop();
 		ogl = 0;
@@ -2364,55 +3036,34 @@ IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize,
 // -----------------------------------
 // MACOSX VERSION
 // -----------------------------------
-#ifdef MACOSX
-IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize,
-	CIrrDeviceMacOSX *device, bool fullscreen, bool stencilBuffer,
-	io::IFileSystem* io, bool vsync, bool antiAlias)
+#if defined(_IRR_USE_OSX_DEVICE_)
+IVideoDriver* createOpenGLDriver(const SIrrlichtCreationParameters& params,
+		io::IFileSystem* io, CIrrDeviceMacOSX *device)
 {
 #ifdef _IRR_COMPILE_WITH_OPENGL_
-	return new COpenGLDriver(screenSize, fullscreen, stencilBuffer,
-		device, io, vsync, antiAlias);
+	return new COpenGLDriver(params, io, device);
 #else
 	return 0;
 #endif //  _IRR_COMPILE_WITH_OPENGL_
 }
-#endif // MACOSX
+#endif // _IRR_USE_OSX_DEVICE_
 
 // -----------------------------------
-// LINUX VERSION
+// X11/SDL VERSION
 // -----------------------------------
-#ifdef _IRR_USE_LINUX_DEVICE_
-IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize,
-		bool fullscreen, bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias)
+#if defined(_IRR_USE_LINUX_DEVICE_) || defined(_IRR_USE_SDL_DEVICE_)
+IVideoDriver* createOpenGLDriver(const SIrrlichtCreationParameters& params,
+		io::IFileSystem* io)
 {
 #ifdef _IRR_COMPILE_WITH_OPENGL_
-	return new COpenGLDriver(screenSize, fullscreen, stencilBuffer,
-		io, vsync, antiAlias);
+	return new COpenGLDriver(params, io);
 #else
 	return 0;
 #endif //  _IRR_COMPILE_WITH_OPENGL_
 }
 #endif // _IRR_USE_LINUX_DEVICE_
 
-// -----------------------------------
-// SDL VERSION
-// -----------------------------------
-#ifdef _IRR_USE_SDL_DEVICE_
-IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize,
-		bool fullscreen, bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias)
-{
-#ifdef _IRR_COMPILE_WITH_OPENGL_
-	return new COpenGLDriver(screenSize, fullscreen, stencilBuffer,
-		io, vsync, antiAlias);
-#else
-	return 0;
-#endif //  _IRR_COMPILE_WITH_OPENGL_
-}
-#endif // _IRR_USE_SDL_DEVICE_
-
-
 } // end namespace
 } // end namespace
 
-#endif // _IRR_COMPILE_WITH_OPENGL_
 
diff --git a/src/dep/src/irrlicht/COpenGLDriver.h b/src/dep/src/irrlicht/COpenGLDriver.h
index 922d2ac..f649ef3 100644
--- a/src/dep/src/irrlicht/COpenGLDriver.h
+++ b/src/dep/src/irrlicht/COpenGLDriver.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
@@ -6,24 +6,32 @@
 #define __C_VIDEO_OPEN_GL_H_INCLUDED__
 
 #include "IrrCompileConfig.h"
-#include "CNullDriver.h"
-#include "IMaterialRendererServices.h"
-#include "COpenGLExtensionHandler.h"
-
-#ifdef _IRR_COMPILE_WITH_OPENGL_
 
 #if defined(_IRR_WINDOWS_API_)
 	// include windows headers for HWND
 	#define WIN32_LEAN_AND_MEAN
 	#include <windows.h>
+#elif defined(_IRR_USE_OSX_DEVICE_)
+	#include "CIrrDeviceMacOSX.h"
+#endif
+
+#include "SIrrCreationParameters.h"
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "CNullDriver.h"
+#include "IMaterialRendererServices.h"
+#include "COpenGLExtensionHandler.h"
+
+#if defined(_IRR_WINDOWS_API_)
 	#include <GL/gl.h>
 	#include "glext.h"
+	#include "wglext.h"
 #ifdef _MSC_VER
 	#pragma comment(lib, "OpenGL32.lib")
 	#pragma comment(lib, "GLu32.lib")
 #endif
-#elif defined(MACOSX)
-	#include "CIrrDeviceMacOSX.h"
+#elif defined(_IRR_USE_OSX_DEVICE_)
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
 		#define GL_GLEXT_LEGACY 1
 	#endif
@@ -39,8 +47,8 @@
 		#define GL_GLEXT_PROTOTYPES 1
 		#define GLX_GLXEXT_PROTOTYPES 1
 	#endif
-	#include <SDL/SDL_opengl.h>
 	#define NO_SDL_GLEXT
+	#include <SDL/SDL_opengl.h>
 	#include "glext.h"
 #else
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
@@ -69,50 +77,71 @@ namespace video
 	{
 	public:
 
+		#if defined(_IRR_WINDOWS_API_) || defined(_IRR_USE_LINUX_DEVICE_) || defined(_IRR_USE_SDL_DEVICE_)
+		COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFileSystem* io);
+		#endif
+
+		#ifdef _IRR_USE_OSX_DEVICE_
+		COpenGLDriver(const SIrrlichtCreationParameters& params,
+				io::IFileSystem* io, CIrrDeviceMacOSX *device);
+		#endif
+
 		#ifdef _IRR_WINDOWS_API_
-		//! win32 constructor
-		COpenGLDriver(const core::dimension2d<s32>& screenSize, HWND window, bool fullscreen,
-			bool stencilBuffer, io::IFileSystem* io, bool antiAlias);
-
 		//! inits the windows specific parts of the open gl driver
-		bool initDriver(const core::dimension2d<s32>& screenSize, HWND window,
-			u32 bits, bool fullscreen, bool vsync, bool stencilBuffer);
-		#endif
-
-		#ifdef _IRR_USE_LINUX_DEVICE_
-		COpenGLDriver(const core::dimension2d<s32>& screenSize, bool fullscreen,
-			bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias);
-		#endif
-
-		#ifdef MACOSX
-		COpenGLDriver(const core::dimension2d<s32>& screenSize, bool fullscreen,
-			bool stencilBuffer, CIrrDeviceMacOSX *device,io::IFileSystem* io, bool vsync, bool antiAlias);
-		#endif
-
-		#ifdef _IRR_USE_SDL_DEVICE_
-		COpenGLDriver(const core::dimension2d<s32>& screenSize, bool fullscreen,
-			bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias);
+		bool initDriver(SIrrlichtCreationParameters params);
 		#endif
 
 		//! destructor
 		virtual ~COpenGLDriver();
 
 		//! clears the zbuffer
-		virtual bool beginScene(bool backBuffer, bool zBuffer, SColor color);
+		virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
+				SColor color=SColor(255,0,0,0),
+				void* windowId=0,
+				core::rect<s32>* sourceRect=0);
 
 		//! presents the rendered scene on the screen, returns false if failed
-		virtual bool endScene( s32 windowId, core::rect<s32>* sourceRect=0 );
+		virtual bool endScene();
 
 		//! sets transformation
 		virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat);
 
+
+		struct SHWBufferLink_opengl : public SHWBufferLink
+		{
+			SHWBufferLink_opengl(const scene::IMeshBuffer *_MeshBuffer): SHWBufferLink(_MeshBuffer), vbo_verticesID(0),vbo_indicesID(0){}
+
+			GLuint vbo_verticesID; //tmp
+			GLuint vbo_indicesID; //tmp
+
+			GLuint vbo_verticesSize; //tmp
+			GLuint vbo_indicesSize; //tmp
+		};
+
+		bool updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer);
+		bool updateIndexHardwareBuffer(SHWBufferLink_opengl *HWBuffer);
+
+		//! updates hardware buffer if needed
+		virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer);
+
+		//! Create hardware buffer from mesh
+		virtual SHWBufferLink *createHardwareBuffer(const scene::IMeshBuffer* mb);
+
+		//! Delete hardware buffer (only some drivers can)
+		virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer);
+
+		//! Draw hardware buffer
+		virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer);
+
 		//! draws a vertex primitive list
-		virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType);
+		virtual void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
+				const void* indexList, u32 primitiveCount,
+				E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
 
 		//! queries the features of the driver, returns true if feature is available
 		virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 		{
-			return COpenGLExtensionHandler::queryFeature(feature);
+			return FeatureEnabled[feature] && COpenGLExtensionHandler::queryFeature(feature);
 		}
 
 		//! Sets a material. All 3d drawing functions draw geometry now
@@ -152,7 +181,7 @@ namespace video
 		//! Draws a part of the texture into the rectangle.
 		virtual void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
 			const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect = 0,
-			video::SColor* colors=0, bool useAlphaChannelOfTexture=false);
+			const video::SColor* const colors=0, bool useAlphaChannelOfTexture=false);
 
 		//! draw an 2d rectangle
 		virtual void draw2DRectangle(SColor color, const core::rect<s32>& pos,
@@ -168,6 +197,9 @@ namespace video
 					const core::position2d<s32>& end,
 					SColor color=SColor(255,255,255,255));
 
+		//! Draws a single pixel
+		virtual void drawPixel(u32 x, u32 y, const SColor & color);
+
 		//! Draws a 3d line.
 		virtual void draw3DLine(const core::vector3df& start,
 					const core::vector3df& end,
@@ -219,6 +251,9 @@ namespace video
 		//! Returns type of video driver
 		virtual E_DRIVER_TYPE getDriverType() const;
 
+		//! get color format of the current color buffer
+		virtual ECOLOR_FORMAT getColorFormat() const;
+
 		//! Returns the transformation set by setTransform
 		virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const;
 
@@ -246,8 +281,9 @@ namespace video
 		//! Returns whether disabling was successful or not.
 		bool disableTextures(u32 fromStage=0);
 
-		//! Adds a new material renderer to the VideoDriver, using extGLGetObjectParameteriv(shaderHandle, GL_OBJECT_COMPILE_STATUS_ARB, &status) pixel and/or
-		//! vertex shaders to render geometry.
+		//! Adds a new material renderer to the VideoDriver, using
+		//! extGLGetObjectParameteriv(shaderHandle, GL_OBJECT_COMPILE_STATUS_ARB, &status)
+		//! pixel and/or vertex shaders to render geometry.
 		virtual s32 addShaderMaterial(const c8* vertexShaderProgram, const c8* pixelShaderProgram,
 			IShaderConstantSetCallBack* callback, E_MATERIAL_TYPE baseMaterial, s32 userData);
 
@@ -269,7 +305,8 @@ namespace video
 		//! call.
 		virtual u32 getMaximalPrimitiveCount() const;
 
-		virtual ITexture* createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name);
+		virtual ITexture* addRenderTargetTexture(const core::dimension2d<s32>& size,
+				const c8* name);
 
 		virtual bool setRenderTarget(video::ITexture* texture, bool clearBackBuffer,
 					bool clearZBuffer, SColor color);
@@ -297,6 +334,12 @@ namespace video
 		//! \param enable: If true, enable the clipping plane else disable it.
 		virtual void enableClipPlane(u32 index, bool enable);
 
+		//! Returns the graphics card vendor name.
+		virtual core::stringc getVendorInfo() {return vendorName;}
+
+		ITexture* createDepthTexture(ITexture* texture, bool shared=true);
+		void removeDepthTexture(ITexture* texture);
+
 	private:
 
 		void uploadClipPlane(u32 index);
@@ -310,6 +353,9 @@ namespace video
 		inline void createGLMatrix(GLfloat gl_matrix[16], const core::matrix4& m);
 		inline void createGLTextureMatrix(GLfloat gl_matrix[16], const core::matrix4& m);
 
+		//! Set GL pipeline to desired texture wrap modes of the material
+		void setWrapMode(const SMaterial& material);
+
 		//! sets the needed renderstates
 		void setRenderStates3DMode();
 
@@ -321,6 +367,7 @@ namespace video
 
 		void createMaterialRenderers();
 
+
 		core::stringw Name;
 		core::matrix4 Matrices[ETS_COUNT];
 		core::array<u8> ColorBuffer;
@@ -342,20 +389,27 @@ namespace video
 		SMaterial Material, LastMaterial;
 		COpenGLTexture* RenderTargetTexture;
 		const ITexture* CurrentTexture[MATERIAL_MAX_TEXTURES];
+		core::array<ITexture*> DepthTextures;
 		s32 LastSetLight;
 		core::array<core::plane3df> UserClipPlane;
 		core::array<bool> UserClipPlaneEnabled;
 
 		core::dimension2d<s32> CurrentRendertargetSize;
 
+		core::stringc vendorName;
+
+		core::matrix4 TextureFlipMatrix;
+
+		//! Color buffer format
+		ECOLOR_FORMAT ColorFormat;
+
 		#ifdef _IRR_WINDOWS_API_
 			HDC HDc; // Private GDI Device Context
 			HWND Window;
 			HGLRC HRc; // Permanent Rendering Context
 		#elif defined(_IRR_USE_LINUX_DEVICE_)
-			GLXDrawable XWindow;
-			Display* XDisplay;
-		#elif defined(MACOSX)
+			GLXDrawable Drawable;
+		#elif defined(_IRR_USE_OSX_DEVICE_)
 			CIrrDeviceMacOSX *_device;
 		#endif
 	};
@@ -367,4 +421,3 @@ namespace video
 #endif // _IRR_COMPILE_WITH_OPENGL_
 #endif
 
-
diff --git a/src/dep/src/irrlicht/COpenGLExtensionHandler.cpp b/src/dep/src/irrlicht/COpenGLExtensionHandler.cpp
index 6a42bdb..3d2d8fa 100644
--- a/src/dep/src/irrlicht/COpenGLExtensionHandler.cpp
+++ b/src/dep/src/irrlicht/COpenGLExtensionHandler.cpp
@@ -1,12 +1,16 @@
-#include "COpenGLExtensionHandler.h"
-#include "irrString.h"
-#include "SMaterial.h" // for MATERIAL_MAX_TEXTURES
-#include "fast_atof.h"
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
+#include "COpenGLExtensionHandler.h"
+#include "irrString.h"
+#include "SMaterial.h" // for MATERIAL_MAX_TEXTURES
+#include "fast_atof.h"
+
 namespace irr
 {
 namespace video
@@ -15,11 +19,9 @@ namespace video
 COpenGLExtensionHandler::COpenGLExtensionHandler() :
 		StencilBuffer(false),
 		MultiTextureExtension(false), MultiSamplingExtension(false), AnisotropyExtension(false),
-		SeparateStencilExtension(false),
 		TextureCompressionExtension(false),
-		PackedDepthStencilExtension(false),
 		MaxTextureUnits(1), MaxLights(1), MaxIndices(65535),
-		MaxAnisotropy(1.0f), MaxUserClipPlanes(0),
+		MaxAnisotropy(1.0f), MaxUserClipPlanes(0), MaxMultipleRenderTargets(1),
 		Version(0), ShaderLanguageVersion(0)
 #ifdef _IRR_OPENGL_USE_EXTPOINTER_
 	,pGlActiveTextureARB(0), pGlClientActiveTextureARB(0),
@@ -42,7 +44,13 @@ COpenGLExtensionHandler::COpenGLExtensionHandler() :
 	pGlBindFramebufferEXT(0), pGlDeleteFramebuffersEXT(0), pGlGenFramebuffersEXT(0),
 	pGlCheckFramebufferStatusEXT(0), pGlFramebufferTexture2DEXT(0),
 	pGlBindRenderbufferEXT(0), pGlDeleteRenderbuffersEXT(0), pGlGenRenderbuffersEXT(0),
-	pGlRenderbufferStorageEXT(0), pGlFramebufferRenderbufferEXT(0)
+	pGlRenderbufferStorageEXT(0), pGlFramebufferRenderbufferEXT(0),
+	pGlDrawBuffersARB(0), pGlDrawBuffersATI(0),
+	pGlGenBuffersARB(0), pGlBindBufferARB(0), pGlBufferDataARB(0), pGlDeleteBuffersARB(0),
+	pGlBufferSubDataARB(0), pGlGetBufferSubDataARB(0), pGlMapBufferARB(0), pGlUnmapBufferARB(0),
+	pGlIsBufferARB(0), pGlGetBufferParameterivARB(0), pGlGetBufferPointervARB(0)
+
+
 #endif // _IRR_OPENGL_USE_EXTPOINTER_
 {
 	for (u32 i=0; i<IRR_OpenGL_Feature_Count; ++i)
@@ -59,7 +67,7 @@ void COpenGLExtensionHandler::dump() const
 void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 {
 	const f32 ogl_ver = core::fast_atof(reinterpret_cast<const c8*>(glGetString(GL_VERSION)));
-	Version = core::floor32(ogl_ver)*100+core::ceil32(core::fract(ogl_ver)*10.0f);
+	Version = core::floor32(ogl_ver)*100+core::round32(core::fract(ogl_ver)*10.0f);
 	if ( Version >= 102)
 		os::Printer::log("OpenGL driver version is 1.2 or better.", ELL_INFORMATION);
 	else
@@ -97,9 +105,7 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 	MultiTextureExtension = FeatureAvailable[IRR_ARB_multitexture];
 	MultiSamplingExtension = FeatureAvailable[IRR_ARB_multisample];
 	AnisotropyExtension = FeatureAvailable[IRR_EXT_texture_filter_anisotropic];
-	SeparateStencilExtension = FeatureAvailable[IRR_ATI_separate_stencil];
 	TextureCompressionExtension = FeatureAvailable[IRR_ARB_texture_compression];
-	PackedDepthStencilExtension = FeatureAvailable[IRR_EXT_packed_depth_stencil];
 	StencilBuffer=stencilBuffer;
 
 #ifdef _IRR_WINDOWS_API_
@@ -147,17 +153,33 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 	// compressed textures
 	pGlCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC) wglGetProcAddress("glCompressedTexImage2D");
 
-        // FrameBufferObjects
-        pGlBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC) wglGetProcAddress("glBindFramebufferEXT");
-        pGlDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC) wglGetProcAddress("glDeleteFramebuffersEXT");
-        pGlGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC) wglGetProcAddress("glGenFramebuffersEXT");
-        pGlCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) wglGetProcAddress("glCheckFramebufferStatusEXT");
-        pGlFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) wglGetProcAddress("glFramebufferTexture2DEXT");
-        pGlBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC) wglGetProcAddress("glBindRenderbufferEXT");
-        pGlDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC) wglGetProcAddress("glDeleteRenderbuffersEXT");
-        pGlGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC) wglGetProcAddress("glGenRenderbuffersEXT");
-        pGlRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC) wglGetProcAddress("glRenderbufferStorageEXT");
-        pGlFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) wglGetProcAddress("glFramebufferRenderbufferEXT");
+	// FrameBufferObjects
+	pGlBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC) wglGetProcAddress("glBindFramebufferEXT");
+	pGlDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC) wglGetProcAddress("glDeleteFramebuffersEXT");
+	pGlGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC) wglGetProcAddress("glGenFramebuffersEXT");
+	pGlCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) wglGetProcAddress("glCheckFramebufferStatusEXT");
+	pGlFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) wglGetProcAddress("glFramebufferTexture2DEXT");
+	pGlBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC) wglGetProcAddress("glBindRenderbufferEXT");
+	pGlDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC) wglGetProcAddress("glDeleteRenderbuffersEXT");
+	pGlGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC) wglGetProcAddress("glGenRenderbuffersEXT");
+	pGlRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC) wglGetProcAddress("glRenderbufferStorageEXT");
+	pGlFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) wglGetProcAddress("glFramebufferRenderbufferEXT");
+	pGlDrawBuffersARB = (PFNGLDRAWBUFFERSARBPROC) wglGetProcAddress("glDrawBuffersARB");
+	pGlDrawBuffersATI = (PFNGLDRAWBUFFERSATIPROC) wglGetProcAddress("glDrawBuffersATI");
+
+	// get vertex buffer extension
+	pGlGenBuffersARB = (PFNGLGENBUFFERSARBPROC) wglGetProcAddress("glGenBuffersARB");
+	pGlBindBufferARB = (PFNGLBINDBUFFERARBPROC) wglGetProcAddress("glBindBufferARB");
+	pGlBufferDataARB = (PFNGLBUFFERDATAARBPROC) wglGetProcAddress("glBufferDataARB");
+	pGlDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC) wglGetProcAddress("glDeleteBuffersARB");
+	pGlBufferSubDataARB= (PFNGLBUFFERSUBDATAARBPROC) wglGetProcAddress("glBufferSubDataARB");
+	pGlGetBufferSubDataARB= (PFNGLGETBUFFERSUBDATAARBPROC)wglGetProcAddress("glGetBufferSubDataARB");
+	pGlMapBufferARB= (PFNGLMAPBUFFERARBPROC) wglGetProcAddress("glMapBufferARB");
+	pGlUnmapBufferARB= (PFNGLUNMAPBUFFERARBPROC) wglGetProcAddress("glUnmapBufferARB");
+	pGlIsBufferARB= (PFNGLISBUFFERARBPROC) wglGetProcAddress("glIsBufferARB");
+	pGlGetBufferParameterivARB= (PFNGLGETBUFFERPARAMETERIVARBPROC) wglGetProcAddress("glGetBufferParameterivARB");
+	pGlGetBufferPointervARB= (PFNGLGETBUFFERPOINTERVARBPROC) wglGetProcAddress("glGetBufferPointervARB");
+
 
 	// vsync extension
 	wglSwapIntervalEXT = (PFNWGLSWAPINTERVALFARPROC) wglGetProcAddress("wglSwapIntervalEXT");
@@ -333,6 +355,46 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 	pGlFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)
 	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glFramebufferRenderbufferEXT"));
 
+	pGlDrawBuffersARB = (PFNGLDRAWBUFFERSARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glDrawBuffersARB"));
+
+	pGlDrawBuffersATI = (PFNGLDRAWBUFFERSATIPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glDrawBuffersATI"));
+
+	pGlGenBuffersARB = (PFNGLGENBUFFERSARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glGenBuffersARB"));
+
+	pGlBindBufferARB = (PFNGLBINDBUFFERARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glBindBufferARB"));
+
+	pGlBufferDataARB = (PFNGLBUFFERDATAARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glBufferDataARB"));
+
+	pGlDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glDeleteBuffersARB"));
+
+	pGlBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glBufferSubDataARB"));
+
+	pGlGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glGetBufferSubDataARB"));
+
+	pGlMapBufferARB = (PFNGLMAPBUFFERARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glMapBufferARB"));
+
+	pGlUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glUnmapBufferARB"));
+
+	pGlIsBufferARB = (PFNGLISBUFFERARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glIsBufferARB"));
+
+	pGlGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glGetBufferParameterivARB"));
+
+	pGlGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)
+	IRR_OGL_LOAD_EXTENSION(reinterpret_cast<const GLubyte*>("glGetBufferPointervARB"));
+
+
 	#endif // _IRR_OPENGL_USE_EXTPOINTER_
 #endif // _IRR_WINDOWS_API_
 
@@ -353,6 +415,19 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 #ifdef GL_VERSION_1_2
 	if (Version>101)
 		glGetIntegerv(GL_MAX_ELEMENTS_INDICES, &MaxIndices);
+#endif
+#ifdef ARB_draw_buffers
+	if (FeatureAvailable[IRR_ARB_draw_buffers])
+	{
+		glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, reinterpret_cast<GLint*>(&MaxUserClipPlanes));
+		MaxMultipleRenderTargets = static_cast<u8>(MaxUserClipPlanes);
+	}
+#elif defined(ATI_draw_buffers)
+	if (FeatureAvailable[IRR_ATI_draw_buffers])
+	{
+		glGetIntegerv(GL_MAX_DRAW_BUFFERS_ATI, reinterpret_cast<GLint*>(&MaxUserClipPlanes));
+		MaxMultipleRenderTargets = static_cast<u8>(MaxUserClipPlanes);
+	}
 #endif
 	glGetIntegerv(GL_MAX_CLIP_PLANES, reinterpret_cast<GLint*>(&MaxUserClipPlanes));
 #if defined(GL_ARB_shading_language_100) || defined (GL_VERSION_2_0)
@@ -369,7 +444,7 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 		else
 		{
 			const f32 sl_ver = core::fast_atof(reinterpret_cast<const c8*>(shaderVersion));
-			ShaderLanguageVersion = core::floor32(sl_ver)*100+core::ceil32(core::fract(sl_ver)*10.0f);
+			ShaderLanguageVersion = core::floor32(sl_ver)*100+core::round32(core::fract(sl_ver)*10.0f);
 		}
 	}
 #endif
@@ -412,11 +487,19 @@ bool COpenGLExtensionHandler::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 	case EVDF_ARB_FRAGMENT_PROGRAM_1:
 		return FeatureAvailable[IRR_ARB_fragment_program];
 	case EVDF_ARB_GLSL:
-		return FeatureAvailable[IRR_ARB_shading_language_100];
+		return (FeatureAvailable[IRR_ARB_shading_language_100]||Version>=200);
+	case EVDF_TEXTURE_NSQUARE:
+		return true; // non-square is always supported
 	case EVDF_TEXTURE_NPOT:
-		return FeatureAvailable[IRR_ARB_texture_non_power_of_two];
+		// Some ATI cards seem to have only SW support in OpenGL 2.0
+		// drivers if the extension is not exposed, so we skip this
+		// extra test for now!
+		// return (FeatureAvailable[IRR_ARB_texture_non_power_of_two]||Version>=200);
+		return (FeatureAvailable[IRR_ARB_texture_non_power_of_two]);
 	case EVDF_FRAMEBUFFER_OBJECT:
 		return FeatureAvailable[IRR_EXT_framebuffer_object];
+	case EVDF_VERTEX_BUFFER_OBJECT:
+		return FeatureAvailable[IRR_ARB_vertex_buffer_object];
 	default:
 		return false;
 	};
@@ -428,3 +511,4 @@ bool COpenGLExtensionHandler::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
 
 #endif
 
+
diff --git a/src/dep/src/irrlicht/COpenGLExtensionHandler.h b/src/dep/src/irrlicht/COpenGLExtensionHandler.h
index 76be7d2..14b4959 100644
--- a/src/dep/src/irrlicht/COpenGLExtensionHandler.h
+++ b/src/dep/src/irrlicht/COpenGLExtensionHandler.h
@@ -1,10 +1,13 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
 #ifndef __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__
 #define __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__
 
+#include "IrrCompileConfig.h"
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
 #include "EDriverFeatures.h"
 #include "irrTypes.h"
 #include "os.h"
@@ -18,7 +21,7 @@
 #ifdef _MSC_VER
 	#pragma comment(lib, "OpenGL32.lib")
 #endif
-#elif defined(MACOSX)
+#elif defined(_IRR_USE_OSX_DEVICE_)
 	#include "CIrrDeviceMacOSX.h"
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
 		#define GL_GLEXT_LEGACY 1
@@ -35,8 +38,9 @@
 		#define GL_GLEXT_PROTOTYPES 1
 		#define GLX_GLXEXT_PROTOTYPES 1
 	#endif
-	#include <SDL/SDL_opengl.h>
 	#define NO_SDL_GLEXT
+	#include <SDL/SDL_video.h>
+	#include <SDL/SDL_opengl.h>
 	#include "glext.h"
 #else
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
@@ -75,13 +79,21 @@ static const char* const OpenGLFeatureStrings[] = {
 	"GL_APPLE_vertex_array_range",
 	"GL_APPLE_ycbcr_422",
 	"GL_ARB_color_buffer_float",
+	"GL_ARB_depth_buffer_float",
 	"GL_ARB_depth_texture",
 	"GL_ARB_draw_buffers",
+	"GL_ARB_draw_instanced",
 	"GL_ARB_fragment_program",
 	"GL_ARB_fragment_program_shadow",
 	"GL_ARB_fragment_shader",
+	"GL_ARB_framebuffer_object",
+	"GL_ARB_framebuffer_sRGB",
+	"GL_ARB_geometry_shader4",
 	"GL_ARB_half_float_pixel",
+	"GL_ARB_half_float_vertex",
 	"GL_ARB_imaging",
+	"GL_ARB_instanced_arrays",
+	"GL_ARB_map_buffer_range",
 	"GL_ARB_matrix_palette",
 	"GL_ARB_multisample",
 	"GL_ARB_multitexture",
@@ -94,7 +106,9 @@ static const char* const OpenGLFeatureStrings[] = {
 	"GL_ARB_shadow",
 	"GL_ARB_shadow_ambient",
 	"GL_ARB_texture_border_clamp",
+	"GL_ARB_texture_buffer_object",
 	"GL_ARB_texture_compression",
+	"GL_ARB_texture_compression_rgtc",
 	"GL_ARB_texture_cube_map",
 	"GL_ARB_texture_env_add",
 	"GL_ARB_texture_env_combine",
@@ -104,7 +118,9 @@ static const char* const OpenGLFeatureStrings[] = {
 	"GL_ARB_texture_mirrored_repeat",
 	"GL_ARB_texture_non_power_of_two",
 	"GL_ARB_texture_rectangle",
+	"GL_ARB_texture_rg",
 	"GL_ARB_transpose_matrix",
+	"GL_ARB_vertex_array_object",
 	"GL_ARB_vertex_blend",
 	"GL_ARB_vertex_buffer_object",
 	"GL_ARB_vertex_program",
@@ -144,6 +160,7 @@ static const char* const OpenGLFeatureStrings[] = {
 	"GL_EXT_copy_texture",
 	"GL_EXT_cull_vertex",
 	"GL_EXT_depth_bounds_test",
+	"GL_EXT_direct_state_access",
 	"GL_EXT_draw_buffers2",
 	"GL_EXT_draw_instanced",
 	"GL_EXT_draw_range_elements",
@@ -202,10 +219,13 @@ static const char* const OpenGLFeatureStrings[] = {
 	"GL_EXT_texture_shared_exponent",
 	"GL_EXT_texture_sRGB",
 	"GL_EXT_timer_query",
+	"GL_EXT_transform_feedback",
 	"GL_EXT_vertex_array",
+	"GL_EXT_vertex_array_bgra",
 	"GL_EXT_vertex_shader",
 	"GL_EXT_vertex_weighting",
 	"GL_FfdMaskSGIX",
+	"GL_GREMEDY_frame_terminator",
 	"GL_GREMEDY_string_marker",
 	"GL_HP_convolution_border_modes",
 	"GL_HP_image_transform",
@@ -228,6 +248,7 @@ static const char* const OpenGLFeatureStrings[] = {
 	"GL_MESAX_texture_stack",
 	"GL_MESA_ycbcr_texture",
 	"GL_NV_blend_square",
+	"GL_NV_conditional_render",
 	"GL_NV_copy_depth_to_color",
 	"GL_NV_depth_buffer_float",
 	"GL_NV_depth_clamp",
@@ -251,6 +272,7 @@ static const char* const OpenGLFeatureStrings[] = {
 	"GL_NV_parameter_buffer_object",
 	"GL_NV_pixel_data_range",
 	"GL_NV_point_sprite",
+	"GL_NV_present_video",
 	"GL_NV_primitive_restart",
 	"GL_NV_register_combiners",
 	"GL_NV_register_combiners2",
@@ -369,13 +391,21 @@ class COpenGLExtensionHandler
 		IRR_APPLE_vertex_array_range,
 		IRR_APPLE_ycbcr_422,
 		IRR_ARB_color_buffer_float,
+		IRR_ARB_depth_buffer_float,
 		IRR_ARB_depth_texture,
 		IRR_ARB_draw_buffers,
+		IRR_ARB_draw_instanced,
 		IRR_ARB_fragment_program,
 		IRR_ARB_fragment_program_shadow,
 		IRR_ARB_fragment_shader,
+		IRR_ARB_framebuffer_object,
+		IRR_ARB_framebuffer_sRGB,
+		IRR_ARB_geometry_shader4,
 		IRR_ARB_half_float_pixel,
+		IRR_ARB_half_float_vertex,
 		IRR_ARB_imaging,
+		IRR_ARB_instanced_arrays,
+		IRR_ARB_map_buffer_range,
 		IRR_ARB_matrix_palette,
 		IRR_ARB_multisample,
 		IRR_ARB_multitexture,
@@ -388,7 +418,9 @@ class COpenGLExtensionHandler
 		IRR_ARB_shadow,
 		IRR_ARB_shadow_ambient,
 		IRR_ARB_texture_border_clamp,
+		IRR_ARB_texture_buffer_object,
 		IRR_ARB_texture_compression,
+		IRR_ARB_texture_compression_rgtc,
 		IRR_ARB_texture_cube_map,
 		IRR_ARB_texture_env_add,
 		IRR_ARB_texture_env_combine,
@@ -398,7 +430,9 @@ class COpenGLExtensionHandler
 		IRR_ARB_texture_mirrored_repeat,
 		IRR_ARB_texture_non_power_of_two,
 		IRR_ARB_texture_rectangle,
+		IRR_ARB_texture_rg,
 		IRR_ARB_transpose_matrix,
+		IRR_ARB_vertex_array_object,
 		IRR_ARB_vertex_blend,
 		IRR_ARB_vertex_buffer_object,
 		IRR_ARB_vertex_program,
@@ -438,6 +472,7 @@ class COpenGLExtensionHandler
 		IRR_EXT_copy_texture,
 		IRR_EXT_cull_vertex,
 		IRR_EXT_depth_bounds_test,
+		IRR_EXT_direct_state_access,
 		IRR_EXT_draw_buffers2,
 		IRR_EXT_draw_instanced,
 		IRR_EXT_draw_range_elements,
@@ -496,10 +531,13 @@ class COpenGLExtensionHandler
 		IRR_EXT_texture_shared_exponent,
 		IRR_EXT_texture_sRGB,
 		IRR_EXT_timer_query,
+		IRR_EXT_transform_feedback,
 		IRR_EXT_vertex_array,
+		IRR_EXT_vertex_array_bgra,
 		IRR_EXT_vertex_shader,
 		IRR_EXT_vertex_weighting,
 		IRR_FfdMaskSGIX,
+		IRR_GREMEDY_frame_terminator,
 		IRR_GREMEDY_string_marker,
 		IRR_HP_convolution_border_modes,
 		IRR_HP_image_transform,
@@ -522,6 +560,7 @@ class COpenGLExtensionHandler
 		IRR_MESAX_texture_stack,
 		IRR_MESA_ycbcr_texture,
 		IRR_NV_blend_square,
+		IRR_NV_conditional_render,
 		IRR_NV_copy_depth_to_color,
 		IRR_NV_depth_buffer_float,
 		IRR_NV_depth_clamp,
@@ -545,6 +584,7 @@ class COpenGLExtensionHandler
 		IRR_NV_parameter_buffer_object,
 		IRR_NV_pixel_data_range,
 		IRR_NV_point_sprite,
+		IRR_NV_present_video,
 		IRR_NV_primitive_restart,
 		IRR_NV_register_combiners,
 		IRR_NV_register_combiners2,
@@ -646,6 +686,7 @@ class COpenGLExtensionHandler
 		IRR_OpenGL_Feature_Count
 	};
 
+
 	// constructor
 	COpenGLExtensionHandler();
 
@@ -655,6 +696,12 @@ class COpenGLExtensionHandler
 	//! queries the features of the driver, returns true if feature is available
 	bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const;
 
+	//! queries the features of the driver, returns true if feature is available
+	bool queryOpenGLFeature(EOpenGLFeatures feature) const
+	{
+		return FeatureAvailable[feature];
+	}
+
 	//! show all features with availablity
 	void dump() const;
 
@@ -663,9 +710,7 @@ class COpenGLExtensionHandler
 	bool MultiTextureExtension;
 	bool MultiSamplingExtension;
 	bool AnisotropyExtension;
-	bool SeparateStencilExtension;
 	bool TextureCompressionExtension;
-	bool PackedDepthStencilExtension;
 
 	// Some non-boolean properties
 	//! Maxmimum texture layers supported by the fixed pipeline
@@ -678,6 +723,8 @@ class COpenGLExtensionHandler
 	f32 MaxAnisotropy;
 	//! Number of user clipplanes
 	u32 MaxUserClipPlanes;
+	//! Number of rendertargets available as MRTs
+	u8 MaxMultipleRenderTargets;
 
 	//! OpenGL version as Integer: 100*Major+Minor, i.e. 2.1 becomes 201
 	u32 Version;
@@ -735,6 +782,21 @@ class COpenGLExtensionHandler
 	void extGlRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
 	void extGlFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
 	void extGlActiveStencilFace(GLenum face);
+	void extGlDrawBuffers(GLsizei n, const GLenum *bufs);
+
+	// vertex buffer object
+	void extGlGenBuffers(GLsizei n, GLuint *buffers);
+	void extGlBindBuffer(GLenum target, GLuint buffer);
+	void extGlBufferData(GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+	void extGlDeleteBuffers(GLsizei n, const GLuint *buffers);
+	void extGlBufferSubData (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+	void extGlGetBufferSubData (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+	void *extGlMapBuffer (GLenum target, GLenum access);
+	GLboolean extGlUnmapBuffer (GLenum target);
+	GLboolean extGlIsBuffer (GLuint buffer);
+	void extGlGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
+	void extGlGetBufferPointerv (GLenum target, GLenum pname, GLvoid **params);
+
 
 	protected:
 	// the global feature array
@@ -792,6 +854,19 @@ class COpenGLExtensionHandler
 		PFNGLRENDERBUFFERSTORAGEEXTPROC pGlRenderbufferStorageEXT;
 		PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC pGlFramebufferRenderbufferEXT;
 		PFNGLACTIVESTENCILFACEEXTPROC pGlActiveStencilFaceEXT;
+		PFNGLDRAWBUFFERSARBPROC pGlDrawBuffersARB;
+		PFNGLDRAWBUFFERSATIPROC pGlDrawBuffersATI;
+		PFNGLGENBUFFERSARBPROC pGlGenBuffersARB;
+		PFNGLBINDBUFFERARBPROC pGlBindBufferARB;
+		PFNGLBUFFERDATAARBPROC pGlBufferDataARB;
+		PFNGLDELETEBUFFERSARBPROC pGlDeleteBuffersARB;
+		PFNGLBUFFERSUBDATAARBPROC pGlBufferSubDataARB;
+		PFNGLGETBUFFERSUBDATAARBPROC pGlGetBufferSubDataARB;
+		PFNGLMAPBUFFERARBPROC pGlMapBufferARB;
+		PFNGLUNMAPBUFFERARBPROC pGlUnmapBufferARB;
+		PFNGLISBUFFERARBPROC pGlIsBufferARB;
+		PFNGLGETBUFFERPARAMETERIVARBPROC pGlGetBufferParameterivARB;
+		PFNGLGETBUFFERPOINTERVARBPROC pGlGetBufferPointervARB;
 	#endif
 };
 
@@ -1106,7 +1181,9 @@ inline void COpenGLExtensionHandler::extGlUniformMatrix4fv(GLint loc, GLsizei co
 #endif
 }
 
-inline void COpenGLExtensionHandler::extGlGetActiveUniform(GLhandleARB program, GLuint index, GLsizei maxlength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name)
+inline void COpenGLExtensionHandler::extGlGetActiveUniform(GLhandleARB program,
+		GLuint index, GLsizei maxlength, GLsizei *length,
+		GLint *size, GLenum *type, GLcharARB *name)
 {
 #ifdef _IRR_OPENGL_USE_EXTPOINTER_
 	if (pGlGetActiveUniformARB)
@@ -1322,9 +1399,166 @@ inline void COpenGLExtensionHandler::extGlActiveStencilFace(GLenum face)
 #endif
 }
 
+inline void COpenGLExtensionHandler::extGlDrawBuffers(GLsizei n, const GLenum *bufs)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlDrawBuffersARB)
+		pGlDrawBuffersARB(n, bufs);
+	else if (pGlDrawBuffersATI)
+		pGlDrawBuffersATI(n, bufs);
+#elif defined(GL_ARB_draw_buffers)
+	glDrawBuffersARB(n, bufs);
+#elif defined(GL_ATI_draw_buffers)
+	glDrawBuffersATI(n, bufs);
+#else
+	os::Printer::log("glDrawBuffers not supported", ELL_ERROR);
+#endif
+}
+
+
+inline void COpenGLExtensionHandler::extGlGenBuffers(GLsizei n, GLuint *buffers)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlGenBuffersARB)
+		pGlGenBuffersARB(n, buffers);
+#elif defined(GL_ARB_vertex_buffer_object)
+	glGenBuffers(n, buffers);
+#else
+	os::Printer::log("glGenBuffers not supported", ELL_ERROR);
+#endif
+}
+
+inline void COpenGLExtensionHandler::extGlBindBuffer(GLenum target, GLuint buffer)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlBindBufferARB)
+		pGlBindBufferARB(target, buffer);
+#elif defined(GL_ARB_vertex_buffer_object)
+	glBindBuffer(target, buffer);
+#else
+	os::Printer::log("glBindBuffer not supported", ELL_ERROR);
+#endif
+}
+
+inline void COpenGLExtensionHandler::extGlBufferData(GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlBufferDataARB)
+		pGlBufferDataARB(target, size, data, usage);
+#elif defined(GL_ARB_vertex_buffer_object)
+	glBufferData(target, size, data, usage);
+#else
+	os::Printer::log("glBufferData not supported", ELL_ERROR);
+#endif
+}
+
+inline void COpenGLExtensionHandler::extGlDeleteBuffers(GLsizei n, const GLuint *buffers)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlDeleteBuffersARB)
+		pGlDeleteBuffersARB(n, buffers);
+#elif defined(GL_ARB_vertex_buffer_object)
+	glDeleteBuffers(n, buffers);
+#else
+	os::Printer::log("glDeleteBuffers not supported", ELL_ERROR);
+#endif
+}
+
+inline void COpenGLExtensionHandler::extGlBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlBufferSubDataARB)
+		pGlBufferSubDataARB(target, offset, size, data);
+#elif defined(GL_ARB_vertex_buffer_object)
+	glBufferSubData(target, offset, size, data);
+#else
+	os::Printer::log("glBufferSubData not supported", ELL_ERROR);
+#endif
+}
+
+inline void COpenGLExtensionHandler::extGlGetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlGetBufferSubDataARB)
+		pGlGetBufferSubDataARB(target, offset, size, data);
+#elif defined(GL_ARB_vertex_buffer_object)
+	glGetBufferSubData(target, offset, size, data);
+#else
+	os::Printer::log("glGetBufferSubData not supported", ELL_ERROR);
+#endif
+}
+
+inline void *COpenGLExtensionHandler::extGlMapBuffer(GLenum target, GLenum access)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlMapBufferARB)
+		return pGlMapBufferARB(target, access);
+	return 0;
+#elif defined(GL_ARB_vertex_buffer_object)
+	return glMapBuffer(target, access);
+#else
+	os::Printer::log("glMapBuffer not supported", ELL_ERROR);
+	return 0;
+#endif
+}
+
+inline GLboolean COpenGLExtensionHandler::extGlUnmapBuffer (GLenum target)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlUnmapBufferARB)
+		return pGlUnmapBufferARB(target);
+	return false;
+#elif defined(GL_ARB_vertex_buffer_object)
+	return glUnmapBuffer(target);
+#else
+	os::Printer::log("glUnmapBuffer not supported", ELL_ERROR);
+	return false;
+#endif
+}
+
+inline GLboolean COpenGLExtensionHandler::extGlIsBuffer (GLuint buffer)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlIsBufferARB)
+		return pGlIsBufferARB(buffer);
+	return false;
+#elif defined(GL_ARB_vertex_buffer_object)
+	return glIsBuffer(buffer);
+#else
+	os::Printer::log("glDeleteBuffers not supported", ELL_ERROR);
+	return false;
+#endif
+}
+
+inline void COpenGLExtensionHandler::extGlGetBufferParameteriv (GLenum target, GLenum pname, GLint *params)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlGetBufferParameterivARB)
+		pGlGetBufferParameterivARB(target, pname, params);
+#elif defined(GL_ARB_vertex_buffer_object)
+	glGetBufferParameteriv(target, pname, params);
+#else
+	os::Printer::log("glGetBufferParameteriv not supported", ELL_ERROR);
+#endif
+}
+
+inline void COpenGLExtensionHandler::extGlGetBufferPointerv (GLenum target, GLenum pname, GLvoid **params)
+{
+#ifdef _IRR_OPENGL_USE_EXTPOINTER_
+	if (pGlGetBufferPointervARB)
+		pGlGetBufferPointervARB(target, pname, params);
+#elif defined(GL_ARB_vertex_buffer_object)
+	glGetBufferPointerv(target, pname, params);
+#else
+	os::Printer::log("glGetBufferPointerv not supported", ELL_ERROR);
+#endif
+}
+
 
 }
 }
 
 #endif
 
+#endif
+
diff --git a/src/dep/src/irrlicht/COpenGLMaterialRenderer.h b/src/dep/src/irrlicht/COpenGLMaterialRenderer.h
index 3b6b911..f8da565 100644
--- a/src/dep/src/irrlicht/COpenGLMaterialRenderer.h
+++ b/src/dep/src/irrlicht/COpenGLMaterialRenderer.h
@@ -1,672 +1,695 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-#ifdef _IRR_COMPILE_WITH_OPENGL_
-
-#include "COpenGLDriver.h"
-#include "IMaterialRenderer.h"
-
-namespace irr
-{
-namespace video
-{
-
-//! Base class for all internal OpenGL material renderers
-class COpenGLMaterialRenderer : public IMaterialRenderer
-{
-public:
-
-	//! Constructor
-	COpenGLMaterialRenderer(video::COpenGLDriver* driver) : Driver(driver)
-	{
-	}
-
-protected:
-
-	video::COpenGLDriver* Driver;
-};
-
-
-//! Solid material renderer
-class COpenGLMaterialRenderer_SOLID : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_SOLID(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(1);
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-		{
-			// thanks to Murphy, the following line removed some
-			// bugs with several OpenGL implementations.
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-		}
-	}
-};
-
-
-//! Generic Texture Blend
-class COpenGLMaterialRenderer_ONETEXTURE_BLEND : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_ONETEXTURE_BLEND(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(1);
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-//		if (material.MaterialType != lastMaterial.MaterialType ||
-//			material.MaterialTypeParam != lastMaterial.MaterialTypeParam ||
-//			resetAllRenderstates)
-		{
-			E_BLEND_FACTOR srcFact,dstFact;
-			E_MODULATE_FUNC modulate;
-			unpack_texureBlendFunc ( srcFact, dstFact, modulate, material.MaterialTypeParam );
-
-			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
-
-			glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, (f32) modulate );
-
-			glBlendFunc( getGLBlend(srcFact), getGLBlend(dstFact) );
-			glEnable(GL_ALPHA_TEST);
-			glEnable(GL_BLEND);
-
-			if ( getTexelAlpha ( srcFact ) + getTexelAlpha ( dstFact ) )
-			{
-				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
-				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE);
-
-				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PRIMARY_COLOR_EXT);
-			}
-		}
-	}
-
-	virtual void OnUnsetMaterial()
-	{
-		glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.f );
-		glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
-
-		glDisable(GL_BLEND);
-		glDisable(GL_ALPHA_TEST);
-	}
-
-	private:
-
-		u32 getGLBlend ( E_BLEND_FACTOR factor ) const
-		{
-			u32 r = 0;
-			switch ( factor )
-			{
-				case EBF_ZERO:			r = GL_ZERO; break;
-				case EBF_ONE:			r = GL_ONE; break;
-				case EBF_DST_COLOR:		r = GL_DST_COLOR; break;
-				case EBF_ONE_MINUS_DST_COLOR:	r = GL_ONE_MINUS_DST_COLOR; break;
-				case EBF_SRC_COLOR:		r = GL_SRC_COLOR; break;
-				case EBF_ONE_MINUS_SRC_COLOR:	r = GL_ONE_MINUS_SRC_COLOR; break;
-				case EBF_SRC_ALPHA:		r = GL_SRC_ALPHA; break;
-				case EBF_ONE_MINUS_SRC_ALPHA:	r = GL_ONE_MINUS_SRC_ALPHA; break;
-				case EBF_DST_ALPHA:		r = GL_DST_ALPHA; break;
-				case EBF_ONE_MINUS_DST_ALPHA:	r = GL_ONE_MINUS_DST_ALPHA; break;
-				case EBF_SRC_ALPHA_SATURATE:	r = GL_SRC_ALPHA_SATURATE; break;
-			}
-			return r;
-		}
-
-		u32 getTexelAlpha ( E_BLEND_FACTOR factor ) const
-		{
-			u32 r;
-			switch ( factor )
-			{
-				case EBF_SRC_ALPHA:		r = 1; break;
-				case EBF_ONE_MINUS_SRC_ALPHA:	r = 1; break;
-				case EBF_DST_ALPHA:		r = 1; break;
-				case EBF_ONE_MINUS_DST_ALPHA:	r = 1; break;
-				case EBF_SRC_ALPHA_SATURATE:	r = 1; break;
-				default:			r = 0; break;
-			}
-			return r;
-		}
-};
-
-
-//! Solid 2 layer material renderer
-class COpenGLMaterialRenderer_SOLID_2_LAYER : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_SOLID_2_LAYER(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(2);
-		Driver->setTexture(1, material.getTexture(1));
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-		{
-			if (Driver->queryFeature(EVDF_MULTITEXTURE))
-			{
-				Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
-				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-				Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
-			}
-
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-		}
-	}
-};
-
-
-//! Transparent add color material renderer
-class COpenGLMaterialRenderer_TRANSPARENT_ADD_COLOR : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_TRANSPARENT_ADD_COLOR(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(1);
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if ((material.MaterialType != lastMaterial.MaterialType) || resetAllRenderstates)
-		{
-			glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-			glEnable(GL_BLEND);
-		}
-	}
-
-	virtual void OnUnsetMaterial()
-	{
-		glDisable(GL_BLEND);
-	}
-
-	//! Returns if the material is transparent.
-	virtual bool isTransparent() const
-	{
-		return true;
-	}
-};
-
-
-//! Transparent vertex alpha material renderer
-class COpenGLMaterialRenderer_TRANSPARENT_VERTEX_ALPHA : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_TRANSPARENT_VERTEX_ALPHA(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(1);
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-		{
-			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-
-			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PRIMARY_COLOR_EXT );
-
-			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_PRIMARY_COLOR_EXT );
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_TEXTURE);
-
-			glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-			glEnable(GL_BLEND);
-		}
-		glDepthMask(GL_FALSE);
-	}
-
-	virtual void OnUnsetMaterial()
-	{
-		// default values
-		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-		glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_MODULATE );
-		glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE );
-		glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_EXT, GL_PREVIOUS_EXT );
-		glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-		glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE );
-		glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
-
-		glDisable(GL_BLEND);
-	}
-
-	//! Returns if the material is transparent.
-	virtual bool isTransparent() const
-	{
-		return true;
-	}
-};
-
-
-//! Transparent alpha channel material renderer
-class COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(1);
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates
-			|| material.MaterialTypeParam != lastMaterial.MaterialTypeParam )
-		{
-			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
-
-			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE);
-
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			glEnable(GL_BLEND);
-			glEnable(GL_ALPHA_TEST);
-
-			f32 refValue = material.MaterialTypeParam;
-			if ( refValue == 0.0f )
-				refValue = 0.5f;
-
-			glAlphaFunc(GL_GREATER, refValue);
-		}
-	}
-
-	virtual void OnUnsetMaterial()
-	{
-		glDisable(GL_ALPHA_TEST);
-		glDisable(GL_BLEND);
-	}
-
-	//! Returns if the material is transparent.
-	virtual bool isTransparent() const
-	{
-		return true;
-	}
-};
-
-
-
-//! Transparent alpha channel material renderer
-class COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(1);
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-		{
-			glEnable(GL_ALPHA_TEST);
-			glAlphaFunc(GL_GREATER, 0.5);
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-		}
-	}
-
-	virtual void OnUnsetMaterial()
-	{
-		glDisable(GL_ALPHA_TEST);
-	}
-
-	//! Returns if the material is transparent.
-	virtual bool isTransparent() const
-	{
-		return false;  // this material is not really transparent because it does no blending.
-	}
-};
-
-
-//! material renderer for all kinds of lightmaps
-class COpenGLMaterialRenderer_LIGHTMAP : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_LIGHTMAP(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(2);
-		Driver->setTexture(1, material.getTexture(1));
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-		{
-			// diffuse map
-
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-			switch (material.MaterialType)
-			{
-				case EMT_LIGHTMAP_LIGHTING:
-				case EMT_LIGHTMAP_LIGHTING_M2:
-				case EMT_LIGHTMAP_LIGHTING_M4:
-					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-					break;
-				case EMT_LIGHTMAP_ADD:
-				case EMT_LIGHTMAP:
-				case EMT_LIGHTMAP_M2:
-				case EMT_LIGHTMAP_M4:
-				default:
-					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_REPLACE);
-					break;
-			}
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
-			glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_EXT, GL_SRC_COLOR);
-			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
-			glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_EXT, GL_SRC_COLOR );
-
-			if (Driver->queryFeature(EVDF_MULTITEXTURE))
-			{
-				// lightmap
-
-				Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
-				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-
-				if (material.MaterialType == EMT_LIGHTMAP_ADD)
-					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_ADD_SIGNED_ARB);
-				else
-					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-
-				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_PREVIOUS_EXT);
-				glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_EXT, GL_SRC_COLOR);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_TEXTURE);
-				glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_EXT, GL_SRC_COLOR);
-
-				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_MODULATE);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PREVIOUS_ARB);
-				glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_EXT, GL_SRC_ALPHA);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_EXT, GL_PREVIOUS_ARB);
-				glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_EXT, GL_SRC_ALPHA);
-
-				switch (material.MaterialType)
-				{
-					case EMT_LIGHTMAP_M4:
-					case EMT_LIGHTMAP_LIGHTING_M4:
-						glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 4.0f);
-						break;
-					case EMT_LIGHTMAP_M2:
-					case EMT_LIGHTMAP_LIGHTING_M2:
-						glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 2.0f);
-						break;
-					default:
-						glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.0f);
-				}
-			}
-		}
-	}
-
-	virtual void OnUnsetMaterial()
-	{
-		if (Driver->queryFeature(EVDF_MULTITEXTURE))
-		{
-			Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
-			glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.f );
-			Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
-		}
-	}
-};
-
-
-
-//! detail map  material renderer
-class COpenGLMaterialRenderer_DETAIL_MAP : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_DETAIL_MAP(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(2);
-		Driver->setTexture(1, material.getTexture(1));
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-		{
-			// diffuse map
-
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-
-			if (Driver->queryFeature(EVDF_MULTITEXTURE))
-			{
-				// detail map
-
-				Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
-
-				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-				glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_ADD_SIGNED_EXT);
-
-				glTexEnvi(GL_TEXTURE_ENV,GL_SOURCE0_RGB_EXT,GL_PREVIOUS_EXT);
-				glTexEnvi(GL_TEXTURE_ENV,GL_OPERAND0_RGB_EXT,GL_SRC_COLOR);
-
-				glTexEnvi(GL_TEXTURE_ENV,GL_SOURCE1_RGB_EXT, GL_TEXTURE);
-				glTexEnvi(GL_TEXTURE_ENV,GL_OPERAND1_RGB_EXT,GL_SRC_COLOR);
-				Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
-			}
-		}
-	}
-};
-
-
-//! sphere map material renderer
-class COpenGLMaterialRenderer_SPHERE_MAP : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_SPHERE_MAP(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(1);
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-		{
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-			glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-			glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-
-			glEnable(GL_TEXTURE_GEN_S);
-			glEnable(GL_TEXTURE_GEN_T);
-		}
-	}
-
-	virtual void OnUnsetMaterial()
-	{
-		glDisable(GL_TEXTURE_GEN_S);
-		glDisable(GL_TEXTURE_GEN_T);
-	}
-};
-
-
-//! reflection 2 layer material renderer
-class COpenGLMaterialRenderer_REFLECTION_2_LAYER : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_REFLECTION_2_LAYER(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(2);
-		Driver->setTexture(1, material.getTexture(1));
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-		{
-			if (Driver->queryFeature(EVDF_MULTITEXTURE))
-			{
-				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-				glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE );
-				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PRIMARY_COLOR_EXT );
-
-				Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
-
-				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-
-				glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_PREVIOUS_EXT);
-				glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_EXT, GL_SRC_COLOR);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_TEXTURE);
-				glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_EXT, GL_SRC_COLOR);
-
-			}
-			glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-			glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-			glEnable(GL_TEXTURE_GEN_S);
-			glEnable(GL_TEXTURE_GEN_T);
-		}
-	}
-
-	virtual void OnUnsetMaterial()
-	{
-		if (Driver->queryFeature(EVDF_MULTITEXTURE))
-		{
-			Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-		}
-		glDisable(GL_TEXTURE_GEN_S);
-		glDisable(GL_TEXTURE_GEN_T);
-		if (Driver->queryFeature(EVDF_MULTITEXTURE))
-		{
-			Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
-
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-		}
-	}
-};
-
-
-//! reflection 2 layer material renderer
-class COpenGLMaterialRenderer_TRANSPARENT_REFLECTION_2_LAYER : public COpenGLMaterialRenderer
-{
-public:
-
-	COpenGLMaterialRenderer_TRANSPARENT_REFLECTION_2_LAYER(video::COpenGLDriver* d)
-		: COpenGLMaterialRenderer(d) {}
-
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services)
-	{
-		Driver->disableTextures(2);
-		Driver->setTexture(1, material.getTexture(1));
-		Driver->setTexture(0, material.getTexture(0));
-		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-		{
-			if (Driver->queryFeature(EVDF_MULTITEXTURE))
-			{
-				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-				glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE );
-				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PRIMARY_COLOR_EXT );
-
-				Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
-
-				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
-
-				glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_PREVIOUS_EXT);
-				glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_EXT, GL_SRC_COLOR);
-				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_TEXTURE);
-				glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_EXT, GL_SRC_COLOR);
-			}
-			glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-			glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-			glEnable(GL_TEXTURE_GEN_S);
-			glEnable(GL_TEXTURE_GEN_T);
-
-			glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
-			glEnable(GL_BLEND);
-		}
-	}
-
-	virtual void OnUnsetMaterial()
-	{
-		if (Driver->queryFeature(EVDF_MULTITEXTURE))
-		{
-			Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-		}
-		glDisable(GL_TEXTURE_GEN_S);
-		glDisable(GL_TEXTURE_GEN_T);
-		if (Driver->queryFeature(EVDF_MULTITEXTURE))
-		{
-			Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-		}
-		glDisable(GL_BLEND);
-	}
-
-	//! Returns if the material is transparent.
-	virtual bool isTransparent() const
-	{
-		return true;
-	}
-};
-
-} // end namespace video
-} // end namespace irr
-
-#endif
-#endif
-
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__
+#define __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "COpenGLDriver.h"
+#include "IMaterialRenderer.h"
+#if defined(_IRR_USE_OSX_DEVICE_)
+	#define GL_COMBINE_EXT                    0x8570
+	#define GL_COMBINE_RGB_EXT                0x8571
+	#define GL_COMBINE_ALPHA_EXT              0x8572
+	#define GL_RGB_SCALE_EXT                  0x8573
+	#define GL_ADD_SIGNED_EXT                 0x8574
+	#define GL_INTERPOLATE_EXT                0x8575
+	#define GL_CONSTANT_EXT                   0x8576
+	#define GL_PRIMARY_COLOR_EXT              0x8577
+	#define GL_PREVIOUS_EXT                   0x8578
+	#define GL_SOURCE0_RGB_EXT                0x8580
+	#define GL_SOURCE1_RGB_EXT                0x8581
+	#define GL_SOURCE2_RGB_EXT                0x8582
+	#define GL_SOURCE3_RGB_EXT                0x8583
+	#define GL_SOURCE4_RGB_EXT                0x8584
+	#define GL_SOURCE5_RGB_EXT                0x8585
+	#define GL_SOURCE6_RGB_EXT                0x8586
+	#define GL_SOURCE7_RGB_EXT                0x8587
+	#define GL_SOURCE0_ALPHA_EXT              0x8588
+	#define GL_SOURCE1_ALPHA_EXT              0x8589
+	#define GL_SOURCE2_ALPHA_EXT              0x858A
+	#define GL_SOURCE3_ALPHA_EXT              0x858B
+	#define GL_SOURCE4_ALPHA_EXT              0x858C
+	#define GL_SOURCE5_ALPHA_EXT              0x858D
+	#define GL_SOURCE6_ALPHA_EXT              0x858E
+	#define GL_SOURCE7_ALPHA_EXT              0x858F
+	#define GL_OPERAND0_RGB_EXT               0x8590
+	#define GL_OPERAND1_RGB_EXT               0x8591
+	#define GL_OPERAND2_RGB_EXT               0x8592
+	#define GL_OPERAND3_RGB_EXT               0x8593
+	#define GL_OPERAND4_RGB_EXT               0x8594
+	#define GL_OPERAND5_RGB_EXT               0x8595
+	#define GL_OPERAND6_RGB_EXT               0x8596
+	#define GL_OPERAND7_RGB_EXT               0x8597
+	#define GL_OPERAND0_ALPHA_EXT             0x8598
+	#define GL_OPERAND1_ALPHA_EXT             0x8599
+	#define GL_OPERAND2_ALPHA_EXT             0x859A
+	#define GL_OPERAND3_ALPHA_EXT             0x859B
+	#define GL_OPERAND4_ALPHA_EXT             0x859C
+	#define GL_OPERAND5_ALPHA_EXT             0x859D
+	#define GL_OPERAND6_ALPHA_EXT             0x859E
+	#define GL_OPERAND7_ALPHA_EXT             0x859F
+#endif
+
+namespace irr
+{
+namespace video
+{
+
+//! Base class for all internal OpenGL material renderers
+class COpenGLMaterialRenderer : public IMaterialRenderer
+{
+public:
+
+	//! Constructor
+	COpenGLMaterialRenderer(video::COpenGLDriver* driver) : Driver(driver)
+	{
+	}
+
+protected:
+
+	video::COpenGLDriver* Driver;
+};
+
+
+//! Solid material renderer
+class COpenGLMaterialRenderer_SOLID : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_SOLID(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(1);
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (resetAllRenderstates || (material.MaterialType != lastMaterial.MaterialType))
+		{
+			// thanks to Murphy, the following line removed some
+			// bugs with several OpenGL implementations.
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		}
+	}
+};
+
+
+//! Generic Texture Blend
+class COpenGLMaterialRenderer_ONETEXTURE_BLEND : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_ONETEXTURE_BLEND(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(1);
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+//		if (material.MaterialType != lastMaterial.MaterialType ||
+//			material.MaterialTypeParam != lastMaterial.MaterialTypeParam ||
+//			resetAllRenderstates)
+		{
+			E_BLEND_FACTOR srcFact,dstFact;
+			E_MODULATE_FUNC modulate;
+			unpack_texureBlendFunc ( srcFact, dstFact, modulate, material.MaterialTypeParam );
+
+			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
+
+			glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, (f32) modulate );
+
+			glBlendFunc( getGLBlend(srcFact), getGLBlend(dstFact) );
+			glEnable(GL_ALPHA_TEST);
+			glAlphaFunc(GL_GREATER, 0.f);
+			glEnable(GL_BLEND);
+
+			if ( getTexelAlpha(srcFact) || getTexelAlpha(dstFact) )
+			{
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE);
+
+				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PRIMARY_COLOR_EXT);
+			}
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.f );
+		glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
+
+		glDisable(GL_BLEND);
+		glDisable(GL_ALPHA_TEST);
+	}
+
+	//! Returns if the material is transparent.
+	/** Is not always transparent, but mostly. */
+	virtual bool isTransparent() const
+	{
+		return true;
+	}
+
+	private:
+
+		u32 getGLBlend ( E_BLEND_FACTOR factor ) const
+		{
+			u32 r = 0;
+			switch ( factor )
+			{
+				case EBF_ZERO:			r = GL_ZERO; break;
+				case EBF_ONE:			r = GL_ONE; break;
+				case EBF_DST_COLOR:		r = GL_DST_COLOR; break;
+				case EBF_ONE_MINUS_DST_COLOR:	r = GL_ONE_MINUS_DST_COLOR; break;
+				case EBF_SRC_COLOR:		r = GL_SRC_COLOR; break;
+				case EBF_ONE_MINUS_SRC_COLOR:	r = GL_ONE_MINUS_SRC_COLOR; break;
+				case EBF_SRC_ALPHA:		r = GL_SRC_ALPHA; break;
+				case EBF_ONE_MINUS_SRC_ALPHA:	r = GL_ONE_MINUS_SRC_ALPHA; break;
+				case EBF_DST_ALPHA:		r = GL_DST_ALPHA; break;
+				case EBF_ONE_MINUS_DST_ALPHA:	r = GL_ONE_MINUS_DST_ALPHA; break;
+				case EBF_SRC_ALPHA_SATURATE:	r = GL_SRC_ALPHA_SATURATE; break;
+			}
+			return r;
+		}
+
+		u32 getTexelAlpha ( E_BLEND_FACTOR factor ) const
+		{
+			u32 r;
+			switch ( factor )
+			{
+				case EBF_SRC_ALPHA:		r = 1; break;
+				case EBF_ONE_MINUS_SRC_ALPHA:	r = 1; break;
+				case EBF_DST_ALPHA:		r = 1; break;
+				case EBF_ONE_MINUS_DST_ALPHA:	r = 1; break;
+				case EBF_SRC_ALPHA_SATURATE:	r = 1; break;
+				default:			r = 0; break;
+			}
+			return r;
+		}
+};
+
+
+//! Solid 2 layer material renderer
+class COpenGLMaterialRenderer_SOLID_2_LAYER : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_SOLID_2_LAYER(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(2);
+		Driver->setTexture(1, material.getTexture(1));
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
+		{
+			if (Driver->queryFeature(EVDF_MULTITEXTURE))
+			{
+				Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
+				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PRIMARY_COLOR_EXT);
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_INTERPOLATE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_PREVIOUS_EXT);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_TEXTURE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB_EXT, GL_PRIMARY_COLOR);
+				glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB_EXT, GL_SRC_ALPHA);
+			}
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		if (Driver->queryFeature(EVDF_MULTITEXTURE))
+		{
+			Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB_EXT, GL_SRC_COLOR);
+			Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
+		}
+	}
+};
+
+
+//! Transparent add color material renderer
+class COpenGLMaterialRenderer_TRANSPARENT_ADD_COLOR : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_TRANSPARENT_ADD_COLOR(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(1);
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if ((material.MaterialType != lastMaterial.MaterialType) || resetAllRenderstates)
+		{
+			glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+			glEnable(GL_BLEND);
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		glDisable(GL_BLEND);
+	}
+
+	//! Returns if the material is transparent.
+	virtual bool isTransparent() const
+	{
+		return true;
+	}
+};
+
+
+//! Transparent vertex alpha material renderer
+class COpenGLMaterialRenderer_TRANSPARENT_VERTEX_ALPHA : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_TRANSPARENT_VERTEX_ALPHA(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(1);
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
+		{
+			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+
+			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PRIMARY_COLOR_EXT );
+
+			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_PRIMARY_COLOR_EXT );
+			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_TEXTURE);
+
+			glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+			glEnable(GL_BLEND);
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		// default values
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+		glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_MODULATE );
+		glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE );
+		glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_EXT, GL_PREVIOUS_EXT );
+		glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+		glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE );
+		glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
+
+		glDisable(GL_BLEND);
+	}
+
+	//! Returns if the material is transparent.
+	virtual bool isTransparent() const
+	{
+		return true;
+	}
+};
+
+
+//! Transparent alpha channel material renderer
+class COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(1);
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates
+			|| material.MaterialTypeParam != lastMaterial.MaterialTypeParam )
+		{
+			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
+
+			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE);
+
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			glEnable(GL_BLEND);
+			glEnable(GL_ALPHA_TEST);
+
+			glAlphaFunc(GL_GREATER, material.MaterialTypeParam);
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		glDisable(GL_ALPHA_TEST);
+		glDisable(GL_BLEND);
+	}
+
+	//! Returns if the material is transparent.
+	virtual bool isTransparent() const
+	{
+		return true;
+	}
+};
+
+
+
+//! Transparent alpha channel material renderer
+class COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(1);
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
+		{
+			glEnable(GL_ALPHA_TEST);
+			glAlphaFunc(GL_GREATER, 0.5f);
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		glDisable(GL_ALPHA_TEST);
+	}
+
+	//! Returns if the material is transparent.
+	virtual bool isTransparent() const
+	{
+		return false;  // this material is not really transparent because it does no blending.
+	}
+};
+
+
+//! material renderer for all kinds of lightmaps
+class COpenGLMaterialRenderer_LIGHTMAP : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_LIGHTMAP(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(2);
+		Driver->setTexture(1, material.getTexture(1));
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
+		{
+			// diffuse map
+
+			switch (material.MaterialType)
+			{
+				case EMT_LIGHTMAP_LIGHTING:
+				case EMT_LIGHTMAP_LIGHTING_M2:
+				case EMT_LIGHTMAP_LIGHTING_M4:
+					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+					break;
+				case EMT_LIGHTMAP_ADD:
+				case EMT_LIGHTMAP:
+				case EMT_LIGHTMAP_M2:
+				case EMT_LIGHTMAP_M4:
+				default:
+					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+					break;
+			}
+
+			if (Driver->queryFeature(EVDF_MULTITEXTURE))
+			{
+				// lightmap
+
+				Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
+				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+
+				if (material.MaterialType == EMT_LIGHTMAP_ADD)
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_ADD_SIGNED_ARB);
+				else
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+
+				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_PREVIOUS_EXT);
+				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_TEXTURE);
+
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_MODULATE);
+				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PREVIOUS_ARB);
+				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_EXT, GL_PREVIOUS_ARB);
+
+				switch (material.MaterialType)
+				{
+					case EMT_LIGHTMAP_M4:
+					case EMT_LIGHTMAP_LIGHTING_M4:
+						glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 4.0f);
+						break;
+					case EMT_LIGHTMAP_M2:
+					case EMT_LIGHTMAP_LIGHTING_M2:
+						glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 2.0f);
+						break;
+					default:
+						glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.0f);
+				}
+			}
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		if (Driver->queryFeature(EVDF_MULTITEXTURE))
+		{
+			Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
+			glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.f );
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+			Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		}
+	}
+};
+
+
+
+//! detail map  material renderer
+class COpenGLMaterialRenderer_DETAIL_MAP : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_DETAIL_MAP(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(2);
+		Driver->setTexture(1, material.getTexture(1));
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
+		{
+			// diffuse map
+
+			if (Driver->queryFeature(EVDF_MULTITEXTURE))
+			{
+				// detail map
+				Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
+
+				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+				glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_ADD_SIGNED_EXT);
+				glTexEnvi(GL_TEXTURE_ENV,GL_SOURCE0_RGB_EXT,GL_PREVIOUS_EXT);
+				glTexEnvi(GL_TEXTURE_ENV,GL_SOURCE1_RGB_EXT, GL_TEXTURE);
+				Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
+			}
+		}
+	}
+};
+
+
+//! sphere map material renderer
+class COpenGLMaterialRenderer_SPHERE_MAP : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_SPHERE_MAP(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(1);
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
+		{
+			glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+			glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+
+			glEnable(GL_TEXTURE_GEN_S);
+			glEnable(GL_TEXTURE_GEN_T);
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		glDisable(GL_TEXTURE_GEN_S);
+		glDisable(GL_TEXTURE_GEN_T);
+	}
+};
+
+
+//! reflection 2 layer material renderer
+class COpenGLMaterialRenderer_REFLECTION_2_LAYER : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_REFLECTION_2_LAYER(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(2);
+		Driver->setTexture(1, material.getTexture(1));
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
+		{
+			if (Driver->queryFeature(EVDF_MULTITEXTURE))
+			{
+				Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
+				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+				glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_PREVIOUS_EXT);
+				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_TEXTURE);
+
+			}
+			glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+			glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+			glEnable(GL_TEXTURE_GEN_S);
+			glEnable(GL_TEXTURE_GEN_T);
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		if (Driver->queryFeature(EVDF_MULTITEXTURE))
+		{
+			Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		}
+		glDisable(GL_TEXTURE_GEN_S);
+		glDisable(GL_TEXTURE_GEN_T);
+		if (Driver->queryFeature(EVDF_MULTITEXTURE))
+		{
+			Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
+		}
+	}
+};
+
+
+//! reflection 2 layer material renderer
+class COpenGLMaterialRenderer_TRANSPARENT_REFLECTION_2_LAYER : public COpenGLMaterialRenderer
+{
+public:
+
+	COpenGLMaterialRenderer_TRANSPARENT_REFLECTION_2_LAYER(video::COpenGLDriver* d)
+		: COpenGLMaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+		Driver->disableTextures(2);
+		Driver->setTexture(1, material.getTexture(1));
+		Driver->setTexture(0, material.getTexture(0));
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
+		{
+			if (Driver->queryFeature(EVDF_MULTITEXTURE))
+			{
+				Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
+				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+				glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_PREVIOUS_EXT);
+				glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_TEXTURE);
+			}
+			glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+			glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+			glEnable(GL_TEXTURE_GEN_S);
+			glEnable(GL_TEXTURE_GEN_T);
+
+			glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
+			glEnable(GL_BLEND);
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		if (Driver->queryFeature(EVDF_MULTITEXTURE))
+		{
+			Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		}
+		glDisable(GL_TEXTURE_GEN_S);
+		glDisable(GL_TEXTURE_GEN_T);
+		if (Driver->queryFeature(EVDF_MULTITEXTURE))
+		{
+			Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
+		}
+		glDisable(GL_BLEND);
+	}
+
+	//! Returns if the material is transparent.
+	virtual bool isTransparent() const
+	{
+		return true;
+	}
+};
+
+} // end namespace video
+} // end namespace irr
+
+#endif
+#endif
+
diff --git a/src/dep/src/irrlicht/COpenGLNormalMapRenderer.cpp b/src/dep/src/irrlicht/COpenGLNormalMapRenderer.cpp
index 0f3d01d..2f7606b 100644
--- a/src/dep/src/irrlicht/COpenGLNormalMapRenderer.cpp
+++ b/src/dep/src/irrlicht/COpenGLNormalMapRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,9 +18,9 @@ namespace video
 {
 
 // Irrlicht Engine OpenGL render path normal map vertex shader
-// I guess it could be optimized a lot, because I wrote it in D3D ASM and 
+// I guess it could be optimized a lot, because I wrote it in D3D ASM and
 // transferred it 1:1 to OpenGL
-const char OPENGL_NORMAL_MAP_VSH[] = 
+const char OPENGL_NORMAL_MAP_VSH[] =
 	"!!ARBvp1.0\n"\
 	"#input\n"\
 	"# 0-3: transposed world matrix;\n"\
@@ -132,9 +132,9 @@ const char OPENGL_NORMAL_MAP_VSH[] =
 	"END\n";
 
 // Irrlicht Engine OpenGL render path normal map pixel shader
-// I guess it could be optimized a bit, because I wrote it in D3D ASM and 
+// I guess it could be optimized a bit, because I wrote it in D3D ASM and
 // transfered it 1:1 to OpenGL
-const char OPENGL_NORMAL_MAP_PSH[] = 
+const char OPENGL_NORMAL_MAP_PSH[] =
 	"!!ARBfp1.0\n"\
 	"\n"\
 	"#Input\n"\
@@ -173,16 +173,21 @@ const char OPENGL_NORMAL_MAP_PSH[] =
 	"END\n";
 
 //! Constructor
-COpenGLNormalMapRenderer::COpenGLNormalMapRenderer(video::COpenGLDriver* driver, 
+COpenGLNormalMapRenderer::COpenGLNormalMapRenderer(video::COpenGLDriver* driver,
 	s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial)
 	: COpenGLShaderMaterialRenderer(driver, 0, baseMaterial), CompiledShaders(true)
 {
-	// set this as callback. We could have done this in 
+
+	#ifdef _DEBUG
+	setDebugName("COpenGLNormalMapRenderer");
+	#endif
+
+	// set this as callback. We could have done this in
 	// the initialization list, but some compilers don't like it.
 
 	CallBack = this;
 
-	// basicly, this thing simply compiles these hardcoded shaders if the
+	// basically, this thing simply compiles the hardcoded shaders if the
 	// hardware is able to do them, otherwise it maps to the base material
 
 	if (!driver->queryFeature(video::EVDF_ARB_FRAGMENT_PROGRAM_1) ||
@@ -200,7 +205,7 @@ COpenGLNormalMapRenderer::COpenGLNormalMapRenderer(video::COpenGLDriver* driver,
 
 	if (renderer)
 	{
-		// use the already compiled shaders 
+		// use the already compiled shaders
 		video::COpenGLNormalMapRenderer* nmr = reinterpret_cast<video::COpenGLNormalMapRenderer*>(renderer);
 		CompiledShaders = false;
 
@@ -213,7 +218,11 @@ COpenGLNormalMapRenderer::COpenGLNormalMapRenderer(video::COpenGLDriver* driver,
 	{
 		// compile shaders on our own
 		init(outMaterialTypeNr, OPENGL_NORMAL_MAP_VSH, OPENGL_NORMAL_MAP_PSH, EVT_TANGENTS);
-	}	
+	}
+
+	// fallback if compilation has failed
+	if (-1==outMaterialTypeNr)
+		outMaterialTypeNr = driver->addMaterialRenderer(this);
 }
 
 
@@ -225,14 +234,14 @@ COpenGLNormalMapRenderer::~COpenGLNormalMapRenderer()
 
 	if (!CompiledShaders)
 	{
-		// prevent this from deleting shaders we did not create 
+		// prevent this from deleting shaders we did not create
 		VertexShader = 0;
 		PixelShader = 0;
 	}
 }
 
 
-//! Returns the render capability of the material. 
+//! Returns the render capability of the material.
 s32 COpenGLNormalMapRenderer::getRenderCapability() const
 {
 	if (Driver->queryFeature(video::EVDF_ARB_FRAGMENT_PROGRAM_1) &&
@@ -264,10 +273,10 @@ void COpenGLNormalMapRenderer::OnSetConstants(IMaterialRendererServices* service
 	// and set them as constants
 
 	u32 cnt = driver->getDynamicLightCount();
-	
+
 	for (u32 i=0; i<2; ++i)
 	{
-		video::SLight light; 
+		video::SLight light;
 
 		if (i<cnt)
 			light = driver->getDynamicLight(i);
diff --git a/src/dep/src/irrlicht/COpenGLNormalMapRenderer.h b/src/dep/src/irrlicht/COpenGLNormalMapRenderer.h
index 42d46fe..4b50954 100644
--- a/src/dep/src/irrlicht/COpenGLNormalMapRenderer.h
+++ b/src/dep/src/irrlicht/COpenGLNormalMapRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/COpenGLParallaxMapRenderer.cpp b/src/dep/src/irrlicht/COpenGLParallaxMapRenderer.cpp
index 2853835..04243a0 100644
--- a/src/dep/src/irrlicht/COpenGLParallaxMapRenderer.cpp
+++ b/src/dep/src/irrlicht/COpenGLParallaxMapRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -211,6 +211,11 @@ COpenGLParallaxMapRenderer::COpenGLParallaxMapRenderer(video::COpenGLDriver* dri
 	s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial)
 	: COpenGLShaderMaterialRenderer(driver, 0, baseMaterial), CompiledShaders(true)
 {
+
+	#ifdef _DEBUG
+	setDebugName("COpenGLParallaxMapRenderer");
+	#endif
+
 	// set this as callback. We could have done this in
 	// the initialization list, but some compilers don't like it.
 
@@ -248,6 +253,10 @@ COpenGLParallaxMapRenderer::COpenGLParallaxMapRenderer(video::COpenGLDriver* dri
 		// compile shaders on our own
 		init(outMaterialTypeNr, OPENGL_PARALLAX_MAP_VSH, OPENGL_PARALLAX_MAP_PSH, EVT_TANGENTS);
 	}
+
+	// fallback if compilation has failed
+	if (-1==outMaterialTypeNr)
+		outMaterialTypeNr = driver->addMaterialRenderer(this);
 }
 
 
diff --git a/src/dep/src/irrlicht/COpenGLParallaxMapRenderer.h b/src/dep/src/irrlicht/COpenGLParallaxMapRenderer.h
index 1fe5295..a97c3ab 100644
--- a/src/dep/src/irrlicht/COpenGLParallaxMapRenderer.h
+++ b/src/dep/src/irrlicht/COpenGLParallaxMapRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/COpenGLSLMaterialRenderer.cpp b/src/dep/src/irrlicht/COpenGLSLMaterialRenderer.cpp
index 605046d..0a7825b 100644
--- a/src/dep/src/irrlicht/COpenGLSLMaterialRenderer.cpp
+++ b/src/dep/src/irrlicht/COpenGLSLMaterialRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -41,6 +41,10 @@ COpenGLSLMaterialRenderer::COpenGLSLMaterialRenderer(video::COpenGLDriver* drive
 	: Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
 		Program(0), UserData(userData)
 {
+	#ifdef _DEBUG
+	setDebugName("COpenGLSLMaterialRenderer");
+	#endif
+
 	//entry points must always be main, and the compile target isn't selectable
 	//it is fine to ignore what has been asked for, as the compiler should spot anything wrong
 	//just check that GLSL is available
@@ -102,11 +106,14 @@ void COpenGLSLMaterialRenderer::init(s32& outMaterialTypeNr,
 		return;
 
 #if defined(GL_ARB_vertex_shader) && defined (GL_ARB_fragment_shader)
-	if (!createShader(GL_VERTEX_SHADER_ARB, vertexShaderProgram))
-		return;
+	if (vertexShaderProgram)
+		if (!createShader(GL_VERTEX_SHADER_ARB, vertexShaderProgram))
+			return;
 
-	if (!createShader(GL_FRAGMENT_SHADER_ARB, pixelShaderProgram))
-		return;
+
+	if (pixelShaderProgram)
+		if (!createShader(GL_FRAGMENT_SHADER_ARB, pixelShaderProgram))
+			return;
 #endif
 
 	if (!linkProgram())
@@ -116,6 +123,7 @@ void COpenGLSLMaterialRenderer::init(s32& outMaterialTypeNr,
 	outMaterialTypeNr = Driver->addMaterialRenderer(this);
 }
 
+
 bool COpenGLSLMaterialRenderer::OnRender(IMaterialRendererServices* service,
 					E_VERTEX_TYPE vtxtype)
 {
@@ -134,13 +142,17 @@ void COpenGLSLMaterialRenderer::OnSetMaterial(const video::SMaterial& material,
 {
 	if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
 	{
-		if(Program)
+		if (Program)
 			Driver->extGlUseProgramObject(Program);
 
 		if (BaseMaterial)
 			BaseMaterial->OnSetMaterial(material, material, true, this);
 	}
 
+	//let callback know used material
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
+
 	for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
 		Driver->setTexture(i, material.getTexture(i));
 	Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@@ -203,6 +215,7 @@ bool COpenGLSLMaterialRenderer::createShader(GLenum shaderType, const char* shad
 	return true;
 }
 
+
 bool COpenGLSLMaterialRenderer::linkProgram()
 {
 	Driver->extGlLinkProgram(Program);
@@ -278,7 +291,6 @@ bool COpenGLSLMaterialRenderer::linkProgram()
 }
 
 
-
 void COpenGLSLMaterialRenderer::setBasicRenderStates(const SMaterial& material,
 						const SMaterial& lastMaterial,
 						bool resetAllRenderstates)
@@ -313,31 +325,33 @@ bool COpenGLSLMaterialRenderer::setPixelShaderConstant(const c8* name, const f32
 		return false;
 
 #ifdef GL_ARB_shader_objects
+	GLint Location=Driver->extGlGetUniformLocation(Program,name);
+
 	switch (UniformInfo[i].type)
 	{
 		case GL_FLOAT:
-			Driver->extGlUniform1fv(i, count, floats);
+			Driver->extGlUniform1fv(Location, count, floats);
 			break;
 		case GL_FLOAT_VEC2_ARB:
-			Driver->extGlUniform2fv(i, count/2, floats);
+			Driver->extGlUniform2fv(Location, count/2, floats);
 			break;
 		case GL_FLOAT_VEC3_ARB:
-			Driver->extGlUniform3fv(i, count/3, floats);
+			Driver->extGlUniform3fv(Location, count/3, floats);
 			break;
 		case GL_FLOAT_VEC4_ARB:
-			Driver->extGlUniform4fv(i, count/4, floats);
+			Driver->extGlUniform4fv(Location, count/4, floats);
 			break;
 		case GL_FLOAT_MAT2_ARB:
-			Driver->extGlUniformMatrix2fv(i, count/4, false, floats);
+			Driver->extGlUniformMatrix2fv(Location, count/4, false, floats);
 			break;
 		case GL_FLOAT_MAT3_ARB:
-			Driver->extGlUniformMatrix3fv(i, count/9, false, floats);
+			Driver->extGlUniformMatrix3fv(Location, count/9, false, floats);
 			break;
 		case GL_FLOAT_MAT4_ARB:
-			Driver->extGlUniformMatrix4fv(i, count/16, false, floats);
+			Driver->extGlUniformMatrix4fv(Location, count/16, false, floats);
 			break;
 		default:
-			Driver->extGlUniform1iv(i, count, reinterpret_cast<const GLint*>(floats));
+			Driver->extGlUniform1iv(Location, count, reinterpret_cast<const GLint*>(floats));
 			break;
 	}
 #endif
diff --git a/src/dep/src/irrlicht/COpenGLSLMaterialRenderer.h b/src/dep/src/irrlicht/COpenGLSLMaterialRenderer.h
index b47d155..af1709e 100644
--- a/src/dep/src/irrlicht/COpenGLSLMaterialRenderer.h
+++ b/src/dep/src/irrlicht/COpenGLSLMaterialRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,7 +17,7 @@
 #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
 	#define GL_GLEXT_LEGACY 1
 #endif
-#if defined(MACOSX)
+#if defined(_IRR_USE_OSX_DEVICE_)
 	#include <OpenGL/gl.h>
 #else
 	#include <GL/gl.h>
@@ -50,7 +50,7 @@ public:
 
 	//! Constructor
 	COpenGLSLMaterialRenderer(
-		video::COpenGLDriver* driver, 
+		COpenGLDriver* driver, 
 		s32& outMaterialTypeNr, 
 		const c8* vertexShaderProgram,
 		const c8* vertexShaderEntryPointName,
@@ -59,14 +59,14 @@ public:
 		const c8* pixelShaderEntryPointName,
 		E_PIXEL_SHADER_TYPE psCompileTarget,
 		IShaderConstantSetCallBack* callback,
-		video::IMaterialRenderer* baseMaterial,
+		IMaterialRenderer* baseMaterial,
 		s32 userData);
 
 	//! Destructor
 	virtual ~COpenGLSLMaterialRenderer();
 
-	virtual void OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial,
-		bool resetAllRenderstates, video::IMaterialRendererServices* services);
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services);
 
 	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype);
 
@@ -100,7 +100,7 @@ protected:
 	bool createShader(GLenum shaderType, const char* shader);
 	bool linkProgram();
 	
-	video::COpenGLDriver* Driver;
+	COpenGLDriver* Driver;
 	IShaderConstantSetCallBack* CallBack;
 	IMaterialRenderer* BaseMaterial;
 
diff --git a/src/dep/src/irrlicht/COpenGLShaderMaterialRenderer.cpp b/src/dep/src/irrlicht/COpenGLShaderMaterialRenderer.cpp
index 69a7aca..2583312 100644
--- a/src/dep/src/irrlicht/COpenGLShaderMaterialRenderer.cpp
+++ b/src/dep/src/irrlicht/COpenGLShaderMaterialRenderer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -25,6 +25,11 @@ COpenGLShaderMaterialRenderer::COpenGLShaderMaterialRenderer(video::COpenGLDrive
 	: Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
 		VertexShader(0), PixelShader(0), UserData(userData)
 {
+
+	#ifdef _DEBUG
+	setDebugName("COpenGLShaderMaterialRenderer");
+	#endif
+
 	if (BaseMaterial)
 		BaseMaterial->grab();
 
@@ -38,8 +43,8 @@ COpenGLShaderMaterialRenderer::COpenGLShaderMaterialRenderer(video::COpenGLDrive
 //! constructor only for use by derived classes who want to
 //! create a fall back material for example.
 COpenGLShaderMaterialRenderer::COpenGLShaderMaterialRenderer(COpenGLDriver* driver,
-							IShaderConstantSetCallBack* callback,
-							IMaterialRenderer* baseMaterial, s32 userData)
+				IShaderConstantSetCallBack* callback,
+				IMaterialRenderer* baseMaterial, s32 userData)
 : Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
 		VertexShader(0), PixelShader(0), UserData(userData)
 {
@@ -64,26 +69,29 @@ COpenGLShaderMaterialRenderer::~COpenGLShaderMaterialRenderer()
 		Driver->extGlDeletePrograms(1, &PixelShader);
 
 	if (BaseMaterial)
-		BaseMaterial->drop ();
+		BaseMaterial->drop();
 }
 
+
 void COpenGLShaderMaterialRenderer::init(s32& outMaterialTypeNr, const c8* vertexShaderProgram,
 	const c8* pixelShaderProgram, E_VERTEX_TYPE type)
 {
 	outMaterialTypeNr = -1;
 
+	bool success;
+
 	// create vertex shader
-	if (!createVertexShader(vertexShaderProgram))
-		return;
+	success=createVertexShader(vertexShaderProgram);
 
 	// create pixel shader
-	if (!createPixelShader(pixelShaderProgram))
+	if (!createPixelShader(pixelShaderProgram) || !success)
 		return;
 
 	// register as a new material
 	outMaterialTypeNr = Driver->addMaterialRenderer(this);
 }
 
+
 bool COpenGLShaderMaterialRenderer::OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
 {
 	// call callback to set shader constants
@@ -121,6 +129,10 @@ void COpenGLShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& materi
 			BaseMaterial->OnSetMaterial(material, material, true, services);
 	}
 
+	//let callback know used material
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
+
 	for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
 		Driver->setTexture(i, material.getTexture(i));
 	Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@@ -144,12 +156,14 @@ void COpenGLShaderMaterialRenderer::OnUnsetMaterial()
 		BaseMaterial->OnUnsetMaterial();
 }
 
+
 //! Returns if the material is transparent.
 bool COpenGLShaderMaterialRenderer::isTransparent() const
 {
 	return BaseMaterial ? BaseMaterial->isTransparent() : false;
 }
 
+
 bool COpenGLShaderMaterialRenderer::createPixelShader(const c8* pxsh)
 {
 	if (!pxsh)
@@ -181,6 +195,9 @@ bool COpenGLShaderMaterialRenderer::createPixelShader(const c8* pxsh)
 		sprintf(tmp, "Pixel shader compilation failed at position %d:\n%s", errPos, errString);
 		os::Printer::log(tmp);
 
+		Driver->extGlDeletePrograms(1, &PixelShader);
+		PixelShader=0;
+
 		return false;
 	}
 #else
@@ -190,7 +207,8 @@ bool COpenGLShaderMaterialRenderer::createPixelShader(const c8* pxsh)
 	return true;
 }
 
-bool COpenGLShaderMaterialRenderer::createVertexShader(const char* vtxsh)
+
+bool COpenGLShaderMaterialRenderer::createVertexShader(const c8* vtxsh)
 {
 	if (!vtxsh)
 		return true;
@@ -201,7 +219,7 @@ bool COpenGLShaderMaterialRenderer::createVertexShader(const char* vtxsh)
 
 	// clear error buffer
 	while(glGetError() != GL_NO_ERROR)
-		{}
+	{}
 
 	// compile
 	Driver->extGlProgramString(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
@@ -219,6 +237,9 @@ bool COpenGLShaderMaterialRenderer::createVertexShader(const char* vtxsh)
 		sprintf(tmp, "Vertex shader compilation failed at position %d:\n%s", errPos, errString);
 		os::Printer::log(tmp);
 
+		Driver->extGlDeletePrograms(1, &VertexShader);
+		VertexShader=0;
+
 		return false;
 	}
 #else
diff --git a/src/dep/src/irrlicht/COpenGLShaderMaterialRenderer.h b/src/dep/src/irrlicht/COpenGLShaderMaterialRenderer.h
index c79b982..2fd2a46 100644
--- a/src/dep/src/irrlicht/COpenGLShaderMaterialRenderer.h
+++ b/src/dep/src/irrlicht/COpenGLShaderMaterialRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,7 +16,7 @@
 #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
 	#define GL_GLEXT_LEGACY 1
 #endif
-#if defined(MACOSX)
+#if defined(_IRR_USE_OSX_DEVICE_)
 	#include <OpenGL/gl.h>
 #else
 	#include <GL/gl.h>
@@ -43,15 +43,15 @@ class COpenGLShaderMaterialRenderer : public IMaterialRenderer
 public:
 
 	//! Constructor
-	COpenGLShaderMaterialRenderer(video::COpenGLDriver* driver,
+	COpenGLShaderMaterialRenderer(COpenGLDriver* driver,
 		s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram,
 		IShaderConstantSetCallBack* callback, IMaterialRenderer* baseMaterial, s32 userData);
 
 	//! Destructor
 	virtual ~COpenGLShaderMaterialRenderer();
 
-	virtual void OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial,
-		bool resetAllRenderstates, video::IMaterialRendererServices* services);
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services);
 
 	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype);
 
@@ -72,9 +72,9 @@ protected:
 		const c8* pixelShaderProgram, E_VERTEX_TYPE type);
 
 	bool createPixelShader(const c8* pxsh);
-	bool createVertexShader(const char* vtxsh);
+	bool createVertexShader(const c8* vtxsh);
 
-	video::COpenGLDriver* Driver;
+	COpenGLDriver* Driver;
 	IShaderConstantSetCallBack* CallBack;
 	IMaterialRenderer* BaseMaterial;
 
diff --git a/src/dep/src/irrlicht/COpenGLTexture.cpp b/src/dep/src/irrlicht/COpenGLTexture.cpp
index a1243a8..4047f74 100644
--- a/src/dep/src/irrlicht/COpenGLTexture.cpp
+++ b/src/dep/src/irrlicht/COpenGLTexture.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -20,147 +20,58 @@ namespace irr
 namespace video
 {
 
-// helper function for render to texture
-static bool checkFBOStatus(COpenGLDriver* Driver);
-
 //! constructor for usual textures
-COpenGLTexture::COpenGLTexture(IImage* image, const char* name, COpenGLDriver* driver)
- : ITexture(name), Driver(driver), Image(0),
-  TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_BGRA_EXT),
-  PixelType(GL_UNSIGNED_BYTE), HasMipMaps(true), IsRenderTarget(false),
-  ColorFrameBuffer(0), DepthRenderBuffer(0), StencilRenderBuffer(0), Locks(0)
+COpenGLTexture::COpenGLTexture(IImage* origImage, const char* name, COpenGLDriver* driver)
+	: ITexture(name), ColorFormat(ECF_A8R8G8B8), Driver(driver), Image(0),
+	TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_BGRA_EXT),
+	PixelType(GL_UNSIGNED_BYTE),
+	IsRenderTarget(false), AutomaticMipmapUpdate(false),
+	ReadOnlyLock(false), KeepImage(true)
 {
 	#ifdef _DEBUG
 	setDebugName("COpenGLTexture");
 	#endif
 
-	getImageData(image);
-
 	HasMipMaps = Driver->getTextureCreationFlag(ETCF_CREATE_MIP_MAPS);
-	if (Image)
+	getImageData(origImage);
+
+	glGenTextures(1, &TextureName);
+
+	if (ImageSize==TextureSize)
+		Image = new CImage(ColorFormat, origImage);
+	else
 	{
-		glGenTextures(1, &TextureName);
-		copyTexture();
+		Image = new CImage(ColorFormat, TextureSize);
+		// scale texture
+		origImage->copyToScaling(Image);
+	}
+	copyTexture();
+	if (!KeepImage)
+	{
+		Image->drop();
+		Image=0;
 	}
 }
 
-//! ColorFrameBuffer constructor
-COpenGLTexture::COpenGLTexture(const core::dimension2d<s32>& size,
-                                bool extPackedDepthStencilSupported,
-                                const char* name,
-                                COpenGLDriver* driver)
- : ITexture(name), ImageSize(size), Driver(driver), Image(0),
-  TextureName(0), InternalFormat(GL_RGB8), PixelFormat(GL_RGBA),
-  PixelType(GL_UNSIGNED_BYTE), HasMipMaps(false), IsRenderTarget(true),
-  ColorFrameBuffer(0), DepthRenderBuffer(0), StencilRenderBuffer(0), Locks(0)
+//! constructor for basic setup (only for derived classes)
+COpenGLTexture::COpenGLTexture(const char* name, COpenGLDriver* driver)
+	: ITexture(name), ColorFormat(ECF_A8R8G8B8), Driver(driver), Image(0),
+	TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_BGRA_EXT),
+	PixelType(GL_UNSIGNED_BYTE),
+	HasMipMaps(true), IsRenderTarget(false), AutomaticMipmapUpdate(false),
+	ReadOnlyLock(false), KeepImage(true)
 {
 	#ifdef _DEBUG
-	setDebugName("COpenGLTexture_FBO");
+	setDebugName("COpenGLTexture");
 	#endif
-
-	// generate color texture
-	glGenTextures(1, &TextureName);
-	glBindTexture(GL_TEXTURE_2D, TextureName);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexImage2D(GL_TEXTURE_2D, 0, InternalFormat, ImageSize.Width,
-		ImageSize.Height, 0, PixelFormat, PixelType, 0);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-#ifdef GL_EXT_packed_depth_stencil
-	if (extPackedDepthStencilSupported)
-	{
-		// generate packed depth stencil texture
-		glGenTextures(1, &DepthRenderBuffer);
-		glBindTexture(GL_TEXTURE_2D, DepthRenderBuffer);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_STENCIL_EXT, ImageSize.Width,
-			ImageSize.Height, 0, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-		StencilRenderBuffer = DepthRenderBuffer; // stencil is packed with depth
-	}
-	else // generate separate stencil and depth textures
-#endif
-	{
-		// generate depth texture
-		glGenTextures(1, &DepthRenderBuffer);
-		glBindTexture(GL_TEXTURE_2D, DepthRenderBuffer);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, ImageSize.Width,
-			ImageSize.Height, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 0);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-        // we 're in trouble! the code below does not complete the FBO currently...
-        // stencil buffer is only supported with EXT_packed_depth_stencil extension (above)
-
-//        // generate stencil texture
-//        glGenTextures(1, &StencilRenderBuffer);
-//        glBindTexture(GL_TEXTURE_2D, StencilRenderBuffer);
-//        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-//        glTexImage2D(GL_TEXTURE_2D, 0, GL_STENCIL_INDEX, ImageSize.Width,
-//                        ImageSize.Height, 0, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, 0);
-//        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-//        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	}
-
-#ifdef GL_EXT_framebuffer_object
-	// generate frame buffer
-	Driver->extGlGenFramebuffers(1, &ColorFrameBuffer);
-	Driver->extGlBindFramebuffer(GL_FRAMEBUFFER_EXT, ColorFrameBuffer);
-
-	// attach color texture to frame buffer
-	Driver->extGlFramebufferTexture2D(GL_FRAMEBUFFER_EXT,
-						GL_COLOR_ATTACHMENT0_EXT,
-						GL_TEXTURE_2D,
-						TextureName,
-						0);
-	// attach depth texture to depth buffer
-	Driver->extGlFramebufferTexture2D(GL_FRAMEBUFFER_EXT,
-						GL_DEPTH_ATTACHMENT_EXT,
-						GL_TEXTURE_2D,
-						DepthRenderBuffer,
-						0);
-	// attach stencil texture to stencil buffer
-	Driver->extGlFramebufferTexture2D(GL_FRAMEBUFFER_EXT,
-						GL_STENCIL_ATTACHMENT_EXT,
-						GL_TEXTURE_2D,
-						StencilRenderBuffer,
-						0);
-	glGetError();
-
-	// check the status
-	if (!checkFBOStatus(Driver))
-	{
-		printf("FBO=%u, Color=%u, Depth=%u, Stencil=%u\n",
-			ColorFrameBuffer, TextureName, DepthRenderBuffer, StencilRenderBuffer);
-		if (ColorFrameBuffer)
-			Driver->extGlDeleteFramebuffers(1, &ColorFrameBuffer);
-		if (DepthRenderBuffer)
-			glDeleteTextures(1, &DepthRenderBuffer);
-		if (StencilRenderBuffer && StencilRenderBuffer != DepthRenderBuffer)
-			glDeleteTextures(1, &StencilRenderBuffer);
-		ColorFrameBuffer = 0;
-		DepthRenderBuffer = 0;
-		StencilRenderBuffer = 0;
-	}
-	Driver->extGlBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
-#endif
 }
 
 
 //! destructor
 COpenGLTexture::~COpenGLTexture()
 {
-	if (ColorFrameBuffer)
-		Driver->extGlDeleteFramebuffers(1, &ColorFrameBuffer);
-	if (DepthRenderBuffer)
-		glDeleteTextures(1, &DepthRenderBuffer);
-	if (StencilRenderBuffer && StencilRenderBuffer != DepthRenderBuffer)
-		glDeleteTextures(1, &StencilRenderBuffer);
-
-	glDeleteTextures(1, &TextureName);
+	if (TextureName)
+		glDeleteTextures(1, &TextureName);
 	if (Image)
 		Image->drop();
 }
@@ -224,36 +135,22 @@ void COpenGLTexture::getImageData(IImage* image)
 		return;
 	}
 
-	core::dimension2d<s32> nImageSize;
-	if (Driver->queryFeature(EVDF_TEXTURE_NPOT))
-		nImageSize=ImageSize;
-	else
-	{
-		nImageSize.Width = getTextureSizeFromSurfaceSize(ImageSize.Width);
-		nImageSize.Height = getTextureSizeFromSurfaceSize(ImageSize.Height);
-	}
+	TextureSize=ImageSize.getOptimalSize(!Driver->queryFeature(EVDF_TEXTURE_NPOT));
 
-	ECOLOR_FORMAT destFormat = getBestColorFormat(image->getColorFormat());
-	if (ImageSize==nImageSize)
-		Image = new CImage(destFormat, image);
-	else
-	{
-		Image = new CImage(destFormat, nImageSize);
-		// scale texture
-		image->copyToScaling(Image);
-	}
+	ColorFormat = getBestColorFormat(image->getColorFormat());
 }
 
 
-
 //! copies the the texture into an open gl texture.
 void COpenGLTexture::copyTexture(bool newTexture)
 {
-	glBindTexture(GL_TEXTURE_2D, TextureName);
-	if (Driver->testGLError())
-		os::Printer::log("Could not bind Texture", ELL_ERROR);
+	if (!Image)
+	{
+		os::Printer::log("No image for OpenGL texture to upload", ELL_ERROR);
+		return;
+	}
 
-	switch (Image->getColorFormat())
+	switch (ColorFormat)
 	{
 		case ECF_A1R5G5B5:
 			InternalFormat=GL_RGBA;
@@ -281,6 +178,10 @@ void COpenGLTexture::copyTexture(bool newTexture)
 			break;
 	}
 
+	Driver->setTexture(0, this);
+	if (Driver->testGLError())
+		os::Printer::log("Could not bind Texture", ELL_ERROR);
+
 	if (newTexture)
 	{
 		#ifndef DISABLE_MIPMAPPING
@@ -327,45 +228,83 @@ void COpenGLTexture::copyTexture(bool newTexture)
 }
 
 
-
-//! returns the size of a texture which would be the optimal size for rendering it
-inline s32 COpenGLTexture::getTextureSizeFromSurfaceSize(s32 size) const
-{
-	s32 ts = 0x01;
-	while(ts < size)
-		ts <<= 1;
-
-	return ts;
-}
-
-
 //! lock function
-void* COpenGLTexture::lock()
+void* COpenGLTexture::lock(bool readOnly)
 {
-	if (Image)
-	{
-		++Locks;
-		return Image->lock();
-	}
-	else
-		return 0;
-}
+	ReadOnlyLock |= readOnly;
 
+	if (!Image || IsRenderTarget)
+	{
+		// prepare the data storage if necessary
+		if (!Image)
+			Image = new CImage(ECF_A8R8G8B8, ImageSize);
+		if (!Image)
+			return 0;
+
+		u8* pPixels = static_cast<u8*>(Image->lock());
+		if (!pPixels)
+		{
+			return 0;
+		}
+		// we need to keep the correct texture bound...
+		GLint tmpTexture;
+		glGetIntegerv(GL_TEXTURE_BINDING_2D, &tmpTexture);
+		glBindTexture(GL_TEXTURE_2D, TextureName);
+
+		// allows to read pixels in top-to-bottom order
+#ifdef GL_MESA_pack_invert
+		if (Driver->queryOpenGLFeature(COpenGLExtensionHandler::IRR_MESA_pack_invert))
+			glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+#endif
+
+		glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, pPixels);
+
+#ifdef GL_MESA_pack_invert
+		if (Driver->queryOpenGLFeature(COpenGLExtensionHandler::IRR_MESA_pack_invert))
+			glPixelStorei(GL_PACK_INVERT_MESA, GL_FALSE);
+		else
+#endif
+		{
+			// opengl images are horizontally flipped, so we have to fix that here.
+			const s32 pitch=Image->getPitch();
+			u8* p2 = pPixels + (ImageSize.Height - 1) * pitch;
+			u8* tmpBuffer = new u8[pitch];
+			for (s32 i=0; i < ImageSize.Height; i += 2)
+			{
+				memcpy(tmpBuffer, pPixels, pitch);
+				memcpy(pPixels, p2, pitch);
+				memcpy(p2, tmpBuffer, pitch);
+				pPixels += pitch;
+				p2 -= pitch;
+			}
+			delete [] tmpBuffer;
+		}
+		Image->unlock();
+
+		//reset old bound texture
+		glBindTexture(GL_TEXTURE_2D, tmpTexture);
+	}
+	return Image->lock();
+}
 
 
 //! unlock function
 void COpenGLTexture::unlock()
 {
-	if (Image)
-	{
-		--Locks;
-		Image->unlock();
+	if (!Image)
+		return;
+	Image->unlock();
+	if (!ReadOnlyLock)
 		copyTexture(false);
+	ReadOnlyLock = false;
+	if (!KeepImage)
+	{
+		Image->drop();
+		Image=0;
 	}
 }
 
 
-
 //! Returns size of the original image.
 const core::dimension2d<s32>& COpenGLTexture::getOriginalSize() const
 {
@@ -373,37 +312,27 @@ const core::dimension2d<s32>& COpenGLTexture::getOriginalSize() const
 }
 
 
-
-//! Returns of the texture.
+//! Returns size of the texture.
 const core::dimension2d<s32>& COpenGLTexture::getSize() const
 {
-	if (Image)
-		return Image->getDimension();
-	else
-		return ImageSize;
+	return TextureSize;
 }
 
 
-
-//! returns driver type of texture (=the driver, who created the texture)
+//! returns driver type of texture, i.e. the driver, which created the texture
 E_DRIVER_TYPE COpenGLTexture::getDriverType() const
 {
 	return EDT_OPENGL;
 }
 
 
-
 //! returns color format of texture
 ECOLOR_FORMAT COpenGLTexture::getColorFormat() const
 {
-	if (Image)
-		return Image->getColorFormat();
-	else
-		return ECF_A8R8G8B8;
+	return ColorFormat;
 }
 
 
-
 //! returns pitch of texture (in bytes)
 u32 COpenGLTexture::getPitch() const
 {
@@ -414,7 +343,6 @@ u32 COpenGLTexture::getPitch() const
 }
 
 
-
 //! return open gl texture name
 GLuint COpenGLTexture::getOpenGLTextureName() const
 {
@@ -434,7 +362,7 @@ bool COpenGLTexture::hasMipMaps() const
 //! modifying the texture
 void COpenGLTexture::regenerateMipMapLevels()
 {
-	if (AutomaticMipmapUpdate || !HasMipMaps)
+	if (AutomaticMipmapUpdate || !HasMipMaps || !Image)
 		return;
 	if ((Image->getDimension().Width==1) && (Image->getDimension().Height==1))
 		return;
@@ -461,41 +389,268 @@ void COpenGLTexture::regenerateMipMapLevels()
 }
 
 
-bool COpenGLTexture::isFrameBufferObject() const
-{
-    return ColorFrameBuffer != 0;
-}
-
 bool COpenGLTexture::isRenderTarget() const
 {
     return IsRenderTarget;
 }
 
-void COpenGLTexture::setRenderTarget(bool isTarget)
+
+void COpenGLTexture::setIsRenderTarget(bool isTarget)
 {
     IsRenderTarget = isTarget;
 }
 
 
-//! Bind ColorFrameBuffer (valid only if isFrameBufferObject() returns true).
-void COpenGLTexture::bindFrameBufferObject()
+bool COpenGLTexture::isFrameBufferObject() const
+{
+	return false;
+}
+
+
+//! Bind Render Target Texture
+void COpenGLTexture::bindRTT()
+{
+}
+
+
+//! Unbind Render Target Texture
+void COpenGLTexture::unbindRTT()
+{
+	Driver->setTexture(0, this);
+
+	// Copy Our ViewPort To The Texture
+	glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, getSize().Width, getSize().Height);
+}
+
+
+/* FBO Textures */
+
+// helper function for render to texture
+static bool checkFBOStatus(COpenGLDriver* Driver);
+
+//! RTT ColorFrameBuffer constructor
+COpenGLFBOTexture::COpenGLFBOTexture(const core::dimension2d<s32>& size,
+                                const char* name,
+                                COpenGLDriver* driver)
+	: COpenGLTexture(name, driver), DepthTexture(0), ColorFrameBuffer(0)
+{
+	#ifdef _DEBUG
+	setDebugName("COpenGLTexture_FBO");
+	#endif
+
+	ImageSize = size;
+	TextureSize = size;
+	InternalFormat = GL_RGBA;
+	PixelFormat = GL_RGBA;
+	PixelType = GL_UNSIGNED_BYTE;
+	HasMipMaps = false;
+	IsRenderTarget = true;
+
+#ifdef GL_EXT_framebuffer_object
+	// generate frame buffer
+	Driver->extGlGenFramebuffers(1, &ColorFrameBuffer);
+	Driver->extGlBindFramebuffer(GL_FRAMEBUFFER_EXT, ColorFrameBuffer);
+
+	// generate color texture
+	glGenTextures(1, &TextureName);
+	Driver->setTexture(0, this);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glTexImage2D(GL_TEXTURE_2D, 0, InternalFormat, ImageSize.Width,
+		ImageSize.Height, 0, PixelFormat, PixelType, 0);
+
+	// attach color texture to frame buffer
+	Driver->extGlFramebufferTexture2D(GL_FRAMEBUFFER_EXT,
+						GL_COLOR_ATTACHMENT0_EXT,
+						GL_TEXTURE_2D,
+						TextureName,
+						0);
+#endif
+	unbindRTT();
+}
+
+
+//! destructor
+COpenGLFBOTexture::~COpenGLFBOTexture()
+{
+	if (DepthTexture)
+		if (DepthTexture->drop())
+			Driver->removeDepthTexture(DepthTexture);
+	if (ColorFrameBuffer)
+		Driver->extGlDeleteFramebuffers(1, &ColorFrameBuffer);
+}
+
+
+bool COpenGLFBOTexture::isFrameBufferObject() const
+{
+	return true;
+}
+
+
+//! Bind Render Target Texture
+void COpenGLFBOTexture::bindRTT()
 {
 #ifdef GL_EXT_framebuffer_object
-    if (ColorFrameBuffer != 0)
-        Driver->extGlBindFramebuffer(GL_FRAMEBUFFER_EXT, ColorFrameBuffer);
+	if (ColorFrameBuffer != 0)
+		Driver->extGlBindFramebuffer(GL_FRAMEBUFFER_EXT, ColorFrameBuffer);
 #endif
 }
 
 
-//! Unbind ColorFrameBuffer (valid only if isFrameBufferObject() returns true).
-void COpenGLTexture::unbindFrameBufferObject()
+//! Unbind Render Target Texture
+void COpenGLFBOTexture::unbindRTT()
 {
 #ifdef GL_EXT_framebuffer_object
-    if (ColorFrameBuffer != 0)
-        Driver->extGlBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
+	if (ColorFrameBuffer != 0)
+		Driver->extGlBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
 #endif
 }
 
+
+/* FBO Depth Textures */
+
+//! RTT DepthBuffer constructor
+COpenGLFBODepthTexture::COpenGLFBODepthTexture(
+		const core::dimension2d<s32>& size,
+		const char* name,
+		COpenGLDriver* driver,
+		bool useStencil)
+	: COpenGLFBOTexture(size, name, driver), DepthRenderBuffer(0),
+	StencilRenderBuffer(0), UseStencil(useStencil)
+{
+#ifdef _DEBUG
+	setDebugName("COpenGLTextureFBO_Depth");
+#endif
+
+	ImageSize = size;
+	TextureSize = size;
+	InternalFormat = GL_RGBA;
+	PixelFormat = GL_RGBA;
+	PixelType = GL_UNSIGNED_BYTE;
+	HasMipMaps = false;
+
+	if (useStencil)
+	{
+		glGenTextures(1, &DepthRenderBuffer);
+		glBindTexture(GL_TEXTURE_2D, DepthRenderBuffer);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+#ifdef GL_EXT_packed_depth_stencil
+		if (Driver->queryOpenGLFeature(COpenGLExtensionHandler::IRR_EXT_packed_depth_stencil))
+		{
+			// generate packed depth stencil texture
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_STENCIL_EXT, ImageSize.Width,
+				ImageSize.Height, 0, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0);
+			StencilRenderBuffer = DepthRenderBuffer; // stencil is packed with depth
+		}
+		else // generate separate stencil and depth textures
+#endif
+		{
+			// generate depth texture
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, ImageSize.Width,
+				ImageSize.Height, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 0);
+
+			// we 're in trouble! the code below does not complete
+			// the FBO currently...  stencil buffer is only
+			// supported with EXT_packed_depth_stencil extension
+			// (above)
+
+//			// generate stencil texture
+//			glGenTextures(1, &StencilRenderBuffer);
+//			glBindTexture(GL_TEXTURE_2D, StencilRenderBuffer);
+//			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+//			glTexImage2D(GL_TEXTURE_2D, 0, GL_STENCIL_INDEX, ImageSize.Width,
+//			ImageSize.Height, 0, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, 0);
+//			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+//			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+		}
+	}
+#ifdef GL_EXT_framebuffer_object
+	else
+	{
+		// generate depth buffer
+		Driver->extGlGenRenderbuffers(1, &DepthRenderBuffer);
+		Driver->extGlBindRenderbuffer(GL_RENDERBUFFER_EXT, DepthRenderBuffer);
+		Driver->extGlRenderbufferStorage(GL_RENDERBUFFER_EXT,
+				GL_DEPTH_COMPONENT, ImageSize.Width,
+				ImageSize.Height);
+	}
+#endif
+}
+
+
+//! destructor
+COpenGLFBODepthTexture::~COpenGLFBODepthTexture()
+{
+	if (DepthRenderBuffer && UseStencil)
+		glDeleteTextures(1, &DepthRenderBuffer);
+	else
+		Driver->extGlDeleteRenderbuffers(1, &DepthRenderBuffer);
+	if (StencilRenderBuffer && StencilRenderBuffer != DepthRenderBuffer)
+		glDeleteTextures(1, &StencilRenderBuffer);
+}
+
+
+//combine depth texture and rtt
+bool COpenGLFBODepthTexture::attach(ITexture* renderTex)
+{
+	if (!renderTex)
+		return false;
+	video::COpenGLFBOTexture* rtt = static_cast<video::COpenGLFBOTexture*>(renderTex);
+	rtt->bindRTT();
+#ifdef GL_EXT_framebuffer_object
+	if (UseStencil)
+	{
+		// attach stencil texture to stencil buffer
+		Driver->extGlFramebufferTexture2D(GL_FRAMEBUFFER_EXT,
+						GL_STENCIL_ATTACHMENT_EXT,
+						GL_TEXTURE_2D,
+						StencilRenderBuffer,
+						0);
+
+		// attach depth texture to depth buffer
+		Driver->extGlFramebufferTexture2D(GL_FRAMEBUFFER_EXT,
+						GL_DEPTH_ATTACHMENT_EXT,
+						GL_TEXTURE_2D,
+						DepthRenderBuffer,
+						0);
+	}
+	else
+	{
+		// attach depth renderbuffer to depth buffer
+		Driver->extGlFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT,
+						GL_DEPTH_ATTACHMENT_EXT,
+						GL_RENDERBUFFER_EXT,
+						DepthRenderBuffer);
+	}
+#endif
+	// check the status
+	if (!checkFBOStatus(Driver))
+	{
+		os::Printer::log("FBO incomplete");
+		return false;
+	}
+	rtt->DepthTexture=this;
+	grab(); // grab the depth buffer, not the RTT
+	rtt->unbindRTT();
+	return true;
+}
+
+
+//! Bind Render Target Texture
+void COpenGLFBODepthTexture::bindRTT()
+{
+}
+
+
+//! Unbind Render Target Texture
+void COpenGLFBODepthTexture::unbindRTT()
+{
+}
+
+
 bool checkFBOStatus(COpenGLDriver* Driver)
 {
 #ifdef GL_EXT_framebuffer_object
@@ -545,11 +700,12 @@ bool checkFBOStatus(COpenGLDriver* Driver)
 		default:
 			break;
 	}
-	os::Printer::log("FBO error", ELL_ERROR);
 #endif
+	os::Printer::log("FBO error", ELL_ERROR);
 	return false;
 }
 
+
 } // end namespace video
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/COpenGLTexture.h b/src/dep/src/irrlicht/COpenGLTexture.h
index 5e84225..e2ee95c 100644
--- a/src/dep/src/irrlicht/COpenGLTexture.h
+++ b/src/dep/src/irrlicht/COpenGLTexture.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -25,7 +25,7 @@
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
 		#define GL_GLEXT_LEGACY 1
 	#endif
-	#if defined(MACOSX)
+	#if defined(_IRR_USE_OSX_DEVICE_)
 		#include <OpenGL/gl.h>
 	#else
 		#include <GL/gl.h>
@@ -49,25 +49,23 @@ public:
 
 	//! constructor
 	COpenGLTexture(IImage* surface, const char* name, COpenGLDriver* driver=0);
-	//! FrameBufferObject constructor
-	COpenGLTexture(const core::dimension2d<s32>& size, bool extPackedDepthStencilSupported, const char* name, COpenGLDriver* driver=0);
 
 	//! destructor
 	virtual ~COpenGLTexture();
 
 	//! lock function
-	virtual void* lock();
+	virtual void* lock(bool readOnly = false);
 
 	//! unlock function
 	virtual void unlock();
 
-	//! Returns original size of the texture.
+	//! Returns original size of the texture (image).
 	virtual const core::dimension2d<s32>& getOriginalSize() const;
 
 	//! Returns size of the texture.
 	virtual const core::dimension2d<s32>& getSize() const;
 
-	//! returns driver type of texture (=the driver, who created the texture)
+	//! returns driver type of texture (=the driver, that created it)
 	virtual E_DRIVER_TYPE getDriverType() const;
 
 	//! returns color format of texture
@@ -90,18 +88,21 @@ public:
 	virtual bool isRenderTarget() const;
 
 	//! Is it a FrameBufferObject?
-	bool isFrameBufferObject() const;
+	virtual bool isFrameBufferObject() const;
 
-	//! Bind FrameBufferObject (valid only if isFrameBufferObject() returns true).
-	void bindFrameBufferObject();
+	//! Bind RenderTargetTexture
+	virtual void bindRTT();
 
-	//! Unbind FrameBufferObject (valid only if isFrameBufferObject() returns true).
-	void unbindFrameBufferObject();
+	//! Unbind RenderTargetTexture
+	virtual void unbindRTT();
 
 	//! sets whether this texture is intended to be used as a render target.
-	void setRenderTarget(bool isTarget);
+	void setIsRenderTarget(bool isTarget);
 
-private:
+protected:
+
+	//! protected constructor with basic setup, no GL texture name created, for derived classes
+	COpenGLTexture(const char* name, COpenGLDriver* driver);
 
 	//! get the desired color format based on texture creation flags and the input format.
 	ECOLOR_FORMAT getBestColorFormat(ECOLOR_FORMAT format);
@@ -109,14 +110,14 @@ private:
 	//! convert the image into an internal image with better properties for this driver.
 	void getImageData(IImage* image);
 
-	//! copies the the texture into an open gl texture.
+	//! copies the texture into an OpenGL texture.
 	//! \param: newTexture is true if method is called from a newly created texture for the first time. Otherwise call with false to improve memory handling.
 	void copyTexture(bool newTexture=true);
 
-	//! returns the size of a texture which would be the optimize size for rendering it
-	inline s32 getTextureSizeFromSurfaceSize(s32 size) const;
-
 	core::dimension2d<s32> ImageSize;
+	core::dimension2d<s32> TextureSize;
+	ECOLOR_FORMAT ColorFormat;
+	s32 Pitch;
 	COpenGLDriver* Driver;
 	IImage* Image;
 
@@ -124,15 +125,62 @@ private:
 	GLint InternalFormat;
 	GLenum PixelFormat;
 	GLenum PixelType;
+
 	bool HasMipMaps;
 	bool IsRenderTarget;
 	bool AutomaticMipmapUpdate;
+	bool ReadOnlyLock;
+	bool KeepImage;
+};
 
-	GLuint ColorFrameBuffer; // for FBO path
-	GLuint DepthRenderBuffer; // for FBO path
-	GLuint StencilRenderBuffer; // for FBO path
+//! OpenGL FBO texture.
+class COpenGLFBOTexture : public COpenGLTexture
+{
+public:
 
-	u32 Locks;
+	//! FrameBufferObject constructor
+	COpenGLFBOTexture(const core::dimension2d<s32>& size, const char* name, COpenGLDriver* driver=0);
+
+	//! destructor
+	virtual ~COpenGLFBOTexture();
+
+	//! Is it a FrameBufferObject?
+	virtual bool isFrameBufferObject() const;
+
+	//! Bind RenderTargetTexture
+	virtual void bindRTT();
+
+	//! Unbind RenderTargetTexture
+	virtual void unbindRTT();
+
+	ITexture* DepthTexture;
+protected:
+	GLuint ColorFrameBuffer;
+};
+
+
+//! OpenGL FBO depth texture.
+class COpenGLFBODepthTexture : public COpenGLFBOTexture
+{
+public:
+	//! FrameBufferObject depth constructor
+	COpenGLFBODepthTexture(const core::dimension2d<s32>& size, const char* name, COpenGLDriver* driver=0, bool useStencil=false);
+
+	//! destructor
+	virtual ~COpenGLFBODepthTexture();
+
+	//! Bind RenderTargetTexture
+	virtual void bindRTT();
+
+	//! Unbind RenderTargetTexture
+	virtual void unbindRTT();
+
+	bool attach(ITexture*);
+
+protected:
+	GLuint DepthRenderBuffer;
+	GLuint StencilRenderBuffer;
+	bool UseStencil;
 };
 
 
diff --git a/src/dep/src/irrlicht/CPakReader.cpp b/src/dep/src/irrlicht/CPakReader.cpp
index 062ea83..9daca52 100644
--- a/src/dep/src/irrlicht/CPakReader.cpp
+++ b/src/dep/src/irrlicht/CPakReader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // Code contributed by skreamz
@@ -174,13 +174,11 @@ void CPakReader::deletePathFromFilename(core::stringc& filename)
 	// delete path from filename
 	const c8* p = filename.c_str() + filename.size();
 
-	// suche ein slash oder den anfang.
+	// search for path separator or beginning
 
 	while (*p!='/' && *p!='\\' && p!=filename.c_str())
 		--p;
 
-	core::stringc newName;
-
 	if (p != filename.c_str())
 	{
 		++p;
diff --git a/src/dep/src/irrlicht/CPakReader.h b/src/dep/src/irrlicht/CPakReader.h
index 184248c..82d75e0 100644
--- a/src/dep/src/irrlicht/CPakReader.h
+++ b/src/dep/src/irrlicht/CPakReader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CParticleAnimatedMeshSceneNodeEmitter.cpp b/src/dep/src/irrlicht/CParticleAnimatedMeshSceneNodeEmitter.cpp
index 6436479..6ecead6 100644
--- a/src/dep/src/irrlicht/CParticleAnimatedMeshSceneNodeEmitter.cpp
+++ b/src/dep/src/irrlicht/CParticleAnimatedMeshSceneNodeEmitter.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,25 +19,21 @@ CParticleAnimatedMeshSceneNodeEmitter::CParticleAnimatedMeshSceneNodeEmitter(
 		s32 mbNumber, bool everyMeshVertex,
 		u32 minParticlesPerSecond, u32 maxParticlesPerSecond,
 		const video::SColor& minStartColor, const video::SColor& maxStartColor,
-		u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees )
-	: Node(node), TotalVertices(0), MBCount(0), MBNumber(mbNumber),
-	EveryMeshVertex(everyMeshVertex), UseNormalDirection(useNormalDirection),
-	NormalDirectionModifier(normalDirectionModifier), Direction(direction),
+		u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees,
+		const core::dimension2df& minStartSize, const core::dimension2df& maxStartSize )
+	: Node(0), AnimatedMesh(0), BaseMesh(0), TotalVertices(0), MBCount(0), MBNumber(mbNumber),
+	Direction(direction), NormalDirectionModifier(normalDirectionModifier),
 	MinParticlesPerSecond(minParticlesPerSecond), MaxParticlesPerSecond(maxParticlesPerSecond),
 	MinStartColor(minStartColor), MaxStartColor(maxStartColor),
 	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
-	Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)
+	MaxStartSize(maxStartSize), MinStartSize(minStartSize),
+	Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees),
+	EveryMeshVertex(everyMeshVertex), UseNormalDirection(useNormalDirection)
 {
-	AnimatedMesh = node->getMesh();
-	BaseMesh = AnimatedMesh->getMesh(0);
-
-	TotalVertices = 0;
-	MBCount = BaseMesh->getMeshBufferCount();
-	for( u32 i = 0; i < MBCount; ++i )
-	{
-		VertexPerMeshBufferList.push_back( BaseMesh->getMeshBuffer(i)->getVertexCount() );
-		TotalVertices += BaseMesh->getMeshBuffer(i)->getVertexCount();
-	}
+	#ifdef _DEBUG
+	setDebugName("CParticleAnimatedMeshSceneNodeEmitter");
+	#endif
+	setAnimatedMeshSceneNode(node);
 }
 
 
@@ -47,9 +43,9 @@ s32 CParticleAnimatedMeshSceneNodeEmitter::emitt(u32 now, u32 timeSinceLastCall,
 {
 	Time += timeSinceLastCall;
 
-	u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
-	f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
-	f32 everyWhatMillisecond = 1000.0f / perSecond;
+	const u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
+	const f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
+	const f32 everyWhatMillisecond = 1000.0f / perSecond;
 
 	if(Time > everyWhatMillisecond)
 	{
@@ -62,7 +58,8 @@ s32 CParticleAnimatedMeshSceneNodeEmitter::emitt(u32 now, u32 timeSinceLastCall,
 			amount = MaxParticlesPerSecond * 2;
 
 		// Get Mesh for this frame
-		IMesh* frameMesh = AnimatedMesh->getMesh( core::floor32(Node->getFrameNr()), 255, Node->getStartFrame(), Node->getEndFrame() );
+		IMesh* frameMesh = AnimatedMesh->getMesh( core::floor32(Node->getFrameNr()),
+				255, Node->getStartFrame(), Node->getEndFrame() );
 		for(u32 i=0; i<amount; ++i)
 		{
 			if( EveryMeshVertex )
@@ -71,32 +68,21 @@ s32 CParticleAnimatedMeshSceneNodeEmitter::emitt(u32 now, u32 timeSinceLastCall,
 				{
 					for( u32 k=0; k<frameMesh->getMeshBuffer(j)->getVertexCount(); ++k )
 					{
-						switch( frameMesh->getMeshBuffer(j)->getVertexType() )
-						{
-						case video::EVT_STANDARD:
-							p.pos = ((video::S3DVertex*)frameMesh->getMeshBuffer(j)->getVertices())[k].Pos;
-							if( UseNormalDirection )
-								p.vector = ((video::S3DVertex*)frameMesh->getMeshBuffer(j)->getVertices())[k].Normal / NormalDirectionModifier;
-							else
-								p.vector = Direction;
-							break;
-						case video::EVT_TANGENTS:
-							p.pos = ((video::S3DVertexTangents*)frameMesh->getMeshBuffer(j)->getVertices())[k].Pos;
-							if( UseNormalDirection )
-								p.vector = ((video::S3DVertexTangents*)frameMesh->getMeshBuffer(j)->getVertices())[k].Normal / NormalDirectionModifier;
-							else
-								p.vector = Direction;
-							break;
-						}
+						p.pos = frameMesh->getMeshBuffer(j)->getPosition(k);
+						if( UseNormalDirection )
+							p.vector = frameMesh->getMeshBuffer(j)->getNormal(k) /
+								NormalDirectionModifier;
+						else
+							p.vector = Direction;
 
 						p.startTime = now;
 
 						if( MaxAngleDegrees )
 						{
 							core::vector3df tgt = p.vector;
-							tgt.rotateXYBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df());
-							tgt.rotateYZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df());
-							tgt.rotateXZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df());
+							tgt.rotateXYBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
+							tgt.rotateYZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
+							tgt.rotateXZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
 							p.vector = tgt;
 						}
 
@@ -111,6 +97,13 @@ s32 CParticleAnimatedMeshSceneNodeEmitter::emitt(u32 now, u32 timeSinceLastCall,
 						p.startColor = p.color;
 						p.startVector = p.vector;
 
+						if (MinStartSize==MaxStartSize)
+							p.startSize = MinStartSize;
+						else
+							p.startSize = MinStartSize.getInterpolated(
+								MaxStartSize, (os::Randomizer::rand() % 100) / 100.0f);
+						p.size = p.startSize;
+
 						Particles.push_back(p);
 					}
 				}
@@ -118,44 +111,31 @@ s32 CParticleAnimatedMeshSceneNodeEmitter::emitt(u32 now, u32 timeSinceLastCall,
 			else
 			{
 				s32 randomMB = 0;
-
 				if( MBNumber < 0 )
-				{
 					randomMB = os::Randomizer::rand() % MBCount;
-				}
 				else
-				{
 					randomMB = MBNumber;
-				}
 
-				u32 vertexNumber = os::Randomizer::rand() % frameMesh->getMeshBuffer(randomMB)->getVertexCount();
+				u32 vertexNumber = frameMesh->getMeshBuffer(randomMB)->getVertexCount();
+				if (!vertexNumber)
+					continue;
+				vertexNumber = os::Randomizer::rand() % vertexNumber;
 
-				switch( frameMesh->getMeshBuffer(randomMB)->getVertexType() )
-				{
-				case video::EVT_STANDARD:
-					p.pos = ((video::S3DVertex*)frameMesh->getMeshBuffer(randomMB)->getVertices())[vertexNumber].Pos;
-					if( UseNormalDirection )
-						p.vector = ((video::S3DVertex*)frameMesh->getMeshBuffer(randomMB)->getVertices())[vertexNumber].Normal / NormalDirectionModifier;
-					else
-						p.vector = Direction;
-					break;
-				case video::EVT_TANGENTS:
-					p.pos = ((video::S3DVertexTangents*)frameMesh->getMeshBuffer(randomMB)->getVertices())[vertexNumber].Pos;
-					if( UseNormalDirection )
-						p.vector = ((video::S3DVertexTangents*)frameMesh->getMeshBuffer(randomMB)->getVertices())[vertexNumber].Normal / NormalDirectionModifier;
-					else
-						p.vector = Direction;
-					break;
-				}
+				p.pos = frameMesh->getMeshBuffer(randomMB)->getPosition(vertexNumber);
+				if( UseNormalDirection )
+					p.vector = frameMesh->getMeshBuffer(randomMB)->getNormal(vertexNumber) /
+						NormalDirectionModifier;
+				else
+					p.vector = Direction;
 
 				p.startTime = now;
 
 				if( MaxAngleDegrees )
 				{
 					core::vector3df tgt = Direction;
-					tgt.rotateXYBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df(0,0,0));
-					tgt.rotateYZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df(0,0,0));
-					tgt.rotateXZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df(0,0,0));
+					tgt.rotateXYBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
+					tgt.rotateYZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
+					tgt.rotateXZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
 					p.vector = tgt;
 				}
 
@@ -170,6 +150,13 @@ s32 CParticleAnimatedMeshSceneNodeEmitter::emitt(u32 now, u32 timeSinceLastCall,
 				p.startColor = p.color;
 				p.startVector = p.vector;
 
+				if (MinStartSize==MaxStartSize)
+					p.startSize = MinStartSize;
+				else
+					p.startSize = MinStartSize.getInterpolated(
+							MaxStartSize, (os::Randomizer::rand() % 100) / 100.0f);
+				p.size = p.startSize;
+
 				Particles.push_back(p);
 			}
 		}
@@ -182,6 +169,7 @@ s32 CParticleAnimatedMeshSceneNodeEmitter::emitt(u32 now, u32 timeSinceLastCall,
 	return 0;
 }
 
+
 //! Set Mesh to emit particles from
 void CParticleAnimatedMeshSceneNodeEmitter::setAnimatedMeshSceneNode( IAnimatedMeshSceneNode* node )
 {
@@ -191,6 +179,7 @@ void CParticleAnimatedMeshSceneNodeEmitter::setAnimatedMeshSceneNode( IAnimatedM
 
 	TotalVertices = 0;
 	MBCount = BaseMesh->getMeshBufferCount();
+	VertexPerMeshBufferList.reallocate(MBCount);
 	for( u32 i = 0; i < MBCount; ++i )
 	{
 		VertexPerMeshBufferList.push_back( BaseMesh->getMeshBuffer(i)->getVertexCount() );
diff --git a/src/dep/src/irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h b/src/dep/src/irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h
index 200d25c..d6bf923 100644
--- a/src/dep/src/irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h
+++ b/src/dep/src/irrlicht/CParticleAnimatedMeshSceneNodeEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -32,7 +32,9 @@ public:
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin = 2000,
 		u32 lifeTimeMax = 4000,
-		s32 maxAngleDegrees = 0
+		s32 maxAngleDegrees = 0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f)
 	);
 
 	//! Prepares an array with new particles to emitt into the system
@@ -67,6 +69,12 @@ public:
 	//! Set maximum starting color for particles
 	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
 
+	//! Set the maximum starting size for particles
+	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; };
+
+	//! Set the minimum starting size for particles
+	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; };
+
 	//! Get Mesh we're emitting particles from
 	virtual const IAnimatedMeshSceneNode* getAnimatedMeshSceneNode() const { return Node; }
 
@@ -95,28 +103,36 @@ public:
 	//! Get the maximum starting color for particles
 	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
 
+	//! Get the maximum starting size for particles
+	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; };
+
+	//! Get the minimum starting size for particles
+	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; };
+
 private:
 
 	IAnimatedMeshSceneNode* Node;
 	IAnimatedMesh*		AnimatedMesh;
-	const IMesh*			BaseMesh;
+	const IMesh*		BaseMesh;
 	s32			TotalVertices;
 	u32			MBCount;
 	s32			MBNumber;
 	core::array<s32>	VertexPerMeshBufferList;
 
-	bool EveryMeshVertex;
-	bool UseNormalDirection;
-	f32 NormalDirectionModifier;
 	core::array<SParticle> Particles;
 	core::vector3df Direction;
+	f32 NormalDirectionModifier;
 	u32 MinParticlesPerSecond, MaxParticlesPerSecond;
 	video::SColor MinStartColor, MaxStartColor;
 	u32 MinLifeTime, MaxLifeTime;
+	core::dimension2df MaxStartSize, MinStartSize;
 
 	u32 Time;
 	u32 Emitted;
 	s32 MaxAngleDegrees;
+
+	bool EveryMeshVertex;
+	bool UseNormalDirection;
 };
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CParticleAttractionAffector.cpp b/src/dep/src/irrlicht/CParticleAttractionAffector.cpp
index 8934628..872c945 100644
--- a/src/dep/src/irrlicht/CParticleAttractionAffector.cpp
+++ b/src/dep/src/irrlicht/CParticleAttractionAffector.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,6 +16,9 @@ CParticleAttractionAffector::CParticleAttractionAffector(
 	: Point(point), Speed(speed), AffectX(affectX), AffectY(affectY),
 		AffectZ(affectZ), Attract(attract), LastTime(0)
 {
+	#ifdef _DEBUG
+	setDebugName("CParticleAttractionAffector");
+	#endif
 }
 
 
diff --git a/src/dep/src/irrlicht/CParticleAttractionAffector.h b/src/dep/src/irrlicht/CParticleAttractionAffector.h
index b3ab534..0c5edda 100644
--- a/src/dep/src/irrlicht/CParticleAttractionAffector.h
+++ b/src/dep/src/irrlicht/CParticleAttractionAffector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CParticleBoxEmitter.cpp b/src/dep/src/irrlicht/CParticleBoxEmitter.cpp
index 4bc18b7..86b8f17 100644
--- a/src/dep/src/irrlicht/CParticleBoxEmitter.cpp
+++ b/src/dep/src/irrlicht/CParticleBoxEmitter.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,30 +14,34 @@ namespace scene
 
 //! constructor
 CParticleBoxEmitter::CParticleBoxEmitter(
-	const core::aabbox3df& box,
-	const core::vector3df& direction, u32 minParticlesPerSecond,
-	u32 maxParticlesPerSecond,	video::SColor minStartColor,
-	video::SColor maxStartColor, u32 lifeTimeMin, u32 lifeTimeMax,
-	s32 maxAngleDegrees)
- : Box(box), Direction(direction), MinParticlesPerSecond(minParticlesPerSecond),
+	const core::aabbox3df& box, const core::vector3df& direction,
+	u32 minParticlesPerSecond, u32 maxParticlesPerSecond,
+	video::SColor minStartColor, video::SColor maxStartColor,
+	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees,
+	const core::dimension2df& minStartSize, const core::dimension2df& maxStartSize)
+ : Box(box), Direction(direction),
+	MaxStartSize(maxStartSize), MinStartSize(minStartSize),
+	MinParticlesPerSecond(minParticlesPerSecond),
 	MaxParticlesPerSecond(maxParticlesPerSecond),
 	MinStartColor(minStartColor), MaxStartColor(maxStartColor),
-	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), Time(0), Emitted(0),
-	MaxAngleDegrees(maxAngleDegrees)
+	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
+	Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)
 {
+	#ifdef _DEBUG
+	setDebugName("CParticleBoxEmitter");
+	#endif
 }
 
 
-
 //! Prepares an array with new particles to emitt into the system
 //! and returns how much new particles there are.
 s32 CParticleBoxEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray)
 {
 	Time += timeSinceLastCall;
 
-	u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
-	f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
-	f32 everyWhatMillisecond = 1000.0f / perSecond;
+	const u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
+	const f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
+	const f32 everyWhatMillisecond = 1000.0f / perSecond;
 
 	if (Time > everyWhatMillisecond)
 	{
@@ -62,9 +66,9 @@ s32 CParticleBoxEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outAr
 			if (MaxAngleDegrees)
 			{
 				core::vector3df tgt = Direction;
-				tgt.rotateXYBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df());
-				tgt.rotateYZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df());
-				tgt.rotateXZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df());
+				tgt.rotateXYBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
+				tgt.rotateYZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
+				tgt.rotateXZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
 				p.vector = tgt;
 			}
 
@@ -79,6 +83,13 @@ s32 CParticleBoxEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outAr
 			p.startColor = p.color;
 			p.startVector = p.vector;
 
+			if (MinStartSize==MaxStartSize)
+				p.startSize = MinStartSize;
+			else
+				p.startSize = MinStartSize.getInterpolated(
+					MaxStartSize, (os::Randomizer::rand() % 100) / 100.0f);
+			p.size = p.startSize;
+
 			Particles.push_back(p);
 		}
 
diff --git a/src/dep/src/irrlicht/CParticleBoxEmitter.h b/src/dep/src/irrlicht/CParticleBoxEmitter.h
index 79c4feb..052ee49 100644
--- a/src/dep/src/irrlicht/CParticleBoxEmitter.h
+++ b/src/dep/src/irrlicht/CParticleBoxEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -29,7 +29,10 @@ public:
 		video::SColor maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000,
 		u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0);
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) 
+		);
 
 	//! Prepares an array with new particles to emitt into the system
 	//! and returns how much new particles there are.
@@ -50,6 +53,12 @@ public:
 	//! Set maximum start color.
 	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
 
+	//! Set the maximum starting size for particles
+	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; };
+
+	//! Set the minimum starting size for particles
+	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; };
+
 	//! Set box from which the particles are emitted.
 	virtual void setBox( const core::aabbox3df& box ) { Box = box; }
 
@@ -68,6 +77,12 @@ public:
 	//! Gets maximum start color.
 	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
 
+	//! Gets the maximum starting size for particles
+	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; };
+
+	//! Gets the minimum starting size for particles
+	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; };
+
 	//! Get box from which the particles are emitted.
 	virtual const core::aabbox3df& getBox() const { return Box; }
 
@@ -82,6 +97,7 @@ private:
 	core::array<SParticle> Particles;
 	core::aabbox3df Box;
 	core::vector3df Direction;
+	core::dimension2df MaxStartSize, MinStartSize;
 	u32 MinParticlesPerSecond, MaxParticlesPerSecond;
 	video::SColor MinStartColor, MaxStartColor;
 	u32 MinLifeTime, MaxLifeTime;
diff --git a/src/dep/src/irrlicht/CParticleCylinderEmitter.cpp b/src/dep/src/irrlicht/CParticleCylinderEmitter.cpp
index 11c2fa4..095f447 100644
--- a/src/dep/src/irrlicht/CParticleCylinderEmitter.cpp
+++ b/src/dep/src/irrlicht/CParticleCylinderEmitter.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,14 +17,21 @@ CParticleCylinderEmitter::CParticleCylinderEmitter(
 	bool outlineOnly, const core::vector3df& direction,
 	u32 minParticlesPerSecond, u32 maxParticlesPerSecond,
 	const video::SColor& minStartColor, const video::SColor& maxStartColor,
-	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees)
-	: Center(center), Normal(normal), Radius(radius), Length(length), OutlineOnly( outlineOnly ),
-	Direction(direction), MinParticlesPerSecond(minParticlesPerSecond),
+	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees,
+	const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize )
+	: Center(center), Normal(normal), Direction(direction),
+	MaxStartSize(maxStartSize), MinStartSize(minStartSize),
+	MinParticlesPerSecond(minParticlesPerSecond),
 	MaxParticlesPerSecond(maxParticlesPerSecond),
 	MinStartColor(minStartColor), MaxStartColor(maxStartColor),
-	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), Time(0), Emitted(0),
-	MaxAngleDegrees(maxAngleDegrees)
+	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
+	Radius(radius), Length(length), Time(0), Emitted(0),
+	MaxAngleDegrees(maxAngleDegrees), OutlineOnly(outlineOnly)
 {
+	#ifdef _DEBUG
+	setDebugName("CParticleCylinderEmitter");
+	#endif
 }
 
 
@@ -34,9 +41,9 @@ s32 CParticleCylinderEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*&
 {
 	Time += timeSinceLastCall;
 
-	u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
-	f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
-	f32 everyWhatMillisecond = 1000.0f / perSecond;
+	const u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
+	const f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
+	const f32 everyWhatMillisecond = 1000.0f / perSecond;
 
 	if(Time > everyWhatMillisecond)
 	{
@@ -58,9 +65,7 @@ s32 CParticleCylinderEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*&
 				distance = Radius;
 
 			// Random direction from center
-			p.pos.X = Center.X + distance;
-			p.pos.Y = Center.Y;
-			p.pos.Z = Center.Z + distance;
+			p.pos.set(Center.X + distance, Center.Y, Center.Z + distance);
 			p.pos.rotateXZBy( os::Randomizer::rand() % 360, Center );
 
 			// Random length
@@ -92,6 +97,13 @@ s32 CParticleCylinderEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*&
 			p.startColor = p.color;
 			p.startVector = p.vector;
 
+			if (MinStartSize==MaxStartSize)
+				p.startSize = MinStartSize;
+			else
+				p.startSize = MinStartSize.getInterpolated(
+					MaxStartSize, (os::Randomizer::rand() % 100) / 100.0f);
+			p.size = p.startSize;
+
 			Particles.push_back(p);
 		}
 
diff --git a/src/dep/src/irrlicht/CParticleCylinderEmitter.h b/src/dep/src/irrlicht/CParticleCylinderEmitter.h
index 097c2e8..709aa56 100644
--- a/src/dep/src/irrlicht/CParticleCylinderEmitter.h
+++ b/src/dep/src/irrlicht/CParticleCylinderEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -29,7 +29,10 @@ public:
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000,
 		u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0);
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) 
+		);
 
 	//! Prepares an array with new particles to emitt into the system
 	//! and returns how much new particles there are.
@@ -65,6 +68,12 @@ public:
 	//! Set direction the emitter emits particles
 	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
 
+	//! Set the maximum starting size for particles
+	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; };
+
+	//! Set the minimum starting size for particles
+	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; };
+
 	//! Get the center of the cylinder
 	virtual const core::vector3df& getCenter() const { return Center; }
 
@@ -95,24 +104,32 @@ public:
 	//! Gets direction the emitter emits particles
 	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
 
+	//! Gets the maximum starting size for particles
+	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; };
+
+	//! Gets the minimum starting size for particles
+	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; };
+
 private:
 
 	core::array<SParticle> Particles;
 
 	core::vector3df	Center;
 	core::vector3df	Normal;
-	f32	Radius;
-	f32	Length;
-	bool OutlineOnly;
-
 	core::vector3df Direction;
+	core::dimension2df MaxStartSize, MinStartSize;
 	u32 MinParticlesPerSecond, MaxParticlesPerSecond;
 	video::SColor MinStartColor, MaxStartColor;
 	u32 MinLifeTime, MaxLifeTime;
 
+	f32 Radius;
+	f32 Length;
+
 	u32 Time;
 	u32 Emitted;
 	s32 MaxAngleDegrees;
+
+	bool OutlineOnly;
 };
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CParticleFadeOutAffector.cpp b/src/dep/src/irrlicht/CParticleFadeOutAffector.cpp
index ffebb58..87c3897 100644
--- a/src/dep/src/irrlicht/CParticleFadeOutAffector.cpp
+++ b/src/dep/src/irrlicht/CParticleFadeOutAffector.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,6 +16,11 @@ CParticleFadeOutAffector::CParticleFadeOutAffector(
 	const video::SColor& targetColor, u32 fadeOutTime)
 	: IParticleFadeOutAffector(), TargetColor(targetColor)
 {
+
+	#ifdef _DEBUG
+	setDebugName("CParticleFadeOutAffector");
+	#endif
+
 	FadeOutTime = fadeOutTime ? static_cast<f32>(fadeOutTime) : 1.0f;
 }
 
diff --git a/src/dep/src/irrlicht/CParticleFadeOutAffector.h b/src/dep/src/irrlicht/CParticleFadeOutAffector.h
index 6260c16..9db8af4 100644
--- a/src/dep/src/irrlicht/CParticleFadeOutAffector.h
+++ b/src/dep/src/irrlicht/CParticleFadeOutAffector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CParticleGravityAffector.cpp b/src/dep/src/irrlicht/CParticleGravityAffector.cpp
index f4b18a2..295677c 100644
--- a/src/dep/src/irrlicht/CParticleGravityAffector.cpp
+++ b/src/dep/src/irrlicht/CParticleGravityAffector.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,6 +16,9 @@ CParticleGravityAffector::CParticleGravityAffector(
 	const core::vector3df& gravity, u32 timeForceLost)
 	: IParticleGravityAffector(), TimeForceLost(static_cast<f32>(timeForceLost)), Gravity(gravity)
 {
+	#ifdef _DEBUG
+	setDebugName("CParticleGravityAffector");
+	#endif
 }
 
 
diff --git a/src/dep/src/irrlicht/CParticleGravityAffector.h b/src/dep/src/irrlicht/CParticleGravityAffector.h
index bed10f1..1ab67a0 100644
--- a/src/dep/src/irrlicht/CParticleGravityAffector.h
+++ b/src/dep/src/irrlicht/CParticleGravityAffector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CParticleMeshEmitter.cpp b/src/dep/src/irrlicht/CParticleMeshEmitter.cpp
index c9dfcaf..2f67355 100644
--- a/src/dep/src/irrlicht/CParticleMeshEmitter.cpp
+++ b/src/dep/src/irrlicht/CParticleMeshEmitter.cpp
@@ -1,11 +1,10 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "IrrCompileConfig.h"
 #include "CParticleMeshEmitter.h"
 #include "os.h"
-#include <math.h>
 
 namespace irr
 {
@@ -19,21 +18,22 @@ CParticleMeshEmitter::CParticleMeshEmitter(
 	s32 mbNumber, bool everyMeshVertex,
 	u32 minParticlesPerSecond, u32 maxParticlesPerSecond,
 	const video::SColor& minStartColor, const video::SColor& maxStartColor,
-	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees )
-	: Mesh(mesh), TotalVertices(0), MBCount(0), MBNumber(mbNumber),
-	EveryMeshVertex(everyMeshVertex), UseNormalDirection(useNormalDirection),
+	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees,
+	const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize )
+	: Mesh(0), TotalVertices(0), MBCount(0), MBNumber(mbNumber),
 	NormalDirectionModifier(normalDirectionModifier), Direction(direction),
+	MaxStartSize(maxStartSize), MinStartSize(minStartSize),
 	MinParticlesPerSecond(minParticlesPerSecond), MaxParticlesPerSecond(maxParticlesPerSecond),
 	MinStartColor(minStartColor), MaxStartColor(maxStartColor),
 	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
-	Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)
+	Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees),
+	EveryMeshVertex(everyMeshVertex), UseNormalDirection(useNormalDirection)
 {
-	MBCount = Mesh->getMeshBufferCount();
-	for( u32 i = 0; i < MBCount; ++i )
-	{
-		VertexPerMeshBufferList.push_back( Mesh->getMeshBuffer(i)->getVertexCount() );
-		TotalVertices += Mesh->getMeshBuffer(i)->getVertexCount();
-	}
+	#ifdef _DEBUG
+	setDebugName("CParticleMeshEmitter");
+	#endif
+	setMesh(mesh);
 }
 
 
@@ -43,9 +43,9 @@ s32 CParticleMeshEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outA
 {
 	Time += timeSinceLastCall;
 
-	u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
-	f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
-	f32 everyWhatMillisecond = 1000.0f / perSecond;
+	const u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
+	const f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
+	const f32 everyWhatMillisecond = 1000.0f / perSecond;
 
 	if(Time > everyWhatMillisecond)
 	{
@@ -65,23 +65,12 @@ s32 CParticleMeshEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outA
 				{
 					for( u32 k=0; k<Mesh->getMeshBuffer(j)->getVertexCount(); ++k )
 					{
-						switch( Mesh->getMeshBuffer(j)->getVertexType() )
-						{
-						case video::EVT_STANDARD:
-							p.pos = ((video::S3DVertex*)Mesh->getMeshBuffer(j)->getVertices())[k].Pos;
-							if( UseNormalDirection )
-								p.vector = ((video::S3DVertex*)Mesh->getMeshBuffer(j)->getVertices())[k].Normal / NormalDirectionModifier;
-							else
-								p.vector = Direction;
-							break;
-						case video::EVT_TANGENTS:
-							p.pos = ((video::S3DVertexTangents*)Mesh->getMeshBuffer(j)->getVertices())[k].Pos;
-							if( UseNormalDirection )
-								p.vector = ((video::S3DVertexTangents*)Mesh->getMeshBuffer(j)->getVertices())[k].Normal / NormalDirectionModifier;
-							else
-								p.vector = Direction;
-							break;
-						}
+						p.pos = Mesh->getMeshBuffer(j)->getPosition(k);
+						if( UseNormalDirection )
+							p.vector = Mesh->getMeshBuffer(j)->getNormal(k) /
+								NormalDirectionModifier;
+						else
+							p.vector = Direction;
 
 						p.startTime = now;
 
@@ -105,6 +94,13 @@ s32 CParticleMeshEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outA
 						p.startColor = p.color;
 						p.startVector = p.vector;
 
+						if (MinStartSize==MaxStartSize)
+							p.startSize = MinStartSize;
+						else
+							p.startSize = MinStartSize.getInterpolated(
+								MaxStartSize, (os::Randomizer::rand() % 100) / 100.0f);
+						p.size = p.startSize;
+
 						Particles.push_back(p);
 					}
 				}
@@ -122,25 +118,17 @@ s32 CParticleMeshEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outA
 					randomMB = MBNumber;
 				}
 
-				u32 vertexNumber = os::Randomizer::rand() % Mesh->getMeshBuffer(randomMB)->getVertexCount();
+				u32 vertexNumber = Mesh->getMeshBuffer(randomMB)->getVertexCount();
+				if (!vertexNumber)
+					continue;
+				vertexNumber = os::Randomizer::rand() % vertexNumber;
 
-				switch( Mesh->getMeshBuffer(randomMB)->getVertexType() )
-				{
-				case video::EVT_STANDARD:
-					p.pos = ((video::S3DVertex*)Mesh->getMeshBuffer(randomMB)->getVertices())[vertexNumber].Pos;
-					if( UseNormalDirection )
-						p.vector = ((video::S3DVertex*)Mesh->getMeshBuffer(randomMB)->getVertices())[vertexNumber].Normal / NormalDirectionModifier;
-					else
-						p.vector = Direction;
-					break;
-				case video::EVT_TANGENTS:
-					p.pos = ((video::S3DVertexTangents*)Mesh->getMeshBuffer(randomMB)->getVertices())[vertexNumber].Pos;
-					if( UseNormalDirection )
-						p.vector = ((video::S3DVertexTangents*)Mesh->getMeshBuffer(randomMB)->getVertices())[vertexNumber].Normal / NormalDirectionModifier;
-					else
-						p.vector = Direction;
-					break;
-				}
+				p.pos = Mesh->getMeshBuffer(randomMB)->getPosition(vertexNumber);
+				if( UseNormalDirection )
+					p.vector = Mesh->getMeshBuffer(randomMB)->getNormal(vertexNumber) /
+							NormalDirectionModifier;
+				else
+					p.vector = Direction;
 
 				p.startTime = now;
 
@@ -164,6 +152,13 @@ s32 CParticleMeshEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outA
 				p.startColor = p.color;
 				p.startVector = p.vector;
 
+				if (MinStartSize==MaxStartSize)
+					p.startSize = MinStartSize;
+				else
+					p.startSize = MinStartSize.getInterpolated(
+						MaxStartSize, (os::Randomizer::rand() % 100) / 100.0f);
+				p.size = p.startSize;
+
 				Particles.push_back(p);
 			}
 		}
@@ -176,13 +171,15 @@ s32 CParticleMeshEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outA
 	return 0;
 }
 
+
 //! Set Mesh to emit particles from
-void CParticleMeshEmitter::setMesh( IMesh* mesh )
+void CParticleMeshEmitter::setMesh(IMesh* mesh)
 {
 	Mesh = mesh;
 
 	TotalVertices = 0;
 	MBCount = Mesh->getMeshBufferCount();
+	VertexPerMeshBufferList.reallocate(MBCount);
 	for( u32 i = 0; i < MBCount; ++i )
 	{
 		VertexPerMeshBufferList.push_back( Mesh->getMeshBuffer(i)->getVertexCount() );
diff --git a/src/dep/src/irrlicht/CParticleMeshEmitter.h b/src/dep/src/irrlicht/CParticleMeshEmitter.h
index 83a1593..3cbb4f3 100644
--- a/src/dep/src/irrlicht/CParticleMeshEmitter.h
+++ b/src/dep/src/irrlicht/CParticleMeshEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -33,7 +33,9 @@ public:
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin = 2000,
 		u32 lifeTimeMax = 4000,
-		s32 maxAngleDegrees = 0
+		s32 maxAngleDegrees = 0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f)
 	);
 
 	//! Prepares an array with new particles to emitt into the system
@@ -68,6 +70,12 @@ public:
 	//! Set maximum starting color for particles
 	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
 
+	//! Set the maximum starting size for particles
+	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; };
+
+	//! Set the minimum starting size for particles
+	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; };
+
 	//! Get Mesh we're emitting particles from
 	virtual const IMesh* getMesh() const { return Mesh; }
 
@@ -96,19 +104,24 @@ public:
 	//! Get the maximum starting color for particles
 	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
 
+	//! Gets the maximum starting size for particles
+	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; };
+
+	//! Gets the minimum starting size for particles
+	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; };
+
 private:
 
 	const IMesh* Mesh;
+	core::array<s32>	VertexPerMeshBufferList;
 	s32 TotalVertices;
 	u32 MBCount;
 	s32 MBNumber;
-	core::array<s32>	VertexPerMeshBufferList;
 
-	bool EveryMeshVertex;
-	bool UseNormalDirection;
 	f32 NormalDirectionModifier;
 	core::array<SParticle> Particles;
 	core::vector3df Direction;
+	core::dimension2df MaxStartSize, MinStartSize;
 	u32 MinParticlesPerSecond, MaxParticlesPerSecond;
 	video::SColor MinStartColor, MaxStartColor;
 	u32 MinLifeTime, MaxLifeTime;
@@ -116,6 +129,9 @@ private:
 	u32 Time;
 	u32 Emitted;
 	s32 MaxAngleDegrees;
+
+	bool EveryMeshVertex;
+	bool UseNormalDirection;
 };
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CParticlePointEmitter.cpp b/src/dep/src/irrlicht/CParticlePointEmitter.cpp
index 56a4bc1..889076b 100644
--- a/src/dep/src/irrlicht/CParticlePointEmitter.cpp
+++ b/src/dep/src/irrlicht/CParticlePointEmitter.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,27 +16,32 @@ CParticlePointEmitter::CParticlePointEmitter(
 	const core::vector3df& direction, u32 minParticlesPerSecond,
 	u32 maxParticlesPerSecond, video::SColor minStartColor,
 	video::SColor maxStartColor, u32 lifeTimeMin, u32 lifeTimeMax,
-	s32 maxAngleDegrees)
- : Direction(direction), MinParticlesPerSecond(minParticlesPerSecond),
+	s32 maxAngleDegrees,
+	const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize)
+ : Direction(direction),
+	MinStartSize(minStartSize), MaxStartSize(maxStartSize),
+	MinParticlesPerSecond(minParticlesPerSecond),
 	MaxParticlesPerSecond(maxParticlesPerSecond),
 	MinStartColor(minStartColor), MaxStartColor(maxStartColor),
 	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
 	MaxAngleDegrees(maxAngleDegrees), Time(0), Emitted(0)
 {
-
+	#ifdef _DEBUG
+	setDebugName("CParticlePointEmitter");
+	#endif
 }
 
 
-
 //! Prepares an array with new particles to emitt into the system
 //! and returns how much new particles there are.
 s32 CParticlePointEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray)
 {
 	Time += timeSinceLastCall;
 
-	u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
-	f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
-	f32 everyWhatMillisecond = 1000.0f / perSecond;
+	const u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
+	const f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
+	const f32 everyWhatMillisecond = 1000.0f / perSecond;
 
 	if (Time > everyWhatMillisecond)
 	{
@@ -47,9 +52,9 @@ s32 CParticlePointEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& out
 		if (MaxAngleDegrees)
 		{
 			core::vector3df tgt = Direction;
-			tgt.rotateXYBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df(0,0,0));
-			tgt.rotateYZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df(0,0,0));
-			tgt.rotateXZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df(0,0,0));
+			tgt.rotateXYBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
+			tgt.rotateYZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
+			tgt.rotateXZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
 			Particle.vector = tgt;
 		}
 
@@ -63,6 +68,14 @@ s32 CParticlePointEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& out
 
 		Particle.startColor = Particle.color;
 		Particle.startVector = Particle.vector;
+
+		if (MinStartSize==MaxStartSize)
+			Particle.startSize = MinStartSize;
+		else
+			Particle.startSize = MinStartSize.getInterpolated(
+				MaxStartSize, (os::Randomizer::rand() % 100) / 100.0f);
+		Particle.size = Particle.startSize;
+
 		outArray = &Particle;
 		return 1;
 	}
diff --git a/src/dep/src/irrlicht/CParticlePointEmitter.h b/src/dep/src/irrlicht/CParticlePointEmitter.h
index fde6cc3..ae436ae 100644
--- a/src/dep/src/irrlicht/CParticlePointEmitter.h
+++ b/src/dep/src/irrlicht/CParticlePointEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -27,7 +27,9 @@ public:
 		video::SColor maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000,
 		u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0);
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
 
 	//! Prepares an array with new particles to emitt into the system
 	//! and returns how much new particles there are.
@@ -48,6 +50,12 @@ public:
 	//! Set maximum start color.
 	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
 
+	//! Set the maximum starting size for particles
+	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; };
+
+	//! Set the minimum starting size for particles
+	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; };
+
 	//! Gets direction the emitter emits particles.
 	virtual const core::vector3df& getDirection() const { return Direction; }
 
@@ -63,6 +71,12 @@ public:
 	//! Gets maximum start color.
 	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
 
+	//! Gets the maximum starting size for particles
+	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; };
+
+	//! Gets the minimum starting size for particles
+	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; };
+
 	//! Writes attributes of the object.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;
 
@@ -73,6 +87,7 @@ private:
 
 	SParticle Particle;
 	core::vector3df Direction;
+	core::dimension2df MinStartSize, MaxStartSize;
 	u32 MinParticlesPerSecond, MaxParticlesPerSecond;
 	video::SColor MinStartColor, MaxStartColor;
 	u32 MinLifeTime, MaxLifeTime;
diff --git a/src/dep/src/irrlicht/CParticleRingEmitter.cpp b/src/dep/src/irrlicht/CParticleRingEmitter.cpp
index 408c08e..e424f94 100644
--- a/src/dep/src/irrlicht/CParticleRingEmitter.cpp
+++ b/src/dep/src/irrlicht/CParticleRingEmitter.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,13 +16,21 @@ CParticleRingEmitter::CParticleRingEmitter(
 	const core::vector3df& direction, u32 minParticlesPerSecond,
 	u32 maxParticlesPerSecond, const video::SColor& minStartColor,
 	const video::SColor& maxStartColor, u32 lifeTimeMin, u32 lifeTimeMax,
-	s32 maxAngleDegrees)
+	s32 maxAngleDegrees,
+	const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize )
 	: Center(center), Radius(radius), RingThickness(ringThickness),
-		Direction(direction), MinParticlesPerSecond(minParticlesPerSecond),
-		MaxParticlesPerSecond(maxParticlesPerSecond), MinStartColor(minStartColor),
-		MaxStartColor(maxStartColor), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
+		Direction(direction),
+		MaxStartSize(maxStartSize), MinStartSize(minStartSize),
+		MinParticlesPerSecond(minParticlesPerSecond),
+		MaxParticlesPerSecond(maxParticlesPerSecond),
+		MinStartColor(minStartColor), MaxStartColor(maxStartColor),
+		MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
 		Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)
 {
+	#ifdef _DEBUG
+	setDebugName("CParticleRingEmitter");
+	#endif
 }
 
 
@@ -54,10 +62,7 @@ s32 CParticleRingEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outA
 				distance *= -1.0f;
 			distance += Radius;
 
-			p.pos.X = Center.X + distance;
-			p.pos.Y = Center.Y;
-			p.pos.Z = Center.Z + distance;
-
+			p.pos.set(Center.X + distance, Center.Y, Center.Z + distance);
 			p.pos.rotateXZBy( ( os::Randomizer::rand() % 3600 ) * 0.1f, Center );
 
 			p.startTime = now;
@@ -83,6 +88,13 @@ s32 CParticleRingEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outA
 			p.startColor = p.color;
 			p.startVector = p.vector;
 
+			if (MinStartSize==MaxStartSize)
+				p.startSize = MinStartSize;
+			else
+				p.startSize = MinStartSize.getInterpolated(
+					MaxStartSize, (os::Randomizer::rand() % 100) / 100.0f);
+			p.size = p.startSize;
+
 			Particles.push_back(p);
 		}
 
diff --git a/src/dep/src/irrlicht/CParticleRingEmitter.h b/src/dep/src/irrlicht/CParticleRingEmitter.h
index 5ab0fc2..21451e9 100644
--- a/src/dep/src/irrlicht/CParticleRingEmitter.h
+++ b/src/dep/src/irrlicht/CParticleRingEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -28,7 +28,10 @@ public:
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000,
 		u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0);
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f)
+		);
 
 	//! Prepares an array with new particles to emitt into the system
 	//! and returns how much new particles there are.
@@ -49,6 +52,12 @@ public:
 	//! Set maximum starting color for particles
 	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
 
+	//! Set the maximum starting size for particles
+	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; };
+
+	//! Set the minimum starting size for particles
+	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; };
+
 	//! Set the center of the ring
 	virtual void setCenter( const core::vector3df& center ) { Center = center; }
 
@@ -73,6 +82,12 @@ public:
 	//! Gets the maximum starting color for particles
 	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
 
+	//! Gets the maximum starting size for particles
+	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; };
+
+	//! Gets the minimum starting size for particles
+	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; };
+
 	//! Get the center of the ring
 	virtual const core::vector3df& getCenter() const { return Center; }
 
@@ -91,6 +106,7 @@ private:
 	f32 RingThickness;
 
 	core::vector3df Direction;
+	core::dimension2df MaxStartSize, MinStartSize;
 	u32 MinParticlesPerSecond, MaxParticlesPerSecond;
 	video::SColor MinStartColor, MaxStartColor;
 	u32 MinLifeTime, MaxLifeTime;
@@ -98,9 +114,6 @@ private:
 	u32 Time;
 	u32 Emitted;
 	s32 MaxAngleDegrees;
-
-	f32 MinimumDistance;
-	f32 MaximumDistance;
 };
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CParticleRotationAffector.cpp b/src/dep/src/irrlicht/CParticleRotationAffector.cpp
index 51808e1..90a1594 100644
--- a/src/dep/src/irrlicht/CParticleRotationAffector.cpp
+++ b/src/dep/src/irrlicht/CParticleRotationAffector.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,6 +13,9 @@ namespace scene
 CParticleRotationAffector::CParticleRotationAffector( const core::vector3df& speed, const core::vector3df& pivotPoint )
 		: PivotPoint(pivotPoint), Speed(speed), LastTime(0)
 {
+	#ifdef _DEBUG
+	setDebugName("CParticleRotationAffector");
+	#endif
 }
 
 
diff --git a/src/dep/src/irrlicht/CParticleRotationAffector.h b/src/dep/src/irrlicht/CParticleRotationAffector.h
index 6dfbb31..68fc81a 100644
--- a/src/dep/src/irrlicht/CParticleRotationAffector.h
+++ b/src/dep/src/irrlicht/CParticleRotationAffector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CParticleSphereEmitter.cpp b/src/dep/src/irrlicht/CParticleSphereEmitter.cpp
index c145eda..5fefe7d 100644
--- a/src/dep/src/irrlicht/CParticleSphereEmitter.cpp
+++ b/src/dep/src/irrlicht/CParticleSphereEmitter.cpp
@@ -1,11 +1,10 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "IrrCompileConfig.h"
 #include "CParticleSphereEmitter.h"
 #include "os.h"
-#include <math.h>
 
 namespace irr
 {
@@ -18,13 +17,21 @@ CParticleSphereEmitter::CParticleSphereEmitter(
 	const core::vector3df& direction, u32 minParticlesPerSecond,
 	u32 maxParticlesPerSecond, const video::SColor& minStartColor,
 	const video::SColor& maxStartColor, u32 lifeTimeMin, u32 lifeTimeMax,
-	s32 maxAngleDegrees)
-	: Center(center), Radius(radius), Direction(direction), MinParticlesPerSecond(minParticlesPerSecond),
+	s32 maxAngleDegrees,
+	const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize )
+	: Center(center), Radius(radius), Direction(direction),
+	MinStartSize(minStartSize), MaxStartSize(maxStartSize),
+	MinParticlesPerSecond(minParticlesPerSecond),
 	MaxParticlesPerSecond(maxParticlesPerSecond),
 	MinStartColor(minStartColor), MaxStartColor(maxStartColor),
-	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), Time(0), Emitted(0),
-	MaxAngleDegrees(maxAngleDegrees)
+	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
+	Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)
 {
+	#ifdef _DEBUG
+	setDebugName("CParticleSphereEmitter");
+	#endif
+
 }
 
 
@@ -34,9 +41,9 @@ s32 CParticleSphereEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& ou
 {
 	Time += timeSinceLastCall;
 
-	u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
-	f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
-	f32 everyWhatMillisecond = 1000.0f / perSecond;
+	const u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
+	const f32 perSecond = pps ? (f32)MinParticlesPerSecond + (os::Randomizer::rand() % pps) : MinParticlesPerSecond;
+	const f32 everyWhatMillisecond = 1000.0f / perSecond;
 
 	if(Time > everyWhatMillisecond)
 	{
@@ -54,9 +61,7 @@ s32 CParticleSphereEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& ou
 			f32 distance = fmodf( (f32)os::Randomizer::rand(), Radius * 1000.0f ) * 0.001f;
 
 			// Random direction from center
-			p.pos.X = Center.X + distance;
-			p.pos.Y = Center.Y + distance;
-			p.pos.Z = Center.Z + distance;
+			p.pos.set(Center + distance);
 			p.pos.rotateXYBy( os::Randomizer::rand() % 360, Center );
 			p.pos.rotateYZBy( os::Randomizer::rand() % 360, Center );
 			p.pos.rotateXZBy( os::Randomizer::rand() % 360, Center );
@@ -67,9 +72,9 @@ s32 CParticleSphereEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& ou
 			if(MaxAngleDegrees)
 			{
 				core::vector3df tgt = Direction;
-				tgt.rotateXYBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df());
-				tgt.rotateYZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df());
-				tgt.rotateXZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees, core::vector3df());
+				tgt.rotateXYBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
+				tgt.rotateYZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
+				tgt.rotateXZBy((os::Randomizer::rand()%(MaxAngleDegrees*2)) - MaxAngleDegrees);
 				p.vector = tgt;
 			}
 
@@ -84,6 +89,13 @@ s32 CParticleSphereEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& ou
 			p.startColor = p.color;
 			p.startVector = p.vector;
 
+			if (MinStartSize==MaxStartSize)
+				p.startSize = MinStartSize;
+			else
+				p.startSize = MinStartSize.getInterpolated(
+					MaxStartSize, (os::Randomizer::rand() % 100) / 100.0f);
+			p.size = p.startSize;
+
 			Particles.push_back(p);
 		}
 
diff --git a/src/dep/src/irrlicht/CParticleSphereEmitter.h b/src/dep/src/irrlicht/CParticleSphereEmitter.h
index 29368a8..7618d0b 100644
--- a/src/dep/src/irrlicht/CParticleSphereEmitter.h
+++ b/src/dep/src/irrlicht/CParticleSphereEmitter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -29,7 +29,9 @@ public:
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000,
 		u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0);
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
 
 	//! Prepares an array with new particles to emitt into the system
 	//! and returns how much new particles there are.
@@ -50,6 +52,12 @@ public:
 	//! Set maximum start color
 	virtual void setMaxStartColor( const video::SColor& color ) { MaxStartColor = color; }
 
+	//! Set the maximum starting size for particles
+	virtual void setMaxStartSize( const core::dimension2df& size ) { MaxStartSize = size; };
+
+	//! Set the minimum starting size for particles
+	virtual void setMinStartSize( const core::dimension2df& size ) { MinStartSize = size; };
+
 	//! Set the center of the sphere for particle emissions
 	virtual void setCenter( const core::vector3df& center ) { Center = center; }
 
@@ -71,6 +79,12 @@ public:
 	//! Get maximum start color
 	virtual const video::SColor& getMaxStartColor() const { return MaxStartColor; }
 
+	//! Gets the maximum starting size for particles
+	virtual const core::dimension2df& getMaxStartSize() const { return MaxStartSize; };
+
+	//! Gets the minimum starting size for particles
+	virtual const core::dimension2df& getMinStartSize() const { return MinStartSize; };
+
 	//! Get the center of the sphere for particle emissions
 	virtual const core::vector3df& getCenter() const { return Center; }
 
@@ -83,8 +97,9 @@ private:
 
 	core::vector3df	Center;
 	f32 Radius;
-
 	core::vector3df Direction;
+
+	core::dimension2df MinStartSize, MaxStartSize;
 	u32 MinParticlesPerSecond, MaxParticlesPerSecond;
 	video::SColor MinStartColor, MaxStartColor;
 	u32 MinLifeTime, MaxLifeTime;
diff --git a/src/dep/src/irrlicht/CParticleSystemSceneNode.cpp b/src/dep/src/irrlicht/CParticleSystemSceneNode.cpp
index dd3706d..984c8a3 100644
--- a/src/dep/src/irrlicht/CParticleSystemSceneNode.cpp
+++ b/src/dep/src/irrlicht/CParticleSystemSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,6 +19,7 @@
 #include "CParticleFadeOutAffector.h"
 #include "CParticleGravityAffector.h"
 #include "CParticleRotationAffector.h"
+#include "CParticleScaleAffector.h"
 #include "SViewFrustum.h"
 
 namespace irr
@@ -32,34 +33,41 @@ CParticleSystemSceneNode::CParticleSystemSceneNode(bool createDefaultEmitter,
 	const core::vector3df& position, const core::vector3df& rotation,
 	const core::vector3df& scale)
 	: IParticleSystemSceneNode(parent, mgr, id, position, rotation, scale),
-	Emitter(0), LastEmitTime(0), ParticlesAreGlobal(true)
+	Emitter(0), ParticleSize(core::dimension2d<f32>(5.0f, 5.0f)), LastEmitTime(0),
+	MaxParticles(0xffff), Buffer(0), ParticlesAreGlobal(true)
 {
 	#ifdef _DEBUG
 	setDebugName("CParticleSystemSceneNode");
 	#endif
 
+	Buffer = new SMeshBuffer();
 	if (createDefaultEmitter)
 	{
 		IParticleEmitter* e = createBoxEmitter();
 		setEmitter(e);
 		e->drop();
 	}
-
-	setParticleSize();
 }
 
 
-
 //! destructor
 CParticleSystemSceneNode::~CParticleSystemSceneNode()
 {
 	if (Emitter)
 		Emitter->drop();
+	if (Buffer)
+		Buffer->drop();
 
 	removeAllAffectors();
 }
 
 
+//! Gets the particle emitter, which creates the particles.
+IParticleEmitter* CParticleSystemSceneNode::getEmitter()
+{
+	return Emitter;
+}
+
 
 //! Sets the particle emitter, which creates the particles.
 void CParticleSystemSceneNode::setEmitter(IParticleEmitter* emitter)
@@ -74,7 +82,6 @@ void CParticleSystemSceneNode::setEmitter(IParticleEmitter* emitter)
 }
 
 
-
 //! Adds new particle effector to the particle system.
 void CParticleSystemSceneNode::addAffector(IParticleAffector* affector)
 {
@@ -83,7 +90,6 @@ void CParticleSystemSceneNode::addAffector(IParticleAffector* affector)
 }
 
 
-
 //! Removes all particle affectors in the particle system.
 void CParticleSystemSceneNode::removeAllAffectors()
 {
@@ -99,11 +105,10 @@ void CParticleSystemSceneNode::removeAllAffectors()
 //! Returns the material based on the zero based index i.
 video::SMaterial& CParticleSystemSceneNode::getMaterial(u32 i)
 {
-	return Buffer.Material;
+	return Buffer->Material;
 }
 
 
-
 //! Returns amount of materials used by this scene node.
 u32 CParticleSystemSceneNode::getMaterialCount() const
 {
@@ -119,29 +124,33 @@ CParticleSystemSceneNode::createAnimatedMeshSceneNodeEmitter(
 	s32 mbNumber, bool everyMeshVertex,
 	u32 minParticlesPerSecond, u32 maxParticlesPerSecond,
 	const video::SColor& minStartColor, const video::SColor& maxStartColor,
-	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees )
+	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees,
+	const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize )
 {
 	return new CParticleAnimatedMeshSceneNodeEmitter( node,
 			useNormalDirection, direction, normalDirectionModifier,
 			mbNumber, everyMeshVertex,
 			minParticlesPerSecond, maxParticlesPerSecond,
 			minStartColor, maxStartColor,
-			lifeTimeMin, lifeTimeMax, maxAngleDegrees );
+			lifeTimeMin, lifeTimeMax, maxAngleDegrees,
+			minStartSize, maxStartSize );
 }
 
 
-
 //! Creates a box particle emitter.
 IParticleBoxEmitter* CParticleSystemSceneNode::createBoxEmitter(
 	const core::aabbox3df& box, const core::vector3df& direction,
 	u32 minParticlesPerSecond, u32 maxParticlesPerSecond,
 	const video::SColor& minStartColor, const video::SColor& maxStartColor,
 	u32 lifeTimeMin, u32 lifeTimeMax,
-	s32 maxAngleDegrees)
+	s32 maxAngleDegrees, const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize )
 {
 	return new CParticleBoxEmitter(box, direction, minParticlesPerSecond,
 		maxParticlesPerSecond, minStartColor, maxStartColor,
-		lifeTimeMin, lifeTimeMax, maxAngleDegrees);
+		lifeTimeMin, lifeTimeMax, maxAngleDegrees,
+			minStartSize, maxStartSize );
 }
 
 
@@ -152,13 +161,16 @@ IParticleCylinderEmitter* CParticleSystemSceneNode::createCylinderEmitter(
 	bool outlineOnly, const core::vector3df& direction,
 	u32 minParticlesPerSecond, u32 maxParticlesPerSecond,
 	const video::SColor& minStartColor, const video::SColor& maxStartColor,
-	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees )
+	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees, 
+	const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize )
 {
 	return new CParticleCylinderEmitter( center, radius, normal, length,
 			outlineOnly, direction,
 			minParticlesPerSecond, maxParticlesPerSecond,
 			minStartColor, maxStartColor,
-			lifeTimeMin, lifeTimeMax, maxAngleDegrees );
+			lifeTimeMin, lifeTimeMax, maxAngleDegrees,
+			minStartSize, maxStartSize );
 }
 
 
@@ -169,27 +181,31 @@ IParticleMeshEmitter* CParticleSystemSceneNode::createMeshEmitter(
 	s32 mbNumber, bool everyMeshVertex,
 	u32 minParticlesPerSecond, u32 maxParticlesPerSecond,
 	const video::SColor& minStartColor, const video::SColor& maxStartColor,
-	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees )
+	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees,
+	const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize)
 {
 	return new CParticleMeshEmitter( mesh, useNormalDirection, direction,
 			normalDirectionModifier, mbNumber, everyMeshVertex,
 			minParticlesPerSecond, maxParticlesPerSecond,
 			minStartColor, maxStartColor,
-			lifeTimeMin, lifeTimeMax, maxAngleDegrees );
+			lifeTimeMin, lifeTimeMax, maxAngleDegrees,
+			minStartSize, maxStartSize );
 }
 
 
-
 //! Creates a point particle emitter.
 IParticlePointEmitter* CParticleSystemSceneNode::createPointEmitter(
 	const core::vector3df& direction, u32 minParticlesPerSecond,
 	u32 maxParticlesPerSecond, const video::SColor& minStartColor,
 	const video::SColor& maxStartColor, u32 lifeTimeMin, u32 lifeTimeMax,
-	s32 maxAngleDegrees)
+	s32 maxAngleDegrees, const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize )
 {
 	return new CParticlePointEmitter(direction, minParticlesPerSecond,
 		maxParticlesPerSecond, minStartColor, maxStartColor,
-		lifeTimeMin, lifeTimeMax, maxAngleDegrees);
+		lifeTimeMin, lifeTimeMax, maxAngleDegrees,
+			minStartSize, maxStartSize );
 }
 
 
@@ -199,11 +215,13 @@ IParticleRingEmitter* CParticleSystemSceneNode::createRingEmitter(
 	const core::vector3df& direction,
 	u32 minParticlesPerSecond, u32 maxParticlesPerSecond,
 	const video::SColor& minStartColor, const video::SColor& maxStartColor,
-	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees )
+	u32 lifeTimeMin, u32 lifeTimeMax, s32 maxAngleDegrees,
+	const core::dimension2df& minStartSize, const core::dimension2df& maxStartSize )
 {
 	return new CParticleRingEmitter( center, radius, ringThickness, direction,
 		minParticlesPerSecond, maxParticlesPerSecond, minStartColor,
-		maxStartColor, lifeTimeMin, lifeTimeMax, maxAngleDegrees );
+		maxStartColor, lifeTimeMin, lifeTimeMax, maxAngleDegrees,
+			minStartSize, maxStartSize );
 }
 
 
@@ -213,16 +231,17 @@ IParticleSphereEmitter* CParticleSystemSceneNode::createSphereEmitter(
 	u32 minParticlesPerSecond, u32 maxParticlesPerSecond,
 	const video::SColor& minStartColor, const video::SColor& maxStartColor,
 	u32 lifeTimeMin, u32 lifeTimeMax,
-	s32 maxAngleDegrees)
+	s32 maxAngleDegrees, const core::dimension2df& minStartSize,
+	const core::dimension2df& maxStartSize )
 {
 	return new CParticleSphereEmitter(center, radius, direction,
 			minParticlesPerSecond, maxParticlesPerSecond,
 			minStartColor, maxStartColor,
-			lifeTimeMin, lifeTimeMax, maxAngleDegrees);
+			lifeTimeMin, lifeTimeMax, maxAngleDegrees,
+			minStartSize, maxStartSize );
 }
 
 
-
 //! Creates a point attraction affector. This affector modifies the positions of the
 //! particles and attracts them to a specified point at a specified speed per second.
 IParticleAttractionAffector* CParticleSystemSceneNode::createAttractionAffector(
@@ -232,6 +251,12 @@ IParticleAttractionAffector* CParticleSystemSceneNode::createAttractionAffector(
 	return new CParticleAttractionAffector( point, speed, attract, affectX, affectY, affectZ );
 }
 
+//! Creates a scale particle affector.
+IParticleAffector* CParticleSystemSceneNode::createScaleParticleAffector(const core::dimension2df& scaleTo)
+{
+	return new CParticleScaleAffector(scaleTo);
+}
+
 
 //! Creates a fade out particle affector.
 IParticleFadeOutAffector* CParticleSystemSceneNode::createFadeOutParticleAffector(
@@ -258,7 +283,6 @@ IParticleRotationAffector* CParticleSystemSceneNode::createRotationAffector(
 }
 
 
-
 //! pre render event
 void CParticleSystemSceneNode::OnRegisterSceneNode()
 {
@@ -272,7 +296,6 @@ void CParticleSystemSceneNode::OnRegisterSceneNode()
 }
 
 
-
 //! render
 void CParticleSystemSceneNode::render()
 {
@@ -288,28 +311,12 @@ void CParticleSystemSceneNode::render()
 	core::vector3df view(camera->getTarget() - camera->getAbsolutePosition());
 	view.normalize();
 
-	core::vector3df horizontal = camera->getUpVector().crossProduct(view);
-	horizontal.normalize();
-	horizontal *= 0.5f * ParticleSize.Width;
-
-	core::vector3df vertical = horizontal.crossProduct(view);
-	vertical.normalize();
-	vertical *= 0.5f * ParticleSize.Height;
-
 	view *= -1.0f;
 
 #else
 
 	const core::matrix4 &m = camera->getViewFrustum()->Matrices [ video::ETS_VIEW ];
 
-	f32 f;
-
-	f = 0.5f * ParticleSize.Width;
-	const core::vector3df horizontal ( m[0] * f, m[4] * f, m[8] * f );
-
-	f = -0.5f * ParticleSize.Height;
-	const core::vector3df vertical ( m[1] * f, m[5] * f, m[9] * f );
-
 	const core::vector3df view ( -m[2], -m[6] , -m[10] );
 
 #endif
@@ -323,21 +330,40 @@ void CParticleSystemSceneNode::render()
 	{
 		const SParticle& particle = Particles[i];
 
-		Buffer.Vertices[0+idx].Pos = particle.pos + horizontal + vertical;
-		Buffer.Vertices[0+idx].Color = particle.color;
-		Buffer.Vertices[0+idx].Normal = view;
+		#if 0
+			core::vector3df horizontal = camera->getUpVector().crossProduct(view);
+			horizontal.normalize();
+			horizontal *= 0.5f * particle.size.Width;
 
-		Buffer.Vertices[1+idx].Pos = particle.pos + horizontal - vertical;
-		Buffer.Vertices[1+idx].Color = particle.color;
-		Buffer.Vertices[1+idx].Normal = view;
+			core::vector3df vertical = horizontal.crossProduct(view);
+			vertical.normalize();
+			vertical *= 0.5f * particle.size.Height;
 
-		Buffer.Vertices[2+idx].Pos = particle.pos - horizontal - vertical;
-		Buffer.Vertices[2+idx].Color = particle.color;
-		Buffer.Vertices[2+idx].Normal = view;
+		#else
+			f32 f;
 
-		Buffer.Vertices[3+idx].Pos = particle.pos - horizontal + vertical;
-		Buffer.Vertices[3+idx].Color = particle.color;
-		Buffer.Vertices[3+idx].Normal = view;
+			f = 0.5f * particle.size.Width;
+			const core::vector3df horizontal ( m[0] * f, m[4] * f, m[8] * f );
+
+			f = -0.5f * particle.size.Height;
+			const core::vector3df vertical ( m[1] * f, m[5] * f, m[9] * f );
+		#endif
+
+		Buffer->Vertices[0+idx].Pos = particle.pos + horizontal + vertical;
+		Buffer->Vertices[0+idx].Color = particle.color;
+		Buffer->Vertices[0+idx].Normal = view;
+
+		Buffer->Vertices[1+idx].Pos = particle.pos + horizontal - vertical;
+		Buffer->Vertices[1+idx].Color = particle.color;
+		Buffer->Vertices[1+idx].Normal = view;
+
+		Buffer->Vertices[2+idx].Pos = particle.pos - horizontal - vertical;
+		Buffer->Vertices[2+idx].Color = particle.color;
+		Buffer->Vertices[2+idx].Normal = view;
+
+		Buffer->Vertices[3+idx].Pos = particle.pos - horizontal + vertical;
+		Buffer->Vertices[3+idx].Color = particle.color;
+		Buffer->Vertices[3+idx].Normal = view;
 
 		idx +=4;
 	}
@@ -348,10 +374,10 @@ void CParticleSystemSceneNode::render()
 		mat.setTranslation(AbsoluteTransformation.getTranslation());
 	driver->setTransform(video::ETS_WORLD, mat);
 
-	driver->setMaterial(Buffer.Material);
+	driver->setMaterial(Buffer->Material);
 
-	driver->drawVertexPrimitiveList(Buffer.getVertices(), Particles.size()*4,
-		Buffer.getIndices(), Particles.size()*2, video::EVT_STANDARD, EPT_TRIANGLES);
+	driver->drawVertexPrimitiveList(Buffer->getVertices(), Particles.size()*4,
+		Buffer->getIndices(), Particles.size()*2, video::EVT_STANDARD, EPT_TRIANGLES,Buffer->getIndexType());
 
 	// for debug purposes only:
 	if ( DebugDataVisible & scene::EDS_BBOX )
@@ -360,20 +386,18 @@ void CParticleSystemSceneNode::render()
 		video::SMaterial deb_m;
 		deb_m.Lighting = false;
 		driver->setMaterial(deb_m);
-		driver->draw3DBox(Buffer.BoundingBox, video::SColor(0,255,255,255));
+		driver->draw3DBox(Buffer->BoundingBox, video::SColor(0,255,255,255));
 	}
 }
 
 
-
 //! returns the axis aligned bounding box of this node
 const core::aabbox3d<f32>& CParticleSystemSceneNode::getBoundingBox() const
 {
-	return Buffer.getBoundingBox();
+	return Buffer->getBoundingBox();
 }
 
 
-
 void CParticleSystemSceneNode::doParticleSystem(u32 time)
 {
 	if (LastEmitTime==0)
@@ -415,40 +439,38 @@ void CParticleSystemSceneNode::doParticleSystem(u32 time)
 		(*ait)->affect(now, Particles.pointer(), Particles.size());
 
 	if (ParticlesAreGlobal)
-		Buffer.BoundingBox.reset(AbsoluteTransformation.getTranslation());
+		Buffer->BoundingBox.reset(AbsoluteTransformation.getTranslation());
 	else
-		Buffer.BoundingBox.reset(core::vector3df(0,0,0));
+		Buffer->BoundingBox.reset(core::vector3df(0,0,0));
 
 	// animate all particles
 	f32 scale = (f32)timediff;
 
-	for (s32 i=0; i<(s32)Particles.size();)
+	for (u32 i=0; i<Particles.size();)
 	{
 		if (now > Particles[i].endTime)
 			Particles.erase(i);
 		else
 		{
 			Particles[i].pos += (Particles[i].vector * scale);
-			Buffer.BoundingBox.addInternalPoint(Particles[i].pos);
+			Buffer->BoundingBox.addInternalPoint(Particles[i].pos);
 			++i;
 		}
 	}
 
-	f32 m = ParticleSize.Width > ParticleSize.Height ? ParticleSize.Width : ParticleSize.Height;
-	m *= 0.5f;
-	Buffer.BoundingBox.MaxEdge.X += m;
-	Buffer.BoundingBox.MaxEdge.Y += m;
-	Buffer.BoundingBox.MaxEdge.Z += m;
+	const f32 m = (ParticleSize.Width > ParticleSize.Height ? ParticleSize.Width : ParticleSize.Height) * 0.5f;
+	Buffer->BoundingBox.MaxEdge.X += m;
+	Buffer->BoundingBox.MaxEdge.Y += m;
+	Buffer->BoundingBox.MaxEdge.Z += m;
 
-	Buffer.BoundingBox.MinEdge.X -= m;
-	Buffer.BoundingBox.MinEdge.Y -= m;
-	Buffer.BoundingBox.MinEdge.Z -= m;
+	Buffer->BoundingBox.MinEdge.X -= m;
+	Buffer->BoundingBox.MinEdge.Y -= m;
+	Buffer->BoundingBox.MinEdge.Z -= m;
 
 	if (ParticlesAreGlobal)
 	{
-		core::matrix4 absinv = AbsoluteTransformation;
-		absinv.makeInverse();
-		absinv.transformBox(Buffer.BoundingBox);
+		core::matrix4 absinv( AbsoluteTransformation, core::matrix4::EM4CONST_INVERSE );
+		absinv.transformBoxEx(Buffer->BoundingBox);
 	}
 }
 
@@ -462,46 +484,52 @@ void CParticleSystemSceneNode::setParticlesAreGlobal(bool global)
 }
 
 
-
 //! Sets the size of all particles.
 void CParticleSystemSceneNode::setParticleSize(const core::dimension2d<f32> &size)
 {
+	os::Printer::log("setParticleSize is deprecated, use setMinStartSize/setMaxStartSize in emitter.", irr::ELL_WARNING);
+	//A bit of a hack, but better here than in the particle code
+	if (Emitter)
+	{
+		Emitter->setMinStartSize(size);
+		Emitter->setMaxStartSize(size);
+	}
 	ParticleSize = size;
 }
 
 
 void CParticleSystemSceneNode::reallocateBuffers()
 {
-	if (Particles.size() * 4 > Buffer.getVertexCount() ||
-			Particles.size() * 6 > Buffer.getIndexCount())
+	if (Particles.size() * 4 > Buffer->getVertexCount() ||
+			Particles.size() * 6 > Buffer->getIndexCount())
 	{
-		u32 oldSize = Buffer.getVertexCount();
-		Buffer.Vertices.set_used(Particles.size() * 4);
+		u32 oldSize = Buffer->getVertexCount();
+		Buffer->Vertices.set_used(Particles.size() * 4);
 
 		u32 i;
 
 		// fill remaining vertices
-		for (i=oldSize; i<Buffer.Vertices.size(); i+=4)
+		for (i=oldSize; i<Buffer->Vertices.size(); i+=4)
 		{
-			Buffer.Vertices[0+i].TCoords.set(0.0f, 0.0f);
-			Buffer.Vertices[1+i].TCoords.set(0.0f, 1.0f);
-			Buffer.Vertices[2+i].TCoords.set(1.0f, 1.0f);
-			Buffer.Vertices[3+i].TCoords.set(1.0f, 0.0f);
+			Buffer->Vertices[0+i].TCoords.set(0.0f, 0.0f);
+			Buffer->Vertices[1+i].TCoords.set(0.0f, 1.0f);
+			Buffer->Vertices[2+i].TCoords.set(1.0f, 1.0f);
+			Buffer->Vertices[3+i].TCoords.set(1.0f, 0.0f);
 		}
 
 		// fill remaining indices
-		u32 oldIdxSize = Buffer.getIndexCount();
+		u32 oldIdxSize = Buffer->getIndexCount();
 		u32 oldvertices = oldSize;
-		Buffer.Indices.set_used(Particles.size() * 6);
+		Buffer->Indices.set_used(Particles.size() * 6);
 
-		for (i=oldIdxSize; i<Buffer.Indices.size(); i+=6)
+		for (i=oldIdxSize; i<Buffer->Indices.size(); i+=6)
 		{
-			Buffer.Indices[0+i] = 0+oldvertices;
-			Buffer.Indices[1+i] = 2+oldvertices;
-			Buffer.Indices[2+i] = 1+oldvertices;
-			Buffer.Indices[3+i] = 0+oldvertices;
-			Buffer.Indices[4+i] = 3+oldvertices;
-			Buffer.Indices[5+i] = 2+oldvertices;
+			Buffer->Indices[0+i] = (u16)0+oldvertices;
+			Buffer->Indices[1+i] = (u16)2+oldvertices;
+			Buffer->Indices[2+i] = (u16)1+oldvertices;
+			Buffer->Indices[3+i] = (u16)0+oldvertices;
+			Buffer->Indices[4+i] = (u16)3+oldvertices;
+			Buffer->Indices[5+i] = (u16)2+oldvertices;
 			oldvertices += 4;
 		}
 	}
@@ -533,7 +561,7 @@ void CParticleSystemSceneNode::serializeAttributes(io::IAttributes* out, io::SAt
 	E_PARTICLE_AFFECTOR_TYPE atype = EPAT_NONE;
 
 	for (core::list<IParticleAffector*>::ConstIterator it = AffectorList.begin();
-		 it != AffectorList.end(); ++it)
+		it != AffectorList.end(); ++it)
 	{
 		atype = (*it)->getType();
 
@@ -615,6 +643,9 @@ void CParticleSystemSceneNode::deserializeAttributes(io::IAttributes* in, io::SA
 		case EPAT_GRAVITY:
 			aff = createGravityAffector();
 			break;
+		case EPAT_SCALE:
+			aff = createScaleParticleAffector();
+			break;
 		case EPAT_NONE:
 		default:
 			break;
@@ -636,3 +667,4 @@ void CParticleSystemSceneNode::deserializeAttributes(io::IAttributes* in, io::SA
 } // end namespace scene
 } // end namespace irr
 
+
diff --git a/src/dep/src/irrlicht/CParticleSystemSceneNode.h b/src/dep/src/irrlicht/CParticleSystemSceneNode.h
index f706f87..915cf95 100644
--- a/src/dep/src/irrlicht/CParticleSystemSceneNode.h
+++ b/src/dep/src/irrlicht/CParticleSystemSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -33,6 +33,9 @@ public:
 	//! destructor
 	virtual ~CParticleSystemSceneNode();
 
+	//! Gets the particle emitter, which creates the particles.
+	virtual IParticleEmitter* getEmitter();
+
 	//! Sets the particle emitter, which creates the particles.
 	virtual void setEmitter(IParticleEmitter* emitter);
 
@@ -60,14 +63,16 @@ public:
 	//! Creates a particle emitter for an animated mesh scene node
 	virtual IParticleAnimatedMeshSceneNodeEmitter* createAnimatedMeshSceneNodeEmitter(
 		scene::IAnimatedMeshSceneNode* node, bool useNormalDirection = true,
-		const core::vector3df& direction = core::vector3df(0.0f,0.0f,0.0f),
+		const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f),
 		f32 normalDirectionModifier = 100.0f, s32 mbNumber = -1,
 		bool everyMeshVertex = false, u32 minParticlesPerSecond = 5,
 		u32 maxParticlesPerSecond = 10,
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000,
-		s32 maxAngleDegrees = 0 );
+		s32 maxAngleDegrees = 0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
 
 	//! Creates a box particle emitter.
 	virtual IParticleBoxEmitter* createBoxEmitter(
@@ -78,23 +83,27 @@ public:
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0);
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
 
 	//! Creates a particle emitter for emitting from a cylinder
 	virtual IParticleCylinderEmitter* createCylinderEmitter(
 		const core::vector3df& center, f32 radius,
 		const core::vector3df& normal, f32 length,
-		bool outlineOnly = false, const core::vector3df& direction = core::vector3df(0.0f,0.0f,0.0f),
+		bool outlineOnly = false, const core::vector3df& direction = core::vector3df(0.0f,0.5f,0.0f),
 		u32 minParticlesPerSecond = 5, u32 maxParticlesPersSecond = 10,
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000,
-		s32 maxAngleDegrees = 0 );
+		s32 maxAngleDegrees = 0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
 
 	//! Creates a mesh particle emitter.
 	virtual IParticleMeshEmitter* createMeshEmitter(
 		scene::IMesh* mesh, bool useNormalDirection = true,
-		const core::vector3df& direction = core::vector3df(0.0f,0.0f,0.0f),
+		const core::vector3df& direction = core::vector3df(0.0f,0.03f,0.0f),
 		f32 normalDirectionModifier = 100.0f, s32 mbNumber = -1,
 		bool everyMeshVertex = false,
 		u32 minParticlesPerSecond = 5,
@@ -102,7 +111,9 @@ public:
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin = 2000, u32 lifeTimeMax = 4000,
-		s32 maxAngleDegrees = 0 );
+		s32 maxAngleDegrees = 0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
 
 	//! Creates a point particle emitter.
 	virtual IParticlePointEmitter* createPointEmitter(
@@ -112,7 +123,9 @@ public:
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0);
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
 
 	//! Creates a ring particle emitter.
 	virtual IParticleRingEmitter* createRingEmitter(
@@ -123,7 +136,9 @@ public:
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0);
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
 
 	//! Creates a sphere particle emitter.
 	virtual IParticleSphereEmitter* createSphereEmitter(
@@ -134,7 +149,9 @@ public:
 		const video::SColor& minStartColor = video::SColor(255,0,0,0),
 		const video::SColor& maxStartColor = video::SColor(255,255,255,255),
 		u32 lifeTimeMin=2000, u32 lifeTimeMax=4000,
-		s32 maxAngleDegrees=0);
+		s32 maxAngleDegrees=0,
+		const core::dimension2df& minStartSize = core::dimension2df(5.0f,5.0f),
+		const core::dimension2df& maxStartSize = core::dimension2df(5.0f,5.0f) );
 
 	//! Creates a point attraction affector. This affector modifies the positions of the
 	//! particles and attracts them to a specified point at a specified speed per second.
@@ -142,6 +159,9 @@ public:
 		const core::vector3df& point, f32 speed = 1.0f, bool attract = true,
 		bool affectX = true, bool affectY = true, bool affectZ = true);
 
+	//! Creates a scale particle affector.
+	virtual IParticleAffector* createScaleParticleAffector(const core::dimension2df& scaleTo = core::dimension2df(1.0f, 1.0f));
+
 	//! Creates a fade out particle affector.
 	virtual IParticleFadeOutAffector* createFadeOutParticleAffector(
 		const video::SColor& targetColor = video::SColor(0,0,0,0),
@@ -165,7 +185,7 @@ public:
 	//! Sets if the particles should be global. If they are, the particles are affected by
 	//! the movement of the particle system scene node too, otherwise they completely
 	//! ignore it. Default is true.
-	virtual void setParticlesAreGlobal(bool global);
+	virtual void setParticlesAreGlobal(bool global=true);
 
 	//! Writes attributes of the scene node.
 	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const;
@@ -188,7 +208,7 @@ private:
 	u32 LastEmitTime;
 	s32 MaxParticles;
 
-	SMeshBuffer Buffer;
+	SMeshBuffer* Buffer;
 
 	enum E_PARTICLES_PRIMITIVE
 	{
diff --git a/src/dep/src/irrlicht/CQ3LevelMesh.cpp b/src/dep/src/irrlicht/CQ3LevelMesh.cpp
index 50a8941..b6c7771 100644
--- a/src/dep/src/irrlicht/CQ3LevelMesh.cpp
+++ b/src/dep/src/irrlicht/CQ3LevelMesh.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -20,10 +20,10 @@ namespace scene
 
 
 //! constructor
-CQ3LevelMesh::CQ3LevelMesh(io::IFileSystem* fs, video::IVideoDriver* driver, scene::ISceneManager* smgr)
+CQ3LevelMesh::CQ3LevelMesh(io::IFileSystem* fs, scene::ISceneManager* smgr)
 : Textures(0), LightMaps(0),
  Vertices(0), Faces(0),	Planes(0), Nodes(0), Leafs(0), LeafFaces(0),
-	MeshVerts(0), Brushes(0), Driver(driver), FileSystem(fs), SceneManager ( smgr )
+	MeshVerts(0), Brushes(0), FileSystem(fs), SceneManager(smgr)
 {
 	#ifdef _DEBUG
 	IReferenceCounted::setDebugName("CQ3LevelMesh");
@@ -34,6 +34,10 @@ CQ3LevelMesh::CQ3LevelMesh(io::IFileSystem* fs, video::IVideoDriver* driver, sce
 		Mesh[i] = 0;
 	}
 
+	if (smgr)
+		Driver = smgr->getVideoDriver();
+	else
+		Driver = 0;
 	if (Driver)
 		Driver->grab();
 
@@ -41,7 +45,7 @@ CQ3LevelMesh::CQ3LevelMesh(io::IFileSystem* fs, video::IVideoDriver* driver, sce
 		FileSystem->grab();
 
 	// load default shaders
-	InitShader ();
+	InitShader();
 }
 
 
@@ -133,7 +137,7 @@ bool CQ3LevelMesh::loadFile(io::IReadFile* file)
 	loadBrushes(&Lumps[kBrushes], file);			// load the brushes of the BSP
 	loadBrushSides(&Lumps[kBrushSides], file);		// load the brushsides of the BSP
 	loadLeafBrushes(&Lumps[kLeafBrushes], file);	// load the brushes of the leaf
-	loadShaders(&Lumps[kShaders], file );			// load the shaderes
+	loadShaders(&Lumps[kShaders], file );			// load the shaders
 
 	PatchTesselation = 8;
 
@@ -158,11 +162,11 @@ u32 CQ3LevelMesh::getFrameCount() const
 }
 
 
-void CQ3LevelMesh::releaseMesh ( s32 index )
+void CQ3LevelMesh::releaseMesh( s32 index )
 {
 	if ( Mesh[index] )
 	{
-		Mesh[index]->drop ();
+		Mesh[index]->drop();
 		Mesh[index] = 0;
 	}
 }
@@ -183,13 +187,14 @@ void CQ3LevelMesh::loadTextures(tBSPLump* l, io::IReadFile* file)
 	file->seek(l->offset);
 	file->read(Textures, l->length);
 
-	#ifdef __BIG_ENDIAN__
-	for (int i=0;i<NumTextures;i++)
+	for (s32 i=0;i<NumTextures;++i)
 	{
+	#ifdef __BIG_ENDIAN__
 		Textures[i].flags = os::Byteswap::byteswap(Textures[i].flags);
 		Textures[i].contents = os::Byteswap::byteswap(Textures[i].contents);
-	}
 	#endif
+		os::Printer::log("Loaded texture", Textures[i].strName, ELL_INFORMATION);
+	}
 }
 
 
@@ -212,7 +217,7 @@ void CQ3LevelMesh::loadVerts(tBSPLump* l, io::IReadFile* file)
 	file->read(Vertices, l->length);
 
 	#ifdef __BIG_ENDIAN__
-	for (int i=0;i<NumVertices;i++)
+	for (s32 i=0;i<NumVertices;i++)
 	{
 		Vertices[i].vPosition[0] = os::Byteswap::byteswap(Vertices[i].vPosition[0]);
 		Vertices[i].vPosition[1] = os::Byteswap::byteswap(Vertices[i].vPosition[1]);
@@ -304,13 +309,13 @@ void CQ3LevelMesh::loadVisData(tBSPLump* l, io::IReadFile* file)
 void CQ3LevelMesh::loadEntities(tBSPLump* l, io::IReadFile* file)
 {
 	core::array<u8> entity;
-	entity.set_used ( l->length + 2 );
+	entity.set_used( l->length + 2 );
 	entity[l->length + 1 ] = 0;
 
 	file->seek(l->offset);
-	file->read ( entity.pointer(), l->length);
+	file->read( entity.pointer(), l->length);
 
-	parser_parse ( entity.pointer(), l->length, &CQ3LevelMesh::scriptcallback_entity );
+	parser_parse( entity.pointer(), l->length, &CQ3LevelMesh::scriptcallback_entity );
 }
 
 
@@ -319,13 +324,13 @@ void CQ3LevelMesh::loadShaders(tBSPLump* l, io::IReadFile* file)
 {
 	u32 files = l->length / sizeof(tBSPShader);
 
-	file->seek ( l->offset );
+	file->seek( l->offset );
 
 	tBSPShader def;
 	for ( u32 i = 0; i!= files; ++i )
 	{
-		file->read ( &def, sizeof ( def ) );
-		getShader ( def.strName, 1 );
+		file->read( &def, sizeof( def ) );
+		getShader(def.strName);
 	}
 }
 
@@ -369,13 +374,13 @@ void CQ3LevelMesh::loadLeafBrushes(tBSPLump* l, io::IReadFile* file)
 }
 
 
-inline bool isQ3WhiteSpace ( const u8 symbol )
+inline bool isQ3WhiteSpace( const u8 symbol )
 {
 	return symbol == ' ' || symbol == '\t' || symbol == '\r';
 }
 
 
-void CQ3LevelMesh::parser_nextToken ()
+void CQ3LevelMesh::parser_nextToken()
 {
 	u8 symbol;
 
@@ -393,7 +398,7 @@ void CQ3LevelMesh::parser_nextToken ()
 
 		symbol = Parser.source [ Parser.index ];
 		Parser.index += 1;
-	} while ( isQ3WhiteSpace ( symbol ) );
+	} while ( isQ3WhiteSpace( symbol ) );
 
 	// first symbol, one symbol
 	switch ( symbol )
@@ -411,7 +416,7 @@ void CQ3LevelMesh::parser_nextToken ()
 			}
 			symbol = Parser.source [ Parser.index ];
 			Parser.index += 1;
-			if ( isQ3WhiteSpace ( symbol ) )
+			if ( isQ3WhiteSpace( symbol ) )
 			{
 				Parser.tokenresult = Q3_TOKEN_MATH_DIVIDE;
 				return;
@@ -463,14 +468,14 @@ void CQ3LevelMesh::parser_nextToken ()
 				symbol = Parser.source [ Parser.index ];
 				Parser.index += 1;
 				if ( symbol != '"' )
-					Parser.token.append ( symbol );
+					Parser.token.append( symbol );
 			} while ( symbol != '"' );
 			Parser.tokenresult = Q3_TOKEN_ENTITY;
 			return;
 	}
 
 	// user identity
-	Parser.token.append ( symbol );
+	Parser.token.append( symbol );
 
 	// continue till whitespace
 	bool notisWhite = true;
@@ -483,10 +488,10 @@ void CQ3LevelMesh::parser_nextToken ()
 		}
 		symbol = Parser.source [ Parser.index ];
 
-		notisWhite = ! isQ3WhiteSpace ( symbol );
+		notisWhite = ! isQ3WhiteSpace( symbol );
 		if ( notisWhite )
 		{
-			Parser.token.append ( symbol );
+			Parser.token.append( symbol );
 		}
 
 		Parser.index += 1;
@@ -502,9 +507,9 @@ void CQ3LevelMesh::parser_nextToken ()
 	parse entity & shader
 	calls callback on content in {}
 */
-void CQ3LevelMesh::parser_parse ( const void * data, const u32 size, CQ3LevelMesh::tParserCallback callback )
+void CQ3LevelMesh::parser_parse( const void * data, const u32 size, CQ3LevelMesh::tParserCallback callback )
 {
-	Parser.source = (const c8*) data;
+	Parser.source = static_cast<const c8*>(data);
 	Parser.sourcesize = size;
 	Parser.index = 0;
 
@@ -515,25 +520,25 @@ void CQ3LevelMesh::parser_parse ( const void * data, const u32 size, CQ3LevelMes
 
 	quake3::SVariable entity;
 
-	groupList = new quake3::SVarGroupList ();
+	groupList = new quake3::SVarGroupList();
 
-	groupList->VariableGroup.push_back ( quake3::SVarGroup () );
+	groupList->VariableGroup.push_back( quake3::SVarGroup() );
 	active = last = 0;
 
 	do
 	{
-		parser_nextToken ();
+		parser_nextToken();
 
 		switch ( Parser.tokenresult )
 		{
 			case Q3_TOKEN_START_LIST:
 			{
-				//stack = core::min_ ( stack + 1, 7 );
+				//stack = core::min_( stack + 1, 7 );
 
-				groupList->VariableGroup.push_back ( quake3::SVarGroup () );
+				groupList->VariableGroup.push_back( quake3::SVarGroup() );
 				last = active;
 				active = groupList->VariableGroup.size() - 1;
-				entity.clear ();
+				entity.clear();
 			}  break;
 
 			// a unregisterd variable is finished
@@ -541,8 +546,8 @@ void CQ3LevelMesh::parser_parse ( const void * data, const u32 size, CQ3LevelMes
 			{
 				if ( entity.isValid() )
 				{
-					groupList->VariableGroup[active].Variable.push_back ( entity );
-					entity.clear ();
+					groupList->VariableGroup[active].Variable.push_back( entity );
+					entity.clear();
 				}
 			} break;
 
@@ -570,17 +575,17 @@ void CQ3LevelMesh::parser_parse ( const void * data, const u32 size, CQ3LevelMes
 
 			case Q3_TOKEN_END_LIST:
 			{
-				//stack = core::max_ ( stack - 1, 0 );
+				//stack = core::max_( stack - 1, 0 );
 
 				// close tag for first
 				if ( active == 1 )
 				{
-					(this->*callback) ( groupList );
+					(this->*callback)( groupList );
 
 					// new group
-					groupList->drop ();
-					groupList = new quake3::SVarGroupList ();
-					groupList->VariableGroup.push_back ( quake3::SVarGroup () );
+					groupList->drop();
+					groupList = new quake3::SVarGroupList();
+					groupList->VariableGroup.push_back( quake3::SVarGroup() );
 					last = 0;
 				}
 
@@ -593,14 +598,14 @@ void CQ3LevelMesh::parser_parse ( const void * data, const u32 size, CQ3LevelMes
 
 	} while ( Parser.tokenresult != Q3_TOKEN_EOF );
 
-	groupList->drop ();
+	groupList->drop();
 }
 
 
 /*
 	this loader applies only textures for stage 1 & 2
 */
-s32 CQ3LevelMesh::setShaderMaterial ( video::SMaterial &material, const tBSPFace * face ) const
+s32 CQ3LevelMesh::setShaderMaterial( video::SMaterial &material, const tBSPFace * face ) const
 {
 	material.MaterialType = video::EMT_SOLID;
 	material.Wireframe = false;
@@ -625,13 +630,13 @@ s32 CQ3LevelMesh::setShaderMaterial ( video::SMaterial &material, const tBSPFace
 	if ( face->lightmapID >= 0 )
 	{
 		material.setTexture(1, Lightmap [ face->lightmapID ]);
-		material.MaterialType = quake3::defaultLightMap;
+		material.MaterialType = quake3::defaultMaterialType;
 	}
 
 	// store shader ID
 	material.MaterialTypeParam2 = (f32) shaderState;
 
-	const quake3::SShader *shader = getShader ( shaderState );
+	const quake3::SShader *shader = getShader(shaderState);
 	if ( 0 == shader )
 		return shaderState;
 
@@ -640,12 +645,12 @@ s32 CQ3LevelMesh::setShaderMaterial ( video::SMaterial &material, const tBSPFace
 	s32 index;
 
 	// generic
-	group = shader->getGroup ( 1 );
+	group = shader->getGroup( 1 );
 	if ( group )
 	{
-		material.BackfaceCulling = quake3::getBackfaceCulling ( group->get ( "cull" ) );
+		material.BackfaceCulling = quake3::isDisabled( group->get( "cull" ) );
 
-		if ( group->isDefined ( "surfaceparm", "nolightmap" ) )
+		if ( group->isDefined( "surfaceparm", "nolightmap" ) )
 		{
 			material.MaterialType = video::EMT_SOLID;
 			material.setTexture(1, 0);
@@ -659,21 +664,21 @@ s32 CQ3LevelMesh::setShaderMaterial ( video::SMaterial &material, const tBSPFace
 	u32 startPos;
 	for ( s32 g = 2; g <= 3; ++g )
 	{
-		group = shader->getGroup ( g );
+		group = shader->getGroup( g );
 		if ( 0 == group )
 			continue;
 
 		startPos = 0;
 
-		index = group->getIndex ( "depthwrite" );
+		index = group->getIndex( "depthwrite" );
 		if ( index >= 0 )
 		{
-			material.ZBuffer = true;
+			material.ZWriteEnable = true;
 		}
 
 		quake3::SBlendFunc blendfunc;
-		quake3::getBlendFunc ( group->get ( "blendfunc" ), blendfunc );
-		quake3::getBlendFunc ( group->get ( "alphafunc" ), blendfunc );
+		quake3::getBlendFunc( group->get( "blendfunc" ), blendfunc );
+		quake3::getBlendFunc( group->get( "alphafunc" ), blendfunc );
 
 		material.MaterialType = blendfunc.type;
 		material.MaterialTypeParam = blendfunc.param;
@@ -684,7 +689,7 @@ s32 CQ3LevelMesh::setShaderMaterial ( video::SMaterial &material, const tBSPFace
 
 	//material.BackfaceCulling = false;
 
-	if ( shader->VarGroup->VariableGroup.size () <= 4 )
+	if ( shader->VarGroup->VariableGroup.size() <= 4 )
 	{
 		shaderState |= 0x00010000;
 	}
@@ -721,10 +726,10 @@ void CQ3LevelMesh::constructMesh2()
 	{
 		const tBSPFace * face = &Faces [i];
 
-		s32 shaderState = setShaderMaterial ( material, face );
-		toBuffer.clear ();
+		s32 shaderState = setShaderMaterial( material, face );
+		toBuffer.clear();
 
-		const quake3::SShader *shader = getShader ( shaderState );
+		const quake3::SShader *shader = getShader(shaderState);
 
 		switch( Faces[i].type )
 		{
@@ -736,13 +741,13 @@ void CQ3LevelMesh::constructMesh2()
 					{
 						item.takeVertexColor = material.getTexture(0) == 0 || material.getTexture(1) == 0;
 						item.index = quake3::E_Q3_MESH_GEOMETRY;
-						toBuffer.push_back ( item );
+						toBuffer.push_back( item );
 					}
 					else
 					{
 						item.takeVertexColor = 1;
 						item.index = quake3::E_Q3_MESH_ITEMS;
-						toBuffer.push_back ( item );
+						toBuffer.push_back( item );
 					}
 
 				} break;
@@ -754,26 +759,26 @@ void CQ3LevelMesh::constructMesh2()
 				{
 					item.takeVertexColor = material.Textures[1] == 0;
 					item.index = quake3::E_Q3_MESH_GEOMETRY;
-					toBuffer.push_back ( item );
+					toBuffer.push_back( item );
 				}
 				else
 				if ( material.Textures[0] )
 				{
 					item.takeVertexColor = material.Textures[1] == 0;
 					item.index = quake3::E_Q3_MESH_GEOMETRY;
-					toBuffer.push_back ( item );
+					toBuffer.push_back( item );
 					if ( 0 == (shaderState & 0xFFFF0000 ) )
 					{
 						item.takeVertexColor = 1;
 						item.index = quake3::E_Q3_MESH_ITEMS;
-						toBuffer.push_back ( item );
+						toBuffer.push_back( item );
 					}
 				}
 				else
 				{
 					item.takeVertexColor = 1;
 					item.index = quake3::E_Q3_MESH_ITEMS;
-					toBuffer.push_back ( item );
+					toBuffer.push_back( item );
 				}
 				break;
 
@@ -782,20 +787,20 @@ void CQ3LevelMesh::constructMesh2()
 				{
 					item.takeVertexColor = material.Textures[1] == 0;
 					item.index = quake3::E_Q3_MESH_GEOMETRY;
-					toBuffer.push_back ( item );
+					toBuffer.push_back( item );
 				}
 				else
 				{
 					item.takeVertexColor = 1;
 					item.index = quake3::E_Q3_MESH_ITEMS;
-					toBuffer.push_back ( item );
+					toBuffer.push_back( item );
 				}
 				break;
 */
 			case 4: // billboards
 				item.takeVertexColor = 1;
 				item.index = quake3::E_Q3_MESH_ITEMS;
-				toBuffer.push_back ( item );
+				toBuffer.push_back( item );
 				break;
 		}
 
@@ -807,7 +812,7 @@ void CQ3LevelMesh::constructMesh2()
 			{
 				if ( 0 == toBuffer[g].takeVertexColor )
 				{
-					toBuffer[g].takeVertexColor = material.getTexture(0) == 0 || material.getTexture(1);
+					toBuffer[g].takeVertexColor = material.getTexture(0) == 0 || material.getTexture(1) == 0;
 				}
 				if (Faces[i].lightmapID < -1 || Faces[i].lightmapID > NumLightMaps-1)
 				{
@@ -821,13 +826,29 @@ void CQ3LevelMesh::constructMesh2()
 			}
 			else
 			{
-				buffer = (SMeshBufferLightMap*) Mesh[ toBuffer[g].index ]->getMeshBuffer ( material );
-				//buffer = 0;
+				// Construct a unique mesh for each shader or combine meshbuffers for same shader
+#if 0
+				buffer = 0;
+				if ( shader )
+				{
+					const quake3::SVarGroup *group = shader->getGroup( 1 );
+					if ( group )
+					{
+						if ( group->getIndex( "deformvertexes" ) >= 0 )
+						{
+							buffer = (SMeshBufferLightMap*) Mesh[ toBuffer[g].index ]->getMeshBuffer( material );
+						}
+					}
+
+				}
+#else
+				buffer = (SMeshBufferLightMap*) Mesh[ toBuffer[g].index ]->getMeshBuffer( material );
+#endif
 				if ( 0 == buffer )
 				{
 					buffer = new scene::SMeshBufferLightMap();
-					Mesh[ toBuffer[g].index ]->addMeshBuffer ( buffer );
-					buffer->drop ();
+					Mesh[ toBuffer[g].index ]->addMeshBuffer( buffer );
+					buffer->drop();
 					buffer->getMaterial() = material;
 				}
 			}
@@ -847,14 +868,16 @@ void CQ3LevelMesh::constructMesh2()
 					index = MeshVerts + face->meshVertIndex;
 					k = buffer->getVertexCount();
 
-					for ( j = 0; j < face->numMeshVerts; j += 1 )
+					buffer->Indices.reallocate(buffer->getIndexCount()+face->numMeshVerts);
+					for ( j = 0; j < face->numMeshVerts; ++j )
 					{
 						buffer->Indices.push_back( k + index [j] );
 					}
 
+					buffer->Vertices.reallocate(k+face->numOfVerts);
 					for ( j = 0; j != face->numOfVerts; ++j )
 					{
-						copy ( &temp[0], &Vertices[ j + face->vertexIndex ], toBuffer[g].takeVertexColor );
+						copy( &temp[0], &Vertices[ j + face->vertexIndex ], toBuffer[g].takeVertexColor );
 						buffer->Vertices.push_back( temp[0] );
 					}
 					break;
@@ -905,9 +928,11 @@ void CQ3LevelMesh::constructMesh()
 			//case 3: // mesh vertices
 			case 1: // normal polygons
 				{
+					meshBuffer->Vertices.reallocate(meshBuffer->getVertexCount()+3*Faces[i].numMeshVerts);
+					meshBuffer->Indices.reallocate(meshBuffer->getIndexCount()+3*Faces[i].numMeshVerts);
 					for (s32 tf=0; tf<Faces[i].numMeshVerts; tf+=3)
 					{
-						s32 idx = meshBuffer->getVertexCount();
+						const s32 idx = meshBuffer->getVertexCount();
 						s32 vidxes[3];
 
 						vidxes[0] = MeshVerts[Faces[i].meshVertIndex + tf +0]
@@ -918,9 +943,9 @@ void CQ3LevelMesh::constructMesh()
 							+ Faces[i].vertexIndex;
 
 						// add all three vertices
-						copy ( &temp[0], &Vertices[ vidxes[0] ], 0 );
-						copy ( &temp[1], &Vertices[ vidxes[1] ], 0 );
-						copy ( &temp[2], &Vertices[ vidxes[2] ], 0 );
+						copy( &temp[0], &Vertices[ vidxes[0] ], 0 );
+						copy( &temp[1], &Vertices[ vidxes[1] ], 0 );
+						copy( &temp[2], &Vertices[ vidxes[2] ], 0 );
 
 						meshBuffer->Vertices.push_back( temp[0] );
 						meshBuffer->Vertices.push_back( temp[1] );
@@ -951,18 +976,20 @@ inline f32 CQ3LevelMesh::Blend( const f64 s[3], const f64 t[3], const tBSPVertex
 	f64 res = 0.0;
 	f32 *ptr;
 
-	for( int i=0; i<3; i++ )
-		for( int j=0; j<3; j++ )
+	for( int i=0; i<3; ++i )
+	{
+		for( int j=0; j<3; ++j )
 		{
 			ptr = (f32 *)( (char*)v[i*3+j] + offset );
 			res += s[i] * t[j] *  (*ptr);
 		}
+	}
 
 	return (f32) res;
 }
 
 
-void CQ3LevelMesh::S3DVertex2TCoords_64::copyto ( video::S3DVertex2TCoords &dest ) const
+void CQ3LevelMesh::S3DVertex2TCoords_64::copyto( video::S3DVertex2TCoords &dest ) const
 {
 	dest.Pos.X = core::round_( (f32) Pos.X );
 	dest.Pos.Y = core::round_( (f32) Pos.Y );
@@ -986,11 +1013,11 @@ void CQ3LevelMesh::S3DVertex2TCoords_64::copyto ( video::S3DVertex2TCoords &dest
 }
 
 
-void CQ3LevelMesh::copy ( S3DVertex2TCoords_64 * dest, const tBSPVertex * source, s32 vertexcolor ) const
+void CQ3LevelMesh::copy( S3DVertex2TCoords_64 * dest, const tBSPVertex * source, s32 vertexcolor ) const
 {
-	//dest->Pos.X = core::round ( source->vPosition[0] );
-	//dest->Pos.Y = core::round ( source->vPosition[2] );
-	//dest->Pos.Z = core::round ( source->vPosition[1] );
+	//dest->Pos.X = core::round( source->vPosition[0] );
+	//dest->Pos.Y = core::round( source->vPosition[2] );
+	//dest->Pos.Z = core::round( source->vPosition[1] );
 	dest->Pos.X = source->vPosition[0];
 	dest->Pos.Y = source->vPosition[2];
 	dest->Pos.Z = source->vPosition[1];
@@ -998,7 +1025,7 @@ void CQ3LevelMesh::copy ( S3DVertex2TCoords_64 * dest, const tBSPVertex * source
 	dest->Normal.X = source->vNormal[0];
 	dest->Normal.Y = source->vNormal[2];
 	dest->Normal.Z = source->vNormal[1];
-	dest->Normal.normalize ();
+	dest->Normal.normalize();
 
 	dest->TCoords.X = source->vTextureCoord[0];
 	dest->TCoords.Y = source->vTextureCoord[1];
@@ -1007,22 +1034,22 @@ void CQ3LevelMesh::copy ( S3DVertex2TCoords_64 * dest, const tBSPVertex * source
 
 	if ( vertexcolor )
 	{
-		u32 a = core::s32_min ( source->color[3] * quake3::defaultModulate, 255 );
-		u32 r = core::s32_min ( source->color[0] * quake3::defaultModulate, 255 );
-		u32 g = core::s32_min ( source->color[1] * quake3::defaultModulate, 255 );
-		u32 b = core::s32_min ( source->color[2] * quake3::defaultModulate, 255 );
+		u32 a = core::s32_min( source->color[3] * quake3::defaultModulate, 255 );
+		u32 r = core::s32_min( source->color[0] * quake3::defaultModulate, 255 );
+		u32 g = core::s32_min( source->color[1] * quake3::defaultModulate, 255 );
+		u32 b = core::s32_min( source->color[2] * quake3::defaultModulate, 255 );
 
-		dest->Color.set (a * 1.f/255.f, r * 1.f/255.f,
+		dest->Color.set(a * 1.f/255.f, r * 1.f/255.f,
 				g * 1.f/255.f, b * 1.f/255.f);
 	}
 	else
 	{
-		dest->Color.set ( 1.f, 1.f, 1.f, 1.f );
+		dest->Color.set( 1.f, 1.f, 1.f, 1.f );
 	}
 }
 
 
-inline void CQ3LevelMesh::copy ( video::S3DVertex2TCoords * dest, const tBSPVertex * source, s32 vertexcolor ) const
+inline void CQ3LevelMesh::copy( video::S3DVertex2TCoords * dest, const tBSPVertex * source, s32 vertexcolor ) const
 {
 	dest->Pos.X = core::round_( source->vPosition[0] );
 	dest->Pos.Y = core::round_( source->vPosition[2] );
@@ -1044,10 +1071,10 @@ inline void CQ3LevelMesh::copy ( video::S3DVertex2TCoords * dest, const tBSPVert
 
 	if ( vertexcolor )
 	{
-		u32 a = core::s32_min ( source->color[3] * quake3::defaultModulate, 255 );
-		u32 r = core::s32_min ( source->color[0] * quake3::defaultModulate, 255 );
-		u32 g = core::s32_min ( source->color[1] * quake3::defaultModulate, 255 );
-		u32 b = core::s32_min ( source->color[2] * quake3::defaultModulate, 255 );
+		u32 a = core::s32_min( source->color[3] * quake3::defaultModulate, 255 );
+		u32 r = core::s32_min( source->color[0] * quake3::defaultModulate, 255 );
+		u32 g = core::s32_min( source->color[1] * quake3::defaultModulate, 255 );
+		u32 b = core::s32_min( source->color[2] * quake3::defaultModulate, 255 );
 
 		dest->Color.color = a << 24 | r << 16 | g << 8 | b;
 	}
@@ -1058,18 +1085,16 @@ inline void CQ3LevelMesh::copy ( video::S3DVertex2TCoords * dest, const tBSPVert
 }
 
 
-void CQ3LevelMesh::SBezier::tesselate ( s32 level )
+void CQ3LevelMesh::SBezier::tesselate( s32 level )
 {
 	//Calculate how many vertices across/down there are
 	s32 j, k;
 
-	u32 idx = Patch->Vertices.size();
+	column[0].set_used( level + 1 );
+	column[1].set_used( level + 1 );
+	column[2].set_used( level + 1 );
 
-	column[0].set_used ( level + 1 );
-	column[1].set_used ( level + 1 );
-	column[2].set_used ( level + 1 );
-
-	const f64 w = 0.0 + core::reciprocal ( (f32) level );
+	const f64 w = 0.0 + core::reciprocal( (f32) level );
 
 	//Tesselate along the columns
 	for( j = 0; j <= level; ++j)
@@ -1081,6 +1106,8 @@ void CQ3LevelMesh::SBezier::tesselate ( s32 level )
 		column[2][j] = control[2].getInterpolated_quadratic(control[5], control[8], f );
 	}
 
+	const u32 idx = Patch->Vertices.size();
+	Patch->Vertices.reallocate(idx+level*level);
 	//Tesselate across the rows to get final vertices
 	video::S3DVertex2TCoords v;
 	S3DVertex2TCoords_64 f;
@@ -1088,12 +1115,13 @@ void CQ3LevelMesh::SBezier::tesselate ( s32 level )
 	{
 		for( k = 0; k <= level; ++k)
 		{
-			f = column[0][j].getInterpolated_quadratic(	column[1][j], column[2][j],	w * (f64) k );
-			f.copyto ( v );
-			Patch->Vertices.push_back ( v );
+			f = column[0][j].getInterpolated_quadratic(column[1][j], column[2][j], w * (f64) k);
+			f.copyto( v );
+			Patch->Vertices.push_back( v );
 		}
 	}
 
+	Patch->Indices.reallocate(Patch->Indices.size()+6*level*level);
 	// connect
 	for( j = 0; j < level; ++j)
 	{
@@ -1101,13 +1129,13 @@ void CQ3LevelMesh::SBezier::tesselate ( s32 level )
 		{
 			const s32 inx = idx + ( k * ( level + 1 ) ) + j;
 
-			Patch->Indices.push_back ( inx + 0 );
-			Patch->Indices.push_back ( inx + (level + 1 ) + 0 );
-			Patch->Indices.push_back ( inx + (level + 1 ) + 1 );
+			Patch->Indices.push_back( inx + 0 );
+			Patch->Indices.push_back( inx + (level + 1 ) + 0 );
+			Patch->Indices.push_back( inx + (level + 1 ) + 1 );
 
-			Patch->Indices.push_back ( inx + 0 );
-			Patch->Indices.push_back ( inx + (level + 1 ) + 1 );
-			Patch->Indices.push_back ( inx + 1 );
+			Patch->Indices.push_back( inx + 0 );
+			Patch->Indices.push_back( inx + (level + 1 ) + 1 );
+			Patch->Indices.push_back( inx + 1 );
 		}
 	}
 }
@@ -1130,24 +1158,26 @@ void CQ3LevelMesh::createCurvedSurface3(SMeshBufferLightMap* meshBuffer,
 
 	video::S3DVertex2TCoords v;
 
-	m = meshBuffer->Vertices.size ();
+	m = meshBuffer->Vertices.size();
+	meshBuffer->Vertices.reallocate(m+controlHeight * controlWidth);
 	for ( j = 0; j!= controlHeight * controlWidth; ++j )
 	{
-		copy ( &v, &Vertices [ face->vertexIndex + j ], storevertexcolor );
-		meshBuffer->Vertices.push_back ( v );
+		copy( &v, &Vertices [ face->vertexIndex + j ], storevertexcolor );
+		meshBuffer->Vertices.push_back( v );
 	}
 
+	meshBuffer->Indices.reallocate(meshBuffer->Indices.size()+6*(controlHeight-1) * (controlWidth-1));
 	for ( j = 0; j!= controlHeight - 1; ++j )
 	{
 		for ( k = 0; k!= controlWidth - 1; ++k )
 		{
-			meshBuffer->Indices.push_back ( m + k + 0 );
-			meshBuffer->Indices.push_back ( m + k + controlWidth + 0 );
-			meshBuffer->Indices.push_back ( m + k + controlWidth + 1 );
+			meshBuffer->Indices.push_back( m + k + 0 );
+			meshBuffer->Indices.push_back( m + k + controlWidth + 0 );
+			meshBuffer->Indices.push_back( m + k + controlWidth + 1 );
 
-			meshBuffer->Indices.push_back ( m + k + 0 );
-			meshBuffer->Indices.push_back ( m + k + controlWidth + 1 );
-			meshBuffer->Indices.push_back ( m + k + 1 );
+			meshBuffer->Indices.push_back( m + k + 0 );
+			meshBuffer->Indices.push_back( m + k + controlWidth + 1 );
+			meshBuffer->Indices.push_back( m + k + 1 );
 		}
 		m += controlWidth;
 	}
@@ -1169,16 +1199,16 @@ void CQ3LevelMesh::createCurvedSurface2(SMeshBufferLightMap* meshBuffer,
 	const u32 controlHeight = face->size[1];
 
 	// number of biquadratic patches
-	const u32 biquadWidth =  (controlWidth - 1)/2;
+	const u32 biquadWidth = (controlWidth - 1)/2;
 	const u32 biquadHeight = (controlHeight -1)/2;
 
 	// Create space for a temporary array of the patch's control points
 	core::array<S3DVertex2TCoords_64> controlPoint;
-	controlPoint.set_used ( controlWidth * controlHeight );
+	controlPoint.set_used( controlWidth * controlHeight );
 
 	for( j = 0; j < controlPoint.size(); ++j)
 	{
-		copy ( &controlPoint[j], &Vertices [ face->vertexIndex + j ], storevertexcolor );
+		copy( &controlPoint[j], &Vertices [ face->vertexIndex + j ], storevertexcolor );
 	}
 
 	// create a temporary patch
@@ -1203,7 +1233,7 @@ void CQ3LevelMesh::createCurvedSurface2(SMeshBufferLightMap* meshBuffer,
 			Bezier.control[7] = controlPoint[ inx + controlWidth * 2 + 1];
 			Bezier.control[8] = controlPoint[ inx + controlWidth * 2 + 2];
 
-			Bezier.tesselate ( patchTesselation );
+			Bezier.tesselate( patchTesselation );
 		}
 	}
 
@@ -1220,7 +1250,7 @@ void CQ3LevelMesh::createCurvedSurface2(SMeshBufferLightMap* meshBuffer,
 		{
 			const core::vector3df &m = meshBuffer->Vertices[k].Pos;
 
-			if ( !v.equals ( m, tolerance ) )
+			if ( !v.equals( m, tolerance ) )
 				continue;
 
 			meshBuffer->Vertices[k].Pos = v;
@@ -1230,15 +1260,17 @@ void CQ3LevelMesh::createCurvedSurface2(SMeshBufferLightMap* meshBuffer,
 */
 
 	// add Patch to meshbuffer
+	meshBuffer->Vertices.reallocate(msize+bsize);
 	for ( j = 0; j!= bsize; ++j )
 	{
-		meshBuffer->Vertices.push_back ( Bezier.Patch->Vertices[j] );
+		meshBuffer->Vertices.push_back( Bezier.Patch->Vertices[j] );
 	}
 
 	// add indices to meshbuffer
+	meshBuffer->Indices.reallocate(meshBuffer->getIndexCount()+Bezier.Patch->getIndexCount());
 	for ( j = 0; j!= Bezier.Patch->getIndexCount(); ++j )
 	{
-		meshBuffer->Indices.push_back ( msize + Bezier.Patch->Indices[j] );
+		meshBuffer->Indices.push_back( msize + Bezier.Patch->Indices[j] );
 	}
 
 	delete Bezier.Patch;
@@ -1283,14 +1315,14 @@ void CQ3LevelMesh::createCurvedSurface(SMeshBufferLightMap* meshBuffer, s32 i)
 			const f64 tstep = 1.0 / (f64) trun;
 
 			v[0] = &Vertices[cpidx[0]];
-			v[1] = 	&Vertices[cpidx[1]];
-			v[2] = 	&Vertices[cpidx[2]];
-			v[3] = 	&Vertices[cpidx[3]];
-			v[4] = 	&Vertices[cpidx[4]];
-			v[5] = 	&Vertices[cpidx[5]];
-			v[6] = 	&Vertices[cpidx[6]];
-			v[7] = 	&Vertices[cpidx[7]];
-			v[8] = 	&Vertices[cpidx[8]];
+			v[1] = &Vertices[cpidx[1]];
+			v[2] = &Vertices[cpidx[2]];
+			v[3] = &Vertices[cpidx[3]];
+			v[4] = &Vertices[cpidx[4]];
+			v[5] = &Vertices[cpidx[5]];
+			v[6] = &Vertices[cpidx[6]];
+			v[7] = &Vertices[cpidx[7]];
+			v[8] = &Vertices[cpidx[8]];
 
 
 			s32 dos;
@@ -1367,8 +1399,6 @@ void CQ3LevelMesh::createCurvedSurface(SMeshBufferLightMap* meshBuffer, s32 i)
 					meshBuffer->Vertices.push_back(currentVertex[2]);
 					meshBuffer->Vertices.push_back(currentVertex[1]);
 
-					meshBuffer->Vertices.push_back(currentVertex[1]);
-					meshBuffer->Vertices.push_back(currentVertex[2]);
 					meshBuffer->Vertices.push_back(currentVertex[3]);
 
 					// add indexes
@@ -1376,9 +1406,9 @@ void CQ3LevelMesh::createCurvedSurface(SMeshBufferLightMap* meshBuffer, s32 i)
 					meshBuffer->Indices.push_back(idx+1);
 					meshBuffer->Indices.push_back(idx+2);
 					// add indexes
+					meshBuffer->Indices.push_back(idx+2);
+					meshBuffer->Indices.push_back(idx+1);
 					meshBuffer->Indices.push_back(idx+3);
-					meshBuffer->Indices.push_back(idx+4);
-					meshBuffer->Indices.push_back(idx+5);
 				}
 			}
 		}
@@ -1387,7 +1417,7 @@ void CQ3LevelMesh::createCurvedSurface(SMeshBufferLightMap* meshBuffer, s32 i)
 
 
 //! get's an interface to the entities
-const quake3::tQ3EntityList & CQ3LevelMesh::getEntityList ()
+const quake3::tQ3EntityList & CQ3LevelMesh::getEntityList()
 {
 	Entity.sort();
 	return Entity;
@@ -1396,11 +1426,11 @@ const quake3::tQ3EntityList & CQ3LevelMesh::getEntityList ()
 
 /*!
 */
-const quake3::SShader * CQ3LevelMesh::getShader ( u32 index  ) const
+const quake3::SShader * CQ3LevelMesh::getShader(u32 index) const
 {
 	index &= 0xFFFF;
 
-	if ( index < Shader.size () )
+	if ( index < Shader.size() )
 	{
 		return &Shader[index];
 	}
@@ -1410,16 +1440,16 @@ const quake3::SShader * CQ3LevelMesh::getShader ( u32 index  ) const
 
 
 //! loads the shader definition
-//  either from file ( we assume /scripts on fileNameIsValid == 0 )
-const quake3::SShader * CQ3LevelMesh::getShader ( const c8 * filename, s32 fileNameIsValid )
+const quake3::SShader * CQ3LevelMesh::getShader( const c8 * filename, bool fileNameIsValid )
 {
 	quake3::SShader search;
 	search.name = filename;
+	search.name.replace( '\\', '/' );
 
 	s32 index;
 
 	//! is Shader already in cache?
-	index = Shader.linear_search ( search );
+	index = Shader.linear_search( search );
 	if ( index >= 0 )
 	{
 		return &Shader[index];
@@ -1427,59 +1457,59 @@ const quake3::SShader * CQ3LevelMesh::getShader ( const c8 * filename, s32 fileN
 
 	core::stringc loadFile;
 
-	if ( 0 == fileNameIsValid )
+	if ( !fileNameIsValid )
 	{
 		// extract the shader name from the last path component in filename
 		// "scripts/[name].shader"
-		core::stringc cut ( filename );
+		core::stringc cut( search.name );
 
-		s32 end = cut.findLast ( '/' );
-		s32 start = cut.findLast ( '/', end - 1 );
+		s32 end = cut.findLast( '/' );
+		s32 start = cut.findLast( '/', end - 1 );
 
 		loadFile = "scripts";
-		loadFile.append ( cut.subString ( start, end - start ) );
-		loadFile.append ( ".shader" );
+		loadFile.append( cut.subString( start, end - start ) );
+		loadFile.append( ".shader" );
 	}
 	else
 	{
-		loadFile = filename;
+		loadFile = search.name;
 	}
 
 	// already loaded the file ?
-	index = ShaderFile.binary_search ( loadFile );
+	index = ShaderFile.binary_search( loadFile );
 	if ( index >= 0 )
 		return 0;
 
-	if ( !FileSystem->existFile ( loadFile.c_str () ) )
+	// add file to loaded files
+	ShaderFile.push_back( loadFile );
+
+	if ( !FileSystem->existFile( loadFile.c_str() ) )
 		return 0;
 
-	io::IReadFile *file = FileSystem->createAndOpenFile ( loadFile.c_str () );
+	io::IReadFile *file = FileSystem->createAndOpenFile( loadFile.c_str() );
 	if ( 0 == file )
 		return 0;
 
 	core::stringc message;
-	message = loadFile + " for " + core::stringc ( filename );
+	message = loadFile + " for " + core::stringc( filename );
 	os::Printer::log("Loaded shader", message.c_str(), ELL_INFORMATION);
 
-	// add file to loaded files
-	ShaderFile.push_back ( loadFile );
-
 	// load script
 	core::array<u8> script;
-	const long len = file->getSize ();
+	const long len = file->getSize();
 
-	script.set_used ( len + 2 );
+	script.set_used( len + 2 );
 	script[ len + 1 ] = 0;
 
 	file->seek( 0 );
-	file->read ( script.pointer(), len );
-	file->drop ();
+	file->read( script.pointer(), len );
+	file->drop();
 
 	// start a parser instance
-	parser_parse ( script.pointer(), len, &CQ3LevelMesh::scriptcallback_shader );
+	parser_parse( script.pointer(), len, &CQ3LevelMesh::scriptcallback_shader );
 
 	// search again
-	index = Shader.linear_search ( search );
+	index = Shader.linear_search( search );
 	if ( index >= 0 )
 		return &Shader[index];
 
@@ -1488,9 +1518,9 @@ const quake3::SShader * CQ3LevelMesh::getShader ( const c8 * filename, s32 fileN
 
 
 //! adding default shaders
-void CQ3LevelMesh::InitShader ()
+void CQ3LevelMesh::InitShader()
 {
-	ReleaseShader ();
+	ReleaseShader();
 
 	quake3::SShader element;
 
@@ -1498,62 +1528,61 @@ void CQ3LevelMesh::InitShader ()
 	quake3::SVariable variable;
 
 	variable.name = "noshader";
-	group.Variable.push_back ( variable );
+	group.Variable.push_back( variable );
 
-	element.VarGroup = new quake3::SVarGroupList ();
-	element.VarGroup->VariableGroup.push_back ( group );
-	element.name = element.VarGroup->VariableGroup[0].Variable[0].name.c_str ();
-	Shader.push_back ( element );
+	element.VarGroup = new quake3::SVarGroupList();
+	element.VarGroup->VariableGroup.push_back( group );
+	element.name = element.VarGroup->VariableGroup[0].Variable[0].name.c_str();
+	Shader.push_back( element );
 
 	// load common named shader
-	getShader ( "scripts/common.shader", 1 );
+	getShader("scripts/common.shader");
 }
 
 
-//!. script callback for shaders
+//! script callback for shaders
 //! i'm having troubles with the reference counting, during callback.. resorting..
-void CQ3LevelMesh::ReleaseShader ()
+void CQ3LevelMesh::ReleaseShader()
 {
 	for ( u32 i = 0; i!= Shader.size(); ++i )
 	{
-		Shader[i].VarGroup->drop ();
+		Shader[i].VarGroup->drop();
 	}
-	Shader.clear ();
+	Shader.clear();
 	ShaderFile.clear();
 }
 
-void CQ3LevelMesh::ReleaseEntity ()
+
+void CQ3LevelMesh::ReleaseEntity()
 {
 	for ( u32 i = 0; i!= Entity.size(); ++i )
 	{
-		Entity[i].VarGroup->drop ();
+		Entity[i].VarGroup->drop();
 	}
-	Entity.clear ();
-
+	Entity.clear();
 }
 
 
 // entity only has only one valid level.. and no assoziative name..
-void CQ3LevelMesh::scriptcallback_entity ( quake3::SVarGroupList *& grouplist )
+void CQ3LevelMesh::scriptcallback_entity( quake3::SVarGroupList *& grouplist )
 {
 	quake3::SEntity element;
 
-	if ( grouplist->VariableGroup.size () != 2 )
+	if ( grouplist->VariableGroup.size() != 2 )
 		return;
 
+	element.name = grouplist->VariableGroup[1].get( "classname" );
 
-	element.name = grouplist->VariableGroup[1].get ( "classname" );
-
-	grouplist->grab ();
+	grouplist->grab();
 	element.VarGroup = grouplist;
 	element.id = Shader.size();
 
-	Entity.push_back ( element );
+	Entity.push_back( element );
 }
 
 
 //!. script callback for shaders
-void CQ3LevelMesh::scriptcallback_shader ( quake3::SVarGroupList *& grouplist )
+void CQ3LevelMesh::scriptcallback_shader( quake3::SVarGroupList *& grouplist )
 {
 	quake3::SShader element;
 
@@ -1562,13 +1591,13 @@ void CQ3LevelMesh::scriptcallback_shader ( quake3::SVarGroupList *& grouplist )
 		return;
 	// end fix
 
-	grouplist->grab ();
+	grouplist->grab();
 
 	element.VarGroup = grouplist;
-	element.name = element.VarGroup->VariableGroup[0].Variable[0].name.c_str ();
+	element.name = element.VarGroup->VariableGroup[0].Variable[0].name.c_str();
 	element.id = Shader.size();
 
-	Shader.push_back ( element );
+	Shader.push_back( element );
 }
 
 
@@ -1637,8 +1666,8 @@ void CQ3LevelMesh::loadTextures()
 			lmapsize,
 			LightMaps[t-1].imageBits, true, false );
 
-		lig[t] = Driver->addTexture ( lightmapname, lmapImg );
-		lmapImg->drop ();
+		lig[t] = Driver->addTexture( lightmapname, lmapImg );
+		lmapImg->drop();
 
 	}
 	//Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState);
@@ -1657,13 +1686,14 @@ void CQ3LevelMesh::loadTextures()
 				b->Material.MaterialType = video::EMT_SOLID;
 
 			if (!b->Material.getTexture(0))
- 				b->Material.MaterialType = video::EMT_SOLID;
+				b->Material.MaterialType = video::EMT_SOLID;
 		}
 	}
 }
 
+
 // delete all buffers without geometry in it.
-void CQ3LevelMesh::cleanMeshes ()
+void CQ3LevelMesh::cleanMeshes()
 {
 	// delete all buffers without geometry in it.
 	for ( u32 g = 0; g < quake3::E_Q3_MESH_SIZE; ++g )
@@ -1685,11 +1715,11 @@ void CQ3LevelMesh::cleanMeshes ()
 				++i;
 		}
 	}
-
 }
 
+
 // recalculate bounding boxes
-void CQ3LevelMesh::calcBoundingBoxes ()
+void CQ3LevelMesh::calcBoundingBoxes()
 {
 	// create bounding box
 	for ( u32 g = 0; g != quake3::E_Q3_MESH_SIZE; ++g )
@@ -1706,7 +1736,7 @@ void CQ3LevelMesh::calcBoundingBoxes ()
 
 /*
 //! loads a texture
-video::ITexture* CQ3LevelMesh::loadTexture ( const tStringList &stringList )
+video::ITexture* CQ3LevelMesh::loadTexture( const tStringList &stringList )
 {
 	static const char * extension[2] =
 	{
@@ -1715,13 +1745,13 @@ video::ITexture* CQ3LevelMesh::loadTexture ( const tStringList &stringList )
 	};
 
 	core::stringc loadFile;
-	for ( u32 i = 0; i!= stringList.size (); ++i )
+	for ( u32 i = 0; i!= stringList.size(); ++i )
 	{
 		for ( u32 g = 0; g != 2 ; ++g )
 		{
-			cutFilenameExtension ( loadFile, stringList[i] ).append ( extension[g] );
+			cutFilenameExtension( loadFile, stringList[i] ).append( extension[g] );
 
-			if ( FileSystem->existFile ( loadFile.c_str() ) )
+			if ( FileSystem->existFile( loadFile.c_str() ) )
 			{
 				video::ITexture* t = Driver->getTexture( loadFile.c_str() );
 				if ( t )
@@ -1758,8 +1788,8 @@ void CQ3LevelMesh::loadTextures2()
 			lmapsize,
 			LightMaps[t].imageBits, true, false );
 
-		Lightmap[t] = Driver->addTexture ( lightmapname, lmapImg );
-		lmapImg->drop ();
+		Lightmap[t] = Driver->addTexture( lightmapname, lmapImg );
+		lmapImg->drop();
 
 	}
 
@@ -1772,6 +1802,12 @@ void CQ3LevelMesh::loadTextures2()
 	core::stringc check;
 	quake3::tTexArray textureArray;
 
+	// pre-load shaders
+	for ( t=0; t< NumTextures; ++t)
+	{
+		shader = getShader(Textures[t].strName, false);
+	}
+
 	for ( t=0; t< NumTextures; ++t)
 	{
 		Tex[t].ShaderID = -1;
@@ -1780,7 +1816,7 @@ void CQ3LevelMesh::loadTextures2()
 		list = "";
 
 		// get a shader ( if one exists )
-		shader = getShader ( Textures[t].strName, 0 );
+		shader = getShader( Textures[t].strName, false);
 		if ( shader )
 		{
 			Tex[t].ShaderID = shader->id;
@@ -1788,10 +1824,10 @@ void CQ3LevelMesh::loadTextures2()
 			// if texture name == stage1 Texture map
 			const quake3::SVarGroup * group;
 
-			group = shader->getGroup ( 2 );
+			group = shader->getGroup( 2 );
 			if ( group )
 			{
-				if ( core::cutFilenameExtension ( check, group->get ( "map" ) ) == Textures[t].strName )
+				if ( core::cutFilenameExtension( check, group->get( "map" ) ) == Textures[t].strName )
 				{
 					list += check;
 				}
@@ -1799,9 +1835,9 @@ void CQ3LevelMesh::loadTextures2()
 				if ( check == "$lightmap" )
 				{
 					// we check if lightmap is in stage 1 and texture in stage 2
-					group = shader->getGroup ( 3 );
+					group = shader->getGroup( 3 );
 					if ( group )
-						list += group->get ( "map" );
+						list += group->get( "map" );
 				}
 			}
 		}
@@ -1812,7 +1848,7 @@ void CQ3LevelMesh::loadTextures2()
 		}
 
 		u32 pos = 0;
-		quake3::getTextures ( textureArray, list, pos, FileSystem, Driver );
+		quake3::getTextures( textureArray, list, pos, FileSystem, Driver );
 
 		Tex[t].Texture = textureArray[0];
 	}
diff --git a/src/dep/src/irrlicht/CQ3LevelMesh.h b/src/dep/src/irrlicht/CQ3LevelMesh.h
index 95ff959..ca08ba3 100644
--- a/src/dep/src/irrlicht/CQ3LevelMesh.h
+++ b/src/dep/src/irrlicht/CQ3LevelMesh.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -24,21 +24,26 @@ namespace scene
 	public:
 
 		//! constructor
-		CQ3LevelMesh(io::IFileSystem* fs, video::IVideoDriver* driver,  scene::ISceneManager* smgr);
+		CQ3LevelMesh(io::IFileSystem* fs, scene::ISceneManager* smgr);
 
 		//! destructor
 		virtual ~CQ3LevelMesh();
 
-		//! loads a level from a .bsp-File. Also tries to load all needed textures. Returns true if successful.
+		//! loads a level from a .bsp-File. Also tries to load all
+		//! needed textures. Returns true if successful.
 		bool loadFile(io::IReadFile* file);
 
-		//! returns the amount of frames in milliseconds. If the amount is 1, it is a static (=non animated) mesh.
+		//! returns the amount of frames in milliseconds. If the amount
+		//! is 1, it is a static (=non animated) mesh.
 		virtual u32 getFrameCount() const;
 
-		//! returns the animated mesh based on a detail level. 0 is the lowest, 255 the highest detail. Note, that some Meshes will ignore the detail level.
-		virtual IMesh* getMesh(s32 frameInMs, s32 detailLevel=255, s32 startFrameLoop=-1, s32 endFrameLoop=-1);
+		//! returns the animated mesh based on a detail level. 0 is the
+		//! lowest, 255 the highest detail. Note, that some Meshes will
+		//! ignore the detail level.
+		virtual IMesh* getMesh(s32 frameInMs, s32 detailLevel=255,
+				s32 startFrameLoop=-1, s32 endFrameLoop=-1);
 
-		virtual void releaseMesh ( s32 index );
+		virtual void releaseMesh( s32 index );
 
 		//! Returns an axis aligned bounding box of the mesh.
 		//! \return A bounding box of this mesh is returned.
@@ -51,14 +56,14 @@ namespace scene
 		virtual E_ANIMATED_MESH_TYPE getMeshType() const;
 
 		//! loads the shader definition
-		virtual const quake3::SShader * getShader ( const c8 * filename, s32 fileNameIsValid );
+		virtual const quake3::SShader * getShader( const c8 * filename, bool fileNameIsValid=true );
 
 		//! returns a already loaded Shader
-		virtual const quake3::SShader * getShader ( u32 index  ) const;
+		virtual const quake3::SShader * getShader( u32 index  ) const;
 
 
 		//! get's an interface to the entities
-		virtual const quake3::tQ3EntityList & getEntityList ();
+		virtual const quake3::tQ3EntityList & getEntityList();
 
 
 
@@ -79,8 +84,7 @@ namespace scene
 
 		//! Returns pointer to a mesh buffer which fits a material
  		/** \param material: material to search for
-		\return Returns the pointer to the mesh buffer or
-		NULL if there is no such mesh buffer. */
+		\return Pointer to the mesh buffer or 0 if there is no such mesh buffer. */
 		virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const
 		{
 			return 0;
@@ -91,8 +95,17 @@ namespace scene
 			return;
 		}
 
+		//! set the hardware mapping hint, for driver
+		virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX)
+		{
+			return;
+		}
 
-
+		//! flags the meshbuffer as changed, reloads hardware buffers
+		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX)
+		{
+			return;
+		}
 
 	private:
 
@@ -259,38 +272,32 @@ namespace scene
 			u8 direction[2];   // The direction of the light: [phi,theta]
 		};
 
-		void loadTextures	(tBSPLump* l, io::IReadFile* file);		// Load the textures
-		void loadLightmaps  (tBSPLump* l, io::IReadFile* file);      // Load the lightmaps
-		void loadVerts      (tBSPLump* l, io::IReadFile* file);		// Load the vertices
-		void loadFaces      (tBSPLump* l, io::IReadFile* file);		// Load the faces
-		void loadPlanes     (tBSPLump* l, io::IReadFile* file);		// Load the Planes of the BSP
-		void loadNodes      (tBSPLump* l, io::IReadFile* file);		// load the Nodes of the BSP
-		void loadLeafs      (tBSPLump* l, io::IReadFile* file);		// load the Leafs of the BSP
-		void loadLeafFaces  (tBSPLump* l, io::IReadFile* file);		// load the Faces of the Leafs of the BSP
-		void loadVisData    (tBSPLump* l, io::IReadFile* file);		// load the visibility data of the clusters
-		void loadEntities   (tBSPLump* l, io::IReadFile* file);		// load the entities
-		void loadModels     (tBSPLump* l, io::IReadFile* file);		// load the models
-		void loadMeshVerts  (tBSPLump* l, io::IReadFile* file);		// load the mesh vertices
-		void loadBrushes    (tBSPLump* l, io::IReadFile* file);		// load the brushes of the BSP
-		void loadBrushSides (tBSPLump* l, io::IReadFile* file);		// load the brushsides of the BSP
-		void loadLeafBrushes(tBSPLump* l, io::IReadFile* file);		// load the brushes of the leaf
-		void loadShaders	(tBSPLump* l, io::IReadFile* file);		// load the shaders
+		void loadTextures   (tBSPLump* l, io::IReadFile* file); // Load the textures
+		void loadLightmaps  (tBSPLump* l, io::IReadFile* file); // Load the lightmaps
+		void loadVerts      (tBSPLump* l, io::IReadFile* file); // Load the vertices
+		void loadFaces      (tBSPLump* l, io::IReadFile* file); // Load the faces
+		void loadPlanes     (tBSPLump* l, io::IReadFile* file); // Load the Planes of the BSP
+		void loadNodes      (tBSPLump* l, io::IReadFile* file); // load the Nodes of the BSP
+		void loadLeafs      (tBSPLump* l, io::IReadFile* file); // load the Leafs of the BSP
+		void loadLeafFaces  (tBSPLump* l, io::IReadFile* file); // load the Faces of the Leafs of the BSP
+		void loadVisData    (tBSPLump* l, io::IReadFile* file); // load the visibility data of the clusters
+		void loadEntities   (tBSPLump* l, io::IReadFile* file); // load the entities
+		void loadModels     (tBSPLump* l, io::IReadFile* file); // load the models
+		void loadMeshVerts  (tBSPLump* l, io::IReadFile* file); // load the mesh vertices
+		void loadBrushes    (tBSPLump* l, io::IReadFile* file); // load the brushes of the BSP
+		void loadBrushSides (tBSPLump* l, io::IReadFile* file); // load the brushsides of the BSP
+		void loadLeafBrushes(tBSPLump* l, io::IReadFile* file); // load the brushes of the leaf
+		void loadShaders    (tBSPLump* l, io::IReadFile* file); // load the shaders
 
 		// second parameter i is the zero based index of the current face.
 		void createCurvedSurface(SMeshBufferLightMap* meshBuffer, s32 i);
 
 		//bi-quadratic bezier patches
-		void createCurvedSurface2 (	SMeshBufferLightMap* meshBuffer,
-									s32 faceIndex,
-									s32 patchTesselation,
-									s32 storevertexcolor
-								);
+		void createCurvedSurface2(SMeshBufferLightMap* meshBuffer,
+				s32 faceIndex, s32 patchTesselation, s32 storevertexcolor);
 
-		void createCurvedSurface3 (	SMeshBufferLightMap* meshBuffer,
-									s32 faceIndex,
-									s32 patchTesselation,
-									s32 storevertexcolor
-								);
+		void createCurvedSurface3(SMeshBufferLightMap* meshBuffer,
+				s32 faceIndex, s32 patchTesselation, s32 storevertexcolor);
 
 		f32 Blend( const f64 s[3], const f64 t[3], const tBSPVertex *v[9], int offset);
 
@@ -302,27 +309,28 @@ namespace scene
 			core::vector2d<f64> TCoords;
 			core::vector2d<f64> TCoords2;
 
-			void copyto ( video::S3DVertex2TCoords &dest ) const;
+			void copyto( video::S3DVertex2TCoords &dest ) const;
 
 			S3DVertex2TCoords_64() {}
 			S3DVertex2TCoords_64(const core::vector3d<f64>& pos, const core::vector3d<f64>& normal, const video::SColorf& color,
 				const core::vector2d<f64>& tcoords, const core::vector2d<f64>& tcoords2)
 				: Pos(pos), Normal(normal), Color(color), TCoords(tcoords), TCoords2(tcoords2) {}
 
-			S3DVertex2TCoords_64 getInterpolated_quadratic(const S3DVertex2TCoords_64& v2, const S3DVertex2TCoords_64& v3, const f64 d) const
+			S3DVertex2TCoords_64 getInterpolated_quadratic(const S3DVertex2TCoords_64& v2,
+					const S3DVertex2TCoords_64& v3, const f64 d) const
 			{
 				return S3DVertex2TCoords_64 (
 						Pos.getInterpolated_quadratic ( v2.Pos, v3.Pos, d  ),
 						Normal.getInterpolated_quadratic ( v2.Normal, v3.Normal, d ),
 						Color.getInterpolated_quadratic ( v2.Color, v3.Color, (f32) d ),
 						TCoords.getInterpolated_quadratic ( v2.TCoords, v3.TCoords, d ),
-						TCoords2.getInterpolated_quadratic ( v2.TCoords2, v3.TCoords2, d )
-					);
+						TCoords2.getInterpolated_quadratic ( v2.TCoords2, v3.TCoords2, d ));
 			}
 		};
 
-		inline void copy ( video::S3DVertex2TCoords * dest, const tBSPVertex * source, s32 vertexcolor ) const;
-		void copy ( S3DVertex2TCoords_64 * dest, const tBSPVertex * source, s32 vertexcolor ) const;
+		inline void copy( video::S3DVertex2TCoords * dest, const tBSPVertex * source,
+				s32 vertexcolor ) const;
+		void copy( S3DVertex2TCoords_64 * dest, const tBSPVertex * source, s32 vertexcolor ) const;
 
 
 		struct SBezier
@@ -406,24 +414,24 @@ namespace scene
 		SQ3Parser Parser;
 
 
-		typedef void ( CQ3LevelMesh::*tParserCallback ) ( quake3::SVarGroupList *& groupList );
-		void parser_parse ( const void * data, u32 size, tParserCallback callback );
-		void parser_nextToken ();
+		typedef void( CQ3LevelMesh::*tParserCallback ) ( quake3::SVarGroupList *& groupList );
+		void parser_parse( const void * data, u32 size, tParserCallback callback );
+		void parser_nextToken();
 
-		void dumpVarGroup ( const quake3::SVarGroup * group, s32 stack ) const;
+		void dumpVarGroup( const quake3::SVarGroup * group, s32 stack ) const;
 
-		void scriptcallback_entity ( quake3::SVarGroupList *& grouplist );
+		void scriptcallback_entity( quake3::SVarGroupList *& grouplist );
 		quake3::tQ3EntityList Entity;
 
-		void scriptcallback_shader ( quake3::SVarGroupList *& grouplist );
+		void scriptcallback_shader( quake3::SVarGroupList *& grouplist );
 		core::array < quake3::SShader > Shader;
 		quake3::tStringList ShaderFile;
-		void InitShader ();
-		void ReleaseShader ();
-		void ReleaseEntity ();
+		void InitShader();
+		void ReleaseShader();
+		void ReleaseEntity();
 
 
-		s32 setShaderMaterial ( video::SMaterial & material, const tBSPFace * face ) const;
+		s32 setShaderMaterial( video::SMaterial & material, const tBSPFace * face ) const;
 
 		struct SToBuffer
 		{
@@ -431,8 +439,8 @@ namespace scene
 			u32 index;
 		};
 
-		void cleanMeshes ();
-		void calcBoundingBoxes ();
+		void cleanMeshes();
+		void calcBoundingBoxes();
 
 	};
 
diff --git a/src/dep/src/irrlicht/CQuake3ShaderSceneNode.cpp b/src/dep/src/irrlicht/CQuake3ShaderSceneNode.cpp
index 3126a9f..9f8e353 100644
--- a/src/dep/src/irrlicht/CQuake3ShaderSceneNode.cpp
+++ b/src/dep/src/irrlicht/CQuake3ShaderSceneNode.cpp
@@ -1,11 +1,19 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
+#include "IrrCompileConfig.h"
+
+#ifdef _IRR_COMPILE_WITH_BSP_LOADER_
+
 #include "CQuake3ShaderSceneNode.h"
+#include "ISceneManager.h"
 #include "IVideoDriver.h"
 #include "ICameraSceneNode.h"
 #include "SViewFrustum.h"
+#include "IMeshManipulator.h"
+#include "SMesh.h"
+#include "IMaterialRenderer.h"
 
 namespace irr
 {
@@ -17,7 +25,8 @@ CQuake3ShaderSceneNode::CQuake3ShaderSceneNode(
 			scene::ISceneNode* parent, scene::ISceneManager* mgr,s32 id,
 			io::IFileSystem *fileSystem, scene::IMeshBuffer *buffer,
 			const quake3::SShader * shader)
-	: scene::ISceneNode(parent, mgr, id), Shader ( shader ),TimeAbs ( 0.f )
+	: scene::ISceneNode(parent, mgr, id), MeshBuffer(0), Original(0),
+	Shader(shader), TimeAbs(0.f)
 {
 	#ifdef _DEBUG
 		core::stringc dName = "CQuake3ShaderSceneNode ";
@@ -26,129 +35,154 @@ CQuake3ShaderSceneNode::CQuake3ShaderSceneNode(
 		setDebugName( dName.c_str() );
 	#endif
 
+	MeshBuffer = new SMeshBuffer();
+	Original = new SMeshBufferLightMap();
+
 	// name the Scene Node
 	this->Name = Shader->name;
 
 	// clone meshbuffer to modifiable buffer
-	cloneBuffer ( static_cast< scene::SMeshBufferLightMap *> ( buffer ) );
+	cloneBuffer( static_cast< scene::SMeshBufferLightMap *>( buffer ) );
 
 	// load all Textures in all stages
-	loadTextures ( fileSystem );
+	loadTextures( fileSystem );
+
+	setAutomaticCulling( scene::EAC_BOX );
 }
 
-/*
-*/
-CQuake3ShaderSceneNode::~CQuake3ShaderSceneNode ()
+
+CQuake3ShaderSceneNode::~CQuake3ShaderSceneNode()
 {
+	if (MeshBuffer)
+		MeshBuffer->drop();
+	if (Original)
+		Original->drop();
 }
 
+
 /*
 	create single copies
 */
-void CQuake3ShaderSceneNode::cloneBuffer ( scene::SMeshBufferLightMap * buffer )
+void CQuake3ShaderSceneNode::cloneBuffer( scene::SMeshBufferLightMap * buffer )
 {
-	Original.Material = buffer->Material;
-	MeshBuffer.Material = buffer->Material;
+	Original->Material = buffer->Material;
+	MeshBuffer->Material = buffer->Material;
 
-	Original.Indices = buffer->Indices;
-	MeshBuffer.Indices = buffer->Indices;
+	Original->Indices = buffer->Indices;
+	MeshBuffer->Indices = buffer->Indices;
 
-	const u32 vsize = buffer->Vertices.size ();
+	const u32 vsize = buffer->Vertices.size();
 
-	Original.Vertices.set_used ( vsize );
-	MeshBuffer.Vertices.set_used ( vsize );
+	Original->Vertices.reallocate( vsize );
+	MeshBuffer->Vertices.reallocate( vsize );
 	for ( u32 i = 0; i!= vsize; ++i )
 	{
-		const video::S3DVertex2TCoords * src = &buffer->Vertices[i];
-		Original.Vertices[i] = *src;
+		const video::S3DVertex2TCoords& src = buffer->Vertices[i];
 
-		video::S3DVertex * d = &MeshBuffer.Vertices[i];
+		// Original has same Vertex Format
+		Original->Vertices.push_back(src);
 
-		d->Pos = src->Pos;
-		d->Color = 0xFFFFFFFF; //src->Color;
-		d->Normal = src->Normal;
-		d->TCoords = src->TCoords;
+		// we have a different vertex format
+		MeshBuffer->Vertices.push_back(src);
+		MeshBuffer->Vertices.getLast().Color=0xFFFFFFFF;
 	}
 
-	MeshBuffer.recalculateBoundingBox ();
-	// used for sorting
-	MeshBuffer.Material.setTexture(0, (video::ITexture*) Shader);
-}
+	MeshBuffer->recalculateBoundingBox();
 
+#if 1
+	// move the (temp) Mesh
+	{
+		// original bounding box
+		const core::aabbox3df& b = MeshBuffer->getBoundingBox();
+
+		// set Scene Node Position
+		setPosition( b.getCenter() );
+
+		core::matrix4 m;
+		m.setTranslation( -b.getCenter() );
+		SceneManager->getMeshManipulator()->transform( Original, m );
+		SceneManager->getMeshManipulator()->transform( MeshBuffer, m );
+
+		MeshBuffer->recalculateBoundingBox();
+	}
+#endif
+	// used for sorting
+	MeshBuffer->Material.setTexture(0, (video::ITexture*) Shader);
+}
 
 
 /*
 	load the textures for all stages
 */
-void CQuake3ShaderSceneNode::loadTextures ( io::IFileSystem * fileSystem )
+void CQuake3ShaderSceneNode::loadTextures( io::IFileSystem * fileSystem )
 {
 	const quake3::SVarGroup *group;
 	u32 i;
 
 	// clear all stages and prefill empty
-	Q3Texture.clear ();
-	for ( i = 0; i != Shader->VarGroup->VariableGroup.size (); ++i )
+	Q3Texture.clear();
+	for ( i = 0; i != Shader->VarGroup->VariableGroup.size(); ++i )
 	{
-		Q3Texture.push_back ( SQ3Texture() );
+		Q3Texture.push_back( SQ3Texture() );
 	}
 
 	u32 pos;
 
 	// get texture map
-	for ( i = 0; i < Shader->VarGroup->VariableGroup.size (); ++i )
+	for ( i = 0; i < Shader->VarGroup->VariableGroup.size(); ++i )
 	{
-		group = Shader->getGroup ( i );
+		group = Shader->getGroup( i );
 
-		const core::stringc &mapname = group->get ( "map" );
-		if ( 0 == mapname.size () )
+		const core::stringc &mapname = group->get( "map" );
+		if ( 0 == mapname.size() )
 			continue;
 
 		// our lightmap is passed in material.Texture[2]
 		if ( mapname == "$lightmap" )
 		{
-			Q3Texture [i].Texture.push_back ( Original.getMaterial().getTexture(1) );
+			Q3Texture [i].Texture.push_back( Original->getMaterial().getTexture(1) );
 		}
 		else
 		{
 			pos = 0;
-			quake3::getTextures ( Q3Texture [i].Texture, mapname, pos, fileSystem, SceneManager->getVideoDriver() );
+			quake3::getTextures( Q3Texture [i].Texture, mapname, pos, fileSystem, SceneManager->getVideoDriver() );
 		}
 	}
 
 	// get anim map
-	for ( i = 0; i < Shader->VarGroup->VariableGroup.size (); ++i )
+	for ( i = 0; i < Shader->VarGroup->VariableGroup.size(); ++i )
 	{
 		if ( Q3Texture [i].Texture.size() )
 			continue;
 
-		group = Shader->getGroup ( i );
+		group = Shader->getGroup( i );
 
-		const core::stringc &animmap = group->get ( "animmap" );
-		if ( 0 == animmap.size () )
+		const core::stringc &animmap = group->get( "animmap" );
+		if ( 0 == animmap.size() )
 			continue;
 
 		// first parameter is frequency
 		pos = 0;
-		Q3Texture [i].TextureFrequency = core::max_ ( 0.0001f, quake3::getAsFloat ( animmap, pos ) );
+		Q3Texture [i].TextureFrequency = core::max_( 0.0001f, quake3::getAsFloat( animmap, pos ) );
 
-		quake3::getTextures ( Q3Texture [i].Texture, animmap, pos,fileSystem, SceneManager->getVideoDriver() );
+		quake3::getTextures( Q3Texture [i].Texture, animmap, pos,fileSystem, SceneManager->getVideoDriver() );
 	}
 
 	// get clamp map
-	for ( i = 0; i < Shader->VarGroup->VariableGroup.size (); ++i )
+	for ( i = 0; i < Shader->VarGroup->VariableGroup.size(); ++i )
 	{
 		if ( Q3Texture [i].Texture.size() )
 			continue;
 
-		group = Shader->getGroup ( i );
+		group = Shader->getGroup( i );
 
-		const core::stringc &clampmap = group->get ( "clampmap" );
-		if ( 0 == clampmap.size () )
+		const core::stringc &clampmap = group->get( "clampmap" );
+		if ( 0 == clampmap.size() )
 			continue;
 
 		Q3Texture [i].TextureAddressMode = video::ETC_CLAMP;
 		pos = 0;
-		quake3::getTextures ( Q3Texture [i].Texture, clampmap, pos,fileSystem, SceneManager->getVideoDriver() );
+		quake3::getTextures( Q3Texture [i].Texture, clampmap, pos,fileSystem, SceneManager->getVideoDriver() );
 	}
 }
 
@@ -157,33 +191,55 @@ void CQuake3ShaderSceneNode::loadTextures ( io::IFileSystem * fileSystem )
 */
 void CQuake3ShaderSceneNode::OnRegisterSceneNode()
 {
-	PassedCulling = 0;
-	StageCall = 0;
-	if ( !IsVisible)
-		return;
-
-	u32 first = 1;
-	for ( u32 i = 1; i < Q3Texture.size(); ++i )
+	if ( isVisible() )
 	{
-		if ( 0 == Q3Texture [ i ].Texture.size() && i >= 2 )
-			continue;
+		SceneManager->registerNodeForRendering(this, isTransparent() ? ESNRP_TRANSPARENT: ESNRP_SOLID );
+	}
+	ISceneNode::OnRegisterSceneNode();
+}
 
-		scene::E_SCENE_NODE_RENDER_PASS time = (scene::E_SCENE_NODE_RENDER_PASS) ( scene::ESNRP_SHADER_0 + i );
-		if ( first )
+/*
+	is this a transparent node ?
+*/
+bool CQuake3ShaderSceneNode::isTransparent() const
+{
+	bool ret = false;
+
+	// generic stage
+	const quake3::SVarGroup *group;
+	
+	group = Shader->getGroup( 1 );
+/*
+	if ( group->isDefined( "surfaceparm", "nonsolid" ) )
+	{
+		ret = true;
+	}
+*/
+	if ( group->isDefined( "surfaceparm", "trans" ) )
+	{
+		ret = true;
+	}
+	else
+	{
+		for ( u32 stage = 0; stage < Shader->VarGroup->VariableGroup.size(); ++stage )
 		{
-			setAutomaticCulling ( scene::EAC_BOX );
-			PassedCulling = SceneManager->registerNodeForRendering(this, time );
-			setAutomaticCulling ( scene::EAC_OFF );
-			first = 0;
-		}
-		else
-		if ( PassedCulling )
-		{
-			SceneManager->registerNodeForRendering(this, time );
+			if ( 0 == Q3Texture [ stage].Texture.size() )
+				continue;
+
+			group = Shader->getGroup( stage );
+			quake3::SBlendFunc blendfunc;
+			quake3::getBlendFunc( group->get( "blendfunc" ), blendfunc );
+			quake3::getBlendFunc( group->get( "alphafunc" ), blendfunc );
+
+			ret = blendfunc.isTransparent;
+			break;
 		}
 	}
+
+	return ret;
 }
 
+
 /*
 	render in multipass technique
 */
@@ -191,85 +247,97 @@ void CQuake3ShaderSceneNode::render()
 {
 	video::IVideoDriver* driver = SceneManager->getVideoDriver();
 
-	const u32 stage = SceneManager->getSceneNodeRenderPass() - scene::ESNRP_SHADER_0;
+	bool isTransparentPass =
+		SceneManager->getSceneNodeRenderPass() == scene::ESNRP_TRANSPARENT;
 
 	video::SMaterial material;
-
 	const quake3::SVarGroup *group;
 
-	// generic stage
-	group = Shader->getGroup ( 1 );
-	material.BackfaceCulling = quake3::getBackfaceCulling ( group->get ( "cull" ) );
-
-	// advance current stage
-	core::matrix4 texture;
-	animate ( stage, texture );
-
-	// stage 1 finished, no drawing stage ( vertex transform only )
-	if ( stage == 1 )
-		return;
-
-	// current stage
-	group = Shader->getGroup ( stage );
-
-
-	SQ3Texture &q = Q3Texture [ stage];
-
 	material.Lighting = false;
-	material.setTexture(0, q.Texture [ q.TextureIndex ]);
 	material.setTexture(1, 0);
-	material.ZBuffer = quake3::getDepthFunction ( group->get ( "depthfunc" ) );
-	material.ZWriteEnable = (0 == StageCall );
 	material.NormalizeNormals = false;
 
-	quake3::SBlendFunc blendfunc;
-	quake3::getBlendFunc ( group->get ( "blendfunc" ), blendfunc );
-	quake3::getBlendFunc ( group->get ( "alphafunc" ), blendfunc );
+	// generic stage
+	group = Shader->getGroup( 1 );
+	material.BackfaceCulling = quake3::isDisabled( group->get( "cull" ) );
 
-	material.MaterialType = blendfunc.type;
-	material.MaterialTypeParam = blendfunc.param;
+//	u32 zEnable = group->getIndex( "polygonoffset" ) >= 0;
 
-/*
-	if ( textureTransform )
+	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation );
+
+	u32 drawCount = 0;
+	for ( u32 stage = 0; stage < Shader->VarGroup->VariableGroup.size(); ++stage )
+	//for ( u32 stage = 2; stage < 3; ++stage )
 	{
-		transformtex ( texture, q.TextureAddressMode );
+		SQ3Texture &q = Q3Texture[stage];
+
+		// advance current stage
+		core::matrix4 texture;
+		animate( stage, texture );
+
+		// stage 1 finished, no drawing stage ( vertex transform only )
+		if ( 0 == q.Texture.size() )
+			continue;
+
+		// current stage
+		group = Shader->getGroup( stage );
+
+		material.setTexture(0, q.Texture[ q.TextureIndex ]);
+		material.ZBuffer = quake3::getDepthFunction( group->get( "depthfunc" ) );
+
+		if ( group->getIndex( "depthwrite" ) >= 0 )
+		{
+			material.ZWriteEnable = true;
+		}
+		else
+		{
+			material.ZWriteEnable = drawCount ? false: !isTransparentPass;
+		}
+
+		//resolve quake3 blendfunction to irrlicht Material Type
+		quake3::SBlendFunc blendfunc;
+		quake3::getBlendFunc( group->get( "blendfunc" ), blendfunc );
+		quake3::getBlendFunc( group->get( "alphafunc" ), blendfunc );
+
+		material.MaterialType = blendfunc.type;
+		material.MaterialTypeParam = blendfunc.param;
+
+		material.TextureLayer[0].TextureWrap = q.TextureAddressMode;
+		material.setTextureMatrix( 0, texture );
+
+		driver->setMaterial( material );
+		driver->drawMeshBuffer( MeshBuffer );
+		drawCount += 1;
 	}
-*/
-	material.TextureLayer[0].TextureWrap = q.TextureAddressMode;
-	material.TextureLayer[1].TextureWrap = material.TextureLayer[0].TextureWrap;
-	driver->setTransform ( video::ETS_TEXTURE_0, texture );
 
-	driver->setMaterial( material );
-
-	if ( 0 == StageCall )
+	if ( DebugDataVisible & scene::EDS_BBOX )
 	{
-		driver->setTransform(video::ETS_WORLD, core::matrix4() );
+		video::SMaterial deb_m;
+		deb_m.Lighting = false;
+		driver->setMaterial(deb_m);
+		driver->draw3DBox( getBoundingBox(), video::SColor(0,255,255,255));
 	}
-	
-	driver->drawMeshBuffer( &MeshBuffer );
-
-	StageCall += 1;
 }
 
 
 /*!
 */
-void CQuake3ShaderSceneNode::vertextransform_wave ( f32 dt, quake3::SModifierFunction &function )
+void CQuake3ShaderSceneNode::vertextransform_wave( f32 dt, quake3::SModifierFunction &function )
 {
-	function.wave = core::reciprocal ( function.wave );
+	function.wave = core::reciprocal( function.wave );
 
 	const f32 phase = function.phase;
 
-	const u32 vsize = MeshBuffer.Vertices.size();
+	const u32 vsize = MeshBuffer->Vertices.size();
 	for ( u32 i = 0; i != vsize; ++i )
 	{
-		const video::S3DVertex2TCoords &src = Original.Vertices[i];
-		video::S3DVertex &dst = MeshBuffer.Vertices[i];
+		const video::S3DVertex2TCoords &src = Original->Vertices[i];
+		video::S3DVertex &dst = MeshBuffer->Vertices[i];
 
-		f32 wavephase = (src.Pos.X + src.Pos.Y + src.Pos.Z) * function.wave;
+		const f32 wavephase = (src.Pos.X + src.Pos.Y + src.Pos.Z) * function.wave;
 		function.phase = phase + wavephase;
 
-		const f32 f = function.evaluate ( dt );
+		const f32 f = function.evaluate( dt );
 
 		dst.Pos.X = src.Pos.X + f * src.Normal.X;
 		dst.Pos.Y = src.Pos.Y + f * src.Normal.Y;
@@ -279,24 +347,24 @@ void CQuake3ShaderSceneNode::vertextransform_wave ( f32 dt, quake3::SModifierFun
 
 /*!
 */
-void CQuake3ShaderSceneNode::vertextransform_bulge ( f32 dt, quake3::SModifierFunction &function )
+void CQuake3ShaderSceneNode::vertextransform_bulge( f32 dt, quake3::SModifierFunction &function )
 {
 	function.func = 0;
-	function.wave = core::reciprocal ( function.bulgewidth );
+	function.wave = core::reciprocal( function.bulgewidth );
 
 	dt *= function.bulgespeed * 0.1f;
 	const f32 phase = function.phase;
 
-	const u32 vsize = MeshBuffer.Vertices.size();
+	const u32 vsize = MeshBuffer->Vertices.size();
 	for ( u32 i = 0; i != vsize; ++i )
 	{
-		const video::S3DVertex2TCoords &src = Original.Vertices[i];
-		video::S3DVertex &dst = MeshBuffer.Vertices[i];
+		const video::S3DVertex2TCoords &src = Original->Vertices[i];
+		video::S3DVertex &dst = MeshBuffer->Vertices[i];
 
-		f32 wavephase = (Original.Vertices[i].TCoords.X ) * function.wave;
+		const f32 wavephase = (Original->Vertices[i].TCoords.X ) * function.wave;
 		function.phase = phase + wavephase;
 
-		const f32 f = function.evaluate ( dt );
+		const f32 f = function.evaluate( dt );
 
 		dst.Pos.X = src.Pos.X + f * src.Normal.X;
 		dst.Pos.Y = src.Pos.Y + f * src.Normal.Y;
@@ -306,12 +374,12 @@ void CQuake3ShaderSceneNode::vertextransform_bulge ( f32 dt, quake3::SModifierFu
 
 /*!
 */
-void CQuake3ShaderSceneNode::vertextransform_autosprite ( f32 dt, quake3::SModifierFunction &function )
+void CQuake3ShaderSceneNode::vertextransform_autosprite( f32 dt, quake3::SModifierFunction &function )
 {
 	const core::matrix4 &m = SceneManager->getActiveCamera()->getViewFrustum()->Matrices [ video::ETS_VIEW ];
-	const core::vector3df view ( -m[2], -m[6] , -m[10] );
+	const core::vector3df view( -m[2], -m[6] , -m[10] );
 
-	const u32 vsize = MeshBuffer.Vertices.size();
+	const u32 vsize = MeshBuffer->Vertices.size();
 
 	core::aabbox3df box;
 	u32 g;
@@ -319,85 +387,109 @@ void CQuake3ShaderSceneNode::vertextransform_autosprite ( f32 dt, quake3::SModif
 	for ( u32 i = 0; i < vsize; i += 4 )
 	{
 		// in pairs of 4
-		box.reset ( Original.Vertices[i].Pos );
+		box.reset( Original->Vertices[i].Pos );
 		for ( g = 1; g != 4; ++g )
 		{
-			box.addInternalPoint ( Original.Vertices[i + g].Pos );
+			box.addInternalPoint( Original->Vertices[i + g].Pos );
 		}
 
-		core::vector3df c = box.getCenter ();
+		core::vector3df c = box.getCenter();
 		f32 sh = 0.5f * ( box.MaxEdge.Z - box.MinEdge.Z );
 		f32 sv = 0.5f * ( box.MaxEdge.Y - box.MinEdge.Y );
 
-		const core::vector3df h ( m[0] * sh, m[4] * sh, m[8] * sh );
-		const core::vector3df v ( m[1] * sv, m[5] * sv, m[9] * sv );
+		const core::vector3df h( m[0] * sh, m[4] * sh, m[8] * sh );
+		const core::vector3df v( m[1] * sv, m[5] * sv, m[9] * sv );
 
-		MeshBuffer.Vertices[ i + 0 ].Pos = c + h + v;
-		MeshBuffer.Vertices[ i + 1 ].Pos = c - h - v;
-		MeshBuffer.Vertices[ i + 2 ].Pos = c + h - v;
-		MeshBuffer.Vertices[ i + 3 ].Pos = c - h + v;
+		MeshBuffer->Vertices[ i + 0 ].Pos = c + h + v;
+		MeshBuffer->Vertices[ i + 1 ].Pos = c - h - v;
+		MeshBuffer->Vertices[ i + 2 ].Pos = c + h - v;
+		MeshBuffer->Vertices[ i + 3 ].Pos = c - h + v;
 
-		MeshBuffer.Vertices[ i + 0 ].Normal = view;
-		MeshBuffer.Vertices[ i + 1 ].Normal = view;
-		MeshBuffer.Vertices[ i + 2 ].Normal = view;
-		MeshBuffer.Vertices[ i + 3 ].Normal = view;
+		MeshBuffer->Vertices[ i + 0 ].Normal = view;
+		MeshBuffer->Vertices[ i + 1 ].Normal = view;
+		MeshBuffer->Vertices[ i + 2 ].Normal = view;
+		MeshBuffer->Vertices[ i + 3 ].Normal = view;
 	}
 }
 
 /*
 	Generate Vertex Color
 */
-void CQuake3ShaderSceneNode::rgbgen ( f32 dt, quake3::SModifierFunction &function )
+void CQuake3ShaderSceneNode::vertextransform_rgbgen( f32 dt, quake3::SModifierFunction &function )
 {
 	u32 i;
-	const u32 vsize = MeshBuffer.Vertices.size();
+	const u32 vsize = MeshBuffer->Vertices.size();
 
 	switch ( function.masterfunc1 )
 	{
 		case 6:
 			//identity
 			for ( i = 0; i != vsize; ++i )
-				MeshBuffer.Vertices[i].Color = 0xFFFFFFFF;
+				MeshBuffer->Vertices[i].Color = 0xFFFFFFFF;
 			break;
 		case 7:
 			// vertex
 			for ( i = 0; i != vsize; ++i )
-				MeshBuffer.Vertices[i].Color = Original.Vertices[i].Color;
+				MeshBuffer->Vertices[i].Color = Original->Vertices[i].Color;
 			break;
 		case 5:
 		{
 			// wave
-			f32 f = function.evaluate ( dt ) * 255.f;
-			s32 value = core::clamp ( core::floor32 ( f ), 0, 255 );
+			f32 f = function.evaluate( dt ) * 255.f;
+			s32 value = core::clamp( core::floor32(f), 0, 255 );
 			value |= value << 8;
 			value |= value << 16;
 
 			for ( i = 0; i != vsize; ++i )
-				MeshBuffer.Vertices[i].Color = value;
+				MeshBuffer->Vertices[i].Color = value;
 		} break;
 	}
 }
 
+
+
 /*
 	Generate Texture Coordinates
 */
-u32 CQuake3ShaderSceneNode::tcgen ( f32 dt, quake3::SModifierFunction &function, core::matrix4 &texture )
+void CQuake3ShaderSceneNode::vertextransform_tcgen( f32 dt, quake3::SModifierFunction &function )
 {
-	u32 ret = 0;
 	u32 i;
-	const u32 vsize = MeshBuffer.Vertices.size();
+	const u32 vsize = MeshBuffer->Vertices.size();
 
 	switch ( function.tcgen )
 	{
+		case 12:
+			//tcgen turb
+		{
+			function.wave = core::reciprocal( function.wave );
+
+			const f32 phase = function.phase;
+
+			for ( i = 0; i != vsize; ++i )
+			{
+				const video::S3DVertex2TCoords &src = Original->Vertices[i];
+				video::S3DVertex &dst = MeshBuffer->Vertices[i];
+
+				const f32 wavephase = (src.Pos.X + src.Pos.Y + src.Pos.Z) * function.wave;
+				function.phase = phase + wavephase;
+
+				const f32 f = function.evaluate( dt );
+
+				dst.TCoords.X = src.TCoords.X + f * src.Normal.X;
+				dst.TCoords.Y = src.TCoords.Y + f * src.Normal.Y;
+			}
+		}
+		break;
+
 		case 8:
 			// tcgen texture
 			for ( i = 0; i != vsize; ++i )
-				MeshBuffer.Vertices[i].TCoords = Original.Vertices[i].TCoords;
+				MeshBuffer->Vertices[i].TCoords = Original->Vertices[i].TCoords;
 			break;
 		case 9:
 			// tcgen lightmap
 			for ( i = 0; i != vsize; ++i )
-				MeshBuffer.Vertices[i].TCoords = Original.Vertices[i].TCoords2;
+				MeshBuffer->Vertices[i].TCoords = Original->Vertices[i].TCoords2;
 			break;
 		case 10:
 		{
@@ -412,29 +504,26 @@ u32 CQuake3ShaderSceneNode::tcgen ( f32 dt, quake3::SModifierFunction &function,
 			core::vector3df eyePlaneS;
 			core::vector3df eyePlaneT;
 
-			viewinverse.transformVect ( eyePlaneS, core::vector3df ( 1.f, 0.f, 0.f ) );
-			viewinverse.transformVect ( eyePlaneT, core::vector3df ( 0.f, 1.f, 0.f ) );
+			viewinverse.transformVect( eyePlaneS, core::vector3df(1.f, 0.f, 0.f) );
+			viewinverse.transformVect( eyePlaneT, core::vector3df(0.f, 1.f, 0.f) );
 
-			eyePlaneS.normalize ();
-			eyePlaneT.normalize ();
+			eyePlaneS.normalize();
+			eyePlaneT.normalize();
 
 			core::vector3df v;
 			for ( i = 0; i != vsize; ++i )
 			{
 				// vertex in eye space
-				view.transformVect ( v, Original.Vertices[i].Pos );
+				view.transformVect( v, Original->Vertices[i].Pos );
 				v.normalize();
 
-				MeshBuffer.Vertices[i].TCoords.X = (1.f + eyePlaneS.dotProduct ( v ) ) * 0.5f;
-				MeshBuffer.Vertices[i].TCoords.Y = 1.f - ( (1.f + eyePlaneT.dotProduct ( v ) ) * 0.5f );
+				MeshBuffer->Vertices[i].TCoords.X = (1.f + eyePlaneS.dotProduct(v) ) * 0.5f;
+				MeshBuffer->Vertices[i].TCoords.Y = 1.f - ( (1.f + eyePlaneT.dotProduct(v) ) * 0.5f );
 			}
 
-			ret = 0;
-
 		} break;
-	}
 
-	return ret;
+	}
 }
 
 
@@ -442,10 +531,10 @@ u32 CQuake3ShaderSceneNode::tcgen ( f32 dt, quake3::SModifierFunction &function,
 /*
 	Transform Texture Coordinates
 */
-void CQuake3ShaderSceneNode::transformtex ( const core::matrix4 &m, const u32 addressMode )
+void CQuake3ShaderSceneNode::transformtex( const core::matrix4 &m, const u32 addressMode )
 {
 	u32 i;
-	const u32 vsize = MeshBuffer.Vertices.size();
+	const u32 vsize = MeshBuffer->Vertices.size();
 
 	f32 tx1;
 	f32 ty1;
@@ -454,7 +543,7 @@ void CQuake3ShaderSceneNode::transformtex ( const core::matrix4 &m, const u32 ad
 	{
 		for ( i = 0; i != vsize; ++i )
 		{
-			core::vector2df &tx = MeshBuffer.Vertices[i].TCoords;
+			core::vector2df &tx = MeshBuffer->Vertices[i].TCoords;
 
 			tx1 = m[0] * tx.X + m[4] * tx.Y + m[8];
 			ty1 = m[1] * tx.X + m[5] * tx.Y + m[9];
@@ -468,7 +557,7 @@ void CQuake3ShaderSceneNode::transformtex ( const core::matrix4 &m, const u32 ad
 
 		for ( i = 0; i != vsize; ++i )
 		{
-			core::vector2df &tx = MeshBuffer.Vertices[i].TCoords;
+			core::vector2df &tx = MeshBuffer->Vertices[i].TCoords;
 
 			tx1 = m[0] * tx.X + m[4] * tx.Y + m[8];
 			ty1 = m[1] * tx.X + m[5] * tx.Y + m[9];
@@ -476,8 +565,8 @@ void CQuake3ShaderSceneNode::transformtex ( const core::matrix4 &m, const u32 ad
 			tx.X = tx1 <= 0.f ? 0.f : tx1 >= 1.f ? 1.f : tx1;
 			tx.Y = ty1 <= 0.f ? 0.f : ty1 >= 1.f ? 1.f : ty1;
 
-			//tx.X = core::clamp ( tx1, 0.f, 1.f );
-			//tx.Y = core::clamp ( ty1, 0.f, 1.f );
+			//tx.X = core::clamp( tx1, 0.f, 1.f );
+			//tx.Y = core::clamp( ty1, 0.f, 1.f );
 		}
 	}
 }
@@ -492,30 +581,25 @@ void CQuake3ShaderSceneNode::transformtex ( const core::matrix4 &m, const u32 ad
 	Vertex transformation are called if found
 
 */
-u32 CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture )
+void CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture )
 {
-	const f32 dt = TimeAbs;
-
-	const quake3::SVarGroup *group = Shader->getGroup ( stage );
+	const quake3::SVarGroup *group = Shader->getGroup( stage );
 
 	// select current texture
 	if ( Q3Texture [ stage ].TextureFrequency != 0.f )
 	{
-		s32 v = core::floor32 ( dt * Q3Texture [ stage ].TextureFrequency );
-		Q3Texture [ stage ].TextureIndex = v % Q3Texture [ stage ].Texture.size();
+		s32 v = core::floor32( TimeAbs * Q3Texture[stage].TextureFrequency );
+		Q3Texture [ stage ].TextureIndex = v % Q3Texture[stage].Texture.size();
 	}
 
-
-	core::matrix4 texturem;
 	core::matrix4 m2;
 	quake3::SModifierFunction function;
 
 	f32 f0;
 	f32 f1;
-	u32 textureMatrixFound = 0;
 
 	// walk group for all modifiers
-	for ( u32 g = 0; g != group->Variable.size (); ++g )
+	for ( u32 g = 0; g != group->Variable.size(); ++g )
 	{
 		const quake3::SVariable &v = group->Variable[g];
 
@@ -526,7 +610,7 @@ u32 CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture )
 		};
 
 		u32 pos = 0;
-		function.masterfunc0 = quake3::isEqual ( v.name, pos, modifierList, 5 );
+		function.masterfunc0 = quake3::isEqual( v.name, pos, modifierList, 5 );
 
 		if ( -2 == function.masterfunc0 )
 			continue;
@@ -535,12 +619,7 @@ u32 CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture )
 		{
 			//tcmod
 			case 0:
-				if ( 0 == textureMatrixFound )
-				{
-					texturem.makeIdentity ();
-					textureMatrixFound = 1;
-				}
-				m2.makeIdentity ();
+				m2.makeIdentity();
 				break;
 		}
 
@@ -554,25 +633,25 @@ u32 CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture )
 		};
 
 		pos = 0;
-		function.masterfunc1 = quake3::isEqual ( v.content, pos, funclist, 14 );
+		function.masterfunc1 = quake3::isEqual( v.content, pos, funclist, 14 );
 
 		switch ( function.masterfunc1 )
 		{
 			case 0:
 				// scroll
-				f0 = quake3::getAsFloat ( v.content, pos ) * dt;
-				f1 = quake3::getAsFloat ( v.content, pos ) * dt;
-				m2.setTextureTranslate ( f0, f1 );
+				f0 = quake3::getAsFloat( v.content, pos ) * TimeAbs;
+				f1 = quake3::getAsFloat( v.content, pos ) * TimeAbs;
+				m2.setTextureTranslate( f0, f1 );
 				break;
 			case 1:
 				// scale
-				f0 = quake3::getAsFloat ( v.content, pos );
-				f1 = quake3::getAsFloat ( v.content, pos );
-				m2.setTextureScale ( f0, f1 );
+				f0 = quake3::getAsFloat( v.content, pos );
+				f1 = quake3::getAsFloat( v.content, pos );
+				m2.setTextureScale( f0, f1 );
 				break;
 			case 2:
 				//rotate
-				m2.setTextureRotationCenter ( quake3::getAsFloat ( v.content, pos ) * core::DEGTORAD * dt );
+				m2.setTextureRotationCenter( quake3::getAsFloat( v.content, pos ) * core::DEGTORAD * TimeAbs );
 				break;
 			case 3:
 			case 4:
@@ -583,44 +662,60 @@ u32 CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture )
 				// turb == sin, default == sin
 				function.func = 0;
 
-				if ( function.masterfunc1 == 5 && function.masterfunc0 == 1)
+				if (function.masterfunc1 == 5 && function.masterfunc0 == 1)
 				{
 					// deformvertexes, wave
-					function.wave = quake3::getAsFloat ( v.content, pos );
+					function.wave = quake3::getAsFloat( v.content, pos );
 				}
 
-				if (	function.masterfunc1 == 3 ||
+				if (function.masterfunc1 == 3 ||
 						function.masterfunc1 == 4 ||
-						function.masterfunc1 == 5
-						)
+						function.masterfunc1 == 5)
 				{
 					// stretch, wave, tub
-					quake3::getModifierFunc ( function, v.content, pos );
+					quake3::getModifierFunc( function, v.content, pos );
 				}
 
 				switch ( function.masterfunc1 )
 				{
 					case 3:
 						// stretch
-						f0 = core::reciprocal ( function.evaluate ( dt ) );
-						m2.setTextureScaleCenter ( f0, f0 );
+						f0 = core::reciprocal( function.evaluate(TimeAbs) );
+						m2.setTextureScaleCenter( f0, f0 );
 						break;
 					case 4:
+					{
 						// turb
-						f0 = function.evaluate ( dt );
-						function.freq *= 2.f;
-						f1 = function.evaluate ( dt );
-						m2.setTextureTranslate ( f1, f0 );
-						break;
+/*
+						quake3::SModifierFunction ampFunction;
+						ampFunction.func = 0;
+						ampFunction.freq = function.freq;
+						ampFunction.base = 1.f;
+						ampFunction.amp = 0.2f;
+						f2 = ampFunction.evaluate( TimeAbs );
+
+						f0 = function.evaluate( TimeAbs );
+						function.func = 1;
+						f1 = function.evaluate( TimeAbs );
+
+						m2.setTextureTranslate( f0, f1 );
+						m2.setTextureScaleCenter( f2, f2 );
+						//m2.setTextureScale( f2, f2 );
+*/
+					}break;
 					case 5:
 						if ( function.masterfunc0 == 1 )
-							vertextransform_wave ( dt, function );
+						{
+							vertextransform_wave( TimeAbs, function );
+						}
 						else
-							rgbgen ( dt, function );
+						{
+							vertextransform_rgbgen( TimeAbs, function );
+						}
 						break;
 					case 6:
 					case 7:
-						rgbgen ( dt, function );
+						vertextransform_rgbgen( TimeAbs, function );
 						break;
 				}
 				
@@ -637,17 +732,17 @@ u32 CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture )
 				break;
 			case 12:
 				// deformvertexes bulge
-				function.bulgewidth = quake3::getAsFloat ( v.content, pos );
-				function.bulgeheight = quake3::getAsFloat ( v.content, pos );
-				function.bulgespeed = quake3::getAsFloat ( v.content, pos );
+				function.bulgewidth = quake3::getAsFloat( v.content, pos );
+				function.bulgeheight = quake3::getAsFloat( v.content, pos );
+				function.bulgespeed = quake3::getAsFloat( v.content, pos );
 
-				vertextransform_bulge ( dt, function );
+				vertextransform_bulge(TimeAbs, function);
 				break;
 
 			case 13:
 			case 14:
 				// deformvertexes autosprite
-				vertextransform_autosprite ( dt, function);
+				vertextransform_autosprite(TimeAbs, function);
 				break;
 
 		} // func
@@ -655,32 +750,26 @@ u32 CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture )
 		switch ( function.masterfunc0 )
 		{
 			case 0:
-				texturem *= m2;
+				texture *= m2;
 				break;
 		}
 
 	} // group
 
 	// texture coordinate modifier
-	textureMatrixFound += tcgen ( dt, function, texturem );
-
-	if ( textureMatrixFound )
-	{
-		texturem.getTransposed ( texture );
-	}
-
-	return textureMatrixFound;
+	vertextransform_tcgen(TimeAbs, function);
 }
 
 
 void CQuake3ShaderSceneNode::OnAnimate(u32 timeMs)
 {
-	TimeAbs = f32( timeMs ) * ( 1.f/1000.f);
+	TimeAbs = f32( timeMs ) * (1.f/1000.f);
+	ISceneNode::OnAnimate( timeMs );
 }
 
 const core::aabbox3d<f32>& CQuake3ShaderSceneNode::getBoundingBox() const
 {
-	return MeshBuffer.getBoundingBox ();
+	return MeshBuffer->getBoundingBox();
 }
 
 
@@ -691,7 +780,7 @@ u32 CQuake3ShaderSceneNode::getMaterialCount() const
 
 video::SMaterial& CQuake3ShaderSceneNode::getMaterial(u32 i)
 {
-	video::SMaterial& m = MeshBuffer.getMaterial();
+	video::SMaterial& m = MeshBuffer->getMaterial();
 	m.setTexture(0, 0);
 	if ( Q3Texture [ i ].TextureIndex )
 		m.setTexture(0, Q3Texture [ i ].Texture [ Q3Texture [ i ].TextureIndex ]);
@@ -702,3 +791,5 @@ video::SMaterial& CQuake3ShaderSceneNode::getMaterial(u32 i)
 } // end namespace scene
 } // end namespace irr
 
+#endif
+
diff --git a/src/dep/src/irrlicht/CQuake3ShaderSceneNode.h b/src/dep/src/irrlicht/CQuake3ShaderSceneNode.h
index 3cb8221..7ffc7b6 100644
--- a/src/dep/src/irrlicht/CQuake3ShaderSceneNode.h
+++ b/src/dep/src/irrlicht/CQuake3ShaderSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,10 +23,9 @@ public:
 
 	CQuake3ShaderSceneNode( ISceneNode* parent, ISceneManager* mgr,s32 id,
 				io::IFileSystem *fileSystem,IMeshBuffer *buffer,
-				const quake3::SShader * shader
-		);
+				const quake3::SShader * shader);
 
-	virtual ~CQuake3ShaderSceneNode ();
+	virtual ~CQuake3ShaderSceneNode();
 
 	virtual void OnRegisterSceneNode();
 	virtual void render();
@@ -37,9 +36,9 @@ public:
 	virtual video::SMaterial& getMaterial(u32 i);
 
 private:
-	SMeshBuffer MeshBuffer;
-	SMeshBufferLightMap Original;
-	const quake3::SShader * Shader;
+	SMeshBuffer* MeshBuffer;
+	SMeshBufferLightMap* Original;
+	const quake3::SShader* Shader;
 
 	struct SQ3Texture
 	{
@@ -63,18 +62,15 @@ private:
 	void vertextransform_wave ( f32 dt, quake3::SModifierFunction &function );
 	void vertextransform_bulge( f32 dt, quake3::SModifierFunction &function );
 	void vertextransform_autosprite( f32 dt, quake3::SModifierFunction &function );
-
-	void rgbgen ( f32 dt, quake3::SModifierFunction &function );
-	u32 tcgen ( f32 dt, quake3::SModifierFunction &function, core::matrix4 &texture );
+	void vertextransform_tcgen ( f32 dt, quake3::SModifierFunction &function );
+	void vertextransform_rgbgen ( f32 dt, quake3::SModifierFunction &function );
 
 	void transformtex ( const core::matrix4 &m, const u32 clamp );
 
 	f32 TimeAbs;
-	u32 animate( u32 stage, core::matrix4 &texture );
+	void animate( u32 stage, core::matrix4 &texture );
 
-
-	s32 PassedCulling;
-	s32 StageCall;
+	bool isTransparent() const;
 
 };
 
diff --git a/src/dep/src/irrlicht/CReadFile.cpp b/src/dep/src/irrlicht/CReadFile.cpp
index 42452d4..a8550f3 100644
--- a/src/dep/src/irrlicht/CReadFile.cpp
+++ b/src/dep/src/irrlicht/CReadFile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,18 +11,16 @@ namespace io
 
 
 CReadFile::CReadFile(const c8* fileName)
-: File(0), FileSize(0)
+: File(0), FileSize(0), Filename(fileName)
 {
 	#ifdef _DEBUG
 	setDebugName("CReadFile");
 	#endif
 
-	Filename = fileName;
 	openFile();
 }
 
 
-
 CReadFile::~CReadFile()
 {
 	if (File)
@@ -30,18 +28,16 @@ CReadFile::~CReadFile()
 }
 
 
-
 //! returns how much was read
 s32 CReadFile::read(void* buffer, u32 sizeToRead)
 {
 	if (!isOpen())
 		return 0;
 
-	return fread(buffer, 1, sizeToRead, File);
+	return (s32)fread(buffer, 1, sizeToRead, File);
 }
 
 
-
 //! changes position in file, returns true if successful
 //! if relativeMovement==true, the pos is changed relative to current pos,
 //! otherwise from begin of file
@@ -54,7 +50,6 @@ bool CReadFile::seek(long finalPos, bool relativeMovement)
 }
 
 
-
 //! returns size of file
 long CReadFile::getSize() const
 {
@@ -62,7 +57,6 @@ long CReadFile::getSize() const
 }
 
 
-
 //! returns where in the file we are.
 long CReadFile::getPos() const
 {
@@ -70,7 +64,6 @@ long CReadFile::getPos() const
 }
 
 
-
 //! opens the file
 void CReadFile::openFile()
 {
diff --git a/src/dep/src/irrlicht/CReadFile.h b/src/dep/src/irrlicht/CReadFile.h
index dc0b0a9..497c58c 100644
--- a/src/dep/src/irrlicht/CReadFile.h
+++ b/src/dep/src/irrlicht/CReadFile.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -31,8 +31,6 @@ namespace io
 		virtual s32 read(void* buffer, u32 sizeToRead);
 
 		//! changes position in file, returns true if successful
-		//! if relativeMovement==true, the pos is changed relative to current pos,
-		//! otherwise from begin of file
 		virtual bool seek(long finalPos, bool relativeMovement = false);
 
 		//! returns size of file
@@ -55,9 +53,9 @@ namespace io
 		//! opens the file
 		void openFile();
 
-		core::stringc Filename;
 		FILE* File;
 		long FileSize;
+		core::stringc Filename;
 	};
 
 } // end namespace io
diff --git a/src/dep/src/irrlicht/CSTLMeshFileLoader.cpp b/src/dep/src/irrlicht/CSTLMeshFileLoader.cpp
index 783df56..8779dbb 100644
--- a/src/dep/src/irrlicht/CSTLMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/CSTLMeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2007 Christian Stehno
+// Copyright (C) 2007-2009 Christian Stehno
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CSTLMeshFileLoader.h b/src/dep/src/irrlicht/CSTLMeshFileLoader.h
index 679e0f2..3210f29 100644
--- a/src/dep/src/irrlicht/CSTLMeshFileLoader.h
+++ b/src/dep/src/irrlicht/CSTLMeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007 Christian Stehno
+// Copyright (C) 2007-2009 Christian Stehno
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CSTLMeshWriter.cpp b/src/dep/src/irrlicht/CSTLMeshWriter.cpp
index 899f7d3..647aa6a 100644
--- a/src/dep/src/irrlicht/CSTLMeshWriter.cpp
+++ b/src/dep/src/irrlicht/CSTLMeshWriter.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -23,6 +23,10 @@ namespace scene
 CSTLMeshWriter::CSTLMeshWriter(scene::ISceneManager* smgr)
 	: SceneManager(smgr)
 {
+	#ifdef _DEBUG
+	setDebugName("CSTLMeshWriter");
+	#endif
+
 	if (SceneManager)
 		SceneManager->grab();
 }
@@ -86,55 +90,19 @@ bool CSTLMeshWriter::writeMeshBinary(io::IWriteFile* file, scene::IMesh* mesh, s
 		IMeshBuffer* buffer = mesh->getMeshBuffer(i);
 		if (buffer)
 		{
-			const u16 indexCount = buffer->getIndexCount();
-
-			switch(buffer->getVertexType())
+			const u32 indexCount = buffer->getIndexCount();
+			const u16 attributes = 0;
+			for (u32 j=0; j<indexCount; j+=3)
 			{
-			case video::EVT_STANDARD:
-				{
-					video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
-					const u16 attributes = 0;
-					for (u32 j=0; j<indexCount; j+=3)
-					{
-						const core::plane3df tmpplane(vtx[buffer->getIndices()[j]].Pos,vtx[buffer->getIndices()[j+1]].Pos,vtx[buffer->getIndices()[j+2]].Pos);
-						file->write(&tmpplane.Normal, 12);
-						file->write(&vtx[buffer->getIndices()[j]].Pos, 12);
-						file->write(&vtx[buffer->getIndices()[j+1]].Pos, 12);
-						file->write(&vtx[buffer->getIndices()[j+2]].Pos, 12);
-						file->write(&attributes, 2);
-					}
-				}
-				break;
-			case video::EVT_2TCOORDS:
-				{
-					video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
-					const u16 attributes = 0;
-					for (u32 j=0; j<indexCount; j+=3)
-					{
-						const core::plane3df tmpplane(vtx[buffer->getIndices()[j]].Pos,vtx[buffer->getIndices()[j+1]].Pos,vtx[buffer->getIndices()[j+2]].Pos);
-						file->write(&tmpplane.Normal, 12);
-						file->write(&vtx[buffer->getIndices()[j]].Pos, 12);
-						file->write(&vtx[buffer->getIndices()[j+1]].Pos, 12);
-						file->write(&vtx[buffer->getIndices()[j+2]].Pos, 12);
-						file->write(&attributes, 2);
-					}
-				}
-				break;
-			case video::EVT_TANGENTS:
-				{
-					video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
-					const u16 attributes = 0;
-					for (u32 j=0; j<indexCount; j+=3)
-					{
-						const core::plane3df tmpplane(vtx[buffer->getIndices()[j]].Pos,vtx[buffer->getIndices()[j+1]].Pos,vtx[buffer->getIndices()[j+2]].Pos);
-						file->write(&tmpplane.Normal, 12);
-						file->write(&vtx[buffer->getIndices()[j]].Pos, 12);
-						file->write(&vtx[buffer->getIndices()[j+1]].Pos, 12);
-						file->write(&vtx[buffer->getIndices()[j+2]].Pos, 12);
-						file->write(&attributes, 2);
-					}
-				}
-				break;
+				const core::vector3df& v1 = buffer->getPosition(buffer->getIndices()[j]);
+				const core::vector3df& v2 = buffer->getPosition(buffer->getIndices()[j+1]);
+				const core::vector3df& v3 = buffer->getPosition(buffer->getIndices()[j+2]);
+				const core::plane3df tmpplane(v1,v2,v3);
+				file->write(&tmpplane.Normal, 12);
+				file->write(&v1, 12);
+				file->write(&v2, 12);
+				file->write(&v3, 12);
+				file->write(&attributes, 2);
 			}
 		}
 	}
@@ -158,40 +126,13 @@ bool CSTLMeshWriter::writeMeshASCII(io::IWriteFile* file, scene::IMesh* mesh, s3
 		IMeshBuffer* buffer = mesh->getMeshBuffer(i);
 		if (buffer)
 		{
-			const u16 indexCount = buffer->getIndexCount();
-
-			switch(buffer->getVertexType())
+			const u32 indexCount = buffer->getIndexCount();
+			for (u32 j=0; j<indexCount; j+=3)
 			{
-			case video::EVT_STANDARD:
-				{
-					video::S3DVertex* vtx = (video::S3DVertex*)buffer->getVertices();
-					for (u32 j=0; j<indexCount; j+=3)
-						writeFace(file,
-							vtx[buffer->getIndices()[j]].Pos,
-							vtx[buffer->getIndices()[j+1]].Pos,
-							vtx[buffer->getIndices()[j+2]].Pos);
-				}
-				break;
-			case video::EVT_2TCOORDS:
-				{
-					video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buffer->getVertices();
-					for (u32 j=0; j<indexCount; j+=3)
-						writeFace(file,
-							vtx[buffer->getIndices()[j]].Pos,
-							vtx[buffer->getIndices()[j+1]].Pos,
-							vtx[buffer->getIndices()[j+2]].Pos);
-				}
-				break;
-			case video::EVT_TANGENTS:
-				{
-					video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buffer->getVertices();
-					for (u32 j=0; j<indexCount; j+=3)
-						writeFace(file,
-							vtx[buffer->getIndices()[j]].Pos,
-							vtx[buffer->getIndices()[j+1]].Pos,
-							vtx[buffer->getIndices()[j+2]].Pos);
-				}
-				break;
+				writeFace(file,
+					buffer->getPosition(buffer->getIndices()[j]),
+					buffer->getPosition(buffer->getIndices()[j+1]),
+					buffer->getPosition(buffer->getIndices()[j+2]));
 			}
 			file->write("\n",1);
 		}
@@ -206,11 +147,11 @@ bool CSTLMeshWriter::writeMeshASCII(io::IWriteFile* file, scene::IMesh* mesh, s3
 
 void CSTLMeshWriter::getVectorAsStringLine(const core::vector3df& v, core::stringc& s) const
 {
-	s = v.X;
+	s = core::stringc(v.X);
 	s += " ";
-	s += v.Y;
+	s += core::stringc(v.Y);
 	s += " ";
-	s += v.Z;
+	s += core::stringc(v.Z);
 	s += "\n";
 }
 
diff --git a/src/dep/src/irrlicht/CSTLMeshWriter.h b/src/dep/src/irrlicht/CSTLMeshWriter.h
index 0a0fd0d..017d0eb 100644
--- a/src/dep/src/irrlicht/CSTLMeshWriter.h
+++ b/src/dep/src/irrlicht/CSTLMeshWriter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CSceneCollisionManager.cpp b/src/dep/src/irrlicht/CSceneCollisionManager.cpp
index 7a20501..b6ceec5 100644
--- a/src/dep/src/irrlicht/CSceneCollisionManager.cpp
+++ b/src/dep/src/irrlicht/CSceneCollisionManager.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,6 +10,7 @@
 
 #include "os.h"
 #include "irrMath.h"
+#include <float.h> // For FLT_MAX
 
 namespace irr
 {
@@ -61,9 +62,9 @@ ISceneNode* CSceneCollisionManager::getSceneNodeFromRayBB(core::line3d<f32> ray,
 						bool bNoDebugObjects)
 {
 	ISceneNode* best = 0;
-	f32 dist = 9999999999.0f;
+	f32 dist = FLT_MAX;
 
-	getPickedNodeBB(SceneManager->getRootSceneNode(), ray, 
+	getPickedNodeBB(SceneManager->getRootSceneNode(), ray,
 		idBitMask, bNoDebugObjects, dist, best);
 
 	return best;
@@ -87,46 +88,60 @@ void CSceneCollisionManager::getPickedNodeBB(ISceneNode* root,
    {
       ISceneNode* current = *it;
 
-      if (current->isVisible() &&
-          (bNoDebugObjects ? !current->isDebugObject() : true) &&
-          (bits==0 || (bits != 0 && (current->getID() & bits))))
-      {
-         // get world to object space transform
-         core::matrix4 mat;
-         if (!current->getAbsoluteTransformation().getInverse(mat))
-            continue;
+      if (current->isVisible())
+	  {
+		  if((bNoDebugObjects ? !current->isDebugObject() : true) &&
+			(bits==0 || (bits != 0 && (current->getID() & bits))))
+		  {
+			 // get world to object space transform
+			 core::matrix4 mat;
+			 if (!current->getAbsoluteTransformation().getInverse(mat))
+				continue;
 
-         // transform vector from world space to object space
-         core::line3df line(ray);
-         mat.transformVect(line.start);
-         mat.transformVect(line.end);
+			 // transform vector from world space to object space
+			 core::line3df line(ray);
+			 mat.transformVect(line.start);
+			 mat.transformVect(line.end);
 
-         const core::aabbox3df& box = current->getBoundingBox();
+			 const core::aabbox3df& box = current->getBoundingBox();
 
-         // do intersection test in object space
-         if (box.intersectsWithLine(line))
-         {
-            box.getEdges(edges);
-            f32 distance = 0.0f;
+			 // do the initial intersection test in object space, since the
+			 // object space box is more accurate.
+			 if (box.intersectsWithLine(line))
+			 {
+				box.getEdges(edges);
+				f32 distance = 0.0f;
 
-            for (s32 e=0; e<8; ++e)
-            {
-               f32 t = edges[e].getDistanceFromSQ(line.start);
-               if (t > distance)
-                  distance = t;
-            }
+				for (s32 e=0; e<8; ++e)
+				{
+				   // Transform the corner into world coordinates, to take
+				   // scaling into account.
+				   current->getAbsoluteTransformation().transformVect(edges[e]);
 
-            if (distance < outbestdistance)
-            {
-               outbestnode = current;
-               outbestdistance = distance;
-            }
-         }
-      }
+				   // and compare it against the world space ray start position
+				   f32 t = edges[e].getDistanceFromSQ(ray.start);
 
-      getPickedNodeBB(current, ray, bits, bNoDebugObjects, outbestdistance, outbestnode);
+				   // We're looking for the furthest corner; this is a crude
+				   // test; we should be checking the actual ray/plane
+				   // intersection.
+				   // http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?p=181419
+				   if (t > distance)
+					  distance = t;
+				}
+
+				if (distance < outbestdistance)
+				{
+				   outbestnode = current;
+				   outbestdistance = distance;
+				}
+			 }
+		  }
+
+		  // Only check the children if this node is visible.
+	      getPickedNodeBB(current, ray, bits, bNoDebugObjects, outbestdistance, outbestnode);
+	  }
    }
-} 
+}
 
 
 
@@ -168,13 +183,35 @@ bool CSceneCollisionManager::getCollisionPoint(const core::line3d<f32>& ray,
 
 	const core::vector3df linevect = ray.getVector().normalize();
 	core::vector3df intersection;
-	f32 nearest = 9999999999999.0f;
+	f32 nearest = FLT_MAX;
 	bool found = false;
 	const f32 raylength = ray.getLengthSQ();
 
+	const f32 minX = core::min_(ray.start.X, ray.end.X);
+	const f32 maxX = core::max_(ray.start.X, ray.end.X);
+	const f32 minY = core::min_(ray.start.Y, ray.end.Y);
+	const f32 maxY = core::max_(ray.start.Y, ray.end.Y);
+	const f32 minZ = core::min_(ray.start.Z, ray.end.Z);
+	const f32 maxZ = core::max_(ray.start.Z, ray.end.Z);
+
 	for (s32 i=0; i<cnt; ++i)
 	{
-		if (Triangles[i].getIntersectionWithLine(ray.start, linevect, intersection))
+		const core::triangle3df & triangle = Triangles[i];
+
+		if(minX > triangle.pointA.X && minX > triangle.pointB.X && minX > triangle.pointC.X)
+			continue;
+		if(maxX < triangle.pointA.X && maxX < triangle.pointB.X && maxX < triangle.pointC.X)
+			continue;
+		if(minY > triangle.pointA.Y && minY > triangle.pointB.Y && minY > triangle.pointC.Y)
+			continue;
+		if(maxY < triangle.pointA.Y && maxY < triangle.pointB.Y && maxY < triangle.pointC.Y)
+			continue;
+		if(minZ > triangle.pointA.Z && minZ > triangle.pointB.Z && minZ > triangle.pointC.Z)
+			continue;
+		if(maxZ < triangle.pointA.Z && maxZ < triangle.pointB.Z && maxZ < triangle.pointC.Z)
+			continue;
+
+		if (triangle.getIntersectionWithLine(ray.start, linevect, intersection))
 		{
 			const f32 tmp = intersection.getDistanceFromSQ(ray.start);
 			const f32 tmp2 = intersection.getDistanceFromSQ(ray.end);
@@ -182,7 +219,7 @@ bool CSceneCollisionManager::getCollisionPoint(const core::line3d<f32>& ray,
 			if (tmp < raylength && tmp2 < raylength && tmp < nearest)
 			{
 				nearest = tmp;
-				outTriangle = Triangles[i];
+				outTriangle = triangle;
 				outIntersection = intersection;
 				found = true;
 			}
@@ -481,7 +518,7 @@ core::vector3df CSceneCollisionManager::collideEllipsoidWithWorld(
 	colData.R3Position = position;
 	colData.R3Velocity = velocity;
 	colData.eRadius = radius;
-	colData.nearestDistance = 9999999999999.0f;
+	colData.nearestDistance = FLT_MAX;
 	colData.selector = selector;
 	colData.slidingSpeed = slidingSpeed;
 	colData.triangleHits = 0;
@@ -537,7 +574,7 @@ core::vector3df CSceneCollisionManager::collideWithWorld(s32 recursionDepth,
 	colData.normalizedVelocity.normalize();
 	colData.basePoint = pos;
 	colData.foundCollision = false;
-	colData.nearestDistance = 9999999999999.0f;
+	colData.nearestDistance = FLT_MAX;
 
 	//------------------ collide with world
 
@@ -552,7 +589,7 @@ core::vector3df CSceneCollisionManager::collideWithWorld(s32 recursionDepth,
 
 	core::matrix4 scaleMatrix;
 	scaleMatrix.setScale(
-		core::vector3df(1.0f / colData.eRadius.X, 
+		core::vector3df(1.0f / colData.eRadius.X,
 						1.0f / colData.eRadius.Y,
 						1.0f / colData.eRadius.Z)
 					);
@@ -631,7 +668,7 @@ core::line3d<f32> CSceneCollisionManager::getRayFromScreenCoordinates(
 	core::vector3df lefttoright = f->getFarRightUp() - farLeftUp;
 	core::vector3df uptodown = f->getFarLeftDown() - farLeftUp;
 
-	core::rect<s32> viewPort = Driver->getViewPort();
+	const core::rect<s32>& viewPort = Driver->getViewPort();
 	core::dimension2d<s32> screenSize(viewPort.getWidth(), viewPort.getHeight());
 
 	f32 dx = pos.X / (f32)screenSize.Width;
@@ -648,52 +685,44 @@ core::line3d<f32> CSceneCollisionManager::getRayFromScreenCoordinates(
 }
 
 
-
 //! Calculates 2d screen position from a 3d position.
 core::position2d<s32> CSceneCollisionManager::getScreenCoordinatesFrom3DPosition(
 	core::vector3df pos3d, ICameraSceneNode* camera)
 {
-	core::position2d<s32> pos2d(-1000,-1000);
-
 	if (!SceneManager || !Driver)
-		return pos2d;
+		return core::position2d<s32>(-1000,-1000);
 
 	if (!camera)
 		camera = SceneManager->getActiveCamera();
 
 	if (!camera)
-		return pos2d;
+		return core::position2d<s32>(-1000,-1000);
 
-	core::rect<s32> viewPort = Driver->getViewPort();
+	const core::rect<s32>& viewPort = Driver->getViewPort();
 	core::dimension2d<s32> dim(viewPort.getWidth(), viewPort.getHeight());
 
 	dim.Width /= 2;
 	dim.Height /= 2;
 
-	f32 transformedPos[4];
-
 	core::matrix4 trans = camera->getProjectionMatrix();
 	trans *= camera->getViewMatrix();
 
-	transformedPos[0] = pos3d.X;
-	transformedPos[1] = pos3d.Y;
-	transformedPos[2] = pos3d.Z;
-	transformedPos[3] = 1.0f;
+	f32 transformedPos[4] = { pos3d.X, pos3d.Y, pos3d.Z, 1.0f };
 
 	trans.multiplyWith1x4Matrix(transformedPos);
 
 	if (transformedPos[3] < 0)
 		return core::position2d<s32>(-10000,-10000);
 
-	f32 zDiv = transformedPos[3] == 0.0f ? 1.0f :
-		(1.0f / transformedPos[3]);
+	const f32 zDiv = transformedPos[3] == 0.0f ? 1.0f :
+		core::reciprocal(transformedPos[3]);
 
-	pos2d.X = (s32)(dim.Width * transformedPos[0] * zDiv) + dim.Width;
-	pos2d.Y = ((s32)(dim.Height - (dim.Height * (transformedPos[1] * zDiv))));
-
-	return pos2d;
+	return core::position2d<s32>(
+			core::round32(dim.Width * transformedPos[0] * zDiv) + dim.Width,
+			dim.Height - core::round32(dim.Height * (transformedPos[1] * zDiv)));
 }
 
+
 inline bool CSceneCollisionManager::getLowestRoot(f32 a, f32 b, f32 c, f32 maxR, f32* root)
 {
 	// check if solution exists
@@ -735,3 +764,4 @@ inline bool CSceneCollisionManager::getLowestRoot(f32 a, f32 b, f32 c, f32 maxR,
 } // end namespace scene
 } // end namespace irr
 
+
diff --git a/src/dep/src/irrlicht/CSceneCollisionManager.h b/src/dep/src/irrlicht/CSceneCollisionManager.h
index 0194914..cb28b0e 100644
--- a/src/dep/src/irrlicht/CSceneCollisionManager.h
+++ b/src/dep/src/irrlicht/CSceneCollisionManager.h
@@ -1,7 +1,7 @@
 #ifndef __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
 #define __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
 
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CSceneManager.cpp b/src/dep/src/irrlicht/CSceneManager.cpp
index e1a8103..2eebb87 100644
--- a/src/dep/src/irrlicht/CSceneManager.cpp
+++ b/src/dep/src/irrlicht/CSceneManager.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,6 +13,7 @@
 #include "ISceneUserDataSerializer.h"
 #include "IGUIEnvironment.h"
 #include "IMaterialRenderer.h"
+#include "IReadFile.h"
 
 #include "os.h"
 
@@ -82,6 +83,10 @@
 #include "CB3DMeshFileLoader.h"
 #endif
 
+#ifdef _IRR_COMPILE_WITH_LWO_LOADER_
+#include "CLWOMeshFileLoader.h"
+#endif
+
 #ifdef _IRR_COMPILE_WITH_STL_LOADER_
 #include "CSTLMeshFileLoader.h"
 #endif
@@ -98,13 +103,16 @@
 #include "CSTLMeshWriter.h"
 #endif
 
+#ifdef _IRR_COMPILE_WITH_OBJ_WRITER_
+#include "COBJMeshWriter.h"
+#endif
+
 #include "CCubeSceneNode.h"
 #include "CSphereSceneNode.h"
 #include "CAnimatedMeshSceneNode.h"
 #include "COctTreeSceneNode.h"
 #include "CCameraSceneNode.h"
-#include "CCameraMayaSceneNode.h"
-#include "CCameraFPSSceneNode.h"
+
 #include "CLightSceneNode.h"
 #include "CBillboardSceneNode.h"
 #include "CMeshSceneNode.h"
@@ -119,7 +127,6 @@
 #include "CDefaultSceneNodeFactory.h"
 
 #include "CSceneCollisionManager.h"
-#include "CMeshManipulator.h"
 #include "CTriangleSelector.h"
 #include "COctTreeTriangleSelector.h"
 #include "CTriangleBBSelector.h"
@@ -133,9 +140,12 @@
 #include "CSceneNodeAnimatorCollisionResponse.h"
 #include "CSceneNodeAnimatorDelete.h"
 #include "CSceneNodeAnimatorFollowSpline.h"
+#include "CSceneNodeAnimatorCameraFPS.h"
+#include "CSceneNodeAnimatorCameraMaya.h"
 #include "CDefaultSceneNodeAnimatorFactory.h"
 
 #include "CQuake3ShaderSceneNode.h"
+#include "CVolumeLightSceneNode.h"
 
 //! Enable debug features
 #define SCENEMANAGER_DEBUG
@@ -150,7 +160,7 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
 		gui::ICursorControl* cursorControl, IMeshCache* cache,
 		gui::IGUIEnvironment* gui)
 : ISceneNode(0, 0), Driver(driver), FileSystem(fs), GUIEnvironment(gui),
-	CursorControl(cursorControl), CollisionManager(0), MeshManipulator(0),
+	CursorControl(cursorControl), CollisionManager(0),
 	ActiveCamera(0), ShadowColor(150,0,0,0), AmbientLight(0,0,0,0),
 	MeshCache(cache), CurrentRendertime(ESNRP_COUNT),
 	IRR_XML_FORMAT_SCENE(L"irr_scene"), IRR_XML_FORMAT_NODE(L"node"), IRR_XML_FORMAT_NODE_ATTR_TYPE(L"type")
@@ -160,6 +170,9 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
 	ISceneNode::setDebugName("CSceneManager ISceneNode");
 	#endif
 
+	// root node's scene manager
+	SceneManager = this;
+
 	if (Driver)
 		Driver->grab();
 
@@ -169,7 +182,7 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
 	if (CursorControl)
 		CursorControl->grab();
 
-	if ( GUIEnvironment )
+	if (GUIEnvironment)
 		GUIEnvironment->grab();
 
 	// create mesh cache if not there already
@@ -181,16 +194,13 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
 	// create collision manager
 	CollisionManager = new CSceneCollisionManager(this, Driver);
 
-	// create manipulator
-	MeshManipulator = new CMeshManipulator();
-
 	// add file format loaders
 
 	#ifdef _IRR_COMPILE_WITH_IRR_MESH_LOADER_
-	MeshLoaderList.push_back(new CIrrMeshFileLoader(Driver, this, FileSystem));
+	MeshLoaderList.push_back(new CIrrMeshFileLoader(this, FileSystem));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_BSP_LOADER_
-	MeshLoaderList.push_back(new CBSPMeshFileLoader(FileSystem, Driver, this));
+	MeshLoaderList.push_back(new CBSPMeshFileLoader(this, FileSystem));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_MD2_LOADER_
 	MeshLoaderList.push_back(new CMD2MeshFileLoader());
@@ -199,13 +209,13 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
 	MeshLoaderList.push_back(new CMS3DMeshFileLoader(Driver));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_3DS_LOADER_
-	MeshLoaderList.push_back(new C3DSMeshFileLoader(MeshManipulator,FileSystem, Driver));
+	MeshLoaderList.push_back(new C3DSMeshFileLoader(this, FileSystem));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_X_LOADER_
-	MeshLoaderList.push_back(new CXMeshFileLoader(this));
+	MeshLoaderList.push_back(new CXMeshFileLoader(this, FileSystem));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_OCT_LOADER_
-	MeshLoaderList.push_back(new COCTLoader(Driver));
+	MeshLoaderList.push_back(new COCTLoader(this, FileSystem));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_CSM_LOADER_
 	MeshLoaderList.push_back(new CCSMLoader(this, FileSystem));
@@ -214,26 +224,29 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
 	MeshLoaderList.push_back(new CLMTSMeshFileLoader(FileSystem, Driver, &Parameters));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_MY3D_LOADER_
-	MeshLoaderList.push_back(new CMY3DMeshFileLoader(FileSystem, Driver, this));
+	MeshLoaderList.push_back(new CMY3DMeshFileLoader(this, FileSystem));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_COLLADA_LOADER_
-	MeshLoaderList.push_back(new CColladaFileLoader(Driver, this, FileSystem));
+	MeshLoaderList.push_back(new CColladaFileLoader(this, FileSystem));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_DMF_LOADER_
-	MeshLoaderList.push_back(new CDMFLoader(Driver, this));
+	MeshLoaderList.push_back(new CDMFLoader(this, FileSystem));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_OGRE_LOADER_
-	MeshLoaderList.push_back(new COgreMeshFileLoader(MeshManipulator, FileSystem, Driver));
+	MeshLoaderList.push_back(new COgreMeshFileLoader(FileSystem, Driver));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_OBJ_LOADER_
-	MeshLoaderList.push_back(new COBJMeshFileLoader(FileSystem, Driver));
+	MeshLoaderList.push_back(new COBJMeshFileLoader(this, FileSystem));
 	#endif
 	#ifdef _IRR_COMPILE_WITH_MD3_LOADER_
-	MeshLoaderList.push_back(new CMD3MeshFileLoader(FileSystem, Driver));
+	MeshLoaderList.push_back(new CMD3MeshFileLoader());
 	#endif
 	#ifdef _IRR_COMPILE_WITH_B3D_LOADER_
 	MeshLoaderList.push_back(new CB3DMeshFileLoader(this));
 	#endif
+	#ifdef _IRR_COMPILE_WITH_LWO_LOADER_
+	MeshLoaderList.push_back(new CLWOMeshFileLoader(this, FileSystem));
+	#endif
 	#ifdef _IRR_COMPILE_WITH_STL_LOADER_
 	MeshLoaderList.push_back(new CSTLMeshFileLoader());
 	#endif
@@ -243,7 +256,7 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
 	registerSceneNodeFactory(factory);
 	factory->drop();
 
-	ISceneNodeAnimatorFactory* animatorFactory = new CDefaultSceneNodeAnimatorFactory(this);
+	ISceneNodeAnimatorFactory* animatorFactory = new CDefaultSceneNodeAnimatorFactory(this, CursorControl);
 	registerSceneNodeAnimatorFactory(animatorFactory);
 	animatorFactory->drop();
 }
@@ -255,9 +268,6 @@ CSceneManager::~CSceneManager()
 {
 	clearDeletionList();
 
-	if (Driver)
-		Driver->drop();
-
 	if (FileSystem)
 		FileSystem->drop();
 
@@ -267,11 +277,8 @@ CSceneManager::~CSceneManager()
 	if (CollisionManager)
 		CollisionManager->drop();
 
-	if (MeshManipulator)
-		MeshManipulator->drop();
-
-	if ( GUIEnvironment )
-		GUIEnvironment->drop ();
+	if (GUIEnvironment)
+		GUIEnvironment->drop();
 
 	u32 i;
 
@@ -280,6 +287,7 @@ CSceneManager::~CSceneManager()
 
 	if (ActiveCamera)
 		ActiveCamera->drop();
+	ActiveCamera = 0;
 
 	if (MeshCache)
 		MeshCache->drop();
@@ -289,6 +297,14 @@ CSceneManager::~CSceneManager()
 
 	for (i=0; i<SceneNodeAnimatorFactoryList.size(); ++i)
 		SceneNodeAnimatorFactoryList[i]->drop();
+
+	// remove all nodes and animators before dropping the driver
+	// as render targets may be destroyed twice
+	removeAll();
+	removeAnimators();
+
+	if (Driver)
+		Driver->drop();
 }
 
 
@@ -336,14 +352,53 @@ IAnimatedMesh* CSceneManager::getMesh(const c8* filename)
 }
 
 
+//! gets an animateable mesh. loads it if needed. returned pointer must not be dropped.
+IAnimatedMesh* CSceneManager::getMesh(io::IReadFile* file)
+{
+	if (!file)
+		return 0;
+
+	core::stringc name = file->getFileName();
+	IAnimatedMesh* msh = MeshCache->getMeshByFilename(file->getFileName());
+	if (msh)
+		return msh;
+
+	name.make_lower();
+	s32 count = MeshLoaderList.size();
+	for (s32 i=count-1; i>=0; --i)
+	{
+		if (MeshLoaderList[i]->isALoadableFileExtension(name.c_str()))
+		{
+			// reset file to avoid side effects of previous calls to createMesh
+			file->seek(0);
+			msh = MeshLoaderList[i]->createMesh(file);
+			if (msh)
+			{
+				MeshCache->addMesh(file->getFileName(), msh);
+				msh->drop();
+				break;
+			}
+		}
+	}
+
+	if (!msh)
+		os::Printer::log("Could not load mesh, file format seems to be unsupported", file->getFileName(), ELL_ERROR);
+	else
+		os::Printer::log("Loaded mesh", file->getFileName(), ELL_INFORMATION);
+
+	return msh;
+}
+
+
 //! returns the video driver
 video::IVideoDriver* CSceneManager::getVideoDriver()
 {
 	return Driver;
 }
 
+
 //! returns the GUI Environment
-gui::IGUIEnvironment* CSceneManager::getGUIEnvironment ()
+gui::IGUIEnvironment* CSceneManager::getGUIEnvironment()
 {
 	return GUIEnvironment;
 }
@@ -368,21 +423,25 @@ ITextSceneNode* CSceneManager::addTextSceneNode(gui::IGUIFont* font,
 	return t;
 }
 
+
 //! Adds a text scene node, which uses billboards
-ITextSceneNode* CSceneManager::addBillboardTextSceneNode(gui::IGUIFont* font,
+IBillboardTextSceneNode* CSceneManager::addBillboardTextSceneNode(gui::IGUIFont* font,
 		const wchar_t* text, ISceneNode* parent,
 		const core::dimension2d<f32>& size,
 		const core::vector3df& position, s32 id,
-		video::SColor shade_top, video::SColor shade_down)
+		video::SColor colorTop, video::SColor colorBottom)
 {
-	if (!font)
+	if (!font && GUIEnvironment)
+		font = GUIEnvironment->getBuiltInFont();
+
+	if(!font)
 		return 0;
 
 	if (!parent)
 		parent = this;
 
-	ITextSceneNode* node = new CBillboardTextSceneNode(parent, this, id, font, text, position, size,
-		shade_top, shade_down);
+	IBillboardTextSceneNode* node = new CBillboardTextSceneNode(parent, this, id, font, text, position, size,
+		colorTop, colorBottom);
 	node->drop();
 
 	return node;
@@ -391,51 +450,67 @@ ITextSceneNode* CSceneManager::addBillboardTextSceneNode(gui::IGUIFont* font,
 
 
 //! Adds a scene node, which can render a quake3 shader
-ISceneNode* CSceneManager::addQuake3SceneNode(	IMeshBuffer* meshBuffer,
-												const quake3::SShader * shader,
-												ISceneNode* parent,
-												s32 id
-											)
-
+ISceneNode* CSceneManager::addQuake3SceneNode(IMeshBuffer* meshBuffer,
+					const quake3::SShader * shader,
+					ISceneNode* parent, s32 id)
 {
+#ifdef _IRR_COMPILE_WITH_BSP_LOADER_
 	if ( 0 == shader )
 		return 0;
 
 	if (!parent)
 		parent = this;
 
-	CQuake3ShaderSceneNode* node = new CQuake3ShaderSceneNode ( parent, this, id, FileSystem, meshBuffer, shader );
+	CQuake3ShaderSceneNode* node = new CQuake3ShaderSceneNode( parent, this, id, FileSystem, meshBuffer, shader );
 	node->drop();
 
 	return node;
-
+#else
+	return 0;
+#endif
 }
 
-
-//! adds a test scene node for test purposes to the scene. It is a simple cube of (1,1,1) size.
+//! adds Volume Lighting Scene Node.
 //! the returned pointer must not be dropped.
-ISceneNode* CSceneManager::addCubeSceneNode(f32 size, ISceneNode* parent, s32 id,
+IVolumeLightSceneNode* CSceneManager::addVolumeLightSceneNode(ISceneNode* parent, s32 id,
+	const u32 subdivU, const u32 subdivV,
+	const video::SColor foot, const video::SColor tail,
 	const core::vector3df& position, const core::vector3df& rotation, const core::vector3df& scale)
 {
 	if (!parent)
 		parent = this;
 
-	ISceneNode* node = new CCubeSceneNode(size, parent, this, id, position, rotation, scale);
+	IVolumeLightSceneNode* node = new CVolumeLightSceneNode(parent, this, id, subdivU, subdivV, foot, tail, position, rotation, scale);
 	node->drop();
 
 	return node;
 }
 
-//! Adds a sphere scene node for test purposes to the scene.
-ISceneNode* CSceneManager::addSphereSceneNode(f32 radius, s32 polyCount, ISceneNode* parent, s32 id,
-	const core::vector3df& position,
-	const core::vector3df& rotation,
-	const core::vector3df& scale)
+//! adds a test scene node for test purposes to the scene. It is a simple cube of (1,1,1) size.
+//! the returned pointer must not be dropped.
+IMeshSceneNode* CSceneManager::addCubeSceneNode(f32 size, ISceneNode* parent,
+		s32 id, const core::vector3df& position,
+		const core::vector3df& rotation, const core::vector3df& scale)
 {
 	if (!parent)
 		parent = this;
 
-	ISceneNode* node = new CSphereSceneNode(radius, polyCount, polyCount, parent, this, id, position, rotation, scale);
+	IMeshSceneNode* node = new CCubeSceneNode(size, parent, this, id, position, rotation, scale);
+	node->drop();
+
+	return node;
+}
+
+
+//! Adds a sphere scene node for test purposes to the scene.
+IMeshSceneNode* CSceneManager::addSphereSceneNode(f32 radius, s32 polyCount,
+		ISceneNode* parent, s32 id, const core::vector3df& position,
+		const core::vector3df& rotation, const core::vector3df& scale)
+{
+	if (!parent)
+		parent = this;
+
+	IMeshSceneNode* node = new CSphereSceneNode(radius, polyCount, polyCount, parent, this, id, position, rotation, scale);
 	node->drop();
 
 	return node;
@@ -481,7 +556,6 @@ ISceneNode* CSceneManager::addWaterSurfaceSceneNode(IMesh* mesh, f32 waveHeight,
 }
 
 
-
 //! adds a scene node for rendering an animated mesh model
 IAnimatedMeshSceneNode* CSceneManager::addAnimatedMeshSceneNode(IAnimatedMesh* mesh, ISceneNode* parent, s32 id,
 	const core::vector3df& position, const core::vector3df& rotation,
@@ -516,7 +590,6 @@ ISceneNode* CSceneManager::addOctTreeSceneNode(IAnimatedMesh* mesh, ISceneNode*
 }
 
 
-
 //! Adss a scene node for rendering using a octtree. This a good method for rendering
 //! scenes with lots of geometry. The Octree is built on the fly from the mesh, much
 //! faster then a bsp tree.
@@ -561,9 +634,8 @@ ICameraSceneNode* CSceneManager::addCameraSceneNode(ISceneNode* parent,
 }
 
 
-
-//! Adds a camera scene node which is able to be controlle with the mouse similar
-//! like in the 3D Software Maya by Alias Wavefront.
+//! Adds a camera scene node which is able to be controlld with the mouse similar
+//! to in the 3D Software Maya by Alias Wavefront.
 //! The returned pointer must not be dropped.
 ICameraSceneNode* CSceneManager::addCameraSceneNodeMaya(ISceneNode* parent,
 	f32 rotateSpeed, f32 zoomSpeed, f32 translationSpeed, s32 id)
@@ -571,17 +643,20 @@ ICameraSceneNode* CSceneManager::addCameraSceneNodeMaya(ISceneNode* parent,
 	if (!parent)
 		parent = this;
 
-	ICameraSceneNode* node = new CCameraMayaSceneNode(parent, this, id, rotateSpeed,
-		zoomSpeed, translationSpeed);
-	node->drop();
+	ICameraSceneNode* node = new CCameraSceneNode(parent, this, id);
+	ISceneNodeAnimator* anm = new CSceneNodeAnimatorCameraMaya(CursorControl, 
+		rotateSpeed, zoomSpeed, translationSpeed);
 
+	node->addAnimator(anm);
 	setActiveCamera(node);
 
+	anm->drop();
+	node->drop();
+
 	return node;
 }
 
 
-
 //! Adds a camera scene node which is able to be controled with the mouse and keys
 //! like in most first person shooters (FPS):
 ICameraSceneNode* CSceneManager::addCameraSceneNodeFPS(ISceneNode* parent,
@@ -591,17 +666,24 @@ ICameraSceneNode* CSceneManager::addCameraSceneNodeFPS(ISceneNode* parent,
 	if (!parent)
 		parent = this;
 
-	ICameraSceneNode* node = new CCameraFPSSceneNode(parent, this, CursorControl,
-		id, rotateSpeed, moveSpeed, jumpSpeed, keyMapArray, keyMapSize, noVerticalMovement);
-	node->drop();
+	ICameraSceneNode* node = new CCameraSceneNode(parent, this, id);
+	ISceneNodeAnimator* anm = new CSceneNodeAnimatorCameraFPS(CursorControl,
+			rotateSpeed, moveSpeed, jumpSpeed,
+			keyMapArray, keyMapSize, noVerticalMovement);
 
+	// Bind the node's rotation to its target. This is consistent with 1.4.2 and below.
+	node->bindTargetAndRotation(true);
+
+	node->addAnimator(anm);
 	setActiveCamera(node);
 
+	anm->drop();
+	node->drop();
+
 	return node;
 }
 
 
-
 //! Adds a dynamic light scene node. The light will cast dynamic light on all
 //! other scene nodes in the scene, which have the material flag video::MTF_LIGHTING
 //! turned on. (This is the default setting in most scene nodes).
@@ -618,20 +700,19 @@ ILightSceneNode* CSceneManager::addLightSceneNode(ISceneNode* parent,
 }
 
 
-
 //! Adds a billboard scene node to the scene. A billboard is like a 3d sprite: A 2d element,
 //! which always looks to the camera. It is usually used for things like explosions, fire,
 //! lensflares and things like that.
 IBillboardSceneNode* CSceneManager::addBillboardSceneNode(ISceneNode* parent,
 	const core::dimension2d<f32>& size, const core::vector3df& position, s32 id,
-	video::SColor shade_top, video::SColor shade_down
+	video::SColor colorTop, video::SColor colorBottom
 	)
 {
 	if (!parent)
 		parent = this;
 
 	IBillboardSceneNode* node = new CBillboardSceneNode(parent, this, id, position, size,
-		shade_top, shade_down);
+		colorTop, colorBottom);
 	node->drop();
 
 	return node;
@@ -703,6 +784,13 @@ ITerrainSceneNode* CSceneManager::addTerrainSceneNode(
 {
 	io::IReadFile* file = FileSystem->createAndOpenFile(heightMapFileName);
 
+	if(!file && !addAlsoIfHeightmapEmpty)
+	{
+		os::Printer::log("Could not load terrain, because file could not be opened.",
+		heightMapFileName, ELL_ERROR);
+		return 0;
+	}
+
 	ITerrainSceneNode* terrain = addTerrainSceneNode(file, parent, id,
 		position, rotation, scale, vertexColor, maxLOD, patchSize,
 		smoothFactor, addAlsoIfHeightmapEmpty);
@@ -730,8 +818,7 @@ ITerrainSceneNode* CSceneManager::addTerrainSceneNode(
 
 	if (!heightMapFile && !addAlsoIfHeightmapEmpty)
 	{
-		os::Printer::log("Could not load terrain, because file could not be opened.",
-			heightMapFile->getFileName(), ELL_ERROR);
+		os::Printer::log("Could not load terrain, because file could not be opened.", ELL_ERROR);
 		return 0;
 	}
 
@@ -781,11 +868,11 @@ IDummyTransformationSceneNode* CSceneManager::addDummyTransformationSceneNode(
 }
 
 //! Adds a Hill Plane mesh to the mesh pool. The mesh is generated on the fly
-//! and looks like a plane with some hills on it. It is uses mostly for quick
-//! tests of the engine only. You can specify how many hills there should be
-//! on the plane and how high they should be. Also you must specify a name for
-//! the mesh, because the mesh is added to the mesh pool, and can be retrieved
-//! again using ISceneManager::getMesh with the name as parameter.
+//! and looks like a plane with some hills on it. You can specify how many hills
+//! there should be on the plane and how high they should be. Also you must
+//! specify a name for the mesh, because the mesh is added to the mesh pool,
+//! and can be retrieved again using ISceneManager::getMesh with the name as
+//! parameter.
 IAnimatedMesh* CSceneManager::addHillPlaneMesh(const c8* name,
 		const core::dimension2d<f32>& tileSize,
 		const core::dimension2d<u32>& tileCount,
@@ -793,9 +880,12 @@ IAnimatedMesh* CSceneManager::addHillPlaneMesh(const c8* name,
 		const core::dimension2d<f32>& countHills,
 		const core::dimension2d<f32>& textureRepeatCount)
 {
-	if (!name || MeshCache->isMeshLoaded(name))
+	if (!name)
 		return 0;
 
+	if (MeshCache->isMeshLoaded(name))
+		return MeshCache->getMeshByFilename(name);
+
 	IMesh* mesh = CGeometryCreator::createHillPlaneMesh(tileSize,
 			tileCount, material, hillHeight, countHills,
 			textureRepeatCount);
@@ -804,11 +894,14 @@ IAnimatedMesh* CSceneManager::addHillPlaneMesh(const c8* name,
 
 	SAnimatedMesh* animatedMesh = new SAnimatedMesh();
 	if (!animatedMesh)
+	{
+		mesh->drop();
 		return 0;
+	}
 
 	animatedMesh->addMesh(mesh);
-	animatedMesh->recalculateBoundingBox();
 	mesh->drop();
+	animatedMesh->recalculateBoundingBox();
 
 	MeshCache->addMesh(name, animatedMesh);
 	animatedMesh->drop();
@@ -824,9 +917,12 @@ IAnimatedMesh* CSceneManager::addTerrainMesh(const c8* name,
 	f32 maxHeight,
 	const core::dimension2d<s32>& defaultVertexBlockSize)
 {
-	if (!name || MeshCache->isMeshLoaded(name))
+	if (!name)
 		return 0;
 
+	if (MeshCache->isMeshLoaded(name))
+		return MeshCache->getMeshByFilename(name);
+
 	IMesh* mesh = CGeometryCreator::createTerrainMesh(texture, heightmap,
 			stretchSize, maxHeight, getVideoDriver(),
 			defaultVertexBlockSize);
@@ -835,11 +931,14 @@ IAnimatedMesh* CSceneManager::addTerrainMesh(const c8* name,
 
 	SAnimatedMesh* animatedMesh = new SAnimatedMesh();
 	if (!animatedMesh)
+	{
+		mesh->drop();
 		return 0;
+	}
 
 	animatedMesh->addMesh(mesh);
-	animatedMesh->recalculateBoundingBox();
 	mesh->drop();
+	animatedMesh->recalculateBoundingBox();
 
 	MeshCache->addMesh(name, animatedMesh);
 	animatedMesh->drop();
@@ -853,9 +952,12 @@ IAnimatedMesh* CSceneManager::addArrowMesh(const c8* name,
 		u32 tesselationCylinder, u32 tesselationCone, f32 height,
 		f32 cylinderHeight, f32 width0,f32 width1)
 {
-	if (!name || MeshCache->isMeshLoaded(name))
+	if (!name)
 		return 0;
 
+	if (MeshCache->isMeshLoaded(name))
+		return MeshCache->getMeshByFilename(name);
+
 	IMesh* mesh = CGeometryCreator::createArrowMesh( tesselationCylinder,
 			tesselationCone, height, cylinderHeight, width0,width1,
 			vtxColor0, vtxColor1);
@@ -864,11 +966,14 @@ IAnimatedMesh* CSceneManager::addArrowMesh(const c8* name,
 
 	SAnimatedMesh* animatedMesh = new SAnimatedMesh();
 	if (!animatedMesh)
+	{
+		mesh->drop();
 		return 0;
+	}
 
 	animatedMesh->addMesh(mesh);
-	animatedMesh->recalculateBoundingBox();
 	mesh->drop();
+	animatedMesh->recalculateBoundingBox();
 
 	MeshCache->addMesh(name, animatedMesh);
 	animatedMesh->drop();
@@ -882,20 +987,26 @@ IAnimatedMesh* CSceneManager::addArrowMesh(const c8* name,
 IAnimatedMesh* CSceneManager::addSphereMesh(const c8* name,
 		f32 radius, u32 polyCountX, u32 polyCountY)
 {
-	if (!name || MeshCache->isMeshLoaded(name))
+	if (!name)
 		return 0;
 
-	IMesh* mesh = CGeometryCreator::createSphereMesh( radius, polyCountX, polyCountY);
+	if (MeshCache->isMeshLoaded(name))
+		return MeshCache->getMeshByFilename(name);
+
+	IMesh* mesh = CGeometryCreator::createSphereMesh(radius, polyCountX, polyCountY);
 	if (!mesh)
 		return 0;
 
 	SAnimatedMesh* animatedMesh = new SAnimatedMesh();
 	if (!animatedMesh)
+	{
+		mesh->drop();
 		return 0;
+	}
 
 	animatedMesh->addMesh(mesh);
-	animatedMesh->recalculateBoundingBox();
 	mesh->drop();
+	animatedMesh->recalculateBoundingBox();
 
 	MeshCache->addMesh(name, animatedMesh);
 	animatedMesh->drop();
@@ -916,7 +1027,6 @@ ISceneNode* CSceneManager::getRootSceneNode()
 }
 
 
-
 //! Returns the current active camera.
 //! \return The active camera is returned. Note that this can be NULL, if there
 //! was no camera created yet.
@@ -926,7 +1036,6 @@ ICameraSceneNode* CSceneManager::getActiveCamera()
 }
 
 
-
 //! Sets the active camera. The previous active camera will be deactivated.
 //! \param camera: The new camera which should be active.
 void CSceneManager::setActiveCamera(ICameraSceneNode* camera)
@@ -941,8 +1050,6 @@ void CSceneManager::setActiveCamera(ICameraSceneNode* camera)
 }
 
 
-
-
 //! renders the node.
 void CSceneManager::render()
 {
@@ -959,13 +1066,15 @@ const core::aabbox3d<f32>& CSceneManager::getBoundingBox() const
 }
 
 
-
 //! returns if node is culled
 bool CSceneManager::isCulled(const ISceneNode* node)
 {
 	const ICameraSceneNode* cam = getActiveCamera();
 	if (!cam)
+	{
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
+	}
 
 	switch ( node->getAutomaticCulling() )
 	{
@@ -973,7 +1082,8 @@ bool CSceneManager::isCulled(const ISceneNode* node)
 		case scene::EAC_BOX:
 		{
 			core::aabbox3d<f32> tbox = node->getBoundingBox();
-			node->getAbsoluteTransformation().transformBox(tbox);
+			node->getAbsoluteTransformation().transformBoxEx(tbox);
+			_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 			return !(tbox.intersectsWithBox(cam->getViewFrustum()->getBoundingBox() ));
 		}
 
@@ -1011,14 +1121,14 @@ bool CSceneManager::isCulled(const ISceneNode* node)
 				if (!boxInFrustum)
 					return true;
 			}
-
-			return false;
 		}
+		break;
 
 		case scene::EAC_OFF:
 		break;
 	}
 
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return false;
 }
 
@@ -1065,7 +1175,7 @@ u32 CSceneManager::registerNodeForRendering(ISceneNode* node, E_SCENE_NODE_RENDE
 	case ESNRP_SOLID:
 		if (!isCulled(node))
 		{
-			SolidNodeList.push_back( node );
+			SolidNodeList.push_back(node);
 			taken = 1;
 		}
 		break;
@@ -1099,7 +1209,7 @@ u32 CSceneManager::registerNodeForRendering(ISceneNode* node, E_SCENE_NODE_RENDE
 			// not transparent, register as solid
 			if ( 0 == taken )
 			{
-				SolidNodeList.push_back( node );
+				SolidNodeList.push_back(node);
 				taken = 1;
 			}
 		}
@@ -1111,22 +1221,6 @@ u32 CSceneManager::registerNodeForRendering(ISceneNode* node, E_SCENE_NODE_RENDE
 			taken = 1;
 		}
 		break;
-	case ESNRP_SHADER_0:
-	case ESNRP_SHADER_1:
-	case ESNRP_SHADER_2:
-	case ESNRP_SHADER_3:
-	case ESNRP_SHADER_4:
-	case ESNRP_SHADER_5:
-	case ESNRP_SHADER_6:
-	case ESNRP_SHADER_7:
-	case ESNRP_SHADER_8:
-	case ESNRP_SHADER_9:
-	case ESNRP_SHADER_10:
-		if ( !isCulled(node) )
-		{
-			ShaderNodeList[ time - ESNRP_SHADER_0].push_back( ShaderNodeEntry ( node,time - ESNRP_SHADER_0 ));
-			taken = 1;
-		} break;
 
 	case ESNRP_COUNT: // ignore this one
 		break;
@@ -1162,16 +1256,17 @@ void CSceneManager::drawAll()
 	video::IVideoDriver* driver = getVideoDriver();
 	if ( driver )
 	{
-		core::matrix4 identity;
-		driver->setTransform ( video::ETS_PROJECTION, identity );
-		driver->setTransform ( video::ETS_VIEW, identity );
-		driver->setTransform ( video::ETS_WORLD, identity );
-		driver->setTransform ( video::ETS_TEXTURE_0, identity );
-		driver->setTransform ( video::ETS_TEXTURE_1, identity );
-		driver->setTransform ( video::ETS_TEXTURE_2, identity );
-		driver->setTransform ( video::ETS_TEXTURE_3, identity );
+		driver->setTransform ( video::ETS_PROJECTION, core::IdentityMatrix );
+		driver->setTransform ( video::ETS_VIEW, core::IdentityMatrix );
+		driver->setTransform ( video::ETS_WORLD, core::IdentityMatrix );
+		driver->setTransform ( video::ETS_TEXTURE_0, core::IdentityMatrix );
+		driver->setTransform ( video::ETS_TEXTURE_1, core::IdentityMatrix );
+		driver->setTransform ( video::ETS_TEXTURE_2, core::IdentityMatrix );
+		driver->setTransform ( video::ETS_TEXTURE_3, core::IdentityMatrix );
 	}
 
+	driver->setAllowZWriteOnTransparent(Parameters.getAttributeAsBool( ALLOW_ZWRITE_ON_TRANSPARENT) );
+
 	// do animations and other stuff.
 	OnAnimate(os::Timer::getTime());
 
@@ -1208,11 +1303,11 @@ void CSceneManager::drawAll()
 
 		Driver->setAmbientLight(AmbientLight);
 
-		LightList.sort ();		// on distance to camera
+		LightList.sort();		// on distance to camera
 
-		u32 maxLights = core::min_ ( Driver->getMaximalDynamicLightAmount (), LightList.size () );
+		u32 maxLights = core::min_ ( Driver->getMaximalDynamicLightAmount(), LightList.size() );
 		for (i=0; i< maxLights; ++i)
-			LightList[i].node->render();
+			LightList[i].Node->render();
 
 		LightList.set_used(0);
 	}
@@ -1234,9 +1329,9 @@ void CSceneManager::drawAll()
 		SolidNodeList.sort(); // sort by textures
 
 		for (i=0; i<SolidNodeList.size(); ++i)
-			SolidNodeList[i].node->render();
+			SolidNodeList[i].Node->render();
 
-		Parameters.setAttribute ( "drawn", (s32) SolidNodeList.size () );
+		Parameters.setAttribute ( "drawn", (s32) SolidNodeList.size() );
 
 		SolidNodeList.set_used(0);
 	}
@@ -1260,29 +1355,11 @@ void CSceneManager::drawAll()
 		TransparentNodeList.sort(); // sort by distance from camera
 
 		for (i=0; i<TransparentNodeList.size(); ++i)
-			TransparentNodeList[i].node->render();
+			TransparentNodeList[i].Node->render();
 
 		TransparentNodeList.set_used(0);
 	}
 
-	// render shader objects.
-	{
-		for ( u32 g = 0; g!= ESNRP_SHADER_10 - ESNRP_SHADER_0 + 1; ++g )
-		{
-			CurrentRendertime = (scene::E_SCENE_NODE_RENDER_PASS) (ESNRP_SHADER_0 + g);
-
-			const u32 size = ShaderNodeList[g].size ();
-			if ( 0 == size )
-				continue;
-
-			ShaderNodeList[g].sort(); // sort by textures
-			for (i=0; i< size; ++i)
-				ShaderNodeList[g][i].node->render();
-
-			ShaderNodeList[g].set_used(0);
-		}
-	}
-
 	clearDeletionList();
 
 	CurrentRendertime = ESNRP_COUNT;
@@ -1317,10 +1394,11 @@ ISceneNodeAnimator* CSceneManager::createRotationAnimator(const core::vector3df&
 
 //! creates a fly circle animator, which lets the attached scene node fly around a center.
 ISceneNodeAnimator* CSceneManager::createFlyCircleAnimator(
-		const core::vector3df& normal, f32 radius, f32 speed,
+		const core::vector3df& center, f32 radius, f32 speed,
 		const core::vector3df& direction)
 {
-	ISceneNodeAnimator* anim = new CSceneNodeAnimatorFlyCircle(os::Timer::getTime(), normal,
+	ISceneNodeAnimator* anim = new CSceneNodeAnimatorFlyCircle(
+			os::Timer::getTime(), center,
 			radius, speed, direction);
 	return anim;
 }
@@ -1399,7 +1477,6 @@ void CSceneManager::addExternalMeshLoader(IMeshLoader* externalLoader)
 }
 
 
-
 //! Returns a pointer to the scene collision manager.
 ISceneCollisionManager* CSceneManager::getSceneCollisionManager()
 {
@@ -1410,7 +1487,7 @@ ISceneCollisionManager* CSceneManager::getSceneCollisionManager()
 //! Returns a pointer to the mesh manipulator.
 IMeshManipulator* CSceneManager::getMeshManipulator()
 {
-	return MeshManipulator;
+	return Driver->getMeshManipulator();
 }
 
 
@@ -1481,7 +1558,7 @@ void CSceneManager::clearDeletionList()
 	if (DeletionList.empty())
 		return;
 
-	for (s32 i=0; i<(s32)DeletionList.size(); ++i)
+	for (u32 i=0; i<DeletionList.size(); ++i)
 	{
 		DeletionList[i]->remove();
 		DeletionList[i]->drop();
@@ -1545,7 +1622,7 @@ ISceneNode* CSceneManager::getSceneNodeFromType(scene::ESCENE_NODE_TYPE type, IS
 	if (start == 0)
 		start = getRootSceneNode();
 
-	if (start->getType() == type)
+	if (start->getType() == type || ESNT_ANY == type)
 		return start;
 
 	ISceneNode* node = 0;
@@ -1568,7 +1645,7 @@ void CSceneManager::getSceneNodesFromType(ESCENE_NODE_TYPE type, core::array<sce
 	if (start == 0)
 		start = getRootSceneNode();
 
-	if (start->getType() == type)
+	if (start->getType() == type || ESNT_ANY == type)
 		outNodes.push_back(start);
 
 	const core::list<ISceneNode*>& list = start->getChildren();
@@ -1635,7 +1712,7 @@ IMeshCache* CSceneManager::getMeshCache()
 //! Creates a new scene manager.
 ISceneManager* CSceneManager::createNewSceneManager(bool cloneContent)
 {
-	CSceneManager* manager = new CSceneManager(Driver, FileSystem, CursorControl, MeshCache);
+	CSceneManager* manager = new CSceneManager(Driver, FileSystem, CursorControl, MeshCache, GUIEnvironment);
 
 	if (cloneContent)
 		manager->cloneMembers(this, manager);
@@ -1717,12 +1794,14 @@ ISceneNodeAnimatorFactory* CSceneManager::getSceneNodeAnimatorFactory(u32 index)
 //! \param filename: Name of the file .
 bool CSceneManager::saveScene(const c8* filename, ISceneUserDataSerializer* userDataSerializer)
 {
+	bool ret = false;
 	io::IWriteFile* file = FileSystem->createAndWriteFile(filename);
-	if (!file)
-		return false;
-
-	bool ret = saveScene(file, userDataSerializer);
-	file->drop();
+	if (file)
+	{
+		ret = saveScene(file, userDataSerializer);
+		file->drop();
+	}
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return ret;
 }
 
@@ -1731,11 +1810,17 @@ bool CSceneManager::saveScene(const c8* filename, ISceneUserDataSerializer* user
 bool CSceneManager::saveScene(io::IWriteFile* file, ISceneUserDataSerializer* userDataSerializer)
 {
 	if (!file)
+	{
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
+	}
 
 	io::IXMLWriter* writer = FileSystem->createXMLWriter(file);
 	if (!writer)
+	{
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
+	}
 
 	writer->writeXMLHeader();
 	writeSceneNode(writer, this, userDataSerializer);
@@ -1749,16 +1834,19 @@ bool CSceneManager::saveScene(io::IWriteFile* file, ISceneUserDataSerializer* us
 //! \param filename: Name of the file .
 bool CSceneManager::loadScene(const c8* filename, ISceneUserDataSerializer* userDataSerializer)
 {
+	bool ret = false;
 	io::IReadFile* read = FileSystem->createAndOpenFile(filename);
 	if (!read)
 	{
 		os::Printer::log("Unable to open scene file", filename, ELL_ERROR);
-		return false;
+	}
+	else
+	{
+		ret = loadScene(read, userDataSerializer);
+		read->drop();
 	}
 
-	bool ret = loadScene(read, userDataSerializer);
-	read->drop();
-
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 	return ret;
 }
 
@@ -1769,6 +1857,7 @@ bool CSceneManager::loadScene(io::IReadFile* file, ISceneUserDataSerializer* use
 	if (!file)
 	{
 		os::Printer::log("Unable to open scene file", ELL_ERROR);
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
 	}
 
@@ -1776,6 +1865,7 @@ bool CSceneManager::loadScene(io::IReadFile* file, ISceneUserDataSerializer* use
 	if (!reader)
 	{
 		os::Printer::log("Scene is not a valid XML file", file->getFileName(), ELL_ERROR);
+		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
 		return false;
 	}
 
@@ -1799,7 +1889,6 @@ bool CSceneManager::loadScene(io::IReadFile* file, ISceneUserDataSerializer* use
 
 	reader->drop();
 	return true;
-
 }
 
 
@@ -1811,22 +1900,18 @@ void CSceneManager::readSceneNode(io::IXMLReader* reader, ISceneNode* parent, IS
 
 	scene::ISceneNode* node = 0;
 
-	if ((!parent && IRR_XML_FORMAT_SCENE==reader->getNodeName()) ||
-		( parent && IRR_XML_FORMAT_NODE==reader->getNodeName()))
+	if (!parent && IRR_XML_FORMAT_SCENE==reader->getNodeName())
+		node = this; // root
+	else if (parent && IRR_XML_FORMAT_NODE==reader->getNodeName())
 	{
-		if (parent)
-		{
-			// find node type and create it
-			core::stringc attrName = reader->getAttributeValue(IRR_XML_FORMAT_NODE_ATTR_TYPE.c_str());
+		// find node type and create it
+		core::stringc attrName = reader->getAttributeValue(IRR_XML_FORMAT_NODE_ATTR_TYPE.c_str());
 
-			for (int i=(int)SceneNodeFactoryList.size()-1; i>=0 && !node; --i)
-				node = SceneNodeFactoryList[i]->addSceneNode(attrName.c_str(), parent);
+		for (s32 i=(s32)SceneNodeFactoryList.size()-1; i>=0 && !node; --i)
+			node = SceneNodeFactoryList[i]->addSceneNode(attrName.c_str(), parent);
 
-			if (!node)
-				os::Printer::log("Could not create scene node of unknown type", attrName.c_str());
-		}
-		else
-			node = this; // root
+		if (!node)
+			os::Printer::log("Could not create scene node of unknown type", attrName.c_str());
 	}
 
 	// read attributes
@@ -1883,6 +1968,8 @@ void CSceneManager::readSceneNode(io::IXMLReader* reader, ISceneNode* parent, IS
 		if (endreached)
 			break;
 	}
+	if ( node && userDataSerializer )
+		userDataSerializer->OnCreateNode(node);
 }
 
 
@@ -2218,6 +2305,12 @@ IMeshWriter* CSceneManager::createMeshWriter(EMESH_WRITER_TYPE type)
 		return new CSTLMeshWriter(this);
 #else
 		return 0;
+#endif
+	case EMWT_OBJ:
+#ifdef _IRR_COMPILE_WITH_OBJ_WRITER_
+		return new COBJMeshWriter(this, FileSystem);
+#else
+		return 0;
 #endif
 	}
 
diff --git a/src/dep/src/irrlicht/CSceneManager.h b/src/dep/src/irrlicht/CSceneManager.h
index 153282c..0d8ee8c 100644
--- a/src/dep/src/irrlicht/CSceneManager.h
+++ b/src/dep/src/irrlicht/CSceneManager.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -33,7 +33,7 @@ namespace scene
 
 		//! constructor
 		CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
-			gui::ICursorControl* cursorControl, IMeshCache* cache = 0, 
+			gui::ICursorControl* cursorControl, IMeshCache* cache = 0,
 			gui::IGUIEnvironment *guiEnvironment = 0);
 
 		//! destructor
@@ -42,6 +42,9 @@ namespace scene
 		//! gets an animateable mesh. loads it if needed. returned pointer must not be dropped.
 		virtual IAnimatedMesh* getMesh(const c8* filename);
 
+		//! gets an animateable mesh. loads it if needed. returned pointer must not be dropped.
+		virtual IAnimatedMesh* getMesh(io::IReadFile* file);
+
 		//! Returns an interface to the mesh cache which is shared beween all existing scene managers.
 		virtual IMeshCache* getMeshCache();
 
@@ -50,13 +53,23 @@ namespace scene
 
 		virtual gui::IGUIEnvironment* getGUIEnvironment();
 
-		//! adds a cube scene node to the scene. It is a simple cube of (1,1,1) size. 
+		//! adds Volume Lighting Scene Node.
 		//! the returned pointer must not be dropped.
-		virtual ISceneNode* addCubeSceneNode(f32 size=10.0f, ISceneNode* parent=0, s32 id=-1,
+		virtual IVolumeLightSceneNode* addVolumeLightSceneNode(ISceneNode* parent=0, s32 id=-1,
+			const u32 subdivU = 32, const u32 subdivV = 32,
+			const video::SColor foot = video::SColor(51, 0, 230, 180),
+			const video::SColor tail = video::SColor(0, 0, 0, 0),
+			const core::vector3df& position = core::vector3df(0,0,0),
+			const core::vector3df& rotation = core::vector3df(0,0,0),
+			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f));
+
+		//! adds a cube scene node to the scene. It is a simple cube of (1,1,1) size.
+		//! the returned pointer must not be dropped.
+		virtual IMeshSceneNode* addCubeSceneNode(f32 size=10.0f, ISceneNode* parent=0, s32 id=-1,
 			const core::vector3df& position = core::vector3df(0,0,0),	const core::vector3df& rotation = core::vector3df(0,0,0),	const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f));
 
 		//! Adds a sphere scene node to the scene.
-		virtual ISceneNode* addSphereSceneNode(f32 radius=5.0f, s32 polyCount=16, ISceneNode* parent=0, s32 id=-1,
+		virtual IMeshSceneNode* addSphereSceneNode(f32 radius=5.0f, s32 polyCount=16, ISceneNode* parent=0, s32 id=-1,
 			const core::vector3df& position = core::vector3df(0,0,0),
 			const core::vector3df& rotation = core::vector3df(0,0,0),
 			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f));
@@ -71,7 +84,7 @@ namespace scene
 		//! adds a scene node for rendering a static mesh
 		//! the returned pointer must not be dropped.
 		virtual IMeshSceneNode* addMeshSceneNode(IMesh* mesh, ISceneNode* parent=0, s32 id=-1,
-			const core::vector3df& position = core::vector3df(0,0,0), 
+			const core::vector3df& position = core::vector3df(0,0,0),
 			const core::vector3df& rotation = core::vector3df(0,0,0),
 			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f),
 			bool alsoAddIfMeshPointerZero=false);
@@ -94,16 +107,16 @@ namespace scene
 		//! draws all scene nodes
 		virtual void drawAll();
 
-		//! Adds a scene node for rendering using a octtree to the scene graph. This a good method for rendering 
+		//! Adds a scene node for rendering using a octtree to the scene graph. This a good method for rendering
 		//! scenes with lots of geometry. The Octree is built on the fly from the mesh, much
 		//! faster then a bsp tree.
-		virtual ISceneNode* addOctTreeSceneNode(IAnimatedMesh* mesh, ISceneNode* parent=0, 
-			s32 id=-1, s32 minimalPolysPerNode=128, bool alsoAddIfMeshPointerZero=false);
+		virtual ISceneNode* addOctTreeSceneNode(IAnimatedMesh* mesh, ISceneNode* parent=0,
+			s32 id=-1, s32 minimalPolysPerNode=512, bool alsoAddIfMeshPointerZero=false);
 
-		//! Adss a scene node for rendering using a octtree. This a good method for rendering 
+		//! Adss a scene node for rendering using a octtree. This a good method for rendering
 		//! scenes with lots of geometry. The Octree is built on the fly from the mesh, much
 		//! faster then a bsp tree.
-		virtual ISceneNode* addOctTreeSceneNode(IMesh* mesh, ISceneNode* parent=0, 
+		virtual ISceneNode* addOctTreeSceneNode(IMesh* mesh, ISceneNode* parent=0,
 			s32 id=-1, s32 minimalPolysPerNode=128, bool alsoAddIfMeshPointerZero=false);
 
 		//! Adds a camera scene node to the tree and sets it as active camera.
@@ -111,21 +124,21 @@ namespace scene
 		//! \param lookat: Position where the camera will look at. Also known as target.
 		//! \param parent: Parent scene node of the camera. Can be null. If the parent moves,
 		//! the camera will move too.
-		//! \return Returns pointer to interface to camera
+		//! \return Pointer to interface to camera
 		virtual ICameraSceneNode* addCameraSceneNode(ISceneNode* parent = 0,
-			const core::vector3df& position = core::vector3df(0,0,0), 
-			const core::vector3df& lookat = core::vector3df(0,0,0), s32 id=-1);
+			const core::vector3df& position = core::vector3df(0,0,0),
+			const core::vector3df& lookat = core::vector3df(0,0,100), s32 id=-1);
 
 		//! Adds a camera scene node which is able to be controlle with the mouse similar
 		//! like in the 3D Software Maya by Alias Wavefront.
 		//! The returned pointer must not be dropped.
 		virtual ICameraSceneNode* addCameraSceneNodeMaya(ISceneNode* parent = 0,
-			f32 rotateSpeed = -1500.0f, f32 zoomSpeed = 200.0f, f32 translationSpeed = 100.0f, s32 id=-1);
+			f32 rotateSpeed = -1500.0f, f32 zoomSpeed = 200.0f, f32 translationSpeed = 1500.0f, s32 id=-1);
 
 		//! Adds a camera scene node which is able to be controled with the mouse and keys
-		//! like in most first person shooters (FPS): 
+		//! like in most first person shooters (FPS):
 		virtual ICameraSceneNode* addCameraSceneNodeFPS(ISceneNode* parent = 0,
-			f32 rotateSpeed = 1500.0f, f32 moveSpeed = 200.0f, s32 id=-1,
+			f32 rotateSpeed = 100.0f, f32 moveSpeed = .5f, s32 id=-1,
 			SKeyMap* keyMapArray=0, s32 keyMapSize=0, bool noVerticalMovement=false,
 			f32 jumpSpeed = 0.f);
 
@@ -134,7 +147,8 @@ namespace scene
 		//! turned on. (This is the default setting in most scene nodes).
 		virtual ILightSceneNode* addLightSceneNode(ISceneNode* parent = 0,
 			const core::vector3df& position = core::vector3df(0,0,0),
-			video::SColorf color = video::SColorf(1.0f, 1.0f, 1.0f),	f32 range=100.0f, s32 id=-1);
+			video::SColorf color = video::SColorf(1.0f, 1.0f, 1.0f),
+			f32 range=100.0f, s32 id=-1);
 
 		//! Adds a billboard scene node to the scene. A billboard is like a 3d sprite: A 2d element,
 		//! which always looks to the camera. It is usually used for things like explosions, fire,
@@ -142,10 +156,10 @@ namespace scene
 		virtual IBillboardSceneNode* addBillboardSceneNode(ISceneNode* parent = 0,
 			const core::dimension2d<f32>& size = core::dimension2d<f32>(10.0f, 10.0f),
 			const core::vector3df& position = core::vector3df(0,0,0), s32 id=-1,
-			video::SColor shade_top = 0xFFFFFFFF, video::SColor shade_down = 0xFFFFFFFF);
+			video::SColor shadeTop = 0xFFFFFFFF, video::SColor shadeBottom = 0xFFFFFFFF);
 
 		//! Adds a skybox scene node. A skybox is a big cube with 6 textures on it and
-		//! is drawn around the camera position. 
+		//! is drawn around the camera position.
 		virtual ISceneNode* addSkyBoxSceneNode(video::ITexture* top, video::ITexture* bottom,
 			video::ITexture* left, video::ITexture* right, video::ITexture* front,
 			video::ITexture* back, ISceneNode* parent = 0, s32 id=-1);
@@ -153,22 +167,23 @@ namespace scene
 		//! Adds a skydome scene node. A skydome is a large (half-) sphere with a
 		//! panoramic texture on it and is drawn around the camera position.
 		virtual ISceneNode* addSkyDomeSceneNode(video::ITexture* texture,
-			u32 horiRes, u32 vertRes, f64 texturePercentage,
-			f64 spherePercentage, ISceneNode* parent=0, s32 id=-1);
+			u32 horiRes=16, u32 vertRes=8,
+			f64 texturePercentage=0.9, f64 spherePercentage=2.0,
+			ISceneNode* parent=0, s32 id=-1);
 
-		//! Adds a text scene node, which is able to display 
+		//! Adds a text scene node, which is able to display
 		//! 2d text at a position in three dimensional space
 		virtual ITextSceneNode* addTextSceneNode(gui::IGUIFont* font, const wchar_t* text,
-			video::SColor color=video::SColor(100,255,255,255), 
+			video::SColor color=video::SColor(100,255,255,255),
 			ISceneNode* parent = 0,	const core::vector3df& position = core::vector3df(0,0,0),
 			s32 id=-1);
 
 		//! Adds a text scene node, which uses billboards
-		virtual ITextSceneNode* addBillboardTextSceneNode(gui::IGUIFont* font, const wchar_t* text,
+		virtual IBillboardTextSceneNode* addBillboardTextSceneNode(gui::IGUIFont* font, const wchar_t* text,
 			ISceneNode* parent = 0,
 			const core::dimension2d<f32>& size = core::dimension2d<f32>(10.0f, 10.0f),
 			const core::vector3df& position = core::vector3df(0,0,0), s32 id=-1,
-			video::SColor shade_top = 0xFFFFFFFF, video::SColor shade_down = 0xFFFFFFFF);
+			video::SColor colorTop = 0xFFFFFFFF, video::SColor colorBottom = 0xFFFFFFFF);
 
 		//! Adds a scene node, which can render a quake3 shader
 		virtual ISceneNode* addQuake3SceneNode(IMeshBuffer* meshBuffer, const quake3::SShader * shader,
@@ -185,7 +200,7 @@ namespace scene
 		//! name as parameter.
 		virtual IAnimatedMesh* addHillPlaneMesh(const c8* name,
 			const core::dimension2d<f32>& tileSize, const core::dimension2d<u32>& tileCount,
-			video::SMaterial* material = 0,	f32 hillHeight = 0.0f, 
+			video::SMaterial* material = 0,	f32 hillHeight = 0.0f,
 			const core::dimension2d<f32>& countHills = core::dimension2d<f32>(1.0f, 1.0f),
 			const core::dimension2d<f32>& textureRepeatCount = core::dimension2d<f32>(1.0f, 1.0f));
 
@@ -205,7 +220,7 @@ namespace scene
 		IAnimatedMesh* addSphereMesh(const c8* name,
 				f32 radius, u32 polyCountX, u32 polyCountY);
 
-		//! Adds a particle system scene node. 
+		//! Adds a particle system scene node.
 		virtual IParticleSystemSceneNode* addParticleSystemSceneNode(
 			bool withDefaultEmitter=true, ISceneNode* parent=0, s32 id=-1,
 			const core::vector3df& position = core::vector3df(0,0,0),
@@ -214,8 +229,8 @@ namespace scene
 
 		//! Adds a terrain scene node to the scene graph.
 		virtual ITerrainSceneNode* addTerrainSceneNode(
-			const c8* heightMapFileName, 
-			ISceneNode* parent=0, s32 id=-1, 
+			const c8* heightMapFileName,
+			ISceneNode* parent=0, s32 id=-1,
 			const core::vector3df& position = core::vector3df(0.0f,0.0f,0.0f),
 			const core::vector3df& rotation = core::vector3df(0.0f,0.0f,0.0f),
 			const core::vector3df& scale = core::vector3df(1.0f,1.0f,1.0f),
@@ -225,8 +240,8 @@ namespace scene
 
 		//! Adds a terrain scene node to the scene graph.
 		virtual ITerrainSceneNode* addTerrainSceneNode(
-			io::IReadFile* heightMap, 
-			ISceneNode* parent=0, s32 id=-1, 
+			io::IReadFile* heightMap,
+			ISceneNode* parent=0, s32 id=-1,
 			const core::vector3df& position = core::vector3df(0.0f,0.0f,0.0f),
 			const core::vector3df& rotation = core::vector3df(0.0f,0.0f,0.0f),
 			const core::vector3df& scale = core::vector3df(1.0f,1.0f,1.0f),
@@ -241,11 +256,11 @@ namespace scene
 		//! Adds an empty scene node.
 		virtual ISceneNode* addEmptySceneNode(ISceneNode* parent, s32 id=-1);
 
-		//! Returns the root scene node. This is the scene node wich is parent 
+		//! Returns the root scene node. This is the scene node wich is parent
 		//! of all scene nodes. The root scene node is a special scene node which
 		//! only exists to manage all scene nodes. It is not rendered and cannot
 		//! be removed from the scene.
-		//! \return Returns a pointer to the root scene node.
+		//! \return Pointer to the root scene node.
 		virtual ISceneNode* getRootSceneNode();
 
 		//! Returns the current active camera.
@@ -259,17 +274,20 @@ namespace scene
 
 		//! creates a rotation animator, which rotates the attached scene node around itself.
 		//! \param rotationPerSecond: Specifies the speed of the animation
-		//! \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator()
+		//! \return The animator. Attach it to a scene node with ISceneNode::addAnimator()
 		//! and the animator will animate it.
 		virtual ISceneNodeAnimator* createRotationAnimator(const core::vector3df& rotationPerSecond);
 
-		//! creates a fly circle animator, which lets the attached scene node fly 
-		//! around a center. The center is the position of the scene node.
-		//! \param rotationSpeed: 
-		//! \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator()
-		//! and the animator will animate it.
-		virtual ISceneNodeAnimator* createFlyCircleAnimator(const core::vector3df& normal, f32 radius, f32 speed,
-			const core::vector3df& direction);
+		//! creates a fly circle animator
+		/** Lets the attached scene node fly around a center.
+		\param center Center relative to node origin
+		\param speed rotation speed
+		\return Animator. Attach it to a scene node with ISceneNode::addAnimator()
+		and the animator will animate it. */
+		virtual ISceneNodeAnimator* createFlyCircleAnimator(
+				const core::vector3df& center=core::vector3df(0.f, 0.f, 0.f),
+				f32 radius=100.f, f32 speed=0.001f,
+				const core::vector3df& direction=core::vector3df(0.f, 1.f, 0.f));
 
 		//! Creates a fly straight animator, which lets the attached scene node
 		//! fly or move along a line between two points.
@@ -286,17 +304,17 @@ namespace scene
 		virtual ISceneNodeAnimator* createDeleteAnimator(u32 timeMS);
 
 
-		//! Creates a special scene node animator for doing automatic collision detection 
+		//! Creates a special scene node animator for doing automatic collision detection
 		//! and response.
 		virtual ISceneNodeAnimatorCollisionResponse* createCollisionResponseAnimator(
-			ITriangleSelector* world, ISceneNode* sceneNode, 
+			ITriangleSelector* world, ISceneNode* sceneNode,
 			const core::vector3df& ellipsoidRadius = core::vector3df(30,60,30),
 			const core::vector3df& gravityPerSecond = core::vector3df(0,-1.0f,0),
 			const core::vector3df& ellipsoidTranslation = core::vector3df(0,0,0),
 			f32 slidingValue = 0.0005f);
 
 		//! Creates a follow spline animator.
-        virtual ISceneNodeAnimator* createFollowSplineAnimator(s32 startTime,
+		virtual ISceneNodeAnimator* createFollowSplineAnimator(s32 startTime,
 			const core::array< core::vector3df >& points,
 			f32 speed = 1.0f, f32 tightness = 0.5f);
 
@@ -329,7 +347,7 @@ namespace scene
 
 		//! Returns a pointer to the mesh manipulator.
 		virtual IMeshManipulator* getMeshManipulator();
-		
+
 		//! Sets the color of stencil buffers shadows drawn by the scene manager.
 		virtual void setShadowColor(video::SColor color);
 
@@ -355,7 +373,7 @@ namespace scene
 		//! use this method, it is used by the internal engine.
 		virtual bool postEventFromUser(const SEvent& event);
 
-		//! Clears the whole scene. All scene nodes are removed. 
+		//! Clears the whole scene. All scene nodes are removed.
 		virtual void clear();
 
 		//! Removes all children of this scene node
@@ -364,10 +382,10 @@ namespace scene
 		//! Returns interface to the parameters set in this scene.
 		virtual io::IAttributes* getParameters();
 
-		//! Returns current render pass. 
+		//! Returns current render pass.
 		virtual E_SCENE_NODE_RENDER_PASS getSceneNodeRenderPass() const;
 
-		//! Creates a new scene manager. 
+		//! Creates a new scene manager.
 		virtual ISceneManager* createNewSceneManager(bool cloneContent);
 
 		//! Returns type of the scene node
@@ -377,7 +395,7 @@ namespace scene
 		virtual ISceneNodeFactory* getDefaultSceneNodeFactory();
 
 		//! Adds a scene node factory to the scene manager.
-		/** Use this to extend the scene manager with new scene node types which it should be 
+		/** Use this to extend the scene manager with new scene node types which it should be
 		able to create automaticly, for example when loading data from xml files. */
 		virtual void registerSceneNodeFactory(ISceneNodeFactory* factoryToAdd);
 
@@ -391,7 +409,7 @@ namespace scene
 		virtual const c8* getSceneNodeTypeName(ESCENE_NODE_TYPE type);
 
 		//! Adds a scene node to the scene by name
-		virtual ISceneNode* addSceneNode(const char* sceneNodeTypeName, ISceneNode* parent);
+		virtual ISceneNode* addSceneNode(const char* sceneNodeTypeName, ISceneNode* parent=0);
 
 		//! Returns the default scene node animator factory which can create all built-in scene node animators
 		virtual ISceneNodeAnimatorFactory* getDefaultSceneNodeAnimatorFactory();
@@ -417,11 +435,11 @@ namespace scene
 		virtual bool loadScene(const c8* filename, ISceneUserDataSerializer* userDataSerializer=0);
 
 		//! Loads a scene. Note that the current scene is not cleared before.
-		virtual bool loadScene(io::IReadFile* file, ISceneUserDataSerializer* userDataSerializer=0);	
+		virtual bool loadScene(io::IReadFile* file, ISceneUserDataSerializer* userDataSerializer=0);
 
 		//! Writes attributes of the scene node.
 		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const;
-	
+
 		//! Reads attributes of the scene node.
 		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0);
 
@@ -459,99 +477,66 @@ namespace scene
 
 		//! reads user data of a node
 		void readUserData(io::IXMLReader* reader, ISceneNode* node, ISceneUserDataSerializer* userDataSerializer);
-		
+
 		struct DefaultNodeEntry
 		{
-			DefaultNodeEntry() {};
-
-			DefaultNodeEntry(ISceneNode* n)
+			DefaultNodeEntry(ISceneNode* n) :
+				Node(n), TextureValue(0)
 			{
-				textureValue = 0;
-
 				if (n->getMaterialCount())
-					textureValue = (n->getMaterial(0).getTexture(0));
-
-				node = n;
+					TextureValue = (n->getMaterial(0).getTexture(0));
 			}
 
-			ISceneNode* node;
-			void* textureValue;
-
 			bool operator < (const DefaultNodeEntry& other) const
 			{
-				return (textureValue < other.textureValue);
-			}
-		};
-
-		struct ShaderNodeEntry
-		{
-			ShaderNodeEntry() {};
-
-			ShaderNodeEntry(ISceneNode* n, u32 sceneTime )
-			{
-				textureValue = n->getMaterial( sceneTime ).getTexture(0);
-
-				node = n;
+				return (TextureValue < other.TextureValue);
 			}
 
-			ISceneNode* node;
-			void* textureValue;
-
-			bool operator < (const ShaderNodeEntry& other) const
-			{
-				return (textureValue < other.textureValue);
-			}
+			ISceneNode* Node;
+			private:
+			void* TextureValue;
 		};
 
 
 		struct TransparentNodeEntry
 		{
-			TransparentNodeEntry() {};
-
-			TransparentNodeEntry(ISceneNode* n, const core::vector3df &camera)
+			TransparentNodeEntry(ISceneNode* n, const core::vector3df& camera)
+				: Node(n)
 			{
-				node = n;
-
-				// TODO: this could be optimized, by not using sqrt
-				distance = (f32)(node->getAbsoluteTransformation().getTranslation().getDistanceFrom(camera));
+				Distance = (f32)(Node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(camera));
 			}
 
-			ISceneNode* node;
-			f32 distance;
-
 			bool operator < (const TransparentNodeEntry& other) const
 			{
-				return (distance > other.distance);
+				return (Distance > other.Distance);
 			}
+
+			ISceneNode* Node;
+			private:
+			f32 Distance;
 		};
 
 		//! sort on distance (sphere) to camera
 		struct DistanceNodeEntry
 		{
-			DistanceNodeEntry() {};
-
 			DistanceNodeEntry(ISceneNode* n, f64 d)
+				: Node(n), Distance(d) {}
+
+			DistanceNodeEntry(ISceneNode* n, const core::vector3df& cameraPos)
+				: Node(n)
 			{
-				node = n;
-				distance = d;
+				Distance = Node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(cameraPos);
+				Distance -= Node->getBoundingBox().getExtent().getLengthSQ() * 0.5;
 			}
 
-			DistanceNodeEntry(ISceneNode* n, const core::vector3df &cameraPos)
-			{
-				node = n;
-				
-				distance = (node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(cameraPos));
-				distance -= node->getBoundingBox().getExtent().getLengthSQ() / 2.0;
-			}
-
-			ISceneNode* node;
-
-			f64 distance;
-
 			bool operator < (const DistanceNodeEntry& other) const
 			{
-				return distance < other.distance;
+				return Distance < other.Distance;
 			}
+
+			ISceneNode* Node;
+			private:
+			f64 Distance;
 		};
 
 		//! video driver
@@ -569,9 +554,6 @@ namespace scene
 		//! collision manager
 		ISceneCollisionManager* CollisionManager;
 
-		//! mesh manipulator
-		IMeshManipulator* MeshManipulator;
-
 		//! render pass lists
 		core::array<ISceneNode*> CameraList;
 		core::array<DistanceNodeEntry> LightList;
@@ -579,7 +561,6 @@ namespace scene
 		core::array<ISceneNode*> SkyBoxList;
 		core::array<DefaultNodeEntry> SolidNodeList;
 		core::array<TransparentNodeEntry> TransparentNodeList;
-		core::array<ShaderNodeEntry> ShaderNodeList[ ESNRP_SHADER_10 - ESNRP_SHADER_0 + 1];
 
 		core::array<IMeshLoader*> MeshLoaderList;
 		core::array<ISceneNode*> DeletionList;
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.cpp
index 52a7a4f..d18d152 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.cpp
@@ -1,211 +1,246 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "CSceneNodeAnimatorCollisionResponse.h"
-#include "ISceneCollisionManager.h"
-#include "ISceneManager.h"
-#include "os.h"
-
-namespace irr
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CSceneNodeAnimatorCollisionResponse.h"
+#include "ISceneCollisionManager.h"
+#include "ISceneManager.h"
+#include "ICameraSceneNode.h"
+#include "os.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CSceneNodeAnimatorCollisionResponse::CSceneNodeAnimatorCollisionResponse(
+		ISceneManager* scenemanager,
+		ITriangleSelector* world, ISceneNode* object,
+		const core::vector3df& ellipsoidRadius,
+		const core::vector3df& gravityPerSecond,
+		const core::vector3df& ellipsoidTranslation,
+		f32 slidingSpeed)
+: Radius(ellipsoidRadius), Gravity(gravityPerSecond), Translation(ellipsoidTranslation),
+	World(world), Object(object), SceneManager(scenemanager), LastTime(0),
+	SlidingSpeed(slidingSpeed), Falling(false), IsCamera(false),
+	AnimateCameraTarget(true)
+{
+	#ifdef _DEBUG
+	setDebugName("CSceneNodeAnimatorCollisionResponse");
+	#endif
+	
+	if (World)
+		World->grab();
+
+	setNode(Object);
+}
+
+
+//! destructor
+CSceneNodeAnimatorCollisionResponse::~CSceneNodeAnimatorCollisionResponse()
+{
+	if (World)
+		World->drop();
+}
+
+
+//! Returns if the attached scene node is falling, which means that
+//! there is no blocking wall from the scene node in the direction of
+//! the gravity.
+bool CSceneNodeAnimatorCollisionResponse::isFalling() const
+{
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return Falling;
+}
+
+
+//! Sets the radius of the ellipsoid with which collision detection and
+//! response is done.
+void CSceneNodeAnimatorCollisionResponse::setEllipsoidRadius(
+	const core::vector3df& radius)
+{
+	Radius = radius;
+}
+
+
+//! Returns the radius of the ellipsoid with wich the collision detection and
+//! response is done.
+core::vector3df CSceneNodeAnimatorCollisionResponse::getEllipsoidRadius() const
+{
+	return Radius;
+}
+
+
+//! Sets the gravity of the environment.
+void CSceneNodeAnimatorCollisionResponse::setGravity(const core::vector3df& gravity)
+{
+	Gravity = gravity;
+}
+
+
+//! Returns current vector of gravity.
+core::vector3df CSceneNodeAnimatorCollisionResponse::getGravity() const
+{
+	return Gravity;
+}
+
+
+//! 'Jump' the animator, by adding a jump speed opposite to its gravity
+void CSceneNodeAnimatorCollisionResponse::jump(f32 jumpSpeed)
 {
-namespace scene
-{
-
-//! constructor
-CSceneNodeAnimatorCollisionResponse::CSceneNodeAnimatorCollisionResponse(
-		ISceneManager* scenemanager,
-		ITriangleSelector* world, ISceneNode* object,
-		const core::vector3df& ellipsoidRadius,
-		const core::vector3df& gravityPerSecond,
-		const core::vector3df& ellipsoidTranslation,
-		f32 slidingSpeed)
-: Radius(ellipsoidRadius), Gravity(gravityPerSecond / 1000.0f), Translation(ellipsoidTranslation),
-	World(world), Object(object), SceneManager(scenemanager),
-	SlidingSpeed(slidingSpeed), Falling(false)
-{
-	if (World)
-		World->grab();
-
-	if (Object)
-		LastPosition = Object->getPosition();
-
-	LastTime = os::Timer::getTime();
-	FallStartTime = LastTime;
-}
-
-
-
-//! destructor
-CSceneNodeAnimatorCollisionResponse::~CSceneNodeAnimatorCollisionResponse()
-{
-	if (World)
-		World->drop();
-}
-
-
-//! Returns if the attached scene node is falling, which means that
-//! there is no blocking wall from the scene node in the direction of
-//! the gravity.
-bool CSceneNodeAnimatorCollisionResponse::isFalling() const
-{
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return Falling;
-}
-
-
-//! Sets the radius of the ellipsoid with which collision detection and
-//! response is done.
-void CSceneNodeAnimatorCollisionResponse::setEllipsoidRadius(
-	const core::vector3df& radius)
-{
-	Radius = radius;
-}
-
-//! Returns the radius of the ellipsoid with wich the collision detection and
-//! response is done.
-core::vector3df CSceneNodeAnimatorCollisionResponse::getEllipsoidRadius() const
-{
-	return Radius;
-}
-
-
-//! Sets the gravity of the environment.
-void CSceneNodeAnimatorCollisionResponse::setGravity(const core::vector3df& gravity)
-{
-	Gravity = gravity;
-}
-
-
-//! Returns current vector of gravity.
-core::vector3df CSceneNodeAnimatorCollisionResponse::getGravity() const
-{
-	return Gravity;
-}
-
-
-//! Sets the translation of the ellipsoid for collision detection.
-void CSceneNodeAnimatorCollisionResponse::setEllipsoidTranslation(const core::vector3df &translation)
-{
-	Translation = translation;
-}
-
-
-
-//! Returns the translation of the ellipsoid for collision detection.
-core::vector3df CSceneNodeAnimatorCollisionResponse::getEllipsoidTranslation() const
-{
-	return Translation;
-}
-
-
-//! Sets a triangle selector holding all triangles of the world with which
-//! the scene node may collide.
-void CSceneNodeAnimatorCollisionResponse::setWorld(ITriangleSelector* newWorld)
-{
-	Falling = false;
-
-	LastTime = os::Timer::getTime();
-	FallStartTime = LastTime;
-
-
-	if (World)
-		World->drop();
-
-	World = newWorld;
-	if (World)
-		World->grab();
-
-}
-
-
-
-//! Returns the current triangle selector containing all triangles for
-//! collision detection.
-ITriangleSelector* CSceneNodeAnimatorCollisionResponse::getWorld() const
-{
-	return World;
-}
-
-
-
-void CSceneNodeAnimatorCollisionResponse::animateNode(ISceneNode* node, u32 timeMs)
-{
-	if (node != Object)
-	{
-		os::Printer::log("CollisionResponseAnimator only works with same scene node as set as object during creation", ELL_ERROR);
-		return;
-	}
-
-	if (!World)
-		return;
-
-	u32 diff = timeMs - LastTime;
-	LastTime = timeMs;
-
-	core::vector3df pos = Object->getPosition();
-	core::vector3df vel = pos - LastPosition;
-
-	//g = Gravity * (f32)((timeMs - FallStartTime) * diff);
-
-	f32 dt = 1.f;
-	if (Falling)
-	{
-		dt = f32 ( ( timeMs - FallStartTime ) * diff );
-	}
-	core::vector3df g = Gravity * dt;
-
-	core::triangle3df triangle = RefTriangle;
-
-	core::vector3df force = vel + g;
-
-	const core::vector3df nullVector ( 0.f, 0.f, 0.f );
-
-	if ( force != nullVector )
-	{
-		// TODO: divide SlidingSpeed by frame time
-
-		bool f = false;
-		pos = SceneManager->getSceneCollisionManager()->getCollisionResultPosition(
-				World, LastPosition-Translation,
-				Radius, vel, triangle, f, SlidingSpeed, g);
-
-		pos += Translation;
-
-		if (f)//triangle == RefTriangle)
-		{
-			if (!Falling)
-				FallStartTime = timeMs;
-
-			Falling = true;
-		}
-		else
-			Falling = false;
-
-		Object->setPosition(pos);
-	}
-
-	LastPosition = Object->getPosition();
-}
-
-//! Writes attributes of the scene node animator.
-void CSceneNodeAnimatorCollisionResponse::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const
-{
-	out->addVector3d("Radius", Radius);
-	out->addVector3d("Gravity", Gravity);
-	out->addVector3d("Translation", Translation);
-}
-
-//! Reads attributes of the scene node animator.
-void CSceneNodeAnimatorCollisionResponse::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
-{
-	Radius = in->getAttributeAsVector3d("Radius");
-	Gravity = in->getAttributeAsVector3d("Gravity");
-	Translation = in->getAttributeAsVector3d("Translation");
-}
-
-
-
-} // end namespace scene
-} // end namespace irr
-
+	FallingVelocity -= (core::vector3df(Gravity).normalize()) * jumpSpeed;
+	Falling = true;
+}
+
+
+//! Sets the translation of the ellipsoid for collision detection.
+void CSceneNodeAnimatorCollisionResponse::setEllipsoidTranslation(const core::vector3df &translation)
+{
+	Translation = translation;
+}
+
+
+//! Returns the translation of the ellipsoid for collision detection.
+core::vector3df CSceneNodeAnimatorCollisionResponse::getEllipsoidTranslation() const
+{
+	return Translation;
+}
+
+
+//! Sets a triangle selector holding all triangles of the world with which
+//! the scene node may collide.
+void CSceneNodeAnimatorCollisionResponse::setWorld(ITriangleSelector* newWorld)
+{
+	Falling = false;
+
+	LastTime = os::Timer::getTime();
+
+	if (World)
+		World->drop();
+
+	World = newWorld;
+	if (World)
+		World->grab();
+
+}
+
+
+//! Returns the current triangle selector containing all triangles for
+//! collision detection.
+ITriangleSelector* CSceneNodeAnimatorCollisionResponse::getWorld() const
+{
+	return World;
+}
+
+
+void CSceneNodeAnimatorCollisionResponse::animateNode(ISceneNode* node, u32 timeMs)
+{
+	if (node != Object)
+	{
+		setNode(node);
+		return;
+	}
+
+	if (!World)
+		return;
+
+	u32 diff = timeMs - LastTime;
+	LastTime = timeMs;
+
+	core::vector3df pos = Object->getPosition();
+	core::vector3df vel = pos - LastPosition;
+
+	FallingVelocity += Gravity * (f32)diff * 0.001f;
+
+	core::triangle3df triangle = RefTriangle;
+
+	core::vector3df force = vel + FallingVelocity;
+
+	const core::vector3df nullVector ( 0.f, 0.f, 0.f );
+
+	if ( force != nullVector )
+	{
+		// TODO: divide SlidingSpeed by frame time
+
+		bool f = false;
+		pos = SceneManager->getSceneCollisionManager()->getCollisionResultPosition(
+				World, LastPosition-Translation,
+				Radius, vel, triangle, f, SlidingSpeed, FallingVelocity);
+
+		pos += Translation;
+
+		if (f)//triangle == RefTriangle)
+		{
+			Falling = true;
+		}
+		else
+		{
+			Falling = false;
+			FallingVelocity.set(0, 0, 0);
+		}
+
+		Object->setPosition(pos);
+	}
+
+	// move camera target
+	if (AnimateCameraTarget && IsCamera)
+	{
+		const core::vector3df pdiff = Object->getPosition() - LastPosition - vel;
+		ICameraSceneNode* cam = (ICameraSceneNode*)Object;
+		cam->setTarget(cam->getTarget() + pdiff);
+	}
+
+	LastPosition = Object->getPosition();
+}
+
+
+void CSceneNodeAnimatorCollisionResponse::setNode(ISceneNode* node)
+{
+	Object = node;
+
+	if (Object)
+	{
+		LastPosition = Object->getPosition();
+		IsCamera = (Object->getType() == ESNT_CAMERA);
+	}
+
+	LastTime = os::Timer::getTime();
+}
+
+
+//! Writes attributes of the scene node animator.
+void CSceneNodeAnimatorCollisionResponse::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const
+{
+	out->addVector3d("Radius", Radius);
+	out->addVector3d("Gravity", Gravity);
+	out->addVector3d("Translation", Translation);
+	out->addBool("AnimateCameraTarget", AnimateCameraTarget);
+}
+
+
+//! Reads attributes of the scene node animator.
+void CSceneNodeAnimatorCollisionResponse::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
+{
+	Radius = in->getAttributeAsVector3d("Radius");
+	Gravity = in->getAttributeAsVector3d("Gravity");
+	Translation = in->getAttributeAsVector3d("Translation");
+	AnimateCameraTarget = in->getAttributeAsBool("AnimateCameraTarget");
+}
+
+
+ISceneNodeAnimator* CSceneNodeAnimatorCollisionResponse::createClone(ISceneNode* node, ISceneManager* newManager)
+{
+	if (!newManager) newManager = SceneManager;
+
+	CSceneNodeAnimatorCollisionResponse * newAnimator = 
+		new CSceneNodeAnimatorCollisionResponse(newManager, World, Object, Radius, (Gravity * 1000.0f), Translation,
+													SlidingSpeed);
+
+	return newAnimator;
+}
+
+
+} // end namespace scene
+} // end namespace irr
+
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.h b/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.h
index 09725de..3230872 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.h
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -51,6 +51,9 @@ namespace scene
 		//! Sets the gravity of the environment.
 		virtual void setGravity(const core::vector3df& gravity);
 
+		//! 'Jump' the animator, by adding a jump speed opposite to its gravity
+		virtual void jump(f32 jumpSpeed);
+
 		//! Returns current vector of gravity.
 		virtual core::vector3df getGravity() const;
 
@@ -79,22 +82,33 @@ namespace scene
 
 		//! Returns type of the scene node animator
 		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const { return ESNAT_COLLISION_RESPONSE; }
+		
+		//! Creates a clone of this animator.
+		/** Please note that you will have to drop
+		(IReferenceCounted::drop()) the returned pointer after calling
+		this. */
+		virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0);
 
 	private:
-		core::vector3df LastPosition;
+
+		void setNode(ISceneNode* node);
+
 		core::vector3df Radius;
 		core::vector3df Gravity;
 		core::vector3df Translation;
+		core::vector3df FallingVelocity; // In the direction of Gravity.
+
+		core::vector3df LastPosition;
+		core::triangle3df RefTriangle;
 		
 		ITriangleSelector* World;
 		ISceneNode* Object;
 		ISceneManager* SceneManager;
 		u32 LastTime;
-		u32 FallStartTime;
 		f32 SlidingSpeed;
 		bool Falling;
-
-		core::triangle3df RefTriangle;
+		bool IsCamera;
+		bool AnimateCameraTarget;
 	};
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorDelete.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorDelete.cpp
index cffbdf3..2f8abec 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorDelete.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorDelete.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -40,6 +40,13 @@ void CSceneNodeAnimatorDelete::animateNode(ISceneNode* node, u32 timeMs)
 	}
 }
 
+ISceneNodeAnimator* CSceneNodeAnimatorDelete::createClone(ISceneNode* node, ISceneManager* newManager)
+{
+	CSceneNodeAnimatorDelete * newAnimator = 
+		new CSceneNodeAnimatorDelete(SceneManager, DeleteTime);
+
+	return newAnimator;
+}
 
 } // end namespace scene
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorDelete.h b/src/dep/src/irrlicht/CSceneNodeAnimatorDelete.h
index 2a3691e..041d666 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorDelete.h
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorDelete.h
@@ -1,44 +1,50 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED__
-#define __C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED__
-
-#include "ISceneNode.h"
-
-namespace irr
-{
-namespace scene
-{
-	class CSceneNodeAnimatorDelete : public ISceneNodeAnimator
-	{
-	public:
-
-		//! constructor
-		CSceneNodeAnimatorDelete(ISceneManager* manager, u32 when);
-
-		//! destructor
-		virtual ~CSceneNodeAnimatorDelete();
-
-		//! animates a scene node
-		virtual void animateNode(ISceneNode* node, u32 timeMs);
-
-		//! Returns type of the scene node animator
-		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const
-		{
-			return ESNAT_DELETION;
-		}
-
-	private:
-
-		u32 DeleteTime;
-		ISceneManager* SceneManager;
-	};
-
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED__
+#define __C_SCENE_NODE_ANIMATOR_DELETE_H_INCLUDED__
+
+#include "ISceneNode.h"
+
+namespace irr
+{
+namespace scene
+{
+	class CSceneNodeAnimatorDelete : public ISceneNodeAnimator
+	{
+	public:
+
+		//! constructor
+		CSceneNodeAnimatorDelete(ISceneManager* manager, u32 when);
+
+		//! destructor
+		virtual ~CSceneNodeAnimatorDelete();
+
+		//! animates a scene node
+		virtual void animateNode(ISceneNode* node, u32 timeMs);
+
+		//! Returns type of the scene node animator
+		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const
+		{
+			return ESNAT_DELETION;
+		}
+		
+		//! Creates a clone of this animator.
+		/** Please note that you will have to drop
+		(IReferenceCounted::drop()) the returned pointer after calling
+		this. */
+		virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0);
+
+	private:
+
+		u32 DeleteTime;
+		ISceneManager* SceneManager;
+	};
+
+
+} // end namespace scene
+} // end namespace irr
+
+#endif
+
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorFlyCircle.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorFlyCircle.cpp
index c55a8ca..2276f57 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorFlyCircle.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorFlyCircle.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,16 +16,20 @@ CSceneNodeAnimatorFlyCircle::CSceneNodeAnimatorFlyCircle(u32 time, const core::v
 	#ifdef _DEBUG
 	setDebugName("CSceneNodeAnimatorFlyCircle");
 	#endif
-	Direction.normalize();
+	init();
 }
 
 
-
-//! destructor
-CSceneNodeAnimatorFlyCircle::~CSceneNodeAnimatorFlyCircle()
+void CSceneNodeAnimatorFlyCircle::init()
 {
-}
+	Direction.normalize();
 
+	if (Direction.Y != 0)
+		VecV = core::vector3df(50,0,0).crossProduct(Direction).normalize();
+	else
+		VecV = core::vector3df(0,50,0).crossProduct(Direction).normalize();
+	VecU = VecV.crossProduct(Direction).normalize();
+}
 
 
 //! animates a scene node
@@ -36,10 +40,7 @@ void CSceneNodeAnimatorFlyCircle::animateNode(ISceneNode* node, u32 timeMs)
 
 	const f32 t = (timeMs-StartTime) * Speed;
 
-	core::vector3df circle(Radius * sinf(t), 0, Radius * cosf(t));
-	circle = circle.crossProduct ( Direction );
-
-	node->setPosition(Center + circle);
+	node->setPosition(Center + Radius * ((VecU*cosf(t)) + (VecV*sinf(t))));
 }
 
 
@@ -60,14 +61,22 @@ void CSceneNodeAnimatorFlyCircle::deserializeAttributes(io::IAttributes* in, io:
 	Radius = in->getAttributeAsFloat("Radius");
 	Speed = in->getAttributeAsFloat("Speed");
 	Direction = in->getAttributeAsVector3d("Direction");
+	StartTime = 0;
 	
 	if (Direction.equals(core::vector3df(0,0,0)))
 		Direction.set(0,1,0); // irrlicht 1.1 backwards compatibility
 	else
 		Direction.normalize();
+	init();
 }
 
+ISceneNodeAnimator* CSceneNodeAnimatorFlyCircle::createClone(ISceneNode* node, ISceneManager* newManager)
+{
+	CSceneNodeAnimatorFlyCircle * newAnimator = 
+		new CSceneNodeAnimatorFlyCircle(StartTime, Center, Radius, Speed, Direction);
 
+	return newAnimator;
+}
 
 } // end namespace scene
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorFlyCircle.h b/src/dep/src/irrlicht/CSceneNodeAnimatorFlyCircle.h
index a9113eb..675c799 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorFlyCircle.h
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorFlyCircle.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,11 +16,9 @@ namespace scene
 	public:
 
 		//! constructor
-		CSceneNodeAnimatorFlyCircle(u32 time, const core::vector3df& center, f32 radius, f32 speed,
-										const core::vector3df& direction);
-
-		//! destructor
-		virtual ~CSceneNodeAnimatorFlyCircle();
+		CSceneNodeAnimatorFlyCircle(u32 time,
+				const core::vector3df& center, f32 radius,
+				f32 speed, const core::vector3df& direction);
 
 		//! animates a scene node
 		virtual void animateNode(ISceneNode* node, u32 timeMs);
@@ -33,11 +31,24 @@ namespace scene
 
 		//! Returns type of the scene node animator
 		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const { return ESNAT_FLY_CIRCLE; }
+		
+		//! Creates a clone of this animator.
+		/** Please note that you will have to drop
+		(IReferenceCounted::drop()) the returned pointer after calling
+		this. */
+		virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0);
 
 	private:
+		// do some initial calculations
+		void init();
 
+		// circle center
 		core::vector3df Center;
+		// up-vector, normal to the circle's plane
 		core::vector3df Direction;
+		// Two helper vectors
+		core::vector3df VecU;
+		core::vector3df VecV;
 		f32 Radius;
 		f32 Speed;
 		u32 StartTime;
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorFlyStraight.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorFlyStraight.cpp
index 6a55391..f770e0d 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorFlyStraight.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorFlyStraight.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -81,6 +81,13 @@ void CSceneNodeAnimatorFlyStraight::deserializeAttributes(io::IAttributes* in, i
 	recalculateImidiateValues();
 }
 
+ISceneNodeAnimator* CSceneNodeAnimatorFlyStraight::createClone(ISceneNode* node, ISceneManager* newManager)
+{
+	CSceneNodeAnimatorFlyStraight * newAnimator = 
+		new CSceneNodeAnimatorFlyStraight(Start, End, TimeForWay, Loop, StartTime);
+
+	return newAnimator;
+}
 
 } // end namespace scene
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorFlyStraight.h b/src/dep/src/irrlicht/CSceneNodeAnimatorFlyStraight.h
index d9cb79a..3d56e4d 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorFlyStraight.h
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorFlyStraight.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -35,6 +35,12 @@ namespace scene
 
 		//! Returns type of the scene node animator
 		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const { return ESNAT_FLY_STRAIGHT; }
+		
+		//! Creates a clone of this animator.
+		/** Please note that you will have to drop
+		(IReferenceCounted::drop()) the returned pointer after calling
+		this. */
+		virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0);
 
 	private:
 
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.cpp
index ebd3f4f..17f4a35 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.cpp
@@ -1,120 +1,131 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "CSceneNodeAnimatorFollowSpline.h"
-
-namespace irr
-{
-namespace scene
-{
-
-//! constructor
-CSceneNodeAnimatorFollowSpline::CSceneNodeAnimatorFollowSpline(u32 time,
-	const core::array<core::vector3df>& points, f32 speed,
-	f32 tightness)
-: Points(points), Speed(speed), Tightness(tightness), StartTime(time)
-{
-	#ifdef _DEBUG
-	setDebugName("CSceneNodeAnimatorFollowSpline");
-	#endif
-}
-
-
-
-inline s32 CSceneNodeAnimatorFollowSpline::clamp(s32 idx, s32 size)
-{
-	return ( idx<0 ? size+idx : ( idx>=size ? idx-size : idx ) );
-}
-
-
-//! animates a scene node
-void CSceneNodeAnimatorFollowSpline::animateNode(ISceneNode* node, u32 timeMs)
-{
-	const u32 pSize = Points.size();
-	if (pSize==0)
-		return;
-
-	const f32 dt = ( (timeMs-StartTime) * Speed * 0.001f );
-	const f32 u = core::fract ( dt );
-	const s32 idx = core::floor32( dt ) % pSize;
-	//const f32 u = 0.001f * fmodf( dt, 1000.0f );
-	
-	const core::vector3df& p0 = Points[ clamp( idx - 1, pSize ) ];
-	const core::vector3df& p1 = Points[ clamp( idx + 0, pSize ) ];
-	const core::vector3df& p2 = Points[ clamp( idx + 1, pSize ) ];
-	const core::vector3df& p3 = Points[ clamp( idx + 2, pSize ) ];
-
-	// hermite polynomials
-	const f32 h1 = 2.0f * u * u * u - 3.0f * u * u + 1.0f;
-	const f32 h2 = -2.0f * u * u * u + 3.0f * u * u;
-	const f32 h3 = u * u * u - 2.0f * u * u + u;
-	const f32 h4 = u * u * u - u * u;
-
-	// tangents
-	const core::vector3df t1 = ( p2 - p0 ) * Tightness;
-	const core::vector3df t2 = ( p3 - p1 ) * Tightness;
-
-	// interpolated point
-	node->setPosition(p1 * h1 + p2 * h2 + t1 * h3 + t2 * h4);
-}
-
-
-//! Writes attributes of the scene node animator.
-void CSceneNodeAnimatorFollowSpline::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const
-{
-	out->addFloat("Speed", Speed);
-	out->addFloat("Tightness", Tightness);
-
-	u32 count = Points.size();
-
-	if ( options && (options->Flags & io::EARWF_FOR_EDITOR))
-	{
-		// add one point in addition when serializing for editors
-		// to make it easier to add points quickly
-		count += 1;
-	}
-
-	for (u32 i=0; i<count; ++i)
-	{
-		core::stringc tname = "Point";
-		tname += (int)(i+1);
-
-		out->addVector3d(tname.c_str(), i<Points.size() ? Points[i] : core::vector3df(0,0,0) );
-	}
-}
-
-
-//! Reads attributes of the scene node animator.
-void CSceneNodeAnimatorFollowSpline::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
-{
-	Speed = in->getAttributeAsFloat("Speed");
-	Tightness = in->getAttributeAsFloat("Tightness");
-	Points.clear();
-
-	for(u32 i=1; true; ++i)
-	{
-		core::stringc pname = "Point";
-		pname += i;
-
-		if (in->existsAttribute(pname.c_str()))
-			Points.push_back(in->getAttributeAsVector3d(pname.c_str()));
-		else
-			break;
-	}
-
-	// remove last point if double entry from editor
-	if ( options && (options->Flags & io::EARWF_FOR_EDITOR) &&
-		Points.size() > 2 && Points.getLast() == core::vector3df(0,0,0))
-	{
-		Points.erase(Points.size()-1);
-
-		if (Points.size() > 2 && Points.getLast() == core::vector3df(0,0,0))
-			Points.erase(Points.size()-1);
-	}
-}
-
-
-} // end namespace scene
-} // end namespace irr
-
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CSceneNodeAnimatorFollowSpline.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CSceneNodeAnimatorFollowSpline::CSceneNodeAnimatorFollowSpline(u32 time,
+	const core::array<core::vector3df>& points, f32 speed,
+	f32 tightness)
+: Points(points), Speed(speed), Tightness(tightness), StartTime(time)
+{
+	#ifdef _DEBUG
+	setDebugName("CSceneNodeAnimatorFollowSpline");
+	#endif
+}
+
+
+inline s32 CSceneNodeAnimatorFollowSpline::clamp(s32 idx, s32 size)
+{
+	return ( idx<0 ? size+idx : ( idx>=size ? idx-size : idx ) );
+}
+
+
+//! animates a scene node
+void CSceneNodeAnimatorFollowSpline::animateNode(ISceneNode* node, u32 timeMs)
+{
+	const u32 pSize = Points.size();
+	if (pSize==0)
+		return;
+	if (pSize==1)
+	{
+		node->setPosition(Points[0]);
+		return;
+	}
+
+	const f32 dt = ( (timeMs-StartTime) * Speed * 0.001f );
+	const f32 u = core::fract ( dt );
+	const s32 idx = core::floor32( dt ) % pSize;
+	//const f32 u = 0.001f * fmodf( dt, 1000.0f );
+	
+	const core::vector3df& p0 = Points[ clamp( idx - 1, pSize ) ];
+	const core::vector3df& p1 = Points[ clamp( idx + 0, pSize ) ]; // starting point
+	const core::vector3df& p2 = Points[ clamp( idx + 1, pSize ) ]; // end point
+	const core::vector3df& p3 = Points[ clamp( idx + 2, pSize ) ];
+
+	// hermite polynomials
+	const f32 h1 = 2.0f * u * u * u - 3.0f * u * u + 1.0f;
+	const f32 h2 = -2.0f * u * u * u + 3.0f * u * u;
+	const f32 h3 = u * u * u - 2.0f * u * u + u;
+	const f32 h4 = u * u * u - u * u;
+
+	// tangents
+	const core::vector3df t1 = ( p2 - p0 ) * Tightness;
+	const core::vector3df t2 = ( p3 - p1 ) * Tightness;
+
+	// interpolated point
+	node->setPosition(p1 * h1 + p2 * h2 + t1 * h3 + t2 * h4);
+}
+
+
+//! Writes attributes of the scene node animator.
+void CSceneNodeAnimatorFollowSpline::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const
+{
+	out->addFloat("Speed", Speed);
+	out->addFloat("Tightness", Tightness);
+
+	u32 count = Points.size();
+
+	if ( options && (options->Flags & io::EARWF_FOR_EDITOR))
+	{
+		// add one point in addition when serializing for editors
+		// to make it easier to add points quickly
+		count += 1;
+	}
+
+	for (u32 i=0; i<count; ++i)
+	{
+		core::stringc tname = "Point";
+		tname += (int)(i+1);
+
+		out->addVector3d(tname.c_str(), i<Points.size() ? Points[i] : core::vector3df(0,0,0) );
+	}
+}
+
+
+//! Reads attributes of the scene node animator.
+void CSceneNodeAnimatorFollowSpline::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
+{
+	Speed = in->getAttributeAsFloat("Speed");
+	Tightness = in->getAttributeAsFloat("Tightness");
+	Points.clear();
+
+	for(u32 i=1; true; ++i)
+	{
+		core::stringc pname = "Point";
+		pname += i;
+
+		if (in->existsAttribute(pname.c_str()))
+			Points.push_back(in->getAttributeAsVector3d(pname.c_str()));
+		else
+			break;
+	}
+
+	// remove last point if double entry from editor
+	if ( options && (options->Flags & io::EARWF_FOR_EDITOR) &&
+		Points.size() > 2 && Points.getLast() == core::vector3df(0,0,0))
+	{
+		Points.erase(Points.size()-1);
+
+		if (Points.size() > 2 && Points.getLast() == core::vector3df(0,0,0))
+			Points.erase(Points.size()-1);
+	}
+}
+
+ISceneNodeAnimator* CSceneNodeAnimatorFollowSpline::createClone(ISceneNode* node, ISceneManager* newManager)
+{
+	CSceneNodeAnimatorFollowSpline * newAnimator = 
+		new CSceneNodeAnimatorFollowSpline(StartTime, Points, Speed, Tightness);
+
+	return newAnimator;
+}
+
+} // end namespace scene
+} // end namespace irr
+
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.h b/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.h
index 25eb90b..ce10873 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.h
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -34,6 +34,12 @@ namespace scene
 
 		//! Returns type of the scene node animator
 		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const { return ESNAT_FOLLOW_SPLINE; }
+		
+		//! Creates a clone of this animator.
+		/** Please note that you will have to drop
+		(IReferenceCounted::drop()) the returned pointer after calling
+		this. */
+		virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0);
 
 	protected:
 
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorRotation.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorRotation.cpp
index 751243c..e48d051 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorRotation.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorRotation.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -56,6 +56,13 @@ void CSceneNodeAnimatorRotation::deserializeAttributes(io::IAttributes* in, io::
 	Rotation = in->getAttributeAsVector3d("Rotation");
 }
 
+ISceneNodeAnimator* CSceneNodeAnimatorRotation::createClone(ISceneNode* node, ISceneManager* newManager)
+{
+	CSceneNodeAnimatorRotation * newAnimator = 
+		new CSceneNodeAnimatorRotation(StartTime, Rotation);
+
+	return newAnimator;
+}
 
 } // end namespace scene
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorRotation.h b/src/dep/src/irrlicht/CSceneNodeAnimatorRotation.h
index 77caf87..cbaa769 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorRotation.h
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorRotation.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -32,6 +32,12 @@ namespace scene
 
 		//! Returns type of the scene node animator
 		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const { return ESNAT_ROTATION; }
+		
+		//! Creates a clone of this animator.
+		/** Please note that you will have to drop
+		(IReferenceCounted::drop()) the returned pointer after calling
+		this. */
+		virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0);
 
 	private:
 
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorTexture.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorTexture.cpp
index 9122e60..d3f5943 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorTexture.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorTexture.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -55,16 +55,15 @@ void CSceneNodeAnimatorTexture::animateNode(ISceneNode* node, u32 timeMs)
 {
 	if (Textures.size())
 	{
-		u32 t = (timeMs-StartTime);
-
-		s32 idx = 0;
+		const u32 t = (timeMs-StartTime);
 
+		u32 idx = 0;
 		if (!Loop && timeMs >= EndTime)
 			idx = Textures.size() - 1;
 		else
 			idx = (t/TimePerFrame) % Textures.size();
 
-		if (idx < (s32)Textures.size())
+		if (idx < Textures.size())
 			node->setMaterialTexture(0, Textures[idx]);
 	}
 }
@@ -119,6 +118,13 @@ void CSceneNodeAnimatorTexture::deserializeAttributes(io::IAttributes* in, io::S
 	}
 }
 
+ISceneNodeAnimator* CSceneNodeAnimatorTexture::createClone(ISceneNode* node, ISceneManager* newManager)
+{
+	CSceneNodeAnimatorTexture * newAnimator = 
+		new CSceneNodeAnimatorTexture(Textures, TimePerFrame, Loop, StartTime);
+
+	return newAnimator;
+}
 
 } // end namespace scene
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorTexture.h b/src/dep/src/irrlicht/CSceneNodeAnimatorTexture.h
index fb4e0c8..04bc6ae 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorTexture.h
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorTexture.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -34,6 +34,12 @@ namespace scene
 
 		//! Returns type of the scene node animator
 		virtual ESCENE_NODE_ANIMATOR_TYPE getType() const { return ESNAT_TEXTURE; }
+		
+		//! Creates a clone of this animator.
+		/** Please note that you will have to drop
+		(IReferenceCounted::drop()) the returned pointer after calling
+		this. */
+		virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0);
 
 	private:
 
diff --git a/src/dep/src/irrlicht/CShadowVolumeSceneNode.cpp b/src/dep/src/irrlicht/CShadowVolumeSceneNode.cpp
index 0403ab4..8ca6c4d 100644
--- a/src/dep/src/irrlicht/CShadowVolumeSceneNode.cpp
+++ b/src/dep/src/irrlicht/CShadowVolumeSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,27 +15,28 @@ namespace scene
 
 
 //! constructor
-CShadowVolumeSceneNode::CShadowVolumeSceneNode(ISceneNode* parent,
-					ISceneManager* mgr, s32 id,
-					bool zfailmethod, f32 infinity)
-: IShadowVolumeSceneNode(parent, mgr, id), Indices(0), Vertices(0),
-	Adjacency(0), FaceData(0), UseZFailMethod(zfailmethod),
+CShadowVolumeSceneNode::CShadowVolumeSceneNode(const IMesh* shadowMesh, ISceneNode* parent,
+		ISceneManager* mgr, s32 id, bool zfailmethod, f32 infinity)
+: IShadowVolumeSceneNode(parent, mgr, id), Vertices(0), Indices(0),
+	Adjacency(0), Edges(0), FaceData(0), ShadowMesh(0),
 	IndexCountAllocated(0), VertexCountAllocated(0),
-	IndexCount(0), VertexCount(0), ShadowVolumesUsed(0),
-	Edges(0), EdgeCount(0), Infinity(infinity)
+	IndexCount(0), VertexCount(0), EdgeCount(0), ShadowVolumesUsed(0),
+	Infinity(infinity), UseZFailMethod(zfailmethod)
 {
 	#ifdef _DEBUG
 	setDebugName("CShadowVolumeSceneNode");
 	#endif
-
+	setShadowMesh(shadowMesh);
 	setAutomaticCulling(scene::EAC_OFF);
 }
 
 
-
 //! destructor
 CShadowVolumeSceneNode::~CShadowVolumeSceneNode()
 {
+	if (ShadowMesh)
+		ShadowMesh->drop();
+
 	delete [] Edges;
 
 	for (u32 i=0; i<ShadowVolumes.size(); ++i)
@@ -48,7 +49,6 @@ CShadowVolumeSceneNode::~CShadowVolumeSceneNode()
 }
 
 
-
 void CShadowVolumeSceneNode::createShadowVolume(const core::vector3df& light)
 {
 	SShadowVolume* svp = 0;
@@ -106,7 +106,6 @@ void CShadowVolumeSceneNode::createShadowVolume(const core::vector3df& light)
 	// is used
 	createZPassVolume(faceCount, numEdges, light, svp, UseZFailMethod);
 
-
 	for (s32 i=0; i<numEdges; ++i)
 	{
 		core::vector3df &v1 = Vertices[Edges[2*i+0]];
@@ -128,6 +127,7 @@ void CShadowVolumeSceneNode::createShadowVolume(const core::vector3df& light)
 	}
 }
 
+
 void CShadowVolumeSceneNode::createZFailVolume(s32 faceCount, s32& numEdges,
 						const core::vector3df& light,
 						SShadowVolume* svp)
@@ -206,6 +206,7 @@ void CShadowVolumeSceneNode::createZFailVolume(s32 faceCount, s32& numEdges,
 	}
 }
 
+
 void CShadowVolumeSceneNode::createZPassVolume(s32 faceCount,
 						s32& numEdges,
 						core::vector3df light,
@@ -249,17 +250,27 @@ void CShadowVolumeSceneNode::createZPassVolume(s32 faceCount,
 	}
 }
 
-//! sets the mesh from which the shadow volume should be generated.
-void CShadowVolumeSceneNode::setMeshToRenderFrom(const IMesh* mesh)
-{
-	ShadowVolumesUsed = 0;
 
-	s32 oldIndexCount = IndexCount;
-	s32 oldVertexCount = VertexCount;
+void CShadowVolumeSceneNode::setShadowMesh(const IMesh* mesh)
+{
+	if (ShadowMesh)
+		ShadowMesh->drop();
+	ShadowMesh = mesh;
+	if (ShadowMesh)
+		ShadowMesh->grab();
+}
+
+
+void CShadowVolumeSceneNode::updateShadowVolumes()
+{
+	const s32 oldIndexCount = IndexCount;
+	const s32 oldVertexCount = VertexCount;
 
 	VertexCount = 0;
 	IndexCount = 0;
+	ShadowVolumesUsed = 0;
 
+	const IMesh* const mesh = ShadowMesh;
 	if (!mesh)
 		return;
 
@@ -268,14 +279,13 @@ void CShadowVolumeSceneNode::setMeshToRenderFrom(const IMesh* mesh)
 	u32 i;
 	s32 totalVertices = 0;
 	s32 totalIndices = 0;
-	u32 bufcnt = mesh->getMeshBufferCount();
-	const IMeshBuffer* b;
+	const u32 bufcnt = mesh->getMeshBufferCount();
 
 	for (i=0; i<bufcnt; ++i)
 	{
-		b = mesh->getMeshBuffer(i);
-		totalIndices += b->getIndexCount();
-		totalVertices += b->getVertexCount();
+		const IMeshBuffer* buf = mesh->getMeshBuffer(i);
+		totalIndices += buf->getIndexCount();
+		totalVertices += buf->getVertexCount();
 	}
 
 	// allocate memory if necessary
@@ -304,49 +314,16 @@ void CShadowVolumeSceneNode::setMeshToRenderFrom(const IMesh* mesh)
 
 	for (i=0; i<bufcnt; ++i)
 	{
-		b = mesh->getMeshBuffer(i);
-
-		s32 idxcnt = b->getIndexCount();
-		s32 vtxnow = VertexCount;
-
-		const u16* idxp = b->getIndices();
-		const u16* idxpend = idxp + idxcnt;
+		const IMeshBuffer* buf = mesh->getMeshBuffer(i);
 
+		const u16* idxp = buf->getIndices();
+		const u16* idxpend = idxp + buf->getIndexCount();
 		for (; idxp!=idxpend; ++idxp)
-			Indices[IndexCount++] = *idxp + vtxnow;
+			Indices[IndexCount++] = *idxp + VertexCount;
 
-		s32 vtxcnt = b->getVertexCount();
-
-		switch(b->getVertexType())
-		{
-		case video::EVT_STANDARD:
-			{
-				const video::S3DVertex* vp = (video::S3DVertex*)b->getVertices();
-				const video::S3DVertex* const vpend = vp + vtxcnt;
-
-				for (; vp!=vpend; ++vp)
-					Vertices[VertexCount++] = (*vp).Pos;
-			}
-			break;
-		case video::EVT_2TCOORDS:
-			{
-				const video::S3DVertex2TCoords* vp = (video::S3DVertex2TCoords*)b->getVertices();
-				const video::S3DVertex2TCoords* const vpend = vp + vtxcnt;
-
-				for (; vp!=vpend; ++vp)
-					Vertices[VertexCount++] = (*vp).Pos;
-			}
-			break;
-		case video::EVT_TANGENTS:
-			{
-				const video::S3DVertexTangents* vp = (video::S3DVertexTangents*)b->getVertices();
-				const video::S3DVertexTangents* const vpend = vp + vtxcnt;
-
-				for (; vp!=vpend; ++vp)
-					Vertices[VertexCount++] = (*vp).Pos;
-			}
-			break;
-		}
+		const u32 vtxcnt = buf->getVertexCount();
+		for (u32 j=0; j<vtxcnt; ++j)
+			Vertices[VertexCount++] = buf->getPosition(j);
 	}
 
 	// recalculate adjacency if necessary
@@ -378,7 +355,6 @@ void CShadowVolumeSceneNode::setMeshToRenderFrom(const IMesh* mesh)
 }
 
 
-
 //! pre render method
 void CShadowVolumeSceneNode::OnRegisterSceneNode()
 {
@@ -390,7 +366,6 @@ void CShadowVolumeSceneNode::OnRegisterSceneNode()
 }
 
 
-
 //! renders the node.
 void CShadowVolumeSceneNode::render()
 {
@@ -404,8 +379,22 @@ void CShadowVolumeSceneNode::render()
 	for (s32 i=0; i<ShadowVolumesUsed; ++i)
 		driver->drawStencilShadowVolume(ShadowVolumes[i].vertices,
 			ShadowVolumes[i].count, UseZFailMethod);
-}
 
+/*
+	if ( DebugDataVisible & scene::EDS_MESH_WIRE_OVERLAY )
+	{
+		video::SMaterial mat;
+		mat.Lighting = false;
+		mat.Wireframe = true;
+		mat.ZBuffer = true;
+		driver->setMaterial(mat);
+
+		for (s32 i=0; i<ShadowVolumesUsed; ++i)
+			driver->drawVertexPrimitiveList(ShadowVolumes[i].vertices,
+			ShadowVolumes[i].count,0,0,video::EVT_STANDARD,scene::EPT_LINES);
+	}
+*/
+}
 
 
 //! returns the axis aligned bounding box of this node
@@ -471,3 +460,4 @@ void CShadowVolumeSceneNode::calculateAdjacency(f32 epsilon)
 } // end namespace scene
 } // end namespace irr
 
+
diff --git a/src/dep/src/irrlicht/CShadowVolumeSceneNode.h b/src/dep/src/irrlicht/CShadowVolumeSceneNode.h
index 78cec13..40ae828 100644
--- a/src/dep/src/irrlicht/CShadowVolumeSceneNode.h
+++ b/src/dep/src/irrlicht/CShadowVolumeSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,14 +18,19 @@ namespace scene
 	public:
 
 		//! constructor
-		CShadowVolumeSceneNode(ISceneNode* parent, ISceneManager* mgr, 
+		CShadowVolumeSceneNode(const IMesh* shadowMesh, ISceneNode* parent, ISceneManager* mgr, 
 			s32 id,  bool zfailmethod=true, f32 infinity=10000.0f);
 
 		//! destructor
 		virtual ~CShadowVolumeSceneNode();
 
-		//! sets the mesh from which the shadow volume should be generated.
-		virtual void setMeshToRenderFrom(const IMesh* mesh);
+		//! Sets the mesh from which the shadow volume should be generated.
+		/** To optimize shadow rendering, use a simpler mesh for shadows.
+		*/
+		virtual void setShadowMesh(const IMesh* mesh);
+
+		//! Updates the shadow volumes for current light positions.
+		virtual void updateShadowVolumes();
 
 		//! pre render method
 		virtual void OnRegisterSceneNode();
@@ -58,24 +63,30 @@ namespace scene
 
 		core::aabbox3d<f32> Box;
 
-		u16* Indices;
+		// a shadow volume for every light
+		core::array<SShadowVolume> ShadowVolumes;
+
 		core::vector3df* Vertices;
+		u16* Indices;
 		u16* Adjacency;
-		bool* FaceData; // used for zfail method, if face is front facing
-		bool UseZFailMethod;
+		u16* Edges;
+		// used for zfail method, if face is front facing
+		bool* FaceData;
+
+		const scene::IMesh* ShadowMesh;
 
 		s32 IndexCountAllocated;
 		s32 VertexCountAllocated;
 		s32 IndexCount;
 		s32 VertexCount;
 
-		core::array<SShadowVolume> ShadowVolumes; // a shadow volume for every light
-		s32 ShadowVolumesUsed;
-
-		u16* Edges;
 		s32 EdgeCount;
 
+		s32 ShadowVolumesUsed;
+
 		f32 Infinity;
+
+		bool UseZFailMethod;
 	};
 
 } // end namespace scene
diff --git a/src/dep/src/irrlicht/CSkinnedMesh.cpp b/src/dep/src/irrlicht/CSkinnedMesh.cpp
index 2759fc5..3fbd846 100644
--- a/src/dep/src/irrlicht/CSkinnedMesh.cpp
+++ b/src/dep/src/irrlicht/CSkinnedMesh.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2006 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,7 +10,6 @@
 #include "IAnimatedMeshSceneNode.h"
 #include "os.h"
 
-
 namespace irr
 {
 namespace scene
@@ -20,8 +19,8 @@ namespace scene
 //! constructor
 CSkinnedMesh::CSkinnedMesh()
 : SkinningBuffers(0), HasAnimation(0), PreparedForSkinning(0),
-	AnimationFrames(0.f), lastAnimatedFrame(0.f), lastSkinnedFrame(0.f),
-	BoneControlUsed(false), AnimateNormals(true), InterpolationMode(EIM_LINEAR)
+	AnimationFrames(0.f), LastAnimatedFrame(0.f), LastSkinnedFrame(0.f),
+	BoneControlUsed(false), AnimateNormals(true), HardwareSkinning(0), InterpolationMode(EIM_LINEAR)
 {
 	#ifdef _DEBUG
 	setDebugName("CSkinnedMesh");
@@ -62,7 +61,6 @@ IMesh* CSkinnedMesh::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32
 
 	animateMesh((f32)frame, 1.0f);
 	buildAll_LocalAnimatedMatrices();
-	buildAll_GlobalAnimatedMatrices();
 	skinMesh();
 	return this;
 }
@@ -77,11 +75,10 @@ IMesh* CSkinnedMesh::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32
 //! blend: {0-old position, 1-New position}
 void CSkinnedMesh::animateMesh(f32 frame, f32 blend)
 {
-
-	if ( !HasAnimation  || lastAnimatedFrame==frame)
+	if ( !HasAnimation  || LastAnimatedFrame==frame)
 		return;
 
-	lastAnimatedFrame=frame;
+	LastAnimatedFrame=frame;
 
 	if (blend<=0.f)
 		return; //No need to animate
@@ -89,42 +86,34 @@ void CSkinnedMesh::animateMesh(f32 frame, f32 blend)
 	for (u32 i=0; i<AllJoints.size(); ++i)
 	{
 		//To Bitplane: The joints can be animated here with no input from their parents, but for setAnimationMode extra checks are needed to their parents
+		SJoint *joint = AllJoints[i];
 
-		SJoint *Joint = AllJoints[i];
-
-		const core::vector3df oldPosition = Joint->Animatedposition;
-		const core::vector3df oldScale = Joint->Animatedscale;
-		const core::quaternion oldRotation = Joint->Animatedrotation;
+		const core::vector3df oldPosition = joint->Animatedposition;
+		const core::vector3df oldScale = joint->Animatedscale;
+		const core::quaternion oldRotation = joint->Animatedrotation;
 
 		core::vector3df position = oldPosition;
 		core::vector3df scale = oldScale;
 		core::quaternion rotation = oldRotation;
 
-		if (!BoneControlUsed)
-		{
-			Joint->positionHint=-1;
-			Joint->scaleHint=-1;
-			Joint->rotationHint=-1;
-		}
-
-		getFrameData(frame, Joint,
-				position, Joint->positionHint,
-				scale, Joint->scaleHint,
-				rotation, Joint->rotationHint);
+		getFrameData(frame, joint,
+				position, joint->positionHint,
+				scale, joint->scaleHint,
+				rotation, joint->rotationHint);
 
 		if (blend==1.0f)
 		{
 			//No blending needed
-			Joint->Animatedposition = position;
-			Joint->Animatedscale = scale;
-			Joint->Animatedrotation = rotation;
+			joint->Animatedposition = position;
+			joint->Animatedscale = scale;
+			joint->Animatedrotation = rotation;
 		}
 		else
 		{
 			//Blend animation
-			Joint->Animatedposition = core::lerp(oldPosition, position, blend);
-			Joint->Animatedscale = core::lerp(oldScale, scale, blend);
-			Joint->Animatedrotation.slerp(oldRotation, rotation, blend);
+			joint->Animatedposition = core::lerp(oldPosition, position, blend);
+			joint->Animatedscale = core::lerp(oldScale, scale, blend);
+			joint->Animatedrotation.slerp(oldRotation, rotation, blend);
 		}
 
 		//Note:
@@ -138,7 +127,7 @@ void CSkinnedMesh::animateMesh(f32 frame, f32 blend)
 		//-----------------
 	}
 
-	BoneControlUsed=false;
+	updateBoundingBox();
 }
 
 
@@ -146,40 +135,73 @@ void CSkinnedMesh::buildAll_LocalAnimatedMatrices()
 {
 	for (u32 i=0; i<AllJoints.size(); ++i)
 	{
-		SJoint *Joint = AllJoints[i];
+		SJoint *joint = AllJoints[i];
 
 		//Could be faster:
 
-		if (Joint->UseAnimationFrom &&
-			(Joint->UseAnimationFrom->PositionKeys.size() ||
-			 Joint->UseAnimationFrom->ScaleKeys.size() ||
-			 Joint->UseAnimationFrom->RotationKeys.size() ))
+		if (joint->UseAnimationFrom &&
+			(joint->UseAnimationFrom->PositionKeys.size() ||
+			 joint->UseAnimationFrom->ScaleKeys.size() ||
+			 joint->UseAnimationFrom->RotationKeys.size() ))
 		{
-			Joint->LocalAnimatedMatrix.makeIdentity();
-			Joint->LocalAnimatedMatrix.setTranslation(Joint->Animatedposition);
-			Joint->LocalAnimatedMatrix*=Joint->Animatedrotation.getMatrix();
+			joint->LocalAnimatedMatrix=joint->Animatedrotation.getMatrix();
 
-			Joint->GlobalSkinningSpace=false;
+			// --- joint->LocalAnimatedMatrix *= joint->Animatedrotation.getMatrix() ---
+			f32 *m1 = joint->LocalAnimatedMatrix.pointer();
+			core::vector3df &Pos = joint->Animatedposition;
+			m1[0] += Pos.X*m1[3];
+			m1[1] += Pos.Y*m1[3];
+			m1[2] += Pos.Z*m1[3];
+			m1[4] += Pos.X*m1[7];
+			m1[5] += Pos.Y*m1[7];
+			m1[6] += Pos.Z*m1[7];
+			m1[8] += Pos.X*m1[11];
+			m1[9] += Pos.Y*m1[11];
+			m1[10] += Pos.Z*m1[11];
+			m1[12] += Pos.X*m1[15];
+			m1[13] += Pos.Y*m1[15];
+			m1[14] += Pos.Z*m1[15];
+			// -----------------------------------
 
-			if (Joint->ScaleKeys.size())
+			joint->GlobalSkinningSpace=false;
+
+			if (joint->ScaleKeys.size())
 			{
-				//Joint->_LocalAnimatedMatrix.setScale(Joint->_Animatedscale);
+				/*
 				core::matrix4 scaleMatrix;
-				scaleMatrix.setScale(Joint->Animatedscale);
-				Joint->LocalAnimatedMatrix *= scaleMatrix;
+				scaleMatrix.setScale(joint->Animatedscale);
+				joint->LocalAnimatedMatrix *= scaleMatrix;
+				*/
+
+				// -------- joint->LocalAnimatedMatrix *= scaleMatrix -----------------
+				core::matrix4& mat = joint->LocalAnimatedMatrix;
+				mat[0] *= joint->Animatedscale.X;
+				mat[1] *= joint->Animatedscale.X;
+				mat[2] *= joint->Animatedscale.X;
+				mat[3] *= joint->Animatedscale.X;
+				mat[4] *= joint->Animatedscale.Y;
+				mat[5] *= joint->Animatedscale.Y;
+				mat[6] *= joint->Animatedscale.Y;
+				mat[7] *= joint->Animatedscale.Y;
+				mat[8] *= joint->Animatedscale.Z;
+				mat[9] *= joint->Animatedscale.Z;
+				mat[10] *= joint->Animatedscale.Z;
+				mat[11] *= joint->Animatedscale.Z;
+				// -----------------------------------
+
 			}
 		}
 		else
 		{
-			Joint->LocalAnimatedMatrix=Joint->LocalMatrix;
+			joint->LocalAnimatedMatrix=joint->LocalMatrix;
 		}
 	}
 }
 
 
-void CSkinnedMesh::buildAll_GlobalAnimatedMatrices(SJoint *Joint, SJoint *ParentJoint)
+void CSkinnedMesh::buildAll_GlobalAnimatedMatrices(SJoint *joint, SJoint *parentJoint)
 {
-	if (!Joint)
+	if (!joint)
 	{
 		for (u32 i=0; i<RootJoints.size(); ++i)
 			buildAll_GlobalAnimatedMatrices(RootJoints[i], 0);
@@ -188,19 +210,19 @@ void CSkinnedMesh::buildAll_GlobalAnimatedMatrices(SJoint *Joint, SJoint *Parent
 	else
 	{
 		// Find global matrix...
-		if (!ParentJoint || Joint->GlobalSkinningSpace)
-			Joint->GlobalAnimatedMatrix = Joint->LocalAnimatedMatrix;
+		if (!parentJoint || joint->GlobalSkinningSpace)
+			joint->GlobalAnimatedMatrix = joint->LocalAnimatedMatrix;
 		else
-			Joint->GlobalAnimatedMatrix = ParentJoint->GlobalAnimatedMatrix * Joint->LocalAnimatedMatrix;
+			joint->GlobalAnimatedMatrix = parentJoint->GlobalAnimatedMatrix * joint->LocalAnimatedMatrix;
 
 	}
 
-	for (u32 j=0; j<Joint->Children.size(); ++j)
-		buildAll_GlobalAnimatedMatrices(Joint->Children[j], Joint);
+	for (u32 j=0; j<joint->Children.size(); ++j)
+		buildAll_GlobalAnimatedMatrices(joint->Children[j], joint);
 }
 
 
-void CSkinnedMesh::getFrameData(f32 frame, SJoint *Joint,
+void CSkinnedMesh::getFrameData(f32 frame, SJoint *joint,
 				core::vector3df &position, s32 &positionHint,
 				core::vector3df &scale, s32 &scaleHint,
 				core::quaternion &rotation, s32 &rotationHint)
@@ -209,21 +231,21 @@ void CSkinnedMesh::getFrameData(f32 frame, SJoint *Joint,
 	s32 foundScaleIndex = -1;
 	s32 foundRotationIndex = -1;
 
-	if (Joint->UseAnimationFrom)
+	if (joint->UseAnimationFrom)
 	{
-		const core::array<SPositionKey> &PositionKeys=Joint->UseAnimationFrom->PositionKeys;
-		const core::array<SScaleKey> &ScaleKeys=Joint->UseAnimationFrom->ScaleKeys;
-		const core::array<SRotationKey> &RotationKeys=Joint->UseAnimationFrom->RotationKeys;
+		const core::array<SPositionKey> &PositionKeys=joint->UseAnimationFrom->PositionKeys;
+		const core::array<SScaleKey> &ScaleKeys=joint->UseAnimationFrom->ScaleKeys;
+		const core::array<SRotationKey> &RotationKeys=joint->UseAnimationFrom->RotationKeys;
 
 		if (PositionKeys.size())
 		{
 			foundPositionIndex = -1;
 
 			//Test the Hints...
-			if ((u32)positionHint < PositionKeys.size())
+			if (positionHint>=0 && (u32)positionHint < PositionKeys.size())
 			{
 				//check this hint
-				if (PositionKeys[positionHint].frame>=frame && PositionKeys[positionHint-1].frame<frame )
+				if (positionHint>0 && PositionKeys[positionHint].frame>=frame && PositionKeys[positionHint-1].frame<frame )
 					foundPositionIndex=positionHint;
 				else if (positionHint+1 < (s32)PositionKeys.size())
 				{
@@ -277,10 +299,10 @@ void CSkinnedMesh::getFrameData(f32 frame, SJoint *Joint,
 			foundScaleIndex = -1;
 
 			//Test the Hints...
-			if ((u32)scaleHint < ScaleKeys.size())
+			if (scaleHint>=0 && (u32)scaleHint < ScaleKeys.size())
 			{
 				//check this hint
-				if (ScaleKeys[scaleHint].frame>=frame && ScaleKeys[scaleHint-1].frame<frame )
+				if (scaleHint>0 && ScaleKeys[scaleHint].frame>=frame && ScaleKeys[scaleHint-1].frame<frame )
 					foundScaleIndex=scaleHint;
 				else if (scaleHint+1 < (s32)ScaleKeys.size())
 				{
@@ -335,10 +357,10 @@ void CSkinnedMesh::getFrameData(f32 frame, SJoint *Joint,
 			foundRotationIndex = -1;
 
 			//Test the Hints...
-			if ((u32)rotationHint < RotationKeys.size())
+			if (rotationHint>=0 && (u32)rotationHint < RotationKeys.size())
 			{
 				//check this hint
-				if (RotationKeys[rotationHint].frame>=frame && RotationKeys[rotationHint-1].frame<frame )
+				if (rotationHint>0 && RotationKeys[rotationHint].frame>=frame && RotationKeys[rotationHint-1].frame<frame )
 					foundRotationIndex=rotationHint;
 				else if (rotationHint+1 < (s32)RotationKeys.size())
 				{
@@ -403,95 +425,96 @@ void CSkinnedMesh::getFrameData(f32 frame, SJoint *Joint,
 //! Preforms a software skin on this mesh based of joint positions
 void CSkinnedMesh::skinMesh()
 {
-
 	if ( !HasAnimation)
 		return;
 
-
 	//----------------
-	// Temp!
+	// This is marked as "Temp!".  A shiny dubloon to whomever can tell me why.
 	buildAll_GlobalAnimatedMatrices();
 	//-----------------
 
-
-	//Software skin....
-
-	u32 i;
-
-
-
-
-	//rigid animation
-	for (i=0; i<AllJoints.size(); ++i)
+	if (!HardwareSkinning)
 	{
-		for (u32 j=0; j<AllJoints[i]->AttachedMeshes.size(); ++j)
+		//Software skin....
+		u32 i;
+
+		//rigid animation
+		for (i=0; i<AllJoints.size(); ++i)
 		{
-			SSkinMeshBuffer* Buffer=(*SkinningBuffers)[ AllJoints[i]->AttachedMeshes[j] ];
-			Buffer->Transformation=AllJoints[i]->GlobalAnimatedMatrix;
+			for (u32 j=0; j<AllJoints[i]->AttachedMeshes.size(); ++j)
+			{
+				SSkinMeshBuffer* Buffer=(*SkinningBuffers)[ AllJoints[i]->AttachedMeshes[j] ];
+				Buffer->Transformation=AllJoints[i]->GlobalAnimatedMatrix;
+			}
 		}
+
+		//clear skinning helper array
+		for (i=0; i<Vertices_Moved.size(); ++i)
+			for (u32 j=0; j<Vertices_Moved[i].size(); ++j)
+				Vertices_Moved[i][j]=false;
+
+		//skin starting with the root joints
+		for (i=0; i<RootJoints.size(); ++i)
+			SkinJoint(RootJoints[i], 0);
+
+		for (i=0; i<SkinningBuffers->size(); ++i)
+			(*SkinningBuffers)[i]->setDirty(EBT_VERTEX);
+
 	}
-
-	//clear skinning helper array
-
-	for (i=0; i<Vertices_Moved.size(); ++i)
-		for (u32 j=0; j<Vertices_Moved[i].size(); ++j)
-			Vertices_Moved[i][j]=false;
-
-
-	//skin starting with the root joints
-	for (i=0; i<RootJoints.size(); ++i)
-		SkinJoint(RootJoints[i], 0);
 }
 
-void CSkinnedMesh::SkinJoint(SJoint *Joint, SJoint *ParentJoint)
+
+void CSkinnedMesh::SkinJoint(SJoint *joint, SJoint *parentJoint)
 {
-	if (Joint->Weights.size())
+	if (joint->Weights.size())
 	{
 		//Find this joints pull on vertices...
-		core::matrix4 JointVertexPull(core::matrix4::EM4CONST_NOTHING);
-		JointVertexPull.setbyproduct(Joint->GlobalAnimatedMatrix, Joint->GlobalInversedMatrix);
+		core::matrix4 jointVertexPull(core::matrix4::EM4CONST_NOTHING);
+		jointVertexPull.setbyproduct(joint->GlobalAnimatedMatrix, joint->GlobalInversedMatrix);
 
-		core::vector3df ThisVertexMove, ThisNormalMove;
+		core::vector3df thisVertexMove, thisNormalMove;
 
-		core::array<scene::SSkinMeshBuffer*> &BuffersUsed=*SkinningBuffers;
+		core::array<scene::SSkinMeshBuffer*> &buffersUsed=*SkinningBuffers;
 
 		//Skin Vertices Positions and Normals...
-		for (u32 i=0; i<Joint->Weights.size(); ++i)
+		for (u32 i=0; i<joint->Weights.size(); ++i)
 		{
-			SWeight& weight = Joint->Weights[i];
+			SWeight& weight = joint->Weights[i];
 
 			// Pull this vertex...
-			JointVertexPull.transformVect(ThisVertexMove, weight.StaticPos);
+			jointVertexPull.transformVect(thisVertexMove, weight.StaticPos);
 
 			if (AnimateNormals)
-				JointVertexPull.rotateVect(ThisNormalMove, weight.StaticNormal);
+				jointVertexPull.rotateVect(thisNormalMove, weight.StaticNormal);
 
 			if (! (*(weight.Moved)) )
 			{
 				*(weight.Moved) = true;
 
-				BuffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Pos = ThisVertexMove * weight.strength;
+				buffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Pos = thisVertexMove * weight.strength;
 
 				if (AnimateNormals)
-					BuffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Normal = ThisNormalMove * weight.strength;
+					buffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Normal = thisNormalMove * weight.strength;
 
-				//*(weight._Pos) = ThisVertexMove * weight.strength;
+				//*(weight._Pos) = thisVertexMove * weight.strength;
 			}
 			else
 			{
-				BuffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Pos += ThisVertexMove * weight.strength;
+				buffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Pos += thisVertexMove * weight.strength;
 
 				if (AnimateNormals)
-					BuffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Normal += ThisNormalMove * weight.strength;
+					buffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Normal += thisNormalMove * weight.strength;
 
-				//*(weight._Pos) += ThisVertexMove * weight.strength;
+				//*(weight._Pos) += thisVertexMove * weight.strength;
 			}
+
+			buffersUsed[weight.buffer_id]->boundingBoxNeedsRecalculated();
 		}
 	}
 
 	//Skin all children
-	for (u32 j=0; j<Joint->Children.size(); ++j)
-		SkinJoint(Joint->Children[j], Joint);
+	for (u32 j=0; j<joint->Children.size(); ++j)
+		SkinJoint(joint->Children[j], joint);
 }
 
 
@@ -581,6 +604,23 @@ void CSkinnedMesh::setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue)
 }
 
 
+//! set the hardware mapping hint, for driver
+void CSkinnedMesh::setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint,
+		E_BUFFER_TYPE buffer)
+{
+	for (u32 i=0; i<LocalBuffers.size(); ++i)
+		LocalBuffers[i]->setHardwareMappingHint(newMappingHint, buffer);
+}
+
+
+//! flags the meshbuffer as changed, reloads hardware buffers
+void CSkinnedMesh::setDirty(E_BUFFER_TYPE buffer)
+{
+	for (u32 i=0; i<LocalBuffers.size(); ++i)
+		LocalBuffers[i]->setDirty(buffer);
+}
+
+
 //! uses animation from another mesh
 bool CSkinnedMesh::useAnimationFrom(const ISkinnedMesh *mesh)
 {
@@ -603,7 +643,8 @@ bool CSkinnedMesh::useAnimationFrom(const ISkinnedMesh *mesh)
 					joint->UseAnimationFrom=otherJoint;
 				}
 			}
-			if (!joint->UseAnimationFrom) unmatched=true;
+			if (!joint->UseAnimationFrom)
+				unmatched=true;
 		}
 	}
 
@@ -647,35 +688,67 @@ const core::array<CSkinnedMesh::SJoint*> &CSkinnedMesh::getAllJoints() const
 }
 
 
-void CSkinnedMesh::CalculateGlobalMatrixes(SJoint *Joint,SJoint *ParentJoint)
+//! (This feature is not implementated in irrlicht yet)
+bool CSkinnedMesh::setHardwareSkinning(bool on)
 {
-	if (!Joint && ParentJoint) // bit of protection from endless loops
+	if (HardwareSkinning!=on)
+	{
+
+		if (on)
+		{
+
+			//set mesh to static pose...
+			for (u32 i=0; i<AllJoints.size(); ++i)
+			{
+				SJoint *joint=AllJoints[i];
+				for (u32 j=0; j<joint->Weights.size(); ++j)
+				{
+					const u16 buffer_id=joint->Weights[j].buffer_id;
+					const u32 vertex_id=joint->Weights[j].vertex_id;
+					LocalBuffers[buffer_id]->getVertex(vertex_id)->Pos = joint->Weights[j].StaticPos;
+					LocalBuffers[buffer_id]->getVertex(vertex_id)->Normal = joint->Weights[j].StaticNormal;
+					LocalBuffers[buffer_id]->boundingBoxNeedsRecalculated();
+				}
+			}
+
+
+		}
+
+		HardwareSkinning=on;
+	}
+	return HardwareSkinning;
+}
+
+
+void CSkinnedMesh::CalculateGlobalMatrices(SJoint *joint,SJoint *parentJoint)
+{
+	if (!joint && parentJoint) // bit of protection from endless loops
 		return;
 
 	//Go through the root bones
-	if (!Joint)
+	if (!joint)
 	{
 		for (u32 i=0; i<RootJoints.size(); ++i)
-			CalculateGlobalMatrixes(RootJoints[i],0);
+			CalculateGlobalMatrices(RootJoints[i],0);
 		return;
 	}
 
-	if (!ParentJoint)
-		Joint->GlobalMatrix = Joint->LocalMatrix;
+	if (!parentJoint)
+		joint->GlobalMatrix = joint->LocalMatrix;
 	else
-		Joint->GlobalMatrix = ParentJoint->GlobalMatrix * Joint->LocalMatrix;
+		joint->GlobalMatrix = parentJoint->GlobalMatrix * joint->LocalMatrix;
 
-	Joint->LocalAnimatedMatrix=Joint->LocalMatrix;
-	Joint->GlobalAnimatedMatrix=Joint->GlobalMatrix;
+	joint->LocalAnimatedMatrix=joint->LocalMatrix;
+	joint->GlobalAnimatedMatrix=joint->GlobalMatrix;
 
-	if (Joint->GlobalInversedMatrix.isIdentity())//might be pre calculated
+	if (joint->GlobalInversedMatrix.isIdentity())//might be pre calculated
 	{
-		Joint->GlobalInversedMatrix = Joint->GlobalMatrix;
-		Joint->GlobalInversedMatrix.makeInverse(); // slow
+		joint->GlobalInversedMatrix = joint->GlobalMatrix;
+		joint->GlobalInversedMatrix.makeInverse(); // slow
 	}
 
-	for (u32 j=0; j<Joint->Children.size(); ++j)
-		CalculateGlobalMatrixes(Joint->Children[j],Joint);
+	for (u32 j=0; j<joint->Children.size(); ++j)
+		CalculateGlobalMatrices(joint->Children[j],joint);
 }
 
 
@@ -737,22 +810,22 @@ void CSkinnedMesh::checkForAnimation()
 		//check for bugs:
 		for(i=0; i < AllJoints.size(); ++i)
 		{
-			SJoint *Joint = AllJoints[i];
-			for (j=0; j<Joint->Weights.size(); ++j)
+			SJoint *joint = AllJoints[i];
+			for (j=0; j<joint->Weights.size(); ++j)
 			{
-				const u16 buffer_id=Joint->Weights[j].buffer_id;
-				const u32 vertex_id=Joint->Weights[j].vertex_id;
+				const u16 buffer_id=joint->Weights[j].buffer_id;
+				const u32 vertex_id=joint->Weights[j].vertex_id;
 
 				//check for invalid ids
 				if (buffer_id>=LocalBuffers.size())
 				{
 					os::Printer::log("Skinned Mesh: Weight buffer id too large", ELL_WARNING);
-					Joint->Weights[j].buffer_id = Joint->Weights[j].vertex_id =0;
+					joint->Weights[j].buffer_id = joint->Weights[j].vertex_id =0;
 				}
 				else if (vertex_id>=LocalBuffers[buffer_id]->getVertexCount())
 				{
 					os::Printer::log("Skinned Mesh: Weight vertex id too large", ELL_WARNING);
-					Joint->Weights[j].buffer_id = Joint->Weights[j].vertex_id =0;
+					joint->Weights[j].buffer_id = joint->Weights[j].vertex_id =0;
 				}
 			}
 		}
@@ -767,17 +840,17 @@ void CSkinnedMesh::checkForAnimation()
 
 		for (i=0; i<AllJoints.size(); ++i)
 		{
-			SJoint *Joint = AllJoints[i];
-			for (j=0; j<Joint->Weights.size(); ++j)
+			SJoint *joint = AllJoints[i];
+			for (j=0; j<joint->Weights.size(); ++j)
 			{
-				const u16 buffer_id=Joint->Weights[j].buffer_id;
-				const u32 vertex_id=Joint->Weights[j].vertex_id;
+				const u16 buffer_id=joint->Weights[j].buffer_id;
+				const u32 vertex_id=joint->Weights[j].vertex_id;
 
-				Joint->Weights[j].Moved = &Vertices_Moved[buffer_id] [vertex_id];
-				Joint->Weights[j].StaticPos = LocalBuffers[buffer_id]->getVertex(vertex_id)->Pos;
-				Joint->Weights[j].StaticNormal = LocalBuffers[buffer_id]->getVertex(vertex_id)->Normal;
+				joint->Weights[j].Moved = &Vertices_Moved[buffer_id] [vertex_id];
+				joint->Weights[j].StaticPos = LocalBuffers[buffer_id]->getVertex(vertex_id)->Pos;
+				joint->Weights[j].StaticNormal = LocalBuffers[buffer_id]->getVertex(vertex_id)->Normal;
 
-				//Joint->Weights[j]._Pos=&Buffers[buffer_id]->getVertex(vertex_id)->Pos;
+				//joint->Weights[j]._Pos=&Buffers[buffer_id]->getVertex(vertex_id)->Pos;
 			}
 		}
 
@@ -792,34 +865,15 @@ void CSkinnedMesh::finalize()
 {
 	u32 i;
 
-	lastAnimatedFrame=-1;
-	lastSkinnedFrame=-1;
+	LastAnimatedFrame=-1;
+	LastSkinnedFrame=-1;
 
 	//calculate bounding box
-
 	for (i=0; i<LocalBuffers.size(); ++i)
 	{
 		LocalBuffers[i]->recalculateBoundingBox();
 	}
 
-	// Get BoundingBox...
-	if (LocalBuffers.empty())
-		BoundingBox.reset(0,0,0);
-	else
-	{
-		BoundingBox.reset(LocalBuffers[0]->BoundingBox.MaxEdge);
-		for (u32 j=0; j<LocalBuffers.size(); ++j)
-		{
-			BoundingBox.addInternalBox(LocalBuffers[j]->BoundingBox);
-		}
-	}
-
-	//add 5% padding to bounding box
-	core::vector3df Padding=BoundingBox.getExtent()*0.05f;
-	BoundingBox.MinEdge-=Padding;
-	BoundingBox.MaxEdge+=Padding;
-
-
 	if (AllJoints.size() || RootJoints.size())
 	{
 		// populate AllJoints or RootJoints, depending on which is empty
@@ -862,16 +916,12 @@ void CSkinnedMesh::finalize()
 		Vertices_Moved[i].set_used(LocalBuffers[i]->getVertexCount());
 	}
 
-
 	//Todo: optimise keys here...
 
-
 	checkForAnimation();
 
-
 	if (HasAnimation)
 	{
-
 		//--- optimize and check keyframes ---
 		for(i=0;i<AllJoints.size();++i)
 		{
@@ -1017,14 +1067,12 @@ void CSkinnedMesh::finalize()
 
 	//Needed for animation and skinning...
 
-	CalculateGlobalMatrixes(0,0);
+	CalculateGlobalMatrices(0,0);
 
 	//animateMesh(0, 1);
 	//buildAll_LocalAnimatedMatrices();
 	//buildAll_GlobalAnimatedMatrices();
 
-
-
 	//rigid animation for non animated meshes
 	for (i=0; i<AllJoints.size(); ++i)
 	{
@@ -1035,8 +1083,45 @@ void CSkinnedMesh::finalize()
 		}
 	}
 
+	//calculate bounding box
+	if (LocalBuffers.empty())
+		BoundingBox.reset(0,0,0);
+	else
+	{
+		irr::core::aabbox3df bb(LocalBuffers[0]->BoundingBox);
+		LocalBuffers[0]->Transformation.transformBoxEx(bb);
+		BoundingBox.reset(bb);
+
+		for (u32 j=1; j<LocalBuffers.size(); ++j)
+		{
+			bb = LocalBuffers[j]->BoundingBox;
+			LocalBuffers[j]->Transformation.transformBoxEx(bb);
+
+			BoundingBox.addInternalBox(bb);
+		}
+	}
+}
 
 
+void CSkinnedMesh::updateBoundingBox(void)
+{
+	if(!SkinningBuffers)
+		return;
+
+	core::array<SSkinMeshBuffer*> & buffer = *SkinningBuffers;
+	BoundingBox.reset(0,0,0);
+
+	if (!buffer.empty())
+	{
+		for (u32 j=0; j<buffer.size(); ++j)
+		{
+			buffer[j]->recalculateBoundingBox();
+			core::aabbox3df bb = buffer[j]->BoundingBox;
+			buffer[j]->Transformation.transformBoxEx(bb);
+
+			BoundingBox.addInternalBox(bb);
+		}
+	}
 }
 
 
@@ -1071,13 +1156,9 @@ CSkinnedMesh::SPositionKey *CSkinnedMesh::createPositionKey(SJoint *joint)
 {
 	if (!joint)
 		return 0;
-	SPositionKey *key;
 
 	joint->PositionKeys.push_back(SPositionKey());
-	key=&joint->PositionKeys.getLast();
-
-	key->frame=0;
-	return key;
+	return &joint->PositionKeys.getLast();
 }
 
 
@@ -1085,12 +1166,9 @@ CSkinnedMesh::SScaleKey *CSkinnedMesh::createScaleKey(SJoint *joint)
 {
 	if (!joint)
 		return 0;
-	SScaleKey *key;
 
 	joint->ScaleKeys.push_back(SScaleKey());
-	key=&joint->ScaleKeys.getLast();
-
-	return key;
+	return &joint->ScaleKeys.getLast();
 }
 
 
@@ -1098,12 +1176,9 @@ CSkinnedMesh::SRotationKey *CSkinnedMesh::createRotationKey(SJoint *joint)
 {
 	if (!joint)
 		return 0;
-	SRotationKey *key;
 
 	joint->RotationKeys.push_back(SRotationKey());
-	key=&joint->RotationKeys.getLast();
-
-	return key;
+	return &joint->RotationKeys.getLast();
 }
 
 
@@ -1113,12 +1188,13 @@ CSkinnedMesh::SWeight *CSkinnedMesh::createWeight(SJoint *joint)
 		return 0;
 
 	joint->Weights.push_back(SWeight());
+	return &joint->Weights.getLast();
+}
 
-	SWeight *weight=&joint->Weights.getLast();
 
-	//Could do stuff here...
-
-	return weight;
+bool CSkinnedMesh::isStatic()
+{
+	return !HasAnimation;
 }
 
 
@@ -1137,36 +1213,35 @@ void CSkinnedMesh::normalizeWeights()
 		Vertices_TotalWeight[i].set_used(LocalBuffers[i]->getVertexCount());
 	}
 
-
 	for (i=0; i<Vertices_TotalWeight.size(); ++i)
 		for (j=0; j<Vertices_TotalWeight[i].size(); ++j)
 			Vertices_TotalWeight[i][j] = 0;
 
 	for (i=0; i<AllJoints.size(); ++i)
 	{
-		SJoint *Joint=AllJoints[i];
-		for (j=0; j<Joint->Weights.size(); ++j)
+		SJoint *joint=AllJoints[i];
+		for (j=0; j<joint->Weights.size(); ++j)
 		{
-			if (Joint->Weights[j].strength<=0)//Check for invalid weights
+			if (joint->Weights[j].strength<=0)//Check for invalid weights
 			{
-				Joint->Weights.erase(j);
-				j--;
+				joint->Weights.erase(j);
+				--j;
 			}
 			else
 			{
-				Vertices_TotalWeight[ Joint->Weights[j].buffer_id ] [ Joint->Weights[j].vertex_id ] += Joint->Weights[j].strength;
+				Vertices_TotalWeight[ joint->Weights[j].buffer_id ] [ joint->Weights[j].vertex_id ] += joint->Weights[j].strength;
 			}
 		}
 	}
 
 	for (i=0; i<AllJoints.size(); ++i)
 	{
-		SJoint *Joint=AllJoints[i];
-		for (j=0; j< Joint->Weights.size(); ++j)
+		SJoint *joint=AllJoints[i];
+		for (j=0; j< joint->Weights.size(); ++j)
 		{
-			f32 total = Vertices_TotalWeight[ Joint->Weights[j].buffer_id ] [ Joint->Weights[j].vertex_id ];
+			const f32 total = Vertices_TotalWeight[ joint->Weights[j].buffer_id ] [ joint->Weights[j].vertex_id ];
 			if (total != 0 && total != 1)
-				Joint->Weights[j].strength /= total;
+				joint->Weights[j].strength /= total;
 		}
 	}
 }
@@ -1194,18 +1269,16 @@ void CSkinnedMesh::recoverJointsFromMesh(core::array<IBoneSceneNode*> &JointChil
 	}
 }
 
+
 void CSkinnedMesh::transferJointsToMesh(const core::array<IBoneSceneNode*> &JointChildSceneNodes)
 {
-	for (u32 i=0;i<AllJoints.size();++i)
+	for (u32 i=0; i<AllJoints.size(); ++i)
 	{
-		IBoneSceneNode* node=JointChildSceneNodes[i];
+		const IBoneSceneNode* const node=JointChildSceneNodes[i];
 		SJoint *joint=AllJoints[i];
 
-
-
-		joint->LocalAnimatedMatrix.setTranslation( node->getPosition() );
-		joint->LocalAnimatedMatrix.setRotationDegrees( node->getRotation() );
-
+		joint->LocalAnimatedMatrix.setTranslation(node->getPosition());
+		joint->LocalAnimatedMatrix.setRotationDegrees(node->getRotation());
 
 		//joint->LocalAnimatedMatrix.setScale( node->getScale() );
 
@@ -1219,31 +1292,42 @@ void CSkinnedMesh::transferJointsToMesh(const core::array<IBoneSceneNode*> &Join
 			joint->GlobalSkinningSpace=false;
 	}
 	//Remove cache, temp...
-	lastAnimatedFrame=-1;
-	lastSkinnedFrame=-1;
+	LastAnimatedFrame=-1;
+	LastSkinnedFrame=-1;
+}
 
-	BoneControlUsed=true;
+
+void CSkinnedMesh::transferOnlyJointsHintsToMesh(const core::array<IBoneSceneNode*> &JointChildSceneNodes)
+{
+	for (u32 i=0;i<AllJoints.size();++i)
+	{
+		const IBoneSceneNode* const node=JointChildSceneNodes[i];
+		SJoint *joint=AllJoints[i];
+
+		joint->positionHint=node->positionHint;
+		joint->scaleHint=node->scaleHint;
+		joint->rotationHint=node->rotationHint;
+	}
 }
 
 
 void CSkinnedMesh::createJoints(core::array<IBoneSceneNode*> &JointChildSceneNodes,
-	IAnimatedMeshSceneNode* AnimatedMeshSceneNode, ISceneManager* SceneManager)
+		IAnimatedMeshSceneNode* AnimatedMeshSceneNode,
+		ISceneManager* SceneManager)
 {
 	u32 i;
 
 	//Create new joints
 	for (i=0;i<AllJoints.size();++i)
 	{
-		IBoneSceneNode* node = new CBoneSceneNode(0, SceneManager, 0, i, AllJoints[i]->Name.c_str());
-
-		JointChildSceneNodes.push_back(node);
+		JointChildSceneNodes.push_back(new CBoneSceneNode(0, SceneManager, 0, i, AllJoints[i]->Name.c_str()));
 	}
 
 	//Match up parents
 	for (i=0;i<JointChildSceneNodes.size();++i)
 	{
 		IBoneSceneNode* node=JointChildSceneNodes[i];
-		SJoint *joint=AllJoints[i]; //should be fine
+		const SJoint* const joint=AllJoints[i]; //should be fine
 
 		s32 parentID=-1;
 
@@ -1251,7 +1335,7 @@ void CSkinnedMesh::createJoints(core::array<IBoneSceneNode*> &JointChildSceneNod
 		{
 			if (i!=j && parentID==-1)
 			{
-				SJoint *parentTest=AllJoints[j];
+				const SJoint* const parentTest=AllJoints[j];
 				for (u32 n=0;n<parentTest->Children.size();++n)
 				{
 					if (parentTest->Children[n]==joint)
@@ -1282,7 +1366,7 @@ void CSkinnedMesh::convertMeshToTangents()
 		{
 			LocalBuffers[b]->MoveTo_Tangents();
 
-			s32 idxCnt = LocalBuffers[b]->getIndexCount();
+			const s32 idxCnt = LocalBuffers[b]->getIndexCount();
 
 			u16* idx = LocalBuffers[b]->getIndices();
 			video::S3DVertexTangents* v =
@@ -1365,6 +1449,12 @@ void CSkinnedMesh::calculateTangents(
 }
 
 
+
+
+
+
+
+
 } // end namespace scene
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/CSkinnedMesh.h b/src/dep/src/irrlicht/CSkinnedMesh.h
index cd12e32..901b30d 100644
--- a/src/dep/src/irrlicht/CSkinnedMesh.h
+++ b/src/dep/src/irrlicht/CSkinnedMesh.h
@@ -1,20 +1,18 @@
-// Copyright (C) 2002-2006 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-
 //New skinned mesh
 
 #ifndef __C_SKINNED_MESH_H_INCLUDED__
 #define __C_SKINNED_MESH_H_INCLUDED__
 
+#include "ISkinnedMesh.h"
+#include "SMeshBuffer.h"
 #include "S3DVertex.h"
 #include "irrString.h"
 #include "matrix4.h"
-#include "SMeshBuffer.h"
-#include <quaternion.h>
-
-#include "ISkinnedMesh.h"
+#include "quaternion.h"
 
 namespace irr
 {
@@ -68,6 +66,12 @@ namespace scene
 		//! sets a flag of all contained materials to a new value
 		virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue);
 
+		//! set the hardware mapping hint, for driver
+		virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX);
+
+		//! flags the meshbuffer as changed, reloads hardware buffers
+		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX);
+
 		//! Returns the type of the animated mesh.
 		virtual E_ANIMATED_MESH_TYPE getMeshType() const;
 
@@ -97,15 +101,22 @@ namespace scene
 		//! Tranfers the joint data to the mesh
 		virtual void transferJointsToMesh(const core::array<IBoneSceneNode*> &JointChildSceneNodes);
 
+		//! Tranfers the joint hints to the mesh
+		virtual void transferOnlyJointsHintsToMesh(const core::array<IBoneSceneNode*> &JointChildSceneNodes);
+
 		//! Creates an array of joints from this mesh
-		virtual void createJoints(core::array<IBoneSceneNode*> &JointChildSceneNodes, IAnimatedMeshSceneNode* AnimatedMeshSceneNode, ISceneManager* SceneManager);
-
+		virtual void createJoints(core::array<IBoneSceneNode*> &JointChildSceneNodes,
+				IAnimatedMeshSceneNode* AnimatedMeshSceneNode,
+				ISceneManager* SceneManager);
 
+		//! Convertes the mesh to contain tangent information
 		virtual void convertMeshToTangents();
 
+		//! Does the mesh have no animation
+		virtual bool isStatic();
 
-
-
+		//! (This feature is not implemented in irrlicht yet)
+		virtual bool setHardwareSkinning(bool on);
 
 		//Interface for the mesh loaders (finalize should lock these functions, and they should have some prefix like loader_
 
@@ -123,22 +134,17 @@ namespace scene
 		//! loaders should call this after populating the mesh
 		virtual void finalize();
 
-
-
-
 		virtual SSkinMeshBuffer *createBuffer();
 
 		virtual SJoint *createJoint(SJoint *parent=0);
 
 		virtual SPositionKey *createPositionKey(SJoint *joint);
-		virtual SScaleKey *createScaleKey(SJoint *joint);
 		virtual SRotationKey *createRotationKey(SJoint *joint);
+		virtual SScaleKey *createScaleKey(SJoint *joint);
 
 		virtual SWeight *createWeight(SJoint *joint);
 
-
-
-
+		virtual void updateBoundingBox(void);
 
 private:
 
@@ -150,9 +156,12 @@ private:
 
 		void buildAll_GlobalAnimatedMatrices(SJoint *Joint=0, SJoint *ParentJoint=0);
 
-		void getFrameData(f32 frame,SJoint *Node,core::vector3df &position, s32 &positionHint, core::vector3df &scale, s32 &scaleHint, core::quaternion &rotation, s32 &rotationHint);
+		void getFrameData(f32 frame, SJoint *Node,
+				core::vector3df &position, s32 &positionHint,
+				core::vector3df &scale, s32 &scaleHint,
+				core::quaternion &rotation, s32 &rotationHint);
 
-		void CalculateGlobalMatrixes(SJoint *Joint,SJoint *ParentJoint);
+		void CalculateGlobalMatrices(SJoint *Joint,SJoint *ParentJoint);
 
 		void SkinJoint(SJoint *Joint, SJoint *ParentJoint);
 
@@ -161,9 +170,6 @@ private:
 			core::vector3df& vt1, core::vector3df& vt2, core::vector3df& vt3,
 			core::vector2df& tc1, core::vector2df& tc2, core::vector2df& tc3);
 
-		//void createSkelton_Helper(ISceneManager* SceneManager, core::array<IBoneSceneNode*> &JointChildSceneNodes, IAnimatedMeshSceneNode *AnimatedMeshSceneNode, ISceneNode* ParentNode, SJoint *ParentNode, SJoint *Node);
-
-
 		core::array<SSkinMeshBuffer*> *SkinningBuffers; //Meshbuffer to skin, default is to skin localBuffers
 
 		core::array<SSkinMeshBuffer*> LocalBuffers;
@@ -177,12 +183,15 @@ private:
 
 		f32 AnimationFrames;
 
-		f32 lastAnimatedFrame;
-		f32 lastSkinnedFrame;
+		f32 LastAnimatedFrame;
+		f32 LastSkinnedFrame;
 		bool BoneControlUsed;
 
 		bool AnimateNormals;
 
+		bool HardwareSkinning;
+
+
 		E_INTERPOLATION_MODE InterpolationMode;
 
 		core::aabbox3d<f32> BoundingBox;
diff --git a/src/dep/src/irrlicht/CSkyBoxSceneNode.cpp b/src/dep/src/irrlicht/CSkyBoxSceneNode.cpp
index a636ab3..7b3978b 100644
--- a/src/dep/src/irrlicht/CSkyBoxSceneNode.cpp
+++ b/src/dep/src/irrlicht/CSkyBoxSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -66,7 +66,6 @@ CSkyBoxSceneNode::CSkyBoxSceneNode(video::ITexture* top, video::ITexture* bottom
 	if (!tex) tex = bottom;
 
 	const f32 onepixel = tex?(1.0f / (tex->getSize().Width * 1.5f)) : 0.0f;
-	const f32 l = 10.0f;
 	const f32 t = 1.0f - onepixel;
 	const f32 o = 0.0f + onepixel;
 
@@ -74,55 +73,55 @@ CSkyBoxSceneNode::CSkyBoxSceneNode(video::ITexture* top, video::ITexture* bottom
 
 	Material[0] = mat;
 	Material[0].setTexture(0, front);
-	Vertices[0] = video::S3DVertex(-l,-l,-l, 0,0,1, video::SColor(255,255,255,255), t, t);
-	Vertices[1] = video::S3DVertex( l,-l,-l, 0,0,1, video::SColor(255,255,255,255), o, t);
-	Vertices[2] = video::S3DVertex( l, l,-l, 0,0,1, video::SColor(255,255,255,255), o, o);
-	Vertices[3] = video::S3DVertex(-l, l,-l, 0,0,1, video::SColor(255,255,255,255), t, o);
+	Vertices[0] = video::S3DVertex(-1,-1,-1, 0,0,1, video::SColor(255,255,255,255), t, t);
+	Vertices[1] = video::S3DVertex( 1,-1,-1, 0,0,1, video::SColor(255,255,255,255), o, t);
+	Vertices[2] = video::S3DVertex( 1, 1,-1, 0,0,1, video::SColor(255,255,255,255), o, o);
+	Vertices[3] = video::S3DVertex(-1, 1,-1, 0,0,1, video::SColor(255,255,255,255), t, o);
 
 	// create left side
 
 	Material[1] = mat;
 	Material[1].setTexture(0, left);
-	Vertices[4] = video::S3DVertex( l,-l,-l, -1,0,0, video::SColor(255,255,255,255), t, t);
-	Vertices[5] = video::S3DVertex( l,-l, l, -1,0,0, video::SColor(255,255,255,255), o, t);
-	Vertices[6] = video::S3DVertex( l, l, l, -1,0,0, video::SColor(255,255,255,255), o, o);
-	Vertices[7] = video::S3DVertex( l, l,-l, -1,0,0, video::SColor(255,255,255,255), t, o);
+	Vertices[4] = video::S3DVertex( 1,-1,-1, -1,0,0, video::SColor(255,255,255,255), t, t);
+	Vertices[5] = video::S3DVertex( 1,-1, 1, -1,0,0, video::SColor(255,255,255,255), o, t);
+	Vertices[6] = video::S3DVertex( 1, 1, 1, -1,0,0, video::SColor(255,255,255,255), o, o);
+	Vertices[7] = video::S3DVertex( 1, 1,-1, -1,0,0, video::SColor(255,255,255,255), t, o);
 
 	// create back side
 
 	Material[2] = mat;
 	Material[2].setTexture(0, back);
-	Vertices[8]  = video::S3DVertex( l,-l, l, 0,0,-1, video::SColor(255,255,255,255), t, t);
-	Vertices[9]  = video::S3DVertex(-l,-l, l, 0,0,-1, video::SColor(255,255,255,255), o, t);
-	Vertices[10] = video::S3DVertex(-l, l, l, 0,0,-1, video::SColor(255,255,255,255), o, o);
-	Vertices[11] = video::S3DVertex( l, l, l, 0,0,-1, video::SColor(255,255,255,255), t, o);
+	Vertices[8]  = video::S3DVertex( 1,-1, 1, 0,0,-1, video::SColor(255,255,255,255), t, t);
+	Vertices[9]  = video::S3DVertex(-1,-1, 1, 0,0,-1, video::SColor(255,255,255,255), o, t);
+	Vertices[10] = video::S3DVertex(-1, 1, 1, 0,0,-1, video::SColor(255,255,255,255), o, o);
+	Vertices[11] = video::S3DVertex( 1, 1, 1, 0,0,-1, video::SColor(255,255,255,255), t, o);
 
 	// create right side
 
 	Material[3] = mat;
 	Material[3].setTexture(0, right);
-	Vertices[12] = video::S3DVertex(-l,-l, l, 1,0,0, video::SColor(255,255,255,255), t, t);
-	Vertices[13] = video::S3DVertex(-l,-l,-l, 1,0,0, video::SColor(255,255,255,255), o, t);
-	Vertices[14] = video::S3DVertex(-l, l,-l, 1,0,0, video::SColor(255,255,255,255), o, o);
-	Vertices[15] = video::S3DVertex(-l, l, l, 1,0,0, video::SColor(255,255,255,255), t, o);
+	Vertices[12] = video::S3DVertex(-1,-1, 1, 1,0,0, video::SColor(255,255,255,255), t, t);
+	Vertices[13] = video::S3DVertex(-1,-1,-1, 1,0,0, video::SColor(255,255,255,255), o, t);
+	Vertices[14] = video::S3DVertex(-1, 1,-1, 1,0,0, video::SColor(255,255,255,255), o, o);
+	Vertices[15] = video::S3DVertex(-1, 1, 1, 1,0,0, video::SColor(255,255,255,255), t, o);
 
 	// create top side
 
 	Material[4] = mat;
 	Material[4].setTexture(0, top);
-	Vertices[16] = video::S3DVertex( l, l,-l, 0,-1,0, video::SColor(255,255,255,255), t, t);
-	Vertices[17] = video::S3DVertex( l, l, l, 0,-1,0, video::SColor(255,255,255,255), o, t);
-	Vertices[18] = video::S3DVertex(-l, l, l, 0,-1,0, video::SColor(255,255,255,255), o, o);
-	Vertices[19] = video::S3DVertex(-l, l,-l, 0,-1,0, video::SColor(255,255,255,255), t, o);
+	Vertices[16] = video::S3DVertex( 1, 1,-1, 0,-1,0, video::SColor(255,255,255,255), t, t);
+	Vertices[17] = video::S3DVertex( 1, 1, 1, 0,-1,0, video::SColor(255,255,255,255), o, t);
+	Vertices[18] = video::S3DVertex(-1, 1, 1, 0,-1,0, video::SColor(255,255,255,255), o, o);
+	Vertices[19] = video::S3DVertex(-1, 1,-1, 0,-1,0, video::SColor(255,255,255,255), t, o);
 
 	// create bottom side
 
 	Material[5] = mat;
 	Material[5].setTexture(0, bottom);
-	Vertices[20] = video::S3DVertex( l,-l, l, 0,1,0, video::SColor(255,255,255,255), o, o);
-	Vertices[21] = video::S3DVertex( l,-l,-l, 0,1,0, video::SColor(255,255,255,255), t, o);
-	Vertices[22] = video::S3DVertex(-l,-l,-l, 0,1,0, video::SColor(255,255,255,255), t, t);
-	Vertices[23] = video::S3DVertex(-l,-l, l, 0,1,0, video::SColor(255,255,255,255), o, t);
+	Vertices[20] = video::S3DVertex( 1,-1, 1, 0,1,0, video::SColor(255,255,255,255), o, o);
+	Vertices[21] = video::S3DVertex( 1,-1,-1, 0,1,0, video::SColor(255,255,255,255), t, o);
+	Vertices[22] = video::S3DVertex(-1,-1,-1, 0,1,0, video::SColor(255,255,255,255), t, t);
+	Vertices[23] = video::S3DVertex(-1,-1, 1, 0,1,0, video::SColor(255,255,255,255), o, t);
 }
 
 
@@ -139,10 +138,15 @@ void CSkyBoxSceneNode::render()
 	{
 		// draw perspective skybox
 
-		core::matrix4 mat(AbsoluteTransformation);
-		mat.setTranslation(camera->getAbsolutePosition());
+		core::matrix4 translate(AbsoluteTransformation);
+		translate.setTranslation(camera->getAbsolutePosition());
+	
+		// Draw the sky box between the near and far clip plane
+		const f32 viewDistance = (camera->getNearValue() + camera->getFarValue()) * 0.5f;
+		core::matrix4 scale;
+		scale.setScale(core::vector3df(viewDistance, viewDistance, viewDistance));
 
-		driver->setTransform(video::ETS_WORLD, mat);
+		driver->setTransform(video::ETS_WORLD, translate * scale);
 
 		for (s32 i=0; i<6; ++i)
 		{
@@ -206,10 +210,9 @@ const core::aabbox3d<f32>& CSkyBoxSceneNode::getBoundingBox() const
 void CSkyBoxSceneNode::OnRegisterSceneNode()
 {
 	if (IsVisible)
-	{
 		SceneManager->registerNodeForRendering(this, ESNRP_SKY_BOX);
-		ISceneNode::OnRegisterSceneNode();
-	}
+
+	ISceneNode::OnRegisterSceneNode();
 }
 
 
diff --git a/src/dep/src/irrlicht/CSkyBoxSceneNode.h b/src/dep/src/irrlicht/CSkyBoxSceneNode.h
index 9beb59a..e229cd1 100644
--- a/src/dep/src/irrlicht/CSkyBoxSceneNode.h
+++ b/src/dep/src/irrlicht/CSkyBoxSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CSkyDomeSceneNode.cpp b/src/dep/src/irrlicht/CSkyDomeSceneNode.cpp
index 9e3e1b4..9eed38d 100644
--- a/src/dep/src/irrlicht/CSkyDomeSceneNode.cpp
+++ b/src/dep/src/irrlicht/CSkyDomeSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // Code for this scene node has been contributed by Anders la Cour-Harbo (alc)
@@ -31,7 +31,7 @@ namespace scene
 
 CSkyDomeSceneNode::CSkyDomeSceneNode(video::ITexture* sky, u32 horiRes, u32 vertRes,
 			f64 texturePercentage, f64 spherePercentage, ISceneNode* parent, ISceneManager* mgr, s32 id)
-			: ISceneNode(parent, mgr, id)
+			: ISceneNode(parent, mgr, id), Buffer(0)
 {
 	#ifdef _DEBUG
 	setDebugName("CSkyDomeSceneNode");
@@ -40,18 +40,19 @@ CSkyDomeSceneNode::CSkyDomeSceneNode(video::ITexture* sky, u32 horiRes, u32 vert
 	f64 radius = 1000.0; /* Adjust this to get more or less perspective distorsion. */
 	f64 azimuth, azimuth_step;
 	f64 elevation, elevation_step;
-	u32 k, c;
+	u32 k;
 
 	video::S3DVertex vtx;
 
 	AutomaticCullingState = scene::EAC_OFF;
 
-	Buffer.Material.Lighting = false;
-	Buffer.Material.ZBuffer = false;
-	Buffer.Material.ZWriteEnable = false;
-	Buffer.Material.setTexture(0, sky);
-	Buffer.BoundingBox.MaxEdge.set(0,0,0);
-	Buffer.BoundingBox.MinEdge.set(0,0,0);
+	Buffer = new SMeshBuffer();
+	Buffer->Material.Lighting = false;
+	Buffer->Material.ZBuffer = false;
+	Buffer->Material.ZWriteEnable = false;
+	Buffer->Material.setTexture(0, sky);
+	Buffer->BoundingBox.MaxEdge.set(0,0,0);
+	Buffer->BoundingBox.MinEdge.set(0,0,0);
 
 	azimuth_step = 2.*core::PI64/(f64)horiRes;
 	if (spherePercentage<0.)
@@ -60,54 +61,58 @@ CSkyDomeSceneNode::CSkyDomeSceneNode(video::ITexture* sky, u32 horiRes, u32 vert
 		spherePercentage=2.;
 	elevation_step = spherePercentage*core::PI64/2./(f64)vertRes;
 
-	Buffer.Vertices.set_used((horiRes+1)*(vertRes+1));
-	Buffer.Indices.set_used(3*(2*vertRes-1)*horiRes);
+	Buffer->Vertices.reallocate((horiRes+1)*(vertRes+1));
+	Buffer->Indices.reallocate(3*(2*vertRes-1)*horiRes);
 
 	vtx.Color.set(255,255,255,255);
 	vtx.Normal.set(0.0f,0.0f,0.0f);
 
-	c = 0;
+	const f32 tcV = (f32)texturePercentage/(f32)vertRes;
 	for (k = 0, azimuth = 0; k <= horiRes; ++k)
 	{
 		elevation = core::PI64/2.;
+		const f32 tcU = (f32)k/(f32)horiRes;
+		const f64 sinA = sin(azimuth);
+		const f64 cosA = cos(azimuth);
 		for (u32 j = 0; j <= vertRes; ++j)
 		{
-			vtx.Pos.set((f32) (radius*cos(elevation)*sin(azimuth)),
-						(f32) (radius*sin(elevation)+50.0f),
-						(f32) (radius*cos(elevation)*cos(azimuth)));
+			const f64 cosEr = radius*cos(elevation);
+			vtx.Pos.set((f32) (cosEr*sinA),
+					(f32) (radius*sin(elevation)+50.0f),
+					(f32) (cosEr*cosA));
 
-			vtx.TCoords.set((f32)k/(f32)horiRes, (f32)j/(f32)vertRes*(f32)texturePercentage);
+			vtx.TCoords.set(tcU, (f32)j*tcV);
 
-			Buffer.Vertices[c++] = vtx;
+			Buffer->Vertices.push_back(vtx);
 			elevation -= elevation_step;
 		}
 		azimuth += azimuth_step;
 	}
 
-	c = 0;
 	for (k = 0; k < horiRes; ++k)
 	{
-		Buffer.Indices[c++] = vertRes+2+(vertRes+1)*k;
-		Buffer.Indices[c++] = 1+(vertRes+1)*k;
-		Buffer.Indices[c++] = 0+(vertRes+1)*k;
+		Buffer->Indices.push_back(vertRes+2+(vertRes+1)*k);
+		Buffer->Indices.push_back(1+(vertRes+1)*k);
+		Buffer->Indices.push_back(0+(vertRes+1)*k);
 
 		for (u32 j = 1; j < vertRes; ++j)
 		{
-			Buffer.Indices[c++] = vertRes+2+(vertRes+1)*k+j;
-			Buffer.Indices[c++] = 1+(vertRes+1)*k+j;
-			Buffer.Indices[c++] = 0+(vertRes+1)*k+j;
+			Buffer->Indices.push_back(vertRes+2+(vertRes+1)*k+j);
+			Buffer->Indices.push_back(1+(vertRes+1)*k+j);
+			Buffer->Indices.push_back(0+(vertRes+1)*k+j);
 
-			Buffer.Indices[c++] = vertRes+1+(vertRes+1)*k+j;
-			Buffer.Indices[c++] = vertRes+2+(vertRes+1)*k+j;
-			Buffer.Indices[c++] = 0+(vertRes+1)*k+j;
+			Buffer->Indices.push_back(vertRes+1+(vertRes+1)*k+j);
+			Buffer->Indices.push_back(vertRes+2+(vertRes+1)*k+j);
+			Buffer->Indices.push_back(0+(vertRes+1)*k+j);
 		}
 	}
 }
 
 
-//! destructor
 CSkyDomeSceneNode::~CSkyDomeSceneNode()
 {
+	if (Buffer)
+		Buffer->drop();
 }
 
 
@@ -127,25 +132,25 @@ void CSkyDomeSceneNode::render()
 
 		driver->setTransform(video::ETS_WORLD, mat);
 
-		driver->setMaterial(Buffer.Material);
-		driver->drawMeshBuffer(&Buffer);
+		driver->setMaterial(Buffer->Material);
+		driver->drawMeshBuffer(Buffer);
 	}
 }
 
+
 //! returns the axis aligned bounding box of this node
 const core::aabbox3d<f32>& CSkyDomeSceneNode::getBoundingBox() const
 {
-	return Buffer.BoundingBox;
+	return Buffer->BoundingBox;
 }
 
 
 void CSkyDomeSceneNode::OnRegisterSceneNode()
 {
 	if (IsVisible)
-	{
 		SceneManager->registerNodeForRendering(this, ESNRP_SKY_BOX);
-		ISceneNode::OnRegisterSceneNode();
-	}
+
+	ISceneNode::OnRegisterSceneNode();
 }
 
 
@@ -156,7 +161,7 @@ void CSkyDomeSceneNode::OnRegisterSceneNode()
 //! to directly modify the material of a scene node.
 video::SMaterial& CSkyDomeSceneNode::getMaterial(u32 i)
 {
-	return Buffer.Material;
+	return Buffer->Material;
 }
 
 
diff --git a/src/dep/src/irrlicht/CSkyDomeSceneNode.h b/src/dep/src/irrlicht/CSkyDomeSceneNode.h
index 8422c98..77dc0ac 100644
--- a/src/dep/src/irrlicht/CSkyDomeSceneNode.h
+++ b/src/dep/src/irrlicht/CSkyDomeSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 // Code for this scene node has been contributed by Anders la Cour-Harbo (alc)
@@ -18,8 +18,8 @@ class CSkyDomeSceneNode : public ISceneNode
 {
 	public:
 		CSkyDomeSceneNode(video::ITexture* texture, u32 horiRes, u32 vertRes,
-		f64 texturePercentage, f64 spherePercentage, ISceneNode* root,
-		ISceneManager* smgr, s32 id);
+			f64 texturePercentage, f64 spherePercentage,
+			ISceneNode* root, ISceneManager* smgr, s32 id);
 		virtual ~CSkyDomeSceneNode();
 		virtual void OnRegisterSceneNode();
 		virtual void render();
@@ -29,7 +29,7 @@ class CSkyDomeSceneNode : public ISceneNode
 		virtual ESCENE_NODE_TYPE getType() const { return ESNT_SKY_BOX; }
 
 	private:
-		SMeshBuffer Buffer;
+		SMeshBuffer* Buffer;
 };
 
 
diff --git a/src/dep/src/irrlicht/CSoftware2MaterialRenderer.h b/src/dep/src/irrlicht/CSoftware2MaterialRenderer.h
index 0ba49e0..f961846 100644
--- a/src/dep/src/irrlicht/CSoftware2MaterialRenderer.h
+++ b/src/dep/src/irrlicht/CSoftware2MaterialRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,21 +21,21 @@ class CSoftware2MaterialRenderer : public IMaterialRenderer
 public:
 
 	//! Constructor
-	CSoftware2MaterialRenderer(video::CSoftwareDriver2* driver)
+	CSoftware2MaterialRenderer(video::CBurningVideoDriver* driver)
 		: Driver(driver)
 	{
 	}
 
 protected:
 
-	video::CSoftwareDriver2* Driver;
+	video::CBurningVideoDriver* Driver;
 };
 
 //! solid material renderer
 class CSoftware2MaterialRenderer_SOLID : public CSoftware2MaterialRenderer
 {
 public:
-	CSoftware2MaterialRenderer_SOLID ( video::CSoftwareDriver2* driver )
+	CSoftware2MaterialRenderer_SOLID ( video::CBurningVideoDriver* driver )
 		:CSoftware2MaterialRenderer ( driver ) {}
 
 	//! Returns if the material is transparent. 
@@ -52,7 +52,7 @@ public:
 class CSoftware2MaterialRenderer_TRANSPARENT_ADD_COLOR : public CSoftware2MaterialRenderer
 {
 public:
-	CSoftware2MaterialRenderer_TRANSPARENT_ADD_COLOR ( video::CSoftwareDriver2* driver )
+	CSoftware2MaterialRenderer_TRANSPARENT_ADD_COLOR ( video::CBurningVideoDriver* driver )
 		: CSoftware2MaterialRenderer ( driver ) {}
 
 
@@ -68,13 +68,48 @@ public:
 class CSoftware2MaterialRenderer_UNSUPPORTED : public CSoftware2MaterialRenderer
 {
 public:
-	CSoftware2MaterialRenderer_UNSUPPORTED ( video::CSoftwareDriver2* driver )
+	CSoftware2MaterialRenderer_UNSUPPORTED ( video::CBurningVideoDriver* driver )
 		: CSoftware2MaterialRenderer ( driver ) {}
 
 	virtual s32 getRenderCapability() const { return 1; }
 
 };
 
+//! unsupported material renderer
+class CBurningShader_REFERENCE : public CSoftware2MaterialRenderer
+{
+public:
+	CBurningShader_REFERENCE ( video::CBurningVideoDriver* driver )
+		: CSoftware2MaterialRenderer ( driver ) {}
+
+	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+		bool resetAllRenderstates, IMaterialRendererServices* services)
+	{
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+	}
+
+	virtual bool isTransparent() const
+	{
+		return false;
+	}
+
+	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
+	{
+		return true;
+	};
+
+
+	virtual s32 getRenderCapability() const
+	{
+		return 1;
+	}
+
+};
+
+
 
 } // end namespace video
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/CSoftwareDriver.cpp b/src/dep/src/irrlicht/CSoftwareDriver.cpp
index 3409e49..bcb1208 100644
--- a/src/dep/src/irrlicht/CSoftwareDriver.cpp
+++ b/src/dep/src/irrlicht/CSoftwareDriver.cpp
@@ -1,918 +1,954 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "CSoftwareDriver.h"
-
-#include "IrrCompileConfig.h"
-#ifdef _IRR_COMPILE_WITH_SOFTWARE_
-
-#include "CSoftwareTexture.h"
-#include "os.h"
-#include "S3DVertex.h"
-
-namespace irr
-{
-namespace video
-{
-
-
-//! constructor
-CSoftwareDriver::CSoftwareDriver(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter)
-: CNullDriver(io, windowSize), RenderTargetTexture(0), RenderTargetSurface(0),
-	CurrentTriangleRenderer(0), ZBuffer(0), Texture(0)
-{
-	#ifdef _DEBUG
-	setDebugName("CSoftwareDriver");
-	#endif
-
-	// create backbuffer
-
-	BackBuffer = new CImage(ECF_A1R5G5B5, windowSize);
-	BackBuffer->fill(SColor(0));
-
-	// get presenter
-
-	Presenter = presenter;
-
-	// create z buffer
-
-	ZBuffer = video::createZBuffer(BackBuffer->getDimension());
-
-	// create triangle renderers
-
-	TriangleRenderers[ETR_FLAT] = createTriangleRendererFlat(ZBuffer);
-	TriangleRenderers[ETR_FLAT_WIRE] = createTriangleRendererFlatWire(ZBuffer);
-	TriangleRenderers[ETR_GOURAUD] = createTriangleRendererGouraud(ZBuffer);
-	TriangleRenderers[ETR_GOURAUD_WIRE] = createTriangleRendererGouraudWire(ZBuffer);
-	TriangleRenderers[ETR_TEXTURE_FLAT] = createTriangleRendererTextureFlat(ZBuffer);
-	TriangleRenderers[ETR_TEXTURE_FLAT_WIRE] = createTriangleRendererTextureFlatWire(ZBuffer);
-	TriangleRenderers[ETR_TEXTURE_GOURAUD] = createTriangleRendererTextureGouraud(ZBuffer);
-	TriangleRenderers[ETR_TEXTURE_GOURAUD_WIRE] = createTriangleRendererTextureGouraudWire(ZBuffer);
-	TriangleRenderers[ETR_TEXTURE_GOURAUD_NOZ] = createTriangleRendererTextureGouraudNoZ();
-	TriangleRenderers[ETR_TEXTURE_GOURAUD_ADD] = createTriangleRendererTextureGouraudAdd(ZBuffer);
-
-	// select render target
-
-	setRenderTarget(BackBuffer);
-
-	// select the right renderer
-
-	selectRightTriangleRenderer();
-}
-
-
-
-//! destructor
-CSoftwareDriver::~CSoftwareDriver()
-{
-	// delete Backbuffer
-	BackBuffer->drop();
-
-	// delete triangle renderers
-
-	for (s32 i=0; i<ETR_COUNT; ++i)
-		if (TriangleRenderers[i])
-			TriangleRenderers[i]->drop();
-
-	// delete zbuffer
-
-	if (ZBuffer)
-		ZBuffer->drop();
-
-	// delete current texture
-
-	if (Texture)
-		Texture->drop();
-
-	if (RenderTargetTexture)
-		RenderTargetTexture->drop();
-
-	if (RenderTargetSurface)
-		RenderTargetSurface->drop();
-}
-
-
-
-//! switches to a triangle renderer
-void CSoftwareDriver::switchToTriangleRenderer(ETriangleRenderer renderer)
-{
-	video::IImage* s = 0;
-	if (Texture)
-		s = ((CSoftwareTexture*)Texture)->getTexture();
-
-	CurrentTriangleRenderer = TriangleRenderers[renderer];
-	CurrentTriangleRenderer->setBackfaceCulling(Material.BackfaceCulling == true);
-	CurrentTriangleRenderer->setTexture(s);
-	CurrentTriangleRenderer->setRenderTarget(RenderTargetSurface, ViewPort);
-}
-
-
-//! void selects the right triangle renderer based on the render states.
-void CSoftwareDriver::selectRightTriangleRenderer()
-{
-
-	ETriangleRenderer renderer = ETR_FLAT;
-
-	if (Texture)
-	{
-		if (!Material.GouraudShading)
-			renderer = (!Material.Wireframe) ? ETR_TEXTURE_FLAT : ETR_TEXTURE_FLAT_WIRE;
-		else
-		{
-			if (Material.Wireframe)
-				renderer = ETR_TEXTURE_GOURAUD_WIRE;
-			else
-			{
-				if (Material.MaterialType == EMT_TRANSPARENT_ADD_COLOR ||
-						Material.MaterialType == EMT_TRANSPARENT_ALPHA_CHANNEL ||
-						Material.MaterialType == EMT_TRANSPARENT_VERTEX_ALPHA)
-				{
-					// simply draw all transparent stuff with the same renderer. at
-					// least it is transparent then.
-					renderer = ETR_TEXTURE_GOURAUD_ADD;
-				}
-				else
-				if (!Material.ZBuffer && !Material.ZWriteEnable)
-					renderer = ETR_TEXTURE_GOURAUD_NOZ;
-				else
-				{
-					renderer = ETR_TEXTURE_GOURAUD;
-				}
-			}
-		}
-	}
-	else
-	{
-		if (!Material.GouraudShading)
-			renderer = (!Material.Wireframe) ? ETR_FLAT : ETR_FLAT_WIRE;
-		else
-			renderer = (!Material.Wireframe) ? ETR_GOURAUD : ETR_GOURAUD_WIRE;
-	}
-
-	switchToTriangleRenderer(renderer);
-}
-
-
-
-
-//! presents the rendered scene on the screen, returns false if failed
-bool CSoftwareDriver::endScene( s32 windowId, core::rect<s32>* sourceRect )
-{
-	CNullDriver::endScene();
-
-	Presenter->present(BackBuffer, windowId, sourceRect );
-	return true;
-}
-
-
-
-//! queries the features of the driver, returns true if feature is available
-bool CSoftwareDriver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
-{
-	switch (feature)
-	{
-	case EVDF_RENDER_TO_TARGET:
-		return true;
-	default:
-		return false;
-	};
-}
-
-
-
-//! sets transformation
-void CSoftwareDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat)
-{
-	TransformationMatrix[state] = mat;
-}
-
-
-
-
-//! sets the current Texture
-bool CSoftwareDriver::setTexture(video::ITexture* texture)
-{
-	if (texture && texture->getDriverType() != EDT_SOFTWARE)
-	{
-		os::Printer::log("Fatal Error: Tried to set a texture not owned by this driver.", ELL_ERROR);
-		return false;
-	}
-
-	if (Texture)
-		Texture->drop();
-
-	Texture = texture;
-
-	if (Texture)
-		Texture->grab();
-
-	selectRightTriangleRenderer();
-	return true;
-}
-
-
-
-//! sets a material
-void CSoftwareDriver::setMaterial(const SMaterial& material)
-{
-	Material = material;
-
-	for (u32 i = 0; i < 1; ++i)
-	{
-		setTexture(Material.getTexture(i));
-		setTransform ((E_TRANSFORMATION_STATE) ( ETS_TEXTURE_0 + i ),
-				material.getTextureMatrix(i));
-	}
-}
-
-
-//! clears the zbuffer
-bool CSoftwareDriver::beginScene(bool backBuffer, bool zBuffer, SColor color)
-{
-	CNullDriver::beginScene(backBuffer, zBuffer, color);
-
-	if (backBuffer)
-		BackBuffer->fill( color );
-
-	if (ZBuffer && zBuffer)
-		ZBuffer->clear();
-
-	return true;
-}
-
-
-//! sets a render target
-bool CSoftwareDriver::setRenderTarget(video::ITexture* texture, bool clearBackBuffer,
-								bool clearZBuffer, SColor color)
-{
-	if (texture && texture->getDriverType() != EDT_SOFTWARE)
-	{
-		os::Printer::log("Fatal Error: Tried to set a texture not owned by this driver.", ELL_ERROR);
-		return false;
-	}
-
-	if (RenderTargetTexture)
-		RenderTargetTexture->drop();
-
-	RenderTargetTexture = texture;
-
-	if (RenderTargetTexture)
-	{
-		RenderTargetTexture->grab();
-		setRenderTarget(((CSoftwareTexture*)RenderTargetTexture)->getTexture());
-	}
-	else
-	{
-		setRenderTarget(BackBuffer);
-	}
-
-	if (RenderTargetSurface && (clearBackBuffer || clearZBuffer))
-	{
-		if (clearZBuffer)
-			ZBuffer->clear();
-
-		if (clearBackBuffer)
-			((video::CImage*)RenderTargetSurface)->fill( color );
-	}
-
-	return true;
-}
-
-
-//! sets a render target
-void CSoftwareDriver::setRenderTarget(video::CImage* image)
-{
-	if (RenderTargetSurface)
-		RenderTargetSurface->drop();
-
-	RenderTargetSurface = image;
-	RenderTargetSize.Width = 0;
-	RenderTargetSize.Height = 0;
-	Render2DTranslation.X = 0;
-	Render2DTranslation.Y = 0;
-
-	if (RenderTargetSurface)
-	{
-		RenderTargetSurface->grab();
-		RenderTargetSize = RenderTargetSurface->getDimension();
-	}
-
-	setViewPort(core::rect<s32>(0,0,RenderTargetSize.Width,RenderTargetSize.Height));
-
-	if (ZBuffer)
-		ZBuffer->setSize(RenderTargetSize);
-}
-
-
-
-//! sets a viewport
-void CSoftwareDriver::setViewPort(const core::rect<s32>& area)
-{
-	ViewPort = area;
-
-	//TODO: the clipping is not correct, because the projection is affected.
-	// to correct this, ViewPortSize and Render2DTranslation will have to be corrected.
-	core::rect<s32> rendert(0,0,RenderTargetSize.Width,RenderTargetSize.Height);
-	ViewPort.clipAgainst(rendert);
-
-	ViewPortSize = ViewPort.getSize();
-	Render2DTranslation.X = (ViewPortSize.Width / 2) + ViewPort.UpperLeftCorner.X;
-	Render2DTranslation.Y = ViewPort.UpperLeftCorner.Y + ViewPortSize.Height - (ViewPortSize.Height / 2);// + ViewPort.UpperLeftCorner.Y;
-
-	if (CurrentTriangleRenderer)
-		CurrentTriangleRenderer->setRenderTarget(RenderTargetSurface, ViewPort);
-}
-
-
-//! draws a vertex primitive list
-void CSoftwareDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType)
-{
-	const u16* indexPointer=0;
-	core::array<u16> newBuffer;
-	switch (pType)
-	{
-		case scene::EPT_LINE_STRIP:
-			{
-				switch (vType)
-				{
-					case EVT_STANDARD:
-						{
-							for (u32 i=0; i < primitiveCount-1; ++i)
-								draw3DLine(((S3DVertex*)vertices)[indexList[i]].Pos,
-									((S3DVertex*)vertices)[indexList[i+1]].Pos,
-									((S3DVertex*)vertices)[indexList[i]].Color);
-						}
-						break;
-					case EVT_2TCOORDS:
-						{
-							for (u32 i=0; i < primitiveCount-1; ++i)
-								draw3DLine(((S3DVertex2TCoords*)vertices)[indexList[i]].Pos,
-									((S3DVertex2TCoords*)vertices)[indexList[i+1]].Pos,
-									((S3DVertex2TCoords*)vertices)[indexList[i]].Color);
-						}
-						break;
-					case EVT_TANGENTS:
-						{
-							for (u32 i=0; i < primitiveCount-1; ++i)
-								draw3DLine(((S3DVertexTangents*)vertices)[indexList[i]].Pos,
-									((S3DVertexTangents*)vertices)[indexList[i+1]].Pos,
-									((S3DVertexTangents*)vertices)[indexList[i]].Color);
-						}
-						break;
-				}
-			}
-			return;
-		case scene::EPT_LINE_LOOP:
-			drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount-1, vType, scene::EPT_LINE_STRIP);
-			switch (vType)
-			{
-				case EVT_STANDARD:
-					draw3DLine(((S3DVertex*)vertices)[indexList[primitiveCount-1]].Pos,
-						((S3DVertex*)vertices)[indexList[0]].Pos,
-						((S3DVertex*)vertices)[indexList[primitiveCount-1]].Color);
-					break;
-				case EVT_2TCOORDS:
-					draw3DLine(((S3DVertex2TCoords*)vertices)[indexList[primitiveCount-1]].Pos,
-						((S3DVertex2TCoords*)vertices)[indexList[0]].Pos,
-						((S3DVertex2TCoords*)vertices)[indexList[primitiveCount-1]].Color);
-					break;
-				case EVT_TANGENTS:
-					draw3DLine(((S3DVertexTangents*)vertices)[indexList[primitiveCount-1]].Pos,
-						((S3DVertexTangents*)vertices)[indexList[0]].Pos,
-						((S3DVertexTangents*)vertices)[indexList[primitiveCount-1]].Color);
-					break;
-			}
-			return;
-		case scene::EPT_LINES:
-			{
-				switch (vType)
-				{
-					case EVT_STANDARD:
-						{
-							for (u32 i=0; i < 2*primitiveCount; i+=2)
-								draw3DLine(((S3DVertex*)vertices)[indexList[i]].Pos,
-									((S3DVertex*)vertices)[indexList[i+1]].Pos,
-									((S3DVertex*)vertices)[indexList[i]].Color);
-						}
-						break;
-					case EVT_2TCOORDS:
-						{
-							for (u32 i=0; i < 2*primitiveCount; i+=2)
-								draw3DLine(((S3DVertex2TCoords*)vertices)[indexList[i]].Pos,
-									((S3DVertex2TCoords*)vertices)[indexList[i+1]].Pos,
-									((S3DVertex2TCoords*)vertices)[indexList[i]].Color);
-						}
-						break;
-					case EVT_TANGENTS:
-						{
-							for (u32 i=0; i < 2*primitiveCount; i+=2)
-								draw3DLine(((S3DVertexTangents*)vertices)[indexList[i]].Pos,
-									((S3DVertexTangents*)vertices)[indexList[i+1]].Pos,
-									((S3DVertexTangents*)vertices)[indexList[i]].Color);
-						}
-						break;
-				}
-			}
-			return;
-		case scene::EPT_TRIANGLE_FAN:
-			{
-				// TODO: don't convert fan to list
-				newBuffer.reallocate(primitiveCount*3);
-				for( u32 t=0; t<primitiveCount; ++t )
-				{
-					newBuffer.push_back(indexList[0]);
-					newBuffer.push_back(indexList[t+1]);
-					newBuffer.push_back(indexList[t+2]);
-				}
-
-				indexPointer = newBuffer.pointer();
-			}
-			break;
-		case scene::EPT_TRIANGLES:
-			indexPointer=indexList;
-			break;
-	}
-	switch (vType)
-	{
-		case EVT_STANDARD:
-			drawClippedIndexedTriangleListT((S3DVertex*)vertices, vertexCount, indexPointer, primitiveCount);
-			break;
-		case EVT_2TCOORDS:
-			drawClippedIndexedTriangleListT((S3DVertex2TCoords*)vertices, vertexCount, indexPointer, primitiveCount);
-			break;
-		case EVT_TANGENTS:
-			drawClippedIndexedTriangleListT((S3DVertexTangents*)vertices, vertexCount, indexPointer, primitiveCount);
-			break;
-	}
-}
-
-
-
-template<class VERTEXTYPE>
-void CSoftwareDriver::drawClippedIndexedTriangleListT(const VERTEXTYPE* vertices,
-	s32 vertexCount, const u16* indexList, s32 triangleCount)
-{
-	if (!RenderTargetSurface || !ZBuffer || !triangleCount)
-		return;
-
-	if (!checkPrimitiveCount(triangleCount))
-		return;
-
-	// arrays for storing clipped vertices
-	core::array<VERTEXTYPE> clippedVertices;
-	core::array<u16> clippedIndices;
-
-	// calculate inverse world transformation
-	core::matrix4 worldinv(TransformationMatrix[ETS_WORLD]);
-	worldinv.makeInverse();
-
-	// calculate view frustum planes
-	scene::SViewFrustum frustum(TransformationMatrix[ETS_PROJECTION] * TransformationMatrix[ETS_VIEW]);
-
-	// copy and transform clipping planes ignoring far plane
-	core::plane3df planes[5]; // ordered by near, left, right, bottom, top
-	for (int p=0; p<5; ++p)
-		worldinv.transformPlane(frustum.planes[p+1], planes[p]);
-
-	core::EIntersectionRelation3D inout[3]; // is point in front or back of plane?
-
-	// temporary buffer for vertices to be clipped by all planes
-	core::array<VERTEXTYPE> tClpBuf;
-	int t;
-
-	int i;
-	for (i=0; i<triangleCount; ++i) // for all input triangles
-	{
-		// add next triangle to tempClipBuffer
-		for (t=0; t<3; ++t)
-			tClpBuf.push_back(vertices[indexList[(i*3)+t]]);
-
-		for (int p=0; p<5; ++p) // for all clip planes
-		for (int v=0; v<(int)tClpBuf.size(); v+=3) // for all vertices in temp clip buffer
-		{
-			int inside = 0;
-			int outside = 0;
-
-			// test intersection relation of the current vertices
-			for (t=0; t<3; ++t)
-			{
-				inout[t] = planes[p].classifyPointRelation(tClpBuf[v+t].Pos);
-				if (inout[t] != core::ISREL3D_FRONT)
-					++inside;
-				else
-				if (inout[t] == core::ISREL3D_FRONT)
-					++outside;
-			}
-
-			if (!outside)
-			{
-				// add all vertices to new buffer, this triangle needs no clipping.
-				// so simply don't change this part of the temporary triangle buffer
-				continue;
-			}
-
-			if (!inside)
-			{
-				// all vertices are outside, don't add this triangle, so erase this
-				// triangle from the tClpBuf
-				tClpBuf.erase(v,3);
-				v -= 3;
-				continue;
-			}
-
-			// this vertex has to be clipped by this clipping plane.
-
-			// The following lines represent my try to implement some real clipping.
-			// There is a bug somewhere, and after some time I've given up.
-			// So now it is commented out, resulting that triangles which would need clipping
-			// are simply taken out (in the next two lines).
-#ifndef __SOFTWARE_CLIPPING_PROBLEM__
-			tClpBuf.erase(v,3);
-			v -= 3;
-#endif
-
-			/*
-			// my idea is the following:
-			// current vertex to next vertex relation:
-			// out - out : add nothing
-			// out -  in : add middle point
-			// in -  out : add first and middle point
-			// in -   in : add both
-
-
-			// now based on the number of intersections, create new vertices
-			// into tClpBuf (at the front for not letting them be clipped again)
-
-			int added = 0;
-			int prev = v+2;
-			for (int index=v; index<v+3; ++index)
-			{
-				if (inout[prev] == core::ISREL3D_BACK)
-				{
-					if (inout[index] != core::ISREL3D_BACK)
-					{
-						VERTEXTYPE& vt1 = tClpBuf[prev];
-						VERTEXTYPE& vt2 = tClpBuf[index];
-
-						f32 fact = planes[p].getKnownIntersectionWithLine(vt1.Pos, vt2.Pos);
-						VERTEXTYPE nvt;
-						nvt.Pos = vt1.Pos.getInterpolated(vt2.Pos, fact);
-						nvt.Color = vt1.Color.getInterpolated(vt2.Color, fact);
-						nvt.TCoords = vt1.TCoords.getInterpolated(vt2.TCoords, fact);
-
-						tClpBuf.push_front(nvt); ++index; ++prev; ++v;
-						++added;
-					}
-				}
-				else
-				{
-					if (inout[index] != core::ISREL3D_BACK)
-					{
-						VERTEXTYPE vt1 = tClpBuf[index];
-						VERTEXTYPE vt2 = tClpBuf[prev];
-						tClpBuf.push_front(vt1); ++index; ++prev; ++v;
-						tClpBuf.push_front(vt2); ++index; ++prev; ++v;
-						added+= 2;
-					}
-					else
-					{
-						// same as above, but other way round.
-						VERTEXTYPE vt1 = tClpBuf[index];
-						VERTEXTYPE vt2 = tClpBuf[prev];
-
-						f32 fact = planes[p].getKnownIntersectionWithLine(vt1.Pos, vt2.Pos);
-						VERTEXTYPE nvt;
-						nvt.Pos = vt1.Pos.getInterpolated(vt2.Pos, fact);
-						nvt.Color = vt1.Color.getInterpolated(vt2.Color, fact);
-						nvt.TCoords = vt1.TCoords.getInterpolated(vt2.TCoords, fact);
-
-						tClpBuf.push_front(vt2); ++index; ++prev; ++v;
-						tClpBuf.push_front(nvt); ++index; ++prev; ++v;
-						added += 2;
-					}
-				}
-
-				prev = index;
-			}
-
-			// erase original vertices
-			tClpBuf.erase(v,3);
-			v -= 3;
-			*/
-
-
-		} // end for all clip planes
-
-		// now add all remaining triangles in tempClipBuffer to clippedIndices
-		// and clippedVertices array.
-		if (clippedIndices.size() + tClpBuf.size() < 65535)
-		for (t=0; t<(int)tClpBuf.size(); ++t)
-		{
-			clippedIndices.push_back(clippedVertices.size());
-			clippedVertices.push_back(tClpBuf[t]);
-		}
-		tClpBuf.clear();
-
-	} // end for all input triangles
-
-
-	// draw newly created triangles.
-
-	// -----------------------------------------------------------
-	// here all triangles are being drawn. I put this in a separate
-	// method, but the visual studio 6 compiler has great problems
-	// with templates and didn't accept two template methods in this
-	// class.
-
-	// draw triangles
-
-	CNullDriver::drawVertexPrimitiveList(clippedVertices.pointer(), clippedVertices.size(),
-		clippedIndices.pointer(), clippedIndices.size()/3, EVT_STANDARD, scene::EPT_TRIANGLES);
-
-	if (TransformedPoints.size() < clippedVertices.size())
-		TransformedPoints.set_used(clippedVertices.size());
-
-	if (TransformedPoints.empty())
-		return;
-
-	const VERTEXTYPE* currentVertex = clippedVertices.pointer();
-	S2DVertex* tp = &TransformedPoints[0];
-
-	core::dimension2d<s32> textureSize(0,0);
-	f32 zDiv;
-
-	if (Texture)
-		textureSize = ((CSoftwareTexture*)Texture)->getTexture()->getDimension();
-
-	f32 transformedPos[4]; // transform all points in the list
-
-	core::matrix4 matrix(TransformationMatrix[ETS_PROJECTION]);
-	matrix *= TransformationMatrix[ETS_VIEW];
-	matrix *= TransformationMatrix[ETS_WORLD];
-
-	s32 ViewTransformWidth = (ViewPortSize.Width>>1);
-	s32 ViewTransformHeight = (ViewPortSize.Height>>1);
-
-	for (i=0; i<(int)clippedVertices.size(); ++i)
-	{
-		transformedPos[0] = currentVertex->Pos.X;
-		transformedPos[1] = currentVertex->Pos.Y;
-		transformedPos[2] = currentVertex->Pos.Z;
-		transformedPos[3] = 1.0f;
-
-		matrix.multiplyWith1x4Matrix(transformedPos);
-		zDiv = transformedPos[3] == 0.0f ? 1.0f : (1.0f / transformedPos[3]);
-
-		tp->Pos.X = (s32)(ViewTransformWidth * (transformedPos[0] * zDiv) + (Render2DTranslation.X));
-		tp->Pos.Y = (Render2DTranslation.Y - (s32)(ViewTransformHeight * (transformedPos[1] * zDiv)));
-		tp->Color = currentVertex->Color.toA1R5G5B5();
-		tp->ZValue = (TZBufferType)(32767.0f * zDiv);
-
-		tp->TCoords.X = (s32)(currentVertex->TCoords.X * textureSize.Width);
-		tp->TCoords.X <<= 8;
-		tp->TCoords.Y = (s32)(currentVertex->TCoords.Y * textureSize.Height);
-		tp->TCoords.Y <<= 8;
-
-		++currentVertex;
-		++tp;
-	}
-
-	// draw all transformed points from the index list
-	CurrentTriangleRenderer->drawIndexedTriangleList(&TransformedPoints[0],
-		clippedVertices.size(), clippedIndices.pointer(), clippedIndices.size()/3);
-}
-
-
-
-//! Draws a 3d line.
-void CSoftwareDriver::draw3DLine(const core::vector3df& start,
-				const core::vector3df& end, SColor color)
-{
-	core::vector3df vect = start.crossProduct(end);
-	vect.normalize();
-	vect *= Material.Thickness*0.3f;
-
-	S3DVertex vtx[4];
-
-	vtx[0].Color = color;
-	vtx[1].Color = color;
-	vtx[2].Color = color;
-	vtx[3].Color = color;
-
-	vtx[0].Pos = start;
-	vtx[1].Pos = end;
-
-	vtx[2].Pos = start + vect;
-	vtx[3].Pos = end + vect;
-
-	u16 idx[12] = {0,1,2, 0,2,1, 0,1,3, 0,3,1};
-
-	drawIndexedTriangleList(vtx, 4, idx, 4);
-}
-
-
-
-//! clips a triangle against the viewing frustum
-void CSoftwareDriver::clipTriangle(f32* transformedPos)
-{
-}
-
-
-
-//! creates the clipping planes from the matrix
-void CSoftwareDriver::createPlanes(const core::matrix4& mat)
-{
-	Frustum = scene::SViewFrustum(mat);
-}
-
-
-
-//! Only used by the internal engine. Used to notify the driver that
-//! the window was resized.
-void CSoftwareDriver::OnResize(const core::dimension2d<s32>& size)
-{
-	// make sure width and height are multiples of 2
-	core::dimension2d<s32> realSize(size);
-
-	if (realSize.Width % 2)
-		realSize.Width += 1;
-
-	if (realSize.Height % 2)
-		realSize.Height += 1;
-
-	if (ScreenSize != realSize)
-	{
-		if (ViewPort.getWidth() == ScreenSize.Width &&
-			ViewPort.getHeight() == ScreenSize.Height)
-		{
-			ViewPort = core::rect<s32>(core::position2d<s32>(0,0), realSize);
-		}
-
-		ScreenSize = realSize;
-
-		bool resetRT = (RenderTargetSurface == BackBuffer);
-
-		BackBuffer->drop();
-		BackBuffer = new CImage(ECF_A1R5G5B5, realSize);
-
-		if (resetRT)
-			setRenderTarget(BackBuffer);
-	}
-}
-
-//! returns the current render target size
-const core::dimension2d<s32>& CSoftwareDriver::getCurrentRenderTargetSize() const
-{
-	return RenderTargetSize;
-}
-
-
-//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
-void CSoftwareDriver::draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
-					const core::rect<s32>& sourceRect,
-					const core::rect<s32>* clipRect, SColor color,
-					bool useAlphaChannelOfTexture)
-{
-	if (texture)
-	{
-		if (texture->getDriverType() != EDT_SOFTWARE)
-		{
-			os::Printer::log("Fatal Error: Tried to copy from a surface not owned by this driver.", ELL_ERROR);
-			return;
-		}
-
-		if (useAlphaChannelOfTexture)
-			((CSoftwareTexture*)texture)->getImage()->copyToWithAlpha(
-				((CImage*)RenderTargetSurface), destPos, sourceRect, color, clipRect);
-		else
-			((CSoftwareTexture*)texture)->getImage()->copyTo(
-				((CImage*)RenderTargetSurface), destPos, sourceRect, clipRect);
-	}
-}
-
-
-
-//! Draws a 2d line.
-void CSoftwareDriver::draw2DLine(const core::position2d<s32>& start,
-								const core::position2d<s32>& end,
-								SColor color)
-{
-	((CImage*)RenderTargetSurface)->drawLine(start, end, color );
-}
-
-
-
-//! draw a 2d rectangle
-void CSoftwareDriver::draw2DRectangle(SColor color, const core::rect<s32>& pos,
-					const core::rect<s32>* clip)
-{
-	if (clip)
-	{
-		core::rect<s32> p(pos);
-
-		p.clipAgainst(*clip);
-
-		if(!p.isValid())
-			return;
-
-		((CImage*)RenderTargetSurface)->drawRectangle(p, color);
-	}
-	else
-	{
-		if(!pos.isValid())
-			return;
-
-		((CImage*)RenderTargetSurface)->drawRectangle(pos, color);
-	}
-}
-
-
-//!Draws an 2d rectangle with a gradient.
-void CSoftwareDriver::draw2DRectangle(const core::rect<s32>& pos,
-	SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
-	const core::rect<s32>* clip)
-{
-	// TODO: implement
-	draw2DRectangle(colorLeftUp, pos, clip);
-}
-
-
-//! \return Returns the name of the video driver. Example: In case of the Direct3D8
-//! driver, it would return "Direct3D8.1".
-const wchar_t* CSoftwareDriver::getName() const
-{
-	return L"Irrlicht Software Device 1.0";
-}
-
-
-//! Returns type of video driver
-E_DRIVER_TYPE CSoftwareDriver::getDriverType() const
-{
-	return EDT_SOFTWARE;
-}
-
-
-//! Returns the transformation set by setTransform
-const core::matrix4& CSoftwareDriver::getTransform(E_TRANSFORMATION_STATE state) const
-{
-	return TransformationMatrix[state];
-}
-
-//! Creates a render target texture.
-ITexture* CSoftwareDriver::createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name)
-{
-	CImage* img = new CImage(video::ECF_A1R5G5B5, size);
-	ITexture* tex = new CSoftwareTexture(img, name, true);
-	img->drop();
-	return tex;
-}
-
-
-//! Clears the ZBuffer.
-void CSoftwareDriver::clearZBuffer()
-{
-	if (ZBuffer)
-		ZBuffer->clear();
-}
-
-
-//! Returns an image created from the last rendered frame.
-IImage* CSoftwareDriver::createScreenShot()
-{
-	return new CImage(BackBuffer->getColorFormat(), BackBuffer);
-}
-
-
-//! Returns the maximum amount of primitives (mostly vertices) which
-//! the device is able to render with one drawIndexedTriangleList
-//! call.
-u32 CSoftwareDriver::getMaximalPrimitiveCount() const
-{
-	return 0x00800000;
-}
-
-} // end namespace video
-} // end namespace irr
-
-#endif // _IRR_COMPILE_WITH_SOFTWARE_
-
-namespace irr
-{
-namespace video
-{
-
-
-//! creates a video driver
-IVideoDriver* createSoftwareDriver(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter)
-{
-	#ifdef _IRR_COMPILE_WITH_SOFTWARE_
-	return new CSoftwareDriver(windowSize, fullscreen, io, presenter);
-	#else
-	return 0;
-	#endif
-}
-
-
-} // end namespace video
-} // end namespace irr
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CSoftwareDriver.h"
+
+#include "IrrCompileConfig.h"
+#ifdef _IRR_COMPILE_WITH_SOFTWARE_
+
+#include "CSoftwareTexture.h"
+#include "os.h"
+#include "S3DVertex.h"
+
+namespace irr
+{
+namespace video
+{
+
+
+//! constructor
+CSoftwareDriver::CSoftwareDriver(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter)
+: CNullDriver(io, windowSize), BackBuffer(0), Presenter(presenter), WindowId(0),
+	SceneSourceRect(0), RenderTargetTexture(0), RenderTargetSurface(0),
+	CurrentTriangleRenderer(0), ZBuffer(0), Texture(0)
+{
+	#ifdef _DEBUG
+	setDebugName("CSoftwareDriver");
+	#endif
+
+	// create backbuffer
+
+	BackBuffer = new CImage(ECF_A1R5G5B5, windowSize);
+	if (BackBuffer)
+	{
+		BackBuffer->fill(SColor(0));
+
+		// create z buffer
+		ZBuffer = video::createZBuffer(BackBuffer->getDimension());
+	}
+
+	// create triangle renderers
+
+	TriangleRenderers[ETR_FLAT] = createTriangleRendererFlat(ZBuffer);
+	TriangleRenderers[ETR_FLAT_WIRE] = createTriangleRendererFlatWire(ZBuffer);
+	TriangleRenderers[ETR_GOURAUD] = createTriangleRendererGouraud(ZBuffer);
+	TriangleRenderers[ETR_GOURAUD_WIRE] = createTriangleRendererGouraudWire(ZBuffer);
+	TriangleRenderers[ETR_TEXTURE_FLAT] = createTriangleRendererTextureFlat(ZBuffer);
+	TriangleRenderers[ETR_TEXTURE_FLAT_WIRE] = createTriangleRendererTextureFlatWire(ZBuffer);
+	TriangleRenderers[ETR_TEXTURE_GOURAUD] = createTriangleRendererTextureGouraud(ZBuffer);
+	TriangleRenderers[ETR_TEXTURE_GOURAUD_WIRE] = createTriangleRendererTextureGouraudWire(ZBuffer);
+	TriangleRenderers[ETR_TEXTURE_GOURAUD_NOZ] = createTriangleRendererTextureGouraudNoZ();
+	TriangleRenderers[ETR_TEXTURE_GOURAUD_ADD] = createTriangleRendererTextureGouraudAdd(ZBuffer);
+
+	// select render target
+
+	setRenderTarget(BackBuffer);
+
+	// select the right renderer
+
+	selectRightTriangleRenderer();
+}
+
+
+
+//! destructor
+CSoftwareDriver::~CSoftwareDriver()
+{
+	// delete Backbuffer
+	if (BackBuffer)
+		BackBuffer->drop();
+
+	// delete triangle renderers
+
+	for (s32 i=0; i<ETR_COUNT; ++i)
+		if (TriangleRenderers[i])
+			TriangleRenderers[i]->drop();
+
+	// delete zbuffer
+
+	if (ZBuffer)
+		ZBuffer->drop();
+
+	// delete current texture
+
+	if (Texture)
+		Texture->drop();
+
+	if (RenderTargetTexture)
+		RenderTargetTexture->drop();
+
+	if (RenderTargetSurface)
+		RenderTargetSurface->drop();
+}
+
+
+
+//! switches to a triangle renderer
+void CSoftwareDriver::switchToTriangleRenderer(ETriangleRenderer renderer)
+{
+	video::IImage* s = 0;
+	if (Texture)
+		s = ((CSoftwareTexture*)Texture)->getTexture();
+
+	CurrentTriangleRenderer = TriangleRenderers[renderer];
+	CurrentTriangleRenderer->setBackfaceCulling(Material.BackfaceCulling == true);
+	CurrentTriangleRenderer->setTexture(s);
+	CurrentTriangleRenderer->setRenderTarget(RenderTargetSurface, ViewPort);
+}
+
+
+//! void selects the right triangle renderer based on the render states.
+void CSoftwareDriver::selectRightTriangleRenderer()
+{
+
+	ETriangleRenderer renderer = ETR_FLAT;
+
+	if (Texture)
+	{
+		if (!Material.GouraudShading)
+			renderer = (!Material.Wireframe) ? ETR_TEXTURE_FLAT : ETR_TEXTURE_FLAT_WIRE;
+		else
+		{
+			if (Material.Wireframe)
+				renderer = ETR_TEXTURE_GOURAUD_WIRE;
+			else
+			{
+				if (Material.MaterialType == EMT_TRANSPARENT_ADD_COLOR ||
+						Material.MaterialType == EMT_TRANSPARENT_ALPHA_CHANNEL ||
+						Material.MaterialType == EMT_TRANSPARENT_VERTEX_ALPHA)
+				{
+					// simply draw all transparent stuff with the same renderer. at
+					// least it is transparent then.
+					renderer = ETR_TEXTURE_GOURAUD_ADD;
+				}
+				else
+				if (!Material.ZBuffer && !Material.ZWriteEnable)
+					renderer = ETR_TEXTURE_GOURAUD_NOZ;
+				else
+				{
+					renderer = ETR_TEXTURE_GOURAUD;
+				}
+			}
+		}
+	}
+	else
+	{
+		if (!Material.GouraudShading)
+			renderer = (!Material.Wireframe) ? ETR_FLAT : ETR_FLAT_WIRE;
+		else
+			renderer = (!Material.Wireframe) ? ETR_GOURAUD : ETR_GOURAUD_WIRE;
+	}
+
+	switchToTriangleRenderer(renderer);
+}
+
+
+//! queries the features of the driver, returns true if feature is available
+bool CSoftwareDriver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
+{
+	switch (feature)
+	{
+	case EVDF_RENDER_TO_TARGET:
+	case EVDF_TEXTURE_NSQUARE:
+		return FeatureEnabled[feature];
+	default:
+		return false;
+	};
+}
+
+
+
+//! sets transformation
+void CSoftwareDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat)
+{
+	TransformationMatrix[state] = mat;
+}
+
+
+
+
+//! sets the current Texture
+bool CSoftwareDriver::setTexture(video::ITexture* texture)
+{
+	if (texture && texture->getDriverType() != EDT_SOFTWARE)
+	{
+		os::Printer::log("Fatal Error: Tried to set a texture not owned by this driver.", ELL_ERROR);
+		return false;
+	}
+
+	if (Texture)
+		Texture->drop();
+
+	Texture = texture;
+
+	if (Texture)
+		Texture->grab();
+
+	selectRightTriangleRenderer();
+	return true;
+}
+
+
+
+//! sets a material
+void CSoftwareDriver::setMaterial(const SMaterial& material)
+{
+	Material = material;
+
+	for (u32 i = 0; i < 1; ++i)
+	{
+		setTexture(Material.getTexture(i));
+		setTransform ((E_TRANSFORMATION_STATE) ( ETS_TEXTURE_0 + i ),
+				material.getTextureMatrix(i));
+	}
+}
+
+
+//! clears the zbuffer
+bool CSoftwareDriver::beginScene(bool backBuffer, bool zBuffer, SColor color,
+		void* windowId, core::rect<s32>* sourceRect)
+{
+	CNullDriver::beginScene(backBuffer, zBuffer, color, windowId, sourceRect);
+	WindowId=windowId;
+	SceneSourceRect = sourceRect;
+
+	if (backBuffer && BackBuffer)
+		BackBuffer->fill(color);
+
+	if (ZBuffer && zBuffer)
+		ZBuffer->clear();
+
+	return true;
+}
+
+
+//! presents the rendered scene on the screen, returns false if failed
+bool CSoftwareDriver::endScene()
+{
+	CNullDriver::endScene();
+
+	return Presenter->present(BackBuffer, WindowId, SceneSourceRect);
+}
+
+
+//! sets a render target
+bool CSoftwareDriver::setRenderTarget(video::ITexture* texture, bool clearBackBuffer,
+								bool clearZBuffer, SColor color)
+{
+	if (texture && texture->getDriverType() != EDT_SOFTWARE)
+	{
+		os::Printer::log("Fatal Error: Tried to set a texture not owned by this driver.", ELL_ERROR);
+		return false;
+	}
+
+	if (RenderTargetTexture)
+		RenderTargetTexture->drop();
+
+	RenderTargetTexture = texture;
+
+	if (RenderTargetTexture)
+	{
+		RenderTargetTexture->grab();
+		setRenderTarget(((CSoftwareTexture*)RenderTargetTexture)->getTexture());
+	}
+	else
+	{
+		setRenderTarget(BackBuffer);
+	}
+
+	if (RenderTargetSurface && (clearBackBuffer || clearZBuffer))
+	{
+		if (clearZBuffer)
+			ZBuffer->clear();
+
+		if (clearBackBuffer)
+			((video::CImage*)RenderTargetSurface)->fill( color );
+	}
+
+	return true;
+}
+
+
+//! sets a render target
+void CSoftwareDriver::setRenderTarget(video::CImage* image)
+{
+	if (RenderTargetSurface)
+		RenderTargetSurface->drop();
+
+	RenderTargetSurface = image;
+	RenderTargetSize.Width = 0;
+	RenderTargetSize.Height = 0;
+	Render2DTranslation.X = 0;
+	Render2DTranslation.Y = 0;
+
+	if (RenderTargetSurface)
+	{
+		RenderTargetSurface->grab();
+		RenderTargetSize = RenderTargetSurface->getDimension();
+	}
+
+	setViewPort(core::rect<s32>(0,0,RenderTargetSize.Width,RenderTargetSize.Height));
+
+	if (ZBuffer)
+		ZBuffer->setSize(RenderTargetSize);
+}
+
+
+
+//! sets a viewport
+void CSoftwareDriver::setViewPort(const core::rect<s32>& area)
+{
+	ViewPort = area;
+
+	//TODO: the clipping is not correct, because the projection is affected.
+	// to correct this, ViewPortSize and Render2DTranslation will have to be corrected.
+	core::rect<s32> rendert(0,0,RenderTargetSize.Width,RenderTargetSize.Height);
+	ViewPort.clipAgainst(rendert);
+
+	ViewPortSize = ViewPort.getSize();
+	Render2DTranslation.X = (ViewPortSize.Width / 2) + ViewPort.UpperLeftCorner.X;
+	Render2DTranslation.Y = ViewPort.UpperLeftCorner.Y + ViewPortSize.Height - (ViewPortSize.Height / 2);// + ViewPort.UpperLeftCorner.Y;
+
+	if (CurrentTriangleRenderer)
+		CurrentTriangleRenderer->setRenderTarget(RenderTargetSurface, ViewPort);
+}
+
+void CSoftwareDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
+				const void* indexList, u32 primitiveCount,
+				E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
+
+{
+	switch (iType)
+	{
+		case (EIT_16BIT):
+		{
+			drawVertexPrimitiveList16(vertices, vertexCount, (const u16*)indexList, primitiveCount, vType, pType);
+			break;
+		}
+		case (EIT_32BIT):
+		{
+			os::Printer::log("Software driver can not render 32bit buffers", ELL_ERROR);
+			break;
+		}
+	}
+
+
+}
+
+//! draws a vertex primitive list
+void CSoftwareDriver::drawVertexPrimitiveList16(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType)
+{
+	const u16* indexPointer=0;
+	core::array<u16> newBuffer;
+	switch (pType)
+	{
+		case scene::EPT_LINE_STRIP:
+			{
+				switch (vType)
+				{
+					case EVT_STANDARD:
+						{
+							for (u32 i=0; i < primitiveCount-1; ++i)
+								draw3DLine(((S3DVertex*)vertices)[indexList[i]].Pos,
+									((S3DVertex*)vertices)[indexList[i+1]].Pos,
+									((S3DVertex*)vertices)[indexList[i]].Color);
+						}
+						break;
+					case EVT_2TCOORDS:
+						{
+							for (u32 i=0; i < primitiveCount-1; ++i)
+								draw3DLine(((S3DVertex2TCoords*)vertices)[indexList[i]].Pos,
+									((S3DVertex2TCoords*)vertices)[indexList[i+1]].Pos,
+									((S3DVertex2TCoords*)vertices)[indexList[i]].Color);
+						}
+						break;
+					case EVT_TANGENTS:
+						{
+							for (u32 i=0; i < primitiveCount-1; ++i)
+								draw3DLine(((S3DVertexTangents*)vertices)[indexList[i]].Pos,
+									((S3DVertexTangents*)vertices)[indexList[i+1]].Pos,
+									((S3DVertexTangents*)vertices)[indexList[i]].Color);
+						}
+						break;
+				}
+			}
+			return;
+		case scene::EPT_LINE_LOOP:
+			drawVertexPrimitiveList16(vertices, vertexCount, indexList, primitiveCount-1, vType, scene::EPT_LINE_STRIP);
+			switch (vType)
+			{
+				case EVT_STANDARD:
+					draw3DLine(((S3DVertex*)vertices)[indexList[primitiveCount-1]].Pos,
+						((S3DVertex*)vertices)[indexList[0]].Pos,
+						((S3DVertex*)vertices)[indexList[primitiveCount-1]].Color);
+					break;
+				case EVT_2TCOORDS:
+					draw3DLine(((S3DVertex2TCoords*)vertices)[indexList[primitiveCount-1]].Pos,
+						((S3DVertex2TCoords*)vertices)[indexList[0]].Pos,
+						((S3DVertex2TCoords*)vertices)[indexList[primitiveCount-1]].Color);
+					break;
+				case EVT_TANGENTS:
+					draw3DLine(((S3DVertexTangents*)vertices)[indexList[primitiveCount-1]].Pos,
+						((S3DVertexTangents*)vertices)[indexList[0]].Pos,
+						((S3DVertexTangents*)vertices)[indexList[primitiveCount-1]].Color);
+					break;
+			}
+			return;
+		case scene::EPT_LINES:
+			{
+				switch (vType)
+				{
+					case EVT_STANDARD:
+						{
+							for (u32 i=0; i < 2*primitiveCount; i+=2)
+								draw3DLine(((S3DVertex*)vertices)[indexList[i]].Pos,
+									((S3DVertex*)vertices)[indexList[i+1]].Pos,
+									((S3DVertex*)vertices)[indexList[i]].Color);
+						}
+						break;
+					case EVT_2TCOORDS:
+						{
+							for (u32 i=0; i < 2*primitiveCount; i+=2)
+								draw3DLine(((S3DVertex2TCoords*)vertices)[indexList[i]].Pos,
+									((S3DVertex2TCoords*)vertices)[indexList[i+1]].Pos,
+									((S3DVertex2TCoords*)vertices)[indexList[i]].Color);
+						}
+						break;
+					case EVT_TANGENTS:
+						{
+							for (u32 i=0; i < 2*primitiveCount; i+=2)
+								draw3DLine(((S3DVertexTangents*)vertices)[indexList[i]].Pos,
+									((S3DVertexTangents*)vertices)[indexList[i+1]].Pos,
+									((S3DVertexTangents*)vertices)[indexList[i]].Color);
+						}
+						break;
+				}
+			}
+			return;
+		case scene::EPT_TRIANGLE_FAN:
+			{
+				// TODO: don't convert fan to list
+				newBuffer.reallocate(primitiveCount*3);
+				for( u32 t=0; t<primitiveCount; ++t )
+				{
+					newBuffer.push_back(indexList[0]);
+					newBuffer.push_back(indexList[t+1]);
+					newBuffer.push_back(indexList[t+2]);
+				}
+
+				indexPointer = newBuffer.pointer();
+			}
+			break;
+		case scene::EPT_TRIANGLES:
+			indexPointer=indexList;
+			break;
+		default:
+			return;
+	}
+	switch (vType)
+	{
+		case EVT_STANDARD:
+			drawClippedIndexedTriangleListT((S3DVertex*)vertices, vertexCount, indexPointer, primitiveCount);
+			break;
+		case EVT_2TCOORDS:
+			drawClippedIndexedTriangleListT((S3DVertex2TCoords*)vertices, vertexCount, indexPointer, primitiveCount);
+			break;
+		case EVT_TANGENTS:
+			drawClippedIndexedTriangleListT((S3DVertexTangents*)vertices, vertexCount, indexPointer, primitiveCount);
+			break;
+	}
+}
+
+
+
+template<class VERTEXTYPE>
+void CSoftwareDriver::drawClippedIndexedTriangleListT(const VERTEXTYPE* vertices,
+	s32 vertexCount, const u16* indexList, s32 triangleCount)
+{
+	if (!RenderTargetSurface || !ZBuffer || !triangleCount)
+		return;
+
+	if (!checkPrimitiveCount(triangleCount))
+		return;
+
+	// arrays for storing clipped vertices
+	core::array<VERTEXTYPE> clippedVertices;
+	core::array<u16> clippedIndices;
+
+	// calculate inverse world transformation
+	core::matrix4 worldinv(TransformationMatrix[ETS_WORLD]);
+	worldinv.makeInverse();
+
+	// calculate view frustum planes
+	scene::SViewFrustum frustum(TransformationMatrix[ETS_PROJECTION] * TransformationMatrix[ETS_VIEW]);
+
+	// copy and transform clipping planes ignoring far plane
+	core::plane3df planes[5]; // ordered by near, left, right, bottom, top
+	for (int p=0; p<5; ++p)
+		worldinv.transformPlane(frustum.planes[p+1], planes[p]);
+
+	core::EIntersectionRelation3D inout[3]; // is point in front or back of plane?
+
+	// temporary buffer for vertices to be clipped by all planes
+	core::array<VERTEXTYPE> tClpBuf;
+	int t;
+
+	int i;
+	for (i=0; i<triangleCount; ++i) // for all input triangles
+	{
+		// add next triangle to tempClipBuffer
+		for (t=0; t<3; ++t)
+			tClpBuf.push_back(vertices[indexList[(i*3)+t]]);
+
+		for (int p=0; p<5; ++p) // for all clip planes
+		for (int v=0; v<(int)tClpBuf.size(); v+=3) // for all vertices in temp clip buffer
+		{
+			int inside = 0;
+			int outside = 0;
+
+			// test intersection relation of the current vertices
+			for (t=0; t<3; ++t)
+			{
+				inout[t] = planes[p].classifyPointRelation(tClpBuf[v+t].Pos);
+				if (inout[t] != core::ISREL3D_FRONT)
+					++inside;
+				else
+				if (inout[t] == core::ISREL3D_FRONT)
+					++outside;
+			}
+
+			if (!outside)
+			{
+				// add all vertices to new buffer, this triangle needs no clipping.
+				// so simply don't change this part of the temporary triangle buffer
+				continue;
+			}
+
+			if (!inside)
+			{
+				// all vertices are outside, don't add this triangle, so erase this
+				// triangle from the tClpBuf
+				tClpBuf.erase(v,3);
+				v -= 3;
+				continue;
+			}
+
+			// this vertex has to be clipped by this clipping plane.
+
+			// The following lines represent my try to implement some real clipping.
+			// There is a bug somewhere, and after some time I've given up.
+			// So now it is commented out, resulting that triangles which would need clipping
+			// are simply taken out (in the next two lines).
+#ifndef __SOFTWARE_CLIPPING_PROBLEM__
+			tClpBuf.erase(v,3);
+			v -= 3;
+#endif
+
+			/*
+			// my idea is the following:
+			// current vertex to next vertex relation:
+			// out - out : add nothing
+			// out -  in : add middle point
+			// in -  out : add first and middle point
+			// in -   in : add both
+
+
+			// now based on the number of intersections, create new vertices
+			// into tClpBuf (at the front for not letting them be clipped again)
+
+			int added = 0;
+			int prev = v+2;
+			for (int index=v; index<v+3; ++index)
+			{
+				if (inout[prev] == core::ISREL3D_BACK)
+				{
+					if (inout[index] != core::ISREL3D_BACK)
+					{
+						VERTEXTYPE& vt1 = tClpBuf[prev];
+						VERTEXTYPE& vt2 = tClpBuf[index];
+
+						f32 fact = planes[p].getKnownIntersectionWithLine(vt1.Pos, vt2.Pos);
+						VERTEXTYPE nvt;
+						nvt.Pos = vt1.Pos.getInterpolated(vt2.Pos, fact);
+						nvt.Color = vt1.Color.getInterpolated(vt2.Color, fact);
+						nvt.TCoords = vt1.TCoords.getInterpolated(vt2.TCoords, fact);
+
+						tClpBuf.push_front(nvt); ++index; ++prev; ++v;
+						++added;
+					}
+				}
+				else
+				{
+					if (inout[index] != core::ISREL3D_BACK)
+					{
+						VERTEXTYPE vt1 = tClpBuf[index];
+						VERTEXTYPE vt2 = tClpBuf[prev];
+						tClpBuf.push_front(vt1); ++index; ++prev; ++v;
+						tClpBuf.push_front(vt2); ++index; ++prev; ++v;
+						added+= 2;
+					}
+					else
+					{
+						// same as above, but other way round.
+						VERTEXTYPE vt1 = tClpBuf[index];
+						VERTEXTYPE vt2 = tClpBuf[prev];
+
+						f32 fact = planes[p].getKnownIntersectionWithLine(vt1.Pos, vt2.Pos);
+						VERTEXTYPE nvt;
+						nvt.Pos = vt1.Pos.getInterpolated(vt2.Pos, fact);
+						nvt.Color = vt1.Color.getInterpolated(vt2.Color, fact);
+						nvt.TCoords = vt1.TCoords.getInterpolated(vt2.TCoords, fact);
+
+						tClpBuf.push_front(vt2); ++index; ++prev; ++v;
+						tClpBuf.push_front(nvt); ++index; ++prev; ++v;
+						added += 2;
+					}
+				}
+
+				prev = index;
+			}
+
+			// erase original vertices
+			tClpBuf.erase(v,3);
+			v -= 3;
+			*/
+
+
+		} // end for all clip planes
+
+		// now add all remaining triangles in tempClipBuffer to clippedIndices
+		// and clippedVertices array.
+		if (clippedIndices.size() + tClpBuf.size() < 65535)
+		for (t=0; t<(int)tClpBuf.size(); ++t)
+		{
+			clippedIndices.push_back(clippedVertices.size());
+			clippedVertices.push_back(tClpBuf[t]);
+		}
+		tClpBuf.clear();
+
+	} // end for all input triangles
+
+
+	// draw newly created triangles.
+
+	// -----------------------------------------------------------
+	// here all triangles are being drawn. I put this in a separate
+	// method, but the visual studio 6 compiler has great problems
+	// with templates and didn't accept two template methods in this
+	// class.
+
+	// draw triangles
+
+	CNullDriver::drawVertexPrimitiveList(clippedVertices.pointer(), clippedVertices.size(),
+		clippedIndices.pointer(), clippedIndices.size()/3, EVT_STANDARD, scene::EPT_TRIANGLES, EIT_16BIT);
+
+	if (TransformedPoints.size() < clippedVertices.size())
+		TransformedPoints.set_used(clippedVertices.size());
+
+	if (TransformedPoints.empty())
+		return;
+
+	const VERTEXTYPE* currentVertex = clippedVertices.pointer();
+	S2DVertex* tp = &TransformedPoints[0];
+
+	core::dimension2d<s32> textureSize(0,0);
+	f32 zDiv;
+
+	if (Texture)
+		textureSize = ((CSoftwareTexture*)Texture)->getTexture()->getDimension();
+
+	f32 transformedPos[4]; // transform all points in the list
+
+	core::matrix4 matrix(TransformationMatrix[ETS_PROJECTION]);
+	matrix *= TransformationMatrix[ETS_VIEW];
+	matrix *= TransformationMatrix[ETS_WORLD];
+
+	s32 ViewTransformWidth = (ViewPortSize.Width>>1);
+	s32 ViewTransformHeight = (ViewPortSize.Height>>1);
+
+	for (i=0; i<(int)clippedVertices.size(); ++i)
+	{
+		transformedPos[0] = currentVertex->Pos.X;
+		transformedPos[1] = currentVertex->Pos.Y;
+		transformedPos[2] = currentVertex->Pos.Z;
+		transformedPos[3] = 1.0f;
+
+		matrix.multiplyWith1x4Matrix(transformedPos);
+		zDiv = transformedPos[3] == 0.0f ? 1.0f : (1.0f / transformedPos[3]);
+
+		tp->Pos.X = (s32)(ViewTransformWidth * (transformedPos[0] * zDiv) + (Render2DTranslation.X));
+		tp->Pos.Y = (Render2DTranslation.Y - (s32)(ViewTransformHeight * (transformedPos[1] * zDiv)));
+		tp->Color = currentVertex->Color.toA1R5G5B5();
+		tp->ZValue = (TZBufferType)(32767.0f * zDiv);
+
+		tp->TCoords.X = (s32)(currentVertex->TCoords.X * textureSize.Width);
+		tp->TCoords.X <<= 8;
+		tp->TCoords.Y = (s32)(currentVertex->TCoords.Y * textureSize.Height);
+		tp->TCoords.Y <<= 8;
+
+		++currentVertex;
+		++tp;
+	}
+
+	// draw all transformed points from the index list
+	CurrentTriangleRenderer->drawIndexedTriangleList(&TransformedPoints[0],
+		clippedVertices.size(), clippedIndices.pointer(), clippedIndices.size()/3);
+}
+
+
+//! Draws a 3d line.
+void CSoftwareDriver::draw3DLine(const core::vector3df& start,
+				const core::vector3df& end, SColor color)
+{
+	core::vector3df vect = start.crossProduct(end);
+	vect.normalize();
+	vect *= Material.Thickness*0.3f;
+
+	S3DVertex vtx[4];
+
+	vtx[0].Color = color;
+	vtx[1].Color = color;
+	vtx[2].Color = color;
+	vtx[3].Color = color;
+
+	vtx[0].Pos = start;
+	vtx[1].Pos = end;
+
+	vtx[2].Pos = start + vect;
+	vtx[3].Pos = end + vect;
+
+	u16 idx[12] = {0,1,2, 0,2,1, 0,1,3, 0,3,1};
+
+	drawIndexedTriangleList(vtx, 4, idx, 4);
+}
+
+
+//! clips a triangle against the viewing frustum
+void CSoftwareDriver::clipTriangle(f32* transformedPos)
+{
+}
+
+
+//! Only used by the internal engine. Used to notify the driver that
+//! the window was resized.
+void CSoftwareDriver::OnResize(const core::dimension2d<s32>& size)
+{
+	// make sure width and height are multiples of 2
+	core::dimension2d<s32> realSize(size);
+
+	if (realSize.Width % 2)
+		realSize.Width += 1;
+
+	if (realSize.Height % 2)
+		realSize.Height += 1;
+
+	if (ScreenSize != realSize)
+	{
+		if (ViewPort.getWidth() == ScreenSize.Width &&
+			ViewPort.getHeight() == ScreenSize.Height)
+		{
+			ViewPort = core::rect<s32>(core::position2d<s32>(0,0), realSize);
+		}
+
+		ScreenSize = realSize;
+
+		bool resetRT = (RenderTargetSurface == BackBuffer);
+
+		if (BackBuffer)
+			BackBuffer->drop();
+		BackBuffer = new CImage(ECF_A1R5G5B5, realSize);
+
+		if (resetRT)
+			setRenderTarget(BackBuffer);
+	}
+}
+
+//! returns the current render target size
+const core::dimension2d<s32>& CSoftwareDriver::getCurrentRenderTargetSize() const
+{
+	return RenderTargetSize;
+}
+
+
+//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
+void CSoftwareDriver::draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
+					const core::rect<s32>& sourceRect,
+					const core::rect<s32>* clipRect, SColor color,
+					bool useAlphaChannelOfTexture)
+{
+	if (texture)
+	{
+		if (texture->getDriverType() != EDT_SOFTWARE)
+		{
+			os::Printer::log("Fatal Error: Tried to copy from a surface not owned by this driver.", ELL_ERROR);
+			return;
+		}
+
+		if (useAlphaChannelOfTexture)
+			((CSoftwareTexture*)texture)->getImage()->copyToWithAlpha(
+				((CImage*)RenderTargetSurface), destPos, sourceRect, color, clipRect);
+		else
+			((CSoftwareTexture*)texture)->getImage()->copyTo(
+				((CImage*)RenderTargetSurface), destPos, sourceRect, clipRect);
+	}
+}
+
+
+
+//! Draws a 2d line.
+void CSoftwareDriver::draw2DLine(const core::position2d<s32>& start,
+								const core::position2d<s32>& end,
+								SColor color)
+{
+	((CImage*)RenderTargetSurface)->drawLine(start, end, color );
+}
+
+//! Draws a pixel
+void CSoftwareDriver::drawPixel(u32 x, u32 y, const SColor & color)
+{
+	((CImage*)BackBuffer)->setPixel(x, y, color);
+}
+
+
+//! draw a 2d rectangle
+void CSoftwareDriver::draw2DRectangle(SColor color, const core::rect<s32>& pos,
+					const core::rect<s32>* clip)
+{
+	if (clip)
+	{
+		core::rect<s32> p(pos);
+
+		p.clipAgainst(*clip);
+
+		if(!p.isValid())
+			return;
+
+		((CImage*)RenderTargetSurface)->drawRectangle(p, color);
+	}
+	else
+	{
+		if(!pos.isValid())
+			return;
+
+		((CImage*)RenderTargetSurface)->drawRectangle(pos, color);
+	}
+}
+
+
+//!Draws an 2d rectangle with a gradient.
+void CSoftwareDriver::draw2DRectangle(const core::rect<s32>& pos,
+	SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
+	const core::rect<s32>* clip)
+{
+	// TODO: implement
+	draw2DRectangle(colorLeftUp, pos, clip);
+}
+
+
+//! \return Returns the name of the video driver. Example: In case of the Direct3D8
+//! driver, it would return "Direct3D8.1".
+const wchar_t* CSoftwareDriver::getName() const
+{
+	return L"Irrlicht Software Device 1.0";
+}
+
+
+//! Returns type of video driver
+E_DRIVER_TYPE CSoftwareDriver::getDriverType() const
+{
+	return EDT_SOFTWARE;
+}
+
+
+//! returns color format
+ECOLOR_FORMAT CSoftwareDriver::getColorFormat() const
+{
+	if (BackBuffer)
+		return BackBuffer->getColorFormat();
+	else
+		return CNullDriver::getColorFormat();
+}
+
+
+//! Returns the transformation set by setTransform
+const core::matrix4& CSoftwareDriver::getTransform(E_TRANSFORMATION_STATE state) const
+{
+	return TransformationMatrix[state];
+}
+
+
+//! Creates a render target texture.
+ITexture* CSoftwareDriver::addRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name)
+{
+	CImage* img = new CImage(video::ECF_A1R5G5B5, size);
+	if (!name)
+		name="rt";
+	ITexture* tex = new CSoftwareTexture(img, name, true);
+	img->drop();
+	addTexture(tex);
+	tex->drop();
+	return tex;
+}
+
+
+//! Clears the ZBuffer.
+void CSoftwareDriver::clearZBuffer()
+{
+	if (ZBuffer)
+		ZBuffer->clear();
+}
+
+
+//! Returns an image created from the last rendered frame.
+IImage* CSoftwareDriver::createScreenShot()
+{
+	if (BackBuffer)
+		return new CImage(BackBuffer->getColorFormat(), BackBuffer);
+	else
+		return 0;
+}
+
+
+//! Returns the maximum amount of primitives (mostly vertices) which
+//! the device is able to render with one drawIndexedTriangleList
+//! call.
+u32 CSoftwareDriver::getMaximalPrimitiveCount() const
+{
+	return 0x00800000;
+}
+
+} // end namespace video
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_SOFTWARE_
+
+namespace irr
+{
+namespace video
+{
+
+
+//! creates a video driver
+IVideoDriver* createSoftwareDriver(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter)
+{
+	#ifdef _IRR_COMPILE_WITH_SOFTWARE_
+	return new CSoftwareDriver(windowSize, fullscreen, io, presenter);
+	#else
+	return 0;
+	#endif
+}
+
+
+} // end namespace video
+} // end namespace irr
diff --git a/src/dep/src/irrlicht/CSoftwareDriver.h b/src/dep/src/irrlicht/CSoftwareDriver.h
index f925ce8..0eac0ac 100644
--- a/src/dep/src/irrlicht/CSoftwareDriver.h
+++ b/src/dep/src/irrlicht/CSoftwareDriver.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -24,9 +24,6 @@ namespace video
 		//! destructor
 		virtual ~CSoftwareDriver();
 
-		//! presents the rendered scene on the screen, returns false if failed
-		virtual bool endScene( s32 windowId = 0, core::rect<s32>* sourceRect=0 );
-
 		//! queries the features of the driver, returns true if feature is available
 		virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const;
 
@@ -43,7 +40,13 @@ namespace video
 		virtual void setViewPort(const core::rect<s32>& area);
 
 		//! clears the zbuffer
-		virtual bool beginScene(bool backBuffer, bool zBuffer, SColor color);
+		virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
+				SColor color=SColor(255,0,0,0),
+				void* windowId=0,
+				core::rect<s32>* sourceRect=0);
+
+		//! presents the rendered scene on the screen, returns false if failed
+		virtual bool endScene();
 
 		//! Only used by the internal engine. Used to notify the driver that
 		//! the window was resized.
@@ -53,7 +56,9 @@ namespace video
 		virtual const core::dimension2d<s32>& getCurrentRenderTargetSize() const;
 
 		//! draws a vertex primitive list
-		void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType);
+		void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
+				const void* indexList, u32 primitiveCount,
+				E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
 
 		//! Draws a 3d line.
 		virtual void draw3DLine(const core::vector3df& start,
@@ -78,6 +83,9 @@ namespace video
 								const core::position2d<s32>& end,
 								SColor color=SColor(255,255,255,255));
 
+		//! Draws a single pixel
+		virtual void drawPixel(u32 x, u32 y, const SColor & color); 
+
 		//! \return Returns the name of the video driver. Example: In case of the Direct3D8
 		//! driver, it would return "Direct3D8.1".
 		virtual const wchar_t* getName() const;
@@ -85,11 +93,15 @@ namespace video
 		//! Returns type of video driver
 		virtual E_DRIVER_TYPE getDriverType() const;
 
+		//! get color format of the current color buffer
+		virtual ECOLOR_FORMAT getColorFormat() const;
+
 		//! Returns the transformation set by setTransform
 		virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const;
 
 		//! Creates a render target texture.
-		virtual ITexture* createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name);
+		virtual ITexture* addRenderTargetTexture(const core::dimension2d<s32>& size,
+				const c8* name);
 
 		//! Clears the ZBuffer.
 		virtual void clearZBuffer();
@@ -104,21 +116,12 @@ namespace video
 
 	protected:
 
-		struct splane
-		{
-			core::vector3df Normal;
-			f32 Dist;
-		};
-
 		//! sets a render target
 		void setRenderTarget(video::CImage* image);
 
 		//! sets the current Texture
 		bool setTexture(video::ITexture* texture);
 
-		video::CImage* BackBuffer;
-		video::IImagePresenter* Presenter;
-
 		//! switches to a triangle renderer
 		void switchToTriangleRenderer(ETriangleRenderer renderer);
 
@@ -128,13 +131,22 @@ namespace video
 		//! clips a triangle agains the viewing frustum
 		void clipTriangle(f32* transformedPos);
 
-		//! creates the clipping planes from the view matrix
-		void createPlanes(const core::matrix4& mat);
+
+		//! draws a vertex primitive list
+		void drawVertexPrimitiveList16(const void* vertices, u32 vertexCount,
+				const u16* indexList, u32 primitiveCount,
+				E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType);
+
 
 		template<class VERTEXTYPE>
 		void drawClippedIndexedTriangleListT(const VERTEXTYPE* vertices,
 			s32 vertexCount, const u16* indexList, s32 triangleCount);
 
+		video::CImage* BackBuffer;
+		video::IImagePresenter* Presenter;
+		void* WindowId;
+		core::rect<s32>* SceneSourceRect;
+
 		core::array<S2DVertex> TransformedPoints;
 
 		video::ITexture* RenderTargetTexture;
@@ -152,11 +164,8 @@ namespace video
 		IZBuffer* ZBuffer;
 
 		video::ITexture* Texture;
-		scene::SViewFrustum Frustum;
 
 		SMaterial Material;
-
-		splane planes[6]; // current planes of the view frustum
 	};
 
 } // end namespace video
@@ -165,3 +174,4 @@ namespace video
 
 #endif
 
+
diff --git a/src/dep/src/irrlicht/CSoftwareDriver2.cpp b/src/dep/src/irrlicht/CSoftwareDriver2.cpp
index d8c759c..bcd7fe1 100644
--- a/src/dep/src/irrlicht/CSoftwareDriver2.cpp
+++ b/src/dep/src/irrlicht/CSoftwareDriver2.cpp
@@ -1,1919 +1,2006 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "CSoftwareDriver2.h"
-
-#include "IrrCompileConfig.h"
-
-#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
-
-#include "SoftwareDriver2_helper.h"
-#include "CSoftwareTexture2.h"
-#include "CSoftware2MaterialRenderer.h"
-#include "S3DVertex.h"
-#include "S4DVertex.h"
-
-
-namespace irr
-{
-namespace video
-{
-
-
-//! constructor
-CSoftwareDriver2::CSoftwareDriver2(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter)
-: CNullDriver(io, windowSize), BackBuffer(0), Presenter(presenter),
-	RenderTargetTexture(0), RenderTargetSurface(0), CurrentShader(0),
-	 DepthBuffer(0), CurrentOut ( 12 * 2, 128 ), Temp ( 12 * 2, 128 )
-{
-	#ifdef _DEBUG
-	setDebugName("CSoftwareDriver2");
-	#endif
-
-	Texture[0] = 0;
-	Texture[1] = 0;
-	Texmap[0].Texture = 0;
-	Texmap[1].Texture = 0;
-
-	// create backbuffer
-	BackBuffer = new CImage(ECF_SOFTWARE2, windowSize);
-	BackBuffer->fill(SColor(0));
-	
-	// create z buffer
-
-	DepthBuffer = video::createDepthBuffer(BackBuffer->getDimension());
-
-	// create triangle renderers
-
-	irr::memset32 ( BurningShader, 0, sizeof ( BurningShader ) );
-	//BurningShader[ETR_FLAT] = createTRFlat2(DepthBuffer);
-	//BurningShader[ETR_FLAT_WIRE] = createTRFlatWire2(DepthBuffer);
-	BurningShader[ETR_GOURAUD] = createTriangleRendererGouraud2(DepthBuffer);
-	BurningShader[ETR_GOURAUD_ALPHA] = createTriangleRendererGouraudAlpha2(DepthBuffer );
-	BurningShader[ETR_GOURAUD_ALPHA_NOZ] = createTRGouraudAlphaNoZ2(DepthBuffer );
-	//BurningShader[ETR_GOURAUD_WIRE] = createTriangleRendererGouraudWire2(DepthBuffer);
-	//BurningShader[ETR_TEXTURE_FLAT] = createTriangleRendererTextureFlat2(DepthBuffer);
-	//BurningShader[ETR_TEXTURE_FLAT_WIRE] = createTriangleRendererTextureFlatWire2(DepthBuffer);
-	BurningShader[ETR_TEXTURE_GOURAUD] = createTriangleRendererTextureGouraud2(DepthBuffer);
-	BurningShader[ETR_TEXTURE_GOURAUD_LIGHTMAP] = createTriangleRendererTextureLightMap2_M1(DepthBuffer);
-	BurningShader[ETR_TEXTURE_GOURAUD_LIGHTMAP_M2] = createTriangleRendererTextureLightMap2_M2(DepthBuffer);
-	BurningShader[ETR_TEXTURE_GOURAUD_LIGHTMAP_M4] = createTriangleRendererGTextureLightMap2_M4(DepthBuffer);
-	BurningShader[ETR_TEXTURE_LIGHTMAP_M4] = createTriangleRendererTextureLightMap2_M4(DepthBuffer);
-	BurningShader[ETR_TEXTURE_GOURAUD_LIGHTMAP_ADD] = createTriangleRendererTextureLightMap2_Add(DepthBuffer);
-	BurningShader[ETR_TEXTURE_GOURAUD_DETAIL_MAP] = createTriangleRendererTextureDetailMap2(DepthBuffer);
-
-	BurningShader[ETR_TEXTURE_GOURAUD_WIRE] = createTriangleRendererTextureGouraudWire2(DepthBuffer);
-	BurningShader[ETR_TEXTURE_GOURAUD_NOZ] = createTRTextureGouraudNoZ2();
-	BurningShader[ETR_TEXTURE_GOURAUD_ADD] = createTRTextureGouraudAdd2(DepthBuffer);
-	BurningShader[ETR_TEXTURE_GOURAUD_ADD_NO_Z] = createTRTextureGouraudAddNoZ2(DepthBuffer);
-	BurningShader[ETR_TEXTURE_GOURAUD_VERTEX_ALPHA] = createTriangleRendererTextureVertexAlpha2 ( DepthBuffer );
-
-	BurningShader[ETR_TEXTURE_GOURAUD_ALPHA] = createTRTextureGouraudAlpha(DepthBuffer );
-	BurningShader[ETR_TEXTURE_GOURAUD_ALPHA_NOZ] = createTRTextureGouraudAlphaNoZ( DepthBuffer );
-
-	BurningShader[ETR_TEXTURE_BLEND] = createTRTextureBlend( DepthBuffer );
-
-
-	// add the same renderer for all solid types
-	CSoftware2MaterialRenderer_SOLID* smr = new CSoftware2MaterialRenderer_SOLID( this);
-	CSoftware2MaterialRenderer_TRANSPARENT_ADD_COLOR* tmr = new CSoftware2MaterialRenderer_TRANSPARENT_ADD_COLOR( this);
-	CSoftware2MaterialRenderer_UNSUPPORTED * umr = new CSoftware2MaterialRenderer_UNSUPPORTED ( this );
-
-	//!TODO: addMaterialRenderer depends on pushing order....
-	addMaterialRenderer ( smr ); // EMT_SOLID
-	addMaterialRenderer ( smr ); // EMT_SOLID_2_LAYER,
-	addMaterialRenderer ( smr ); // EMT_LIGHTMAP,
-	addMaterialRenderer ( tmr ); // EMT_LIGHTMAP_ADD,
-	addMaterialRenderer ( smr ); // EMT_LIGHTMAP_M2,
-	addMaterialRenderer ( smr ); // EMT_LIGHTMAP_M4,
-	addMaterialRenderer ( smr ); // EMT_LIGHTMAP_LIGHTING,
-	addMaterialRenderer ( smr ); // EMT_LIGHTMAP_LIGHTING_M2,
-	addMaterialRenderer ( smr ); // EMT_LIGHTMAP_LIGHTING_M4,
-	addMaterialRenderer ( smr ); // EMT_DETAIL_MAP,
-	addMaterialRenderer ( umr ); // EMT_SPHERE_MAP,
-	addMaterialRenderer ( smr ); // EMT_REFLECTION_2_LAYER,
-	addMaterialRenderer ( tmr ); // EMT_TRANSPARENT_ADD_COLOR,
-	addMaterialRenderer ( tmr ); // EMT_TRANSPARENT_ALPHA_CHANNEL,	
-	addMaterialRenderer ( tmr ); // EMT_TRANSPARENT_ALPHA_CHANNEL_REF,	
-	addMaterialRenderer ( tmr ); // EMT_TRANSPARENT_VERTEX_ALPHA,
-	addMaterialRenderer ( smr ); // EMT_TRANSPARENT_REFLECTION_2_LAYER,
-	addMaterialRenderer ( umr ); // EMT_NORMAL_MAP_SOLID,
-	addMaterialRenderer ( umr ); // EMT_NORMAL_MAP_TRANSPARENT_ADD_COLOR,
-	addMaterialRenderer ( umr ); // EMT_NORMAL_MAP_TRANSPARENT_VERTEX_ALPHA,
-	addMaterialRenderer ( umr ); // EMT_PARALLAX_MAP_SOLID,
-	addMaterialRenderer ( umr ); // EMT_PARALLAX_MAP_TRANSPARENT_ADD_COLOR,
-	addMaterialRenderer ( umr ); // EMT_PARALLAX_MAP_TRANSPARENT_VERTEX_ALPHA,
-	addMaterialRenderer ( tmr ); // EMT_ONETEXTURE_BLEND
-
-	smr->drop ();
-	tmr->drop ();
-	umr->drop ();
-
-
-	// select render target
-
-	setRenderTarget(BackBuffer);
-
-
-	Global_AmbientLight.set ( 0.f, 0.f, 0.f, 0.f );
-
-	// select the right renderer
-	setCurrentShader();
-
-}
-
-
-
-//! destructor
-CSoftwareDriver2::~CSoftwareDriver2()
-{
-	// delete Backbuffer
-	BackBuffer->drop();
-
-	// delete triangle renderers
-
-	for (s32 i=0; i<ETR2_COUNT; ++i)
-		if (BurningShader[i])
-			BurningShader[i]->drop();
-
-	// delete zbuffer
-
-	if (DepthBuffer)
-		DepthBuffer->drop();
-
-	// delete current texture
-
-	if ( Texture[0] )
-		Texture[0]->drop();
-
-	if ( Texture[1] )
-		Texture[1]->drop();
-
-	if (RenderTargetTexture)
-		RenderTargetTexture->drop();
-
-	if (RenderTargetSurface)
-		RenderTargetSurface->drop();
-}
-
-
-
-//! void selects the right triangle renderer based on the render states.
-void CSoftwareDriver2::setCurrentShader()
-{
-	EBurningFFShader shader = ETR_TEXTURE_GOURAUD;
-
-	bool zMaterialTest = true;
-	switch ( Material.org.MaterialType )
-	{
-		case EMT_ONETEXTURE_BLEND:
-			shader = ETR_TEXTURE_BLEND;
-			zMaterialTest = false;
-			break;
-
-		case EMT_TRANSPARENT_ALPHA_CHANNEL_REF:
-		case EMT_TRANSPARENT_ALPHA_CHANNEL:
-			if ( Material.org.ZBuffer )
-			{
-				shader = ETR_TEXTURE_GOURAUD_ALPHA;
-			}
-			else
-			{
-				shader = ETR_TEXTURE_GOURAUD_ALPHA_NOZ;
-			}
-			zMaterialTest = false;
-			break;
-
-		case EMT_TRANSPARENT_ADD_COLOR:
-			if ( Material.org.ZBuffer )
-			{
-				shader = ETR_TEXTURE_GOURAUD_ADD;
-			}
-			else
-			{
-				shader = ETR_TEXTURE_GOURAUD_ADD_NO_Z;
-			}
-			zMaterialTest = false;
-			break;
-
-		case EMT_TRANSPARENT_VERTEX_ALPHA:
-			shader = ETR_TEXTURE_GOURAUD_VERTEX_ALPHA;
-			break;
-
-		case EMT_LIGHTMAP:
-		case EMT_LIGHTMAP_LIGHTING:
-			shader = ETR_TEXTURE_GOURAUD_LIGHTMAP;
-			break;
-
-		case EMT_LIGHTMAP_M2:
-		case EMT_LIGHTMAP_LIGHTING_M2:
-			shader = ETR_TEXTURE_GOURAUD_LIGHTMAP_M2;
-			break;
-
-		case EMT_LIGHTMAP_LIGHTING_M4:
-			if ( Material.org.getTexture(1) )
-				shader = ETR_TEXTURE_GOURAUD_LIGHTMAP_M4;
-			break;
-		case EMT_LIGHTMAP_M4:
-			if ( Material.org.getTexture(1) )
-				shader = ETR_TEXTURE_LIGHTMAP_M4;
-			break;
-
-		case EMT_LIGHTMAP_ADD:
-			if ( Material.org.getTexture(1) )
-				shader = ETR_TEXTURE_GOURAUD_LIGHTMAP_ADD;
-			break;
-
-		case EMT_DETAIL_MAP:
-			shader = ETR_TEXTURE_GOURAUD_DETAIL_MAP;
-			break;
-
-		default:
-			break;
-
-	}
-
-	if ( zMaterialTest && !Material.org.ZBuffer && !Material.org.ZWriteEnable)
-	{
-		shader = ETR_TEXTURE_GOURAUD_NOZ;
-	}
-
-	if ( 0 == Material.org.getTexture(0) )
-	{
-		shader = ETR_GOURAUD;
-	}
-
-	if ( Material.org.Wireframe )
-	{
-		shader = ETR_TEXTURE_GOURAUD_WIRE;
-	}
-
-	// switchToTriangleRenderer
-	CurrentShader = BurningShader[shader];
-	if ( CurrentShader )
-	{
-		CurrentShader->setZCompareFunc ( Material.org.ZBuffer );
-		switch ( shader )
-		{
-			case ETR_TEXTURE_GOURAUD_ALPHA:
-			case ETR_TEXTURE_GOURAUD_ALPHA_NOZ:
-				CurrentShader->setParam ( 0, Material.org.MaterialTypeParam );
-				break;
-
-			case EMT_ONETEXTURE_BLEND:
-			{
-				E_BLEND_FACTOR srcFact,dstFact;
-				E_MODULATE_FUNC modulate;
-				unpack_texureBlendFunc ( srcFact, dstFact, modulate, Material.org.MaterialTypeParam );
-				CurrentShader->setParam ( 0, Material.org.MaterialTypeParam );
-			}
-			break;
-			default:
-			break;
-		}
-
-		CurrentShader->setRenderTarget(RenderTargetSurface, ViewPort);
-	}
-}
-
-
-
-//! queries the features of the driver, returns true if feature is available
-bool CSoftwareDriver2::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
-{
-	switch (feature)
-	{
-#ifdef SOFTWARE_DRIVER_2_BILINEAR
-	case EVDF_BILINEAR_FILTER:
-		return true;
-#endif
-#ifdef SOFTWARE_DRIVER_2_MIPMAPPING
-	case EVDF_MIP_MAP:
-		return true;
-#endif
-	case EVDF_RENDER_TO_TARGET:
-	case EVDF_MULTITEXTURE:
-	case EVDF_HARDWARE_TL:
-		return true;
-
-	default:
-		return false;
-	}
-}
-
-
-
-//! sets transformation
-void CSoftwareDriver2::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat)
-{
-	Transformation[state].m = mat;
-	Transformation[state].isIdentity = mat.isIdentity();
-
-	switch ( state )
-	{
-		case ETS_VIEW:
-			Transformation[ETS_VIEW_PROJECTION].m.setbyproduct_nocheck (
-				Transformation[ETS_PROJECTION].m,
-				Transformation[ETS_VIEW].m
-			);
-			break;
-
-		case ETS_WORLD:
-			if ( Transformation[state].isIdentity )
-			{
-				Transformation[ETS_CURRENT] = Transformation[ETS_VIEW_PROJECTION];
-			}
-			else
-			{
-				Transformation[ETS_CURRENT].m.setbyproduct_nocheck (
-					Transformation[ETS_VIEW_PROJECTION].m,
-					Transformation[ETS_WORLD].m
-				);
-			}
-			Transformation[ETS_CURRENT].isIdentity = 0;
-
-#ifdef SOFTWARE_DRIVER_2_LIGHTING
-			if ( Material.org.Lighting )
-			{
-				if ( Transformation[state].isIdentity )
-				{
-					Transformation[ETS_WORLD_VIEW] = Transformation[ETS_VIEW];
-				}
-				else
-				{
-					Transformation[ETS_WORLD_VIEW].m.setbyproduct_nocheck (
-						Transformation[ETS_VIEW].m,
-						Transformation[ETS_WORLD].m
-					);
-				}
-
-				core::matrix4 m2 ( Transformation[ETS_WORLD_VIEW].m );
-				m2.makeInverse ();
-				m2.getTransposed ( Transformation[ETS_WORLD_VIEW_INVERSE_TRANSPOSED].m );
-			}
-#endif
-			break;
-		default:
-			break;
-	}
-}
-
-
-
-//! sets the current Texture
-bool CSoftwareDriver2::setTexture(u32 stage, video::ITexture* texture)
-{
-	if (texture && texture->getDriverType() != EDT_BURNINGSVIDEO)
-	{
-		os::Printer::log("Fatal Error: Tried to set a texture not owned by this driver.", ELL_ERROR);
-		return false;
-	}
-
-	if (Texture[stage])
-		Texture[stage]->drop();
-
-	Texture[stage] = texture;
-
-	if (Texture[stage])
-		Texture[stage]->grab();
-
-	if (Texture[stage])
-		Texmap[stage].Texture = (video::CSoftwareTexture2*) Texture[stage];
-
-	setCurrentShader();
-	return true;
-}
-
-
-
-//! sets a material
-void CSoftwareDriver2::setMaterial(const SMaterial& material)
-{
-	Material.org = material;
-
-	Material.AmbientColor.setA8R8G8B8 ( Material.org.AmbientColor.color );
-	Material.DiffuseColor.setA8R8G8B8 ( Material.org.DiffuseColor.color );
-	Material.EmissiveColor.setA8R8G8B8 ( Material.org.EmissiveColor.color );
-	Material.SpecularColor.setA8R8G8B8 ( Material.org.SpecularColor.color );
-
-	Material.SpecularEnabled = Material.org.Shininess != 0.f;
-	if (Material.SpecularEnabled)
-		Material.org.NormalizeNormals = true;
-
-	for (u32 i = 0; i < 2; ++i)
-	{
-		setTexture( i, Material.org.getTexture(i) );
-		setTransform((E_TRANSFORMATION_STATE) (ETS_TEXTURE_0 + i), 
-				material.getTextureMatrix(i));
-	}
-}
-
-
-
-//! clears the zbuffer
-bool CSoftwareDriver2::beginScene(bool backBuffer, bool zBuffer, SColor color)
-{
-
-	CNullDriver::beginScene(backBuffer, zBuffer, color);
-
-	if (backBuffer)
-		BackBuffer->fill( color );
-
-	if (DepthBuffer && zBuffer)
-		DepthBuffer->clear();
-
-	return true;
-}
-
-//! presents the rendered scene on the screen, returns false if failed
-bool CSoftwareDriver2::endScene( s32 windowId, core::rect<s32>* sourceRect )
-{
-	CNullDriver::endScene();
-
-	Presenter->present(BackBuffer, windowId, sourceRect );
-
-	return true;
-}
-
-
-
-
-//! sets a render target
-bool CSoftwareDriver2::setRenderTarget(video::ITexture* texture, bool clearBackBuffer, 
-								 bool clearZBuffer, SColor color)
-{
-	if (texture && texture->getDriverType() != EDT_BURNINGSVIDEO)
-	{
-		os::Printer::log("Fatal Error: Tried to set a texture not owned by this driver.", ELL_ERROR);
-		return false;
-	}
-
-	if (RenderTargetTexture)
-		RenderTargetTexture->drop();
-
-	RenderTargetTexture = texture;
-
-	if (RenderTargetTexture)
-	{
-		RenderTargetTexture->grab();
-		setRenderTarget(((CSoftwareTexture2*)RenderTargetTexture)->getTexture());
-	}
-	else
-	{
-		setRenderTarget(BackBuffer);
-	}
-
-	if (RenderTargetSurface && (clearBackBuffer || clearZBuffer))
-	{
-		if (clearZBuffer)
-			DepthBuffer->clear();
-
-		if (clearBackBuffer)
-			((video::CImage*)RenderTargetSurface)->fill( color );
-	}
-
-	return true;
-}
-
-
-//! sets a render target
-void CSoftwareDriver2::setRenderTarget(video::CImage* image)
-{
-	if (RenderTargetSurface)
-		RenderTargetSurface->drop();
-
-	RenderTargetSurface = image;
-	RenderTargetSize.Width = 0;
-	RenderTargetSize.Height = 0;
-
-	if (RenderTargetSurface)
-	{
-		RenderTargetSurface->grab();
-		RenderTargetSize = RenderTargetSurface->getDimension();
-	}
-
-	setViewPort(core::rect<s32>(0,0,RenderTargetSize.Width,RenderTargetSize.Height));
-
-	if (DepthBuffer)
-		DepthBuffer->setSize(RenderTargetSize);
-}
-
-
-
-//! sets a viewport
-void CSoftwareDriver2::setViewPort(const core::rect<s32>& area)
-{
-	ViewPort = area;
-
-	core::rect<s32> rendert(0,0,RenderTargetSize.Width,RenderTargetSize.Height);
-	ViewPort.clipAgainst(rendert);
-
-	Transformation [ ETS_CLIPSCALE ].m.buildNDCToDCMatrix ( ViewPort, 1 );
-
-
-	if (CurrentShader)
-		CurrentShader->setRenderTarget(RenderTargetSurface, ViewPort);
-}
-
-/*
-	generic plane clipping in homogenous coordinates
-	special case ndc frustum <-w,w>,<-w,w>,<-w,w>
-	can be rewritten with compares e.q near plane, a.z < -a.w and b.z < -b.w
-*/
-
-const sVec4 CSoftwareDriver2::NDCPlane[6] =
-{
-	sVec4(  0.f,  0.f, -1.f, -1.f ),	// near
-	sVec4(  0.f,  0.f,  1.f, -1.f ),	// far
-	sVec4(  1.f,  0.f,  0.f, -1.f ),	// left
-	sVec4( -1.f,  0.f,  0.f, -1.f ),	// right
-	sVec4(  0.f,  1.f,  0.f, -1.f ),	// bottom
-	sVec4(  0.f, -1.f,  0.f, -1.f )		// top
-};
-
-
-
-/*
-	test a vertex if it's inside the standard frustum
-
-	this is the generic one..
-
-	f32 dotPlane;
-	for ( u32 i = 0; i!= 6; ++i )
-	{
-		dotPlane = v->Pos.dotProduct ( NDCPlane[i] );
-		setbit ( flag, dotPlane <= 0.f, 1 << i );
-	}
-
-	// this is the base for ndc frustum <-w,w>,<-w,w>,<-w,w>
-	setbits ( flag, ( v->Pos.z - v->Pos.w ) <= 0.f, 1 );
-	setbits ( flag, (-v->Pos.z - v->Pos.w ) <= 0.f, 2 );
-	setbits ( flag, ( v->Pos.x - v->Pos.w ) <= 0.f, 4 );
-	setbits ( flag, (-v->Pos.x - v->Pos.w ) <= 0.f, 8 );
-	setbits ( flag, ( v->Pos.y - v->Pos.w ) <= 0.f, 16 );
-	setbits ( flag, (-v->Pos.y - v->Pos.w ) <= 0.f, 32 );
-
-*/
-#ifdef _MSC_VER
-
-REALINLINE u32 CSoftwareDriver2::clipToFrustumTest ( const s4DVertex * v  ) const
-{
-	f32 test[6];
-	u32 flag;
-	const f32 w = - v->Pos.w;
-
-	// a conditional move is needed....FCOMI ( but we don't have it )
-	// so let the fpu calculate and write it back.
-	// cpu makes the compare, interleaving
-
-	test[0] =  v->Pos.z + w;
-	test[1] = -v->Pos.z + w;
-	test[2] =  v->Pos.x + w;
-	test[3] = -v->Pos.x + w;
-	test[4] =  v->Pos.y + w;
-	test[5] = -v->Pos.y + w;
-
-	flag  = (IR ( test[0] )              ) >> 31;
-	flag |= (IR ( test[1] ) & 0x80000000 ) >> 30;
-	flag |= (IR ( test[2] ) & 0x80000000 ) >> 29;
-	flag |= (IR ( test[3] ) & 0x80000000 ) >> 28;
-	flag |= (IR ( test[4] ) & 0x80000000 ) >> 27;
-	flag |= (IR ( test[5] ) & 0x80000000 ) >> 26;
-
-/*
-	flag  = F32_LOWER_EQUAL_0 ( test[0] );
-	flag |= F32_LOWER_EQUAL_0 ( test[1] ) << 1;
-	flag |= F32_LOWER_EQUAL_0 ( test[2] ) << 2;
-	flag |= F32_LOWER_EQUAL_0 ( test[3] ) << 3;
-	flag |= F32_LOWER_EQUAL_0 ( test[4] ) << 4;
-	flag |= F32_LOWER_EQUAL_0 ( test[5] ) << 5;
-*/
-	return flag;
-}
-
-#else
-
-
-REALINLINE u32 CSoftwareDriver2::clipToFrustumTest ( const s4DVertex * v  ) const
-{
-	u32 flag = 0;
-	for ( u32 i = 0; i!= 6; ++i )
-	{
-		core::setbit ( flag, v->Pos.dotProduct ( NDCPlane[i] ) <= 0.f, 1 << i );
-	}
-	return flag;
-}
-
-#endif // _MSC_VER 
-
-u32 CSoftwareDriver2::clipToHyperPlane ( s4DVertex * dest, const s4DVertex * source, u32 inCount, const sVec4 &plane )
-{
-	u32 outCount = 0;
-	s4DVertex * out = dest;
-
-	const s4DVertex * a;
-	const s4DVertex * b = source;
-
-	f32 bDotPlane;
-
-	bDotPlane = b->Pos.dotProduct ( plane );
-
-	for( u32 i = 1; i < inCount + 1; ++i)
-	{
-		const s32 condition = i - inCount;
-		const s32 index = (( ( condition >> 31 ) & ( i ^ condition ) ) ^ condition ) << 1;
-
-		a = &source[ index ];
-
-		// current point inside
-		if ( a->Pos.dotProduct ( plane ) <= 0.f )
-		{
-			// last point outside
-			if ( F32_GREATER_0 ( bDotPlane ) )
-			{
-				// intersect line segment with plane
-				out->interpolate ( *b, *a, bDotPlane / (b->Pos - a->Pos).dotProduct ( plane ) );
-				out += 2;
-				outCount += 1;
-			}
-
-			// copy current to out
-			//*out = *a;
-			irr::memcpy32_small ( out, a, SIZEOF_SVERTEX * 2 );
-			b = out;
-
-			out += 2;
-			outCount += 1;
-		}
-		else
-		{
-			// current point outside
-
-			if ( F32_LOWER_EQUAL_0 (  bDotPlane ) )
-			{
-				// previous was inside
-				// intersect line segment with plane
-				out->interpolate ( *b, *a, bDotPlane / (b->Pos - a->Pos).dotProduct ( plane ) );
-				out += 2;
-				outCount += 1;
-			}
-			// pointer
-			b = a;
-		}
-
-		bDotPlane = b->Pos.dotProduct ( plane );
-
-	}
-
-	return outCount;
-}
-
-
-u32 CSoftwareDriver2::clipToFrustum ( s4DVertex *v0, s4DVertex * v1, const u32 vIn )
-{
-	u32 vOut = vIn;
-
-	vOut = clipToHyperPlane ( v1, v0, vOut, NDCPlane[0] ); if ( vOut < vIn ) return vOut;
-	vOut = clipToHyperPlane ( v0, v1, vOut, NDCPlane[1] ); if ( vOut < vIn ) return vOut;
-	vOut = clipToHyperPlane ( v1, v0, vOut, NDCPlane[2] ); if ( vOut < vIn ) return vOut;
-	vOut = clipToHyperPlane ( v0, v1, vOut, NDCPlane[3] ); if ( vOut < vIn ) return vOut;
-	vOut = clipToHyperPlane ( v1, v0, vOut, NDCPlane[4] ); if ( vOut < vIn ) return vOut;
-	vOut = clipToHyperPlane ( v0, v1, vOut, NDCPlane[5] );
-	return vOut;
-}
-
-/*!
- Part I:
-	apply Clip Scale matrix
-	From Normalized Device Coordiante ( NDC ) Space to Device Coordinate Space ( DC )
-
- Part II:
-	Project homogeneous vector
-	homogeneous to non-homogenous coordinates ( dividebyW )
-
-	Incoming: ( xw, yw, zw, w, u, v, 1, R, G, B, A )
-	Outgoing: ( xw/w, yw/w, zw/w, w/w, u/w, v/w, 1/w, R/w, G/w, B/w, A/w )
-
-
-	replace w/w by 1/w
-*/
-inline void CSoftwareDriver2::ndc_2_dc_and_project ( s4DVertex *dest,s4DVertex *source, u32 vIn ) const
-{
-	u32 g;
-
-	for ( g = 0; g != vIn; g += 2 )
-	{
-		if ( (dest[g].flag & VERTEX4D_PROJECTED ) == VERTEX4D_PROJECTED )
-			continue;
-
-		dest[g].flag = source[g].flag | VERTEX4D_PROJECTED;
-
-		const f32 w = source[g].Pos.w;
-		const f32 iw = core::reciprocal ( w );
-
-		// to device coordinates
-		dest[g].Pos.x = iw * ( source[g].Pos.x * Transformation [ ETS_CLIPSCALE ].m[ 0] + w * Transformation [ ETS_CLIPSCALE ].m[12] );
-		dest[g].Pos.y = iw * ( source[g].Pos.y * Transformation [ ETS_CLIPSCALE ].m[ 5] + w * Transformation [ ETS_CLIPSCALE ].m[13] );
-
-#ifndef SOFTWARE_DRIVER_2_USE_WBUFFER
-		dest[g].Pos.z = iw * source[g].Pos.z;
-#endif
-
-	#ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
-		#ifdef SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT
-			dest[g].Color[0] = source[g].Color[0] * iw;
-		#else
-			dest[g].Color[0] = source[g].Color[0];
-		#endif
-
-	#endif
-
-		dest[g].Pos.w = iw;
-
-	}
-
-}
-
-
-inline void CSoftwareDriver2::ndc_2_dc_and_project2 ( const s4DVertex **v, const u32 size ) const
-{
-	u32 g;
-
-	for ( g = 0; g != size; g += 1 )
-	{
-		s4DVertex * a = (s4DVertex*) v[g];
-
-		if ( (a[1].flag & VERTEX4D_PROJECTED ) == VERTEX4D_PROJECTED )
-			continue;
-
-		a[1].flag = a->flag | VERTEX4D_PROJECTED;
-
-		// project homogenous vertex, store 1/w
-		const f32 w = a->Pos.w;
-		const f32 iw = core::reciprocal ( w );
-
-		// to device coordinates
-		a[1].Pos.x = iw * ( a->Pos.x * Transformation [ ETS_CLIPSCALE ].m[ 0] + w * Transformation [ ETS_CLIPSCALE ].m[12] );
-		a[1].Pos.y = iw * ( a->Pos.y * Transformation [ ETS_CLIPSCALE ].m[ 5] + w * Transformation [ ETS_CLIPSCALE ].m[13] );
-
-#ifndef SOFTWARE_DRIVER_2_USE_WBUFFER
-		a[1].Pos.z = a->Pos.z * iw;
-#endif
-
-	#ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
-		#ifdef SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT
-			a[1].Color[0] = a->Color[0] * iw;
-		#else
-			a[1].Color[0] = a->Color[0];
-		#endif
-	#endif
-
-		a[1].Pos.w = iw;
-
-	}
-
-}
-
-
-/*!
-	crossproduct in projected 2D -> screen area triangle
-*/
-inline f32 CSoftwareDriver2::screenarea ( const s4DVertex *v ) const
-{
-	return	( ( v[3].Pos.x - v[1].Pos.x ) * ( v[5].Pos.y - v[1].Pos.y ) ) -
-			( ( v[3].Pos.y - v[1].Pos.y ) * ( v[5].Pos.x - v[1].Pos.x ) );
-}
-
-
-/*!
-*/
-inline f32 CSoftwareDriver2::texelarea ( const s4DVertex *v, int tex ) const
-{
-	f32 x0,y0, x1,y1, z;
-
-	x0 = v[2].Tex[tex].x - v[0].Tex[tex].x;
-	y0 = v[2].Tex[tex].y - v[0].Tex[tex].y;
-	x1 = v[4].Tex[tex].x - v[0].Tex[tex].x;
-	y1 = v[4].Tex[tex].y - v[0].Tex[tex].y;
-
-	z = x0*y1 - x1*y0;
-
-	const core::dimension2d<s32> &d = Texmap[tex].Texture->getMaxSize();
-	z *= d.Height;
-	z *= d.Width;
-	return z;
-}
-
-/*!
-	crossproduct in projected 2D
-*/
-inline f32 CSoftwareDriver2::screenarea2 ( const s4DVertex **v ) const
-{
-	return	( (( v[1] + 1 )->Pos.x - (v[0] + 1 )->Pos.x ) * ( (v[2] + 1 )->Pos.y - (v[0] + 1 )->Pos.y ) ) -
-			( (( v[1] + 1 )->Pos.y - (v[0] + 1 )->Pos.y ) * ( (v[2] + 1 )->Pos.x - (v[0] + 1 )->Pos.x ) );
-}
-
-/*!
-*/
-inline f32 CSoftwareDriver2::texelarea2 ( const s4DVertex **v, s32 tex ) const
-{
-	f32 z;
-
-	z =		(v[1]->Tex[tex].x - v[0]->Tex[tex].x ) *
-			(v[2]->Tex[tex].y - v[0]->Tex[tex].y )
-		 -	(v[2]->Tex[tex].x - v[0]->Tex[tex].x ) *
-			(v[1]->Tex[tex].y - v[0]->Tex[tex].y )
-		;
-
-	const core::dimension2d<s32> &d = Texmap[tex].Texture->getMaxSize();
-	z *= d.Height;
-	z *= d.Width;
-	return z;
-}
-
-
-
-
-/*!
-*/
-inline void CSoftwareDriver2::select_polygon_mipmap ( s4DVertex *v, u32 vIn, s32 tex )
-{
-	f32 f[2];
-	const core::dimension2d<s32>& dim = Texmap[tex].Texture->getSize();
-
-	f[0] = (f32) dim.Width;
-	f[1] = (f32) dim.Height;
-
-#ifdef SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT
-	for ( u32 g = 0; g != vIn; g += 2 )
-	{
-		(v + g + 1 )->Tex[tex].x	= (v + g + 0)->Tex[tex].x * ( v + g + 1 )->Pos.w * f[0];
-		(v + g + 1 )->Tex[tex].y	= (v + g + 0)->Tex[tex].y * ( v + g + 1 )->Pos.w * f[1];
-	}
-#else
-	for ( u32 g = 0; g != vIn; g += 2 )
-	{
-		(v + g + 1 )->Tex[tex].x	= (v + g + 0)->Tex[tex].x * f[0];
-		(v + g + 1 )->Tex[tex].y	= (v + g + 0)->Tex[tex].y * f[1];
-	}
-#endif
-}
-
-inline void CSoftwareDriver2::select_polygon_mipmap2 ( s4DVertex **v, s32 tex ) const
-{
-	f32 f[2];
-	const core::dimension2d<s32>& dim = Texmap[tex].Texture->getSize();
-
-	f[0] = (f32) dim.Width;
-	f[1] = (f32) dim.Height;
-
-#ifdef SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT
-	(v[0] + 1 )->Tex[tex].x	= v[0]->Tex[tex].x * ( v[0] + 1 )->Pos.w * f[0];
-	(v[0] + 1 )->Tex[tex].y	= v[0]->Tex[tex].y * ( v[0] + 1 )->Pos.w * f[1];
-
-	(v[1] + 1 )->Tex[tex].x	= v[1]->Tex[tex].x * ( v[1] + 1 )->Pos.w * f[0];
-	(v[1] + 1 )->Tex[tex].y	= v[1]->Tex[tex].y * ( v[1] + 1 )->Pos.w * f[1];
-
-	(v[2] + 1 )->Tex[tex].x	= v[2]->Tex[tex].x * ( v[2] + 1 )->Pos.w * f[0];
-	(v[2] + 1 )->Tex[tex].y	= v[2]->Tex[tex].y * ( v[2] + 1 )->Pos.w * f[1];
-
-#else
-	(v[0] + 1 )->Tex[tex].x	= v[0]->Tex[tex].x * f[0];
-	(v[0] + 1 )->Tex[tex].y	= v[0]->Tex[tex].y * f[1];
-
-	(v[1] + 1 )->Tex[tex].x	= v[1]->Tex[tex].x * f[0];
-	(v[1] + 1 )->Tex[tex].y	= v[1]->Tex[tex].y * f[1];
-
-	(v[2] + 1 )->Tex[tex].x	= v[2]->Tex[tex].x * f[0];
-	(v[2] + 1 )->Tex[tex].y	= v[2]->Tex[tex].y * f[1];
-#endif
-}
-
-// Vertex Cache
-const SVSize CSoftwareDriver2::vSize[] =
-{
-	{ VERTEX4D_FORMAT_0, sizeof(S3DVertex),1 },
-	{ VERTEX4D_FORMAT_1, sizeof(S3DVertex2TCoords),2 },
-	{ VERTEX4D_FORMAT_2, sizeof(S3DVertexTangents),2 }
-};
-
-
-
-/*!
-	fill a cache line with transformed, light and clipp test triangles
-*/
-void CSoftwareDriver2::VertexCache_fill(const u32 sourceIndex,
-					const u32 destIndex)
-{
-	u8 * source;
-	s4DVertex *dest;
-
-	source = (u8*) VertexCache.vertices + ( sourceIndex * vSize[VertexCache.vType].Pitch );
-
-	// it's a look ahead so we never hit it..
-	// but give priority...
-	//VertexCache.info[ destIndex ].hit = hitCount;
-
-	// store info
-	VertexCache.info[ destIndex ].index = sourceIndex;
-	VertexCache.info[ destIndex ].hit = 0;
-
-	// destination Vertex
-	dest = (s4DVertex *) ( (u8*) VertexCache.mem.data + ( destIndex << ( SIZEOF_SVERTEX_LOG2 + 1  ) ) );
-
-	// transform Model * World * Camera * Projection * NDCSpace matrix
-	Transformation [ ETS_CURRENT].m.transformVect ( &dest->Pos.x, ((S3DVertex*) source )->Pos );
-
-#ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
-
-	// light Vertex
-	#ifdef SOFTWARE_DRIVER_2_LIGHTING
-		lightVertex ( dest, ((S3DVertex*) source ) );
-	#else
-		dest->Color[0].setA8R8G8B8 ( ((S3DVertex*) source )->Color.color );
-	#endif
-#endif
-
-	// transfer texture coordinates
-	if ( Transformation [ ETS_TEXTURE_0 ].isIdentity )
-	{
-		// only look on first transform
-		irr::memcpy32_small ( &dest->Tex[0],
-						&((S3DVertex*) source )->TCoords,
-						vSize[VertexCache.vType].TexSize * ( sizeof ( f32 ) * 2 )
-					);
-	}
-	else
-	{
-	/*
-			Generate texture coordinates as linear functions so that:
-				u = Ux*x + Uy*y + Uz*z + Uw 
-				v = Vx*x + Vy*y + Vz*z + Vw
-			The matrix M for this case is:
-				Ux  Vx  0  0 
-				Uy  Vy  0  0 
-				Uz  Vz  0  0 
-				Uw  Vw  0  0 
-	*/
-
-		const core::vector2d<f32> *src = &((S3DVertex*) source )->TCoords;
-		u32 t;
-
-		for ( t = 0; t != vSize[VertexCache.vType].TexSize; ++t )
-		{
-			const core::matrix4& M = Transformation [ ETS_TEXTURE_0 + t ].m;
-			if ( Material.org.TextureLayer[0].TextureWrap==ETC_REPEAT )
-			{
-				dest->Tex[t].x = M[0] * src[t].X + M[4] * src[t].Y + M[8];
-				dest->Tex[t].y = M[1] * src[t].X + M[5] * src[t].Y + M[9];
-			}
-			else
-			{
-				f32 tx1, ty1;
-
-				tx1 = M[0] * src[t].X + M[4] * src[t].Y + M[8];
-				ty1 = M[1] * src[t].X + M[5] * src[t].Y + M[9];
-
-				dest->Tex[t].x = tx1 <= 0.f ? 0.f : tx1 >= 1.f ? 1.f : tx1;
-				dest->Tex[t].y = ty1 <= 0.f ? 0.f : ty1 >= 1.f ? 1.f : ty1;
-
-				//dest->Tex[t].x = core::clamp ( M[0] * src[t].X + M[4] * src[t].Y + M[8], 0.f, 1.f );
-				//dest->Tex[t].y = core::clamp ( M[1] * src[t].X + M[5] * src[t].Y + M[9], 0.f, 1.f );
-			}
-		}
-
-	}
-
-	dest[0].flag = dest[1].flag = vSize[VertexCache.vType].Format;
-
-	// test vertex 
-	dest[0].flag |= clipToFrustumTest ( dest);
-
-	// to DC Space, project homogenous vertex
-	if ( (dest[0].flag & VERTEX4D_CLIPMASK ) == VERTEX4D_INSIDE )
-	{
-		ndc_2_dc_and_project2 ( (const s4DVertex**) &dest, 1 );
-	}
-
-	//return dest;
-}
-
-//
-
-REALINLINE s4DVertex * CSoftwareDriver2::VertexCache_getVertex ( const u32 sourceIndex )
-{
-	for ( s32 i = 0; i < VERTEXCACHE_ELEMENT; ++i )
-	{
-		if ( VertexCache.info[ i ].index == sourceIndex )
-		{
-			return (s4DVertex *) ( (u8*) VertexCache.mem.data + ( i << ( SIZEOF_SVERTEX_LOG2 + 1  ) ) );
-		}
-	}
-	return 0;
-}
-
-
-/*
-	Cache based on linear walk indices
-	fill blockwise on the next 16(Cache_Size) unique vertices in indexlist
-	merge the next 16 vertices with the current
-*/
-REALINLINE void CSoftwareDriver2::VertexCache_get ( s4DVertex ** face )
-{
-	SCacheInfo info[VERTEXCACHE_ELEMENT];
-
-	// next primitive must be complete in cache
-	if (	VertexCache.indicesIndex - VertexCache.indicesRun < 3 &&
-			VertexCache.indicesIndex < VertexCache.indexCount
-		)
-	{
-		// rewind to start of primitive
-		VertexCache.indicesIndex = VertexCache.indicesRun;
-
-		irr::memset32 ( info, VERTEXCACHE_MISS, sizeof ( info ) );
-
-		// get the next unique vertices cache line
-		u32 fillIndex = 0;
-		u32 dIndex;
-		u32 i;
-
-		while ( VertexCache.indicesIndex < VertexCache.indexCount &&
-				fillIndex < VERTEXCACHE_ELEMENT
-				)
-		{
-			u32 sourceIndex = VertexCache.indices [ VertexCache.indicesIndex++ ];
-
-			// if not exist, push back
-			s32 exist = 0;
-			for ( dIndex = 0;  dIndex < fillIndex; ++dIndex )
-			{
-				if ( info[ dIndex ].index == sourceIndex )
-				{
-					exist = 1;
-					break;
-				}
-			}
-
-			if ( 0 == exist )
-			{
-				info[fillIndex++].index = sourceIndex;
-			}
-		}
-
-		// clear marks
-		for ( i = 0; i!= VERTEXCACHE_ELEMENT; ++i )
-		{
-			VertexCache.info[i].hit = 0;
-		}
-
-		// mark all exisiting
-		for ( i = 0; i!= fillIndex; ++i )
-		{
-			for ( dIndex = 0;  dIndex < VERTEXCACHE_ELEMENT; ++dIndex )
-			{
-				if ( VertexCache.info[ dIndex ].index == info[i].index )
-				{
-					info[i].hit = dIndex;
-					VertexCache.info[ dIndex ].hit = 1;
-					break;
-				}
-			}
-		}
-
-		// fill new
-		for ( i = 0; i!= fillIndex; ++i )
-		{
-			if ( info[i].hit != VERTEXCACHE_MISS )
-				continue;
-
-			for ( dIndex = 0;  dIndex < VERTEXCACHE_ELEMENT; ++dIndex )
-			{
-				if ( 0 == VertexCache.info[dIndex].hit )
-				{
-					VertexCache_fill ( info[i].index, dIndex );
-					VertexCache.info[dIndex].hit += 1;
-					info[i].hit = dIndex;
-					break;
-				}
-			}
-		}
-	}
-
-	const u32 i0 = core::if_c_a_else_0 ( VertexCache.pType != scene::EPT_TRIANGLE_FAN, VertexCache.indicesRun );
-
-	face[0] = VertexCache_getVertex ( VertexCache.indices[ i0    ] );
-	face[1] = VertexCache_getVertex ( VertexCache.indices[ VertexCache.indicesRun + 1] );
-	face[2] = VertexCache_getVertex ( VertexCache.indices[ VertexCache.indicesRun + 2] );
-
-	VertexCache.indicesRun += VertexCache.primitivePitch;
-}
-
-REALINLINE void CSoftwareDriver2::VertexCache_get2 ( s4DVertex ** face )
-{
-	const u32 i0 = core::if_c_a_else_0 ( VertexCache.pType != scene::EPT_TRIANGLE_FAN, VertexCache.indicesRun );
-
-	VertexCache_fill ( VertexCache.indices[ i0    ], 0 );
-	VertexCache_fill ( VertexCache.indices[ VertexCache.indicesRun + 1], 1 );
-	VertexCache_fill ( VertexCache.indices[ VertexCache.indicesRun + 2], 2 );
-
-	VertexCache.indicesRun += VertexCache.primitivePitch;
-
-	face[0] = (s4DVertex *) ( (u8*) VertexCache.mem.data + ( 0 << ( SIZEOF_SVERTEX_LOG2 + 1  ) ) );
-	face[1] = (s4DVertex *) ( (u8*) VertexCache.mem.data + ( 1 << ( SIZEOF_SVERTEX_LOG2 + 1  ) ) );
-	face[2] = (s4DVertex *) ( (u8*) VertexCache.mem.data + ( 2 << ( SIZEOF_SVERTEX_LOG2 + 1  ) ) );
-
-}
-
-void CSoftwareDriver2::VertexCache_reset ( const void* vertices, u32 vertexCount, 
-											const u16* indices, u32 primitiveCount, 
-											E_VERTEX_TYPE vType,scene::E_PRIMITIVE_TYPE pType )
-{
-	VertexCache.vertices = vertices;
-	VertexCache.vertexCount = vertexCount;
-
-	VertexCache.indices = indices;
-	VertexCache.indicesIndex = 0;
-	VertexCache.indicesRun = 0;
-
-	VertexCache.vType = vType;
-	VertexCache.pType = pType;
-
-	switch ( VertexCache.pType )
-	{
-		case scene::EPT_TRIANGLES:
-			VertexCache.indexCount = primitiveCount + primitiveCount + primitiveCount;
-			VertexCache.primitivePitch = 3;
-			break;
-		case scene::EPT_TRIANGLE_FAN:
-			VertexCache.indexCount = primitiveCount + 2;
-			VertexCache.primitivePitch = 1;
-			break;
-	}
-
-	irr::memset32 ( VertexCache.info, VERTEXCACHE_MISS, sizeof ( VertexCache.info ) );
-
-}
-
-
-//! draws a vertex primitive list
-void CSoftwareDriver2::drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType)
-{
-	if (!checkPrimitiveCount(primitiveCount))
-		return;
-
-	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType);
-
-	if ( 0 == CurrentShader )
-		return;
-
-
-	VertexCache_reset ( vertices, vertexCount, indexList, primitiveCount, vType, pType );
-
-	const s4DVertex * face[3];
-
-	f32 dc_area;
-	s32 lodLevel;
-	u32 i;
-	u32 g;
-
-	for ( i = 0; i < (u32) primitiveCount; ++i )
-	{
-		VertexCache_get ( (s4DVertex**) face );
-
-		// if fully outside or outside on same side
-		if ( ( (face[0]->flag | face[1]->flag | face[2]->flag) & VERTEX4D_CLIPMASK )
-				!= VERTEX4D_INSIDE
-			)
-			continue;
-
-		// if fully inside
-		if ( ( face[0]->flag & face[1]->flag & face[2]->flag & VERTEX4D_CLIPMASK ) == VERTEX4D_INSIDE )
-		{
-			dc_area = screenarea2 ( face );
-			if ( Material.org.BackfaceCulling && F32_LOWER_EQUAL_0 ( dc_area ) )
-			{
-				continue;
-			}
-
-			dc_area = core::reciprocal ( dc_area );
-			// select mipmap
-			for ( g = 0; g != 2; ++g )
-			{
-				if ( 0 == Texmap[g].Texture )
-				{
-					CurrentShader->setTexture(g, 0, 0);
-					continue;
-				}
-
-				lodLevel = s32_log2_f32 ( texelarea2 ( face, g ) * dc_area );
-
-				CurrentShader->setTexture(g, Texmap[g].Texture, lodLevel);
-				select_polygon_mipmap2 ( (s4DVertex**) face, g );
-
-			}
-
-			// rasterize
-			CurrentShader->drawTriangle ( face[0] + 1, face[1] + 1, face[2] + 1 );
-			continue;
-		}
-
-		// else if not complete inside clipping necessary
-		irr::memcpy32_small ( ( (u8*) CurrentOut.data + ( 0 << ( SIZEOF_SVERTEX_LOG2 + 1 ) ) ), face[0], SIZEOF_SVERTEX * 2 );
-		irr::memcpy32_small ( ( (u8*) CurrentOut.data + ( 1 << ( SIZEOF_SVERTEX_LOG2 + 1 ) ) ), face[1], SIZEOF_SVERTEX * 2 );
-		irr::memcpy32_small ( ( (u8*) CurrentOut.data + ( 2 << ( SIZEOF_SVERTEX_LOG2 + 1 ) ) ), face[2], SIZEOF_SVERTEX * 2 );
-
-		u32 flag = CurrentOut.data->flag & VERTEX4D_FORMAT_MASK;
-
-		for ( g = 0; g != CurrentOut.ElementSize; ++g )
-		{
-			CurrentOut.data[g].flag = flag;
-			Temp.data[g].flag = flag;
-		}
-
-		u32 vOut;
-		vOut = clipToFrustum ( CurrentOut.data, Temp.data, 3 );
-/*
-		if ( vOut < 3 )
-		{
-			char buf[256];
-			struct SCheck
-			{
-				u32 flag;
-				const char * name;
-			};
-			
-			SCheck check[5];
-			check[0].flag = face[0]->flag;
-			check[0].name = "face0";
-			check[1].flag = face[1]->flag;
-			check[1].name = "face1";
-			check[2].flag = face[2]->flag;
-			check[2].name = "face2";
-			check[3].flag = (face[0]->flag & face[1]->flag & face[2]->flag);
-			check[3].name = "AND  ";
-			check[4].flag = (face[0]->flag | face[1]->flag | face[2]->flag);
-			check[4].name = "OR   ";
-
-			for ( s32 h = 0; h!= 5; ++h )
-			{
-				sprintf ( buf, "%s: %d %d %d %d %d %d",
-								check[h].name,
-								( check[h].flag & 1 ),
-								( check[h].flag & 2 ) >> 1,
-								( check[h].flag & 4 ) >> 2,
-								( check[h].flag & 8 ) >> 3,
-								( check[h].flag & 16 ) >> 4,
-								( check[h].flag & 32 ) >> 5
-							);
-				os::Printer::print ( buf );
-			}
-
-			sprintf ( buf, "Vout: %d\n", vOut );
-			os::Printer::print ( buf );
-
-			int hold = 1;
-		}
-*/
-		if ( vOut < 3 )
-			continue;
-
-		vOut <<= 1;
-
-		// to DC Space, project homogenous vertex
-		ndc_2_dc_and_project ( CurrentOut.data + 1, CurrentOut.data, vOut );
-
-/*
-		// if not complete inside clipping necessary
-		if ( ( test & VERTEX4D_INSIDE ) != VERTEX4D_INSIDE )
-		{
-			u32 v[2] = { PointerAsValue ( Temp ) , PointerAsValue ( CurrentOut ) };
-			for ( g = 0; g != 6; ++g )
-			{
-				vOut = clipToHyperPlane ( (s4DVertex*) v[0], (s4DVertex*) v[1], vOut, NDCPlane[g] );
-				if ( vOut < 3 )
-					break;
-
-				v[0] ^= v[1];
-				v[1] ^= v[0];
-				v[0] ^= v[1];
-
-			}
-
-			if ( vOut < 3 )
-				continue;
-
-		}
-*/
-
-		// check 2d backface culling on first
-		dc_area = screenarea ( CurrentOut.data );
-		if ( Material.org.BackfaceCulling && F32_LOWER_EQUAL_0 ( dc_area ) )
-			continue;
-
-		// select mipmap
-		for ( g = 0; g != 2; ++g )
-		{
-			if ( 0 == Texmap[g].Texture )
-			{
-				CurrentShader->setTexture(g, 0, 0);
-				continue;
-			}
-
-			lodLevel = s32_log2_f32 ( texelarea ( CurrentOut.data, g ) / dc_area );
-
-			CurrentShader->setTexture(g, Texmap[g].Texture, lodLevel);
-			select_polygon_mipmap ( CurrentOut.data, vOut, g );
-		}
-
-		// re-tesselate ( triangle-fan, 0-1-2,0-2-3.. )
-		for ( g = 0; g <= vOut - 6; g += 2 )
-		{
-			// rasterize
-			CurrentShader->drawTriangle ( CurrentOut.data + 0 + 1,
-													CurrentOut.data + g + 3,
-													CurrentOut.data + g + 5
-												);
-		}
-
-	}
-
-	// dump statistics
-/*
-	char buf [64];
-	sprintf ( buf,"VCount:%d PCount:%d CacheMiss: %d",
-					vertexCount, primitiveCount,
-					VertexCache.CacheMiss
-				);
-	os::Printer::print ( buf );
-*/
-}
-
-//! Sets the dynamic ambient light color. The default color is
-//! (0,0,0,0) which means it is dark.
-//! \param color: New color of the ambient light.
-void CSoftwareDriver2::setAmbientLight(const SColorf& color)
-{
-	Global_AmbientLight.setColorf ( color );
-}
-
-
-//! adds a dynamic light
-void CSoftwareDriver2::addDynamicLight(const SLight& dl)
-{
-	if ( Light.size () >= getMaximalDynamicLightAmount () )
-		return;
-
-	SInternalLight l;
-	l.org = dl;
-
-	// light in eye space
-	Transformation[ETS_VIEW].m.transformVect ( &l.posEyeSpace.x, l.org.Position );
-
-	l.constantAttenuation = l.org.Attenuation.X;
-	l.linearAttenuation = l.org.Attenuation.Y;
-	l.quadraticAttenuation = l.org.Attenuation.Z;
-
-	l.AmbientColor.setColorf ( l.org.AmbientColor );
-	l.DiffuseColor.setColorf ( l.org.DiffuseColor );
-	l.SpecularColor.setColorf ( l.org.SpecularColor );
-
-	switch ( dl.Type )
-	{
-		case video::ELT_DIRECTIONAL:
-		{
-			l.posEyeSpace.normalize_xyz ();
-		} break;
-	}
-
-	Light.push_back ( l );
-	CNullDriver::addDynamicLight( l.org );
-}
-
-//! deletes all dynamic lights there are
-void CSoftwareDriver2::deleteAllDynamicLights()
-{
-	Light.set_used ( 0 );
-	CNullDriver::deleteAllDynamicLights();
-
-}
-
-//! returns the maximal amount of dynamic lights the device can handle
-u32 CSoftwareDriver2::getMaximalDynamicLightAmount() const
-{
-	return 8;
-}
-
-
-
-#ifdef SOFTWARE_DRIVER_2_LIGHTING
-
-/*!
-*/
-void CSoftwareDriver2::lightVertex ( s4DVertex *dest, const S3DVertex *source )
-{
-	// apply lighting model
-	if ( false == Material.org.Lighting )
-	{
-		// should use the DiffuseColor but using pre-lit vertex color
-		dest->Color[0].setA8R8G8B8 ( source->Color.color );
-		return;
-	}
-
-	if ( Lights.size () == 0 )
-	{
-		dest->Color[0] = Material.EmissiveColor;
-		return;
-	}
-
-	// eyespace
-/*
-	core::matrix4 modelview = Transformation[ETS_WORLD].m * Transformation[ETS_VIEW].m;
-
-	core::matrix4 m2 ( modelview );
-	m2.makeInverse ();
-	core::matrix4 modelviewinversetransposed ( m2.getTransposed() );
-*/
-
-	sVec4 vertexEyeSpace;
-	sVec4 normalEyeSpace;
-	sVec4 vertexEyeSpaceUnit;
-
-	// vertex in eye space
-	Transformation[ETS_WORLD_VIEW].m.transformVect ( &vertexEyeSpace.x, source->Pos );
-	vertexEyeSpace.project_xyz ();
-
-	vertexEyeSpaceUnit = vertexEyeSpace;
-	vertexEyeSpaceUnit.normalize_xyz();
-
-	// vertex normal in eye-space
-	//modelviewinversetransposed.transformVect ( &normalEyeSpace.x, source->Normal );
-	Transformation[ETS_WORLD_VIEW_INVERSE_TRANSPOSED].m.rotateVect ( &normalEyeSpace.x, source->Normal );
-	if ( Material.org.NormalizeNormals )
-	{
-		normalEyeSpace.normalize_xyz();
-	}
-
-
-	sVec4 ambient;
-	sVec4 diffuse;
-	sVec4 specular;
-
-
-	// the universe started in darkness..
-	ambient.set ( 0.f, 0.f, 0.f, 0.f );
-	diffuse.set ( 0.f, 0.f, 0.f, 0.f );
-	specular.set ( 0.f, 0.f, 0.f, 0.f );
-
-	f32 attenuation = 1.f;
-
-	u32 i;
-	for ( i = 0; i!= Light.size (); ++i )
-	{
-		const SInternalLight &light = Light[i];
-
-		sVec4 vp;			// unit vector vertex to light
-		sVec4 lightHalf;		// blinn-phong reflection
-
-
-		switch ( light.org.Type )
-		{
-			case video::ELT_POINT:
-			{
-				// surface to light
-				vp.x = light.posEyeSpace.x - vertexEyeSpace.x;
-				vp.y = light.posEyeSpace.y - vertexEyeSpace.y;
-				vp.z = light.posEyeSpace.z - vertexEyeSpace.z;
-
-				// irrlicht attenuation model
-#if 0
-				const f32 d = vp.get_inverse_length_xyz();
-
-				vp.x *= d;
-				vp.y *= d;
-				vp.z *= d;
-				attenuation = light.org.Radius * d;
-
-#else
-				const f32 d = vp.get_length_xyz();
-				attenuation = core::reciprocal (light.constantAttenuation +
-									light.linearAttenuation * d +
-									light.quadraticAttenuation * d * d
-								);
-
-				// normalize surface to light
-				vp.normalize_xyz();
-#endif
-
-				lightHalf.x = vp.x - vertexEyeSpaceUnit.x;
-				lightHalf.y = vp.y - vertexEyeSpaceUnit.y;
-				lightHalf.z = vp.z - vertexEyeSpaceUnit.z;
-				lightHalf.normalize_xyz();
-		
-			} break;
-
-			case video::ELT_DIRECTIONAL:
-			{
-				attenuation = 1.f;
-				vp = light.posEyeSpace;
-
-				// half angle = lightvector + eye vector ( 0, 0, 1 )
-				lightHalf.x = vp.x;
-				lightHalf.y = vp.y;
-				lightHalf.z = vp.z - 1.f;
-				lightHalf.normalize_xyz();
-			} break;
-		}
-
-		// build diffuse reflection
-
-		//angle between normal and light vector
-		f32 dotVP = core::max_ ( 0.f, normalEyeSpace.dot_xyz ( vp ) );
-		f32 dotHV = core::max_ ( 0.f, normalEyeSpace.dot_xyz ( lightHalf ) );
-
-		f32 pf;
-		if ( dotVP == 0.0 )
-		{
-			pf = 0.f;
-		}
-		else
-		{
-			pf = (f32)pow(dotHV, Material.org.Shininess );
-		}
-
-		// accumulate ambient
-		ambient += light.AmbientColor * attenuation;
-		diffuse += light.DiffuseColor * ( dotVP * attenuation );
-		specular += light.SpecularColor * ( pf * attenuation );
-
-	}
-
-	sVec4 dColor;
-
-	dColor = Global_AmbientLight;
-	dColor += Material.EmissiveColor;
-	dColor += ambient * Material.AmbientColor;
-	dColor += diffuse * Material.DiffuseColor;
-	dColor += specular * Material.SpecularColor;
-	dColor.saturate();
-
-	dest->Color[0] = dColor;
-}
-
-#endif
-
-
-//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
-void CSoftwareDriver2::draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
-					 const core::rect<s32>& sourceRect, 
-					 const core::rect<s32>* clipRect, SColor color, 
-					 bool useAlphaChannelOfTexture)
-{
-	if (texture)
-	{
-		if (texture->getDriverType() != EDT_BURNINGSVIDEO)
-		{
-			os::Printer::log("Fatal Error: Tried to copy from a surface not owned by this driver.", ELL_ERROR);
-			return;
-		}
-
-		if (useAlphaChannelOfTexture)
-			((CSoftwareTexture2*)texture)->getImage()->copyToWithAlpha(
-				BackBuffer, destPos, sourceRect, color, clipRect);
-		else
-			((CSoftwareTexture2*)texture)->getImage()->copyTo(
-				BackBuffer, destPos, sourceRect, clipRect);
-	}
-}
-
-
-
-//! Draws a 2d line. 
-void CSoftwareDriver2::draw2DLine(const core::position2d<s32>& start,
-					const core::position2d<s32>& end,
-					SColor color)
-{
-	((CImage*)BackBuffer)->drawLine(start, end, color );
-}
-
-
-
-//! draw an 2d rectangle
-void CSoftwareDriver2::draw2DRectangle(SColor color, const core::rect<s32>& pos,
-									 const core::rect<s32>* clip)
-{
-	if (clip)
-	{
-		core::rect<s32> p(pos);
-
-		p.clipAgainst(*clip);
-
-		if(!p.isValid())  
-			return;
-
-		BackBuffer->drawRectangle(p, color);
-	}
-	else
-	{
-		if(!pos.isValid())
-			return;
-
-		BackBuffer->drawRectangle(pos, color);
-	}
-}
-
-//! Only used by the internal engine. Used to notify the driver that
-//! the window was resized.
-void CSoftwareDriver2::OnResize(const core::dimension2d<s32>& size)
-{
-	// make sure width and height are multiples of 2
-	core::dimension2d<s32> realSize(size);
-
-	if (realSize.Width % 2)
-		realSize.Width += 1;
-
-	if (realSize.Height % 2)
-		realSize.Height += 1;
-
-	if (ScreenSize != realSize)
-	{
-		if (ViewPort.getWidth() == ScreenSize.Width &&
-			ViewPort.getHeight() == ScreenSize.Height)
-		{
-			ViewPort = core::rect<s32>(core::position2d<s32>(0,0), realSize);
-		}
-
-		ScreenSize = realSize;
-
-		bool resetRT = (RenderTargetSurface == BackBuffer);
-
-		BackBuffer->drop();
-		BackBuffer = new CImage(ECF_SOFTWARE2, realSize);
-
-		if (resetRT)
-			setRenderTarget(BackBuffer);
-	}
-}
-
-//! returns the current render target size
-const core::dimension2d<s32>& CSoftwareDriver2::getCurrentRenderTargetSize() const
-{
-	return RenderTargetSize;
-}
-
-//!Draws an 2d rectangle with a gradient.
-void CSoftwareDriver2::draw2DRectangle(const core::rect<s32>& position,
-	SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
-	const core::rect<s32>* clip)
-{
-#ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
-
-	core::rect<s32> pos = position;
-
-	if (clip)
-		pos.clipAgainst(*clip);
-
-	if (!pos.isValid())
-		return;
-
-	const core::dimension2d<s32> renderTargetSize ( ViewPort.getSize() );
-
-	const s32 xPlus = -(renderTargetSize.Width>>1);
-	const f32 xFact = 1.0f / (renderTargetSize.Width>>1);
-
-	const s32 yPlus = renderTargetSize.Height-(renderTargetSize.Height>>1);
-	const f32 yFact = 1.0f / (renderTargetSize.Height>>1);
-
-	// fill VertexCache direct
-	s4DVertex *v;
-
-	VertexCache.vertexCount = 4;
-
-	VertexCache.info[0].index = 0;
-	VertexCache.info[1].index = 1;
-	VertexCache.info[2].index = 2;
-	VertexCache.info[3].index = 3;
-
-	v = &VertexCache.mem.data [ 0 ];
-
-	v[0].Pos.set ( (f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.UpperLeftCorner.Y) * yFact, 0.f, 1.f );
-	v[0].Color[0].setA8R8G8B8 ( colorLeftUp.color );
-
-	v[2].Pos.set ( (f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus- pos.UpperLeftCorner.Y) * yFact, 0.f, 1.f );
-	v[2].Color[0].setA8R8G8B8 ( colorRightUp.color );
-
-	v[4].Pos.set ( (f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.f ,1.f );
-	v[4].Color[0].setA8R8G8B8 ( colorRightDown.color );
-
-	v[6].Pos.set ( (f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.f, 1.f );
-	v[6].Color[0].setA8R8G8B8 ( colorLeftDown.color );
-
-	s32 i;
-	u32 g;
-
-	for ( i = 0; i!= 8; i += 2 )
-	{
-		v[i + 0].flag = clipToFrustumTest ( v + i );
-		v[i + 1].flag = 0;
-		if ( (v[i].flag & VERTEX4D_INSIDE ) == VERTEX4D_INSIDE )
-		{
-			ndc_2_dc_and_project ( v + i + 1, v + i, 2 );
-		}
-	}
-
-
-	IBurningShader * render;
-
-	render = BurningShader [ ETR_GOURAUD_ALPHA_NOZ ];
-	render->setRenderTarget(RenderTargetSurface, ViewPort);
-
-	static const s16 indexList[6] = {0,1,2,0,2,3};
-
-	s4DVertex * face[3];
-
-	for ( i = 0; i!= 6; i += 3 )
-	{
-		face[0] = VertexCache_getVertex ( indexList [ i + 0 ] );
-		face[1] = VertexCache_getVertex ( indexList [ i + 1 ] );
-		face[2] = VertexCache_getVertex ( indexList [ i + 2 ] );
-
-		// test clipping
-		u32 test = face[0]->flag & face[1]->flag & face[2]->flag & VERTEX4D_INSIDE;
-
-		if ( test == VERTEX4D_INSIDE )
-		{
-			render->drawTriangle ( face[0] + 1, face[1] + 1, face[2] + 1 );
-			continue;
-		}
-		// Todo: all vertices are clipped in 2d..
-		// is this true ?
-		u32 vOut = 6;
-		memcpy ( CurrentOut.data + 0, face[0], sizeof ( s4DVertex ) * 2 );
-		memcpy ( CurrentOut.data + 2, face[1], sizeof ( s4DVertex ) * 2 );
-		memcpy ( CurrentOut.data + 4, face[2], sizeof ( s4DVertex ) * 2 );
-
-		vOut = clipToFrustum ( CurrentOut.data, Temp.data, 3 );
-		if ( vOut < 3 )
-			continue;
-
-		vOut <<= 1;
-		// to DC Space, project homogenous vertex
-		ndc_2_dc_and_project ( CurrentOut.data + 1, CurrentOut.data, vOut );
-
-		// re-tesselate ( triangle-fan, 0-1-2,0-2-3.. )
-		for ( g = 0; g <= vOut - 6; g += 2 )
-		{
-			// rasterize
-			render->drawTriangle ( CurrentOut.data + 1, &CurrentOut.data[g + 3], &CurrentOut.data[g + 5] );
-		}
-
-	}
-#else
-	draw2DRectangle ( colorLeftUp, position, clip );
-#endif
-}
-
-
-
-//! Draws a 3d line.
-void CSoftwareDriver2::draw3DLine(const core::vector3df& start,
-	const core::vector3df& end, SColor color)
-{
-	Transformation [ ETS_CURRENT].m.transformVect ( &CurrentOut.data[0].Pos.x, start );
-	Transformation [ ETS_CURRENT].m.transformVect ( &CurrentOut.data[2].Pos.x, end );
-
-	u32 g;
-	u32 vOut;
-
-	// no clipping flags
-	for ( g = 0; g != CurrentOut.ElementSize; ++g )
-	{
-		CurrentOut.data[g].flag = 0;
-		Temp.data[g].flag = 0;
-	}
-
-	// vertices count per line
-	vOut = clipToFrustum ( CurrentOut.data, Temp.data, 2 );
-	if ( vOut < 2 )
-		return;
-
-	vOut <<= 1;
-
-	IBurningShader * line;
-	line = BurningShader [ ETR_TEXTURE_GOURAUD_WIRE ];
-	line->setRenderTarget(RenderTargetSurface, ViewPort);
-
-	// to DC Space, project homogenous vertex
-	ndc_2_dc_and_project ( CurrentOut.data + 1, CurrentOut.data, vOut );
-
-	// unproject vertex color
-#ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
-	for ( g = 0; g != vOut; g+= 2 )
-	{
-		CurrentOut.data[ g + 1].Color[0].setA8R8G8B8 ( color.color );
-	}
-#endif
-
-
-	for ( g = 0; g <= vOut - 4; g += 2 )
-	{
-		// rasterize
-		line->drawLine ( CurrentOut.data + 1, CurrentOut.data + g + 3 );
-	}
-}
-
-
-
-//! \return Returns the name of the video driver. Example: In case of the DirectX8
-//! driver, it would return "Direct3D8.1".
-const wchar_t* CSoftwareDriver2::getName() const
-{
-#ifdef BURNINGVIDEO_RENDERER_BEAUTIFUL
-	return L"burnings video 0.38b";
-#elif defined ( BURNINGVIDEO_RENDERER_ULTRA_FAST )
-	return L"burnings video 0.38uf";
-#elif defined ( BURNINGVIDEO_RENDERER_FAST )
-	return L"burnings video 0.38f";
-#else
-	return L"burnings video 0.38";
-#endif
-}
-
-//! Returns type of video driver
-E_DRIVER_TYPE CSoftwareDriver2::getDriverType() const
-{
-	return EDT_BURNINGSVIDEO;
-}
-
-//! Returns the transformation set by setTransform
-const core::matrix4& CSoftwareDriver2::getTransform(E_TRANSFORMATION_STATE state) const
-{
-	return Transformation[state].m;
-}
-
-//! Creates a render target texture.
-ITexture* CSoftwareDriver2::createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name)
-{
-	CImage* img = new CImage(ECF_SOFTWARE2, size);
-
-	ITexture* tex = new CSoftwareTexture2(img, name, false, true);
-	img->drop();
-	return tex;	
-}
-
-
-//! Clears the DepthBuffer. 
-void CSoftwareDriver2::clearZBuffer()
-{
-	if (DepthBuffer)
-		DepthBuffer->clear();
-}
-
-
-//! Returns an image created from the last rendered frame.
-IImage* CSoftwareDriver2::createScreenShot()
-{
-	return new CImage(BackBuffer->getColorFormat(), BackBuffer);
-}
-
-
-//! returns a device dependent texture from a software surface (IImage)
-//! THIS METHOD HAS TO BE OVERRIDDEN BY DERIVED DRIVERS WITH OWN TEXTURES
-ITexture* CSoftwareDriver2::createDeviceDependentTexture(IImage* surface, const char* name)
-{
-	return new CSoftwareTexture2(surface, name, getTextureCreationFlag(ETCF_CREATE_MIP_MAPS));
-
-}
-
-//! Returns the maximum amount of primitives (mostly vertices) which
-//! the device is able to render with one drawIndexedTriangleList
-//! call.
-u32 CSoftwareDriver2::getMaximalPrimitiveCount() const
-{
-	return 0x00800000;
-}
-
-} // end namespace video
-} // end namespace irr
-
-#endif // _IRR_COMPILE_WITH_BURNINGSVIDEO_
-
-namespace irr
-{
-namespace video
-{
-
-//! creates a video driver
-IVideoDriver* createSoftwareDriver2(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter)
-{
-	#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
-	return new CSoftwareDriver2(windowSize, fullscreen, io, presenter);
-	#else
-	return 0;
-	#endif // _IRR_COMPILE_WITH_BURNINGSVIDEO_
-}
-
-
-
-} // end namespace video
-} // end namespace irr
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CSoftwareDriver2.h"
+
+#include "IrrCompileConfig.h"
+
+#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
+
+#include "SoftwareDriver2_helper.h"
+#include "CSoftwareTexture2.h"
+#include "CSoftware2MaterialRenderer.h"
+#include "S3DVertex.h"
+#include "S4DVertex.h"
+
+
+#define MAT_TEXTURE(tex) ( (video::CSoftwareTexture2*) Material.org.getTexture ( tex ) )
+
+
+namespace irr
+{
+namespace video
+{
+
+
+//! constructor
+CBurningVideoDriver::CBurningVideoDriver(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter)
+: CNullDriver(io, windowSize), BackBuffer(0), Presenter(presenter),
+	WindowId(0), SceneSourceRect(0),
+	RenderTargetTexture(0), RenderTargetSurface(0), CurrentShader(0),
+	 DepthBuffer(0), CurrentOut ( 12 * 2, 128 ), Temp ( 12 * 2, 128 )
+{
+	#ifdef _DEBUG
+	setDebugName("CBurningVideoDriver");
+	#endif
+
+	// create backbuffer
+	BackBuffer = new CImage(BURNINGSHADER_COLOR_FORMAT, windowSize);
+	if (BackBuffer)
+	{
+		BackBuffer->fill(SColor(0));
+
+		// create z buffer
+		DepthBuffer = video::createDepthBuffer(BackBuffer->getDimension());
+	}
+
+	// create triangle renderers
+
+	irr::memset32 ( BurningShader, 0, sizeof ( BurningShader ) );
+	//BurningShader[ETR_FLAT] = createTRFlat2(DepthBuffer);
+	//BurningShader[ETR_FLAT_WIRE] = createTRFlatWire2(DepthBuffer);
+	BurningShader[ETR_GOURAUD] = createTriangleRendererGouraud2(DepthBuffer);
+	BurningShader[ETR_GOURAUD_ALPHA] = createTriangleRendererGouraudAlpha2(DepthBuffer );
+	BurningShader[ETR_GOURAUD_ALPHA_NOZ] = createTRGouraudAlphaNoZ2(DepthBuffer );
+	//BurningShader[ETR_GOURAUD_WIRE] = createTriangleRendererGouraudWire2(DepthBuffer);
+	//BurningShader[ETR_TEXTURE_FLAT] = createTriangleRendererTextureFlat2(DepthBuffer);
+	//BurningShader[ETR_TEXTURE_FLAT_WIRE] = createTriangleRendererTextureFlatWire2(DepthBuffer);
+	BurningShader[ETR_TEXTURE_GOURAUD] = createTriangleRendererTextureGouraud2(DepthBuffer);
+	BurningShader[ETR_TEXTURE_GOURAUD_LIGHTMAP] = createTriangleRendererTextureLightMap2_M1(DepthBuffer);
+	BurningShader[ETR_TEXTURE_GOURAUD_LIGHTMAP_M2] = createTriangleRendererTextureLightMap2_M2(DepthBuffer);
+	BurningShader[ETR_TEXTURE_GOURAUD_LIGHTMAP_M4] = createTriangleRendererGTextureLightMap2_M4(DepthBuffer);
+	BurningShader[ETR_TEXTURE_LIGHTMAP_M4] = createTriangleRendererTextureLightMap2_M4(DepthBuffer);
+	BurningShader[ETR_TEXTURE_GOURAUD_LIGHTMAP_ADD] = createTriangleRendererTextureLightMap2_Add(DepthBuffer);
+	BurningShader[ETR_TEXTURE_GOURAUD_DETAIL_MAP] = createTriangleRendererTextureDetailMap2(DepthBuffer);
+
+	BurningShader[ETR_TEXTURE_GOURAUD_WIRE] = createTriangleRendererTextureGouraudWire2(DepthBuffer);
+	BurningShader[ETR_TEXTURE_GOURAUD_NOZ] = createTRTextureGouraudNoZ2();
+	BurningShader[ETR_TEXTURE_GOURAUD_ADD] = createTRTextureGouraudAdd2(DepthBuffer);
+	BurningShader[ETR_TEXTURE_GOURAUD_ADD_NO_Z] = createTRTextureGouraudAddNoZ2(DepthBuffer);
+	BurningShader[ETR_TEXTURE_GOURAUD_VERTEX_ALPHA] = createTriangleRendererTextureVertexAlpha2 ( DepthBuffer );
+
+	BurningShader[ETR_TEXTURE_GOURAUD_ALPHA] = createTRTextureGouraudAlpha(DepthBuffer );
+	BurningShader[ETR_TEXTURE_GOURAUD_ALPHA_NOZ] = createTRTextureGouraudAlphaNoZ( DepthBuffer );
+
+	BurningShader[ETR_TEXTURE_BLEND] = createTRTextureBlend( DepthBuffer );
+
+	BurningShader[ETR_REFERENCE] = createTriangleRendererReference ( DepthBuffer );
+
+
+	// add the same renderer for all solid types
+	CSoftware2MaterialRenderer_SOLID* smr = new CSoftware2MaterialRenderer_SOLID( this);
+	CSoftware2MaterialRenderer_TRANSPARENT_ADD_COLOR* tmr = new CSoftware2MaterialRenderer_TRANSPARENT_ADD_COLOR( this);
+	CSoftware2MaterialRenderer_UNSUPPORTED * umr = new CSoftware2MaterialRenderer_UNSUPPORTED ( this );
+
+	//!TODO: addMaterialRenderer depends on pushing order....
+	addMaterialRenderer ( smr ); // EMT_SOLID
+	addMaterialRenderer ( smr ); // EMT_SOLID_2_LAYER,
+	addMaterialRenderer ( smr ); // EMT_LIGHTMAP,
+	addMaterialRenderer ( tmr ); // EMT_LIGHTMAP_ADD,
+	addMaterialRenderer ( smr ); // EMT_LIGHTMAP_M2,
+	addMaterialRenderer ( smr ); // EMT_LIGHTMAP_M4,
+	addMaterialRenderer ( smr ); // EMT_LIGHTMAP_LIGHTING,
+	addMaterialRenderer ( smr ); // EMT_LIGHTMAP_LIGHTING_M2,
+	addMaterialRenderer ( smr ); // EMT_LIGHTMAP_LIGHTING_M4,
+	addMaterialRenderer ( smr ); // EMT_DETAIL_MAP,
+	addMaterialRenderer ( umr ); // EMT_SPHERE_MAP,
+	addMaterialRenderer ( smr ); // EMT_REFLECTION_2_LAYER,
+	addMaterialRenderer ( tmr ); // EMT_TRANSPARENT_ADD_COLOR,
+	addMaterialRenderer ( tmr ); // EMT_TRANSPARENT_ALPHA_CHANNEL,
+	addMaterialRenderer ( tmr ); // EMT_TRANSPARENT_ALPHA_CHANNEL_REF,
+	addMaterialRenderer ( tmr ); // EMT_TRANSPARENT_VERTEX_ALPHA,
+	addMaterialRenderer ( smr ); // EMT_TRANSPARENT_REFLECTION_2_LAYER,
+	addMaterialRenderer ( umr ); // EMT_NORMAL_MAP_SOLID,
+	addMaterialRenderer ( umr ); // EMT_NORMAL_MAP_TRANSPARENT_ADD_COLOR,
+	addMaterialRenderer ( umr ); // EMT_NORMAL_MAP_TRANSPARENT_VERTEX_ALPHA,
+	addMaterialRenderer ( umr ); // EMT_PARALLAX_MAP_SOLID,
+	addMaterialRenderer ( umr ); // EMT_PARALLAX_MAP_TRANSPARENT_ADD_COLOR,
+	addMaterialRenderer ( umr ); // EMT_PARALLAX_MAP_TRANSPARENT_VERTEX_ALPHA,
+	addMaterialRenderer ( tmr ); // EMT_ONETEXTURE_BLEND
+
+	smr->drop ();
+	tmr->drop ();
+	umr->drop ();
+
+	// select render target
+
+	setRenderTarget(BackBuffer);
+
+	LightSpace.Global_AmbientLight.set ( 0.f, 0.f, 0.f, 0.f );
+
+	// select the right renderer
+	//CurrentShader = BurningShader[ETR_REFERENCE];
+	setCurrentShader();
+}
+
+
+//! destructor
+CBurningVideoDriver::~CBurningVideoDriver()
+{
+	// delete Backbuffer
+	if (BackBuffer)
+		BackBuffer->drop();
+
+	// delete triangle renderers
+
+	for (s32 i=0; i<ETR2_COUNT; ++i)
+		if (BurningShader[i])
+			BurningShader[i]->drop();
+
+	// delete zbuffer
+
+	if (DepthBuffer)
+		DepthBuffer->drop();
+
+	if (RenderTargetTexture)
+		RenderTargetTexture->drop();
+
+	if (RenderTargetSurface)
+		RenderTargetSurface->drop();
+}
+
+
+//! void selects the right triangle renderer based on the render states.
+void CBurningVideoDriver::setCurrentShader()
+{
+	EBurningFFShader shader = ETR_TEXTURE_GOURAUD;
+
+	bool zMaterialTest = true;
+	switch ( Material.org.MaterialType )
+	{
+		case EMT_ONETEXTURE_BLEND:
+			shader = ETR_TEXTURE_BLEND;
+			zMaterialTest = false;
+			break;
+
+		case EMT_TRANSPARENT_ALPHA_CHANNEL_REF:
+		case EMT_TRANSPARENT_ALPHA_CHANNEL:
+			if ( Material.org.ZBuffer )
+			{
+				shader = ETR_TEXTURE_GOURAUD_ALPHA;
+			}
+			else
+			{
+				shader = ETR_TEXTURE_GOURAUD_ALPHA_NOZ;
+			}
+			zMaterialTest = false;
+			break;
+
+		case EMT_TRANSPARENT_ADD_COLOR:
+			if ( Material.org.ZBuffer )
+			{
+				shader = ETR_TEXTURE_GOURAUD_ADD;
+			}
+			else
+			{
+				shader = ETR_TEXTURE_GOURAUD_ADD_NO_Z;
+			}
+			zMaterialTest = false;
+			break;
+
+		case EMT_TRANSPARENT_VERTEX_ALPHA:
+			shader = ETR_TEXTURE_GOURAUD_VERTEX_ALPHA;
+			break;
+
+		case EMT_LIGHTMAP:
+		case EMT_LIGHTMAP_LIGHTING:
+			shader = ETR_TEXTURE_GOURAUD_LIGHTMAP;
+			break;
+
+		case EMT_LIGHTMAP_M2:
+		case EMT_LIGHTMAP_LIGHTING_M2:
+			shader = ETR_TEXTURE_GOURAUD_LIGHTMAP_M2;
+			break;
+
+		case EMT_LIGHTMAP_LIGHTING_M4:
+			if ( Material.org.getTexture(1) )
+				shader = ETR_TEXTURE_GOURAUD_LIGHTMAP_M4;
+			break;
+		case EMT_LIGHTMAP_M4:
+			if ( Material.org.getTexture(1) )
+				shader = ETR_TEXTURE_LIGHTMAP_M4;
+			break;
+
+		case EMT_LIGHTMAP_ADD:
+			if ( Material.org.getTexture(1) )
+				shader = ETR_TEXTURE_GOURAUD_LIGHTMAP_ADD;
+			break;
+
+		case EMT_DETAIL_MAP:
+			shader = ETR_TEXTURE_GOURAUD_DETAIL_MAP;
+			break;
+
+		default:
+			break;
+
+	}
+
+	if ( zMaterialTest && !Material.org.ZBuffer && !Material.org.ZWriteEnable)
+	{
+		shader = ETR_TEXTURE_GOURAUD_NOZ;
+	}
+
+	if ( 0 == Material.org.getTexture(0) )
+	{
+		shader = ETR_GOURAUD;
+	}
+
+	if ( Material.org.Wireframe )
+	{
+		shader = ETR_TEXTURE_GOURAUD_WIRE;
+	}
+
+	//shader = ETR_REFERENCE;
+
+	// switchToTriangleRenderer
+	CurrentShader = BurningShader[shader];
+	if ( CurrentShader )
+	{
+		CurrentShader->setZCompareFunc ( Material.org.ZBuffer );
+		switch ( shader )
+		{
+			case ETR_TEXTURE_GOURAUD_ALPHA:
+			case ETR_TEXTURE_GOURAUD_ALPHA_NOZ:
+				CurrentShader->setParam ( 0, Material.org.MaterialTypeParam );
+				break;
+
+			case EMT_ONETEXTURE_BLEND:
+			{
+				E_BLEND_FACTOR srcFact,dstFact;
+				E_MODULATE_FUNC modulate;
+				unpack_texureBlendFunc ( srcFact, dstFact, modulate, Material.org.MaterialTypeParam );
+				CurrentShader->setParam ( 0, Material.org.MaterialTypeParam );
+			}
+			break;
+			default:
+			break;
+		}
+
+		CurrentShader->setRenderTarget(RenderTargetSurface, ViewPort);
+		CurrentShader->setMaterial ( Material );
+	}
+}
+
+
+
+//! queries the features of the driver, returns true if feature is available
+bool CBurningVideoDriver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
+{
+	if (!FeatureEnabled[feature])
+		return false;
+
+	switch (feature)
+	{
+#ifdef SOFTWARE_DRIVER_2_BILINEAR
+	case EVDF_BILINEAR_FILTER:
+		return true;
+#endif
+#ifdef SOFTWARE_DRIVER_2_MIPMAPPING
+	case EVDF_MIP_MAP:
+		return true;
+#endif
+	case EVDF_RENDER_TO_TARGET:
+	case EVDF_MULTITEXTURE:
+	case EVDF_HARDWARE_TL:
+	case EVDF_TEXTURE_NSQUARE:
+		return true;
+
+	default:
+		return false;
+	}
+}
+
+
+
+//! sets transformation
+void CBurningVideoDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat)
+{
+	Transformation[state].m = mat;
+	Transformation[state].isIdentity = mat.isIdentity();
+
+	switch ( state )
+	{
+		case ETS_VIEW:
+			Transformation[ETS_VIEW_PROJECTION].m.setbyproduct_nocheck (
+				Transformation[ETS_PROJECTION].m,
+				Transformation[ETS_VIEW].m
+			);
+			break;
+
+		case ETS_WORLD:
+			if ( Transformation[state].isIdentity )
+			{
+				Transformation[ETS_CURRENT] = Transformation[ETS_VIEW_PROJECTION];
+			}
+			else
+			{
+				Transformation[ETS_CURRENT].m.setbyproduct_nocheck (
+					Transformation[ETS_VIEW_PROJECTION].m,
+					Transformation[ETS_WORLD].m
+				);
+			}
+			Transformation[ETS_CURRENT].isIdentity = 0;
+
+#ifdef SOFTWARE_DRIVER_2_LIGHTING
+			if ( Material.org.Lighting )
+			{
+				if ( Transformation[state].isIdentity )
+				{
+					Transformation[ETS_WORLD_VIEW] = Transformation[ETS_VIEW];
+				}
+				else
+				{
+					Transformation[ETS_WORLD_VIEW].m.setbyproduct_nocheck (
+						Transformation[ETS_VIEW].m,
+						Transformation[ETS_WORLD].m
+					);
+				}
+
+				core::matrix4 m2 ( Transformation[ETS_WORLD_VIEW].m );
+				m2.makeInverse ();
+				m2.getTransposed ( Transformation[ETS_WORLD_VIEW_INVERSE_TRANSPOSED].m );
+			}
+#endif
+			break;
+		default:
+			break;
+	}
+}
+
+
+//! sets a material
+void CBurningVideoDriver::setMaterial(const SMaterial& material)
+{
+	Material.org = material;
+
+	Material.AmbientColor.setA8R8G8B8 ( Material.org.AmbientColor.color );
+	Material.DiffuseColor.setA8R8G8B8 ( Material.org.DiffuseColor.color );
+	Material.EmissiveColor.setA8R8G8B8 ( Material.org.EmissiveColor.color );
+	Material.SpecularColor.setA8R8G8B8 ( Material.org.SpecularColor.color );
+
+	Material.SpecularEnabled = Material.org.Shininess != 0.f;
+	if (Material.SpecularEnabled)
+		Material.org.NormalizeNormals = true;
+
+	for (u32 i = 0; i < 2; ++i)
+	{
+		setTransform((E_TRANSFORMATION_STATE) (ETS_TEXTURE_0 + i),
+				material.getTextureMatrix(i));
+	}
+
+	setCurrentShader();
+}
+
+
+//! clears the zbuffer
+bool CBurningVideoDriver::beginScene(bool backBuffer, bool zBuffer,
+		SColor color, void* windowId, core::rect<s32>* sourceRect)
+{
+	CNullDriver::beginScene(backBuffer, zBuffer, color, windowId, sourceRect);
+	WindowId = windowId;
+	SceneSourceRect = sourceRect;
+
+	if (backBuffer && BackBuffer)
+		BackBuffer->fill(color);
+
+	if (DepthBuffer && zBuffer)
+		DepthBuffer->clear();
+
+	return true;
+}
+
+
+//! presents the rendered scene on the screen, returns false if failed
+bool CBurningVideoDriver::endScene()
+{
+	CNullDriver::endScene();
+
+	return Presenter->present(BackBuffer, WindowId, SceneSourceRect);
+}
+
+
+//! sets a render target
+bool CBurningVideoDriver::setRenderTarget(video::ITexture* texture, bool clearBackBuffer,
+								 bool clearZBuffer, SColor color)
+{
+	if (texture && texture->getDriverType() != EDT_BURNINGSVIDEO)
+	{
+		os::Printer::log("Fatal Error: Tried to set a texture not owned by this driver.", ELL_ERROR);
+		return false;
+	}
+
+	if (RenderTargetTexture)
+		RenderTargetTexture->drop();
+
+	RenderTargetTexture = texture;
+
+	if (RenderTargetTexture)
+	{
+		RenderTargetTexture->grab();
+		setRenderTarget(((CSoftwareTexture2*)RenderTargetTexture)->getTexture());
+	}
+	else
+	{
+		setRenderTarget(BackBuffer);
+	}
+
+	if (RenderTargetSurface && (clearBackBuffer || clearZBuffer))
+	{
+		if (clearZBuffer)
+			DepthBuffer->clear();
+
+		if (clearBackBuffer)
+			((video::CImage*)RenderTargetSurface)->fill( color );
+	}
+
+	return true;
+}
+
+
+//! sets a render target
+void CBurningVideoDriver::setRenderTarget(video::CImage* image)
+{
+	if (RenderTargetSurface)
+		RenderTargetSurface->drop();
+
+	RenderTargetSurface = image;
+	RenderTargetSize.Width = 0;
+	RenderTargetSize.Height = 0;
+
+	if (RenderTargetSurface)
+	{
+		RenderTargetSurface->grab();
+		RenderTargetSize = RenderTargetSurface->getDimension();
+	}
+
+	setViewPort(core::rect<s32>(0,0,RenderTargetSize.Width,RenderTargetSize.Height));
+
+	if (DepthBuffer)
+		DepthBuffer->setSize(RenderTargetSize);
+}
+
+
+
+//! sets a viewport
+void CBurningVideoDriver::setViewPort(const core::rect<s32>& area)
+{
+	ViewPort = area;
+
+	core::rect<s32> rendert(0,0,RenderTargetSize.Width,RenderTargetSize.Height);
+	ViewPort.clipAgainst(rendert);
+
+	Transformation [ ETS_CLIPSCALE ].m.buildNDCToDCMatrix ( ViewPort, 1 );
+
+
+	if (CurrentShader)
+		CurrentShader->setRenderTarget(RenderTargetSurface, ViewPort);
+}
+
+/*
+	generic plane clipping in homogenous coordinates
+	special case ndc frustum <-w,w>,<-w,w>,<-w,w>
+	can be rewritten with compares e.q near plane, a.z < -a.w and b.z < -b.w
+*/
+
+const sVec4 CBurningVideoDriver::NDCPlane[6] =
+{
+	sVec4(  0.f,  0.f, -1.f, -1.f ),	// near
+	sVec4(  0.f,  0.f,  1.f, -1.f ),	// far
+	sVec4(  1.f,  0.f,  0.f, -1.f ),	// left
+	sVec4( -1.f,  0.f,  0.f, -1.f ),	// right
+	sVec4(  0.f,  1.f,  0.f, -1.f ),	// bottom
+	sVec4(  0.f, -1.f,  0.f, -1.f )		// top
+};
+
+
+
+/*
+	test a vertex if it's inside the standard frustum
+
+	this is the generic one..
+
+	f32 dotPlane;
+	for ( u32 i = 0; i!= 6; ++i )
+	{
+		dotPlane = v->Pos.dotProduct ( NDCPlane[i] );
+		core::setbit_cond( flag, dotPlane <= 0.f, 1 << i );
+	}
+
+	// this is the base for ndc frustum <-w,w>,<-w,w>,<-w,w>
+	core::setbit_cond( flag, ( v->Pos.z - v->Pos.w ) <= 0.f, 1 );
+	core::setbit_cond( flag, (-v->Pos.z - v->Pos.w ) <= 0.f, 2 );
+	core::setbit_cond( flag, ( v->Pos.x - v->Pos.w ) <= 0.f, 4 );
+	core::setbit_cond( flag, (-v->Pos.x - v->Pos.w ) <= 0.f, 8 );
+	core::setbit_cond( flag, ( v->Pos.y - v->Pos.w ) <= 0.f, 16 );
+	core::setbit_cond( flag, (-v->Pos.y - v->Pos.w ) <= 0.f, 32 );
+
+*/
+#ifdef IRRLICHT_FAST_MATH
+
+REALINLINE u32 CBurningVideoDriver::clipToFrustumTest ( const s4DVertex * v  ) const
+{
+	f32 test[6];
+	u32 flag;
+	const f32 w = - v->Pos.w;
+
+	// a conditional move is needed....FCOMI ( but we don't have it )
+	// so let the fpu calculate and write it back.
+	// cpu makes the compare, interleaving
+
+	test[0] =  v->Pos.z + w;
+	test[1] = -v->Pos.z + w;
+	test[2] =  v->Pos.x + w;
+	test[3] = -v->Pos.x + w;
+	test[4] =  v->Pos.y + w;
+	test[5] = -v->Pos.y + w;
+
+	flag  = (IR ( test[0] )              ) >> 31;
+	flag |= (IR ( test[1] ) & 0x80000000 ) >> 30;
+	flag |= (IR ( test[2] ) & 0x80000000 ) >> 29;
+	flag |= (IR ( test[3] ) & 0x80000000 ) >> 28;
+	flag |= (IR ( test[4] ) & 0x80000000 ) >> 27;
+	flag |= (IR ( test[5] ) & 0x80000000 ) >> 26;
+
+/*
+	flag  = F32_LOWER_EQUAL_0 ( test[0] );
+	flag |= F32_LOWER_EQUAL_0 ( test[1] ) << 1;
+	flag |= F32_LOWER_EQUAL_0 ( test[2] ) << 2;
+	flag |= F32_LOWER_EQUAL_0 ( test[3] ) << 3;
+	flag |= F32_LOWER_EQUAL_0 ( test[4] ) << 4;
+	flag |= F32_LOWER_EQUAL_0 ( test[5] ) << 5;
+*/
+	return flag;
+}
+
+#else
+
+
+REALINLINE u32 CBurningVideoDriver::clipToFrustumTest ( const s4DVertex * v  ) const
+{
+	u32 flag = 0;
+	for ( u32 i = 0; i!= 6; ++i )
+	{
+		core::setbit_cond( flag, v->Pos.dotProduct ( NDCPlane[i] ) <= 0.f, 1 << i );
+	}
+	return flag;
+}
+
+#endif // _MSC_VER
+
+u32 CBurningVideoDriver::clipToHyperPlane ( s4DVertex * dest, const s4DVertex * source, u32 inCount, const sVec4 &plane )
+{
+	u32 outCount = 0;
+	s4DVertex * out = dest;
+
+	const s4DVertex * a;
+	const s4DVertex * b = source;
+
+	f32 bDotPlane;
+
+	bDotPlane = b->Pos.dotProduct ( plane );
+
+	for( u32 i = 1; i < inCount + 1; ++i)
+	{
+		const s32 condition = i - inCount;
+		const s32 index = (( ( condition >> 31 ) & ( i ^ condition ) ) ^ condition ) << 1;
+
+		a = &source[ index ];
+
+		// current point inside
+		if ( a->Pos.dotProduct ( plane ) <= 0.f )
+		{
+			// last point outside
+			if ( F32_GREATER_0 ( bDotPlane ) )
+			{
+				// intersect line segment with plane
+				out->interpolate ( *b, *a, bDotPlane / (b->Pos - a->Pos).dotProduct ( plane ) );
+				out += 2;
+				outCount += 1;
+			}
+
+			// copy current to out
+			//*out = *a;
+			irr::memcpy32_small ( out, a, SIZEOF_SVERTEX * 2 );
+			b = out;
+
+			out += 2;
+			outCount += 1;
+		}
+		else
+		{
+			// current point outside
+
+			if ( F32_LOWER_EQUAL_0 (  bDotPlane ) )
+			{
+				// previous was inside
+				// intersect line segment with plane
+				out->interpolate ( *b, *a, bDotPlane / (b->Pos - a->Pos).dotProduct ( plane ) );
+				out += 2;
+				outCount += 1;
+			}
+			// pointer
+			b = a;
+		}
+
+		bDotPlane = b->Pos.dotProduct ( plane );
+
+	}
+
+	return outCount;
+}
+
+
+u32 CBurningVideoDriver::clipToFrustum ( s4DVertex *v0, s4DVertex * v1, const u32 vIn )
+{
+	u32 vOut = vIn;
+
+	vOut = clipToHyperPlane ( v1, v0, vOut, NDCPlane[0] ); if ( vOut < vIn ) return vOut;
+	vOut = clipToHyperPlane ( v0, v1, vOut, NDCPlane[1] ); if ( vOut < vIn ) return vOut;
+	vOut = clipToHyperPlane ( v1, v0, vOut, NDCPlane[2] ); if ( vOut < vIn ) return vOut;
+	vOut = clipToHyperPlane ( v0, v1, vOut, NDCPlane[3] ); if ( vOut < vIn ) return vOut;
+	vOut = clipToHyperPlane ( v1, v0, vOut, NDCPlane[4] ); if ( vOut < vIn ) return vOut;
+	vOut = clipToHyperPlane ( v0, v1, vOut, NDCPlane[5] );
+	return vOut;
+}
+
+/*!
+ Part I:
+	apply Clip Scale matrix
+	From Normalized Device Coordiante ( NDC ) Space to Device Coordinate Space ( DC )
+
+ Part II:
+	Project homogeneous vector
+	homogeneous to non-homogenous coordinates ( dividebyW )
+
+	Incoming: ( xw, yw, zw, w, u, v, 1, R, G, B, A )
+	Outgoing: ( xw/w, yw/w, zw/w, w/w, u/w, v/w, 1/w, R/w, G/w, B/w, A/w )
+
+
+	replace w/w by 1/w
+*/
+inline void CBurningVideoDriver::ndc_2_dc_and_project ( s4DVertex *dest,s4DVertex *source, u32 vIn ) const
+{
+	u32 g;
+
+	for ( g = 0; g != vIn; g += 2 )
+	{
+		if ( (dest[g].flag & VERTEX4D_PROJECTED ) == VERTEX4D_PROJECTED )
+			continue;
+
+		dest[g].flag = source[g].flag | VERTEX4D_PROJECTED;
+
+		const f32 w = source[g].Pos.w;
+		const f32 iw = core::reciprocal ( w );
+
+		// to device coordinates
+		dest[g].Pos.x = iw * ( source[g].Pos.x * Transformation [ ETS_CLIPSCALE ].m[ 0] + w * Transformation [ ETS_CLIPSCALE ].m[12] );
+		dest[g].Pos.y = iw * ( source[g].Pos.y * Transformation [ ETS_CLIPSCALE ].m[ 5] + w * Transformation [ ETS_CLIPSCALE ].m[13] );
+
+#ifndef SOFTWARE_DRIVER_2_USE_WBUFFER
+		dest[g].Pos.z = iw * source[g].Pos.z;
+#endif
+
+	#ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
+		#ifdef SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT
+			dest[g].Color[0] = source[g].Color[0] * iw;
+		#else
+			dest[g].Color[0] = source[g].Color[0];
+		#endif
+
+	#endif
+
+		dest[g].Pos.w = iw;
+	}
+}
+
+
+inline void CBurningVideoDriver::ndc_2_dc_and_project2 ( const s4DVertex **v, const u32 size ) const
+{
+	u32 g;
+
+	for ( g = 0; g != size; g += 1 )
+	{
+		s4DVertex * a = (s4DVertex*) v[g];
+
+		if ( (a[1].flag & VERTEX4D_PROJECTED ) == VERTEX4D_PROJECTED )
+			continue;
+
+		a[1].flag = a->flag | VERTEX4D_PROJECTED;
+
+		// project homogenous vertex, store 1/w
+		const f32 w = a->Pos.w;
+		const f32 iw = core::reciprocal ( w );
+
+		// to device coordinates
+		a[1].Pos.x = iw * ( a->Pos.x * Transformation [ ETS_CLIPSCALE ].m[ 0] + w * Transformation [ ETS_CLIPSCALE ].m[12] );
+		a[1].Pos.y = iw * ( a->Pos.y * Transformation [ ETS_CLIPSCALE ].m[ 5] + w * Transformation [ ETS_CLIPSCALE ].m[13] );
+
+#ifndef SOFTWARE_DRIVER_2_USE_WBUFFER
+		a[1].Pos.z = a->Pos.z * iw;
+#endif
+
+	#ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
+		#ifdef SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT
+			a[1].Color[0] = a->Color[0] * iw;
+		#else
+			a[1].Color[0] = a->Color[0];
+		#endif
+	#endif
+
+		a[1].Pos.w = iw;
+
+	}
+
+}
+
+
+/*!
+	crossproduct in projected 2D -> screen area triangle
+*/
+inline f32 CBurningVideoDriver::screenarea ( const s4DVertex *v ) const
+{
+	return	( ( v[3].Pos.x - v[1].Pos.x ) * ( v[5].Pos.y - v[1].Pos.y ) ) -
+			( ( v[3].Pos.y - v[1].Pos.y ) * ( v[5].Pos.x - v[1].Pos.x ) );
+}
+
+
+/*!
+*/
+inline f32 CBurningVideoDriver::texelarea ( const s4DVertex *v, int tex ) const
+{
+	f32 z;
+
+	z =		( (v[2].Tex[tex].x - v[0].Tex[tex].x ) * (v[4].Tex[tex].y - v[0].Tex[tex].y ) )
+		 -	( (v[4].Tex[tex].x - v[0].Tex[tex].x ) * (v[2].Tex[tex].y - v[0].Tex[tex].y ) );
+
+	return MAT_TEXTURE ( tex )->getLODFactor ( z );
+}
+
+/*!
+	crossproduct in projected 2D
+*/
+inline f32 CBurningVideoDriver::screenarea2 ( const s4DVertex **v ) const
+{
+	return	( (( v[1] + 1 )->Pos.x - (v[0] + 1 )->Pos.x ) * ( (v[2] + 1 )->Pos.y - (v[0] + 1 )->Pos.y ) ) -
+			( (( v[1] + 1 )->Pos.y - (v[0] + 1 )->Pos.y ) * ( (v[2] + 1 )->Pos.x - (v[0] + 1 )->Pos.x ) );
+}
+
+/*!
+*/
+inline f32 CBurningVideoDriver::texelarea2 ( const s4DVertex **v, s32 tex ) const
+{
+	f32 z;
+	z =		( (v[1]->Tex[tex].x - v[0]->Tex[tex].x ) * (v[2]->Tex[tex].y - v[0]->Tex[tex].y ) )
+		 -	( (v[2]->Tex[tex].x - v[0]->Tex[tex].x ) * (v[1]->Tex[tex].y - v[0]->Tex[tex].y ) );
+
+	return MAT_TEXTURE ( tex )->getLODFactor ( z );
+}
+
+
+/*!
+*/
+inline void CBurningVideoDriver::select_polygon_mipmap ( s4DVertex *v, u32 vIn, s32 tex )
+{
+	f32 f[2];
+
+	f[0] = (f32) MAT_TEXTURE ( tex )->getSize().Width;
+	f[1] = (f32) MAT_TEXTURE ( tex )->getSize().Height;
+
+#ifdef SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT
+	for ( u32 g = 0; g != vIn; g += 2 )
+	{
+		(v + g + 1 )->Tex[tex].x	= (v + g + 0)->Tex[tex].x * ( v + g + 1 )->Pos.w * f[0];
+		(v + g + 1 )->Tex[tex].y	= (v + g + 0)->Tex[tex].y * ( v + g + 1 )->Pos.w * f[1];
+	}
+#else
+	for ( u32 g = 0; g != vIn; g += 2 )
+	{
+		(v + g + 1 )->Tex[tex].x	= (v + g + 0)->Tex[tex].x * f[0];
+		(v + g + 1 )->Tex[tex].y	= (v + g + 0)->Tex[tex].y * f[1];
+	}
+#endif
+}
+
+inline void CBurningVideoDriver::select_polygon_mipmap2 ( s4DVertex **v, s32 tex ) const
+{
+	f32 f[2];
+
+	f[0] = (f32) MAT_TEXTURE ( tex )->getSize().Width;
+	f[1] = (f32) MAT_TEXTURE ( tex )->getSize().Height;
+
+#ifdef SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT
+	(v[0] + 1 )->Tex[tex].x	= v[0]->Tex[tex].x * ( v[0] + 1 )->Pos.w * f[0];
+	(v[0] + 1 )->Tex[tex].y	= v[0]->Tex[tex].y * ( v[0] + 1 )->Pos.w * f[1];
+
+	(v[1] + 1 )->Tex[tex].x	= v[1]->Tex[tex].x * ( v[1] + 1 )->Pos.w * f[0];
+	(v[1] + 1 )->Tex[tex].y	= v[1]->Tex[tex].y * ( v[1] + 1 )->Pos.w * f[1];
+
+	(v[2] + 1 )->Tex[tex].x	= v[2]->Tex[tex].x * ( v[2] + 1 )->Pos.w * f[0];
+	(v[2] + 1 )->Tex[tex].y	= v[2]->Tex[tex].y * ( v[2] + 1 )->Pos.w * f[1];
+
+#else
+	(v[0] + 1 )->Tex[tex].x	= v[0]->Tex[tex].x * f[0];
+	(v[0] + 1 )->Tex[tex].y	= v[0]->Tex[tex].y * f[1];
+
+	(v[1] + 1 )->Tex[tex].x	= v[1]->Tex[tex].x * f[0];
+	(v[1] + 1 )->Tex[tex].y	= v[1]->Tex[tex].y * f[1];
+
+	(v[2] + 1 )->Tex[tex].x	= v[2]->Tex[tex].x * f[0];
+	(v[2] + 1 )->Tex[tex].y	= v[2]->Tex[tex].y * f[1];
+#endif
+}
+
+// Vertex Cache
+const SVSize CBurningVideoDriver::vSize[] =
+{
+	{ VERTEX4D_FORMAT_TEXTURE_1 | VERTEX4D_FORMAT_COLOR_1, sizeof(S3DVertex), 1 },
+	{ VERTEX4D_FORMAT_TEXTURE_2 | VERTEX4D_FORMAT_COLOR_1, sizeof(S3DVertex2TCoords),2 },
+	{ VERTEX4D_FORMAT_TEXTURE_2 | VERTEX4D_FORMAT_COLOR_1, sizeof(S3DVertexTangents),2 }
+};
+
+
+
+/*!
+	fill a cache line with transformed, light and clipp test triangles
+*/
+void CBurningVideoDriver::VertexCache_fill(const u32 sourceIndex,
+					const u32 destIndex)
+{
+	u8 * source;
+	s4DVertex *dest;
+
+	source = (u8*) VertexCache.vertices + ( sourceIndex * vSize[VertexCache.vType].Pitch );
+
+	// it's a look ahead so we never hit it..
+	// but give priority...
+	//VertexCache.info[ destIndex ].hit = hitCount;
+
+	// store info
+	VertexCache.info[ destIndex ].index = sourceIndex;
+	VertexCache.info[ destIndex ].hit = 0;
+
+	// destination Vertex
+	dest = (s4DVertex *) ( (u8*) VertexCache.mem.data + ( destIndex << ( SIZEOF_SVERTEX_LOG2 + 1  ) ) );
+
+	// transform Model * World * Camera * Projection * NDCSpace matrix
+	Transformation [ ETS_CURRENT].m.transformVect ( &dest->Pos.x, ((S3DVertex*) source )->Pos );
+
+#ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
+
+	// light Vertex
+	#ifdef SOFTWARE_DRIVER_2_LIGHTING
+		lightVertex ( dest, ((S3DVertex*) source ) );
+	#else
+		dest->Color[0].setA8R8G8B8 ( ((S3DVertex*) source )->Color.color );
+	#endif
+#endif
+
+	// transfer texture coordinates
+	if ( Transformation [ ETS_TEXTURE_0 ].isIdentity )
+	{
+		// only look on first transform
+		irr::memcpy32_small ( &dest->Tex[0],
+						&((S3DVertex*) source )->TCoords,
+						vSize[VertexCache.vType].TexSize * ( sizeof ( f32 ) * 2 )
+					);
+	}
+	else
+	{
+	/*
+			Generate texture coordinates as linear functions so that:
+				u = Ux*x + Uy*y + Uz*z + Uw
+				v = Vx*x + Vy*y + Vz*z + Vw
+			The matrix M for this case is:
+				Ux  Vx  0  0
+				Uy  Vy  0  0
+				Uz  Vz  0  0
+				Uw  Vw  0  0
+	*/
+
+		const core::vector2d<f32> *src = &((S3DVertex*) source )->TCoords;
+		u32 t;
+
+		for ( t = 0; t != vSize[VertexCache.vType].TexSize; ++t )
+		{
+			const core::matrix4& M = Transformation [ ETS_TEXTURE_0 + t ].m;
+			if ( Material.org.TextureLayer[t].TextureWrap==ETC_REPEAT )
+			{
+				dest->Tex[t].x = M[0] * src[t].X + M[4] * src[t].Y + M[8];
+				dest->Tex[t].y = M[1] * src[t].X + M[5] * src[t].Y + M[9];
+			}
+			else
+			{
+				f32 tx1, ty1;
+
+				tx1 = M[0] * src[t].X + M[4] * src[t].Y + M[8];
+				ty1 = M[1] * src[t].X + M[5] * src[t].Y + M[9];
+
+				dest->Tex[t].x = tx1 <= 0.f ? 0.f : tx1 >= 1.f ? 1.f : tx1;
+				dest->Tex[t].y = ty1 <= 0.f ? 0.f : ty1 >= 1.f ? 1.f : ty1;
+
+				//dest->Tex[t].x = core::clamp ( M[0] * src[t].X + M[4] * src[t].Y + M[8], 0.f, 1.f );
+				//dest->Tex[t].y = core::clamp ( M[1] * src[t].X + M[5] * src[t].Y + M[9], 0.f, 1.f );
+			}
+		}
+
+	}
+
+	dest[0].flag = dest[1].flag = vSize[VertexCache.vType].Format;
+
+	// test vertex
+	dest[0].flag |= clipToFrustumTest ( dest);
+
+	// to DC Space, project homogenous vertex
+	if ( (dest[0].flag & VERTEX4D_CLIPMASK ) == VERTEX4D_INSIDE )
+	{
+		ndc_2_dc_and_project2 ( (const s4DVertex**) &dest, 1 );
+	}
+
+	//return dest;
+}
+
+//
+
+REALINLINE s4DVertex * CBurningVideoDriver::VertexCache_getVertex ( const u32 sourceIndex )
+{
+	for ( s32 i = 0; i < VERTEXCACHE_ELEMENT; ++i )
+	{
+		if ( VertexCache.info[ i ].index == sourceIndex )
+		{
+			return (s4DVertex *) ( (u8*) VertexCache.mem.data + ( i << ( SIZEOF_SVERTEX_LOG2 + 1  ) ) );
+		}
+	}
+	return 0;
+}
+
+
+/*
+	Cache based on linear walk indices
+	fill blockwise on the next 16(Cache_Size) unique vertices in indexlist
+	merge the next 16 vertices with the current
+*/
+REALINLINE void CBurningVideoDriver::VertexCache_get ( s4DVertex ** face )
+{
+	SCacheInfo info[VERTEXCACHE_ELEMENT];
+
+	// next primitive must be complete in cache
+	if (	VertexCache.indicesIndex - VertexCache.indicesRun < 3 &&
+			VertexCache.indicesIndex < VertexCache.indexCount
+		)
+	{
+		// rewind to start of primitive
+		VertexCache.indicesIndex = VertexCache.indicesRun;
+
+		irr::memset32 ( info, VERTEXCACHE_MISS, sizeof ( info ) );
+
+		// get the next unique vertices cache line
+		u32 fillIndex = 0;
+		u32 dIndex;
+		u32 i;
+
+		while ( VertexCache.indicesIndex < VertexCache.indexCount &&
+				fillIndex < VERTEXCACHE_ELEMENT
+				)
+		{
+			u32 sourceIndex = VertexCache.indices [ VertexCache.indicesIndex++ ];
+
+			// if not exist, push back
+			s32 exist = 0;
+			for ( dIndex = 0;  dIndex < fillIndex; ++dIndex )
+			{
+				if ( info[ dIndex ].index == sourceIndex )
+				{
+					exist = 1;
+					break;
+				}
+			}
+
+			if ( 0 == exist )
+			{
+				info[fillIndex++].index = sourceIndex;
+			}
+		}
+
+		// clear marks
+		for ( i = 0; i!= VERTEXCACHE_ELEMENT; ++i )
+		{
+			VertexCache.info[i].hit = 0;
+		}
+
+		// mark all exisiting
+		for ( i = 0; i!= fillIndex; ++i )
+		{
+			for ( dIndex = 0;  dIndex < VERTEXCACHE_ELEMENT; ++dIndex )
+			{
+				if ( VertexCache.info[ dIndex ].index == info[i].index )
+				{
+					info[i].hit = dIndex;
+					VertexCache.info[ dIndex ].hit = 1;
+					break;
+				}
+			}
+		}
+
+		// fill new
+		for ( i = 0; i!= fillIndex; ++i )
+		{
+			if ( info[i].hit != VERTEXCACHE_MISS )
+				continue;
+
+			for ( dIndex = 0;  dIndex < VERTEXCACHE_ELEMENT; ++dIndex )
+			{
+				if ( 0 == VertexCache.info[dIndex].hit )
+				{
+					VertexCache_fill ( info[i].index, dIndex );
+					VertexCache.info[dIndex].hit += 1;
+					info[i].hit = dIndex;
+					break;
+				}
+			}
+		}
+	}
+
+	const u32 i0 = core::if_c_a_else_0 ( VertexCache.pType != scene::EPT_TRIANGLE_FAN, VertexCache.indicesRun );
+
+	face[0] = VertexCache_getVertex ( VertexCache.indices[ i0    ] );
+	face[1] = VertexCache_getVertex ( VertexCache.indices[ VertexCache.indicesRun + 1] );
+	face[2] = VertexCache_getVertex ( VertexCache.indices[ VertexCache.indicesRun + 2] );
+
+	VertexCache.indicesRun += VertexCache.primitivePitch;
+}
+
+REALINLINE void CBurningVideoDriver::VertexCache_get2 ( s4DVertex ** face )
+{
+	const u32 i0 = core::if_c_a_else_0 ( VertexCache.pType != scene::EPT_TRIANGLE_FAN, VertexCache.indicesRun );
+
+	VertexCache_fill ( VertexCache.indices[ i0    ], 0 );
+	VertexCache_fill ( VertexCache.indices[ VertexCache.indicesRun + 1], 1 );
+	VertexCache_fill ( VertexCache.indices[ VertexCache.indicesRun + 2], 2 );
+
+	VertexCache.indicesRun += VertexCache.primitivePitch;
+
+	face[0] = (s4DVertex *) ( (u8*) VertexCache.mem.data + ( 0 << ( SIZEOF_SVERTEX_LOG2 + 1  ) ) );
+	face[1] = (s4DVertex *) ( (u8*) VertexCache.mem.data + ( 1 << ( SIZEOF_SVERTEX_LOG2 + 1  ) ) );
+	face[2] = (s4DVertex *) ( (u8*) VertexCache.mem.data + ( 2 << ( SIZEOF_SVERTEX_LOG2 + 1  ) ) );
+
+}
+
+void CBurningVideoDriver::VertexCache_reset ( const void* vertices, u32 vertexCount,
+											const u16* indices, u32 primitiveCount,
+											E_VERTEX_TYPE vType,scene::E_PRIMITIVE_TYPE pType )
+{
+	VertexCache.vertices = vertices;
+	VertexCache.vertexCount = vertexCount;
+
+	VertexCache.indices = indices;
+	VertexCache.indicesIndex = 0;
+	VertexCache.indicesRun = 0;
+
+	VertexCache.vType = vType;
+	VertexCache.pType = pType;
+
+	switch ( VertexCache.pType )
+	{
+		case scene::EPT_TRIANGLES:
+			VertexCache.indexCount = primitiveCount + primitiveCount + primitiveCount;
+			VertexCache.primitivePitch = 3;
+			break;
+		case scene::EPT_TRIANGLE_FAN:
+			VertexCache.indexCount = primitiveCount + 2;
+			VertexCache.primitivePitch = 1;
+			break;
+	}
+
+	irr::memset32 ( VertexCache.info, VERTEXCACHE_MISS, sizeof ( VertexCache.info ) );
+
+}
+
+
+void CBurningVideoDriver::drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
+				const void* indexList, u32 primitiveCount,
+				E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
+
+{
+	switch (iType)
+	{
+		case (EIT_16BIT):
+		{
+			drawVertexPrimitiveList16(vertices, vertexCount, (const u16*) indexList, primitiveCount, vType, pType);
+			break;
+		}
+		case (EIT_32BIT):
+		{
+			os::Printer::log("Software driver can not render 32bit buffers", ELL_ERROR);
+			break;
+		}
+	}
+
+
+}
+
+
+
+//! draws a vertex primitive list
+void CBurningVideoDriver::drawVertexPrimitiveList16(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType)
+{
+	if (!checkPrimitiveCount(primitiveCount))
+		return;
+
+	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType, EIT_16BIT);
+
+	if ( 0 == CurrentShader )
+		return;
+
+
+	VertexCache_reset ( vertices, vertexCount, indexList, primitiveCount, vType, pType );
+
+	const s4DVertex * face[3];
+
+	f32 dc_area;
+	s32 lodLevel;
+	u32 i;
+	u32 g;
+
+	for ( i = 0; i < (u32) primitiveCount; ++i )
+	{
+		VertexCache_get ( (s4DVertex**) face );
+
+		// if fully outside or outside on same side
+		if ( ( (face[0]->flag | face[1]->flag | face[2]->flag) & VERTEX4D_CLIPMASK )
+				!= VERTEX4D_INSIDE
+			)
+			continue;
+
+		// if fully inside
+		if ( ( face[0]->flag & face[1]->flag & face[2]->flag & VERTEX4D_CLIPMASK ) == VERTEX4D_INSIDE )
+		{
+			dc_area = screenarea2 ( face );
+			if ( Material.org.BackfaceCulling && F32_LOWER_EQUAL_0( dc_area ) )
+				continue;
+			if ( Material.org.FrontfaceCulling && F32_GREATER_EQUAL_0( dc_area ) )
+				continue;
+
+			dc_area = core::reciprocal ( dc_area );
+
+			// select mipmap
+
+			for ( g = 0; g != vSize[VertexCache.vType].TexSize; ++g )
+			//for ( g = 0; g != BURNING_MATERIAL_MAX_TEXTURES; ++g )
+			{
+				if ( 0 == MAT_TEXTURE ( g ) )
+				{
+					CurrentShader->setTextureParam(g, 0, 0);
+					continue;
+				}
+
+				lodLevel = s32_log2_f32 ( texelarea2 ( face, g ) * dc_area );
+				CurrentShader->setTextureParam(g, MAT_TEXTURE ( g ), lodLevel);
+				select_polygon_mipmap2 ( (s4DVertex**) face, g );
+
+			}
+
+			// rasterize
+			CurrentShader->drawTriangle ( face[0] + 1, face[1] + 1, face[2] + 1 );
+			continue;
+		}
+
+		// else if not complete inside clipping necessary
+		irr::memcpy32_small ( ( (u8*) CurrentOut.data + ( 0 << ( SIZEOF_SVERTEX_LOG2 + 1 ) ) ), face[0], SIZEOF_SVERTEX * 2 );
+		irr::memcpy32_small ( ( (u8*) CurrentOut.data + ( 1 << ( SIZEOF_SVERTEX_LOG2 + 1 ) ) ), face[1], SIZEOF_SVERTEX * 2 );
+		irr::memcpy32_small ( ( (u8*) CurrentOut.data + ( 2 << ( SIZEOF_SVERTEX_LOG2 + 1 ) ) ), face[2], SIZEOF_SVERTEX * 2 );
+
+		const u32 flag = CurrentOut.data->flag & VERTEX4D_FORMAT_MASK;
+
+		for ( g = 0; g != CurrentOut.ElementSize; ++g )
+		{
+			CurrentOut.data[g].flag = flag;
+			Temp.data[g].flag = flag;
+		}
+
+		u32 vOut;
+		vOut = clipToFrustum ( CurrentOut.data, Temp.data, 3 );
+/*
+		if ( vOut < 3 )
+		{
+			char buf[256];
+			struct SCheck
+			{
+				u32 flag;
+				const char * name;
+			};
+
+			SCheck check[5];
+			check[0].flag = face[0]->flag;
+			check[0].name = "face0";
+			check[1].flag = face[1]->flag;
+			check[1].name = "face1";
+			check[2].flag = face[2]->flag;
+			check[2].name = "face2";
+			check[3].flag = (face[0]->flag & face[1]->flag & face[2]->flag);
+			check[3].name = "AND  ";
+			check[4].flag = (face[0]->flag | face[1]->flag | face[2]->flag);
+			check[4].name = "OR   ";
+
+			for ( s32 h = 0; h!= 5; ++h )
+			{
+				sprintf ( buf, "%s: %d %d %d %d %d %d",
+								check[h].name,
+								( check[h].flag & 1 ),
+								( check[h].flag & 2 ) >> 1,
+								( check[h].flag & 4 ) >> 2,
+								( check[h].flag & 8 ) >> 3,
+								( check[h].flag & 16 ) >> 4,
+								( check[h].flag & 32 ) >> 5
+							);
+				os::Printer::print ( buf );
+			}
+
+			sprintf ( buf, "Vout: %d\n", vOut );
+			os::Printer::print ( buf );
+
+			int hold = 1;
+		}
+*/
+		if ( vOut < 3 )
+			continue;
+
+		vOut <<= 1;
+
+		// to DC Space, project homogenous vertex
+		ndc_2_dc_and_project ( CurrentOut.data + 1, CurrentOut.data, vOut );
+
+/*
+		// TODO: don't stick on 32 Bit Pointer
+		#define PointerAsValue(x) ( (u32) (u32*) (x) )
+
+		// if not complete inside clipping necessary
+		if ( ( test & VERTEX4D_INSIDE ) != VERTEX4D_INSIDE )
+		{
+			u32 v[2] = { PointerAsValue ( Temp ) , PointerAsValue ( CurrentOut ) };
+			for ( g = 0; g != 6; ++g )
+			{
+				vOut = clipToHyperPlane ( (s4DVertex*) v[0], (s4DVertex*) v[1], vOut, NDCPlane[g] );
+				if ( vOut < 3 )
+					break;
+
+				v[0] ^= v[1];
+				v[1] ^= v[0];
+				v[0] ^= v[1];
+			}
+
+			if ( vOut < 3 )
+				continue;
+
+		}
+*/
+
+		// check 2d backface culling on first
+		dc_area = screenarea ( CurrentOut.data );
+		if ( Material.org.BackfaceCulling && F32_LOWER_EQUAL_0 ( dc_area ) )
+			continue;
+		if ( Material.org.FrontfaceCulling && F32_GREATER_EQUAL_0( dc_area ) )
+			continue;
+
+		// select mipmap
+		//for ( g = 0; g != BURNING_MATERIAL_MAX_TEXTURES; ++g )
+		for ( g = 0; g != vSize[VertexCache.vType].TexSize; ++g )
+		{
+			if ( 0 == MAT_TEXTURE ( g ) )
+			{
+				CurrentShader->setTextureParam(g, 0, 0);
+				continue;
+			}
+
+			lodLevel = s32_log2_f32 ( texelarea ( CurrentOut.data, g ) / dc_area );
+
+			CurrentShader->setTextureParam(g, MAT_TEXTURE ( g ), lodLevel);
+			select_polygon_mipmap ( CurrentOut.data, vOut, g );
+		}
+
+		// re-tesselate ( triangle-fan, 0-1-2,0-2-3.. )
+		for ( g = 0; g <= vOut - 6; g += 2 )
+		{
+			// rasterize
+			CurrentShader->drawTriangle ( CurrentOut.data + 0 + 1,
+							CurrentOut.data + g + 3,
+							CurrentOut.data + g + 5);
+		}
+
+	}
+
+	// dump statistics
+/*
+	char buf [64];
+	sprintf ( buf,"VCount:%d PCount:%d CacheMiss: %d",
+					vertexCount, primitiveCount,
+					VertexCache.CacheMiss
+				);
+	os::Printer::print ( buf );
+*/
+}
+
+//! Sets the dynamic ambient light color. The default color is
+//! (0,0,0,0) which means it is dark.
+//! \param color: New color of the ambient light.
+void CBurningVideoDriver::setAmbientLight(const SColorf& color)
+{
+	LightSpace.Global_AmbientLight.setColorf ( color );
+}
+
+
+//! adds a dynamic light
+void CBurningVideoDriver::addDynamicLight(const SLight& dl)
+{
+	if ( LightSpace.Light.size () >= getMaximalDynamicLightAmount () )
+		return;
+
+	SBurningShaderLight l;
+	l.org = dl;
+
+	// light in eye space
+	Transformation[ETS_VIEW].m.transformVect ( &l.posEyeSpace.x, l.org.Position );
+
+	l.constantAttenuation = l.org.Attenuation.X;
+	l.linearAttenuation = l.org.Attenuation.Y;
+	l.quadraticAttenuation = l.org.Attenuation.Z;
+
+	l.AmbientColor.setColorf ( l.org.AmbientColor );
+	l.DiffuseColor.setColorf ( l.org.DiffuseColor );
+	l.SpecularColor.setColorf ( l.org.SpecularColor );
+
+	switch ( dl.Type )
+	{
+		case video::ELT_DIRECTIONAL:
+		{
+			l.posEyeSpace.normalize_xyz ();
+		} break;
+
+		default:
+			break;
+	}
+
+	LightSpace.Light.push_back ( l );
+	CNullDriver::addDynamicLight( l.org );
+}
+
+//! deletes all dynamic lights there are
+void CBurningVideoDriver::deleteAllDynamicLights()
+{
+	LightSpace.Light.set_used ( 0 );
+	CNullDriver::deleteAllDynamicLights();
+
+}
+
+//! returns the maximal amount of dynamic lights the device can handle
+u32 CBurningVideoDriver::getMaximalDynamicLightAmount() const
+{
+	return 8;
+}
+
+
+
+#ifdef SOFTWARE_DRIVER_2_LIGHTING
+
+/*!
+*/
+void CBurningVideoDriver::lightVertex ( s4DVertex *dest, const S3DVertex *source )
+{
+	// apply lighting model
+	if ( false == Material.org.Lighting )
+	{
+		// should use the DiffuseColor but using pre-lit vertex color
+		dest->Color[0].setA8R8G8B8 ( source->Color.color );
+		return;
+	}
+
+	// eyespace
+/*
+	core::matrix4 modelview = Transformation[ETS_WORLD].m * Transformation[ETS_VIEW].m;
+
+	core::matrix4 m2 ( modelview );
+	m2.makeInverse ();
+	core::matrix4 modelviewinversetransposed ( m2.getTransposed() );
+*/
+
+	sVec4 vertexEyeSpace;
+	sVec4 normalEyeSpace;
+	sVec4 vertexEyeSpaceUnit;
+
+	// vertex in eye space
+	Transformation[ETS_WORLD_VIEW].m.transformVect ( &vertexEyeSpace.x, source->Pos );
+	vertexEyeSpace.project_xyz ();
+
+	vertexEyeSpaceUnit = vertexEyeSpace;
+	vertexEyeSpaceUnit.normalize_xyz();
+
+	// vertex normal in eye-space
+	//modelviewinversetransposed.transformVect ( &normalEyeSpace.x, source->Normal );
+	Transformation[ETS_WORLD_VIEW_INVERSE_TRANSPOSED].m.rotateVect ( &normalEyeSpace.x, source->Normal );
+	if ( Material.org.NormalizeNormals )
+	{
+		normalEyeSpace.normalize_xyz();
+	}
+
+
+	sVec4 ambient;
+	sVec4 diffuse;
+	sVec4 specular;
+
+
+	// the universe started in darkness..
+	ambient.set ( 0.f, 0.f, 0.f, 0.f );
+	diffuse.set ( 0.f, 0.f, 0.f, 0.f );
+	specular.set ( 0.f, 0.f, 0.f, 0.f );
+
+	f32 attenuation = 1.f;
+
+	u32 i;
+	for ( i = 0; i!= LightSpace.Light.size (); ++i )
+	{
+		const SBurningShaderLight &light = LightSpace.Light[i];
+
+		sVec4 vp;			// unit vector vertex to light
+		sVec4 lightHalf;		// blinn-phong reflection
+
+
+		switch ( light.org.Type )
+		{
+			case video::ELT_POINT:
+			{
+				// surface to light
+				vp.x = light.posEyeSpace.x - vertexEyeSpace.x;
+				vp.y = light.posEyeSpace.y - vertexEyeSpace.y;
+				vp.z = light.posEyeSpace.z - vertexEyeSpace.z;
+
+				// irrlicht attenuation model
+#if 0
+				const f32 d = vp.get_inverse_length_xyz();
+
+				vp.x *= d;
+				vp.y *= d;
+				vp.z *= d;
+				attenuation = light.org.Radius * d;
+
+#else
+				const f32 d = vp.get_length_xyz();
+				attenuation = core::reciprocal (light.constantAttenuation +
+									light.linearAttenuation * d +
+									light.quadraticAttenuation * d * d
+								);
+
+				// normalize surface to light
+				vp.normalize_xyz();
+#endif
+
+				lightHalf.x = vp.x - vertexEyeSpaceUnit.x;
+				lightHalf.y = vp.y - vertexEyeSpaceUnit.y;
+				lightHalf.z = vp.z - vertexEyeSpaceUnit.z;
+				lightHalf.normalize_xyz();
+
+			} break;
+
+			case video::ELT_DIRECTIONAL:
+			{
+				attenuation = 1.f;
+				vp = light.posEyeSpace;
+
+				// half angle = lightvector + eye vector ( 0, 0, 1 )
+				lightHalf.x = vp.x;
+				lightHalf.y = vp.y;
+				lightHalf.z = vp.z - 1.f;
+				lightHalf.normalize_xyz();
+			} break;
+
+			default:
+				break;
+		}
+
+		// build diffuse reflection
+
+		//angle between normal and light vector
+		f32 dotVP = core::max_ ( 0.f, normalEyeSpace.dot_xyz ( vp ) );
+		f32 dotHV = core::max_ ( 0.f, normalEyeSpace.dot_xyz ( lightHalf ) );
+
+		f32 pf;
+		if ( dotVP == 0.0 )
+		{
+			pf = 0.f;
+		}
+		else
+		{
+			pf = (f32)pow(dotHV, Material.org.Shininess );
+		}
+
+		// accumulate ambient
+		ambient += light.AmbientColor * attenuation;
+		diffuse += light.DiffuseColor * ( dotVP * attenuation );
+		specular += light.SpecularColor * ( pf * attenuation );
+
+	}
+
+	sVec4 dColor;
+
+	dColor = LightSpace.Global_AmbientLight;
+	dColor += Material.EmissiveColor;
+	dColor += ambient * Material.AmbientColor;
+	dColor += diffuse * Material.DiffuseColor;
+	dColor += specular * Material.SpecularColor;
+	dColor.saturate();
+
+	dest->Color[0] = dColor;
+}
+
+#endif
+
+
+//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
+void CBurningVideoDriver::draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
+					 const core::rect<s32>& sourceRect,
+					 const core::rect<s32>* clipRect, SColor color,
+					 bool useAlphaChannelOfTexture)
+{
+	if (texture)
+	{
+		if (texture->getDriverType() != EDT_BURNINGSVIDEO)
+		{
+			os::Printer::log("Fatal Error: Tried to copy from a surface not owned by this driver.", ELL_ERROR);
+			return;
+		}
+
+		if (useAlphaChannelOfTexture)
+			((CSoftwareTexture2*)texture)->getImage()->copyToWithAlpha(
+				BackBuffer, destPos, sourceRect, color, clipRect);
+		else
+			((CSoftwareTexture2*)texture)->getImage()->copyTo(
+				BackBuffer, destPos, sourceRect, clipRect);
+	}
+}
+
+
+
+//! Draws a 2d line.
+void CBurningVideoDriver::draw2DLine(const core::position2d<s32>& start,
+					const core::position2d<s32>& end,
+					SColor color)
+{
+	((CImage*)BackBuffer)->drawLine(start, end, color );
+}
+
+//! Draws a pixel
+void CBurningVideoDriver::drawPixel(u32 x, u32 y, const SColor & color)
+{
+	((CImage*)BackBuffer)->setPixel(x, y, color);
+}
+
+//! draw an 2d rectangle
+void CBurningVideoDriver::draw2DRectangle(SColor color, const core::rect<s32>& pos,
+									 const core::rect<s32>* clip)
+{
+	if (clip)
+	{
+		core::rect<s32> p(pos);
+
+		p.clipAgainst(*clip);
+
+		if(!p.isValid())
+			return;
+
+		BackBuffer->drawRectangle(p, color);
+	}
+	else
+	{
+		if(!pos.isValid())
+			return;
+
+		BackBuffer->drawRectangle(pos, color);
+	}
+}
+
+
+//! Only used by the internal engine. Used to notify the driver that
+//! the window was resized.
+void CBurningVideoDriver::OnResize(const core::dimension2d<s32>& size)
+{
+	// make sure width and height are multiples of 2
+	core::dimension2d<s32> realSize(size);
+
+	if (realSize.Width % 2)
+		realSize.Width += 1;
+
+	if (realSize.Height % 2)
+		realSize.Height += 1;
+
+	if (ScreenSize != realSize)
+	{
+		if (ViewPort.getWidth() == ScreenSize.Width &&
+			ViewPort.getHeight() == ScreenSize.Height)
+		{
+			ViewPort = core::rect<s32>(core::position2d<s32>(0,0), realSize);
+		}
+
+		ScreenSize = realSize;
+
+		bool resetRT = (RenderTargetSurface == BackBuffer);
+
+		if (BackBuffer)
+			BackBuffer->drop();
+		BackBuffer = new CImage(BURNINGSHADER_COLOR_FORMAT, realSize);
+
+		if (resetRT)
+			setRenderTarget(BackBuffer);
+	}
+}
+
+
+//! returns the current render target size
+const core::dimension2d<s32>& CBurningVideoDriver::getCurrentRenderTargetSize() const
+{
+	return RenderTargetSize;
+}
+
+
+//!Draws an 2d rectangle with a gradient.
+void CBurningVideoDriver::draw2DRectangle(const core::rect<s32>& position,
+	SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
+	const core::rect<s32>* clip)
+{
+#ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
+
+	core::rect<s32> pos = position;
+
+	if (clip)
+		pos.clipAgainst(*clip);
+
+	if (!pos.isValid())
+		return;
+
+	const core::dimension2d<s32> renderTargetSize ( ViewPort.getSize() );
+
+	const s32 xPlus = -(renderTargetSize.Width>>1);
+	const f32 xFact = 1.0f / (renderTargetSize.Width>>1);
+
+	const s32 yPlus = renderTargetSize.Height-(renderTargetSize.Height>>1);
+	const f32 yFact = 1.0f / (renderTargetSize.Height>>1);
+
+	// fill VertexCache direct
+	s4DVertex *v;
+
+	VertexCache.vertexCount = 4;
+
+	VertexCache.info[0].index = 0;
+	VertexCache.info[1].index = 1;
+	VertexCache.info[2].index = 2;
+	VertexCache.info[3].index = 3;
+
+	v = &VertexCache.mem.data [ 0 ];
+
+	v[0].Pos.set ( (f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.UpperLeftCorner.Y) * yFact, 0.f, 1.f );
+	v[0].Color[0].setA8R8G8B8 ( colorLeftUp.color );
+
+	v[2].Pos.set ( (f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus- pos.UpperLeftCorner.Y) * yFact, 0.f, 1.f );
+	v[2].Color[0].setA8R8G8B8 ( colorRightUp.color );
+
+	v[4].Pos.set ( (f32)(pos.LowerRightCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.f ,1.f );
+	v[4].Color[0].setA8R8G8B8 ( colorRightDown.color );
+
+	v[6].Pos.set ( (f32)(pos.UpperLeftCorner.X+xPlus) * xFact, (f32)(yPlus-pos.LowerRightCorner.Y) * yFact, 0.f, 1.f );
+	v[6].Color[0].setA8R8G8B8 ( colorLeftDown.color );
+
+	s32 i;
+	u32 g;
+
+	for ( i = 0; i!= 8; i += 2 )
+	{
+		v[i + 0].flag = clipToFrustumTest ( v + i );
+		v[i + 1].flag = 0;
+		if ( (v[i].flag & VERTEX4D_INSIDE ) == VERTEX4D_INSIDE )
+		{
+			ndc_2_dc_and_project ( v + i + 1, v + i, 2 );
+		}
+	}
+
+
+	IBurningShader * render;
+
+	render = BurningShader [ ETR_GOURAUD_ALPHA_NOZ ];
+	render->setRenderTarget(RenderTargetSurface, ViewPort);
+
+	static const s16 indexList[6] = {0,1,2,0,2,3};
+
+	s4DVertex * face[3];
+
+	for ( i = 0; i!= 6; i += 3 )
+	{
+		face[0] = VertexCache_getVertex ( indexList [ i + 0 ] );
+		face[1] = VertexCache_getVertex ( indexList [ i + 1 ] );
+		face[2] = VertexCache_getVertex ( indexList [ i + 2 ] );
+
+		// test clipping
+		u32 test = face[0]->flag & face[1]->flag & face[2]->flag & VERTEX4D_INSIDE;
+
+		if ( test == VERTEX4D_INSIDE )
+		{
+			render->drawTriangle ( face[0] + 1, face[1] + 1, face[2] + 1 );
+			continue;
+		}
+		// Todo: all vertices are clipped in 2d..
+		// is this true ?
+		u32 vOut = 6;
+		memcpy ( CurrentOut.data + 0, face[0], sizeof ( s4DVertex ) * 2 );
+		memcpy ( CurrentOut.data + 2, face[1], sizeof ( s4DVertex ) * 2 );
+		memcpy ( CurrentOut.data + 4, face[2], sizeof ( s4DVertex ) * 2 );
+
+		vOut = clipToFrustum ( CurrentOut.data, Temp.data, 3 );
+		if ( vOut < 3 )
+			continue;
+
+		vOut <<= 1;
+		// to DC Space, project homogenous vertex
+		ndc_2_dc_and_project ( CurrentOut.data + 1, CurrentOut.data, vOut );
+
+		// re-tesselate ( triangle-fan, 0-1-2,0-2-3.. )
+		for ( g = 0; g <= vOut - 6; g += 2 )
+		{
+			// rasterize
+			render->drawTriangle ( CurrentOut.data + 1, &CurrentOut.data[g + 3], &CurrentOut.data[g + 5] );
+		}
+
+	}
+#else
+	draw2DRectangle ( colorLeftUp, position, clip );
+#endif
+}
+
+
+//! Draws a 3d line.
+void CBurningVideoDriver::draw3DLine(const core::vector3df& start,
+	const core::vector3df& end, SColor color)
+{
+	Transformation [ ETS_CURRENT].m.transformVect ( &CurrentOut.data[0].Pos.x, start );
+	Transformation [ ETS_CURRENT].m.transformVect ( &CurrentOut.data[2].Pos.x, end );
+
+	u32 g;
+	u32 vOut;
+
+	// no clipping flags
+	for ( g = 0; g != CurrentOut.ElementSize; ++g )
+	{
+		CurrentOut.data[g].flag = 0;
+		Temp.data[g].flag = 0;
+	}
+
+	// vertices count per line
+	vOut = clipToFrustum ( CurrentOut.data, Temp.data, 2 );
+	if ( vOut < 2 )
+		return;
+
+	vOut <<= 1;
+
+	IBurningShader * line;
+	line = BurningShader [ ETR_TEXTURE_GOURAUD_WIRE ];
+	line->setRenderTarget(RenderTargetSurface, ViewPort);
+
+	// to DC Space, project homogenous vertex
+	ndc_2_dc_and_project ( CurrentOut.data + 1, CurrentOut.data, vOut );
+
+	// unproject vertex color
+#ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
+	for ( g = 0; g != vOut; g+= 2 )
+	{
+		CurrentOut.data[ g + 1].Color[0].setA8R8G8B8 ( color.color );
+	}
+#endif
+
+
+	for ( g = 0; g <= vOut - 4; g += 2 )
+	{
+		// rasterize
+		line->drawLine ( CurrentOut.data + 1, CurrentOut.data + g + 3 );
+	}
+}
+
+
+//! \return Returns the name of the video driver. Example: In case of the DirectX8
+//! driver, it would return "Direct3D8.1".
+const wchar_t* CBurningVideoDriver::getName() const
+{
+#ifdef BURNINGVIDEO_RENDERER_BEAUTIFUL
+	return L"burnings video 0.39b";
+#elif defined ( BURNINGVIDEO_RENDERER_ULTRA_FAST )
+	return L"burnings video 0.39uf";
+#elif defined ( BURNINGVIDEO_RENDERER_FAST )
+	return L"burnings video 0.39f";
+#else
+	return L"burnings video 0.39";
+#endif
+}
+
+
+//! Returns type of video driver
+E_DRIVER_TYPE CBurningVideoDriver::getDriverType() const
+{
+	return EDT_BURNINGSVIDEO;
+}
+
+
+//! returns color format
+ECOLOR_FORMAT CBurningVideoDriver::getColorFormat() const
+{
+	return BURNINGSHADER_COLOR_FORMAT;
+}
+
+
+//! Returns the transformation set by setTransform
+const core::matrix4& CBurningVideoDriver::getTransform(E_TRANSFORMATION_STATE state) const
+{
+	return Transformation[state].m;
+}
+
+
+//! Creates a render target texture.
+ITexture* CBurningVideoDriver::addRenderTargetTexture(const core::dimension2d<s32>& size,
+		const c8* name)
+{
+	CImage* img = new CImage(BURNINGSHADER_COLOR_FORMAT, size);
+	if (!name)
+		name="rt";
+	ITexture* tex = new CSoftwareTexture2(img, name, false, true);
+	img->drop();
+	addTexture(tex);
+	tex->drop();
+	return tex;
+}
+
+
+//! Clears the DepthBuffer.
+void CBurningVideoDriver::clearZBuffer()
+{
+	if (DepthBuffer)
+		DepthBuffer->clear();
+}
+
+
+//! Returns an image created from the last rendered frame.
+IImage* CBurningVideoDriver::createScreenShot()
+{
+	if (BackBuffer)
+		return new CImage(BackBuffer->getColorFormat(), BackBuffer);
+	else
+		return 0;
+}
+
+
+//! returns a device dependent texture from a software surface (IImage)
+//! THIS METHOD HAS TO BE OVERRIDDEN BY DERIVED DRIVERS WITH OWN TEXTURES
+ITexture* CBurningVideoDriver::createDeviceDependentTexture(IImage* surface, const char* name)
+{
+	return new CSoftwareTexture2(surface, name, getTextureCreationFlag(ETCF_CREATE_MIP_MAPS));
+
+}
+
+
+//! Returns the maximum amount of primitives (mostly vertices) which
+//! the device is able to render with one drawIndexedTriangleList
+//! call.
+u32 CBurningVideoDriver::getMaximalPrimitiveCount() const
+{
+	return 0x00800000;
+}
+
+
+//! Draws a shadow volume into the stencil buffer. To draw a stencil shadow, do
+//! this: First, draw all geometry. Then use this method, to draw the shadow
+//! volume. Then, use IVideoDriver::drawStencilShadow() to visualize the shadow.
+void CBurningVideoDriver::drawStencilShadowVolume(const core::vector3df* triangles, s32 count, bool zfail)
+{
+/*
+	if (!StencilBuffer || !count)
+		return;
+
+	setRenderStatesStencilShadowMode(zfail);
+
+	if (!zfail)
+	{
+		// ZPASS Method
+
+		// Draw front-side of shadow volume in stencil/z only
+		pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CCW );
+		pID3DDevice->SetRenderState(D3DRS_STENCILPASS, D3DSTENCILOP_INCRSAT);
+		pID3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLELIST, count / 3, triangles, sizeof(core::vector3df));
+
+		// Now reverse cull order so front sides of shadow volume are written.
+		pID3DDevice->SetRenderState( D3DRS_CULLMODE,   D3DCULL_CW );
+		pID3DDevice->SetRenderState( D3DRS_STENCILPASS, D3DSTENCILOP_DECRSAT);
+		pID3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLELIST, count / 3, triangles, sizeof(core::vector3df));
+	}
+	else
+	{
+		// ZFAIL Method
+
+		// Draw front-side of shadow volume in stencil/z only
+		pID3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW );
+		pID3DDevice->SetRenderState(D3DRS_STENCILZFAIL, D3DSTENCILOP_INCRSAT );
+		pID3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLELIST, count / 3, triangles, sizeof(core::vector3df));
+
+		// Now reverse cull order so front sides of shadow volume are written.
+		pID3DDevice->SetRenderState( D3DRS_CULLMODE,   D3DCULL_CCW );
+		pID3DDevice->SetRenderState( D3DRS_STENCILZFAIL,  D3DSTENCILOP_DECRSAT );
+		pID3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLELIST, count / 3, triangles, sizeof(core::vector3df));
+	}
+*/
+}
+
+
+
+//! Fills the stencil shadow with color. After the shadow volume has been drawn
+//! into the stencil buffer using IVideoDriver::drawStencilShadowVolume(), use this
+//! to draw the color of the shadow.
+void CBurningVideoDriver::drawStencilShadow(bool clearStencilBuffer, video::SColor leftUpEdge,
+			video::SColor rightUpEdge, video::SColor leftDownEdge, video::SColor rightDownEdge)
+{
+/*
+	if (!StencilBuffer)
+		return;
+
+	S3DVertex vtx[4];
+	vtx[0] = S3DVertex(1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, leftUpEdge, 0.0f, 0.0f);
+	vtx[1] = S3DVertex(1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, rightUpEdge, 0.0f, 1.0f);
+	vtx[2] = S3DVertex(-1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, leftDownEdge, 1.0f, 0.0f);
+	vtx[3] = S3DVertex(-1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, rightDownEdge, 1.0f, 1.0f);
+
+	s16 indices[6] = {0,1,2,1,3,2};
+
+	setRenderStatesStencilFillMode(
+		leftUpEdge.getAlpha() < 255 ||
+		rightUpEdge.getAlpha() < 255 ||
+		leftDownEdge.getAlpha() < 255 ||
+		rightDownEdge.getAlpha() < 255);
+
+	setTexture(0,0);
+
+	setVertexShader(EVT_STANDARD);
+
+	pID3DDevice->DrawIndexedPrimitiveUP(D3DPT_TRIANGLELIST, 0, 4, 2, &indices[0],
+		D3DFMT_INDEX16, &vtx[0], sizeof(S3DVertex));
+
+	if (clearStencilBuffer)
+		pID3DDevice->Clear( 0, NULL, D3DCLEAR_STENCIL,0, 1.0, 0);
+*/
+}
+
+
+} // end namespace video
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_BURNINGSVIDEO_
+
+namespace irr
+{
+namespace video
+{
+
+//! creates a video driver
+IVideoDriver* createSoftwareDriver2(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter)
+{
+	#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
+	return new CBurningVideoDriver(windowSize, fullscreen, io, presenter);
+	#else
+	return 0;
+	#endif // _IRR_COMPILE_WITH_BURNINGSVIDEO_
+}
+
+
+
+} // end namespace video
+} // end namespace irr
diff --git a/src/dep/src/irrlicht/CSoftwareDriver2.h b/src/dep/src/irrlicht/CSoftwareDriver2.h
index 14eef09..8a1e85d 100644
--- a/src/dep/src/irrlicht/CSoftwareDriver2.h
+++ b/src/dep/src/irrlicht/CSoftwareDriver2.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -16,18 +16,15 @@ namespace irr
 {
 namespace video
 {
-	class CSoftwareDriver2 : public CNullDriver
+	class CBurningVideoDriver : public CNullDriver
 	{
 	public:
 
 		//! constructor
-		CSoftwareDriver2(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter);
+		CBurningVideoDriver(const core::dimension2d<s32>& windowSize, bool fullscreen, io::IFileSystem* io, video::IImagePresenter* presenter);
 
 		//! destructor
-		virtual ~CSoftwareDriver2();
-
-		//! presents the rendered scene on the screen, returns false if failed
-		virtual bool endScene( s32 windowId = 0, core::rect<s32>* sourceRect=0 );
+		virtual ~CBurningVideoDriver();
 
 		//! queries the features of the driver, returns true if feature is available
 		virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const;
@@ -45,7 +42,13 @@ namespace video
 		virtual void setViewPort(const core::rect<s32>& area);
 
 		//! clears the zbuffer
-		virtual bool beginScene(bool backBuffer, bool zBuffer, SColor color);
+		virtual bool beginScene(bool backBuffer=true, bool zBuffer=true,
+				SColor color=SColor(255,0,0,0),
+				void* windowId=0,
+				core::rect<s32>* sourceRect=0);
+
+		//! presents the rendered scene on the screen, returns false if failed
+		virtual bool endScene();
 
 		//! Only used by the internal engine. Used to notify the driver that
 		//! the window was resized.
@@ -69,7 +72,9 @@ namespace video
 		virtual void setAmbientLight(const SColorf& color);
 
 		//! draws a vertex primitive list
-		void drawVertexPrimitiveList(const void* vertices, u32 vertexCount, const u16* indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType);
+		void drawVertexPrimitiveList(const void* vertices, u32 vertexCount,
+				const void* indexList, u32 primitiveCount,
+				E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
 
 		//! draws an 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
 		virtual void draw2DImage(const video::ITexture* texture, const core::position2d<s32>& destPos,
@@ -94,6 +99,9 @@ namespace video
 					const core::position2d<s32>& end,
 					SColor color=SColor(255,255,255,255));
 
+		//! Draws a single pixel
+		virtual void drawPixel(u32 x, u32 y, const SColor & color);
+
 		//! \return Returns the name of the video driver. Example: In case of the DirectX8
 		//! driver, it would return "Direct3D8.1".
 		virtual const wchar_t* getName() const;
@@ -101,11 +109,14 @@ namespace video
 		//! Returns type of video driver
 		virtual E_DRIVER_TYPE getDriverType() const;
 
+		//! get color format of the current color buffer
+		virtual ECOLOR_FORMAT getColorFormat() const;
+
 		//! Returns the transformation set by setTransform
 		virtual const core::matrix4& getTransform(E_TRANSFORMATION_STATE state) const;
 
 		//! Creates a render target texture.
-		virtual ITexture* createRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name);
+		virtual ITexture* addRenderTargetTexture(const core::dimension2d<s32>& size, const c8* name);
 
 		//! Clears the DepthBuffer.
 		virtual void clearZBuffer();
@@ -118,13 +129,33 @@ namespace video
 		//! call.
 		virtual u32 getMaximalPrimitiveCount() const;
 
+		//! Draws a shadow volume into the stencil buffer. To draw a stencil shadow, do
+		//! this: First, draw all geometry. Then use this method, to draw the shadow
+		//! volume. Then, use IVideoDriver::drawStencilShadow() to visualize the shadow.
+		virtual void drawStencilShadowVolume(const core::vector3df* triangles, s32 count, bool zfail);
+
+		//! Fills the stencil shadow with color. After the shadow volume has been drawn
+		//! into the stencil buffer using IVideoDriver::drawStencilShadowVolume(), use this
+		//! to draw the color of the shadow.
+		virtual void drawStencilShadow(bool clearStencilBuffer=false,
+			video::SColor leftUpEdge = video::SColor(0,0,0,0),
+			video::SColor rightUpEdge = video::SColor(0,0,0,0),
+			video::SColor leftDownEdge = video::SColor(0,0,0,0),
+			video::SColor rightDownEdge = video::SColor(0,0,0,0));
+
 	protected:
 
+
+		void drawVertexPrimitiveList16(const void* vertices, u32 vertexCount,
+				const u16* indexList, u32 primitiveCount,
+				E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType);
+
+
 		//! sets a render target
 		void setRenderTarget(video::CImage* image);
 
 		//! sets the current Texture
-		bool setTexture(u32 stage, video::ITexture* texture);
+		//bool setTexture(u32 stage, video::ITexture* texture);
 
 		//! returns a device dependent texture from a software surface (IImage)
 		//! THIS METHOD HAS TO BE OVERRIDDEN BY DERIVED DRIVERS WITH OWN TEXTURES
@@ -133,6 +164,9 @@ namespace video
 		video::CImage* BackBuffer;
 		video::IImagePresenter* Presenter;
 
+		void* WindowId;
+		core::rect<s32>* SceneSourceRect;
+
 		video::ITexture* RenderTargetTexture;
 		video::IImage* RenderTargetSurface;
 		core::dimension2d<s32> RenderTargetSize;
@@ -145,8 +179,6 @@ namespace video
 
 		IDepthBuffer* DepthBuffer;
 
-		video::ITexture* Texture[2];
-		sInternalTexture Texmap[2];
 
 		/*
 			extend Matrix Stack
@@ -215,37 +247,8 @@ namespace video
 		void select_polygon_mipmap2 ( s4DVertex **source, s32 tex ) const;
 
 
-		sVec4 Global_AmbientLight;
-
-		struct SInternalLight
-		{
-			SLight org;
-
-			sVec4 posEyeSpace;
-
-			f32 constantAttenuation;
-			f32 linearAttenuation;
-			f32 quadraticAttenuation;
-
-			sVec4 AmbientColor;
-			sVec4 DiffuseColor;
-			sVec4 SpecularColor;
-		};
-		core::array<SInternalLight> Light;
-
-		struct SInternalMaterial
-		{
-			SMaterial org;
-
-			sVec4 AmbientColor;
-			sVec4 DiffuseColor;
-			sVec4 SpecularColor;
-			sVec4 EmissiveColor;
-
-			u32 SpecularEnabled;	// == Power2
-		};
-
-		SInternalMaterial Material;
+		SBurningShaderLightSpace LightSpace;
+		SBurningShaderMaterial Material;
 
 		static const sVec4 NDCPlane[6];
 
@@ -257,3 +260,4 @@ namespace video
 
 #endif
 
+
diff --git a/src/dep/src/irrlicht/CSoftwareTexture.cpp b/src/dep/src/irrlicht/CSoftwareTexture.cpp
index 572376e..f933c0a 100644
--- a/src/dep/src/irrlicht/CSoftwareTexture.cpp
+++ b/src/dep/src/irrlicht/CSoftwareTexture.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -59,7 +59,7 @@ CSoftwareTexture::~CSoftwareTexture()
 
 
 //! lock function
-void* CSoftwareTexture::lock()
+void* CSoftwareTexture::lock(bool readOnly)
 {
 	return Image->lock();
 }
diff --git a/src/dep/src/irrlicht/CSoftwareTexture.h b/src/dep/src/irrlicht/CSoftwareTexture.h
index 26f250a..b6dcbdc 100644
--- a/src/dep/src/irrlicht/CSoftwareTexture.h
+++ b/src/dep/src/irrlicht/CSoftwareTexture.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -27,7 +27,7 @@ public:
 	virtual ~CSoftwareTexture();
 
 	//! lock function
-	virtual void* lock();
+	virtual void* lock(bool readOnly = false);
 
 	//! unlock function
 	virtual void unlock();
diff --git a/src/dep/src/irrlicht/CSoftwareTexture2.cpp b/src/dep/src/irrlicht/CSoftwareTexture2.cpp
index 5031c33..4f4fe43 100644
--- a/src/dep/src/irrlicht/CSoftwareTexture2.cpp
+++ b/src/dep/src/irrlicht/CSoftwareTexture2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,6 +19,10 @@ namespace video
 CSoftwareTexture2::CSoftwareTexture2(IImage* image, const char* name, bool generateMipLevels, bool isRenderTarget)
 : ITexture(name), MipMapLOD(0), HasMipMaps(generateMipLevels), IsRenderTarget(isRenderTarget)
 {
+	#ifdef _DEBUG
+	setDebugName("CSoftwareTexture2");
+	#endif
+
 	#ifndef SOFTWARE_DRIVER_2_MIPMAPPING
 		HasMipMaps = false;
 	#endif
@@ -27,31 +31,30 @@ CSoftwareTexture2::CSoftwareTexture2(IImage* image, const char* name, bool gener
 
 	if (image)
 	{
-		
-		core::dimension2d<s32> optSize;
-		core::dimension2d<s32> origSize = image->getDimension();
-		OrigSize = origSize;
+		OrigSize = image->getDimension();
 
-		optSize.Width = getTextureSizeFromSurfaceSize(origSize.Width);
-		optSize.Height = getTextureSizeFromSurfaceSize(origSize.Height);
+		core::dimension2d<s32> optSize(
+				OrigSize.getOptimalSize(true, false, false));
 		
-		if ( origSize == optSize )
+		if ( OrigSize == optSize )
 		{
-			MipMap[0] = new CImage(ECF_SOFTWARE2, image);
+			MipMap[0] = new CImage(BURNINGSHADER_COLOR_FORMAT, image);
 		}
 		else
 		{
-			MipMap[0] = new CImage(ECF_SOFTWARE2, optSize);
+			//os::Printer::log ( "Burningvideo: Warning Texture reformat", ELL_WARNING );
+			MipMap[0] = new CImage(BURNINGSHADER_COLOR_FORMAT, optSize);
 
 			// temporary CImage needed
-			CImage * temp = new CImage ( ECF_SOFTWARE2, image );
-			temp->copyToScaling(MipMap[0]);
+			CImage * temp = new CImage ( BURNINGSHADER_COLOR_FORMAT, image );
+			temp->copyToScalingBoxFilter ( MipMap[0], 0 );
+			//temp->copyToScaling(MipMap[0]);
 			temp->drop ();
 		}
 	}
 
-	regenerateMipMapLevels ();
-	setCurrentMipMapLOD ( 0 );
+	regenerateMipMapLevels();
+	setCurrentMipMapLOD(0);
 }
 
 
@@ -61,26 +64,11 @@ CSoftwareTexture2::~CSoftwareTexture2()
 	for ( s32 i = 0; i!= SOFTWARE_DRIVER_2_MIPMAPPING_MAX; ++i )
 	{
 		if ( MipMap[i] )
-			MipMap[i]->drop ();
+			MipMap[i]->drop();
 	}
 }
 
 
-//! returns the size of a texture which would be the optimize size for rendering it
-inline s32 CSoftwareTexture2::getTextureSizeFromSurfaceSize(s32 size) const
-{
-	s32 ts = 0x01;
-	while(ts < size)
-		ts <<= 1;
-
-/*
-	if (ts > size && ts > 256 )
-		ts >>= 1;
-*/
-	return ts;
-}
-
-
 //! Regenerates the mip map levels of the texture. Useful after locking and 
 //! modifying the texture
 void CSoftwareTexture2::regenerateMipMapLevels()
@@ -94,7 +82,7 @@ void CSoftwareTexture2::regenerateMipMapLevels()
 	for ( i = 1; i!= SOFTWARE_DRIVER_2_MIPMAPPING_MAX; ++i )
 	{
 		if ( MipMap[i] )
-			MipMap[i]->drop ();
+			MipMap[i]->drop();
 	}
 
 	core::dimension2d<s32> newSize;
@@ -105,13 +93,13 @@ void CSoftwareTexture2::regenerateMipMapLevels()
 	while ( i < SOFTWARE_DRIVER_2_MIPMAPPING_MAX )
 	{
 		currentSize = c->getDimension();
-		newSize.Width = core::s32_max ( 1, currentSize.Width >> 1 );
-		newSize.Height = core::s32_max ( 1, currentSize.Height >> 1 );
+		newSize.Width = core::s32_max ( 1, currentSize.Width >> SOFTWARE_DRIVER_2_MIPMAPPING_SCALE );
+		newSize.Height = core::s32_max ( 1, currentSize.Height >> SOFTWARE_DRIVER_2_MIPMAPPING_SCALE );
 
-		MipMap[i] = new CImage(ECF_SOFTWARE2, newSize);
-		MipMap[0]->copyToScalingBoxFilter ( MipMap[i], 0 );
+		MipMap[i] = new CImage(BURNINGSHADER_COLOR_FORMAT, newSize);
+		MipMap[0]->copyToScalingBoxFilter( MipMap[i], 0 );
 		c = MipMap[i];
-		i += 1;
+		++i;
 	}
 }
 
diff --git a/src/dep/src/irrlicht/CSoftwareTexture2.h b/src/dep/src/irrlicht/CSoftwareTexture2.h
index 3637398..751722b 100644
--- a/src/dep/src/irrlicht/CSoftwareTexture2.h
+++ b/src/dep/src/irrlicht/CSoftwareTexture2.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -29,7 +29,7 @@ public:
 	virtual ~CSoftwareTexture2();
 
 	//! lock function
-	virtual void* lock()
+	virtual void* lock(bool readOnly = false)
 	{
 		return MipMap[MipMapLOD]->lock();
 	}
@@ -48,9 +48,9 @@ public:
 	}
 
 	//! Returns the size of the largest mipmap.
-	const core::dimension2d<s32>& getMaxSize() const
+	f32 getLODFactor( const f32 texArea ) const
 	{
-		return MipMap[0]->getDimension();
+		return MipMap[0]->getImageDataSizeInPixels () * texArea;
 	}
 
 	//! Returns (=size) of the texture.
@@ -81,7 +81,7 @@ public:
 	//! returns color format of texture
 	virtual ECOLOR_FORMAT getColorFormat() const
 	{
-		return ECF_SOFTWARE2;
+		return BURNINGSHADER_COLOR_FORMAT;
 	}
 
 	//! returns pitch of texture (in bytes)
@@ -114,10 +114,6 @@ public:
 	}
 
 private:
-
-	//! returns the size of a texture which would be the optimize size for rendering it
-	inline s32 getTextureSizeFromSurfaceSize(s32 size) const;
-
 	core::dimension2d<s32> OrigSize;
 
 	CImage * MipMap[SOFTWARE_DRIVER_2_MIPMAPPING_MAX];
diff --git a/src/dep/src/irrlicht/CSphereSceneNode.cpp b/src/dep/src/irrlicht/CSphereSceneNode.cpp
index 7d22ecd..a596e52 100644
--- a/src/dep/src/irrlicht/CSphereSceneNode.cpp
+++ b/src/dep/src/irrlicht/CSphereSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,7 +17,7 @@ namespace scene
 //! constructor
 CSphereSceneNode::CSphereSceneNode(f32 radius, u32 polyCountX, u32 polyCountY, ISceneNode* parent, ISceneManager* mgr, s32 id,
 			const core::vector3df& position, const core::vector3df& rotation, const core::vector3df& scale)
-: ISceneNode(parent, mgr, id, position, rotation, scale), Mesh(0),
+: IMeshSceneNode(parent, mgr, id, position, rotation, scale), Mesh(0),
 	Radius(radius), PolyCountX(polyCountX), PolyCountY(polyCountY)
 {
 	#ifdef _DEBUG
diff --git a/src/dep/src/irrlicht/CSphereSceneNode.h b/src/dep/src/irrlicht/CSphereSceneNode.h
index 24b0ed6..1583ac3 100644
--- a/src/dep/src/irrlicht/CSphereSceneNode.h
+++ b/src/dep/src/irrlicht/CSphereSceneNode.h
@@ -1,18 +1,18 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __C_SHPERE_SCENE_NODE_H_INCLUDED__
 #define __C_SHPERE_SCENE_NODE_H_INCLUDED__
 
-#include "ISceneNode.h"
+#include "IMeshSceneNode.h"
 #include "IMesh.h"
 
 namespace irr
 {
 namespace scene
 {
-	class CSphereSceneNode : public ISceneNode
+	class CSphereSceneNode : public IMeshSceneNode
 	{
 	public:
 
@@ -55,6 +55,20 @@ namespace scene
 		//! Creates a clone of this scene node and its children.
 		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0);
 
+		//! The mesh cannot be changed
+		virtual void setMesh(IMesh* mesh) {}
+
+		//! Returns the current mesh
+		virtual IMesh* getMesh() { return Mesh; }
+
+		//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
+		/* In this way it is possible to change the materials a mesh causing all mesh scene nodes 
+		referencing this mesh to change too. */
+		virtual void setReadOnlyMaterials(bool readonly) {}
+
+		//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
+		virtual bool isReadOnlyMaterials() const { return false; }
+
 	private:
 
 		IMesh* Mesh;
diff --git a/src/dep/src/irrlicht/CTRFlat.cpp b/src/dep/src/irrlicht/CTRFlat.cpp
index c1113f7..f9ac119 100644
--- a/src/dep/src/irrlicht/CTRFlat.cpp
+++ b/src/dep/src/irrlicht/CTRFlat.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -100,8 +100,7 @@ public:
 			if (!TriangleRect.isRectCollided(ViewPortRect))
 				continue;
 
-
-			// höhe des dreiecks berechnen
+			// calculate height of triangle
 			height = v3->Pos.Y - v1->Pos.Y;
 			if (!height)
 				continue;
diff --git a/src/dep/src/irrlicht/CTRFlatWire.cpp b/src/dep/src/irrlicht/CTRFlatWire.cpp
index 9cf2cb1..7113360 100644
--- a/src/dep/src/irrlicht/CTRFlatWire.cpp
+++ b/src/dep/src/irrlicht/CTRFlatWire.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -98,8 +98,7 @@ public:
 			if (!TriangleRect.isRectCollided(ViewPortRect))
 				continue;
 
-
-			// höhe des dreiecks berechnen
+			// calculate height of triangle
 			height = v3->Pos.Y - v1->Pos.Y;
 			if (!height)
 				continue;
diff --git a/src/dep/src/irrlicht/CTRGouraud.cpp b/src/dep/src/irrlicht/CTRGouraud.cpp
index 90514aa..5ffb723 100644
--- a/src/dep/src/irrlicht/CTRGouraud.cpp
+++ b/src/dep/src/irrlicht/CTRGouraud.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -105,8 +105,7 @@ public:
 			if (!TriangleRect.isRectCollided(ViewPortRect))
 				continue;
 
-
-			// höhe des dreiecks berechnen
+			// calculate height of triangle
 			height = v3->Pos.Y - v1->Pos.Y;
 			if (!height)
 				continue;
@@ -123,9 +122,9 @@ public:
 			leftZValue = v1->ZValue;
 			rightZValue = v1->ZValue;
 
-			leftR = rightR = video::getRedSigned(v1->Color)<<3;
-			leftG = rightG = video::getGreenSigned(v1->Color)<<3;
-			leftB = rightB = video::getBlueSigned(v1->Color)<<3;
+			leftR = rightR = video::getRed(v1->Color)<<11;
+			leftG = rightG = video::getGreen(v1->Color)<<11;
+			leftB = rightB = video::getBlue(v1->Color)<<11;
 
 			targetSurface = lockedSurface + span * SurfaceWidth;
 			zTarget = lockedZBuffer + span * SurfaceWidth;
@@ -135,32 +134,32 @@ public:
 				tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 				rightdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
 				rightZStep = (s32)((v2->ZValue - v1->ZValue) * tmpDiv);
-				rightStepR = (s32)(((video::getRedSigned(v2->Color)<<3) - rightR) * tmpDiv);
-				rightStepG = (s32)(((video::getGreenSigned(v2->Color)<<3) - rightG) * tmpDiv);
-				rightStepB = (s32)(((video::getBlueSigned(v2->Color)<<3) - rightB) * tmpDiv);
+				rightStepR = (s32)(((s32)(video::getRed(v2->Color)<<11) - rightR) * tmpDiv);
+				rightStepG = (s32)(((s32)(video::getGreen(v2->Color)<<11) - rightG) * tmpDiv);
+				rightStepB = (s32)(((s32)(video::getBlue(v2->Color)<<11) - rightB) * tmpDiv);
 
 				tmpDiv = 1.0f / (f32)height;
 				leftdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
 				leftZStep = (s32)((v3->ZValue - v1->ZValue) * tmpDiv);
-				leftStepR = (s32)(((video::getRedSigned(v3->Color)<<3) - leftR) * tmpDiv);
-				leftStepG = (s32)(((video::getGreenSigned(v3->Color)<<3) - leftG) * tmpDiv);
-				leftStepB = (s32)(((video::getBlueSigned(v3->Color)<<3) - leftB) * tmpDiv);
+				leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<11) - leftR) * tmpDiv);
+				leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<11) - leftG) * tmpDiv);
+				leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<11) - leftB) * tmpDiv);
 			}
 			else
 			{
 				tmpDiv = 1.0f / (f32)height;
 				rightdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
 				rightZStep = (s32)((v3->ZValue - v1->ZValue) * tmpDiv);
-				rightStepR = (s32)(((video::getRedSigned(v3->Color)<<3) - rightR) * tmpDiv);
-				rightStepG = (s32)(((video::getGreenSigned(v3->Color)<<3) - rightG) * tmpDiv);
-				rightStepB = (s32)(((video::getBlueSigned(v3->Color)<<3) - rightB) * tmpDiv);
+				rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<11) - rightR) * tmpDiv);
+				rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<11) - rightG) * tmpDiv);
+				rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<11) - rightB) * tmpDiv);
 
 				tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 				leftdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
 				leftZStep = (s32)((v2->ZValue - v1->ZValue) * tmpDiv);
-				leftStepR = (s32)(((video::getRedSigned(v2->Color)<<3) - leftR) * tmpDiv);
-				leftStepG = (s32)(((video::getGreenSigned(v2->Color)<<3) - leftG) * tmpDiv);
-				leftStepB = (s32)(((video::getBlueSigned(v2->Color)<<3) - leftB) * tmpDiv);
+				leftStepR = (s32)(((s32)(video::getRed(v2->Color)<<11) - leftR) * tmpDiv);
+				leftStepG = (s32)(((s32)(video::getGreen(v2->Color)<<11) - leftG) * tmpDiv);
+				leftStepB = (s32)(((s32)(video::getBlue(v2->Color)<<11) - leftB) * tmpDiv);
 			}
 
 
@@ -251,7 +250,7 @@ public:
 							if (spanZValue > *spanZTarget)
 							{
 								*spanZTarget = spanZValue;
-								*hSpanBegin = video::RGB16(spanR, spanG, spanB);
+								*hSpanBegin = video::RGB16(spanR>>8, spanG>>8, spanB>>8);
 							}
 
 							spanR += spanStepR;
@@ -296,12 +295,12 @@ public:
 					rightZValue = v2->ZValue;
 					rightZStep = (s32)((v3->ZValue - v2->ZValue) * tmpDiv);
 
-					rightR = video::getRedSigned(v2->Color)<<3;
-					rightG = video::getGreenSigned(v2->Color)<<3;
-					rightB = video::getBlueSigned(v2->Color)<<3;
-					rightStepR = (s32)(((video::getRedSigned(v3->Color)<<3) - rightR) * tmpDiv);
-					rightStepG = (s32)(((video::getGreenSigned(v3->Color)<<3) - rightG) * tmpDiv);
-					rightStepB = (s32)(((video::getBlueSigned(v3->Color)<<3) - rightB) * tmpDiv);
+					rightR = video::getRed(v2->Color)<<11;
+					rightG = video::getGreen(v2->Color)<<11;
+					rightB = video::getBlue(v2->Color)<<11;
+					rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<11) - rightR) * tmpDiv);
+					rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<11) - rightG) * tmpDiv);
+					rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<11) - rightB) * tmpDiv);
 				}
 				else
 				{
@@ -313,12 +312,12 @@ public:
 					leftZValue = v2->ZValue;
 					leftZStep = (s32)((v3->ZValue - v2->ZValue) * tmpDiv);
 
-					leftR = video::getRedSigned(v2->Color)<<3;
-					leftG = video::getGreenSigned(v2->Color)<<3;
-					leftB = video::getBlueSigned(v2->Color)<<3;
-					leftStepR = (s32)(((video::getRedSigned(v3->Color)<<3) - leftR) * tmpDiv);
-					leftStepG = (s32)(((video::getGreenSigned(v3->Color)<<3) - leftG) * tmpDiv);
-					leftStepB = (s32)(((video::getBlueSigned(v3->Color)<<3) - leftB) * tmpDiv);
+					leftR = video::getRed(v2->Color)<<11;
+					leftG = video::getGreen(v2->Color)<<11;
+					leftB = video::getBlue(v2->Color)<<11;
+					leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<11) - leftR) * tmpDiv);
+					leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<11) - leftG) * tmpDiv);
+					leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<11) - leftB) * tmpDiv);
 				}
 
 
diff --git a/src/dep/src/irrlicht/CTRGouraud2.cpp b/src/dep/src/irrlicht/CTRGouraud2.cpp
index 986a3bd..ecd086e 100644
--- a/src/dep/src/irrlicht/CTRGouraud2.cpp
+++ b/src/dep/src/irrlicht/CTRGouraud2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -132,10 +132,10 @@ void CTRGouraud2::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
+	sVec2 slopeT[0];
 #endif
 #ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[1];
 #endif
 
 	// apply top-left fill-convention, left
@@ -157,13 +157,13 @@ void CTRGouraud2::scanline_bilinear ()
 	slopeW = (line.w[1] - line.w[0]) * invDeltaX;
 #endif
 #ifdef IPOL_C0
-	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
+	slopeC = (line.c[0][1] - line.c[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -175,20 +175,20 @@ void CTRGouraud2::scanline_bilinear ()
 	line.w[0] += slopeW * subPixel;
 #endif
 #ifdef IPOL_C0
-	line.c[0] += slopeC * subPixel;
+	line.c[0][0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -216,9 +216,9 @@ void CTRGouraud2::scanline_bilinear ()
 #ifdef INVERSE_W
 			inversew = core::reciprocal ( line.w[0] );
 
-			getSample_color ( r0, g0, b0, line.c[0] * inversew );
+			getSample_color ( r0, g0, b0, line.c[0][0] * inversew );
 #else
-			getSample_color ( r0, g0, b0, line.c[0] );
+			getSample_color ( r0, g0, b0, line.c[0][0] );
 #endif
 
 			dst[i] = fix_to_color ( r0, g0, b0 );
@@ -242,13 +242,13 @@ void CTRGouraud2::scanline_bilinear ()
 		line.w[0] += slopeW;
 #endif
 #ifdef IPOL_C0
-		line.c[0] += slopeC;
+		line.c[0][0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -296,18 +296,18 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 #endif
 
 #ifdef IPOL_C0
-	scan.slopeC[0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
-	scan.c[0] = a->Color[0];
+	scan.slopeC[0][0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
+	scan.c[0][0] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -321,7 +321,7 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -350,18 +350,18 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
-		scan.c[1] = a->Color[0];
+		scan.slopeC[0][1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
+		scan.c[0][1] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -386,18 +386,18 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -419,18 +419,18 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -450,18 +450,18 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -483,13 +483,13 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 			scan.w[0] = a->Pos.w + scan.slopeW[0] * temp[0];
 #endif
 #ifdef IPOL_C0
-			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
+			scan.c[0][0] = a->Color[0] + scan.slopeC[0][0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -509,18 +509,18 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
-		scan.c[1] = b->Color[0];
+		scan.slopeC[0][1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
+		scan.c[0][1] = b->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -546,18 +546,18 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -579,18 +579,18 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -610,18 +610,18 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -630,7 +630,7 @@ void CTRGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4D
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRGouraudAlpha2.cpp b/src/dep/src/irrlicht/CTRGouraudAlpha2.cpp
index f785805..465f77f 100644
--- a/src/dep/src/irrlicht/CTRGouraudAlpha2.cpp
+++ b/src/dep/src/irrlicht/CTRGouraudAlpha2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -135,10 +135,10 @@ void CTRGouraudAlpha2::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
+	sVec2 slopeT[0];
 #endif
 #ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[1];
 #endif
 
 	// apply top-left fill-convention, left
@@ -160,13 +160,13 @@ void CTRGouraudAlpha2::scanline_bilinear ()
 	slopeW = (line.w[1] - line.w[0]) * invDeltaX;
 #endif
 #ifdef IPOL_C0
-	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
+	slopeC = (line.c[0][1] - line.c[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -178,20 +178,20 @@ void CTRGouraudAlpha2::scanline_bilinear ()
 	line.w[0] += slopeW * subPixel;
 #endif
 #ifdef IPOL_C0
-	line.c[0] += slopeC * subPixel;
+	line.c[0][0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -222,9 +222,9 @@ void CTRGouraudAlpha2::scanline_bilinear ()
 #ifdef INVERSE_W
 			inversew = core::reciprocal ( line.w[0] );
 
-			getSample_color ( a0, r0, g0, b0, line.c[0] * inversew );
+			getSample_color ( a0, r0, g0, b0, line.c[0][0] * inversew );
 #else
-			getSample_color ( a0, r0, g0, b0, line.c[0] );
+			getSample_color ( a0, r0, g0, b0, line.c[0][0] );
 #endif
 
 			color_to_fix ( r1, g1, b1, dst[i] );
@@ -253,13 +253,13 @@ void CTRGouraudAlpha2::scanline_bilinear ()
 		line.w[0] += slopeW;
 #endif
 #ifdef IPOL_C0
-		line.c[0] += slopeC;
+		line.c[0][0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -308,18 +308,18 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 #endif
 
 #ifdef IPOL_C0
-	scan.slopeC[0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
-	scan.c[0] = a->Color[0];
+	scan.slopeC[0][0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
+	scan.c[0][0] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -333,7 +333,7 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -362,18 +362,18 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
-		scan.c[1] = a->Color[0];
+		scan.slopeC[0][1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
+		scan.c[0][1] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -398,18 +398,18 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -431,18 +431,18 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -462,18 +462,18 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -495,13 +495,13 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 			scan.w[0] = a->Pos.w + scan.slopeW[0] * temp[0];
 #endif
 #ifdef IPOL_C0
-			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
+			scan.c[0][0] = a->Color[0] + scan.slopeC[0][0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -521,18 +521,18 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
-		scan.c[1] = b->Color[0];
+		scan.slopeC[0][1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
+		scan.c[0][1] = b->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -558,18 +558,18 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -591,18 +591,18 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -622,18 +622,18 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -642,7 +642,7 @@ void CTRGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,cons
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRGouraudAlphaNoZ2.cpp b/src/dep/src/irrlicht/CTRGouraudAlphaNoZ2.cpp
index d2fc258..cfa31a3 100644
--- a/src/dep/src/irrlicht/CTRGouraudAlphaNoZ2.cpp
+++ b/src/dep/src/irrlicht/CTRGouraudAlphaNoZ2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -134,10 +134,10 @@ void CTRGouraudAlphaNoZ2::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
+	sVec2 slopeT[0];
 #endif
 #ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[1];
 #endif
 
 	// apply top-left fill-convention, left
@@ -159,13 +159,13 @@ void CTRGouraudAlphaNoZ2::scanline_bilinear ()
 	slopeW = (line.w[1] - line.w[0]) * invDeltaX;
 #endif
 #ifdef IPOL_C0
-	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
+	slopeC = (line.c[0][1] - line.c[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -177,20 +177,20 @@ void CTRGouraudAlphaNoZ2::scanline_bilinear ()
 	line.w[0] += slopeW * subPixel;
 #endif
 #ifdef IPOL_C0
-	line.c[0] += slopeC * subPixel;
+	line.c[0][0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -229,9 +229,9 @@ void CTRGouraudAlphaNoZ2::scanline_bilinear ()
 #ifdef IPOL_W
 			inversew = core::reciprocal ( line.w[0] );
 
-			getSample_color ( a0, r0, g0, b0, line.c[0] * inversew );
+			getSample_color ( a0, r0, g0, b0, line.c[0][0] * inversew );
 #else
-			getSample_color ( a0, r0, g0, b0, line.c[0] );
+			getSample_color ( a0, r0, g0, b0, line.c[0][0] );
 #endif
 
 			color_to_fix ( r1, g1, b1, dst[i] );
@@ -255,13 +255,13 @@ void CTRGouraudAlphaNoZ2::scanline_bilinear ()
 		line.w[0] += slopeW;
 #endif
 #ifdef IPOL_C0
-		line.c[0] += slopeC;
+		line.c[0][0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -310,18 +310,18 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 #endif
 
 #ifdef IPOL_C0
-	scan.slopeC[0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
-	scan.c[0] = a->Color[0];
+	scan.slopeC[0][0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
+	scan.c[0][0] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -335,7 +335,7 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -364,18 +364,18 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
-		scan.c[1] = a->Color[0];
+		scan.slopeC[0][1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
+		scan.c[0][1] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -400,18 +400,18 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -433,18 +433,18 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -464,18 +464,18 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -497,13 +497,13 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 			scan.w[0] = a->Pos.w + scan.slopeW[0] * temp[0];
 #endif
 #ifdef IPOL_C0
-			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
+			scan.c[0][0] = a->Color[0] + scan.slopeC[0][0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -523,18 +523,18 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
-		scan.c[1] = b->Color[0];
+		scan.slopeC[0][1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
+		scan.c[0][1] = b->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -560,18 +560,18 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -593,18 +593,18 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -624,18 +624,18 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -644,7 +644,7 @@ void CTRGouraudAlphaNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,c
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRGouraudWire.cpp b/src/dep/src/irrlicht/CTRGouraudWire.cpp
index fd0f1e4..c301a4c 100644
--- a/src/dep/src/irrlicht/CTRGouraudWire.cpp
+++ b/src/dep/src/irrlicht/CTRGouraudWire.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -101,8 +101,7 @@ public:
 			if (!TriangleRect.isRectCollided(ViewPortRect))
 				continue;
 
-
-			// höhe des dreiecks berechnen
+			// calculate height of triangle
 			height = v3->Pos.Y - v1->Pos.Y;
 			if (!height)
 				continue;
@@ -119,9 +118,9 @@ public:
 			leftZValue = v1->ZValue;
 			rightZValue = v1->ZValue;
 
-			leftR = rightR = video::getRed(v1->Color)<<8;
-			leftG = rightG = video::getGreen(v1->Color)<<8;
-			leftB = rightB = video::getBlue(v1->Color)<<8;
+			leftR = rightR = video::getRed(v1->Color)<<11;
+			leftG = rightG = video::getGreen(v1->Color)<<11;
+			leftB = rightB = video::getBlue(v1->Color)<<11;
 
 			targetSurface = lockedSurface + span * SurfaceWidth;
 			zTarget = lockedZBuffer + span * SurfaceWidth;
@@ -131,32 +130,32 @@ public:
 				tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 				rightdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
 				rightZStep = (s32)((v2->ZValue - v1->ZValue) * tmpDiv);
-				rightStepR = (s32)(((video::getRed(v2->Color)<<8) - rightR) * tmpDiv);
-				rightStepG = (s32)(((video::getGreen(v2->Color)<<8) - rightG) * tmpDiv);
-				rightStepB = (s32)(((video::getBlue(v2->Color)<<8) - rightB) * tmpDiv);
+				rightStepR = (s32)(((s32)(video::getRed(v2->Color)<<11) - rightR) * tmpDiv);
+				rightStepG = (s32)(((s32)(video::getGreen(v2->Color)<<11) - rightG) * tmpDiv);
+				rightStepB = (s32)(((s32)(video::getBlue(v2->Color)<<11) - rightB) * tmpDiv);
 
 				tmpDiv = 1.0f / (f32)height;
 				leftdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
 				leftZStep = (s32)((v3->ZValue - v1->ZValue) * tmpDiv);
-				leftStepR = (s32)(((video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
-				leftStepG = (s32)(((video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
-				leftStepB = (s32)(((video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
+				leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<11) - leftR) * tmpDiv);
+				leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<11) - leftG) * tmpDiv);
+				leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<11) - leftB) * tmpDiv);
 			}
 			else
 			{
 				tmpDiv = 1.0f / (f32)height;
 				rightdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
 				rightZStep = (s32)((v3->ZValue - v1->ZValue) * tmpDiv);
-				rightStepR = (s32)(((video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
-				rightStepG = (s32)(((video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
-				rightStepB = (s32)(((video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
+				rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<11) - rightR) * tmpDiv);
+				rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<11) - rightG) * tmpDiv);
+				rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<11) - rightB) * tmpDiv);
 
 				tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 				leftdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
 				leftZStep = (s32)((v2->ZValue - v1->ZValue) * tmpDiv);
-				leftStepR = (s32)(((video::getRed(v2->Color)<<8) - leftR) * tmpDiv);
-				leftStepG = (s32)(((video::getGreen(v2->Color)<<8) - leftG) * tmpDiv);
-				leftStepB = (s32)(((video::getBlue(v2->Color)<<8) - leftB) * tmpDiv);
+				leftStepR = (s32)(((s32)(video::getRed(v2->Color)<<11) - leftR) * tmpDiv);
+				leftStepG = (s32)(((s32)(video::getGreen(v2->Color)<<11) - leftG) * tmpDiv);
+				leftStepB = (s32)(((s32)(video::getBlue(v2->Color)<<11) - leftB) * tmpDiv);
 			}
 
 
@@ -215,7 +214,7 @@ public:
 						if (leftZValue > *(zTarget + leftx))
 						{
 							*(zTarget + leftx) = leftZValue;
-							*(targetSurface + leftx) = (((leftR>>8) & 0x1F)<<10) | (((leftG>>8) & 0x1F)<<5) | ((leftB>>8) & 0x1F);
+							*(targetSurface + leftx) = video::RGB16(leftR>>8, leftG>>8, leftB>>8);
 						}
 					}
 
@@ -226,7 +225,7 @@ public:
 						if (rightZValue > *(zTarget + rightx))
 						{
 							*(zTarget + rightx) = rightZValue;
-							*(targetSurface + rightx) = (((rightR>>8) & 0x1F)<<10) | (((rightG>>8) & 0x1F)<<5) | ((rightB>>8) & 0x1F);
+							*(targetSurface + rightx) = video::RGB16(rightR, rightG, rightB);
 						}
 
 					}
@@ -263,12 +262,12 @@ public:
 					rightZValue = v2->ZValue;
 					rightZStep = (s32)((v3->ZValue - v2->ZValue) * tmpDiv);
 
-					rightR = video::getRed(v2->Color)<<8;
-					rightG = video::getGreen(v2->Color)<<8;
-					rightB = video::getBlue(v2->Color)<<8;
-					rightStepR = (s32)(((video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
-					rightStepG = (s32)(((video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
-					rightStepB = (s32)(((video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
+					rightR = video::getRed(v2->Color)<<11;
+					rightG = video::getGreen(v2->Color)<<11;
+					rightB = video::getBlue(v2->Color)<<11;
+					rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<11) - rightR) * tmpDiv);
+					rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<11) - rightG) * tmpDiv);
+					rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<11) - rightB) * tmpDiv);
 				}
 				else
 				{
@@ -280,12 +279,12 @@ public:
 					leftZValue = v2->ZValue;
 					leftZStep = (s32)((v3->ZValue - v2->ZValue) * tmpDiv);
 
-					leftR = video::getRed(v2->Color)<<8;
-					leftG = video::getGreen(v2->Color)<<8;
-					leftB = video::getBlue(v2->Color)<<8;
-					leftStepR = (s32)(((video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
-					leftStepG = (s32)(((video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
-					leftStepB = (s32)(((video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
+					leftR = video::getRed(v2->Color)<<11;
+					leftG = video::getGreen(v2->Color)<<11;
+					leftB = video::getBlue(v2->Color)<<11;
+					leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<11) - leftR) * tmpDiv);
+					leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<11) - leftG) * tmpDiv);
+					leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<11) - leftB) * tmpDiv);
 				}
 
 
diff --git a/src/dep/src/irrlicht/CTRTextureBlend.cpp b/src/dep/src/irrlicht/CTRTextureBlend.cpp
index a740330..a09a671 100644
--- a/src/dep/src/irrlicht/CTRTextureBlend.cpp
+++ b/src/dep/src/irrlicht/CTRTextureBlend.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -144,10 +144,7 @@ void CTRTextureBlend::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -172,10 +169,10 @@ void CTRTextureBlend::scanline_bilinear ()
 	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -190,17 +187,17 @@ void CTRTextureBlend::scanline_bilinear ()
 	line.c[0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -232,8 +229,8 @@ void CTRTextureBlend::scanline_bilinear ()
 
 		getSample_texture ( r0, g0, b0, 
 							&IT[0],
-							f32_to_fixPoint ( line.t0[0].x,inversew),
-							f32_to_fixPoint ( line.t0[0].y,inversew)
+							f32_to_fixPoint ( line.t[0][0].x,inversew),
+							f32_to_fixPoint ( line.t[0][0].y,inversew)
 						);
 
 		color_to_fix ( r1, g1, b1, dst[i] );
@@ -248,7 +245,7 @@ void CTRTextureBlend::scanline_bilinear ()
 		line.w[0] += slopeW;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 	}
 	break;
@@ -271,8 +268,8 @@ void CTRTextureBlend::scanline_bilinear ()
 #endif
 		getSample_texture ( r0, g0, b0, 
 							&IT[0],
-							f32_to_fixPoint ( line.t0[0].x,inversew),
-							f32_to_fixPoint ( line.t0[0].y,inversew)
+							f32_to_fixPoint ( line.t[0][0].x,inversew),
+							f32_to_fixPoint ( line.t[0][0].y,inversew)
 						);
 
 		color_to_fix ( r1, g1, b1, dst[i] );
@@ -287,7 +284,7 @@ void CTRTextureBlend::scanline_bilinear ()
 		line.w[0] += slopeW;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 	}break;
 	} // zcompare
@@ -342,13 +339,13 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -362,7 +359,7 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -396,13 +393,13 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -432,13 +429,13 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -465,13 +462,13 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -496,13 +493,13 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -527,10 +524,10 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -555,13 +552,13 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -592,13 +589,13 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -625,13 +622,13 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -656,13 +653,13 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -671,7 +668,7 @@ void CTRTextureBlend::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureDetailMap2.cpp b/src/dep/src/irrlicht/CTRTextureDetailMap2.cpp
index 7f17164..122a139 100644
--- a/src/dep/src/irrlicht/CTRTextureDetailMap2.cpp
+++ b/src/dep/src/irrlicht/CTRTextureDetailMap2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -134,10 +134,7 @@ void CTRTextureDetailMap2::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -159,13 +156,13 @@ void CTRTextureDetailMap2::scanline_bilinear ()
 	slopeW = (line.w[1] - line.w[0]) * invDeltaX;
 #endif
 #ifdef IPOL_C0
-	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
+	slopeC = (line.c[0][1] - line.c[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -177,20 +174,20 @@ void CTRTextureDetailMap2::scanline_bilinear ()
 	line.w[0] += slopeW * subPixel;
 #endif
 #ifdef IPOL_C0
-	line.c[0] += slopeC * subPixel;
+	line.c[0][0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -219,16 +216,16 @@ void CTRTextureDetailMap2::scanline_bilinear ()
 #ifdef INVERSE_W
 			inversew = fix_inverse32 ( line.w[0] );
 
-			tx0 = f32_to_fixPoint ( line.t0[0].x,inversew);
-			ty0 = f32_to_fixPoint ( line.t0[0].y,inversew);
-			tx1 = f32_to_fixPoint ( line.t1[0].x,inversew);
-			ty1 = f32_to_fixPoint ( line.t1[0].y,inversew);
+			tx0 = f32_to_fixPoint ( line.t[0][0].x,inversew);
+			ty0 = f32_to_fixPoint ( line.t[0][0].y,inversew);
+			tx1 = f32_to_fixPoint ( line.t[1][0].x,inversew);
+			ty1 = f32_to_fixPoint ( line.t[1][0].y,inversew);
 
 #else
-			tx0 = f32_to_fixPoint ( line.t0[0].x );
-			ty0 = f32_to_fixPoint ( line.t0[0].y );
-			tx1 = f32_to_fixPoint ( line.t1[0].x );
-			ty1 = f32_to_fixPoint ( line.t1[0].y );
+			tx0 = f32_to_fixPoint ( line.t[0][0].x );
+			ty0 = f32_to_fixPoint ( line.t[0][0].y );
+			tx1 = f32_to_fixPoint ( line.t[1][0].x );
+			ty1 = f32_to_fixPoint ( line.t[1][0].y );
 #endif
 			getSample_texture ( r0, g0, b0, &IT[0], tx0,ty0 );
 			getSample_texture ( r1, g1, b1, &IT[1], tx1,ty1 );
@@ -262,13 +259,13 @@ void CTRTextureDetailMap2::scanline_bilinear ()
 		line.w[0] += slopeW;
 #endif
 #ifdef IPOL_C0
-		line.c[0] += slopeC;
+		line.c[0][0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -316,18 +313,18 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 #endif
 
 #ifdef IPOL_C0
-	scan.slopeC[0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
-	scan.c[0] = a->Color[0];
+	scan.slopeC[0][0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
+	scan.c[0][0] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -341,7 +338,7 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -370,18 +367,18 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
-		scan.c[1] = a->Color[0];
+		scan.slopeC[0][1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
+		scan.c[0][1] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -406,18 +403,18 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -439,18 +436,18 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -470,18 +467,18 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -503,13 +500,13 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 			scan.w[0] = a->Pos.w + scan.slopeW[0] * temp[0];
 #endif
 #ifdef IPOL_C0
-			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
+			scan.c[0][0] = a->Color[0] + scan.slopeC[0][0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -529,18 +526,18 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
-		scan.c[1] = b->Color[0];
+		scan.slopeC[0][1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
+		scan.c[0][1] = b->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -566,18 +563,18 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -599,18 +596,18 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -630,18 +627,18 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -650,7 +647,7 @@ void CTRTextureDetailMap2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureFlat.cpp b/src/dep/src/irrlicht/CTRTextureFlat.cpp
index f104c02..67c3b7a 100644
--- a/src/dep/src/irrlicht/CTRTextureFlat.cpp
+++ b/src/dep/src/irrlicht/CTRTextureFlat.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -103,8 +103,7 @@ public:
 			if (!TriangleRect.isRectCollided(ViewPortRect))
 				continue;
 
-
-			// höhe des dreiecks berechnen
+			// calculate height of triangle
 			height = v3->Pos.Y - v1->Pos.Y;
 			if (!height)
 				continue;
diff --git a/src/dep/src/irrlicht/CTRTextureFlatWire.cpp b/src/dep/src/irrlicht/CTRTextureFlatWire.cpp
index 5c51c2f..d1d4694 100644
--- a/src/dep/src/irrlicht/CTRTextureFlatWire.cpp
+++ b/src/dep/src/irrlicht/CTRTextureFlatWire.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -100,8 +100,7 @@ public:
 			if (!TriangleRect.isRectCollided(ViewPortRect))
 				continue;
 
-
-			// höhe des dreiecks berechnen
+			// calculate height of triangle
 			height = v3->Pos.Y - v1->Pos.Y;
 			if (!height)
 				continue;
diff --git a/src/dep/src/irrlicht/CTRTextureGouraud.cpp b/src/dep/src/irrlicht/CTRTextureGouraud.cpp
index 8dbbe82..bd8225d 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraud.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraud.cpp
@@ -1,10 +1,8 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 #include "CTRTextureGouraud.h"
-#include "os.h"
 
 #ifdef _IRR_COMPILE_WITH_SOFTWARE_
 
@@ -176,8 +174,7 @@ void CTRTextureGouraud::drawIndexedTriangleList(S2DVertex* vertices, s32 vertexC
 		if (!TriangleRect.isRectCollided(ViewPortRect))
 			continue;
 
-
-		// höhe des dreiecks berechnen
+		// calculate height of triangle
 		height = v3->Pos.Y - v1->Pos.Y;
 		if (!height)
 			continue;
@@ -194,9 +191,9 @@ void CTRTextureGouraud::drawIndexedTriangleList(S2DVertex* vertices, s32 vertexC
 		leftZValue = v1->ZValue;
 		rightZValue = v1->ZValue;
 
-		leftR = rightR = video::getRedSigned(v1->Color)<<8;
-		leftG = rightG = video::getGreenSigned(v1->Color)<<8;
-		leftB = rightB = video::getBlueSigned(v1->Color)<<8;
+		leftR = rightR = video::getRed(v1->Color)<<8;
+		leftG = rightG = video::getGreen(v1->Color)<<8;
+		leftB = rightB = video::getBlue(v1->Color)<<8;
 		leftTx = rightTx = v1->TCoords.X;
 		leftTy = rightTy = v1->TCoords.Y;
 
@@ -208,18 +205,18 @@ void CTRTextureGouraud::drawIndexedTriangleList(S2DVertex* vertices, s32 vertexC
 			tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 			rightdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
 			rightZStep = (s32)((v2->ZValue - v1->ZValue) * tmpDiv);
-			rightStepR = (s32)(((video::getRedSigned(v2->Color)<<8) - rightR) * tmpDiv);
-			rightStepG = (s32)(((video::getGreenSigned(v2->Color)<<8) - rightG) * tmpDiv);
-			rightStepB = (s32)(((video::getBlueSigned(v2->Color)<<8) - rightB) * tmpDiv);
+			rightStepR = (s32)(((s32)(video::getRed(v2->Color)<<8) - rightR) * tmpDiv);
+			rightStepG = (s32)(((s32)(video::getGreen(v2->Color)<<8) - rightG) * tmpDiv);
+			rightStepB = (s32)(((s32)(video::getBlue(v2->Color)<<8) - rightB) * tmpDiv);
 			rightTxStep = (s32)((v2->TCoords.X - rightTx) * tmpDiv);
 			rightTyStep = (s32)((v2->TCoords.Y - rightTy) * tmpDiv);
 
 			tmpDiv = 1.0f / (f32)height;
 			leftdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
 			leftZStep = (s32)((v3->ZValue - v1->ZValue) * tmpDiv);
-			leftStepR = (s32)(((video::getRedSigned(v3->Color)<<8) - leftR) * tmpDiv);
-			leftStepG = (s32)(((video::getGreenSigned(v3->Color)<<8) - leftG) * tmpDiv);
-			leftStepB = (s32)(((video::getBlueSigned(v3->Color)<<8) - leftB) * tmpDiv);
+			leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
+			leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
+			leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
 			leftTxStep = (s32)((v3->TCoords.X - leftTx) * tmpDiv);
 			leftTyStep = (s32)((v3->TCoords.Y - leftTy) * tmpDiv);
 		}
@@ -228,18 +225,18 @@ void CTRTextureGouraud::drawIndexedTriangleList(S2DVertex* vertices, s32 vertexC
 			tmpDiv = 1.0f / (f32)height;
 			rightdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
 			rightZStep = (s32)((v3->ZValue - v1->ZValue) * tmpDiv);
-			rightStepR = (s32)(((video::getRedSigned(v3->Color)<<8) - rightR) * tmpDiv);
-			rightStepG = (s32)(((video::getGreenSigned(v3->Color)<<8) - rightG) * tmpDiv);
-			rightStepB = (s32)(((video::getBlueSigned(v3->Color)<<8) - rightB) * tmpDiv);
+			rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
+			rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
+			rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
 			rightTxStep = (s32)((v3->TCoords.X - rightTx) * tmpDiv);
 			rightTyStep = (s32)((v3->TCoords.Y - rightTy) * tmpDiv);
 
 			tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 			leftdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
 			leftZStep = (s32)((v2->ZValue - v1->ZValue) * tmpDiv);
-			leftStepR = (s32)(((video::getRedSigned(v2->Color)<<8) - leftR) * tmpDiv);
-			leftStepG = (s32)(((video::getGreenSigned(v2->Color)<<8) - leftG) * tmpDiv);
-			leftStepB = (s32)(((video::getBlueSigned(v2->Color)<<8) - leftB) * tmpDiv);
+			leftStepR = (s32)(((s32)(video::getRed(v2->Color)<<8) - leftR) * tmpDiv);
+			leftStepG = (s32)(((s32)(video::getGreen(v2->Color)<<8) - leftG) * tmpDiv);
+			leftStepB = (s32)(((s32)(video::getBlue(v2->Color)<<8) - leftB) * tmpDiv);
 			leftTxStep = (s32)((v2->TCoords.X - leftTx) * tmpDiv);
 			leftTyStep = (s32)((v2->TCoords.Y - leftTy) * tmpDiv);
 		}
@@ -342,7 +339,9 @@ void CTRTextureGouraud::drawIndexedTriangleList(S2DVertex* vertices, s32 vertexC
 						{
 							*spanZTarget = spanZValue;
 							u16 color = lockedTexture[((spanTy>>8)&textureYMask) * lockedTextureWidth + ((spanTx>>8)&textureXMask)];
-							*hSpanBegin = video::RGB16(video::getRedSigned(color) * (spanR>>8) >>2, video::getGreenSigned(color) * (spanG>>8) >>2, video::getBlueSigned(color) * (spanB>>8) >>2);
+							*hSpanBegin = video::RGB16(video::getRed(color) * (spanR>>8) >>2,
+									video::getGreen(color) * (spanG>>8) >>2,
+									video::getBlue(color) * (spanB>>8) >>2);
 						}
 
 						spanR += spanStepR;
@@ -395,12 +394,12 @@ void CTRTextureGouraud::drawIndexedTriangleList(S2DVertex* vertices, s32 vertexC
 				rightZValue = v2->ZValue;
 				rightZStep = (s32)((v3->ZValue - v2->ZValue) * tmpDiv);
 
-				rightR = video::getRedSigned(v2->Color)<<8;
-				rightG = video::getGreenSigned(v2->Color)<<8;
-				rightB = video::getBlueSigned(v2->Color)<<8;
-				rightStepR = (s32)(((video::getRedSigned(v3->Color)<<8) - rightR) * tmpDiv);
-				rightStepG = (s32)(((video::getGreenSigned(v3->Color)<<8) - rightG) * tmpDiv);
-				rightStepB = (s32)(((video::getBlueSigned(v3->Color)<<8) - rightB) * tmpDiv);
+				rightR = video::getRed(v2->Color)<<8;
+				rightG = video::getGreen(v2->Color)<<8;
+				rightB = video::getBlue(v2->Color)<<8;
+				rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
+				rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
+				rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
 
 				rightTx = v2->TCoords.X;
 				rightTy = v2->TCoords.Y;
@@ -417,12 +416,12 @@ void CTRTextureGouraud::drawIndexedTriangleList(S2DVertex* vertices, s32 vertexC
 				leftZValue = v2->ZValue;
 				leftZStep = (s32)((v3->ZValue - v2->ZValue) * tmpDiv);
 
-				leftR = video::getRedSigned(v2->Color)<<8;
-				leftG = video::getGreenSigned(v2->Color)<<8;
-				leftB = video::getBlueSigned(v2->Color)<<8;
-				leftStepR = (s32)(((video::getRedSigned(v3->Color)<<8) - leftR) * tmpDiv);
-				leftStepG = (s32)(((video::getGreenSigned(v3->Color)<<8) - leftG) * tmpDiv);
-				leftStepB = (s32)(((video::getBlueSigned(v3->Color)<<8) - leftB) * tmpDiv);
+				leftR = video::getRed(v2->Color)<<8;
+				leftG = video::getGreen(v2->Color)<<8;
+				leftB = video::getBlue(v2->Color)<<8;
+				leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
+				leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
+				leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
 
 				leftTx = v2->TCoords.X;
 				leftTy = v2->TCoords.Y;
diff --git a/src/dep/src/irrlicht/CTRTextureGouraud.h b/src/dep/src/irrlicht/CTRTextureGouraud.h
index c05b917..443f16c 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraud.h
+++ b/src/dep/src/irrlicht/CTRTextureGouraud.h
@@ -1,11 +1,27 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #ifndef __C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED__
 #define __C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED__
 
+#include "IrrCompileConfig.h"
+
+#ifndef _IRR_COMPILE_WITH_SOFTWARE_
+// forward declarations for create methods
+namespace irr
+{
+namespace video
+{
+	class ITriangleRenderer;
+	class IZBuffer;
+} // end namespace video
+} // end namespace irr
+
+#else
+
 #include "ITriangleRenderer.h"
+#include "IImage.h"
 
 namespace irr
 {
@@ -21,7 +37,7 @@ namespace video
 	
 		//! destructor
 		virtual ~CTRTextureGouraud();
-
+	
 		//! sets a render target
 		virtual void setRenderTarget(video::IImage* surface, const core::rect<s32>& viewPort);
 
@@ -65,3 +81,5 @@ namespace video
 
 #endif
 
+#endif
+
diff --git a/src/dep/src/irrlicht/CTRTextureGouraud2.cpp b/src/dep/src/irrlicht/CTRTextureGouraud2.cpp
index c1b8fde..f428867 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraud2.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraud2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -133,10 +133,7 @@ void CTRTextureGouraud2::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -158,13 +155,13 @@ void CTRTextureGouraud2::scanline_bilinear ()
 	slopeW = (line.w[1] - line.w[0]) * invDeltaX;
 #endif
 #ifdef IPOL_C0
-	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
+	slopeC = (line.c[0][1] - line.c[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -176,20 +173,20 @@ void CTRTextureGouraud2::scanline_bilinear ()
 	line.w[0] += slopeW * subPixel;
 #endif
 #ifdef IPOL_C0
-	line.c[0] += slopeC * subPixel;
+	line.c[0][0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -200,8 +197,9 @@ void CTRTextureGouraud2::scanline_bilinear ()
 	tFixPoint tx0;
 	tFixPoint ty0;
 
-#ifdef IPOL_C0
 	tFixPoint r0, g0, b0;
+
+#ifdef IPOL_C0
 	tFixPoint r1, g1, b1;
 #endif
 
@@ -228,20 +226,20 @@ void CTRTextureGouraud2::scanline_bilinear ()
 
 #ifdef INVERSE_W
 			inversew = fix_inverse32 ( line.w[0] );
-			tx0 = f32_to_fixPoint ( line.t0[0].x, inversew);
-			ty0 = f32_to_fixPoint ( line.t0[0].y, inversew);
+			tx0 = f32_to_fixPoint ( line.t[0][0].x, inversew);
+			ty0 = f32_to_fixPoint ( line.t[0][0].y, inversew);
 
 #ifdef IPOL_C0
-			r1 = f32_to_fixPoint ( line.c[0].y ,inversew );
-			g1 = f32_to_fixPoint ( line.c[0].z ,inversew );
-			b1 = f32_to_fixPoint ( line.c[0].w ,inversew );
+			r1 = f32_to_fixPoint ( line.c[0][0].y ,inversew );
+			g1 = f32_to_fixPoint ( line.c[0][0].z ,inversew );
+			b1 = f32_to_fixPoint ( line.c[0][0].w ,inversew );
 #endif
 
 #else
-			tx0 = f32_to_fixPoint ( line.t0[0].x );
-			ty0 = f32_to_fixPoint ( line.t0[0].y );
+			tx0 = f32_to_fixPoint ( line.t[0][0].x );
+			ty0 = f32_to_fixPoint ( line.t[0][0].y );
 #ifdef IPOL_C0
-			getTexel_plain2 ( r1, g1, b1, line.c[0] );
+			getTexel_plain2 ( r1, g1, b1, line.c[0][0] );
 #endif
 #endif
 
@@ -273,13 +271,13 @@ void CTRTextureGouraud2::scanline_bilinear ()
 		line.w[0] += slopeW;
 #endif
 #ifdef IPOL_C0
-		line.c[0] += slopeC;
+		line.c[0][0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -328,18 +326,18 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 #endif
 
 #ifdef IPOL_C0
-	scan.slopeC[0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
-	scan.c[0] = a->Color[0];
+	scan.slopeC[0][0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
+	scan.c[0][0] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -353,7 +351,7 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -382,18 +380,18 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
-		scan.c[1] = a->Color[0];
+		scan.slopeC[0][1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
+		scan.c[0][1] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -418,18 +416,18 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -451,18 +449,18 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -482,18 +480,18 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -515,13 +513,13 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 			scan.w[0] = a->Pos.w + scan.slopeW[0] * temp[0];
 #endif
 #ifdef IPOL_C0
-			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
+			scan.c[0][0] = a->Color[0] + scan.slopeC[0][0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -541,18 +539,18 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
-		scan.c[1] = b->Color[0];
+		scan.slopeC[0][1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
+		scan.c[0][1] = b->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -578,18 +576,18 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -611,18 +609,18 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -642,18 +640,18 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -662,7 +660,7 @@ void CTRTextureGouraud2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,co
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureGouraudAdd.cpp b/src/dep/src/irrlicht/CTRTextureGouraudAdd.cpp
index 1779a89..6b373af 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraudAdd.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraudAdd.cpp
@@ -1,10 +1,9 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "IrrCompileConfig.h"
 #include "CTRTextureGouraud.h"
-#include "os.h"
 
 #ifdef _IRR_COMPILE_WITH_SOFTWARE_
 
@@ -121,8 +120,7 @@ void CTRTextureGouraudAdd::drawIndexedTriangleList(S2DVertex* vertices, s32 vert
 		if (!TriangleRect.isRectCollided(ViewPortRect))
 			continue;
 
-
-		// höhe des dreiecks berechnen
+		// calculate height of triangle
 		height = v3->Pos.Y - v1->Pos.Y;
 		if (!height)
 			continue;
@@ -153,18 +151,18 @@ void CTRTextureGouraudAdd::drawIndexedTriangleList(S2DVertex* vertices, s32 vert
 			tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 			rightdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
 			rightZStep = (s32)((v2->ZValue - v1->ZValue) * tmpDiv);
-			rightStepR = (s32)(((video::getRed(v2->Color)<<8) - rightR) * tmpDiv);
-			rightStepG = (s32)(((video::getGreen(v2->Color)<<8) - rightG) * tmpDiv);
-			rightStepB = (s32)(((video::getBlue(v2->Color)<<8) - rightB) * tmpDiv);
+			rightStepR = (s32)(((s32)(video::getRed(v2->Color)<<8) - rightR) * tmpDiv);
+			rightStepG = (s32)(((s32)(video::getGreen(v2->Color)<<8) - rightG) * tmpDiv);
+			rightStepB = (s32)(((s32)(video::getBlue(v2->Color)<<8) - rightB) * tmpDiv);
 			rightTxStep = (s32)((v2->TCoords.X - rightTx) * tmpDiv);
 			rightTyStep = (s32)((v2->TCoords.Y - rightTy) * tmpDiv);
 
 			tmpDiv = 1.0f / (f32)height;
 			leftdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
 			leftZStep = (s32)((v3->ZValue - v1->ZValue) * tmpDiv);
-			leftStepR = (s32)(((video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
-			leftStepG = (s32)(((video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
-			leftStepB = (s32)(((video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
+			leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
+			leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
+			leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
 			leftTxStep = (s32)((v3->TCoords.X - leftTx) * tmpDiv);
 			leftTyStep = (s32)((v3->TCoords.Y - leftTy) * tmpDiv);
 		}
@@ -173,18 +171,18 @@ void CTRTextureGouraudAdd::drawIndexedTriangleList(S2DVertex* vertices, s32 vert
 			tmpDiv = 1.0f / (f32)height;
 			rightdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
 			rightZStep = (s32)((v3->ZValue - v1->ZValue) * tmpDiv);
-			rightStepR = (s32)(((video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
-			rightStepG = (s32)(((video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
-			rightStepB = (s32)(((video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
+			rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
+			rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
+			rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
 			rightTxStep = (s32)((v3->TCoords.X - rightTx) * tmpDiv);
 			rightTyStep = (s32)((v3->TCoords.Y - rightTy) * tmpDiv);
 
 			tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 			leftdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
 			leftZStep = (s32)((v2->ZValue - v1->ZValue) * tmpDiv);
-			leftStepR = (s32)(((video::getRed(v2->Color)<<8) - leftR) * tmpDiv);
-			leftStepG = (s32)(((video::getGreen(v2->Color)<<8) - leftG) * tmpDiv);
-			leftStepB = (s32)(((video::getBlue(v2->Color)<<8) - leftB) * tmpDiv);
+			leftStepR = (s32)(((s32)(video::getRed(v2->Color)<<8) - leftR) * tmpDiv);
+			leftStepG = (s32)(((s32)(video::getGreen(v2->Color)<<8) - leftG) * tmpDiv);
+			leftStepB = (s32)(((s32)(video::getBlue(v2->Color)<<8) - leftB) * tmpDiv);
 			leftTxStep = (s32)((v2->TCoords.X - leftTx) * tmpDiv);
 			leftTyStep = (s32)((v2->TCoords.Y - leftTy) * tmpDiv);
 		}
@@ -244,7 +242,7 @@ void CTRTextureGouraudAdd::drawIndexedTriangleList(S2DVertex* vertices, s32 vert
 
 				// perform some clipping
 				// thanks to a correction by hybrid
-                // calculations delayed to correctly propagate to textures etc.
+				// calculations delayed to correctly propagate to textures etc.
 				s32 tDiffLeft=0, tDiffRight=0;
 				if (leftx<ViewPortRect.UpperLeftCorner.X)
 					tDiffLeft=ViewPortRect.UpperLeftCorner.X-leftx;
@@ -288,12 +286,12 @@ void CTRTextureGouraudAdd::drawIndexedTriangleList(S2DVertex* vertices, s32 vert
 							//*spanZTarget = spanZValue;
 							color = lockedTexture[((spanTy>>8)&textureYMask) * lockedTextureWidth + ((spanTx>>8)&textureXMask)];
 
-							int basis = *hSpanBegin;
-							int r = (video::getRed(basis)<<3) + (video::getRed(color)<<3);
+							s32 basis = *hSpanBegin;
+							s32 r = (video::getRed(basis)<<3) + (video::getRed(color)<<3);
 							if (r > 255) r = 255;
-							int g = (video::getGreen(basis)<<3) + (video::getGreen(color)<<3);
+							s32 g = (video::getGreen(basis)<<3) + (video::getGreen(color)<<3);
 							if (g > 255) g = 255;
-							int b = (video::getBlue(basis)<<3) + (video::getBlue(color)<<3);
+							s32 b = (video::getBlue(basis)<<3) + (video::getBlue(color)<<3);
 							if (b > 255) b = 255;
 
 							*hSpanBegin = video::RGB16(r, g, b);
@@ -352,9 +350,9 @@ void CTRTextureGouraudAdd::drawIndexedTriangleList(S2DVertex* vertices, s32 vert
 				rightR = video::getRed(v2->Color)<<8;
 				rightG = video::getGreen(v2->Color)<<8;
 				rightB = video::getBlue(v2->Color)<<8;
-				rightStepR = (s32)(((video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
-				rightStepG = (s32)(((video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
-				rightStepB = (s32)(((video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
+				rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
+				rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
+				rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
 
 				rightTx = v2->TCoords.X;
 				rightTy = v2->TCoords.Y;
@@ -374,9 +372,9 @@ void CTRTextureGouraudAdd::drawIndexedTriangleList(S2DVertex* vertices, s32 vert
 				leftR = video::getRed(v2->Color)<<8;
 				leftG = video::getGreen(v2->Color)<<8;
 				leftB = video::getBlue(v2->Color)<<8;
-				leftStepR = (s32)(((video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
-				leftStepG = (s32)(((video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
-				leftStepB = (s32)(((video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
+				leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
+				leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
+				leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
 
 				leftTx = v2->TCoords.X;
 				leftTy = v2->TCoords.Y;
diff --git a/src/dep/src/irrlicht/CTRTextureGouraudAdd2.cpp b/src/dep/src/irrlicht/CTRTextureGouraudAdd2.cpp
index 84918da..46363de 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraudAdd2.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraudAdd2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -133,10 +133,7 @@ void CTRTextureGouraudAdd2::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -161,10 +158,10 @@ void CTRTextureGouraudAdd2::scanline_bilinear ()
 	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -179,17 +176,17 @@ void CTRTextureGouraudAdd2::scanline_bilinear ()
 	line.c[0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -240,14 +237,14 @@ void CTRTextureGouraudAdd2::scanline_bilinear ()
 
 			dst[i] = PixelAdd32 (
 						dst[i],
-					getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t0[0].x,inversew), 
-												d + f32_to_fixPoint ( line.t0[0].y,inversew) )
+					getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t[0][0].x,inversew), 
+												d + f32_to_fixPoint ( line.t[0][0].y,inversew) )
 												  );
 #else
 			dst[i] = PixelAdd32 (
 						dst[i],
-					getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t0[0].x), 
-												d + f32_to_fixPoint ( line.t0[0].y) )
+					getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t[0][0].x), 
+												d + f32_to_fixPoint ( line.t[0][0].y) )
 												 );
 
 #endif
@@ -256,11 +253,11 @@ void CTRTextureGouraudAdd2::scanline_bilinear ()
 #ifdef INVERSE_W
 			inversew = fix_inverse32 ( line.w[0] );
 
-			tx0 = f32_to_fixPoint ( line.t0[0].x,inversew);
-			ty0 = f32_to_fixPoint ( line.t0[0].y,inversew);
+			tx0 = f32_to_fixPoint ( line.t[0][0].x,inversew);
+			ty0 = f32_to_fixPoint ( line.t[0][0].y,inversew);
 #else
-			tx0 = f32_to_fixPoint ( line.t0[0].x );
-			ty0 = f32_to_fixPoint ( line.t0[0].y );
+			tx0 = f32_to_fixPoint ( line.t[0][0].x );
+			ty0 = f32_to_fixPoint ( line.t[0][0].y );
 #endif
 			getSample_texture ( r0, g0, b0, &IT[0], tx0,ty0 );
 
@@ -285,10 +282,10 @@ void CTRTextureGouraudAdd2::scanline_bilinear ()
 		line.c[0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -340,13 +337,13 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -360,7 +357,7 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -394,13 +391,13 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -430,13 +427,13 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -463,13 +460,13 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -494,13 +491,13 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -525,10 +522,10 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -553,13 +550,13 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -590,13 +587,13 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -623,13 +620,13 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -654,13 +651,13 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -669,7 +666,7 @@ void CTRTextureGouraudAdd2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureGouraudAddNoZ2.cpp b/src/dep/src/irrlicht/CTRTextureGouraudAddNoZ2.cpp
index 612b6a7..0798f44 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraudAddNoZ2.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraudAddNoZ2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -133,10 +133,7 @@ void CTRTextureGouraudAddNoZ2::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -161,10 +158,10 @@ void CTRTextureGouraudAddNoZ2::scanline_bilinear ()
 	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -179,17 +176,17 @@ void CTRTextureGouraudAddNoZ2::scanline_bilinear ()
 	line.c[0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef IPOL_Z
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -214,11 +211,11 @@ void CTRTextureGouraudAddNoZ2::scanline_bilinear ()
 #ifdef IPOL_W
 			inversew = fix_inverse32 ( line.w[0] );
 
-			tx0 = f32_to_fixPoint ( line.t0[0].x,inversew);
-			ty0 = f32_to_fixPoint ( line.t0[0].y,inversew);
+			tx0 = f32_to_fixPoint ( line.t[0][0].x,inversew);
+			ty0 = f32_to_fixPoint ( line.t[0][0].y,inversew);
 #else
-			tx0 = f32_to_fixPoint ( line.t0[0].x );
-			ty0 = f32_to_fixPoint ( line.t0[0].y );
+			tx0 = f32_to_fixPoint ( line.t[0][0].x );
+			ty0 = f32_to_fixPoint ( line.t[0][0].y );
 #endif
 
 			getSample_texture ( r0, g0, b0, &IT[0], tx0,ty0 );
@@ -247,10 +244,10 @@ void CTRTextureGouraudAddNoZ2::scanline_bilinear ()
 		line.c[0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -303,13 +300,13 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -323,7 +320,7 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef IPOL_Z
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -357,13 +354,13 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -393,13 +390,13 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -426,13 +423,13 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -457,13 +454,13 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -488,10 +485,10 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -516,13 +513,13 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -553,13 +550,13 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -586,13 +583,13 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -617,13 +614,13 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -632,7 +629,7 @@ void CTRTextureGouraudAddNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex
 	RenderTarget->unlock();
 
 #ifdef IPOL_Z
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureGouraudAlpha.cpp b/src/dep/src/irrlicht/CTRTextureGouraudAlpha.cpp
index 4b44815..617f4d6 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraudAlpha.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraudAlpha.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -150,10 +150,7 @@ void CTRTextureGouraudAlpha2::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -178,10 +175,10 @@ void CTRTextureGouraudAlpha2::scanline_bilinear ()
 	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -196,17 +193,17 @@ void CTRTextureGouraudAlpha2::scanline_bilinear ()
 	line.c[0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -242,14 +239,14 @@ void CTRTextureGouraudAlpha2::scanline_bilinear ()
 
 		inversew = fix_inverse32 ( line.w[0] );
 
-		u32 argb = getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t0[0].x,inversew), 
-											d + f32_to_fixPoint ( line.t0[0].y,inversew)
+		u32 argb = getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t[0][0].x,inversew), 
+											d + f32_to_fixPoint ( line.t[0][0].y,inversew)
 											);
 
 #else
 
-		u32 argb = getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t0[0].x), 
-											d + f32_to_fixPoint ( line.t0[0].y)
+		u32 argb = getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t[0][0].x), 
+											d + f32_to_fixPoint ( line.t[0][0].y)
 											);
 
 #endif
@@ -274,8 +271,8 @@ void CTRTextureGouraudAlpha2::scanline_bilinear ()
 
 		getSample_texture ( a0, r0, g0, b0, 
 							&IT[0],
-							f32_to_fixPoint ( line.t0[0].x,inversew),
-							f32_to_fixPoint ( line.t0[0].y,inversew)
+							f32_to_fixPoint ( line.t[0][0].x,inversew),
+							f32_to_fixPoint ( line.t[0][0].y,inversew)
 						);
 
 		if ( a0 >= AlphaRef )
@@ -306,10 +303,10 @@ void CTRTextureGouraudAlpha2::scanline_bilinear ()
 		line.c[0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -363,13 +360,13 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -383,7 +380,7 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -417,13 +414,13 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -453,13 +450,13 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -486,13 +483,13 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -517,13 +514,13 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -548,10 +545,10 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -576,13 +573,13 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -613,13 +610,13 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -646,13 +643,13 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -677,13 +674,13 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -692,7 +689,7 @@ void CTRTextureGouraudAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureGouraudAlphaNoZ.cpp b/src/dep/src/irrlicht/CTRTextureGouraudAlphaNoZ.cpp
index fb0f97d..590aeb7 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraudAlphaNoZ.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraudAlphaNoZ.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -150,10 +150,7 @@ void CTRTextureGouraudAlphaNoZ::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -178,10 +175,10 @@ void CTRTextureGouraudAlphaNoZ::scanline_bilinear ()
 	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -196,17 +193,17 @@ void CTRTextureGouraudAlphaNoZ::scanline_bilinear ()
 	line.c[0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -242,14 +239,14 @@ void CTRTextureGouraudAlphaNoZ::scanline_bilinear ()
 
 		inversew = fix_inverse32 ( line.w[0] );
 
-		u32 argb = getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t0[0].x,inversew), 
-											d + f32_to_fixPoint ( line.t0[0].y,inversew)
+		u32 argb = getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t[0][0].x,inversew), 
+											d + f32_to_fixPoint ( line.t[0][0].y,inversew)
 											);
 
 #else
 
-		u32 argb = getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t0[0].x), 
-											d + f32_to_fixPoint ( line.t0[0].y)
+		u32 argb = getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t[0][0].x), 
+											d + f32_to_fixPoint ( line.t[0][0].y)
 											);
 
 #endif
@@ -274,8 +271,8 @@ void CTRTextureGouraudAlphaNoZ::scanline_bilinear ()
 
 		getSample_texture ( a0, r0, g0, b0, 
 							&IT[0],
-							f32_to_fixPoint ( line.t0[0].x,inversew),
-							f32_to_fixPoint ( line.t0[0].y,inversew)
+							f32_to_fixPoint ( line.t[0][0].x,inversew),
+							f32_to_fixPoint ( line.t[0][0].y,inversew)
 						);
 
 		if ( a0 >= AlphaRef )
@@ -306,10 +303,10 @@ void CTRTextureGouraudAlphaNoZ::scanline_bilinear ()
 		line.c[0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -363,13 +360,13 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -383,7 +380,7 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -417,13 +414,13 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -453,13 +450,13 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -486,13 +483,13 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -517,13 +514,13 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -548,10 +545,10 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -576,13 +573,13 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -613,13 +610,13 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -646,13 +643,13 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -677,13 +674,13 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -692,7 +689,7 @@ void CTRTextureGouraudAlphaNoZ::drawTriangle ( const s4DVertex *a,const s4DVerte
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureGouraudNoZ.cpp b/src/dep/src/irrlicht/CTRTextureGouraudNoZ.cpp
index 7e8e652..9f105ce 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraudNoZ.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraudNoZ.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -103,8 +103,7 @@ public:
 			if (!TriangleRect.isRectCollided(ViewPortRect))
 				continue;
 
-
-			// höhe des dreiecks berechnen
+			// calculate height of triangle
 			height = v3->Pos.Y - v1->Pos.Y;
 			if (!height)
 				continue;
@@ -130,17 +129,17 @@ public:
 			{
 				tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 				rightdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
-				rightStepR = (s32)(((video::getRed(v2->Color)<<8) - rightR) * tmpDiv);
-				rightStepG = (s32)(((video::getGreen(v2->Color)<<8) - rightG) * tmpDiv);
-				rightStepB = (s32)(((video::getBlue(v2->Color)<<8) - rightB) * tmpDiv);
+				rightStepR = (s32)(((s32)(video::getRed(v2->Color)<<8) - rightR) * tmpDiv);
+				rightStepG = (s32)(((s32)(video::getGreen(v2->Color)<<8) - rightG) * tmpDiv);
+				rightStepB = (s32)(((s32)(video::getBlue(v2->Color)<<8) - rightB) * tmpDiv);
 				rightTxStep = (s32)((v2->TCoords.X - rightTx) * tmpDiv);
 				rightTyStep = (s32)((v2->TCoords.Y - rightTy) * tmpDiv);
 
 				tmpDiv = 1.0f / (f32)height;
 				leftdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
-				leftStepR = (s32)(((video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
-				leftStepG = (s32)(((video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
-				leftStepB = (s32)(((video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
+				leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
+				leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
+				leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
 				leftTxStep = (s32)((v3->TCoords.X - leftTx) * tmpDiv);
 				leftTyStep = (s32)((v3->TCoords.Y - leftTy) * tmpDiv);
 			}
@@ -148,17 +147,17 @@ public:
 			{
 				tmpDiv = 1.0f / (f32)height;
 				rightdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
-				rightStepR = (s32)(((video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
-				rightStepG = (s32)(((video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
-				rightStepB = (s32)(((video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
+				rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
+				rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
+				rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
 				rightTxStep = (s32)((v3->TCoords.X - rightTx) * tmpDiv);
 				rightTyStep = (s32)((v3->TCoords.Y - rightTy) * tmpDiv);
 
 				tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 				leftdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
-				leftStepR = (s32)(((video::getRed(v2->Color)<<8) - leftR) * tmpDiv);
-				leftStepG = (s32)(((video::getGreen(v2->Color)<<8) - leftG) * tmpDiv);
-				leftStepB = (s32)(((video::getBlue(v2->Color)<<8) - leftB) * tmpDiv);
+				leftStepR = (s32)(((s32)(video::getRed(v2->Color)<<8) - leftR) * tmpDiv);
+				leftStepG = (s32)(((s32)(video::getGreen(v2->Color)<<8) - leftG) * tmpDiv);
+				leftStepB = (s32)(((s32)(video::getBlue(v2->Color)<<8) - leftB) * tmpDiv);
 				leftTxStep = (s32)((v2->TCoords.X - leftTx) * tmpDiv);
 				leftTyStep = (s32)((v2->TCoords.Y - leftTy) * tmpDiv);
 			}
@@ -252,7 +251,9 @@ public:
 						while (hSpanBegin < hSpanEnd) 
 						{
 							color = lockedTexture[((spanTy>>8)&textureYMask) * lockedTextureWidth + ((spanTx>>8)&textureXMask)];
-							*hSpanBegin = video::RGB16(video::getRed(color) * (spanR>>8) >>2, video::getGreen(color) * (spanG>>8) >>2, video::getBlue(color) * (spanB>>8) >>2);
+							*hSpanBegin = video::RGB16(video::getRed(color) * (spanR>>8) >>2,
+									video::getGreen(color) * (spanG>>8) >>2,
+									video::getBlue(color) * (spanB>>8) >>2);
 
 							spanR += spanStepR;
 							spanG += spanStepG;
@@ -299,9 +300,9 @@ public:
 					rightR = video::getRed(v2->Color)<<8;
 					rightG = video::getGreen(v2->Color)<<8;
 					rightB = video::getBlue(v2->Color)<<8;
-					rightStepR = (s32)(((video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
-					rightStepG = (s32)(((video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
-					rightStepB = (s32)(((video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
+					rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
+					rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
+					rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
 
 					rightTx = v2->TCoords.X;
 					rightTy = v2->TCoords.Y;
@@ -318,9 +319,9 @@ public:
 					leftR = video::getRed(v2->Color)<<8;
 					leftG = video::getGreen(v2->Color)<<8;
 					leftB = video::getBlue(v2->Color)<<8;
-					leftStepR = (s32)(((video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
-					leftStepG = (s32)(((video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
-					leftStepB = (s32)(((video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
+					leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
+					leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
+					leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
 
 					leftTx = v2->TCoords.X;
 					leftTy = v2->TCoords.Y;
diff --git a/src/dep/src/irrlicht/CTRTextureGouraudNoZ2.cpp b/src/dep/src/irrlicht/CTRTextureGouraudNoZ2.cpp
index 1b44056..18a7db0 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraudNoZ2.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraudNoZ2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -138,10 +138,7 @@ void CTRTextureGouraudNoZ2::scanline_bilinear ( )
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -166,10 +163,10 @@ void CTRTextureGouraudNoZ2::scanline_bilinear ( )
 	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -184,17 +181,17 @@ void CTRTextureGouraudNoZ2::scanline_bilinear ( )
 	line.c[0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -219,11 +216,11 @@ void CTRTextureGouraudNoZ2::scanline_bilinear ( )
 #ifdef INVERSE_W
 			inversew = fix_inverse32 ( line.w[0] );
 
-			tx0 = f32_to_fixPoint ( line.t0[0].x,inversew);
-			ty0 = f32_to_fixPoint ( line.t0[0].y,inversew);
+			tx0 = f32_to_fixPoint ( line.t[0][0].x,inversew);
+			ty0 = f32_to_fixPoint ( line.t[0][0].y,inversew);
 #else
-			tx0 = f32_to_fixPoint ( line.t0[0].x );
-			ty0 = f32_to_fixPoint ( line.t0[0].y );
+			tx0 = f32_to_fixPoint ( line.t[0][0].x );
+			ty0 = f32_to_fixPoint ( line.t[0][0].y );
 #endif
 			dst[i] = getTexel_plain ( &IT[0], tx0, ty0 );
 
@@ -249,10 +246,10 @@ void CTRTextureGouraudNoZ2::scanline_bilinear ( )
 		line.c[0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -306,13 +303,13 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -326,7 +323,7 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -360,13 +357,13 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -396,13 +393,13 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -429,13 +426,13 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -460,13 +457,13 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -491,10 +488,10 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -519,13 +516,13 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -556,13 +553,13 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -589,13 +586,13 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -620,13 +617,13 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -635,7 +632,7 @@ void CTRTextureGouraudNoZ2::drawTriangle ( const s4DVertex *a,const s4DVertex *b
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureGouraudVertexAlpha2.cpp b/src/dep/src/irrlicht/CTRTextureGouraudVertexAlpha2.cpp
index 5a08278..e03c4e0 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraudVertexAlpha2.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraudVertexAlpha2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -132,10 +132,7 @@ void CTRTextureVertexAlpha2::scanline_bilinear (  )
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -157,13 +154,13 @@ void CTRTextureVertexAlpha2::scanline_bilinear (  )
 	slopeW = (line.w[1] - line.w[0]) * invDeltaX;
 #endif
 #ifdef IPOL_C0
-	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
+	slopeC = (line.c[0][1] - line.c[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -175,20 +172,20 @@ void CTRTextureVertexAlpha2::scanline_bilinear (  )
 	line.w[0] += slopeW * subPixel;
 #endif
 #ifdef IPOL_C0
-	line.c[0] += slopeC * subPixel;
+	line.c[0][0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -231,8 +228,8 @@ void CTRTextureVertexAlpha2::scanline_bilinear (  )
 
 			dst[i] = PixelAdd32 (
 						dst[i],
-					getTexel_plain ( &IT[0],	f32_to_fixPoint ( line.t0[0].x,inversew), 
-												f32_to_fixPoint ( line.t0[0].y,inversew) )
+					getTexel_plain ( &IT[0],	f32_to_fixPoint ( line.t[0][0].x,inversew), 
+												f32_to_fixPoint ( line.t[0][0].y,inversew) )
 												  );
 
 #else
@@ -240,19 +237,19 @@ void CTRTextureVertexAlpha2::scanline_bilinear (  )
 #ifdef INVERSE_W
 			inversew = fix_inverse32 ( line.w[0] );
 
-			tx0 = f32_to_fixPoint ( line.t0[0].x,inversew);
-			ty0 = f32_to_fixPoint ( line.t0[0].y,inversew);
+			tx0 = f32_to_fixPoint ( line.t[0][0].x,inversew);
+			ty0 = f32_to_fixPoint ( line.t[0][0].y,inversew);
 
 #ifdef IPOL_C0
-			a3 = f32_to_fixPoint ( line.c[0].y,inversew );
+			a3 = f32_to_fixPoint ( line.c[0][0].y,inversew );
 #endif
 
 #else
-			tx0 = f32_to_fixPoint ( line.t0[0].x );
-			ty0 = f32_to_fixPoint ( line.t0[0].y );
+			tx0 = f32_to_fixPoint ( line.t[0][0].x );
+			ty0 = f32_to_fixPoint ( line.t[0][0].y );
 
 #ifdef IPOL_C0
-			a3 = f32_to_fixPoint ( line.c[0].y );
+			a3 = f32_to_fixPoint ( line.c[0][0].y );
 #endif
 
 
@@ -289,13 +286,13 @@ void CTRTextureVertexAlpha2::scanline_bilinear (  )
 		line.w[0] += slopeW;
 #endif
 #ifdef IPOL_C0
-		line.c[0] += slopeC;
+		line.c[0][0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -344,18 +341,18 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_C0
-	scan.slopeC[0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
-	scan.c[0] = a->Color[0];
+	scan.slopeC[0][0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
+	scan.c[0][0] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -369,7 +366,7 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -398,18 +395,18 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
-		scan.c[1] = a->Color[0];
+		scan.slopeC[0][1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
+		scan.c[0][1] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -434,18 +431,18 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -467,18 +464,18 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -498,18 +495,18 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -531,13 +528,13 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 			scan.w[0] = a->Pos.w + scan.slopeW[0] * temp[0];
 #endif
 #ifdef IPOL_C0
-			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
+			scan.c[0][0] = a->Color[0] + scan.slopeC[0][0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -557,18 +554,18 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
-		scan.c[1] = b->Color[0];
+		scan.slopeC[0][1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
+		scan.c[0][1] = b->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -594,18 +591,18 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -627,18 +624,18 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -658,18 +655,18 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -678,7 +675,7 @@ void CTRTextureVertexAlpha2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureGouraudWire.cpp b/src/dep/src/irrlicht/CTRTextureGouraudWire.cpp
index f57210b..0cbf20e 100644
--- a/src/dep/src/irrlicht/CTRTextureGouraudWire.cpp
+++ b/src/dep/src/irrlicht/CTRTextureGouraudWire.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -104,8 +104,7 @@ public:
 			if (!TriangleRect.isRectCollided(ViewPortRect))
 				continue;
 
-
-			// höhe des dreiecks berechnen
+			// calculate height of triangle
 			height = v3->Pos.Y - v1->Pos.Y;
 			if (!height)
 				continue;
@@ -136,18 +135,18 @@ public:
 				tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 				rightdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
 				rightZStep = (s32)((v2->ZValue - v1->ZValue) * tmpDiv);
-				rightStepR = (s32)(((video::getRed(v2->Color)<<8) - rightR) * tmpDiv);
-				rightStepG = (s32)(((video::getGreen(v2->Color)<<8) - rightG) * tmpDiv);
-				rightStepB = (s32)(((video::getBlue(v2->Color)<<8) - rightB) * tmpDiv);
+				rightStepR = (s32)(((s32)(video::getRed(v2->Color)<<8) - rightR) * tmpDiv);
+				rightStepG = (s32)(((s32)(video::getGreen(v2->Color)<<8) - rightG) * tmpDiv);
+				rightStepB = (s32)(((s32)(video::getBlue(v2->Color)<<8) - rightB) * tmpDiv);
 				rightTxStep = (s32)((v2->TCoords.X - rightTx) * tmpDiv);
 				rightTyStep = (s32)((v2->TCoords.Y - rightTy) * tmpDiv);
 
 				tmpDiv = 1.0f / (f32)height;
 				leftdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
 				leftZStep = (s32)((v3->ZValue - v1->ZValue) * tmpDiv);
-				leftStepR = (s32)(((video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
-				leftStepG = (s32)(((video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
-				leftStepB = (s32)(((video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
+				leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
+				leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
+				leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
 				leftTxStep = (s32)((v3->TCoords.X - leftTx) * tmpDiv);
 				leftTyStep = (s32)((v3->TCoords.Y - leftTy) * tmpDiv);
 			}
@@ -156,18 +155,18 @@ public:
 				tmpDiv = 1.0f / (f32)height;
 				rightdeltaxf = (v3->Pos.X - v1->Pos.X) * tmpDiv;
 				rightZStep = (s32)((v3->ZValue - v1->ZValue) * tmpDiv);
-				rightStepR = (s32)(((video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
-				rightStepG = (s32)(((video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
-				rightStepB = (s32)(((video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
+				rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
+				rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
+				rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
 				rightTxStep = (s32)((v3->TCoords.X - rightTx) * tmpDiv);
 				rightTyStep = (s32)((v3->TCoords.Y - rightTy) * tmpDiv);
 
 				tmpDiv = 1.0f / (f32)(v2->Pos.Y - v1->Pos.Y);
 				leftdeltaxf = (v2->Pos.X - v1->Pos.X) * tmpDiv;
 				leftZStep = (s32)((v2->ZValue - v1->ZValue) * tmpDiv);
-				leftStepR = (s32)(((video::getRed(v2->Color)<<8) - leftR) * tmpDiv);
-				leftStepG = (s32)(((video::getGreen(v2->Color)<<8) - leftG) * tmpDiv);
-				leftStepB = (s32)(((video::getBlue(v2->Color)<<8) - leftB) * tmpDiv);
+				leftStepR = (s32)(((s32)(video::getRed(v2->Color)<<8) - leftR) * tmpDiv);
+				leftStepG = (s32)(((s32)(video::getGreen(v2->Color)<<8) - leftG) * tmpDiv);
+				leftStepB = (s32)(((s32)(video::getBlue(v2->Color)<<8) - leftB) * tmpDiv);
 				leftTxStep = (s32)((v2->TCoords.X - leftTx) * tmpDiv);
 				leftTyStep = (s32)((v2->TCoords.Y - leftTy) * tmpDiv);
 			}
@@ -234,7 +233,9 @@ public:
 						{
 							*(zTarget + leftx) = leftZValue;
 							color = lockedTexture[((leftTy>>8)&textureYMask) * lockedTextureWidth + ((leftTx>>8)&textureXMask)];
-							*(targetSurface + leftx) = video::RGB16(video::getRed(color) * (leftR>>8) >>2, video::getGreen(color) * (leftG>>8) >>2, video::getBlue(color) * (leftR>>8) >>2);
+							*(targetSurface + leftx) = video::RGB16(video::getRed(color) * (leftR>>8) >>2,
+									video::getGreen(color) * (leftG>>8) >>2,
+									video::getBlue(color) * (leftR>>8) >>2);
 						}
 					}
 
@@ -246,7 +247,9 @@ public:
 						{
 							*(zTarget + rightx) = rightZValue;
 							color = lockedTexture[((rightTy>>8)&textureYMask) * lockedTextureWidth + ((rightTx>>8)&textureXMask)];
-							*(targetSurface + rightx) = video::RGB16(video::getRed(color) * (rightR>>8) >>2, video::getGreen(color) * (rightG>>8) >>2, video::getBlue(color) * (rightR>>8) >>2);
+							*(targetSurface + rightx) = video::RGB16(video::getRed(color) * (rightR>>8) >>2,
+									video::getGreen(color) * (rightG>>8) >>2,
+									video::getBlue(color) * (rightR>>8) >>2);
 						}
 
 					}
@@ -291,9 +294,9 @@ public:
 					rightR = video::getRed(v2->Color)<<8;
 					rightG = video::getGreen(v2->Color)<<8;
 					rightB = video::getBlue(v2->Color)<<8;
-					rightStepR = (s32)(((video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
-					rightStepG = (s32)(((video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
-					rightStepB = (s32)(((video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
+					rightStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - rightR) * tmpDiv);
+					rightStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - rightG) * tmpDiv);
+					rightStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - rightB) * tmpDiv);
 
 					rightTx = v2->TCoords.X;
 					rightTy = v2->TCoords.Y;
@@ -313,9 +316,9 @@ public:
 					leftR = video::getRed(v2->Color)<<8;
 					leftG = video::getGreen(v2->Color)<<8;
 					leftB = video::getBlue(v2->Color)<<8;
-					leftStepR = (s32)(((video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
-					leftStepG = (s32)(((video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
-					leftStepB = (s32)(((video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
+					leftStepR = (s32)(((s32)(video::getRed(v3->Color)<<8) - leftR) * tmpDiv);
+					leftStepG = (s32)(((s32)(video::getGreen(v3->Color)<<8) - leftG) * tmpDiv);
+					leftStepB = (s32)(((s32)(video::getBlue(v3->Color)<<8) - leftB) * tmpDiv);
 
 					leftTx = v2->TCoords.X;
 					leftTy = v2->TCoords.Y;
@@ -332,11 +335,10 @@ public:
 		RenderTarget->unlock();
 		ZBuffer->unlock();
 		Texture->unlock();
-
 	}
-
 };
 
+
 } // end namespace video
 } // end namespace irr
 
@@ -359,3 +361,4 @@ ITriangleRenderer* createTriangleRendererTextureGouraudWire(IZBuffer* zbuffer)
 
 } // end namespace video
 } // end namespace irr
+
diff --git a/src/dep/src/irrlicht/CTRTextureLightMap2_Add.cpp b/src/dep/src/irrlicht/CTRTextureLightMap2_Add.cpp
index 0c7d066..9441092 100644
--- a/src/dep/src/irrlicht/CTRTextureLightMap2_Add.cpp
+++ b/src/dep/src/irrlicht/CTRTextureLightMap2_Add.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -133,10 +133,7 @@ REALINLINE void CTRTextureLightMap2_Add::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -161,10 +158,10 @@ REALINLINE void CTRTextureLightMap2_Add::scanline_bilinear ()
 	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -179,17 +176,17 @@ REALINLINE void CTRTextureLightMap2_Add::scanline_bilinear ()
 	line.c[0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -232,19 +229,19 @@ REALINLINE void CTRTextureLightMap2_Add::scanline_bilinear ()
 			const tFixPointu d = dithermask [ dIndex | ( i ) & 3 ];
 
 			dst[i] = PixelAdd32 (
-					getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t0[0].x,inversew), 
-												d + f32_to_fixPoint ( line.t0[0].y,inversew) ),
-					getTexel_plain ( &IT[1],	d + f32_to_fixPoint ( line.t1[0].x,inversew), 
-												d + f32_to_fixPoint ( line.t1[0].y,inversew) )
+					getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t[0][0].x,inversew), 
+												d + f32_to_fixPoint ( line.t[0][0].y,inversew) ),
+					getTexel_plain ( &IT[1],	d + f32_to_fixPoint ( line.t[1][0].x,inversew), 
+												d + f32_to_fixPoint ( line.t[1][0].y,inversew) )
 							);
 #else
 			const tFixPointu d = dithermask [ dIndex | ( i ) & 3 ];
 
 			dst[i] = PixelAdd32 (
-					getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t0[0].x), 
-												d + f32_to_fixPoint ( line.t0[0].y) ),
-					getTexel_plain ( &IT[1],	d + f32_to_fixPoint ( line.t1[0].x), 
-												d + f32_to_fixPoint ( line.t1[0].y) )
+					getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t[0][0].x), 
+												d + f32_to_fixPoint ( line.t[0][0].y) ),
+					getTexel_plain ( &IT[1],	d + f32_to_fixPoint ( line.t[1][0].x), 
+												d + f32_to_fixPoint ( line.t[1][0].y) )
 							);
 
 #endif
@@ -252,8 +249,8 @@ REALINLINE void CTRTextureLightMap2_Add::scanline_bilinear ()
 #else
 			const f32 inversew = fix_inverse32 ( line.w[0] );
 
-			getSample_texture ( r0, g0, b0, &IT[0], f32_to_fixPoint ( line.t0[0].x,inversew), f32_to_fixPoint ( line.t0[0].y,inversew) );
-			getSample_texture ( r1, g1, b1, &IT[1], f32_to_fixPoint ( line.t0[1].x,inversew), f32_to_fixPoint ( line.t0[1].y,inversew) );
+			getSample_texture ( r0, g0, b0, &IT[0], f32_to_fixPoint ( line.t[0][0].x,inversew), f32_to_fixPoint ( line.t[0][0].y,inversew) );
+			getSample_texture ( r1, g1, b1, &IT[1], f32_to_fixPoint ( line.t[0][1].x,inversew), f32_to_fixPoint ( line.t[0][1].y,inversew) );
 
 			dst[i] = fix_to_color ( clampfix_maxcolor ( r0 + r1 ),
 									clampfix_maxcolor ( g0 + g1 ),
@@ -273,10 +270,10 @@ REALINLINE void CTRTextureLightMap2_Add::scanline_bilinear ()
 		line.c[0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -330,13 +327,13 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -352,7 +349,7 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -388,13 +385,13 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -424,13 +421,13 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -457,13 +454,13 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -488,13 +485,13 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -519,10 +516,10 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -547,13 +544,13 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -584,13 +581,13 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -617,13 +614,13 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -648,13 +645,13 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -663,7 +660,7 @@ void CTRTextureLightMap2_Add::drawTriangle ( const s4DVertex *a,const s4DVertex
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureLightMap2_M1.cpp b/src/dep/src/irrlicht/CTRTextureLightMap2_M1.cpp
index 912cf38..dd197ca 100644
--- a/src/dep/src/irrlicht/CTRTextureLightMap2_M1.cpp
+++ b/src/dep/src/irrlicht/CTRTextureLightMap2_M1.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -126,7 +126,7 @@ REALINLINE void CTRTextureLightMap2_M1::scanline_bilinear2 ()
 	const f32 invDeltaX = core::reciprocal_approxim ( line.x[1] - line.x[0] );
 
 	// search z-buffer for first not occulled pixel
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 	// subTexel
 	const f32 subPixel = ( (f32) xStart ) - line.x[0];
@@ -172,15 +172,15 @@ REALINLINE void CTRTextureLightMap2_M1::scanline_bilinear2 ()
 	line.z[0] = a;
 	line.z[1] = b;
 #endif
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 	a = (f32) i + subPixel;
 
-	line.t0[1] = (line.t0[1] - line.t0[0]) * invDeltaX;
-	line.t1[1] = (line.t1[1] - line.t1[0]) * invDeltaX;
+	line.t[0][1] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
+	line.t[1][1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 
-	line.t0[0] += line.t0[1] * a;
-	line.t1[0] += line.t1[1] * a;
+	line.t[0][0] += line.t[0][1] * a;
+	line.t[1][0] += line.t[1][1] * a;
 
 
 #ifdef BURNINGVIDEO_RENDERER_FAST
@@ -218,18 +218,18 @@ REALINLINE void CTRTextureLightMap2_M1::scanline_bilinear2 ()
 			const tFixPointu d = dithermask [ dIndex | ( i ) & 3 ];
 
 			dst[i] = PixelMul32 (
-					getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t0[0].x,inversew), 
-												d + f32_to_fixPoint ( line.t0[0].y,inversew) ),
-					getTexel_plain ( &IT[1],	d + f32_to_fixPoint ( line.t1[0].x,inversew), 
-												d + f32_to_fixPoint ( line.t1[0].y,inversew) )
+					getTexel_plain ( &IT[0],	d + f32_to_fixPoint ( line.t[0][0].x,inversew), 
+												d + f32_to_fixPoint ( line.t[0][0].y,inversew) ),
+					getTexel_plain ( &IT[1],	d + f32_to_fixPoint ( line.t[1][0].x,inversew), 
+												d + f32_to_fixPoint ( line.t[1][0].y,inversew) )
 							);
 
 
 #else
 
 
-			getSample_texture ( r0, g0, b0, &IT[0], f32_to_fixPoint ( line.t0[0].x,inversew), f32_to_fixPoint ( line.t0[0].y,inversew) );
-			getSample_texture ( r1, g1, b1, &IT[1], f32_to_fixPoint ( line.t1[0].x,inversew), f32_to_fixPoint ( line.t1[0].y,inversew) );
+			getSample_texture ( r0, g0, b0, &IT[0], f32_to_fixPoint ( line.t[0][0].x,inversew), f32_to_fixPoint ( line.t[0][0].y,inversew) );
+			getSample_texture ( r1, g1, b1, &IT[1], f32_to_fixPoint ( line.t[1][0].x,inversew), f32_to_fixPoint ( line.t[1][0].y,inversew) );
 
 			dst[i] = fix_to_color ( clampfix_maxcolor ( imulFix_tex1 ( r0, r1 ) ),
 									clampfix_maxcolor ( imulFix_tex1 ( g0, g1 ) ),
@@ -244,8 +244,8 @@ REALINLINE void CTRTextureLightMap2_M1::scanline_bilinear2 ()
 #else
 		line.z[0] += line.z[1];
 #endif
-		line.t0[0] += line.t0[1];
-		line.t1[0] += line.t1[1];
+		line.t[0][0] += line.t[0][1];
+		line.t[1][0] += line.t[1][1];
 	}
 
 }
@@ -304,13 +304,13 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -326,7 +326,7 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -361,13 +361,13 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -397,13 +397,13 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -430,13 +430,13 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -461,13 +461,13 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -493,10 +493,10 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -521,13 +521,13 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -558,13 +558,13 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -591,13 +591,13 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -622,13 +622,13 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -637,7 +637,7 @@ void CTRTextureLightMap2_M1::drawTriangle ( const s4DVertex *a,const s4DVertex *
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureLightMap2_M2.cpp b/src/dep/src/irrlicht/CTRTextureLightMap2_M2.cpp
index d20721a..644565e 100644
--- a/src/dep/src/irrlicht/CTRTextureLightMap2_M2.cpp
+++ b/src/dep/src/irrlicht/CTRTextureLightMap2_M2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -126,7 +126,7 @@ REALINLINE void CTRTextureLightMap2_M2::scanline_bilinear2 ()
 	const f32 invDeltaX = core::reciprocal_approxim ( line.x[1] - line.x[0] );
 
 	// search z-buffer for first not occulled pixel
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 	// subTexel
 	const f32 subPixel = ( (f32) xStart ) - line.x[0];
@@ -172,15 +172,15 @@ REALINLINE void CTRTextureLightMap2_M2::scanline_bilinear2 ()
 	line.z[0] = a;
 	line.z[1] = b;
 #endif
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 	a = (f32) i + subPixel;
 
-	line.t0[1] = (line.t0[1] - line.t0[0]) * invDeltaX;
-	line.t1[1] = (line.t1[1] - line.t1[0]) * invDeltaX;
+	line.t[0][1] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
+	line.t[1][1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 
-	line.t0[0] += line.t0[1] * a;
-	line.t1[0] += line.t1[1] * a;
+	line.t[0][0] += line.t[0][1] * a;
+	line.t[1][0] += line.t[1][1] * a;
 
 
 #ifdef BURNINGVIDEO_RENDERER_FAST
@@ -220,11 +220,11 @@ REALINLINE void CTRTextureLightMap2_M2::scanline_bilinear2 ()
 
 			const tFixPointu d = dithermask [ dIndex | ( i ) & 3 ];
 
-			getSample_texture ( r0, g0, b0, &IT[0], d + f32_to_fixPoint ( line.t0[0].x,inversew), d + f32_to_fixPoint ( line.t0[0].y,inversew) );
-			getSample_texture ( r1, g1, b1, &IT[1], d + f32_to_fixPoint ( line.t1[0].x,inversew), d + f32_to_fixPoint ( line.t1[0].y,inversew) );
+			getSample_texture ( r0, g0, b0, &IT[0], d + f32_to_fixPoint ( line.t[0][0].x,inversew), d + f32_to_fixPoint ( line.t[0][0].y,inversew) );
+			getSample_texture ( r1, g1, b1, &IT[1], d + f32_to_fixPoint ( line.t[1][0].x,inversew), d + f32_to_fixPoint ( line.t[1][0].y,inversew) );
 #else
-			getSample_texture ( r0, g0, b0, &IT[0], f32_to_fixPoint ( line.t0[0].x,inversew), f32_to_fixPoint ( line.t0[0].y,inversew) );
-			getSample_texture ( r1, g1, b1, &IT[1], f32_to_fixPoint ( line.t1[0].x,inversew), f32_to_fixPoint ( line.t1[0].y,inversew) );
+			getSample_texture ( r0, g0, b0, &IT[0], f32_to_fixPoint ( line.t[0][0].x,inversew), f32_to_fixPoint ( line.t[0][0].y,inversew) );
+			getSample_texture ( r1, g1, b1, &IT[1], f32_to_fixPoint ( line.t[1][0].x,inversew), f32_to_fixPoint ( line.t[1][0].y,inversew) );
 
 #endif
 
@@ -239,8 +239,8 @@ REALINLINE void CTRTextureLightMap2_M2::scanline_bilinear2 ()
 #else
 		line.z[0] += line.z[1];
 #endif
-		line.t0[0] += line.t0[1];
-		line.t1[0] += line.t1[1];
+		line.t[0][0] += line.t[0][1];
+		line.t[1][0] += line.t[1][1];
 	}
 
 }
@@ -297,13 +297,13 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -319,7 +319,7 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -354,13 +354,13 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -390,13 +390,13 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -423,13 +423,13 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -454,13 +454,13 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -486,10 +486,10 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -514,13 +514,13 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -551,13 +551,13 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -584,13 +584,13 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -615,13 +615,13 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -630,7 +630,7 @@ void CTRTextureLightMap2_M2::drawTriangle ( const s4DVertex *a,const s4DVertex *
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureLightMap2_M4.cpp b/src/dep/src/irrlicht/CTRTextureLightMap2_M4.cpp
index d06d0de..ebc864d 100644
--- a/src/dep/src/irrlicht/CTRTextureLightMap2_M4.cpp
+++ b/src/dep/src/irrlicht/CTRTextureLightMap2_M4.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -114,16 +114,13 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear2_mag ()
 	tVideoSample *dst;
 	fp24 *z;
 
-	s32 xStart;
-	s32 xEnd;
+	// apply top-left fill-convention, left
+	const s32 xStart = irr::core::ceil32( line.x[0] );
+	const s32 xEnd = irr::core::ceil32( line.x[1] ) - 1;
 	s32 dx;
 	s32 i;
 
 
-	// apply top-left fill-convention, left
-	xStart = core::ceil32( line.x[0] );
-	xEnd = core::ceil32( line.x[1] ) - 1;
-
 	dx = xEnd - xStart;
 	if ( dx < 0 )
 		return;
@@ -132,7 +129,9 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear2_mag ()
 	const f32 invDeltaX = core::reciprocal_approxim ( line.x[1] - line.x[0] );
 
 	// search z-buffer for first not occulled pixel
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	i = ( line.y * RenderTarget->getDimension().Width ) + xStart;
+	z = lockedDepthBuffer + i;
+	dst = lockedSurface + i;
 
 	// subTexel
 	const f32 subPixel = ( (f32) xStart ) - line.x[0];
@@ -143,7 +142,7 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear2_mag ()
 
 	i = 0;
 
-	while ( a <= z[i] )
+	while ( a < z[i] )
 	{
 		a += b;
 
@@ -178,15 +177,14 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear2_mag ()
 	line.z[0] = a;
 	line.z[1] = b;
 #endif
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
 
 	a = (f32) i + subPixel;
 
-	line.t0[1] = (line.t0[1] - line.t0[0]) * invDeltaX;
-	line.t1[1] = (line.t1[1] - line.t1[0]) * invDeltaX;
+	line.t[0][1] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
+	line.t[1][1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 
-	line.t0[0] += line.t0[1] * a;
-	line.t1[0] += line.t1[1] * a;
+	line.t[0][0] += line.t[0][1] * a;
+	line.t[1][0] += line.t[1][1] * a;
 
 
 #ifdef BURNINGVIDEO_RENDERER_FAST
@@ -226,11 +224,11 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear2_mag ()
 
 			const tFixPointu d = dithermask [ dIndex | ( i ) & 3 ];
 
-			getSample_texture ( r0, g0, b0, &IT[0], d + f32_to_fixPoint ( line.t0[0].x,inversew), d + f32_to_fixPoint ( line.t0[0].y,inversew) );
-			getSample_texture ( r1, g1, b1, &IT[1], d + f32_to_fixPoint ( line.t1[0].x,inversew), d + f32_to_fixPoint ( line.t1[0].y,inversew) );
+			getSample_texture ( r0, g0, b0, &IT[0], d + f32_to_fixPoint ( line.t[0][0].x,inversew), d + f32_to_fixPoint ( line.t[0][0].y,inversew) );
+			getSample_texture ( r1, g1, b1, &IT[1], d + f32_to_fixPoint ( line.t[1][0].x,inversew), d + f32_to_fixPoint ( line.t[1][0].y,inversew) );
 #else
-			getSample_texture ( r0, g0, b0, &IT[0], f32_to_fixPoint ( line.t0[0].x,inversew), f32_to_fixPoint ( line.t0[0].y,inversew) );
-			getSample_texture ( r1, g1, b1, &IT[1], f32_to_fixPoint ( line.t1[0].x,inversew), f32_to_fixPoint ( line.t1[0].y,inversew) );
+			getSample_texture ( r0, g0, b0, &IT[0], f32_to_fixPoint ( line.t[0][0].x,inversew), f32_to_fixPoint ( line.t[0][0].y,inversew) );
+			getSample_texture ( r1, g1, b1, &IT[1], f32_to_fixPoint ( line.t[1][0].x,inversew), f32_to_fixPoint ( line.t[1][0].y,inversew) );
 
 #endif
 
@@ -245,8 +243,8 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear2_mag ()
 #else
 		line.z[0] += line.z[1];
 #endif
-		line.t0[0] += line.t0[1];
-		line.t1[0] += line.t1[1];
+		line.t[0][0] += line.t[0][1];
+		line.t[1][0] += line.t[1][1];
 	}
 
 }
@@ -276,7 +274,7 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear2_min ()
 	const f32 invDeltaX = core::reciprocal_approxim ( line.x[1] - line.x[0] );
 
 	// search z-buffer for first not occulled pixel
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 	// subTexel
 	const f32 subPixel = ( (f32) xStart ) - line.x[0];
@@ -322,15 +320,15 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear2_min ()
 	line.z[0] = a;
 	line.z[1] = b;
 #endif
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 	a = (f32) i + subPixel;
 
-	line.t0[1] = (line.t0[1] - line.t0[0]) * invDeltaX;
-	line.t1[1] = (line.t1[1] - line.t1[0]) * invDeltaX;
+	line.t[0][1] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
+	line.t[1][1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 
-	line.t0[0] += line.t0[1] * a;
-	line.t1[0] += line.t1[1] * a;
+	line.t[0][0] += line.t[0][1] * a;
+	line.t[1][0] += line.t[1][1] * a;
 
 
 	tFixPoint r0, g0, b0;
@@ -356,8 +354,8 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear2_min ()
 #endif
 
 
-			getTexel_fix ( r0, g0, b0, &IT[0], f32_to_fixPoint ( line.t0[0].x,inversew), f32_to_fixPoint ( line.t0[0].y,inversew) );
-			getTexel_fix ( r1, g1, b1, &IT[1], f32_to_fixPoint ( line.t1[0].x,inversew), f32_to_fixPoint ( line.t1[0].y,inversew) );
+			getTexel_fix ( r0, g0, b0, &IT[0], f32_to_fixPoint ( line.t[0][0].x,inversew), f32_to_fixPoint ( line.t[0][0].y,inversew) );
+			getTexel_fix ( r1, g1, b1, &IT[1], f32_to_fixPoint ( line.t[1][0].x,inversew), f32_to_fixPoint ( line.t[1][0].y,inversew) );
 
 			dst[i] = fix_to_color ( clampfix_maxcolor ( imulFix_tex4 ( r0, r1 ) ),
 									clampfix_maxcolor ( imulFix_tex4 ( g0, g1 ) ),
@@ -370,8 +368,8 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear2_min ()
 #else
 		line.z[0] += line.z[1];
 #endif
-		line.t0[0] += line.t0[1];
-		line.t1[0] += line.t1[1];
+		line.t[0][0] += line.t[0][1];
+		line.t[1][0] += line.t[1][1];
 	}
 
 }
@@ -407,10 +405,10 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
+	sVec2 slopeT[0];
 #endif
 #ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[1];
 #endif
 
 	// apply top-left fill-convention, left
@@ -435,10 +433,10 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear ()
 	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -453,17 +451,17 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear ()
 	line.c[0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -494,10 +492,10 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear ()
 #ifdef INVERSE_W
 			inversew = fix_inverse32 ( line.w[0] );
 
-			tx0 = f32_to_fixPoint ( line.t0[0].x,inversew);
-			ty0 = f32_to_fixPoint ( line.t0[0].y,inversew);
-			tx1 = f32_to_fixPoint ( line.t1[0].x,inversew);
-			ty1 = f32_to_fixPoint ( line.t1[0].y,inversew);
+			tx0 = f32_to_fixPoint ( line.t[0][0].x,inversew);
+			ty0 = f32_to_fixPoint ( line.t[0][0].y,inversew);
+			tx1 = f32_to_fixPoint ( line.t[1][0].x,inversew);
+			ty1 = f32_to_fixPoint ( line.t[1][0].y,inversew);
 
 #ifdef IPOL_C0
 			r3 = f32_to_fixPoint ( line.c[0].y ,inversew );
@@ -506,10 +504,10 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear ()
 #endif
 
 #else
-			tx0 = f32_to_fixPoint ( line.t0[0].x );
-			ty0 = f32_to_fixPoint ( line.t0[0].y );
-			tx1 = f32_to_fixPoint ( line.t1[0].x );
-			ty1 = f32_to_fixPoint ( line.t1[0].y );
+			tx0 = f32_to_fixPoint ( line.t[0][0].x );
+			ty0 = f32_to_fixPoint ( line.t[0][0].y );
+			tx1 = f32_to_fixPoint ( line.t[1][0].x );
+			ty1 = f32_to_fixPoint ( line.t[1][0].y );
 
 #endif
 			getSample_texture ( r0, g0, b0, &IT[0], tx0, ty0 );
@@ -555,10 +553,10 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear ()
 		line.c[0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -566,7 +564,8 @@ REALINLINE void CTRTextureLightMap2_M4::scanline_bilinear ()
 #endif
 
 
-#ifdef BURNINGVIDEO_RENDERER_FAST
+//#ifdef BURNINGVIDEO_RENDERER_FAST
+#if 1
 
 void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c )
 {
@@ -626,13 +625,13 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -648,7 +647,7 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -683,13 +682,13 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -719,13 +718,13 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -752,13 +751,13 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -783,13 +782,13 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -815,10 +814,10 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -843,13 +842,13 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -880,13 +879,13 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -913,13 +912,13 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -944,13 +943,13 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -959,7 +958,7 @@ void CTRTextureLightMap2_M4::drawTriangle_Min ( const s4DVertex *a,const s4DVert
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
@@ -1029,13 +1028,13 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -1051,7 +1050,7 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -1086,13 +1085,13 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -1122,13 +1121,13 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -1155,13 +1154,13 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -1186,13 +1185,13 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -1218,10 +1217,10 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -1246,13 +1245,13 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -1283,13 +1282,13 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -1316,13 +1315,13 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -1347,13 +1346,13 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -1362,7 +1361,7 @@ void CTRTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex *
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureLightMapGouraud2_M4.cpp b/src/dep/src/irrlicht/CTRTextureLightMapGouraud2_M4.cpp
index 44846e0..6d81892 100644
--- a/src/dep/src/irrlicht/CTRTextureLightMapGouraud2_M4.cpp
+++ b/src/dep/src/irrlicht/CTRTextureLightMapGouraud2_M4.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -133,10 +133,7 @@ void CTRGTextureLightMap2_M4::scanline_bilinear ()
 	sVec4 slopeC;
 #endif
 #ifdef IPOL_T0
-	sVec2 slopeT0;
-#endif
-#ifdef IPOL_T1
-	sVec2 slopeT1;
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES];
 #endif
 
 	// apply top-left fill-convention, left
@@ -158,13 +155,13 @@ void CTRGTextureLightMap2_M4::scanline_bilinear ()
 	slopeW = (line.w[1] - line.w[0]) * invDeltaX;
 #endif
 #ifdef IPOL_C0
-	slopeC = (line.c[1] - line.c[0]) * invDeltaX;
+	slopeC = (line.c[0][1] - line.c[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T0
-	slopeT0 = (line.t0[1] - line.t0[0]) * invDeltaX;
+	slopeT[0] = (line.t[0][1] - line.t[0][0]) * invDeltaX;
 #endif
 #ifdef IPOL_T1
-	slopeT1 = (line.t1[1] - line.t1[0]) * invDeltaX;
+	slopeT[1] = (line.t[1][1] - line.t[1][0]) * invDeltaX;
 #endif
 
 #ifdef SUBTEXEL
@@ -176,20 +173,20 @@ void CTRGTextureLightMap2_M4::scanline_bilinear ()
 	line.w[0] += slopeW * subPixel;
 #endif
 #ifdef IPOL_C0
-	line.c[0] += slopeC * subPixel;
+	line.c[0][0] += slopeC * subPixel;
 #endif
 #ifdef IPOL_T0
-	line.t0[0] += slopeT0 * subPixel;
+	line.t[0][0] += slopeT[0] * subPixel;
 #endif
 #ifdef IPOL_T1
-	line.t1[0] += slopeT1 * subPixel;
+	line.t[1][0] += slopeT[1] * subPixel;
 #endif
 #endif
 
-	dst = lockedSurface + ( line.y * SurfaceWidth ) + xStart;
+	dst = lockedSurface + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 
 #ifdef USE_ZBUFFER
-	z = lockedZBuffer + ( line.y * SurfaceWidth ) + xStart;
+	z = lockedDepthBuffer + ( line.y * RenderTarget->getDimension().Width ) + xStart;
 #endif
 
 
@@ -220,22 +217,22 @@ void CTRGTextureLightMap2_M4::scanline_bilinear ()
 #ifdef INVERSE_W
 			inversew = fix_inverse32 ( line.w[0] );
 
-			tx0 = f32_to_fixPoint ( line.t0[0].x,inversew);
-			ty0 = f32_to_fixPoint ( line.t0[0].y,inversew);
-			tx1 = f32_to_fixPoint ( line.t1[0].x,inversew);
-			ty1 = f32_to_fixPoint ( line.t1[0].y,inversew);
+			tx0 = f32_to_fixPoint ( line.t[0][0].x,inversew);
+			ty0 = f32_to_fixPoint ( line.t[0][0].y,inversew);
+			tx1 = f32_to_fixPoint ( line.t[1][0].x,inversew);
+			ty1 = f32_to_fixPoint ( line.t[1][0].y,inversew);
 
 #ifdef IPOL_C0
-			r3 = f32_to_fixPoint ( line.c[0].y ,inversew );
-			g3 = f32_to_fixPoint ( line.c[0].z ,inversew );
-			b3 = f32_to_fixPoint ( line.c[0].w ,inversew );
+			r3 = f32_to_fixPoint ( line.c[0][0].y ,inversew );
+			g3 = f32_to_fixPoint ( line.c[0][0].z ,inversew );
+			b3 = f32_to_fixPoint ( line.c[0][0].w ,inversew );
 #endif
 
 #else
-			tx0 = f32_to_fixPoint ( line.t0[0].x );
-			ty0 = f32_to_fixPoint ( line.t0[0].y );
-			tx1 = f32_to_fixPoint ( line.t1[0].x );
-			ty1 = f32_to_fixPoint ( line.t1[0].y );
+			tx0 = f32_to_fixPoint ( line.t[0][0].x );
+			ty0 = f32_to_fixPoint ( line.t[0][0].y );
+			tx1 = f32_to_fixPoint ( line.t[1][0].x );
+			ty1 = f32_to_fixPoint ( line.t[1][0].y );
 
 #endif
 			getSample_texture ( r0, g0, b0, &IT[0], tx0, ty0 );
@@ -278,13 +275,13 @@ void CTRGTextureLightMap2_M4::scanline_bilinear ()
 		line.w[0] += slopeW;
 #endif
 #ifdef IPOL_C0
-		line.c[0] += slopeC;
+		line.c[0][0] += slopeC;
 #endif
 #ifdef IPOL_T0
-		line.t0[0] += slopeT0;
+		line.t[0][0] += slopeT[0];
 #endif
 #ifdef IPOL_T1
-		line.t1[0] += slopeT1;
+		line.t[1][0] += slopeT[1];
 #endif
 	}
 
@@ -334,18 +331,18 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_C0
-	scan.slopeC[0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
-	scan.c[0] = a->Color[0];
+	scan.slopeC[0][0] = (c->Color[0] - a->Color[0]) * scan.invDeltaY[0];
+	scan.c[0][0] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-	scan.slopeT0[0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
-	scan.t0[0] = a->Tex[0];
+	scan.slopeT[0][0] = (c->Tex[0] - a->Tex[0]) * scan.invDeltaY[0];
+	scan.t[0][0] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-	scan.slopeT1[0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
-	scan.t1[0] = a->Tex[1];
+	scan.slopeT[1][0] = (c->Tex[1] - a->Tex[1]) * scan.invDeltaY[0];
+	scan.t[1][0] = a->Tex[1];
 #endif
 
 	// top left fill convention y run
@@ -361,7 +358,7 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 #ifdef IPOL_T0
@@ -393,18 +390,18 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
-		scan.c[1] = a->Color[0];
+		scan.slopeC[0][1] = (b->Color[0] - a->Color[0]) * scan.invDeltaY[1];
+		scan.c[0][1] = a->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
-		scan.t0[1] = a->Tex[0];
+		scan.slopeT[0][1] = (b->Tex[0] - a->Tex[0]) * scan.invDeltaY[1];
+		scan.t[0][1] = a->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
-		scan.t1[1] = a->Tex[1];
+		scan.slopeT[1][1] = (b->Tex[1] - a->Tex[1]) * scan.invDeltaY[1];
+		scan.t[1][1] = a->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -429,18 +426,18 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -462,18 +459,18 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -493,18 +490,18 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -528,13 +525,13 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 			scan.w[0] = a->Pos.w + scan.slopeW[0] * temp[0];
 #endif
 #ifdef IPOL_C0
-			scan.c[0] = a->Color[0] + scan.slopeC[0] * temp[0];
+			scan.c[0][0] = a->Color[0] + scan.slopeC[0][0] * temp[0];
 #endif
 #ifdef IPOL_T0
-			scan.t0[0] = a->Tex[0] + scan.slopeT0[0] * temp[0];
+			scan.t[0][0] = a->Tex[0] + scan.slopeT[0][0] * temp[0];
 #endif
 #ifdef IPOL_T1
-			scan.t1[0] = a->Tex[1] + scan.slopeT1[0] * temp[0];
+			scan.t[1][0] = a->Tex[1] + scan.slopeT[1][0] * temp[0];
 #endif
 
 		}
@@ -554,18 +551,18 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_C0
-		scan.slopeC[1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
-		scan.c[1] = b->Color[0];
+		scan.slopeC[0][1] = (c->Color[0] - b->Color[0]) * scan.invDeltaY[2];
+		scan.c[0][1] = b->Color[0];
 #endif
 
 #ifdef IPOL_T0
-		scan.slopeT0[1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
-		scan.t0[1] = b->Tex[0];
+		scan.slopeT[0][1] = (c->Tex[0] - b->Tex[0]) * scan.invDeltaY[2];
+		scan.t[0][1] = b->Tex[0];
 #endif
 
 #ifdef IPOL_T1
-		scan.slopeT1[1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
-		scan.t1[1] = b->Tex[1];
+		scan.slopeT[1][1] = (c->Tex[1] - b->Tex[1]) * scan.invDeltaY[2];
+		scan.t[1][1] = b->Tex[1];
 #endif
 
 		// apply top-left fill convention, top part
@@ -591,18 +588,18 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_C0
-		scan.c[0] += scan.slopeC[0] * subPixel;
-		scan.c[1] += scan.slopeC[1] * subPixel;		
+		scan.c[0][0] += scan.slopeC[0][0] * subPixel;
+		scan.c[0][1] += scan.slopeC[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T0
-		scan.t0[0] += scan.slopeT0[0] * subPixel;
-		scan.t0[1] += scan.slopeT0[1] * subPixel;		
+		scan.t[0][0] += scan.slopeT[0][0] * subPixel;
+		scan.t[0][1] += scan.slopeT[0][1] * subPixel;		
 #endif
 
 #ifdef IPOL_T1
-		scan.t1[0] += scan.slopeT1[0] * subPixel;
-		scan.t1[1] += scan.slopeT1[1] * subPixel;		
+		scan.t[1][0] += scan.slopeT[1][0] * subPixel;
+		scan.t[1][1] += scan.slopeT[1][1] * subPixel;		
 #endif
 
 #endif
@@ -624,18 +621,18 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_C0
-			line.c[scan.left] = scan.c[0];
-			line.c[scan.right] = scan.c[1];
+			line.c[0][scan.left] = scan.c[0][0];
+			line.c[0][scan.right] = scan.c[0][1];
 #endif
 
 #ifdef IPOL_T0
-			line.t0[scan.left] = scan.t0[0];
-			line.t0[scan.right] = scan.t0[1];
+			line.t[0][scan.left] = scan.t[0][0];
+			line.t[0][scan.right] = scan.t[0][1];
 #endif
 
 #ifdef IPOL_T1
-			line.t1[scan.left] = scan.t1[0];
-			line.t1[scan.right] = scan.t1[1];
+			line.t[1][scan.left] = scan.t[1][0];
+			line.t[1][scan.right] = scan.t[1][1];
 #endif
 
 			// render a scanline
@@ -655,18 +652,18 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 #endif
 
 #ifdef IPOL_C0
-			scan.c[0] += scan.slopeC[0];
-			scan.c[1] += scan.slopeC[1];
+			scan.c[0][0] += scan.slopeC[0][0];
+			scan.c[0][1] += scan.slopeC[0][1];
 #endif
 
 #ifdef IPOL_T0
-			scan.t0[0] += scan.slopeT0[0];
-			scan.t0[1] += scan.slopeT0[1];
+			scan.t[0][0] += scan.slopeT[0][0];
+			scan.t[0][1] += scan.slopeT[0][1];
 #endif
 
 #ifdef IPOL_T1
-			scan.t1[0] += scan.slopeT1[0];
-			scan.t1[1] += scan.slopeT1[1];
+			scan.t[1][0] += scan.slopeT[1][0];
+			scan.t[1][1] += scan.slopeT[1][1];
 #endif
 
 		}
@@ -675,7 +672,7 @@ void CTRGTextureLightMap2_M4::drawTriangle ( const s4DVertex *a,const s4DVertex
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 #ifdef IPOL_T0
diff --git a/src/dep/src/irrlicht/CTRTextureWire2.cpp b/src/dep/src/irrlicht/CTRTextureWire2.cpp
index 18c647f..843c94b 100644
--- a/src/dep/src/irrlicht/CTRTextureWire2.cpp
+++ b/src/dep/src/irrlicht/CTRTextureWire2.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -115,8 +115,8 @@ static inline void swap_xor ( s32 &a, s32 &b )
 void CTRTextureWire2::renderLine ( const s4DVertex *a,const s4DVertex *b ) const
 {
 	
-	int pitch0 = SurfaceWidth << VIDEO_SAMPLE_GRANULARITY;
-	int pitch1 = SurfaceWidth << 2;
+	int pitch0 = RenderTarget->getDimension().Width << VIDEO_SAMPLE_GRANULARITY;
+	int pitch1 = RenderTarget->getDimension().Width << 2;
 
 	int aposx = (int) a->Pos.x;
 	int aposy = (int) a->Pos.y;
@@ -171,7 +171,7 @@ void CTRTextureWire2::renderLine ( const s4DVertex *a,const s4DVertex *b ) const
 
 	dst = (tVideoSample*) ( (u8*) lockedSurface + ( aposy * pitch0 ) + (aposx << VIDEO_SAMPLE_GRANULARITY ) );
 #ifdef USE_ZBUFFER
-	z = (fp24*) ( (u8*) lockedZBuffer + ( aposy * pitch1 ) + (aposx << 2 ) );
+	z = (fp24*) ( (u8*) lockedDepthBuffer + ( aposy * pitch1 ) + (aposx << 2 ) );
 #endif
 
 	c = dx << 1;
@@ -254,7 +254,7 @@ void CTRTextureWire2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 	renderLine ( a, b );
@@ -264,7 +264,7 @@ void CTRTextureWire2::drawTriangle ( const s4DVertex *a,const s4DVertex *b,const
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 }
@@ -281,14 +281,14 @@ void CTRTextureWire2::drawLine ( const s4DVertex *a,const s4DVertex *b)
 	lockedSurface = (tVideoSample*)RenderTarget->lock();
 
 #ifdef USE_ZBUFFER
-	lockedZBuffer = ZBuffer->lock();
+	lockedDepthBuffer = (fp24*) DepthBuffer->lock();
 #endif
 
 	renderLine ( a, b );
 	RenderTarget->unlock();
 
 #ifdef USE_ZBUFFER
-	ZBuffer->unlock();
+	DepthBuffer->unlock();
 #endif
 
 }
diff --git a/src/dep/src/irrlicht/CTerrainSceneNode.cpp b/src/dep/src/irrlicht/CTerrainSceneNode.cpp
index e6f68e0..732ca26 100644
--- a/src/dep/src/irrlicht/CTerrainSceneNode.cpp
+++ b/src/dep/src/irrlicht/CTerrainSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -19,6 +19,8 @@
 #include "IGUIFont.h"
 #include "IFileSystem.h"
 #include "IReadFile.h"
+#include "ITextSceneNode.h"
+#include "IAnimatedMesh.h"
 
 namespace irr
 {
@@ -29,54 +31,60 @@ namespace scene
 	CTerrainSceneNode::CTerrainSceneNode(ISceneNode* parent, ISceneManager* mgr,
 			io::IFileSystem* fs, s32 id, s32 maxLOD, E_TERRAIN_PATCH_SIZE patchSize,
 			const core::vector3df& position,
-			const core::vector3df& rotation, 
+			const core::vector3df& rotation,
 			const core::vector3df& scale)
 	: ITerrainSceneNode(parent, mgr, id, position, rotation, scale),
-	TerrainData(patchSize, maxLOD, position, rotation, scale),
+	TerrainData(patchSize, maxLOD, position, rotation, scale), RenderBuffer(0),
 	VerticesToRender(0), IndicesToRender(0), DynamicSelectorUpdate(false),
 	OverrideDistanceThreshold(false), UseDefaultRotationPivot(true), ForceRecalculation(false),
 	OldCameraPosition(core::vector3df(-99999.9f, -99999.9f, -99999.9f)),
 	OldCameraRotation(core::vector3df(-99999.9f, -99999.9f, -99999.9f)),
-	CameraMovementDelta(10.0f), CameraRotationDelta(1.0f),
+	OldCameraUp(core::vector3df(-99999.9f, -99999.9f, -99999.9f)),
+	CameraMovementDelta(10.0f), CameraRotationDelta(1.0f),CameraFOVDelta(0.1f),
 	TCoordScale1(1.0f), TCoordScale2(1.0f), FileSystem(fs)
 	{
 		#ifdef _DEBUG
 		setDebugName("CTerrainSceneNode");
 		#endif
 
+		RenderBuffer = new CDynamicMeshBuffer(video::EVT_2TCOORDS, video::EIT_16BIT);
+		RenderBuffer->setHardwareMappingHint(scene::EHM_STATIC, scene::EBT_VERTEX);
+		RenderBuffer->setHardwareMappingHint(scene::EHM_DYNAMIC, scene::EBT_INDEX);
+
 		if (FileSystem)
 			FileSystem->grab();
 
-		setAutomaticCulling( scene::EAC_OFF );
+		setAutomaticCulling(scene::EAC_OFF);
 	}
 
 
 	//! destructor
-	CTerrainSceneNode::~CTerrainSceneNode ( )
+	CTerrainSceneNode::~CTerrainSceneNode()
 	{
-		if (TerrainData.LODDistanceThreshold)
-			delete [] TerrainData.LODDistanceThreshold;
-
-		if (TerrainData.Patches)
-			delete [] TerrainData.Patches;
+		delete [] TerrainData.Patches;
 
 		if (FileSystem)
 			FileSystem->drop();
+
+		if (RenderBuffer)
+			RenderBuffer->drop();
 	}
 
 
-	//! Initializes the terrain data.  Loads the vertices from the heightMapFile
-	bool CTerrainSceneNode::loadHeightMap( io::IReadFile* file, video::SColor vertexColor, s32 smoothFactor )
+	//! Initializes the terrain data. Loads the vertices from the heightMapFile
+	bool CTerrainSceneNode::loadHeightMap(io::IReadFile* file, video::SColor vertexColor,
+			s32 smoothFactor)
 	{
-		if( !file )
+		if (!file)
 			return false;
 
-		u32 startTime = os::Timer::getRealTime();
-		video::IImage* heightMap = SceneManager->getVideoDriver()->createImageFromFile( file );
+		Mesh.MeshBuffers.clear();
+		const u32 startTime = os::Timer::getRealTime();
+		video::IImage* heightMap = SceneManager->getVideoDriver()->createImageFromFile(file);
 
-		if( !heightMap )
+		if (!heightMap)
 		{
-			os::Printer::print( "Was not able to load heightmap." );
+			os::Printer::log("Unable to load heightmap.");
 			return false;
 		}
 
@@ -85,34 +93,34 @@ namespace scene
 		// Get the dimension of the heightmap data
 		TerrainData.Size = heightMap->getDimension().Width;
 
-		switch( TerrainData.PatchSize )
+		switch (TerrainData.PatchSize)
 		{
 			case ETPS_9:
-				if( TerrainData.MaxLOD > 3 )
+				if (TerrainData.MaxLOD > 3)
 				{
 					TerrainData.MaxLOD = 3;
 				}
 			break;
 			case ETPS_17:
-				if( TerrainData.MaxLOD > 4 )
+				if (TerrainData.MaxLOD > 4)
 				{
 					TerrainData.MaxLOD = 4;
 				}
 			break;
 			case ETPS_33:
-				if( TerrainData.MaxLOD > 5 )
+				if (TerrainData.MaxLOD > 5)
 				{
 					TerrainData.MaxLOD = 5;
 				}
 			break;
 			case ETPS_65:
-				if( TerrainData.MaxLOD > 6 )
+				if (TerrainData.MaxLOD > 6)
 				{
 					TerrainData.MaxLOD = 6;
 				}
 			break;
 			case ETPS_129:
-				if( TerrainData.MaxLOD > 7 )
+				if (TerrainData.MaxLOD > 7)
 				{
 					TerrainData.MaxLOD = 7;
 				}
@@ -120,83 +128,79 @@ namespace scene
 		}
 
 		// --- Generate vertex data from heightmap ----
-		// resize the vertex array for the mesh buffer one time ( makes loading faster )
-		SMeshBufferLightMap* pMeshBuffer = new SMeshBufferLightMap();
-		pMeshBuffer->Vertices.set_used( TerrainData.Size * TerrainData.Size );
+		// resize the vertex array for the mesh buffer one time (makes loading faster)
+		//SMeshBufferLightMap* mb = new SMeshBufferLightMap();
 
-		video::S3DVertex2TCoords vertex;
-		vertex.Normal.set( 0.0f, 1.0f, 0.0f );
-		vertex.Color = vertexColor;
+		scene::CDynamicMeshBuffer *mb=0;
+
+		const u32 numVertices = TerrainData.Size * TerrainData.Size;
+		if (numVertices <= 65536)
+		{
+			//small enough for 16bit buffers
+			mb=new scene::CDynamicMeshBuffer(video::EVT_2TCOORDS, video::EIT_16BIT);
+			RenderBuffer->getIndexBuffer().setType(video::EIT_16BIT);
+		}
+		else
+		{
+			//we need 32bit buffers
+			mb=new scene::CDynamicMeshBuffer(video::EVT_2TCOORDS, video::EIT_32BIT);
+			RenderBuffer->getIndexBuffer().setType(video::EIT_32BIT);
+		}
+
+		mb->getVertexBuffer().set_used(numVertices);
 
 		// Read the heightmap to get the vertex data
 		// Apply positions changes, scaling changes
 		const f32 tdSize = 1.0f/(f32)(TerrainData.Size-1);
 		s32 index = 0;
-		for( s32 x = 0; x < TerrainData.Size; ++x )
+		float fx=0.f;
+		float fx2=0.f;
+		for (s32 x = 0; x < TerrainData.Size; ++x)
 		{
-			for( s32 z = 0; z < TerrainData.Size; ++z )
+			float fz=0.f;
+			float fz2=0.f;
+			for (s32 z = 0; z < TerrainData.Size; ++z)
 			{
-				vertex.Pos.X = (f32)x;
-				video::SColor pixelColor(heightMap->getPixel(x,z));
-				vertex.Pos.Y = (f32) pixelColor.getLuminance();
-				vertex.Pos.Z = (f32)z;
+				video::S3DVertex2TCoords& vertex= static_cast<video::S3DVertex2TCoords*>(mb->getVertexBuffer().pointer())[index++];
+				vertex.Normal.set(0.0f, 1.0f, 0.0f);
+				vertex.Color = vertexColor;
+				vertex.Pos.X = fx;
+				vertex.Pos.Y = (f32) heightMap->getPixel(TerrainData.Size-x-1,z).getLuminance();
+				vertex.Pos.Z = fz;
 
-				vertex.TCoords.X = vertex.TCoords2.X = x * tdSize;
-				vertex.TCoords.Y = vertex.TCoords2.Y = z * tdSize;
+				vertex.TCoords.X = vertex.TCoords2.X = 1.f-fx2;
+				vertex.TCoords.Y = vertex.TCoords2.Y = fz2;
 
-				pMeshBuffer->Vertices[index] = vertex;
-				++index;
+				++fz;
+				fz2 += tdSize;
 			}
+			++fx;
+			fx2 += tdSize;
 		}
 
 		// drop heightMap, no longer needed
 		heightMap->drop();
 
-		//! Terrain smoothing. Applause to DeusXL!
-		// http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?p=91272#91272
-
-		s32 run;
-
-		for( run = 0; run < smoothFactor; ++run )
-		{
-			for( index = 2; index < (TerrainData.Size * TerrainData.Size - 2); ++index)
-			{
-				pMeshBuffer->Vertices[index].Pos.Y =
-					(pMeshBuffer->Vertices[index - 2].Pos.Y + pMeshBuffer->Vertices[index - 1].Pos.Y +
-					pMeshBuffer->Vertices[index + 1].Pos.Y + pMeshBuffer->Vertices[index + 2].Pos.Y) / 4.0f;
-			}
-		}
-
-		for( run = 0; run < smoothFactor; ++run)
-		{
-			for( index = TerrainData.Size; index < (TerrainData.Size * (TerrainData.Size - 1)); ++index)
-			{
-				pMeshBuffer->Vertices[index].Pos.Y =
-					(pMeshBuffer->Vertices[index - TerrainData.Size].Pos.Y +
-					pMeshBuffer->Vertices[index + TerrainData.Size].Pos.Y ) / 2.0f;
-			}
-		}
-
+		smoothTerrain(mb, smoothFactor);
 
 		// calculate smooth normals for the vertices
-		calculateNormals( pMeshBuffer );
+		calculateNormals(mb);
 
 		// add the MeshBuffer to the mesh
-		Mesh.addMeshBuffer( pMeshBuffer );
-		const u32 vertexCount = pMeshBuffer->getVertexCount();
+		Mesh.addMeshBuffer(mb);
 
 		// We copy the data to the renderBuffer, after the normals have been calculated.
-		RenderBuffer.Vertices.set_used( vertexCount );
+		RenderBuffer->getVertexBuffer().set_used(numVertices);
 
-		for( u32 i = 0; i < vertexCount; ++i )
+		for (u32 i = 0; i < numVertices; ++i)
 		{
-			RenderBuffer.Vertices[i] = pMeshBuffer->Vertices[i];
-			RenderBuffer.Vertices[i].Pos *= TerrainData.Scale;
-			RenderBuffer.Vertices[i].Pos += TerrainData.Position;
+			RenderBuffer->getVertexBuffer()[i] = mb->getVertexBuffer()[i];
+			RenderBuffer->getVertexBuffer()[i].Pos *= TerrainData.Scale;
+			RenderBuffer->getVertexBuffer()[i].Pos += TerrainData.Position;
 		}
 
-		// We no longer need the pMeshBuffer
-		pMeshBuffer->drop();
+		// We no longer need the mb
+		mb->drop();
 
 		// calculate all the necessary data for the patches and the terrain
 		calculateDistanceThresholds();
@@ -207,69 +211,88 @@ namespace scene
 		TerrainData.RotationPivot = TerrainData.Center;
 
 		// Rotate the vertices of the terrain by the rotation
-		// specified.  Must be done after calculating the terrain data,
+		// specified. Must be done after calculating the terrain data,
 		// so we know what the current center of the terrain is.
-		setRotation( TerrainData.Rotation );
+		setRotation(TerrainData.Rotation);
 
 		// Pre-allocate memory for indices
-		RenderBuffer.Indices.set_used( TerrainData.PatchCount * TerrainData.PatchCount *
-			TerrainData.CalcPatchSize * TerrainData.CalcPatchSize * 6 );
+
+		RenderBuffer->getIndexBuffer().set_used(
+				TerrainData.PatchCount * TerrainData.PatchCount *
+				TerrainData.CalcPatchSize * TerrainData.CalcPatchSize * 6);
+
+		RenderBuffer->setDirty();
 
 		const u32 endTime = os::Timer::getRealTime();
 
 		c8 tmp[255];
-		sprintf(tmp, "Generated terrain data (%dx%d) in %.4f seconds",
-			TerrainData.Size, TerrainData.Size, ( endTime - startTime ) / 1000.0f );
-		os::Printer::log( tmp );
+		snprintf(tmp, 255, "Generated terrain data (%dx%d) in %.4f seconds",
+			TerrainData.Size, TerrainData.Size, (endTime - startTime) / 1000.0f );
+		os::Printer::log(tmp);
 
 		return true;
 	}
 
 
-	//! Initializes the terrain data.  Loads the vertices from the heightMapFile
-	bool CTerrainSceneNode::loadHeightMapRAW( io::IReadFile* file, s32 bitsPerPixel, video::SColor vertexColor, s32 smoothFactor )
+	//! Initializes the terrain data. Loads the vertices from the heightMapFile
+	bool CTerrainSceneNode::loadHeightMapRAW(io::IReadFile* file,
+			s32 bitsPerPixel, bool signedData, bool floatVals,
+			s32 width, video::SColor vertexColor, s32 smoothFactor)
 	{
-		if( !file )
+		if (!file)
+			return false;
+		if (floatVals && bitsPerPixel != 32)
 			return false;
 
 		// start reading
-		u32 startTime = os::Timer::getTime();
+		const u32 startTime = os::Timer::getTime();
+
+		Mesh.MeshBuffers.clear();
 
-		// get file size
-		const long fileSize = file->getSize();
 		const s32 bytesPerPixel = bitsPerPixel / 8;
 
 		// Get the dimension of the heightmap data
-		TerrainData.Size = core::floor32(sqrtf( (f32)( fileSize / bytesPerPixel ) ));
+		const s32 filesize = file->getSize();
+		if (!width)
+			TerrainData.Size = core::floor32(sqrtf((f32)(filesize / bytesPerPixel)));
+		else
+		{
+			if ((filesize-file->getPos())/bytesPerPixel>width*width)
+			{
+				os::Printer::log("Error reading heightmap RAW file", "File is too small.");
+				return false;
+			}
+			TerrainData.Size = width;
+		}
 
-		switch( TerrainData.PatchSize )
+		switch (TerrainData.PatchSize)
 		{
 			case ETPS_9:
-				if( TerrainData.MaxLOD > 3 )
+				if (TerrainData.MaxLOD > 3)
 				{
 					TerrainData.MaxLOD = 3;
 				}
 			break;
 			case ETPS_17:
-				if( TerrainData.MaxLOD > 4 )
+				if (TerrainData.MaxLOD > 4)
 				{
 					TerrainData.MaxLOD = 4;
 				}
 			break;
 			case ETPS_33:
-				if( TerrainData.MaxLOD > 5 )
+				if (TerrainData.MaxLOD > 5)
 				{
 					TerrainData.MaxLOD = 5;
 				}
 			break;
 			case ETPS_65:
-				if( TerrainData.MaxLOD > 6 )
+				if (TerrainData.MaxLOD > 6)
 				{
 					TerrainData.MaxLOD = 6;
 				}
 			break;
 			case ETPS_129:
-				if( TerrainData.MaxLOD > 7 )
+				if (TerrainData.MaxLOD > 7)
 				{
 					TerrainData.MaxLOD = 7;
 				}
@@ -277,84 +300,146 @@ namespace scene
 		}
 
 		// --- Generate vertex data from heightmap ----
-		// resize the vertex array for the mesh buffer one time ( makes loading faster )
-		SMeshBufferLightMap* pMeshBuffer = new SMeshBufferLightMap();
-		pMeshBuffer->Vertices.reallocate( TerrainData.Size * TerrainData.Size );
+		// resize the vertex array for the mesh buffer one time (makes loading faster)
+		scene::CDynamicMeshBuffer *mb=0;
+		const u32 numVertices = TerrainData.Size * TerrainData.Size;
+		if (numVertices <= 65536)
+		{
+			//small enough for 16bit buffers
+			mb=new scene::CDynamicMeshBuffer(video::EVT_2TCOORDS, video::EIT_16BIT);
+			RenderBuffer->getIndexBuffer().setType(video::EIT_16BIT);
+		}
+		else
+		{
+			//we need 32bit buffers
+			mb=new scene::CDynamicMeshBuffer(video::EVT_2TCOORDS, video::EIT_32BIT);
+			RenderBuffer->getIndexBuffer().setType(video::EIT_32BIT);
+		}
+
+		mb->getVertexBuffer().reallocate(numVertices);
 
 		video::S3DVertex2TCoords vertex;
-		vertex.Normal.set( 0.0f, 1.0f, 0.0f );
+		vertex.Normal.set(0.0f, 1.0f, 0.0f);
 		vertex.Color = vertexColor;
 
 		// Read the heightmap to get the vertex data
 		// Apply positions changes, scaling changes
 		const f32 tdSize = 1.0f/(f32)(TerrainData.Size-1);
-		for( s32 x = 0; x < TerrainData.Size; ++x )
+		float fx=0.f;
+		float fx2=0.f;
+		for (s32 x = 0; x < TerrainData.Size; ++x)
 		{
-			for( s32 z = 0; z < TerrainData.Size; ++z )
+			float fz=0.f;
+			float fz2=0.f;
+			for (s32 z = 0; z < TerrainData.Size; ++z)
 			{
-				vertex.Pos.X = (f32)x;
-
-				if( file->read( &vertex.Pos.Y, bytesPerPixel ) != bytesPerPixel )
+				bool failure=false;
+				vertex.Pos.X = fx;
+				if (floatVals)
 				{
-					os::Printer::print("Error reading heightmap RAW file.");
-					pMeshBuffer->drop();
+					if (file->read(&vertex.Pos.Y, bytesPerPixel) != bytesPerPixel)
+						failure=true;
+				}
+				else if (signedData)
+				{
+					switch (bytesPerPixel)
+					{
+						case 1:
+						{
+							s8 val;
+							if (file->read(&val, bytesPerPixel) != bytesPerPixel)
+								failure=true;
+							vertex.Pos.Y=val;
+						}
+						break;
+						case 2:
+						{
+							s16 val;
+							if (file->read(&val, bytesPerPixel) != bytesPerPixel)
+								failure=true;
+							vertex.Pos.Y=val/256.f;
+						}
+						break;
+						case 4:
+						{
+							s32 val;
+							if (file->read(&val, bytesPerPixel) != bytesPerPixel)
+								failure=true;
+							vertex.Pos.Y=val/16777216.f;
+						}
+						break;
+					}
+				}
+				else
+				{
+					switch (bytesPerPixel)
+					{
+						case 1:
+						{
+							u8 val;
+							if (file->read(&val, bytesPerPixel) != bytesPerPixel)
+								failure=true;
+							vertex.Pos.Y=val;
+						}
+						break;
+						case 2:
+						{
+							u16 val;
+							if (file->read(&val, bytesPerPixel) != bytesPerPixel)
+								failure=true;
+							vertex.Pos.Y=val/256.f;
+						}
+						break;
+						case 4:
+						{
+							u32 val;
+							if (file->read(&val, bytesPerPixel) != bytesPerPixel)
+								failure=true;
+							vertex.Pos.Y=val/16777216.f;
+						}
+						break;
+					}
+				}
+				if (failure)
+				{
+					os::Printer::log("Error reading heightmap RAW file.");
+					mb->drop();
 					return false;
 				}
+				vertex.Pos.Z = fz;
 
-				vertex.Pos.Z = (f32)z;
+				vertex.TCoords.X = vertex.TCoords2.X = 1.f-fx2;
+				vertex.TCoords.Y = vertex.TCoords2.Y = fz2;
 
-				vertex.TCoords.X = vertex.TCoords2.X = x * tdSize;
-				vertex.TCoords.Y = vertex.TCoords2.Y = z * tdSize;
-
-				pMeshBuffer->Vertices.push_back( vertex );
+				mb->getVertexBuffer().push_back(vertex);
+				++fz;
+				fz2 += tdSize;
 			}
+			++fx;
+			fx2 += tdSize;
 		}
 
-		//! Terrain smoothing. Applause to DeusXL!
-		// http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?p=91272#91272
-
-		s32 run;
-		s32 index;
-
-		for( run = 0; run < smoothFactor; ++run )
-		{
-			for( index = 2; index < (TerrainData.Size * TerrainData.Size - 2); ++index)
-			{
-				pMeshBuffer->Vertices[index].Pos.Y =
-					(pMeshBuffer->Vertices[index - 2].Pos.Y + pMeshBuffer->Vertices[index - 1].Pos.Y +
-					pMeshBuffer->Vertices[index + 1].Pos.Y + pMeshBuffer->Vertices[index + 2].Pos.Y) / 4.0f;
-			}
-		}
-
-		for( run = 0; run < smoothFactor; ++run)
-		{
-			for( index = TerrainData.Size; index < (TerrainData.Size * (TerrainData.Size - 1)); ++index)
-			{
-				pMeshBuffer->Vertices[index].Pos.Y =
-					(pMeshBuffer->Vertices[index - TerrainData.Size].Pos.Y +
-					pMeshBuffer->Vertices[index + TerrainData.Size].Pos.Y ) / 2.0f;
-			}
-		}
+		smoothTerrain(mb, smoothFactor);
 
 		// calculate smooth normals for the vertices
-		calculateNormals( pMeshBuffer );
+		calculateNormals(mb);
 
 		// add the MeshBuffer to the mesh
-		Mesh.addMeshBuffer( pMeshBuffer );
-		const u32 vertexCount = pMeshBuffer->getVertexCount();
+		Mesh.addMeshBuffer(mb);
+		const u32 vertexCount = mb->getVertexCount();
 
 		// We copy the data to the renderBuffer, after the normals have been calculated.
-		RenderBuffer.Vertices.set_used( vertexCount );
+		RenderBuffer->getVertexBuffer().set_used(vertexCount);
 
-		for( u32 i = 0; i < vertexCount; i++ )
+		for (u32 i = 0; i < vertexCount; i++)
 		{
-			RenderBuffer.Vertices[i] = pMeshBuffer->Vertices[i];
-			RenderBuffer.Vertices[i].Pos *= TerrainData.Scale;
-			RenderBuffer.Vertices[i].Pos += TerrainData.Position;
+			RenderBuffer->getVertexBuffer()[i] = mb->getVertexBuffer()[i];
+			RenderBuffer->getVertexBuffer()[i].Pos *= TerrainData.Scale;
+			RenderBuffer->getVertexBuffer()[i].Pos += TerrainData.Position;
 		}
 
-		// We no longer need the pMeshBuffer
-		pMeshBuffer->drop();
+		// We no longer need the mb
+		mb->drop();
 
 		// calculate all the necessary data for the patches and the terrain
 		calculateDistanceThresholds();
@@ -364,21 +449,22 @@ namespace scene
 		// set the default rotation pivot point to the terrain nodes center
 		TerrainData.RotationPivot = TerrainData.Center;
 
-		// Rotate the vertices of the terrain by the rotation specified.  Must be done
+		// Rotate the vertices of the terrain by the rotation specified. Must be done
 		// after calculating the terrain data, so we know what the current center of the
 		// terrain is.
-		setRotation( TerrainData.Rotation );
+		setRotation(TerrainData.Rotation);
 
 		// Pre-allocate memory for indices
-		RenderBuffer.Indices.set_used( TerrainData.PatchCount * TerrainData.PatchCount *
-			TerrainData.CalcPatchSize * TerrainData.CalcPatchSize * 6 );
+		RenderBuffer->getIndexBuffer().set_used(
+				TerrainData.PatchCount*TerrainData.PatchCount*
+				TerrainData.CalcPatchSize*TerrainData.CalcPatchSize*6);
 
-		u32 endTime = os::Timer::getTime();
+		const u32 endTime = os::Timer::getTime();
 
 		c8 tmp[255];
-		sprintf( tmp, "Generated terrain data (%dx%d) in %.4f seconds",
-			TerrainData.Size, TerrainData.Size, (endTime - startTime) / 1000.0f );
-		os::Printer::print( tmp );
+		snprintf(tmp, 255, "Generated terrain data (%dx%d) in %.4f seconds",
+			TerrainData.Size, TerrainData.Size, (endTime - startTime) / 1000.0f);
+		os::Printer::log(tmp);
 
 		return true;
 	}
@@ -393,6 +479,7 @@ namespace scene
 		ForceRecalculation = true;
 	}
 
+
 	//! Sets the rotation of the node. This only modifies
 	//! the relative rotation of the node.
 	//! \param rotation: New rotation of the node in degrees.
@@ -403,52 +490,58 @@ namespace scene
 		ForceRecalculation = true;
 	}
 
-	//! Sets the pivot point for rotation of this node.  This is useful for the TiledTerrainManager to
+
+	//! Sets the pivot point for rotation of this node. This is useful for the TiledTerrainManager to
 	//! rotate all terrain tiles around a global world point.
 	//! NOTE: The default for the RotationPivot will be the center of the individual tile.
-	void CTerrainSceneNode::setRotationPivot( const core::vector3df& pivot )
+	void CTerrainSceneNode::setRotationPivot(const core::vector3df& pivot)
 	{
 		UseDefaultRotationPivot = false;
 		TerrainData.RotationPivot = pivot;
 	}
 
+
 	//! Sets the position of the node.
 	//! \param newpos: New postition of the scene node.
-	void CTerrainSceneNode::setPosition ( const core::vector3df& newpos )
+	void CTerrainSceneNode::setPosition(const core::vector3df& newpos)
 	{
 		TerrainData.Position = newpos;
 		applyTransformation();
 		ForceRecalculation = true;
 	}
 
-	//! Apply transformation changes( scale, position, rotation )
+
+	//! Apply transformation changes(scale, position, rotation)
 	void CTerrainSceneNode::applyTransformation()
 	{
-		if( !Mesh.getMeshBufferCount() )
+		if (!Mesh.getMeshBufferCount())
 			return;
 
 		TerrainData.Position = TerrainData.Position;
-		video::S3DVertex2TCoords* meshVertices = (video::S3DVertex2TCoords*)Mesh.getMeshBuffer( 0 )->getVertices();
-		s32 vtxCount = Mesh.getMeshBuffer( 0 )->getVertexCount();
+		video::S3DVertex2TCoords* meshVertices = (video::S3DVertex2TCoords*)Mesh.getMeshBuffer(0)->getVertices();
+		s32 vtxCount = Mesh.getMeshBuffer(0)->getVertexCount();
 		core::matrix4 rotMatrix;
-		rotMatrix.setRotationDegrees( TerrainData.Rotation );
+		rotMatrix.setRotationDegrees(TerrainData.Rotation);
 
-		for( s32 i = 0; i < vtxCount; ++i )
+		for (s32 i = 0; i < vtxCount; ++i)
 		{
-			RenderBuffer.Vertices[i].Pos = meshVertices[i].Pos * TerrainData.Scale + TerrainData.Position;
+			RenderBuffer->getVertexBuffer()[i].Pos = meshVertices[i].Pos * TerrainData.Scale + TerrainData.Position;
 
-			RenderBuffer.Vertices[i].Pos -= TerrainData.RotationPivot;
-			rotMatrix.inverseRotateVect( RenderBuffer.Vertices[i].Pos );
-			RenderBuffer.Vertices[i].Pos += TerrainData.RotationPivot;
+			RenderBuffer->getVertexBuffer()[i].Pos -= TerrainData.RotationPivot;
+			rotMatrix.inverseRotateVect(RenderBuffer->getVertexBuffer()[i].Pos);
+			RenderBuffer->getVertexBuffer()[i].Pos += TerrainData.RotationPivot;
 		}
 
-		calculateDistanceThresholds( true );
+		calculateDistanceThresholds(true);
 		calculatePatchData();
+
+		RenderBuffer->setDirty(EBT_VERTEX);
 	}
 
+
 	//! Updates the scene nodes indices if the camera has moved or rotated by a certain
 	//! threshold, which can be changed using the SetCameraMovementDeltaThreshold and
-	//! SetCameraRotationDeltaThreshold functions.  This also determines if a given patch
+	//! SetCameraRotationDeltaThreshold functions. This also determines if a given patch
 	//! for the scene node is within the view frustum and if it's not the indices are not
 	//! generated for that patch.
 	void CTerrainSceneNode::OnRegisterSceneNode()
@@ -462,118 +555,71 @@ namespace scene
 		ForceRecalculation = false;
 	}
 
+
 	void CTerrainSceneNode::preRenderLODCalculations()
 	{
-		SceneManager->registerNodeForRendering( this );
-		// Do Not call ISceneNode::OnRegisterSceneNode ( ), this node should have no children
+		scene::ICameraSceneNode * camera = SceneManager->getActiveCamera();
+		if(!camera)
+			return;
+
+		SceneManager->registerNodeForRendering(this);
+		// Do Not call ISceneNode::OnRegisterSceneNode(), this node should have no children
 
 		// Determine the camera rotation, based on the camera direction.
-		core::line3d<f32> line;
-		line.start = SceneManager->getActiveCamera()->getAbsolutePosition();
-		line.end = SceneManager->getActiveCamera()->getTarget();
-		core::vector3df cameraRotation = line.getVector().getHorizontalAngle();
-		core::vector3df cameraPosition = SceneManager->getActiveCamera()->getPosition ( );
+		const core::vector3df cameraPosition = camera->getAbsolutePosition();
+		const core::vector3df cameraRotation = core::line3d<f32>(cameraPosition, camera->getTarget()).getVector().getHorizontalAngle();
+		core::vector3df cameraUp = camera->getUpVector();
+		cameraUp.normalize();
+		const f32 CameraFOV = SceneManager->getActiveCamera()->getFOV();
 
 		// Only check on the Camera's Y Rotation
 		if (!ForceRecalculation)
 		{
-			if (( fabs(cameraRotation.X - OldCameraRotation.X) < CameraRotationDelta) &&
-				( fabs(cameraRotation.Y - OldCameraRotation.Y) < CameraRotationDelta))
+			if ((fabsf(cameraRotation.X - OldCameraRotation.X) < CameraRotationDelta) &&
+				(fabsf(cameraRotation.Y - OldCameraRotation.Y) < CameraRotationDelta))
 			{
 				if ((fabs(cameraPosition.X - OldCameraPosition.X) < CameraMovementDelta) &&
 					(fabs(cameraPosition.Y - OldCameraPosition.Y) < CameraMovementDelta) &&
 					(fabs(cameraPosition.Z - OldCameraPosition.Z) < CameraMovementDelta))
 				{
-					return;
+					if (fabs(CameraFOV-OldCameraFOV) < CameraFOVDelta &&
+						cameraUp.dotProduct(OldCameraUp) > (1.f - (cos(core::DEGTORAD * CameraRotationDelta))))
+					{
+						return;
+					}
 				}
 			}
 		}
 
 		OldCameraPosition = cameraPosition;
 		OldCameraRotation = cameraRotation;
+		OldCameraUp = cameraUp;
+		OldCameraFOV = CameraFOV;
+
 		const SViewFrustum* frustum = SceneManager->getActiveCamera()->getViewFrustum();
 
-		// Determine each patches LOD based on distance from camera ( and whether or not they are in
-		// the view frustum ).
-		for( s32 j = 0; j < TerrainData.PatchCount * TerrainData.PatchCount; ++j )
+		// Determine each patches LOD based on distance from camera (and whether or not they are in
+		// the view frustum).
+		const s32 count = TerrainData.PatchCount * TerrainData.PatchCount;
+		for (s32 j = 0; j < count; ++j)
 		{
-			if( frustum->getBoundingBox().intersectsWithBox( TerrainData.Patches[j].BoundingBox ) )
+			if (frustum->getBoundingBox().intersectsWithBox(TerrainData.Patches[j].BoundingBox))
 			{
-				f32 distance = (cameraPosition.X - TerrainData.Patches[j].Center.X) * (cameraPosition.X - TerrainData.Patches[j].Center.X) +
+				const f32 distance = (cameraPosition.X - TerrainData.Patches[j].Center.X) * (cameraPosition.X - TerrainData.Patches[j].Center.X) +
 					(cameraPosition.Y - TerrainData.Patches[j].Center.Y) * (cameraPosition.Y - TerrainData.Patches[j].Center.Y) +
 					(cameraPosition.Z - TerrainData.Patches[j].Center.Z) * (cameraPosition.Z - TerrainData.Patches[j].Center.Z);
 
-				for( s32 i = TerrainData.MaxLOD - 1; i >= 0; --i )
+				for (s32 i = TerrainData.MaxLOD - 1; i >= 0; --i)
 				{
-					if( distance >= TerrainData.LODDistanceThreshold[i] )
+					if (distance >= TerrainData.LODDistanceThreshold[i])
 					{
 						TerrainData.Patches[j].CurrentLOD = i;
 						break;
 					}
-					//else if( i == 0 )
+					//else if (i == 0)
 					{
 						// If we've turned off a patch from viewing, because of the frustum, and now we turn around and it's
-						// too close, we need to turn it back on, at the highest LOD.  The if above doesn't catch this.
-						TerrainData.Patches[j].CurrentLOD = 0;
-					}
-				}
-			}
-			else
-			{
-				TerrainData.Patches[j].CurrentLOD = -1;
-			}
-		}
-	}
-
-	void CTerrainSceneNode::preRenderLODCalculations_old()
-	{
-		SceneManager->registerNodeForRendering( this );
-		// Do Not call ISceneNode::OnRegisterSceneNode ( ), this node should have no children
-
-		// Determine the camera rotation, based on the camera direction.
-		core::line3d<f32> line;
-		line.start = SceneManager->getActiveCamera()->getAbsolutePosition();
-		line.end = SceneManager->getActiveCamera()->getTarget();
-		core::vector3df cameraRotation = line.getVector().getHorizontalAngle();
-		core::vector3df cameraPosition = SceneManager->getActiveCamera()->getPosition ( );
-
-		// Only check on the Camera's Y Rotation
-		if (( fabs(cameraRotation.X - OldCameraRotation.X) < CameraRotationDelta) &&
-			( fabs(cameraRotation.Y - OldCameraRotation.Y) < CameraRotationDelta))
-		{
-			if ((fabs(cameraPosition.X - OldCameraPosition.X) < CameraMovementDelta) &&
-				(fabs(cameraPosition.Y - OldCameraPosition.Y) < CameraMovementDelta) &&
-				(fabs(cameraPosition.Z - OldCameraPosition.Z) < CameraMovementDelta))
-			{
-				return;
-			}
-		}
-
-		OldCameraPosition = cameraPosition;
-		OldCameraRotation = cameraRotation;
-		const SViewFrustum* frustum = SceneManager->getActiveCamera()->getViewFrustum();
-
-		// Determine each patches LOD based on distance from camera ( and whether or not they are in
-		// the view frustum ).
-		for( s32 j = 0; j < TerrainData.PatchCount * TerrainData.PatchCount; ++j )
-		{
-			if( frustum->getBoundingBox().intersectsWithBox( TerrainData.Patches[j].BoundingBox ) )
-			{
-				f32 distance = (cameraPosition.X - TerrainData.Patches[j].Center.X) * (cameraPosition.X - TerrainData.Patches[j].Center.X) +
-					(cameraPosition.Y - TerrainData.Patches[j].Center.Y) * (cameraPosition.Y - TerrainData.Patches[j].Center.Y) +
-					(cameraPosition.Z - TerrainData.Patches[j].Center.Z) * (cameraPosition.Z - TerrainData.Patches[j].Center.Z);
-
-				for( s32 i = TerrainData.MaxLOD - 1; i >= 0; --i )
-				{
-					if( distance >= TerrainData.LODDistanceThreshold[i] )
-					{
-						TerrainData.Patches[j].CurrentLOD = i;
-						break;
-					}
-					//else if( i == 0 )
-					{
-						// If we've turned off a patch from viewing, because of the frustum, and now we turn around and it's
-						// too close, we need to turn it back on, at the highest LOD.  The if above doesn't catch this.
+						// too close, we need to turn it back on, at the highest LOD. The if above doesn't catch this.
 						TerrainData.Patches[j].CurrentLOD = 0;
 					}
 				}
@@ -587,46 +633,58 @@ namespace scene
 
 
 	void CTerrainSceneNode::preRenderIndicesCalculations()
+	{
+		switch (RenderBuffer->getIndexBuffer().getType())
+		{
+			case video::EIT_16BIT:
+				preRenderIndicesCalculationsDirect<u16>((u16*)RenderBuffer->getIndexBuffer().pointer());
+				break;
+			case video::EIT_32BIT:
+				preRenderIndicesCalculationsDirect<u32>((u32*)RenderBuffer->getIndexBuffer().pointer());
+				break;
+		}
+	}
+
+
+	template<class INDEX_TYPE>
+	void CTerrainSceneNode::preRenderIndicesCalculationsDirect(INDEX_TYPE* IndexBuffer)
 	{
 		IndicesToRender = 0;
-		s32 index11;
-		s32 index21;
-		s32 index12;
-		s32 index22;
 
 		// Then generate the indices for all patches that are visible.
-		for( s32 i = 0; i < TerrainData.PatchCount; ++i )
+		for (s32 i = 0; i < TerrainData.PatchCount; ++i)
 		{
-			for( s32 j = 0; j < TerrainData.PatchCount; ++j )
+			for (s32 j = 0; j < TerrainData.PatchCount; ++j)
 			{
-				s32 index = i * TerrainData.PatchCount + j;
-				if( TerrainData.Patches[index].CurrentLOD >= 0 )
+				const s32 index = i * TerrainData.PatchCount + j;
+				if (TerrainData.Patches[index].CurrentLOD >= 0)
 				{
 					s32 x = 0;
 					s32 z = 0;
 
 					// calculate the step we take this patch, based on the patches current LOD
-					s32 step = 1 << TerrainData.Patches[index].CurrentLOD;
+					const s32 step = 1 << TerrainData.Patches[index].CurrentLOD;
 
 					// Loop through patch and generate indices
-					while( z < TerrainData.CalcPatchSize )
+					while (z < TerrainData.CalcPatchSize)
 					{
-						index11 = getIndex( j, i, index, x, z );
-						index21 = getIndex( j, i, index, x + step, z );
-						index12 = getIndex( j, i, index, x, z + step );
-						index22 = getIndex( j, i, index, x + step, z + step );
+						const s32 index11 = getIndex(j, i, index, x, z);
+						const s32 index21 = getIndex(j, i, index, x + step, z);
+						const s32 index12 = getIndex(j, i, index, x, z + step);
+						const s32 index22 = getIndex(j, i, index, x + step, z + step);
 
-						RenderBuffer.Indices[IndicesToRender++] = index12;
-						RenderBuffer.Indices[IndicesToRender++] = index11;
-						RenderBuffer.Indices[IndicesToRender++] = index22;
-						RenderBuffer.Indices[IndicesToRender++] = index22;
-						RenderBuffer.Indices[IndicesToRender++] = index11;
-						RenderBuffer.Indices[IndicesToRender++] = index21;
+						IndexBuffer[IndicesToRender++]= static_cast<INDEX_TYPE>(index12);
+						IndexBuffer[IndicesToRender++]= static_cast<INDEX_TYPE>(index11);
+						IndexBuffer[IndicesToRender++]= static_cast<INDEX_TYPE>(index22);
+						IndexBuffer[IndicesToRender++]= static_cast<INDEX_TYPE>(index22);
+						IndexBuffer[IndicesToRender++]= static_cast<INDEX_TYPE>(index11);
+						IndexBuffer[IndicesToRender++]= static_cast<INDEX_TYPE>(index21);
 
 						// increment index position horizontally
 						x += step;
 
-						if ( x >= TerrainData.CalcPatchSize ) // we've hit an edge
+						// we've hit an edge
+						if (x >= TerrainData.CalcPatchSize)
 						{
 							x = 0;
 							z += step;
@@ -636,10 +694,12 @@ namespace scene
 			}
 		}
 
-		if ( DynamicSelectorUpdate && TriangleSelector )
+		RenderBuffer->setDirty(EBT_INDEX);
+
+		if (DynamicSelectorUpdate && TriangleSelector)
 		{
 			CTerrainTriangleSelector* selector = (CTerrainTriangleSelector*)TriangleSelector;
-			selector->setTriangleData ( this, -1 );
+			selector->setTriangleData(this, -1);
 		}
 	}
 
@@ -655,16 +715,15 @@ namespace scene
 
 		video::IVideoDriver* driver = SceneManager->getVideoDriver();
 
-		core::matrix4 identity;
-		driver->setTransform (video::ETS_WORLD, identity);
-
+		driver->setTransform (video::ETS_WORLD, core::IdentityMatrix);
 		driver->setMaterial(Mesh.getMeshBuffer(0)->getMaterial());
 
+		RenderBuffer->getIndexBuffer().set_used(IndicesToRender);
+
 		// For use with geomorphing
-		driver->drawVertexPrimitiveList(
-			RenderBuffer.getVertices(), RenderBuffer.getVertexCount(),
-			RenderBuffer.getIndices(), IndicesToRender / 3,
-			video::EVT_2TCOORDS, EPT_TRIANGLES);
+		driver->drawMeshBuffer(RenderBuffer);
+
+		RenderBuffer->getIndexBuffer().set_used(RenderBuffer->getIndexBuffer().allocated_size());
 
 		// for debug purposes only:
 		if (DebugDataVisible)
@@ -672,95 +731,137 @@ namespace scene
 			video::SMaterial m;
 			m.Lighting = false;
 			driver->setMaterial(m);
-			if ( DebugDataVisible & scene::EDS_BBOX )
-				driver->draw3DBox( TerrainData.BoundingBox, video::SColor(0,255,255,255));
+			if (DebugDataVisible & scene::EDS_BBOX)
+				driver->draw3DBox(TerrainData.BoundingBox, video::SColor(255,255,255,255));
 
 			const s32 count = TerrainData.PatchCount * TerrainData.PatchCount;
 			s32 visible = 0;
-			if ( DebugDataVisible & scene::EDS_BBOX_BUFFERS )
-				for( s32 j = 0; j < count; ++j )
+			if (DebugDataVisible & scene::EDS_BBOX_BUFFERS)
+			{
+				for (s32 j = 0; j < count; ++j)
 				{
-					driver->draw3DBox( TerrainData.Patches[j].BoundingBox, video::SColor(0,255,0,0));
-					visible += ( TerrainData.Patches[j].CurrentLOD >= 0 );
+					driver->draw3DBox(TerrainData.Patches[j].BoundingBox, video::SColor(255,255,0,0));
+					visible += (TerrainData.Patches[j].CurrentLOD >= 0);
 				}
+			}
+
+			if (DebugDataVisible & scene::EDS_NORMALS)
+			{
+				IAnimatedMesh * arrow = SceneManager->addArrowMesh(
+						"__debugnormal", 0xFFECEC00,
+						0xFF999900, 4, 8, 1.f, 0.6f, 0.05f,
+						0.3f);
+				if (0 == arrow)
+				{
+					arrow = SceneManager->getMesh("__debugnormal");
+				}
+				IMesh *mesh = arrow->getMesh(0);
+
+				// find a good scaling factor
+
+				core::matrix4 m2;
+
+				// draw normals
+				driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
+				for (u32 i=0; i != RenderBuffer->getVertexCount(); ++i)
+				{
+					const core::vector3df& v = RenderBuffer->getNormal(i);
+					// align to v->Normal
+					if (core::vector3df(0,-1,0)==v)
+					{
+						m2.makeIdentity();
+						m2[5]=-m2[5];
+					}
+					else
+					{
+						core::quaternion quatRot;
+						m2=quatRot.rotationFromTo(v,core::vector3df(0,1,0)).getMatrix();
+					}
+
+					m2.setTranslation(RenderBuffer->getPosition(i));
+					m2=AbsoluteTransformation*m2;
+
+					driver->setTransform(video::ETS_WORLD, m2 );
+					for (u32 a = 0; a != mesh->getMeshBufferCount(); ++a)
+						driver->drawMeshBuffer(mesh->getMeshBuffer(a));
+				}
+				driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
+			}
 
 			static u32 lastTime = 0;
 
 			const u32 now = os::Timer::getRealTime();
-			if ( now - lastTime > 1000 )
+			if (now - lastTime > 1000)
 			{
 				char buf[64];
-				sprintf ( buf, "Count: %d, Visible: %d", count, visible );
-				os::Printer::print ( buf );
+				snprintf(buf, 64, "Count: %d, Visible: %d", count, visible);
+				os::Printer::log(buf);
 
 				lastTime = now;
 			}
 		}
 	}
 
+
 	//! Return the bounding box of the entire terrain.
 	const core::aabbox3d<f32>& CTerrainSceneNode::getBoundingBox() const
 	{
 		return TerrainData.BoundingBox;
 	}
 
+
 	//! Return the bounding box of a patch
-	const core::aabbox3d<f32>& CTerrainSceneNode::getBoundingBox( s32 patchX, s32 patchZ ) const
+	const core::aabbox3d<f32>& CTerrainSceneNode::getBoundingBox(s32 patchX, s32 patchZ) const
 	{
 		return TerrainData.Patches[patchX * TerrainData.PatchCount + patchZ].BoundingBox;
 	}
 
+
 	//! Gets the meshbuffer data based on a specified Level of Detail.
 	//! \param mb: A reference to an SMeshBuffer object
 	//! \param LOD: The Level Of Detail you want the indices from.
-	void CTerrainSceneNode::getMeshBufferForLOD(SMeshBufferLightMap& mb, s32 LOD ) const
+	void CTerrainSceneNode::getMeshBufferForLOD(IDynamicMeshBuffer& mb, s32 LOD ) const
 	{
 		if (!Mesh.getMeshBufferCount())
 			return;
 
-		if ( LOD < 0 )
-			LOD = 0;
-		else if ( LOD > TerrainData.MaxLOD - 1 )
-			LOD = TerrainData.MaxLOD - 1;
+		LOD = core::clamp(LOD, 0, TerrainData.MaxLOD - 1);
 
-		s32 numVertices = Mesh.getMeshBuffer( 0 )->getVertexCount ( );
-		mb.Vertices.reallocate ( numVertices );
-		video::S3DVertex2TCoords* vertices = (video::S3DVertex2TCoords*)Mesh.getMeshBuffer ( 0 )->getVertices ( );
+		const u32 numVertices = Mesh.getMeshBuffer(0)->getVertexCount();
+		mb.getVertexBuffer().reallocate(numVertices);
+		video::S3DVertex2TCoords* vertices = (video::S3DVertex2TCoords*)Mesh.getMeshBuffer(0)->getVertices();
 
-		s32 i;
-		for (i=0; i<numVertices; ++i)
-			mb.Vertices.push_back(vertices[i]);
+		for (u32 n=0; n<numVertices; ++n)
+			mb.getVertexBuffer().push_back(vertices[n]);
+
+		mb.getIndexBuffer().setType(RenderBuffer->getIndexBuffer().getType());
 
 		// calculate the step we take for all patches, since LOD is the same
-		s32 step = 1 << LOD;
-		s32 index11;
-		s32 index21;
-		s32 index12;
-		s32 index22;
+		const s32 step = 1 << LOD;
 
 		// Generate the indices for all patches at the specified LOD
-		for (i=0; i<TerrainData.PatchCount; ++i)
+		s32 index = 0;
+		for (s32 i=0; i<TerrainData.PatchCount; ++i)
 		{
 			for (s32 j=0; j<TerrainData.PatchCount; ++j)
 			{
-				s32 index = i*TerrainData.PatchCount + j;
 				s32 x = 0;
 				s32 z = 0;
 
 				// Loop through patch and generate indices
 				while (z < TerrainData.CalcPatchSize)
 				{
-					index11 = getIndex( j, i, index, x, z );
-					index21 = getIndex( j, i, index, x + step, z );
-					index12 = getIndex( j, i, index, x, z + step );
-					index22 = getIndex( j, i, index, x + step, z + step );
+					const s32 index11 = getIndex(j, i, index, x, z);
+					const s32 index21 = getIndex(j, i, index, x + step, z);
+					const s32 index12 = getIndex(j, i, index, x, z + step);
+					const s32 index22 = getIndex(j, i, index, x + step, z + step);
 
-					mb.Indices.push_back( index12 );
-					mb.Indices.push_back( index11 );
-					mb.Indices.push_back( index22 );
-					mb.Indices.push_back( index22 );
-					mb.Indices.push_back( index11 );
-					mb.Indices.push_back( index21 );
+					mb.getIndexBuffer().push_back(index12);
+					mb.getIndexBuffer().push_back(index11);
+					mb.getIndexBuffer().push_back(index22);
+					mb.getIndexBuffer().push_back(index22);
+					mb.getIndexBuffer().push_back(index11);
+					mb.getIndexBuffer().push_back(index21);
 
 					// increment index position horizontally
 					x += step;
@@ -771,32 +872,34 @@ namespace scene
 						z += step;
 					}
 				}
+				++index;
 			}
 		}
 	}
 
+
 	//! Gets the indices for a specified patch at a specified Level of Detail.
 	//! \param mb: A reference to an array of u32 indices.
 	//! \param patchX: Patch x coordinate.
 	//! \param patchZ: Patch z coordinate.
-	//! \param LOD: The level of detail to get for that patch.  If -1, then get
-	//! the CurrentLOD.  If the CurrentLOD is set to -1, meaning it's not shown,
-	//! then it will retrieve the triangles at the highest LOD ( 0 ).
+	//! \param LOD: The level of detail to get for that patch. If -1, then get
+	//! the CurrentLOD. If the CurrentLOD is set to -1, meaning it's not shown,
+	//! then it will retrieve the triangles at the highest LOD (0).
 	//! \return: Number if indices put into the buffer.
 	s32 CTerrainSceneNode::getIndicesForPatch(core::array<u32>& indices, s32 patchX, s32 patchZ, s32 LOD)
 	{
-		if ( patchX < 0 || patchX > TerrainData.PatchCount - 1 || patchZ < 0 || patchZ > TerrainData.PatchCount - 1 )
+		if (patchX < 0 || patchX > TerrainData.PatchCount-1 ||
+				patchZ < 0 || patchZ > TerrainData.PatchCount-1)
 			return -1;
 
-		if ( LOD < -1 || LOD > TerrainData.MaxLOD - 1 )
+		if (LOD < -1 || LOD > TerrainData.MaxLOD - 1)
 			return -1;
 
-		s32 rv = 0;
 		core::array<s32> cLODs;
 		bool setLODs = false;
 
 		// If LOD of -1 was passed in, use the CurrentLOD of the patch specified
-		if ( LOD == -1 )
+		if (LOD == -1)
 		{
 			LOD = TerrainData.Patches[patchX * TerrainData.PatchCount + patchZ].CurrentLOD;
 		}
@@ -807,31 +910,28 @@ namespace scene
 			setLODs = true;
 		}
 
-		if ( LOD < 0 )
+		if (LOD < 0)
 			return -2; // Patch not visible, don't generate indices.
 
 		// calculate the step we take for this LOD
-		s32 step = 1 << LOD;
+		const s32 step = 1 << LOD;
 
 		// Generate the indices for the specified patch at the specified LOD
-		s32 index = patchX * TerrainData.PatchCount + patchZ;
+		const s32 index = patchX * TerrainData.PatchCount + patchZ;
 
 		s32 x = 0;
 		s32 z = 0;
-		s32 index11;
-		s32 index21;
-		s32 index12;
-		s32 index22;
 
-		indices.set_used ( TerrainData.PatchSize * TerrainData.PatchSize * 6 );
+		indices.set_used(TerrainData.PatchSize * TerrainData.PatchSize * 6);
 
 		// Loop through patch and generate indices
+		s32 rv=0;
 		while (z<TerrainData.CalcPatchSize)
 		{
-			index11 = getIndex( patchZ, patchX, index, x, z );
-			index21 = getIndex( patchZ, patchX, index, x + step, z );
-			index12 = getIndex( patchZ, patchX, index, x, z + step );
-			index22 = getIndex( patchZ, patchX, index, x + step, z + step );
+			const s32 index11 = getIndex(patchZ, patchX, index, x, z);
+			const s32 index21 = getIndex(patchZ, patchX, index, x + step, z);
+			const s32 index12 = getIndex(patchZ, patchX, index, x, z + step);
+			const s32 index22 = getIndex(patchZ, patchX, index, x + step, z + step);
 
 			indices[rv++] = index12;
 			indices[rv++] = index11;
@@ -850,22 +950,24 @@ namespace scene
 			}
 		}
 
-		if ( setLODs )
-			setCurrentLODOfPatches (cLODs);
+		if (setLODs)
+			setCurrentLODOfPatches(cLODs);
 
 		return rv;
 	}
 
+
 	//! Populates an array with the CurrentLOD of each patch.
 	//! \param LODs: A reference to a core::array<s32> to hold the values
 	//! \return Returns the number of elements in the array
 	s32 CTerrainSceneNode::getCurrentLODOfPatches(core::array<s32>& LODs) const
 	{
 		s32 numLODs;
-		LODs.clear ( );
+		LODs.clear();
 
-		for ( numLODs = 0; numLODs < TerrainData.PatchCount * TerrainData.PatchCount; numLODs++ )
-			LODs.push_back ( TerrainData.Patches[numLODs].CurrentLOD );
+		const s32 count = TerrainData.PatchCount * TerrainData.PatchCount;
+		for (numLODs = 0; numLODs < count; numLODs++)
+			LODs.push_back(TerrainData.Patches[numLODs].CurrentLOD);
 
 		return LODs.size();
 	}
@@ -875,7 +977,7 @@ namespace scene
 	//! \param patchX: Patch x coordinate.
 	//! \param patchZ: Patch z coordinate.
 	//! \param LOD: The level of detail to set the patch to.
-	void CTerrainSceneNode::setLODOfPatch( s32 patchX, s32 patchZ, s32 LOD )
+	void CTerrainSceneNode::setLODOfPatch(s32 patchX, s32 patchZ, s32 LOD)
 	{
 		TerrainData.Patches[patchX * TerrainData.PatchCount + patchZ].CurrentLOD = LOD;
 	}
@@ -887,7 +989,7 @@ namespace scene
 	{
 		OverrideDistanceThreshold = true;
 
-		if ( LOD < 0 || LOD > TerrainData.MaxLOD - 1 )
+		if (LOD < 0 || LOD > TerrainData.MaxLOD - 1)
 			return false;
 
 		TerrainData.LODDistanceThreshold[LOD] = newDistance * newDistance;
@@ -895,6 +997,7 @@ namespace scene
 		return true;
 	}
 
+
 	//! Creates a planar texture mapping on the terrain
 	//! \param resolution: resolution of the planar mapping. This is the value
 	//! specifying the relation between world space and texture coordinate space.
@@ -906,25 +1009,30 @@ namespace scene
 		const f32 resBySize = resolution / (f32)(TerrainData.Size-1);
 		const f32 res2BySize = resolution2 / (f32)(TerrainData.Size-1);
 		u32 index = 0;
-		f32 xval = 0, zval;
-		f32 x2val = 0, z2val=0;
+		f32 xval = 0.f;
+		f32 x2val = 0.f;
 		for (s32 x=0; x<TerrainData.Size; ++x)
 		{
-			zval=z2val=0;
+			f32 zval=0.f;
+			f32 z2val=0.f;
 			for (s32 z=0; z<TerrainData.Size; ++z)
 			{
-				RenderBuffer.Vertices[index].TCoords.X = xval;
-				RenderBuffer.Vertices[index].TCoords.Y = zval;
+				RenderBuffer->getVertexBuffer()[index].TCoords.X = 1.f-xval;
+				RenderBuffer->getVertexBuffer()[index].TCoords.Y = zval;
 
-				if ( resolution2 == 0 )
+				if (RenderBuffer->getVertexType()==video::EVT_2TCOORDS)
 				{
-					RenderBuffer.Vertices[index].TCoords2 = RenderBuffer.Vertices[index].TCoords;
-				}
-				else
-				{
-					RenderBuffer.Vertices[index].TCoords2.X = x2val;
-					RenderBuffer.Vertices[index].TCoords2.Y = z2val;
+					if (resolution2 == 0)
+					{
+						((video::S3DVertex2TCoords&)RenderBuffer->getVertexBuffer()[index]).TCoords2 = RenderBuffer->getVertexBuffer()[index].TCoords;
+					}
+					else
+					{
+						((video::S3DVertex2TCoords&)RenderBuffer->getVertexBuffer()[index]).TCoords2.X = 1.f-x2val;
+						((video::S3DVertex2TCoords&)RenderBuffer->getVertexBuffer()[index]).TCoords2.Y = z2val;
+					}
 				}
+
 				++index;
 				zval += resBySize;
 				z2val += res2BySize;
@@ -932,66 +1040,92 @@ namespace scene
 			xval += resBySize;
 			x2val += res2BySize;
 		}
+
+		RenderBuffer->setDirty(EBT_VERTEX);
 	}
 
+
 	//! used to get the indices when generating index data for patches at varying levels of detail.
-	u32 CTerrainSceneNode::getIndex(const s32& PatchX, const s32& PatchZ,
-					const s32& PatchIndex, u32 vX, u32 vZ) const
+	u32 CTerrainSceneNode::getIndex(const s32 PatchX, const s32 PatchZ,
+					const s32 PatchIndex, u32 vX, u32 vZ) const
 	{
 		// top border
 		if (vZ == 0)
 		{
 			if (TerrainData.Patches[PatchIndex].Top &&
 				TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Top->CurrentLOD &&
-				(vX % ( 1 << TerrainData.Patches[PatchIndex].Top->CurrentLOD)) != 0 )
+				(vX % (1 << TerrainData.Patches[PatchIndex].Top->CurrentLOD)) != 0 )
 			{
-				vX = vX - vX % ( 1 << TerrainData.Patches[PatchIndex].Top->CurrentLOD );
+				vX -= vX % (1 << TerrainData.Patches[PatchIndex].Top->CurrentLOD);
 			}
 		}
 		else
-		if ( vZ == (u32)TerrainData.CalcPatchSize ) // bottom border
+		if (vZ == (u32)TerrainData.CalcPatchSize) // bottom border
 		{
 			if (TerrainData.Patches[PatchIndex].Bottom &&
 				TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Bottom->CurrentLOD &&
-				(vX % ( 1 << TerrainData.Patches[PatchIndex].Bottom->CurrentLOD)) != 0)
+				(vX % (1 << TerrainData.Patches[PatchIndex].Bottom->CurrentLOD)) != 0)
 			{
-				vX = vX - vX % ( 1 << TerrainData.Patches[PatchIndex].Bottom->CurrentLOD );
+				vX -= vX % (1 << TerrainData.Patches[PatchIndex].Bottom->CurrentLOD);
 			}
 		}
 
 		// left border
-		if ( vX == 0 )
+		if (vX == 0)
 		{
 			if (TerrainData.Patches[PatchIndex].Left &&
 				TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Left->CurrentLOD &&
-				( vZ % ( 1 << TerrainData.Patches[PatchIndex].Left->CurrentLOD ) ) != 0)
+				(vZ % (1 << TerrainData.Patches[PatchIndex].Left->CurrentLOD)) != 0)
 			{
-				vZ = vZ - vZ % ( 1 << TerrainData.Patches[PatchIndex].Left->CurrentLOD );
+				vZ -= vZ % (1 << TerrainData.Patches[PatchIndex].Left->CurrentLOD);
 			}
 		}
 		else
-		if  ( vX == (u32)TerrainData.CalcPatchSize ) // right border
+		if (vX == (u32)TerrainData.CalcPatchSize) // right border
 		{
 			if (TerrainData.Patches[PatchIndex].Right &&
 				TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Right->CurrentLOD &&
-				( vZ %  ( 1 << TerrainData.Patches[PatchIndex].Right->CurrentLOD ) ) != 0)
+				(vZ % (1 << TerrainData.Patches[PatchIndex].Right->CurrentLOD)) != 0)
 			{
-				vZ = vZ - vZ % ( 1 << TerrainData.Patches[PatchIndex].Right->CurrentLOD );
+				vZ -= vZ % (1 << TerrainData.Patches[PatchIndex].Right->CurrentLOD);
 			}
 		}
 
-		if ( vZ >= (u32)TerrainData.PatchSize )
+		if (vZ >= (u32)TerrainData.PatchSize)
 			vZ = TerrainData.CalcPatchSize;
 
-		if ( vX >= (u32)TerrainData.PatchSize )
+		if (vX >= (u32)TerrainData.PatchSize)
 			vX = TerrainData.CalcPatchSize;
 
 		return (vZ + ((TerrainData.CalcPatchSize) * PatchZ)) * TerrainData.Size +
 			(vX + ((TerrainData.CalcPatchSize) * PatchX));
 	}
 
+
+	//! smooth the terrain
+	void CTerrainSceneNode::smoothTerrain(CDynamicMeshBuffer* mb, s32 smoothFactor)
+	{
+		for (s32 run = 0; run < smoothFactor; ++run)
+		{
+			s32 yd = TerrainData.Size;
+			for (s32 y = 1; y < TerrainData.Size - 1; ++y)
+			{
+				for (s32 x = 1; x < TerrainData.Size - 1; ++x)
+				{
+					mb->getVertexBuffer()[x + yd].Pos.Y =
+						(mb->getVertexBuffer()[x-1 + yd].Pos.Y +
+						mb->getVertexBuffer()[x+1 + yd].Pos.Y +
+						mb->getVertexBuffer()[x   + yd - TerrainData.Size].Pos.Y +
+						mb->getVertexBuffer()[x   + yd - TerrainData.Size].Pos.Y) * 0.25f;
+				}
+				yd += TerrainData.Size;
+			}
+		}
+	}
+
+
 	//! calculate smooth normals
-	void CTerrainSceneNode::calculateNormals ( SMeshBufferLightMap* pMeshBuffer )
+	void CTerrainSceneNode::calculateNormals(CDynamicMeshBuffer* mb)
 	{
 		s32 count;
 		core::vector3df a, b, c, t;
@@ -1006,22 +1140,22 @@ namespace scene
 				// top left
 				if (x>0 && z>0)
 				{
-					a = pMeshBuffer->Vertices[(x-1)*TerrainData.Size+z-1].Pos;
-					b = pMeshBuffer->Vertices[(x-1)*TerrainData.Size+z].Pos;
-					c = pMeshBuffer->Vertices[x*TerrainData.Size+z].Pos;
+					a = mb->getVertexBuffer()[(x-1)*TerrainData.Size+z-1].Pos;
+					b = mb->getVertexBuffer()[(x-1)*TerrainData.Size+z].Pos;
+					c = mb->getVertexBuffer()[x*TerrainData.Size+z].Pos;
 					b -= a;
 					c -= a;
-					t = b.crossProduct ( c );
-					t.normalize ( );
+					t = b.crossProduct(c);
+					t.normalize();
 					normal += t;
 
-					a = pMeshBuffer->Vertices[(x-1)*TerrainData.Size+z-1].Pos;
-					b = pMeshBuffer->Vertices[x*TerrainData.Size+z-1].Pos;
-					c = pMeshBuffer->Vertices[x*TerrainData.Size+z].Pos;
+					a = mb->getVertexBuffer()[(x-1)*TerrainData.Size+z-1].Pos;
+					b = mb->getVertexBuffer()[x*TerrainData.Size+z-1].Pos;
+					c = mb->getVertexBuffer()[x*TerrainData.Size+z].Pos;
 					b -= a;
 					c -= a;
-					t = b.crossProduct ( c );
-					t.normalize ( );
+					t = b.crossProduct(c);
+					t.normalize();
 					normal += t;
 
 					count += 2;
@@ -1030,22 +1164,22 @@ namespace scene
 				// top right
 				if (x>0 && z<TerrainData.Size-1)
 				{
-					a = pMeshBuffer->Vertices[(x-1)*TerrainData.Size+z].Pos;
-					b = pMeshBuffer->Vertices[(x-1)*TerrainData.Size+z+1].Pos;
-					c = pMeshBuffer->Vertices[x*TerrainData.Size+z+1].Pos;
+					a = mb->getVertexBuffer()[(x-1)*TerrainData.Size+z].Pos;
+					b = mb->getVertexBuffer()[(x-1)*TerrainData.Size+z+1].Pos;
+					c = mb->getVertexBuffer()[x*TerrainData.Size+z+1].Pos;
 					b -= a;
 					c -= a;
-					t = b.crossProduct ( c );
-					t.normalize ( );
+					t = b.crossProduct(c);
+					t.normalize();
 					normal += t;
 
-					a = pMeshBuffer->Vertices[(x-1)*TerrainData.Size+z].Pos;
-					b = pMeshBuffer->Vertices[x*TerrainData.Size+z+1].Pos;
-					c = pMeshBuffer->Vertices[x*TerrainData.Size+z].Pos;
+					a = mb->getVertexBuffer()[(x-1)*TerrainData.Size+z].Pos;
+					b = mb->getVertexBuffer()[x*TerrainData.Size+z+1].Pos;
+					c = mb->getVertexBuffer()[x*TerrainData.Size+z].Pos;
 					b -= a;
 					c -= a;
-					t = b.crossProduct ( c );
-					t.normalize ( );
+					t = b.crossProduct(c);
+					t.normalize();
 					normal += t;
 
 					count += 2;
@@ -1054,22 +1188,22 @@ namespace scene
 				// bottom right
 				if (x<TerrainData.Size-1 && z<TerrainData.Size-1)
 				{
-					a = pMeshBuffer->Vertices[x*TerrainData.Size+z+1].Pos;
-					b = pMeshBuffer->Vertices[x*TerrainData.Size+z].Pos;
-					c = pMeshBuffer->Vertices[(x+1)*TerrainData.Size+z+1].Pos;
+					a = mb->getVertexBuffer()[x*TerrainData.Size+z+1].Pos;
+					b = mb->getVertexBuffer()[x*TerrainData.Size+z].Pos;
+					c = mb->getVertexBuffer()[(x+1)*TerrainData.Size+z+1].Pos;
 					b -= a;
 					c -= a;
-					t = b.crossProduct ( c );
-					t.normalize ( );
+					t = b.crossProduct(c);
+					t.normalize();
 					normal += t;
 
-					a = pMeshBuffer->Vertices[x*TerrainData.Size+z+1].Pos;
-					b = pMeshBuffer->Vertices[(x+1)*TerrainData.Size+z+1].Pos;
-					c = pMeshBuffer->Vertices[(x+1)*TerrainData.Size+z].Pos;
+					a = mb->getVertexBuffer()[x*TerrainData.Size+z+1].Pos;
+					b = mb->getVertexBuffer()[(x+1)*TerrainData.Size+z+1].Pos;
+					c = mb->getVertexBuffer()[(x+1)*TerrainData.Size+z].Pos;
 					b -= a;
 					c -= a;
-					t = b.crossProduct ( c );
-					t.normalize ( );
+					t = b.crossProduct(c);
+					t.normalize();
 					normal += t;
 
 					count += 2;
@@ -1078,45 +1212,46 @@ namespace scene
 				// bottom left
 				if (x<TerrainData.Size-1 && z>0)
 				{
-					a = pMeshBuffer->Vertices[x*TerrainData.Size+z-1].Pos;
-					b = pMeshBuffer->Vertices[x*TerrainData.Size+z].Pos;
-					c = pMeshBuffer->Vertices[(x+1)*TerrainData.Size+z].Pos;
+					a = mb->getVertexBuffer()[x*TerrainData.Size+z-1].Pos;
+					b = mb->getVertexBuffer()[x*TerrainData.Size+z].Pos;
+					c = mb->getVertexBuffer()[(x+1)*TerrainData.Size+z].Pos;
 					b -= a;
 					c -= a;
-					t = b.crossProduct ( c );
-					t.normalize ( );
+					t = b.crossProduct(c);
+					t.normalize();
 					normal += t;
 
-					a = pMeshBuffer->Vertices[x*TerrainData.Size+z-1].Pos;
-					b = pMeshBuffer->Vertices[(x+1)*TerrainData.Size+z].Pos;
-					c = pMeshBuffer->Vertices[(x+1)*TerrainData.Size+z-1].Pos;
+					a = mb->getVertexBuffer()[x*TerrainData.Size+z-1].Pos;
+					b = mb->getVertexBuffer()[(x+1)*TerrainData.Size+z].Pos;
+					c = mb->getVertexBuffer()[(x+1)*TerrainData.Size+z-1].Pos;
 					b -= a;
 					c -= a;
-					t = b.crossProduct ( c );
-					t.normalize ( );
+					t = b.crossProduct(c);
+					t.normalize();
 					normal += t;
 
 					count += 2;
 				}
 
-				if ( count != 0 )
+				if (count != 0)
 				{
-					normal.normalize ( );
+					normal.normalize();
 				}
 				else
 				{
-					normal.set( 0.0f, 1.0f, 0.0f );
+					normal.set(0.0f, 1.0f, 0.0f);
 				}
 
-				pMeshBuffer->Vertices[x * TerrainData.Size + z].Normal = normal;
+				mb->getVertexBuffer()[x * TerrainData.Size + z].Normal = normal;
 			}
 		}
 	}
 
+
 	//! create patches, stuff that needs to be done only once for patches goes here.
 	void CTerrainSceneNode::createPatches()
 	{
-		TerrainData.PatchCount = (TerrainData.Size - 1) / ( TerrainData.CalcPatchSize );
+		TerrainData.PatchCount = (TerrainData.Size - 1) / (TerrainData.CalcPatchSize);
 
 		if (TerrainData.Patches)
 			delete [] TerrainData.Patches;
@@ -1124,63 +1259,59 @@ namespace scene
 		TerrainData.Patches = new SPatch[TerrainData.PatchCount * TerrainData.PatchCount];
 	}
 
+
 	//! used to calculate the internal STerrainData structure both at creation and after scaling/position calls.
 	void CTerrainSceneNode::calculatePatchData()
 	{
 		// Reset the Terrains Bounding Box for re-calculation
-		TerrainData.BoundingBox = core::aabbox3df ( 999999.9f, 999999.9f, 999999.9f, -999999.9f, -999999.9f, -999999.9f );
+		TerrainData.BoundingBox = core::aabbox3df(999999.9f, 999999.9f, 999999.9f, -999999.9f, -999999.9f, -999999.9f);
 
-		for( s32 x = 0; x < TerrainData.PatchCount; ++x )
+		for (s32 x = 0; x < TerrainData.PatchCount; ++x)
 		{
-			for( s32 z = 0; z < TerrainData.PatchCount; ++z )
+			for (s32 z = 0; z < TerrainData.PatchCount; ++z)
 			{
-				s32 index = x * TerrainData.PatchCount + z;
+				const s32 index = x * TerrainData.PatchCount + z;
 				TerrainData.Patches[index].CurrentLOD = 0;
 
-				// For each patch, calculate the bounding box ( mins and maxes )
-				TerrainData.Patches[index].BoundingBox =  core::aabbox3df (999999.9f, 999999.9f, 999999.9f,
-					-999999.9f, -999999.9f, -999999.9f );
+				// For each patch, calculate the bounding box (mins and maxes)
+				TerrainData.Patches[index].BoundingBox = core::aabbox3df(999999.9f, 999999.9f, 999999.9f,
+					-999999.9f, -999999.9f, -999999.9f);
+
+				for (s32 xx = x*(TerrainData.CalcPatchSize); xx <= (x + 1) * TerrainData.CalcPatchSize; ++xx)
+					for (s32 zz = z*(TerrainData.CalcPatchSize); zz <= (z + 1) * TerrainData.CalcPatchSize; ++zz)
+						TerrainData.Patches[index].BoundingBox.addInternalPoint(RenderBuffer->getVertexBuffer()[xx * TerrainData.Size + zz].Pos);
 
-				for( s32 xx = x*(TerrainData.CalcPatchSize); xx <= ( x + 1 ) * TerrainData.CalcPatchSize; ++xx )
-					for( s32 zz = z*(TerrainData.CalcPatchSize); zz <= ( z + 1 ) * TerrainData.CalcPatchSize; ++zz )
-						TerrainData.Patches[index].BoundingBox.addInternalPoint( RenderBuffer.Vertices[xx * TerrainData.Size + zz].Pos );
 
 				// Reconfigure the bounding box of the terrain as a whole
-				TerrainData.BoundingBox.addInternalBox( TerrainData.Patches[index].BoundingBox );
+				TerrainData.BoundingBox.addInternalBox(TerrainData.Patches[index].BoundingBox);
 
 				// get center of Patch
 				TerrainData.Patches[index].Center = TerrainData.Patches[index].BoundingBox.getCenter();
 
 				// Assign Neighbours
 				// Top
-				if( x > 0 )
+				if (x > 0)
 					TerrainData.Patches[index].Top = &TerrainData.Patches[(x-1) * TerrainData.PatchCount + z];
 				else
 					TerrainData.Patches[index].Top = 0;
 
 				// Bottom
-				if( x < TerrainData.PatchCount - 1 )
+				if (x < TerrainData.PatchCount - 1)
 					TerrainData.Patches[index].Bottom = &TerrainData.Patches[(x+1) * TerrainData.PatchCount + z];
 				else
 					TerrainData.Patches[index].Bottom = 0;
 
 				// Left
-				if( z > 0 )
+				if (z > 0)
 					TerrainData.Patches[index].Left = &TerrainData.Patches[x * TerrainData.PatchCount + z - 1];
 				else
 					TerrainData.Patches[index].Left = 0;
 
 				// Right
-				if( z < TerrainData.PatchCount - 1 )
+				if (z < TerrainData.PatchCount - 1)
 					TerrainData.Patches[index].Right = &TerrainData.Patches[x * TerrainData.PatchCount + z + 1];
 				else
 					TerrainData.Patches[index].Right = 0;
-
-				if ( TerrainData.Patches[index].DebugText )
-				{
-					TerrainData.Patches[index].DebugText->setPosition ( TerrainData.Patches[index].Center );
-				}
-				
 			}
 		}
 
@@ -1188,7 +1319,7 @@ namespace scene
 		TerrainData.Center = TerrainData.BoundingBox.getCenter();
 
 		// if the default rotation pivot is still being used, update it.
-		if( UseDefaultRotationPivot )
+		if (UseDefaultRotationPivot)
 		{
 			TerrainData.RotationPivot = TerrainData.Center;
 		}
@@ -1201,39 +1332,38 @@ namespace scene
 		// Only update the LODDistanceThreshold if it's not manually changed
 		if (!OverrideDistanceThreshold)
 		{
-			if( TerrainData.LODDistanceThreshold )
-			{
-				delete [] TerrainData.LODDistanceThreshold;
-			}
-
+			TerrainData.LODDistanceThreshold.set_used(0);
 			// Determine new distance threshold for determining what LOD to draw patches at
-			TerrainData.LODDistanceThreshold = new f64[TerrainData.MaxLOD];
+			TerrainData.LODDistanceThreshold.reallocate(TerrainData.MaxLOD);
 
+			const f64 size = TerrainData.PatchSize * TerrainData.PatchSize *
+					TerrainData.Scale.X * TerrainData.Scale.Z;
 			for (s32 i=0; i<TerrainData.MaxLOD; ++i)
 			{
-				TerrainData.LODDistanceThreshold[i] =
-					(TerrainData.PatchSize * TerrainData.PatchSize) *
-					(TerrainData.Scale.X * TerrainData.Scale.Z) *
-					((i+1+ i / 2) * (i+1+ i / 2));
+				TerrainData.LODDistanceThreshold.push_back(size * ((i+1+ i / 2) * (i+1+ i / 2)));
 			}
 		}
 	}
 
+
 	void CTerrainSceneNode::setCurrentLODOfPatches(s32 lod)
 	{
-		for (s32 i=0; i< TerrainData.PatchCount * TerrainData.PatchCount; ++i)
+		const s32 count = TerrainData.PatchCount * TerrainData.PatchCount;
+		for (s32 i=0; i< count; ++i)
 			TerrainData.Patches[i].CurrentLOD = lod;
 	}
 
-	void CTerrainSceneNode::setCurrentLODOfPatches(core::array<s32>& lodarray)
+
+	void CTerrainSceneNode::setCurrentLODOfPatches(const core::array<s32>& lodarray)
 	{
-		for (s32 i=0; i<TerrainData.PatchCount * TerrainData.PatchCount; ++i)
+		const s32 count = TerrainData.PatchCount * TerrainData.PatchCount;
+		for (s32 i=0; i<count; ++i)
 			TerrainData.Patches[i].CurrentLOD = lodarray[i];
 	}
 
 
 	//! Gets the height
-	f32 CTerrainSceneNode::getHeight( f32 x, f32 z ) const
+	f32 CTerrainSceneNode::getHeight(f32 x, f32 z) const
 	{
 		if (!Mesh.getMeshBufferCount())
 			return 0;
@@ -1241,28 +1371,29 @@ namespace scene
 		f32 height = -999999.9f;
 
 		core::matrix4 rotMatrix;
-		rotMatrix.setRotationDegrees( TerrainData.Rotation );
-		core::vector3df pos( x, 0.0f, z );
-		rotMatrix.rotateVect( pos );
+		rotMatrix.setRotationDegrees(TerrainData.Rotation);
+		core::vector3df pos(x, 0.0f, z);
+		rotMatrix.rotateVect(pos);
 		pos -= TerrainData.Position;
 		pos /= TerrainData.Scale;
 
-		s32 X(core::floor32( pos.X ));
-		s32 Z(core::floor32( pos.Z ));
+		s32 X(core::floor32(pos.X));
+		s32 Z(core::floor32(pos.Z));
 
-		if( X >= 0 && X < TerrainData.Size && Z >= 0 && Z <= TerrainData.Size )
+		if (X >= 0 && X < TerrainData.Size-1 &&
+				Z >= 0 && Z < TerrainData.Size-1)
 		{
-			const video::S3DVertex2TCoords* Vertices = (const video::S3DVertex2TCoords*)Mesh.getMeshBuffer( 0 )->getVertices();
-			const core::vector3df& a = Vertices[ X * TerrainData.Size + Z ].Pos;
-			const core::vector3df& b = Vertices[ (X + 1) * TerrainData.Size + Z ].Pos;
-			const core::vector3df& c = Vertices[ X * TerrainData.Size + ( Z + 1 ) ].Pos;
-			const core::vector3df& d = Vertices[ (X + 1) * TerrainData.Size + ( Z + 1 ) ].Pos;
+			const video::S3DVertex2TCoords* Vertices = (const video::S3DVertex2TCoords*)Mesh.getMeshBuffer(0)->getVertices();
+			const core::vector3df& a = Vertices[X * TerrainData.Size + Z].Pos;
+			const core::vector3df& b = Vertices[(X + 1) * TerrainData.Size + Z].Pos;
+			const core::vector3df& c = Vertices[X * TerrainData.Size + (Z + 1)].Pos;
+			const core::vector3df& d = Vertices[(X + 1) * TerrainData.Size + (Z + 1)].Pos;
 
 			// offset from integer position
 			const f32 dx = pos.X - X;
 			const f32 dz = pos.Z - Z;
 
-			if( dx > dz )
+			if (dx > dz)
 				height = a.Y + (d.Y - b.Y)*dz + (b.Y - a.Y)*dx;
 			else
 				height = a.Y + (d.Y - c.Y)*dx + (c.Y - a.Y)*dz;
@@ -1289,7 +1420,7 @@ namespace scene
 
 	//! Reads attributes of the scene node.
 	void CTerrainSceneNode::deserializeAttributes(io::IAttributes* in,
-													io::SAttributeReadWriteOptions* options)
+			io::SAttributeReadWriteOptions* options)
 	{
 		core::stringc newHeightmap = in->getAttributeAsString("Heightmap");
 		f32 tcoordScale1 = in->getAttributeAsFloat("TextureScale1");
@@ -1297,15 +1428,14 @@ namespace scene
 
 		// set possible new heightmap
 
-		if (newHeightmap.size() > 0 && 
-			newHeightmap != HeightmapFile)
+		if (newHeightmap.size() != 0 && newHeightmap != HeightmapFile)
 		{
 			io::IReadFile* file = FileSystem->createAndOpenFile(newHeightmap.c_str());
 			if (file)
 			{
 				loadHeightMap(file, video::SColor(255,255,255,255), 0);
 				file->drop();
-			}	
+			}
 			else
 				os::Printer::log("could not open heightmap", newHeightmap.c_str());
 		}
@@ -1337,11 +1467,11 @@ namespace scene
 			newManager = SceneManager;
 
 		CTerrainSceneNode* nb = new CTerrainSceneNode(
-			newParent, newManager, FileSystem, ID, 
+			newParent, newManager, FileSystem, ID,
 			4, ETPS_17, getPosition(), getRotation(), getScale());
 
 		nb->cloneMembers(this, newManager);
-		
+
 		// instead of cloning the data structures, recreate the terrain.
 		// (temporary solution)
 
@@ -1352,7 +1482,7 @@ namespace scene
 		{
 			nb->loadHeightMap(file, video::SColor(255,255,255,255), 0);
 			file->drop();
-		}	
+		}
 
 		// scale textures
 
@@ -1366,12 +1496,12 @@ namespace scene
 				nb->Mesh.getMeshBuffer(m) &&
 				Mesh.getMeshBuffer(m))
 			{
-				nb->Mesh.getMeshBuffer(m)->getMaterial() = 
+				nb->Mesh.getMeshBuffer(m)->getMaterial() =
 					Mesh.getMeshBuffer(m)->getMaterial();
 			}
 		}
 
-		nb->RenderBuffer.Material = RenderBuffer.Material;
+		nb->RenderBuffer->Material = RenderBuffer->Material;
 
 		// finish
 
@@ -1382,3 +1512,4 @@ namespace scene
 } // end namespace scene
 } // end namespace irr
 
+
diff --git a/src/dep/src/irrlicht/CTerrainSceneNode.h b/src/dep/src/irrlicht/CTerrainSceneNode.h
index 7fbb552..d0677f6 100644
--- a/src/dep/src/irrlicht/CTerrainSceneNode.h
+++ b/src/dep/src/irrlicht/CTerrainSceneNode.h
@@ -1,32 +1,30 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 // The code for the TerrainSceneNode is based on the GeoMipMapSceneNode
-// developed by Spintz. He made it available for Irrlicht and allowed it to be 
-// distributed under this licence. I only modified some parts. A lot of thanks go to him. 
+// developed by Spintz. He made it available for Irrlicht and allowed it to be
+// distributed under this licence. I only modified some parts. A lot of thanks go to him.
 
 #ifndef __C_TERRAIN_SCENE_NODE_H__
 #define __C_TERRAIN_SCENE_NODE_H__
 
 #include "ITerrainSceneNode.h"
 #include "SMesh.h"
-#include "IReadFile.h"
-#include "ITextSceneNode.h"
+#include "CDynamicMeshBuffer.h"
 
 namespace irr
 {
 namespace io
 {
 	class IFileSystem;
+	class IReadFile;
 }
 namespace scene
 {
+	class ITextSceneNode;
+
 	//! A scene node for displaying terrain using the geo mip map algorithm.
-	/** The code for the TerrainSceneNode is based on the GeoMipMapSceneNode
-	 * developed by Spintz. He made it available for Irrlicht and allowed it to be 
-	 * distributed under this licence. I only modified some parts. A lot of thanks go to him. 
-	 **/
 	class CTerrainSceneNode : public ITerrainSceneNode
 	{
 	public:
@@ -43,7 +41,7 @@ namespace scene
 		//! \param scale: The scale factor for the terrain.  If you're using a heightmap of size 128x128 and would like
 		//! your terrain to be 12800x12800 in game units, then use a scale factor of ( core::vector ( 100.0f, 100.0f, 100.0f ).
 		//! If you use a Y scaling factor of 0.0f, then your terrain will be flat.
-		CTerrainSceneNode(ISceneNode* parent, ISceneManager* mgr, io::IFileSystem* fs, s32 id, 
+		CTerrainSceneNode(ISceneNode* parent, ISceneManager* mgr, io::IFileSystem* fs, s32 id,
 			s32 maxLOD = 4, E_TERRAIN_PATCH_SIZE patchSize = ETPS_17,
 			const core::vector3df& position = core::vector3df(0.0f, 0.0f, 0.0f),
 			const core::vector3df& rotation = core::vector3df(0.0f, 0.0f, 0.0f),
@@ -52,19 +50,19 @@ namespace scene
 		virtual ~CTerrainSceneNode();
 
 		//! Initializes the terrain data.  Loads the vertices from the heightMapFile.
-		virtual bool loadHeightMap(io::IReadFile* file, 
+		virtual bool loadHeightMap(io::IReadFile* file,
 			video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 );
 
 		//! Initializes the terrain data.  Loads the vertices from the heightMapFile.
 		virtual bool loadHeightMapRAW(io::IReadFile* file, s32 bitsPerPixel = 16,
-			video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 );
+			bool signedData=true, bool floatVals=false, s32 width=0, video::SColor vertexColor = video::SColor ( 255, 255, 255, 255 ), s32 smoothFactor = 0 );
 
 		//! Returns the material based on the zero based index i. This scene node only uses
 		//! 1 material.
 		//! \param i: Zero based index i. UNUSED, left in for virtual purposes.
 		//! \return Returns the single material this scene node uses.
-		virtual video::SMaterial& getMaterial ( u32 i ) 
-		{ 
+		virtual video::SMaterial& getMaterial ( u32 i )
+		{
 			return Mesh.getMeshBuffer(i)->getMaterial();
 		}
 
@@ -72,19 +70,19 @@ namespace scene
 		//! \return Returns current count of materials used by this scene node ( always 1 )
 		virtual u32 getMaterialCount() const
 		{
-			return Mesh.getMeshBufferCount(); 
+			return Mesh.getMeshBufferCount();
 		}
 
-		//! Gets the last scaling factor applied to the scene node.  This value only represents the 
-		//! last scaling factor presented to the node.  For instance, if you make create the node 
-		//! with a scale factor of ( 1.0f, 1.0f, 1.0f ) then call setScale ( 50.0f, 5.0f, 50.0f ), 
-		//! then make another call to setScale with the values ( 2.0f, 2.0f, 2.0f ), this will return 
+		//! Gets the last scaling factor applied to the scene node.  This value only represents the
+		//! last scaling factor presented to the node.  For instance, if you make create the node
+		//! with a scale factor of ( 1.0f, 1.0f, 1.0f ) then call setScale ( 50.0f, 5.0f, 50.0f ),
+		//! then make another call to setScale with the values ( 2.0f, 2.0f, 2.0f ), this will return
 		//! core::vector3df ( 2.0f, 2.0f, 2.0f ), although the total scaling of the scene node is
 		//! core::vector3df ( 100.0f, 10.0f, 100.0f ).
 		//! \return Returns the last scaling factor passed to the scene node.
-		virtual core::vector3df getScale() const
+		virtual const core::vector3df& getScale() const
 		{
-			return TerrainData.Scale; 
+			return TerrainData.Scale;
 		}
 
 		//! Scales the scene nodes vertices by the vector specified.
@@ -93,7 +91,7 @@ namespace scene
 
 		//! Gets the last rotation factor applied to the scene node.
 		//! \return Returns the last rotation factor applied to the scene node.
-		virtual const core::vector3df& getRotation() const 
+		virtual const core::vector3df& getRotation() const
 		{
 			return TerrainData.Rotation;
 		}
@@ -102,14 +100,13 @@ namespace scene
 		//! \param rotation: New rotation of the node in degrees.
 		virtual void setRotation(const core::vector3df& rotation);
 
-		//! Sets the pivot point for rotation of this node.  This is useful for the TiledTerrainManager to
-		//! rotate all terrain tiles around a global world point.
+		//! Sets the pivot point for rotation of this node.
 		//! NOTE: The default for the RotationPivot will be the center of the individual tile.
 		virtual void setRotationPivot( const core::vector3df& pivot );
 
-		//! Gets the last positioning vector applied to the scene node. 
+		//! Gets the last positioning vector applied to the scene node.
 		//! \return Returns the last position vector applied to the scene node.
-		virtual const core::vector3df getPosition() const
+		virtual const core::vector3df& getPosition() const
 		{
 			return TerrainData.Position;
 		}
@@ -119,7 +116,7 @@ namespace scene
 		virtual void setPosition(const core::vector3df& newpos);
 
 		//! Updates the scene nodes indices if the camera has moved or rotated by a certain
-		//! threshold, which can be changed using the SetCameraMovementDeltaThreshold and 
+		//! threshold, which can be changed using the SetCameraMovementDeltaThreshold and
 		//! SetCameraRotationDeltaThreshold functions.  This also determines if a given patch
 		//! for the scene node is within the view frustum and if it's not the indices are not
 		//! generated for that patch.
@@ -140,21 +137,24 @@ namespace scene
 		//! Returns the mesh
 		virtual IMesh* getMesh() { return &Mesh; }
 
-		//! Gets the meshbuffer data based on a specified Level of Detail.
-		//! \param mb: A reference to an SMeshBufferLightMap object
-		//! \param LOD: The Level Of Detail you want the indices from.
-		virtual void getMeshBufferForLOD(SMeshBufferLightMap& mb, s32 LOD ) const;
+		//! Returns a pointer to the buffer used by the terrain (most users will not need this)
+		virtual IMeshBuffer* getRenderBuffer() { return RenderBuffer; }
 
-		//! Gets the indices for a specified patch at a specified Level of Detail.  
+		//! Gets the meshbuffer data based on a specified Level of Detail.
+		//! \param mb: A reference to an IDynamicMeshBuffer object
+		//! \param LOD: The Level Of Detail you want the indices from.
+		virtual void getMeshBufferForLOD(IDynamicMeshBuffer& mb, s32 LOD=0) const;
+
+		//! Gets the indices for a specified patch at a specified Level of Detail.
 		//! \param indices: A reference to an array of u32 indices.
 		//! \param patchX: Patch x coordinate.
 		//! \param patchZ: Patch z coordinate.
-		//! \param LOD: The level of detail to get for that patch.  If -1, then get 
+		//! \param LOD: The level of detail to get for that patch.  If -1, then get
 		//! the CurrentLOD.  If the CurrentLOD is set to -1, meaning it's not shown,
-		//! then it will retrieve the triangles at the highest LOD ( 0 ).
-		//! \return: Number if indices put into the buffer.
+		//! then it will retrieve the triangles at the highest LOD (0).
+		//! \return: Number of indices put into the buffer.
 		virtual s32 getIndicesForPatch(core::array<u32>& indices,
-			s32 patchX, s32 patchZ, s32 LOD = 0 );
+			s32 patchX, s32 patchZ, s32 LOD=0);
 
 		//! Populates an array with the CurrentLOD of each patch.
 		//! \param LODs: A reference to a core::array<s32> to hold the values
@@ -165,7 +165,7 @@ namespace scene
 		//! \param patchX: Patch x coordinate.
 		//! \param patchZ: Patch z coordinate.
 		//! \param LOD: The level of detail to set the patch to.
-		virtual void setLODOfPatch( s32 patchX, s32 patchZ, s32 LOD );
+		virtual void setLODOfPatch(s32 patchX, s32 patchZ, s32 LOD=0);
 
 		//! Returns center of terrain.
 		virtual const core::vector3df& getTerrainCenter() const
@@ -178,7 +178,7 @@ namespace scene
 
 		//! Sets the movement camera threshold which is used to determine when to recalculate
 		//! indices for the scene node.  The default value is 10.0f.
-		virtual void setCameraMovementDelta(f32 delta) 
+		virtual void setCameraMovementDelta(f32 delta)
 		{
 			CameraMovementDelta = delta;
 		}
@@ -190,16 +190,15 @@ namespace scene
 			CameraRotationDelta = delta;
 		}
 
-		//! Sets whether or not the node should dynamically update it's associated selector when
+		//! Sets whether or not the node should dynamically update it its associated selector when
 		//! the geomipmap data changes.
 		//! param bVal: Boolean value representing whether or not to update selector dynamically.
 		//! NOTE: Temporarily disabled while working out issues with DynamicSelectorUpdate
 		virtual void setDynamicSelectorUpdate(bool bVal ) { DynamicSelectorUpdate = false; }
-		//virtual void setDynamicSelectorUpdate ( bool bVal ) { DynamicSelectorUpdate = bVal; }
 
 		//! Override the default generation of distance thresholds for determining the LOD a patch
-		//! is rendered at.  If any LOD is overridden, then the scene node will no longer apply
-		//! scaling factors to these values.  If you override these distances, and then apply
+		//! is rendered at. If any LOD is overridden, then the scene node will no longer apply
+		//! scaling factors to these values. If you override these distances and then apply
 		//! a scale to the scene node, it is your responsibility to update the new distances to
 		//! work best with your new terrain size.
 		virtual bool overrideLODDistance( s32 LOD, f64 newDistance );
@@ -225,20 +224,17 @@ namespace scene
 	private:
 
 		friend class CTerrainTriangleSelector;
-		friend class CTiledTerrainSceneNodeManager;
 
 		struct SPatch
 		{
 			SPatch()
-			: CurrentLOD(-1), DebugText(0),
-			Top(0), Bottom(0), Right(0), Left(0)
+			: CurrentLOD(-1), Top(0), Bottom(0), Right(0), Left(0)
 			{
 			}
 
 			s32			CurrentLOD;
 			core::aabbox3df		BoundingBox;
 			core::vector3df		Center;
-			scene::ITextSceneNode*	DebugText;
 			SPatch*			Top;
 			SPatch*			Bottom;
 			SPatch*			Right;
@@ -251,7 +247,7 @@ namespace scene
 			: Size(0), PatchSize(0), CalcPatchSize(0),
 				PatchCount(0), MaxLOD(0),
 				BoundingBox(core::aabbox3df( 99999.9f, 99999.9f, 99999.9f, -99999.9f, -99999.9f, -99999.9f)),
-				LODDistanceThreshold(0), Patches(0)
+				Patches(0)
 			{
 			}
 
@@ -260,7 +256,7 @@ namespace scene
 				PatchSize(patchSize), CalcPatchSize(patchSize-1),
 				PatchCount(0), MaxLOD(maxLOD),
 				BoundingBox(core::aabbox3df( 99999.9f, 99999.9f, 99999.9f, -99999.9f, -99999.9f, -99999.9f)),
-				LODDistanceThreshold(0), Patches(0)
+				Patches(0)
 			{
 			}
 
@@ -275,19 +271,24 @@ namespace scene
 			s32		PatchCount;
 			s32		MaxLOD;
 			core::aabbox3df	BoundingBox;
-			f64*		LODDistanceThreshold;
+			core::array<f64> LODDistanceThreshold;
 			SPatch*		Patches;
 		};
 
 		virtual void preRenderLODCalculations();
-		virtual void preRenderLODCalculations_old();
 		virtual void preRenderIndicesCalculations();
 
-		//! get indices when generating index data for patches at varying levels of detail.
-		u32 getIndex(const s32& PatchX, const s32& PatchZ, const s32& PatchIndex, u32 vX, u32 vZ) const;
+		template<class INDEX_TYPE>
+		void preRenderIndicesCalculationsDirect(INDEX_TYPE* IndexBuffer);
 
-		//! calculate smooth normals 
-		void calculateNormals(SMeshBufferLightMap* pMeshBuffer );
+		//! get indices when generating index data for patches at varying levels of detail.
+		u32 getIndex(const s32 PatchX, const s32 PatchZ, const s32 PatchIndex, u32 vX, u32 vZ) const;
+
+		//! smooth the terrain
+		void smoothTerrain(CDynamicMeshBuffer* mb, s32 smoothFactor);
+
+		//! calculate smooth normals
+		void calculateNormals(CDynamicMeshBuffer* mb);
 
 		//! create patches, stuff that needs to only be done once for patches goes here.
 		void createPatches();
@@ -302,14 +303,16 @@ namespace scene
 		void setCurrentLODOfPatches(s32 i);
 
 		//! sets the CurrentLOD of TerrainData patches to the LODs specified in the array
-		void setCurrentLODOfPatches(core::array<s32>& lodarray);
+		void setCurrentLODOfPatches(const core::array<s32>& lodarray);
 
 		//! Apply transformation changes( scale, position, rotation )
 		void applyTransformation();
 
 		STerrainData TerrainData;
 		SMesh Mesh;
-		SMeshBufferLightMap RenderBuffer;
+
+		CDynamicMeshBuffer *RenderBuffer;
+
 		u32 VerticesToRender;
 		u32 IndicesToRender;
 
@@ -320,8 +323,11 @@ namespace scene
 
 		core::vector3df	OldCameraPosition;
 		core::vector3df	OldCameraRotation;
+		core::vector3df	OldCameraUp;
+		f32				OldCameraFOV;
 		f32 CameraMovementDelta;
 		f32 CameraRotationDelta;
+		f32 CameraFOVDelta;
 
 		// needed for (de)serialization
 		f32 TCoordScale1;
@@ -336,3 +342,4 @@ namespace scene
 
 #endif // __C_TERRAIN_SCENE_NODE_H__
 
+
diff --git a/src/dep/src/irrlicht/CTerrainTriangleSelector.cpp b/src/dep/src/irrlicht/CTerrainTriangleSelector.cpp
index f2c3582..61a60cc 100644
--- a/src/dep/src/irrlicht/CTerrainTriangleSelector.cpp
+++ b/src/dep/src/irrlicht/CTerrainTriangleSelector.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,47 +14,49 @@ namespace scene
 
 //! constructor
 CTerrainTriangleSelector::CTerrainTriangleSelector ( ITerrainSceneNode* node, s32 LOD )
-: SceneNode ( node )
+	: SceneNode(node)
 {
 	#ifdef _DEBUG
 	setDebugName ("CTerrainTriangleSelector");
 	#endif
 
-	setTriangleData ( node, LOD );
+	setTriangleData(node, LOD);
 }
 
+
 //! destructor
 CTerrainTriangleSelector::~CTerrainTriangleSelector()
 {
-	TrianglePatches.TrianglePatchArray.clear ( );
+	TrianglePatches.TrianglePatchArray.clear();
 }
 
+
 //! Clears and sets triangle data
 void CTerrainTriangleSelector::setTriangleData(ITerrainSceneNode* node, s32 LOD)
 {
 	core::triangle3df tri;
 	core::array<u32> indices;
-	CTerrainSceneNode* terrainNode = (CTerrainSceneNode*)node;
 
 	// Get pointer to the GeoMipMaps vertices
-	video::S3DVertex2TCoords* vertices = (video::S3DVertex2TCoords*)terrainNode->RenderBuffer.getVertices();
+	video::S3DVertex2TCoords* vertices = static_cast<video::S3DVertex2TCoords*>(node->getRenderBuffer()->getVertices());
 
 	// Clear current data
+	const s32 count = (static_cast<CTerrainSceneNode*>(node))->TerrainData.PatchCount;
 	TrianglePatches.TotalTriangles = 0;
-	TrianglePatches.NumPatches = terrainNode->TerrainData.PatchCount * terrainNode->TerrainData.PatchCount;
+	TrianglePatches.NumPatches = count*count;
 
 	TrianglePatches.TrianglePatchArray.reallocate(TrianglePatches.NumPatches);
-	for (int o=0; o<TrianglePatches.NumPatches; ++o)
+	for (s32 o=0; o<TrianglePatches.NumPatches; ++o)
 		TrianglePatches.TrianglePatchArray.push_back(SGeoMipMapTrianglePatch());
 
-	for(s32 x = 0; x < terrainNode->TerrainData.PatchCount; ++x )
+	s32 tIndex = 0;
+	for(s32 x = 0; x < count; ++x )
 	{
-		for(s32 z = 0; z < terrainNode->TerrainData.PatchCount; ++z )
+		for(s32 z = 0; z < count; ++z )
 		{
-			s32 tIndex = x * terrainNode->TerrainData.PatchCount + z;
 			TrianglePatches.TrianglePatchArray[tIndex].NumTriangles = 0;
-			TrianglePatches.TrianglePatchArray[tIndex].Box = terrainNode->getBoundingBox( x, z );
-			u32 indexCount = terrainNode->getIndicesForPatch( indices, x, z, LOD );
+			TrianglePatches.TrianglePatchArray[tIndex].Box = node->getBoundingBox( x, z );
+			u32 indexCount = node->getIndicesForPatch( indices, x, z, LOD );
 
 			TrianglePatches.TrianglePatchArray[tIndex].Triangles.reallocate(indexCount/3);
 			for(u32 i = 0; i < indexCount; i += 3 )
@@ -67,6 +69,7 @@ void CTerrainTriangleSelector::setTriangleData(ITerrainSceneNode* node, s32 LOD)
 			}
 
 			TrianglePatches.TotalTriangles += TrianglePatches.TrianglePatchArray[tIndex].NumTriangles;
+			++tIndex;
 		}
 	}
 }
@@ -105,6 +108,7 @@ void CTerrainTriangleSelector::getTriangles ( core::triangle3df* triangles, s32
 	outTriangleCount = tIndex;
 }
 
+
 //! Gets all triangles which lie within a specific bounding box.
 void CTerrainTriangleSelector::getTriangles ( core::triangle3df* triangles, s32 arraySize,
 	s32& outTriangleCount, const core::aabbox3d<f32>& box,
@@ -146,10 +150,7 @@ void CTerrainTriangleSelector::getTriangles(core::triangle3df* triangles, s32 ar
 	s32& outTriangleCount, const core::line3d<f32>& line,
 	const core::matrix4* transform) const
 {
-	s32 count = TrianglePatches.TotalTriangles;
-
-	if (count > arraySize)
-		count = arraySize;
+	const s32 count = core::min_((s32)TrianglePatches.TotalTriangles, arraySize);
 
 	core::matrix4 mat;
 
diff --git a/src/dep/src/irrlicht/CTerrainTriangleSelector.h b/src/dep/src/irrlicht/CTerrainTriangleSelector.h
index d50ba66..9ebf6b1 100644
--- a/src/dep/src/irrlicht/CTerrainTriangleSelector.h
+++ b/src/dep/src/irrlicht/CTerrainTriangleSelector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -10,7 +10,6 @@
 #define __C_TERRAIN_TRIANGLE_SELECTOR_H__
 
 #include "ITriangleSelector.h"
-#include "IMesh.h"
 #include "irrArray.h"
 
 namespace irr
@@ -29,29 +28,29 @@ class CTerrainTriangleSelector : public ITriangleSelector
 public:
 
 	//! Constructs a selector based on an IGeoMipMapSceneNode
-	CTerrainTriangleSelector(ITerrainSceneNode* node, s32 LOD );
+	CTerrainTriangleSelector(ITerrainSceneNode* node, s32 LOD);
 
 	//! Destructor
-	~CTerrainTriangleSelector();
+	virtual ~CTerrainTriangleSelector();
 
 	//! Clears and sets triangle data
-	virtual void setTriangleData ( ITerrainSceneNode* node, s32 LOD );
+	virtual void setTriangleData (ITerrainSceneNode* node, s32 LOD);
 
 	//! Gets all triangles.
-	void getTriangles ( core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, 
-		const core::matrix4* transform = 0 ) const;
+	void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
+		const core::matrix4* transform=0) const;
 
 	//! Gets all triangles which lie within a specific bounding box.
-	void getTriangles ( core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
-		const core::aabbox3d<f32>& box, const core::matrix4* transform = 0 ) const;
+	void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount,
+		const core::aabbox3d<f32>& box, const core::matrix4* transform=0) const;
 
 	//! Gets all triangles which have or may have contact with a 3d line.
-	virtual void getTriangles ( core::triangle3df* triangles, s32 arraySize,
-        s32& outTriangleCount, const core::line3d<f32>& line, 
-		const core::matrix4* transform = 0 ) const;
+	virtual void getTriangles(core::triangle3df* triangles, s32 arraySize,
+		s32& outTriangleCount, const core::line3d<f32>& line, 
+		const core::matrix4* transform=0) const;
 
 	//! Returns amount of all available triangles in this selector
-	virtual s32 getTriangleCount ( ) const;
+	virtual s32 getTriangleCount() const;
 
 private:
 
@@ -66,10 +65,9 @@ private:
 
 	struct SGeoMipMapTrianglePatches
 	{
-		SGeoMipMapTrianglePatches ( )
+		SGeoMipMapTrianglePatches() :
+			NumPatches(0), TotalTriangles(0)
 		{
-			TotalTriangles = 0;
-			NumPatches = 0;
 		}
 
 		core::array<SGeoMipMapTrianglePatch>	TrianglePatchArray;
diff --git a/src/dep/src/irrlicht/CTextSceneNode.cpp b/src/dep/src/irrlicht/CTextSceneNode.cpp
index 8c58d9a..143810a 100644
--- a/src/dep/src/irrlicht/CTextSceneNode.cpp
+++ b/src/dep/src/irrlicht/CTextSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -46,10 +46,9 @@ CTextSceneNode::~CTextSceneNode()
 void CTextSceneNode::OnRegisterSceneNode()
 {
 	if (IsVisible)
-	{
 		SceneManager->registerNodeForRendering(this, ESNRP_TRANSPARENT);
-		ISceneNode::OnRegisterSceneNode();
-	}
+
+	ISceneNode::OnRegisterSceneNode();
 }
 
 //! renders the node.
@@ -93,19 +92,19 @@ void CTextSceneNode::setTextColor(video::SColor color)
 CBillboardTextSceneNode::CBillboardTextSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,	
 	gui::IGUIFont* font,const wchar_t* text,
 	const core::vector3df& position, const core::dimension2d<f32>& size,
-	video::SColor shade_top,video::SColor shade_bottom )
-: ITextSceneNode(parent, mgr, id, position),
-	Font(0), Shade_top(shade_top), Shade_bottom(shade_bottom), Mesh(0)
+	video::SColor colorTop,video::SColor shade_bottom )
+: IBillboardTextSceneNode(parent, mgr, id, position),
+	Font(0), ColorTop(colorTop), ColorBottom(shade_bottom), Mesh(0)
 {
 	#ifdef _DEBUG
 	setDebugName("CBillboardTextSceneNode");
 	#endif
 
-	Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-	Material.MaterialTypeParam = 0.5f;
+	Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+	Material.MaterialTypeParam = 1.f / 255.f;
 	Material.BackfaceCulling = false;
 	Material.Lighting = false;
-	Material.ZBuffer = false;
+	Material.ZBuffer = true;
 	Material.ZWriteEnable = false;
 
 	if (font)
@@ -206,17 +205,17 @@ void CBillboardTextSceneNode::setText(const wchar_t* text)
 		buf->Vertices[firstVert+2].TCoords.set(tex[3], tex[2]);
 		buf->Vertices[firstVert+3].TCoords.set(tex[3], tex[1]);
 
-		buf->Vertices[firstVert+0].Color = Shade_bottom;
-		buf->Vertices[firstVert+3].Color = Shade_bottom;
-		buf->Vertices[firstVert+1].Color = Shade_top;
-		buf->Vertices[firstVert+2].Color = Shade_top;
+		buf->Vertices[firstVert+0].Color = ColorBottom;
+		buf->Vertices[firstVert+3].Color = ColorBottom;
+		buf->Vertices[firstVert+1].Color = ColorTop;
+		buf->Vertices[firstVert+2].Color = ColorTop;
 
-		buf->Indices[firstInd+0] = firstVert+0;
-		buf->Indices[firstInd+1] = firstVert+2;
-		buf->Indices[firstInd+2] = firstVert+1;
-		buf->Indices[firstInd+3] = firstVert+0;
-		buf->Indices[firstInd+4] = firstVert+3;
-		buf->Indices[firstInd+5] = firstVert+2;
+		buf->Indices[firstInd+0] = (u16)firstVert+0;
+		buf->Indices[firstInd+1] = (u16)firstVert+2;
+		buf->Indices[firstInd+2] = (u16)firstVert+1;
+		buf->Indices[firstInd+3] = (u16)firstVert+0;
+		buf->Indices[firstInd+4] = (u16)firstVert+3;
+		buf->Indices[firstInd+5] = (u16)firstVert+2;
 
 		wchar_t *tp = 0;
 		if (i>0) 
@@ -229,7 +228,6 @@ void CBillboardTextSceneNode::setText(const wchar_t* text)
 		info.firstVert = firstVert;
 
 		Symbol.push_back(info);
-
 	}
 }
 
@@ -312,13 +310,12 @@ void CBillboardTextSceneNode::OnRegisterSceneNode()
 	// make bounding box
 
 	for (i=0; i< Mesh->getMeshBufferCount() ; ++i)
-		((SMeshBuffer*)Mesh->getMeshBuffer(i))->recalculateBoundingBox();
+		Mesh->getMeshBuffer(i)->recalculateBoundingBox();
 	Mesh->recalculateBoundingBox();
 
 	BBox = Mesh->getBoundingBox();
-	core::matrix4 mat = getAbsoluteTransformation();
-	mat.makeInverse();
-	mat.transformBox(BBox);
+	core::matrix4 mat( getAbsoluteTransformation(), core::matrix4::EM4CONST_INVERSE );
+	mat.transformBoxEx(BBox);
 
 	SceneManager->registerNodeForRendering(this, ESNRP_TRANSPARENT);
 	ISceneNode::OnRegisterSceneNode();
@@ -334,10 +331,7 @@ void CBillboardTextSceneNode::render()
 	core::matrix4 mat;
 	driver->setTransform(video::ETS_WORLD, mat);
 
-	
-
-	u32 i;
-	for ( i = 0; i < Mesh->getMeshBufferCount(); ++i )
+	for (u32 i = 0; i < Mesh->getMeshBufferCount(); ++i)
 	{
 		driver->setMaterial(Mesh->getMeshBuffer(i)->getMaterial());
 		driver->drawMeshBuffer(Mesh->getMeshBuffer(i));
@@ -351,9 +345,9 @@ void CBillboardTextSceneNode::render()
 		driver->setMaterial(m);
 		driver->draw3DBox(BBox, video::SColor(0,208,195,152));
 	}
-
 }
 
+
 //! returns the axis aligned bounding box of this node
 const core::aabbox3d<f32>& CBillboardTextSceneNode::getBoundingBox() const
 {
@@ -398,20 +392,62 @@ u32 CBillboardTextSceneNode::getMaterialCount() const
 
 
 //! gets the size of the billboard
-const core::dimension2d<f32>& CBillboardTextSceneNode::getSize()
+const core::dimension2d<f32>& CBillboardTextSceneNode::getSize() const
 {
 	return Size;
 }
 
 
-
-
 //! sets the color of the text
 void CBillboardTextSceneNode::setTextColor(video::SColor color)
 {
 	Color = color;
 }
 
+//! Set the color of all vertices of the billboard
+//! \param overallColor: the color to set
+void CBillboardTextSceneNode::setColor(const video::SColor & overallColor)
+{
+	for ( u32 i = 0; i != Text.size (); ++i )
+	{
+		const SSymbolInfo &info = Symbol[i];
+		SMeshBuffer* buf = (SMeshBuffer*)Mesh->getMeshBuffer(info.bufNo);
+		buf->Vertices[info.firstVert+0].Color = overallColor;
+		buf->Vertices[info.firstVert+1].Color = overallColor;
+		buf->Vertices[info.firstVert+2].Color = overallColor;
+		buf->Vertices[info.firstVert+3].Color = overallColor;
+	}
+}
+
+
+//! Set the color of the top and bottom vertices of the billboard
+//! \param topColor: the color to set the top vertices
+//! \param bottomColor: the color to set the bottom vertices
+void CBillboardTextSceneNode::setColor(const video::SColor & topColor, const video::SColor & bottomColor)
+{
+	ColorBottom = bottomColor;
+	ColorTop = topColor;
+	for ( u32 i = 0; i != Text.size (); ++i )
+	{
+		const SSymbolInfo &info = Symbol[i];
+		SMeshBuffer* buf = (SMeshBuffer*)Mesh->getMeshBuffer(info.bufNo);
+		buf->Vertices[info.firstVert+0].Color = ColorBottom;
+		buf->Vertices[info.firstVert+3].Color = ColorBottom;
+		buf->Vertices[info.firstVert+1].Color = ColorTop;
+		buf->Vertices[info.firstVert+2].Color = ColorTop;
+	}
+}
+
+
+//! Gets the color of the top and bottom vertices of the billboard
+//! \param topColor: stores the color of the top vertices
+//! \param bottomColor: stores the color of the bottom vertices
+void CBillboardTextSceneNode::getColor(video::SColor & topColor, video::SColor & bottomColor) const
+{
+	topColor = ColorTop;
+	bottomColor = ColorBottom;
+}
+
 
 } // end namespace scene
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/CTextSceneNode.h b/src/dep/src/irrlicht/CTextSceneNode.h
index 81edb42..8588dc7 100644
--- a/src/dep/src/irrlicht/CTextSceneNode.h
+++ b/src/dep/src/irrlicht/CTextSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,6 +6,7 @@
 #define __C_TEXT_SCENE_NODE_H_INCLUDED__
 
 #include "ITextSceneNode.h"
+#include "IBillboardTextSceneNode.h"
 #include "IGUIFont.h"
 #include "IGUIFontBitmap.h"
 #include "ISceneCollisionManager.h"
@@ -56,14 +57,14 @@ namespace scene
 		core::aabbox3d<f32> Box;
 	};
 
-	class CBillboardTextSceneNode : public ITextSceneNode
+	class CBillboardTextSceneNode : public IBillboardTextSceneNode
 	{
 	public:
 
 		CBillboardTextSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,	
 			gui::IGUIFont* font,const wchar_t* text,
 			const core::vector3df& position, const core::dimension2d<f32>& size,
-			video::SColor shade_top, video::SColor shade_bottom);
+			video::SColor colorTop, video::SColor shade_bottom);
 
 		//! destructor
 		virtual ~CBillboardTextSceneNode();
@@ -86,7 +87,7 @@ namespace scene
 		virtual void setSize(const core::dimension2d<f32>& size);
 
 		//! gets the size of the billboard
-		virtual const core::dimension2d<f32>& getSize();
+		virtual const core::dimension2d<f32>& getSize() const;
 
 		virtual video::SMaterial& getMaterial(u32 i);
 		
@@ -96,6 +97,20 @@ namespace scene
 		//! Returns type of the scene node
 		virtual ESCENE_NODE_TYPE getType() const { return ESNT_TEXT; }
 
+		//! Set the color of all vertices of the billboard
+		//! \param overallColor: the color to set
+		virtual void setColor(const video::SColor & overallColor);
+
+		//! Set the color of the top and bottom vertices of the billboard
+		//! \param topColor: the color to set the top vertices
+		//! \param bottomColor: the color to set the bottom vertices
+		virtual void setColor(const video::SColor & topColor, const video::SColor & bottomColor);
+
+		//! Gets the color of the top and bottom vertices of the billboard
+		//! \param topColor: stores the color of the top vertices
+		//! \param bottomColor: stores the color of the bottom vertices
+		virtual void getColor(video::SColor & topColor, video::SColor & bottomColor) const;
+
 	private:
 
 		core::stringw Text;
@@ -106,8 +121,8 @@ namespace scene
 		core::aabbox3d<f32> BBox;
 		video::SMaterial Material;
 
-		video::SColor Shade_top;
-		video::SColor Shade_bottom;
+		video::SColor ColorTop;
+		video::SColor ColorBottom;
 		struct SSymbolInfo
 		{
 			u32 bufNo;
diff --git a/src/dep/src/irrlicht/CTimer.h b/src/dep/src/irrlicht/CTimer.h
index f1326fb..3e4d4e7 100644
--- a/src/dep/src/irrlicht/CTimer.h
+++ b/src/dep/src/irrlicht/CTimer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CTriangleBBSelector.cpp b/src/dep/src/irrlicht/CTriangleBBSelector.cpp
index fdd142d..034e19d 100644
--- a/src/dep/src/irrlicht/CTriangleBBSelector.cpp
+++ b/src/dep/src/irrlicht/CTriangleBBSelector.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,7 +11,7 @@ namespace scene
 {
 
 //! constructor
-CTriangleBBSelector::CTriangleBBSelector(ISceneNode* node)
+CTriangleBBSelector::CTriangleBBSelector(const ISceneNode* node)
 : CTriangleSelector(node)
 {
 	#ifdef _DEBUG
@@ -32,7 +32,7 @@ void CTriangleBBSelector::getTriangles(core::triangle3df* triangles,
 		return;
 
 	// construct triangles
-	core::aabbox3d<f32> box = SceneNode->getBoundingBox();
+	const core::aabbox3d<f32>& box = SceneNode->getBoundingBox();
 	core::vector3df edges[8];
 	box.getEdges(edges);
 
diff --git a/src/dep/src/irrlicht/CTriangleBBSelector.h b/src/dep/src/irrlicht/CTriangleBBSelector.h
index b373aeb..db85286 100644
--- a/src/dep/src/irrlicht/CTriangleBBSelector.h
+++ b/src/dep/src/irrlicht/CTriangleBBSelector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -18,7 +18,7 @@ class CTriangleBBSelector : public CTriangleSelector
 public:
 
 	//! Constructs a selector based on a mesh
-	CTriangleBBSelector(ISceneNode* node);
+	CTriangleBBSelector(const ISceneNode* node);
 
 	//! Gets all triangles.
 	virtual void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, 
diff --git a/src/dep/src/irrlicht/CTriangleSelector.cpp b/src/dep/src/irrlicht/CTriangleSelector.cpp
index 89cb74e..e026793 100644
--- a/src/dep/src/irrlicht/CTriangleSelector.cpp
+++ b/src/dep/src/irrlicht/CTriangleSelector.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -12,7 +12,7 @@ namespace scene
 {
 
 //! constructor
-CTriangleSelector::CTriangleSelector(ISceneNode* node)
+CTriangleSelector::CTriangleSelector(const ISceneNode* node)
 : SceneNode(node)
 {
 	#ifdef _DEBUG
@@ -22,7 +22,7 @@ CTriangleSelector::CTriangleSelector(ISceneNode* node)
 
 
 //! constructor
-CTriangleSelector::CTriangleSelector(IMesh* mesh, ISceneNode* node)
+CTriangleSelector::CTriangleSelector(const IMesh* mesh, const ISceneNode* node)
 : SceneNode(node)
 {
 	#ifdef _DEBUG
@@ -30,59 +30,32 @@ CTriangleSelector::CTriangleSelector(IMesh* mesh, ISceneNode* node)
 	#endif
 
 	const u32 cnt = mesh->getMeshBufferCount();
+	u32 totalFaceCount = 0;
+	for (u32 j=0; j<cnt; ++j)
+		totalFaceCount += mesh->getMeshBuffer(j)->getIndexCount();
+	totalFaceCount /= 3;
+	Triangles.reallocate(totalFaceCount);
+
 	for (u32 i=0; i<cnt; ++i)
 	{
-		IMeshBuffer* buf = mesh->getMeshBuffer(i);
+		const IMeshBuffer* buf = mesh->getMeshBuffer(i);
 
-		s32 idxCnt = buf->getIndexCount();
+		const u32 idxCnt = buf->getIndexCount();
 		const u16* const indices = buf->getIndices();
-		core::triangle3df tri;
 
-		switch (buf->getVertexType())
+		for (u32 j=0; j<idxCnt; j+=3)
 		{
-		case video::EVT_STANDARD:
-			{
-				video::S3DVertex* vtx = (video::S3DVertex*)buf->getVertices();
-				for (s32 j=0; j<idxCnt; j+=3)
-				{
-					Triangles.push_back(core::triangle3df(
-							vtx[indices[j+0]].Pos,
-							vtx[indices[j+1]].Pos,
-							vtx[indices[j+2]].Pos));
-				}
-			}
-			break;
-		case video::EVT_2TCOORDS:
-			{
-				video::S3DVertex2TCoords* vtx = (video::S3DVertex2TCoords*)buf->getVertices();
-				for (s32 j=0; j<idxCnt; j+=3)
-				{
-					Triangles.push_back(core::triangle3df(
-							vtx[indices[j+0]].Pos,
-							vtx[indices[j+1]].Pos,
-							vtx[indices[j+2]].Pos));
-				}
-			}
-			break;
-		case video::EVT_TANGENTS:
-			{
-				video::S3DVertexTangents* vtx = (video::S3DVertexTangents*)buf->getVertices();
-				for (s32 j=0; j<idxCnt; j+=3)
-				{
-					Triangles.push_back(core::triangle3df(
-							vtx[indices[j+0]].Pos,
-							vtx[indices[j+1]].Pos,
-							vtx[indices[j+2]].Pos));
-				}
-			}
-			break;
+			Triangles.push_back(core::triangle3df(
+					buf->getPosition(indices[j+0]),
+					buf->getPosition(indices[j+1]),
+					buf->getPosition(indices[j+2])));
 		}
 	}
 }
 
 
 //! constructor
-CTriangleSelector::CTriangleSelector(core::aabbox3d<f32> box, ISceneNode* node)
+CTriangleSelector::CTriangleSelector(const core::aabbox3d<f32>& box, const ISceneNode* node)
 : SceneNode(node)
 {
 	#ifdef _DEBUG
diff --git a/src/dep/src/irrlicht/CTriangleSelector.h b/src/dep/src/irrlicht/CTriangleSelector.h
index 6143eef..ea48816 100644
--- a/src/dep/src/irrlicht/CTriangleSelector.h
+++ b/src/dep/src/irrlicht/CTriangleSelector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -22,13 +22,13 @@ class CTriangleSelector : public ITriangleSelector
 public:
 
 	//! Constructs a selector based on a mesh
-	CTriangleSelector(ISceneNode* node);
+	CTriangleSelector(const ISceneNode* node);
 
 	//! Constructs a selector based on a mesh
-	CTriangleSelector(IMesh* mesh, ISceneNode* node);
+	CTriangleSelector(const IMesh* mesh, const ISceneNode* node);
 
 	//! Constructs a selector based on a bounding box
-	CTriangleSelector(core::aabbox3d<f32> box, ISceneNode* node);
+	CTriangleSelector(const core::aabbox3d<f32>& box, const ISceneNode* node);
 
 	//! Gets all triangles.
 	void getTriangles(core::triangle3df* triangles, s32 arraySize, s32& outTriangleCount, 
@@ -48,7 +48,7 @@ public:
 
 protected:
 
-	ISceneNode* SceneNode;
+	const ISceneNode* SceneNode;
 	mutable core::array<core::triangle3df> Triangles;
 };
 
diff --git a/src/dep/src/irrlicht/CVideoModeList.cpp b/src/dep/src/irrlicht/CVideoModeList.cpp
index 5067a5a..492a71b 100644
--- a/src/dep/src/irrlicht/CVideoModeList.cpp
+++ b/src/dep/src/irrlicht/CVideoModeList.cpp
@@ -1,8 +1,9 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CVideoModeList.h"
+#include "irrMath.h"
 
 namespace irr
 {
@@ -12,18 +13,15 @@ namespace video
 //! constructor
 CVideoModeList::CVideoModeList()
 {
+	#ifdef _DEBUG
+	setDebugName("CVideoModeList");
+	#endif
+
 	Desktop.depth = 0;
 	Desktop.size = core::dimension2d<s32>(0,0);
 }
 
 
-//! destructor
-CVideoModeList::~CVideoModeList()
-{
-}
-
-
-
 void CVideoModeList::setDesktop(s32 desktopDepth, const core::dimension2d<s32>& desktopSize)
 {
 	Desktop.depth = desktopDepth;
@@ -38,7 +36,6 @@ s32 CVideoModeList::getVideoModeCount() const
 }
 
 
-
 //! Returns the screen size of a video mode in pixels.
 core::dimension2d<s32> CVideoModeList::getVideoModeResolution(s32 modeNumber) const
 {
@@ -49,6 +46,44 @@ core::dimension2d<s32> CVideoModeList::getVideoModeResolution(s32 modeNumber) co
 }
 
 
+core::dimension2d<s32> CVideoModeList::getVideoModeResolution(
+		const core::dimension2d<s32>& minSize,
+		const core::dimension2d<s32>& maxSize) const
+{
+	u32 best=VideoModes.size();
+	// if only one or no mode
+	if (best<2)
+		return getVideoModeResolution(0);
+
+	u32 i;
+	for (i=0; i<VideoModes.size(); ++i)
+	{
+		if (VideoModes[i].size.Width>=minSize.Width &&
+			VideoModes[i].size.Height>=minSize.Height &&
+			VideoModes[i].size.Width<=maxSize.Width &&
+			VideoModes[i].size.Height<=maxSize.Height)
+			best=i;
+	}
+	// we take the last one found, the largest one fitting
+	if (best<VideoModes.size())
+		return VideoModes[best].size;
+	const u32 minArea = minSize.getArea();
+	const u32 maxArea = maxSize.getArea();
+	u32 minDist = 0xffffffff;
+	best=0;
+	for (i=0; i<VideoModes.size(); ++i)
+	{
+		const u32 area = VideoModes[i].size.getArea();
+		const u32 dist = core::min_(abs(int(minArea-area)), abs(int(maxArea-area)));
+		if (dist<minDist)
+		{
+			minDist=dist;
+			best=i;
+		}
+	}
+	return VideoModes[best].size;
+}
+
 
 //! Returns the pixel depth of a video mode in bits.
 s32 CVideoModeList::getVideoModeDepth(s32 modeNumber) const
@@ -61,7 +96,7 @@ s32 CVideoModeList::getVideoModeDepth(s32 modeNumber) const
 
 
 //! Returns current desktop screen resolution.
-core::dimension2d<s32> CVideoModeList::getDesktopResolution() const
+const core::dimension2d<s32>& CVideoModeList::getDesktopResolution() const
 {
 	return Desktop.size;
 }
@@ -74,7 +109,6 @@ s32 CVideoModeList::getDesktopDepth() const
 }
 
 
-
 //! adds a new mode to the list
 void CVideoModeList::addMode(const core::dimension2d<s32>& size, s32 depth)
 {
diff --git a/src/dep/src/irrlicht/CVideoModeList.h b/src/dep/src/irrlicht/CVideoModeList.h
index c97e940..c05d621 100644
--- a/src/dep/src/irrlicht/CVideoModeList.h
+++ b/src/dep/src/irrlicht/CVideoModeList.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,20 +21,20 @@ namespace video
 		//! constructor
 		CVideoModeList();
 
-		//! destructor
-		virtual ~CVideoModeList();
-
 		//! Gets amount of video modes in the list.
 		virtual s32 getVideoModeCount() const;
 
 		//! Returns the screen size of a video mode in pixels.
 		virtual core::dimension2d<s32> getVideoModeResolution(s32 modeNumber) const;
 
+		//! Returns the screen size of an optimal video mode in pixels.
+		virtual core::dimension2d<s32> getVideoModeResolution(const core::dimension2d<s32>& minSize, const core::dimension2d<s32>& maxSize) const;
+
 		//! Returns the pixel depth of a video mode in bits.
 		virtual s32 getVideoModeDepth(s32 modeNumber) const;
 
 		//! Returns current desktop screen resolution.
-		virtual core::dimension2d<s32> getDesktopResolution() const;
+		virtual const core::dimension2d<s32>& getDesktopResolution() const;
 
 		//! Returns the pixel depth of a video mode in bits.
 		virtual s32 getDesktopDepth() const;
diff --git a/src/dep/src/irrlicht/CWaterSurfaceSceneNode.cpp b/src/dep/src/irrlicht/CWaterSurfaceSceneNode.cpp
index 443dbe5..e03cc9b 100644
--- a/src/dep/src/irrlicht/CWaterSurfaceSceneNode.cpp
+++ b/src/dep/src/irrlicht/CWaterSurfaceSceneNode.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -76,52 +76,10 @@ void CWaterSurfaceSceneNode::animateWaterSurface()
 	{
 		const u32 vtxCnt = Mesh->getMeshBuffer(b)->getVertexCount();
 
-		switch(Mesh->getMeshBuffer(b)->getVertexType())
-		{
-		case video::EVT_STANDARD:
-			{
-				video::S3DVertex* v =
-					(video::S3DVertex*)Mesh->getMeshBuffer(b)->getVertices();
-
-				video::S3DVertex* v2 =
-					(video::S3DVertex*)OriginalMesh->getMeshBuffer(b)->getVertices();
-
-				for (u32 i=0; i<vtxCnt; ++i)
-				{
-					addWave(v[i].Pos, v2[i].Pos, time);
-				}
-
-			}
-			break;
-		case video::EVT_2TCOORDS:
-			{
-				video::S3DVertex2TCoords* v =
-					(video::S3DVertex2TCoords*)Mesh->getMeshBuffer(b)->getVertices();
-
-				video::S3DVertex2TCoords* v2 =
-					(video::S3DVertex2TCoords*)OriginalMesh->getMeshBuffer(b)->getVertices();
-
-				for (u32 i=0; i<vtxCnt; ++i)
-				{
-					addWave(v[i].Pos, v2[i].Pos, time);
-				}
-			}
-			break;
-		case video::EVT_TANGENTS:
-			{
-				video::S3DVertexTangents* v =
-					(video::S3DVertexTangents*)Mesh->getMeshBuffer(b)->getVertices();
-
-				video::S3DVertexTangents* v2 =
-					(video::S3DVertexTangents*)OriginalMesh->getMeshBuffer(b)->getVertices();
-
-				for (u32 i=0; i<vtxCnt; ++i)
-				{
-					addWave(v[i].Pos, v2[i].Pos, time);
-				}
-			}
-			break;
-		} // end switch
+		for (u32 i=0; i<vtxCnt; ++i)
+			addWave(Mesh->getMeshBuffer(b)->getPosition(i),
+				OriginalMesh->getMeshBuffer(b)->getPosition(i),
+				time);
 	}// end for all mesh buffers
 
 	SceneManager->getMeshManipulator()->recalculateNormals(Mesh);
diff --git a/src/dep/src/irrlicht/CWaterSurfaceSceneNode.h b/src/dep/src/irrlicht/CWaterSurfaceSceneNode.h
index c880f76..05c4714 100644
--- a/src/dep/src/irrlicht/CWaterSurfaceSceneNode.h
+++ b/src/dep/src/irrlicht/CWaterSurfaceSceneNode.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CWriteFile.cpp b/src/dep/src/irrlicht/CWriteFile.cpp
index c3e9ae3..dc29e16 100644
--- a/src/dep/src/irrlicht/CWriteFile.cpp
+++ b/src/dep/src/irrlicht/CWriteFile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CWriteFile.h b/src/dep/src/irrlicht/CWriteFile.h
index fe64d5b..f1add8e 100644
--- a/src/dep/src/irrlicht/CWriteFile.h
+++ b/src/dep/src/irrlicht/CWriteFile.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CXMLReader.cpp b/src/dep/src/irrlicht/CXMLReader.cpp
index 3dbcf73..dac2c7a 100644
--- a/src/dep/src/irrlicht/CXMLReader.cpp
+++ b/src/dep/src/irrlicht/CXMLReader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CXMLReader.h b/src/dep/src/irrlicht/CXMLReader.h
index 67e98f8..62c1b90 100644
--- a/src/dep/src/irrlicht/CXMLReader.h
+++ b/src/dep/src/irrlicht/CXMLReader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CXMLReaderImpl.h b/src/dep/src/irrlicht/CXMLReaderImpl.h
index e51b744..24f12b1 100644
--- a/src/dep/src/irrlicht/CXMLReaderImpl.h
+++ b/src/dep/src/irrlicht/CXMLReaderImpl.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h
 
@@ -71,8 +71,7 @@ public:
 		// if not end reached, parse the node
 		if (P && (unsigned int)(P - TextBegin) < TextSize - 1 && *P != 0)
 		{
-			parseCurrentNode();
-			return true;
+			return parseCurrentNode();
 		}
 
 		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
@@ -210,7 +209,8 @@ public:
 private:
 
 	// Reads the current xml node
-	void parseCurrentNode()
+	// return false if no further node is found
+	bool parseCurrentNode()
 	{
 		char_type* start = P;
 
@@ -218,14 +218,15 @@ private:
 		while(*P != L'<' && *P)
 			++P;
 
+		// not a node, so return false
 		if (!*P)
-			return;
+			return false;
 
 		if (P - start > 0)
 		{
 			// we found some text, store it
 			if (setText(start, P))
-				return;
+				return true;
 		}
 
 		++P;
@@ -247,6 +248,7 @@ private:
 			parseOpeningXMLElement();
 			break;
 		}
+		return true;
 	}
 
 
@@ -550,8 +552,10 @@ private:
 	//! reads the xml file and converts it into the wanted character format.
 	bool readFile(IFileReadCallBack* callback)
 	{
-		int size = callback->getSize();		
-		size += 4; // We need two terminating 0's at the end.
+		long size = callback->getSize();		
+		if (size<0)
+			return false;
+		size += 4; // We need four terminating 0's at the end.
 		           // For ASCII we need 1 0's, for UTF-16 2, for UTF-32 4.
 
 		char* data8 = new char[size];
@@ -564,10 +568,7 @@ private:
 
 		// add zeros at end
 
-		data8[size-1] = 0;
-		data8[size-2] = 0;
-		data8[size-3] = 0;
-		data8[size-4] = 0;
+		memset(data8+size-4, 0, 4);
 
 		char16* data16 = reinterpret_cast<char16*>(data8);
 		char32* data32 = reinterpret_cast<char32*>(data8);	
@@ -587,35 +588,35 @@ private:
 		{
 			// UTF-32, big endian
 			SourceFormat = ETF_UTF32_BE;
-			convertTextData(data32+1, data8, (size/4)); // data32+1 because we need to skip the header
+			convertTextData(data32+1, data8, (size/4)-1); // data32+1 because we need to skip the header
 		}
 		else
 		if (size >= 4 && data32[0] == (char32)UTF32_LE)
 		{
 			// UTF-32, little endian
 			SourceFormat = ETF_UTF32_LE;
-			convertTextData(data32+1, data8, (size/4)); // data32+1 because we need to skip the header
+			convertTextData(data32+1, data8, (size/4)-1); // data32+1 because we need to skip the header
 		}
 		else
 		if (size >= 2 && data16[0] == UTF16_BE)
 		{
 			// UTF-16, big endian
 			SourceFormat = ETF_UTF16_BE;
-			convertTextData(data16+1, data8, (size/2)); // data16+1 because we need to skip the header
+			convertTextData(data16+1, data8, (size/2)-1); // data16+1 because we need to skip the header
 		}
 		else
 		if (size >= 2 && data16[0] == UTF16_LE)
 		{
 			// UTF-16, little endian
 			SourceFormat = ETF_UTF16_LE;
-			convertTextData(data16+1, data8, (size/2)); // data16+1 because we need to skip the header
+			convertTextData(data16+1, data8, (size/2)-1); // data16+1 because we need to skip the header
 		}
 		else
-		if (size >= 3 && data8[0] == UTF8[0] && data8[1] == UTF8[1] && data8[2] == UTF8[2])
+		if (size >= 3 && memcmp(data8,UTF8,3)==0)
 		{
 			// UTF-8
 			SourceFormat = ETF_UTF8;
-			convertTextData(data8+3, data8, size); // data8+3 because we need to skip the header
+			convertTextData(data8+3, data8, size-3); // data8+3 because we need to skip the header
 		}
 		else
 		{
diff --git a/src/dep/src/irrlicht/CXMLWriter.cpp b/src/dep/src/irrlicht/CXMLWriter.cpp
index 06b0b79..43dea14 100644
--- a/src/dep/src/irrlicht/CXMLWriter.cpp
+++ b/src/dep/src/irrlicht/CXMLWriter.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -17,6 +17,10 @@ namespace io
 CXMLWriter::CXMLWriter(IWriteFile* file)
 : File(file), Tabs(0), TextWrittenLast(false)
 {
+	#ifdef _DEBUG
+	setDebugName("CXMLWriter");
+	#endif
+	
 	if (File)
 		File->grab();
 }
@@ -233,7 +237,7 @@ void CXMLWriter::writeLineBreak()
 	if (!File)
 		return;
 
-#if defined(MACOSX)
+#if defined(_IRR_OSX_PLATFORM_)
 	File->write(L"\r", sizeof(wchar_t));
 #elif defined(_IRR_WINDOWS_API_)
 	File->write(L"\r\n", 2*sizeof(wchar_t));
diff --git a/src/dep/src/irrlicht/CXMLWriter.h b/src/dep/src/irrlicht/CXMLWriter.h
index 723fc81..0921d36 100644
--- a/src/dep/src/irrlicht/CXMLWriter.h
+++ b/src/dep/src/irrlicht/CXMLWriter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CXMeshFileLoader.cpp b/src/dep/src/irrlicht/CXMeshFileLoader.cpp
index c7c2582..21646ee 100644
--- a/src/dep/src/irrlicht/CXMeshFileLoader.cpp
+++ b/src/dep/src/irrlicht/CXMeshFileLoader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -11,7 +11,9 @@
 
 #include "fast_atof.h"
 #include "coreutil.h"
+#include "ISceneManager.h"
 #include "IVideoDriver.h"
+#include "IFileSystem.h"
 #include "IReadFile.h"
 
 #ifdef _DEBUG
@@ -25,11 +27,14 @@ namespace scene
 {
 
 //! Constructor
-CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr)
-: SceneManager(smgr), AnimatedMesh(0), MajorVersion(0), MinorVersion(0),
-	BinaryFormat(false), BinaryNumCount(0), Buffer(0), P(0), End(0),
-	FloatSize(0), CurFrame(0)
+CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs)
+: SceneManager(smgr), FileSystem(fs), AnimatedMesh(0), MajorVersion(0),
+	MinorVersion(0), BinaryFormat(false), BinaryNumCount(0), Buffer(0),
+	P(0), End(0), FloatSize(0), CurFrame(0)
 {
+	#ifdef _DEBUG
+	setDebugName("CXMeshFileLoader");
+	#endif
 }
 
 
@@ -37,7 +42,7 @@ CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr)
 //! based on the file extension (e.g. ".bsp")
 bool CXMeshFileLoader::isALoadableFileExtension(const c8* filename) const
 {
-	return strstr(filename, ".x") != 0;
+	return strncmp(&filename[strlen(filename)-2], ".x", 2) == 0;
 }
 
 
@@ -50,11 +55,13 @@ IAnimatedMesh* CXMeshFileLoader::createMesh(io::IReadFile* f)
 	if (!f)
 		return 0;
 
+#ifdef _XREADER_DEBUG
 	u32 time = os::Timer::getRealTime();
+#endif
 
 	AnimatedMesh = new CSkinnedMesh();
 
-	if ( load(f) )
+	if (load(f))
 	{
 		AnimatedMesh->finalize();
 	}
@@ -114,7 +121,9 @@ bool CXMeshFileLoader::load(io::IReadFile* file)
 		u32 i;
 
 		mesh->Buffers.reallocate(mesh->Materials.size());
+#ifndef BETTER_MESHBUFFER_SPLITTING_FOR_X
 		const u32 bufferOffset = AnimatedMesh->getMeshBufferCount();
+#endif
 		for (i=0; i<mesh->Materials.size(); ++i)
 		{
 			mesh->Buffers.push_back( AnimatedMesh->createBuffer() );
@@ -128,7 +137,6 @@ bool CXMeshFileLoader::load(io::IReadFile* file)
 					AnimatedMesh->getAllJoints()[mesh->AttachedJointID]->AttachedMeshes.push_back( AnimatedMesh->getMeshBuffers().size()-1 );
 				}
 			}
-
 		}
 
 		if (!mesh->HasVertexColors)
@@ -161,7 +169,7 @@ bool CXMeshFileLoader::load(io::IReadFile* file)
 			{
 				for (u32 id=i*3+0;id<=i*3+2;++id)
 				{
-					core::array< u32 > &Array=verticesLinkBuffer[ mesh->Indices[id] ];
+					core::array< u16 > &Array=verticesLinkBuffer[ mesh->Indices[id] ];
 					bool found=false;
 
 					for (u32 j=0; j < Array.size(); ++j)
@@ -204,7 +212,7 @@ bool CXMeshFileLoader::load(io::IReadFile* file)
 				{
 					core::array< u16 > &Array=verticesLinkBuffer[ mesh->Indices[id] ];
 
-					for (u32 j=0;j<  Array.size() ;++j)
+					for (u32 j=0;j< Array.size() ;++j)
 					{
 						if ( Array[j]== mesh->FaceMaterialIndices[i] )
 							buffer->Indices.push_back( verticesLinkIndex[ mesh->Indices[id] ][j] );
@@ -212,29 +220,31 @@ bool CXMeshFileLoader::load(io::IReadFile* file)
 				}
 			}
 
-			for (u32 j=0;j<mesh->Weights.size();++j)
+			for (u32 j=0;j<mesh->WeightJoint.size();++j)
 			{
-				ISkinnedMesh::SWeight& Weight = (*mesh->Weights[j]);
+				ISkinnedMesh::SJoint* joint = AnimatedMesh->getAllJoints()[mesh->WeightJoint[j]];
+				ISkinnedMesh::SWeight& weight = joint->Weights[mesh->WeightNum[j]];
 
-				u32 id = Weight.vertex_id;
+				u32 id = weight.vertex_id;
 
 				if (id>=verticesLinkIndex.size())
 				{
 					os::Printer::log("X loader: Weight id out of range", ELL_WARNING);
 					id=0;
+					weight.strength=0.f;
 				}
 
 				if (verticesLinkBuffer[id].size()==1)
 				{
-					Weight.vertex_id=verticesLinkIndex[id][0];
-					Weight.buffer_id=verticesLinkBuffer[id][0];
+					weight.vertex_id=verticesLinkIndex[id][0];
+					weight.buffer_id=verticesLinkBuffer[id][0];
 				}
 				else if (verticesLinkBuffer[id].size() != 0)
 				{
 					for (u32 k=1; k < verticesLinkBuffer[id].size(); ++k)
 					{
-						ISkinnedMesh::SWeight* WeightClone = AnimatedMesh->createWeight(Joint);
-						WeightClone->strength = Weight.strength;
+						ISkinnedMesh::SWeight* WeightClone = AnimatedMesh->createWeight(joint);
+						WeightClone->strength = weight.strength;
 						WeightClone->vertex_id = verticesLinkIndex[id][k];
 						WeightClone->buffer_id = verticesLinkBuffer[id][k];
 					}
@@ -244,74 +254,91 @@ bool CXMeshFileLoader::load(io::IReadFile* file)
 		#else
 		{
 			core::array< u32 > verticesLinkIndex;
-			core::array< u16 > verticesLinkBuffer;
+			core::array< s16 > verticesLinkBuffer;
 			verticesLinkBuffer.set_used(mesh->Vertices.size());
-			verticesLinkIndex.set_used(mesh->Vertices.size());
 
 			// init with 0
 			for (i=0;i<mesh->Vertices.size();++i)
 			{
-				verticesLinkBuffer[i]=0;
-				verticesLinkIndex[i]=0;
+				verticesLinkBuffer[i]=-1;
 			}
 
+			bool warned = false;
 			// store meshbuffer number per vertex
 			for (i=0;i<mesh->FaceMaterialIndices.size();++i)
 			{
 				for (u32 id=i*3+0;id<=i*3+2;++id)
 				{
+					if ((verticesLinkBuffer[mesh->Indices[id]] != -1) && (verticesLinkBuffer[mesh->Indices[id]] != (s16)mesh->FaceMaterialIndices[i]))
+					{
+						if (!warned)
+						{
+							os::Printer::log("X loader", "Duplicated vertex, animation might be corrupted.", ELL_WARNING);
+							warned=true;
+						}
+						const u32 tmp = mesh->Vertices.size();
+						mesh->Vertices.push_back(mesh->Vertices[ mesh->Indices[id] ]);
+						mesh->Indices[id] = tmp;
+						verticesLinkBuffer.set_used(mesh->Vertices.size());
+					}
 					verticesLinkBuffer[ mesh->Indices[id] ] = mesh->FaceMaterialIndices[i];
 				}
 			}
 
-			// store vertices in buffers and remember relation in verticesLinkIndex
-			u32* vCountArray = new u32[mesh->Buffers.size()];
-			memset(vCountArray, 0, mesh->Buffers.size()*sizeof(u32));
-			// count vertices in each buffer and reallocate
-			for (i=0;i<mesh->Vertices.size();++i)
-				++vCountArray[verticesLinkBuffer[i]];
-			for (i=0; i!=mesh->Buffers.size(); ++i)
-				mesh->Buffers[i]->Vertices_Standard.reallocate(vCountArray[i]);
-
-			// actually store vertices
-			for (i=0;i<mesh->Vertices.size();++i)
+			if (mesh->FaceMaterialIndices.size() != 0)
 			{
-				scene::SSkinMeshBuffer *buffer = mesh->Buffers[ verticesLinkBuffer[i] ];
+				// store vertices in buffers and remember relation in verticesLinkIndex
+				u32* vCountArray = new u32[mesh->Buffers.size()];
+				memset(vCountArray, 0, mesh->Buffers.size()*sizeof(u32));
+				// count vertices in each buffer and reallocate
+				for (i=0; i<mesh->Vertices.size(); ++i)
+					++vCountArray[verticesLinkBuffer[i]];
+				for (i=0; i!=mesh->Buffers.size(); ++i)
+					mesh->Buffers[i]->Vertices_Standard.reallocate(vCountArray[i]);
 
-				verticesLinkIndex[i] = buffer->Vertices_Standard.size();
-				buffer->Vertices_Standard.push_back( mesh->Vertices[i] );
+				verticesLinkIndex.set_used(mesh->Vertices.size());
+				// actually store vertices
+				for (i=0; i<mesh->Vertices.size(); ++i)
+				{
+					scene::SSkinMeshBuffer *buffer = mesh->Buffers[ verticesLinkBuffer[i] ];
+
+					verticesLinkIndex[i] = buffer->Vertices_Standard.size();
+					buffer->Vertices_Standard.push_back( mesh->Vertices[i] );
+				}
+
+				// count indices per buffer and reallocate
+				memset(vCountArray, 0, mesh->Buffers.size()*sizeof(u32));
+				for (i=0; i<mesh->FaceMaterialIndices.size(); ++i)
+					++vCountArray[ mesh->FaceMaterialIndices[i] ];
+				for (i=0; i!=mesh->Buffers.size(); ++i)
+					mesh->Buffers[i]->Indices.reallocate(vCountArray[i]);
+				delete [] vCountArray;
+				// create indices per buffer
+				for (i=0; i<mesh->FaceMaterialIndices.size(); ++i)
+				{
+					scene::SSkinMeshBuffer *buffer = mesh->Buffers[ mesh->FaceMaterialIndices[i] ];
+					for (u32 id=i*3+0; id!=i*3+3; ++id)
+					{
+						buffer->Indices.push_back( verticesLinkIndex[ mesh->Indices[id] ] );
+					}
+				}
 			}
 
-			// count indices per buffer and reallocate
-			memset(vCountArray, 0, mesh->Buffers.size()*sizeof(u32));
-			for (i=0;i<mesh->FaceMaterialIndices.size();++i)
-				++vCountArray[ mesh->FaceMaterialIndices[i] ];
-			for (i=0; i!=mesh->Buffers.size(); ++i)
-				mesh->Buffers[i]->Indices.reallocate(vCountArray[i]);
-			delete [] vCountArray;
-			// create indices per buffer
-			for (i=0;i<mesh->FaceMaterialIndices.size();++i)
+			for (u32 j=0; j<mesh->WeightJoint.size(); ++j)
 			{
-				scene::SSkinMeshBuffer *buffer = mesh->Buffers[ mesh->FaceMaterialIndices[i] ];
-				for (u32 id=i*3+0;id!=i*3+3;++id)
-					buffer->Indices.push_back( verticesLinkIndex[ mesh->Indices[id] ] );
-			}
+				ISkinnedMesh::SWeight& weight = (AnimatedMesh->getAllJoints()[mesh->WeightJoint[j]]->Weights[mesh->WeightNum[j]]);
 
-
-			for (u32 j=0;j<mesh->Weights.size();++j)
-			{
-				ISkinnedMesh::SWeight* weight = mesh->Weights[j];
-
-				u32 id = weight->vertex_id;
+				u32 id = weight.vertex_id;
 
 				if (id>=verticesLinkIndex.size())
 				{
 					os::Printer::log("X loader: Weight id out of range", ELL_WARNING);
 					id=0;
+					weight.strength=0.f;
 				}
 
-				weight->vertex_id=verticesLinkIndex[id];
-				weight->buffer_id=verticesLinkBuffer[id] + bufferOffset;;
+				weight.vertex_id=verticesLinkIndex[id];
+				weight.buffer_id=verticesLinkBuffer[id] + bufferOffset;
 			}
 		}
 		#endif
@@ -341,6 +368,7 @@ bool CXMeshFileLoader::readFileIntoMemory(io::IReadFile* file)
 		return false;
 	}
 
+	Line = 1;
 	End = Buffer + size;
 
 	//! check header "xof "
@@ -439,7 +467,7 @@ bool CXMeshFileLoader::parseDataObject()
 		//mesh->Buffer=AnimatedMesh->createBuffer();
 		Meshes.push_back(mesh);
 
-		return parseDataObjectMesh ( *mesh );
+		return parseDataObjectMesh(*mesh);
 	}
 	else
 	if (objectName == "AnimationSet")
@@ -480,11 +508,12 @@ bool CXMeshFileLoader::parseDataObjectTemplate()
 	{
 		os::Printer::log("Left delimiter in template data object missing.",
 			name.c_str(), ELL_ERROR);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
 	// read GUID
-	core::stringc guid = getNextToken();
+	getNextToken();
 
 	// read and ignore data members
 	while(true)
@@ -522,6 +551,7 @@ bool CXMeshFileLoader::parseDataObjectFrame( CSkinnedMesh::SJoint *Parent )
 	if (!readHeadOfDataObject(&name))
 	{
 		os::Printer::log("No opening brace in Frame found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -529,7 +559,7 @@ bool CXMeshFileLoader::parseDataObjectFrame( CSkinnedMesh::SJoint *Parent )
 
 	if (name.size())
 	{
-		for (u32 n=0;n < AnimatedMesh->getAllJoints().size();++n)
+		for (u32 n=0; n < AnimatedMesh->getAllJoints().size(); ++n)
 		{
 			if (AnimatedMesh->getAllJoints()[n]->Name==name)
 			{
@@ -572,6 +602,7 @@ bool CXMeshFileLoader::parseDataObjectFrame( CSkinnedMesh::SJoint *Parent )
 		if (objectName.size() == 0)
 		{
 			os::Printer::log("Unexpected ending found in Frame in x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 			return false;
 		}
 		else
@@ -634,22 +665,23 @@ bool CXMeshFileLoader::parseDataObjectTransformationMatrix(core::matrix4 &mat)
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace in Transformation Matrix found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
-	for (u32 i=0; i<4; ++i)
-		for (u32 j=0; j<4; ++j)
-			mat(i,j)=readFloat();
+	readMatrix(mat);
 
-	if (!checkForTwoFollowingSemicolons())
+	if (!checkForOneFollowingSemicolons())
 	{
 		os::Printer::log("No finishing semicolon in Transformation Matrix found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
 	if (!checkForClosingBrace())
 	{
 		os::Printer::log("No closing brace in Transformation Matrix found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -657,27 +689,29 @@ bool CXMeshFileLoader::parseDataObjectTransformationMatrix(core::matrix4 &mat)
 }
 
 
-
 bool CXMeshFileLoader::parseDataObjectMesh(SXMesh &mesh)
 {
-#ifdef _XREADER_DEBUG
-	os::Printer::log("CXFileReader: Reading mesh");
-#endif
-
 	core::stringc name;
 
 	if (!readHeadOfDataObject(&name))
 	{
+#ifdef _XREADER_DEBUG
+		os::Printer::log("CXFileReader: Reading mesh");
+#endif
 		os::Printer::log("No opening brace in Mesh found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: Reading mesh", name.c_str());
+#endif
+
 	// read vertex count
 	const u32 nVertices = readInt();
 
 	// read vertices
-	mesh.Vertices.set_used(nVertices); //luke: change
-
+	mesh.Vertices.set_used(nVertices);
 	for (u32 n=0; n<nVertices; ++n)
 	{
 		readVector3(mesh.Vertices[n].Pos);
@@ -687,6 +721,7 @@ bool CXMeshFileLoader::parseDataObjectMesh(SXMesh &mesh)
 	if (!checkForTwoFollowingSemicolons())
 	{
 		os::Printer::log("No finishing semicolon in Mesh Vertex Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -708,6 +743,7 @@ bool CXMeshFileLoader::parseDataObjectMesh(SXMesh &mesh)
 			if (fcnt < 3)
 			{
 				os::Printer::log("Invalid face count (<3) found in Mesh x file reader.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 				return false;
 			}
 
@@ -738,14 +774,10 @@ bool CXMeshFileLoader::parseDataObjectMesh(SXMesh &mesh)
 		}
 	}
 
-	if (BinaryFormat && BinaryNumCount)
-	{
-		os::Printer::log("Binary X: Mesh: Integer count mismatch", ELL_WARNING);
-		return false;
-	}
-	else if (!checkForTwoFollowingSemicolons())
+	if (!checkForTwoFollowingSemicolons())
 	{
 		os::Printer::log("No finishing semicolon in Mesh Face Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -762,6 +794,7 @@ bool CXMeshFileLoader::parseDataObjectMesh(SXMesh &mesh)
 		if (objectName.size() == 0)
 		{
 			os::Printer::log("Unexpected ending found in Mesh in x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 			return false;
 		}
 		else
@@ -802,6 +835,147 @@ bool CXMeshFileLoader::parseDataObjectMesh(SXMesh &mesh)
 				return false;
 		}
 		else
+		if (objectName == "DeclData")
+		{
+			// arbitrary vertex attributes
+			// first comes the number of element definitions
+			// then the vertex element type definitions
+			// with format type;tesselator;semantics;usageindex
+			// we want to support 2;0;6;0 == tangent
+			//                    2;0;7;0 == binormal
+			//                    2;0;3;0 == normal
+			//                  1/2;0;5;0 == 1st uv coord
+			// and              1/2;0;5;1 == 2nd uv coord
+			// type==2 is 3xf32, type==1 is 2xf32
+			u32 j;
+			const u32 dcnt = readInt();
+			u16 size = 0;
+			s16 normalpos = -1;
+			s16 uvpos = -1;
+			s16 uv2pos = -1;
+			s16 tangentpos = -1;
+			s16 binormalpos = -1;
+			s16 normaltype = -1;
+			s16 uvtype = -1;
+			s16 uv2type = -1;
+			s16 tangenttype = -1;
+			s16 binormaltype = -1;
+			for (j=0; j<dcnt; ++j)
+			{
+				const u32 type = readInt();
+				//const u32 tesselator = readInt();
+				readInt();
+				const u32 semantics = readInt();
+				const u32 index = readInt();
+				switch (semantics)
+				{
+				case 3:
+					normalpos = size;
+					normaltype = type;
+					break;
+				case 5:
+					if (index==0)
+					{
+						uvpos = size;
+						uvtype = type;
+					}
+					else if (index==1)
+					{
+						uv2pos = size;
+						uv2type = type;
+					}
+					break;
+				case 6:
+					tangentpos = size;
+					tangenttype = type;
+					break;
+				case 7:
+					binormalpos = size;
+					binormaltype = type;
+					break;
+				default:
+					break;
+				}
+				switch (type)
+				{
+				case 0:
+					size += 4;
+					break;
+				case 1:
+					size += 8;
+					break;
+				case 2:
+					size += 12;
+					break;
+				case 3:
+					size += 16;
+					break;
+				case 4:
+				case 5:
+				case 6:
+					size += 4;
+					break;
+				case 7:
+					size += 8;
+					break;
+				case 8:
+				case 9:
+					size += 4;
+					break;
+				case 10:
+					size += 8;
+					break;
+				case 11:
+					size += 4;
+					break;
+				case 12:
+					size += 8;
+					break;
+				case 13:
+					size += 4;
+					break;
+				case 14:
+					size += 4;
+					break;
+				case 15:
+					size += 4;
+					break;
+				case 16:
+					size += 8;
+					break;
+				}
+			}
+			const u32 datasize = readInt();
+			u32* data = new u32[datasize];
+			for (j=0; j<datasize; ++j)
+				data[j]=readInt();
+
+			if (!checkForOneFollowingSemicolons())
+			{
+				os::Printer::log("No finishing semicolon in DeclData found.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
+				delete [] data;
+				return false;
+			}
+			if (!checkForClosingBrace())
+			{
+				os::Printer::log("No closing brace in DeclData.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
+				delete [] data;
+				return false;
+			}
+			u8* dataptr = (u8*) data;
+			for (j=0; j<mesh.Vertices.size(); ++j)
+			{
+				if ((normalpos != -1) && (normaltype == 2))
+					mesh.Vertices[j].Normal.set(*((core::vector3df*)(dataptr+normalpos)));
+				if ((uvpos != -1) && (uvtype == 1))
+					mesh.Vertices[j].TCoords.set(*((core::vector2df*)(dataptr+uvpos)));
+				dataptr += size;
+			}
+			delete [] data;
+		}
+		else
 		if (objectName == "XSkinMeshHeader")
 		{
 			if (!parseDataObjectSkinMeshHeader(mesh))
@@ -836,6 +1010,7 @@ bool CXMeshFileLoader::parseDataObjectSkinWeights(SXMesh &mesh)
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace in Skin Weights found in .x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -844,15 +1019,16 @@ bool CXMeshFileLoader::parseDataObjectSkinWeights(SXMesh &mesh)
 	if (!getNextTokenAsString(TransformNodeName))
 	{
 		os::Printer::log("Unknown syntax while reading transfrom node name string in .x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
-
 	mesh.HasSkinning=true;
 
 	CSkinnedMesh::SJoint *joint=0;
 
-	for (u32 n=0; n < AnimatedMesh->getAllJoints().size(); ++n)
+	u32 n;
+	for (n=0; n < AnimatedMesh->getAllJoints().size(); ++n)
 	{
 		if (AnimatedMesh->getAllJoints()[n]->Name==TransformNodeName)
 		{
@@ -866,6 +1042,7 @@ bool CXMeshFileLoader::parseDataObjectSkinWeights(SXMesh &mesh)
 #ifdef _XREADER_DEBUG
 		os::Printer::log("creating joint for skinning ", TransformNodeName.c_str());
 #endif
+		n = AnimatedMesh->getAllJoints().size();
 		joint=AnimatedMesh->createJoint(0);
 		joint->Name=TransformNodeName;
 	}
@@ -879,21 +1056,23 @@ bool CXMeshFileLoader::parseDataObjectSkinWeights(SXMesh &mesh)
 	const u32 jointStart = joint->Weights.size();
 	joint->Weights.reallocate(jointStart+nWeights);
 
-	mesh.Weights.reallocate( mesh.Weights.size() + nWeights );
+	mesh.WeightJoint.reallocate( mesh.WeightJoint.size() + nWeights );
+	mesh.WeightNum.reallocate( mesh.WeightNum.size() + nWeights );
 
 	for (i=0; i<nWeights; ++i)
 	{
+		mesh.WeightJoint.push_back(n);
+		mesh.WeightNum.push_back(joint->Weights.size());
+
 		CSkinnedMesh::SWeight *weight=AnimatedMesh->createWeight(joint);
 
 		weight->buffer_id=0;
 		weight->vertex_id=readInt();
-
-		mesh.Weights.push_back(weight);
 	}
 
 	// read vertex weights
 
-	for (i=0; i<nWeights; ++i)
+	for (i=jointStart; i<jointStart+nWeights; ++i)
 		joint->Weights[i].strength = readFloat();
 
 	// read matrix offset
@@ -903,21 +1082,19 @@ bool CXMeshFileLoader::parseDataObjectSkinWeights(SXMesh &mesh)
 	// world space coordinates of the mesh as affected by the bone
 	core::matrix4& MatrixOffset = joint->GlobalInversedMatrix;
 
-	for (i=0; i<4; ++i)
-	{
-		for (u32 j=0; j<4; ++j)
-			MatrixOffset(i,j) = readFloat();
-	}
+	readMatrix(MatrixOffset);
 
-	if (!checkForTwoFollowingSemicolons())
+	if (!checkForOneFollowingSemicolons())
 	{
 		os::Printer::log("No finishing semicolon in Skin Weights found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
 	if (!checkForClosingBrace())
 	{
 		os::Printer::log("No closing brace in Skin Weights found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -934,6 +1111,7 @@ bool CXMeshFileLoader::parseDataObjectSkinMeshHeader(SXMesh& mesh)
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace in Skin Mesh header found in .x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -947,6 +1125,7 @@ bool CXMeshFileLoader::parseDataObjectSkinMeshHeader(SXMesh& mesh)
 	if (!checkForClosingBrace())
 	{
 		os::Printer::log("No closing brace in skin mesh header in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -963,6 +1142,7 @@ bool CXMeshFileLoader::parseDataObjectMeshNormals(SXMesh &mesh)
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace in Mesh Normals found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -978,6 +1158,7 @@ bool CXMeshFileLoader::parseDataObjectMeshNormals(SXMesh &mesh)
 	if (!checkForTwoFollowingSemicolons())
 	{
 		os::Printer::log("No finishing semicolon in Mesh Normals Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -998,6 +1179,7 @@ bool CXMeshFileLoader::parseDataObjectMeshNormals(SXMesh &mesh)
 		if (indexcount != mesh.IndexCountPerFace[k])
 		{
 			os::Printer::log("Not matching normal and face index count found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 			return false;
 		}
 
@@ -1029,12 +1211,14 @@ bool CXMeshFileLoader::parseDataObjectMeshNormals(SXMesh &mesh)
 	if (!checkForTwoFollowingSemicolons())
 	{
 		os::Printer::log("No finishing semicolon in Mesh Face Normals Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
 	if (!checkForClosingBrace())
 	{
 		os::Printer::log("No closing brace in Mesh Normals found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1051,6 +1235,7 @@ bool CXMeshFileLoader::parseDataObjectMeshTextureCoords(SXMesh &mesh)
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace in Mesh Texture Coordinates found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1061,12 +1246,14 @@ bool CXMeshFileLoader::parseDataObjectMeshTextureCoords(SXMesh &mesh)
 	if (!checkForTwoFollowingSemicolons())
 	{
 		os::Printer::log("No finishing semicolon in Mesh Texture Coordinates Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
 	if (!checkForClosingBrace())
 	{
 		os::Printer::log("No closing brace in Mesh Texture Coordinates Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1083,6 +1270,7 @@ bool CXMeshFileLoader::parseDataObjectMeshVertexColors(SXMesh &mesh)
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace for Mesh Vertex Colors found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1094,6 +1282,7 @@ bool CXMeshFileLoader::parseDataObjectMeshVertexColors(SXMesh &mesh)
 		if (Index>=mesh.Vertices.size())
 		{
 			os::Printer::log("index value in parseDataObjectMeshVertexColors out of bounds", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 			return false;
 		}
 		readRGBA(mesh.Vertices[Index].Color);
@@ -1103,12 +1292,14 @@ bool CXMeshFileLoader::parseDataObjectMeshVertexColors(SXMesh &mesh)
 	if (!checkForOneFollowingSemicolons())
 	{
 		os::Printer::log("No finishing semicolon in Mesh Vertex Colors Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
 	if (!checkForClosingBrace())
 	{
 		os::Printer::log("No closing brace in Mesh Texture Coordinates Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1125,6 +1316,7 @@ bool CXMeshFileLoader::parseDataObjectMeshMaterialList(SXMesh &mesh)
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace in Mesh Material List found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1134,18 +1326,20 @@ bool CXMeshFileLoader::parseDataObjectMeshMaterialList(SXMesh &mesh)
 	// read non triangulated face material index count
 	const u32 nFaceIndices = readInt();
 
-	if (nFaceIndices != mesh.IndexCountPerFace.size())
-	{
-		os::Printer::log("Index count per face not equal to face material index count in x file.", ELL_WARNING);
-		return false;
-	}
+	// There seems to be a compact representation of "all faces the same material"
+	// being represented as 1;1;0;; which means 1 material, 1 face with first material
+	// all the other faces have to obey then, so check is disabled
+	//if (nFaceIndices != mesh.IndexCountPerFace.size())
+	//	os::Printer::log("Index count per face not equal to face material index count in x file.", ELL_WARNING);
 
 	// read non triangulated face indices and create triangulated ones
 	mesh.FaceMaterialIndices.set_used( mesh.Indices.size() / 3);
 	u32 triangulatedindex = 0;
-	for (u32 tfi=0; tfi<nFaceIndices; ++tfi)
+	u32 ind = 0;
+	for (u32 tfi=0; tfi<mesh.IndexCountPerFace.size(); ++tfi)
 	{
-		const u32 ind = readInt();
+		if (tfi<nFaceIndices)
+			ind = readInt();
 		const u32 fc = mesh.IndexCountPerFace[tfi]/3;
 		for (u32 k=0; k<fc; ++k)
 			mesh.FaceMaterialIndices[triangulatedindex++] = ind;
@@ -1168,6 +1362,7 @@ bool CXMeshFileLoader::parseDataObjectMeshMaterialList(SXMesh &mesh)
 		if (objectName.size() == 0)
 		{
 			os::Printer::log("Unexpected ending found in Mesh Material list in .x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 			return false;
 		}
 		else
@@ -1217,6 +1412,7 @@ bool CXMeshFileLoader::parseDataObjectMaterial(video::SMaterial& material)
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace in Mesh Material found in .x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1240,6 +1436,7 @@ bool CXMeshFileLoader::parseDataObjectMaterial(video::SMaterial& material)
 		if (objectName.size() == 0)
 		{
 			os::Printer::log("Unexpected ending found in Mesh Material in .x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 			return false;
 		}
 		else
@@ -1256,16 +1453,40 @@ bool CXMeshFileLoader::parseDataObjectMaterial(video::SMaterial& material)
 				return false;
 
 			// original name
-			SceneManager->getVideoDriver()->getTexture ( TextureFileName.c_str() );
+			if (FileSystem->existFile(TextureFileName.c_str()))
+				material.setTexture(0, SceneManager->getVideoDriver()->getTexture (TextureFileName.c_str()));
 			// mesh path
-			if (!material.getTexture(0))
+			else
 			{
 				TextureFileName=FilePath + stripPathFromString(TextureFileName,false);
-				material.setTexture(0, SceneManager->getVideoDriver()->getTexture ( TextureFileName.c_str() ));
+				if (FileSystem->existFile(TextureFileName.c_str()))
+					material.setTexture(0, SceneManager->getVideoDriver()->getTexture(TextureFileName.c_str()));
+				// working directory
+				else
+					material.setTexture(0, SceneManager->getVideoDriver()->getTexture(stripPathFromString(TextureFileName,false).c_str()));
+			}
+		}
+		else
+		if (objectName.equals_ignore_case("NormalmapFilename"))
+		{
+			// some exporters write "NormalmapFileName" instead.
+			core::stringc TextureFileName;
+			if (!parseDataObjectTextureFilename(TextureFileName))
+				return false;
+
+			// original name
+			if (FileSystem->existFile(TextureFileName.c_str()))
+				material.setTexture(1, SceneManager->getVideoDriver()->getTexture (TextureFileName.c_str()));
+			// mesh path
+			else
+			{
+				TextureFileName=FilePath + stripPathFromString(TextureFileName,false);
+				if (FileSystem->existFile(TextureFileName.c_str()))
+					material.setTexture(1, SceneManager->getVideoDriver()->getTexture(TextureFileName.c_str()));
+				// working directory
+				else
+					material.setTexture(1, SceneManager->getVideoDriver()->getTexture(stripPathFromString(TextureFileName,false).c_str()));
 			}
-			// working directory
-			if (!material.getTexture(0))
-				SceneManager->getVideoDriver()->getTexture ( stripPathFromString(TextureFileName,false).c_str() );
 		}
 		else
 		{
@@ -1290,6 +1511,7 @@ bool CXMeshFileLoader::parseDataObjectAnimationSet()
 	if (!readHeadOfDataObject(&AnimationName))
 	{
 		os::Printer::log("No opening brace in Animation Set found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1300,6 +1522,7 @@ bool CXMeshFileLoader::parseDataObjectAnimationSet()
 		if (objectName.size() == 0)
 		{
 			os::Printer::log("Unexpected ending found in Animation set in x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 			return false;
 		}
 		else
@@ -1333,6 +1556,7 @@ bool CXMeshFileLoader::parseDataObjectAnimation()
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace in Animation found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1349,6 +1573,7 @@ bool CXMeshFileLoader::parseDataObjectAnimation()
 		if (objectName.size() == 0)
 		{
 			os::Printer::log("Unexpected ending found in Animation in x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 			return false;
 		}
 		else
@@ -1378,6 +1603,7 @@ bool CXMeshFileLoader::parseDataObjectAnimation()
 			if (!checkForClosingBrace())
 			{
 				os::Printer::log("Unexpected ending found in Animation in x file.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 				return false;
 			}
 		}
@@ -1397,7 +1623,7 @@ bool CXMeshFileLoader::parseDataObjectAnimation()
 		CSkinnedMesh::SJoint *joint=0;
 
 		u32 n;
-		for (n=0;n < AnimatedMesh->getAllJoints().size();++n)
+		for (n=0; n < AnimatedMesh->getAllJoints().size(); ++n)
 		{
 			if (AnimatedMesh->getAllJoints()[n]->Name==FrameName)
 			{
@@ -1416,40 +1642,21 @@ bool CXMeshFileLoader::parseDataObjectAnimation()
 		}
 
 		joint->PositionKeys.reallocate(joint->PositionKeys.size()+animationDump.PositionKeys.size());
-		for (n=0;n<animationDump.PositionKeys.size();++n)
+		for (n=0; n<animationDump.PositionKeys.size(); ++n)
 		{
-			ISkinnedMesh::SPositionKey *key=&animationDump.PositionKeys[n];
-
-			//key->position+=joint->LocalMatrix.getTranslation();
-
-			joint->PositionKeys.push_back(*key);
+			joint->PositionKeys.push_back(animationDump.PositionKeys[n]);
 		}
 
 		joint->ScaleKeys.reallocate(joint->ScaleKeys.size()+animationDump.ScaleKeys.size());
-		for (n=0;n<animationDump.ScaleKeys.size();++n)
+		for (n=0; n<animationDump.ScaleKeys.size(); ++n)
 		{
-			ISkinnedMesh::SScaleKey *key=&animationDump.ScaleKeys[n];
-
-			//key->scale*=joint->LocalMatrix.getScale();
-
-			joint->ScaleKeys.push_back(*key);
+			joint->ScaleKeys.push_back(animationDump.ScaleKeys[n]);
 		}
 
 		joint->RotationKeys.reallocate(joint->RotationKeys.size()+animationDump.RotationKeys.size());
-		for (n=0;n<animationDump.RotationKeys.size();++n)
+		for (n=0; n<animationDump.RotationKeys.size(); ++n)
 		{
-			ISkinnedMesh::SRotationKey *key=&animationDump.RotationKeys[n];
-
-			core::matrix4 tmpMatrix;
-
-			tmpMatrix.setRotationRadians(
-				core::vector3df(key->rotation.X, key->rotation.Y, key->rotation.Z) );
-
-			tmpMatrix=joint->LocalMatrix*tmpMatrix;
-
-			//key->rotation  = core::quaternion(tmpMatrix);
-
-			joint->RotationKeys.push_back(*key);
+			joint->RotationKeys.push_back(animationDump.RotationKeys[n]);
 		}
 	}
 	else
@@ -1468,6 +1675,7 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace in Animation Key found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1478,6 +1686,7 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
 	if (keyType > 4)
 	{
 		os::Printer::log("Unknown key type found in Animation Key in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1492,7 +1701,7 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
 	for (u32 i=0; i<numberOfKeys; ++i)
 	{
 		// read time
-		const u32 time = readInt();
+		const f32 time = (f32)readInt();
 
 		// read keys
 		switch(keyType)
@@ -1505,6 +1714,7 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
 				if (readInt() != 4)
 				{
 					os::Printer::log("Expected 4 numbers in animation key in x file", ELL_WARNING);
+					os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 					return false;
 				}
 
@@ -1516,11 +1726,12 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
 				if (!checkForTwoFollowingSemicolons())
 				{
 					os::Printer::log("No finishing semicolon after quaternion animation key in x file", ELL_WARNING);
+					os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 					return false;
 				}
 
 				ISkinnedMesh::SRotationKey *key=AnimatedMesh->createRotationKey(joint);
-				key->frame=(f32)time;
+				key->frame=time;
 				key->rotation.set(X,Y,Z,W);
 			}
 			break;
@@ -1533,6 +1744,7 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
 				if (readInt() != 3)
 				{
 					os::Printer::log("Expected 3 numbers in animation key in x file", ELL_WARNING);
+					os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 					return false;
 				}
 
@@ -1542,19 +1754,20 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
 				if (!checkForTwoFollowingSemicolons())
 				{
 					os::Printer::log("No finishing semicolon after vector animation key in x file", ELL_WARNING);
+					os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 					return false;
 				}
 
 				if (keyType==2)
 				{
 					ISkinnedMesh::SPositionKey *key=AnimatedMesh->createPositionKey(joint);
-					key->frame=(f32)time;
+					key->frame=time;
 					key->position=vector;
 				}
 				else
 				{
 					ISkinnedMesh::SScaleKey *key=AnimatedMesh->createScaleKey(joint);
-					key->frame=(f32)time;
+					key->frame=time;
 					key->scale=vector;
 				}
 			}
@@ -1568,45 +1781,45 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
 				if (readInt() != 16)
 				{
 					os::Printer::log("Expected 16 numbers in animation key in x file", ELL_WARNING);
+					os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 					return false;
 				}
 
 				// read matrix
-				core::matrix4 Matrix;
+				core::matrix4 mat(core::matrix4::EM4CONST_NOTHING);
+				readMatrix(mat);
 
-				for (u32 m=0; m<4; ++m)
-					for (u32 n=0; n<4; ++n)
-						Matrix(m,n) = readFloat();
+				//mat=joint->LocalMatrix*mat;
 
-
-				//Matrix=joint->LocalMatrix*Matrix;
-
-				if (!checkForTwoFollowingSemicolons())
+				if (!checkForOneFollowingSemicolons())
 				{
 					os::Printer::log("No finishing semicolon after matrix animation key in x file", ELL_WARNING);
+					os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 					return false;
 				}
 
-				//core::vector3df rotation = Matrix.getRotationDegrees();
+				//core::vector3df rotation = mat.getRotationDegrees();
 
 				ISkinnedMesh::SRotationKey *keyR=AnimatedMesh->createRotationKey(joint);
-				keyR->frame=(f32)time;
-				//keyR->rotation.set(rotation.X*core::DEGTORAD,rotation.Y*core::DEGTORAD,rotation.Z*core::DEGTORAD);
-				keyR->rotation= core::quaternion(Matrix);
+				keyR->frame=time;
+				keyR->rotation= core::quaternion(mat);
 
 
 				ISkinnedMesh::SPositionKey *keyP=AnimatedMesh->createPositionKey(joint);
-				keyP->frame=(f32)time;
-				keyP->position=Matrix.getTranslation();
+				keyP->frame=time;
+				keyP->position=mat.getTranslation();
 
-				core::vector3df scale=Matrix.getScale();
-
-				//if (scale.X==0) scale.X=1;
-				//if (scale.Y==0) scale.Y=1;
-				//if (scale.Z==0) scale.Z=1;
 /*
+				core::vector3df scale=mat.getScale();
+
+				if (scale.X==0)
+					scale.X=1;
+				if (scale.Y==0)
+					scale.Y=1;
+				if (scale.Z==0)
+					scale.Z=1;
 				ISkinnedMesh::SScaleKey *keyS=AnimatedMesh->createScaleKey(joint);
-				keyS->frame=(f32)time;
+				keyS->frame=time;
 				keyS->scale=scale;
 */
 			}
@@ -1614,11 +1827,13 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
 		} // end switch
 	}
 
-	checkForOneFollowingSemicolons();
+	if (!checkForOneFollowingSemicolons())
+		--P;
 
 	if (!checkForClosingBrace())
 	{
 		os::Printer::log("No closing brace in animation key in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1635,18 +1850,21 @@ bool CXMeshFileLoader::parseDataObjectTextureFilename(core::stringc& texturename
 	if (!readHeadOfDataObject())
 	{
 		os::Printer::log("No opening brace in Texture filename found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
 	if (!getNextTokenAsString(texturename))
 	{
 		os::Printer::log("Unknown syntax while reading texture filename string in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
 	if (!checkForClosingBrace())
 	{
 		os::Printer::log("No closing brace in Texture filename found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_ERROR);
 		return false;
 	}
 
@@ -1873,20 +2091,14 @@ void CXMeshFileLoader::findNextNoneWhiteSpaceNumber()
 	if (BinaryFormat)
 		return;
 
-	while(true)
+	while((P < End) && (P[0] != '-') && (P[0] != '.') &&
+		!( core::isdigit(P[0])))
 	{
-		while((P < End) && (P[0] != '-') && (P[0] != '.') &&
-			!( core::isdigit(P[0])))
-			++P;
-
-		if (P >= End)
-			return;
-
 		// check if this is a comment
 		if ((P[0] == '/' && P[1] == '/') || P[0] == '#')
 			readUntilEndOfLine();
 		else
-			break;
+			++P;
 	}
 }
 
@@ -1900,7 +2112,11 @@ void CXMeshFileLoader::findNextNoneWhiteSpace()
 	while(true)
 	{
 		while((P < End) && core::isspace(P[0]))
+		{
+			if (*P=='\n')
+				++Line;
 			++P;
+		}
 
 		if (P >= End)
 			return;
@@ -1956,6 +2172,7 @@ void CXMeshFileLoader::readUntilEndOfLine()
 		if (P[0] == '\n' || P[0] == '\r')
 		{
 			++P;
+			++Line;
 			return;
 		}
 
@@ -2061,35 +2278,14 @@ bool CXMeshFileLoader::readVector3(core::vector3df& vec)
 }
 
 
-// read color without alpha value. Stops after second semicolon after blue value
-bool CXMeshFileLoader::readRGB(video::SColorf& color)
-{
-	color.r = readFloat();
-	color.g = readFloat();
-	color.b = readFloat();
-	color.a = 1.0f;
-	return checkForOneFollowingSemicolons();
-}
-
-
-// read color with alpha value. Stops after second semicolon after blue value
-bool CXMeshFileLoader::readRGBA(video::SColorf& color)
-{
-	color.r = readFloat();
-	color.g = readFloat();
-	color.b = readFloat();
-	color.a = readFloat();
-	return checkForOneFollowingSemicolons();
-}
-
-
 // read color without alpha value. Stops after second semicolon after blue value
 bool CXMeshFileLoader::readRGB(video::SColor& color)
 {
-	color.setRed( (u32)(readFloat()*255)) ;
-	color.setGreen( (u32)(readFloat()*255)) ;
-	color.setBlue( (u32)(readFloat()*255)) ;
-	color.setAlpha( 255 );
+	video::SColorf tmpColor;
+	tmpColor.r = readFloat();
+	tmpColor.g = readFloat();
+	tmpColor.b = readFloat();
+	color = tmpColor.toSColor();
 	return checkForOneFollowingSemicolons();
 }
 
@@ -2097,10 +2293,21 @@ bool CXMeshFileLoader::readRGB(video::SColor& color)
 // read color with alpha value. Stops after second semicolon after blue value
 bool CXMeshFileLoader::readRGBA(video::SColor& color)
 {
-	color.setRed( (u32)(readFloat()*255)) ;
-	color.setGreen( (u32)(readFloat()*255)) ;
-	color.setBlue( (u32)(readFloat()*255)) ;
-	color.setAlpha( (u32)(readFloat()*255)) ;
+	video::SColorf tmpColor;
+	tmpColor.r = readFloat();
+	tmpColor.g = readFloat();
+	tmpColor.b = readFloat();
+	tmpColor.a = readFloat();
+	color = tmpColor.toSColor();
+	return checkForOneFollowingSemicolons();
+}
+
+
+// read matrix from list of floats
+bool CXMeshFileLoader::readMatrix(core::matrix4& mat)
+{
+	for (u32 i=0; i<16; ++i)
+		mat[i] = readFloat();
 	return checkForOneFollowingSemicolons();
 }
 
@@ -2110,13 +2317,16 @@ core::stringc CXMeshFileLoader::stripPathFromString(core::stringc string, bool r
 	s32 slashIndex=string.findLast('/'); // forward slash
 	s32 backSlash=string.findLast('\\'); // back slash
 
-	if (backSlash>slashIndex) slashIndex=backSlash;
+	if (backSlash>slashIndex)
+		slashIndex=backSlash;
 
 	if (slashIndex==-1)//no slashes found
+	{
 		if (returnPath)
 			return core::stringc(); //no path to return
 		else
 			return string;
+	}
 
 	if (returnPath)
 		return string.subString(0, slashIndex + 1);
diff --git a/src/dep/src/irrlicht/CXMeshFileLoader.h b/src/dep/src/irrlicht/CXMeshFileLoader.h
index 58e542c..b01413d 100644
--- a/src/dep/src/irrlicht/CXMeshFileLoader.h
+++ b/src/dep/src/irrlicht/CXMeshFileLoader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -14,6 +14,7 @@ namespace irr
 {
 namespace io
 {
+	class IFileSystem;
 	class IReadFile;
 } // end namespace io
 namespace scene
@@ -26,7 +27,7 @@ class CXMeshFileLoader : public IMeshLoader
 public:
 
 	//! Constructor
-	CXMeshFileLoader(scene::ISceneManager* smgr);
+	CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs);
 
 	//! returns true if the file maybe is able to be loaded by this class
 	//! based on the file extension (e.g. ".cob")
@@ -78,7 +79,8 @@ public:
 		bool HasSkinning;
 		bool HasVertexColors;
 
-		core::array<ISkinnedMesh::SWeight*> Weights;
+		core::array<u32> WeightJoint;
+		core::array<u32> WeightNum;
 	};
 
 private:
@@ -161,13 +163,12 @@ private:
 	f32 readFloat();
 	bool readVector2(core::vector2df& vec);
 	bool readVector3(core::vector3df& vec);
-	bool readRGB(video::SColorf& color);
-	bool readRGBA(video::SColorf& color);
-
+	bool readMatrix(core::matrix4& mat);
 	bool readRGB(video::SColor& color);
 	bool readRGBA(video::SColor& color);
 
 	ISceneManager*	SceneManager;
+	io::IFileSystem*	FileSystem;
 
 	core::array<CSkinnedMesh::SJoint*> *AllJoints;
 
@@ -183,6 +184,7 @@ private:
 	const c8* P;
 	c8* End;
 	c8 FloatSize;
+	u32 Line;
 	core::stringc FilePath;
 
 	CSkinnedMesh::SJoint *CurFrame;
diff --git a/src/dep/src/irrlicht/CZBuffer.cpp b/src/dep/src/irrlicht/CZBuffer.cpp
index bc1a140..070e9d8 100644
--- a/src/dep/src/irrlicht/CZBuffer.cpp
+++ b/src/dep/src/irrlicht/CZBuffer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CZBuffer.h b/src/dep/src/irrlicht/CZBuffer.h
index 6714296..29c8845 100644
--- a/src/dep/src/irrlicht/CZBuffer.h
+++ b/src/dep/src/irrlicht/CZBuffer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/CZipReader.cpp b/src/dep/src/irrlicht/CZipReader.cpp
index 1723dcd..2bb8f1f 100644
--- a/src/dep/src/irrlicht/CZipReader.cpp
+++ b/src/dep/src/irrlicht/CZipReader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -298,13 +298,11 @@ void CZipReader::deletePathFromFilename(core::stringc& filename)
 	// delete path from filename
 	const c8* p = filename.c_str() + filename.size();
 
-	// suche ein slash oder den anfang.
+	// search for path separator or beginning
 
 	while (*p!='/' && *p!='\\' && p!=filename.c_str())
 		--p;
 
-	core::stringc newName;
-
 	if (p != filename.c_str())
 	{
 		++p;
diff --git a/src/dep/src/irrlicht/CZipReader.h b/src/dep/src/irrlicht/CZipReader.h
index 6b37e72..a6317b4 100644
--- a/src/dep/src/irrlicht/CZipReader.h
+++ b/src/dep/src/irrlicht/CZipReader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,11 +15,11 @@ namespace irr
 {
 namespace io
 {
-
-	const s16 ZIP_FILE_ENCRYPTED =		0x0001; // set if the file is encrypted
-	const s16 ZIP_INFO_IN_DATA_DESCRITOR =	0x0008; // the fields crc-32, compressed size
-														// and uncompressed size are set to zero in the local
-														// header
+	// set if the file is encrypted
+	const s16 ZIP_FILE_ENCRYPTED =		0x0001;
+	// the fields crc-32, compressed size and uncompressed size are set to
+	// zero in the local header
+	const s16 ZIP_INFO_IN_DATA_DESCRITOR =	0x0008;
 
 #if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__) 
 #	pragma pack( push, packing )
@@ -111,7 +111,8 @@ namespace io
 
 	private:
 		
-		//! scans for a local header, returns false if there is no more local file header.
+		//! scans for a local header, returns false if there is no more
+		//! local file header.
 		bool scanLocalHeader();
 		IReadFile* File;
 
@@ -134,7 +135,8 @@ namespace io
 	{
 	public:
 
-		CUnZipReader( IFileSystem *parent, const c8* basename, bool ignoreCase, bool ignorePaths);
+		CUnZipReader(IFileSystem *parent, const c8* basename,
+				bool ignoreCase, bool ignorePaths);
 
 		//! opens a file by file name
 		virtual IReadFile* openFile(const c8* filename);
diff --git a/src/dep/src/irrlicht/IBurningShader.cpp b/src/dep/src/irrlicht/IBurningShader.cpp
index c96ff9e..f3d9ad4 100644
--- a/src/dep/src/irrlicht/IBurningShader.cpp
+++ b/src/dep/src/irrlicht/IBurningShader.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -15,25 +15,27 @@ namespace video
 {
 
 	const tFixPointu IBurningShader::dithermask[ 4 * 4] =
-		{
-			0x00,0x80,0x20,0xa0,
-			0xc0,0x40,0xe0,0x60,
-			0x30,0xb0,0x10,0x90,
-			0xf0,0x70,0xd0,0x50
-		};
+	{
+		0x00,0x80,0x20,0xa0,
+		0xc0,0x40,0xe0,0x60,
+		0x30,0xb0,0x10,0x90,
+		0xf0,0x70,0xd0,0x50
+	};
 
 	IBurningShader::IBurningShader(IDepthBuffer* zbuffer)
-		:RenderTarget(0),ZBuffer(zbuffer)
+		:RenderTarget(0),DepthBuffer(zbuffer)
 	{
-		IT[0].Texture = 0;
-		IT[1].Texture = 0;
-
 		#ifdef _DEBUG
-		setDebugName("CTRTextureLightMap2_M1");
+		setDebugName("IBurningShader");
 		#endif
 
-		if (ZBuffer)
-			zbuffer->grab();
+		for ( u32 i = 0; i != BURNING_MATERIAL_MAX_TEXTURES; ++i )
+		{
+			IT[i].Texture = 0;
+		}
+
+		if ( DepthBuffer )
+			DepthBuffer->grab();
 	}
 
 
@@ -43,14 +45,14 @@ namespace video
 		if (RenderTarget)
 			RenderTarget->drop();
 
-		if (ZBuffer)
-			ZBuffer->drop();
+		if (DepthBuffer)
+			DepthBuffer->drop();
 
-		if ( IT[0].Texture )
-			IT[0].Texture->drop();
-
-		if ( IT[1].Texture )
-			IT[1].Texture->drop();
+		for ( u32 i = 0; i != BURNING_MATERIAL_MAX_TEXTURES; ++i )
+		{
+			if ( IT[i].Texture )
+				IT[i].Texture->drop();
+		}
 	}
 
 	//! sets a render target
@@ -63,14 +65,17 @@ namespace video
 
 		if (RenderTarget)
 		{
-			SurfaceWidth = RenderTarget->getDimension().Width;
 			RenderTarget->grab();
+
+			//lockedSurface = (tVideoSample*)RenderTarget->lock();
+			//lockedDepthBuffer = DepthBuffer->lock();
 		}
+
 	}
 
 
 	//! sets the Texture
-	void IBurningShader::setTexture( u32 stage, video::CSoftwareTexture2* texture, s32 lodLevel)
+	void IBurningShader::setTextureParam( u32 stage, video::CSoftwareTexture2* texture, s32 lodLevel)
 	{
 		sInternalTexture *it = &IT[stage];
 
@@ -93,12 +98,15 @@ namespace video
 			// prepare for optimal fixpoint
 			it->pitchlog2 = s32_log2_s32 ( it->Texture->getPitch() );
 
-			it->textureXMask = s32_to_fixPoint ( it->Texture->getSize().Width - 1 ) & FIX_POINT_UNSIGNED_MASK;
-			it->textureYMask = s32_to_fixPoint ( it->Texture->getSize().Height - 1 ) & FIX_POINT_UNSIGNED_MASK;
+			const core::dimension2d<s32> &dim = it->Texture->getSize();
+			it->textureXMask = s32_to_fixPoint ( dim.Width - 1 ) & FIX_POINT_UNSIGNED_MASK;
+			it->textureYMask = s32_to_fixPoint ( dim.Height - 1 ) & FIX_POINT_UNSIGNED_MASK;
+			it->data = (tVideoSample*) it->Texture->lock();
 		}
 	}
 
 
+
 } // end namespace video
 } // end namespace irr
 
diff --git a/src/dep/src/irrlicht/IBurningShader.h b/src/dep/src/irrlicht/IBurningShader.h
index 7cf80a1..3bdb76b 100644
--- a/src/dep/src/irrlicht/IBurningShader.h
+++ b/src/dep/src/irrlicht/IBurningShader.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,6 +13,9 @@
 #include "rect.h"
 #include "IDepthBuffer.h"
 #include "S4DVertex.h"
+#include "irrArray.h"
+#include "SLight.h"
+#include "SMaterial.h"
 
 
 namespace irr
@@ -21,6 +24,39 @@ namespace irr
 namespace video
 {
 
+	struct SBurningShaderLight
+	{
+		SLight org;
+
+		sVec4 posEyeSpace;
+
+		f32 constantAttenuation;
+		f32 linearAttenuation;
+		f32 quadraticAttenuation;
+
+		sVec4 AmbientColor;
+		sVec4 DiffuseColor;
+		sVec4 SpecularColor;
+	};
+
+	struct SBurningShaderLightSpace
+	{
+		core::array<SBurningShaderLight> Light;
+		sVec4 Global_AmbientLight;
+	};
+
+	struct SBurningShaderMaterial
+	{
+		SMaterial org;
+
+		sVec4 AmbientColor;
+		sVec4 DiffuseColor;
+		sVec4 SpecularColor;
+		sVec4 EmissiveColor;
+
+		u32 SpecularEnabled;	// == Power2
+	};
+
 	enum EBurningFFShader
 	{
 		ETR_FLAT = 0,
@@ -53,11 +89,13 @@ namespace video
 		ETR_TEXTURE_GOURAUD_ALPHA_NOZ,
 
 		ETR_TEXTURE_BLEND,
+		ETR_REFERENCE,
 		ETR_INVALID,
 
 		ETR2_COUNT
 	};
 
+
 	class IBurningShader : public virtual IReferenceCounted
 	{
 	public:
@@ -70,24 +108,24 @@ namespace video
 		virtual void setRenderTarget(video::IImage* surface, const core::rect<s32>& viewPort);
 
 		//! sets the Texture
-		virtual void setTexture( u32 stage, video::CSoftwareTexture2* texture, s32 lodLevel);
+		virtual void setTextureParam( u32 stage, video::CSoftwareTexture2* texture, s32 lodLevel);
 		virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) = 0;
 		virtual void drawLine ( const s4DVertex *a,const s4DVertex *b) {};
 
 		virtual void setParam ( u32 index, f32 value) {};
 		virtual void setZCompareFunc ( u32 func) {};
 
+		virtual void setMaterial ( const SBurningShaderMaterial &material ) {};
+
 	protected:
 
 		video::IImage* RenderTarget;
+		IDepthBuffer* DepthBuffer;
 
-		IDepthBuffer* ZBuffer;
-
-		s32 SurfaceWidth;
-		fp24* lockedZBuffer;
+		fp24* lockedDepthBuffer;
 		tVideoSample* lockedSurface;
 
-		sInternalTexture IT[2];
+		sInternalTexture IT[ BURNING_MATERIAL_MAX_TEXTURES ];
 
 		static const tFixPointu dithermask[ 4 * 4];
 	};
@@ -121,6 +159,9 @@ namespace video
 	IBurningShader* createTRTextureBlend(IDepthBuffer* zbuffer);
 	IBurningShader* createTRTextureInverseAlphaBlend(IDepthBuffer* zbuffer);
 
+	IBurningShader* createTriangleRendererReference(IDepthBuffer* zbuffer);
+
+
 
 } // end namespace video
 } // end namespace irr
diff --git a/src/dep/src/irrlicht/IDepthBuffer.h b/src/dep/src/irrlicht/IDepthBuffer.h
index 467b9cb..e151c15 100644
--- a/src/dep/src/irrlicht/IDepthBuffer.h
+++ b/src/dep/src/irrlicht/IDepthBuffer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -30,10 +30,14 @@ namespace video
 		virtual const core::dimension2d<s32>& getSize() const = 0;
 
 		//! locks the zbuffer
-		virtual fp24* lock() = 0;
+		virtual void* lock() = 0;
 
 		//! unlocks the zbuffer
 		virtual void unlock() = 0;
+
+		//! returns pitch of depthbuffer (in bytes)
+		virtual u32 getPitch() const = 0;
+
 	};
 
 
diff --git a/src/dep/src/irrlicht/IImagePresenter.h b/src/dep/src/irrlicht/IImagePresenter.h
index 7b38207..7507713 100644
--- a/src/dep/src/irrlicht/IImagePresenter.h
+++ b/src/dep/src/irrlicht/IImagePresenter.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -26,7 +26,7 @@ namespace video
 
 		virtual ~IImagePresenter() {};
 		//! presents a surface in the client area
-		virtual void present(video::IImage* surface, s32 windowId=0, core::rect<s32>* src=0 ) = 0;
+		virtual bool present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0 ) = 0;
 	};
 
 } // end namespace video
diff --git a/src/dep/src/irrlicht/ITriangleRenderer.h b/src/dep/src/irrlicht/ITriangleRenderer.h
index 731ced5..36f975d 100644
--- a/src/dep/src/irrlicht/ITriangleRenderer.h
+++ b/src/dep/src/irrlicht/ITriangleRenderer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -6,7 +6,6 @@
 #define __I_TRIANGLE_RENDERER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
-#include "IImage.h"
 #include "S2DVertex.h"
 #include "rect.h"
 #include "IZBuffer.h"
@@ -15,6 +14,7 @@ namespace irr
 {
 namespace video
 {
+	class IImage;
 
 	enum ETriangleRenderer
 	{
@@ -35,9 +35,6 @@ namespace video
 	{
 	public:
 	
-		//! destructor
-		virtual ~ITriangleRenderer() {};
-
 		//! sets a render target
 		virtual void setRenderTarget(video::IImage* surface, const core::rect<s32>& viewPort) = 0;
 
diff --git a/src/dep/src/irrlicht/IZBuffer.h b/src/dep/src/irrlicht/IZBuffer.h
index d345d4a..3f171b7 100644
--- a/src/dep/src/irrlicht/IZBuffer.h
+++ b/src/dep/src/irrlicht/IZBuffer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/Irrlicht.cpp b/src/dep/src/irrlicht/Irrlicht.cpp
index ade41f7..964de40 100644
--- a/src/dep/src/irrlicht/Irrlicht.cpp
+++ b/src/dep/src/irrlicht/Irrlicht.cpp
@@ -1,14 +1,14 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "IrrCompileConfig.h"
 
-static const char* const copyright = "Irrlicht Engine (c) 2002-2007 Nikolaus Gebhardt";
+static const char* const copyright = "Irrlicht Engine (c) 2002-2009 Nikolaus Gebhardt";
 
 #ifdef _IRR_WINDOWS_
 	#include <windows.h>
-	#if defined(_DEBUG) && !defined(__GNUWIN32__)
+	#if defined(_DEBUG) && !defined(__GNUWIN32__) && !defined(_WIN32_WCE)
 		#include <crtdbg.h>
 	#endif // _DEBUG
 #endif
@@ -24,30 +24,32 @@ namespace irr
 	//! stub for calling createDeviceEx
 	IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDevice(video::E_DRIVER_TYPE driverType,
 			const core::dimension2d<s32>& windowSize,
-			u32 bits, bool fullscreen, 
-			bool stencilbuffer, bool vsync, IEventReceiver* res,
-			const char* version)
+			u32 bits, bool fullscreen,
+			bool stencilbuffer, bool vsync, IEventReceiver* res)
 	{
 		SIrrlichtCreationParameters p;
 		p.DriverType = driverType;
 		p.WindowSize = windowSize;
-		p.Bits = bits;
+		p.Bits = (u8)bits;
 		p.Fullscreen = fullscreen;
 		p.Stencilbuffer = stencilbuffer;
 		p.Vsync = vsync;
-		p.EventReceiver = res;	
-		p.SDK_version_do_not_use = version;
+		p.EventReceiver = res;
 
 		return createDeviceEx(p);
 	}
 
+namespace core
+{
+	const matrix4 IdentityMatrix(matrix4::EM4CONST_IDENTITY);
+}
 } // end namespace irr
 
 
 #if defined(_IRR_WINDOWS_API_)
 
-BOOL APIENTRY DllMain( HANDLE hModule, 
-                       DWORD  ul_reason_for_call, 
+BOOL APIENTRY DllMain( HANDLE hModule,
+                       DWORD  ul_reason_for_call,
                        LPVOID lpReserved )
 {
 	// _crtBreakAlloc = 139;
@@ -55,7 +57,7 @@ BOOL APIENTRY DllMain( HANDLE hModule,
     switch (ul_reason_for_call)
 	{
 		case DLL_PROCESS_ATTACH:
-			#if defined(_DEBUG) && !defined(__GNUWIN32__) && !defined(__BORLANDC__)
+			#if defined(_DEBUG) && !defined(__GNUWIN32__) && !defined(__BORLANDC__) && !defined (_WIN32_WCE)
 				_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF | _CRTDBG_ALLOC_MEM_DF);
 			#endif
 			break;
diff --git a/src/dep/src/irrlicht/Irrlicht.dev b/src/dep/src/irrlicht/Irrlicht.dev
index 2fd3271..03983aa 100644
--- a/src/dep/src/irrlicht/Irrlicht.dev
+++ b/src/dep/src/irrlicht/Irrlicht.dev
@@ -7,9 +7,9 @@ Type=3
 Compiler=-D__GNUWIN32__ -W -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D_USRDLL -DIRRLICHT_EXPORTS_@@_
 CppCompiler=-D__GNUWIN32__ -W -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D_USRDLL -DIRRLICHT_EXPORTS_@@_
 Includes=..\..\include;zlib
-Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lopengl32_@@_
+Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lwinmm -lopengl32_@@_
 Libs=
-UnitCount=592
+UnitCount=607
 Folders=doc,gui_impl,include,include/core,include/gui,include/io,include/scene,include/video,io_impl,other_impl,other_impl/extern,other_impl/extern/jpeglib,other_impl/extern/libpng,other_impl/extern/zlib,scene_impl,scene_impl/animators,scene_impl/collision,scene_impl/mesh,scene_impl/mesh/loaders,scene_impl/mesh/writers,scene_impl/nodes,scene_impl/nodes/particles,video_impl,"video_impl/Burning Video",video_impl/DirectX8,video_impl/DirectX9,video_impl/Null,video_impl/OpenGL,video_impl/Software
 ObjFiles=
 PrivateResource=
@@ -1890,46 +1890,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit187]
-FileName=CCameraFPSSceneNode.cpp
-Folder=scene_impl/nodes
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit188]
-FileName=CCameraFPSSceneNode.h
-Folder=scene_impl/nodes
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit189]
-FileName=CCameraMayaSceneNode.cpp
-Folder=scene_impl/nodes
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit190]
-FileName=CCameraMayaSceneNode.h
-Folder=scene_impl/nodes
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit191]
 FileName=CCameraSceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -1939,7 +1899,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit192]
+[Unit188]
 FileName=CCameraSceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -1949,7 +1909,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit193]
+[Unit189]
 FileName=CColladaFileLoader.cpp
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -1959,7 +1919,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit194]
+[Unit190]
 FileName=CColladaFileLoader.h
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -1969,7 +1929,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit195]
+[Unit191]
 FileName=CCSMLoader.cpp
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -1979,7 +1939,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit196]
+[Unit192]
 FileName=CCSMLoader.h
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -1989,7 +1949,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit197]
+[Unit193]
 FileName=CDMFLoader.cpp
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -1999,7 +1959,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit198]
+[Unit194]
 FileName=CDMFLoader.h
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2009,7 +1969,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit199]
+[Unit195]
 FileName=CDummyTransformationSceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -2019,7 +1979,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit200]
+[Unit196]
 FileName=CDummyTransformationSceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -2029,7 +1989,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit201]
+[Unit197]
 FileName=CEmptySceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -2039,7 +1999,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit202]
+[Unit198]
 FileName=CEmptySceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -2049,7 +2009,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit203]
+[Unit199]
 FileName=CGeometryCreator.cpp
 Folder=scene_impl/mesh
 Compile=1
@@ -2059,7 +2019,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit204]
+[Unit200]
 FileName=CGeometryCreator.h
 Folder=scene_impl/mesh
 Compile=1
@@ -2069,7 +2029,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit205]
+[Unit201]
 FileName=CLightSceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -2079,7 +2039,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit206]
+[Unit202]
 FileName=CLightSceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -2089,7 +2049,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit207]
+[Unit203]
 FileName=CLMTSMeshFileLoader.cpp
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2099,7 +2059,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit208]
+[Unit204]
 FileName=CLMTSMeshFileLoader.h
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2109,7 +2069,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit209]
+[Unit205]
 FileName=CMeshManipulator.cpp
 Folder=scene_impl/mesh
 Compile=1
@@ -2119,7 +2079,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit210]
+[Unit206]
 FileName=CMeshManipulator.h
 Folder=scene_impl/mesh
 Compile=1
@@ -2129,7 +2089,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit211]
+[Unit207]
 FileName=CMeshSceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -2139,7 +2099,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit212]
+[Unit208]
 FileName=CMeshSceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -2149,7 +2109,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit213]
+[Unit209]
 FileName=CMetaTriangleSelector.cpp
 Folder=scene_impl/collision
 Compile=1
@@ -2159,7 +2119,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit214]
+[Unit210]
 FileName=CMetaTriangleSelector.h
 Folder=scene_impl/collision
 Compile=1
@@ -2169,7 +2129,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit215]
+[Unit211]
 FileName=CMY3DHelper.h
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2179,7 +2139,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit216]
+[Unit212]
 FileName=CMY3DMeshFileLoader.cpp
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2189,7 +2149,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit217]
+[Unit213]
 FileName=CMY3DMeshFileLoader.h
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2199,9 +2159,9 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit218]
-FileName=CMY3DStuff.h
-Folder=scene_impl/mesh/loaders
+[Unit214]
+FileName=..\..\include\EGUIAlignment.h
+Folder=include/gui
 Compile=1
 CompileCpp=1
 Link=1
@@ -2209,7 +2169,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit219]
+[Unit215]
 FileName=COCTLoader.cpp
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2219,7 +2179,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit220]
+[Unit216]
 FileName=COCTLoader.h
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2229,7 +2189,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit221]
+[Unit217]
 FileName=COctTreeSceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -2239,7 +2199,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit222]
+[Unit218]
 FileName=COctTreeSceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -2249,7 +2209,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit223]
+[Unit219]
 FileName=COctTreeTriangleSelector.cpp
 Folder=scene_impl/collision
 Compile=1
@@ -2259,7 +2219,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit224]
+[Unit220]
 FileName=COctTreeTriangleSelector.h
 Folder=scene_impl/collision
 Compile=1
@@ -2269,7 +2229,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit225]
+[Unit221]
 FileName=CParticleBoxEmitter.cpp
 Folder=scene_impl/nodes/particles
 Compile=1
@@ -2279,7 +2239,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit226]
+[Unit222]
 FileName=CParticleBoxEmitter.h
 Folder=scene_impl/nodes/particles
 Compile=1
@@ -2289,7 +2249,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit227]
+[Unit223]
 FileName=CParticleFadeOutAffector.cpp
 Folder=scene_impl/nodes/particles
 Compile=1
@@ -2299,7 +2259,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit228]
+[Unit224]
 FileName=CParticleFadeOutAffector.h
 Folder=scene_impl/nodes/particles
 Compile=1
@@ -2309,7 +2269,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit229]
+[Unit225]
 FileName=CParticleGravityAffector.cpp
 Folder=scene_impl/nodes/particles
 Compile=1
@@ -2319,7 +2279,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit230]
+[Unit226]
 FileName=CParticleGravityAffector.h
 Folder=scene_impl/nodes/particles
 Compile=1
@@ -2329,7 +2289,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit231]
+[Unit227]
 FileName=CParticlePointEmitter.cpp
 Folder=scene_impl/nodes/particles
 Compile=1
@@ -2339,7 +2299,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit232]
+[Unit228]
 FileName=CParticlePointEmitter.h
 Folder=scene_impl/nodes/particles
 Compile=1
@@ -2349,7 +2309,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit233]
+[Unit229]
 FileName=CParticleSystemSceneNode.cpp
 Folder=scene_impl/nodes/particles
 Compile=1
@@ -2359,7 +2319,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit234]
+[Unit230]
 FileName=CParticleSystemSceneNode.h
 Folder=scene_impl/nodes/particles
 Compile=1
@@ -2369,7 +2329,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit235]
+[Unit231]
 FileName=CQ3LevelMesh.cpp
 Folder=scene_impl/mesh
 Compile=1
@@ -2379,7 +2339,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit236]
+[Unit232]
 FileName=CQ3LevelMesh.h
 Folder=scene_impl/mesh
 Compile=1
@@ -2389,7 +2349,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit237]
+[Unit233]
 FileName=CSceneCollisionManager.cpp
 Folder=scene_impl/collision
 Compile=1
@@ -2399,7 +2359,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit238]
+[Unit234]
 FileName=CSceneCollisionManager.h
 Folder=scene_impl/collision
 Compile=1
@@ -2409,7 +2369,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit239]
+[Unit235]
 FileName=CSceneManager.cpp
 Folder=scene_impl
 Compile=1
@@ -2419,7 +2379,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit240]
+[Unit236]
 FileName=CSceneManager.h
 Folder=scene_impl
 Compile=1
@@ -2429,7 +2389,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit241]
+[Unit237]
 FileName=CSceneNodeAnimatorCollisionResponse.cpp
 Folder=scene_impl/animators
 Compile=1
@@ -2439,7 +2399,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit242]
+[Unit238]
 FileName=CSceneNodeAnimatorCollisionResponse.h
 Folder=scene_impl/animators
 Compile=1
@@ -2449,7 +2409,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit243]
+[Unit239]
 FileName=CSceneNodeAnimatorDelete.cpp
 Folder=scene_impl/animators
 Compile=1
@@ -2459,7 +2419,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit244]
+[Unit240]
 FileName=CSceneNodeAnimatorDelete.h
 Folder=scene_impl/animators
 Compile=1
@@ -2469,7 +2429,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit245]
+[Unit241]
 FileName=CSceneNodeAnimatorFlyCircle.cpp
 Folder=scene_impl/animators
 Compile=1
@@ -2479,7 +2439,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit246]
+[Unit242]
 FileName=CSceneNodeAnimatorFlyCircle.h
 Folder=scene_impl/animators
 Compile=1
@@ -2489,7 +2449,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit247]
+[Unit243]
 FileName=CSceneNodeAnimatorFlyStraight.cpp
 Folder=scene_impl/animators
 Compile=1
@@ -2499,7 +2459,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit248]
+[Unit244]
 FileName=CSceneNodeAnimatorFlyStraight.h
 Folder=scene_impl/animators
 Compile=1
@@ -2509,7 +2469,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit249]
+[Unit245]
 FileName=CSceneNodeAnimatorFollowSpline.cpp
 Folder=scene_impl/animators
 Compile=1
@@ -2519,7 +2479,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit250]
+[Unit246]
 FileName=CSceneNodeAnimatorFollowSpline.h
 Folder=scene_impl/animators
 Compile=1
@@ -2529,7 +2489,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit251]
+[Unit247]
 FileName=CSceneNodeAnimatorRotation.cpp
 Folder=scene_impl/animators
 Compile=1
@@ -2539,7 +2499,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit252]
+[Unit248]
 FileName=CSceneNodeAnimatorRotation.h
 Folder=scene_impl/animators
 Compile=1
@@ -2549,7 +2509,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit253]
+[Unit249]
 FileName=CSceneNodeAnimatorTexture.cpp
 Folder=scene_impl/animators
 Compile=1
@@ -2559,7 +2519,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit254]
+[Unit250]
 FileName=CSceneNodeAnimatorTexture.h
 Folder=scene_impl/animators
 Compile=1
@@ -2569,7 +2529,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit255]
+[Unit251]
 FileName=CShadowVolumeSceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -2579,7 +2539,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit256]
+[Unit252]
 FileName=CShadowVolumeSceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -2589,7 +2549,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit257]
+[Unit253]
 FileName=CSkyBoxSceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -2599,7 +2559,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit258]
+[Unit254]
 FileName=CSkyBoxSceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -2609,7 +2569,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit259]
+[Unit255]
 FileName=COBJMeshFileLoader.cpp
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2619,7 +2579,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit260]
+[Unit256]
 FileName=COBJMeshFileLoader.h
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2629,7 +2589,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit261]
+[Unit257]
 FileName=CTerrainSceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -2639,7 +2599,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit262]
+[Unit258]
 FileName=CTerrainSceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -2649,7 +2609,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit263]
+[Unit259]
 FileName=CTerrainTriangleSelector.cpp
 Folder=scene_impl/collision
 Compile=1
@@ -2659,7 +2619,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit264]
+[Unit260]
 FileName=CTerrainTriangleSelector.h
 Folder=scene_impl/collision
 Compile=1
@@ -2669,7 +2629,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit265]
+[Unit261]
 FileName=CTextSceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -2679,7 +2639,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit266]
+[Unit262]
 FileName=CTextSceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -2689,7 +2649,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit267]
+[Unit263]
 FileName=CTriangleBBSelector.cpp
 Folder=scene_impl/collision
 Compile=1
@@ -2699,7 +2659,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit268]
+[Unit264]
 FileName=CTriangleBBSelector.h
 Folder=scene_impl/collision
 Compile=1
@@ -2709,7 +2669,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit269]
+[Unit265]
 FileName=CTriangleSelector.cpp
 Folder=scene_impl/collision
 Compile=1
@@ -2719,7 +2679,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit270]
+[Unit266]
 FileName=CTriangleSelector.h
 Folder=scene_impl/collision
 Compile=1
@@ -2729,7 +2689,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit271]
+[Unit267]
 FileName=CWaterSurfaceSceneNode.cpp
 Folder=scene_impl/nodes
 Compile=1
@@ -2739,7 +2699,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit272]
+[Unit268]
 FileName=CWaterSurfaceSceneNode.h
 Folder=scene_impl/nodes
 Compile=1
@@ -2749,7 +2709,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit273]
+[Unit269]
 FileName=..\..\include\SExposedVideoData.h
 Folder=include/video
 Compile=1
@@ -2759,7 +2719,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit274]
+[Unit270]
 FileName=..\..\include\SKeyMap.h
 Folder=include
 Compile=1
@@ -2769,7 +2729,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit275]
+[Unit271]
 FileName=..\..\include\SMeshBufferTangents.h
 Folder=include/video
 Compile=1
@@ -2779,7 +2739,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit276]
+[Unit272]
 FileName=..\..\include\SParticle.h
 Folder=include/scene
 Compile=1
@@ -2789,7 +2749,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit277]
+[Unit273]
 FileName=CXMeshFileLoader.cpp
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -2799,20 +2759,60 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit278]
+[Unit274]
 FileName=CXMeshFileLoader.h
-CompileCpp=1
 Folder=scene_impl/mesh/loaders
 Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit275]
+FileName=OctTree.h
+Folder=scene_impl/mesh
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit276]
+FileName=CFileList.cpp
+Folder=io_impl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit277]
+FileName=CFileList.h
+Folder=io_impl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit278]
+FileName=CFileSystem.cpp
+CompileCpp=1
+Folder=io_impl
+Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
 [Unit279]
-FileName=OctTree.h
+FileName=CFileSystem.h
 CompileCpp=1
-Folder=scene_impl/mesh
+Folder=io_impl
 Compile=1
 Link=1
 Priority=1000
@@ -2820,7 +2820,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit280]
-FileName=CFileList.cpp
+FileName=CLimitReadFile.cpp
 CompileCpp=1
 Folder=io_impl
 Compile=1
@@ -2830,7 +2830,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit281]
-FileName=CFileList.h
+FileName=CLimitReadFile.h
 CompileCpp=1
 Folder=io_impl
 Compile=1
@@ -2840,46 +2840,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit282]
-FileName=CFileSystem.cpp
-Folder=io_impl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit283]
-FileName=CFileSystem.h
-Folder=io_impl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit284]
-FileName=CLimitReadFile.cpp
-Folder=io_impl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit285]
-FileName=CLimitReadFile.h
-Folder=io_impl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit286]
 FileName=CMemoryReadFile.cpp
 Folder=io_impl
 Compile=1
@@ -2889,7 +2849,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit287]
+[Unit283]
 FileName=CMemoryReadFile.h
 Folder=io_impl
 Compile=1
@@ -2899,7 +2859,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit288]
+[Unit284]
 FileName=CReadFile.cpp
 Folder=io_impl
 Compile=1
@@ -2909,7 +2869,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit289]
+[Unit285]
 FileName=CReadFile.h
 Folder=io_impl
 Compile=1
@@ -2919,7 +2879,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit290]
+[Unit286]
 FileName=CWriteFile.cpp
 Folder=io_impl
 Compile=1
@@ -2929,7 +2889,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit291]
+[Unit287]
 FileName=CWriteFile.h
 Folder=io_impl
 Compile=1
@@ -2939,7 +2899,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit292]
+[Unit288]
 FileName=CXMLReader.cpp
 Folder=io_impl
 Compile=1
@@ -2949,7 +2909,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit293]
+[Unit289]
 FileName=CXMLReader.h
 Folder=io_impl
 Compile=1
@@ -2959,7 +2919,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit294]
+[Unit290]
 FileName=CXMLWriter.cpp
 Folder=io_impl
 Compile=1
@@ -2969,7 +2929,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit295]
+[Unit291]
 FileName=CXMLWriter.h
 Folder=io_impl
 Compile=1
@@ -2979,7 +2939,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit296]
+[Unit292]
 FileName=CZipReader.cpp
 Folder=io_impl
 Compile=1
@@ -2989,7 +2949,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit297]
+[Unit293]
 FileName=CZipReader.h
 Folder=io_impl
 Compile=1
@@ -2999,7 +2959,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit298]
+[Unit294]
 FileName=irrXML.cpp
 Folder=io_impl
 Compile=1
@@ -3009,7 +2969,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit299]
+[Unit295]
 FileName=zlib\adler32.c
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3019,7 +2979,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit300]
+[Unit296]
 FileName=zlib\compress.c
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3029,7 +2989,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit301]
+[Unit297]
 FileName=zlib\crc32.c
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3039,7 +2999,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit302]
+[Unit298]
 FileName=zlib\crc32.h
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3049,7 +3009,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit303]
+[Unit299]
 FileName=zlib\deflate.c
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3059,7 +3019,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit304]
+[Unit300]
 FileName=zlib\deflate.h
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3069,7 +3029,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit305]
+[Unit301]
 FileName=zlib\inffast.c
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3079,7 +3039,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit306]
+[Unit302]
 FileName=zlib\inffast.h
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3089,7 +3049,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit307]
+[Unit303]
 FileName=zlib\inflate.c
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3099,7 +3059,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit308]
+[Unit304]
 FileName=zlib\inftrees.c
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3109,7 +3069,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit309]
+[Unit305]
 FileName=zlib\inftrees.h
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3119,7 +3079,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit310]
+[Unit306]
 FileName=zlib\trees.c
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3129,7 +3089,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit311]
+[Unit307]
 FileName=zlib\trees.h
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3139,7 +3099,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit312]
+[Unit308]
 FileName=zlib\uncompr.c
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3149,7 +3109,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit313]
+[Unit309]
 FileName=zlib\zconf.h
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3159,7 +3119,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit314]
+[Unit310]
 FileName=zlib\zlib.h
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3169,7 +3129,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit315]
+[Unit311]
 FileName=zlib\zutil.c
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3179,7 +3139,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit316]
+[Unit312]
 FileName=zlib\zutil.h
 Folder=other_impl/extern/zlib
 Compile=1
@@ -3189,7 +3149,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit317]
+[Unit313]
 FileName=jpeglib\cderror.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3199,27 +3159,27 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit318]
-FileName=jpeglib\cdjpeg.c
-Folder=other_impl/extern/jpeglib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit319]
-FileName=jpeglib\cdjpeg.h
-Folder=other_impl/extern/jpeglib
-Compile=1
+[Unit314]
+FileName=CSceneNodeAnimatorCameraFPS.h
 CompileCpp=1
+Folder=scene_impl/animators
+Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit320]
+[Unit315]
+FileName=CSceneNodeAnimatorCameraMaya.cpp
+CompileCpp=1
+Folder=scene_impl/animators
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit316]
 FileName=jpeglib\jcapimin.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3229,7 +3189,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit321]
+[Unit317]
 FileName=jpeglib\jcapistd.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3239,7 +3199,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit322]
+[Unit318]
 FileName=jpeglib\jccoefct.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3249,7 +3209,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit323]
+[Unit319]
 FileName=jpeglib\jccolor.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3259,7 +3219,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit324]
+[Unit320]
 FileName=jpeglib\jcdctmgr.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3269,7 +3229,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit325]
+[Unit321]
 FileName=jpeglib\jchuff.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3279,7 +3239,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit326]
+[Unit322]
 FileName=jpeglib\jchuff.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3289,7 +3249,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit327]
+[Unit323]
 FileName=jpeglib\jcinit.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3299,7 +3259,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit328]
+[Unit324]
 FileName=jpeglib\jcmainct.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3309,7 +3269,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit329]
+[Unit325]
 FileName=jpeglib\jcmarker.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3319,7 +3279,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit330]
+[Unit326]
 FileName=jpeglib\jcmaster.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3329,7 +3289,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit331]
+[Unit327]
 FileName=jpeglib\jcomapi.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3339,7 +3299,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit332]
+[Unit328]
 FileName=jpeglib\jconfig.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3349,7 +3309,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit333]
+[Unit329]
 FileName=jpeglib\jcparam.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3359,7 +3319,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit334]
+[Unit330]
 FileName=jpeglib\jcphuff.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3369,7 +3329,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit335]
+[Unit331]
 FileName=jpeglib\jcprepct.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3379,7 +3339,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit336]
+[Unit332]
 FileName=jpeglib\jcsample.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3389,7 +3349,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit337]
+[Unit333]
 FileName=jpeglib\jctrans.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3399,7 +3359,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit338]
+[Unit334]
 FileName=jpeglib\jdapimin.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3409,7 +3369,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit339]
+[Unit335]
 FileName=jpeglib\jdapistd.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3419,7 +3379,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit340]
+[Unit336]
 FileName=jpeglib\jdatadst.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3429,7 +3389,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit341]
+[Unit337]
 FileName=jpeglib\jdatasrc.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3439,7 +3399,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit342]
+[Unit338]
 FileName=jpeglib\jdcoefct.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3449,7 +3409,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit343]
+[Unit339]
 FileName=jpeglib\jdcolor.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3459,7 +3419,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit344]
+[Unit340]
 FileName=jpeglib\jdct.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3469,7 +3429,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit345]
+[Unit341]
 FileName=jpeglib\jddctmgr.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3479,7 +3439,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit346]
+[Unit342]
 FileName=jpeglib\jdhuff.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3489,7 +3449,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit347]
+[Unit343]
 FileName=jpeglib\jdhuff.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3499,7 +3459,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit348]
+[Unit344]
 FileName=jpeglib\jdinput.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3509,7 +3469,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit349]
+[Unit345]
 FileName=jpeglib\jdmainct.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3519,7 +3479,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit350]
+[Unit346]
 FileName=jpeglib\jdmarker.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3529,7 +3489,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit351]
+[Unit347]
 FileName=jpeglib\jdmaster.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3539,7 +3499,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit352]
+[Unit348]
 FileName=jpeglib\jdmerge.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3549,7 +3509,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit353]
+[Unit349]
 FileName=jpeglib\jdphuff.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3559,7 +3519,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit354]
+[Unit350]
 FileName=jpeglib\jdpostct.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3569,7 +3529,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit355]
+[Unit351]
 FileName=jpeglib\jdsample.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3579,7 +3539,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit356]
+[Unit352]
 FileName=jpeglib\jdtrans.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3589,7 +3549,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit357]
+[Unit353]
 FileName=jpeglib\jerror.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3599,7 +3559,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit358]
+[Unit354]
 FileName=jpeglib\jerror.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3609,7 +3569,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit359]
+[Unit355]
 FileName=jpeglib\jfdctflt.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3619,7 +3579,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit360]
+[Unit356]
 FileName=jpeglib\jfdctfst.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3629,7 +3589,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit361]
+[Unit357]
 FileName=jpeglib\jfdctint.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3639,7 +3599,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit362]
+[Unit358]
 FileName=jpeglib\jidctflt.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3649,7 +3609,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit363]
+[Unit359]
 FileName=jpeglib\jidctfst.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3659,7 +3619,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit364]
+[Unit360]
 FileName=jpeglib\jidctint.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3669,7 +3629,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit365]
+[Unit361]
 FileName=jpeglib\jidctred.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3679,7 +3639,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit366]
+[Unit362]
 FileName=jpeglib\jinclude.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3689,7 +3649,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit367]
+[Unit363]
 FileName=jpeglib\jmemmgr.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3699,7 +3659,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit368]
+[Unit364]
 FileName=jpeglib\jmemnobs.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3709,7 +3669,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit369]
+[Unit365]
 FileName=jpeglib\jmemsys.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3719,7 +3679,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit370]
+[Unit366]
 FileName=jpeglib\jmorecfg.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3729,7 +3689,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit371]
+[Unit367]
 FileName=jpeglib\jpegint.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3739,7 +3699,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit372]
+[Unit368]
 FileName=jpeglib\jpeglib.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3749,7 +3709,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit373]
+[Unit369]
 FileName=jpeglib\jquant1.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3759,7 +3719,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit374]
+[Unit370]
 FileName=jpeglib\jquant2.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3769,7 +3729,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit375]
+[Unit371]
 FileName=jpeglib\jutils.c
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3779,7 +3739,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit376]
+[Unit372]
 FileName=jpeglib\jversion.h
 Folder=other_impl/extern/jpeglib
 Compile=1
@@ -3789,7 +3749,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit377]
+[Unit373]
 FileName=CMD3MeshFileLoader.h
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -3799,7 +3759,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit378]
+[Unit374]
 FileName=CMD3MeshFileLoader.cpp
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -3809,7 +3769,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit379]
+[Unit375]
 FileName=CAnimatedMeshMD3.h
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -3819,7 +3779,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit380]
+[Unit376]
 FileName=CAnimatedMeshMD3.cpp
 Folder=scene_impl/mesh/loaders
 Compile=1
@@ -3829,7 +3789,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit381]
+[Unit377]
 FileName=CGUISpriteBank.h
 Folder=gui_impl
 Compile=1
@@ -3839,47 +3799,47 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit382]
+[Unit378]
 FileName=CGUISpriteBank.cpp
-CompileCpp=1
 Folder=gui_impl
 Compile=1
+CompileCpp=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit383]
+[Unit379]
 FileName=..\..\include\IGUIFontBitmap.h
-CompileCpp=1
 Folder=include/gui
 Compile=1
+CompileCpp=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit384]
+[Unit380]
 FileName=..\..\include\IGUISpriteBank.h
-CompileCpp=1
 Folder=include/gui
 Compile=1
+CompileCpp=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit385]
+[Unit381]
 FileName=COpenGLExtensionHandler.cpp
-CompileCpp=1
 Folder=video_impl/OpenGL
 Compile=1
+CompileCpp=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit386]
+[Unit382]
 FileName=CGUISpinBox.h
 CompileCpp=1
 Folder=gui_impl
@@ -3889,7 +3849,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit387]
+[Unit383]
 FileName=CGUISpinBox.cpp
 CompileCpp=1
 Folder=gui_impl
@@ -3899,7 +3859,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit388]
+[Unit384]
 FileName=..\..\include\IGUISpinBox.h
 CompileCpp=1
 Folder=include/gui
@@ -3909,7 +3869,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit389]
+[Unit385]
 FileName=..\..\include\SViewFrustum.h
 CompileCpp=1
 Folder=include/scene
@@ -3919,17 +3879,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit390]
+[Unit386]
 FileName=..\..\include\triangle3d.h
+CompileCpp=1
 Folder=include/core
 Compile=1
-CompileCpp=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit391]
+[Unit387]
 FileName=libpng\png.c
 CompileCpp=0
 Folder=other_impl/extern/libpng
@@ -3939,7 +3899,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit392]
+[Unit388]
 FileName=libpng\png.h
 CompileCpp=1
 Folder=other_impl/extern/libpng
@@ -3949,7 +3909,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit393]
+[Unit389]
 FileName=libpng\pngconf.h
 CompileCpp=1
 Folder=other_impl/extern/libpng
@@ -3959,17 +3919,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit394]
+[Unit390]
 FileName=libpng\pngerror.c
-CompileCpp=0
 Folder=other_impl/extern/libpng
 Compile=1
+CompileCpp=0
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit395]
+[Unit391]
 FileName=libpng\pngget.c
 CompileCpp=0
 Folder=other_impl/extern/libpng
@@ -3979,47 +3939,47 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit396]
+[Unit392]
 FileName=libpng\pngmem.c
+CompileCpp=0
 Folder=other_impl/extern/libpng
 Compile=1
-CompileCpp=0
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit397]
+[Unit393]
 FileName=libpng\pngpread.c
+CompileCpp=0
 Folder=other_impl/extern/libpng
 Compile=1
-CompileCpp=0
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit398]
+[Unit394]
 FileName=libpng\pngread.c
+CompileCpp=0
 Folder=other_impl/extern/libpng
 Compile=1
-CompileCpp=0
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit399]
+[Unit395]
 FileName=libpng\pngrio.c
+CompileCpp=0
 Folder=other_impl/extern/libpng
 Compile=1
-CompileCpp=0
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit400]
+[Unit396]
 FileName=libpng\pngrtran.c
 Folder=other_impl/extern/libpng
 Compile=1
@@ -4029,7 +3989,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit401]
+[Unit397]
 FileName=libpng\pngrutil.c
 Folder=other_impl/extern/libpng
 Compile=1
@@ -4039,7 +3999,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit402]
+[Unit398]
 FileName=libpng\pngset.c
 Folder=other_impl/extern/libpng
 Compile=1
@@ -4049,7 +4009,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit403]
+[Unit399]
 FileName=libpng\pngtrans.c
 Folder=other_impl/extern/libpng
 Compile=1
@@ -4059,7 +4019,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit404]
+[Unit400]
 FileName=libpng\pngwio.c
 Folder=other_impl/extern/libpng
 Compile=1
@@ -4069,7 +4029,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit405]
+[Unit401]
 FileName=libpng\pngwrite.c
 Folder=other_impl/extern/libpng
 Compile=1
@@ -4079,7 +4039,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit406]
+[Unit402]
 FileName=libpng\pngwtran.c
 Folder=other_impl/extern/libpng
 Compile=1
@@ -4089,7 +4049,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit407]
+[Unit403]
 FileName=libpng\pngwutil.c
 Folder=other_impl/extern/libpng
 Compile=1
@@ -4099,7 +4059,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit408]
+[Unit404]
 FileName=CIrrDeviceLinux.cpp
 Folder=other_impl
 Compile=1
@@ -4109,7 +4069,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit409]
+[Unit405]
 FileName=CIrrDeviceLinux.h
 Folder=other_impl
 Compile=1
@@ -4119,7 +4079,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit410]
+[Unit406]
 FileName=CIrrDeviceStub.cpp
 Folder=other_impl
 Compile=1
@@ -4129,7 +4089,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit411]
+[Unit407]
 FileName=CIrrDeviceStub.h
 Folder=other_impl
 Compile=1
@@ -4139,7 +4099,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit412]
+[Unit408]
 FileName=CIrrDeviceWin32.cpp
 Folder=other_impl
 Compile=1
@@ -4149,7 +4109,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit413]
+[Unit409]
 FileName=CIrrDeviceWin32.h
 Folder=other_impl
 Compile=1
@@ -4159,7 +4119,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit414]
+[Unit410]
 FileName=CLogger.cpp
 Folder=other_impl
 Compile=1
@@ -4169,7 +4129,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit415]
+[Unit411]
 FileName=CLogger.h
 Folder=other_impl
 Compile=1
@@ -4179,7 +4139,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit416]
+[Unit412]
 FileName=COSOperator.cpp
 Folder=other_impl
 Compile=1
@@ -4189,7 +4149,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit417]
+[Unit413]
 FileName=COSOperator.h
 Folder=other_impl
 Compile=1
@@ -4199,7 +4159,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit418]
+[Unit414]
 FileName=CTimer.h
 Folder=other_impl
 Compile=1
@@ -4209,7 +4169,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit419]
+[Unit415]
 FileName=IImagePresenter.h
 Folder=other_impl
 Compile=1
@@ -4219,7 +4179,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit420]
+[Unit416]
 FileName=Irrlicht.cpp
 Folder=other_impl
 Compile=1
@@ -4229,7 +4189,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit421]
+[Unit417]
 FileName=os.cpp
 Folder=other_impl
 Compile=1
@@ -4239,7 +4199,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit422]
+[Unit418]
 FileName=os.h
 Folder=other_impl
 Compile=1
@@ -4249,7 +4209,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit423]
+[Unit419]
 FileName=..\..\include\IrrCompileConfig.h
 Folder=include
 Compile=1
@@ -4259,7 +4219,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit424]
+[Unit420]
 FileName=CMeshCache.h
 Folder=scene_impl/mesh
 Compile=1
@@ -4269,7 +4229,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit425]
+[Unit421]
 FileName=CMeshCache.cpp
 Folder=scene_impl/mesh
 Compile=1
@@ -4279,7 +4239,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit426]
+[Unit422]
 FileName=COpenGLSLMaterialRenderer.h
 Folder=video_impl/OpenGL
 Compile=1
@@ -4289,7 +4249,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit427]
+[Unit423]
 FileName=COpenGLSLMaterialRenderer.cpp
 Folder=video_impl/OpenGL
 Compile=1
@@ -4299,7 +4259,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit428]
+[Unit424]
 FileName=CSoftwareTexture2.h
 Folder=video_impl/Burning Video
 Compile=1
@@ -4309,7 +4269,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit429]
+[Unit425]
 FileName=S4DVertex.h
 Folder=video_impl/Burning Video
 Compile=1
@@ -4319,7 +4279,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit430]
+[Unit426]
 FileName=SoftwareDriver2_compile_config.h
 Folder=video_impl/Burning Video
 Compile=1
@@ -4329,7 +4289,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit431]
+[Unit427]
 FileName=CSoftwareDriver2.h
 Folder=video_impl/Burning Video
 Compile=1
@@ -4339,7 +4299,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit432]
+[Unit428]
 FileName=CTRTextureGouraudNoZ2.cpp
 Folder=video_impl/Burning Video
 Compile=1
@@ -4349,7 +4309,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit433]
+[Unit429]
 FileName=CTRTextureLightMap2_M2.cpp
 Folder=video_impl/Burning Video
 Compile=1
@@ -4359,7 +4319,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit434]
+[Unit430]
 FileName=CTRTextureLightMap2_M4.cpp
 Folder=video_impl/Burning Video
 Compile=1
@@ -4369,7 +4329,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit435]
+[Unit431]
 FileName=CTRTextureLightMap2_M1.cpp
 Folder=video_impl/Burning Video
 Compile=1
@@ -4379,6 +4339,46 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit432]
+FileName=SoftwareDriver2_helper.h
+Folder=video_impl/Burning Video
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit433]
+FileName=CSoftwareDriver2.cpp
+Folder=video_impl/Burning Video
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit434]
+FileName=CSoftwareTexture2.cpp
+Folder=video_impl/Burning Video
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit435]
+FileName=CTRTextureGouraud2.cpp
+Folder=video_impl/Burning Video
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [VersionInfo]
 Major=0
 Minor=1
@@ -4398,46 +4398,6 @@ ProductVersion=0.1
 AutoIncBuildNr=0
 
 [Unit436]
-FileName=SoftwareDriver2_helper.h
-CompileCpp=1
-Folder=video_impl/Burning Video
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit437]
-FileName=CSoftwareDriver2.cpp
-CompileCpp=1
-Folder=video_impl/Burning Video
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit438]
-FileName=CSoftwareTexture2.cpp
-CompileCpp=1
-Folder=video_impl/Burning Video
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit439]
-FileName=CTRTextureGouraud2.cpp
-CompileCpp=1
-Folder=video_impl/Burning Video
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit440]
 FileName=COgreMeshFileLoader.h
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -4447,7 +4407,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit441]
+[Unit437]
 FileName=COgreMeshFileLoader.cpp
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -4457,7 +4417,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit442]
+[Unit438]
 FileName=CDefaultSceneNodeFactory.h
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -4467,7 +4427,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit443]
+[Unit439]
 FileName=CDefaultSceneNodeAnimatorFactory.cpp
 CompileCpp=1
 Folder=scene_impl/animators
@@ -4477,7 +4437,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit444]
+[Unit440]
 FileName=CDefaultSceneNodeAnimatorFactory.h
 CompileCpp=1
 Folder=scene_impl/animators
@@ -4487,7 +4447,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit445]
+[Unit441]
 FileName=CDefaultSceneNodeFactory.cpp
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -4497,7 +4457,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit446]
+[Unit442]
 FileName=CAttributes.h
 CompileCpp=1
 Folder=io_impl
@@ -4507,7 +4467,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit447]
+[Unit443]
 FileName=CAttributeImpl.h
 CompileCpp=1
 Folder=io_impl
@@ -4517,7 +4477,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit448]
+[Unit444]
 FileName=CAttributes.cpp
 CompileCpp=1
 Folder=io_impl
@@ -4527,7 +4487,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit449]
+[Unit445]
 FileName=CCubeSceneNode.h
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -4537,7 +4497,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit450]
+[Unit446]
 FileName=CCubeSceneNode.cpp
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -4547,7 +4507,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit451]
+[Unit447]
 FileName=CTRTextureGouraudAddNoZ2.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4557,7 +4517,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit452]
+[Unit448]
 FileName=CTRTextureGouraudAdd2.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4567,7 +4527,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit453]
+[Unit449]
 FileName=CTRGouraud2.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4577,7 +4537,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit454]
+[Unit450]
 FileName=CTRGouraudAlpha2.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4587,7 +4547,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit455]
+[Unit451]
 FileName=CTRGouraudAlphaNoZ2.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4597,7 +4557,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit456]
+[Unit452]
 FileName=CTRTextureDetailMap2.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4607,7 +4567,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit457]
+[Unit453]
 FileName=CTRTextureLightMap2_Add.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4617,7 +4577,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit458]
+[Unit454]
 FileName=CTRTextureWire2.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4627,7 +4587,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit459]
+[Unit455]
 FileName=CTRTextureGouraudVertexAlpha2.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4637,7 +4597,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit460]
+[Unit456]
 FileName=..\..\changes.txt
 CompileCpp=1
 Folder=doc
@@ -4647,7 +4607,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit461]
+[Unit457]
 FileName=..\..\readme.txt
 CompileCpp=1
 Folder=doc
@@ -4657,7 +4617,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit462]
+[Unit458]
 FileName=CSphereSceneNode.cpp
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -4667,7 +4627,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit463]
+[Unit459]
 FileName=CSphereSceneNode.h
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -4677,7 +4637,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit464]
+[Unit460]
 FileName=CPakReader.h
 CompileCpp=1
 Folder=io_impl
@@ -4687,7 +4647,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit465]
+[Unit461]
 FileName=CPakReader.cpp
 CompileCpp=1
 Folder=io_impl
@@ -4697,7 +4657,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit466]
+[Unit462]
 FileName=CSkyDomeSceneNode.h
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -4707,7 +4667,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit467]
+[Unit463]
 FileName=CSkyDomeSceneNode.cpp
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -4717,7 +4677,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit468]
+[Unit464]
 FileName=CImageWriterTGA.h
 CompileCpp=1
 Folder=video_impl/Null
@@ -4727,7 +4687,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit469]
+[Unit465]
 FileName=CImageWriterBMP.cpp
 CompileCpp=1
 Folder=video_impl/Null
@@ -4737,7 +4697,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit470]
+[Unit466]
 FileName=CImageWriterBMP.h
 CompileCpp=1
 Folder=video_impl/Null
@@ -4747,27 +4707,27 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit471]
+[Unit467]
 FileName=CImageWriterJPG.cpp
+CompileCpp=1
 Folder=video_impl/Null
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
-CompileCpp=1
 
-[Unit472]
+[Unit468]
 FileName=CImageWriterJPG.h
+CompileCpp=1
 Folder=video_impl/Null
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
-CompileCpp=1
 
-[Unit473]
+[Unit469]
 FileName=CImageWriterPCX.cpp
 CompileCpp=1
 Folder=video_impl/Null
@@ -4777,7 +4737,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit474]
+[Unit470]
 FileName=CImageWriterPCX.h
 CompileCpp=1
 Folder=video_impl/Null
@@ -4787,27 +4747,27 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit475]
+[Unit471]
 FileName=CImageWriterPNG.cpp
-CompileCpp=1
 Folder=video_impl/Null
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
+CompileCpp=1
 
-[Unit476]
+[Unit472]
 FileName=CImageWriterPNG.h
-CompileCpp=1
 Folder=video_impl/Null
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
+CompileCpp=1
 
-[Unit477]
+[Unit473]
 FileName=CImageWriterPPM.cpp
 CompileCpp=1
 Folder=video_impl/Null
@@ -4817,7 +4777,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit478]
+[Unit474]
 FileName=CImageWriterPPM.h
 CompileCpp=1
 Folder=video_impl/Null
@@ -4827,7 +4787,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit479]
+[Unit475]
 FileName=CImageWriterPSD.cpp
 CompileCpp=1
 Folder=video_impl/Null
@@ -4837,7 +4797,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit480]
+[Unit476]
 FileName=CImageWriterPSD.h
 CompileCpp=1
 Folder=video_impl/Null
@@ -4847,7 +4807,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit481]
+[Unit477]
 FileName=CImageWriterTGA.cpp
 CompileCpp=1
 Folder=video_impl/Null
@@ -4857,7 +4817,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit482]
+[Unit478]
 FileName=CTRTextureLightMapGouraud2_M4.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4867,7 +4827,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit483]
+[Unit479]
 FileName=CGUIColorSelectDialog.cpp
 CompileCpp=1
 Folder=gui_impl
@@ -4877,7 +4837,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit484]
+[Unit480]
 FileName=IBurningShader.h
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4887,7 +4847,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit485]
+[Unit481]
 FileName=IBurningShader.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4897,7 +4857,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit486]
+[Unit482]
 FileName=IDepthBuffer.h
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4907,7 +4867,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit487]
+[Unit483]
 FileName=CDepthBuffer.h
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4917,7 +4877,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit488]
+[Unit484]
 FileName=CDepthBuffer.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4927,7 +4887,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit489]
+[Unit485]
 FileName=CQuake3ShaderSceneNode.h
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -4937,7 +4897,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit490]
+[Unit486]
 FileName=CQuake3ShaderSceneNode.cpp
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -4947,7 +4907,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit491]
+[Unit487]
 FileName=..\..\include\fast_atof.h
 CompileCpp=1
 Folder=include
@@ -4957,7 +4917,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit492]
+[Unit488]
 FileName=CTRTextureBlend.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4967,7 +4927,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit493]
+[Unit489]
 FileName=CTRTextureGouraudAlpha.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4977,7 +4937,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit494]
+[Unit490]
 FileName=CTRTextureGouraudAlphaNoZ.cpp
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -4987,7 +4947,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit495]
+[Unit491]
 FileName=CDefaultGUIElementFactory.cpp
 CompileCpp=1
 Folder=gui_impl
@@ -4997,7 +4957,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit496]
+[Unit492]
 FileName=CDefaultGUIElementFactory.h
 CompileCpp=1
 Folder=gui_impl
@@ -5007,17 +4967,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit497]
+[Unit493]
 FileName=CGUIColorSelectDialog.h
+CompileCpp=1
 Folder=gui_impl
 Compile=1
-CompileCpp=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit498]
+[Unit494]
 FileName=CSoftware2MaterialRenderer.h
 CompileCpp=1
 Folder=video_impl/Burning Video
@@ -5027,7 +4987,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit499]
+[Unit495]
 FileName=CXMLReaderImpl.h
 CompileCpp=1
 Folder=io_impl
@@ -5037,7 +4997,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit500]
+[Unit496]
 FileName=ITriangleRenderer.h
 CompileCpp=1
 Folder=video_impl/Software
@@ -5047,17 +5007,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit501]
+[Unit497]
 FileName=..\..\include\EGUIElementTypes.h
-CompileCpp=1
 Folder=include/gui
 Compile=1
+CompileCpp=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit502]
+[Unit498]
 FileName=..\..\include\ESceneNodeAnimatorTypes.h
 CompileCpp=1
 Folder=include/scene
@@ -5067,7 +5027,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit503]
+[Unit499]
 FileName=..\..\include\ESceneNodeTypes.h
 CompileCpp=1
 Folder=include/scene
@@ -5077,7 +5037,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit504]
+[Unit500]
 FileName=..\..\include\ETerrainElements.h
 CompileCpp=1
 Folder=include/scene
@@ -5087,7 +5047,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit505]
+[Unit501]
 FileName=..\..\include\IAnimatedMeshMD2.h
 CompileCpp=1
 Folder=include/scene
@@ -5097,7 +5057,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit506]
+[Unit502]
 FileName=..\..\include\IAttributeExchangingObject.h
 CompileCpp=1
 Folder=include/io
@@ -5107,7 +5067,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit507]
+[Unit503]
 FileName=..\..\include\IAttributes.h
 CompileCpp=1
 Folder=include/io
@@ -5117,7 +5077,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit508]
+[Unit504]
 FileName=..\..\include\IDummyTransformationSceneNode.h
 CompileCpp=1
 Folder=include/scene
@@ -5127,7 +5087,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit509]
+[Unit505]
 FileName=..\..\include\IGPUProgrammingServices.h
 CompileCpp=1
 Folder=include/video
@@ -5137,7 +5097,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit510]
+[Unit506]
 FileName=..\..\include\IGUIColorSelectDialog.h
 CompileCpp=1
 Folder=include/gui
@@ -5147,7 +5107,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit511]
+[Unit507]
 FileName=..\..\include\IGUIComboBox.h
 CompileCpp=1
 Folder=include/gui
@@ -5157,7 +5117,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit512]
+[Unit508]
 FileName=..\..\include\IGUIContextMenu.h
 CompileCpp=1
 Folder=include/gui
@@ -5167,7 +5127,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit513]
+[Unit509]
 FileName=..\..\include\IGUIEditBox.h
 CompileCpp=1
 Folder=include/gui
@@ -5177,7 +5137,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit514]
+[Unit510]
 FileName=..\..\include\IGUIElementFactory.h
 CompileCpp=1
 Folder=include/gui
@@ -5187,7 +5147,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit515]
+[Unit511]
 FileName=..\..\include\IGUIInOutFader.h
 CompileCpp=1
 Folder=include/gui
@@ -5197,7 +5157,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit516]
+[Unit512]
 FileName=..\..\include\IGUIStaticText.h
 CompileCpp=1
 Folder=include/gui
@@ -5207,7 +5167,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit517]
+[Unit513]
 FileName=..\..\include\IGUITabControl.h
 CompileCpp=1
 Folder=include/gui
@@ -5217,7 +5177,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit518]
+[Unit514]
 FileName=..\..\include\IGUIToolbar.h
 CompileCpp=1
 Folder=include/gui
@@ -5227,7 +5187,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit519]
+[Unit515]
 FileName=..\..\include\IImage.h
 CompileCpp=1
 Folder=include/video
@@ -5237,7 +5197,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit520]
+[Unit516]
 FileName=..\..\include\IImageLoader.h
 CompileCpp=1
 Folder=include/video
@@ -5247,7 +5207,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit521]
+[Unit517]
 FileName=..\..\include\IImageWriter.h
 CompileCpp=1
 Folder=include/video
@@ -5257,7 +5217,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit522]
+[Unit518]
 FileName=..\..\include\ILogger.h
 CompileCpp=1
 Folder=include/io
@@ -5267,7 +5227,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit523]
+[Unit519]
 FileName=..\..\include\IMaterialRenderer.h
 CompileCpp=1
 Folder=include/video
@@ -5277,7 +5237,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit524]
+[Unit520]
 FileName=..\..\include\IMaterialRendererServices.h
 CompileCpp=1
 Folder=include/video
@@ -5287,7 +5247,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit525]
+[Unit521]
 FileName=..\..\include\IMeshCache.h
 CompileCpp=1
 Folder=include/scene
@@ -5297,7 +5257,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit526]
+[Unit522]
 FileName=..\..\include\IMeshLoader.h
 CompileCpp=1
 Folder=include/io
@@ -5307,7 +5267,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit527]
+[Unit523]
 FileName=..\..\include\IMeshManipulator.h
 CompileCpp=1
 Folder=include/scene
@@ -5317,7 +5277,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit528]
+[Unit524]
 FileName=..\..\include\IMeshSceneNode.h
 CompileCpp=1
 Folder=include/scene
@@ -5327,7 +5287,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit529]
+[Unit525]
 FileName=..\..\include\IMetaTriangleSelector.h
 CompileCpp=1
 Folder=include/scene
@@ -5337,7 +5297,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit530]
+[Unit526]
 FileName=..\..\include\IOSOperator.h
 CompileCpp=1
 Folder=include/io
@@ -5347,7 +5307,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit531]
+[Unit527]
 FileName=..\..\include\IParticleAffector.h
 CompileCpp=1
 Folder=include/scene
@@ -5357,7 +5317,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit532]
+[Unit528]
 FileName=..\..\include\IParticleEmitter.h
 CompileCpp=1
 Folder=include/scene
@@ -5367,7 +5327,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit533]
+[Unit529]
 FileName=..\..\include\IParticleSystemSceneNode.h
 CompileCpp=1
 Folder=include/scene
@@ -5377,7 +5337,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit534]
+[Unit530]
 FileName=..\..\include\IQ3Shader.h
 CompileCpp=1
 Folder=include/scene
@@ -5387,7 +5347,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit535]
+[Unit531]
 FileName=..\..\include\irrAllocator.h
 CompileCpp=1
 Folder=include/core
@@ -5397,7 +5357,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit536]
+[Unit532]
 FileName=..\..\include\irrMap.h
 CompileCpp=1
 Folder=include/core
@@ -5407,7 +5367,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit537]
+[Unit533]
 FileName=..\..\include\irrXML.h
 CompileCpp=1
 Folder=include/io
@@ -5417,7 +5377,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit538]
+[Unit534]
 FileName=..\..\include\ISceneCollisionManager.h
 CompileCpp=1
 Folder=include/scene
@@ -5427,7 +5387,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit539]
+[Unit535]
 FileName=..\..\include\ISceneNodeAnimatorCollisionResponse.h
 CompileCpp=1
 Folder=include/scene
@@ -5437,7 +5397,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit540]
+[Unit536]
 FileName=..\..\include\ISceneNodeAnimatorFactory.h
 CompileCpp=1
 Folder=include/scene
@@ -5447,7 +5407,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit541]
+[Unit537]
 FileName=..\..\include\ISceneNodeFactory.h
 CompileCpp=1
 Folder=include/scene
@@ -5457,7 +5417,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit542]
+[Unit538]
 FileName=..\..\include\ISceneUserDataSerializer.h
 CompileCpp=1
 Folder=include/scene
@@ -5467,7 +5427,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit543]
+[Unit539]
 FileName=..\..\include\IShaderConstantSetCallBack.h
 CompileCpp=1
 Folder=include/video
@@ -5477,7 +5437,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit544]
+[Unit540]
 FileName=..\..\include\IShadowVolumeSceneNode.h
 CompileCpp=1
 Folder=include/video
@@ -5487,7 +5447,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit545]
+[Unit541]
 FileName=..\..\include\ITerrainSceneNode.h
 CompileCpp=1
 Folder=include/scene
@@ -5497,7 +5457,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit546]
+[Unit542]
 FileName=..\..\include\ITextSceneNode.h
 CompileCpp=1
 Folder=include/scene
@@ -5507,7 +5467,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit547]
+[Unit543]
 FileName=..\..\include\ITimer.h
 CompileCpp=1
 Folder=include
@@ -5517,7 +5477,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit548]
+[Unit544]
 FileName=..\..\include\ITriangleSelector.h
 CompileCpp=1
 Folder=include/scene
@@ -5527,7 +5487,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit549]
+[Unit545]
 FileName=..\..\include\IVideoModeList.h
 CompileCpp=1
 Folder=include/video
@@ -5537,7 +5497,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit550]
+[Unit546]
 FileName=..\..\include\IWriteFile.h
 CompileCpp=1
 Folder=include/io
@@ -5547,7 +5507,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit551]
+[Unit547]
 FileName=..\..\include\IXMLReader.h
 CompileCpp=1
 Folder=include/io
@@ -5557,7 +5517,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit552]
+[Unit548]
 FileName=..\..\include\IXMLWriter.h
 CompileCpp=1
 Folder=include/io
@@ -5567,7 +5527,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit553]
+[Unit549]
 FileName=..\..\include\quaternion.h
 CompileCpp=1
 Folder=include/core
@@ -5577,7 +5537,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit554]
+[Unit550]
 FileName=..\..\include\SAnimatedMesh.h
 CompileCpp=1
 Folder=include/scene
@@ -5587,7 +5547,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit555]
+[Unit551]
 FileName=..\..\include\SceneParameters.h
 CompileCpp=1
 Folder=include/scene
@@ -5597,7 +5557,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit556]
+[Unit552]
 FileName=..\..\include\IReferenceCounted.h
 CompileCpp=1
 Folder=include
@@ -5607,7 +5567,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit557]
+[Unit553]
 FileName=CParticleAnimatedMeshSceneNodeEmitter.h
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5617,7 +5577,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit558]
+[Unit554]
 FileName=CParticleAnimatedMeshSceneNodeEmitter.cpp
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5627,7 +5587,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit559]
+[Unit555]
 FileName=CParticleSphereEmitter.h
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5637,7 +5597,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit560]
+[Unit556]
 FileName=CParticleAttractionAffector.cpp
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5647,7 +5607,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit561]
+[Unit557]
 FileName=CParticleAttractionAffector.h
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5657,7 +5617,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit562]
+[Unit558]
 FileName=CParticleCylinderEmitter.cpp
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5667,7 +5627,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit563]
+[Unit559]
 FileName=CParticleCylinderEmitter.h
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5677,7 +5637,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit564]
+[Unit560]
 FileName=CParticleMeshEmitter.cpp
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5687,7 +5647,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit565]
+[Unit561]
 FileName=CParticleMeshEmitter.h
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5697,7 +5657,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit566]
+[Unit562]
 FileName=CParticleRingEmitter.cpp
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5707,7 +5667,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit567]
+[Unit563]
 FileName=CParticleRingEmitter.h
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5717,7 +5677,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit568]
+[Unit564]
 FileName=CParticleRotationAffector.cpp
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5727,7 +5687,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit569]
+[Unit565]
 FileName=CParticleRotationAffector.h
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5737,7 +5697,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit570]
+[Unit566]
 FileName=CParticleSphereEmitter.cpp
 CompileCpp=1
 Folder=scene_impl/nodes/particles
@@ -5747,7 +5707,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit571]
+[Unit567]
 FileName=CIrrMeshWriter.h
 CompileCpp=1
 Folder=scene_impl/mesh/writers
@@ -5757,7 +5717,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit572]
+[Unit568]
 FileName=CIrrMeshWriter.cpp
 CompileCpp=1
 Folder=scene_impl/mesh/writers
@@ -5767,7 +5727,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit573]
+[Unit569]
 FileName=CColladaMeshWriter.h
 CompileCpp=1
 Folder=scene_impl/mesh/writers
@@ -5777,7 +5737,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit574]
+[Unit570]
 FileName=CColladaMeshWriter.cpp
 CompileCpp=1
 Folder=scene_impl/mesh/writers
@@ -5787,7 +5747,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit575]
+[Unit571]
 FileName=CIrrMeshFileLoader.h
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5797,7 +5757,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit576]
+[Unit572]
 FileName=CIrrMeshFileLoader.cpp
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5807,7 +5767,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit577]
+[Unit573]
 FileName=CBSPMeshFileLoader.h
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5817,7 +5777,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit578]
+[Unit574]
 FileName=CBSPMeshFileLoader.cpp
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5827,7 +5787,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit579]
+[Unit575]
 FileName=CMD2MeshFileLoader.h
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5837,7 +5797,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit580]
+[Unit576]
 FileName=CMD2MeshFileLoader.cpp
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5847,7 +5807,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit581]
+[Unit577]
 FileName=CMS3DMeshFileLoader.h
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5857,7 +5817,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit582]
+[Unit578]
 FileName=CMS3DMeshFileLoader.cpp
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5867,7 +5827,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit583]
+[Unit579]
 FileName=CB3DMeshFileLoader.h
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5877,7 +5837,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit584]
+[Unit580]
 FileName=CB3DMeshFileLoader.cpp
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5887,7 +5847,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit585]
+[Unit581]
 FileName=CSkinnedMesh.h
 CompileCpp=1
 Folder=scene_impl/mesh
@@ -5897,7 +5857,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit586]
+[Unit582]
 FileName=CSkinnedMesh.cpp
 CompileCpp=1
 Folder=scene_impl/mesh
@@ -5907,7 +5867,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit587]
+[Unit583]
 FileName=CBoneSceneNode.h
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -5917,7 +5877,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit588]
+[Unit584]
 FileName=CBoneSceneNode.cpp
 CompileCpp=1
 Folder=scene_impl/nodes
@@ -5927,7 +5887,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit589]
+[Unit585]
 FileName=CSTLMeshWriter.cpp
 CompileCpp=1
 Folder=scene_impl/mesh/writers
@@ -5937,7 +5897,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit590]
+[Unit586]
 FileName=CSTLMeshFileLoader.cpp
 CompileCpp=1
 Folder=scene_impl/mesh/loaders
@@ -5947,8 +5907,48 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit591]
+[Unit587]
 FileName=CImageLoaderPPM.cpp
+CompileCpp=1
+Folder=video_impl/Null
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit588]
+FileName=CImageLoaderPPM.h
+CompileCpp=1
+Folder=video_impl/Null
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit589]
+FileName=CBurningShader_Raster_Reference.cpp
+CompileCpp=1
+Folder=video_impl/Burning Video
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit590]
+FileName=CImageLoaderWAL.cpp
+CompileCpp=1
+Folder=video_impl/Null
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit591]
+FileName=CImageLoaderWAL.h
 Folder=video_impl/Null
 Compile=1
 CompileCpp=1
@@ -5958,8 +5958,158 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit592]
-FileName=CImageLoaderPPM.h
-Folder=video_impl/Null
+FileName=CGUITable.h
+Folder=gui_impl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit593]
+FileName=CGUITable.cpp
+CompileCpp=1
+Folder=gui_impl
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit594]
+FileName=..\..\include\IGUITable.h
+Folder=include/gui
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit595]
+FileName=CVolumeLightSceneNode.h
+CompileCpp=1
+Folder=scene_impl/nodes
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit596]
+FileName=CVolumeLightSceneNode.cpp
+CompileCpp=1
+Folder=scene_impl/nodes
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit597]
+FileName=..\..\include\IVolumeLightSceneNode.h
+CompileCpp=1
+Folder=include/scene
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit598]
+FileName=CLWOMeshFileLoader.cpp
+CompileCpp=1
+Folder=scene_impl/mesh/loaders
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit599]
+FileName=CLWOMeshFileLoader.h
+CompileCpp=1
+Folder=scene_impl/mesh/loaders
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit600]
+FileName=..\..\include\ISceneNodeAnimatorCameraMaya.h
+CompileCpp=1
+Folder=include/scene
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit601]
+FileName=..\..\include\ISceneNodeAnimatorCameraFPS.h
+CompileCpp=1
+Folder=include/scene
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit602]
+FileName=CSceneNodeAnimatorCameraMaya.h
+Folder=scene_impl/animators
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit603]
+FileName=CSceneNodeAnimatorCameraFPS.cpp
+Folder=scene_impl/animators
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit604]
+FileName=COBJMeshWriter.cpp
+CompileCpp=1
+Folder=scene_impl/mesh/writers
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit605]
+FileName=..\..\include\SSkinMeshBuffer.h
+Folder=include/scene
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit606]
+FileName=CParticleScaleAffector.cpp
+Folder=scene_impl/nodes/particles
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit607]
+FileName=CParticleScaleAffector.h
+Folder=scene_impl/nodes/particles
 Compile=1
 CompileCpp=1
 Link=1
diff --git a/src/dep/src/irrlicht/Irrlicht.dsp b/src/dep/src/irrlicht/Irrlicht.dsp
index f0db08c..e69de29 100644
--- a/src/dep/src/irrlicht/Irrlicht.dsp
+++ b/src/dep/src/irrlicht/Irrlicht.dsp
@@ -1,2365 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Irrlicht" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=Irrlicht - Win32 Debug
-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "Irrlicht.mak".
-!MESSAGE 
-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "Irrlicht.mak" CFG="Irrlicht - Win32 Debug"
-!MESSAGE 
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "Irrlicht - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Irrlicht - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Irrlicht - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Release"
-# PROP Intermediate_Dir "..\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IRRLICHT_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../include" /I "zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IRRLICHT_EXPORTS" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0xc07 /d "NDEBUG"
-# ADD RSC /l 0xc07 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "Irrlicht - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Debug"
-# PROP Intermediate_Dir "..\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IRRLICHT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IRRLICHT_EXPORTS" /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0xc07 /d "_DEBUG"
-# ADD RSC /l 0xc07 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Irrlicht - Win32 Release"
-# Name "Irrlicht - Win32 Debug"
-# Begin Group "include"
-
-# PROP Default_Filter ""
-# Begin Group "video"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\EDriverTypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGPUProgrammingServices.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ITexture.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IVideoDriver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\S3DVertex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\SColor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\SLight.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\SMaterial.h
-# End Source File
-# End Group
-# Begin Group "core"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\aabbox3d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\dimension2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\heapsort.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\irrAllocator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\irrArray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\irrList.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\irrMath.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\irrString.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\line2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\line3d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\matrix4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\plane3d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\position2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\rect.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\vector2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\vector3d.h
-# End Source File
-# End Group
-# Begin Group "io"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\IFileList.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IFileSystem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IReadFile.H
-# End Source File
-# End Group
-# Begin Group "scene"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\IAnimatedMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IAnimatedMeshSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IBillboardSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ICameraSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ILightSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IMeshBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IQ3LevelMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ISceneManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ISceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ISceneNodeAnimator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\SMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\SMeshBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\SMeshBufferLightMap.h
-# End Source File
-# End Group
-# Begin Group "gui"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\ICursorControl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUIButton.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUICheckbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUIElement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUIEnvironment.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUIFileOpenDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUIFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUIImage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUIListBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUIMeshViewer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUIScrollBar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUISkin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IGUIWindow.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\include\IEventReceiver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IReferenceCounted.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Irrlicht.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IrrlichtDevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\irrTypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Keycodes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\SIrrCreationParameters.h
-# End Source File
-# End Group
-# Begin Group "gui_impl"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\BuiltInFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDefaultGUIElementFactory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDefaultGUIElementFactory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIButton.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIButton.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUICheckBox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUICheckbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIColorSelectDialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIColorSelectDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIComboBox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIComboBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIContextMenu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIContextMenu.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIEditBox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIEditBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIEnvironment.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIEnvironment.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIFileOpenDialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIFileOpenDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIImage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIImage.H
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIInOutFader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIInOutFader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIListBox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIListBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIMenu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIMenu.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIMeshViewer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIMeshViewer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIMessageBox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIMessageBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIModalScreen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIModalScreen.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIScrollBar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIScrollBar.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUISkin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUISkin.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUISpriteBank.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUISpriteBank.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIStaticText.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIStaticText.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUITabControl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUITabControl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIToolBar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIToolBar.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIWindow.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUIWindow.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\GUIIcons.h
-# End Source File
-# End Group
-# Begin Group "video_impl"
-
-# PROP Default_Filter ""
-# Begin Group "Software"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\CSoftwareDriver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSoftwareDriver.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSoftwareTexture.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSoftwareTexture.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRFlat.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRFlatWire.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRGouraud.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRGouraudWire.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureFlat.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureFlatWire.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraud.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraud.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraudAdd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraudNoZ.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraudWire.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CZBuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CZBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ITriangleRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\IZBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\S2DVertex.h
-# End Source File
-# End Group
-# Begin Group "OpenGL"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\COpenGLDriver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLDriver.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLExtensionHandler.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLExtensionHandler.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLMaterialRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLNormalMapRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLNormalMapRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLParallaxMapRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLParallaxMapRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLShaderMaterialRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLShaderMaterialRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLSLMaterialRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLSLMaterialRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLTexture.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COpenGLTexture.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\glext.h
-# End Source File
-# End Group
-# Begin Group "DirectX8"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\CD3D8Driver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D8Driver.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D8MaterialRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D8NormalMapRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D8NormalMapRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D8ParallaxMapRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D8ParallaxMapRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D8ShaderMaterialRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D8ShaderMaterialRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D8Texture.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D8Texture.h
-# End Source File
-# End Group
-# Begin Group "Null"
-
-# PROP Default_Filter ""
-# Begin Group "ImageWriter"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\CImageWriterBMP.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterBMP.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterJPG.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterJPG.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterPCX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterPCX.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterPNG.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterPNG.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterPPM.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterPPM.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterPSD.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterPSD.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterTGA.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageWriterTGA.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\CColorConverter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CColorConverter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CFPSCounter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CFPSCounter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImage.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderBMP.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderBMP.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderJPG.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderJPG.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderPCX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderPCX.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderPNG.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderPNG.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderPSD.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderPSD.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderTGA.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderTGA.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CNullDriver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CNullDriver.h
-# End Source File
-# End Group
-# Begin Group "DirectX9"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\CD3D9Driver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9Driver.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9HLSLMaterialRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9HLSLMaterialRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9MaterialRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9NormalMapRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9NormalMapRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9ParallaxMapRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9ParallaxMapRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9ShaderMaterialRenderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9ShaderMaterialRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9Texture.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CD3D9Texture.h
-# End Source File
-# End Group
-# Begin Group "Software2"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\CDepthBuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDepthBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSoftware2MaterialRenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSoftwareDriver2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSoftwareDriver2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSoftwareTexture2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSoftwareTexture2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRGouraud2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRGouraudAlpha2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRGouraudAlphaNoZ2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureBlend.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureDetailMap2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraud2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraudAdd2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraudAddNoZ2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraudAlpha.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraudAlphaNoZ.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraudNoZ2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureGouraudVertexAlpha2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureLightMap2_Add.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureLightMap2_M1.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureLightMap2_M1.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureLightMap2_M2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureLightMap2_M4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureLightMapGouraud2_M4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTRTextureWire2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\IBurningShader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\IBurningShader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\IDepthBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\S4DVertex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SoftwareDriver2_compile_config.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SoftwareDriver2_helper.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\CVideoModeList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CVideoModeList.h
-# End Source File
-# End Group
-# Begin Group "scene_impl"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\C3DSMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\C3DSMeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CAnimatedMeshMD2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CAnimatedMeshMD2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CAnimatedMeshMD3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CAnimatedMeshMD3.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CAnimatedMeshSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CAnimatedMeshSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CB3DMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CB3DMeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CBillboardSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CBillboardSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CBoneSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CBoneSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CBSPMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CBSPMeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CCameraFPSSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CCameraFPSSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CCameraMayaSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CCameraMayaSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CCameraSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CCameraSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CColladaFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CColladaFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CColladaMeshWriter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CCSMLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CCSMLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CCubeSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CCubeSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDefaultSceneNodeAnimatorFactory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDefaultSceneNodeAnimatorFactory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDefaultSceneNodeFactory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDefaultSceneNodeFactory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDMFLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDMFLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDummyTransformationSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDummyTransformationSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CEmptySceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CEmptySceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGeometryCreator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGeometryCreator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUISpinBox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CGUISpinBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CImageLoaderPPM.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CIrrDeviceSDL.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CIrrDeviceSDL.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CIrrMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CIrrMeshWriter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CLightSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CLightSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CLMTSMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CLMTSMeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMD2MeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMD2MeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMD3MeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMD3MeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMeshCache.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMeshCache.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMeshManipulator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMeshManipulator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMeshSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMeshSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMetaTriangleSelector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMetaTriangleSelector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMS3DMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMS3DMeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMY3DHelper.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMY3DMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMY3DMeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMY3DStuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COBJMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COBJMeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COCTLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COCTLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COctTreeSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COctTreeSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COctTreeTriangleSelector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COctTreeTriangleSelector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COgreMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COgreMeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleAnimatedMeshSceneNodeEmitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleAnimatedMeshSceneNodeEmitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleAttractionAffector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleAttractionAffector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleBoxEmitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleBoxEmitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleCylinderEmitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleCylinderEmitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleFadeOutAffector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleFadeOutAffector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleGravityAffector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleGravityAffector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleMeshEmitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleMeshEmitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticlePointEmitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticlePointEmitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleRingEmitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleRingEmitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleRotationAffector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleRotationAffector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleSphereEmitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleSphereEmitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleSystemSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CParticleSystemSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CQ3LevelMesh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CQ3LevelMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CQuake3ShaderSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CQuake3ShaderSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneCollisionManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneCollisionManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorCollisionResponse.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorCollisionResponse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorDelete.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorDelete.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorFlyCircle.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorFlyCircle.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorFlyStraight.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorFlyStraight.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorFollowSpline.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorFollowSpline.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorRotation.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorRotation.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorTexture.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSceneNodeAnimatorTexture.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CShadowVolumeSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CShadowVolumeSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSkinnedMesh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSkinnedMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSkyBoxSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSkyBoxSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSkyDomeSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSkyDomeSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSphereSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSphereSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSTLMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSTLMeshWriter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTerrainSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTerrainSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTerrainTriangleSelector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTerrainTriangleSelector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTextSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTextSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTriangleBBSelector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTriangleBBSelector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTriangleSelector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTriangleSelector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CWaterSurfaceSceneNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CWaterSurfaceSceneNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CXMeshFileLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CXMeshFileLoader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dmfsupport.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\OctTree.h
-# End Source File
-# End Group
-# Begin Group "io_impl"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\CAttributeImpl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CAttributes.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CAttributes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CFileList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CFileList.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CFileSystem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CFileSystem.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CLimitReadFile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CLimitReadFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMemoryReadFile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMemoryReadFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CPakReader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CPakReader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CReadFile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CReadFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CWriteFile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CWriteFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CXMLReader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CXMLReader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CXMLReaderImpl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CXMLWriter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CXMLWriter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CZipReader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CZipReader.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\irrXML.cpp
-# End Source File
-# End Group
-# Begin Group "other_impl"
-
-# PROP Default_Filter ""
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\zlib\adler32.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\compress.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\crc32.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\crc32.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\deflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\deflate.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inffast.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inffast.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inftrees.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inftrees.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\trees.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\trees.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\uncompr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\zconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\zlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\zutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\zutil.h
-# End Source File
-# End Group
-# Begin Group "jpeglib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\jpeglib\cderror.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\cdjpeg.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\cdjpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jccoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jccolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcdctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jchuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jchuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcomapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcparam.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcprepct.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jcsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jctrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdatadst.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdatasrc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdcoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdcolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdct.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jddctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdhuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdhuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdinput.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdmerge.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdpostct.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jdtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jerror.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jfdctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jfdctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jfdctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jidctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jidctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jidctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jidctred.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jinclude.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jmemmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jmemnobs.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jmemsys.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jmorecfg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jpegint.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jpeglib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jquant1.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jquant2.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jutils.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\jversion.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\rdbmp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\rdcolmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\rdgif.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\rdppm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\rdrle.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\rdswitch.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\rdtarga.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\transupp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\transupp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\wrbmp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\wrgif.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\wrppm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\wrrle.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeglib\wrtarga.c
-# End Source File
-# End Group
-# Begin Group "libpng"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\libpng\png.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\png.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngget.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngmem.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngpread.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngread.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngrio.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngrtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngrutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngset.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngwio.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngwrite.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngwtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libpng\pngwutil.c
-# End Source File
-# End Group
-# End Group
-# Begin Source File
-
-SOURCE=.\CIrrDeviceLinux.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CIrrDeviceLinux.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CIrrDeviceStub.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CIrrDeviceStub.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CIrrDeviceWin32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CIrrDeviceWin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CLogger.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CLogger.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\COSOperator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\COSOperator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CTimer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fast_atof.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\IImagePresenter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Irrlicht.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\os.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\os.h
-# End Source File
-# End Group
-# Begin Group "doc"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\changes.txt
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\glxext.h
-# End Source File
-# End Target
-# End Project
diff --git a/src/dep/src/irrlicht/Irrlicht.dsw b/src/dep/src/irrlicht/Irrlicht.dsw
index 99cd376..e69de29 100644
--- a/src/dep/src/irrlicht/Irrlicht.dsw
+++ b/src/dep/src/irrlicht/Irrlicht.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
-
-###############################################################################
-
-Project: "Irrlicht"=.\Irrlicht.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/dep/src/irrlicht/Irrlicht7.1.sln b/src/dep/src/irrlicht/Irrlicht7.1.sln
index 7c17761..a748a6f 100644
--- a/src/dep/src/irrlicht/Irrlicht7.1.sln
+++ b/src/dep/src/irrlicht/Irrlicht7.1.sln
@@ -8,6 +8,9 @@ Global
 		Debug = Debug
 		Release = Release
 		Release - Fast FPU = Release - Fast FPU
+		Static lib - Debug|Win32 = Static lib - Debug|Win32
+		Static lib - Release - Fast FPU|Win32 = Static lib - Release - Fast FPU|Win32
+		Static lib - Release|Win32 = Static lib - Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Debug.ActiveCfg = Debug|Win32
@@ -16,6 +19,12 @@ Global
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release.Build.0 = Release|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU.ActiveCfg = Relase - Fast FPU|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU.Build.0 = Relase - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Debug|Win32.ActiveCfg = Static lib - Debug|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Debug|Win32.Build.0 = Static lib - Debug|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release - Fast FPU|Win32.ActiveCfg = Static lib - Release - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release - Fast FPU|Win32.Build.0 = Static lib - Release - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release|Win32.ActiveCfg = Static lib - Release|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release|Win32.Build.0 = Static lib - Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/src/dep/src/irrlicht/Irrlicht7.1.vcproj b/src/dep/src/irrlicht/Irrlicht7.1.vcproj
index 24e0ed9..c9c74a1 100644
--- a/src/dep/src/irrlicht/Irrlicht7.1.vcproj
+++ b/src/dep/src/irrlicht/Irrlicht7.1.vcproj
@@ -12,16 +12,16 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="4"
+			OutputDirectory="..\obj\IrrDebug"
+			IntermediateDirectory="..\obj\IrrDebug"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="0">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include\irrlicht;..\..\include\DXSDK\include;zlib"
+				AdditionalIncludeDirectories="..\..\include;zlib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="FALSE"
 				BasicRuntimeChecks="3"
@@ -39,10 +39,16 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="d3dx8.lib"
-				OutputFile="$(SolutionDir)\src\dep\lib\debug\irrlicht.lib"
-				AdditionalLibraryDirectories="$(SolutionDir)\src\dep\lib\static"/>
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
+				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="libci.lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\obj\IrrDebug\Irrlicht.pdb"
+				ImportLibrary="..\..\lib\Win32-visualstudio\Irrlicht.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"
@@ -64,6 +70,8 @@
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
 			<Tool
 				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
@@ -71,9 +79,9 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="4"
+			OutputDirectory="obj\IrrRelease"
+			IntermediateDirectory="obj\IrrRelease"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="2"
@@ -83,7 +91,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="FALSE"
-				AdditionalIncludeDirectories="..\..\include\irrlicht;..\..\include\DXSDK\include;zlib"
+				AdditionalIncludeDirectories="..\..\include;zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
@@ -101,10 +109,16 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="d3dx8.lib"
-				OutputFile="$(SolutionDir)\src\dep\lib\release\irrlicht.lib"
-				AdditionalLibraryDirectories="$(SolutionDir)\src\dep\lib\static"/>
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
+				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="libci.lib"
+				GenerateDebugInformation="FALSE"
+				ProgramDatabaseFile="..\obj\IrrRelease\Irrlicht.pdb"
+				ImportLibrary="..\..\lib\Win32-visualstudio\Irrlicht.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
@@ -126,6 +140,8 @@
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
 			<Tool
 				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
@@ -133,9 +149,9 @@
 		</Configuration>
 		<Configuration
 			Name="Release - Fast FPU|Win32"
-			OutputDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="4"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="2"
@@ -147,7 +163,7 @@
 				EnableIntrinsicFunctions="TRUE"
 				FavorSizeOrSpeed="0"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="..\..\include\irrlicht;..\..\include\DXSDK\include;zlib"
+				AdditionalIncludeDirectories="..\..\include;zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
@@ -167,10 +183,16 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="d3dx8.lib"
-				OutputFile="$(SolutionDir)\src\dep\lib\release\irrlicht.lib"
-				AdditionalLibraryDirectories="$(SolutionDir)\src\dep\lib\static"/>
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
+				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="libci.lib"
+				GenerateDebugInformation="FALSE"
+				ProgramDatabaseFile="..\obj\IrrRelease\Irrlicht.pdb"
+				ImportLibrary="..\..\lib\Win32-visualstudio\Irrlicht.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
@@ -192,11 +214,267 @@
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
 			<Tool
 				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="Static lib - Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\Debug/Irrlicht.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
+				ExceptionHandling="0"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="false"
+				RuntimeTypeInfo="false"
+				PrecompiledHeaderFile=".\..\obj\IrrDebug/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrDebug/"
+				ObjectFile=".\..\obj\IrrDebug/"
+				ProgramDataBaseFileName=".\..\obj\IrrDebug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Static lib - Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\Release/Irrlicht.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="false"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrRelease/"
+				ObjectFile=".\..\obj\IrrRelease/"
+				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Static lib - Release - Fast FPU|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\Release/Irrlicht.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="0"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				RuntimeTypeInfo="false"
+				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrRelease/"
+				ObjectFile=".\..\obj\IrrRelease/"
+				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="0"
+				CallingConvention="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -457,6 +735,9 @@
 				<File
 					RelativePath=".\..\..\include\IQ3LevelMesh.h">
 				</File>
+				<File
+					RelativePath="..\..\include\IQ3Shader.h">
+				</File>
 				<File
 					RelativePath=".\..\..\include\ISceneCollisionManager.h">
 				</File>
@@ -469,6 +750,12 @@
 				<File
 					RelativePath=".\..\..\include\ISceneNodeAnimator.h">
 				</File>
+				<File
+					RelativePath=".\..\..\include\ISceneNodeAnimatorCameraFPS.h">
+				</File>
+				<File
+					RelativePath=".\..\..\include\ISceneNodeAnimatorCameraMaya.h">
+				</File>
 				<File
 					RelativePath=".\..\..\include\ISceneNodeAnimatorCollisionResponse.h">
 				</File>
@@ -493,6 +780,9 @@
 				<File
 					RelativePath=".\..\..\include\ITextSceneNode.h">
 				</File>
+				<File
+					RelativePath=".\..\..\include\IVolumeLightSceneNode.h">
+				</File>
 				<File
 					RelativePath=".\..\..\include\ITriangleSelector.h">
 				</File>
@@ -514,6 +804,9 @@
 				<File
 					RelativePath=".\..\..\include\SMeshBufferTangents.h">
 				</File>
+				<File
+					RelativePath=".\..\..\include\SSkinMeshBuffer.h">
+				</File>
 				<File
 					RelativePath=".\..\..\include\SParticle.h">
 				</File>
@@ -592,6 +885,9 @@
 				<File
 					RelativePath=".\..\..\include\IGUITabControl.h">
 				</File>
+				<File
+					RelativePath=".\..\..\include\IGUITable.h">
+				</File>
 				<File
 					RelativePath=".\..\..\include\IGUIToolbar.h">
 				</File>
@@ -603,31 +899,31 @@
 		<Filter
 			Name="gui impl">
 			<File
-				RelativePath=".\BuiltInFont.h">
+				RelativePath="BuiltInFont.h">
 			</File>
 			<File
-				RelativePath=".\CDefaultGUIElementFactory.cpp">
+				RelativePath="CDefaultGUIElementFactory.cpp">
 			</File>
 			<File
-				RelativePath=".\CDefaultGUIElementFactory.h">
+				RelativePath="CDefaultGUIElementFactory.h">
 			</File>
 			<File
-				RelativePath=".\CGUIButton.cpp">
+				RelativePath="CGUIButton.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIButton.h">
+				RelativePath="CGUIButton.h">
 			</File>
 			<File
-				RelativePath=".\CGUICheckbox.cpp">
+				RelativePath="CGUICheckbox.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUICheckbox.h">
+				RelativePath="CGUICheckbox.h">
 			</File>
 			<File
-				RelativePath=".\CGUIColorSelectDialog.cpp">
+				RelativePath="CGUIColorSelectDialog.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIColorSelectDialog.h">
+				RelativePath="CGUIColorSelectDialog.h">
 			</File>
 			<File
 				RelativePath="CGUIComboBox.cpp">
@@ -648,28 +944,28 @@
 				RelativePath="CGUIEditBox.h">
 			</File>
 			<File
-				RelativePath=".\CGUIEnvironment.cpp">
+				RelativePath="CGUIEnvironment.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIEnvironment.h">
+				RelativePath="CGUIEnvironment.h">
 			</File>
 			<File
-				RelativePath=".\CGUIFileOpenDialog.cpp">
+				RelativePath="CGUIFileOpenDialog.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIFileOpenDialog.h">
+				RelativePath="CGUIFileOpenDialog.h">
 			</File>
 			<File
-				RelativePath=".\CGUIFont.cpp">
+				RelativePath="CGUIFont.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIFont.h">
+				RelativePath="CGUIFont.h">
 			</File>
 			<File
-				RelativePath=".\CGUIImage.cpp">
+				RelativePath="CGUIImage.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIImage.h">
+				RelativePath="CGUIImage.h">
 			</File>
 			<File
 				RelativePath="CGUIInOutFader.cpp">
@@ -678,10 +974,10 @@
 				RelativePath="CGUIInOutFader.h">
 			</File>
 			<File
-				RelativePath=".\CGUIListBox.cpp">
+				RelativePath="CGUIListBox.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIListBox.h">
+				RelativePath="CGUIListBox.h">
 			</File>
 			<File
 				RelativePath="CGUIMenu.cpp">
@@ -690,10 +986,10 @@
 				RelativePath="CGUIMenu.h">
 			</File>
 			<File
-				RelativePath=".\CGUIMeshViewer.cpp">
+				RelativePath="CGUIMeshViewer.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIMeshViewer.h">
+				RelativePath="CGUIMeshViewer.h">
 			</File>
 			<File
 				RelativePath="CGUIMessageBox.cpp">
@@ -708,34 +1004,34 @@
 				RelativePath="CGUIModalScreen.h">
 			</File>
 			<File
-				RelativePath=".\CGUIScrollBar.cpp">
+				RelativePath="CGUIScrollBar.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIScrollBar.h">
+				RelativePath="CGUIScrollBar.h">
 			</File>
 			<File
-				RelativePath=".\CGUISkin.cpp">
+				RelativePath="CGUISkin.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUISkin.h">
+				RelativePath="CGUISkin.h">
 			</File>
 			<File
-				RelativePath=".\CGUISpinBox.cpp">
+				RelativePath="CGUISpinBox.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUISpinBox.h">
+				RelativePath="CGUISpinBox.h">
 			</File>
 			<File
-				RelativePath=".\CGUISpriteBank.cpp">
+				RelativePath="CGUISpriteBank.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUISpriteBank.h">
+				RelativePath="CGUISpriteBank.h">
 			</File>
 			<File
-				RelativePath=".\CGUIStaticText.cpp">
+				RelativePath="CGUIStaticText.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIStaticText.h">
+				RelativePath="CGUIStaticText.h">
 			</File>
 			<File
 				RelativePath="CGUITabControl.cpp">
@@ -743,6 +1039,12 @@
 			<File
 				RelativePath="CGUITabControl.h">
 			</File>
+			<File
+				RelativePath="CGUITable.cpp">
+			</File>
+			<File
+				RelativePath="CGUITable.h">
+			</File>
 			<File
 				RelativePath="CGUIToolBar.cpp">
 			</File>
@@ -750,10 +1052,10 @@
 				RelativePath="CGUIToolBar.h">
 			</File>
 			<File
-				RelativePath=".\CGUIWindow.cpp">
+				RelativePath="CGUIWindow.cpp">
 			</File>
 			<File
-				RelativePath=".\CGUIWindow.h">
+				RelativePath="CGUIWindow.h">
 			</File>
 		</Filter>
 		<Filter
@@ -767,166 +1069,166 @@
 			<Filter
 				Name="Software">
 				<File
-					RelativePath=".\CSoftwareDriver.cpp">
+					RelativePath="CSoftwareDriver.cpp">
 				</File>
 				<File
-					RelativePath=".\CSoftwareDriver.h">
+					RelativePath="CSoftwareDriver.h">
 				</File>
 				<File
-					RelativePath=".\CSoftwareTexture.cpp">
+					RelativePath="CSoftwareTexture.cpp">
 				</File>
 				<File
-					RelativePath=".\CSoftwareTexture.h">
+					RelativePath="CSoftwareTexture.h">
 				</File>
 				<File
-					RelativePath=".\CTRFlat.cpp">
+					RelativePath="CTRFlat.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRFlatWire.cpp">
+					RelativePath="CTRFlatWire.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRGouraud.cpp">
+					RelativePath="CTRGouraud.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRGouraudWire.cpp">
+					RelativePath="CTRGouraudWire.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureFlat.cpp">
+					RelativePath="CTRTextureFlat.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureFlatWire.cpp">
+					RelativePath="CTRTextureFlatWire.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraud.cpp">
+					RelativePath="CTRTextureGouraud.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraud.h">
+					RelativePath="CTRTextureGouraud.h">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudAdd.cpp">
+					RelativePath="CTRTextureGouraudAdd.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudNoZ.cpp">
+					RelativePath="CTRTextureGouraudNoZ.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudWire.cpp">
+					RelativePath="CTRTextureGouraudWire.cpp">
 				</File>
 				<File
-					RelativePath=".\CZBuffer.cpp">
+					RelativePath="CZBuffer.cpp">
 				</File>
 				<File
-					RelativePath=".\CZBuffer.h">
+					RelativePath="CZBuffer.h">
 				</File>
 				<File
-					RelativePath=".\ITriangleRenderer.h">
+					RelativePath="ITriangleRenderer.h">
 				</File>
 				<File
-					RelativePath=".\IZBuffer.h">
+					RelativePath="IZBuffer.h">
 				</File>
 				<File
-					RelativePath=".\S2DVertex.h">
+					RelativePath="S2DVertex.h">
 				</File>
 			</Filter>
 			<Filter
 				Name="OpenGL">
 				<File
-					RelativePath=".\COpenGLDriver.cpp">
+					RelativePath="COpenGLDriver.cpp">
 				</File>
 				<File
-					RelativePath=".\COpenGLDriver.h">
+					RelativePath="COpenGLDriver.h">
 				</File>
 				<File
-					RelativePath=".\COpenGLExtensionHandler.cpp">
+					RelativePath="COpenGLExtensionHandler.cpp">
 				</File>
 				<File
-					RelativePath=".\COpenGLExtensionHandler.h">
+					RelativePath="COpenGLExtensionHandler.h">
 				</File>
 				<File
-					RelativePath=".\COpenGLMaterialRenderer.h">
+					RelativePath="COpenGLMaterialRenderer.h">
 				</File>
 				<File
-					RelativePath=".\COpenGLNormalMapRenderer.cpp">
+					RelativePath="COpenGLNormalMapRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\COpenGLNormalMapRenderer.h">
+					RelativePath="COpenGLNormalMapRenderer.h">
 				</File>
 				<File
-					RelativePath=".\COpenGLParallaxMapRenderer.cpp">
+					RelativePath="COpenGLParallaxMapRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\COpenGLParallaxMapRenderer.h">
+					RelativePath="COpenGLParallaxMapRenderer.h">
 				</File>
 				<File
-					RelativePath=".\COpenGLShaderMaterialRenderer.cpp">
+					RelativePath="COpenGLShaderMaterialRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\COpenGLShaderMaterialRenderer.h">
+					RelativePath="COpenGLShaderMaterialRenderer.h">
 				</File>
 				<File
-					RelativePath=".\COpenGLSLMaterialRenderer.cpp">
+					RelativePath="COpenGLSLMaterialRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\COpenGLSLMaterialRenderer.h">
+					RelativePath="COpenGLSLMaterialRenderer.h">
 				</File>
 				<File
-					RelativePath=".\COpenGLTexture.cpp">
+					RelativePath="COpenGLTexture.cpp">
 				</File>
 				<File
-					RelativePath=".\COpenGLTexture.h">
+					RelativePath="COpenGLTexture.h">
 				</File>
 				<File
-					RelativePath=".\glext.h">
+					RelativePath="glext.h">
 				</File>
 			</Filter>
 			<Filter
 				Name="Direct3D8">
 				<File
-					RelativePath=".\CD3D8Driver.cpp">
+					RelativePath="CD3D8Driver.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D8Driver.h">
+					RelativePath="CD3D8Driver.h">
 				</File>
 				<File
-					RelativePath=".\CD3D8MaterialRenderer.h">
+					RelativePath="CD3D8MaterialRenderer.h">
 				</File>
 				<File
-					RelativePath=".\CD3D8NormalMapRenderer.cpp">
+					RelativePath="CD3D8NormalMapRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D8NormalMapRenderer.h">
+					RelativePath="CD3D8NormalMapRenderer.h">
 				</File>
 				<File
-					RelativePath=".\CD3D8ParallaxMapRenderer.cpp">
+					RelativePath="CD3D8ParallaxMapRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D8ParallaxMapRenderer.h">
+					RelativePath="CD3D8ParallaxMapRenderer.h">
 				</File>
 				<File
-					RelativePath=".\CD3D8ShaderMaterialRenderer.cpp">
+					RelativePath="CD3D8ShaderMaterialRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D8ShaderMaterialRenderer.h">
+					RelativePath="CD3D8ShaderMaterialRenderer.h">
 				</File>
 				<File
-					RelativePath=".\CD3D8Texture.cpp">
+					RelativePath="CD3D8Texture.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D8Texture.h">
+					RelativePath="CD3D8Texture.h">
 				</File>
 			</Filter>
 			<Filter
 				Name="Null">
 				<File
-					RelativePath=".\CColorConverter.cpp">
+					RelativePath="CColorConverter.cpp">
 				</File>
 				<File
-					RelativePath=".\CColorConverter.h">
+					RelativePath="CColorConverter.h">
 				</File>
 				<File
-					RelativePath=".\CFPSCounter.cpp">
+					RelativePath="CFPSCounter.cpp">
 				</File>
 				<File
-					RelativePath=".\CFPSCounter.h">
+					RelativePath="CFPSCounter.h">
 				</File>
 				<File
 					RelativePath="CImage.cpp">
@@ -977,10 +1279,16 @@
 					RelativePath="CImageLoaderTGA.h">
 				</File>
 				<File
-					RelativePath=".\CNullDriver.cpp">
+					RelativePath="CImageLoaderWAL.cpp">
 				</File>
 				<File
-					RelativePath=".\CNullDriver.h">
+					RelativePath="CImageLoaderWAL.h">
+				</File>
+				<File
+					RelativePath="CNullDriver.cpp">
+				</File>
+				<File
+					RelativePath="CNullDriver.h">
 				</File>
 				<File
 					RelativePath="IImagePresenter.h">
@@ -988,213 +1296,216 @@
 				<Filter
 					Name="Writer">
 					<File
-						RelativePath=".\CImageWriterBMP.cpp">
+						RelativePath="CImageWriterBMP.cpp">
 					</File>
 					<File
-						RelativePath=".\CImageWriterBMP.h">
+						RelativePath="CImageWriterBMP.h">
 					</File>
 					<File
-						RelativePath=".\CImageWriterJPG.cpp">
+						RelativePath="CImageWriterJPG.cpp">
 					</File>
 					<File
-						RelativePath=".\CImageWriterJPG.h">
+						RelativePath="CImageWriterJPG.h">
 					</File>
 					<File
-						RelativePath=".\CImageWriterPCX.cpp">
+						RelativePath="CImageWriterPCX.cpp">
 					</File>
 					<File
-						RelativePath=".\CImageWriterPCX.h">
+						RelativePath="CImageWriterPCX.h">
 					</File>
 					<File
-						RelativePath=".\CImageWriterPNG.cpp">
+						RelativePath="CImageWriterPNG.cpp">
 					</File>
 					<File
-						RelativePath=".\CImageWriterPNG.h">
+						RelativePath="CImageWriterPNG.h">
 					</File>
 					<File
-						RelativePath=".\CImageWriterPPM.cpp">
+						RelativePath="CImageWriterPPM.cpp">
 					</File>
 					<File
-						RelativePath=".\CImageWriterPPM.h">
+						RelativePath="CImageWriterPPM.h">
 					</File>
 					<File
-						RelativePath=".\CImageWriterPSD.cpp">
+						RelativePath="CImageWriterPSD.cpp">
 					</File>
 					<File
-						RelativePath=".\CImageWriterPSD.h">
+						RelativePath="CImageWriterPSD.h">
 					</File>
 					<File
-						RelativePath=".\CImageWriterTGA.cpp">
+						RelativePath="CImageWriterTGA.cpp">
 					</File>
 					<File
-						RelativePath=".\CImageWriterTGA.h">
+						RelativePath="CImageWriterTGA.h">
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
 				Name="Direct3D9">
 				<File
-					RelativePath=".\CD3D9Driver.cpp">
+					RelativePath="CD3D9Driver.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D9Driver.h">
+					RelativePath="CD3D9Driver.h">
 				</File>
 				<File
-					RelativePath=".\CD3D9HLSLMaterialRenderer.cpp">
+					RelativePath="CD3D9HLSLMaterialRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D9HLSLMaterialRenderer.h">
+					RelativePath="CD3D9HLSLMaterialRenderer.h">
 				</File>
 				<File
-					RelativePath=".\CD3D9MaterialRenderer.h">
+					RelativePath="CD3D9MaterialRenderer.h">
 				</File>
 				<File
-					RelativePath=".\CD3D9NormalMapRenderer.cpp">
+					RelativePath="CD3D9NormalMapRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D9NormalMapRenderer.h">
+					RelativePath="CD3D9NormalMapRenderer.h">
 				</File>
 				<File
-					RelativePath=".\CD3D9ParallaxMapRenderer.cpp">
+					RelativePath="CD3D9ParallaxMapRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D9ParallaxMapRenderer.h">
+					RelativePath="CD3D9ParallaxMapRenderer.h">
 				</File>
 				<File
-					RelativePath=".\CD3D9ShaderMaterialRenderer.cpp">
+					RelativePath="CD3D9ShaderMaterialRenderer.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D9ShaderMaterialRenderer.h">
+					RelativePath="CD3D9ShaderMaterialRenderer.h">
 				</File>
 				<File
-					RelativePath=".\CD3D9Texture.cpp">
+					RelativePath="CD3D9Texture.cpp">
 				</File>
 				<File
-					RelativePath=".\CD3D9Texture.h">
+					RelativePath="CD3D9Texture.h">
 				</File>
 			</Filter>
 			<Filter
 				Name="Burning Video">
 				<File
-					RelativePath=".\CDepthBuffer.cpp">
+					RelativePath="CBurningShader_Raster_Reference.cpp">
 				</File>
 				<File
-					RelativePath=".\CDepthBuffer.h">
+					RelativePath="CDepthBuffer.cpp">
 				</File>
 				<File
-					RelativePath=".\CSoftware2MaterialRenderer.h">
+					RelativePath="CDepthBuffer.h">
 				</File>
 				<File
-					RelativePath=".\CSoftwareDriver2.cpp">
+					RelativePath="CSoftware2MaterialRenderer.h">
 				</File>
 				<File
-					RelativePath=".\CSoftwareDriver2.h">
+					RelativePath="CSoftwareDriver2.cpp">
 				</File>
 				<File
-					RelativePath=".\CSoftwareTexture2.cpp">
+					RelativePath="CSoftwareDriver2.h">
 				</File>
 				<File
-					RelativePath=".\CSoftwareTexture2.h">
+					RelativePath="CSoftwareTexture2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRGouraud2.cpp">
+					RelativePath="CSoftwareTexture2.h">
 				</File>
 				<File
-					RelativePath=".\CTRGouraudAlpha2.cpp">
+					RelativePath="CTRGouraud2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRGouraudAlphaNoZ2.cpp">
+					RelativePath="CTRGouraudAlpha2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureBlend.cpp">
+					RelativePath="CTRGouraudAlphaNoZ2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureDetailMap2.cpp">
+					RelativePath="CTRTextureBlend.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraud2.cpp">
+					RelativePath="CTRTextureDetailMap2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudAdd2.cpp">
+					RelativePath="CTRTextureGouraud2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudAddNoZ2.cpp">
+					RelativePath="CTRTextureGouraudAdd2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudAlpha.cpp">
+					RelativePath="CTRTextureGouraudAddNoZ2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudAlphaNoZ.cpp">
+					RelativePath="CTRTextureGouraudAlpha.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudNoZ2.cpp">
+					RelativePath="CTRTextureGouraudAlphaNoZ.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudVertexAlpha2.cpp">
+					RelativePath="CTRTextureGouraudNoZ2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureLightMap2_Add.cpp">
+					RelativePath="CTRTextureGouraudVertexAlpha2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureLightMap2_M1.cpp">
+					RelativePath="CTRTextureLightMap2_Add.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureLightMap2_M2.cpp">
+					RelativePath="CTRTextureLightMap2_M1.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureLightMap2_M4.cpp">
+					RelativePath="CTRTextureLightMap2_M2.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureLightMapGouraud2_M4.cpp">
+					RelativePath="CTRTextureLightMap2_M4.cpp">
 				</File>
 				<File
-					RelativePath=".\CTRTextureWire2.cpp">
+					RelativePath="CTRTextureLightMapGouraud2_M4.cpp">
 				</File>
 				<File
-					RelativePath=".\IBurningShader.cpp">
+					RelativePath="CTRTextureWire2.cpp">
 				</File>
 				<File
-					RelativePath=".\IBurningShader.h">
+					RelativePath="IBurningShader.cpp">
 				</File>
 				<File
-					RelativePath=".\IDepthBuffer.h">
+					RelativePath="IBurningShader.h">
 				</File>
 				<File
-					RelativePath=".\S4DVertex.h">
+					RelativePath="IDepthBuffer.h">
 				</File>
 				<File
-					RelativePath=".\SoftwareDriver2_compile_config.h">
+					RelativePath="S4DVertex.h">
 				</File>
 				<File
-					RelativePath=".\SoftwareDriver2_helper.h">
+					RelativePath="SoftwareDriver2_compile_config.h">
+				</File>
+				<File
+					RelativePath="SoftwareDriver2_helper.h">
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="scene impl">
 			<File
-				RelativePath=".\CDefaultSceneNodeAnimatorFactory.cpp">
+				RelativePath="CDefaultSceneNodeAnimatorFactory.cpp">
 			</File>
 			<File
-				RelativePath=".\CDefaultSceneNodeAnimatorFactory.h">
+				RelativePath="CDefaultSceneNodeAnimatorFactory.h">
 			</File>
 			<File
-				RelativePath=".\CDefaultSceneNodeFactory.cpp">
+				RelativePath="CDefaultSceneNodeFactory.cpp">
 			</File>
 			<File
-				RelativePath=".\CDefaultSceneNodeFactory.h">
+				RelativePath="CDefaultSceneNodeFactory.h">
 			</File>
 			<File
-				RelativePath=".\CGeometryCreator.cpp">
+				RelativePath="CGeometryCreator.cpp">
 			</File>
 			<File
-				RelativePath=".\CGeometryCreator.h">
+				RelativePath="CGeometryCreator.h">
 			</File>
 			<File
-				RelativePath=".\CMeshCache.cpp">
+				RelativePath="CMeshCache.cpp">
 			</File>
 			<File
-				RelativePath=".\CMeshCache.h">
+				RelativePath="CMeshCache.h">
 			</File>
 			<File
 				RelativePath="CMeshManipulator.cpp">
@@ -1203,27 +1514,27 @@
 				RelativePath="CMeshManipulator.h">
 			</File>
 			<File
-				RelativePath=".\CSceneManager.cpp">
+				RelativePath="CSceneManager.cpp">
 			</File>
 			<File
-				RelativePath=".\CSceneManager.h">
+				RelativePath="CSceneManager.h">
 			</File>
 			<File
-				RelativePath=".\OctTree.h">
+				RelativePath="OctTree.h">
 			</File>
 			<Filter
 				Name="loaders">
 				<File
-					RelativePath=".\C3DSMeshFileLoader.cpp">
+					RelativePath="C3DSMeshFileLoader.cpp">
 				</File>
 				<File
-					RelativePath=".\C3DSMeshFileLoader.h">
+					RelativePath="C3DSMeshFileLoader.h">
 				</File>
 				<File
-					RelativePath=".\CAnimatedMeshMD2.cpp">
+					RelativePath="CAnimatedMeshMD2.cpp">
 				</File>
 				<File
-					RelativePath=".\CAnimatedMeshMD2.h">
+					RelativePath="CAnimatedMeshMD2.h">
 				</File>
 				<File
 					RelativePath=".\CAnimatedMeshMD3.cpp">
@@ -1273,6 +1584,12 @@
 				<File
 					RelativePath=".\CLMTSMeshFileLoader.h">
 				</File>
+				<File
+					RelativePath=".\CLWOMeshFileLoader.cpp">
+				</File>
+				<File
+					RelativePath=".\CLWOMeshFileLoader.h">
+				</File>
 				<File
 					RelativePath=".\CMD2MeshFileLoader.cpp">
 				</File>
@@ -1300,9 +1617,6 @@
 				<File
 					RelativePath=".\CMY3DMeshFileLoader.h">
 				</File>
-				<File
-					RelativePath=".\CMY3DStuff.h">
-				</File>
 				<File
 					RelativePath=".\COBJMeshFileLoader.cpp">
 				</File>
@@ -1369,18 +1683,6 @@
 				<File
 					RelativePath=".\CBoneSceneNode.h">
 				</File>
-				<File
-					RelativePath=".\CCameraFPSSceneNode.cpp">
-				</File>
-				<File
-					RelativePath=".\CCameraFPSSceneNode.h">
-				</File>
-				<File
-					RelativePath=".\CCameraMayaSceneNode.cpp">
-				</File>
-				<File
-					RelativePath=".\CCameraMayaSceneNode.h">
-				</File>
 				<File
 					RelativePath=".\CCameraSceneNode.cpp">
 				</File>
@@ -1465,6 +1767,12 @@
 				<File
 					RelativePath=".\CTextSceneNode.h">
 				</File>
+				<File
+					RelativePath=".\CVolumeLightSceneNode.cpp">
+				</File>
+				<File
+					RelativePath=".\CVolumeLightSceneNode.h">
+				</File>
 				<File
 					RelativePath="CWaterSurfaceSceneNode.cpp">
 				</File>
@@ -1475,10 +1783,10 @@
 			<Filter
 				Name="particleSystem">
 				<File
-					RelativePath=".\CParticleAnimatedMeshSceneNodeEmitter.cpp">
+					RelativePath="CParticleAnimatedMeshSceneNodeEmitter.cpp">
 				</File>
 				<File
-					RelativePath=".\CParticleAttractionAffector.cpp">
+					RelativePath="CParticleAttractionAffector.cpp">
 				</File>
 				<File
 					RelativePath="CParticleBoxEmitter.cpp">
@@ -1487,7 +1795,7 @@
 					RelativePath="CParticleBoxEmitter.h">
 				</File>
 				<File
-					RelativePath=".\CParticleCylinderEmitter.cpp">
+					RelativePath="CParticleCylinderEmitter.cpp">
 				</File>
 				<File
 					RelativePath="CParticleFadeOutAffector.cpp">
@@ -1502,7 +1810,13 @@
 					RelativePath="CParticleGravityAffector.h">
 				</File>
 				<File
-					RelativePath=".\CParticleMeshEmitter.cpp">
+					RelativePath="CParticleScaleAffector.cpp">
+				</File>
+				<File
+					RelativePath="CParticleScaleAffector.h">
+				</File>
+				<File
+					RelativePath="CParticleMeshEmitter.cpp">
 				</File>
 				<File
 					RelativePath="CParticlePointEmitter.cpp">
@@ -1511,13 +1825,13 @@
 					RelativePath="CParticlePointEmitter.h">
 				</File>
 				<File
-					RelativePath=".\CParticleRingEmitter.cpp">
+					RelativePath="CParticleRingEmitter.cpp">
 				</File>
 				<File
-					RelativePath=".\CParticleRotationAffector.cpp">
+					RelativePath="CParticleRotationAffector.cpp">
 				</File>
 				<File
-					RelativePath=".\CParticleSphereEmitter.cpp">
+					RelativePath="CParticleSphereEmitter.cpp">
 				</File>
 				<File
 					RelativePath="CParticleSystemSceneNode.cpp">
@@ -1541,16 +1855,16 @@
 					RelativePath="COctTreeTriangleSelector.h">
 				</File>
 				<File
-					RelativePath=".\CSceneCollisionManager.cpp">
+					RelativePath="CSceneCollisionManager.cpp">
 				</File>
 				<File
-					RelativePath=".\CSceneCollisionManager.h">
+					RelativePath="CSceneCollisionManager.h">
 				</File>
 				<File
-					RelativePath=".\CTerrainTriangleSelector.cpp">
+					RelativePath="CTerrainTriangleSelector.cpp">
 				</File>
 				<File
-					RelativePath=".\CTerrainTriangleSelector.h">
+					RelativePath="CTerrainTriangleSelector.h">
 				</File>
 				<File
 					RelativePath="CTriangleBBSelector.cpp">
@@ -1567,6 +1881,18 @@
 			</Filter>
 			<Filter
 				Name="animators">
+				<File
+					RelativePath="CSceneNodeAnimatorCameraFPS.cpp">
+				</File>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraFPS.h">
+				</File>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraMaya.cpp">
+				</File>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraMaya.h">
+				</File>
 				<File
 					RelativePath="CSceneNodeAnimatorCollisionResponse.cpp">
 				</File>
@@ -1580,16 +1906,16 @@
 					RelativePath="CSceneNodeAnimatorDelete.h">
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyCircle.cpp">
+					RelativePath="CSceneNodeAnimatorFlyCircle.cpp">
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyCircle.h">
+					RelativePath="CSceneNodeAnimatorFlyCircle.h">
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyStraight.cpp">
+					RelativePath="CSceneNodeAnimatorFlyStraight.cpp">
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyStraight.h">
+					RelativePath="CSceneNodeAnimatorFlyStraight.h">
 				</File>
 				<File
 					RelativePath="CSceneNodeAnimatorFollowSpline.cpp">
@@ -1598,32 +1924,32 @@
 					RelativePath="CSceneNodeAnimatorFollowSpline.h">
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorRotation.cpp">
+					RelativePath="CSceneNodeAnimatorRotation.cpp">
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorRotation.h">
+					RelativePath="CSceneNodeAnimatorRotation.h">
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorTexture.cpp">
+					RelativePath="CSceneNodeAnimatorTexture.cpp">
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorTexture.h">
+					RelativePath="CSceneNodeAnimatorTexture.h">
 				</File>
 			</Filter>
 			<Filter
 				Name="writers"
 				Filter="">
 				<File
-					RelativePath=".\CColladaMeshWriter.cpp">
+					RelativePath="CColladaMeshWriter.cpp">
 				</File>
 				<File
-					RelativePath=".\CColladaMeshWriter.h">
+					RelativePath="CColladaMeshWriter.h">
 				</File>
 				<File
-					RelativePath=".\CIrrMeshWriter.cpp">
+					RelativePath="CIrrMeshWriter.cpp">
 				</File>
 				<File
-					RelativePath=".\CIrrMeshWriter.h">
+					RelativePath="CIrrMeshWriter.h">
 				</File>
 				<File
 					RelativePath=".\CSTLMeshWriter.cpp">
@@ -1631,6 +1957,12 @@
 				<File
 					RelativePath=".\CSTLMeshWriter.h">
 				</File>
+				<File
+					RelativePath=".\COBJMeshWriter.cpp">
+				</File>
+				<File
+					RelativePath=".\COBJMeshWriter.h">
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1822,12 +2154,6 @@
 					<File
 						RelativePath="jpeglib\cderror.h">
 					</File>
-					<File
-						RelativePath="jpeglib\cdjpeg.c">
-					</File>
-					<File
-						RelativePath="jpeglib\cdjpeg.h">
-					</File>
 					<File
 						RelativePath="jpeglib\jcapimin.c">
 					</File>
diff --git a/src/dep/src/irrlicht/Irrlicht8.0.sln b/src/dep/src/irrlicht/Irrlicht8.0.sln
index e7ed80f..e9759b2 100644
--- a/src/dep/src/irrlicht/Irrlicht8.0.sln
+++ b/src/dep/src/irrlicht/Irrlicht8.0.sln
@@ -1,18 +1,27 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Irrlicht8", "Irrlicht8.0.vcproj", "{E08E042A-6C45-411B-92BE-3CC31331019F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Irrlicht", "Irrlicht8.0.vcproj", "{E08E042A-6C45-411B-92BE-3CC31331019F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
+		Static lib - Debug|Win32 = Static lib - Debug|Win32
+		Static lib - Release - Fast FPU|Win32 = Static lib - Release - Fast FPU|Win32
+		Static lib - Release|Win32 = Static lib - Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Debug|Win32.Build.0 = Debug|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release|Win32.ActiveCfg = Release|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release|Win32.Build.0 = Release|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Debug|Win32.ActiveCfg = Static lib - Debug|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Debug|Win32.Build.0 = Static lib - Debug|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release - Fast FPU|Win32.ActiveCfg = Static lib - Release - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release - Fast FPU|Win32.Build.0 = Static lib - Release - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release|Win32.ActiveCfg = Static lib - Release|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release|Win32.Build.0 = Static lib - Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/dep/src/irrlicht/Irrlicht8.0.vcproj b/src/dep/src/irrlicht/Irrlicht8.0.vcproj
index 6ec210a..f770e2a 100644
--- a/src/dep/src/irrlicht/Irrlicht8.0.vcproj
+++ b/src/dep/src/irrlicht/Irrlicht8.0.vcproj
@@ -78,10 +78,11 @@
 				Name="VCLinkerTool"
 				UseLibraryDependencyInputs="true"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
 				IgnoreDefaultLibraryNames="libci.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\obj\IrrDebug\Irrlicht.pdb"
@@ -178,7 +179,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -259,10 +260,10 @@
 				EnableFunctionLevelLinking="true"
 				FloatingPointModel="2"
 				RuntimeTypeInfo="false"
-				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
-				AssemblerListingLocation=".\..\obj\IrrRelease/"
-				ObjectFile=".\..\obj\IrrRelease/"
-				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
+				PrecompiledHeaderFile=".\..\obj\IrrReleaseFastFPU/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrReleaseFastFPU/"
+				ObjectFile=".\..\obj\IrrReleaseFastFPU/"
+				ProgramDataBaseFileName=".\..\obj\IrrReleaseFastFPU/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
@@ -283,7 +284,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
 				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -317,6 +318,260 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Static lib - Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\Debug/Irrlicht.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
+				ExceptionHandling="0"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="false"
+				RuntimeTypeInfo="false"
+				PrecompiledHeaderFile=".\..\obj\IrrDebugStatic/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrDebugStatic/"
+				ObjectFile=".\..\obj\IrrDebugStatic/"
+				ProgramDataBaseFileName=".\..\obj\IrrDebugStatic/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Static lib - Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\Release/Irrlicht.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="false"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\..\obj\IrrReleaseStatic/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrReleaseStatic/"
+				ObjectFile=".\..\obj\IrrReleaseStatic/"
+				ProgramDataBaseFileName=".\..\obj\IrrReleaseStatic/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Static lib - Release - Fast FPU|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\Release/Irrlicht.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="0"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				RuntimeTypeInfo="false"
+				PrecompiledHeaderFile=".\..\obj\IrrReleaseFastFPUStatic/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrReleaseFastFPUStatic/"
+				ObjectFile=".\..\obj\IrrReleaseFastFPUStatic/"
+				ProgramDataBaseFileName=".\..\obj\IrrReleaseFastFPUStatic/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="0"
+				CallingConvention="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -336,6 +591,10 @@
 				RelativePath=".\..\..\include\IOSOperator.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\..\include\IReferenceCounted.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\..\include\IrrCompileConfig.h"
 				>
@@ -356,10 +615,6 @@
 				RelativePath=".\..\..\include\ITimer.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\..\include\IUnknown.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\..\include\Keycodes.h"
 				>
@@ -675,6 +930,14 @@
 					RelativePath=".\..\..\include\ISceneNodeAnimator.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\include\ISceneNodeAnimatorCameraFPS.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\ISceneNodeAnimatorCameraMaya.h"
+					>
+				</File>
 				<File
 					RelativePath=".\..\..\include\ISceneNodeAnimatorCollisionResponse.h"
 					>
@@ -687,10 +950,6 @@
 					RelativePath=".\..\..\include\ISceneNodeFactory.h"
 					>
 				</File>
-				<File
-					RelativePath=".\..\..\include\ISceneNodeMeshLoader.h"
-					>
-				</File>
 				<File
 					RelativePath=".\..\..\include\IShadowVolumeSceneNode.h"
 					>
@@ -711,6 +970,10 @@
 					RelativePath=".\..\..\include\ITriangleSelector.h"
 					>
 				</File>
+				<File
+					RelativePath=".\..\..\include\IVolumeLightSceneNode.h"
+					>
+				</File>
 				<File
 					RelativePath=".\..\..\include\SAnimatedMesh.h"
 					>
@@ -739,6 +1002,10 @@
 					RelativePath=".\..\..\include\SParticle.h"
 					>
 				</File>
+				<File
+					RelativePath=".\..\..\include\SSkinMeshBuffer.h"
+					>
+				</File>
 				<File
 					RelativePath=".\..\..\include\SViewFrustum.h"
 					>
@@ -747,6 +1014,10 @@
 			<Filter
 				Name="gui"
 				>
+				<File
+					RelativePath="..\..\include\EGUIAlignment.h"
+					>
+				</File>
 				<File
 					RelativePath=".\..\..\include\EGUIElementTypes.h"
 					>
@@ -1040,6 +1311,14 @@
 				RelativePath="CGUITabControl.h"
 				>
 			</File>
+			<File
+				RelativePath=".\CGUITable.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\CGUITable.h"
+				>
+			</File>
 			<File
 				RelativePath="CGUIToolBar.cpp"
 				>
@@ -1351,6 +1630,14 @@
 					RelativePath="CImageLoaderTGA.h"
 					>
 				</File>
+				<File
+					RelativePath="CImageLoaderWAL.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderWAL.h"
+					>
+				</File>
 				<File
 					RelativePath=".\CNullDriver.cpp"
 					>
@@ -1483,6 +1770,10 @@
 			<Filter
 				Name="Burning Video"
 				>
+				<File
+					RelativePath=".\CBurningShader_Raster_Reference.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\CDepthBuffer.cpp"
 					>
@@ -1747,6 +2038,14 @@
 					RelativePath=".\CLMTSMeshFileLoader.h"
 					>
 				</File>
+				<File
+					RelativePath=".\CLWOMeshFileLoader.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CLWOMeshFileLoader.h"
+					>
+				</File>
 				<File
 					RelativePath=".\CMD2MeshFileLoader.cpp"
 					>
@@ -1783,10 +2082,6 @@
 					RelativePath=".\CMY3DMeshFileLoader.h"
 					>
 				</File>
-				<File
-					RelativePath=".\CMY3DStuff.h"
-					>
-				</File>
 				<File
 					RelativePath=".\COBJMeshFileLoader.cpp"
 					>
@@ -1875,22 +2170,6 @@
 					RelativePath=".\CBoneSceneNode.h"
 					>
 				</File>
-				<File
-					RelativePath=".\CCameraFPSSceneNode.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CCameraFPSSceneNode.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CCameraMayaSceneNode.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CCameraMayaSceneNode.h"
-					>
-				</File>
 				<File
 					RelativePath=".\CCameraSceneNode.cpp"
 					>
@@ -2003,6 +2282,14 @@
 					RelativePath=".\CTextSceneNode.h"
 					>
 				</File>
+				<File
+					RelativePath=".\CVolumeLightSceneNode.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CVolumeLightSceneNode.h"
+					>
+				</File>
 				<File
 					RelativePath="CWaterSurfaceSceneNode.cpp"
 					>
@@ -2016,11 +2303,11 @@
 				Name="particleSystem"
 				>
 				<File
-					RelativePath=".\CParticleAnimatedMeshSceneNodeEmitter.cpp"
+					RelativePath="CParticleAnimatedMeshSceneNodeEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleAttractionAffector.cpp"
+					RelativePath="CParticleAttractionAffector.cpp"
 					>
 				</File>
 				<File
@@ -2032,7 +2319,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleCylinderEmitter.cpp"
+					RelativePath="CParticleCylinderEmitter.cpp"
 					>
 				</File>
 				<File
@@ -2052,7 +2339,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleMeshEmitter.cpp"
+					RelativePath="CParticleMeshEmitter.cpp"
 					>
 				</File>
 				<File
@@ -2064,15 +2351,31 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleRingEmitter.cpp"
+					RelativePath="CParticleRingEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleRotationAffector.cpp"
+					RelativePath="CParticleRotationAffector.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleSphereEmitter.cpp"
+					RelativePath="CParticleScaleAffector.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CParticleScaleAffector.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CParticleScaleAffector.h"
+					>
+				</File>
+				<File
+					RelativePath="CParticleScaleAffector.h"
+					>
+				</File>
+				<File
+					RelativePath="CParticleSphereEmitter.cpp"
 					>
 				</File>
 				<File
@@ -2104,19 +2407,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneCollisionManager.cpp"
+					RelativePath="CSceneCollisionManager.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneCollisionManager.h"
+					RelativePath="CSceneCollisionManager.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CTerrainTriangleSelector.cpp"
+					RelativePath="CTerrainTriangleSelector.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTerrainTriangleSelector.h"
+					RelativePath="CTerrainTriangleSelector.h"
 					>
 				</File>
 				<File
@@ -2139,6 +2442,22 @@
 			<Filter
 				Name="animators"
 				>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraFPS.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraFPS.h"
+					>
+				</File>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraMaya.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraMaya.h"
+					>
+				</File>
 				<File
 					RelativePath="CSceneNodeAnimatorCollisionResponse.cpp"
 					>
@@ -2156,19 +2475,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyCircle.cpp"
+					RelativePath="CSceneNodeAnimatorFlyCircle.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyCircle.h"
+					RelativePath="CSceneNodeAnimatorFlyCircle.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyStraight.cpp"
+					RelativePath="CSceneNodeAnimatorFlyStraight.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyStraight.h"
+					RelativePath="CSceneNodeAnimatorFlyStraight.h"
 					>
 				</File>
 				<File
@@ -2180,19 +2499,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorRotation.cpp"
+					RelativePath="CSceneNodeAnimatorRotation.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorRotation.h"
+					RelativePath="CSceneNodeAnimatorRotation.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorTexture.cpp"
+					RelativePath="CSceneNodeAnimatorTexture.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorTexture.h"
+					RelativePath="CSceneNodeAnimatorTexture.h"
 					>
 				</File>
 			</Filter>
@@ -2200,27 +2519,35 @@
 				Name="writers"
 				>
 				<File
-					RelativePath=".\CColladaMeshWriter.cpp"
+					RelativePath="CColladaMeshWriter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CColladaMeshWriter.h"
+					RelativePath="CColladaMeshWriter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CIrrMeshWriter.cpp"
+					RelativePath="CIrrMeshWriter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CIrrMeshWriter.h"
+					RelativePath="CIrrMeshWriter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSTLMeshWriter.cpp"
+					RelativePath="COBJMeshWriter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSTLMeshWriter.h"
+					RelativePath="COBJMeshWriter.h"
+					>
+				</File>
+				<File
+					RelativePath="CSTLMeshWriter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CSTLMeshWriter.h"
 					>
 				</File>
 			</Filter>
@@ -2229,63 +2556,63 @@
 			Name="io impl"
 			>
 			<File
-				RelativePath=".\CAttributeImpl.h"
+				RelativePath="CAttributeImpl.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CAttributes.cpp"
+				RelativePath="CAttributes.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CAttributes.h"
+				RelativePath="CAttributes.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CFileList.cpp"
+				RelativePath="CFileList.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CFileList.h"
+				RelativePath="CFileList.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CFileSystem.cpp"
+				RelativePath="CFileSystem.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CFileSystem.h"
+				RelativePath="CFileSystem.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CLimitReadFile.cpp"
+				RelativePath="CLimitReadFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CLimitReadFile.h"
+				RelativePath="CLimitReadFile.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CMemoryReadFile.cpp"
+				RelativePath="CMemoryReadFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CMemoryReadFile.h"
+				RelativePath="CMemoryReadFile.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CPakReader.cpp"
+				RelativePath="CPakReader.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CPakReader.h"
+				RelativePath="CPakReader.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CReadFile.cpp"
+				RelativePath="CReadFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CReadFile.h"
+				RelativePath="CReadFile.h"
 				>
 			</File>
 			<File
@@ -2305,7 +2632,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CXMLReaderImpl.h"
+				RelativePath="CXMLReaderImpl.h"
 				>
 			</File>
 			<File
@@ -2317,15 +2644,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CZipReader.cpp"
+				RelativePath="CZipReader.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CZipReader.h"
+				RelativePath="CZipReader.h"
 				>
 			</File>
 			<File
-				RelativePath=".\irrXML.cpp"
+				RelativePath="irrXML.cpp"
 				>
 			</File>
 		</Filter>
@@ -2486,14 +2813,6 @@
 						RelativePath="jpeglib\cderror.h"
 						>
 					</File>
-					<File
-						RelativePath="jpeglib\cdjpeg.c"
-						>
-					</File>
-					<File
-						RelativePath="jpeglib\cdjpeg.h"
-						>
-					</File>
 					<File
 						RelativePath="jpeglib\jcapimin.c"
 						>
diff --git a/src/dep/src/irrlicht/Irrlicht9.0.vcproj b/src/dep/src/irrlicht/Irrlicht9.0.vcproj
index ec8594c..4d87c05 100644
--- a/src/dep/src/irrlicht/Irrlicht9.0.vcproj
+++ b/src/dep/src/irrlicht/Irrlicht9.0.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Irrlicht"
 	ProjectGUID="{E08E042A-6C45-411B-92BE-3CC31331019F}"
 	RootNamespace="Irrlicht"
@@ -17,8 +17,314 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
+			OutputDirectory="..\obj\IrrDebug"
+			IntermediateDirectory="..\obj\IrrDebug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\Debug/Irrlicht.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				ExceptionHandling="0"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="false"
+				RuntimeTypeInfo="false"
+				PrecompiledHeaderFile=".\..\obj\IrrDebug/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrDebug/"
+				ObjectFile=".\..\obj\IrrDebug/"
+				ProgramDataBaseFileName=".\..\obj\IrrDebug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				UseLibraryDependencyInputs="true"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
+				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames="libci.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\obj\IrrDebug\Irrlicht.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="obj\IrrRelease"
+			IntermediateDirectory="obj\IrrRelease"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\Release/Irrlicht.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="false"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrRelease/"
+				ObjectFile=".\..\obj\IrrRelease/"
+				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
+				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libci.lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="..\obj\IrrRelease\Irrlicht.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release - Fast FPU|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\Release/Irrlicht.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
+				RuntimeTypeInfo="false"
+				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrReleaseFastFPU/"
+				ObjectFile=".\..\obj\IrrReleaseFastFPU/"
+				ProgramDataBaseFileName=".\..\obj\IrrReleaseFastFPU/"
+				WarningLevel="3"
+				WarnAsError="false"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="0"
+				CallingConvention="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
+				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libci.lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="..\obj\IrrRelease\Irrlicht.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Static lib - Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -48,17 +354,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include\irrlicht;..\..\include\DXSDK\include;zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				DisableLanguageExtensions="false"
 				RuntimeTypeInfo="false"
 				PrecompiledHeaderFile=".\..\obj\IrrDebug/Irrlicht.pch"
-				AssemblerListingLocation=".\..\obj\IrrDebug/"
-				ObjectFile=".\..\obj\IrrDebug/"
-				ProgramDataBaseFileName=".\..\obj\IrrDebug/"
+				AssemblerListingLocation=".\..\obj\IrrDebugStatic/"
+				ObjectFile=".\..\obj\IrrDebugStatic/"
+				ProgramDataBaseFileName=".\..\obj\IrrDebugStatic/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -77,9 +383,8 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="d3dx8.lib"
-				OutputFile="$(SolutionDir)\src\dep\lib\debug\irrlicht.lib"
-				AdditionalLibraryDirectories="$(SolutionDir)\src\dep\lib\static"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="..\..\lib\Win32-visualstudio\Irrlicht.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -98,9 +403,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
+			Name="Static lib - Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -133,17 +438,17 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="..\..\include\irrlicht;..\..\include\DXSDK\include;zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
-				AssemblerListingLocation=".\..\obj\IrrRelease/"
-				ObjectFile=".\..\obj\IrrRelease/"
-				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
+				AssemblerListingLocation=".\..\obj\IrrReleaseStatic/"
+				ObjectFile=".\..\obj\IrrReleaseStatic/"
+				ProgramDataBaseFileName=".\..\obj\IrrReleaseStatic/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
@@ -162,9 +467,8 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="d3dx8.lib"
-				OutputFile="$(SolutionDir)\src\dep\lib\release\irrlicht.lib"
-				AdditionalLibraryDirectories="$(SolutionDir)\src\dep\lib\static"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="..\..\lib\Win32-visualstudio\Irrlicht.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -183,9 +487,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release - Fast FPU|Win32"
-			OutputDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)\temp\$(ProjectName)\$(ConfigurationName)"
+			Name="Static lib - Release - Fast FPU|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -220,18 +524,19 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="0"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\include\irrlicht;..\..\include\DXSDK\include;zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="..\..\include;zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
 				RuntimeTypeInfo="false"
 				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
-				AssemblerListingLocation=".\..\obj\IrrRelease/"
-				ObjectFile=".\..\obj\IrrRelease/"
-				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
+				AssemblerListingLocation=".\..\obj\IrrReleaseFastFPUStatic/"
+				ObjectFile=".\..\obj\IrrReleaseFastFPUStatic/"
+				ProgramDataBaseFileName=".\..\obj\IrrReleaseFastFPUStatic/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
@@ -251,9 +556,8 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="d3dx8.lib"
-				OutputFile="$(SolutionDir)\src\dep\lib\release\irrlicht.lib"
-				AdditionalLibraryDirectories="$(SolutionDir)\src\dep\lib\static"
+				AdditionalDependencies="winmm.lib"
+				OutputFile="..\..\lib\Win32-visualstudio\Irrlicht.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -279,15 +583,15 @@
 			Name="include"
 			>
 			<File
-				RelativePath=".\..\..\include\IEventReceiver.h"
+				RelativePath="..\..\include\IEventReceiver.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\..\include\ILogger.h"
+				RelativePath="..\..\include\ILogger.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\..\include\IOSOperator.h"
+				RelativePath="..\..\include\IOSOperator.h"
 				>
 			</File>
 			<File
@@ -295,98 +599,102 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\..\include\IrrCompileConfig.h"
+				RelativePath="..\..\include\IrrCompileConfig.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\..\include\irrlicht.h"
+				RelativePath="..\..\include\irrlicht.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\..\include\IrrlichtDevice.h"
+				RelativePath="..\..\include\IrrlichtDevice.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\..\include\irrTypes.h"
+				RelativePath="..\..\include\irrTypes.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\..\include\ITimer.h"
+				RelativePath="..\..\include\ITimer.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\..\include\Keycodes.h"
+				RelativePath="..\..\include\Keycodes.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\..\include\SIrrCreationParameters.h"
+				RelativePath="..\..\include\SIrrCreationParameters.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\..\include\SKeyMap.h"
+				RelativePath="..\..\include\SKeyMap.h"
 				>
 			</File>
 			<Filter
 				Name="video"
 				>
 				<File
-					RelativePath=".\..\..\include\EDriverTypes.h"
+					RelativePath="..\..\include\EDriverTypes.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGPUProgrammingServices.h"
+					RelativePath="..\..\include\IGPUProgrammingServices.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IImage.h"
+					RelativePath="..\..\include\IImage.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IImageLoader.h"
+					RelativePath="..\..\include\IImageLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IMaterialRenderer.h"
+					RelativePath="..\..\include\IMaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IMaterialRendererServices.h"
+					RelativePath="..\..\include\IMaterialRendererServices.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IShaderConstantSetCallBack.h"
+					RelativePath="..\..\include\IShaderConstantSetCallBack.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ITexture.h"
+					RelativePath="..\..\include\ITexture.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IVideoDriver.h"
+					RelativePath="..\..\include\IVideoDriver.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IVideoModeList.h"
+					RelativePath="..\..\include\IVideoModeList.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\S3DVertex.h"
+					RelativePath="..\..\include\S3DVertex.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SColor.h"
+					RelativePath="..\..\include\SColor.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SExposedVideoData.h"
+					RelativePath="..\..\include\SExposedVideoData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SLight.h"
+					RelativePath="..\..\include\SLight.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SMaterial.h"
+					RelativePath="..\..\include\SMaterial.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\SMaterialLayer.h"
 					>
 				</File>
 			</Filter>
@@ -394,27 +702,27 @@
 				Name="core"
 				>
 				<File
-					RelativePath=".\..\..\include\aabbox3d.h"
+					RelativePath="..\..\include\aabbox3d.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\dimension2d.h"
+					RelativePath="..\..\include\dimension2d.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\heapsort.h"
+					RelativePath="..\..\include\heapsort.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\irrAllocator.h"
+					RelativePath="..\..\include\irrAllocator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\irrArray.h"
+					RelativePath="..\..\include\irrArray.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\irrList.h"
+					RelativePath="..\..\include\irrList.h"
 					>
 				</File>
 				<File
@@ -422,51 +730,51 @@
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\irrMath.h"
+					RelativePath="..\..\include\irrMath.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\irrString.h"
+					RelativePath="..\..\include\irrString.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\line2d.h"
+					RelativePath="..\..\include\line2d.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\line3d.h"
+					RelativePath="..\..\include\line3d.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\matrix4.h"
+					RelativePath="..\..\include\matrix4.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\plane3d.h"
+					RelativePath="..\..\include\plane3d.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\position2d.h"
+					RelativePath="..\..\include\position2d.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\quaternion.h"
+					RelativePath="..\..\include\quaternion.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\rect.h"
+					RelativePath="..\..\include\rect.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\triangle3d.h"
+					RelativePath="..\..\include\triangle3d.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\vector2d.h"
+					RelativePath="..\..\include\vector2d.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\vector3d.h"
+					RelativePath="..\..\include\vector3d.h"
 					>
 				</File>
 			</Filter>
@@ -474,39 +782,39 @@
 				Name="io"
 				>
 				<File
-					RelativePath=".\..\..\include\IAttributeExchangingObject.h"
+					RelativePath="..\..\include\IAttributeExchangingObject.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IAttributes.h"
+					RelativePath="..\..\include\IAttributes.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IFileList.h"
+					RelativePath="..\..\include\IFileList.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IFileSystem.h"
+					RelativePath="..\..\include\IFileSystem.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IReadFile.H"
+					RelativePath="..\..\include\IReadFile.H"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\irrXML.h"
+					RelativePath="..\..\include\irrXML.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IWriteFile.h"
+					RelativePath="..\..\include\IWriteFile.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IXMLReader.h"
+					RelativePath="..\..\include\IXMLReader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IXMLWriter.h"
+					RelativePath="..\..\include\IXMLWriter.h"
 					>
 				</File>
 			</Filter>
@@ -526,71 +834,67 @@
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ESceneNodeAnimatorTypes.h"
+					RelativePath="..\..\include\ESceneNodeAnimatorTypes.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ESceneNodeTypes.h"
+					RelativePath="..\..\include\ESceneNodeTypes.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IAnimatedMesh.h"
+					RelativePath="..\..\include\IAnimatedMesh.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IAnimatedMeshMD2.h"
+					RelativePath="..\..\include\IAnimatedMeshMD2.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IAnimatedMeshMS3D.h"
+					RelativePath="..\..\include\IAnimatedMeshMS3D.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IAnimatedMeshSceneNode.h"
+					RelativePath="..\..\include\IAnimatedMeshSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IAnimatedMeshX.h"
+					RelativePath="..\..\include\IBillboardSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IBillboardSceneNode.h"
+					RelativePath="..\..\include\ICameraSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ICameraSceneNode.h"
+					RelativePath="..\..\include\IDummyTransformationSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IDummyTransformationSceneNode.h"
+					RelativePath="..\..\include\ILightSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ILightSceneNode.h"
+					RelativePath="..\..\include\IMesh.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IMesh.h"
+					RelativePath="..\..\include\IMeshBuffer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IMeshBuffer.h"
+					RelativePath="..\..\include\IMeshCache.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IMeshCache.h"
+					RelativePath="..\..\include\IMeshLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IMeshLoader.h"
+					RelativePath="..\..\include\IMeshManipulator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IMeshManipulator.h"
-					>
-				</File>
-				<File
-					RelativePath=".\..\..\include\IMeshSceneNode.h"
+					RelativePath="..\..\include\IMeshSceneNode.h"
 					>
 				</File>
 				<File
@@ -598,59 +902,103 @@
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IMetaTriangleSelector.h"
+					RelativePath="..\..\include\IMetaTriangleSelector.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IParticleAffector.h"
+					RelativePath="..\..\include\IParticleAffector.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IParticleEmitter.h"
+					RelativePath="..\..\include\IParticleAnimatedMeshSceneNodeEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IParticleSystemSceneNode.h"
+					RelativePath="..\..\include\IParticleAttractionAffector.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IQ3LevelMesh.h"
+					RelativePath="..\..\include\IParticleBoxEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ISceneCollisionManager.h"
+					RelativePath="..\..\include\IParticleCylinderEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ISceneManager.h"
+					RelativePath="..\..\include\IParticleEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ISceneNode.h"
+					RelativePath="..\..\include\IParticleFadeOutAffector.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ISceneNodeAnimator.h"
+					RelativePath="..\..\include\IParticleGravityAffector.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ISceneNodeAnimatorCollisionResponse.h"
+					RelativePath="..\..\include\IParticleMeshEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ISceneNodeAnimatorFactory.h"
+					RelativePath="..\..\include\IParticleRingEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ISceneNodeFactory.h"
+					RelativePath="..\..\include\IParticleRotationAffector.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ISceneNodeMeshLoader.h"
+					RelativePath="..\..\include\IParticleSphereEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IShadowVolumeSceneNode.h"
+					RelativePath="..\..\include\IParticleSystemSceneNode.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\IQ3LevelMesh.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\ISceneCollisionManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\ISceneManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\ISceneNode.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\ISceneNodeAnimator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\ISceneNodeAnimatorCameraFPS.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\ISceneNodeAnimatorCameraMaya.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\ISceneNodeAnimatorCollisionResponse.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\ISceneNodeAnimatorFactory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\ISceneNodeFactory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\IShadowVolumeSceneNode.h"
 					>
 				</File>
 				<File
@@ -658,47 +1006,55 @@
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ITerrainSceneNode.h"
+					RelativePath="..\..\include\ITerrainSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ITextSceneNode.h"
+					RelativePath="..\..\include\ITextSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ITriangleSelector.h"
+					RelativePath="..\..\include\ITriangleSelector.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SAnimatedMesh.h"
+					RelativePath="..\..\include\IVolumeLightSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SceneParameters.h"
+					RelativePath="..\..\include\SAnimatedMesh.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SMesh.h"
+					RelativePath="..\..\include\SceneParameters.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SMeshBuffer.h"
+					RelativePath="..\..\include\SMesh.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SMeshBufferLightMap.h"
+					RelativePath="..\..\include\SMeshBuffer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SMeshBufferTangents.h"
+					RelativePath="..\..\include\SMeshBufferLightMap.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SParticle.h"
+					RelativePath="..\..\include\SMeshBufferTangents.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\SViewFrustum.h"
+					RelativePath="..\..\include\SParticle.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\SSkinMeshBuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\SViewFrustum.h"
 					>
 				</File>
 			</Filter>
@@ -706,7 +1062,11 @@
 				Name="gui"
 				>
 				<File
-					RelativePath=".\..\..\include\EGUIElementTypes.h"
+					RelativePath="..\..\include\EGUIAlignment.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\EGUIElementTypes.h"
 					>
 				</File>
 				<File
@@ -714,31 +1074,31 @@
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\ICursorControl.h"
+					RelativePath="..\..\include\ICursorControl.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIButton.h"
+					RelativePath="..\..\include\IGUIButton.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUICheckbox.h"
+					RelativePath="..\..\include\IGUICheckbox.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIComboBox.h"
+					RelativePath="..\..\include\IGUIComboBox.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIContextMenu.h"
+					RelativePath="..\..\include\IGUIContextMenu.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIEditBox.h"
+					RelativePath="..\..\include\IGUIEditBox.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIElement.h"
+					RelativePath="..\..\include\IGUIElement.h"
 					>
 				</File>
 				<File
@@ -746,39 +1106,39 @@
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIEnvironment.h"
+					RelativePath="..\..\include\IGUIEnvironment.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIFileOpenDialog.h"
+					RelativePath="..\..\include\IGUIFileOpenDialog.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIFont.h"
+					RelativePath="..\..\include\IGUIFont.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIImage.h"
+					RelativePath="..\..\include\IGUIImage.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIInOutFader.h"
+					RelativePath="..\..\include\IGUIInOutFader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIListBox.h"
+					RelativePath="..\..\include\IGUIListBox.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIMeshViewer.h"
+					RelativePath="..\..\include\IGUIMeshViewer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIScrollBar.h"
+					RelativePath="..\..\include\IGUIScrollBar.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUISkin.h"
+					RelativePath="..\..\include\IGUISkin.h"
 					>
 				</File>
 				<File
@@ -790,19 +1150,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIStaticText.h"
+					RelativePath="..\..\include\IGUIStaticText.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUITabControl.h"
+					RelativePath="..\..\include\IGUITabControl.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIToolbar.h"
+					RelativePath="..\..\include\IGUIToolbar.h"
 					>
 				</File>
 				<File
-					RelativePath=".\..\..\include\IGUIWindow.h"
+					RelativePath="..\..\include\IGUIWindow.h"
 					>
 				</File>
 			</Filter>
@@ -811,39 +1171,39 @@
 			Name="gui impl"
 			>
 			<File
-				RelativePath=".\BuiltInFont.h"
+				RelativePath="BuiltInFont.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CDefaultGUIElementFactory.cpp"
+				RelativePath="CDefaultGUIElementFactory.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CDefaultGUIElementFactory.h"
+				RelativePath="CDefaultGUIElementFactory.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIButton.cpp"
+				RelativePath="CGUIButton.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIButton.h"
+				RelativePath="CGUIButton.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUICheckbox.cpp"
+				RelativePath="CGUICheckbox.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUICheckbox.h"
+				RelativePath="CGUICheckbox.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIColorSelectDialog.cpp"
+				RelativePath="CGUIColorSelectDialog.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIColorSelectDialog.h"
+				RelativePath="CGUIColorSelectDialog.h"
 				>
 			</File>
 			<File
@@ -871,35 +1231,35 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIEnvironment.cpp"
+				RelativePath="CGUIEnvironment.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIEnvironment.h"
+				RelativePath="CGUIEnvironment.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIFileOpenDialog.cpp"
+				RelativePath="CGUIFileOpenDialog.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIFileOpenDialog.h"
+				RelativePath="CGUIFileOpenDialog.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIFont.cpp"
+				RelativePath="CGUIFont.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIFont.h"
+				RelativePath="CGUIFont.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIImage.cpp"
+				RelativePath="CGUIImage.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIImage.h"
+				RelativePath="CGUIImage.h"
 				>
 			</File>
 			<File
@@ -911,11 +1271,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIListBox.cpp"
+				RelativePath="CGUIListBox.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIListBox.h"
+				RelativePath="CGUIListBox.h"
 				>
 			</File>
 			<File
@@ -927,11 +1287,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIMeshViewer.cpp"
+				RelativePath="CGUIMeshViewer.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIMeshViewer.h"
+				RelativePath="CGUIMeshViewer.h"
 				>
 			</File>
 			<File
@@ -951,43 +1311,43 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIScrollBar.cpp"
+				RelativePath="CGUIScrollBar.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIScrollBar.h"
+				RelativePath="CGUIScrollBar.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUISkin.cpp"
+				RelativePath="CGUISkin.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUISkin.h"
+				RelativePath="CGUISkin.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUISpinBox.cpp"
+				RelativePath="CGUISpinBox.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUISpinBox.h"
+				RelativePath="CGUISpinBox.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUISpriteBank.cpp"
+				RelativePath="CGUISpriteBank.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUISpriteBank.h"
+				RelativePath="CGUISpriteBank.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIStaticText.cpp"
+				RelativePath="CGUIStaticText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIStaticText.h"
+				RelativePath="CGUIStaticText.h"
 				>
 			</File>
 			<File
@@ -998,6 +1358,14 @@
 				RelativePath="CGUITabControl.h"
 				>
 			</File>
+			<File
+				RelativePath="CGUITable.cpp"
+				>
+			</File>
+			<File
+				RelativePath="CGUITable.h"
+				>
+			</File>
 			<File
 				RelativePath="CGUIToolBar.cpp"
 				>
@@ -1007,11 +1375,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIWindow.cpp"
+				RelativePath="CGUIWindow.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIWindow.h"
+				RelativePath="CGUIWindow.h"
 				>
 			</File>
 		</Filter>
@@ -1030,83 +1398,83 @@
 				Name="Software"
 				>
 				<File
-					RelativePath=".\CSoftwareDriver.cpp"
+					RelativePath="CSoftwareDriver.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSoftwareDriver.h"
+					RelativePath="CSoftwareDriver.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSoftwareTexture.cpp"
+					RelativePath="CSoftwareTexture.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSoftwareTexture.h"
+					RelativePath="CSoftwareTexture.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRFlat.cpp"
+					RelativePath="CTRFlat.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRFlatWire.cpp"
+					RelativePath="CTRFlatWire.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRGouraud.cpp"
+					RelativePath="CTRGouraud.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRGouraudWire.cpp"
+					RelativePath="CTRGouraudWire.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureFlat.cpp"
+					RelativePath="CTRTextureFlat.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureFlatWire.cpp"
+					RelativePath="CTRTextureFlatWire.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraud.cpp"
+					RelativePath="CTRTextureGouraud.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraud.h"
+					RelativePath="CTRTextureGouraud.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudAdd.cpp"
+					RelativePath="CTRTextureGouraudAdd.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudNoZ.cpp"
+					RelativePath="CTRTextureGouraudNoZ.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudWire.cpp"
+					RelativePath="CTRTextureGouraudWire.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CZBuffer.cpp"
+					RelativePath="CZBuffer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CZBuffer.h"
+					RelativePath="CZBuffer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\ITriangleRenderer.h"
+					RelativePath="ITriangleRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\IZBuffer.h"
+					RelativePath="IZBuffer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\S2DVertex.h"
+					RelativePath="S2DVertex.h"
 					>
 				</File>
 			</Filter>
@@ -1114,67 +1482,67 @@
 				Name="OpenGL"
 				>
 				<File
-					RelativePath=".\COpenGLDriver.cpp"
+					RelativePath="COpenGLDriver.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLDriver.h"
+					RelativePath="COpenGLDriver.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLExtensionHandler.cpp"
+					RelativePath="COpenGLExtensionHandler.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLExtensionHandler.h"
+					RelativePath="COpenGLExtensionHandler.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLMaterialRenderer.h"
+					RelativePath="COpenGLMaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLNormalMapRenderer.cpp"
+					RelativePath="COpenGLNormalMapRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLNormalMapRenderer.h"
+					RelativePath="COpenGLNormalMapRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLParallaxMapRenderer.cpp"
+					RelativePath="COpenGLParallaxMapRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLParallaxMapRenderer.h"
+					RelativePath="COpenGLParallaxMapRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLShaderMaterialRenderer.cpp"
+					RelativePath="COpenGLShaderMaterialRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLShaderMaterialRenderer.h"
+					RelativePath="COpenGLShaderMaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLSLMaterialRenderer.cpp"
+					RelativePath="COpenGLSLMaterialRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLSLMaterialRenderer.h"
+					RelativePath="COpenGLSLMaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLTexture.cpp"
+					RelativePath="COpenGLTexture.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COpenGLTexture.h"
+					RelativePath="COpenGLTexture.h"
 					>
 				</File>
 				<File
-					RelativePath=".\glext.h"
+					RelativePath="glext.h"
 					>
 				</File>
 			</Filter>
@@ -1182,47 +1550,47 @@
 				Name="Direct3D8"
 				>
 				<File
-					RelativePath=".\CD3D8Driver.cpp"
+					RelativePath="CD3D8Driver.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D8Driver.h"
+					RelativePath="CD3D8Driver.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D8MaterialRenderer.h"
+					RelativePath="CD3D8MaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D8NormalMapRenderer.cpp"
+					RelativePath="CD3D8NormalMapRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D8NormalMapRenderer.h"
+					RelativePath="CD3D8NormalMapRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D8ParallaxMapRenderer.cpp"
+					RelativePath="CD3D8ParallaxMapRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D8ParallaxMapRenderer.h"
+					RelativePath="CD3D8ParallaxMapRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D8ShaderMaterialRenderer.cpp"
+					RelativePath="CD3D8ShaderMaterialRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D8ShaderMaterialRenderer.h"
+					RelativePath="CD3D8ShaderMaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D8Texture.cpp"
+					RelativePath="CD3D8Texture.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D8Texture.h"
+					RelativePath="CD3D8Texture.h"
 					>
 				</File>
 			</Filter>
@@ -1230,19 +1598,19 @@
 				Name="Null"
 				>
 				<File
-					RelativePath=".\CColorConverter.cpp"
+					RelativePath="CColorConverter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CColorConverter.h"
+					RelativePath="CColorConverter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CFPSCounter.cpp"
+					RelativePath="CFPSCounter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CFPSCounter.h"
+					RelativePath="CFPSCounter.h"
 					>
 				</File>
 				<File
@@ -1310,11 +1678,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CNullDriver.cpp"
+					RelativePath="CImageLoaderWAL.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CNullDriver.h"
+					RelativePath="CImageLoaderWAL.h"
+					>
+				</File>
+				<File
+					RelativePath="CNullDriver.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CNullDriver.h"
 					>
 				</File>
 				<File
@@ -1325,59 +1701,59 @@
 					Name="Writer"
 					>
 					<File
-						RelativePath=".\CImageWriterBMP.cpp"
+						RelativePath="CImageWriterBMP.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterBMP.h"
+						RelativePath="CImageWriterBMP.h"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterJPG.cpp"
+						RelativePath="CImageWriterJPG.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterJPG.h"
+						RelativePath="CImageWriterJPG.h"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterPCX.cpp"
+						RelativePath="CImageWriterPCX.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterPCX.h"
+						RelativePath="CImageWriterPCX.h"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterPNG.cpp"
+						RelativePath="CImageWriterPNG.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterPNG.h"
+						RelativePath="CImageWriterPNG.h"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterPPM.cpp"
+						RelativePath="CImageWriterPPM.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterPPM.h"
+						RelativePath="CImageWriterPPM.h"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterPSD.cpp"
+						RelativePath="CImageWriterPSD.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterPSD.h"
+						RelativePath="CImageWriterPSD.h"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterTGA.cpp"
+						RelativePath="CImageWriterTGA.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\CImageWriterTGA.h"
+						RelativePath="CImageWriterTGA.h"
 						>
 					</File>
 				</Filter>
@@ -1386,55 +1762,55 @@
 				Name="Direct3D9"
 				>
 				<File
-					RelativePath=".\CD3D9Driver.cpp"
+					RelativePath="CD3D9Driver.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9Driver.h"
+					RelativePath="CD3D9Driver.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9HLSLMaterialRenderer.cpp"
+					RelativePath="CD3D9HLSLMaterialRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9HLSLMaterialRenderer.h"
+					RelativePath="CD3D9HLSLMaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9MaterialRenderer.h"
+					RelativePath="CD3D9MaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9NormalMapRenderer.cpp"
+					RelativePath="CD3D9NormalMapRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9NormalMapRenderer.h"
+					RelativePath="CD3D9NormalMapRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9ParallaxMapRenderer.cpp"
+					RelativePath="CD3D9ParallaxMapRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9ParallaxMapRenderer.h"
+					RelativePath="CD3D9ParallaxMapRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9ShaderMaterialRenderer.cpp"
+					RelativePath="CD3D9ShaderMaterialRenderer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9ShaderMaterialRenderer.h"
+					RelativePath="CD3D9ShaderMaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9Texture.cpp"
+					RelativePath="CD3D9Texture.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CD3D9Texture.h"
+					RelativePath="CD3D9Texture.h"
 					>
 				</File>
 			</Filter>
@@ -1442,127 +1818,131 @@
 				Name="Burning Video"
 				>
 				<File
-					RelativePath=".\CDepthBuffer.cpp"
+					RelativePath="CBurningShader_Raster_Reference.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CDepthBuffer.h"
+					RelativePath="CDepthBuffer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSoftware2MaterialRenderer.h"
+					RelativePath="CDepthBuffer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSoftwareDriver2.cpp"
+					RelativePath="CSoftware2MaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSoftwareDriver2.h"
+					RelativePath="CSoftwareDriver2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSoftwareTexture2.cpp"
+					RelativePath="CSoftwareDriver2.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSoftwareTexture2.h"
+					RelativePath="CSoftwareTexture2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRGouraud2.cpp"
+					RelativePath="CSoftwareTexture2.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRGouraudAlpha2.cpp"
+					RelativePath="CTRGouraud2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRGouraudAlphaNoZ2.cpp"
+					RelativePath="CTRGouraudAlpha2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureBlend.cpp"
+					RelativePath="CTRGouraudAlphaNoZ2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureDetailMap2.cpp"
+					RelativePath="CTRTextureBlend.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraud2.cpp"
+					RelativePath="CTRTextureDetailMap2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudAdd2.cpp"
+					RelativePath="CTRTextureGouraud2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudAddNoZ2.cpp"
+					RelativePath="CTRTextureGouraudAdd2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudAlpha.cpp"
+					RelativePath="CTRTextureGouraudAddNoZ2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudAlphaNoZ.cpp"
+					RelativePath="CTRTextureGouraudAlpha.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudNoZ2.cpp"
+					RelativePath="CTRTextureGouraudAlphaNoZ.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureGouraudVertexAlpha2.cpp"
+					RelativePath="CTRTextureGouraudNoZ2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureLightMap2_Add.cpp"
+					RelativePath="CTRTextureGouraudVertexAlpha2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureLightMap2_M1.cpp"
+					RelativePath="CTRTextureLightMap2_Add.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureLightMap2_M2.cpp"
+					RelativePath="CTRTextureLightMap2_M1.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureLightMap2_M4.cpp"
+					RelativePath="CTRTextureLightMap2_M2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureLightMapGouraud2_M4.cpp"
+					RelativePath="CTRTextureLightMap2_M4.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTRTextureWire2.cpp"
+					RelativePath="CTRTextureLightMapGouraud2_M4.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\IBurningShader.cpp"
+					RelativePath="CTRTextureWire2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\IBurningShader.h"
+					RelativePath="IBurningShader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\IDepthBuffer.h"
+					RelativePath="IBurningShader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\S4DVertex.h"
+					RelativePath="IDepthBuffer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\SoftwareDriver2_compile_config.h"
+					RelativePath="S4DVertex.h"
 					>
 				</File>
 				<File
-					RelativePath=".\SoftwareDriver2_helper.h"
+					RelativePath="SoftwareDriver2_compile_config.h"
+					>
+				</File>
+				<File
+					RelativePath="SoftwareDriver2_helper.h"
 					>
 				</File>
 			</Filter>
@@ -1571,35 +1951,35 @@
 			Name="scene impl"
 			>
 			<File
-				RelativePath=".\CDefaultSceneNodeAnimatorFactory.cpp"
+				RelativePath="CDefaultSceneNodeAnimatorFactory.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CDefaultSceneNodeAnimatorFactory.h"
+				RelativePath="CDefaultSceneNodeAnimatorFactory.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CDefaultSceneNodeFactory.cpp"
+				RelativePath="CDefaultSceneNodeFactory.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CDefaultSceneNodeFactory.h"
+				RelativePath="CDefaultSceneNodeFactory.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CGeometryCreator.cpp"
+				RelativePath="CGeometryCreator.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CGeometryCreator.h"
+				RelativePath="CGeometryCreator.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CMeshCache.cpp"
+				RelativePath="CMeshCache.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CMeshCache.h"
+				RelativePath="CMeshCache.h"
 				>
 			</File>
 			<File
@@ -1611,178 +1991,182 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CSceneManager.cpp"
+				RelativePath="CSceneManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CSceneManager.h"
+				RelativePath="CSceneManager.h"
 				>
 			</File>
 			<File
-				RelativePath=".\OctTree.h"
+				RelativePath="OctTree.h"
 				>
 			</File>
 			<Filter
 				Name="loaders"
 				>
 				<File
-					RelativePath=".\C3DSMeshFileLoader.cpp"
+					RelativePath="C3DSMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\C3DSMeshFileLoader.h"
+					RelativePath="C3DSMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CAnimatedMeshMD2.cpp"
+					RelativePath="CAnimatedMeshMD2.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CAnimatedMeshMD2.h"
+					RelativePath="CAnimatedMeshMD2.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CAnimatedMeshMD3.cpp"
+					RelativePath="CAnimatedMeshMD3.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CAnimatedMeshMD3.h"
+					RelativePath="CAnimatedMeshMD3.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CB3DMeshFileLoader.cpp"
+					RelativePath="CB3DMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CB3DMeshFileLoader.h"
+					RelativePath="CB3DMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CBSPMeshFileLoader.cpp"
+					RelativePath="CBSPMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CBSPMeshFileLoader.h"
+					RelativePath="CBSPMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CColladaFileLoader.cpp"
+					RelativePath="CColladaFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CColladaFileLoader.h"
+					RelativePath="CColladaFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CCSMLoader.cpp"
+					RelativePath="CCSMLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CCSMLoader.h"
+					RelativePath="CCSMLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CDMFLoader.cpp"
+					RelativePath="CDMFLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CDMFLoader.h"
+					RelativePath="CDMFLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CIrrMeshFileLoader.cpp"
+					RelativePath="CIrrMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CIrrMeshFileLoader.h"
+					RelativePath="CIrrMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CLMTSMeshFileLoader.cpp"
+					RelativePath="CLMTSMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CLMTSMeshFileLoader.h"
+					RelativePath="CLMTSMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CMD2MeshFileLoader.cpp"
+					RelativePath="CLWOMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CMD2MeshFileLoader.h"
+					RelativePath="CLWOMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CMD3MeshFileLoader.cpp"
+					RelativePath="CMD2MeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CMD3MeshFileLoader.h"
+					RelativePath="CMD2MeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CMS3DMeshFileLoader.cpp"
+					RelativePath="CMD3MeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CMS3DMeshFileLoader.h"
+					RelativePath="CMD3MeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CMY3DHelper.h"
+					RelativePath="CMS3DMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CMY3DMeshFileLoader.cpp"
+					RelativePath="CMS3DMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CMY3DMeshFileLoader.h"
+					RelativePath="CMY3DHelper.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CMY3DStuff.h"
+					RelativePath="CMY3DMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COBJMeshFileLoader.cpp"
+					RelativePath="CMY3DMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COBJMeshFileLoader.h"
+					RelativePath="COBJMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COCTLoader.cpp"
+					RelativePath="COBJMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COCTLoader.h"
+					RelativePath="COCTLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COgreMeshFileLoader.cpp"
+					RelativePath="COCTLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COgreMeshFileLoader.h"
+					RelativePath="COgreMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CQ3LevelMesh.cpp"
+					RelativePath="COgreMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CQ3LevelMesh.h"
+					RelativePath="CQ3LevelMesh.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSkinnedMesh.cpp"
+					RelativePath="CQ3LevelMesh.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSkinnedMesh.h"
+					RelativePath="CSkinnedMesh.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CSkinnedMesh.h"
 					>
 				</File>
 				<File
@@ -1802,7 +2186,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\dmfsupport.h"
+					RelativePath="dmfsupport.h"
 					>
 				</File>
 			</Filter>
@@ -1810,59 +2194,43 @@
 				Name="sceneNodes"
 				>
 				<File
-					RelativePath=".\CAnimatedMeshSceneNode.cpp"
+					RelativePath="CAnimatedMeshSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CAnimatedMeshSceneNode.h"
+					RelativePath="CAnimatedMeshSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CBillboardSceneNode.cpp"
+					RelativePath="CBillboardSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CBillboardSceneNode.h"
+					RelativePath="CBillboardSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CBoneSceneNode.cpp"
+					RelativePath="CBoneSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CBoneSceneNode.h"
+					RelativePath="CBoneSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CCameraFPSSceneNode.cpp"
+					RelativePath="CCameraSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CCameraFPSSceneNode.h"
+					RelativePath="CCameraSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CCameraMayaSceneNode.cpp"
+					RelativePath="CCubeSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CCameraMayaSceneNode.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CCameraSceneNode.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CCameraSceneNode.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CCubeSceneNode.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CCubeSceneNode.h"
+					RelativePath="CCubeSceneNode.h"
 					>
 				</File>
 				<File
@@ -1882,67 +2250,67 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CLightSceneNode.cpp"
+					RelativePath="CLightSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CLightSceneNode.h"
+					RelativePath="CLightSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CMeshSceneNode.cpp"
+					RelativePath="CMeshSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CMeshSceneNode.h"
+					RelativePath="CMeshSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\COctTreeSceneNode.cpp"
+					RelativePath="COctTreeSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\COctTreeSceneNode.h"
+					RelativePath="COctTreeSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CQuake3ShaderSceneNode.cpp"
+					RelativePath="CQuake3ShaderSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CQuake3ShaderSceneNode.h"
+					RelativePath="CQuake3ShaderSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CShadowVolumeSceneNode.cpp"
+					RelativePath="CShadowVolumeSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CShadowVolumeSceneNode.h"
+					RelativePath="CShadowVolumeSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSkyBoxSceneNode.cpp"
+					RelativePath="CSkyBoxSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSkyBoxSceneNode.h"
+					RelativePath="CSkyBoxSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSkyDomeSceneNode.cpp"
+					RelativePath="CSkyDomeSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSkyDomeSceneNode.h"
+					RelativePath="CSkyDomeSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSphereSceneNode.cpp"
+					RelativePath="CSphereSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSphereSceneNode.h"
+					RelativePath="CSphereSceneNode.h"
 					>
 				</File>
 				<File
@@ -1954,11 +2322,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CTextSceneNode.cpp"
+					RelativePath="CTextSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTextSceneNode.h"
+					RelativePath="CTextSceneNode.h"
+					>
+				</File>
+				<File
+					RelativePath="CVolumeLightSceneNode.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CVolumeLightSceneNode.h"
 					>
 				</File>
 				<File
@@ -1974,11 +2350,19 @@
 				Name="particleSystem"
 				>
 				<File
-					RelativePath=".\CParticleAnimatedMeshSceneNodeEmitter.cpp"
+					RelativePath="CParticleAnimatedMeshSceneNodeEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleAttractionAffector.cpp"
+					RelativePath=".\CParticleAnimatedMeshSceneNodeEmitter.h"
+					>
+				</File>
+				<File
+					RelativePath="CParticleAttractionAffector.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CParticleAttractionAffector.h"
 					>
 				</File>
 				<File
@@ -1990,7 +2374,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleCylinderEmitter.cpp"
+					RelativePath="CParticleCylinderEmitter.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CParticleCylinderEmitter.h"
 					>
 				</File>
 				<File
@@ -2010,7 +2398,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleMeshEmitter.cpp"
+					RelativePath="CParticleMeshEmitter.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CParticleMeshEmitter.h"
 					>
 				</File>
 				<File
@@ -2022,15 +2414,35 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleRingEmitter.cpp"
+					RelativePath="CParticleRingEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleRotationAffector.cpp"
+					RelativePath=".\CParticleRingEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CParticleSphereEmitter.cpp"
+					RelativePath="CParticleRotationAffector.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CParticleRotationAffector.h"
+					>
+				</File>
+				<File
+					RelativePath="CParticleScaleAffector.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CParticleScaleAffector.h"
+					>
+				</File>
+				<File
+					RelativePath="CParticleSphereEmitter.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CParticleSphereEmitter.h"
 					>
 				</File>
 				<File
@@ -2062,19 +2474,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneCollisionManager.cpp"
+					RelativePath="CSceneCollisionManager.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneCollisionManager.h"
+					RelativePath="CSceneCollisionManager.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CTerrainTriangleSelector.cpp"
+					RelativePath="CTerrainTriangleSelector.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CTerrainTriangleSelector.h"
+					RelativePath="CTerrainTriangleSelector.h"
 					>
 				</File>
 				<File
@@ -2097,6 +2509,22 @@
 			<Filter
 				Name="animators"
 				>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraFPS.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraFPS.h"
+					>
+				</File>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraMaya.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CSceneNodeAnimatorCameraMaya.h"
+					>
+				</File>
 				<File
 					RelativePath="CSceneNodeAnimatorCollisionResponse.cpp"
 					>
@@ -2114,19 +2542,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyCircle.cpp"
+					RelativePath="CSceneNodeAnimatorFlyCircle.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyCircle.h"
+					RelativePath="CSceneNodeAnimatorFlyCircle.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyStraight.cpp"
+					RelativePath="CSceneNodeAnimatorFlyStraight.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorFlyStraight.h"
+					RelativePath="CSceneNodeAnimatorFlyStraight.h"
 					>
 				</File>
 				<File
@@ -2138,19 +2566,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorRotation.cpp"
+					RelativePath="CSceneNodeAnimatorRotation.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorRotation.h"
+					RelativePath="CSceneNodeAnimatorRotation.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorTexture.cpp"
+					RelativePath="CSceneNodeAnimatorTexture.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSceneNodeAnimatorTexture.h"
+					RelativePath="CSceneNodeAnimatorTexture.h"
 					>
 				</File>
 			</Filter>
@@ -2158,27 +2586,35 @@
 				Name="writers"
 				>
 				<File
-					RelativePath=".\CColladaMeshWriter.cpp"
+					RelativePath="CColladaMeshWriter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CColladaMeshWriter.h"
+					RelativePath="CColladaMeshWriter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CIrrMeshWriter.cpp"
+					RelativePath="CIrrMeshWriter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CIrrMeshWriter.h"
+					RelativePath="CIrrMeshWriter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\CSTLMeshWriter.cpp"
+					RelativePath="COBJMeshWriter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\CSTLMeshWriter.h"
+					RelativePath="COBJMeshWriter.h"
+					>
+				</File>
+				<File
+					RelativePath="CSTLMeshWriter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CSTLMeshWriter.h"
 					>
 				</File>
 			</Filter>
@@ -2187,63 +2623,63 @@
 			Name="io impl"
 			>
 			<File
-				RelativePath=".\CAttributeImpl.h"
+				RelativePath="CAttributeImpl.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CAttributes.cpp"
+				RelativePath="CAttributes.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CAttributes.h"
+				RelativePath="CAttributes.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CFileList.cpp"
+				RelativePath="CFileList.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CFileList.h"
+				RelativePath="CFileList.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CFileSystem.cpp"
+				RelativePath="CFileSystem.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CFileSystem.h"
+				RelativePath="CFileSystem.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CLimitReadFile.cpp"
+				RelativePath="CLimitReadFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CLimitReadFile.h"
+				RelativePath="CLimitReadFile.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CMemoryReadFile.cpp"
+				RelativePath="CMemoryReadFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CMemoryReadFile.h"
+				RelativePath="CMemoryReadFile.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CPakReader.cpp"
+				RelativePath="CPakReader.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CPakReader.h"
+				RelativePath="CPakReader.h"
 				>
 			</File>
 			<File
-				RelativePath=".\CReadFile.cpp"
+				RelativePath="CReadFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CReadFile.h"
+				RelativePath="CReadFile.h"
 				>
 			</File>
 			<File
@@ -2263,7 +2699,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CXMLReaderImpl.h"
+				RelativePath="CXMLReaderImpl.h"
 				>
 			</File>
 			<File
@@ -2275,15 +2711,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CZipReader.cpp"
+				RelativePath="CZipReader.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CZipReader.h"
+				RelativePath="CZipReader.h"
 				>
 			</File>
 			<File
-				RelativePath=".\irrXML.cpp"
+				RelativePath="irrXML.cpp"
 				>
 			</File>
 		</Filter>
@@ -2298,6 +2734,14 @@
 				RelativePath="CIrrDeviceLinux.h"
 				>
 			</File>
+			<File
+				RelativePath="CIrrDeviceSDL.cpp"
+				>
+			</File>
+			<File
+				RelativePath="CIrrDeviceSDL.h"
+				>
+			</File>
 			<File
 				RelativePath="CIrrDeviceStub.cpp"
 				>
@@ -2335,7 +2779,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\Irrlicht.cpp"
+				RelativePath="Irrlicht.cpp"
 				>
 			</File>
 			<File
@@ -2357,19 +2801,19 @@
 						>
 					</File>
 					<File
-						RelativePath=".\zlib\compress.c"
+						RelativePath="zlib\compress.c"
 						>
 					</File>
 					<File
-						RelativePath=".\zlib\crc32.c"
+						RelativePath="zlib\crc32.c"
 						>
 					</File>
 					<File
-						RelativePath=".\zlib\crc32.h"
+						RelativePath="zlib\crc32.h"
 						>
 					</File>
 					<File
-						RelativePath=".\zlib\deflate.c"
+						RelativePath="zlib\deflate.c"
 						>
 					</File>
 					<File
@@ -2436,14 +2880,6 @@
 						RelativePath="jpeglib\cderror.h"
 						>
 					</File>
-					<File
-						RelativePath="jpeglib\cdjpeg.c"
-						>
-					</File>
-					<File
-						RelativePath="jpeglib\cdjpeg.h"
-						>
-					</File>
 					<File
 						RelativePath="jpeglib\jcapimin.c"
 						>
@@ -2677,71 +3113,71 @@
 					Name="libpng"
 					>
 					<File
-						RelativePath=".\libpng\png.c"
+						RelativePath="libpng\png.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\png.h"
+						RelativePath="libpng\png.h"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngconf.h"
+						RelativePath="libpng\pngconf.h"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngerror.c"
+						RelativePath="libpng\pngerror.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngget.c"
+						RelativePath="libpng\pngget.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngmem.c"
+						RelativePath="libpng\pngmem.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngpread.c"
+						RelativePath="libpng\pngpread.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngread.c"
+						RelativePath="libpng\pngread.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngrio.c"
+						RelativePath="libpng\pngrio.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngrtran.c"
+						RelativePath="libpng\pngrtran.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngrutil.c"
+						RelativePath="libpng\pngrutil.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngset.c"
+						RelativePath="libpng\pngset.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngtrans.c"
+						RelativePath="libpng\pngtrans.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngwio.c"
+						RelativePath="libpng\pngwio.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngwrite.c"
+						RelativePath="libpng\pngwrite.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngwtran.c"
+						RelativePath="libpng\pngwtran.c"
 						>
 					</File>
 					<File
-						RelativePath=".\libpng\pngwutil.c"
+						RelativePath="libpng\pngwutil.c"
 						>
 					</File>
 				</Filter>
diff --git a/src/dep/src/irrlicht/Irrlicht_Win32-gcc.cbp b/src/dep/src/irrlicht/Irrlicht_Win32-gcc.cbp
index ae47fef..e69de29 100644
--- a/src/dep/src/irrlicht/Irrlicht_Win32-gcc.cbp
+++ b/src/dep/src/irrlicht/Irrlicht_Win32-gcc.cbp
@@ -1,854 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="Irrlicht" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="..\..\bin\Win32-gcc\Irrlicht.dll" prefix_auto="0" extension_auto="0" />
-				<Option object_output="..\obj\IrrDebuggcc" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-W" />
-					<Add option="-g" />
-					<Add option="-O0" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DIRRLICHT_EXPORTS" />
-					<Add option="-D_CRT_SECURE_NO_DEPRECATE" />
-					<Add directory="..\..\include" />
-					<Add directory="zlib" />
-				</Compiler>
-				<Linker>
-					<Add library="kernel32" />
-					<Add library="user32" />
-					<Add library="gdi32" />
-					<Add library="winspool" />
-					<Add library="comdlg32" />
-					<Add library="advapi32" />
-					<Add library="shell32" />
-					<Add library="ole32" />
-					<Add library="oleaut32" />
-					<Add library="uuid" />
-					<Add library="opengl32" />
-				</Linker>
-			</Target>
-			<Target title="Release">
-				<Option output="..\..\bin\Win32-gcc\Irrlicht.dll" prefix_auto="0" extension_auto="0" />
-				<Option object_output="obj\IrrReleasegcc" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-W" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DIRRLICHT_EXPORTS" />
-					<Add option="-D_CRT_SECURE_NO_DEPRECATE" />
-					<Add directory="..\..\include" />
-					<Add directory="zlib" />
-				</Compiler>
-				<Linker>
-					<Add library="kernel32" />
-					<Add library="user32" />
-					<Add library="gdi32" />
-					<Add library="winspool" />
-					<Add library="comdlg32" />
-					<Add library="advapi32" />
-					<Add library="shell32" />
-					<Add library="ole32" />
-					<Add library="oleaut32" />
-					<Add library="uuid" />
-					<Add library="opengl32" />
-				</Linker>
-			</Target>
-			<Target title="Release - Fast FPU">
-				<Option output="..\..\bin\Win32-gcc\Irrlicht.dll" prefix_auto="0" extension_auto="0" />
-				<Option object_output="Release - Fast FPU" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-W" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_WINDOWS" />
-					<Add option="-D_USRDLL" />
-					<Add option="-DIRRLICHT_EXPORTS" />
-					<Add option="-D_CRT_SECURE_NO_DEPRECATE" />
-					<Add directory="..\..\include" />
-					<Add directory="zlib" />
-				</Compiler>
-				<Linker>
-					<Add library="kernel32" />
-					<Add library="user32" />
-					<Add library="gdi32" />
-					<Add library="winspool" />
-					<Add library="comdlg32" />
-					<Add library="advapi32" />
-					<Add library="shell32" />
-					<Add library="ole32" />
-					<Add library="oleaut32" />
-					<Add library="uuid" />
-					<Add library="opengl32" />
-				</Linker>
-			</Target>
-		</Build>
-		<VirtualTargets>
-			<Add alias="All" targets="Debug;Release;Release - Fast FPU" />
-		</VirtualTargets>
-		<Unit filename="..\..\changes.txt" />
-		<Unit filename="..\..\include\ECullingTypes.h" />
-		<Unit filename="..\..\include\EDebugSceneTypes.h" />
-		<Unit filename="..\..\include\EDriverTypes.h" />
-		<Unit filename="..\..\include\EGUIElementTypes.h" />
-		<Unit filename="..\..\include\EMeshWriterEnums.h" />
-		<Unit filename="..\..\include\EMessageBoxFlags.h" />
-		<Unit filename="..\..\include\ESceneNodeAnimatorTypes.h" />
-		<Unit filename="..\..\include\ESceneNodeTypes.h" />
-		<Unit filename="..\..\include\IAnimatedMesh.h" />
-		<Unit filename="..\..\include\IAnimatedMeshMD2.h" />
-		<Unit filename="..\..\include\IAnimatedMeshSceneNode.h" />
-		<Unit filename="..\..\include\IAttributeExchangingObject.h" />
-		<Unit filename="..\..\include\IAttributes.h" />
-		<Unit filename="..\..\include\IBillboardSceneNode.h" />
-		<Unit filename="..\..\include\IBoneSceneNode.h" />
-		<Unit filename="..\..\include\ICameraSceneNode.h" />
-		<Unit filename="..\..\include\ICursorControl.h" />
-		<Unit filename="..\..\include\IDummyTransformationSceneNode.h" />
-		<Unit filename="..\..\include\IEventReceiver.h" />
-		<Unit filename="..\..\include\IFileList.h" />
-		<Unit filename="..\..\include\IFileSystem.h" />
-		<Unit filename="..\..\include\IGPUProgrammingServices.h" />
-		<Unit filename="..\..\include\IGUIButton.h" />
-		<Unit filename="..\..\include\IGUICheckbox.h" />
-		<Unit filename="..\..\include\IGUIComboBox.h" />
-		<Unit filename="..\..\include\IGUIContextMenu.h" />
-		<Unit filename="..\..\include\IGUIEditBox.h" />
-		<Unit filename="..\..\include\IGUIElement.h" />
-		<Unit filename="..\..\include\IGUIElementFactory.h" />
-		<Unit filename="..\..\include\IGUIEnvironment.h" />
-		<Unit filename="..\..\include\IGUIFileOpenDialog.h" />
-		<Unit filename="..\..\include\IGUIFont.h" />
-		<Unit filename="..\..\include\IGUIImage.h" />
-		<Unit filename="..\..\include\IGUIInOutFader.h" />
-		<Unit filename="..\..\include\IGUIListBox.h" />
-		<Unit filename="..\..\include\IGUIMeshViewer.h" />
-		<Unit filename="..\..\include\IGUIScrollBar.h" />
-		<Unit filename="..\..\include\IGUISkin.h" />
-		<Unit filename="..\..\include\IGUISpinBox.h" />
-		<Unit filename="..\..\include\IGUISpriteBank.h" />
-		<Unit filename="..\..\include\IGUIStaticText.h" />
-		<Unit filename="..\..\include\IGUITabControl.h" />
-		<Unit filename="..\..\include\IGUIToolbar.h" />
-		<Unit filename="..\..\include\IGUIWindow.h" />
-		<Unit filename="..\..\include\IImage.h" />
-		<Unit filename="..\..\include\IImageLoader.h" />
-		<Unit filename="..\..\include\ILightSceneNode.h" />
-		<Unit filename="..\..\include\ILogger.h" />
-		<Unit filename="..\..\include\IMaterialRenderer.h" />
-		<Unit filename="..\..\include\IMaterialRendererServices.h" />
-		<Unit filename="..\..\include\IMesh.h" />
-		<Unit filename="..\..\include\IMeshBuffer.h" />
-		<Unit filename="..\..\include\IMeshCache.h" />
-		<Unit filename="..\..\include\IMeshLoader.h" />
-		<Unit filename="..\..\include\IMeshManipulator.h" />
-		<Unit filename="..\..\include\IMeshSceneNode.h" />
-		<Unit filename="..\..\include\IMeshWriter.h" />
-		<Unit filename="..\..\include\IMetaTriangleSelector.h" />
-		<Unit filename="..\..\include\IOSOperator.h" />
-		<Unit filename="..\..\include\IParticleAffector.h" />
-		<Unit filename="..\..\include\IParticleEmitter.h" />
-		<Unit filename="..\..\include\IParticleSystemSceneNode.h" />
-		<Unit filename="..\..\include\IQ3LevelMesh.h" />
-		<Unit filename="..\..\include\IReadFile.H" />
-		<Unit filename="..\..\include\IReferenceCounted.h" />
-		<Unit filename="..\..\include\ISceneCollisionManager.h" />
-		<Unit filename="..\..\include\ISceneManager.h" />
-		<Unit filename="..\..\include\ISceneNode.h" />
-		<Unit filename="..\..\include\ISceneNodeAnimator.h" />
-		<Unit filename="..\..\include\ISceneNodeAnimatorCollisionResponse.h" />
-		<Unit filename="..\..\include\ISceneNodeAnimatorFactory.h" />
-		<Unit filename="..\..\include\ISceneNodeFactory.h" />
-		<Unit filename="..\..\include\ISceneNodeMeshLoader.h" />
-		<Unit filename="..\..\include\IShaderConstantSetCallBack.h" />
-		<Unit filename="..\..\include\IShadowVolumeSceneNode.h" />
-		<Unit filename="..\..\include\ISkinnedMesh.h" />
-		<Unit filename="..\..\include\ITerrainSceneNode.h" />
-		<Unit filename="..\..\include\ITextSceneNode.h" />
-		<Unit filename="..\..\include\ITexture.h" />
-		<Unit filename="..\..\include\ITimer.h" />
-		<Unit filename="..\..\include\ITriangleSelector.h" />
-		<Unit filename="..\..\include\IVideoDriver.h" />
-		<Unit filename="..\..\include\IVideoModeList.h" />
-		<Unit filename="..\..\include\IWriteFile.h" />
-		<Unit filename="..\..\include\IXMLReader.h" />
-		<Unit filename="..\..\include\IXMLWriter.h" />
-		<Unit filename="..\..\include\IrrCompileConfig.h" />
-		<Unit filename="..\..\include\IrrlichtDevice.h" />
-		<Unit filename="..\..\include\Keycodes.h" />
-		<Unit filename="..\..\include\S3DVertex.h" />
-		<Unit filename="..\..\include\SAnimatedMesh.h" />
-		<Unit filename="..\..\include\SColor.h" />
-		<Unit filename="..\..\include\SExposedVideoData.h" />
-		<Unit filename="..\..\include\SIrrCreationParameters.h" />
-		<Unit filename="..\..\include\SKeyMap.h" />
-		<Unit filename="..\..\include\SLight.h" />
-		<Unit filename="..\..\include\SMaterial.h" />
-		<Unit filename="..\..\include\SMesh.h" />
-		<Unit filename="..\..\include\SMeshBuffer.h" />
-		<Unit filename="..\..\include\SMeshBufferLightMap.h" />
-		<Unit filename="..\..\include\SMeshBufferTangents.h" />
-		<Unit filename="..\..\include\SParticle.h" />
-		<Unit filename="..\..\include\SViewFrustum.h" />
-		<Unit filename="..\..\include\SceneParameters.h" />
-		<Unit filename="..\..\include\aabbox3d.h" />
-		<Unit filename="..\..\include\dimension2d.h" />
-		<Unit filename="..\..\include\heapsort.h" />
-		<Unit filename="..\..\include\irrAllocator.h" />
-		<Unit filename="..\..\include\irrArray.h" />
-		<Unit filename="..\..\include\irrList.h" />
-		<Unit filename="..\..\include\irrMap.h" />
-		<Unit filename="..\..\include\irrMath.h" />
-		<Unit filename="..\..\include\irrString.h" />
-		<Unit filename="..\..\include\irrTypes.h" />
-		<Unit filename="..\..\include\irrXML.h" />
-		<Unit filename="..\..\include\irrlicht.h" />
-		<Unit filename="..\..\include\line2d.h" />
-		<Unit filename="..\..\include\line3d.h" />
-		<Unit filename="..\..\include\matrix4.h" />
-		<Unit filename="..\..\include\plane3d.h" />
-		<Unit filename="..\..\include\position2d.h" />
-		<Unit filename="..\..\include\quaternion.h" />
-		<Unit filename="..\..\include\rect.h" />
-		<Unit filename="..\..\include\triangle3d.h" />
-		<Unit filename="..\..\include\vector2d.h" />
-		<Unit filename="..\..\include\vector3d.h" />
-		<Unit filename="..\..\readme.txt" />
-		<Unit filename="BuiltInFont.h" />
-		<Unit filename="C3DSMeshFileLoader.cpp" />
-		<Unit filename="C3DSMeshFileLoader.h" />
-		<Unit filename="CAnimatedMeshMD2.cpp" />
-		<Unit filename="CAnimatedMeshMD2.h" />
-		<Unit filename="CAnimatedMeshMD3.cpp" />
-		<Unit filename="CAnimatedMeshMD3.h" />
-		<Unit filename="CAnimatedMeshSceneNode.cpp" />
-		<Unit filename="CAnimatedMeshSceneNode.h" />
-		<Unit filename="CAttributeImpl.h" />
-		<Unit filename="CAttributes.cpp" />
-		<Unit filename="CAttributes.h" />
-		<Unit filename="CB3DMeshFileLoader.cpp" />
-		<Unit filename="CB3DMeshFileLoader.h" />
-		<Unit filename="CBSPMeshFileLoader.cpp" />
-		<Unit filename="CBSPMeshFileLoader.h" />
-		<Unit filename="CBillboardSceneNode.cpp" />
-		<Unit filename="CBillboardSceneNode.h" />
-		<Unit filename="CBoneSceneNode.cpp" />
-		<Unit filename="CBoneSceneNode.h" />
-		<Unit filename="CCSMLoader.cpp" />
-		<Unit filename="CCSMLoader.h" />
-		<Unit filename="CCameraFPSSceneNode.cpp" />
-		<Unit filename="CCameraFPSSceneNode.h" />
-		<Unit filename="CCameraMayaSceneNode.cpp" />
-		<Unit filename="CCameraMayaSceneNode.h" />
-		<Unit filename="CCameraSceneNode.cpp" />
-		<Unit filename="CCameraSceneNode.h" />
-		<Unit filename="CColladaFileLoader.cpp" />
-		<Unit filename="CColladaFileLoader.h" />
-		<Unit filename="CColladaMeshWriter.cpp" />
-		<Unit filename="CColladaMeshWriter.h" />
-		<Unit filename="CColorConverter.cpp" />
-		<Unit filename="CColorConverter.h" />
-		<Unit filename="CCubeSceneNode.cpp" />
-		<Unit filename="CCubeSceneNode.h" />
-		<Unit filename="CD3D8Driver.cpp" />
-		<Unit filename="CD3D8Driver.h" />
-		<Unit filename="CD3D8MaterialRenderer.h" />
-		<Unit filename="CD3D8NormalMapRenderer.cpp" />
-		<Unit filename="CD3D8NormalMapRenderer.h" />
-		<Unit filename="CD3D8ParallaxMapRenderer.cpp" />
-		<Unit filename="CD3D8ParallaxMapRenderer.h" />
-		<Unit filename="CD3D8ShaderMaterialRenderer.cpp" />
-		<Unit filename="CD3D8ShaderMaterialRenderer.h" />
-		<Unit filename="CD3D8Texture.cpp" />
-		<Unit filename="CD3D8Texture.h" />
-		<Unit filename="CD3D9Driver.cpp" />
-		<Unit filename="CD3D9Driver.h" />
-		<Unit filename="CD3D9HLSLMaterialRenderer.cpp" />
-		<Unit filename="CD3D9HLSLMaterialRenderer.h" />
-		<Unit filename="CD3D9MaterialRenderer.h" />
-		<Unit filename="CD3D9NormalMapRenderer.cpp" />
-		<Unit filename="CD3D9NormalMapRenderer.h" />
-		<Unit filename="CD3D9ParallaxMapRenderer.cpp" />
-		<Unit filename="CD3D9ParallaxMapRenderer.h" />
-		<Unit filename="CD3D9ShaderMaterialRenderer.cpp" />
-		<Unit filename="CD3D9ShaderMaterialRenderer.h" />
-		<Unit filename="CD3D9Texture.cpp" />
-		<Unit filename="CD3D9Texture.h" />
-		<Unit filename="CDMFLoader.cpp" />
-		<Unit filename="CDMFLoader.h" />
-		<Unit filename="CDefaultGUIElementFactory.cpp" />
-		<Unit filename="CDefaultGUIElementFactory.h" />
-		<Unit filename="CDefaultSceneNodeAnimatorFactory.cpp" />
-		<Unit filename="CDefaultSceneNodeAnimatorFactory.h" />
-		<Unit filename="CDefaultSceneNodeFactory.cpp" />
-		<Unit filename="CDefaultSceneNodeFactory.h" />
-		<Unit filename="CDepthBuffer.cpp" />
-		<Unit filename="CDepthBuffer.h" />
-		<Unit filename="CDummyTransformationSceneNode.cpp" />
-		<Unit filename="CDummyTransformationSceneNode.h" />
-		<Unit filename="CEmptySceneNode.cpp" />
-		<Unit filename="CEmptySceneNode.h" />
-		<Unit filename="CFPSCounter.cpp" />
-		<Unit filename="CFPSCounter.h" />
-		<Unit filename="CFileList.cpp" />
-		<Unit filename="CFileList.h" />
-		<Unit filename="CFileSystem.cpp" />
-		<Unit filename="CFileSystem.h" />
-		<Unit filename="CGUIButton.cpp" />
-		<Unit filename="CGUIButton.h" />
-		<Unit filename="CGUICheckbox.cpp" />
-		<Unit filename="CGUICheckbox.h" />
-		<Unit filename="CGUIColorSelectDialog.cpp" />
-		<Unit filename="CGUIColorSelectDialog.h" />
-		<Unit filename="CGUIComboBox.cpp" />
-		<Unit filename="CGUIComboBox.h" />
-		<Unit filename="CGUIContextMenu.cpp" />
-		<Unit filename="CGUIContextMenu.h" />
-		<Unit filename="CGUIEditBox.cpp" />
-		<Unit filename="CGUIEditBox.h" />
-		<Unit filename="CGUIEnvironment.cpp" />
-		<Unit filename="CGUIEnvironment.h" />
-		<Unit filename="CGUIFileOpenDialog.cpp" />
-		<Unit filename="CGUIFileOpenDialog.h" />
-		<Unit filename="CGUIFont.cpp" />
-		<Unit filename="CGUIFont.h" />
-		<Unit filename="CGUIImage.cpp" />
-		<Unit filename="CGUIImage.h" />
-		<Unit filename="CGUIInOutFader.cpp" />
-		<Unit filename="CGUIInOutFader.h" />
-		<Unit filename="CGUIListBox.cpp" />
-		<Unit filename="CGUIListBox.h" />
-		<Unit filename="CGUIMenu.cpp" />
-		<Unit filename="CGUIMenu.h" />
-		<Unit filename="CGUIMeshViewer.cpp" />
-		<Unit filename="CGUIMeshViewer.h" />
-		<Unit filename="CGUIMessageBox.cpp" />
-		<Unit filename="CGUIMessageBox.h" />
-		<Unit filename="CGUIModalScreen.cpp" />
-		<Unit filename="CGUIModalScreen.h" />
-		<Unit filename="CGUIScrollBar.cpp" />
-		<Unit filename="CGUIScrollBar.h" />
-		<Unit filename="CGUISkin.cpp" />
-		<Unit filename="CGUISkin.h" />
-		<Unit filename="CGUISpinBox.cpp" />
-		<Unit filename="CGUISpinBox.h" />
-		<Unit filename="CGUISpriteBank.cpp" />
-		<Unit filename="CGUISpriteBank.h" />
-		<Unit filename="CGUIStaticText.cpp" />
-		<Unit filename="CGUIStaticText.h" />
-		<Unit filename="CGUITabControl.cpp" />
-		<Unit filename="CGUITabControl.h" />
-		<Unit filename="CGUIToolBar.cpp" />
-		<Unit filename="CGUIToolBar.h" />
-		<Unit filename="CGUIWindow.cpp" />
-		<Unit filename="CGUIWindow.h" />
-		<Unit filename="CGeometryCreator.cpp" />
-		<Unit filename="CGeometryCreator.h" />
-		<Unit filename="CImage.cpp" />
-		<Unit filename="CImage.h" />
-		<Unit filename="CImageLoaderBMP.cpp" />
-		<Unit filename="CImageLoaderBMP.h" />
-		<Unit filename="CImageLoaderJPG.cpp" />
-		<Unit filename="CImageLoaderJPG.h" />
-		<Unit filename="CImageLoaderPCX.cpp" />
-		<Unit filename="CImageLoaderPCX.h" />
-		<Unit filename="CImageLoaderPNG.cpp" />
-		<Unit filename="CImageLoaderPNG.h" />
-		<Unit filename="CImageLoaderPPM.cpp" />
-		<Unit filename="CImageLoaderPPM.h" />
-		<Unit filename="CImageLoaderPSD.cpp" />
-		<Unit filename="CImageLoaderPSD.h" />
-		<Unit filename="CImageLoaderTGA.cpp" />
-		<Unit filename="CImageLoaderTGA.h" />
-		<Unit filename="CImageWriterBMP.cpp" />
-		<Unit filename="CImageWriterBMP.h" />
-		<Unit filename="CImageWriterJPG.cpp" />
-		<Unit filename="CImageWriterJPG.h" />
-		<Unit filename="CImageWriterPCX.cpp" />
-		<Unit filename="CImageWriterPCX.h" />
-		<Unit filename="CImageWriterPNG.cpp" />
-		<Unit filename="CImageWriterPNG.h" />
-		<Unit filename="CImageWriterPPM.cpp" />
-		<Unit filename="CImageWriterPPM.h" />
-		<Unit filename="CImageWriterPSD.cpp" />
-		<Unit filename="CImageWriterPSD.h" />
-		<Unit filename="CImageWriterTGA.cpp" />
-		<Unit filename="CImageWriterTGA.h" />
-		<Unit filename="CIrrDeviceLinux.cpp" />
-		<Unit filename="CIrrDeviceLinux.h" />
-		<Unit filename="CIrrDeviceStub.cpp" />
-		<Unit filename="CIrrDeviceStub.h" />
-		<Unit filename="CIrrDeviceWin32.cpp" />
-		<Unit filename="CIrrDeviceWin32.h" />
-		<Unit filename="CIrrMeshFileLoader.cpp" />
-		<Unit filename="CIrrMeshFileLoader.h" />
-		<Unit filename="CIrrMeshWriter.cpp" />
-		<Unit filename="CIrrMeshWriter.h" />
-		<Unit filename="CLMTSMeshFileLoader.cpp" />
-		<Unit filename="CLMTSMeshFileLoader.h" />
-		<Unit filename="CLightSceneNode.cpp" />
-		<Unit filename="CLightSceneNode.h" />
-		<Unit filename="CLimitReadFile.cpp" />
-		<Unit filename="CLimitReadFile.h" />
-		<Unit filename="CLogger.cpp" />
-		<Unit filename="CLogger.h" />
-		<Unit filename="CMD2MeshFileLoader.cpp" />
-		<Unit filename="CMD2MeshFileLoader.h" />
-		<Unit filename="CMD3MeshFileLoader.cpp" />
-		<Unit filename="CMD3MeshFileLoader.h" />
-		<Unit filename="CMS3DMeshFileLoader.cpp" />
-		<Unit filename="CMS3DMeshFileLoader.h" />
-		<Unit filename="CMY3DHelper.h" />
-		<Unit filename="CMY3DMeshFileLoader.cpp" />
-		<Unit filename="CMY3DMeshFileLoader.h" />
-		<Unit filename="CMY3DStuff.h" />
-		<Unit filename="CMemoryReadFile.cpp" />
-		<Unit filename="CMemoryReadFile.h" />
-		<Unit filename="CMeshCache.cpp" />
-		<Unit filename="CMeshCache.h" />
-		<Unit filename="CMeshManipulator.cpp" />
-		<Unit filename="CMeshManipulator.h" />
-		<Unit filename="CMeshSceneNode.cpp" />
-		<Unit filename="CMeshSceneNode.h" />
-		<Unit filename="CMetaTriangleSelector.cpp" />
-		<Unit filename="CMetaTriangleSelector.h" />
-		<Unit filename="CNullDriver.cpp" />
-		<Unit filename="CNullDriver.h" />
-		<Unit filename="COBJMeshFileLoader.cpp" />
-		<Unit filename="COBJMeshFileLoader.h" />
-		<Unit filename="COCTLoader.cpp" />
-		<Unit filename="COCTLoader.h" />
-		<Unit filename="COSOperator.cpp" />
-		<Unit filename="COSOperator.h" />
-		<Unit filename="COctTreeSceneNode.cpp" />
-		<Unit filename="COctTreeSceneNode.h" />
-		<Unit filename="COctTreeTriangleSelector.cpp" />
-		<Unit filename="COctTreeTriangleSelector.h" />
-		<Unit filename="COgreMeshFileLoader.cpp" />
-		<Unit filename="COgreMeshFileLoader.h" />
-		<Unit filename="COpenGLDriver.cpp" />
-		<Unit filename="COpenGLDriver.h" />
-		<Unit filename="COpenGLExtensionHandler.cpp" />
-		<Unit filename="COpenGLExtensionHandler.h" />
-		<Unit filename="COpenGLMaterialRenderer.h" />
-		<Unit filename="COpenGLNormalMapRenderer.cpp" />
-		<Unit filename="COpenGLNormalMapRenderer.h" />
-		<Unit filename="COpenGLParallaxMapRenderer.cpp" />
-		<Unit filename="COpenGLParallaxMapRenderer.h" />
-		<Unit filename="COpenGLSLMaterialRenderer.cpp" />
-		<Unit filename="COpenGLSLMaterialRenderer.h" />
-		<Unit filename="COpenGLShaderMaterialRenderer.cpp" />
-		<Unit filename="COpenGLShaderMaterialRenderer.h" />
-		<Unit filename="COpenGLTexture.cpp" />
-		<Unit filename="COpenGLTexture.h" />
-		<Unit filename="CPakReader.cpp" />
-		<Unit filename="CPakReader.h" />
-		<Unit filename="CParticleAnimatedMeshSceneNodeEmitter.cpp" />
-		<Unit filename="CParticleAttractionAffector.cpp" />
-		<Unit filename="CParticleBoxEmitter.cpp" />
-		<Unit filename="CParticleBoxEmitter.h" />
-		<Unit filename="CParticleCylinderEmitter.cpp" />
-		<Unit filename="CParticleFadeOutAffector.cpp" />
-		<Unit filename="CParticleFadeOutAffector.h" />
-		<Unit filename="CParticleGravityAffector.cpp" />
-		<Unit filename="CParticleGravityAffector.h" />
-		<Unit filename="CParticleMeshEmitter.cpp" />
-		<Unit filename="CParticlePointEmitter.cpp" />
-		<Unit filename="CParticlePointEmitter.h" />
-		<Unit filename="CParticleRingEmitter.cpp" />
-		<Unit filename="CParticleRotationAffector.cpp" />
-		<Unit filename="CParticleSphereEmitter.cpp" />
-		<Unit filename="CParticleSystemSceneNode.cpp" />
-		<Unit filename="CParticleSystemSceneNode.h" />
-		<Unit filename="CQ3LevelMesh.cpp" />
-		<Unit filename="CQ3LevelMesh.h" />
-		<Unit filename="CQuake3ShaderSceneNode.cpp" />
-		<Unit filename="CQuake3ShaderSceneNode.h" />
-		<Unit filename="CReadFile.cpp" />
-		<Unit filename="CReadFile.h" />
-		<Unit filename="CSTLMeshFileLoader.cpp" />
-		<Unit filename="CSTLMeshFileLoader.h" />
-		<Unit filename="CSTLMeshWriter.cpp" />
-		<Unit filename="CSTLMeshWriter.h" />
-		<Unit filename="CSceneCollisionManager.cpp" />
-		<Unit filename="CSceneCollisionManager.h" />
-		<Unit filename="CSceneManager.cpp" />
-		<Unit filename="CSceneManager.h" />
-		<Unit filename="CSceneNodeAnimatorCollisionResponse.cpp" />
-		<Unit filename="CSceneNodeAnimatorCollisionResponse.h" />
-		<Unit filename="CSceneNodeAnimatorDelete.cpp" />
-		<Unit filename="CSceneNodeAnimatorDelete.h" />
-		<Unit filename="CSceneNodeAnimatorFlyCircle.cpp" />
-		<Unit filename="CSceneNodeAnimatorFlyCircle.h" />
-		<Unit filename="CSceneNodeAnimatorFlyStraight.cpp" />
-		<Unit filename="CSceneNodeAnimatorFlyStraight.h" />
-		<Unit filename="CSceneNodeAnimatorFollowSpline.cpp" />
-		<Unit filename="CSceneNodeAnimatorFollowSpline.h" />
-		<Unit filename="CSceneNodeAnimatorRotation.cpp" />
-		<Unit filename="CSceneNodeAnimatorRotation.h" />
-		<Unit filename="CSceneNodeAnimatorTexture.cpp" />
-		<Unit filename="CSceneNodeAnimatorTexture.h" />
-		<Unit filename="CShadowVolumeSceneNode.cpp" />
-		<Unit filename="CShadowVolumeSceneNode.h" />
-		<Unit filename="CSkinnedMesh.cpp" />
-		<Unit filename="CSkinnedMesh.h" />
-		<Unit filename="CSkyBoxSceneNode.cpp" />
-		<Unit filename="CSkyBoxSceneNode.h" />
-		<Unit filename="CSkyDomeSceneNode.cpp" />
-		<Unit filename="CSkyDomeSceneNode.h" />
-		<Unit filename="CSoftware2MaterialRenderer.h" />
-		<Unit filename="CSoftwareDriver.cpp" />
-		<Unit filename="CSoftwareDriver.h" />
-		<Unit filename="CSoftwareDriver2.cpp" />
-		<Unit filename="CSoftwareDriver2.h" />
-		<Unit filename="CSoftwareTexture.cpp" />
-		<Unit filename="CSoftwareTexture.h" />
-		<Unit filename="CSoftwareTexture2.cpp" />
-		<Unit filename="CSoftwareTexture2.h" />
-		<Unit filename="CSphereSceneNode.cpp" />
-		<Unit filename="CSphereSceneNode.h" />
-		<Unit filename="CTRFlat.cpp" />
-		<Unit filename="CTRFlatWire.cpp" />
-		<Unit filename="CTRGouraud.cpp" />
-		<Unit filename="CTRGouraud2.cpp" />
-		<Unit filename="CTRGouraudAlpha2.cpp" />
-		<Unit filename="CTRGouraudAlphaNoZ2.cpp" />
-		<Unit filename="CTRGouraudWire.cpp" />
-		<Unit filename="CTRTextureBlend.cpp" />
-		<Unit filename="CTRTextureDetailMap2.cpp" />
-		<Unit filename="CTRTextureFlat.cpp" />
-		<Unit filename="CTRTextureFlatWire.cpp" />
-		<Unit filename="CTRTextureGouraud.cpp" />
-		<Unit filename="CTRTextureGouraud.h" />
-		<Unit filename="CTRTextureGouraud2.cpp" />
-		<Unit filename="CTRTextureGouraudAdd.cpp" />
-		<Unit filename="CTRTextureGouraudAdd2.cpp" />
-		<Unit filename="CTRTextureGouraudAddNoZ2.cpp" />
-		<Unit filename="CTRTextureGouraudAlpha.cpp" />
-		<Unit filename="CTRTextureGouraudAlphaNoZ.cpp" />
-		<Unit filename="CTRTextureGouraudNoZ.cpp" />
-		<Unit filename="CTRTextureGouraudNoZ2.cpp" />
-		<Unit filename="CTRTextureGouraudVertexAlpha2.cpp" />
-		<Unit filename="CTRTextureGouraudWire.cpp" />
-		<Unit filename="CTRTextureLightMap2_Add.cpp" />
-		<Unit filename="CTRTextureLightMap2_M1.cpp" />
-		<Unit filename="CTRTextureLightMap2_M2.cpp" />
-		<Unit filename="CTRTextureLightMap2_M4.cpp" />
-		<Unit filename="CTRTextureLightMapGouraud2_M4.cpp" />
-		<Unit filename="CTRTextureWire2.cpp" />
-		<Unit filename="CTerrainSceneNode.cpp" />
-		<Unit filename="CTerrainSceneNode.h" />
-		<Unit filename="CTerrainTriangleSelector.cpp" />
-		<Unit filename="CTerrainTriangleSelector.h" />
-		<Unit filename="CTextSceneNode.cpp" />
-		<Unit filename="CTextSceneNode.h" />
-		<Unit filename="CTimer.h" />
-		<Unit filename="CTriangleBBSelector.cpp" />
-		<Unit filename="CTriangleBBSelector.h" />
-		<Unit filename="CTriangleSelector.cpp" />
-		<Unit filename="CTriangleSelector.h" />
-		<Unit filename="CVideoModeList.cpp" />
-		<Unit filename="CVideoModeList.h" />
-		<Unit filename="CWaterSurfaceSceneNode.cpp" />
-		<Unit filename="CWaterSurfaceSceneNode.h" />
-		<Unit filename="CWriteFile.cpp" />
-		<Unit filename="CWriteFile.h" />
-		<Unit filename="CXMLReader.cpp" />
-		<Unit filename="CXMLReader.h" />
-		<Unit filename="CXMLReaderImpl.h" />
-		<Unit filename="CXMLWriter.cpp" />
-		<Unit filename="CXMLWriter.h" />
-		<Unit filename="CXMeshFileLoader.cpp" />
-		<Unit filename="CXMeshFileLoader.h" />
-		<Unit filename="CZBuffer.cpp" />
-		<Unit filename="CZBuffer.h" />
-		<Unit filename="CZipReader.cpp" />
-		<Unit filename="CZipReader.h" />
-		<Unit filename="IBurningShader.cpp" />
-		<Unit filename="IBurningShader.h" />
-		<Unit filename="IDepthBuffer.h" />
-		<Unit filename="IImagePresenter.h" />
-		<Unit filename="ITriangleRenderer.h" />
-		<Unit filename="IZBuffer.h" />
-		<Unit filename="Irrlicht.cpp" />
-		<Unit filename="OctTree.h" />
-		<Unit filename="S2DVertex.h" />
-		<Unit filename="S4DVertex.h" />
-		<Unit filename="SoftwareDriver2_compile_config.h" />
-		<Unit filename="SoftwareDriver2_helper.h" />
-		<Unit filename="dmfsupport.h" />
-		<Unit filename="glext.h" />
-		<Unit filename="irrXML.cpp" />
-		<Unit filename="jpeglib\cderror.h" />
-		<Unit filename="jpeglib\cdjpeg.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\cdjpeg.h" />
-		<Unit filename="jpeglib\jcapimin.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jcapistd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jccoefct.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jccolor.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jcdctmgr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jchuff.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jchuff.h" />
-		<Unit filename="jpeglib\jcinit.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jcmainct.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jcmarker.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jcmaster.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jcomapi.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jconfig.h" />
-		<Unit filename="jpeglib\jcparam.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jcphuff.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jcprepct.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jcsample.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jctrans.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdapimin.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdapistd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdatadst.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdatasrc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdcoefct.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdcolor.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdct.h" />
-		<Unit filename="jpeglib\jddctmgr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdhuff.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdhuff.h" />
-		<Unit filename="jpeglib\jdinput.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdmainct.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdmarker.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdmaster.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdmerge.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdphuff.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdpostct.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdsample.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jdtrans.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jerror.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jerror.h" />
-		<Unit filename="jpeglib\jfdctflt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jfdctfst.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jfdctint.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jidctflt.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jidctfst.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jidctint.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jidctred.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jinclude.h" />
-		<Unit filename="jpeglib\jmemmgr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jmemnobs.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jmemsys.h" />
-		<Unit filename="jpeglib\jmorecfg.h" />
-		<Unit filename="jpeglib\jpegint.h" />
-		<Unit filename="jpeglib\jpeglib.h" />
-		<Unit filename="jpeglib\jquant1.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jquant2.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jutils.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="jpeglib\jversion.h" />
-		<Unit filename="libpng\png.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\png.h" />
-		<Unit filename="libpng\pngconf.h" />
-		<Unit filename="libpng\pngerror.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngget.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngmem.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngpread.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngread.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngrio.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngrtran.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngrutil.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngset.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngtrans.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngwio.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngwrite.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngwtran.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="libpng\pngwutil.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="os.cpp" />
-		<Unit filename="os.h" />
-		<Unit filename="zlib\adler32.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="zlib\compress.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="zlib\crc32.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="zlib\crc32.h" />
-		<Unit filename="zlib\deflate.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="zlib\deflate.h" />
-		<Unit filename="zlib\inffast.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="zlib\inffast.h" />
-		<Unit filename="zlib\inffixed.h" />
-		<Unit filename="zlib\inflate.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="zlib\inftrees.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="zlib\inftrees.h" />
-		<Unit filename="zlib\trees.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="zlib\trees.h" />
-		<Unit filename="zlib\uncompr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="zlib\zconf.h" />
-		<Unit filename="zlib\zlib.h" />
-		<Unit filename="zlib\zutil.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="zlib\zutil.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/src/dep/src/irrlicht/MacOSX/DemoApp-Info.plist b/src/dep/src/irrlicht/MacOSX/DemoApp-Info.plist
index a754c7f..e69de29 100644
--- a/src/dep/src/irrlicht/MacOSX/DemoApp-Info.plist
+++ b/src/dep/src/irrlicht/MacOSX/DemoApp-Info.plist
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.irrlicht.${EXECUTABLE_NAME}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>IRRL</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>
diff --git a/src/dep/src/irrlicht/MacOSX/MacOSX_Prefix.pch b/src/dep/src/irrlicht/MacOSX/MacOSX_Prefix.pch
index b3ea109..e69de29 100644
--- a/src/dep/src/irrlicht/MacOSX/MacOSX_Prefix.pch
+++ b/src/dep/src/irrlicht/MacOSX/MacOSX_Prefix.pch
@@ -1,5 +0,0 @@
-//
-// Prefix header for all source files of the 'MacOSX' target in the 'MacOSX' project.
-//
-
-#include <architecture/byte_order.h>
diff --git a/src/dep/src/irrlicht/MacOSX/MainMenu.nib/classes.nib b/src/dep/src/irrlicht/MacOSX/MainMenu.nib/classes.nib
index b9b4b09..e69de29 100644
--- a/src/dep/src/irrlicht/MacOSX/MainMenu.nib/classes.nib
+++ b/src/dep/src/irrlicht/MacOSX/MainMenu.nib/classes.nib
@@ -1,4 +0,0 @@
-{
-    IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }); 
-    IBVersion = 1; 
-}
\ No newline at end of file
diff --git a/src/dep/src/irrlicht/MacOSX/MainMenu.nib/info.nib b/src/dep/src/irrlicht/MacOSX/MainMenu.nib/info.nib
index d4de41f..e69de29 100644
--- a/src/dep/src/irrlicht/MacOSX/MainMenu.nib/info.nib
+++ b/src/dep/src/irrlicht/MacOSX/MainMenu.nib/info.nib
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>195 413 356 240 0 0 1680 1028 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>29</key>
-		<string>62 343 338 44 0 0 1680 1028 </string>
-	</dict>
-	<key>IBFramework Version</key>
-	<string>443.0</string>
-	<key>IBSystem Version</key>
-	<string>8F46</string>
-</dict>
-</plist>
diff --git a/src/dep/src/irrlicht/Makefile b/src/dep/src/irrlicht/Makefile
index ad593c9..04218b2 100644
--- a/src/dep/src/irrlicht/Makefile
+++ b/src/dep/src/irrlicht/Makefile
@@ -1,5 +1,5 @@
-VERSION = 1.4
-# Irrlicht Engine 1.4
+VERSION = 1.5
+# Irrlicht Engine 1.5
 # Makefile for Linux
 #
 # To use, just run:
@@ -19,37 +19,37 @@ VERSION = 1.4
 #
 
 #List of object files, separated based on engine architecture
-IRRMESHLOADER = CBSPMeshFileLoader.o CMD2MeshFileLoader.o CMD3MeshFileLoader.o CMS3DMeshFileLoader.o CB3DMeshFileLoader.o CBSPMeshFileLoader.o C3DSMeshFileLoader.o COgreMeshFileLoader.o COBJMeshFileLoader.o CMD3MeshFileLoader.o CColladaFileLoader.o CCSMLoader.o CDMFLoader.o CLMTSMeshFileLoader.o CMY3DMeshFileLoader.o COCTLoader.o CXMeshFileLoader.o CIrrMeshFileLoader.o CSTLMeshFileLoader.o
-IRRMESHWRITER = CColladaMeshWriter.o CIrrMeshWriter.o CSTLMeshWriter.o
+IRRMESHLOADER = CBSPMeshFileLoader.o CMD2MeshFileLoader.o CMD3MeshFileLoader.o CMS3DMeshFileLoader.o CB3DMeshFileLoader.o C3DSMeshFileLoader.o COgreMeshFileLoader.o COBJMeshFileLoader.o CColladaFileLoader.o CCSMLoader.o CDMFLoader.o CLMTSMeshFileLoader.o CMY3DMeshFileLoader.o COCTLoader.o CXMeshFileLoader.o CIrrMeshFileLoader.o CSTLMeshFileLoader.o CLWOMeshFileLoader.o
+IRRMESHWRITER = CColladaMeshWriter.o CIrrMeshWriter.o CSTLMeshWriter.o COBJMeshWriter.o
 IRRMESHOBJ = $(IRRMESHLOADER) $(IRRMESHWRITER) \
 	CSkinnedMesh.o CBoneSceneNode.o CMeshSceneNode.o \
 	CAnimatedMeshSceneNode.o CAnimatedMeshMD2.o CAnimatedMeshMD3.o \
 	CQ3LevelMesh.o CQuake3ShaderSceneNode.o
-IRROBJ = CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctTreeSceneNode.o COctTreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CCubeSceneNode.o CSphereSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CMeshCache.o CDefaultSceneNodeAnimatorFactory.o CDefaultSceneNodeFactory.o
-IRRPARTICLEOBJ = CParticleAnimatedMeshSceneNodeEmitter.o CParticleBoxEmitter.o CParticleCylinderEmitter.o CParticleMeshEmitter.o CParticlePointEmitter.o CParticleRingEmitter.o CParticleSphereEmitter.o CParticleAttractionAffector.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticleRotationAffector.o CParticleSystemSceneNode.o
-IRRANIMOBJ = CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o
+IRROBJ = CBillboardSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctTreeSceneNode.o COctTreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CVolumeLightSceneNode.o CCubeSceneNode.o CSphereSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CMeshCache.o CDefaultSceneNodeAnimatorFactory.o CDefaultSceneNodeFactory.o
+IRRPARTICLEOBJ = CParticleAnimatedMeshSceneNodeEmitter.o CParticleBoxEmitter.o CParticleCylinderEmitter.o CParticleMeshEmitter.o CParticlePointEmitter.o CParticleRingEmitter.o CParticleSphereEmitter.o CParticleAttractionAffector.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticleRotationAffector.o CParticleSystemSceneNode.o CParticleScaleAffector.o
+IRRANIMOBJ = CSceneNodeAnimatorCameraFPS.o CSceneNodeAnimatorCameraMaya.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o
 IRRDRVROBJ = CNullDriver.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o
-IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CImageLoaderPPM.o\
+IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CImageLoaderPPM.o CImageLoaderWAL.o \
 	CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o
 IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)
-IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o
+IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o CBurningShader_Raster_Reference.o
 IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o irrXML.o CAttributes.o
 IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.o
-IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o
+IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o
 ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
 JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcphuff.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdphuff.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jidctred.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o
 LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o
 # Next variable is for additional scene nodes etc. of customized Irrlicht versions
 EXTRAOBJ =
-LINKOBJ := $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
 	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
 
 ###############
 #Compiler flags
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
+CXXINCS = -I../../include/irrlicht -Izlib -Ijpeglib -Ilibpng
 CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
-CXXFLAGS = -Wall
+CXXFLAGS = -Wall -pipe
 ifndef NDEBUG
 CXXFLAGS += -g -D_DEBUG
 else
@@ -58,22 +58,38 @@ endif
 ifdef PROFILE
 CXXFLAGS += -pg
 endif
-CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+
+sharedlib sharedlib_osx: CXXFLAGS += -fpic
+sharedlib sharedlib_osx: CFLAGS += -fpic
+
+#multilib handling
+ifeq ($(HOSTTYPE), x86_64)
+LIBSELECT=64
+endif
 
 #Linux specific options
-STATIC_LIB = libIrrlicht.a
-SHARED_LIB = libIrrlicht.so
-IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
-LIB_PATH = ../../lib/$(SYSTEM)
-INSTALL_DIR = /usr/local/lib
 staticlib sharedlib install: SYSTEM = Linux
-staticlib sharedlib : LDFLAGS = --no-export-all-symbols --add-stdcall-alias
-sharedlib : LDFLAGS += -L/usr/X11R6/lib -lGL -lXxf86vm
-staticlib sharedlib : CXXINCS += -I/usr/X11R6/include
+STATIC_LIB = libIrrlicht.a
+IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
+LIB_PATH = ../../lib/linux-gcc
+INSTALL_DIR = /usr/local/lib
+sharedlib: SHARED_LIB = libIrrlicht.so
+staticlib sharedlib: LDFLAGS = --no-export-all-symbols --add-stdcall-alias
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
+staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+
+#OSX specific options
+staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
+staticlib_osx sharedlib_osx: IRROTHEROBJ += MacOSX/CIrrDeviceMacOSX.o MacOSX/OSXClipboard.o MacOSX/AppDelegate.o
+staticlib_osx sharedlib_osx: CXXINCS += -IMacOSX -I/usr/X11R6/include
+sharedlib_osx: SHARED_LIB = libIrrlicht.dylib
+staticlib_osx sharedlib_osx: LDFLAGS = --no-export-all-symbols --add-stdcall-alias
+sharedlib_osx: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
 
 #Windows specific options
 sharedlib_win32 staticlib_win32: SYSTEM = Win32-gcc
-sharedlib_win32: LDFLAGS = -lgdi32 -lopengl32 -ld3dx9d -lSDL
+sharedlib_win32: LDFLAGS = -lgdi32 -lopengl32 -ld3dx9d -lwinmm
 sharedlib_win32 staticlib_win32: CPPFLAGS += -DIRR_COMPILE_WITH_DX9_DEV_PACK -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
 staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
 
@@ -91,7 +107,7 @@ $(STATIC_LIB): $(LINKOBJ)
 	$(AR) rs $@ $^
 
 # Copies static lib into /lib/Linux
-staticlib: $(STATIC_LIB)
+staticlib staticlib_osx: $(STATIC_LIB)
 	cp $^ $(LIB_PATH)
 
 # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
@@ -103,17 +119,36 @@ sharedlib_win32: $(IRRLICHT_DLL)
 staticlib_win32: $(STATIC_LIB)
 	cp $^ $(LIB_PATH)
 
+# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/Linux
+sharedlib_osx: $(LINKOBJ)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -dynamiclib -Wl,-install_name,$(SHARED_LIB).1 -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
+	cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
+
 # Installs Irrlicht if it was created as shared lib
 install:
 	cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
 	cd $(INSTALL_DIR) && ln -s libIrrlicht.so.$(VERSION) $(SHARED_LIB)
 	ldconfig -n $(INSTALL_DIR)
 
+install_osx:
+	cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
+	cd $(INSTALL_DIR) && ln -s libIrrlicht.dylib.$(VERSION) $(SHARED_LIB)
+	ldconfig -n $(INSTALL_DIR)
+
+TAGS:
+	ctags *.cpp ../../include/*.h *.h
+
 # Create dependency files for automatic recompilation
 %.d:%.cpp
 	$(CXX) $(CPPFLAGS) -MM -MF $@ $<
 
+# Create object files from objective-c code
+%.o:%.mm
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+
+ifneq ($(MAKECMDGOALS),clean)
 -include $(LINKOBJ:.o=.d)
+endif
 
 help:
 	@echo "Available targets for Irrlicht"
diff --git a/src/dep/src/irrlicht/OctTree.h b/src/dep/src/irrlicht/OctTree.h
index 1085f94..fa46347 100644
--- a/src/dep/src/irrlicht/OctTree.h
+++ b/src/dep/src/irrlicht/OctTree.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -9,20 +9,18 @@
 #include "S3DVertex.h"
 #include "aabbox3d.h"
 #include "irrArray.h"
-#include "irrString.h"
 
 namespace irr
 {
 
-//! template octtree. T must be a vertex type which has a member
-//! called .Pos, which is a core::vertex3df position.
+//! template octtree.
+/** T must be a vertex type which has a member
+called .Pos, which is a core::vertex3df position. */
 template <class T>
 class OctTree
 {
 public:
 
-	u32 nodeCount;
-
 	struct SMeshChunk
 	{
 		core::array<T> Vertices;
@@ -44,45 +42,38 @@ public:
 	};
 
 
-
-	//! constructor
-	OctTree(const core::array<SMeshChunk>& meshes, s32 minimalPolysPerNode=128)
+	//! Constructor
+	OctTree(const core::array<SMeshChunk>& meshes, s32 minimalPolysPerNode=128) :
+		IndexData(0), IndexDataCount(meshes.size()), NodeCount(0)
 	{
-		nodeCount = 0;
-
-		IndexDataCount = meshes.size();
 		IndexData = new SIndexData[IndexDataCount];
 
 		// construct array of all indices
 
 		core::array<SIndexChunk>* indexChunks = new core::array<SIndexChunk>;
-		SIndexChunk ic;
-
-		for (u32 i=0; i<meshes.size(); ++i)
+		indexChunks->reallocate(meshes.size());
+		for (u32 i=0; i!=meshes.size(); ++i)
 		{
 			IndexData[i].CurrentSize = 0;
 			IndexData[i].MaxSize = meshes[i].Indices.size();
 			IndexData[i].Indices = new u16[IndexData[i].MaxSize];
 
-			ic.MaterialId = meshes[i].MaterialId;
-			indexChunks->push_back(ic);
+			indexChunks->push_back(SIndexChunk());
+			SIndexChunk& tic = indexChunks->getLast();
 
-			SIndexChunk& tic = (*indexChunks)[i];
-
-			for (u32 t=0; t<meshes[i].Indices.size(); ++t)
-				tic.Indices.push_back(meshes[i].Indices[t]);
+			tic.MaterialId = meshes[i].MaterialId;
+			tic.Indices = meshes[i].Indices;
 		}
 
 		// create tree
-
-		Root = new OctTreeNode(nodeCount, 0, meshes, indexChunks, minimalPolysPerNode);
+		Root = new OctTreeNode(NodeCount, 0, meshes, indexChunks, minimalPolysPerNode);
 	}
 
 	//! returns all ids of polygons partially or fully enclosed 
 	//! by this bounding box.
 	void calculatePolys(const core::aabbox3d<f32>& box)
 	{
-		for (u32 i=0; i<IndexDataCount; ++i)
+		for (u32 i=0; i!=IndexDataCount; ++i)
 			IndexData[i].CurrentSize = 0;
 
 		Root->getPolys(box, IndexData, 0);
@@ -92,28 +83,32 @@ public:
 	//! by a view frustum.
 	void calculatePolys(const scene::SViewFrustum& frustum)
 	{
-		for (u32 i=0; i<IndexDataCount; ++i)
+		for (u32 i=0; i!=IndexDataCount; ++i)
 			IndexData[i].CurrentSize = 0;
 
 		Root->getPolys(frustum, IndexData, 0);
 	}
 
-
-	SIndexData* getIndexData()
+	const SIndexData* getIndexData() const
 	{
 		return IndexData;
 	}
 
-	u32 getIndexDataCount()
+	u32 getIndexDataCount() const
 	{
 		return IndexDataCount;
 	}
 
-	// for debug purposes only, renders the bounding boxes of the tree
-	void renderBoundingBoxes(const core::aabbox3d<f32>& box, 
-		core::array< core::aabbox3d<f32> >&outBoxes)
+	u32 getNodeCount() const
 	{
-		Root->renderBoundingBoxes(box, outBoxes);
+		return NodeCount;
+	}
+
+	//! for debug purposes only, collects the bounding boxes of the tree
+	void getBoundingBoxes(const core::aabbox3d<f32>& box, 
+		core::array< const core::aabbox3d<f32>* >&outBoxes) const
+	{
+		Root->getBoundingBoxes(box, outBoxes);
 	}
 
 	//! destructor
@@ -127,7 +122,6 @@ public:
 	}
 
 private:
-
 	// private inner class
 	class OctTreeNode
 	{
@@ -144,7 +138,7 @@ private:
 			
 			u32 i; // new ISO for scoping problem with different compilers
 
-			for (i=0; i<8; ++i)
+			for (i=0; i!=8; ++i)
 				Children[i] = 0;
 
 			if (indices->empty())
@@ -192,23 +186,20 @@ private:
 			core::array<u16> keepIndices;
 
 			if (totalPrimitives > minimalPolysPerNode && !Box.isEmpty())
-			for (s32 ch=0; ch<8; ++ch)
+			for (u32 ch=0; ch!=8; ++ch)
 			{
 				box.reset(middle);
 				box.addInternalPoint(edges[ch]);
 
 				// create indices for child
-				core::array<SIndexChunk>* cindexChunks = new core::array<SIndexChunk>;
-
 				bool added = false;
-
+				core::array<SIndexChunk>* cindexChunks = new core::array<SIndexChunk>;
+				cindexChunks->reallocate(allmeshdata.size());
 				for (i=0; i<allmeshdata.size(); ++i)
 				{
-					SIndexChunk ic;
-					ic.MaterialId = allmeshdata[i].MaterialId;
-					cindexChunks->push_back(ic);
-
-					SIndexChunk& tic = (*cindexChunks)[i];
+					cindexChunks->push_back(SIndexChunk());
+					SIndexChunk& tic = cindexChunks->getLast();
+					tic.MaterialId = allmeshdata[i].MaterialId;
 
 					for (u32 t=0; t<(*indices)[i].Indices.size(); t+=3)
 					{
@@ -246,8 +237,6 @@ private:
 			IndexData = indices;
 		}
 
-
-
 		// destructor
 		~OctTreeNode()
 		{
@@ -257,8 +246,6 @@ private:
 				delete Children[i];
 		}
 
-
-
 		// returns all ids of polygons partially or full enclosed 
 		// by this bounding box.
 		void getPolys(const core::aabbox3d<f32>& box, SIndexData* idxdata, u32 parentTest ) const
@@ -267,22 +254,21 @@ private:
 			if ( parentTest != 2 )
 			{
 				// partially inside ?
-				parentTest = (u32) Box.intersectsWithBox(box);
-				if ( 0 == parentTest )
+				if (!Box.intersectsWithBox(box))
 					return;
 
 				// fully inside ?
-				parentTest+= Box.isFullInside(box);
+				parentTest = Box.isFullInside(box)?2:1;
 			}
 
 			//if (Box.intersectsWithBox(box))
 			{
-				u32 cnt = IndexData->size();
+				const u32 cnt = IndexData->size();
 				u32 i; // new ISO for scoping problem in some compilers
 				
 				for (i=0; i<cnt; ++i)
 				{
-					s32 idxcnt = (*IndexData)[i].Indices.size();
+					const s32 idxcnt = (*IndexData)[i].Indices.size();
 
 					if (idxcnt)
 					{
@@ -292,19 +278,17 @@ private:
 					}
 				}
 
-				for (i=0; i<8; ++i)
+				for (i=0; i!=8; ++i)
 					if (Children[i])
 						Children[i]->getPolys(box, idxdata,parentTest);
 			}
 		}
 
-
-
 		// returns all ids of polygons partially or full enclosed 
 		// by the view frustum.
 		void getPolys(const scene::SViewFrustum& frustum, SIndexData* idxdata,u32 parentTest) const
 		{
-			s32 i; // new ISO for scoping problem in some compilers
+			u32 i; // new ISO for scoping problem in some compilers
 			
 			// not fully inside
 			//if ( parentTest != 2 )
@@ -312,25 +296,27 @@ private:
 				core::vector3df edges[8];
 				Box.getEdges(edges);
 
-				for (i=0; i<scene::SViewFrustum::VF_PLANE_COUNT; ++i)
+				for (i=0; i!=scene::SViewFrustum::VF_PLANE_COUNT; ++i)
 				{
 					bool boxInFrustum=false;
 
-					for (int j=0; j<8; ++j)
+					for (u32 j=0; j!=8; ++j)
+					{
 						if (frustum.planes[i].classifyPointRelation(edges[j]) != core::ISREL3D_FRONT)
 						{
 							boxInFrustum=true;
 							break;
 						}
+					}
 
 					if (!boxInFrustum) // all edges outside
 						return;
 				}
 			}
 
-			s32 cnt = IndexData->size();
+			const u32 cnt = IndexData->size();
 			
-			for (i=0; i<cnt; ++i)
+			for (i=0; i!=cnt; ++i)
 			{
 				s32 idxcnt = (*IndexData)[i].Indices.size();
 
@@ -342,23 +328,22 @@ private:
 				}
 			}
 
-			for (i=0; i<8; ++i)
+			for (i=0; i!=8; ++i)
 				if (Children[i])
 					Children[i]->getPolys(frustum, idxdata,parentTest);
 		}
 
-
-
-		void renderBoundingBoxes(const core::aabbox3d<f32>& box,
-			core::array< core::aabbox3d<f32> >&outBoxes)
+		//! for debug purposes only, collects the bounding boxes of the node
+		void getBoundingBoxes(const core::aabbox3d<f32>& box,
+			core::array< const core::aabbox3d<f32>* >&outBoxes) const
 		{
 			if (Box.intersectsWithBox(box))
 			{
-				outBoxes.push_back(Box);
+				outBoxes.push_back(&Box);
 				
-				for (u32 i=0; i<8; ++i)
+				for (u32 i=0; i!=8; ++i)
 					if (Children[i])
-						Children[i]->renderBoundingBoxes(box, outBoxes);
+						Children[i]->getBoundingBoxes(box, outBoxes);
 			}
 		}
 
@@ -373,6 +358,7 @@ private:
 	OctTreeNode* Root;
 	SIndexData* IndexData;
 	u32 IndexDataCount;
+	u32 NodeCount;
 };
 
 } // end namespace
diff --git a/src/dep/src/irrlicht/S2DVertex.h b/src/dep/src/irrlicht/S2DVertex.h
index 9127ff2..79b2cab 100644
--- a/src/dep/src/irrlicht/S2DVertex.h
+++ b/src/dep/src/irrlicht/S2DVertex.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/S4DVertex.h b/src/dep/src/irrlicht/S4DVertex.h
index f1e2862..0b5482a 100644
--- a/src/dep/src/irrlicht/S4DVertex.h
+++ b/src/dep/src/irrlicht/S4DVertex.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -263,22 +263,33 @@ enum e4DVertexFlag
 	VERTEX4D_CLIPMASK	= 0x0000003F,
 	VERTEX4D_PROJECTED	= 0x00000100,
 
-	VERTEX4D_FORMAT_MASK	= 0xFFFF0000,
-	VERTEX4D_FORMAT_0	= 0x00010000,
-	VERTEX4D_FORMAT_1	= VERTEX4D_FORMAT_0 | 0x00020000,
-	VERTEX4D_FORMAT_2	= VERTEX4D_FORMAT_1 | 0x00040000
+	VERTEX4D_FORMAT_MASK			= 0xFFFF0000,
+
+	VERTEX4D_FORMAT_MASK_TEXTURE	= 0x000F0000,
+	VERTEX4D_FORMAT_TEXTURE_1		= 0x00010000,
+	VERTEX4D_FORMAT_TEXTURE_2		= 0x00020000,
+	VERTEX4D_FORMAT_TEXTURE_3		= 0x00030000,
+	VERTEX4D_FORMAT_TEXTURE_4		= 0x00040000,
+
+	VERTEX4D_FORMAT_MASK_COLOR		= 0x00F00000,
+	VERTEX4D_FORMAT_COLOR_1			= 0x00100000,
+	VERTEX4D_FORMAT_COLOR_2			= 0x00200000
+
 };
 
-// dummy Vertex
+const u32 MATERIAL_MAX_COLORS = 1;
+const u32 BURNING_MATERIAL_MAX_TEXTURES = 2;
+
+// dummy Vertex. used for calculation vertex memory size
 struct __s4DVertex
 {
 	sVec4 Pos;
 
 #ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
-	sVec4 Color[1];
+	sVec4 Color[MATERIAL_MAX_COLORS];
 #endif
 
-	sVec2 Tex[2];
+	sVec2 Tex[BURNING_MATERIAL_MAX_TEXTURES];
 	u32 flag;
 };
 
@@ -290,10 +301,10 @@ struct s4DVertex
 	sVec4 Pos;
 
 #ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
-	sVec4 Color[1];
+	sVec4 Color[ MATERIAL_MAX_COLORS ];
 #endif
 
-	sVec2 Tex[2];
+	sVec2 Tex[ BURNING_MATERIAL_MAX_TEXTURES ];
 
 	u32 flag;
 
@@ -302,20 +313,25 @@ struct s4DVertex
 	// f = a * t + b * ( 1 - t )
 	void interpolate(const s4DVertex& b, const s4DVertex& a, const f32 t)
 	{
+		u32 i;
+		u32 size;
+
 		Pos.interpolate ( a.Pos, b.Pos, t );
 
 #ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
-		Color[0].interpolate ( a.Color[0], b.Color[0], t );
+		size = (flag & VERTEX4D_FORMAT_MASK_COLOR) >> 20;
+		for ( i = 0; i!= size; ++i )
+		{
+			Color[i].interpolate ( a.Color[i], b.Color[i], t );
+		}
 #endif
 
-		Tex[0].interpolate ( a.Tex[0], b.Tex[0], t );
-
-		if ( (flag & VERTEX4D_FORMAT_1 ) == VERTEX4D_FORMAT_1 )
+		size = (flag & VERTEX4D_FORMAT_MASK_TEXTURE) >> 16;
+		for ( i = 0; i!= size; ++i )
 		{
-			Tex[1].interpolate ( a.Tex[1], b.Tex[1], t );
+			Tex[i].interpolate ( a.Tex[i], b.Tex[i], t );
 		}
 
-
 	}
 };
 
@@ -328,7 +344,6 @@ struct SAlignedVertex
 	{
 		u32 byteSize = (ElementSize << SIZEOF_SVERTEX_LOG2 ) + aligned;
 		mem = new u8 [ byteSize ];
-		//data = (s4DVertex*) ((PointerAsValue ( mem ) + (aligned-1) ) & ~ ( aligned - 1 ) );
 		data = (s4DVertex*) mem;
 	}
 
@@ -403,11 +418,12 @@ inline void swapVertexPointer(const s4DVertex** v1, const s4DVertex** v2)
 // ------------------------ Internal Scanline Rasterizer -----------------------------
 
 
+
 // internal scan convert
 struct sScanConvertData
 {
-	s32 left;			// major edge left/right
-	s32 right;		// !left
+	u8 left;			// major edge left/right
+	u8 right;			// !left
 
 	f32 invDeltaY[3];	// inverse edge delta y
 
@@ -422,21 +438,18 @@ struct sScanConvertData
 	f32 slopeZ[2];		// z slope along edges
 #endif
 
-	sVec4 c[2];			// color
-	sVec4 slopeC[2];	// color slope along edges
+	sVec4 c[MATERIAL_MAX_COLORS][2];			// color
+	sVec4 slopeC[MATERIAL_MAX_COLORS][2];	// color slope along edges
 
-	sVec2 t0[2];			// texture
-	sVec2 slopeT0[2];	// texture slope along edges
-
-	sVec2 t1[2];			// texture
-	sVec2 slopeT1[2];	// texture slope along edges
+	sVec2 t[BURNING_MATERIAL_MAX_TEXTURES][2];		// texture
+	sVec2 slopeT[BURNING_MATERIAL_MAX_TEXTURES][2];	// texture slope along edges
 
 };
 
 // passed to scan Line
 struct sScanLineData
 {
-	s32 y;			// y position of scanline
+	s32 y;				// y position of scanline
 	f32 x[2];			// x start, x end of scanline
 
 #if defined ( SOFTWARE_DRIVER_2_USE_WBUFFER ) || defined ( SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT )
@@ -446,13 +459,23 @@ struct sScanLineData
 #endif
 
 #ifdef SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
-	sVec4 c[2];		// color start, color end of scanline
+	sVec4 c[MATERIAL_MAX_COLORS][2];			// color start, color end of scanline
 #endif
 
-	sVec2 t0[2];		// texture start, texture end of scanline
-	sVec2 t1[2];		// texture start, texture end of scanline
+	sVec2 t[BURNING_MATERIAL_MAX_TEXTURES][2];		// texture start, texture end of scanline
 };
 
+// passed to pixel Shader
+struct sPixelShaderData
+{
+	tVideoSample *dst;
+	fp24 *z;
+
+	s32 xStart;
+	s32 xEnd;
+	s32 dx;
+	s32 i;
+};
 
 /*
 	load a color value
diff --git a/src/dep/src/irrlicht/SoftwareDriver2_compile_config.h b/src/dep/src/irrlicht/SoftwareDriver2_compile_config.h
index 87729c0..f15eed5 100644
--- a/src/dep/src/irrlicht/SoftwareDriver2_compile_config.h
+++ b/src/dep/src/irrlicht/SoftwareDriver2_compile_config.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -24,6 +24,18 @@
 	#define SOFTWARE_DRIVER_2_TEXTURE_TRANSFORM
 #endif
 
+#ifdef BURNINGVIDEO_RENDERER_CE
+	#define SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT
+	#define SOFTWARE_DRIVER_2_SUBTEXEL
+	#define SOFTWARE_DRIVER_2_BILINEAR
+	#define SOFTWARE_DRIVER_2_LIGHTING
+	#define SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
+	#define SOFTWARE_DRIVER_2_16BIT
+	#define SOFTWARE_DRIVER_2_MIPMAPPING
+	#define SOFTWARE_DRIVER_2_USE_WBUFFER
+	#define SOFTWARE_DRIVER_2_TEXTURE_TRANSFORM
+#endif
+
 #ifdef BURNINGVIDEO_RENDERER_FAST
 	#define SOFTWARE_DRIVER_2_PERSPECTIVE_CORRECT
 	#define SOFTWARE_DRIVER_2_SUBTEXEL
@@ -45,16 +57,16 @@
 	//#define SOFTWARE_DRIVER_2_USE_VERTEX_COLOR
 	//#define SOFTWARE_DRIVER_2_32BIT
 	#define SOFTWARE_DRIVER_2_MIPMAPPING
-	//#define SOFTWARE_DRIVER_2_USE_WBUFFER
+	#define SOFTWARE_DRIVER_2_USE_WBUFFER
 #endif
 
 // Derivate flags
 
 // texture format
 #ifdef SOFTWARE_DRIVER_2_32BIT
-	#define	ECF_SOFTWARE2	ECF_A8R8G8B8
+	#define	BURNINGSHADER_COLOR_FORMAT	ECF_A8R8G8B8
 #else
-	#define	ECF_SOFTWARE2	ECF_A1R5G5B5
+	#define	BURNINGSHADER_COLOR_FORMAT	ECF_A1R5G5B5
 #endif
 
 // mip mapping
@@ -64,14 +76,14 @@
 		#define SOFTWARE_DRIVER_2_MIPMAPPING_LOD_BIAS	-1
 	#else
 		#define SOFTWARE_DRIVER_2_MIPMAPPING_MAX		8
-		#define SOFTWARE_DRIVER_2_MIPMAPPING_LOD_BIAS	-1
+		#define SOFTWARE_DRIVER_2_MIPMAPPING_LOD_BIAS	0
 	#endif
 #else
 	#define SOFTWARE_DRIVER_2_MIPMAPPING_MAX		1
 	#define SOFTWARE_DRIVER_2_MIPMAPPING_LOD_BIAS	0
 #endif
 
-
+#define SOFTWARE_DRIVER_2_MIPMAPPING_SCALE (8/SOFTWARE_DRIVER_2_MIPMAPPING_MAX)
 
 #ifndef REALINLINE
 	#ifdef _MSC_VER
diff --git a/src/dep/src/irrlicht/SoftwareDriver2_helper.h b/src/dep/src/irrlicht/SoftwareDriver2_helper.h
index 525eaea..313a986 100644
--- a/src/dep/src/irrlicht/SoftwareDriver2_helper.h
+++ b/src/dep/src/irrlicht/SoftwareDriver2_helper.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt / Thomas Alten
+// Copyright (C) 2002-2009 Nikolaus Gebhardt / Thomas Alten
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -13,6 +13,7 @@
 #include "SoftwareDriver2_compile_config.h"
 #include "irrMath.h"
 #include "CSoftwareTexture2.h"
+#include "SMaterial.h"
 
 
 
@@ -107,7 +108,7 @@ REALINLINE void memcpy32_small ( void * dest, const void *source, u32 bytesize )
 
 	do
 	{
-		((u32*) dest ) [ c + -1 ] = ((u32*) source) [ c + -1 ];
+		((u32*) dest ) [ c-1 ] = ((u32*) source) [ c-1 ];
 	} while ( --c );
 
 }
@@ -117,7 +118,7 @@ REALINLINE void memcpy32_small ( void * dest, const void *source, u32 bytesize )
 // integer log2 of a float ieee 754. TODO: non ieee floating point
 static inline s32 s32_log2_f32( f32 f)
 {
-	u32 x = IR ( f );
+	u32 x = core::IR ( f );
 
 	return ((x & 0x7F800000) >> 23) - 127;
 }
@@ -134,22 +135,12 @@ static inline s32 s32_abs(s32 x)
 }
 
 
-// TODO: don't stick on 32 Bit Pointer
-#define PointerAsValue(x) ( (u32) (u32*) (x) ) 
-
-
 //! conditional set based on mask and arithmetic shift
 REALINLINE u32 if_mask_a_else_b ( const u32 mask, const u32 a, const u32 b )
 {
 	return ( mask & ( a ^ b ) ) ^ b;
 }
 
-inline void setbits ( u32 &state, s32 condition, u32 mask )
-{
-	state ^= ( ( -condition >> 31 ) ^ state ) & mask;
-}
-
-
 // ------------------ Video---------------------------------------
 /*!
 	Pixel = dest * ( 1 - alpha ) + source * alpha
@@ -208,7 +199,7 @@ inline u16 PixelBlend16 ( const u16 c2, const u32 c1, const u32 alpha )
 	rb &= 0x7C1F;
 	xg &= 0x03E0;
 
-	return rb | xg; 
+	return (u16)(rb | xg);
 }
 
 /*!
@@ -246,7 +237,7 @@ inline u32 extractAlpha ( const u32 c )
 */
 inline u16 PixelMul16 ( const u16 c0, const u16 c1)
 {
-	return ((( ( (c0 & 0x7C00) * (c1 & 0x7C00) ) & 0x3E000000 ) >> 15 ) |
+	return (u16)((( ( (c0 & 0x7C00) * (c1 & 0x7C00) ) & 0x3E000000 ) >> 15 ) |
 			(( ( (c0 & 0x03E0) * (c1 & 0x03E0) ) & 0x000F8000 ) >> 10 ) |
 			(( ( (c0 & 0x001F) * (c1 & 0x001F) ) & 0x000003E0 ) >> 5 ) |
 			(c0 & 0x8000));
@@ -257,10 +248,10 @@ inline u16 PixelMul16 ( const u16 c0, const u16 c1)
 */
 inline u16 PixelMul16_2 ( u16 c0, u16 c1)
 {
-	return	( ( (c0 & 0x7C00) * (c1 & 0x7C00) ) & 0x3E000000 ) >> 15 |
+	return	(u16)(( ( (c0 & 0x7C00) * (c1 & 0x7C00) ) & 0x3E000000 ) >> 15 |
 			( ( (c0 & 0x03E0) * (c1 & 0x03E0) ) & 0x000F8000 ) >> 10 |
 			( ( (c0 & 0x001F) * (c1 & 0x001F) ) & 0x000003E0 ) >> 5  |
-			( c0 & c1 & 0x8000);
+			( c0 & c1 & 0x8000));
 }
 
 /*
@@ -702,7 +693,24 @@ inline void getSample_texture ( tFixPoint &r, tFixPoint &g, tFixPoint &b,
 	(tFixPointu &) r	 =	(t00 & MASK_R) >> ( SHIFT_R - FIX_POINT_PRE);
 	(tFixPointu &) g	 =	(t00 & MASK_G) << ( FIX_POINT_PRE - SHIFT_G );
 	(tFixPointu &) b	 =	(t00 & MASK_B) << ( FIX_POINT_PRE - SHIFT_B );
+}
 
+inline void getSample_texture ( tFixPointu &a, tFixPointu &r, tFixPointu &g, tFixPointu &b, 
+						const sInternalTexture * t, const tFixPointu tx, const tFixPointu ty
+								)
+{
+	u32 ofs;
+
+	ofs = ( ( ty & t->textureYMask ) >> FIX_POINT_PRE ) << t->pitchlog2;
+	ofs |= ( tx & t->textureXMask ) >> ( FIX_POINT_PRE - VIDEO_SAMPLE_GRANULARITY );
+
+	// texel
+	const tVideoSample t00 = *((tVideoSample*)( (u8*) t->data + ofs ));
+
+	(tFixPointu &)a	 =	(t00 & MASK_A) >> ( SHIFT_A - FIX_POINT_PRE);
+	(tFixPointu &)r	 =	(t00 & MASK_R) >> ( SHIFT_R - FIX_POINT_PRE);
+	(tFixPointu &)g	 =	(t00 & MASK_G) << ( FIX_POINT_PRE - SHIFT_G );
+	(tFixPointu &)b	 =	(t00 & MASK_B) << ( FIX_POINT_PRE - SHIFT_B );
 }
 
 
diff --git a/src/dep/src/irrlicht/dmfsupport.h b/src/dep/src/irrlicht/dmfsupport.h
index af29003..14a732e 100644
--- a/src/dep/src/irrlicht/dmfsupport.h
+++ b/src/dep/src/irrlicht/dmfsupport.h
@@ -1,16 +1,16 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
-// 
+//
 // This file was originally written by Salvatore Russo.
-// I (Nikolaus Gebhardt) did some minor modifications changes to it and integrated 
+// I (Nikolaus Gebhardt) did some minor modifications changes to it and integrated
 // it into Irrlicht:
 // - removed STL dependency
 // - removed log file and replaced it with irrlicht logging
 // - adapted code formatting a bit to Irrlicht style
 // - removed memory leaks
 // Thanks a lot to Salvatore for his work on this and that he gave me
-// his permission to add it into Irrlicht. 
+// his permission to add it into Irrlicht.
 
 // This support library has been made by Salvatore Russo and is released under GNU public license for general uses.
 // For uses in Irrlicht core and only for Irrlicht related uses I release this library under zlib license.
@@ -25,13 +25,13 @@ using namespace video;
 
 #include "irrString.h"
 
-/** A structure representing some DeleD infos. 
- This structure contains data about DeleD level file like: version, ambient colour, number of objects etc...*/
-struct dmfHeader 
-{ 
+/** A structure representing some DeleD infos.
+This structure contains data about DeleD level file like: version, ambient colour, number of objects etc...*/
+struct dmfHeader
+{
 	//main file header
+	core::stringc dmfName; //!<Scene name
 	f32 dmfVersion;     //!<File version
-	char dmfName[128]; //!<Scene name
 	SColor dmfAmbient; //!<Ambient color
 	f32 dmfShadow;     //!<Shadow intensity
 	u32 numObjects;    //!<Number of objects in this scene
@@ -44,24 +44,25 @@ struct dmfHeader
 };
 
 
-/** A structure rapresenting a DeleD material.
+/** A structure representing a DeleD material.
 This structure contains texture names, an ID and some flags.*/
 struct dmfMaterial
 {
-    u32 materialID;//!<This material unique ID.
-    u32 textureFlag;//!<First texture Flag (0=Normal, 1=Color).
-    u32 lightmapFlag;//!<Lightmap Flag (0=Normal, others not considered).
-    u32 textureBlend;//!<Texture Blend mode used to support alpha maps (4=Alpha map, others not implemented yet).
-    char textureName[64];//!<Name of first texture (only file name, no path).
-    char lightmapName[64];//!<Name of lightmap (only file name, no path).             
+	u32 materialID;//!<This material unique ID.
+	u32 textureLayers;//!<First texture Flag (0=Normal, 1=Color).
+	u32 textureFlag;//!<First texture Flag (0=Normal, 1=Color).
+	u32 lightmapFlag;//!<Lightmap Flag (0=Normal, others not considered).
+	u32 textureBlend;//!<Texture Blend mode used to support alpha maps (4=Alpha map, others not implemented yet).
+	core::stringc textureName;//!<Name of first texture (only file name, no path).
+	core::stringc lightmapName;//!<Name of lightmap (only file name, no path).
 };
 
 
 /** A structure rapresenting a single face.
 This structure contains first vertice index, number of vertices and the material used.*/
-struct dmfFace 
+struct dmfFace
 {
-	u32 firstVert;//!<First vertice index.
+	u32 firstVert;//!<First vertex index.
 	u32 numVerts;//!<Number of vertices for this face.
 	u32 materialID;//!<Material used for this face.
 };
@@ -69,27 +70,27 @@ struct dmfFace
 
 /** A structure rapresenting a single vertice.
 This structure contains vertice position coordinates and texture an lightmap UV.*/
-struct dmfVert 
+struct dmfVert
 {
-	f32 tc[2];//!<Texture UV coords.
-	f32 lc[2];//!<Lightmap UV coords.
-	f32 pos[3];//!<Position of vertice x,y,z
+	core::vector3df pos;//!<Position of vertex
+	core::vector2df tc;//!<Texture UV coords
+	core::vector2df lc;//!<Lightmap UV coords
 };
 
 
-/** A structure rapresenting a single dynamic light.
+/** A structure representing a single dynamic light.
 This structure contains light position coordinates, diffuse colour, specular colour and maximum radius of light.*/
-struct dmfLight 
+struct dmfLight
 {
-	f32 pos[3];//!<Position of this light.
+	core::vector3df pos;//!<Position of this light.
 	SColorf diffuseColor;//!<Diffuse color.
 	SColorf specularColor;//!<Specular color.
 	f32 radius;//!<Maximum radius of light.
 };
-		
+
 /** A structure rapresenting a single water plane.
 This structure contains light position coordinates, diffuse colour, specular colour and maximum radius of light.*/
-struct dmfWaterPlain
+struct dmfWaterPlane
 {
 	u32 waterID;//!<ID of specified water plane.
 	u32 numFaces;//!<number of faces that make this plain.Owing to the fact that this is a rectangle you'll have 1 every time.
@@ -97,7 +98,7 @@ struct dmfWaterPlain
 	core::dimension2d<s32> tileNum;//!<number of tiles of this water plain.
 	f32 waveHeight;//!<height of waves.
 	f32 waveSpeed;//!<waves speed.
-	f32 waveLength;//!<waves length.			
+	f32 waveLength;//!<waves length.
 };
 
 
@@ -106,58 +107,56 @@ This function converts an hex string (i.e. FF) to its int value (i.e. 255).
 \return An int representing the hex input value.*/
 int axtoi(const char *hexStg)
 {
-  unsigned int intValue = 0;  // integer value of hex string
-
-  sscanf(hexStg, "%x", &intValue);
-  return (intValue);
+	unsigned int intValue = 0;  // integer value of hex string
+	sscanf(hexStg, "%x", &intValue);
+	return (intValue);
 }
 
 
 /** A standard string.
 A standard string created with standard template libraries.*/
-typedef core::stringc stdstring;
 typedef core::stringc String;
 
 //Define a class StringList based on core::array and the defined class String
 /** A simple stringlist class based on core::array.
 This StringList class is based on core::array and the defined String class.
 */
-class StringList : public core::array<String> 
+class StringList : public core::array<String>
 {
 public:
 
-    /**Basic Constructor*/
-    StringList()
+	/**Basic Constructor*/
+	StringList()
 	{
 	}
 
-    /**Constructor based on file loading.
-    Look at LoadFromFile specifications.*/
+	/**Constructor based on file loading.
+	Look at LoadFromFile specifications.*/
 	StringList(io::IReadFile* file)
 	{
 		LoadFromFile(file);
 	}
 
-    /**Basic destructor.*/
-    ~StringList()
+	/**Basic destructor.*/
+	~StringList()
 	{
 		clear();
 	}
 
-    //Adds a String to StringList
-    /** Add a string to this StringList.*/
-    void Add(String str/*<String to add to the current StringList*/)
+	//Adds a String to StringList
+	/** Add a string to this StringList.*/
+	void Add(String str/*<String to add to the current StringList*/)
 	{
 		push_back(str);
 	}
-        
-    //Loads a stringlist from a file
-    //note that each String added to StringList
-    //is separed by a \\n character and it's present
-    //at the end of line.
-    /** Loads a StringList from a file.
-    This function loads a StringList from a file where each string is divided by a \\n char.*/
-    void LoadFromFile(io::IReadFile* file)
+
+	//Loads a stringlist from a file
+	//note that each String added to StringList
+	//is separated by a \\n character and it's present
+	//at the end of line.
+	/** Loads a StringList from a file.
+	This function loads a StringList from a file where each string is divided by a \\n char.*/
+	void LoadFromFile(io::IReadFile* file)
 	{
 		const long sz = file->getSize();
 		char* buf = new char[sz+1];
@@ -170,56 +169,56 @@ public:
 		{
 			if (*p == '\n')
 			{
-				core::stringc str(start, p - start - 1);
+				core::stringc str(start, (u32)(p - start - 1));
 				str.trim();
 				Add(str);
 				start = p+1;
-			}		
+			}
 
 			++p;
 		}
 
 		if (p - start > 1)
 		{
-			core::stringc str(start, p - start - 1);
+			core::stringc str(start, (u32)(p - start - 1));
 			str.trim();
 			Add(str);
 		}
 
 		delete [] buf;
-    }
+	}
 };
 
-  //This function subdivides a string in a list of strings
+//This function subdivides a string in a list of strings
 /** This function subdivides strings divided by divider in a list of strings.
 \return A StringList made of all strings divided by divider.*/
-StringList SubdivideString(String str, String divider)
+StringList SubdivideString(const String& str, const String& divider)
 {
-    StringList strings; //returned StringList
-    strings.clear();    //clear returned stringlist
-    
-    int c=0;
-	int l=str.size();
-    
-    //process entire string
-    while(c<l)
-	{
-        String resultstr;
-        resultstr = "";
-        //read characters until divider is encountered
-        while((str[c]!=divider[0]) && c<l)
-		{
-            resultstr += str[c];
-            c++;
-        }    
+	StringList strings; //returned StringList
+	strings.clear();    //clear returned stringlist
 
-        //Remove spaces \t and \n from string in my implementation...
-        //pay attention or change it in dll.h if you don't want to remove
-        //a particular char.
-        resultstr.trim();//trims string resultstr
-        strings.Add(resultstr);//add trimmed string
-        c++;
-    }    
+	int c=0;
+	int l=str.size();
+
+	//process entire string
+	while(c<l)
+	{
+		String resultstr;
+		resultstr = "";
+		//read characters until divider is encountered
+		while((str[c]!=divider[0]) && c<l)
+		{
+			resultstr += str[c];
+			++c;
+		}
+
+		//Remove spaces \t and \n from string in my implementation...
+		//pay attention or change it in dll.h if you don't want to remove
+		//a particular char.
+		resultstr.trim();//trims string resultstr
+		strings.Add(resultstr);//add trimmed string
+		++c;
+	}
 
 	return strings;
 }
@@ -229,7 +228,7 @@ StringList SubdivideString(String str, String divider)
 /**This function extract a dmfHeader from a DMF file.
 You must give in input a StringList representing a DMF file loaded with LoadFromFile.
 \return true if function succeed or false on fail.*/
-bool GetDMFHeader (StringList RawFile, dmfHeader & header)
+bool GetDMFHeader(const StringList& RawFile, dmfHeader& header)
 {
 	StringList temp=SubdivideString(RawFile[0],String(";")); //file info
 
@@ -240,151 +239,125 @@ bool GetDMFHeader (StringList RawFile, dmfHeader & header)
 	temp = SubdivideString(RawFile[1],String(" "));//get version
 	StringList temp1=SubdivideString(temp[1],String(";"));
 
-	if (atof(temp1[0].c_str()) < 0.91) 
+	header.dmfVersion = (float)atof(temp1[0].c_str());//save version
+	if (header.dmfVersion < 0.91)
 		return false;//not correct version
 
-	header.dmfVersion = (float)atof(temp1[0].c_str());//save version
-	temp.clear(); 
-          temp = SubdivideString(RawFile[2],String(";"));//get name,ambient color and shadow opacity
-          sprintf(header.dmfName,"%s",temp[0].c_str());//save name
+	temp.clear();
+	temp = SubdivideString(RawFile[2],String(";"));//get name,ambient color and shadow opacity
+	header.dmfName=temp[0];//save name
 
-          String red=String(""), green=String(""), blue=String("");
-          
-          //get color value in hex
-          blue.append((char*)&temp[1][2]);
-		  blue.append((char*)&temp[1][3]);
-          green.append((char*)&temp[1][4]);
-		  green.append((char*)&temp[1][5]);
-          red.append((char*)&temp[1][6]);
-		  red.append((char*)&temp[1][7]);
-          
-          //set ambient color
-          header.dmfAmbient.set(0, axtoi(red.c_str()),
-			  axtoi(green.c_str()), axtoi(blue.c_str()));
-          
-          //set Shadow intensity
-          header.dmfShadow = (float)atof(temp[2].c_str());
-          
-          //set current position
-          int offs=3;
-          
-          //set Materials Number
-          header.numMaterials=atoi(RawFile[offs].c_str());
-          offs=offs + header.numMaterials;
-          offs++;
-          
-          //set Object Number
-          header.numObjects=atoi(RawFile[offs].c_str());
-          
-          //retrieve face and vertices number
-          header.numVertices=0;
-          header.numFaces=0;
-          header.numWatFaces=0;
-          header.numWatVertices=0;
-          offs++;
+	//set ambient color
+	header.dmfAmbient.set(axtoi(temp[1].c_str()));
 
-          s32 fac;
-	  int i;
+	//set Shadow intensity
+	header.dmfShadow = (float)atof(temp[2].c_str());
 
-          for(i=0; i < (int)header.numObjects; i++)
-	  {
-             StringList wat=SubdivideString(RawFile[offs],String(";"));
-             StringList wat1=SubdivideString(wat[0],String("_"));
+	//set current position
+	int offs=3;
 
-             offs++;
-             offs = offs + atoi(RawFile[offs].c_str());
-             offs++;
+	//set Materials Number
+	header.numMaterials=atoi(RawFile[offs].c_str());
+	offs+=header.numMaterials;
+	++offs;
 
-             fac=atoi(RawFile[offs].c_str());
+	//set Object Number
+	header.numObjects=atoi(RawFile[offs].c_str());
 
-             if(!(wat1[0]==String("water") && wat[2]==String("0")))
-				 header.numFaces = header.numFaces + fac;
-             else
-				 header.numWatFaces = header.numWatFaces + fac;
+	//retrieve face and vertices number
+	header.numVertices=0;
+	header.numFaces=0;
+	header.numWatFaces=0;
+	header.numWatVertices=0;
+	offs++;
 
-             offs++;
-             
-			 for(int j=0; j<fac; j++)
-                 if(!(wat1[0] == String("water") && wat[2] == String("0")))
-					 header.numVertices=header.numVertices + atoi(RawFile[offs+j].c_str());
-                 else 
-					 header.numWatVertices=header.numWatVertices + atoi(RawFile[offs + j].c_str());      
+	s32 fac;
+	int i;
 
-             offs = offs + fac;
-          }
-          
-          //retrieve number of dynamic lights
-          header.numLights=0;
-          temp.clear();
-          temp1.clear();
-          s32 lit = atoi(RawFile[offs].c_str());
-
-          for (i=0; i<lit; i++)
+	for(i=0; i < (int)header.numObjects; i++)
 	{
-             offs++;
-             temp=SubdivideString(RawFile[offs],String(";"));
+		StringList wat=SubdivideString(RawFile[offs],String(";"));
+		StringList wat1=SubdivideString(wat[0],String("_"));
 
-             if(atoi(temp[0].c_str())==1)
+		++offs;
+		offs += atoi(RawFile[offs].c_str());
+		++offs;
+
+		fac=atoi(RawFile[offs].c_str());
+
+		if(!(wat1[0]==String("water") && wat[2]==String("0")))
+			header.numFaces = header.numFaces + fac;
+		else
+			header.numWatFaces = header.numWatFaces + fac;
+
+		offs++;
+
+		for(int j=0; j<fac; j++)
 		{
-                temp1=SubdivideString(temp[18],String("_"));
-
-             if(temp1[0]==String("dynamic")) 
-				 header.numLights++;
+			if(!(wat1[0] == String("water") && wat[2] == String("0")))
+				header.numVertices=header.numVertices + atoi(RawFile[offs+j].c_str());
+			else
+				header.numWatVertices=header.numWatVertices + atoi(RawFile[offs + j].c_str());
 		}
-             temp.clear();
-             temp1.clear();
-	}
-             
-   return true; //everything is OK so loading is correct
-}
 
+		offs = offs + fac;
+	}
+
+	//retrieve number of dynamic lights
+	header.numLights=0;
+	temp.clear();
+	temp1.clear();
+	s32 lit = atoi(RawFile[offs].c_str());
+
+	for (i=0; i<lit; i++)
+	{
+		offs++;
+		temp=SubdivideString(RawFile[offs],String(";"));
+
+		if(atoi(temp[0].c_str())==1)
+		{
+			temp1=SubdivideString(temp[18],String("_"));
+
+			if(temp1[0]==String("dynamic"))
+			header.numLights++;
+		}
+		temp.clear();
+		temp1.clear();
+	}
+
+	return true; //everything is OK so loading is correct
+}
 
 
 /**This function extract an array of dmfMaterial from a DMF file.
 You must give in input a StringList representing a DMF file loaded with LoadFromFile.
-\return true if function succeed or false on fail.*/          
-bool GetDMFMaterials(StringList RawFile /**<StringList representing a DMF file.*/,
-			dmfMaterial materials[]/**<Materials returned.*/,
-			int num_material/**<Number of materials contained in DMF file.*/,
-			bool use_material_dirs=false/**<Here you can choose to use default DeleD structure for material dirs.*/)
+\param RawFile StringList representing a DMF file.
+\param materials Materials returned.
+\param num_material Number of materials contained in DMF file.
+\param use_material_dirs Here you can choose to use default DeleD structure for material dirs.
+\return true if function succeed or false on fail.*/
+bool GetDMFMaterials(const StringList& RawFile,
+			core::array<dmfMaterial>& materials,
+			int num_material,
+			bool use_material_dirs=false)
 {
 	int offs=4;
 	StringList temp;
 	StringList temp1;
 	StringList temp2;
 
-	//Checking if this is a DeleD map File of version >= 0.91
-	temp=SubdivideString(RawFile[0],String(";"));//file info
-
-	if ( temp[0] != String("DeleD Map File") ) 
-		return false;//not a deled file
-
-	temp.clear();
-	temp=SubdivideString(RawFile[1],String(" "));//get version
-	temp1=SubdivideString(temp[1],String(";"));
-
-	if (atof(temp1[0].c_str()) < 0.91) 
-		return false;//not correct version
-
-	//end checking
-	temp.clear();
-	temp1.clear();
-     
-	for(int i=0;i<num_material; ++i)
+	materials.reallocate(num_material);
+	for(int i=0; i<num_material; ++i)
 	{
+		materials.push_back(dmfMaterial());
 		temp=SubdivideString(RawFile[offs+i],";");
 		materials[i].materialID = i;
+		materials[i].textureLayers = atoi(temp[3].c_str());
 		temp1=SubdivideString(temp[5],",");
 
 		materials[i].textureFlag = atoi(temp1[0].c_str());
-		if(!use_material_dirs)
-		{
-			temp2=SubdivideString(temp1[1],"\\");
-
-			sprintf(materials[i].textureName, "%s", temp2[temp2.size()-1].c_str());
-		}
-		else
-			sprintf(materials[i].textureName, "%s", temp1[1].c_str());
+		materials[i].textureName=temp1[1];
+		materials[i].textureName.replace('\\','/');
 		materials[i].textureBlend = atoi(temp1[2].c_str());
 		temp1.clear();
 		temp2.clear();
@@ -396,15 +369,15 @@ bool GetDMFMaterials(StringList RawFile /**<StringList representing a DMF file.*
 			if(!use_material_dirs)
 			{
 				temp2=SubdivideString(temp1[1],"\\");
-				sprintf(materials[i].lightmapName,"%s",temp2[temp2.size() - 1].c_str());
+				materials[i].lightmapName=temp2.getLast();
 			}
 			else
-				sprintf(materials[i].lightmapName,"%s",temp1[1].c_str());
+				materials[i].lightmapName=temp1[1];
 		}
-		else 
+		else
 		{
 			materials[i].lightmapFlag=1;
-			materials[i].lightmapName[0]=0;
+			materials[i].lightmapName="";
 		}
 		temp1.clear();
 		temp2.clear();
@@ -415,282 +388,284 @@ bool GetDMFMaterials(StringList RawFile /**<StringList representing a DMF file.*
 
 /**This function extract an array of dmfMaterial from a DMF file considering 1st an 2nd layer for water plains.
 You must give in input a StringList representing a DMF file loaded with LoadFromFile.
-\return true if function succeed or false on fail.*/          
-bool GetDMFWaterMaterials(StringList RawFile /**<StringList representing a DMF file.*/,
-                     dmfMaterial materials[]/**<Materials returned.*/,
-                     int num_material/**<Number of materials contained in DMF file.*/){
-     int offs=4;
-     StringList temp;
-     StringList temp1;
-     StringList temp2;
-     //Checking if this is a DeleD map File of version >= 0.91
-     temp=SubdivideString(RawFile[0],String(";"));//file info
+\return true if function succeed or false on fail.*/
+bool GetDMFWaterMaterials(const StringList& RawFile /**<StringList representing a DMF file.*/,
+		core::array<dmfMaterial>& materials/**<Materials returned.*/,
+		int num_material/**<Number of materials contained in DMF file.*/
+		)
+{
+	int offs=4;
+	StringList temp;
+	StringList temp1;
+	StringList temp2;
+	//Checking if this is a DeleD map File of version >= 0.91
+	temp=SubdivideString(RawFile[0],String(";"));//file info
 
-     if ( temp[0] != String("DeleD Map File") ) 
-		 return false;//not a deled file
+	if ( temp[0] != String("DeleD Map File") )
+		return false;//not a deled file
 
-     temp.clear();
-     temp=SubdivideString(RawFile[1],String(" "));//get version
-     temp1=SubdivideString(temp[1],String(";"));
+	temp.clear();
+	temp=SubdivideString(RawFile[1],String(" "));//get version
+	temp1=SubdivideString(temp[1],String(";"));
 
-     if (atof(temp1[0].c_str()) < 0.91) 
-		 return false;//not correct version
+	if (atof(temp1[0].c_str()) < 0.91)
+		return false;//not correct version
 
-     //end checking
-     temp.clear();
-     temp1.clear();
+	//end checking
+	temp.clear();
+	temp1.clear();
 
-     for(int i=0;i<num_material;i++)
-	 {
-             temp = SubdivideString(RawFile[offs+i],";");
-             materials[i].materialID=i;
+	for(int i=0;i<num_material;i++)
+	{
+		temp = SubdivideString(RawFile[offs+i],";");
+		materials[i].materialID=i;
 
-             temp1 = SubdivideString(temp[5],",");
-             materials[i].textureFlag=atoi(temp1[0].c_str());
-             temp2 = SubdivideString(temp1[1],"\\");
+		temp1 = SubdivideString(temp[5],",");
+		materials[i].textureFlag=atoi(temp1[0].c_str());
+		temp2 = SubdivideString(temp1[1],"\\");
 
-             sprintf(materials[i].textureName,"%s",temp2[temp2.size()-1].c_str());
-             temp1.clear();
-             temp2.clear();
-             int a=temp.size();
-             if(a==7)
-			 {
-                temp1=SubdivideString(temp[6],",");
-                materials[i].lightmapFlag=atoi(temp1[0].c_str());
-                temp2=SubdivideString(temp1[1],"\\");
-                sprintf(materials[i].lightmapName,"%s",temp2[temp2.size() - 1].c_str());
-             }
-             else
-			 {
-                  materials[i].lightmapFlag=1;
-                  sprintf(materials[i].lightmapName,"FFFFFFFF");
-             }
-             temp1.clear();
-             temp2.clear();
-     }
-     return true;
+		materials[i].textureName=temp2.getLast();
+		temp1.clear();
+		temp2.clear();
+		int a=temp.size();
+		if(a==7)
+		{
+			temp1=SubdivideString(temp[6],",");
+			materials[i].lightmapFlag=atoi(temp1[0].c_str());
+			temp2=SubdivideString(temp1[1],"\\");
+			materials[i].lightmapName=temp2.getLast();
+		}
+		else
+		{
+			materials[i].lightmapFlag=1;
+			materials[i].lightmapName="FFFFFFFF";
+		}
+		temp1.clear();
+		temp2.clear();
+	}
+	return true;
 }
+
+
 /**This function extract an array of dmfVert and dmfFace from a DMF file.
 You must give in input a StringList representing a DMF file loaded with LoadFromFile and two arrays long enough.
 Please use GetDMFHeader() before this function to know number of vertices and faces.
-\return true if function succeed or false on fail.*/          
-bool GetDMFVerticesFaces(StringList RawFile/**<StringList representing a DMF file.*/,
-                         dmfVert vertices[]/**<Vertices returned*/,
-                         dmfFace faces[]/**Faces returned*/){
-     int offs=3;
-     int offs1=0;
-     StringList temp,temp1;
-     
-      //Checking if this is a DeleD map File of version >= 0.91
-     temp=SubdivideString(RawFile[0],String(";"));//file info
+\return true if function succeed or false on fail.*/
+bool GetDMFVerticesFaces(const StringList& RawFile/**<StringList representing a DMF file.*/,
+		dmfVert vertices[]/**<Vertices returned*/,
+		dmfFace faces[]/**Faces returned*/
+		)
+{
+	StringList temp,temp1;
 
-     if ( temp[0] != String("DeleD Map File") ) 
-		 return false;//not a deled file
+	// skip materials
+	s32 offs = 4 + atoi(RawFile[3].c_str());
 
-     temp.clear();
-     temp=SubdivideString(RawFile[1],String(" "));//get version
-     temp1=SubdivideString(temp[1],String(";"));
+	const s32 objs = atoi(RawFile[offs].c_str());
+#ifdef _IRR_DMF_DEBUG_
+	os::Printer::log("Reading objects", core::stringc(objs).c_str());
+#endif
 
-     if (atof(temp1[0].c_str()) < 0.91) 
-		 return false;//not correct version
-     //end checking
-     
-     temp.clear();
-     temp1.clear();
-     offs=offs + atoi(RawFile[offs].c_str());
-     offs++;
+	s32 vert=0, tmp_sz=0, vert_cnt=0, face_cnt=0;
+	offs++;
 
-     s32 objs = atoi(RawFile[offs].c_str());
-     s32 fac=0, vert=0, tmp_sz=0, vert_cnt=0, face_cnt=0;
-     offs++;
+	for (int i=0; i<objs; ++i)
+	{
+		StringList wat=SubdivideString(RawFile[offs],";");
+		StringList wat1=SubdivideString(wat[0],"_");
+#ifdef _IRR_DMF_DEBUG_
+	os::Printer::log("Reading object", wat[0].c_str());
+#endif
 
-     for (int i=0; i<objs; i++)
-	 {
-             StringList wat=SubdivideString(RawFile[offs],";");
-             StringList wat1=SubdivideString(wat[0],"_");
+		offs++;
+		const s32 vrtxPos=offs+1;
+		// skip vertices
+		offs += atoi(RawFile[offs].c_str());
+		offs++;
+		const s32 numFaces=atoi(RawFile[offs].c_str());
+		offs++;
+		if(!(wat1[0]==String("water") && wat[2]==String("0")))
+		{
+			for(s32 j=0; j<numFaces; ++j)
+			{
+				temp=SubdivideString(RawFile[offs+j],";");
 
-             offs++;
-             offs1=offs;
-             offs=offs + atoi(RawFile[offs].c_str());
-             offs++;
-             offs1++;
-             fac=atoi(RawFile[offs].c_str());
-             offs++;
-             if(!(wat1[0]==String("water") && wat[2]==String("0")))
-			 {
-             for(int j=0;j<fac;j++)
-			 {
-                     temp=SubdivideString(RawFile[offs+j],";");
-                     
-                     //first value is vertices number for this face
-                     faces[face_cnt].numVerts=atoi(temp[0].c_str());
-                     vert=faces[face_cnt].numVerts;
-                     //second is material ID
-                     faces[face_cnt].materialID=atoi(temp[1].c_str());
-                     //vertices are ordined
-                     faces[face_cnt].firstVert=vert_cnt;
-                     
-                     //now we'll create vertices structure
-                     for(int k=0;k<vert;k++)
-					 {
-                             //get vertex position
-                             temp1=SubdivideString(RawFile[offs1+atoi(temp[2+k].c_str())],";");
-                             //copy x,y,z values
-                             vertices[vert_cnt].pos[0] = (float)atof(temp1[0].c_str());
-                             vertices[vert_cnt].pos[1] = (float)atof(temp1[1].c_str());
-                             vertices[vert_cnt].pos[2] = (float)-atof(temp1[2].c_str());
-                             //get uv coords for tex and light if any
-                             vertices[vert_cnt].tc[0] = (float)atof(temp[2+vert+(2*k)].c_str());
-                             vertices[vert_cnt].tc[1] = (float)atof(temp[2+vert+(2*k)+1].c_str());
-                             tmp_sz=temp.size();
-                             vertices[vert_cnt].lc[0] = (float)atof(temp[tmp_sz-(2*vert)+(2*k)].c_str());
-                             vertices[vert_cnt].lc[1] = (float)atof(temp[tmp_sz-(2*vert)+(2*k)+1].c_str());
-                             vert_cnt++; 
-                             temp1.clear();
-                     }
+				//first value is vertices number for this face
+				vert=atoi(temp[0].c_str());
+				faces[face_cnt].numVerts=vert;
+				//second is material ID
+				faces[face_cnt].materialID=atoi(temp[1].c_str());
+				//vertices are ordined
+				faces[face_cnt].firstVert=vert_cnt;
 
-                     face_cnt++;
-                     temp.clear();
-                 }
-             }
+				//now we'll create vertices structure
+				for(s32 k=0; k<vert; ++k)
+				{
+					//get vertex position
+					temp1=SubdivideString(RawFile[vrtxPos+atoi(temp[2+k].c_str())],";");
+					//copy x,y,z values
+					vertices[vert_cnt].pos.set((float)atof(temp1[0].c_str()),
+							(float)atof(temp1[1].c_str()),
+							(float)-atof(temp1[2].c_str()));
+					//get uv coords for tex and light if any
+					vertices[vert_cnt].tc.set((float)atof(temp[2+vert+(2*k)].c_str()),
+							(float)atof(temp[2+vert+(2*k)+1].c_str()));
+					tmp_sz=temp.size();
+					vertices[vert_cnt].lc.set((float)atof(temp[tmp_sz-(2*vert)+(2*k)].c_str()),
+							(float)atof(temp[tmp_sz-(2*vert)+(2*k)+1].c_str()));
+					vert_cnt++;
+					temp1.clear();
+				}
 
-             offs=offs+fac;
-	 }
+				face_cnt++;
+				temp.clear();
+			}
+		}
 
-  return true;
+		offs=offs+numFaces;
+	}
+
+	return true;
 }
 
+
 /**This function extract an array of dmfLights from a DMF file.
-You must give in input a StringList representing a DMF file loaded with LoadFromFile
-and one array long enough.
-Please use GetDMFHeader() before this function to know number of dynamic lights.
-\return true if function succeed or false on fail.*/          
-bool GetDMFLights(StringList RawFile/**<StringList representing a DMF file.*/,
-                         dmfLight lights[]/**<Lights returned.*/){
-     
-     int offs=3;
-     StringList temp,temp1;
-     
-      //Checking if this is a DeleD map File of version >= 0.91
-     temp=SubdivideString(RawFile[0],String(";"));//file info
+You must give in input a StringList representing a DMF file loaded with
+LoadFromFile and one array long enough.  Please use GetDMFHeader() before this
+function to know number of dynamic lights.
+\return true if function succeed or false on fail.*/
+bool GetDMFLights(const StringList& RawFile/**<StringList representing a DMF file.*/,
+		dmfLight lights[]/**<Lights returned.*/
+		)
+{
+	int offs=3;
+	StringList temp,temp1;
 
-     if ( temp[0] != String("DeleD Map File") ) 
-		 return false;//not a deled file
+	//Checking if this is a DeleD map File of version >= 0.91
+	temp=SubdivideString(RawFile[0],String(";"));//file info
 
-     temp.clear();
-     temp=SubdivideString(RawFile[1],String(" "));//get version
-     temp1=SubdivideString(temp[1],String(";"));
+	if ( temp[0] != String("DeleD Map File") )
+		return false;//not a deled file
 
-     if (atof(temp1[0].c_str()) < 0.91) 
-		 return false;//not correct version
+	temp.clear();
+	temp=SubdivideString(RawFile[1],String(" "));//get version
+	temp1=SubdivideString(temp[1],String(";"));
 
-     //end checking
-     
-     temp.clear();
-     temp1.clear();
-     offs=offs + atoi(RawFile[offs].c_str());
-     offs++;
-     s32 objs = atoi(RawFile[offs].c_str());
-     s32 lit=0;
-     s32 d_lit=0;
-     offs++;
-     
-     //let's get position of lights in file
-	 int i;
-     for(i=0;i<objs;i++)
-	 {
-        offs++;
+	if (atof(temp1[0].c_str()) < 0.91)
+		return false;//not correct version
 
-        offs = offs + atoi(RawFile[offs].c_str());
-        offs++;
+	//end checking
 
-        offs = offs + atoi(RawFile[offs].c_str());
-        offs++; 
-     }
-     
-     //let's find dynamic lights        
-     lit = atoi(RawFile[offs].c_str());
+	temp.clear();
+	temp1.clear();
+	offs=offs + atoi(RawFile[offs].c_str());
+	offs++;
+	s32 objs = atoi(RawFile[offs].c_str());
+	s32 lit=0;
+	s32 d_lit=0;
+	offs++;
 
-     for(i=0;i<lit;i++)
-	 {
-             offs++;
-             temp=SubdivideString(RawFile[offs],String(";"));
-             if(atoi(temp[0].c_str())==1){
-                temp1=SubdivideString(temp[18],String("_"));
-                if(temp1[0]==String("dynamic")) 
-				{
-                   lights[d_lit].radius = (float)atof(temp[4].c_str());
-                   lights[d_lit].pos[0] = (float)atof(temp[5].c_str());
-                   lights[d_lit].pos[1] = (float)atof(temp[6].c_str());
-                   lights[d_lit].pos[2] = (float)-atof(temp[7].c_str());
+	//let's get position of lights in file
+	int i;
+	for(i=0;i<objs;i++)
+	{
+		offs++;
 
-                   lights[d_lit].diffuseColor = SColorf(
-					   SColor(255, atoi(temp[10].c_str()), atoi(temp[11].c_str()),
-					     atoi(temp[12].c_str())));
+		offs = offs + atoi(RawFile[offs].c_str());
+		offs++;
 
-                   lights[d_lit].specularColor = SColorf(
-					   SColor(255, atoi(temp[13].c_str()), atoi(temp[14].c_str()),
-					     atoi(temp[15].c_str())));
+		offs = offs + atoi(RawFile[offs].c_str());
+		offs++;
+	}
 
-                   d_lit++;
-                }
-             }
-             temp.clear();
-             temp1.clear();
-          }
+	//let's find dynamic lights
+	lit = atoi(RawFile[offs].c_str());
 
-    return true;
+	for(i=0;i<lit;i++)
+	{
+		offs++;
+		temp=SubdivideString(RawFile[offs],String(";"));
+		if(atoi(temp[0].c_str())==1)
+		{
+			temp1=SubdivideString(temp[18],String("_"));
+			if(temp1[0]==String("dynamic"))
+			{
+				lights[d_lit].radius = (float)atof(temp[4].c_str());
+				lights[d_lit].pos.set((float)atof(temp[5].c_str()),
+						(float)atof(temp[6].c_str()),
+						(float)-atof(temp[7].c_str()));
+
+				lights[d_lit].diffuseColor = SColorf(
+						SColor(255, atoi(temp[10].c_str()), atoi(temp[11].c_str()),
+						atoi(temp[12].c_str())));
+
+				lights[d_lit].specularColor = SColorf(
+						SColor(255, atoi(temp[13].c_str()), atoi(temp[14].c_str()),
+						atoi(temp[15].c_str())));
+
+				d_lit++;
+			}
+		}
+		temp.clear();
+		temp1.clear();
+	}
+
+	return true;
 }
-/**This function extract an array of dmfWaterPlain,dmfVert and dmfFace from a DMF file.
+
+
+/**This function extracts an array of dmfWaterPlane,dmfVert and dmfFace from a DMF file.
 You must give in input a StringList representing a DMF file loaded with LoadFromFile and three arrays long enough.
 Please use GetDMFHeader() before this function to know number of water plains and water faces as well as water vertices.
-\return true if function succeed or false on fail.*/               
-bool GetDMFWaterPlains(StringList RawFile/**<StringList representing a DMF file.*/,
-                         dmfWaterPlain wat_planes[]/**<Water planes returned.*/,
-                         dmfVert vertices[]/**<Vertices returned*/,
-                         dmfFace faces[]/**Faces returned*/){
-     int offs=3;
-     int offs1=0;
-     StringList temp,temp1;
-     
-      //Checking if this is a DeleD map File of version >= 0.91
-     temp=SubdivideString(RawFile[0],String(";"));//file info
+\return true if function succeed or false on fail.*/
+bool GetDMFWaterPlanes(const StringList& RawFile/**<StringList representing a DMF file.*/,
+		dmfWaterPlane wat_planes[]/**<Water planes returned.*/,
+		dmfVert vertices[]/**<Vertices returned*/,
+		dmfFace faces[]/**Faces returned*/
+		)
+{
+	int offs=3;
+	int offs1=0;
+	StringList temp,temp1;
 
-     if ( temp[0] != String("DeleD Map File") ) 
-		 return false;//not a deled file
+	//Checking if this is a DeleD map File of version >= 0.91
+	temp=SubdivideString(RawFile[0],String(";"));//file info
 
-     temp.clear();
-     temp=SubdivideString(RawFile[1],String(" "));//get version
-     temp1=SubdivideString(temp[1],String(";"));
+	if ( temp[0] != String("DeleD Map File") )
+		return false;//not a deled file
 
-     if (atof(temp1[0].c_str()) < 0.91) 
-		 return false;//not correct version
+	temp.clear();
+	temp=SubdivideString(RawFile[1],String(" "));//get version
+	temp1=SubdivideString(temp[1],String(";"));
 
-     //end checking
-     
-     temp.clear();
-     temp1.clear();
-     offs=offs+atoi(RawFile[offs].c_str());
-     offs++;
-     s32 objs=atoi(RawFile[offs].c_str());
-     s32 fac=0,vert=0,tmp_sz=0,vert_cnt=0,face_cnt=0,wat_id=0;
-     core::dimension2d<s32> tilenum(40,40);
-     f32 waveheight=3.0f;
-     f32 wavespeed=300.0f;
-     f32 wavelength=80.0f;
-     offs++;
+	if (atof(temp1[0].c_str()) < 0.91)
+		return false;//not correct version
+
+	//end checking
+
+	temp.clear();
+	temp1.clear();
+	offs=offs+atoi(RawFile[offs].c_str());
+	offs++;
+	s32 objs=atoi(RawFile[offs].c_str());
+	s32 fac=0,vert=0,tmp_sz=0,vert_cnt=0,face_cnt=0,wat_id=0;
+	core::dimension2d<s32> tilenum(40,40);
+	f32 waveheight=3.0f;
+	f32 wavespeed=300.0f;
+	f32 wavelength=80.0f;
+	offs++;
 
 	for(int i=0;i<objs;i++)
 	{
-             StringList wat=SubdivideString(RawFile[offs],";");
-             StringList wat1=SubdivideString(wat[0],"_");
-             offs++;
-             offs1=offs;
-             offs=offs+atoi(RawFile[offs].c_str());
-             offs++;
-             offs1++;
-             fac=atoi(RawFile[offs].c_str());
-             offs++;
+		StringList wat=SubdivideString(RawFile[offs],";");
+		StringList wat1=SubdivideString(wat[0],"_");
+		offs++;
+		offs1=offs;
+		offs=offs+atoi(RawFile[offs].c_str());
+		offs++;
+		offs1++;
+		fac=atoi(RawFile[offs].c_str());
+		offs++;
 
 		if(wat1[0]==String("water") && wat[2]==String("0"))
 		{
@@ -702,80 +677,79 @@ bool GetDMFWaterPlains(StringList RawFile/**<StringList representing a DMF file.
 			{
 				switch(j)
 				{
-                          case 0:
-                               if(atoi(userinfo[0].c_str())) 
-								   tilenum.Width = atoi(userinfo[0].c_str());
-                               break;
-                          case 1:
-                               if(atoi(userinfo[1].c_str())) 
-								   tilenum.Height = atoi(userinfo[1].c_str());
-                               break;
-                          case 2:
-                               if(atof(userinfo[2].c_str())) 
-								   waveheight = (float)atof(userinfo[2].c_str());
-                               break;
-                          case 3:
-                               if(atof(userinfo[3].c_str())) 
-								   wavespeed = (float)atof(userinfo[3].c_str());
-                               break;
-                          case 4:
-                               if(atof(userinfo[4].c_str())) 
-								   wavelength = (float)atof(userinfo[4].c_str());
-                               
-                               break;
+				case 0:
+					if(atoi(userinfo[0].c_str()))
+						tilenum.Width = atoi(userinfo[0].c_str());
+				break;
+				case 1:
+					if(atoi(userinfo[1].c_str()))
+						tilenum.Height = atoi(userinfo[1].c_str());
+				break;
+				case 2:
+					if(atof(userinfo[2].c_str()))
+						waveheight = (float)atof(userinfo[2].c_str());
+				break;
+				case 3:
+					if(atof(userinfo[3].c_str()))
+						wavespeed = (float)atof(userinfo[3].c_str());
+				break;
+				case 4:
+					if(atof(userinfo[4].c_str()))
+						wavelength = (float)atof(userinfo[4].c_str());
+				break;
 				}
-			}         
-			
-            wat_planes[wat_id].waterID=wat_id;
-            wat_planes[wat_id].numFaces=fac;
-            wat_planes[wat_id].firstFace=face_cnt;
-            wat_planes[wat_id].tileNum=tilenum;
-            wat_planes[wat_id].waveHeight=waveheight;
-            wat_planes[wat_id].waveSpeed=wavespeed;
-            wat_planes[wat_id].waveLength=wavelength;
+			}
+
+			wat_planes[wat_id].waterID=wat_id;
+			wat_planes[wat_id].numFaces=fac;
+			wat_planes[wat_id].firstFace=face_cnt;
+			wat_planes[wat_id].tileNum=tilenum;
+			wat_planes[wat_id].waveHeight=waveheight;
+			wat_planes[wat_id].waveSpeed=wavespeed;
+			wat_planes[wat_id].waveLength=wavelength;
 
 			for(j=0;j<fac;j++)
 			{
-                     temp=SubdivideString(RawFile[offs+j],";");
-                     
-                     //first value is vertices number for this face
-                     faces[face_cnt].numVerts=atoi(temp[0].c_str());
-                     vert=faces[face_cnt].numVerts;
-                     //second is material ID
-                     faces[face_cnt].materialID=atoi(temp[1].c_str());
-                     //vertices are ordined
-                     faces[face_cnt].firstVert=vert_cnt;
-                     
-                     //now we'll create vertices structure
-                     for(int k=0;k<vert;k++)
-					 {
-                             //get vertex position
-                             temp1=SubdivideString(RawFile[offs1+atoi(temp[2+k].c_str())], ";");
+				temp=SubdivideString(RawFile[offs+j],";");
 
-                             //copy x,y,z values
-                             vertices[vert_cnt].pos[0]=(float)atof(temp1[0].c_str());
-                             vertices[vert_cnt].pos[1]=(float)atof(temp1[1].c_str());
-                             vertices[vert_cnt].pos[2]=(float)-atof(temp1[2].c_str());
+				//first value is vertices number for this face
+				faces[face_cnt].numVerts=atoi(temp[0].c_str());
+				vert=faces[face_cnt].numVerts;
+				//second is material ID
+				faces[face_cnt].materialID=atoi(temp[1].c_str());
+				//vertices are ordined
+				faces[face_cnt].firstVert=vert_cnt;
 
-                             //get uv coords for tex and light if any
-                             vertices[vert_cnt].tc[0]=(float)atof(temp[2+vert+(2*k)].c_str());
-                             vertices[vert_cnt].tc[1]=(float)atof(temp[2+vert+(2*k)+1].c_str());
-                             tmp_sz=temp.size();
+				//now we'll create vertices structure
+				for(int k=0;k<vert;k++)
+				{
+					//get vertex position
+					temp1=SubdivideString(RawFile[offs1+atoi(temp[2+k].c_str())], ";");
 
-                             vertices[vert_cnt].lc[0]=(float)atof(temp[tmp_sz-(2*vert)+(2*k)].c_str());
-                             vertices[vert_cnt].lc[1]=(float)atof(temp[tmp_sz-(2*vert)+(2*k)+1].c_str());
-                             vert_cnt++; 
-                             temp1.clear();
-                      }
-                     face_cnt++;
-                     temp.clear();
-                     };
-             }
-             offs=offs+fac;
-       }
- 
-	 return true;
-} 
+					//copy x,y,z values
+					vertices[vert_cnt].pos.set((float)atof(temp1[0].c_str()),
+							(float)atof(temp1[1].c_str()),
+							(float)-atof(temp1[2].c_str()));
+
+					//get uv coords for tex and light if any
+					vertices[vert_cnt].tc.set((float)atof(temp[2+vert+(2*k)].c_str()),
+							(float)atof(temp[2+vert+(2*k)+1].c_str()));
+					tmp_sz=temp.size();
+
+					vertices[vert_cnt].lc.set((float)atof(temp[tmp_sz-(2*vert)+(2*k)].c_str()),
+							(float)atof(temp[tmp_sz-(2*vert)+(2*k)+1].c_str()));
+					++vert_cnt;
+					temp1.clear();
+				}
+				++face_cnt;
+				temp.clear();
+			}
+		}
+		offs=offs+fac;
+	}
+
+	return true;
+}
 
 #endif /* __DMF_SUPPORT_H__ */
 
diff --git a/src/dep/src/irrlicht/glext.h b/src/dep/src/irrlicht/glext.h
index 8b41f3a..4255fa8 100644
--- a/src/dep/src/irrlicht/glext.h
+++ b/src/dep/src/irrlicht/glext.h
@@ -1,7260 +1,8395 @@
-#ifndef __glext_h_
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007 The Khronos Group Inc.
-** 
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-** 
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-** 
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2007/02/12 */
-/* Current version at http://www.opengl.org/registry/ */
-#define GL_GLEXT_VERSION 39
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
-#define GL_CONVOLUTION_BORDER_MODE        0x8013
-#define GL_CONVOLUTION_FILTER_SCALE       0x8014
-#define GL_CONVOLUTION_FILTER_BIAS        0x8015
-#define GL_REDUCE                         0x8016
-#define GL_CONVOLUTION_FORMAT             0x8017
-#define GL_CONVOLUTION_WIDTH              0x8018
-#define GL_CONVOLUTION_HEIGHT             0x8019
-#define GL_MAX_CONVOLUTION_WIDTH          0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
-#define GL_HISTOGRAM_WIDTH                0x8026
-#define GL_HISTOGRAM_FORMAT               0x8027
-#define GL_HISTOGRAM_RED_SIZE             0x8028
-#define GL_HISTOGRAM_GREEN_SIZE           0x8029
-#define GL_HISTOGRAM_BLUE_SIZE            0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
-#define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
-#define GL_MINMAX_FORMAT                  0x802F
-#define GL_MINMAX_SINK                    0x8030
-#define GL_TABLE_TOO_LARGE                0x8031
-#define GL_COLOR_MATRIX                   0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE              0x80D6
-#define GL_COLOR_TABLE_BIAS               0x80D7
-#define GL_COLOR_TABLE_FORMAT             0x80D8
-#define GL_COLOR_TABLE_WIDTH              0x80D9
-#define GL_COLOR_TABLE_RED_SIZE           0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
-#define GL_CONSTANT_BORDER                0x8151
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_MULTISAMPLE_BIT                0x20000000
-#define GL_NORMAL_MAP                     0x8511
-#define GL_REFLECTION_MAP                 0x8512
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_ALPHA               0x84E9
-#define GL_COMPRESSED_LUMINANCE           0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
-#define GL_COMPRESSED_INTENSITY           0x84EC
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_SOURCE0_RGB                    0x8580
-#define GL_SOURCE1_RGB                    0x8581
-#define GL_SOURCE2_RGB                    0x8582
-#define GL_SOURCE0_ALPHA                  0x8588
-#define GL_SOURCE1_ALPHA                  0x8589
-#define GL_SOURCE2_ALPHA                  0x858A
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_SUBTRACT                       0x84E7
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_GENERATE_MIPMAP                0x8191
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_FOG_COORDINATE_SOURCE          0x8450
-#define GL_FOG_COORDINATE                 0x8451
-#define GL_FRAGMENT_DEPTH                 0x8452
-#define GL_CURRENT_FOG_COORDINATE         0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
-#define GL_FOG_COORDINATE_ARRAY           0x8457
-#define GL_COLOR_SUM                      0x8458
-#define GL_CURRENT_SECONDARY_COLOR        0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
-#define GL_SECONDARY_COLOR_ARRAY          0x845E
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_FILTER_CONTROL         0x8500
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_DEPTH_TEXTURE_MODE             0x884B
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#define GL_COMPARE_R_TO_TEXTURE           0x884E
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
-#define GL_FOG_COORD                      GL_FOG_COORDINATE
-#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
-#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
-#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
-#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
-#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-#define GL_SRC0_RGB                       GL_SOURCE0_RGB
-#define GL_SRC1_RGB                       GL_SOURCE1_RGB
-#define GL_SRC2_RGB                       GL_SOURCE2_RGB
-#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
-#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
-#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
-#define GL_PIXEL_PACK_BUFFER              0x88EB
-#define GL_PIXEL_UNPACK_BUFFER            0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
-#define GL_FLOAT_MAT2x3                   0x8B65
-#define GL_FLOAT_MAT2x4                   0x8B66
-#define GL_FLOAT_MAT3x2                   0x8B67
-#define GL_FLOAT_MAT3x4                   0x8B68
-#define GL_FLOAT_MAT4x2                   0x8B69
-#define GL_FLOAT_MAT4x3                   0x8B6A
-#define GL_SRGB                           0x8C40
-#define GL_SRGB8                          0x8C41
-#define GL_SRGB_ALPHA                     0x8C42
-#define GL_SRGB8_ALPHA8                   0x8C43
-#define GL_SLUMINANCE_ALPHA               0x8C44
-#define GL_SLUMINANCE8_ALPHA8             0x8C45
-#define GL_SLUMINANCE                     0x8C46
-#define GL_SLUMINANCE8                    0x8C47
-#define GL_COMPRESSED_SRGB                0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
-#define GL_COMPRESSED_SLUMINANCE          0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_TEXTURE0_ARB                   0x84C0
-#define GL_TEXTURE1_ARB                   0x84C1
-#define GL_TEXTURE2_ARB                   0x84C2
-#define GL_TEXTURE3_ARB                   0x84C3
-#define GL_TEXTURE4_ARB                   0x84C4
-#define GL_TEXTURE5_ARB                   0x84C5
-#define GL_TEXTURE6_ARB                   0x84C6
-#define GL_TEXTURE7_ARB                   0x84C7
-#define GL_TEXTURE8_ARB                   0x84C8
-#define GL_TEXTURE9_ARB                   0x84C9
-#define GL_TEXTURE10_ARB                  0x84CA
-#define GL_TEXTURE11_ARB                  0x84CB
-#define GL_TEXTURE12_ARB                  0x84CC
-#define GL_TEXTURE13_ARB                  0x84CD
-#define GL_TEXTURE14_ARB                  0x84CE
-#define GL_TEXTURE15_ARB                  0x84CF
-#define GL_TEXTURE16_ARB                  0x84D0
-#define GL_TEXTURE17_ARB                  0x84D1
-#define GL_TEXTURE18_ARB                  0x84D2
-#define GL_TEXTURE19_ARB                  0x84D3
-#define GL_TEXTURE20_ARB                  0x84D4
-#define GL_TEXTURE21_ARB                  0x84D5
-#define GL_TEXTURE22_ARB                  0x84D6
-#define GL_TEXTURE23_ARB                  0x84D7
-#define GL_TEXTURE24_ARB                  0x84D8
-#define GL_TEXTURE25_ARB                  0x84D9
-#define GL_TEXTURE26_ARB                  0x84DA
-#define GL_TEXTURE27_ARB                  0x84DB
-#define GL_TEXTURE28_ARB                  0x84DC
-#define GL_TEXTURE29_ARB                  0x84DD
-#define GL_TEXTURE30_ARB                  0x84DE
-#define GL_TEXTURE31_ARB                  0x84DF
-#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_COLOR_SUM_ARB                  0x8458
-#define GL_VERTEX_PROGRAM_ARB             0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
-#define GL_PROGRAM_LENGTH_ARB             0x8627
-#define GL_PROGRAM_STRING_ARB             0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB             0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
-#define GL_PROGRAM_BINDING_ARB            0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
-#define GL_PROGRAM_FORMAT_ARB             0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
-#define GL_MATRIX0_ARB                    0x88C0
-#define GL_MATRIX1_ARB                    0x88C1
-#define GL_MATRIX2_ARB                    0x88C2
-#define GL_MATRIX3_ARB                    0x88C3
-#define GL_MATRIX4_ARB                    0x88C4
-#define GL_MATRIX5_ARB                    0x88C5
-#define GL_MATRIX6_ARB                    0x88C6
-#define GL_MATRIX7_ARB                    0x88C7
-#define GL_MATRIX8_ARB                    0x88C8
-#define GL_MATRIX9_ARB                    0x88C9
-#define GL_MATRIX10_ARB                   0x88CA
-#define GL_MATRIX11_ARB                   0x88CB
-#define GL_MATRIX12_ARB                   0x88CC
-#define GL_MATRIX13_ARB                   0x88CD
-#define GL_MATRIX14_ARB                   0x88CE
-#define GL_MATRIX15_ARB                   0x88CF
-#define GL_MATRIX16_ARB                   0x88D0
-#define GL_MATRIX17_ARB                   0x88D1
-#define GL_MATRIX18_ARB                   0x88D2
-#define GL_MATRIX19_ARB                   0x88D3
-#define GL_MATRIX20_ARB                   0x88D4
-#define GL_MATRIX21_ARB                   0x88D5
-#define GL_MATRIX22_ARB                   0x88D6
-#define GL_MATRIX23_ARB                   0x88D7
-#define GL_MATRIX24_ARB                   0x88D8
-#define GL_MATRIX25_ARB                   0x88D9
-#define GL_MATRIX26_ARB                   0x88DA
-#define GL_MATRIX27_ARB                   0x88DB
-#define GL_MATRIX28_ARB                   0x88DC
-#define GL_MATRIX29_ARB                   0x88DD
-#define GL_MATRIX30_ARB                   0x88DE
-#define GL_MATRIX31_ARB                   0x88DF
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_FRAGMENT_PROGRAM_ARB           0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_QUERY_COUNTER_BITS_ARB         0x8864
-#define GL_CURRENT_QUERY_ARB              0x8865
-#define GL_QUERY_RESULT_ARB               0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
-#define GL_SAMPLES_PASSED_ARB             0x8914
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_PROGRAM_OBJECT_ARB             0x8B40
-#define GL_SHADER_OBJECT_ARB              0x8B48
-#define GL_OBJECT_TYPE_ARB                0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-#define GL_FLOAT_VEC2_ARB                 0x8B50
-#define GL_FLOAT_VEC3_ARB                 0x8B51
-#define GL_FLOAT_VEC4_ARB                 0x8B52
-#define GL_INT_VEC2_ARB                   0x8B53
-#define GL_INT_VEC3_ARB                   0x8B54
-#define GL_INT_VEC4_ARB                   0x8B55
-#define GL_BOOL_ARB                       0x8B56
-#define GL_BOOL_VEC2_ARB                  0x8B57
-#define GL_BOOL_VEC3_ARB                  0x8B58
-#define GL_BOOL_VEC4_ARB                  0x8B59
-#define GL_FLOAT_MAT2_ARB                 0x8B5A
-#define GL_FLOAT_MAT3_ARB                 0x8B5B
-#define GL_FLOAT_MAT4_ARB                 0x8B5C
-#define GL_SAMPLER_1D_ARB                 0x8B5D
-#define GL_SAMPLER_2D_ARB                 0x8B5E
-#define GL_SAMPLER_3D_ARB                 0x8B5F
-#define GL_SAMPLER_CUBE_ARB               0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_POINT_SPRITE_ARB               0x8861
-#define GL_COORD_REPLACE_ARB              0x8862
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
-#define GL_DRAW_BUFFER0_ARB               0x8825
-#define GL_DRAW_BUFFER1_ARB               0x8826
-#define GL_DRAW_BUFFER2_ARB               0x8827
-#define GL_DRAW_BUFFER3_ARB               0x8828
-#define GL_DRAW_BUFFER4_ARB               0x8829
-#define GL_DRAW_BUFFER5_ARB               0x882A
-#define GL_DRAW_BUFFER6_ARB               0x882B
-#define GL_DRAW_BUFFER7_ARB               0x882C
-#define GL_DRAW_BUFFER8_ARB               0x882D
-#define GL_DRAW_BUFFER9_ARB               0x882E
-#define GL_DRAW_BUFFER10_ARB              0x882F
-#define GL_DRAW_BUFFER11_ARB              0x8830
-#define GL_DRAW_BUFFER12_ARB              0x8831
-#define GL_DRAW_BUFFER13_ARB              0x8832
-#define GL_DRAW_BUFFER14_ARB              0x8833
-#define GL_DRAW_BUFFER15_ARB              0x8834
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_DOT3_RGB_EXT                   0x8740
-#define GL_DOT3_RGBA_EXT                  0x8741
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_MIRROR_CLAMP_ATI               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_ELEMENT_ARRAY_APPLE            0x8768
-#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
-#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_DRAW_PIXELS_APPLE              0x8A0A
-#define GL_FENCE_APPLE                    0x8A0B
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CACHED_APPLE           0x85BE
-#define GL_STORAGE_SHARED_APPLE           0x85BF
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_YCBCR_422_APPLE                0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_RGB_S3TC                       0x83A0
-#define GL_RGB4_S3TC                      0x83A1
-#define GL_RGBA_S3TC                      0x83A2
-#define GL_RGBA4_S3TC                     0x83A3
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
-#define GL_DRAW_BUFFER0_ATI               0x8825
-#define GL_DRAW_BUFFER1_ATI               0x8826
-#define GL_DRAW_BUFFER2_ATI               0x8827
-#define GL_DRAW_BUFFER3_ATI               0x8828
-#define GL_DRAW_BUFFER4_ATI               0x8829
-#define GL_DRAW_BUFFER5_ATI               0x882A
-#define GL_DRAW_BUFFER6_ATI               0x882B
-#define GL_DRAW_BUFFER7_ATI               0x882C
-#define GL_DRAW_BUFFER8_ATI               0x882D
-#define GL_DRAW_BUFFER9_ATI               0x882E
-#define GL_DRAW_BUFFER10_ATI              0x882F
-#define GL_DRAW_BUFFER11_ATI              0x8830
-#define GL_DRAW_BUFFER12_ATI              0x8831
-#define GL_DRAW_BUFFER13_ATI              0x8832
-#define GL_DRAW_BUFFER14_ATI              0x8833
-#define GL_DRAW_BUFFER15_ATI              0x8834
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_MODULATE_ADD_ATI               0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
-#define GL_MODULATE_SUBTRACT_ATI          0x8746
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV            0x8870
-#define GL_MAX_TEXTURE_COORDS_NV          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
-#define GL_PROGRAM_ERROR_STRING_NV        0x8874
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_HALF_FLOAT_NV                  0x140B
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_PRIMITIVE_RESTART_NV           0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-#endif
-
-#ifndef GL_NV_vertex_program2
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_STENCIL_BACK_FUNC_ATI          0x8800
-#define GL_STENCIL_BACK_FAIL_ATI          0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
-#define GL_DEPTH_BOUNDS_EXT               0x8891
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_MIRROR_CLAMP_EXT               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
-#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_PACK_INVERT_MESA               0x8758
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
-#define GL_YCBCR_MESA                     0x8757
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
-#endif
-
-#ifndef GL_NV_vertex_program3
-/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#define GL_RENDERBUFFER_EXT               0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT             0x8D46
-#define GL_STENCIL_INDEX4_EXT             0x8D47
-#define GL_STENCIL_INDEX8_EXT             0x8D48
-#define GL_STENCIL_INDEX16_EXT            0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_DEPTH_STENCIL_EXT              0x84F9
-#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
-#define GL_DEPTH24_STENCIL8_EXT           0x88F0
-#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_STENCIL_TAG_BITS_EXT           0x88F2
-#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_SRGB_EXT                       0x8C40
-#define GL_SRGB8_EXT                      0x8C41
-#define GL_SRGB_ALPHA_EXT                 0x8C42
-#define GL_SRGB8_ALPHA8_EXT               0x8C43
-#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
-#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
-#define GL_SLUMINANCE_EXT                 0x8C46
-#define GL_SLUMINANCE8_EXT                0x8C47
-#define GL_COMPRESSED_SRGB_EXT            0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
-#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
-#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
-#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
-#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   0x8CAA
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
-#define GL_MAX_SAMPLES_EXT                0x8D57
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_TEXTURE_1D_STACK_MESAX         0x8759
-#define GL_TEXTURE_2D_STACK_MESAX         0x875A
-#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
-#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
-#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
-#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_TIME_ELAPSED_EXT               0x88BF
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
-#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
-#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
-#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
-#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
-#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
-#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
-#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_LINES_ADJACENCY_EXT            0x000A
-#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
-#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
-#define GL_GEOMETRY_PROGRAM_NV            0x8C26
-#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
-#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
-#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
-#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_GEOMETRY_SHADER_EXT            0x8DD9
-/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
-/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
-/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
-/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
-#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
-/* reuse GL_LINES_ADJACENCY_EXT */
-/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
-/* reuse GL_TRIANGLES_ADJACENCY_EXT */
-/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-/* reuse GL_PROGRAM_POINT_SIZE_EXT */
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
-#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
-#define GL_SAMPLER_BUFFER_EXT             0x8DC2
-#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
-#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
-#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
-#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
-#define GL_INT_SAMPLER_1D_EXT             0x8DC9
-#define GL_INT_SAMPLER_2D_EXT             0x8DCA
-#define GL_INT_SAMPLER_3D_EXT             0x8DCB
-#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
-#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
-#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
-#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_R11F_G11F_B10F_EXT             0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
-#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
-#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
-#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
-#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_TEXTURE_BUFFER_EXT             0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
-#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
-#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
-#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
-#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
-#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_RGB9_E5_EXT                    0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
-#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
-#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
-#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
-#endif
-
-#ifndef GL_NV_fragment_program4
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
-#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
-#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
-#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
-#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
-#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
-#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
-#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
-#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
-#define GL_TEXTURE_COORD_NV               0x8C79
-#define GL_CLIP_DISTANCE_NV               0x8C7A
-#define GL_VERTEX_ID_NV                   0x8C7B
-#define GL_PRIMITIVE_ID_NV                0x8C7C
-#define GL_GENERIC_ATTRIB_NV              0x8C7D
-#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
-#define GL_ACTIVE_VARYINGS_NV             0x8C81
-#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
-#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
-#define GL_PRIMITIVES_GENERATED_NV        0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
-#define GL_RASTERIZER_DISCARD_NV          0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
-#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
-#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
-#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
-#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
-#define GL_UNIFORM_BUFFER_EXT             0x8DEE
-#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_RGBA32UI_EXT                   0x8D70
-#define GL_RGB32UI_EXT                    0x8D71
-#define GL_ALPHA32UI_EXT                  0x8D72
-#define GL_INTENSITY32UI_EXT              0x8D73
-#define GL_LUMINANCE32UI_EXT              0x8D74
-#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
-#define GL_RGBA16UI_EXT                   0x8D76
-#define GL_RGB16UI_EXT                    0x8D77
-#define GL_ALPHA16UI_EXT                  0x8D78
-#define GL_INTENSITY16UI_EXT              0x8D79
-#define GL_LUMINANCE16UI_EXT              0x8D7A
-#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
-#define GL_RGBA8UI_EXT                    0x8D7C
-#define GL_RGB8UI_EXT                     0x8D7D
-#define GL_ALPHA8UI_EXT                   0x8D7E
-#define GL_INTENSITY8UI_EXT               0x8D7F
-#define GL_LUMINANCE8UI_EXT               0x8D80
-#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
-#define GL_RGBA32I_EXT                    0x8D82
-#define GL_RGB32I_EXT                     0x8D83
-#define GL_ALPHA32I_EXT                   0x8D84
-#define GL_INTENSITY32I_EXT               0x8D85
-#define GL_LUMINANCE32I_EXT               0x8D86
-#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
-#define GL_RGBA16I_EXT                    0x8D88
-#define GL_RGB16I_EXT                     0x8D89
-#define GL_ALPHA16I_EXT                   0x8D8A
-#define GL_INTENSITY16I_EXT               0x8D8B
-#define GL_LUMINANCE16I_EXT               0x8D8C
-#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
-#define GL_RGBA8I_EXT                     0x8D8E
-#define GL_RGB8I_EXT                      0x8D8F
-#define GL_ALPHA8I_EXT                    0x8D90
-#define GL_INTENSITY8I_EXT                0x8D91
-#define GL_LUMINANCE8I_EXT                0x8D92
-#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
-#define GL_RED_INTEGER_EXT                0x8D94
-#define GL_GREEN_INTEGER_EXT              0x8D95
-#define GL_BLUE_INTEGER_EXT               0x8D96
-#define GL_ALPHA_INTEGER_EXT              0x8D97
-#define GL_RGB_INTEGER_EXT                0x8D98
-#define GL_RGBA_INTEGER_EXT               0x8D99
-#define GL_BGR_INTEGER_EXT                0x8D9A
-#define GL_BGRA_INTEGER_EXT               0x8D9B
-#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
-#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
-#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;			/* native character */
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for handling shader object handles and program/shader text */
-typedef char GLcharARB;		/* native character */
-typedef unsigned int GLhandleARB;	/* shader object handle */
-#endif
-
-/* GL types for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS )
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <inttypes.h>     /* Fallback option */
-#endif
-#endif
-
-#ifndef GL_EXT_timer_query
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogram (GLenum);
-GLAPI void APIENTRY glResetMinmax (GLenum);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glClientActiveTexture (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glFogCoordf (GLfloat);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
-GLAPI void APIENTRY glFogCoordd (GLdouble);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
-GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *);
-GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
-GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *);
-GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint);
-GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
-GLAPI void APIENTRY glEndQuery (GLenum);
-GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
-GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_VERSION_2_1 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformMatrix2x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix2x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
-GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
-GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
-GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
-GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
-GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexBlendARB (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
-GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
-GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
-GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
-GLAPI void APIENTRY glEndQueryARB (GLenum);
-GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
-GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
-GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
-GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
-GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
-GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
-GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
-GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
-GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_SGI_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint);
-GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
-GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum);
-GLAPI void APIENTRY glTextureLightEXT (GLenum);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
-GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
-GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
-GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFinishFenceNV (GLuint);
-GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
-GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
-GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
-GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
-GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
-GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
-typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
-GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_ATI_pixel_format_float 1
-/* This is really a WGL extension, but defines some associated GL enums.
- * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
- */
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
-GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
-GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
-GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
-typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveRestartNV (void);
-GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-#endif
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-#endif
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
-GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
-GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
-GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
-GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
-GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_EXT_packed_depth_stencil 1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_EXT_stencil_clear_tag 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilClearTagEXT (GLsizei, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_EXT_texture_sRGB 1
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_EXT_framebuffer_blit 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlitFramebufferEXT (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_EXT_framebuffer_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_MESAX_texture_stack 1
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_EXT_timer_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint, GLenum, GLint64EXT *);
-GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint, GLenum, GLuint64EXT *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#define GL_EXT_gpu_program_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_APPLE_flush_buffer_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum, GLintptr, GLsizeiptr);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_NV_gpu_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum, GLuint, const GLint *);
-GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum, GLuint, const GLuint *);
-GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum, GLuint, const GLint *);
-GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum, GLuint, const GLuint *);
-GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum, GLuint, GLuint *);
-GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum, GLuint, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_NV_geometry_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramVertexLimitNV (GLenum, GLint);
-GLAPI void APIENTRY glFramebufferTextureEXT (GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum, GLenum, GLuint, GLint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_EXT_geometry_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramParameteriEXT (GLuint, GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_NV_vertex_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint, GLint);
-GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_EXT_gpu_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetUniformuivEXT (GLuint, GLint, GLuint *);
-GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint, GLuint, const GLchar *);
-GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint, const GLchar *);
-GLAPI void APIENTRY glUniform1uiEXT (GLint, GLuint);
-GLAPI void APIENTRY glUniform2uiEXT (GLint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform3uiEXT (GLint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform4uiEXT (GLint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform1uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform2uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform3uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform4uivEXT (GLint, GLsizei, const GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#define GL_EXT_draw_instanced 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_EXT_packed_float 1
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_EXT_texture_array 1
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_EXT_texture_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBufferEXT (GLenum, GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_EXT_texture_compression_latc 1
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_EXT_texture_compression_rgtc 1
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_EXT_texture_shared_exponent 1
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_NV_depth_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthRangedNV (GLdouble, GLdouble);
-GLAPI void APIENTRY glClearDepthdNV (GLdouble);
-GLAPI void APIENTRY glDepthBoundsdNV (GLdouble, GLdouble);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
-#endif
-
-#ifndef GL_NV_fragment_program4
-#define GL_NV_fragment_program4 1
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_NV_framebuffer_multisample_coverage 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_EXT_framebuffer_sRGB 1
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#define GL_NV_geometry_shader4 1
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_NV_parameter_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum, GLuint, GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum, GLuint, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum, GLuint, GLuint, GLsizei, const GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#define GL_EXT_draw_buffers2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum, GLuint, GLboolean *);
-GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glEnableIndexedEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDisableIndexedEXT (GLenum, GLuint);
-GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_NV_transform_feedback 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum);
-GLAPI void APIENTRY glEndTransformFeedbackNV (void);
-GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint, const GLint *, GLenum);
-GLAPI void APIENTRY glBindBufferRangeNV (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
-GLAPI void APIENTRY glBindBufferOffsetNV (GLenum, GLuint, GLuint, GLintptr);
-GLAPI void APIENTRY glBindBufferBaseNV (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint, GLsizei, const GLint *, GLenum);
-GLAPI void APIENTRY glActiveVaryingNV (GLuint, const GLchar *);
-GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetActiveVaryingNV (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint, GLuint, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_EXT_bindable_uniform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformBufferEXT (GLuint, GLint, GLuint);
-GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint, GLint);
-GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
-typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_EXT_texture_integer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexParameterIivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glTexParameterIuivEXT (GLenum, GLenum, const GLuint *);
-GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum, GLenum, GLuint *);
-GLAPI void APIENTRY glClearColorIiEXT (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glClearColorIuiEXT (GLuint, GLuint, GLuint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
-typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#ifndef __glext_h_
+#define __glext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glext.h last updated 2008/10/09 */
+/* Current version at http://www.opengl.org/registry/ */
+#define GL_GLEXT_VERSION 43
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
+#define GL_SINGLE_COLOR                   0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+#define GL_FUNC_ADD                       0x8006
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CONSTANT_BORDER                0x8151
+#define GL_REPLICATE_BORDER               0x8153
+#define GL_CONVOLUTION_BORDER_COLOR       0x8154
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
+#define GL_MAX_TEXTURE_UNITS              0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_MULTISAMPLE_BIT                0x20000000
+#define GL_NORMAL_MAP                     0x8511
+#define GL_REFLECTION_MAP                 0x8512
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_ALPHA               0x84E9
+#define GL_COMPRESSED_LUMINANCE           0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
+#define GL_COMPRESSED_INTENSITY           0x84EC
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#define GL_COMBINE                        0x8570
+#define GL_COMBINE_RGB                    0x8571
+#define GL_COMBINE_ALPHA                  0x8572
+#define GL_SOURCE0_RGB                    0x8580
+#define GL_SOURCE1_RGB                    0x8581
+#define GL_SOURCE2_RGB                    0x8582
+#define GL_SOURCE0_ALPHA                  0x8588
+#define GL_SOURCE1_ALPHA                  0x8589
+#define GL_SOURCE2_ALPHA                  0x858A
+#define GL_OPERAND0_RGB                   0x8590
+#define GL_OPERAND1_RGB                   0x8591
+#define GL_OPERAND2_RGB                   0x8592
+#define GL_OPERAND0_ALPHA                 0x8598
+#define GL_OPERAND1_ALPHA                 0x8599
+#define GL_OPERAND2_ALPHA                 0x859A
+#define GL_RGB_SCALE                      0x8573
+#define GL_ADD_SIGNED                     0x8574
+#define GL_INTERPOLATE                    0x8575
+#define GL_SUBTRACT                       0x84E7
+#define GL_CONSTANT                       0x8576
+#define GL_PRIMARY_COLOR                  0x8577
+#define GL_PREVIOUS                       0x8578
+#define GL_DOT3_RGB                       0x86AE
+#define GL_DOT3_RGBA                      0x86AF
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_SIZE_MIN                 0x8126
+#define GL_POINT_SIZE_MAX                 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
+#define GL_GENERATE_MIPMAP                0x8191
+#define GL_GENERATE_MIPMAP_HINT           0x8192
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_FOG_COORDINATE_SOURCE          0x8450
+#define GL_FOG_COORDINATE                 0x8451
+#define GL_FRAGMENT_DEPTH                 0x8452
+#define GL_CURRENT_FOG_COORDINATE         0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
+#define GL_FOG_COORDINATE_ARRAY           0x8457
+#define GL_COLOR_SUM                      0x8458
+#define GL_CURRENT_SECONDARY_COLOR        0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
+#define GL_SECONDARY_COLOR_ARRAY          0x845E
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_FILTER_CONTROL         0x8500
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
+#define GL_FOG_COORD                      GL_FOG_COORDINATE
+#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_SRC0_RGB                       GL_SOURCE0_RGB
+#define GL_SRC1_RGB                       GL_SOURCE1_RGB
+#define GL_SRC2_RGB                       GL_SOURCE2_RGB
+#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
+#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
+#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_POINT_SPRITE                   0x8861
+#define GL_COORD_REPLACE                  0x8862
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_COORDS             0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_SLUMINANCE_ALPHA               0x8C44
+#define GL_SLUMINANCE8_ALPHA8             0x8C45
+#define GL_SLUMINANCE                     0x8C46
+#define GL_SLUMINANCE8                    0x8C47
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#define GL_COMPRESSED_SLUMINANCE          0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_COMPARE_REF_TO_TEXTURE         GL_COMPARE_R_TO_TEXTURE_ARB
+#define GL_CLIP_DISTANCE0                 GL_CLIP_PLANE0
+#define GL_CLIP_DISTANCE1                 GL_CLIP_PLANE1
+#define GL_CLIP_DISTANCE2                 GL_CLIP_PLANE2
+#define GL_CLIP_DISTANCE3                 GL_CLIP_PLANE3
+#define GL_CLIP_DISTANCE4                 GL_CLIP_PLANE4
+#define GL_CLIP_DISTANCE5                 GL_CLIP_PLANE5
+#define GL_MAX_CLIP_DISTANCES             GL_MAX_CLIP_PLANES
+#define GL_MAJOR_VERSION                  0x821B
+#define GL_MINOR_VERSION                  0x821C
+#define GL_NUM_EXTENSIONS                 0x821D
+#define GL_CONTEXT_FLAGS                  0x821E
+#define GL_DEPTH_BUFFER                   0x8223
+#define GL_STENCIL_BUFFER                 0x8224
+#define GL_COMPRESSED_RED                 0x8225
+#define GL_COMPRESSED_RG                  0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
+#define GL_RGBA32F                        0x8814
+#define GL_RGB32F                         0x8815
+#define GL_RGBA16F                        0x881A
+#define GL_RGB16F                         0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
+#define GL_CLAMP_VERTEX_COLOR             0x891A
+#define GL_CLAMP_FRAGMENT_COLOR           0x891B
+#define GL_CLAMP_READ_COLOR               0x891C
+#define GL_FIXED_ONLY                     0x891D
+#define GL_MAX_VARYING_COMPONENTS         GL_MAX_VARYING_FLOATS
+#define GL_TEXTURE_RED_TYPE               0x8C10
+#define GL_TEXTURE_GREEN_TYPE             0x8C11
+#define GL_TEXTURE_BLUE_TYPE              0x8C12
+#define GL_TEXTURE_ALPHA_TYPE             0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE         0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE         0x8C15
+#define GL_TEXTURE_DEPTH_TYPE             0x8C16
+#define GL_UNSIGNED_NORMALIZED            0x8C17
+#define GL_TEXTURE_1D_ARRAY               0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
+#define GL_TEXTURE_2D_ARRAY               0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
+#define GL_R11F_G11F_B10F                 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
+#define GL_RGB9_E5                        0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
+#define GL_TEXTURE_SHARED_SIZE            0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED           0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD             0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS            0x8C8C
+#define GL_SEPARATE_ATTRIBS               0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI                       0x8D70
+#define GL_RGB32UI                        0x8D71
+#define GL_RGBA16UI                       0x8D76
+#define GL_RGB16UI                        0x8D77
+#define GL_RGBA8UI                        0x8D7C
+#define GL_RGB8UI                         0x8D7D
+#define GL_RGBA32I                        0x8D82
+#define GL_RGB32I                         0x8D83
+#define GL_RGBA16I                        0x8D88
+#define GL_RGB16I                         0x8D89
+#define GL_RGBA8I                         0x8D8E
+#define GL_RGB8I                          0x8D8F
+#define GL_RED_INTEGER                    0x8D94
+#define GL_GREEN_INTEGER                  0x8D95
+#define GL_BLUE_INTEGER                   0x8D96
+#define GL_ALPHA_INTEGER                  0x8D97
+#define GL_RGB_INTEGER                    0x8D98
+#define GL_RGBA_INTEGER                   0x8D99
+#define GL_BGR_INTEGER                    0x8D9A
+#define GL_BGRA_INTEGER                   0x8D9B
+#define GL_SAMPLER_1D_ARRAY               0x8DC0
+#define GL_SAMPLER_2D_ARRAY               0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
+#define GL_UNSIGNED_INT_VEC2              0x8DC6
+#define GL_UNSIGNED_INT_VEC3              0x8DC7
+#define GL_UNSIGNED_INT_VEC4              0x8DC8
+#define GL_INT_SAMPLER_1D                 0x8DC9
+#define GL_INT_SAMPLER_2D                 0x8DCA
+#define GL_INT_SAMPLER_3D                 0x8DCB
+#define GL_INT_SAMPLER_CUBE               0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
+#define GL_QUERY_WAIT                     0x8E13
+#define GL_QUERY_NO_WAIT                  0x8E14
+#define GL_QUERY_BY_REGION_WAIT           0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
+/* Reuse tokens from ARB_depth_buffer_float */
+/* reuse GL_DEPTH_COMPONENT32F */
+/* reuse GL_DEPTH32F_STENCIL8 */
+/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_DEFAULT */
+/* reuse GL_FRAMEBUFFER_UNDEFINED */
+/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
+/* reuse GL_INDEX */
+/* reuse GL_MAX_RENDERBUFFER_SIZE */
+/* reuse GL_DEPTH_STENCIL */
+/* reuse GL_UNSIGNED_INT_24_8 */
+/* reuse GL_DEPTH24_STENCIL8 */
+/* reuse GL_TEXTURE_STENCIL_SIZE */
+/* reuse GL_TEXTURE_RED_TYPE */
+/* reuse GL_TEXTURE_GREEN_TYPE */
+/* reuse GL_TEXTURE_BLUE_TYPE */
+/* reuse GL_TEXTURE_ALPHA_TYPE */
+/* reuse GL_TEXTURE_LUMINANCE_TYPE */
+/* reuse GL_TEXTURE_INTENSITY_TYPE */
+/* reuse GL_TEXTURE_DEPTH_TYPE */
+/* reuse GL_UNSIGNED_NORMALIZED */
+/* reuse GL_FRAMEBUFFER_BINDING */
+/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_BINDING */
+/* reuse GL_READ_FRAMEBUFFER */
+/* reuse GL_DRAW_FRAMEBUFFER */
+/* reuse GL_READ_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_SAMPLES */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* reuse GL_FRAMEBUFFER_COMPLETE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
+/* reuse GL_MAX_COLOR_ATTACHMENTS */
+/* reuse GL_COLOR_ATTACHMENT0 */
+/* reuse GL_COLOR_ATTACHMENT1 */
+/* reuse GL_COLOR_ATTACHMENT2 */
+/* reuse GL_COLOR_ATTACHMENT3 */
+/* reuse GL_COLOR_ATTACHMENT4 */
+/* reuse GL_COLOR_ATTACHMENT5 */
+/* reuse GL_COLOR_ATTACHMENT6 */
+/* reuse GL_COLOR_ATTACHMENT7 */
+/* reuse GL_COLOR_ATTACHMENT8 */
+/* reuse GL_COLOR_ATTACHMENT9 */
+/* reuse GL_COLOR_ATTACHMENT10 */
+/* reuse GL_COLOR_ATTACHMENT11 */
+/* reuse GL_COLOR_ATTACHMENT12 */
+/* reuse GL_COLOR_ATTACHMENT13 */
+/* reuse GL_COLOR_ATTACHMENT14 */
+/* reuse GL_COLOR_ATTACHMENT15 */
+/* reuse GL_DEPTH_ATTACHMENT */
+/* reuse GL_STENCIL_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER */
+/* reuse GL_RENDERBUFFER */
+/* reuse GL_RENDERBUFFER_WIDTH */
+/* reuse GL_RENDERBUFFER_HEIGHT */
+/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
+/* reuse GL_STENCIL_INDEX1 */
+/* reuse GL_STENCIL_INDEX4 */
+/* reuse GL_STENCIL_INDEX8 */
+/* reuse GL_STENCIL_INDEX16 */
+/* reuse GL_RENDERBUFFER_RED_SIZE */
+/* reuse GL_RENDERBUFFER_GREEN_SIZE */
+/* reuse GL_RENDERBUFFER_BLUE_SIZE */
+/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
+/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
+/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+/* reuse GL_MAX_SAMPLES */
+/* Reuse tokens from ARB_framebuffer_sRGB */
+/* reuse GL_FRAMEBUFFER_SRGB */
+/* Reuse tokens from ARB_half_float_vertex */
+/* reuse GL_HALF_FLOAT */
+/* Reuse tokens from ARB_map_buffer_range */
+/* reuse GL_MAP_READ_BIT */
+/* reuse GL_MAP_WRITE_BIT */
+/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
+/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
+/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
+/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
+/* Reuse tokens from ARB_texture_compression_rgtc */
+/* reuse GL_COMPRESSED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_RG_RGTC2 */
+/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
+/* Reuse tokens from ARB_texture_rg */
+/* reuse GL_RG */
+/* reuse GL_RG_INTEGER */
+/* reuse GL_R8 */
+/* reuse GL_R16 */
+/* reuse GL_RG8 */
+/* reuse GL_RG16 */
+/* reuse GL_R16F */
+/* reuse GL_R32F */
+/* reuse GL_RG16F */
+/* reuse GL_RG32F */
+/* reuse GL_R8I */
+/* reuse GL_R8UI */
+/* reuse GL_R16I */
+/* reuse GL_R16UI */
+/* reuse GL_R32I */
+/* reuse GL_R32UI */
+/* reuse GL_RG8I */
+/* reuse GL_RG8UI */
+/* reuse GL_RG16I */
+/* reuse GL_RG16UI */
+/* reuse GL_RG32I */
+/* reuse GL_RG32UI */
+/* Reuse tokens from ARB_vertex_array_object */
+/* reuse GL_VERTEX_ARRAY_BINDING */
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_ARB            0x812D
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_POINT_SIZE_MIN_ARB             0x8126
+#define GL_POINT_SIZE_MAX_ARB             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
+#define GL_VERTEX_BLEND_ARB               0x86A7
+#define GL_CURRENT_WEIGHT_ARB             0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
+#define GL_WEIGHT_ARRAY_ARB               0x86AD
+#define GL_MODELVIEW0_ARB                 0x1700
+#define GL_MODELVIEW1_ARB                 0x850A
+#define GL_MODELVIEW2_ARB                 0x8722
+#define GL_MODELVIEW3_ARB                 0x8723
+#define GL_MODELVIEW4_ARB                 0x8724
+#define GL_MODELVIEW5_ARB                 0x8725
+#define GL_MODELVIEW6_ARB                 0x8726
+#define GL_MODELVIEW7_ARB                 0x8727
+#define GL_MODELVIEW8_ARB                 0x8728
+#define GL_MODELVIEW9_ARB                 0x8729
+#define GL_MODELVIEW10_ARB                0x872A
+#define GL_MODELVIEW11_ARB                0x872B
+#define GL_MODELVIEW12_ARB                0x872C
+#define GL_MODELVIEW13_ARB                0x872D
+#define GL_MODELVIEW14_ARB                0x872E
+#define GL_MODELVIEW15_ARB                0x872F
+#define GL_MODELVIEW16_ARB                0x8730
+#define GL_MODELVIEW17_ARB                0x8731
+#define GL_MODELVIEW18_ARB                0x8732
+#define GL_MODELVIEW19_ARB                0x8733
+#define GL_MODELVIEW20_ARB                0x8734
+#define GL_MODELVIEW21_ARB                0x8735
+#define GL_MODELVIEW22_ARB                0x8736
+#define GL_MODELVIEW23_ARB                0x8737
+#define GL_MODELVIEW24_ARB                0x8738
+#define GL_MODELVIEW25_ARB                0x8739
+#define GL_MODELVIEW26_ARB                0x873A
+#define GL_MODELVIEW27_ARB                0x873B
+#define GL_MODELVIEW28_ARB                0x873C
+#define GL_MODELVIEW29_ARB                0x873D
+#define GL_MODELVIEW30_ARB                0x873E
+#define GL_MODELVIEW31_ARB                0x873F
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_MATRIX_PALETTE_ARB             0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_COMBINE_ARB                    0x8570
+#define GL_COMBINE_RGB_ARB                0x8571
+#define GL_COMBINE_ALPHA_ARB              0x8572
+#define GL_SOURCE0_RGB_ARB                0x8580
+#define GL_SOURCE1_RGB_ARB                0x8581
+#define GL_SOURCE2_RGB_ARB                0x8582
+#define GL_SOURCE0_ALPHA_ARB              0x8588
+#define GL_SOURCE1_ALPHA_ARB              0x8589
+#define GL_SOURCE2_ALPHA_ARB              0x858A
+#define GL_OPERAND0_RGB_ARB               0x8590
+#define GL_OPERAND1_RGB_ARB               0x8591
+#define GL_OPERAND2_RGB_ARB               0x8592
+#define GL_OPERAND0_ALPHA_ARB             0x8598
+#define GL_OPERAND1_ALPHA_ARB             0x8599
+#define GL_OPERAND2_ALPHA_ARB             0x859A
+#define GL_RGB_SCALE_ARB                  0x8573
+#define GL_ADD_SIGNED_ARB                 0x8574
+#define GL_INTERPOLATE_ARB                0x8575
+#define GL_SUBTRACT_ARB                   0x84E7
+#define GL_CONSTANT_ARB                   0x8576
+#define GL_PRIMARY_COLOR_ARB              0x8577
+#define GL_PREVIOUS_ARB                   0x8578
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_DOT3_RGB_ARB                   0x86AE
+#define GL_DOT3_RGBA_ARB                  0x86AF
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_DEPTH_COMPONENT16_ARB          0x81A5
+#define GL_DEPTH_COMPONENT24_ARB          0x81A6
+#define GL_DEPTH_COMPONENT32_ARB          0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif
+
+#ifndef GL_ARB_window_pos
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_COLOR_SUM_ARB                  0x8458
+#define GL_VERTEX_PROGRAM_ARB             0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
+#define GL_PROGRAM_LENGTH_ARB             0x8627
+#define GL_PROGRAM_STRING_ARB             0x8628
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_CURRENT_MATRIX_ARB             0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
+#define GL_PROGRAM_BINDING_ARB            0x8677
+#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
+#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
+#define GL_PROGRAM_FORMAT_ARB             0x8876
+#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
+#define GL_MATRIX0_ARB                    0x88C0
+#define GL_MATRIX1_ARB                    0x88C1
+#define GL_MATRIX2_ARB                    0x88C2
+#define GL_MATRIX3_ARB                    0x88C3
+#define GL_MATRIX4_ARB                    0x88C4
+#define GL_MATRIX5_ARB                    0x88C5
+#define GL_MATRIX6_ARB                    0x88C6
+#define GL_MATRIX7_ARB                    0x88C7
+#define GL_MATRIX8_ARB                    0x88C8
+#define GL_MATRIX9_ARB                    0x88C9
+#define GL_MATRIX10_ARB                   0x88CA
+#define GL_MATRIX11_ARB                   0x88CB
+#define GL_MATRIX12_ARB                   0x88CC
+#define GL_MATRIX13_ARB                   0x88CD
+#define GL_MATRIX14_ARB                   0x88CE
+#define GL_MATRIX15_ARB                   0x88CF
+#define GL_MATRIX16_ARB                   0x88D0
+#define GL_MATRIX17_ARB                   0x88D1
+#define GL_MATRIX18_ARB                   0x88D2
+#define GL_MATRIX19_ARB                   0x88D3
+#define GL_MATRIX20_ARB                   0x88D4
+#define GL_MATRIX21_ARB                   0x88D5
+#define GL_MATRIX22_ARB                   0x88D6
+#define GL_MATRIX23_ARB                   0x88D7
+#define GL_MATRIX24_ARB                   0x88D8
+#define GL_MATRIX25_ARB                   0x88D9
+#define GL_MATRIX26_ARB                   0x88DA
+#define GL_MATRIX27_ARB                   0x88DB
+#define GL_MATRIX28_ARB                   0x88DC
+#define GL_MATRIX29_ARB                   0x88DD
+#define GL_MATRIX30_ARB                   0x88DE
+#define GL_MATRIX31_ARB                   0x88DF
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_FRAGMENT_PROGRAM_ARB           0x8804
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_QUERY_COUNTER_BITS_ARB         0x8864
+#define GL_CURRENT_QUERY_ARB              0x8865
+#define GL_QUERY_RESULT_ARB               0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
+#define GL_SAMPLES_PASSED_ARB             0x8914
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_PROGRAM_OBJECT_ARB             0x8B40
+#define GL_SHADER_OBJECT_ARB              0x8B48
+#define GL_OBJECT_TYPE_ARB                0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
+#define GL_FLOAT_VEC2_ARB                 0x8B50
+#define GL_FLOAT_VEC3_ARB                 0x8B51
+#define GL_FLOAT_VEC4_ARB                 0x8B52
+#define GL_INT_VEC2_ARB                   0x8B53
+#define GL_INT_VEC3_ARB                   0x8B54
+#define GL_INT_VEC4_ARB                   0x8B55
+#define GL_BOOL_ARB                       0x8B56
+#define GL_BOOL_VEC2_ARB                  0x8B57
+#define GL_BOOL_VEC3_ARB                  0x8B58
+#define GL_BOOL_VEC4_ARB                  0x8B59
+#define GL_FLOAT_MAT2_ARB                 0x8B5A
+#define GL_FLOAT_MAT3_ARB                 0x8B5B
+#define GL_FLOAT_MAT4_ARB                 0x8B5C
+#define GL_SAMPLER_1D_ARB                 0x8B5D
+#define GL_SAMPLER_2D_ARB                 0x8B5E
+#define GL_SAMPLER_3D_ARB                 0x8B5F
+#define GL_SAMPLER_CUBE_ARB               0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
+#define GL_SAMPLER_2D_RECT_ARB            0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_VERTEX_SHADER_ARB              0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_FRAGMENT_SHADER_ARB            0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif
+
+#ifndef GL_ARB_fragment_program_shadow
+#endif
+
+#ifndef GL_ARB_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
+#define GL_DRAW_BUFFER0_ARB               0x8825
+#define GL_DRAW_BUFFER1_ARB               0x8826
+#define GL_DRAW_BUFFER2_ARB               0x8827
+#define GL_DRAW_BUFFER3_ARB               0x8828
+#define GL_DRAW_BUFFER4_ARB               0x8829
+#define GL_DRAW_BUFFER5_ARB               0x882A
+#define GL_DRAW_BUFFER6_ARB               0x882B
+#define GL_DRAW_BUFFER7_ARB               0x882C
+#define GL_DRAW_BUFFER8_ARB               0x882D
+#define GL_DRAW_BUFFER9_ARB               0x882E
+#define GL_DRAW_BUFFER10_ARB              0x882F
+#define GL_DRAW_BUFFER11_ARB              0x8830
+#define GL_DRAW_BUFFER12_ARB              0x8831
+#define GL_DRAW_BUFFER13_ARB              0x8832
+#define GL_DRAW_BUFFER14_ARB              0x8833
+#define GL_DRAW_BUFFER15_ARB              0x8834
+#endif
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_RGBA_FLOAT_MODE_ARB            0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
+#define GL_CLAMP_READ_COLOR_ARB           0x891C
+#define GL_FIXED_ONLY_ARB                 0x891D
+#endif
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif
+
+#ifndef GL_ARB_texture_float
+#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
+#define GL_RGBA32F_ARB                    0x8814
+#define GL_RGB32F_ARB                     0x8815
+#define GL_ALPHA32F_ARB                   0x8816
+#define GL_INTENSITY32F_ARB               0x8817
+#define GL_LUMINANCE32F_ARB               0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
+#define GL_RGBA16F_ARB                    0x881A
+#define GL_RGB16F_ARB                     0x881B
+#define GL_ALPHA16F_ARB                   0x881C
+#define GL_INTENSITY16F_ARB               0x881D
+#define GL_LUMINANCE16F_ARB               0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
+#endif
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+#endif
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#define GL_DEPTH32F_STENCIL8              0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#endif
+
+#ifndef GL_ARB_draw_instanced
+#endif
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
+#define GL_FRAMEBUFFER_DEFAULT            0x8218
+#define GL_FRAMEBUFFER_UNDEFINED          0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#define GL_INDEX                          0x8222
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+#define GL_DEPTH_STENCIL                  0x84F9
+#define GL_UNSIGNED_INT_24_8              0x84FA
+#define GL_DEPTH24_STENCIL8               0x88F0
+#define GL_TEXTURE_STENCIL_SIZE           0x88F1
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING       GL_FRAMEBUFFER_BINDING
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_READ_FRAMEBUFFER               0x8CA8
+#define GL_DRAW_FRAMEBUFFER               0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
+#define GL_RENDERBUFFER_SAMPLES           0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_COLOR_ATTACHMENT1              0x8CE1
+#define GL_COLOR_ATTACHMENT2              0x8CE2
+#define GL_COLOR_ATTACHMENT3              0x8CE3
+#define GL_COLOR_ATTACHMENT4              0x8CE4
+#define GL_COLOR_ATTACHMENT5              0x8CE5
+#define GL_COLOR_ATTACHMENT6              0x8CE6
+#define GL_COLOR_ATTACHMENT7              0x8CE7
+#define GL_COLOR_ATTACHMENT8              0x8CE8
+#define GL_COLOR_ATTACHMENT9              0x8CE9
+#define GL_COLOR_ATTACHMENT10             0x8CEA
+#define GL_COLOR_ATTACHMENT11             0x8CEB
+#define GL_COLOR_ATTACHMENT12             0x8CEC
+#define GL_COLOR_ATTACHMENT13             0x8CED
+#define GL_COLOR_ATTACHMENT14             0x8CEE
+#define GL_COLOR_ATTACHMENT15             0x8CEF
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_STENCIL_INDEX1                 0x8D46
+#define GL_STENCIL_INDEX4                 0x8D47
+#define GL_STENCIL_INDEX8                 0x8D48
+#define GL_STENCIL_INDEX16                0x8D49
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+#define GL_MAX_SAMPLES                    0x8D57
+#endif
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB               0x8DB9
+#endif
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_LINES_ADJACENCY_ARB            0x000A
+#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
+#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
+#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
+#define GL_GEOMETRY_SHADER_ARB            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
+/* reuse GL_MAX_VARYING_COMPONENTS */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+#endif
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_HALF_FLOAT                     0x140B
+#endif
+
+#ifndef GL_ARB_instanced_arrays
+#endif
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_MAP_READ_BIT                   0x0001
+#define GL_MAP_WRITE_BIT                  0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
+#endif
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_TEXTURE_BUFFER_ARB             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_ARB     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_ARB      0x8C2E
+#endif
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1           0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
+#define GL_COMPRESSED_RG_RGTC2            0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
+#endif
+
+#ifndef GL_ARB_texture_rg
+#define GL_RG                             0x8227
+#define GL_RG_INTEGER                     0x8228
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
+#define GL_RG8                            0x822B
+#define GL_RG16                           0x822C
+#define GL_R16F                           0x822D
+#define GL_R32F                           0x822E
+#define GL_RG16F                          0x822F
+#define GL_RG32F                          0x8230
+#define GL_R8I                            0x8231
+#define GL_R8UI                           0x8232
+#define GL_R16I                           0x8233
+#define GL_R16UI                          0x8234
+#define GL_R32I                           0x8235
+#define GL_R32UI                          0x8236
+#define GL_RG8I                           0x8237
+#define GL_RG8UI                          0x8238
+#define GL_RG16I                          0x8239
+#define GL_RG16UI                         0x823A
+#define GL_RG32I                          0x823B
+#define GL_RG32UI                         0x823C
+#endif
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING           0x85B5
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_ABGR_EXT                       0x8000
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+#endif
+
+#ifndef GL_EXT_texture
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif
+
+#ifndef GL_EXT_texture3D
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+#endif
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+#endif
+
+#ifndef GL_EXT_subtexture
+#endif
+
+#ifndef GL_EXT_copy_texture
+#endif
+
+#ifndef GL_EXT_histogram
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+#endif
+
+#ifndef GL_EXT_convolution
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+#endif
+
+#ifndef GL_SGI_color_matrix
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif
+
+#ifndef GL_SGI_color_table
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+#endif
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+#endif
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+#endif
+
+#ifndef GL_SGIS_texture4D
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+#endif
+
+#ifndef GL_SGI_texture_color_table
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif
+
+#ifndef GL_EXT_cmyka
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif
+
+#ifndef GL_EXT_texture_object
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+#endif
+
+#ifndef GL_SGIS_detail_texture
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+#endif
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+#endif
+
+#ifndef GL_EXT_packed_pixels
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif
+
+#ifndef GL_SGIS_texture_lod
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_BLEND_EQUATION_EXT             0x8009
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_INTERLACE_SGIX                 0x8094
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif
+
+#ifndef GL_SGIS_texture_select
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif
+
+#ifndef GL_EXT_point_parameters
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#endif
+
+#ifndef GL_FfdMaskSGIX
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
+#endif
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
+#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
+#define GL_DEFORMATIONS_MASK_SGIX         0x8196
+#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif
+
+#ifndef GL_INGR_palette_buffer
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif
+
+#ifndef GL_EXT_color_subtable
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_LIST_PRIORITY_SGIX             0x8182
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif
+
+#ifndef GL_EXT_index_texture
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+/* reuse GL_FRAGMENT_DEPTH_EXT */
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif
+
+#ifndef GL_SGIX_impact_pixel_texture
+#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
+#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
+#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
+#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
+#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
+#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
+#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif
+
+#ifndef GL_SGIX_async
+#define GL_ASYNC_MARKER_SGIX              0x8329
+#endif
+
+#ifndef GL_SGIX_async_pixel
+#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
+#endif
+
+#ifndef GL_SGIX_async_histogram
+#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
+#endif
+
+#ifndef GL_INTEL_texture_scissor
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_FOG_SCALE_SGIX                 0x81FC
+#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_RESTART_SUN                    0x0001
+#define GL_REPLACE_MIDDLE_SUN             0x0002
+#define GL_REPLACE_OLDEST_SUN             0x0003
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+#endif
+
+#ifndef GL_SUN_vertex
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
+#define GL_MODELVIEW1_MATRIX_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+/* reuse GL_TEXTURE0_ARB */
+/* reuse GL_TEXTURE1_ARB */
+/* reuse GL_ZERO */
+/* reuse GL_NONE */
+/* reuse GL_FOG */
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+/* reuse GL_EYE_PLANE */
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif
+
+#ifndef GL_NV_blend_square
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#endif
+
+#ifndef GL_MESA_window_pos
+#endif
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_CULL_VERTEX_IBM                103050
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif
+
+#ifndef GL_SGI_depth_pass_instrument
+#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
+#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
+#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_MULTISAMPLE_BIT_EXT            0x20000000
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif
+
+#ifndef GL_SGIX_resample
+#define GL_PACK_RESAMPLE_SGIX             0x842C
+#define GL_UNPACK_RESAMPLE_SGIX           0x842D
+#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
+#endif
+
+#ifndef GL_NV_fence
+#define GL_ALL_COMPLETED_NV               0x84F2
+#define GL_FENCE_STATUS_NV                0x84F3
+#define GL_FENCE_CONDITION_NV             0x84F4
+#endif
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_IBM            0x8370
+#endif
+
+#ifndef GL_NV_evaluators
+#define GL_EVAL_2D_NV                     0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
+#define GL_MAP_TESSELLATION_NV            0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
+#endif
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_DEPTH_STENCIL_NV               0x84F9
+#define GL_UNSIGNED_INT_24_8_NV           0x84FA
+#endif
+
+#ifndef GL_NV_register_combiners2
+#define GL_PER_STAGE_CONSTANTS_NV         0x8535
+#endif
+
+#ifndef GL_NV_texture_compression_vtc
+#endif
+
+#ifndef GL_NV_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_NV           0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
+#endif
+
+#ifndef GL_NV_texture_shader
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
+#define GL_SHADER_CONSISTENT_NV           0x86DD
+#define GL_TEXTURE_SHADER_NV              0x86DE
+#define GL_SHADER_OPERATION_NV            0x86DF
+#define GL_CULL_MODES_NV                  0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
+#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
+#define GL_CONST_EYE_NV                   0x86E5
+#define GL_PASS_THROUGH_NV                0x86E6
+#define GL_CULL_FRAGMENT_NV               0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
+#define GL_DOT_PRODUCT_NV                 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV                        0x86F4
+#define GL_DSDT_NV                        0x86F5
+#define GL_DSDT_MAG_NV                    0x86F6
+#define GL_DSDT_MAG_VIB_NV                0x86F7
+#define GL_HILO16_NV                      0x86F8
+#define GL_SIGNED_HILO_NV                 0x86F9
+#define GL_SIGNED_HILO16_NV               0x86FA
+#define GL_SIGNED_RGBA_NV                 0x86FB
+#define GL_SIGNED_RGBA8_NV                0x86FC
+#define GL_SIGNED_RGB_NV                  0x86FE
+#define GL_SIGNED_RGB8_NV                 0x86FF
+#define GL_SIGNED_LUMINANCE_NV            0x8701
+#define GL_SIGNED_LUMINANCE8_NV           0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
+#define GL_SIGNED_ALPHA_NV                0x8705
+#define GL_SIGNED_ALPHA8_NV               0x8706
+#define GL_SIGNED_INTENSITY_NV            0x8707
+#define GL_SIGNED_INTENSITY8_NV           0x8708
+#define GL_DSDT8_NV                       0x8709
+#define GL_DSDT8_MAG8_NV                  0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV                    0x870E
+#define GL_LO_SCALE_NV                    0x870F
+#define GL_DS_SCALE_NV                    0x8710
+#define GL_DT_SCALE_NV                    0x8711
+#define GL_MAGNITUDE_SCALE_NV             0x8712
+#define GL_VIBRANCE_SCALE_NV              0x8713
+#define GL_HI_BIAS_NV                     0x8714
+#define GL_LO_BIAS_NV                     0x8715
+#define GL_DS_BIAS_NV                     0x8716
+#define GL_DT_BIAS_NV                     0x8717
+#define GL_MAGNITUDE_BIAS_NV              0x8718
+#define GL_VIBRANCE_BIAS_NV               0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
+#define GL_TEXTURE_HI_SIZE_NV             0x871B
+#define GL_TEXTURE_LO_SIZE_NV             0x871C
+#define GL_TEXTURE_DS_SIZE_NV             0x871D
+#define GL_TEXTURE_DT_SIZE_NV             0x871E
+#define GL_TEXTURE_MAG_SIZE_NV            0x871F
+#endif
+
+#ifndef GL_NV_texture_shader2
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
+#endif
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+#endif
+
+#ifndef GL_NV_vertex_program
+#define GL_VERTEX_PROGRAM_NV              0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
+#define GL_CURRENT_ATTRIB_NV              0x8626
+#define GL_PROGRAM_LENGTH_NV              0x8627
+#define GL_PROGRAM_STRING_NV              0x8628
+#define GL_MODELVIEW_PROJECTION_NV        0x8629
+#define GL_IDENTITY_NV                    0x862A
+#define GL_INVERSE_NV                     0x862B
+#define GL_TRANSPOSE_NV                   0x862C
+#define GL_INVERSE_TRANSPOSE_NV           0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV          0x862F
+#define GL_MATRIX0_NV                     0x8630
+#define GL_MATRIX1_NV                     0x8631
+#define GL_MATRIX2_NV                     0x8632
+#define GL_MATRIX3_NV                     0x8633
+#define GL_MATRIX4_NV                     0x8634
+#define GL_MATRIX5_NV                     0x8635
+#define GL_MATRIX6_NV                     0x8636
+#define GL_MATRIX7_NV                     0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
+#define GL_CURRENT_MATRIX_NV              0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
+#define GL_PROGRAM_PARAMETER_NV           0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
+#define GL_PROGRAM_TARGET_NV              0x8646
+#define GL_PROGRAM_RESIDENT_NV            0x8647
+#define GL_TRACK_MATRIX_NV                0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+#endif
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
+#endif
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SCALEBIAS_HINT_SGIX            0x8322
+#endif
+
+#ifndef GL_OML_interlace
+#define GL_INTERLACE_OML                  0x8980
+#define GL_INTERLACE_READ_OML             0x8981
+#endif
+
+#ifndef GL_OML_subsample
+#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
+#endif
+
+#ifndef GL_OML_resample
+#define GL_PACK_RESAMPLE_OML              0x8984
+#define GL_UNPACK_RESAMPLE_OML            0x8985
+#define GL_RESAMPLE_REPLICATE_OML         0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
+#define GL_RESAMPLE_AVERAGE_OML           0x8988
+#define GL_RESAMPLE_DECIMATE_OML          0x8989
+#endif
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
+#endif
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_BUMP_ROT_MATRIX_ATI            0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
+#define GL_BUMP_TEX_UNITS_ATI             0x8778
+#define GL_DUDV_ATI                       0x8779
+#define GL_DU8DV8_ATI                     0x877A
+#define GL_BUMP_ENVMAP_ATI                0x877B
+#define GL_BUMP_TARGET_ATI                0x877C
+#endif
+
+#ifndef GL_ATI_fragment_shader
+#define GL_FRAGMENT_SHADER_ATI            0x8920
+#define GL_REG_0_ATI                      0x8921
+#define GL_REG_1_ATI                      0x8922
+#define GL_REG_2_ATI                      0x8923
+#define GL_REG_3_ATI                      0x8924
+#define GL_REG_4_ATI                      0x8925
+#define GL_REG_5_ATI                      0x8926
+#define GL_REG_6_ATI                      0x8927
+#define GL_REG_7_ATI                      0x8928
+#define GL_REG_8_ATI                      0x8929
+#define GL_REG_9_ATI                      0x892A
+#define GL_REG_10_ATI                     0x892B
+#define GL_REG_11_ATI                     0x892C
+#define GL_REG_12_ATI                     0x892D
+#define GL_REG_13_ATI                     0x892E
+#define GL_REG_14_ATI                     0x892F
+#define GL_REG_15_ATI                     0x8930
+#define GL_REG_16_ATI                     0x8931
+#define GL_REG_17_ATI                     0x8932
+#define GL_REG_18_ATI                     0x8933
+#define GL_REG_19_ATI                     0x8934
+#define GL_REG_20_ATI                     0x8935
+#define GL_REG_21_ATI                     0x8936
+#define GL_REG_22_ATI                     0x8937
+#define GL_REG_23_ATI                     0x8938
+#define GL_REG_24_ATI                     0x8939
+#define GL_REG_25_ATI                     0x893A
+#define GL_REG_26_ATI                     0x893B
+#define GL_REG_27_ATI                     0x893C
+#define GL_REG_28_ATI                     0x893D
+#define GL_REG_29_ATI                     0x893E
+#define GL_REG_30_ATI                     0x893F
+#define GL_REG_31_ATI                     0x8940
+#define GL_CON_0_ATI                      0x8941
+#define GL_CON_1_ATI                      0x8942
+#define GL_CON_2_ATI                      0x8943
+#define GL_CON_3_ATI                      0x8944
+#define GL_CON_4_ATI                      0x8945
+#define GL_CON_5_ATI                      0x8946
+#define GL_CON_6_ATI                      0x8947
+#define GL_CON_7_ATI                      0x8948
+#define GL_CON_8_ATI                      0x8949
+#define GL_CON_9_ATI                      0x894A
+#define GL_CON_10_ATI                     0x894B
+#define GL_CON_11_ATI                     0x894C
+#define GL_CON_12_ATI                     0x894D
+#define GL_CON_13_ATI                     0x894E
+#define GL_CON_14_ATI                     0x894F
+#define GL_CON_15_ATI                     0x8950
+#define GL_CON_16_ATI                     0x8951
+#define GL_CON_17_ATI                     0x8952
+#define GL_CON_18_ATI                     0x8953
+#define GL_CON_19_ATI                     0x8954
+#define GL_CON_20_ATI                     0x8955
+#define GL_CON_21_ATI                     0x8956
+#define GL_CON_22_ATI                     0x8957
+#define GL_CON_23_ATI                     0x8958
+#define GL_CON_24_ATI                     0x8959
+#define GL_CON_25_ATI                     0x895A
+#define GL_CON_26_ATI                     0x895B
+#define GL_CON_27_ATI                     0x895C
+#define GL_CON_28_ATI                     0x895D
+#define GL_CON_29_ATI                     0x895E
+#define GL_CON_30_ATI                     0x895F
+#define GL_CON_31_ATI                     0x8960
+#define GL_MOV_ATI                        0x8961
+#define GL_ADD_ATI                        0x8963
+#define GL_MUL_ATI                        0x8964
+#define GL_SUB_ATI                        0x8965
+#define GL_DOT3_ATI                       0x8966
+#define GL_DOT4_ATI                       0x8967
+#define GL_MAD_ATI                        0x8968
+#define GL_LERP_ATI                       0x8969
+#define GL_CND_ATI                        0x896A
+#define GL_CND0_ATI                       0x896B
+#define GL_DOT2_ADD_ATI                   0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
+#define GL_NUM_PASSES_ATI                 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
+#define GL_SWIZZLE_STR_ATI                0x8976
+#define GL_SWIZZLE_STQ_ATI                0x8977
+#define GL_SWIZZLE_STR_DR_ATI             0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
+#define GL_SWIZZLE_STRQ_ATI               0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
+#define GL_RED_BIT_ATI                    0x00000001
+#define GL_GREEN_BIT_ATI                  0x00000002
+#define GL_BLUE_BIT_ATI                   0x00000004
+#define GL_2X_BIT_ATI                     0x00000001
+#define GL_4X_BIT_ATI                     0x00000002
+#define GL_8X_BIT_ATI                     0x00000004
+#define GL_HALF_BIT_ATI                   0x00000008
+#define GL_QUARTER_BIT_ATI                0x00000010
+#define GL_EIGHTH_BIT_ATI                 0x00000020
+#define GL_SATURATE_BIT_ATI               0x00000040
+#define GL_COMP_BIT_ATI                   0x00000002
+#define GL_NEGATE_BIT_ATI                 0x00000004
+#define GL_BIAS_BIT_ATI                   0x00000008
+#endif
+
+#ifndef GL_ATI_pn_triangles
+#define GL_PN_TRIANGLES_ATI               0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+#endif
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_STATIC_ATI                     0x8760
+#define GL_DYNAMIC_ATI                    0x8761
+#define GL_PRESERVE_ATI                   0x8762
+#define GL_DISCARD_ATI                    0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
+#endif
+
+#ifndef GL_EXT_vertex_shader
+#define GL_VERTEX_SHADER_EXT              0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
+#define GL_OP_INDEX_EXT                   0x8782
+#define GL_OP_NEGATE_EXT                  0x8783
+#define GL_OP_DOT3_EXT                    0x8784
+#define GL_OP_DOT4_EXT                    0x8785
+#define GL_OP_MUL_EXT                     0x8786
+#define GL_OP_ADD_EXT                     0x8787
+#define GL_OP_MADD_EXT                    0x8788
+#define GL_OP_FRAC_EXT                    0x8789
+#define GL_OP_MAX_EXT                     0x878A
+#define GL_OP_MIN_EXT                     0x878B
+#define GL_OP_SET_GE_EXT                  0x878C
+#define GL_OP_SET_LT_EXT                  0x878D
+#define GL_OP_CLAMP_EXT                   0x878E
+#define GL_OP_FLOOR_EXT                   0x878F
+#define GL_OP_ROUND_EXT                   0x8790
+#define GL_OP_EXP_BASE_2_EXT              0x8791
+#define GL_OP_LOG_BASE_2_EXT              0x8792
+#define GL_OP_POWER_EXT                   0x8793
+#define GL_OP_RECIP_EXT                   0x8794
+#define GL_OP_RECIP_SQRT_EXT              0x8795
+#define GL_OP_SUB_EXT                     0x8796
+#define GL_OP_CROSS_PRODUCT_EXT           0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
+#define GL_OP_MOV_EXT                     0x8799
+#define GL_OUTPUT_VERTEX_EXT              0x879A
+#define GL_OUTPUT_COLOR0_EXT              0x879B
+#define GL_OUTPUT_COLOR1_EXT              0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
+#define GL_OUTPUT_FOG_EXT                 0x87BD
+#define GL_SCALAR_EXT                     0x87BE
+#define GL_VECTOR_EXT                     0x87BF
+#define GL_MATRIX_EXT                     0x87C0
+#define GL_VARIANT_EXT                    0x87C1
+#define GL_INVARIANT_EXT                  0x87C2
+#define GL_LOCAL_CONSTANT_EXT             0x87C3
+#define GL_LOCAL_EXT                      0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
+#define GL_X_EXT                          0x87D5
+#define GL_Y_EXT                          0x87D6
+#define GL_Z_EXT                          0x87D7
+#define GL_W_EXT                          0x87D8
+#define GL_NEGATIVE_X_EXT                 0x87D9
+#define GL_NEGATIVE_Y_EXT                 0x87DA
+#define GL_NEGATIVE_Z_EXT                 0x87DB
+#define GL_NEGATIVE_W_EXT                 0x87DC
+#define GL_ZERO_EXT                       0x87DD
+#define GL_ONE_EXT                        0x87DE
+#define GL_NEGATIVE_ONE_EXT               0x87DF
+#define GL_NORMALIZED_RANGE_EXT           0x87E0
+#define GL_FULL_RANGE_EXT                 0x87E1
+#define GL_CURRENT_VERTEX_EXT             0x87E2
+#define GL_MVP_MATRIX_EXT                 0x87E3
+#define GL_VARIANT_VALUE_EXT              0x87E4
+#define GL_VARIANT_DATATYPE_EXT           0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
+#define GL_VARIANT_ARRAY_EXT              0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
+#define GL_INVARIANT_VALUE_EXT            0x87EA
+#define GL_INVARIANT_DATATYPE_EXT         0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
+#endif
+
+#ifndef GL_ATI_vertex_streams
+#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
+#define GL_VERTEX_STREAM0_ATI             0x876C
+#define GL_VERTEX_STREAM1_ATI             0x876D
+#define GL_VERTEX_STREAM2_ATI             0x876E
+#define GL_VERTEX_STREAM3_ATI             0x876F
+#define GL_VERTEX_STREAM4_ATI             0x8770
+#define GL_VERTEX_STREAM5_ATI             0x8771
+#define GL_VERTEX_STREAM6_ATI             0x8772
+#define GL_VERTEX_STREAM7_ATI             0x8773
+#define GL_VERTEX_SOURCE_ATI              0x8774
+#endif
+
+#ifndef GL_ATI_element_array
+#define GL_ELEMENT_ARRAY_ATI              0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
+#endif
+
+#ifndef GL_SUN_mesh_array
+#define GL_QUAD_MESH_SUN                  0x8614
+#define GL_TRIANGLE_MESH_SUN              0x8615
+#endif
+
+#ifndef GL_SUN_slice_accum
+#define GL_SLICE_ACCUM_SUN                0x85CC
+#endif
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
+#endif
+
+#ifndef GL_NV_depth_clamp
+#define GL_DEPTH_CLAMP_NV                 0x864F
+#endif
+
+#ifndef GL_NV_occlusion_query
+#define GL_PIXEL_COUNTER_BITS_NV          0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
+#define GL_PIXEL_COUNT_NV                 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+#endif
+
+#ifndef GL_NV_texture_shader3
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV                       0x885E
+#define GL_SIGNED_HILO8_NV                0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
+#endif
+
+#ifndef GL_NV_vertex_program1_1
+#endif
+
+#ifndef GL_EXT_shadow_funcs
+#endif
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+#endif
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
+#endif
+
+#ifndef GL_APPLE_client_storage
+#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
+#endif
+
+#ifndef GL_APPLE_element_array
+#define GL_ELEMENT_ARRAY_APPLE            0x8768
+#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
+#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
+#endif
+
+#ifndef GL_APPLE_fence
+#define GL_DRAW_PIXELS_APPLE              0x8A0A
+#define GL_FENCE_APPLE                    0x8A0B
+#endif
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
+#endif
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CACHED_APPLE           0x85BE
+#define GL_STORAGE_SHARED_APPLE           0x85BF
+#endif
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_YCBCR_422_APPLE                0x85B9
+#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
+#endif
+
+#ifndef GL_S3_s3tc
+#define GL_RGB_S3TC                       0x83A0
+#define GL_RGB4_S3TC                      0x83A1
+#define GL_RGBA_S3TC                      0x83A2
+#define GL_RGBA4_S3TC                     0x83A3
+#endif
+
+#ifndef GL_ATI_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
+#define GL_DRAW_BUFFER0_ATI               0x8825
+#define GL_DRAW_BUFFER1_ATI               0x8826
+#define GL_DRAW_BUFFER2_ATI               0x8827
+#define GL_DRAW_BUFFER3_ATI               0x8828
+#define GL_DRAW_BUFFER4_ATI               0x8829
+#define GL_DRAW_BUFFER5_ATI               0x882A
+#define GL_DRAW_BUFFER6_ATI               0x882B
+#define GL_DRAW_BUFFER7_ATI               0x882C
+#define GL_DRAW_BUFFER8_ATI               0x882D
+#define GL_DRAW_BUFFER9_ATI               0x882E
+#define GL_DRAW_BUFFER10_ATI              0x882F
+#define GL_DRAW_BUFFER11_ATI              0x8830
+#define GL_DRAW_BUFFER12_ATI              0x8831
+#define GL_DRAW_BUFFER13_ATI              0x8832
+#define GL_DRAW_BUFFER14_ATI              0x8833
+#define GL_DRAW_BUFFER15_ATI              0x8834
+#endif
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+#endif
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif
+
+#ifndef GL_NV_fragment_program
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV            0x8870
+#define GL_MAX_TEXTURE_COORDS_NV          0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
+#define GL_PROGRAM_ERROR_STRING_NV        0x8874
+#endif
+
+#ifndef GL_NV_half_float
+#define GL_HALF_FLOAT_NV                  0x140B
+#endif
+
+#ifndef GL_NV_pixel_data_range
+#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+#endif
+
+#ifndef GL_NV_primitive_restart
+#define GL_PRIMITIVE_RESTART_NV           0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
+#endif
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+#endif
+
+#ifndef GL_NV_vertex_program2
+#endif
+
+#ifndef GL_ATI_map_object_buffer
+#endif
+
+#ifndef GL_ATI_separate_stencil
+#define GL_STENCIL_BACK_FUNC_ATI          0x8800
+#define GL_STENCIL_BACK_FAIL_ATI          0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+#endif
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#endif
+
+#ifndef GL_OES_read_format
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
+#endif
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
+#define GL_DEPTH_BOUNDS_EXT               0x8891
+#endif
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_MIRROR_CLAMP_EXT               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
+#endif
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
+#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
+#endif
+
+#ifndef GL_MESA_pack_invert
+#define GL_PACK_INVERT_MESA               0x8758
+#endif
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
+#define GL_YCBCR_MESA                     0x8757
+#endif
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+#endif
+
+#ifndef GL_NV_fragment_program_option
+#endif
+
+#ifndef GL_NV_fragment_program2
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
+#endif
+
+#ifndef GL_NV_vertex_program2_option
+/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
+#endif
+
+#ifndef GL_NV_vertex_program3
+/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+#endif
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
+#define GL_FRAMEBUFFER_EXT                0x8D40
+#define GL_RENDERBUFFER_EXT               0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT             0x8D46
+#define GL_STENCIL_INDEX4_EXT             0x8D47
+#define GL_STENCIL_INDEX8_EXT             0x8D48
+#define GL_STENCIL_INDEX16_EXT            0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
+#endif
+
+#ifndef GL_GREMEDY_string_marker
+#endif
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_DEPTH_STENCIL_EXT              0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
+#define GL_DEPTH24_STENCIL8_EXT           0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
+#endif
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_STENCIL_TAG_BITS_EXT           0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
+#endif
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_SRGB_EXT                       0x8C40
+#define GL_SRGB8_EXT                      0x8C41
+#define GL_SRGB_ALPHA_EXT                 0x8C42
+#define GL_SRGB8_ALPHA8_EXT               0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
+#define GL_SLUMINANCE_EXT                 0x8C46
+#define GL_SLUMINANCE8_EXT                0x8C47
+#define GL_COMPRESSED_SRGB_EXT            0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
+#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
+#endif
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT                0x8D57
+#endif
+
+#ifndef GL_MESAX_texture_stack
+#define GL_TEXTURE_1D_STACK_MESAX         0x8759
+#define GL_TEXTURE_2D_STACK_MESAX         0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+#endif
+
+#ifndef GL_EXT_timer_query
+#define GL_TIME_ELAPSED_EXT               0x88BF
+#endif
+
+#ifndef GL_EXT_gpu_program_parameters
+#endif
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
+#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
+#endif
+
+#ifndef GL_NV_gpu_program4
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
+#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
+#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
+#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
+#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
+#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
+#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
+#endif
+
+#ifndef GL_NV_geometry_program4
+#define GL_LINES_ADJACENCY_EXT            0x000A
+#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
+#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
+#define GL_GEOMETRY_PROGRAM_NV            0x8C26
+#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
+#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
+#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
+#endif
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_GEOMETRY_SHADER_EXT            0x8DD9
+/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
+/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
+/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
+/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
+#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+/* reuse GL_LINES_ADJACENCY_EXT */
+/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
+/* reuse GL_TRIANGLES_ADJACENCY_EXT */
+/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+/* reuse GL_PROGRAM_POINT_SIZE_EXT */
+#endif
+
+#ifndef GL_NV_vertex_program4
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
+#endif
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
+#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
+#define GL_SAMPLER_BUFFER_EXT             0x8DC2
+#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
+#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
+#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
+#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
+#define GL_INT_SAMPLER_1D_EXT             0x8DC9
+#define GL_INT_SAMPLER_2D_EXT             0x8DCA
+#define GL_INT_SAMPLER_3D_EXT             0x8DCB
+#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
+#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
+#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
+#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
+#endif
+
+#ifndef GL_EXT_draw_instanced
+#endif
+
+#ifndef GL_EXT_packed_float
+#define GL_R11F_G11F_B10F_EXT             0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
+#endif
+
+#ifndef GL_EXT_texture_array
+#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
+#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+#endif
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_TEXTURE_BUFFER_EXT             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
+#endif
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
+#endif
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+#endif
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_RGB9_E5_EXT                    0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
+#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
+#endif
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
+#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
+#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
+#endif
+
+#ifndef GL_NV_fragment_program4
+#endif
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
+#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
+#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
+#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
+#endif
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
+#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
+#endif
+
+#ifndef GL_NV_geometry_shader4
+#endif
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
+#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
+#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
+#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
+#endif
+
+#ifndef GL_EXT_draw_buffers2
+#endif
+
+#ifndef GL_NV_transform_feedback
+#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
+#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
+#define GL_TEXTURE_COORD_NV               0x8C79
+#define GL_CLIP_DISTANCE_NV               0x8C7A
+#define GL_VERTEX_ID_NV                   0x8C7B
+#define GL_PRIMITIVE_ID_NV                0x8C7C
+#define GL_GENERIC_ATTRIB_NV              0x8C7D
+#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
+#define GL_ACTIVE_VARYINGS_NV             0x8C81
+#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
+#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
+#define GL_PRIMITIVES_GENERATED_NV        0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
+#define GL_RASTERIZER_DISCARD_NV          0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
+#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
+#endif
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
+#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
+#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
+#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
+#define GL_UNIFORM_BUFFER_EXT             0x8DEE
+#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
+#endif
+
+#ifndef GL_EXT_texture_integer
+#define GL_RGBA32UI_EXT                   0x8D70
+#define GL_RGB32UI_EXT                    0x8D71
+#define GL_ALPHA32UI_EXT                  0x8D72
+#define GL_INTENSITY32UI_EXT              0x8D73
+#define GL_LUMINANCE32UI_EXT              0x8D74
+#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
+#define GL_RGBA16UI_EXT                   0x8D76
+#define GL_RGB16UI_EXT                    0x8D77
+#define GL_ALPHA16UI_EXT                  0x8D78
+#define GL_INTENSITY16UI_EXT              0x8D79
+#define GL_LUMINANCE16UI_EXT              0x8D7A
+#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
+#define GL_RGBA8UI_EXT                    0x8D7C
+#define GL_RGB8UI_EXT                     0x8D7D
+#define GL_ALPHA8UI_EXT                   0x8D7E
+#define GL_INTENSITY8UI_EXT               0x8D7F
+#define GL_LUMINANCE8UI_EXT               0x8D80
+#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
+#define GL_RGBA32I_EXT                    0x8D82
+#define GL_RGB32I_EXT                     0x8D83
+#define GL_ALPHA32I_EXT                   0x8D84
+#define GL_INTENSITY32I_EXT               0x8D85
+#define GL_LUMINANCE32I_EXT               0x8D86
+#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
+#define GL_RGBA16I_EXT                    0x8D88
+#define GL_RGB16I_EXT                     0x8D89
+#define GL_ALPHA16I_EXT                   0x8D8A
+#define GL_INTENSITY16I_EXT               0x8D8B
+#define GL_LUMINANCE16I_EXT               0x8D8C
+#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
+#define GL_RGBA8I_EXT                     0x8D8E
+#define GL_RGB8I_EXT                      0x8D8F
+#define GL_ALPHA8I_EXT                    0x8D90
+#define GL_INTENSITY8I_EXT                0x8D91
+#define GL_LUMINANCE8I_EXT                0x8D92
+#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
+#define GL_RED_INTEGER_EXT                0x8D94
+#define GL_GREEN_INTEGER_EXT              0x8D95
+#define GL_BLUE_INTEGER_EXT               0x8D96
+#define GL_ALPHA_INTEGER_EXT              0x8D97
+#define GL_RGB_INTEGER_EXT                0x8D98
+#define GL_RGBA_INTEGER_EXT               0x8D99
+#define GL_BGR_INTEGER_EXT                0x8D9A
+#define GL_BGRA_INTEGER_EXT               0x8D9B
+#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
+#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
+#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
+#endif
+
+#ifndef GL_GREMEDY_frame_terminator
+#endif
+
+#ifndef GL_NV_conditional_render
+#define GL_QUERY_WAIT_NV                  0x8E13
+#define GL_QUERY_NO_WAIT_NV               0x8E14
+#define GL_QUERY_BY_REGION_WAIT_NV        0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT_NV     0x8E16
+#endif
+
+#ifndef GL_NV_present_video
+#define GL_FRAME_NV                       0x8E26
+#define GL_FIELDS_NV                      0x8E27
+#define GL_CURRENT_TIME_NV                0x8E28
+#define GL_NUM_FILL_STREAMS_NV            0x8E29
+#define GL_PRESENT_TIME_NV                0x8E2A
+#define GL_PRESENT_DURATION_NV            0x8E2B
+#endif
+
+#ifndef GL_EXT_transform_feedback
+#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT  0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
+#define GL_INTERLEAVED_ATTRIBS_EXT        0x8C8C
+#define GL_SEPARATE_ATTRIBS_EXT           0x8C8D
+#define GL_PRIMITIVES_GENERATED_EXT       0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
+#define GL_RASTERIZER_DISCARD_EXT         0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
+#endif
+
+#ifndef GL_EXT_direct_state_access
+#define GL_PROGRAM_MATRIX_EXT             0x8E2D
+#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
+#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
+#endif
+
+#ifndef GL_EXT_vertex_array_bgra
+/* reuse GL_BGRA */
+#endif
+
+
+/*************************************************************/
+
+#include <stddef.h>
+#ifndef GL_VERSION_2_0
+/* GL type for program/shader text */
+typedef char GLchar;			/* native character */
+#endif
+
+#ifndef GL_VERSION_1_5
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+
+#ifndef GL_ARB_shader_objects
+/* GL types for handling shader object handles and program/shader text */
+typedef char GLcharARB;		/* native character */
+typedef unsigned int GLhandleARB;	/* shader object handle */
+#endif
+
+/* GL types for "half" precision (s10e5) float data in host memory */
+#ifndef GL_ARB_half_float_pixel
+typedef unsigned short GLhalfARB;
+#endif
+
+#ifndef GL_NV_half_float
+typedef unsigned short GLhalfNV;
+#endif
+
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glxext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GL_EXT_timer_query extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__) || defined(__digital__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__) || defined(_LP64)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS ) || defined(__sgi)
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <inttypes.h>     /* Fallback option */
+#endif
+#endif
+
+#ifndef GL_EXT_timer_query
+typedef int64_t GLint64EXT;
+typedef uint64_t GLuint64EXT;
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
+GLAPI void APIENTRY glBlendEquation (GLenum);
+GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
+GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
+GLAPI void APIENTRY glResetHistogram (GLenum);
+GLAPI void APIENTRY glResetMinmax (GLenum);
+GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum);
+GLAPI void APIENTRY glClientActiveTexture (GLenum);
+GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
+GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
+GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
+GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
+GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
+GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
+GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glFogCoordf (GLfloat);
+GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
+GLAPI void APIENTRY glFogCoordd (GLdouble);
+GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
+GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
+GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
+GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
+GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
+GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
+GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
+GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
+GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
+GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
+GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
+GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
+GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
+GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2iv (const GLint *);
+GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
+GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3iv (const GLint *);
+GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint);
+GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
+GLAPI void APIENTRY glEndQuery (GLenum);
+GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
+GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
+GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
+GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
+GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
+GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
+GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
+GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
+GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
+GLAPI void APIENTRY glCompileShader (GLuint);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum);
+GLAPI void APIENTRY glDeleteProgram (GLuint);
+GLAPI void APIENTRY glDeleteShader (GLuint);
+GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
+GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint);
+GLAPI GLboolean APIENTRY glIsShader (GLuint);
+GLAPI void APIENTRY glLinkProgram (GLuint);
+GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
+GLAPI void APIENTRY glUseProgram (GLuint);
+GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
+GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform1i (GLint, GLint);
+GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glValidateProgram (GLuint);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_VERSION_3_0 1
+/* OpenGL 3.0 also reuses entry points from these extensions: */
+/* ARB_framebuffer_object */
+/* ARB_map_buffer_range */
+/* ARB_vertex_array_object */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaski (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glGetBooleani_v (GLenum, GLuint, GLboolean *);
+GLAPI void APIENTRY glGetIntegeri_v (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glEnablei (GLenum, GLuint);
+GLAPI void APIENTRY glDisablei (GLenum, GLuint);
+GLAPI GLboolean APIENTRY glIsEnabledi (GLenum, GLuint);
+GLAPI void APIENTRY glBeginTransformFeedback (GLenum);
+GLAPI void APIENTRY glEndTransformFeedback (void);
+GLAPI void APIENTRY glBindBufferRange (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
+GLAPI void APIENTRY glBindBufferBase (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint, GLsizei, const GLint *, GLenum);
+GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint, GLuint, GLint *);
+GLAPI void APIENTRY glClampColor (GLenum, GLenum);
+GLAPI void APIENTRY glBeginConditionalRender (GLuint, GLenum);
+GLAPI void APIENTRY glEndConditionalRender (void);
+GLAPI void APIENTRY glVertexAttribI1i (GLuint, GLint);
+GLAPI void APIENTRY glVertexAttribI2i (GLuint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI3i (GLuint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI4i (GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI1ui (GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI2ui (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI3ui (GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI4ui (GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI1iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI2iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI3iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI4iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI1uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI2uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI3uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI4uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI4bv (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttribI4sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttribI4ubv (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttribI4usv (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribIPointer (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetVertexAttribIiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint, GLenum, GLuint *);
+GLAPI void APIENTRY glGetUniformuiv (GLuint, GLint, GLuint *);
+GLAPI void APIENTRY glBindFragDataLocation (GLuint, GLuint, const GLchar *);
+GLAPI GLint APIENTRY glGetFragDataLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glUniform1ui (GLint, GLuint);
+GLAPI void APIENTRY glUniform2ui (GLint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform3ui (GLint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform4ui (GLint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform1uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform2uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform3uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform4uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glTexParameterIiv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTexParameterIuiv (GLenum, GLenum, const GLuint *);
+GLAPI void APIENTRY glGetTexParameterIiv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTexParameterIuiv (GLenum, GLenum, GLuint *);
+GLAPI void APIENTRY glClearBufferiv (GLenum, GLint, const GLint *);
+GLAPI void APIENTRY glClearBufferuiv (GLenum, GLint, const GLuint *);
+GLAPI void APIENTRY glClearBufferfv (GLenum, GLint, const GLfloat *);
+GLAPI void APIENTRY glClearBufferfi (GLenum, GLint, GLfloat, GLint);
+GLAPI const GLubyte * APIENTRY glGetStringi (GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLint *location);
+typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTextureARB (GLenum);
+GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
+GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
+GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
+GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
+GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
+GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
+GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
+GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
+GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
+GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
+GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
+GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
+GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
+GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
+GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexBlendARB (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
+GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
+GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
+GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
+GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+#endif
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
+GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
+GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
+GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
+GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
+GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
+GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
+GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
+GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
+GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
+GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
+GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
+GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
+GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
+GLAPI void APIENTRY glEndQueryARB (GLenum);
+GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
+GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
+GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
+GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
+GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
+GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
+GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
+GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
+GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
+GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
+GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
+GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
+GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
+GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
+GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
+GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
+GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
+GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
+GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
+GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
+GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
+GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#endif
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+#endif
+
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+#endif
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+#endif
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+#endif
+
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+#endif
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+#endif
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_ARB_depth_buffer_float 1
+#endif
+
+#ifndef GL_ARB_draw_instanced
+#define GL_ARB_draw_instanced 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_ARB_framebuffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint);
+GLAPI void APIENTRY glBindRenderbuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenRenderbuffers (GLsizei, GLuint *);
+GLAPI void APIENTRY glRenderbufferStorage (GLenum, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum, GLenum, GLint *);
+GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint);
+GLAPI void APIENTRY glBindFramebuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteFramebuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei, GLuint *);
+GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum);
+GLAPI void APIENTRY glFramebufferTexture1D (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture3D (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGenerateMipmap (GLenum);
+GLAPI void APIENTRY glBlitFramebuffer (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
+GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glFramebufferTextureLayer (GLenum, GLenum, GLuint, GLint, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_ARB_framebuffer_sRGB 1
+#endif
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_ARB_geometry_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriARB (GLuint, GLenum, GLint);
+GLAPI void APIENTRY glFramebufferTextureARB (GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum, GLenum, GLuint, GLint, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_ARB_half_float_vertex 1
+#endif
+
+#ifndef GL_ARB_instanced_arrays
+#define GL_ARB_instanced_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribDivisor (GLuint, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
+#endif
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapBufferRange (GLenum, GLintptr, GLsizeiptr, GLbitfield);
+GLAPI void APIENTRY glFlushMappedBufferRange (GLenum, GLintptr, GLsizeiptr);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_ARB_texture_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferARB (GLenum, GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_ARB_texture_compression_rgtc 1
+#endif
+
+#ifndef GL_ARB_texture_rg
+#define GL_ARB_texture_rg 1
+#endif
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_ARB_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArray (GLuint);
+GLAPI void APIENTRY glDeleteVertexArrays (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenVertexArrays (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsVertexArray (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#endif
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#endif
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
+GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
+GLAPI void APIENTRY glResetHistogramEXT (GLenum);
+GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#endif
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+#endif
+
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+#endif
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#endif
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
+GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
+GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
+GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
+GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#endif
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#endif
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
+GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
+GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+#endif
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
+GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glArrayElementEXT (GLint);
+GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
+GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
+GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
+GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+#endif
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#endif
+
+#ifndef GL_SGIX_texture_select
+#define GL_SGIX_texture_select 1
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
+GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
+GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
+GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#endif
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_SGIS_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_SGIX_instruments 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
+GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
+GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
+GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
+GLAPI void APIENTRY glStartInstrumentsSGIX (void);
+GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameZoomSGIX (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTagSampleBufferSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#endif
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
+GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
+GLAPI void APIENTRY glDeformSGIX (GLbitfield);
+GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushRasterSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#endif
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glHintPGI (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
+GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
+GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
+GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#endif
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
+GLAPI void APIENTRY glUnlockArraysEXT (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
+GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_SGIX_fragment_lighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
+GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
+GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
+GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyTextureEXT (GLenum);
+GLAPI void APIENTRY glTextureLightEXT (GLenum);
+GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+#endif
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
+GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
+GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
+GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
+GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
+GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
+typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
+typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+#endif
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+#endif
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
+GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
+GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
+GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
+GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
+GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
+GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
+GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
+GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
+GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureNormalEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
+GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
+GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
+GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
+GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
+GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
+GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
+GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
+GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_SGIX_fog_scale 1
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFinishTextureSUNX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
+GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
+GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
+GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
+GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
+GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
+GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
+GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
+GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
+GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
+GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
+GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
+GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
+GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
+#endif
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
+#ifndef GL_INGR_blend_func_separate
+#define GL_INGR_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
+GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
+GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
+GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
+GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
+GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
+GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
+GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#endif
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glResizeBuffersMESA (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
+#endif
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
+GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
+GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
+GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
+GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif
+
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
+GLAPI void APIENTRY glSamplePatternEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#endif
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#endif
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
+
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#endif
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
+GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
+GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glFinishFenceNV (GLuint);
+GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#endif
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
+GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
+GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
+typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+#endif
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+#endif
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+#endif
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+#endif
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+#endif
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+#endif
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+#endif
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
+GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
+GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
+GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
+GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
+GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
+GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
+GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#endif
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+#endif
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+#endif
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+#endif
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+#endif
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+#endif
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+#endif
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
+GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+#endif
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
+GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
+GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
+GLAPI void APIENTRY glBeginFragmentShaderATI (void);
+GLAPI void APIENTRY glEndFragmentShaderATI (void);
+GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
+GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
+GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
+#endif
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
+GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+#endif
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
+GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
+GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
+GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
+GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
+typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVertexShaderEXT (void);
+GLAPI void APIENTRY glEndVertexShaderEXT (void);
+GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
+GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
+GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
+GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
+GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
+GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
+GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
+GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
+GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
+GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
+GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
+GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
+GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
+GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
+GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
+typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
+typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
+typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
+typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
+typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
+typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+#endif
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
+GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
+GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
+GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
+GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
+GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
+GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
+GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
+GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+#endif
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
+GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
+GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+#endif
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+#endif
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+#endif
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
+GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
+GLAPI void APIENTRY glEndOcclusionQueryNV (void);
+GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
+GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+#endif
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+#endif
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+#endif
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#endif
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+#endif
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+#endif
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
+GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
+GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
+GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
+GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
+GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
+GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+#endif
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
+GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+#endif
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
+GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
+GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+#endif
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+#endif
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+#endif
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_ATI_pixel_format_float 1
+/* This is really a WGL extension, but defines some associated GL enums.
+ * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
+ */
+#endif
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#endif
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
+GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
+GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
+GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
+typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
+GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+#endif
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveRestartNV (void);
+GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+#endif
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+#endif
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+#endif
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
+GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+#endif
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_OES_read_format
+#define GL_OES_read_format 1
+#endif
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+#endif
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+#endif
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+#endif
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+#endif
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+#endif
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+#endif
+
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+#endif
+
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+#endif
+
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+#endif
+
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+#endif
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
+GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
+GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
+GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
+GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
+GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+#endif
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
+#endif
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+#endif
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilClearTagEXT (GLsizei, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+#endif
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferEXT (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+#endif
+
+#ifndef GL_EXT_timer_query
+#define GL_EXT_timer_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint, GLenum, GLint64EXT *);
+GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint, GLenum, GLuint64EXT *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
+#endif
+
+#ifndef GL_EXT_gpu_program_parameters
+#define GL_EXT_gpu_program_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_APPLE_flush_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum, GLintptr, GLsizeiptr);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif
+
+#ifndef GL_NV_gpu_program4
+#define GL_NV_gpu_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum, GLuint, const GLint *);
+GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum, GLuint, const GLuint *);
+GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum, GLuint, const GLint *);
+GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum, GLuint, const GLuint *);
+GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum, GLuint, GLuint *);
+GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum, GLuint, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+#endif
+
+#ifndef GL_NV_geometry_program4
+#define GL_NV_geometry_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramVertexLimitNV (GLenum, GLint);
+GLAPI void APIENTRY glFramebufferTextureEXT (GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum, GLenum, GLuint, GLint, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_EXT_geometry_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriEXT (GLuint, GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+#endif
+
+#ifndef GL_NV_vertex_program4
+#define GL_NV_vertex_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint, GLint);
+GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_EXT_gpu_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformuivEXT (GLuint, GLint, GLuint *);
+GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint, GLuint, const GLchar *);
+GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint, const GLchar *);
+GLAPI void APIENTRY glUniform1uiEXT (GLint, GLuint);
+GLAPI void APIENTRY glUniform2uiEXT (GLint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform3uiEXT (GLint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform4uiEXT (GLint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform1uivEXT (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform2uivEXT (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform3uivEXT (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform4uivEXT (GLint, GLsizei, const GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+#endif
+
+#ifndef GL_EXT_draw_instanced
+#define GL_EXT_draw_instanced 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+#endif
+
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+#endif
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_EXT_texture_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferEXT (GLenum, GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_EXT_texture_compression_latc 1
+#endif
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+#endif
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_EXT_texture_shared_exponent 1
+#endif
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_NV_depth_buffer_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthRangedNV (GLdouble, GLdouble);
+GLAPI void APIENTRY glClearDepthdNV (GLdouble);
+GLAPI void APIENTRY glDepthBoundsdNV (GLdouble, GLdouble);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
+#endif
+
+#ifndef GL_NV_fragment_program4
+#define GL_NV_fragment_program4 1
+#endif
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_NV_framebuffer_multisample_coverage 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_EXT_framebuffer_sRGB 1
+#endif
+
+#ifndef GL_NV_geometry_shader4
+#define GL_NV_geometry_shader4 1
+#endif
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_NV_parameter_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum, GLuint, GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum, GLuint, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum, GLuint, GLuint, GLsizei, const GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
+#endif
+
+#ifndef GL_EXT_draw_buffers2
+#define GL_EXT_draw_buffers2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum, GLuint, GLboolean *);
+GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glEnableIndexedEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDisableIndexedEXT (GLenum, GLuint);
+GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
+#endif
+
+#ifndef GL_NV_transform_feedback
+#define GL_NV_transform_feedback 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum);
+GLAPI void APIENTRY glEndTransformFeedbackNV (void);
+GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint, const GLint *, GLenum);
+GLAPI void APIENTRY glBindBufferRangeNV (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
+GLAPI void APIENTRY glBindBufferOffsetNV (GLenum, GLuint, GLuint, GLintptr);
+GLAPI void APIENTRY glBindBufferBaseNV (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint, GLsizei, const GLint *, GLenum);
+GLAPI void APIENTRY glActiveVaryingNV (GLuint, const GLchar *);
+GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetActiveVaryingNV (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint, GLuint, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
+#endif
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_EXT_bindable_uniform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformBufferEXT (GLuint, GLint, GLuint);
+GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint, GLint);
+GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
+typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
+#endif
+
+#ifndef GL_EXT_texture_integer
+#define GL_EXT_texture_integer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexParameterIivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTexParameterIuivEXT (GLenum, GLenum, const GLuint *);
+GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum, GLenum, GLuint *);
+GLAPI void APIENTRY glClearColorIiEXT (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glClearColorIuiEXT (GLuint, GLuint, GLuint, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
+typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif
+
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+#endif
+
+#ifndef GL_NV_conditional_render
+#define GL_NV_conditional_render 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint, GLenum);
+GLAPI void APIENTRY glEndConditionalRenderNV (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
+#endif
+
+#ifndef GL_NV_present_video
+#define GL_NV_present_video 1
+#endif
+
+#ifndef GL_EXT_transform_feedback
+#define GL_EXT_transform_feedback 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum);
+GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
+GLAPI void APIENTRY glBindBufferRangeEXT (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
+GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum, GLuint, GLuint, GLintptr);
+GLAPI void APIENTRY glBindBufferBaseEXT (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint, GLsizei, const GLint *, GLenum);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint, GLuint, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLint *location);
+#endif
+
+#ifndef GL_EXT_direct_state_access
+#define GL_EXT_direct_state_access 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield);
+GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield);
+GLAPI void APIENTRY glMatrixLoadfEXT (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMatrixLoaddEXT (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMatrixMultfEXT (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMatrixMultdEXT (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum);
+GLAPI void APIENTRY glMatrixRotatefEXT (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMatrixRotatedEXT (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMatrixScalefEXT (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMatrixScaledEXT (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMatrixFrustumEXT (GLenum, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMatrixOrthoEXT (GLenum, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMatrixPopEXT (GLenum);
+GLAPI void APIENTRY glMatrixPushEXT (GLenum);
+GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum, const GLdouble *);
+GLAPI void APIENTRY glTextureParameterfEXT (GLuint, GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glTextureParameterfvEXT (GLuint, GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glTextureParameteriEXT (GLuint, GLenum, GLenum, GLint);
+GLAPI void APIENTRY glTextureParameterivEXT (GLuint, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTextureImage1DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTextureImage2DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint, GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetTextureImageEXT (GLuint, GLenum, GLint, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint, GLenum, GLint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint, GLenum, GLint, GLenum, GLint *);
+GLAPI void APIENTRY glTextureImage3DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum, GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum, GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum, GLenum, GLenum, GLint);
+GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum, GLenum, GLint, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum, GLenum, GLint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum, GLenum, GLint, GLenum, GLint *);
+GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glBindMultiTextureEXT (GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum, GLuint);
+GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum, GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum, GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexEnviEXT (GLenum, GLenum, GLenum, GLint);
+GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexGendEXT (GLenum, GLenum, GLenum, GLdouble);
+GLAPI void APIENTRY glMultiTexGendvEXT (GLenum, GLenum, GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexGenfEXT (GLenum, GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum, GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexGeniEXT (GLenum, GLenum, GLenum, GLint);
+GLAPI void APIENTRY glMultiTexGenivEXT (GLenum, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum, GLenum, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum, GLuint, GLvoid* *);
+GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint, GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint, GLenum, GLint, GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum, GLenum, GLint, GLvoid *);
+GLAPI void APIENTRY glNamedProgramStringEXT (GLuint, GLenum, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint, GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint, GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint, GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint, GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint, GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint, GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint, GLenum, GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint, GLenum, GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint, GLenum, GLuint, const GLint *);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint, GLenum, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint, GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint, GLenum, GLuint, const GLuint *);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint, GLenum, GLuint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint, GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint, GLenum, GLuint, GLuint *);
+GLAPI void APIENTRY glTextureParameterIivEXT (GLuint, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint, GLenum, GLenum, const GLuint *);
+GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint, GLenum, GLenum, GLuint *);
+GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum, GLenum, GLenum, const GLuint *);
+GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum, GLenum, GLenum, GLuint *);
+GLAPI void APIENTRY glProgramUniform1fEXT (GLuint, GLint, GLfloat);
+GLAPI void APIENTRY glProgramUniform2fEXT (GLuint, GLint, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramUniform3fEXT (GLuint, GLint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramUniform4fEXT (GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramUniform1iEXT (GLuint, GLint, GLint);
+GLAPI void APIENTRY glProgramUniform2iEXT (GLuint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramUniform3iEXT (GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramUniform4iEXT (GLuint, GLint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint, GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint, GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint, GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint, GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint, GLint, GLuint);
+GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint, GLint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint, GLint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint, GLint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint, GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint, GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint, GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint, GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glNamedBufferDataEXT (GLuint, GLsizeiptr, const GLvoid *, GLenum);
+GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint, GLintptr, GLsizeiptr, const GLvoid *);
+GLAPI GLvoid* APIENTRY glMapNamedBufferEXT (GLuint, GLenum);
+GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint);
+GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint, GLenum, GLvoid* *);
+GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint, GLintptr, GLsizeiptr, GLvoid *);
+GLAPI void APIENTRY glTextureBufferEXT (GLuint, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glMultiTexBufferEXT (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint, GLenum, GLint *);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint, GLenum);
+GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint, GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint, GLenum);
+GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum, GLenum);
+GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint, GLenum);
+GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint, GLsizei, const GLenum *);
+GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint, GLenum);
+GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint, GLsizei, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint, GLenum, GLuint, GLint, GLenum);
+GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint, GLenum, GLuint);
+GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum, GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
+typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid* *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, GLvoid *img);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
+typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
+#endif
+
+#ifndef GL_EXT_vertex_array_bgra
+#define GL_EXT_vertex_array_bgra 1
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dep/src/irrlicht/glxext.h b/src/dep/src/irrlicht/glxext.h
index 2f757e9..536fb25 100644
--- a/src/dep/src/irrlicht/glxext.h
+++ b/src/dep/src/irrlicht/glxext.h
@@ -1,785 +1,833 @@
-#ifndef __glxext_h_
-#define __glxext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007 The Khronos Group Inc.
-** 
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-** 
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-** 
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glxext.h last updated 2007/04/21 */
-/* Current version at http://www.opengl.org/registry/ */
-#define GLX_GLXEXT_VERSION 19
-
-#ifndef GLX_VERSION_1_3
-#define GLX_WINDOW_BIT                     0x00000001
-#define GLX_PIXMAP_BIT                     0x00000002
-#define GLX_PBUFFER_BIT                    0x00000004
-#define GLX_RGBA_BIT                       0x00000001
-#define GLX_COLOR_INDEX_BIT                0x00000002
-#define GLX_PBUFFER_CLOBBER_MASK           0x08000000
-#define GLX_FRONT_LEFT_BUFFER_BIT          0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT         0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT           0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT          0x00000008
-#define GLX_AUX_BUFFERS_BIT                0x00000010
-#define GLX_DEPTH_BUFFER_BIT               0x00000020
-#define GLX_STENCIL_BUFFER_BIT             0x00000040
-#define GLX_ACCUM_BUFFER_BIT               0x00000080
-#define GLX_CONFIG_CAVEAT                  0x20
-#define GLX_X_VISUAL_TYPE                  0x22
-#define GLX_TRANSPARENT_TYPE               0x23
-#define GLX_TRANSPARENT_INDEX_VALUE        0x24
-#define GLX_TRANSPARENT_RED_VALUE          0x25
-#define GLX_TRANSPARENT_GREEN_VALUE        0x26
-#define GLX_TRANSPARENT_BLUE_VALUE         0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE        0x28
-#define GLX_DONT_CARE                      0xFFFFFFFF
-#define GLX_NONE                           0x8000
-#define GLX_SLOW_CONFIG                    0x8001
-#define GLX_TRUE_COLOR                     0x8002
-#define GLX_DIRECT_COLOR                   0x8003
-#define GLX_PSEUDO_COLOR                   0x8004
-#define GLX_STATIC_COLOR                   0x8005
-#define GLX_GRAY_SCALE                     0x8006
-#define GLX_STATIC_GRAY                    0x8007
-#define GLX_TRANSPARENT_RGB                0x8008
-#define GLX_TRANSPARENT_INDEX              0x8009
-#define GLX_VISUAL_ID                      0x800B
-#define GLX_SCREEN                         0x800C
-#define GLX_NON_CONFORMANT_CONFIG          0x800D
-#define GLX_DRAWABLE_TYPE                  0x8010
-#define GLX_RENDER_TYPE                    0x8011
-#define GLX_X_RENDERABLE                   0x8012
-#define GLX_FBCONFIG_ID                    0x8013
-#define GLX_RGBA_TYPE                      0x8014
-#define GLX_COLOR_INDEX_TYPE               0x8015
-#define GLX_MAX_PBUFFER_WIDTH              0x8016
-#define GLX_MAX_PBUFFER_HEIGHT             0x8017
-#define GLX_MAX_PBUFFER_PIXELS             0x8018
-#define GLX_PRESERVED_CONTENTS             0x801B
-#define GLX_LARGEST_PBUFFER                0x801C
-#define GLX_WIDTH                          0x801D
-#define GLX_HEIGHT                         0x801E
-#define GLX_EVENT_MASK                     0x801F
-#define GLX_DAMAGED                        0x8020
-#define GLX_SAVED                          0x8021
-#define GLX_WINDOW                         0x8022
-#define GLX_PBUFFER                        0x8023
-#define GLX_PBUFFER_HEIGHT                 0x8040
-#define GLX_PBUFFER_WIDTH                  0x8041
-#endif
-
-#ifndef GLX_VERSION_1_4
-#define GLX_SAMPLE_BUFFERS                 100000
-#define GLX_SAMPLES                        100001
-#endif
-
-#ifndef GLX_ARB_get_proc_address
-#endif
-
-#ifndef GLX_ARB_multisample
-#define GLX_SAMPLE_BUFFERS_ARB             100000
-#define GLX_SAMPLES_ARB                    100001
-#endif
-
-#ifndef GLX_ARB_fbconfig_float
-#define GLX_RGBA_FLOAT_TYPE_ARB            0x20B9
-#define GLX_RGBA_FLOAT_BIT_ARB             0x00000004
-#endif
-
-#ifndef GLX_SGIS_multisample
-#define GLX_SAMPLE_BUFFERS_SGIS            100000
-#define GLX_SAMPLES_SGIS                   100001
-#endif
-
-#ifndef GLX_EXT_visual_info
-#define GLX_X_VISUAL_TYPE_EXT              0x22
-#define GLX_TRANSPARENT_TYPE_EXT           0x23
-#define GLX_TRANSPARENT_INDEX_VALUE_EXT    0x24
-#define GLX_TRANSPARENT_RED_VALUE_EXT      0x25
-#define GLX_TRANSPARENT_GREEN_VALUE_EXT    0x26
-#define GLX_TRANSPARENT_BLUE_VALUE_EXT     0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE_EXT    0x28
-#define GLX_NONE_EXT                       0x8000
-#define GLX_TRUE_COLOR_EXT                 0x8002
-#define GLX_DIRECT_COLOR_EXT               0x8003
-#define GLX_PSEUDO_COLOR_EXT               0x8004
-#define GLX_STATIC_COLOR_EXT               0x8005
-#define GLX_GRAY_SCALE_EXT                 0x8006
-#define GLX_STATIC_GRAY_EXT                0x8007
-#define GLX_TRANSPARENT_RGB_EXT            0x8008
-#define GLX_TRANSPARENT_INDEX_EXT          0x8009
-#endif
-
-#ifndef GLX_SGI_swap_control
-#endif
-
-#ifndef GLX_SGI_video_sync
-#endif
-
-#ifndef GLX_SGI_make_current_read
-#endif
-
-#ifndef GLX_SGIX_video_source
-#endif
-
-#ifndef GLX_EXT_visual_rating
-#define GLX_VISUAL_CAVEAT_EXT              0x20
-#define GLX_SLOW_VISUAL_EXT                0x8001
-#define GLX_NON_CONFORMANT_VISUAL_EXT      0x800D
-/* reuse GLX_NONE_EXT */
-#endif
-
-#ifndef GLX_EXT_import_context
-#define GLX_SHARE_CONTEXT_EXT              0x800A
-#define GLX_VISUAL_ID_EXT                  0x800B
-#define GLX_SCREEN_EXT                     0x800C
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-#define GLX_WINDOW_BIT_SGIX                0x00000001
-#define GLX_PIXMAP_BIT_SGIX                0x00000002
-#define GLX_RGBA_BIT_SGIX                  0x00000001
-#define GLX_COLOR_INDEX_BIT_SGIX           0x00000002
-#define GLX_DRAWABLE_TYPE_SGIX             0x8010
-#define GLX_RENDER_TYPE_SGIX               0x8011
-#define GLX_X_RENDERABLE_SGIX              0x8012
-#define GLX_FBCONFIG_ID_SGIX               0x8013
-#define GLX_RGBA_TYPE_SGIX                 0x8014
-#define GLX_COLOR_INDEX_TYPE_SGIX          0x8015
-/* reuse GLX_SCREEN_EXT */
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-#define GLX_PBUFFER_BIT_SGIX               0x00000004
-#define GLX_BUFFER_CLOBBER_MASK_SGIX       0x08000000
-#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX     0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX    0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT_SGIX      0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX     0x00000008
-#define GLX_AUX_BUFFERS_BIT_SGIX           0x00000010
-#define GLX_DEPTH_BUFFER_BIT_SGIX          0x00000020
-#define GLX_STENCIL_BUFFER_BIT_SGIX        0x00000040
-#define GLX_ACCUM_BUFFER_BIT_SGIX          0x00000080
-#define GLX_SAMPLE_BUFFERS_BIT_SGIX        0x00000100
-#define GLX_MAX_PBUFFER_WIDTH_SGIX         0x8016
-#define GLX_MAX_PBUFFER_HEIGHT_SGIX        0x8017
-#define GLX_MAX_PBUFFER_PIXELS_SGIX        0x8018
-#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX     0x8019
-#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX    0x801A
-#define GLX_PRESERVED_CONTENTS_SGIX        0x801B
-#define GLX_LARGEST_PBUFFER_SGIX           0x801C
-#define GLX_WIDTH_SGIX                     0x801D
-#define GLX_HEIGHT_SGIX                    0x801E
-#define GLX_EVENT_MASK_SGIX                0x801F
-#define GLX_DAMAGED_SGIX                   0x8020
-#define GLX_SAVED_SGIX                     0x8021
-#define GLX_WINDOW_SGIX                    0x8022
-#define GLX_PBUFFER_SGIX                   0x8023
-#endif
-
-#ifndef GLX_SGI_cushion
-#endif
-
-#ifndef GLX_SGIX_video_resize
-#define GLX_SYNC_FRAME_SGIX                0x00000000
-#define GLX_SYNC_SWAP_SGIX                 0x00000001
-#endif
-
-#ifndef GLX_SGIX_dmbuffer
-#define GLX_DIGITAL_MEDIA_PBUFFER_SGIX     0x8024
-#endif
-
-#ifndef GLX_SGIX_swap_group
-#endif
-
-#ifndef GLX_SGIX_swap_barrier
-#endif
-
-#ifndef GLX_SGIS_blended_overlay
-#define GLX_BLENDED_RGBA_SGIS              0x8025
-#endif
-
-#ifndef GLX_SGIS_shared_multisample
-#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
-#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
-#endif
-
-#ifndef GLX_SUN_get_transparent_index
-#endif
-
-#ifndef GLX_3DFX_multisample
-#define GLX_SAMPLE_BUFFERS_3DFX            0x8050
-#define GLX_SAMPLES_3DFX                   0x8051
-#endif
-
-#ifndef GLX_MESA_copy_sub_buffer
-#endif
-
-#ifndef GLX_MESA_pixmap_colormap
-#endif
-
-#ifndef GLX_MESA_release_buffers
-#endif
-
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_3DFX_WINDOW_MODE_MESA          0x1
-#define GLX_3DFX_FULLSCREEN_MODE_MESA      0x2
-#endif
-
-#ifndef GLX_SGIX_visual_select_group
-#define GLX_VISUAL_SELECT_GROUP_SGIX       0x8028
-#endif
-
-#ifndef GLX_OML_swap_method
-#define GLX_SWAP_METHOD_OML                0x8060
-#define GLX_SWAP_EXCHANGE_OML              0x8061
-#define GLX_SWAP_COPY_OML                  0x8062
-#define GLX_SWAP_UNDEFINED_OML             0x8063
-#endif
-
-#ifndef GLX_OML_sync_control
-#endif
-
-#ifndef GLX_NV_float_buffer
-#define GLX_FLOAT_COMPONENTS_NV            0x20B0
-#endif
-
-#ifndef GLX_SGIX_hyperpipe
-#define GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX 80
-#define GLX_BAD_HYPERPIPE_CONFIG_SGIX      91
-#define GLX_BAD_HYPERPIPE_SGIX             92
-#define GLX_HYPERPIPE_DISPLAY_PIPE_SGIX    0x00000001
-#define GLX_HYPERPIPE_RENDER_PIPE_SGIX     0x00000002
-#define GLX_PIPE_RECT_SGIX                 0x00000001
-#define GLX_PIPE_RECT_LIMITS_SGIX          0x00000002
-#define GLX_HYPERPIPE_STEREO_SGIX          0x00000003
-#define GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX   0x00000004
-#define GLX_HYPERPIPE_ID_SGIX              0x8030
-#endif
-
-#ifndef GLX_MESA_agp_offset
-#endif
-
-#ifndef GLX_EXT_fbconfig_packed_float
-#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT   0x20B1
-#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT    0x00000008
-#endif
-
-#ifndef GLX_EXT_framebuffer_sRGB
-#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x20B2
-#endif
-
-#ifndef GLX_EXT_texture_from_pixmap
-#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
-#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
-#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
-#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
-#define GLX_Y_INVERTED_EXT                 0x20D4
-#define GLX_TEXTURE_FORMAT_EXT             0x20D5
-#define GLX_TEXTURE_TARGET_EXT             0x20D6
-#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
-#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
-#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
-#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
-#define GLX_TEXTURE_1D_EXT                 0x20DB
-#define GLX_TEXTURE_2D_EXT                 0x20DC
-#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
-#define GLX_FRONT_LEFT_EXT                 0x20DE
-#define GLX_FRONT_RIGHT_EXT                0x20DF
-#define GLX_BACK_LEFT_EXT                  0x20E0
-#define GLX_BACK_RIGHT_EXT                 0x20E1
-#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
-#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
-#define GLX_AUX0_EXT                       0x20E2
-#define GLX_AUX1_EXT                       0x20E3
-#define GLX_AUX2_EXT                       0x20E4
-#define GLX_AUX3_EXT                       0x20E5
-#define GLX_AUX4_EXT                       0x20E6
-#define GLX_AUX5_EXT                       0x20E7
-#define GLX_AUX6_EXT                       0x20E8
-#define GLX_AUX7_EXT                       0x20E9
-#define GLX_AUX8_EXT                       0x20EA
-#define GLX_AUX9_EXT                       0x20EB
-#endif
-
-
-/*************************************************************/
-
-#ifndef GLX_ARB_get_proc_address
-typedef void (*__GLXextFuncPtr)(void);
-#endif
-
-#ifndef GLX_SGIX_video_source
-typedef XID GLXVideoSourceSGIX;
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-typedef XID GLXFBConfigIDSGIX;
-typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-typedef XID GLXPbufferSGIX;
-typedef struct {
-    int type;
-    unsigned long serial;	  /* # of last request processed by server */
-    Bool send_event;		  /* true if this came for SendEvent request */
-    Display *display;		  /* display the event was read from */
-    GLXDrawable drawable;	  /* i.d. of Drawable */
-    int event_type;		  /* GLX_DAMAGED_SGIX or GLX_SAVED_SGIX */
-    int draw_type;		  /* GLX_WINDOW_SGIX or GLX_PBUFFER_SGIX */
-    unsigned int mask;	  /* mask indicating which buffers are affected*/
-    int x, y;
-    int width, height;
-    int count;		  /* if nonzero, at least this many more */
-} GLXBufferClobberEventSGIX;
-#endif
-
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GLX_OML_sync_control extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS )
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <inttypes.h>     /* Fallback option */
-#endif
-#endif
-
-#ifndef GLX_VERSION_1_3
-#define GLX_VERSION_1_3 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);
-extern GLXFBConfig * glXChooseFBConfig (Display *, int, const int *, int *);
-extern int glXGetFBConfigAttrib (Display *, GLXFBConfig, int, int *);
-extern XVisualInfo * glXGetVisualFromFBConfig (Display *, GLXFBConfig);
-extern GLXWindow glXCreateWindow (Display *, GLXFBConfig, Window, const int *);
-extern void glXDestroyWindow (Display *, GLXWindow);
-extern GLXPixmap glXCreatePixmap (Display *, GLXFBConfig, Pixmap, const int *);
-extern void glXDestroyPixmap (Display *, GLXPixmap);
-extern GLXPbuffer glXCreatePbuffer (Display *, GLXFBConfig, const int *);
-extern void glXDestroyPbuffer (Display *, GLXPbuffer);
-extern void glXQueryDrawable (Display *, GLXDrawable, int, unsigned int *);
-extern GLXContext glXCreateNewContext (Display *, GLXFBConfig, int, GLXContext, Bool);
-extern Bool glXMakeContextCurrent (Display *, GLXDrawable, GLXDrawable, GLXContext);
-extern GLXDrawable glXGetCurrentReadDrawable (void);
-extern Display * glXGetCurrentDisplay (void);
-extern int glXQueryContext (Display *, GLXContext, int, int *);
-extern void glXSelectEvent (Display *, GLXDrawable, unsigned long);
-extern void glXGetSelectedEvent (Display *, GLXDrawable, unsigned long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXFBConfig * ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
-typedef GLXFBConfig * ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
-typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
-typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
-typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
-typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
-typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
-typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
-typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
-typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
-typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
-typedef Display * ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
-typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
-typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
-typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
-#endif
-
-#ifndef GLX_VERSION_1_4
-#define GLX_VERSION_1_4 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern __GLXextFuncPtr glXGetProcAddress (const GLubyte *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName);
-#endif
-
-#ifndef GLX_ARB_get_proc_address
-#define GLX_ARB_get_proc_address 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName);
-#endif
-
-#ifndef GLX_ARB_multisample
-#define GLX_ARB_multisample 1
-#endif
-
-#ifndef GLX_ARB_fbconfig_float
-#define GLX_ARB_fbconfig_float 1
-#endif
-
-#ifndef GLX_SGIS_multisample
-#define GLX_SGIS_multisample 1
-#endif
-
-#ifndef GLX_EXT_visual_info
-#define GLX_EXT_visual_info 1
-#endif
-
-#ifndef GLX_SGI_swap_control
-#define GLX_SGI_swap_control 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXSwapIntervalSGI (int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
-#endif
-
-#ifndef GLX_SGI_video_sync
-#define GLX_SGI_video_sync 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXGetVideoSyncSGI (unsigned int *);
-extern int glXWaitVideoSyncSGI (int, int, unsigned int *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count);
-typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count);
-#endif
-
-#ifndef GLX_SGI_make_current_read
-#define GLX_SGI_make_current_read 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXMakeCurrentReadSGI (Display *, GLXDrawable, GLXDrawable, GLXContext);
-extern GLXDrawable glXGetCurrentReadDrawableSGI (void);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
-typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
-#endif
-
-#ifndef GLX_SGIX_video_source
-#define GLX_SGIX_video_source 1
-#ifdef _VL_H
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX (Display *, int, VLServer, VLPath, int, VLNode);
-extern void glXDestroyGLXVideoSourceSGIX (Display *, GLXVideoSourceSGIX);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXVideoSourceSGIX ( * PFNGLXCREATEGLXVIDEOSOURCESGIXPROC) (Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode);
-typedef void ( * PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (Display *dpy, GLXVideoSourceSGIX glxvideosource);
-#endif /* _VL_H */
-#endif
-
-#ifndef GLX_EXT_visual_rating
-#define GLX_EXT_visual_rating 1
-#endif
-
-#ifndef GLX_EXT_import_context
-#define GLX_EXT_import_context 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Display * glXGetCurrentDisplayEXT (void);
-extern int glXQueryContextInfoEXT (Display *, GLXContext, int, int *);
-extern GLXContextID glXGetContextIDEXT (const GLXContext);
-extern GLXContext glXImportContextEXT (Display *, GLXContextID);
-extern void glXFreeContextEXT (Display *, GLXContext);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Display * ( * PFNGLXGETCURRENTDISPLAYEXTPROC) (void);
-typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display *dpy, GLXContext context, int attribute, int *value);
-typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
-typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display *dpy, GLXContextID contextID);
-typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context);
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-#define GLX_SGIX_fbconfig 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXGetFBConfigAttribSGIX (Display *, GLXFBConfigSGIX, int, int *);
-extern GLXFBConfigSGIX * glXChooseFBConfigSGIX (Display *, int, int *, int *);
-extern GLXPixmap glXCreateGLXPixmapWithConfigSGIX (Display *, GLXFBConfigSGIX, Pixmap);
-extern GLXContext glXCreateContextWithConfigSGIX (Display *, GLXFBConfigSGIX, int, GLXContext, Bool);
-extern XVisualInfo * glXGetVisualFromFBConfigSGIX (Display *, GLXFBConfigSGIX);
-extern GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX (Display *, XVisualInfo *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
-typedef GLXFBConfigSGIX * ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, int *attrib_list, int *nelements);
-typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
-typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
-typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config);
-typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display *dpy, XVisualInfo *vis);
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-#define GLX_SGIX_pbuffer 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXPbufferSGIX glXCreateGLXPbufferSGIX (Display *, GLXFBConfigSGIX, unsigned int, unsigned int, int *);
-extern void glXDestroyGLXPbufferSGIX (Display *, GLXPbufferSGIX);
-extern int glXQueryGLXPbufferSGIX (Display *, GLXPbufferSGIX, int, unsigned int *);
-extern void glXSelectEventSGIX (Display *, GLXDrawable, unsigned long);
-extern void glXGetSelectedEventSGIX (Display *, GLXDrawable, unsigned long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXPbufferSGIX ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
-typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf);
-typedef int ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
-typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long mask);
-typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long *mask);
-#endif
-
-#ifndef GLX_SGI_cushion
-#define GLX_SGI_cushion 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXCushionSGI (Display *, Window, float);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXCUSHIONSGIPROC) (Display *dpy, Window window, float cushion);
-#endif
-
-#ifndef GLX_SGIX_video_resize
-#define GLX_SGIX_video_resize 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXBindChannelToWindowSGIX (Display *, int, int, Window);
-extern int glXChannelRectSGIX (Display *, int, int, int, int, int, int);
-extern int glXQueryChannelRectSGIX (Display *, int, int, int *, int *, int *, int *);
-extern int glXQueryChannelDeltasSGIX (Display *, int, int, int *, int *, int *, int *);
-extern int glXChannelRectSyncSGIX (Display *, int, int, GLenum);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display *display, int screen, int channel, Window window);
-typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int x, int y, int w, int h);
-typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
-typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display *display, int screen, int channel, int *x, int *y, int *w, int *h);
-typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display *display, int screen, int channel, GLenum synctype);
-#endif
-
-#ifndef GLX_SGIX_dmbuffer
-#define GLX_SGIX_dmbuffer 1
-#ifdef _DM_BUFFER_H_
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXAssociateDMPbufferSGIX (Display *, GLXPbufferSGIX, DMparams *, DMbuffer);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXASSOCIATEDMPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer);
-#endif /* _DM_BUFFER_H_ */
-#endif
-
-#ifndef GLX_SGIX_swap_group
-#define GLX_SGIX_swap_group 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXJoinSwapGroupSGIX (Display *, GLXDrawable, GLXDrawable);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
-#endif
-
-#ifndef GLX_SGIX_swap_barrier
-#define GLX_SGIX_swap_barrier 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXBindSwapBarrierSGIX (Display *, GLXDrawable, int);
-extern Bool glXQueryMaxSwapBarriersSGIX (Display *, int, int *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
-typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
-#endif
-
-#ifndef GLX_SUN_get_transparent_index
-#define GLX_SUN_get_transparent_index 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Status glXGetTransparentIndexSUN (Display *, Window, Window, long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex);
-#endif
-
-#ifndef GLX_MESA_copy_sub_buffer
-#define GLX_MESA_copy_sub_buffer 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXCopySubBufferMESA (Display *, GLXDrawable, int, int, int, int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display *dpy, GLXDrawable drawable, int x, int y, int width, int height);
-#endif
-
-#ifndef GLX_MESA_pixmap_colormap
-#define GLX_MESA_pixmap_colormap 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXPixmap glXCreateGLXPixmapMESA (Display *, XVisualInfo *, Pixmap, Colormap);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
-#endif
-
-#ifndef GLX_MESA_release_buffers
-#define GLX_MESA_release_buffers 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXReleaseBuffersMESA (Display *, GLXDrawable);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display *dpy, GLXDrawable drawable);
-#endif
-
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_MESA_set_3dfx_mode 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXSet3DfxModeMESA (int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode);
-#endif
-
-#ifndef GLX_SGIX_visual_select_group
-#define GLX_SGIX_visual_select_group 1
-#endif
-
-#ifndef GLX_OML_swap_method
-#define GLX_OML_swap_method 1
-#endif
-
-#ifndef GLX_OML_sync_control
-#define GLX_OML_sync_control 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXGetSyncValuesOML (Display *, GLXDrawable, int64_t *, int64_t *, int64_t *);
-extern Bool glXGetMscRateOML (Display *, GLXDrawable, int32_t *, int32_t *);
-extern int64_t glXSwapBuffersMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t);
-extern Bool glXWaitForMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t, int64_t *, int64_t *, int64_t *);
-extern Bool glXWaitForSbcOML (Display *, GLXDrawable, int64_t, int64_t *, int64_t *, int64_t *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXGETSYNCVALUESOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t *ust, int64_t *msc, int64_t *sbc);
-typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator);
-typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
-typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc);
-typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc);
-#endif
-
-#ifndef GLX_NV_float_buffer
-#define GLX_NV_float_buffer 1
-#endif
-
-#ifndef GLX_SGIX_hyperpipe
-#define GLX_SGIX_hyperpipe 1
-
-typedef struct {
-    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int     networkId;
-} GLXHyperpipeNetworkSGIX;
-
-typedef struct {
-    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int     channel;
-    unsigned int
-      participationType;
-    int     timeSlice;
-} GLXHyperpipeConfigSGIX;
-
-typedef struct {
-    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int srcXOrigin, srcYOrigin, srcWidth, srcHeight;
-    int destXOrigin, destYOrigin, destWidth, destHeight;
-} GLXPipeRect;
-
-typedef struct {
-    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int XOrigin, YOrigin, maxHeight, maxWidth;
-} GLXPipeRectLimits;
-
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXHyperpipeNetworkSGIX * glXQueryHyperpipeNetworkSGIX (Display *, int *);
-extern int glXHyperpipeConfigSGIX (Display *, int, int, GLXHyperpipeConfigSGIX *, int *);
-extern GLXHyperpipeConfigSGIX * glXQueryHyperpipeConfigSGIX (Display *, int, int *);
-extern int glXDestroyHyperpipeConfigSGIX (Display *, int);
-extern int glXBindHyperpipeSGIX (Display *, int);
-extern int glXQueryHyperpipeBestAttribSGIX (Display *, int, int, int, void *, void *);
-extern int glXHyperpipeAttribSGIX (Display *, int, int, int, void *);
-extern int glXQueryHyperpipeAttribSGIX (Display *, int, int, int, void *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXHyperpipeNetworkSGIX * ( * PFNGLXQUERYHYPERPIPENETWORKSGIXPROC) (Display *dpy, int *npipes);
-typedef int ( * PFNGLXHYPERPIPECONFIGSGIXPROC) (Display *dpy, int networkId, int npipes, GLXHyperpipeConfigSGIX *cfg, int *hpId);
-typedef GLXHyperpipeConfigSGIX * ( * PFNGLXQUERYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId, int *npipes);
-typedef int ( * PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId);
-typedef int ( * PFNGLXBINDHYPERPIPESGIXPROC) (Display *dpy, int hpId);
-typedef int ( * PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList, void *returnAttribList);
-typedef int ( * PFNGLXHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList);
-typedef int ( * PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList);
-#endif
-
-#ifndef GLX_MESA_agp_offset
-#define GLX_MESA_agp_offset 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern unsigned int glXGetAGPOffsetMESA (const void *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void *pointer);
-#endif
-
-#ifndef GLX_EXT_fbconfig_packed_float
-#define GLX_EXT_fbconfig_packed_float 1
-#endif
-
-#ifndef GLX_EXT_framebuffer_sRGB
-#define GLX_EXT_framebuffer_sRGB 1
-#endif
-
-#ifndef GLX_EXT_texture_from_pixmap
-#define GLX_EXT_texture_from_pixmap 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXBindTexImageEXT (Display *, GLXDrawable, int, const int *);
-extern void glXReleaseTexImageEXT (Display *, GLXDrawable, int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
-typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#ifndef __glxext_h_
+#define __glxext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glxext.h last updated 2008/10/22 */
+/* Current version at http://www.opengl.org/registry/ */
+#define GLX_GLXEXT_VERSION 21
+
+#ifndef GLX_VERSION_1_3
+#define GLX_WINDOW_BIT                     0x00000001
+#define GLX_PIXMAP_BIT                     0x00000002
+#define GLX_PBUFFER_BIT                    0x00000004
+#define GLX_RGBA_BIT                       0x00000001
+#define GLX_COLOR_INDEX_BIT                0x00000002
+#define GLX_PBUFFER_CLOBBER_MASK           0x08000000
+#define GLX_FRONT_LEFT_BUFFER_BIT          0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT         0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT           0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT          0x00000008
+#define GLX_AUX_BUFFERS_BIT                0x00000010
+#define GLX_DEPTH_BUFFER_BIT               0x00000020
+#define GLX_STENCIL_BUFFER_BIT             0x00000040
+#define GLX_ACCUM_BUFFER_BIT               0x00000080
+#define GLX_CONFIG_CAVEAT                  0x20
+#define GLX_X_VISUAL_TYPE                  0x22
+#define GLX_TRANSPARENT_TYPE               0x23
+#define GLX_TRANSPARENT_INDEX_VALUE        0x24
+#define GLX_TRANSPARENT_RED_VALUE          0x25
+#define GLX_TRANSPARENT_GREEN_VALUE        0x26
+#define GLX_TRANSPARENT_BLUE_VALUE         0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE        0x28
+#define GLX_DONT_CARE                      0xFFFFFFFF
+#define GLX_NONE                           0x8000
+#define GLX_SLOW_CONFIG                    0x8001
+#define GLX_TRUE_COLOR                     0x8002
+#define GLX_DIRECT_COLOR                   0x8003
+#define GLX_PSEUDO_COLOR                   0x8004
+#define GLX_STATIC_COLOR                   0x8005
+#define GLX_GRAY_SCALE                     0x8006
+#define GLX_STATIC_GRAY                    0x8007
+#define GLX_TRANSPARENT_RGB                0x8008
+#define GLX_TRANSPARENT_INDEX              0x8009
+#define GLX_VISUAL_ID                      0x800B
+#define GLX_SCREEN                         0x800C
+#define GLX_NON_CONFORMANT_CONFIG          0x800D
+#define GLX_DRAWABLE_TYPE                  0x8010
+#define GLX_RENDER_TYPE                    0x8011
+#define GLX_X_RENDERABLE                   0x8012
+#define GLX_FBCONFIG_ID                    0x8013
+#define GLX_RGBA_TYPE                      0x8014
+#define GLX_COLOR_INDEX_TYPE               0x8015
+#define GLX_MAX_PBUFFER_WIDTH              0x8016
+#define GLX_MAX_PBUFFER_HEIGHT             0x8017
+#define GLX_MAX_PBUFFER_PIXELS             0x8018
+#define GLX_PRESERVED_CONTENTS             0x801B
+#define GLX_LARGEST_PBUFFER                0x801C
+#define GLX_WIDTH                          0x801D
+#define GLX_HEIGHT                         0x801E
+#define GLX_EVENT_MASK                     0x801F
+#define GLX_DAMAGED                        0x8020
+#define GLX_SAVED                          0x8021
+#define GLX_WINDOW                         0x8022
+#define GLX_PBUFFER                        0x8023
+#define GLX_PBUFFER_HEIGHT                 0x8040
+#define GLX_PBUFFER_WIDTH                  0x8041
+#endif
+
+#ifndef GLX_VERSION_1_4
+#define GLX_SAMPLE_BUFFERS                 100000
+#define GLX_SAMPLES                        100001
+#endif
+
+#ifndef GLX_ARB_get_proc_address
+#endif
+
+#ifndef GLX_ARB_multisample
+#define GLX_SAMPLE_BUFFERS_ARB             100000
+#define GLX_SAMPLES_ARB                    100001
+#endif
+
+#ifndef GLX_ARB_fbconfig_float
+#define GLX_RGBA_FLOAT_TYPE_ARB            0x20B9
+#define GLX_RGBA_FLOAT_BIT_ARB             0x00000004
+#endif
+
+#ifndef GLX_ARB_create_context
+#define GLX_CONTEXT_DEBUG_BIT_ARB          0x00000001
+#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
+#define GLX_CONTEXT_MAJOR_VERSION_ARB      0x2091
+#define GLX_CONTEXT_MINOR_VERSION_ARB      0x2092
+#define GLX_CONTEXT_FLAGS_ARB              0x2094
+#endif
+
+#ifndef GLX_SGIS_multisample
+#define GLX_SAMPLE_BUFFERS_SGIS            100000
+#define GLX_SAMPLES_SGIS                   100001
+#endif
+
+#ifndef GLX_EXT_visual_info
+#define GLX_X_VISUAL_TYPE_EXT              0x22
+#define GLX_TRANSPARENT_TYPE_EXT           0x23
+#define GLX_TRANSPARENT_INDEX_VALUE_EXT    0x24
+#define GLX_TRANSPARENT_RED_VALUE_EXT      0x25
+#define GLX_TRANSPARENT_GREEN_VALUE_EXT    0x26
+#define GLX_TRANSPARENT_BLUE_VALUE_EXT     0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE_EXT    0x28
+#define GLX_NONE_EXT                       0x8000
+#define GLX_TRUE_COLOR_EXT                 0x8002
+#define GLX_DIRECT_COLOR_EXT               0x8003
+#define GLX_PSEUDO_COLOR_EXT               0x8004
+#define GLX_STATIC_COLOR_EXT               0x8005
+#define GLX_GRAY_SCALE_EXT                 0x8006
+#define GLX_STATIC_GRAY_EXT                0x8007
+#define GLX_TRANSPARENT_RGB_EXT            0x8008
+#define GLX_TRANSPARENT_INDEX_EXT          0x8009
+#endif
+
+#ifndef GLX_SGI_swap_control
+#endif
+
+#ifndef GLX_SGI_video_sync
+#endif
+
+#ifndef GLX_SGI_make_current_read
+#endif
+
+#ifndef GLX_SGIX_video_source
+#endif
+
+#ifndef GLX_EXT_visual_rating
+#define GLX_VISUAL_CAVEAT_EXT              0x20
+#define GLX_SLOW_VISUAL_EXT                0x8001
+#define GLX_NON_CONFORMANT_VISUAL_EXT      0x800D
+/* reuse GLX_NONE_EXT */
+#endif
+
+#ifndef GLX_EXT_import_context
+#define GLX_SHARE_CONTEXT_EXT              0x800A
+#define GLX_VISUAL_ID_EXT                  0x800B
+#define GLX_SCREEN_EXT                     0x800C
+#endif
+
+#ifndef GLX_SGIX_fbconfig
+#define GLX_WINDOW_BIT_SGIX                0x00000001
+#define GLX_PIXMAP_BIT_SGIX                0x00000002
+#define GLX_RGBA_BIT_SGIX                  0x00000001
+#define GLX_COLOR_INDEX_BIT_SGIX           0x00000002
+#define GLX_DRAWABLE_TYPE_SGIX             0x8010
+#define GLX_RENDER_TYPE_SGIX               0x8011
+#define GLX_X_RENDERABLE_SGIX              0x8012
+#define GLX_FBCONFIG_ID_SGIX               0x8013
+#define GLX_RGBA_TYPE_SGIX                 0x8014
+#define GLX_COLOR_INDEX_TYPE_SGIX          0x8015
+/* reuse GLX_SCREEN_EXT */
+#endif
+
+#ifndef GLX_SGIX_pbuffer
+#define GLX_PBUFFER_BIT_SGIX               0x00000004
+#define GLX_BUFFER_CLOBBER_MASK_SGIX       0x08000000
+#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX     0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX    0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT_SGIX      0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX     0x00000008
+#define GLX_AUX_BUFFERS_BIT_SGIX           0x00000010
+#define GLX_DEPTH_BUFFER_BIT_SGIX          0x00000020
+#define GLX_STENCIL_BUFFER_BIT_SGIX        0x00000040
+#define GLX_ACCUM_BUFFER_BIT_SGIX          0x00000080
+#define GLX_SAMPLE_BUFFERS_BIT_SGIX        0x00000100
+#define GLX_MAX_PBUFFER_WIDTH_SGIX         0x8016
+#define GLX_MAX_PBUFFER_HEIGHT_SGIX        0x8017
+#define GLX_MAX_PBUFFER_PIXELS_SGIX        0x8018
+#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX     0x8019
+#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX    0x801A
+#define GLX_PRESERVED_CONTENTS_SGIX        0x801B
+#define GLX_LARGEST_PBUFFER_SGIX           0x801C
+#define GLX_WIDTH_SGIX                     0x801D
+#define GLX_HEIGHT_SGIX                    0x801E
+#define GLX_EVENT_MASK_SGIX                0x801F
+#define GLX_DAMAGED_SGIX                   0x8020
+#define GLX_SAVED_SGIX                     0x8021
+#define GLX_WINDOW_SGIX                    0x8022
+#define GLX_PBUFFER_SGIX                   0x8023
+#endif
+
+#ifndef GLX_SGI_cushion
+#endif
+
+#ifndef GLX_SGIX_video_resize
+#define GLX_SYNC_FRAME_SGIX                0x00000000
+#define GLX_SYNC_SWAP_SGIX                 0x00000001
+#endif
+
+#ifndef GLX_SGIX_dmbuffer
+#define GLX_DIGITAL_MEDIA_PBUFFER_SGIX     0x8024
+#endif
+
+#ifndef GLX_SGIX_swap_group
+#endif
+
+#ifndef GLX_SGIX_swap_barrier
+#endif
+
+#ifndef GLX_SGIS_blended_overlay
+#define GLX_BLENDED_RGBA_SGIS              0x8025
+#endif
+
+#ifndef GLX_SGIS_shared_multisample
+#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
+#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
+#endif
+
+#ifndef GLX_SUN_get_transparent_index
+#endif
+
+#ifndef GLX_3DFX_multisample
+#define GLX_SAMPLE_BUFFERS_3DFX            0x8050
+#define GLX_SAMPLES_3DFX                   0x8051
+#endif
+
+#ifndef GLX_MESA_copy_sub_buffer
+#endif
+
+#ifndef GLX_MESA_pixmap_colormap
+#endif
+
+#ifndef GLX_MESA_release_buffers
+#endif
+
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_3DFX_WINDOW_MODE_MESA          0x1
+#define GLX_3DFX_FULLSCREEN_MODE_MESA      0x2
+#endif
+
+#ifndef GLX_SGIX_visual_select_group
+#define GLX_VISUAL_SELECT_GROUP_SGIX       0x8028
+#endif
+
+#ifndef GLX_OML_swap_method
+#define GLX_SWAP_METHOD_OML                0x8060
+#define GLX_SWAP_EXCHANGE_OML              0x8061
+#define GLX_SWAP_COPY_OML                  0x8062
+#define GLX_SWAP_UNDEFINED_OML             0x8063
+#endif
+
+#ifndef GLX_OML_sync_control
+#endif
+
+#ifndef GLX_NV_float_buffer
+#define GLX_FLOAT_COMPONENTS_NV            0x20B0
+#endif
+
+#ifndef GLX_SGIX_hyperpipe
+#define GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX 80
+#define GLX_BAD_HYPERPIPE_CONFIG_SGIX      91
+#define GLX_BAD_HYPERPIPE_SGIX             92
+#define GLX_HYPERPIPE_DISPLAY_PIPE_SGIX    0x00000001
+#define GLX_HYPERPIPE_RENDER_PIPE_SGIX     0x00000002
+#define GLX_PIPE_RECT_SGIX                 0x00000001
+#define GLX_PIPE_RECT_LIMITS_SGIX          0x00000002
+#define GLX_HYPERPIPE_STEREO_SGIX          0x00000003
+#define GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX   0x00000004
+#define GLX_HYPERPIPE_ID_SGIX              0x8030
+#endif
+
+#ifndef GLX_MESA_agp_offset
+#endif
+
+#ifndef GLX_EXT_fbconfig_packed_float
+#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT   0x20B1
+#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT    0x00000008
+#endif
+
+#ifndef GLX_EXT_framebuffer_sRGB
+#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x20B2
+#endif
+
+#ifndef GLX_EXT_texture_from_pixmap
+#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
+#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
+#define GLX_Y_INVERTED_EXT                 0x20D4
+#define GLX_TEXTURE_FORMAT_EXT             0x20D5
+#define GLX_TEXTURE_TARGET_EXT             0x20D6
+#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
+#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
+#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
+#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
+#define GLX_TEXTURE_1D_EXT                 0x20DB
+#define GLX_TEXTURE_2D_EXT                 0x20DC
+#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
+#define GLX_FRONT_LEFT_EXT                 0x20DE
+#define GLX_FRONT_RIGHT_EXT                0x20DF
+#define GLX_BACK_LEFT_EXT                  0x20E0
+#define GLX_BACK_RIGHT_EXT                 0x20E1
+#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
+#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
+#define GLX_AUX0_EXT                       0x20E2
+#define GLX_AUX1_EXT                       0x20E3
+#define GLX_AUX2_EXT                       0x20E4
+#define GLX_AUX3_EXT                       0x20E5
+#define GLX_AUX4_EXT                       0x20E6
+#define GLX_AUX5_EXT                       0x20E7
+#define GLX_AUX6_EXT                       0x20E8
+#define GLX_AUX7_EXT                       0x20E9
+#define GLX_AUX8_EXT                       0x20EA
+#define GLX_AUX9_EXT                       0x20EB
+#endif
+
+#ifndef GLX_NV_present_video
+#define GLX_NUM_VIDEO_SLOTS_NV             0x20F0
+#endif
+
+#ifndef GLX_NV_video_out
+#define GLX_VIDEO_OUT_COLOR_NV             0x20C3
+#define GLX_VIDEO_OUT_ALPHA_NV             0x20C4
+#define GLX_VIDEO_OUT_DEPTH_NV             0x20C5
+#define GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV   0x20C6
+#define GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV   0x20C7
+#define GLX_VIDEO_OUT_FRAME_NV             0x20C8
+#define GLX_VIDEO_OUT_FIELD_1_NV           0x20C9
+#define GLX_VIDEO_OUT_FIELD_2_NV           0x20CA
+#define GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB
+#define GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC
+#endif
+
+#ifndef GLX_NV_swap_group
+#endif
+
+
+/*************************************************************/
+
+#ifndef GLX_ARB_get_proc_address
+typedef void (*__GLXextFuncPtr)(void);
+#endif
+
+#ifndef GLX_SGIX_video_source
+typedef XID GLXVideoSourceSGIX;
+#endif
+
+#ifndef GLX_SGIX_fbconfig
+typedef XID GLXFBConfigIDSGIX;
+typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
+#endif
+
+#ifndef GLX_SGIX_pbuffer
+typedef XID GLXPbufferSGIX;
+typedef struct {
+    int type;
+    unsigned long serial;	  /* # of last request processed by server */
+    Bool send_event;		  /* true if this came for SendEvent request */
+    Display *display;		  /* display the event was read from */
+    GLXDrawable drawable;	  /* i.d. of Drawable */
+    int event_type;		  /* GLX_DAMAGED_SGIX or GLX_SAVED_SGIX */
+    int draw_type;		  /* GLX_WINDOW_SGIX or GLX_PBUFFER_SGIX */
+    unsigned int mask;	  /* mask indicating which buffers are affected*/
+    int x, y;
+    int width, height;
+    int count;		  /* if nonzero, at least this many more */
+} GLXBufferClobberEventSGIX;
+#endif
+
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GLX_OML_sync_control extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__) || defined(__digital__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__) || defined(_LP64)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS ) || defined(__sgi)
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <inttypes.h>     /* Fallback option */
+#endif
+#endif
+
+#ifndef GLX_VERSION_1_3
+#define GLX_VERSION_1_3 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);
+extern GLXFBConfig * glXChooseFBConfig (Display *, int, const int *, int *);
+extern int glXGetFBConfigAttrib (Display *, GLXFBConfig, int, int *);
+extern XVisualInfo * glXGetVisualFromFBConfig (Display *, GLXFBConfig);
+extern GLXWindow glXCreateWindow (Display *, GLXFBConfig, Window, const int *);
+extern void glXDestroyWindow (Display *, GLXWindow);
+extern GLXPixmap glXCreatePixmap (Display *, GLXFBConfig, Pixmap, const int *);
+extern void glXDestroyPixmap (Display *, GLXPixmap);
+extern GLXPbuffer glXCreatePbuffer (Display *, GLXFBConfig, const int *);
+extern void glXDestroyPbuffer (Display *, GLXPbuffer);
+extern void glXQueryDrawable (Display *, GLXDrawable, int, unsigned int *);
+extern GLXContext glXCreateNewContext (Display *, GLXFBConfig, int, GLXContext, Bool);
+extern Bool glXMakeContextCurrent (Display *, GLXDrawable, GLXDrawable, GLXContext);
+extern GLXDrawable glXGetCurrentReadDrawable (void);
+extern Display * glXGetCurrentDisplay (void);
+extern int glXQueryContext (Display *, GLXContext, int, int *);
+extern void glXSelectEvent (Display *, GLXDrawable, unsigned long);
+extern void glXGetSelectedEvent (Display *, GLXDrawable, unsigned long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXFBConfig * ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
+typedef GLXFBConfig * ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
+typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
+typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
+typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
+typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
+typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
+typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
+typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
+typedef Display * ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
+typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
+typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
+typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
+#endif
+
+#ifndef GLX_VERSION_1_4
+#define GLX_VERSION_1_4 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern __GLXextFuncPtr glXGetProcAddress (const GLubyte *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName);
+#endif
+
+#ifndef GLX_ARB_get_proc_address
+#define GLX_ARB_get_proc_address 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName);
+#endif
+
+#ifndef GLX_ARB_multisample
+#define GLX_ARB_multisample 1
+#endif
+
+#ifndef GLX_ARB_fbconfig_float
+#define GLX_ARB_fbconfig_float 1
+#endif
+
+#ifndef GLX_ARB_create_context
+#define GLX_ARB_create_context 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXContext glXCreateContextAttribsARB (Display *, GLXFBConfig, GLXContext, Bool, const int *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list);
+#endif
+
+#ifndef GLX_SGIS_multisample
+#define GLX_SGIS_multisample 1
+#endif
+
+#ifndef GLX_EXT_visual_info
+#define GLX_EXT_visual_info 1
+#endif
+
+#ifndef GLX_SGI_swap_control
+#define GLX_SGI_swap_control 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXSwapIntervalSGI (int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
+#endif
+
+#ifndef GLX_SGI_video_sync
+#define GLX_SGI_video_sync 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXGetVideoSyncSGI (unsigned int *);
+extern int glXWaitVideoSyncSGI (int, int, unsigned int *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count);
+typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count);
+#endif
+
+#ifndef GLX_SGI_make_current_read
+#define GLX_SGI_make_current_read 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXMakeCurrentReadSGI (Display *, GLXDrawable, GLXDrawable, GLXContext);
+extern GLXDrawable glXGetCurrentReadDrawableSGI (void);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
+#endif
+
+#ifndef GLX_SGIX_video_source
+#define GLX_SGIX_video_source 1
+#ifdef _VL_H
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX (Display *, int, VLServer, VLPath, int, VLNode);
+extern void glXDestroyGLXVideoSourceSGIX (Display *, GLXVideoSourceSGIX);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXVideoSourceSGIX ( * PFNGLXCREATEGLXVIDEOSOURCESGIXPROC) (Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode);
+typedef void ( * PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (Display *dpy, GLXVideoSourceSGIX glxvideosource);
+#endif /* _VL_H */
+#endif
+
+#ifndef GLX_EXT_visual_rating
+#define GLX_EXT_visual_rating 1
+#endif
+
+#ifndef GLX_EXT_import_context
+#define GLX_EXT_import_context 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Display * glXGetCurrentDisplayEXT (void);
+extern int glXQueryContextInfoEXT (Display *, GLXContext, int, int *);
+extern GLXContextID glXGetContextIDEXT (const GLXContext);
+extern GLXContext glXImportContextEXT (Display *, GLXContextID);
+extern void glXFreeContextEXT (Display *, GLXContext);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Display * ( * PFNGLXGETCURRENTDISPLAYEXTPROC) (void);
+typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display *dpy, GLXContext context, int attribute, int *value);
+typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
+typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display *dpy, GLXContextID contextID);
+typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context);
+#endif
+
+#ifndef GLX_SGIX_fbconfig
+#define GLX_SGIX_fbconfig 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXGetFBConfigAttribSGIX (Display *, GLXFBConfigSGIX, int, int *);
+extern GLXFBConfigSGIX * glXChooseFBConfigSGIX (Display *, int, int *, int *);
+extern GLXPixmap glXCreateGLXPixmapWithConfigSGIX (Display *, GLXFBConfigSGIX, Pixmap);
+extern GLXContext glXCreateContextWithConfigSGIX (Display *, GLXFBConfigSGIX, int, GLXContext, Bool);
+extern XVisualInfo * glXGetVisualFromFBConfigSGIX (Display *, GLXFBConfigSGIX);
+extern GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX (Display *, XVisualInfo *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
+typedef GLXFBConfigSGIX * ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, int *attrib_list, int *nelements);
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
+typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
+typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config);
+typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display *dpy, XVisualInfo *vis);
+#endif
+
+#ifndef GLX_SGIX_pbuffer
+#define GLX_SGIX_pbuffer 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXPbufferSGIX glXCreateGLXPbufferSGIX (Display *, GLXFBConfigSGIX, unsigned int, unsigned int, int *);
+extern void glXDestroyGLXPbufferSGIX (Display *, GLXPbufferSGIX);
+extern int glXQueryGLXPbufferSGIX (Display *, GLXPbufferSGIX, int, unsigned int *);
+extern void glXSelectEventSGIX (Display *, GLXDrawable, unsigned long);
+extern void glXGetSelectedEventSGIX (Display *, GLXDrawable, unsigned long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXPbufferSGIX ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
+typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf);
+typedef int ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
+typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long mask);
+typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long *mask);
+#endif
+
+#ifndef GLX_SGI_cushion
+#define GLX_SGI_cushion 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXCushionSGI (Display *, Window, float);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXCUSHIONSGIPROC) (Display *dpy, Window window, float cushion);
+#endif
+
+#ifndef GLX_SGIX_video_resize
+#define GLX_SGIX_video_resize 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXBindChannelToWindowSGIX (Display *, int, int, Window);
+extern int glXChannelRectSGIX (Display *, int, int, int, int, int, int);
+extern int glXQueryChannelRectSGIX (Display *, int, int, int *, int *, int *, int *);
+extern int glXQueryChannelDeltasSGIX (Display *, int, int, int *, int *, int *, int *);
+extern int glXChannelRectSyncSGIX (Display *, int, int, GLenum);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display *display, int screen, int channel, Window window);
+typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int x, int y, int w, int h);
+typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
+typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display *display, int screen, int channel, int *x, int *y, int *w, int *h);
+typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display *display, int screen, int channel, GLenum synctype);
+#endif
+
+#ifndef GLX_SGIX_dmbuffer
+#define GLX_SGIX_dmbuffer 1
+#ifdef _DM_BUFFER_H_
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXAssociateDMPbufferSGIX (Display *, GLXPbufferSGIX, DMparams *, DMbuffer);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXASSOCIATEDMPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer);
+#endif /* _DM_BUFFER_H_ */
+#endif
+
+#ifndef GLX_SGIX_swap_group
+#define GLX_SGIX_swap_group 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXJoinSwapGroupSGIX (Display *, GLXDrawable, GLXDrawable);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
+#endif
+
+#ifndef GLX_SGIX_swap_barrier
+#define GLX_SGIX_swap_barrier 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXBindSwapBarrierSGIX (Display *, GLXDrawable, int);
+extern Bool glXQueryMaxSwapBarriersSGIX (Display *, int, int *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
+typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
+#endif
+
+#ifndef GLX_SUN_get_transparent_index
+#define GLX_SUN_get_transparent_index 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Status glXGetTransparentIndexSUN (Display *, Window, Window, long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex);
+#endif
+
+#ifndef GLX_MESA_copy_sub_buffer
+#define GLX_MESA_copy_sub_buffer 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXCopySubBufferMESA (Display *, GLXDrawable, int, int, int, int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display *dpy, GLXDrawable drawable, int x, int y, int width, int height);
+#endif
+
+#ifndef GLX_MESA_pixmap_colormap
+#define GLX_MESA_pixmap_colormap 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXPixmap glXCreateGLXPixmapMESA (Display *, XVisualInfo *, Pixmap, Colormap);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
+#endif
+
+#ifndef GLX_MESA_release_buffers
+#define GLX_MESA_release_buffers 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXReleaseBuffersMESA (Display *, GLXDrawable);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display *dpy, GLXDrawable drawable);
+#endif
+
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_MESA_set_3dfx_mode 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXSet3DfxModeMESA (int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode);
+#endif
+
+#ifndef GLX_SGIX_visual_select_group
+#define GLX_SGIX_visual_select_group 1
+#endif
+
+#ifndef GLX_OML_swap_method
+#define GLX_OML_swap_method 1
+#endif
+
+#ifndef GLX_OML_sync_control
+#define GLX_OML_sync_control 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXGetSyncValuesOML (Display *, GLXDrawable, int64_t *, int64_t *, int64_t *);
+extern Bool glXGetMscRateOML (Display *, GLXDrawable, int32_t *, int32_t *);
+extern int64_t glXSwapBuffersMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t);
+extern Bool glXWaitForMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t, int64_t *, int64_t *, int64_t *);
+extern Bool glXWaitForSbcOML (Display *, GLXDrawable, int64_t, int64_t *, int64_t *, int64_t *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXGETSYNCVALUESOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t *ust, int64_t *msc, int64_t *sbc);
+typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator);
+typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
+typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc);
+typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc);
+#endif
+
+#ifndef GLX_NV_float_buffer
+#define GLX_NV_float_buffer 1
+#endif
+
+#ifndef GLX_SGIX_hyperpipe
+#define GLX_SGIX_hyperpipe 1
+
+typedef struct {
+    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int     networkId;
+} GLXHyperpipeNetworkSGIX;
+
+typedef struct {
+    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int     channel;
+    unsigned int
+      participationType;
+    int     timeSlice;
+} GLXHyperpipeConfigSGIX;
+
+typedef struct {
+    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int srcXOrigin, srcYOrigin, srcWidth, srcHeight;
+    int destXOrigin, destYOrigin, destWidth, destHeight;
+} GLXPipeRect;
+
+typedef struct {
+    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int XOrigin, YOrigin, maxHeight, maxWidth;
+} GLXPipeRectLimits;
+
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXHyperpipeNetworkSGIX * glXQueryHyperpipeNetworkSGIX (Display *, int *);
+extern int glXHyperpipeConfigSGIX (Display *, int, int, GLXHyperpipeConfigSGIX *, int *);
+extern GLXHyperpipeConfigSGIX * glXQueryHyperpipeConfigSGIX (Display *, int, int *);
+extern int glXDestroyHyperpipeConfigSGIX (Display *, int);
+extern int glXBindHyperpipeSGIX (Display *, int);
+extern int glXQueryHyperpipeBestAttribSGIX (Display *, int, int, int, void *, void *);
+extern int glXHyperpipeAttribSGIX (Display *, int, int, int, void *);
+extern int glXQueryHyperpipeAttribSGIX (Display *, int, int, int, void *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXHyperpipeNetworkSGIX * ( * PFNGLXQUERYHYPERPIPENETWORKSGIXPROC) (Display *dpy, int *npipes);
+typedef int ( * PFNGLXHYPERPIPECONFIGSGIXPROC) (Display *dpy, int networkId, int npipes, GLXHyperpipeConfigSGIX *cfg, int *hpId);
+typedef GLXHyperpipeConfigSGIX * ( * PFNGLXQUERYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId, int *npipes);
+typedef int ( * PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId);
+typedef int ( * PFNGLXBINDHYPERPIPESGIXPROC) (Display *dpy, int hpId);
+typedef int ( * PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList, void *returnAttribList);
+typedef int ( * PFNGLXHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList);
+typedef int ( * PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList);
+#endif
+
+#ifndef GLX_MESA_agp_offset
+#define GLX_MESA_agp_offset 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern unsigned int glXGetAGPOffsetMESA (const void *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void *pointer);
+#endif
+
+#ifndef GLX_EXT_fbconfig_packed_float
+#define GLX_EXT_fbconfig_packed_float 1
+#endif
+
+#ifndef GLX_EXT_framebuffer_sRGB
+#define GLX_EXT_framebuffer_sRGB 1
+#endif
+
+#ifndef GLX_EXT_texture_from_pixmap
+#define GLX_EXT_texture_from_pixmap 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXBindTexImageEXT (Display *, GLXDrawable, int, const int *);
+extern void glXReleaseTexImageEXT (Display *, GLXDrawable, int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
+typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer);
+#endif
+
+#ifndef GLX_NV_present_video
+#define GLX_NV_present_video 1
+#endif
+
+#ifndef GLX_NV_video_out
+#define GLX_NV_video_out 1
+#endif
+
+#ifndef GLX_NV_swap_group
+#define GLX_NV_swap_group 1
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dep/src/irrlicht/irrXML.cpp b/src/dep/src/irrlicht/irrXML.cpp
index 05cea70..17522cb 100644
--- a/src/dep/src/irrlicht/irrXML.cpp
+++ b/src/dep/src/irrlicht/irrXML.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h
 
@@ -20,7 +20,7 @@ public:
 
 	//! construct from filename
 	CFileReadCallBack(const char* filename)
-		: File(0), Size(0), Close(true)
+		: File(0), Size(-1), Close(true)
 	{
 		// open file
 		File = fopen(filename, "rb");
@@ -31,7 +31,7 @@ public:
 
 	//! construct from FILE pointer
 	CFileReadCallBack(FILE* file)
-		: File(file), Size(0), Close(false)
+		: File(file), Size(-1), Close(false)
 	{
 		if (File)
 			getFileSize();
@@ -83,63 +83,96 @@ private:
 //! Creates an instance of an UFT-8 or ASCII character xml parser. 
 IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(const char* filename)
 {
-	return new CXMLReaderImpl<char, IXMLBase>(new CFileReadCallBack(filename)); 
+	return createIrrXMLReader(new CFileReadCallBack(filename), true); 
 }
 
 
 //! Creates an instance of an UFT-8 or ASCII character xml parser. 
 IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(FILE* file)
 {
-	return new CXMLReaderImpl<char, IXMLBase>(new CFileReadCallBack(file)); 
+	return createIrrXMLReader(new CFileReadCallBack(file), true); 
 }
 
 
 //! Creates an instance of an UFT-8 or ASCII character xml parser. 
-IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(IFileReadCallBack* callback)
+IRRLICHT_API IrrXMLReader* IRRCALLCONV createIrrXMLReader(IFileReadCallBack* callback,
+														  bool deleteCallback)
 {
-	return new CXMLReaderImpl<char, IXMLBase>(callback, false); 
+	if (callback && (callback->getSize() >= 0))
+	{
+		return new CXMLReaderImpl<char, IXMLBase>(callback, deleteCallback); 
+	}
+	else
+	{
+		if(callback && deleteCallback)
+			delete callback;
+
+		return 0;
+	}
 }
 
 
 //! Creates an instance of an UTF-16 xml parser. 
 IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(const char* filename)
 {
-	return new CXMLReaderImpl<char16, IXMLBase>(new CFileReadCallBack(filename)); 
+	return createIrrXMLReaderUTF16(new CFileReadCallBack(filename), true); 
 }
 
 
 //! Creates an instance of an UTF-16 xml parser. 
 IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(FILE* file)
 {
-	return new CXMLReaderImpl<char16, IXMLBase>(new CFileReadCallBack(file)); 
+	return createIrrXMLReaderUTF16(new CFileReadCallBack(file), true); 
 }
 
 
 //! Creates an instance of an UTF-16 xml parser. 
-IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(IFileReadCallBack* callback)
+IRRLICHT_API IrrXMLReaderUTF16* IRRCALLCONV createIrrXMLReaderUTF16(IFileReadCallBack* callback,
+																	bool deleteCallback)
 {
-	return new CXMLReaderImpl<char16, IXMLBase>(callback, false); 
+	if (callback && (callback->getSize() >= 0))
+	{
+		return new CXMLReaderImpl<char16, IXMLBase>(callback, deleteCallback); 
+	}
+	else
+	{
+		if(callback && deleteCallback)
+			delete callback;
+
+		return 0;
+	}
 }
 
 
 //! Creates an instance of an UTF-32 xml parser. 
 IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(const char* filename)
 {
-	return new CXMLReaderImpl<char32, IXMLBase>(new CFileReadCallBack(filename)); 
+	return createIrrXMLReaderUTF32(new CFileReadCallBack(filename), true); 
 }
 
 
 //! Creates an instance of an UTF-32 xml parser. 
 IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(FILE* file)
 {
-	return new CXMLReaderImpl<char32, IXMLBase>(new CFileReadCallBack(file)); 
+	return createIrrXMLReaderUTF32(new CFileReadCallBack(file), true); 
 }
 
 
 //! Creates an instance of an UTF-32 xml parser. 
-IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(IFileReadCallBack* callback)
+IRRLICHT_API IrrXMLReaderUTF32* IRRCALLCONV createIrrXMLReaderUTF32(IFileReadCallBack* callback,
+																	bool deleteCallback)
 {
-	return new CXMLReaderImpl<char32, IXMLBase>(callback, false); 
+	if (callback && (callback->getSize() >= 0))
+	{
+		return new CXMLReaderImpl<char32, IXMLBase>(callback, deleteCallback); 
+	}
+	else
+	{
+		if(callback && deleteCallback)
+			delete callback;
+
+		return 0;
+	}
 }
 
 
diff --git a/src/dep/src/irrlicht/jpeglib/README b/src/dep/src/irrlicht/jpeglib/README
index 911d0e8..e69de29 100644
--- a/src/dep/src/irrlicht/jpeglib/README
+++ b/src/dep/src/irrlicht/jpeglib/README
@@ -1,385 +0,0 @@
-The Independent JPEG Group's JPEG software
-==========================================
-
-README for release 6b of 27-Mar-1998
-====================================
-
-This distribution contains the sixth public release of the Independent JPEG
-Group's free JPEG software.  You are welcome to redistribute this software and
-to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
-
-Serious users of this software (particularly those incorporating it into
-larger programs) should contact IJG at jpeg-info@uunet.uu.net to be added to
-our electronic mailing list.  Mailing list members are notified of updates
-and have a chance to participate in technical discussions, etc.
-
-This software is the work of Tom Lane, Philip Gladstone, Jim Boucher,
-Lee Crocker, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi,
-Guido Vollbeding, Ge' Weijers, and other members of the Independent JPEG
-Group.
-
-IJG is not affiliated with the official ISO JPEG standards committee.
-
-
-DOCUMENTATION ROADMAP
-=====================
-
-This file contains the following sections:
-
-OVERVIEW            General description of JPEG and the IJG software.
-LEGAL ISSUES        Copyright, lack of warranty, terms of distribution.
-REFERENCES          Where to learn more about JPEG.
-ARCHIVE LOCATIONS   Where to find newer versions of this software.
-RELATED SOFTWARE    Other stuff you should get.
-FILE FORMAT WARS    Software *not* to get.
-TO DO               Plans for future IJG releases.
-
-Other documentation files in the distribution are:
-
-User documentation:
-  install.doc       How to configure and install the IJG software.
-  usage.doc         Usage instructions for cjpeg, djpeg, jpegtran,
-                    rdjpgcom, and wrjpgcom.
-  *.1               Unix-style man pages for programs (same info as usage.doc).
-  wizard.doc        Advanced usage instructions for JPEG wizards only.
-  change.log        Version-to-version change highlights.
-Programmer and internal documentation:
-  libjpeg.doc       How to use the JPEG library in your own programs.
-  example.c         Sample code for calling the JPEG library.
-  structure.doc     Overview of the JPEG library's internal structure.
-  filelist.doc      Road map of IJG files.
-  coderules.doc     Coding style rules --- please read if you contribute code.
-
-Please read at least the files install.doc and usage.doc.  Useful information
-can also be found in the JPEG FAQ (Frequently Asked Questions) article.  See
-ARCHIVE LOCATIONS below to find out where to obtain the FAQ article.
-
-If you want to understand how the JPEG code works, we suggest reading one or
-more of the REFERENCES, then looking at the documentation files (in roughly
-the order listed) before diving into the code.
-
-
-OVERVIEW
-========
-
-This package contains C software to implement JPEG image compression and
-decompression.  JPEG (pronounced "jay-peg") is a standardized compression
-method for full-color and gray-scale images.  JPEG is intended for compressing
-"real-world" scenes; line drawings, cartoons and other non-realistic images
-are not its strong suit.  JPEG is lossy, meaning that the output image is not
-exactly identical to the input image.  Hence you must not use JPEG if you
-have to have identical output bits.  However, on typical photographic images,
-very good compression levels can be obtained with no visible change, and
-remarkably high compression levels are possible if you can tolerate a
-low-quality image.  For more details, see the references, or just experiment
-with various compression settings.
-
-This software implements JPEG baseline, extended-sequential, and progressive
-compression processes.  Provision is made for supporting all variants of these
-processes, although some uncommon parameter settings aren't implemented yet.
-For legal reasons, we are not distributing code for the arithmetic-coding
-variants of JPEG; see LEGAL ISSUES.  We have made no provision for supporting
-the hierarchical or lossless processes defined in the standard.
-
-We provide a set of library routines for reading and writing JPEG image files,
-plus two sample applications "cjpeg" and "djpeg", which use the library to
-perform conversion between JPEG and some other popular image file formats.
-The library is intended to be reused in other applications.
-
-In order to support file conversion and viewing software, we have included
-considerable functionality beyond the bare JPEG coding/decoding capability;
-for example, the color quantization modules are not strictly part of JPEG
-decoding, but they are essential for output to colormapped file formats or
-colormapped displays.  These extra functions can be compiled out of the
-library if not required for a particular application.  We have also included
-"jpegtran", a utility for lossless transcoding between different JPEG
-processes, and "rdjpgcom" and "wrjpgcom", two simple applications for
-inserting and extracting textual comments in JFIF files.
-
-The emphasis in designing this software has been on achieving portability and
-flexibility, while also making it fast enough to be useful.  In particular,
-the software is not intended to be read as a tutorial on JPEG.  (See the
-REFERENCES section for introductory material.)  Rather, it is intended to
-be reliable, portable, industrial-strength code.  We do not claim to have
-achieved that goal in every aspect of the software, but we strive for it.
-
-We welcome the use of this software as a component of commercial products.
-No royalty is required, but we do ask for an acknowledgement in product
-documentation, as described under LEGAL ISSUES.
-
-
-LEGAL ISSUES
-============
-
-In plain English:
-
-1. We don't promise that this software works.  (But if you find any bugs,
-   please let us know!)
-2. You can use this software for whatever you want.  You don't have to pay us.
-3. You may not pretend that you wrote this software.  If you use it in a
-   program, you must acknowledge somewhere in your documentation that
-   you've used the IJG code.
-
-In legalese:
-
-The authors make NO WARRANTY or representation, either express or implied,
-with respect to this software, its quality, accuracy, merchantability, or
-fitness for a particular purpose.  This software is provided "AS IS", and you,
-its user, assume the entire risk as to its quality and accuracy.
-
-This software is copyright (C) 1991-1998, Thomas G. Lane.
-All Rights Reserved except as specified below.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-software (or portions thereof) for any purpose, without fee, subject to these
-conditions:
-(1) If any part of the source code for this software is distributed, then this
-README file must be included, with this copyright and no-warranty notice
-unaltered; and any additions, deletions, or changes to the original files
-must be clearly indicated in accompanying documentation.
-(2) If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the work of
-the Independent JPEG Group".
-(3) Permission for use of this software is granted only if the user accepts
-full responsibility for any undesirable consequences; the authors accept
-NO LIABILITY for damages of any kind.
-
-These conditions apply to any software derived from or based on the IJG code,
-not just to the unmodified library.  If you use our work, you ought to
-acknowledge us.
-
-Permission is NOT granted for the use of any IJG author's name or company name
-in advertising or publicity relating to this software or products derived from
-it.  This software may be referred to only as "the Independent JPEG Group's
-software".
-
-We specifically permit and encourage the use of this software as the basis of
-commercial products, provided that all warranty or liability claims are
-assumed by the product vendor.
-
-
-ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
-sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
-ansi2knr.c is NOT covered by the above copyright and conditions, but instead
-by the usual distribution terms of the Free Software Foundation; principally,
-that you must include source code if you redistribute it.  (See the file
-ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
-of any program generated from the IJG code, this does not limit you more than
-the foregoing paragraphs do.
-
-The Unix configuration script "configure" was produced with GNU Autoconf.
-It is copyright by the Free Software Foundation but is freely distributable.
-The same holds for its supporting scripts (config.guess, config.sub,
-ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
-by M.I.T. but is also freely distributable.
-
-It appears that the arithmetic coding option of the JPEG spec is covered by
-patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
-legally be used without obtaining one or more licenses.  For this reason,
-support for arithmetic coding has been removed from the free JPEG software.
-(Since arithmetic coding provides only a marginal gain over the unpatented
-Huffman mode, it is unlikely that very many implementations will support it.)
-So far as we are aware, there are no patent restrictions on the remaining
-code.
-
-The IJG distribution formerly included code to read and write GIF files.
-To avoid entanglement with the Unisys LZW patent, GIF reading support has
-been removed altogether, and the GIF writer has been simplified to produce
-"uncompressed GIFs".  This technique does not use the LZW algorithm; the
-resulting GIF files are larger than usual, but are readable by all standard
-GIF decoders.
-
-We are required to state that
-    "The Graphics Interchange Format(c) is the Copyright property of
-    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
-    CompuServe Incorporated."
-
-
-REFERENCES
-==========
-
-We highly recommend reading one or more of these references before trying to
-understand the innards of the JPEG software.
-
-The best short technical introduction to the JPEG compression algorithm is
-	Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
-	Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
-(Adjacent articles in that issue discuss MPEG motion picture compression,
-applications of JPEG, and related topics.)  If you don't have the CACM issue
-handy, a PostScript file containing a revised version of Wallace's article is
-available at ftp://ftp.uu.net/graphics/jpeg/wallace.ps.gz.  The file (actually
-a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
-omits the sample images that appeared in CACM, but it includes corrections
-and some added material.  Note: the Wallace article is copyright ACM and IEEE,
-and it may not be used for commercial purposes.
-
-A somewhat less technical, more leisurely introduction to JPEG can be found in
-"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
-M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1.  This book provides
-good explanations and example C code for a multitude of compression methods
-including JPEG.  It is an excellent source if you are comfortable reading C
-code but don't know much about data compression in general.  The book's JPEG
-sample code is far from industrial-strength, but when you are ready to look
-at a full implementation, you've got one here...
-
-The best full description of JPEG is the textbook "JPEG Still Image Data
-Compression Standard" by William B. Pennebaker and Joan L. Mitchell, published
-by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.  Price US$59.95, 638 pp.
-The book includes the complete text of the ISO JPEG standards (DIS 10918-1
-and draft DIS 10918-2).  This is by far the most complete exposition of JPEG
-in existence, and we highly recommend it.
-
-The JPEG standard itself is not available electronically; you must order a
-paper copy through ISO or ITU.  (Unless you feel a need to own a certified
-official copy, we recommend buying the Pennebaker and Mitchell book instead;
-it's much cheaper and includes a great deal of useful explanatory material.)
-In the USA, copies of the standard may be ordered from ANSI Sales at (212)
-642-4900, or from Global Engineering Documents at (800) 854-7179.  (ANSI
-doesn't take credit card orders, but Global does.)  It's not cheap: as of
-1992, ANSI was charging $95 for Part 1 and $47 for Part 2, plus 7%
-shipping/handling.  The standard is divided into two parts, Part 1 being the
-actual specification, while Part 2 covers compliance testing methods.  Part 1
-is titled "Digital Compression and Coding of Continuous-tone Still Images,
-Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
-10918-1, ITU-T T.81.  Part 2 is titled "Digital Compression and Coding of
-Continuous-tone Still Images, Part 2: Compliance testing" and has document
-numbers ISO/IEC IS 10918-2, ITU-T T.83.
-
-Some extensions to the original JPEG standard are defined in JPEG Part 3,
-a newer ISO standard numbered ISO/IEC IS 10918-3 and ITU-T T.84.  IJG
-currently does not support any Part 3 extensions.
-
-The JPEG standard does not specify all details of an interchangeable file
-format.  For the omitted details we follow the "JFIF" conventions, revision
-1.02.  A copy of the JFIF spec is available from:
-	Literature Department
-	C-Cube Microsystems, Inc.
-	1778 McCarthy Blvd.
-	Milpitas, CA 95035
-	phone (408) 944-6300,  fax (408) 944-6314
-A PostScript version of this document is available by FTP at
-ftp://ftp.uu.net/graphics/jpeg/jfif.ps.gz.  There is also a plain text
-version at ftp://ftp.uu.net/graphics/jpeg/jfif.txt.gz, but it is missing
-the figures.
-
-The TIFF 6.0 file format specification can be obtained by FTP from
-ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
-found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
-IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
-Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
-(Compression tag 7).  Copies of this Note can be obtained from ftp.sgi.com or
-from ftp://ftp.uu.net/graphics/jpeg/.  It is expected that the next revision
-of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
-Although IJG's own code does not support TIFF/JPEG, the free libtiff library
-uses our library to implement TIFF/JPEG per the Note.  libtiff is available
-from ftp://ftp.sgi.com/graphics/tiff/.
-
-
-ARCHIVE LOCATIONS
-=================
-
-The "official" archive site for this software is ftp.uu.net (Internet
-address 192.48.96.9).  The most recent released version can always be found
-there in directory graphics/jpeg.  This particular version will be archived
-as ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz.  If you don't have
-direct Internet access, UUNET's archives are also available via UUCP; contact
-help@uunet.uu.net for information on retrieving files that way.
-
-Numerous Internet sites maintain copies of the UUNET files.  However, only
-ftp.uu.net is guaranteed to have the latest official version.
-
-You can also obtain this software in DOS-compatible "zip" archive format from
-the SimTel archives (ftp://ftp.simtel.net/pub/simtelnet/msdos/graphics/), or
-on CompuServe in the Graphics Support forum (GO CIS:GRAPHSUP), library 12
-"JPEG Tools".  Again, these versions may sometimes lag behind the ftp.uu.net
-release.
-
-The JPEG FAQ (Frequently Asked Questions) article is a useful source of
-general information about JPEG.  It is updated constantly and therefore is
-not included in this distribution.  The FAQ is posted every two weeks to
-Usenet newsgroups comp.graphics.misc, news.answers, and other groups.
-It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
-and other news.answers archive sites, including the official news.answers
-archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
-If you don't have Web or FTP access, send e-mail to mail-server@rtfm.mit.edu
-with body
-	send usenet/news.answers/jpeg-faq/part1
-	send usenet/news.answers/jpeg-faq/part2
-
-
-RELATED SOFTWARE
-================
-
-Numerous viewing and image manipulation programs now support JPEG.  (Quite a
-few of them use this library to do so.)  The JPEG FAQ described above lists
-some of the more popular free and shareware viewers, and tells where to
-obtain them on Internet.
-
-If you are on a Unix machine, we highly recommend Jef Poskanzer's free
-PBMPLUS software, which provides many useful operations on PPM-format image
-files.  In particular, it can convert PPM images to and from a wide range of
-other formats, thus making cjpeg/djpeg considerably more useful.  The latest
-version is distributed by the NetPBM group, and is available from numerous
-sites, notably ftp://wuarchive.wustl.edu/graphics/graphics/packages/NetPBM/.
-Unfortunately PBMPLUS/NETPBM is not nearly as portable as the IJG software is;
-you are likely to have difficulty making it work on any non-Unix machine.
-
-A different free JPEG implementation, written by the PVRG group at Stanford,
-is available from ftp://havefun.stanford.edu/pub/jpeg/.  This program
-is designed for research and experimentation rather than production use;
-it is slower, harder to use, and less portable than the IJG code, but it
-is easier to read and modify.  Also, the PVRG code supports lossless JPEG,
-which we do not.  (On the other hand, it doesn't do progressive JPEG.)
-
-
-FILE FORMAT WARS
-================
-
-Some JPEG programs produce files that are not compatible with our library.
-The root of the problem is that the ISO JPEG committee failed to specify a
-concrete file format.  Some vendors "filled in the blanks" on their own,
-creating proprietary formats that no one else could read.  (For example, none
-of the early commercial JPEG implementations for the Macintosh were able to
-exchange compressed files.)
-
-The file format we have adopted is called JFIF (see REFERENCES).  This format
-has been agreed to by a number of major commercial JPEG vendors, and it has
-become the de facto standard.  JFIF is a minimal or "low end" representation.
-We recommend the use of TIFF/JPEG (TIFF revision 6.0 as modified by TIFF
-Technical Note #2) for "high end" applications that need to record a lot of
-additional data about an image.  TIFF/JPEG is fairly new and not yet widely
-supported, unfortunately.
-
-The upcoming JPEG Part 3 standard defines a file format called SPIFF.
-SPIFF is interoperable with JFIF, in the sense that most JFIF decoders should
-be able to read the most common variant of SPIFF.  SPIFF has some technical
-advantages over JFIF, but its major claim to fame is simply that it is an
-official standard rather than an informal one.  At this point it is unclear
-whether SPIFF will supersede JFIF or whether JFIF will remain the de-facto
-standard.  IJG intends to support SPIFF once the standard is frozen, but we
-have not decided whether it should become our default output format or not.
-(In any case, our decoder will remain capable of reading JFIF indefinitely.)
-
-Various proprietary file formats incorporating JPEG compression also exist.
-We have little or no sympathy for the existence of these formats.  Indeed,
-one of the original reasons for developing this free software was to help
-force convergence on common, open format standards for JPEG files.  Don't
-use a proprietary file format!
-
-
-TO DO
-=====
-
-The major thrust for v7 will probably be improvement of visual quality.
-The current method for scaling the quantization tables is known not to be
-very good at low Q values.  We also intend to investigate block boundary
-smoothing, "poor man's variable quantization", and other means of improving
-quality-vs-file-size performance without sacrificing compatibility.
-
-In future versions, we are considering supporting some of the upcoming JPEG
-Part 3 extensions --- principally, variable quantization and the SPIFF file
-format.
-
-As always, speeding things up is of great interest.
-
-Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net.
diff --git a/src/dep/src/irrlicht/jpeglib/configure b/src/dep/src/irrlicht/jpeglib/configure
index d3239e7..e69de29 100644
--- a/src/dep/src/irrlicht/jpeglib/configure
+++ b/src/dep/src/irrlicht/jpeglib/configure
@@ -1,2011 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-shared         build shared library using GNU libtool"
-ac_help="$ac_help
-  --enable-static         build static library using GNU libtool"
-ac_help="$ac_help
-  --enable-maxmem[=N]     enable use of temp files, set max mem usage to N MB"
-ac_help="$ac_help
-"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *=*)
-    varname=`echo "$ac_option"|sed -e 's/=.*//'`
-    # Reject names that aren't valid shell variable names.
-    if test -n "`echo $varname| sed 's/[a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $varname: invalid shell variable name" 1>&2; exit 1; }
-    fi
-    val="`echo "$ac_option"|sed 's/[^=]*=//'`"
-    test -n "$verbose" && echo "	setting shell variable $varname to $val"
-    eval "$varname='$val'"
-    eval "export $varname" ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=jcmaster.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:538: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:567: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  ac_prog_rejected=no
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:615: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext <<EOF
-#line 625 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-if { (eval echo configure:629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:649: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:654: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  test "${CFLAGS+set}" = set || CFLAGS="-O2"
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-O"
-fi
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:681: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 696 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 713 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
-echo "configure:742: checking for function prototypes" >&5
-if eval "test \"`echo '$''{'ijg_cv_have_prototypes'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 747 "configure"
-#include "confdefs.h"
-
-int testfunction (int arg1, int * arg2); /* check prototypes */
-struct methods_struct {		/* check method-pointer declarations */
-  int (*error_exit) (char *msgtext);
-  int (*trace_message) (char *msgtext);
-  int (*another_method) (void);
-};
-int testfunction (int arg1, int * arg2) /* check definitions */
-{ return arg2[arg1]; }
-int test2function (void)	/* check void arg list */
-{ return 0; }
-
-int main() {
- 
-; return 0; }
-EOF
-if { (eval echo configure:765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ijg_cv_have_prototypes=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ijg_cv_have_prototypes=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ijg_cv_have_prototypes" 1>&6
-if test $ijg_cv_have_prototypes = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_PROTOTYPES 
-EOF
-
-else
-  echo Your compiler does not seem to know about function prototypes.
-  echo Perhaps it needs a special switch to enable ANSI C mode.
-  echo If so, we recommend running configure like this:
-  echo "   ./configure  CC='cc -switch'"
-  echo where -switch is the proper switch.
-fi
-ac_safe=`echo "stddef.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for stddef.h""... $ac_c" 1>&6
-echo "configure:792: checking for stddef.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 797 "configure"
-#include "confdefs.h"
-#include <stddef.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_STDDEF_H 
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-ac_safe=`echo "stdlib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for stdlib.h""... $ac_c" 1>&6
-echo "configure:828: checking for stdlib.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 833 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_STDLIB_H 
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for string.h""... $ac_c" 1>&6
-echo "configure:864: checking for string.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 869 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define NEED_BSD_STRINGS 
-EOF
-
-fi
-
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:900: checking for size_t" >&5
-cat > conftest.$ac_ext <<EOF
-#line 902 "configure"
-#include "confdefs.h"
-
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#include <stdio.h>
-#ifdef NEED_BSD_STRINGS
-#include <strings.h>
-#else
-#include <string.h>
-#endif
-typedef size_t my_size_t;
-
-int main() {
- my_size_t foovar; 
-; return 0; }
-EOF
-if { (eval echo configure:923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ijg_size_t_ok=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ijg_size_t_ok="not ANSI, perhaps it is in sys/types.h"
-fi
-rm -f conftest*
-echo "$ac_t""$ijg_size_t_ok" 1>&6
-if test "$ijg_size_t_ok" != yes; then
-ac_safe=`echo "sys/types.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/types.h""... $ac_c" 1>&6
-echo "configure:937: checking for sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 942 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define NEED_SYS_TYPES_H 
-EOF
-
-cat > conftest.$ac_ext <<EOF
-#line 968 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "size_t" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ijg_size_t_ok="size_t is in sys/types.h"
-else
-  rm -rf conftest*
-  ijg_size_t_ok=no
-fi
-rm -f conftest*
-
-else
-  echo "$ac_t""no" 1>&6
-ijg_size_t_ok=no
-fi
-
-echo "$ac_t""$ijg_size_t_ok" 1>&6
-if test "$ijg_size_t_ok" = no; then
-  echo Type size_t is not defined in any of the usual places.
-  echo Try putting '"typedef unsigned int size_t;"' in jconfig.h.
-fi
-fi
-echo $ac_n "checking for type unsigned char""... $ac_c" 1>&6
-echo "configure:994: checking for type unsigned char" >&5
-cat > conftest.$ac_ext <<EOF
-#line 996 "configure"
-#include "confdefs.h"
-
-int main() {
- unsigned char un_char; 
-; return 0; }
-EOF
-if { (eval echo configure:1003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-cat >> confdefs.h <<\EOF
-#define HAVE_UNSIGNED_CHAR 
-EOF
-
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6
-fi
-rm -f conftest*
-echo $ac_n "checking for type unsigned short""... $ac_c" 1>&6
-echo "configure:1018: checking for type unsigned short" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1020 "configure"
-#include "confdefs.h"
-
-int main() {
- unsigned short un_short; 
-; return 0; }
-EOF
-if { (eval echo configure:1027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-cat >> confdefs.h <<\EOF
-#define HAVE_UNSIGNED_SHORT 
-EOF
-
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6
-fi
-rm -f conftest*
-echo $ac_n "checking for type void""... $ac_c" 1>&6
-echo "configure:1042: checking for type void" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1044 "configure"
-#include "confdefs.h"
-
-/* Caution: a C++ compiler will insist on valid prototypes */
-typedef void * void_ptr;	/* check void * */
-#ifdef HAVE_PROTOTYPES		/* check ptr to function returning void */
-typedef void (*void_func) (int a, int b);
-#else
-typedef void (*void_func) ();
-#endif
-
-#ifdef HAVE_PROTOTYPES		/* check void function result */
-void test3function (void_ptr arg1, void_func arg2)
-#else
-void test3function (arg1, arg2)
-     void_ptr arg1;
-     void_func arg2;
-#endif
-{
-  char * locptr = (char *) arg1; /* check casting to and from void * */
-  arg1 = (void *) locptr;
-  (*arg2) (1, 2);		/* check call of fcn returning void */
-}
-
-int main() {
- 
-; return 0; }
-EOF
-if { (eval echo configure:1072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define void char
-EOF
-
-fi
-rm -f conftest*
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1088: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1093 "configure"
-#include "confdefs.h"
-
-int main() {
-
-/* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this.  */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
-   It does not let you subtract one const X* pointer from another in an arm
-   of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this.  */
-  char *t;
-  char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-  *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-  struct s { int j; const int *ap[3]; };
-  struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-  const int foo = 10;
-}
-
-; return 0; }
-EOF
-if { (eval echo configure:1142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_const=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_const=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
-  cat >> confdefs.h <<\EOF
-#define const 
-EOF
-
-fi
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1163: checking for inline" >&5
-ijg_cv_inline=""
-cat > conftest.$ac_ext <<EOF
-#line 1166 "configure"
-#include "confdefs.h"
-
-int main() {
-} __inline__ int foo() { return 0; }
-int bar() { return foo();
-; return 0; }
-EOF
-if { (eval echo configure:1174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ijg_cv_inline="__inline__"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 1182 "configure"
-#include "confdefs.h"
-
-int main() {
-} __inline int foo() { return 0; }
-int bar() { return foo();
-; return 0; }
-EOF
-if { (eval echo configure:1190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ijg_cv_inline="__inline"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 1198 "configure"
-#include "confdefs.h"
-
-int main() {
-} inline int foo() { return 0; }
-int bar() { return foo();
-; return 0; }
-EOF
-if { (eval echo configure:1206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ijg_cv_inline="inline"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-echo "$ac_t""$ijg_cv_inline" 1>&6
-cat >> confdefs.h <<EOF
-#define INLINE $ijg_cv_inline
-EOF
-
-echo $ac_n "checking for broken incomplete types""... $ac_c" 1>&6
-echo "configure:1224: checking for broken incomplete types" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1226 "configure"
-#include "confdefs.h"
- typedef struct undefined_structure * undef_struct_ptr; 
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:1233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""ok" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""broken" 1>&6
-cat >> confdefs.h <<\EOF
-#define INCOMPLETE_TYPES_BROKEN 
-EOF
-
-fi
-rm -f conftest*
-echo $ac_n "checking for short external names""... $ac_c" 1>&6
-echo "configure:1248: checking for short external names" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1250 "configure"
-#include "confdefs.h"
-
-int possibly_duplicate_function () { return 0; }
-int possibly_dupli_function () { return 1; }
-
-int main() {
- 
-; return 0; }
-EOF
-if { (eval echo configure:1260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  echo "$ac_t""ok" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""short" 1>&6
-cat >> confdefs.h <<\EOF
-#define NEED_SHORT_EXTERNAL_NAMES 
-EOF
-
-fi
-rm -f conftest*
-echo $ac_n "checking to see if char is signed""... $ac_c" 1>&6
-echo "configure:1275: checking to see if char is signed" >&5
-if test "$cross_compiling" = yes; then
-  echo Assuming that char is signed on target machine.
-echo If it is unsigned, this will be a little bit inefficient.
-
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1282 "configure"
-#include "confdefs.h"
-
-#ifdef HAVE_PROTOTYPES
-int is_char_signed (int arg)
-#else
-int is_char_signed (arg)
-     int arg;
-#endif
-{
-  if (arg == 189) {		/* expected result for unsigned char */
-    return 0;			/* type char is unsigned */
-  }
-  else if (arg != -67) {	/* expected result for signed char */
-    printf("Hmm, it seems 'char' is not eight bits wide on your machine.\n");
-    printf("I fear the JPEG software will not work at all.\n\n");
-  }
-  return 1;			/* assume char is signed otherwise */
-}
-char signed_char_check = (char) (-67);
-main() {
-  exit(is_char_signed((int) signed_char_check));
-}
-EOF
-if { (eval echo configure:1306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define CHAR_IS_UNSIGNED 
-EOF
-
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  echo "$ac_t""yes" 1>&6
-fi
-rm -fr conftest*
-fi
-
-echo $ac_n "checking to see if right shift is signed""... $ac_c" 1>&6
-echo "configure:1323: checking to see if right shift is signed" >&5
-if test "$cross_compiling" = yes; then
-  echo "$ac_t""Assuming that right shift is signed on target machine." 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1328 "configure"
-#include "confdefs.h"
-
-#ifdef HAVE_PROTOTYPES
-int is_shifting_signed (long arg)
-#else
-int is_shifting_signed (arg)
-     long arg;
-#endif
-/* See whether right-shift on a long is signed or not. */
-{
-  long res = arg >> 4;
-
-  if (res == -0x7F7E80CL) {	/* expected result for signed shift */
-    return 1;			/* right shift is signed */
-  }
-  /* see if unsigned-shift hack will fix it. */
-  /* we can't just test exact value since it depends on width of long... */
-  res |= (~0L) << (32-4);
-  if (res == -0x7F7E80CL) {	/* expected result now? */
-    return 0;			/* right shift is unsigned */
-  }
-  printf("Right shift isn't acting as I expect it to.\n");
-  printf("I fear the JPEG software will not work at all.\n\n");
-  return 0;			/* try it with unsigned anyway */
-}
-main() {
-  exit(is_shifting_signed(-0x7F7E80B1L));
-}
-EOF
-if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define RIGHT_SHIFT_IS_UNSIGNED 
-EOF
-
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  echo "$ac_t""yes" 1>&6
-fi
-rm -fr conftest*
-fi
-
-echo $ac_n "checking to see if fopen accepts b spec""... $ac_c" 1>&6
-echo "configure:1375: checking to see if fopen accepts b spec" >&5
-if test "$cross_compiling" = yes; then
-  echo "$ac_t""Assuming that it does." 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1380 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-main() {
-  if (fopen("conftestdata", "wb") != NULL)
-    exit(0);
-  exit(1);
-}
-EOF
-if { (eval echo configure:1390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define DONT_USE_B_MODE 
-EOF
-
-fi
-rm -fr conftest*
-fi
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1436: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1488: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-# Decide whether to use libtool,
-# and if so whether to build shared, static, or both flavors of library.
-LTSHARED="no"
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  LTSHARED="$enableval"
-fi
-
-LTSTATIC="no"
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  LTSTATIC="$enableval"
-fi
-
-if test "x$LTSHARED" != xno  -o  "x$LTSTATIC" != xno; then
-  USELIBTOOL="yes"
-  LIBTOOL="./libtool"
-  O="lo"
-  A="la"
-  LN='$(LIBTOOL) --mode=link $(CC)'
-  INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
-  INSTALL_PROGRAM="\$(LIBTOOL) --mode=install $INSTALL_PROGRAM"
-else
-  USELIBTOOL="no"
-  LIBTOOL=""
-  O="o"
-  A="a"
-  LN='$(CC)'
-  INSTALL_LIB="$INSTALL_DATA"
-fi
-
-
-
-
-
-
-# Configure libtool if needed.
-if test $USELIBTOOL = yes; then
-  disable_shared=
-  disable_static=
-  if test "x$LTSHARED" = xno; then
-    disable_shared="--disable-shared"
-  fi
-  if test "x$LTSTATIC" = xno; then
-    disable_static="--disable-static"
-  fi
-  $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh
-fi
-
-# Select memory manager depending on user input.
-# If no "-enable-maxmem", use jmemnobs
-MEMORYMGR='jmemnobs.$(O)'
-MAXMEM="no"
-# Check whether --enable-maxmem or --disable-maxmem was given.
-if test "${enable_maxmem+set}" = set; then
-  enableval="$enable_maxmem"
-  MAXMEM="$enableval"
-fi
-
-# support --with-maxmem for backwards compatibility with IJG V5.
-# Check whether --with-maxmem or --without-maxmem was given.
-if test "${with_maxmem+set}" = set; then
-  withval="$with_maxmem"
-  MAXMEM="$withval"
-fi
-
-if test "x$MAXMEM" = xyes; then
-  MAXMEM=1
-fi
-if test "x$MAXMEM" != xno; then
-  if test -n "`echo $MAXMEM | sed 's/[0-9]//g'`"; then
-    { echo "configure: error: non-numeric argument to --enable-maxmem" 1>&2; exit 1; }
-  fi
-  DEFAULTMAXMEM=`expr $MAXMEM \* 1048576`
-cat >> confdefs.h <<EOF
-#define DEFAULT_MAX_MEM ${DEFAULTMAXMEM}
-EOF
-
-echo $ac_n "checking for 'tmpfile()'""... $ac_c" 1>&6
-echo "configure:1596: checking for 'tmpfile()'" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1598 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-int main() {
- FILE * tfile = tmpfile(); 
-; return 0; }
-EOF
-if { (eval echo configure:1605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-MEMORYMGR='jmemansi.$(O)'
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6
-MEMORYMGR='jmemname.$(O)'
-cat >> confdefs.h <<\EOF
-#define NEED_SIGNAL_CATCHER 
-EOF
-
-echo $ac_n "checking for 'mktemp()'""... $ac_c" 1>&6
-echo "configure:1620: checking for 'mktemp()'" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1622 "configure"
-#include "confdefs.h"
-
-int main() {
- char fname[80]; mktemp(fname); 
-; return 0; }
-EOF
-if { (eval echo configure:1629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6
-cat >> confdefs.h <<\EOF
-#define NO_MKTEMP 
-EOF
-
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-
-
-# Extract the library version ID from jpeglib.h.
-echo $ac_n "checking libjpeg version number""... $ac_c" 1>&6
-echo "configure:1650: checking libjpeg version number" >&5
-JPEG_LIB_VERSION=`sed -e '/^#define JPEG_LIB_VERSION/!d' -e 's/^[^0-9]*\([0-9][0-9]*\).*$/\1/' $srcdir/jpeglib.h`
-echo "$ac_t""$JPEG_LIB_VERSION" 1>&6
-
-
-# Prepare to massage makefile.cfg correctly.
-if test $ijg_cv_have_prototypes = yes; then
-  A2K_DEPS=""
-  COM_A2K="# "
-else
-  A2K_DEPS="ansi2knr"
-  COM_A2K=""
-fi
-
-
-# ansi2knr needs -DBSD if string.h is missing
-if test $ac_cv_header_string_h = no; then
-  ANSI2KNRFLAGS="-DBSD"
-else
-  ANSI2KNRFLAGS=""
-fi
-
-# Substitutions to enable or disable libtool-related stuff
-if test $USELIBTOOL = yes -a $ijg_cv_have_prototypes = yes; then
-  COM_LT=""
-else
-  COM_LT="# "
-fi
-
-if test "x$LTSHARED" != xno; then
-  FORCE_INSTALL_LIB="install-lib"
-else
-  FORCE_INSTALL_LIB=""
-fi
-
-# Set up -I directives
-if test "x$srcdir" = x.; then
-  INCLUDEFLAGS='-I$(srcdir)'
-else
-  INCLUDEFLAGS='-I. -I$(srcdir)'
-fi
-
-trap '' 1 2 15
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile:makefile.cfg jconfig.h:jconfig.cfg" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@CC@%$CC%g
-s%@CPP@%$CPP%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@RANLIB@%$RANLIB%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@O@%$O%g
-s%@A@%$A%g
-s%@LN@%$LN%g
-s%@INSTALL_LIB@%$INSTALL_LIB%g
-s%@MEMORYMGR@%$MEMORYMGR%g
-s%@JPEG_LIB_VERSION@%$JPEG_LIB_VERSION%g
-s%@A2K_DEPS@%$A2K_DEPS%g
-s%@COM_A2K@%$COM_A2K%g
-s%@ANSI2KNRFLAGS@%$ANSI2KNRFLAGS%g
-s%@COM_LT@%$COM_LT%g
-s%@FORCE_INSTALL_LIB@%$FORCE_INSTALL_LIB%g
-s%@INCLUDEFLAGS@%$INCLUDEFLAGS%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile:makefile.cfg"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="jconfig.h:jconfig.cfg"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/src/dep/src/irrlicht/jpeglib/install-sh b/src/dep/src/irrlicht/jpeglib/install-sh
index 082fd7c..e69de29 100644
--- a/src/dep/src/irrlicht/jpeglib/install-sh
+++ b/src/dep/src/irrlicht/jpeglib/install-sh
@@ -1,250 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/src/dep/src/irrlicht/jpeglib/ltconfig b/src/dep/src/irrlicht/jpeglib/ltconfig
index 679dd73..e69de29 100644
--- a/src/dep/src/irrlicht/jpeglib/ltconfig
+++ b/src/dep/src/irrlicht/jpeglib/ltconfig
@@ -1,1512 +0,0 @@
-#! /bin/sh
-
-# ltconfig - Create a system-specific libtool.
-# Copyright (C) 1996-1998 Free Software Foundation, Inc.
-# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A lot of this script is taken from autoconf-2.10.
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
-
-echo=echo
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
-else
-  # The Solaris and AIX default echo program unquotes backslashes.
-  # This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  # So, we emulate echo with printf '%s\n'
-  echo="printf %s\\n"
-  if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
-  else
-    # Oops.  We have no working printf.  Try to find a not-so-buggy echo.
-    echo=echo
-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-    for dir in $PATH /usr/ucb; do
-      if test -f $dir/echo && test "X`$dir/echo '\t'`" = 'X\t'; then
-        echo="$dir/echo"
-        break
-      fi
-    done
-    IFS="$save_ifs"
-  fi
-fi
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-
-# The name of this program.
-progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
-
-# Constants:
-PROGRAM=ltconfig
-PACKAGE=libtool
-VERSION=1.2
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
-rm="rm -f"
-
-help="Try \`$progname --help' for more information."
-
-# Global variables:
-can_build_shared=yes
-enable_shared=yes
-# All known linkers require a `.a' archive for static linking.
-enable_static=yes
-ltmain=
-silent=
-srcdir=
-ac_config_guess=
-ac_config_sub=
-host=
-nonopt=
-verify_host=yes
-with_gcc=no
-with_gnu_ld=no
-
-old_AR="$AR"
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-old_CPPFLAGS="$CPPFLAGS"
-old_LD="$LD"
-old_LN_S="$LN_S"
-old_NM="$NM"
-old_RANLIB="$RANLIB"
-
-# Parse the command line options.
-args=
-prev=
-for option
-do
-  case "$option" in
-  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    eval "$prev=\$option"
-    prev=
-    continue
-  fi
-
-  case "$option" in
-  --help) cat <<EOM
-Usage: $progname [OPTION]... LTMAIN [HOST]
-
-Generate a system-specific libtool script.
-
-    --disable-shared       do not build shared libraries
-    --disable-static       do not build static libraries
-    --help                 display this help and exit
-    --no-verify            do not verify that HOST is a valid host type
-    --quiet                same as \`--silent'
-    --silent               do not print informational messages
-    --srcdir=DIR           find \`config.guess' in DIR
-    --version              output version information and exit
-    --with-gcc             assume that the GNU C compiler will be used
-    --with-gnu-ld          assume that the C compiler uses the GNU linker
-
-LTMAIN is the \`ltmain.sh' shell script fragment that provides basic libtool
-functionality.
-
-HOST is the canonical host system name [default=guessed].
-EOM
-  exit 0
-  ;;
-
-  --disable-shared) enable_shared=no ;;
-
-  --disable-static) enable_static=no ;;
-
-  --quiet | --silent) silent=yes ;;
-
-  --srcdir) prev=srcdir ;;
-  --srcdir=*) srcdir="$optarg" ;;
-
-  --no-verify) verify_host=no ;;
-
-  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;;
-
-  --with-gcc) with_gcc=yes ;;
-  --with-gnu-ld) with_gnu_ld=yes ;;
-
-  -*)
-    echo "$progname: unrecognized option \`$option'" 1>&2
-    echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    if test -z "$ltmain"; then
-      ltmain="$option"
-    elif test -z "$host"; then
-# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
-#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
-#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
-#      fi
-      host="$option"
-    else
-      echo "$progname: too many arguments" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi ;;
-  esac
-done
-
-if test -z "$ltmain"; then
-  echo "$progname: you must specify a LTMAIN file" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-if test -f "$ltmain"; then :
-else
-  echo "$progname: \`$ltmain' does not exist" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-# Quote any args containing shell metacharacters.
-ltconfig_args=
-for arg
-do
-  case "$arg" in
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ltconfig_args="$ltconfig_args '$arg'" ;;
-  *) ltconfig_args="$ltconfig_args $arg" ;;
-  esac
-done
-
-# A relevant subset of AC_INIT.
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 5 compiler messages saved in config.log
-# 6 checking for... messages and results
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>>./config.log
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-if test -z "$srcdir"; then
-  # Assume the source directory is the same one as the path to ltmain.sh.
-  srcdir=`$echo "$ltmain" | $Xsed -e 's%/[^/]*$%%'`
-  test "$srcdir" = "$ltmain" && srcdir=.
-fi
-
-trap "$rm conftest*; exit 1" 1 2 15
-if test "$verify_host" = yes; then
-  # Check for config.guess and config.sub.
-  ac_aux_dir=
-  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-    if test -f $ac_dir/config.guess; then
-      ac_aux_dir=$ac_dir
-      break
-    fi
-  done
-  if test -z "$ac_aux_dir"; then
-    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-  ac_config_guess=$ac_aux_dir/config.guess
-  ac_config_sub=$ac_aux_dir/config.sub
-
-  # Make sure we can run config.sub.
-  if $ac_config_sub sun4 >/dev/null 2>&1; then :
-  else
-    echo "$progname: cannot run $ac_config_sub" 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-
-  echo $ac_n "checking host system type""... $ac_c" 1>&6
-
-  host_alias=$host
-  case "$host_alias" in
-  "")
-    if host_alias=`$ac_config_guess`; then :
-    else
-      echo "$progname: cannot guess host type; you must specify one" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi ;;
-  esac
-  host=`$ac_config_sub $host_alias`
-  echo "$ac_t$host" 1>&6
-
-  # Make sure the host verified.
-  test -z "$host" && exit 1
-
-elif test -z "$host"; then
-  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
-  echo "$help" 1>&2
-  exit 1
-else
-  host_alias=$host
-fi
-
-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-case "$host_os" in
-linux-gnu*) ;;
-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-esac
-
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-case "$host_os" in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "${COLLECT_NAMES+set}" != set; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR cru $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-# Set a sane default for `AR'.
-test -z "$AR" && AR=ar
-
-# If RANLIB is not set, then run the test.
-if test "${RANLIB+set}" != "set"; then
-  result=no
-
-  echo $ac_n "checking for ranlib... $ac_c" 1>&6
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-  for dir in $PATH; do
-    test -z "$dir" && dir=.
-    if test -f $dir/ranlib; then
-      RANLIB="ranlib"
-      result="ranlib"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  echo "$ac_t$result" 1>&6
-fi
-
-if test -n "$RANLIB"; then
-  old_archive_cmds="$old_archive_cmds;\$RANLIB \$oldlib"
-  old_postinstall_cmds="\$RANLIB \$oldlib;$old_postinstall_cmds"
-fi
-
-# Check to see if we are using GCC.
-if test "$with_gcc" != yes || test -z "$CC"; then
-  # If CC is not set, then try to find GCC or a usable CC.
-  if test -z "$CC"; then
-    echo $ac_n "checking for gcc... $ac_c" 1>&6
-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-    for dir in $PATH; do
-      IFS="$save_ifs"
-      test -z "$dir" && dir=.
-      if test -f $dir/gcc; then
-	CC="gcc"
-	break
-      fi
-    done
-    IFS="$save_ifs"
-
-    if test -n "$CC"; then
-      echo "$ac_t$CC" 1>&6
-    else
-      echo "$ac_t"no 1>&6
-    fi
-  fi
-
-  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
-  if test -z "$CC"; then
-    echo $ac_n "checking for cc... $ac_c" 1>&6
-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-    cc_rejected=no
-    for dir in $PATH; do
-      test -z "$dir" && dir=.
-      if test -f $dir/cc; then
-	if test "$dir/cc" = "/usr/ucb/cc"; then
-	  cc_rejected=yes
-	  continue
-	fi
-	CC="cc"
-	break
-      fi
-    done
-    IFS="$save_ifs"
-    if test $cc_rejected = yes; then
-      # We found a bogon in the path, so make sure we never use it.
-      set dummy $CC
-      shift
-      if test $# -gt 0; then
-	# We chose a different compiler from the bogus one.
-	# However, it has the same name, so the bogon will be chosen
-	# first if we set CC to just the name; use the full file name.
-	shift
-	set dummy "$dir/cc" "$@"
-	shift
-	CC="$@"
-      fi
-    fi
-
-    if test -n "$CC"; then
-      echo "$ac_t$CC" 1>&6
-    else
-      echo "$ac_t"no 1>&6
-    fi
-
-    if test -z "$CC"; then
-      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
-      exit 1
-    fi
-  fi
-
-  # Now see if the compiler is really GCC.
-  with_gcc=no
-  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
-  echo "$progname:424: checking whether we are using GNU C" >&5
-
-  $rm conftest.c
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-    with_gcc=yes
-  fi
-  $rm conftest.c
-  echo "$ac_t$with_gcc" 1>&6
-fi
-
-# Allow CC to be a program name with arguments.
-set dummy $CC
-compiler="$2"
-
-echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
-pic_flag=
-special_shlib_compile_flags=
-wl=
-link_static_flag=
-no_builtin_flag=
-
-if test "$with_gcc" = yes; then
-  wl='-Wl,'
-  link_static_flag='-static'
-  no_builtin_flag=' -fno-builtin'
-
-  case "$host_os" in
-  aix3* | aix4* | irix5* | irix6* | osf3* | osf4*)
-    # PIC is the default for these OSes.
-    ;;
-  os2*)
-    # We can build DLLs from non-PIC.
-    ;;
-  amigaos*)
-    # FIXME: we need at least 68020 code to build shared libraries, but
-    # adding the `-m68020' flag to GCC prevents building anything better,
-    # like `-m68040'.
-    pic_flag='-m68020 -resident32 -malways-restore-a4'
-    ;;
-  *)
-    pic_flag='-fPIC'
-    ;;
-  esac
-else
-  # PORTME Check for PIC flags for the system compiler.
-  case "$host_os" in
-  aix3* | aix4*)
-    # All AIX code is PIC.
-    link_static_flag='-bnso -bI:/lib/syscalls.exp'
-    ;;
-
-  hpux9* | hpux10*)
-    # Is there a better link_static_flag that works with the bundled CC?
-    wl='-Wl,'
-    link_static_flag="${wl}-a ${wl}archive"
-    pic_flag='+Z'
-    ;;
-
-  irix5* | irix6*)
-    wl='-Wl,'
-    link_static_flag='-non_shared'
-    # PIC (with -KPIC) is the default.
-    ;;
-
-  os2*)
-    # We can build DLLs from non-PIC.
-    ;;
-
-  osf3* | osf4*)
-    # All OSF/1 code is PIC.
-    wl='-Wl,'
-    link_static_flag='-non_shared'
-    ;;
-
-  sco3.2v5*)
-    pic_flag='-Kpic'
-    link_static_flag='-dn'
-    special_shlib_compile_flags='-belf'
-    ;;
-
-  solaris2*)
-    pic_flag='-KPIC'
-    link_static_flag='-Bstatic'
-    wl='-Wl,'
-    ;;
-
-  sunos4*)
-    pic_flag='-PIC'
-    link_static_flag='-Bstatic'
-    wl='-Qoption ld '
-    ;;
-
-  sysv4.2uw2*)
-    pic_flag='-KPIC'
-    link_static_flag='-Bstatic'
-    wl='-Wl,'
-    ;;
-
-  uts4*)
-    pic_flag='-pic'
-    link_static_flag='-Bstatic'
-    ;;
-
-  *)
-    can_build_shared=no
-    ;;
-  esac
-fi
-
-if test -n "$pic_flag"; then
-  echo "$ac_t$pic_flag" 1>&6
-
-  # Check to make sure the pic_flag actually works.
-  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
-  $rm conftest*
-  echo > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $pic_flag -DPIC"
-  echo "$progname:547: checking if $compiler PIC flag $pic_flag works" >&5
-  if { (eval echo $progname:548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
-    # Append any warnings to the config.log.
-    cat conftest.err 1>&5
-
-    # On HP-UX, both CC and GCC only warn that PIC is supported... then they
-    # create non-PIC objects.  So, if there were any warnings, we assume that
-    # PIC is not supported.
-    if test -s conftest.err; then
-      echo "$ac_t"no 1>&6
-      can_build_shared=no
-      pic_flag=
-    else
-      echo "$ac_t"yes 1>&6
-      pic_flag=" $pic_flag"
-    fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    can_build_shared=no
-    pic_flag=
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-else
-  echo "$ac_t"none 1>&6
-fi
-
-# Check for any special shared library compilation flags.
-if test -n "$special_shlib_compile_flags"; then
-  echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
-  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
-  else
-    echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
-    can_build_shared=no
-  fi
-fi
-
-echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
-$rm conftest*
-echo 'main(){return(0);}' > conftest.c
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $link_static_flag"
-echo "$progname:591: checking if $compiler static flag $link_static_flag works" >&5
-if { (eval echo $progname:592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  echo "$ac_t$link_static_flag" 1>&6
-else
-  echo "$ac_t"none 1>&6
-  link_static_flag=
-fi
-LDFLAGS="$save_LDFLAGS"
-$rm conftest*
-
-if test -z "$LN_S"; then
-  # Check to see if we can use ln -s, or we need hard links.
-  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
-  $rm conftestdata
-  if ln -s X conftestdata 2>/dev/null; then
-    $rm conftestdata
-    LN_S="ln -s"
-  else
-    LN_S=ln
-  fi
-  if test "$LN_S" = "ln -s"; then
-    echo "$ac_t"yes 1>&6
-  else
-    echo "$ac_t"no 1>&6
-  fi
-fi
-
-# Make sure LD is an absolute path.
-if test -z "$LD"; then
-  ac_prog=ld
-  if test "$with_gcc" = yes; then
-    # Check if gcc -print-prog-name=ld gives a path.
-    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
-    echo "$progname:624: checking for ld used by GCC" >&5
-    ac_prog=`($CC -print-prog-name=ld) 2>&5`
-    case "$ac_prog" in
-    # Accept absolute paths.
-    /* | [A-Za-z]:\\*)
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-    "")
-      # If it fails, then pretend we are not using GCC.
-      ac_prog=ld
-      ;;
-    *)
-      # If it is relative, then search for the first ld in PATH.
-      with_gnu_ld=unknown
-      ;;
-    esac
-  elif test "$with_gnu_ld" = yes; then
-    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
-    echo "$progname:642: checking for GNU ld" >&5
-  else
-    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-    echo "$progname:645: checking for non-GNU ld" >&5
-  fi
-
-  if test -z "$LD"; then
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-    for ac_dir in $PATH; do
-      test -z "$ac_dir" && ac_dir=.
-      if test -f "$ac_dir/$ac_prog"; then
-	LD="$ac_dir/$ac_prog"
-	# Check to see if the program is GNU ld.  I'd rather use --version,
-	# but apparently some GNU ld's only accept -v.
-	# Break only if it was the GNU/non-GNU ld that we prefer.
-	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	  test "$with_gnu_ld" != no && break
-	else
-	  test "$with_gnu_ld" != yes && break
-	fi
-      fi
-    done
-    IFS="$ac_save_ifs"
-  fi
-
-  if test -n "$LD"; then
-    echo "$ac_t$LD" 1>&6
-  else
-    echo "$ac_t"no 1>&6
-  fi
-
-  if test -z "$LD"; then
-    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
-    exit 1
-  fi
-fi
-
-# Check to see if it really is or is not GNU ld.
-echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
-# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-echo "$ac_t$with_gnu_ld" 1>&6
-
-# See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
-
-allow_undefined_flag=
-no_undefined_flag=
-archive_cmds=
-old_archive_from_new_cmds=
-export_dynamic_flag_spec=
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-hardcode_shlibpath_var=unsupported
-runpath_var=
-
-case "$host_os" in
-amigaos* | sunos4*)
-  # On these operating systems, we should treat GNU ld like the system ld.
-  gnu_ld_acts_native=yes
-  ;;
-*)
-  gnu_ld_acts_native=no
-  ;;
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
-
-  # See if GNU ld supports shared libraries.
-  if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-    archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
-    runpath_var=LD_RUN_PATH
-    ld_shlibs=yes
-  else
-    ld_shlibs=no
-  fi
-
-  if test "$ld_shlibs" = yes; then
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-  fi
-else
-  # PORTME fill in a description of your system's linker (not GNU ld)
-  case "$host_os" in
-  aix3*)
-    allow_undefined_flag=unsupported
-    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' > $lib.exp;$LD -o $objdir/$soname$libobjs -bE:$lib.exp -T512 -H512 -bM:SRE;$AR cru $lib $objdir/$soname'
-    # Note: this linker hardcodes the directories in LIBPATH if there
-    # are no directories specified by -L.
-    hardcode_minus_L=yes
-    if test "$with_gcc" = yes && test -z "$link_static_flag"; then
-      # Neither direct hardcoding nor static linking is supported with a
-      # broken collect2.
-      hardcode_direct=unsupported
-    fi
-    ;;
-
-  aix4*)
-    allow_undefined_flag=unsupported
-    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' > $lib.exp;$CC -o $objdir/$soname$libobjs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry;$AR cru $lib $objdir/$soname'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    ;;
-
-  amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data;$echo "#define NAME $libname" > $objdir/a2ixlibrary.data;$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data;$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data;$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data;$AR cru $lib$libobjs;$RANLIB $lib;(cd $objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    ;;
-
-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-  # support.  Future versions do this automatically, but an explicit c++rt0.o
-  # does not break anything, and helps significantly (at the cost of a little
-  # extra space).
-  freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib$libobjs /usr/lib/c++rt0.o'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-  freebsd2*)
-    archive_cmds='$LD -Bshareable -o $lib$libobjs'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
-  freebsd3*)
-    archive_cmds='$CC -shared -o $lib$libobjs'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  hpux9*)
-    archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs;mv $objdir/$soname $lib'
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
-
-  hpux10*)
-    archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs'
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
-
-  irix5* | irix6*)
-    archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs'
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    ;;
-
-  netbsd*)
-    # Tested with NetBSD 1.2 ld
-    archive_cmds='$LD -Bshareable -o $lib$libobjs'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib$libobjs'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  os2*)
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def;$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def;$echo DATA >> $objdir/$libname.def;$echo " SINGLE NONSHARED" >> $objdir/$libname.def;$echo EXPORTS >> $objdir/$libname.def;emxexp$libobjs >> $objdir/$libname.def;$CC -Zdll -Zcrtdll -o $lib$libobjs $objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
-    ;;
-
-  osf3* | osf4*)
-    allow_undefined_flag=' -expect_unresolved \*'
-    archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs$deplibs'
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    ;;
-
-  sco3.2v5*)
-    archive_cmds='$LD -G -o $lib$libobjs'
-    hardcode_direct=yes
-    ;;
-
-  solaris2*)
-    no_undefined_flag=' -z text'
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib$libobjs'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_shlibpath_var=no
-
-    # Solaris 2 before 2.5 hardcodes -L paths.
-    case "$host_os" in
-    solaris2.[0-4]*)
-      hardcode_minus_L=yes
-      ;;
-    esac
-    ;;
-
-  sunos4*)
-    if test "$with_gcc" = yes; then
-      archive_cmds='$CC -shared -o $lib$libobjs'
-    else
-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
-    fi
-
-    if test "$with_gnu_ld" = yes; then
-      export_dynamic_flag_spec='${wl}-export-dynamic'
-    fi
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  uts4*)
-    archive_cmds='$LD -G -h $soname -o $lib$libobjs'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=no
-    hardcode_minus_L=no
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    ld_shlibs=no
-    can_build_shared=no
-    ;;
-  esac
-fi
-echo "$ac_t$ld_shlibs" 1>&6
-
-if test -z "$NM"; then
-  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
-  case "$NM" in
-  /* | [A-Za-z]:\\*) ;; # Let the user override the test with a path.
-  *)
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-    for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
-      test -z "$ac_dir" && ac_dir=.
-      if test -f $ac_dir/nm; then
-        # Check to see if the nm accepts a BSD-compat flag.
-        # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-        #   nm: unknown option "B" ignored
-        if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-          NM="$ac_dir/nm -B"
-        elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-          NM="$ac_dir/nm -p"
-	else
-          NM="$ac_dir/nm"
-	fi
-        break
-      fi
-    done
-    IFS="$ac_save_ifs"
-    test -z "$NM" && NM=nm
-    ;;
-  esac
-  echo "$ac_t$NM" 1>&6
-fi
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRSTU]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \1'
-
-# Define system-specific variables.
-case "$host_os" in
-aix*)
-  symcode='[BCDTU]'
-  ;;
-irix*)
-  # Cannot use undefined symbols on IRIX because inlined functions mess us up.
-  symcode='[BCDEGRST]'
-  ;;
-solaris2*)
-  symcode='[BDTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  symcode='[ABCDGISTUW]'
-fi
-
-# Write the raw and C identifiers.
-global_symbol_pipe="sed -n -e 's/^.* $symcode $sympat$/$symxfrm/p'"
-
-# Check to see that the pipe works correctly.
-pipe_works=no
-$rm conftest*
-cat > conftest.c <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-echo "$progname:971: checking if global_symbol_pipe works" >&5
-if { (eval echo $progname:972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
-  # Now try to grab the symbols.
-  nlist=conftest.nm
-  if { echo "$progname:975: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
-
-    # Try sorting and uniquifying the output.
-    if sort "$nlist" | uniq > "$nlist"T; then
-      mv -f "$nlist"T "$nlist"
-      wcout=`wc "$nlist" 2>/dev/null`
-      count=`$echo "X$wcout" | $Xsed -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
-      (test "$count" -ge 0) 2>/dev/null || count=-1
-    else
-      rm -f "$nlist"T
-      count=-1
-    fi
-
-    # Make sure that we snagged all the symbols we need.
-    if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-      if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-	cat <<EOF > conftest.c
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-        # Now generate the symbol file.
-        sed 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> conftest.c
-
-	cat <<EOF >> conftest.c
-#if defined (__STDC__) && __STDC__
-# define __ptr_t void *
-#else
-# define __ptr_t char *
-#endif
-
-/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
-int dld_preloaded_symbol_count = $count;
-
-/* The mapping between symbol names and symbols. */
-struct {
-  char *name;
-  __ptr_t address;
-}
-dld_preloaded_symbols[] =
-{
-EOF
-        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> conftest.c
-        cat <<\EOF >> conftest.c
-  {0, (__ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-        # Now try linking the two files.
-        mv conftest.o conftestm.o
-	save_LIBS="$LIBS"
-	save_CFLAGS="$CFLAGS"
-        LIBS='conftestm.o'
-	CFLAGS="$CFLAGS$no_builtin_flag"
-        if { (eval echo $progname:1033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-          pipe_works=yes
-        else
-          echo "$progname: failed program was:" >&5
-          cat conftest.c >&5
-        fi
-        LIBS="$save_LIBS"
-      else
-        echo "cannot find nm_test_func in $nlist" >&5
-      fi
-    else
-      echo "cannot find nm_test_var in $nlist" >&5
-    fi
-  else
-    echo "cannot run $global_symbol_pipe" >&5
-  fi
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.c >&5
-fi
-$rm conftest*
-
-# Do not use the global_symbol_pipe unless it works.
-echo "$ac_t$pipe_works" 1>&6
-test "$pipe_works" = yes || global_symbol_pipe=
-
-# Check hardcoding attributes.
-echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var"; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no && \
-     test "$hardcode_minus_L" != no && \
-     test "$hardcode_shlibpath_var" != no; then
-
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-elif test "$hardcode_direct" != yes && \
-     test "$hardcode_minus_L" != yes && \
-     test "$hardcode_shlibpath_var" != yes; then
-  # We cannot hardcode anything.
-  hardcode_action=unsupported
-else
-  # We can only hardcode existing directories.
-  hardcode_action=relink
-fi
-echo "$ac_t$hardcode_action" 1>&6
-test "$hardcode_action" = unsupported && can_build_shared=no
-
-
-reload_flag=
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
-# PORTME Some linker may need a different reload flag.
-reload_flag='-r'
-echo "$ac_t$reload_flag"
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-# PORTME Fill in your ld.so characteristics
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-version_type=none
-dynamic_linker="$host_os ld.so"
-
-echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-case "$host_os" in
-aix3* | aix4*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}.so.$major'
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-  ;;
-
-freebsd2* | freebsd3*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-gnu*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so.$versuffix'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-hpux9* | hpux10*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  dynamic_linker="$host_os dld.sl"
-  version_type=sunos
-  shlibpath_var=SHLIB_PATH
-  library_names_spec='${libname}${release}.sl.$versuffix ${libname}${release}.sl.$major $libname.sl'
-  soname_spec='${libname}${release}.sl.$major'
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6*)
-  version_type=osf
-  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
-  soname_spec='${libname}${release}.so.$major'
-  finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-
-  if test -f /lib/ld.so.1; then
-    dynamic_linker='GNU ld.so'
-  else
-    # Only the GNU ld.so supports shared libraries on MkLinux.
-    case "$host_cpu" in
-    powerpc*) dynamic_linker=no ;;
-    *) dynamic_linker='Linux ld.so' ;;
-    esac
-  fi
-  ;;
-
-netbsd* | openbsd*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so.$versuffix'
-  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-os2*)
-  libname_spec='$name'
-  library_names_spec='$libname.dll $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4*)
-  version_type=osf
-  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}.so.$major'
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris2*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
-  soname_spec='${libname}${release}.so.$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so.$versuffix'
-  finish_cmds='PATH="$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-sysv4.2uw2*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
-  soname_spec='${libname}${release}.so.$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
-  soname_spec='${libname}${release}.so.$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$ac_t$dynamic_linker"
-test "$dynamic_linker" = no && can_build_shared=no
-
-# Report the final consequences.
-echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
-
-echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds;\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-esac
-
-echo "$ac_t$enable_shared" 1>&6
-
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-
-echo "checking whether to build static libraries... $enable_static" 1>&6
-
-echo $ac_n "checking for objdir... $ac_c" 1>&6
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-echo "$ac_t$objdir" 1>&6
-
-# Copy echo and quote the copy, instead of the original, because it is
-# used later.
-ltecho="$echo"
-
-# Now quote all the things that may contain metacharacters.
-for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
-  old_LN_S AR CC LD LN_S NM reload_flag reload_cmds wl pic_flag \
-  link_static_flag no_builtin_flag export_dynamic_flag_spec \
-  libname_spec library_names_spec soname_spec RANLIB \
-  old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-  old_postuninstall_cmds archive_cmds postinstall_cmds postuninstall_cmds \
-  allow_undefined_flag no_undefined_flag \
-  finish_cmds finish_eval global_symbol_pipe \
-  hardcode_libdir_flag_spec hardcode_libdir_separator; do
-
-  case "$var" in
-  reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-  old_postinstall_cmds | old_postuninstall_cmds | archive_cmds | \
-  postinstall_cmds | postuninstall_cmds | finish_cmds)
-    # Double-quote double-evaled strings.
-    eval "$var=\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\"\`"
-    ;;
-  *)
-    eval "$var=\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`"
-    ;;
-  esac
-done
-
-ofile=libtool
-trap "$rm $ofile; exit 1" 1 2 15
-echo creating $ofile
-$rm $ofile
-cat <<EOF > $ofile
-#! /bin/sh
-
-# libtool - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION
-# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
-#
-# Copyright (C) 1996-1998 Free Software Foundation, Inc.
-# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This program was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\
-# LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\
-#   $0$ltconfig_args
-#
-# Compiler and other test output produced by $progname, useful for
-# debugging $progname, is in ./config.log if it exists.
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="sed -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
-
-# An echo program that does not interpret backslashes.
-echo="$ltecho"
-
-# The version of $progname that generated this script.
-LTCONFIG_VERSION="$VERSION"
-
-# Shell to use when invoking shell scripts.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Whether or not to build libtool libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build old-style libraries.
-build_old_libs=$enable_static
-
-# The host system.
-host_alias="$host_alias"
-host="$host"
-
-# The archiver.
-AR="$AR"
-
-# The default C compiler.
-CC="$CC"
-
-# The linker used to build libraries.
-LD="$LD"
-
-# Whether we need hard or soft links.
-LN_S="$LN_S"
-
-# A BSD-compatible nm program.
-NM="$NM"
-
-# The name of the directory that contains temporary libtool files.
-objdir="$objdir"
-
-# How to create reloadable object files.
-reload_flag="$reload_flag"
-reload_cmds="$reload_cmds"
-
-# How to pass a linker flag through the compiler.
-wl="$wl"
-
-# Additional compiler flags for building library objects.
-pic_flag="$pic_flag"
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="$link_static_flag"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag="$no_builtin_flag"
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="$export_dynamic_flag_spec"
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec="$libname_spec"
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec="$library_names_spec"
-
-# The coded name of the library, if different from the real name.
-soname_spec="$soname_spec"
-
-# Commands used to build and install an old-style archive.
-RANLIB="$RANLIB"
-old_archive_cmds="$old_archive_cmds"
-old_postinstall_cmds="$old_postinstall_cmds"
-old_postuninstall_cmds="$old_postuninstall_cmds"
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds="$old_archive_from_new_cmds"
-
-# Commands used to build and install a shared archive.
-archive_cmds="$archive_cmds"
-postinstall_cmds="$postinstall_cmds"
-postuninstall_cmds="$postuninstall_cmds"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag="$allow_undefined_flag"
-
-# Flag that forces no undefined symbols.
-no_undefined_flag="$no_undefined_flag"
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="$finish_cmds"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval="$finish_eval"
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="$global_symbol_pipe"
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec="$hardcode_libdir_flag_spec"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator="$hardcode_libdir_separator"
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-EOF
-
-case "$host_os" in
-aix3*)
-  cat <<\EOF >> $ofile
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "${COLLECT_NAMES+set}" != set; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-
-EOF
-  ;;
-esac
-
-# Append the ltmain.sh script.
-cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1)
-
-chmod +x $ofile
-exit 0
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/src/dep/src/irrlicht/libpng/example.c b/src/dep/src/irrlicht/libpng/example.c
index 2db293a..e40059c 100644
--- a/src/dep/src/irrlicht/libpng/example.c
+++ b/src/dep/src/irrlicht/libpng/example.c
@@ -1,6 +1,820 @@
 
 #if 0 /* in case someone actually tries to compile this */
 
+/* example.c - an example of using libpng
+ * Last changed in libpng 1.2.35 [February 14, 2009]
+ * This file has been placed in the public domain by the authors.
+ * Maintained 1998-2009 Glenn Randers-Pehrson
+ * Maintained 1996, 1997 Andreas Dilger)
+ * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+/* This is an example of how to use libpng to read and write PNG files.
+ * The file libpng.txt is much more verbose then this.  If you have not
+ * read it, do so first.  This was designed to be a starting point of an
+ * implementation.  This is not officially part of libpng, is hereby placed
+ * in the public domain, and therefore does not require a copyright notice.
+ *
+ * This file does not currently compile, because it is missing certain
+ * parts, like allocating memory to hold an image.  You will have to
+ * supply these parts to get it to compile.  For an example of a minimal
+ * working PNG reader/writer, see pngtest.c, included in this distribution;
+ * see also the programs in the contrib directory.
+ */
+
+#include "png.h"
+
+ /* The png_jmpbuf() macro, used in error handling, became available in
+  * libpng version 1.0.6.  If you want to be able to run your code with older
+  * versions of libpng, you must define the macro yourself (but only if it
+  * is not already defined by libpng!).
+  */
+
+#ifndef png_jmpbuf
+#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#endif
+
+/* Check to see if a file is a PNG file using png_sig_cmp().  png_sig_cmp()
+ * returns zero if the image is a PNG and nonzero if it isn't a PNG.
+ *
+ * The function check_if_png() shown here, but not used, returns nonzero (true)
+ * if the file can be opened and is a PNG, 0 (false) otherwise.
+ *
+ * If this call is successful, and you are going to keep the file open,
+ * you should call png_set_sig_bytes(png_ptr, PNG_BYTES_TO_CHECK); once
+ * you have created the png_ptr, so that libpng knows your application
+ * has read that many bytes from the start of the file.  Make sure you
+ * don't call png_set_sig_bytes() with more than 8 bytes read or give it
+ * an incorrect number of bytes read, or you will either have read too
+ * many bytes (your fault), or you are telling libpng to read the wrong
+ * number of magic bytes (also your fault).
+ *
+ * Many applications already read the first 2 or 4 bytes from the start
+ * of the image to determine the file type, so it would be easiest just
+ * to pass the bytes to png_sig_cmp() or even skip that if you know
+ * you have a PNG file, and call png_set_sig_bytes().
+ */
+#define PNG_BYTES_TO_CHECK 4
+int check_if_png(char *file_name, FILE **fp)
+{
+   char buf[PNG_BYTES_TO_CHECK];
+
+   /* Open the prospective PNG file. */
+   if ((*fp = fopen(file_name, "rb")) == NULL)
+      return 0;
+
+   /* Read in some of the signature bytes */
+   if (fread(buf, 1, PNG_BYTES_TO_CHECK, *fp) != PNG_BYTES_TO_CHECK)
+      return 0;
+
+   /* Compare the first PNG_BYTES_TO_CHECK bytes of the signature.
+      Return nonzero (true) if they match */
+
+   return(!png_sig_cmp(buf, (png_size_t)0, PNG_BYTES_TO_CHECK));
+}
+
+/* Read a PNG file.  You may want to return an error code if the read
+ * fails (depending upon the failure).  There are two "prototypes" given
+ * here - one where we are given the filename, and we need to open the
+ * file, and the other where we are given an open file (possibly with
+ * some or all of the magic bytes read - see comments above).
+ */
+#ifdef open_file /* prototype 1 */
+void read_png(char *file_name)  /* We need to open the file */
+{
+   png_structp png_ptr;
+   png_infop info_ptr;
+   unsigned int sig_read = 0;
+   png_uint_32 width, height;
+   int bit_depth, color_type, interlace_type;
+   FILE *fp;
+
+   if ((fp = fopen(file_name, "rb")) == NULL)
+      return (ERROR);
+#else no_open_file /* prototype 2 */
+void read_png(FILE *fp, unsigned int sig_read)  /* file is already open */
+{
+   png_structp png_ptr;
+   png_infop info_ptr;
+   png_uint_32 width, height;
+   int bit_depth, color_type, interlace_type;
+#endif no_open_file /* only use one prototype! */
+
+   /* Create and initialize the png_struct with the desired error handler
+    * functions.  If you want to use the default stderr and longjump method,
+    * you can supply NULL for the last three parameters.  We also supply the
+    * the compiler header file version, so that we know if the application
+    * was compiled with a compatible version of the library.  REQUIRED
+    */
+   png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+      png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+
+   if (png_ptr == NULL)
+   {
+      fclose(fp);
+      return (ERROR);
+   }
+
+   /* Allocate/initialize the memory for image information.  REQUIRED. */
+   info_ptr = png_create_info_struct(png_ptr);
+   if (info_ptr == NULL)
+   {
+      fclose(fp);
+      png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+      return (ERROR);
+   }
+
+   /* Set error handling if you are using the setjmp/longjmp method (this is
+    * the normal method of doing things with libpng).  REQUIRED unless you
+    * set up your own error handlers in the png_create_read_struct() earlier.
+    */
+
+   if (setjmp(png_jmpbuf(png_ptr)))
+   {
+      /* Free all of the memory associated with the png_ptr and info_ptr */
+      png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+      fclose(fp);
+      /* If we get here, we had a problem reading the file */
+      return (ERROR);
+   }
+
+   /* One of the following I/O initialization methods is REQUIRED */
+#ifdef streams /* PNG file I/O method 1 */
+   /* Set up the input control if you are using standard C streams */
+   png_init_io(png_ptr, fp);
+
+#else no_streams /* PNG file I/O method 2 */
+   /* If you are using replacement read functions, instead of calling
+    * png_init_io() here you would call:
+    */
+   png_set_read_fn(png_ptr, (void *)user_io_ptr, user_read_fn);
+   /* where user_io_ptr is a structure you want available to the callbacks */
+#endif no_streams /* Use only one I/O method! */
+
+   /* If we have already read some of the signature */
+   png_set_sig_bytes(png_ptr, sig_read);
+
+#ifdef hilevel
+   /*
+    * If you have enough memory to read in the entire image at once,
+    * and you need to specify only transforms that can be controlled
+    * with one of the PNG_TRANSFORM_* bits (this presently excludes
+    * dithering, filling, setting background, and doing gamma
+    * adjustment), then you can read the entire image (including
+    * pixels) into the info structure with this call:
+    */
+   png_read_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
+#else
+   /* OK, you're doing it the hard way, with the lower-level functions */
+
+   /* The call to png_read_info() gives us all of the information from the
+    * PNG file before the first IDAT (image data chunk).  REQUIRED
+    */
+   png_read_info(png_ptr, info_ptr);
+
+   png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+       &interlace_type, int_p_NULL, int_p_NULL);
+
+/* Set up the data transformations you want.  Note that these are all
+ * optional.  Only call them if you want/need them.  Many of the
+ * transformations only work on specific types of images, and many
+ * are mutually exclusive.
+ */
+
+   /* tell libpng to strip 16 bit/color files down to 8 bits/color */
+   png_set_strip_16(png_ptr);
+
+   /* Strip alpha bytes from the input data without combining with the
+    * background (not recommended).
+    */
+   png_set_strip_alpha(png_ptr);
+
+   /* Extract multiple pixels with bit depths of 1, 2, and 4 from a single
+    * byte into separate bytes (useful for paletted and grayscale images).
+    */
+   png_set_packing(png_ptr);
+
+   /* Change the order of packed pixels to least significant bit first
+    * (not useful if you are using png_set_packing). */
+   png_set_packswap(png_ptr);
+
+   /* Expand paletted colors into true RGB triplets */
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+      png_set_palette_to_rgb(png_ptr);
+
+   /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
+   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+      png_set_expand_gray_1_2_4_to_8(png_ptr);
+
+   /* Expand paletted or RGB images with transparency to full alpha channels
+    * so the data will be available as RGBA quartets.
+    */
+   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+      png_set_tRNS_to_alpha(png_ptr);
+
+   /* Set the background color to draw transparent and alpha images over.
+    * It is possible to set the red, green, and blue components directly
+    * for paletted images instead of supplying a palette index.  Note that
+    * even if the PNG file supplies a background, you are not required to
+    * use it - you should use the (solid) application background if it has one.
+    */
+
+   png_color_16 my_background, *image_background;
+
+   if (png_get_bKGD(png_ptr, info_ptr, &image_background))
+      png_set_background(png_ptr, image_background,
+                         PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+   else
+      png_set_background(png_ptr, &my_background,
+                         PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+
+   /* Some suggestions as to how to get a screen gamma value */
+
+   /* Note that screen gamma is the display_exponent, which includes
+    * the CRT_exponent and any correction for viewing conditions */
+   if (/* We have a user-defined screen gamma value */)
+   {
+      screen_gamma = user-defined screen_gamma;
+   }
+   /* This is one way that applications share the same screen gamma value */
+   else if ((gamma_str = getenv("SCREEN_GAMMA")) != NULL)
+   {
+      screen_gamma = atof(gamma_str);
+   }
+   /* If we don't have another value */
+   else
+   {
+      screen_gamma = 2.2;  /* A good guess for a PC monitors in a dimly
+                              lit room */
+      screen_gamma = 1.7 or 1.0;  /* A good guess for Mac systems */
+   }
+
+   /* Tell libpng to handle the gamma conversion for you.  The final call
+    * is a good guess for PC generated images, but it should be configurable
+    * by the user at run time by the user.  It is strongly suggested that
+    * your application support gamma correction.
+    */
+
+   int intent;
+
+   if (png_get_sRGB(png_ptr, info_ptr, &intent))
+      png_set_gamma(png_ptr, screen_gamma, 0.45455);
+   else
+   {
+      double image_gamma;
+      if (png_get_gAMA(png_ptr, info_ptr, &image_gamma))
+         png_set_gamma(png_ptr, screen_gamma, image_gamma);
+      else
+         png_set_gamma(png_ptr, screen_gamma, 0.45455);
+   }
+
+   /* Dither RGB files down to 8 bit palette or reduce palettes
+    * to the number of colors available on your screen.
+    */
+   if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      int num_palette;
+      png_colorp palette;
+
+      /* This reduces the image to the application supplied palette */
+      if (/* we have our own palette */)
+      {
+         /* An array of colors to which the image should be dithered */
+         png_color std_color_cube[MAX_SCREEN_COLORS];
+
+         png_set_dither(png_ptr, std_color_cube, MAX_SCREEN_COLORS,
+            MAX_SCREEN_COLORS, png_uint_16p_NULL, 0);
+      }
+      /* This reduces the image to the palette supplied in the file */
+      else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette))
+      {
+         png_uint_16p histogram = NULL;
+
+         png_get_hIST(png_ptr, info_ptr, &histogram);
+
+         png_set_dither(png_ptr, palette, num_palette,
+                        max_screen_colors, histogram, 0);
+      }
+   }
+
+   /* invert monochrome files to have 0 as white and 1 as black */
+   png_set_invert_mono(png_ptr);
+
+   /* If you want to shift the pixel values from the range [0,255] or
+    * [0,65535] to the original [0,7] or [0,31], or whatever range the
+    * colors were originally in:
+    */
+   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
+   {
+      png_color_8p sig_bit;
+
+      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+      png_set_shift(png_ptr, sig_bit);
+   }
+
+   /* flip the RGB pixels to BGR (or RGBA to BGRA) */
+   if (color_type & PNG_COLOR_MASK_COLOR)
+      png_set_bgr(png_ptr);
+
+   /* swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
+   png_set_swap_alpha(png_ptr);
+
+   /* swap bytes of 16 bit files to least significant byte first */
+   png_set_swap(png_ptr);
+
+   /* Add filler (or alpha) byte (before/after each RGB triplet) */
+   png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
+
+   /* Turn on interlace handling.  REQUIRED if you are not using
+    * png_read_image().  To see how to handle interlacing passes,
+    * see the png_read_row() method below:
+    */
+   number_passes = png_set_interlace_handling(png_ptr);
+
+   /* Optional call to gamma correct and add the background to the palette
+    * and update info structure.  REQUIRED if you are expecting libpng to
+    * update the palette for you (ie you selected such a transform above).
+    */
+   png_read_update_info(png_ptr, info_ptr);
+
+   /* Allocate the memory to hold the image using the fields of info_ptr. */
+
+   /* The easiest way to read the image: */
+   png_bytep row_pointers[height];
+
+   /* Clear the pointer array */
+   for (row = 0; row < height; row++)
+      row_pointers[row] = NULL;
+
+   for (row = 0; row < height; row++)
+      row_pointers[row] = png_malloc(png_ptr, png_get_rowbytes(png_ptr,
+         info_ptr));
+
+   /* Now it's time to read the image.  One of these methods is REQUIRED */
+#ifdef entire /* Read the entire image in one go */
+   png_read_image(png_ptr, row_pointers);
+
+#else no_entire /* Read the image one or more scanlines at a time */
+   /* The other way to read images - deal with interlacing: */
+
+   for (pass = 0; pass < number_passes; pass++)
+   {
+#ifdef single /* Read the image a single row at a time */
+      for (y = 0; y < height; y++)
+      {
+         png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL, 1);
+      }
+
+#else no_single /* Read the image several rows at a time */
+      for (y = 0; y < height; y += number_of_rows)
+      {
+#ifdef sparkle /* Read the image using the "sparkle" effect. */
+         png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL,
+            number_of_rows);
+#else no_sparkle /* Read the image using the "rectangle" effect */
+         png_read_rows(png_ptr, png_bytepp_NULL, &row_pointers[y],
+            number_of_rows);
+#endif no_sparkle /* use only one of these two methods */
+      }
+
+      /* if you want to display the image after every pass, do
+         so here */
+#endif no_single /* use only one of these two methods */
+   }
+#endif no_entire /* use only one of these two methods */
+
+   /* read rest of file, and get additional chunks in info_ptr - REQUIRED */
+   png_read_end(png_ptr, info_ptr);
+#endif hilevel
+
+   /* At this point you have read the entire image */
+
+   /* clean up after the read, and free any memory allocated - REQUIRED */
+   png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+
+   /* close the file */
+   fclose(fp);
+
+   /* that's it */
+   return (OK);
+}
+
+/* progressively read a file */
+
+int
+initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr)
+{
+   /* Create and initialize the png_struct with the desired error handler
+    * functions.  If you want to use the default stderr and longjump method,
+    * you can supply NULL for the last three parameters.  We also check that
+    * the library version is compatible in case we are using dynamically
+    * linked libraries.
+    */
+   *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+       png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+
+   if (*png_ptr == NULL)
+   {
+      *info_ptr = NULL;
+      return (ERROR);
+   }
+
+   *info_ptr = png_create_info_struct(png_ptr);
+
+   if (*info_ptr == NULL)
+   {
+      png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
+      return (ERROR);
+   }
+
+   if (setjmp(png_jmpbuf((*png_ptr))))
+   {
+      png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
+      return (ERROR);
+   }
+
+   /* This one's new.  You will need to provide all three
+    * function callbacks, even if you aren't using them all.
+    * If you aren't using all functions, you can specify NULL
+    * parameters.  Even when all three functions are NULL,
+    * you need to call png_set_progressive_read_fn().
+    * These functions shouldn't be dependent on global or
+    * static variables if you are decoding several images
+    * simultaneously.  You should store stream specific data
+    * in a separate struct, given as the second parameter,
+    * and retrieve the pointer from inside the callbacks using
+    * the function png_get_progressive_ptr(png_ptr).
+    */
+   png_set_progressive_read_fn(*png_ptr, (void *)stream_data,
+      info_callback, row_callback, end_callback);
+
+   return (OK);
+}
+
+int
+process_data(png_structp *png_ptr, png_infop *info_ptr,
+   png_bytep buffer, png_uint_32 length)
+{
+   if (setjmp(png_jmpbuf((*png_ptr))))
+   {
+      /* Free the png_ptr and info_ptr memory on error */
+      png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
+      return (ERROR);
+   }
+
+   /* This one's new also.  Simply give it chunks of data as
+    * they arrive from the data stream (in order, of course).
+    * On Segmented machines, don't give it any more than 64K.
+    * The library seems to run fine with sizes of 4K, although
+    * you can give it much less if necessary (I assume you can
+    * give it chunks of 1 byte, but I haven't tried with less
+    * than 256 bytes yet).  When this function returns, you may
+    * want to display any rows that were generated in the row
+    * callback, if you aren't already displaying them there.
+    */
+   png_process_data(*png_ptr, *info_ptr, buffer, length);
+   return (OK);
+}
+
+info_callback(png_structp png_ptr, png_infop info)
+{
+/* do any setup here, including setting any of the transformations
+ * mentioned in the Reading PNG files section.  For now, you _must_
+ * call either png_start_read_image() or png_read_update_info()
+ * after all the transformations are set (even if you don't set
+ * any).  You may start getting rows before png_process_data()
+ * returns, so this is your last chance to prepare for that.
+ */
+}
+
+row_callback(png_structp png_ptr, png_bytep new_row,
+   png_uint_32 row_num, int pass)
+{
+/*
+ * This function is called for every row in the image.  If the
+ * image is interlaced, and you turned on the interlace handler,
+ * this function will be called for every row in every pass.
+ *
+ * In this function you will receive a pointer to new row data from
+ * libpng called new_row that is to replace a corresponding row (of
+ * the same data format) in a buffer allocated by your application.
+ *
+ * The new row data pointer new_row may be NULL, indicating there is
+ * no new data to be replaced (in cases of interlace loading).
+ *
+ * If new_row is not NULL then you need to call
+ * png_progressive_combine_row() to replace the corresponding row as
+ * shown below:
+ */
+   /* Check if row_num is in bounds. */
+   if ((row_num >= 0) && (row_num < height))
+   {
+     /* Get pointer to corresponding row in our
+      * PNG read buffer.
+      */
+     png_bytep old_row = ((png_bytep *)our_data)[row_num];
+
+     /* If both rows are allocated then copy the new row
+      * data to the corresponding row data.
+      */
+     if ((old_row != NULL) && (new_row != NULL))
+     png_progressive_combine_row(png_ptr, old_row, new_row);
+   }
+/*
+ * The rows and passes are called in order, so you don't really
+ * need the row_num and pass, but I'm supplying them because it
+ * may make your life easier.
+ *
+ * For the non-NULL rows of interlaced images, you must call
+ * png_progressive_combine_row() passing in the new row and the
+ * old row, as demonstrated above.  You can call this function for
+ * NULL rows (it will just return) and for non-interlaced images
+ * (it just does the png_memcpy for you) if it will make the code
+ * easier.  Thus, you can just do this for all cases:
+ */
+
+   png_progressive_combine_row(png_ptr, old_row, new_row);
+
+/* where old_row is what was displayed for previous rows.  Note
+ * that the first pass (pass == 0 really) will completely cover
+ * the old row, so the rows do not have to be initialized.  After
+ * the first pass (and only for interlaced images), you will have
+ * to pass the current row as new_row, and the function will combine
+ * the old row and the new row.
+ */
+}
+
+end_callback(png_structp png_ptr, png_infop info)
+{
+/* this function is called when the whole image has been read,
+ * including any chunks after the image (up to and including
+ * the IEND).  You will usually have the same info chunk as you
+ * had in the header, although some data may have been added
+ * to the comments and time fields.
+ *
+ * Most people won't do much here, perhaps setting a flag that
+ * marks the image as finished.
+ */
+}
+
+/* write a png file */
+void write_png(char *file_name /* , ... other image information ... */)
+{
+   FILE *fp;
+   png_structp png_ptr;
+   png_infop info_ptr;
+   png_colorp palette;
+
+   /* open the file */
+   fp = fopen(file_name, "wb");
+   if (fp == NULL)
+      return (ERROR);
+
+   /* Create and initialize the png_struct with the desired error handler
+    * functions.  If you want to use the default stderr and longjump method,
+    * you can supply NULL for the last three parameters.  We also check that
+    * the library version is compatible with the one used at compile time,
+    * in case we are using dynamically linked libraries.  REQUIRED.
+    */
+   png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+      png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+
+   if (png_ptr == NULL)
+   {
+      fclose(fp);
+      return (ERROR);
+   }
+
+   /* Allocate/initialize the image information data.  REQUIRED */
+   info_ptr = png_create_info_struct(png_ptr);
+   if (info_ptr == NULL)
+   {
+      fclose(fp);
+      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
+      return (ERROR);
+   }
+
+   /* Set error handling.  REQUIRED if you aren't supplying your own
+    * error handling functions in the png_create_write_struct() call.
+    */
+   if (setjmp(png_jmpbuf(png_ptr)))
+   {
+      /* If we get here, we had a problem reading the file */
+      fclose(fp);
+      png_destroy_write_struct(&png_ptr, &info_ptr);
+      return (ERROR);
+   }
+
+   /* One of the following I/O initialization functions is REQUIRED */
+#ifdef streams /* I/O initialization method 1 */
+   /* set up the output control if you are using standard C streams */
+   png_init_io(png_ptr, fp);
+#else no_streams /* I/O initialization method 2 */
+   /* If you are using replacement write functions, instead of calling
+    * png_init_io() here you would call */
+   png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn,
+      user_IO_flush_function);
+   /* where user_io_ptr is a structure you want available to the callbacks */
+#endif no_streams /* only use one initialization method */
+
+#ifdef hilevel
+   /* This is the easy way.  Use it if you already have all the
+    * image info living info in the structure.  You could "|" many
+    * PNG_TRANSFORM flags into the png_transforms integer here.
+    */
+   png_write_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
+#else
+   /* This is the hard way */
+
+   /* Set the image information here.  Width and height are up to 2^31,
+    * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
+    * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
+    * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
+    * or PNG_COLOR_TYPE_RGB_ALPHA.  interlace is either PNG_INTERLACE_NONE or
+    * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
+    * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED
+    */
+   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, PNG_COLOR_TYPE_???,
+      PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+   /* set the palette if there is one.  REQUIRED for indexed-color images */
+   palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH
+             * png_sizeof(png_color));
+   /* ... set palette colors ... */
+   png_set_PLTE(png_ptr, info_ptr, palette, PNG_MAX_PALETTE_LENGTH);
+   /* You must not free palette here, because png_set_PLTE only makes a link to
+      the palette that you malloced.  Wait until you are about to destroy
+      the png structure. */
+
+   /* optional significant bit chunk */
+   /* if we are dealing with a grayscale image then */
+   sig_bit.gray = true_bit_depth;
+   /* otherwise, if we are dealing with a color image then */
+   sig_bit.red = true_red_bit_depth;
+   sig_bit.green = true_green_bit_depth;
+   sig_bit.blue = true_blue_bit_depth;
+   /* if the image has an alpha channel then */
+   sig_bit.alpha = true_alpha_bit_depth;
+   png_set_sBIT(png_ptr, info_ptr, sig_bit);
+
+
+   /* Optional gamma chunk is strongly suggested if you have any guess
+    * as to the correct gamma of the image.
+    */
+   png_set_gAMA(png_ptr, info_ptr, gamma);
+
+   /* Optionally write comments into the image */
+   text_ptr[0].key = "Title";
+   text_ptr[0].text = "Mona Lisa";
+   text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
+   text_ptr[1].key = "Author";
+   text_ptr[1].text = "Leonardo DaVinci";
+   text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
+   text_ptr[2].key = "Description";
+   text_ptr[2].text = "<long text>";
+   text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt;
+#ifdef PNG_iTXt_SUPPORTED
+   text_ptr[0].lang = NULL;
+   text_ptr[1].lang = NULL;
+   text_ptr[2].lang = NULL;
+#endif
+   png_set_text(png_ptr, info_ptr, text_ptr, 3);
+
+   /* other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs, */
+   /* note that if sRGB is present the gAMA and cHRM chunks must be ignored
+    * on read and must be written in accordance with the sRGB profile */
+
+   /* Write the file header information.  REQUIRED */
+   png_write_info(png_ptr, info_ptr);
+
+   /* If you want, you can write the info in two steps, in case you need to
+    * write your private chunk ahead of PLTE:
+    *
+    *   png_write_info_before_PLTE(write_ptr, write_info_ptr);
+    *   write_my_chunk();
+    *   png_write_info(png_ptr, info_ptr);
+    *
+    * However, given the level of known- and unknown-chunk support in 1.1.0
+    * and up, this should no longer be necessary.
+    */
+
+   /* Once we write out the header, the compression type on the text
+    * chunks gets changed to PNG_TEXT_COMPRESSION_NONE_WR or
+    * PNG_TEXT_COMPRESSION_zTXt_WR, so it doesn't get written out again
+    * at the end.
+    */
+
+   /* set up the transformations you want.  Note that these are
+    * all optional.  Only call them if you want them.
+    */
+
+   /* invert monochrome pixels */
+   png_set_invert_mono(png_ptr);
+
+   /* Shift the pixels up to a legal bit depth and fill in
+    * as appropriate to correctly scale the image.
+    */
+   png_set_shift(png_ptr, &sig_bit);
+
+   /* pack pixels into bytes */
+   png_set_packing(png_ptr);
+
+   /* swap location of alpha bytes from ARGB to RGBA */
+   png_set_swap_alpha(png_ptr);
+
+   /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into
+    * RGB (4 channels -> 3 channels). The second parameter is not used.
+    */
+   png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+
+   /* flip BGR pixels to RGB */
+   png_set_bgr(png_ptr);
+
+   /* swap bytes of 16-bit files to most significant byte first */
+   png_set_swap(png_ptr);
+
+   /* swap bits of 1, 2, 4 bit packed pixel formats */
+   png_set_packswap(png_ptr);
+
+   /* turn on interlace handling if you are not using png_write_image() */
+   if (interlacing)
+      number_passes = png_set_interlace_handling(png_ptr);
+   else
+      number_passes = 1;
+
+   /* The easiest way to write the image (you may have a different memory
+    * layout, however, so choose what fits your needs best).  You need to
+    * use the first method if you aren't handling interlacing yourself.
+    */
+   png_uint_32 k, height, width;
+   png_byte image[height][width*bytes_per_pixel];
+   png_bytep row_pointers[height];
+
+   if (height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
+     png_error (png_ptr, "Image is too tall to process in memory");
+
+   for (k = 0; k < height; k++)
+     row_pointers[k] = image + k*width*bytes_per_pixel;
+
+   /* One of the following output methods is REQUIRED */
+#ifdef entire /* write out the entire image data in one call */
+   png_write_image(png_ptr, row_pointers);
+
+   /* the other way to write the image - deal with interlacing */
+
+#else no_entire /* write out the image data by one or more scanlines */
+   /* The number of passes is either 1 for non-interlaced images,
+    * or 7 for interlaced images.
+    */
+   for (pass = 0; pass < number_passes; pass++)
+   {
+      /* Write a few rows at a time. */
+      png_write_rows(png_ptr, &row_pointers[first_row], number_of_rows);
+
+      /* If you are only writing one row at a time, this works */
+      for (y = 0; y < height; y++)
+         png_write_rows(png_ptr, &row_pointers[y], 1);
+   }
+#endif no_entire /* use only one output method */
+
+   /* You can write optional chunks like tEXt, zTXt, and tIME at the end
+    * as well.  Shouldn't be necessary in 1.1.0 and up as all the public
+    * chunks are supported and you can use png_set_unknown_chunks() to
+    * register unknown chunks into the info structure to be written out.
+    */
+
+   /* It is REQUIRED to call this to finish writing the rest of the file */
+   png_write_end(png_ptr, info_ptr);
+#endif hilevel
+
+   /* If you png_malloced a palette, free it here (don't free info_ptr->palette,
+      as recommended in versions 1.0.5m and earlier of this example; if
+      libpng mallocs info_ptr->palette, libpng will free it).  If you
+      allocated it with malloc() instead of png_malloc(), use free() instead
+      of png_free(). */
+   png_free(png_ptr, palette);
+   palette = NULL;
+
+   /* Similarly, if you png_malloced any data that you passed in with
+      png_set_something(), such as a hist or trans array, free it here,
+      when you can be sure that libpng is through with it. */
+   png_free(png_ptr, trans);
+   trans = NULL;
+
+   /* clean up after the write, and free any memory allocated */
+   png_destroy_write_struct(&png_ptr, &info_ptr);
+
+   /* close the file */
+   fclose(fp);
+
+   /* that's it */
+   return (OK);
+}
+
+#endif /* if 0 */
+
+#if 0 /* in case someone actually tries to compile this */
+
 /* example.c - an example of using libpng
  * Last changed in libpng 1.2.1 December 7, 2001.
  * This file has been placed in the public domain by the authors.
diff --git a/src/dep/src/irrlicht/libpng/libpng.3 b/src/dep/src/irrlicht/libpng/libpng.3
index 0507b48..c22e6c2 100644
--- a/src/dep/src/irrlicht/libpng/libpng.3
+++ b/src/dep/src/irrlicht/libpng/libpng.3
@@ -1,3 +1,4127 @@
+.TH LIBPNG 3 "February 14, 2009"
+.SH NAME
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.35
+.SH SYNOPSIS
+\fI\fB
+
+\fB#include <png.h>\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_access_version_number \fI(void\fP\fB);\fP
+
+\fI\fB
+
+\fBint png_check_sig (png_bytep \fP\fIsig\fP\fB, int \fInum\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_chunk_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_chunk_warning (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fImessage\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_convert_from_struct_tm (png_timep \fP\fIptime\fP\fB, struct tm FAR * \fIttime\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_convert_from_time_t (png_timep \fP\fIptime\fP\fB, time_t \fIttime\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_charp png_convert_to_rfc1123 (png_structp \fP\fIpng_ptr\fP\fB, png_timep \fIptime\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_infop png_create_info_struct (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_structp png_create_read_struct (png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fIwarn_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_structp png_create_read_struct_2(png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_structp png_create_write_struct (png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fIwarn_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_structp png_create_write_struct_2(png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBint png_debug(int \fP\fIlevel\fP\fB, png_const_charp \fImessage\fP\fB);\fP
+
+\fI\fB
+
+\fBint png_debug1(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fIp1\fP\fB);\fP
+
+\fI\fB
+
+\fBint png_debug2(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fP\fIp1\fP\fB, \fIp2\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_destroy_info_struct (png_structp \fP\fIpng_ptr\fP\fB, png_infopp \fIinfo_ptr_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_destroy_read_struct (png_structpp \fP\fIpng_ptr_ptr\fP\fB, png_infopp \fP\fIinfo_ptr_ptr\fP\fB, png_infopp \fIend_info_ptr_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_destroy_write_struct (png_structpp \fP\fIpng_ptr_ptr\fP\fB, png_infopp \fIinfo_ptr_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_free (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fIptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_free_chunk_list (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_free_default(png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fIptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_free_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fInum\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_byte png_get_bit_depth (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_16p \fI*background\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_byte png_get_channels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fP\fI*white_x\fP\fB, double \fP\fI*white_y\fP\fB, double \fP\fI*red_x\fP\fB, double \fP\fI*red_y\fP\fB, double \fP\fI*green_x\fP\fB, double \fP\fI*green_y\fP\fB, double \fP\fI*blue_x\fP\fB, double \fI*blue_y\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*white_x\fP\fB, png_uint_32 \fP\fI*white_y\fP\fB, png_uint_32 \fP\fI*red_x\fP\fB, png_uint_32 \fP\fI*red_y\fP\fB, png_uint_32 \fP\fI*green_x\fP\fB, png_uint_32 \fP\fI*green_y\fP\fB, png_uint_32 \fP\fI*blue_x\fP\fB, png_uint_32 \fI*blue_y\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_byte png_get_color_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_byte png_get_compression_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_byte png_get_copyright (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_voidp png_get_error_ptr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_byte png_get_filter_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fI*file_gamma\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fI*int_file_gamma\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_byte png_get_header_ver (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_byte png_get_header_version (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_16p \fI*hist\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charpp \fP\fIname\fP\fB, int \fP\fI*compression_type\fP\fB, png_charpp \fP\fIprofile\fP\fB, png_uint_32 \fI*proflen\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*width\fP\fB, png_uint_32 \fP\fI*height\fP\fB, int \fP\fI*bit_depth\fP\fB, int \fP\fI*color_type\fP\fB, int \fP\fI*interlace_type\fP\fB, int \fP\fI*compression_type\fP\fB, int \fI*filter_type\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_image_height (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_image_width (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fB#if \fI!defined(PNG_1_0_X)
+
+\fBpng_int_32 png_get_int_32 (png_bytep \fIbuf\fP\fB);\fP
+
+\fI\fB#endif
+
+\fI\fB
+
+\fBpng_byte png_get_interlace_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_voidp png_get_io_ptr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_byte png_get_libpng_ver (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_voidp png_get_mem_ptr(png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*offset_x\fP\fB, png_uint_32 \fP\fI*offset_y\fP\fB, int \fI*unit_type\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fI*purpose\fP\fB, png_int_32 \fP\fI*X0\fP\fB, png_int_32 \fP\fI*X1\fP\fB, int \fP\fI*type\fP\fB, int \fP\fI*nparams\fP\fB, png_charp \fP\fI*units\fP\fB, png_charpp \fI*params\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*res_x\fP\fB, png_uint_32 \fP\fI*res_y\fP\fB, int \fI*unit_type\fP\fB);\fP
+
+\fI\fB
+
+\fBfloat png_get_pixel_aspect_ratio (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_voidp png_get_progressive_ptr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_colorp \fP\fI*palette\fP\fB, int \fI*num_palette\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_byte png_get_rgb_to_gray_status (png_structp \fIpng_ptr)
+
+\fBpng_uint_32 png_get_rowbytes (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_bytepp png_get_rows (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_8p \fI*sig_bit\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_bytep png_get_signature (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_spalette_p \fI*splt_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fI*intent\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_text (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fI*text_ptr\fP\fB, int \fI*num_text\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_timep \fI*mod_time\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fI*trans\fP\fB, int \fP\fI*num_trans\fP\fB, png_color_16p \fI*trans_values\fP\fB);\fP
+
+\fI\fB
+
+\fB#if \fI!defined(PNG_1_0_X)
+
+\fBpng_uint_16 png_get_uint_16 (png_bytep \fIbuf\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_uint_31 (png_bytep \fIbuf\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_uint_32 (png_bytep \fIbuf\fP\fB);\fP
+
+\fI\fB#endif
+
+\fI\fB
+
+\fBpng_uint_32 png_get_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_unknown_chunkpp \fIunknowns\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_voidp png_get_user_chunk_ptr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_user_height_max( png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_voidp png_get_user_transform_ptr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_user_width_max (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_valid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIflag\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_int_32 png_get_x_offset_microns (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_int_32 png_get_x_offset_pixels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_x_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_int_32 png_get_y_offset_microns (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_int_32 png_get_y_offset_pixels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_y_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_get_compression_buffer_size (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBint png_handle_as_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIchunk_name\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_init_io (png_structp \fP\fIpng_ptr\fP\fB, FILE \fI*fp\fP\fB);\fP
+
+\fI\fB
+
+\fBDEPRECATED: void png_info_init (png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBDEPRECATED: void png_info_init_2 (png_infopp \fP\fIptr_ptr\fP\fB, png_size_t \fIpng_info_struct_size\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_voidp png_malloc (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_voidp png_malloc_default(png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
+
+\fI\fB
+
+\fBvoidp png_memcpy (png_voidp \fP\fIs1\fP\fB, png_voidp \fP\fIs2\fP\fB, png_size_t \fIsize\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_voidp png_memcpy_check (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIs1\fP\fB, png_voidp \fP\fIs2\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
+
+\fI\fB
+
+\fBvoidp png_memset (png_voidp \fP\fIs1\fP\fB, int \fP\fIvalue\fP\fB, png_size_t \fIsize\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_voidp png_memset_check (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIs1\fP\fB, int \fP\fIvalue\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
+
+\fI\fB
+
+\fBDEPRECATED: void png_permit_empty_plte (png_structp \fP\fIpng_ptr\fP\fB, int \fIempty_plte_permitted\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_process_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_size\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_progressive_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIold_row\fP\fB, png_bytep \fInew_row\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_read_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_infop \fIend_info_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_read_image (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fIimage\fP\fB);\fP
+
+\fI\fB
+
+\fBDEPRECATED: void png_read_init (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBDEPRECATED: void png_read_init_2 (png_structpp \fP\fIptr_ptr\fP\fB, png_const_charp \fP\fIuser_png_ver\fP\fB, png_size_t \fP\fIpng_struct_size\fP\fB, png_size_t \fIpng_info_size\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_read_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_read_png (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fItransforms\fP\fB, png_voidp \fIparams\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_read_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fIdisplay_row\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_read_rows (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fP\fIrow\fP\fB, png_bytepp \fP\fIdisplay_row\fP\fB, png_uint_32 \fInum_rows\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_read_update_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fB#if \fI!defined(PNG_1_0_X)
+
+\fBpng_save_int_32 (png_bytep \fP\fIbuf\fP\fB, png_int_32 \fIi\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_save_uint_16 (png_bytep \fP\fIbuf\fP\fB, unsigned int \fIi\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_save_uint_32 (png_bytep \fP\fIbuf\fP\fB, png_uint_32 \fIi\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_add_alpha (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, int \fIflags\fP\fB);\fP
+
+\fI\fB#endif
+
+\fI\fB
+
+\fBvoid png_set_background (png_structp \fP\fIpng_ptr\fP\fB, png_color_16p \fP\fIbackground_color\fP\fB, int \fP\fIbackground_gamma_code\fP\fB, int \fP\fIneed_expand\fP\fB, double \fIbackground_gamma\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_bgr (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_16p \fIbackground\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIwhite_x\fP\fB, png_uint_32 \fP\fIwhite_y\fP\fB, png_uint_32 \fP\fIred_x\fP\fB, png_uint_32 \fP\fIred_y\fP\fB, png_uint_32 \fP\fIgreen_x\fP\fB, png_uint_32 \fP\fIgreen_y\fP\fB, png_uint_32 \fP\fIblue_x\fP\fB, png_uint_32 \fIblue_y\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_compression_level (png_structp \fP\fIpng_ptr\fP\fB, int \fIlevel\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_compression_mem_level (png_structp \fP\fIpng_ptr\fP\fB, int \fImem_level\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_compression_method (png_structp \fP\fIpng_ptr\fP\fB, int \fImethod\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_compression_strategy (png_structp \fP\fIpng_ptr\fP\fB, int \fIstrategy\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_compression_window_bits (png_structp \fP\fIpng_ptr\fP\fB, int \fIwindow_bits\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_crc_action (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcrit_action\fP\fB, int \fIancil_action\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_dither (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fP\fInum_palette\fP\fB, int \fP\fImaximum_colors\fP\fB, png_uint_16p \fP\fIhistogram\fP\fB, int \fIfull_dither\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_error_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fIwarning_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_expand (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_expand_gray_1_2_4_to_8(png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_filler (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, int \fIflags\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_filter (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fImethod\fP\fB, int \fIfilters\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_filter_heuristics (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIheuristic_method\fP\fB, int \fP\fInum_weights\fP\fB, png_doublep \fP\fIfilter_weights\fP\fB, png_doublep \fIfilter_costs\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_flush (png_structp \fP\fIpng_ptr\fP\fB, int \fInrows\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_gamma (png_structp \fP\fIpng_ptr\fP\fB, double \fP\fIscreen_gamma\fP\fB, double \fIdefault_file_gamma\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fIfile_gamma\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIfile_gamma\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_gray_1_2_4_to_8(png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_gray_to_rgb (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_16p \fIhist\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, png_uint_32 \fIproflen\fP\fB);\fP
+
+\fI\fB
+
+\fBint png_set_interlace_handling (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_invalid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fImask\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_invert_alpha (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_invert_mono (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIinterlace_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fIfilter_type\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_keep_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIkeep\fP\fB, png_bytep \fP\fIchunk_list\fP\fB, int \fInum_chunks\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_mem_fn(png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIoffset_x\fP\fB, png_uint_32 \fP\fIoffset_y\fP\fB, int \fIunit_type\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_packing (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_packswap (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_palette_to_rgb(png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIpurpose\fP\fB, png_int_32 \fP\fIX0\fP\fB, png_int_32 \fP\fIX1\fP\fB, int \fP\fItype\fP\fB, int \fP\fInparams\fP\fB, png_charp \fP\fIunits\fP\fB, png_charpp \fIparams\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fIres_x\fP\fB, png_uint_32 \fP\fIres_y\fP\fB, int \fIunit_type\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_progressive_read_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIprogressive_ptr\fP\fB, png_progressive_info_ptr \fP\fIinfo_fn\fP\fB, png_progressive_row_ptr \fP\fIrow_fn\fP\fB, png_progressive_end_ptr \fIend_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fInum_palette\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_read_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIio_ptr\fP\fB, png_rw_ptr \fIread_data_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_read_status_fn (png_structp \fP\fIpng_ptr\fP\fB, png_read_status_ptr \fIread_row_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_read_user_transform_fn (png_structp \fP\fIpng_ptr\fP\fB, png_user_transform_ptr \fIread_user_transform_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_rgb_to_gray (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIerror_action\fP\fB, double \fP\fIred\fP\fB, double \fIgreen\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_rgb_to_gray_fixed (png_structp \fP\fIpng_ptr\fP\fB, int error_action png_fixed_point \fP\fIred\fP\fB, png_fixed_point \fIgreen\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_rows (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytepp \fIrow_pointers\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_8p \fIsig_bit\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_shift (png_structp \fP\fIpng_ptr\fP\fB, png_color_8p \fItrue_bits\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_sig_bytes (png_structp \fP\fIpng_ptr\fP\fB, int \fInum_bytes\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_spalette_p \fP\fIsplt_ptr\fP\fB, int \fInum_spalettes\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fIintent\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_sRGB_gAMA_and_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fIintent\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_strip_16 (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_strip_alpha (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_swap (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_swap_alpha (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_text (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fItext_ptr\fP\fB, int \fInum_text\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_timep \fImod_time\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fP\fInum_trans\fP\fB, png_color_16p \fItrans_values\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_tRNS_to_alpha(png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBpng_uint_32 png_set_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_unknown_chunkp \fP\fIunknowns\fP\fB, int \fP\fInum\fP\fB, int \fIlocation\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_unknown_chunk_location(png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fIchunk\fP\fB, int \fIlocation\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_read_user_chunk_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIuser_chunk_ptr\fP\fB, png_user_chunk_ptr \fIread_user_chunk_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_user_limits (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIuser_width_max\fP\fB, png_uint_32 \fIuser_height_max\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_user_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIuser_transform_ptr\fP\fB, int \fP\fIuser_transform_depth\fP\fB, int \fIuser_transform_channels\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_write_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIio_ptr\fP\fB, png_rw_ptr \fP\fIwrite_data_fn\fP\fB, png_flush_ptr \fIoutput_flush_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_write_status_fn (png_structp \fP\fIpng_ptr\fP\fB, png_write_status_ptr \fIwrite_row_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_write_user_transform_fn (png_structp \fP\fIpng_ptr\fP\fB, png_user_transform_ptr \fIwrite_user_transform_fn\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_set_compression_buffer_size(png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP
+
+\fI\fB
+
+\fBint png_sig_cmp (png_bytep \fP\fIsig\fP\fB, png_size_t \fP\fIstart\fP\fB, png_size_t \fInum_to_check\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_start_read_image (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_warning (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fImessage\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIchunk_name\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_chunk_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_chunk_end (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_chunk_start (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIchunk_name\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_destroy (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_flush (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_image (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fIimage\fP\fB);\fP
+
+\fI\fB
+
+\fBDEPRECATED: void png_write_init (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBDEPRECATED: void png_write_init_2 (png_structpp \fP\fIptr_ptr\fP\fB, png_const_charp \fP\fIuser_png_ver\fP\fB, png_size_t \fP\fIpng_struct_size\fP\fB, png_size_t \fIpng_info_size\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_info_before_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_png (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fItransforms\fP\fB, png_voidp \fIparams\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_write_rows (png_structp \fP\fIpng_ptr\fP\fB, png_bytepp \fP\fIrow\fP\fB, png_uint_32 \fInum_rows\fP\fB);\fP
+
+\fI\fB
+
+\fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
+
+\fI\fB
+
+\fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP
+
+\fI\fB
+
+.SH DESCRIPTION
+The
+.I libpng
+library supports encoding, decoding, and various manipulations of
+the Portable Network Graphics (PNG) format image files.  It uses the
+.IR zlib(3)
+compression library.
+Following is a copy of the libpng.txt file that accompanies libpng.
+.SH LIBPNG.TXT
+libpng.txt - A description on how to use and modify libpng
+
+ libpng version 1.2.35 - February 14, 2009
+ Updated and distributed by Glenn Randers-Pehrson
+ <glennrp at users.sourceforge.net>
+ Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ For conditions of distribution and use, see copyright
+ notice in png.h.
+
+ Based on:
+
+ libpng versions 0.97, January 1998, through 1.2.35 - February 14, 2009
+ Updated and distributed by Glenn Randers-Pehrson
+ Copyright (c) 1998-2008 Glenn Randers-Pehrson
+
+ libpng 1.0 beta 6  version 0.96 May 28, 1997
+ Updated and distributed by Andreas Dilger
+ Copyright (c) 1996, 1997 Andreas Dilger
+
+ libpng 1.0 beta 2 - version 0.88  January 26, 1996
+ For conditions of distribution and use, see copyright
+ notice in png.h. Copyright (c) 1995, 1996 Guy Eric
+ Schalnat, Group 42, Inc.
+
+ Updated/rewritten per request in the libpng FAQ
+ Copyright (c) 1995, 1996 Frank J. T. Wojcik
+ December 18, 1995 & January 20, 1996
+
+.SH I. Introduction
+
+This file describes how to use and modify the PNG reference library
+(known as libpng) for your own use.  There are five sections to this
+file: introduction, structures, reading, writing, and modification and
+configuration notes for various special platforms.  In addition to this
+file, example.c is a good starting point for using the library, as
+it is heavily commented and should include everything most people
+will need.  We assume that libpng is already installed; see the
+INSTALL file for instructions on how to install libpng.
+
+For examples of libpng usage, see the files "example.c", "pngtest.c",
+and the files in the "contrib" directory, all of which are included in the
+libpng distribution.
+
+Libpng was written as a companion to the PNG specification, as a way
+of reducing the amount of time and effort it takes to support the PNG
+file format in application programs.
+
+The PNG specification (second edition), November 2003, is available as
+a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2003 (E)) at
+<http://www.w3.org/TR/2003/REC-PNG-20031110/
+The W3C and ISO documents have identical technical content.
+
+The PNG-1.2 specification is available at
+<http://www.libpng.org/pub/png/documents/>.  It is technically equivalent
+to the PNG specification (second edition) but has some additional material.
+
+The PNG-1.0 specification is available
+as RFC 2083 <http://www.libpng.org/pub/png/documents/> and as a
+W3C Recommendation <http://www.w3.org/TR/REC.png.html>.
+
+Some additional chunks are described in the special-purpose public chunks
+documents at <http://www.libpng.org/pub/png/documents/>.
+
+Other information
+about PNG, and the latest version of libpng, can be found at the PNG home
+page, <http://www.libpng.org/pub/png/>.
+
+Most users will not have to modify the library significantly; advanced
+users may want to modify it more.  All attempts were made to make it as
+complete as possible, while keeping the code easy to understand.
+Currently, this library only supports C.  Support for other languages
+is being considered.
+
+Libpng has been designed to handle multiple sessions at one time,
+to be easily modifiable, to be portable to the vast majority of
+machines (ANSI, K&R, 16-, 32-, and 64-bit) available, and to be easy
+to use.  The ultimate goal of libpng is to promote the acceptance of
+the PNG file format in whatever way possible.  While there is still
+work to be done (see the TODO file), libpng should cover the
+majority of the needs of its users.
+
+Libpng uses zlib for its compression and decompression of PNG files.
+Further information about zlib, and the latest version of zlib, can
+be found at the zlib home page, <http://www.info-zip.org/pub/infozip/zlib/>.
+The zlib compression utility is a general purpose utility that is
+useful for more than PNG files, and can be used without libpng.
+See the documentation delivered with zlib for more details.
+You can usually find the source files for the zlib utility wherever you
+find the libpng source files.
+
+Libpng is thread safe, provided the threads are using different
+instances of the structures.  Each thread should have its own
+png_struct and png_info instances, and thus its own image.
+Libpng does not protect itself against two threads using the
+same instance of a structure.
+
+.SH II. Structures
+
+There are two main structures that are important to libpng, png_struct
+and png_info.  The first, png_struct, is an internal structure that
+will not, for the most part, be used by a user except as the first
+variable passed to every libpng function call.
+
+The png_info structure is designed to provide information about the
+PNG file.  At one time, the fields of png_info were intended to be
+directly accessible to the user.  However, this tended to cause problems
+with applications using dynamically loaded libraries, and as a result
+a set of interface functions for png_info (the png_get_*() and png_set_*()
+functions) was developed.  The fields of png_info are still available for
+older applications, but it is suggested that applications use the new
+interfaces if at all possible.
+
+Applications that do make direct access to the members of png_struct (except
+for png_ptr->jmpbuf) must be recompiled whenever the library is updated,
+and applications that make direct access to the members of png_info must
+be recompiled if they were compiled or loaded with libpng version 1.0.6,
+in which the members were in a different order.  In version 1.0.7, the
+members of the png_info structure reverted to the old order, as they were
+in versions 0.97c through 1.0.5.  Starting with version 2.0.0, both
+structures are going to be hidden, and the contents of the structures will
+only be accessible through the png_get/png_set functions.
+
+The png.h header file is an invaluable reference for programming with libpng.
+And while I'm on the topic, make sure you include the libpng header file:
+
+#include <png.h>
+
+.SH III. Reading
+
+We'll now walk you through the possible functions to call when reading
+in a PNG file sequentially, briefly explaining the syntax and purpose
+of each one.  See example.c and png.h for more detail.  While
+progressive reading is covered in the next section, you will still
+need some of the functions discussed in this section to read a PNG
+file.
+
+.SS Setup
+
+You will want to do the I/O initialization(*) before you get into libpng,
+so if it doesn't work, you don't have much to undo.  Of course, you
+will also want to insure that you are, in fact, dealing with a PNG
+file.  Libpng provides a simple check to see if a file is a PNG file.
+To use it, pass in the first 1 to 8 bytes of the file to the function
+png_sig_cmp(), and it will return 0 if the bytes match the corresponding
+bytes of the PNG signature, or nonzero otherwise.  Of course, the more bytes
+you pass in, the greater the accuracy of the prediction.
+
+If you are intending to keep the file pointer open for use in libpng,
+you must ensure you don't read more than 8 bytes from the beginning
+of the file, and you also have to make a call to png_set_sig_bytes_read()
+with the number of bytes you read from the beginning.  Libpng will
+then only check the bytes (if any) that your program didn't read.
+
+(*): If you are not using the standard I/O functions, you will need
+to replace them with custom functions.  See the discussion under
+Customizing libpng.
+
+
+    FILE *fp = fopen(file_name, "rb");
+    if (!fp)
+    {
+        return (ERROR);
+    }
+    fread(header, 1, number, fp);
+    is_png = !png_sig_cmp(header, 0, number);
+    if (!is_png)
+    {
+        return (NOT_PNG);
+    }
+
+
+Next, png_struct and png_info need to be allocated and initialized.  In
+order to ensure that the size of these structures is correct even with a
+dynamically linked libpng, there are functions to initialize and
+allocate the structures.  We also pass the library version, optional
+pointers to error handling functions, and a pointer to a data struct for
+use by the error functions, if necessary (the pointer and functions can
+be NULL if the default error handlers are to be used).  See the section
+on Changes to Libpng below regarding the old initialization functions.
+The structure allocation functions quietly return NULL if they fail to
+create the structure, so your application should check for that.
+
+    png_structp png_ptr = png_create_read_struct
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn);
+    if (!png_ptr)
+        return (ERROR);
+
+    png_infop info_ptr = png_create_info_struct(png_ptr);
+    if (!info_ptr)
+    {
+        png_destroy_read_struct(&png_ptr,
+           (png_infopp)NULL, (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    png_infop end_info = png_create_info_struct(png_ptr);
+    if (!end_info)
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+          (png_infopp)NULL);
+        return (ERROR);
+    }
+
+If you want to use your own memory allocation routines,
+define PNG_USER_MEM_SUPPORTED and use
+png_create_read_struct_2() instead of png_create_read_struct():
+
+    png_structp png_ptr = png_create_read_struct_2
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn, (png_voidp)
+        user_mem_ptr, user_malloc_fn, user_free_fn);
+
+The error handling routines passed to png_create_read_struct()
+and the memory alloc/free routines passed to png_create_struct_2()
+are only necessary if you are not using the libpng supplied error
+handling and memory alloc/free functions.
+
+When libpng encounters an error, it expects to longjmp back
+to your routine.  Therefore, you will need to call setjmp and pass
+your png_jmpbuf(png_ptr).  If you read the file from different
+routines, you will need to update the jmpbuf field every time you enter
+a new routine that will call a png_*() function.
+
+See your documentation of setjmp/longjmp for your compiler for more
+information on setjmp/longjmp.  See the discussion on libpng error
+handling in the Customizing Libpng section below for more information
+on the libpng error handling.  If an error occurs, and libpng longjmp's
+back to your setjmp, you will want to call png_destroy_read_struct() to
+free any memory.
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+           &end_info);
+        fclose(fp);
+        return (ERROR);
+    }
+
+If you would rather avoid the complexity of setjmp/longjmp issues,
+you can compile libpng with PNG_SETJMP_NOT_SUPPORTED, in which case
+errors will result in a call to PNG_ABORT() which defaults to abort().
+
+Now you need to set up the input code.  The default for libpng is to
+use the C function fread().  If you use this, you will need to pass a
+valid FILE * in the function png_init_io().  Be sure that the file is
+opened in binary mode.  If you wish to handle reading data in another
+way, you need not call the png_init_io() function, but you must then
+implement the libpng I/O methods discussed in the Customizing Libpng
+section below.
+
+    png_init_io(png_ptr, fp);
+
+If you had previously opened the file and read any of the signature from
+the beginning in order to see if this was a PNG file, you need to let
+libpng know that there are some bytes missing from the start of the file.
+
+    png_set_sig_bytes(png_ptr, number);
+
+.SS Setting up callback code
+
+You can set up a callback function to handle any unknown chunks in the
+input stream. You must supply the function
+
+    read_chunk_callback(png_ptr ptr,
+         png_unknown_chunkp chunk);
+    {
+       /* The unknown chunk structure contains your
+          chunk data, along with similar data for any other
+          unknown chunks: */
+
+           png_byte name[5];
+           png_byte *data;
+           png_size_t size;
+
+       /* Note that libpng has already taken care of
+          the CRC handling */
+
+       /* put your code here.  Search for your chunk in the
+          unknown chunk structure, process it, and return one
+          of the following: */
+
+       return (-n); /* chunk had an error */
+       return (0); /* did not recognize */
+       return (n); /* success */
+    }
+
+(You can give your function another name that you like instead of
+"read_chunk_callback")
+
+To inform libpng about your function, use
+
+    png_set_read_user_chunk_fn(png_ptr, user_chunk_ptr,
+        read_chunk_callback);
+
+This names not only the callback function, but also a user pointer that
+you can retrieve with
+
+    png_get_user_chunk_ptr(png_ptr);
+
+If you call the png_set_read_user_chunk_fn() function, then all unknown
+chunks will be saved when read, in case your callback function will need
+one or more of them.  This behavior can be changed with the
+png_set_keep_unknown_chunks() function, described below.
+
+At this point, you can set up a callback function that will be
+called after each row has been read, which you can use to control
+a progress meter or the like.  It's demonstrated in pngtest.c.
+You must supply a function
+
+    void read_row_callback(png_ptr ptr, png_uint_32 row,
+       int pass);
+    {
+      /* put your code here */
+    }
+
+(You can give it another name that you like instead of "read_row_callback")
+
+To inform libpng about your function, use
+
+    png_set_read_status_fn(png_ptr, read_row_callback);
+
+.SS Width and height limits
+
+The PNG specification allows the width and height of an image to be as
+large as 2^31-1 (0x7fffffff), or about 2.147 billion rows and columns.
+Since very few applications really need to process such large images,
+we have imposed an arbitrary 1-million limit on rows and columns.
+Larger images will be rejected immediately with a png_error() call. If
+you wish to override this limit, you can use
+
+   png_set_user_limits(png_ptr, width_max, height_max);
+
+to set your own limits, or use width_max = height_max = 0x7fffffffL
+to allow all valid dimensions (libpng may reject some very large images
+anyway because of potential buffer overflow conditions).
+
+You should put this statement after you create the PNG structure and
+before calling png_read_info(), png_read_png(), or png_process_data().
+If you need to retrieve the limits that are being applied, use
+
+   width_max = png_get_user_width_max(png_ptr);
+   height_max = png_get_user_height_max(png_ptr);
+
+.SS Unknown-chunk handling
+
+Now you get to set the way the library processes unknown chunks in the
+input PNG stream. Both known and unknown chunks will be read.  Normal
+behavior is that known chunks will be parsed into information in
+various info_ptr members while unknown chunks will be discarded. This
+behavior can be wasteful if your application will never use some known
+chunk types. To change this, you can call:
+
+    png_set_keep_unknown_chunks(png_ptr, keep,
+        chunk_list, num_chunks);
+    keep       - 0: default unknown chunk handling
+                 1: ignore; do not keep
+                 2: keep only if safe-to-copy
+                 3: keep even if unsafe-to-copy
+               You can use these definitions:
+                 PNG_HANDLE_CHUNK_AS_DEFAULT   0
+                 PNG_HANDLE_CHUNK_NEVER        1
+                 PNG_HANDLE_CHUNK_IF_SAFE      2
+                 PNG_HANDLE_CHUNK_ALWAYS       3
+    chunk_list - list of chunks affected (a byte string,
+                 five bytes per chunk, NULL or '\0' if
+                 num_chunks is 0)
+    num_chunks - number of chunks affected; if 0, all
+                 unknown chunks are affected.  If nonzero,
+                 only the chunks in the list are affected
+
+Unknown chunks declared in this way will be saved as raw data onto a
+list of png_unknown_chunk structures.  If a chunk that is normally
+known to libpng is named in the list, it will be handled as unknown,
+according to the "keep" directive.  If a chunk is named in successive
+instances of png_set_keep_unknown_chunks(), the final instance will
+take precedence.  The IHDR and IEND chunks should not be named in
+chunk_list; if they are, libpng will process them normally anyway.
+
+Here is an example of the usage of png_set_keep_unknown_chunks(),
+where the private "vpAg" chunk will later be processed by a user chunk
+callback function:
+
+    png_byte vpAg[5]={118, 112,  65, 103, (png_byte) '\0'};
+
+    #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+      png_byte unused_chunks[]=
+      {
+        104,  73,  83,  84, (png_byte) '\0',   /* hIST */
+        105,  84,  88, 116, (png_byte) '\0',   /* iTXt */
+        112,  67,  65,  76, (png_byte) '\0',   /* pCAL */
+        115,  67,  65,  76, (png_byte) '\0',   /* sCAL */
+        115,  80,  76,  84, (png_byte) '\0',   /* sPLT */
+        116,  73,  77,  69, (png_byte) '\0',   /* tIME */
+      };
+    #endif
+
+    ...
+
+    #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+      /* ignore all unknown chunks: */
+      png_set_keep_unknown_chunks(read_ptr, 1, NULL, 0);
+      /* except for vpAg: */
+      png_set_keep_unknown_chunks(read_ptr, 2, vpAg, 1);
+      /* also ignore unused known chunks: */
+      png_set_keep_unknown_chunks(read_ptr, 1, unused_chunks,
+         (int)sizeof(unused_chunks)/5);
+    #endif
+
+
+.SS The high-level read interface
+
+At this point there are two ways to proceed; through the high-level
+read interface, or through a sequence of low-level read operations.
+You can use the high-level interface if (a) you are willing to read
+the entire image into memory, and (b) the input transformations
+you want to do are limited to the following set:
+
+    PNG_TRANSFORM_IDENTITY      No transformation
+    PNG_TRANSFORM_STRIP_16      Strip 16-bit samples to
+                                8 bits
+    PNG_TRANSFORM_STRIP_ALPHA   Discard the alpha channel
+    PNG_TRANSFORM_PACKING       Expand 1, 2 and 4-bit
+                                samples to bytes
+    PNG_TRANSFORM_PACKSWAP      Change order of packed
+                                pixels to LSB first
+    PNG_TRANSFORM_EXPAND        Perform set_expand()
+    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images
+    PNG_TRANSFORM_SHIFT         Normalize pixels to the
+                                sBIT depth
+    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA
+                                to BGRA
+    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA
+                                to AG
+    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity
+                                to transparency
+    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples
+
+(This excludes setting a background color, doing gamma transformation,
+dithering, and setting filler.)  If this is the case, simply do this:
+
+    png_read_png(png_ptr, info_ptr, png_transforms, NULL)
+
+where png_transforms is an integer containing the bitwise OR of
+some set of transformation flags.  This call is equivalent to png_read_info(),
+followed the set of transformations indicated by the transform mask,
+then png_read_image(), and finally png_read_end().
+
+(The final parameter of this call is not yet used.  Someday it might point
+to transformation parameters required by some future input transform.)
+
+You must use png_transforms and not call any png_set_transform() functions
+when you use png_read_png().
+
+After you have called png_read_png(), you can retrieve the image data
+with
+
+   row_pointers = png_get_rows(png_ptr, info_ptr);
+
+where row_pointers is an array of pointers to the pixel data for each row:
+
+   png_bytep row_pointers[height];
+
+If you know your image size and pixel size ahead of time, you can allocate
+row_pointers prior to calling png_read_png() with
+
+   if (height > PNG_UINT_32_MAX/png_sizeof(png_byte))
+      png_error (png_ptr,
+         "Image is too tall to process in memory");
+   if (width > PNG_UINT_32_MAX/pixel_size)
+      png_error (png_ptr,
+         "Image is too wide to process in memory");
+   row_pointers = png_malloc(png_ptr,
+      height*png_sizeof(png_bytep));
+   for (int i=0; i<height, i++)
+      row_pointers[i]=NULL;  /* security precaution */
+   for (int i=0; i<height, i++)
+      row_pointers[i]=png_malloc(png_ptr,
+         width*pixel_size);
+   png_set_rows(png_ptr, info_ptr, &row_pointers);
+
+Alternatively you could allocate your image in one big block and define
+row_pointers[i] to point into the proper places in your block.
+
+If you use png_set_rows(), the application is responsible for freeing
+row_pointers (and row_pointers[i], if they were separately allocated).
+
+If you don't allocate row_pointers ahead of time, png_read_png() will
+do it, and it'll be free'ed when you call png_destroy_*().
+
+.SS The low-level read interface
+
+If you are going the low-level route, you are now ready to read all
+the file information up to the actual image data.  You do this with a
+call to png_read_info().
+
+    png_read_info(png_ptr, info_ptr);
+
+This will process all chunks up to but not including the image data.
+
+.SS Querying the info structure
+
+Functions are used to get the information from the info_ptr once it
+has been read.  Note that these fields may not be completely filled
+in until png_read_end() has read the chunk data following the image.
+
+    png_get_IHDR(png_ptr, info_ptr, &width, &height,
+       &bit_depth, &color_type, &interlace_type,
+       &compression_type, &filter_method);
+
+    width          - holds the width of the image
+                     in pixels (up to 2^31).
+    height         - holds the height of the image
+                     in pixels (up to 2^31).
+    bit_depth      - holds the bit depth of one of the
+                     image channels.  (valid values are
+                     1, 2, 4, 8, 16 and depend also on
+                     the color_type.  See also
+                     significant bits (sBIT) below).
+    color_type     - describes which color/alpha channels
+                         are present.
+                     PNG_COLOR_TYPE_GRAY
+                        (bit depths 1, 2, 4, 8, 16)
+                     PNG_COLOR_TYPE_GRAY_ALPHA
+                        (bit depths 8, 16)
+                     PNG_COLOR_TYPE_PALETTE
+                        (bit depths 1, 2, 4, 8)
+                     PNG_COLOR_TYPE_RGB
+                        (bit_depths 8, 16)
+                     PNG_COLOR_TYPE_RGB_ALPHA
+                        (bit_depths 8, 16)
+
+                     PNG_COLOR_MASK_PALETTE
+                     PNG_COLOR_MASK_COLOR
+                     PNG_COLOR_MASK_ALPHA
+
+    filter_method  - (must be PNG_FILTER_TYPE_BASE
+                     for PNG 1.0, and can also be
+                     PNG_INTRAPIXEL_DIFFERENCING if
+                     the PNG datastream is embedded in
+                     a MNG-1.0 datastream)
+    compression_type - (must be PNG_COMPRESSION_TYPE_BASE
+                     for PNG 1.0)
+    interlace_type - (PNG_INTERLACE_NONE or
+                     PNG_INTERLACE_ADAM7)
+    Any or all of interlace_type, compression_type, of
+    filter_method can be NULL if you are
+    not interested in their values.
+
+    channels = png_get_channels(png_ptr, info_ptr);
+    channels       - number of channels of info for the
+                     color type (valid values are 1 (GRAY,
+                     PALETTE), 2 (GRAY_ALPHA), 3 (RGB),
+                     4 (RGB_ALPHA or RGB + filler byte))
+    rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+    rowbytes       - number of bytes needed to hold a row
+
+    signature = png_get_signature(png_ptr, info_ptr);
+    signature      - holds the signature read from the
+                     file (if any).  The data is kept in
+                     the same offset it would be if the
+                     whole signature were read (i.e. if an
+                     application had already read in 4
+                     bytes of signature before starting
+                     libpng, the remaining 4 bytes would
+                     be in signature[4] through signature[7]
+                     (see png_set_sig_bytes())).
+
+
+    width            = png_get_image_width(png_ptr,
+                         info_ptr);
+    height           = png_get_image_height(png_ptr,
+                         info_ptr);
+    bit_depth        = png_get_bit_depth(png_ptr,
+                         info_ptr);
+    color_type       = png_get_color_type(png_ptr,
+                         info_ptr);
+    filter_method    = png_get_filter_type(png_ptr,
+                         info_ptr);
+    compression_type = png_get_compression_type(png_ptr,
+                         info_ptr);
+    interlace_type   = png_get_interlace_type(png_ptr,
+                         info_ptr);
+
+
+These are also important, but their validity depends on whether the chunk
+has been read.  The png_get_valid(png_ptr, info_ptr, PNG_INFO_<chunk>) and
+png_get_<chunk>(png_ptr, info_ptr, ...) functions return non-zero if the
+data has been read, or zero if it is missing.  The parameters to the
+png_get_<chunk> are set directly if they are simple data types, or a pointer
+into the info_ptr is returned for any complex types.
+
+    png_get_PLTE(png_ptr, info_ptr, &palette,
+                     &num_palette);
+    palette        - the palette for the file
+                     (array of png_color)
+    num_palette    - number of entries in the palette
+
+    png_get_gAMA(png_ptr, info_ptr, &gamma);
+    gamma          - the gamma the file is written
+                     at (PNG_INFO_gAMA)
+
+    png_get_sRGB(png_ptr, info_ptr, &srgb_intent);
+    srgb_intent    - the rendering intent (PNG_INFO_sRGB)
+                     The presence of the sRGB chunk
+                     means that the pixel data is in the
+                     sRGB color space.  This chunk also
+                     implies specific values of gAMA and
+                     cHRM.
+
+    png_get_iCCP(png_ptr, info_ptr, &name,
+       &compression_type, &profile, &proflen);
+    name            - The profile name.
+    compression     - The compression type; always
+                      PNG_COMPRESSION_TYPE_BASE for PNG 1.0.
+                      You may give NULL to this argument to
+                      ignore it.
+    profile         - International Color Consortium color
+                      profile data. May contain NULs.
+    proflen         - length of profile data in bytes.
+
+    png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+    sig_bit        - the number of significant bits for
+                     (PNG_INFO_sBIT) each of the gray,
+                     red, green, and blue channels,
+                     whichever are appropriate for the
+                     given color type (png_color_16)
+
+    png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans,
+                     &trans_values);
+    trans          - array of transparent entries for
+                     palette (PNG_INFO_tRNS)
+    trans_values   - graylevel or color sample values of
+                     the single transparent color for
+                     non-paletted images (PNG_INFO_tRNS)
+    num_trans      - number of transparent entries
+                     (PNG_INFO_tRNS)
+
+    png_get_hIST(png_ptr, info_ptr, &hist);
+                     (PNG_INFO_hIST)
+    hist           - histogram of palette (array of
+                     png_uint_16)
+
+    png_get_tIME(png_ptr, info_ptr, &mod_time);
+    mod_time       - time image was last modified
+                    (PNG_VALID_tIME)
+
+    png_get_bKGD(png_ptr, info_ptr, &background);
+    background     - background color (PNG_VALID_bKGD)
+                     valid 16-bit red, green and blue
+                     values, regardless of color_type
+
+    num_comments   = png_get_text(png_ptr, info_ptr,
+                     &text_ptr, &num_text);
+    num_comments   - number of comments
+    text_ptr       - array of png_text holding image
+                     comments
+    text_ptr[i].compression - type of compression used
+                 on "text" PNG_TEXT_COMPRESSION_NONE
+                           PNG_TEXT_COMPRESSION_zTXt
+                           PNG_ITXT_COMPRESSION_NONE
+                           PNG_ITXT_COMPRESSION_zTXt
+    text_ptr[i].key   - keyword for comment.  Must contain
+                         1-79 characters.
+    text_ptr[i].text  - text comments for current
+                         keyword.  Can be empty.
+    text_ptr[i].text_length - length of text string,
+                 after decompression, 0 for iTXt
+    text_ptr[i].itxt_length - length of itxt string,
+                 after decompression, 0 for tEXt/zTXt
+    text_ptr[i].lang  - language of comment (empty
+                         string for unknown).
+    text_ptr[i].lang_key  - keyword in UTF-8
+                         (empty string for unknown).
+    num_text       - number of comments (same as
+                     num_comments; you can put NULL here
+                     to avoid the duplication)
+    Note while png_set_text() will accept text, language,
+    and translated keywords that can be NULL pointers, the
+    structure returned by png_get_text will always contain
+    regular zero-terminated C strings.  They might be
+    empty strings but they will never be NULL pointers.
+
+    num_spalettes = png_get_sPLT(png_ptr, info_ptr,
+       &palette_ptr);
+    palette_ptr    - array of palette structures holding
+                     contents of one or more sPLT chunks
+                     read.
+    num_spalettes  - number of sPLT chunks read.
+
+    png_get_oFFs(png_ptr, info_ptr, &offset_x, &offset_y,
+       &unit_type);
+    offset_x       - positive offset from the left edge
+                     of the screen
+    offset_y       - positive offset from the top edge
+                     of the screen
+    unit_type      - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER
+
+    png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y,
+       &unit_type);
+    res_x          - pixels/unit physical resolution in
+                     x direction
+    res_y          - pixels/unit physical resolution in
+                     x direction
+    unit_type      - PNG_RESOLUTION_UNKNOWN,
+                     PNG_RESOLUTION_METER
+
+    png_get_sCAL(png_ptr, info_ptr, &unit, &width,
+       &height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                 (width and height are doubles)
+
+    png_get_sCAL_s(png_ptr, info_ptr, &unit, &width,
+       &height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                 (width and height are strings like "2.54")
+
+    num_unknown_chunks = png_get_unknown_chunks(png_ptr,
+       info_ptr, &unknowns)
+    unknowns          - array of png_unknown_chunk
+                        structures holding unknown chunks
+    unknowns[i].name  - name of unknown chunk
+    unknowns[i].data  - data of unknown chunk
+    unknowns[i].size  - size of unknown chunk's data
+    unknowns[i].location - position of chunk in file
+
+    The value of "i" corresponds to the order in which the
+    chunks were read from the PNG file or inserted with the
+    png_set_unknown_chunks() function.
+
+The data from the pHYs chunk can be retrieved in several convenient
+forms:
+
+    res_x = png_get_x_pixels_per_meter(png_ptr,
+       info_ptr)
+    res_y = png_get_y_pixels_per_meter(png_ptr,
+       info_ptr)
+    res_x_and_y = png_get_pixels_per_meter(png_ptr,
+       info_ptr)
+    res_x = png_get_x_pixels_per_inch(png_ptr,
+       info_ptr)
+    res_y = png_get_y_pixels_per_inch(png_ptr,
+       info_ptr)
+    res_x_and_y = png_get_pixels_per_inch(png_ptr,
+       info_ptr)
+    aspect_ratio = png_get_pixel_aspect_ratio(png_ptr,
+       info_ptr)
+
+   (Each of these returns 0 [signifying "unknown"] if
+       the data is not present or if res_x is 0;
+       res_x_and_y is 0 if res_x != res_y)
+
+The data from the oFFs chunk can be retrieved in several convenient
+forms:
+
+    x_offset = png_get_x_offset_microns(png_ptr, info_ptr);
+    y_offset = png_get_y_offset_microns(png_ptr, info_ptr);
+    x_offset = png_get_x_offset_inches(png_ptr, info_ptr);
+    y_offset = png_get_y_offset_inches(png_ptr, info_ptr);
+
+   (Each of these returns 0 [signifying "unknown" if both
+       x and y are 0] if the data is not present or if the
+       chunk is present but the unit is the pixel)
+
+For more information, see the png_info definition in png.h and the
+PNG specification for chunk contents.  Be careful with trusting
+rowbytes, as some of the transformations could increase the space
+needed to hold a row (expand, filler, gray_to_rgb, etc.).
+See png_read_update_info(), below.
+
+A quick word about text_ptr and num_text.  PNG stores comments in
+keyword/text pairs, one pair per chunk, with no limit on the number
+of text chunks, and a 2^31 byte limit on their size.  While there are
+suggested keywords, there is no requirement to restrict the use to these
+strings.  It is strongly suggested that keywords and text be sensible
+to humans (that's the point), so don't use abbreviations.  Non-printing
+symbols are not allowed.  See the PNG specification for more details.
+There is also no requirement to have text after the keyword.
+
+Keywords should be limited to 79 Latin-1 characters without leading or
+trailing spaces, but non-consecutive spaces are allowed within the
+keyword.  It is possible to have the same keyword any number of times.
+The text_ptr is an array of png_text structures, each holding a
+pointer to a language string, a pointer to a keyword and a pointer to
+a text string.  The text string, language code, and translated
+keyword may be empty or NULL pointers.  The keyword/text
+pairs are put into the array in the order that they are received.
+However, some or all of the text chunks may be after the image, so, to
+make sure you have read all the text chunks, don't mess with these
+until after you read the stuff after the image.  This will be
+mentioned again below in the discussion that goes with png_read_end().
+
+.SS Input transformations
+
+After you've read the header information, you can set up the library
+to handle any special transformations of the image data.  The various
+ways to transform the data will be described in the order that they
+should occur.  This is important, as some of these change the color
+type and/or bit depth of the data, and some others only work on
+certain color types and bit depths.  Even though each transformation
+checks to see if it has data that it can do something with, you should
+make sure to only enable a transformation if it will be valid for the
+data.  For example, don't swap red and blue on grayscale data.
+
+The colors used for the background and transparency values should be
+supplied in the same format/depth as the current image data.  They
+are stored in the same format/depth as the image data in a bKGD or tRNS
+chunk, so this is what libpng expects for this data.  The colors are
+transformed to keep in sync with the image data when an application
+calls the png_read_update_info() routine (see below).
+
+Data will be decoded into the supplied row buffers packed into bytes
+unless the library has been told to transform it into another format.
+For example, 4 bit/pixel paletted or grayscale data will be returned
+2 pixels/byte with the leftmost pixel in the high-order bits of the
+byte, unless png_set_packing() is called.  8-bit RGB data will be stored
+in RGB RGB RGB format unless png_set_filler() or png_set_add_alpha()
+is called to insert filler bytes, either before or after each RGB triplet.
+16-bit RGB data will be returned RRGGBB RRGGBB, with the most significant
+byte of the color value first, unless png_set_strip_16() is called to
+transform it to regular RGB RGB triplets, or png_set_filler() or
+png_set_add alpha() is called to insert filler bytes, either before or
+after each RRGGBB triplet.  Similarly, 8-bit or 16-bit grayscale data can
+be modified with
+png_set_filler(), png_set_add_alpha(), or png_set_strip_16().
+
+The following code transforms grayscale images of less than 8 to 8 bits,
+changes paletted images to RGB, and adds a full alpha channel if there is
+transparency information in a tRNS chunk.  This is most useful on
+grayscale images with bit depths of 2 or 4 or if there is a multiple-image
+viewing application that wishes to treat all images in the same way.
+
+    if (color_type == PNG_COLOR_TYPE_PALETTE)
+        png_set_palette_to_rgb(png_ptr);
+
+    if (color_type == PNG_COLOR_TYPE_GRAY &&
+        bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);
+
+    if (png_get_valid(png_ptr, info_ptr,
+        PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
+
+These three functions are actually aliases for png_set_expand(), added
+in libpng version 1.0.4, with the function names expanded to improve code
+readability.  In some future version they may actually do different
+things.
+
+As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
+added.  It expands the sample depth without changing tRNS to alpha.
+At the same time, png_set_gray_1_2_4_to_8() was deprecated, and it
+will be removed from a future version.
+
+
+PNG can have files with 16 bits per channel.  If you only can handle
+8 bits per channel, this will strip the pixels down to 8 bit.
+
+    if (bit_depth == 16)
+        png_set_strip_16(png_ptr);
+
+If, for some reason, you don't need the alpha channel on an image,
+and you want to remove it rather than combining it with the background
+(but the image author certainly had in mind that you *would* combine
+it with the background, so that's what you should probably do):
+
+    if (color_type & PNG_COLOR_MASK_ALPHA)
+        png_set_strip_alpha(png_ptr);
+
+In PNG files, the alpha channel in an image
+is the level of opacity.  If you need the alpha channel in an image to
+be the level of transparency instead of opacity, you can invert the
+alpha channel (or the tRNS chunk data) after it's read, so that 0 is
+fully opaque and 255 (in 8-bit or paletted images) or 65535 (in 16-bit
+images) is fully transparent, with
+
+    png_set_invert_alpha(png_ptr);
+
+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as
+they can, resulting in, for example, 8 pixels per byte for 1 bit
+files.  This code expands to 1 pixel per byte without changing the
+values of the pixels:
+
+    if (bit_depth < 8)
+        png_set_packing(png_ptr);
+
+PNG files have possible bit depths of 1, 2, 4, 8, and 16.  All pixels
+stored in a PNG image have been "scaled" or "shifted" up to the next
+higher possible bit depth (e.g. from 5 bits/sample in the range [0,31] to
+8 bits/sample in the range [0, 255]).  However, it is also possible to
+convert the PNG pixel data back to the original bit depth of the image.
+This call reduces the pixels back down to the original bit depth:
+
+    png_color_8p sig_bit;
+
+    if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
+        png_set_shift(png_ptr, sig_bit);
+
+PNG files store 3-color pixels in red, green, blue order.  This code
+changes the storage of the pixels to blue, green, red:
+
+    if (color_type == PNG_COLOR_TYPE_RGB ||
+        color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+        png_set_bgr(png_ptr);
+
+PNG files store RGB pixels packed into 3 or 6 bytes. This code expands them
+into 4 or 8 bytes for windowing systems that need them in this format:
+
+    if (color_type == PNG_COLOR_TYPE_RGB)
+        png_set_filler(png_ptr, filler, PNG_FILLER_BEFORE);
+
+where "filler" is the 8 or 16-bit number to fill with, and the location is
+either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending upon whether
+you want the filler before the RGB or after.  This transformation
+does not affect images that already have full alpha channels.  To add an
+opaque alpha channel, use filler=0xff or 0xffff and PNG_FILLER_AFTER which
+will generate RGBA pixels.
+
+Note that png_set_filler() does not change the color type.  If you want
+to do that, you can add a true alpha channel with
+
+    if (color_type == PNG_COLOR_TYPE_RGB ||
+           color_type == PNG_COLOR_TYPE_GRAY)
+    png_set_add_alpha(png_ptr, filler, PNG_FILLER_AFTER);
+
+where "filler" contains the alpha value to assign to each pixel.
+This function was added in libpng-1.2.7.
+
+If you are reading an image with an alpha channel, and you need the
+data as ARGB instead of the normal PNG format RGBA:
+
+    if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+        png_set_swap_alpha(png_ptr);
+
+For some uses, you may want a grayscale image to be represented as
+RGB.  This code will do that conversion:
+
+    if (color_type == PNG_COLOR_TYPE_GRAY ||
+        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+          png_set_gray_to_rgb(png_ptr);
+
+Conversely, you can convert an RGB or RGBA image to grayscale or grayscale
+with alpha.
+
+    if (color_type == PNG_COLOR_TYPE_RGB ||
+        color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+          png_set_rgb_to_gray_fixed(png_ptr, error_action,
+             int red_weight, int green_weight);
+
+    error_action = 1: silently do the conversion
+    error_action = 2: issue a warning if the original
+                      image has any pixel where
+                      red != green or red != blue
+    error_action = 3: issue an error and abort the
+                      conversion if the original
+                      image has any pixel where
+                      red != green or red != blue
+
+    red_weight:       weight of red component times 100000
+    green_weight:     weight of green component times 100000
+                      If either weight is negative, default
+                      weights (21268, 71514) are used.
+
+If you have set error_action = 1 or 2, you can
+later check whether the image really was gray, after processing
+the image rows, with the png_get_rgb_to_gray_status(png_ptr) function.
+It will return a png_byte that is zero if the image was gray or
+1 if there were any non-gray pixels.  bKGD and sBIT data
+will be silently converted to grayscale, using the green channel
+data, regardless of the error_action setting.
+
+With red_weight+green_weight<=100000,
+the normalized graylevel is computed:
+
+    int rw = red_weight * 65536;
+    int gw = green_weight * 65536;
+    int bw = 65536 - (rw + gw);
+    gray = (rw*red + gw*green + bw*blue)/65536;
+
+The default values approximate those recommended in the Charles
+Poynton's Color FAQ, <http://www.inforamp.net/~poynton/>
+Copyright (c) 1998-01-04 Charles Poynton <poynton at inforamp.net>
+
+    Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
+
+Libpng approximates this with
+
+    Y = 0.21268 * R    + 0.7151 * G    + 0.07217 * B
+
+which can be expressed with integers as
+
+    Y = (6969 * R + 23434 * G + 2365 * B)/32768
+
+The calculation is done in a linear colorspace, if the image gamma
+is known.
+
+If you have a grayscale and you are using png_set_expand_depth(),
+png_set_expand(), or png_set_gray_to_rgb to change to truecolor or to
+a higher bit-depth, you must either supply the background color as a gray
+value at the original file bit-depth (need_expand = 1) or else supply the
+background color as an RGB triplet at the final, expanded bit depth
+(need_expand = 0).  Similarly, if you are reading a paletted image, you
+must either supply the background color as a palette index (need_expand = 1)
+or as an RGB triplet that may or may not be in the palette (need_expand = 0).
+
+    png_color_16 my_background;
+    png_color_16p image_background;
+
+    if (png_get_bKGD(png_ptr, info_ptr, &image_background))
+        png_set_background(png_ptr, image_background,
+          PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+    else
+        png_set_background(png_ptr, &my_background,
+          PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+
+The png_set_background() function tells libpng to composite images
+with alpha or simple transparency against the supplied background
+color.  If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid),
+you may use this color, or supply another color more suitable for
+the current display (e.g., the background color from a web page).  You
+need to tell libpng whether the color is in the gamma space of the
+display (PNG_BACKGROUND_GAMMA_SCREEN for colors you supply), the file
+(PNG_BACKGROUND_GAMMA_FILE for colors from the bKGD chunk), or one
+that is neither of these gammas (PNG_BACKGROUND_GAMMA_UNIQUE - I don't
+know why anyone would use this, but it's here).
+
+To properly display PNG images on any kind of system, the application needs
+to know what the display gamma is.  Ideally, the user will know this, and
+the application will allow them to set it.  One method of allowing the user
+to set the display gamma separately for each system is to check for a
+SCREEN_GAMMA or DISPLAY_GAMMA environment variable, which will hopefully be
+correctly set.
+
+Note that display_gamma is the overall gamma correction required to produce
+pleasing results, which depends on the lighting conditions in the surrounding
+environment.  In a dim or brightly lit room, no compensation other than
+the physical gamma exponent of the monitor is needed, while in a dark room
+a slightly smaller exponent is better.
+
+   double gamma, screen_gamma;
+
+   if (/* We have a user-defined screen
+       gamma value */)
+   {
+      screen_gamma = user_defined_screen_gamma;
+   }
+   /* One way that applications can share the same
+      screen gamma value */
+   else if ((gamma_str = getenv("SCREEN_GAMMA"))
+      != NULL)
+   {
+      screen_gamma = (double)atof(gamma_str);
+   }
+   /* If we don't have another value */
+   else
+   {
+      screen_gamma = 2.2; /* A good guess for a
+           PC monitor in a bright office or a dim room */
+      screen_gamma = 2.0; /* A good guess for a
+           PC monitor in a dark room */
+      screen_gamma = 1.7 or 1.0;  /* A good
+           guess for Mac systems */
+   }
+
+The png_set_gamma() function handles gamma transformations of the data.
+Pass both the file gamma and the current screen_gamma.  If the file does
+not have a gamma value, you can pass one anyway if you have an idea what
+it is (usually 0.45455 is a good guess for GIF images on PCs).  Note
+that file gammas are inverted from screen gammas.  See the discussions
+on gamma in the PNG specification for an excellent description of what
+gamma is, and why all applications should support it.  It is strongly
+recommended that PNG viewers support gamma correction.
+
+   if (png_get_gAMA(png_ptr, info_ptr, &gamma))
+      png_set_gamma(png_ptr, screen_gamma, gamma);
+   else
+      png_set_gamma(png_ptr, screen_gamma, 0.45455);
+
+If you need to reduce an RGB file to a paletted file, or if a paletted
+file has more entries then will fit on your screen, png_set_dither()
+will do that.  Note that this is a simple match dither that merely
+finds the closest color available.  This should work fairly well with
+optimized palettes, and fairly badly with linear color cubes.  If you
+pass a palette that is larger then maximum_colors, the file will
+reduce the number of colors in the palette so it will fit into
+maximum_colors.  If there is a histogram, it will use it to make
+more intelligent choices when reducing the palette.  If there is no
+histogram, it may not do as good a job.
+
+   if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      if (png_get_valid(png_ptr, info_ptr,
+         PNG_INFO_PLTE))
+      {
+         png_uint_16p histogram = NULL;
+
+         png_get_hIST(png_ptr, info_ptr,
+            &histogram);
+         png_set_dither(png_ptr, palette, num_palette,
+            max_screen_colors, histogram, 1);
+      }
+      else
+      {
+         png_color std_color_cube[MAX_SCREEN_COLORS] =
+            { ... colors ... };
+
+         png_set_dither(png_ptr, std_color_cube,
+            MAX_SCREEN_COLORS, MAX_SCREEN_COLORS,
+            NULL,0);
+      }
+   }
+
+PNG files describe monochrome as black being zero and white being one.
+The following code will reverse this (make black be one and white be
+zero):
+
+   if (bit_depth == 1 && color_type == PNG_COLOR_TYPE_GRAY)
+      png_set_invert_mono(png_ptr);
+
+This function can also be used to invert grayscale and gray-alpha images:
+
+   if (color_type == PNG_COLOR_TYPE_GRAY ||
+        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      png_set_invert_mono(png_ptr);
+
+PNG files store 16 bit pixels in network byte order (big-endian,
+ie. most significant bits first).  This code changes the storage to the
+other way (little-endian, i.e. least significant bits first, the
+way PCs store them):
+
+    if (bit_depth == 16)
+        png_set_swap(png_ptr);
+
+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you
+need to change the order the pixels are packed into bytes, you can use:
+
+    if (bit_depth < 8)
+       png_set_packswap(png_ptr);
+
+Finally, you can write your own transformation function if none of
+the existing ones meets your needs.  This is done by setting a callback
+with
+
+    png_set_read_user_transform_fn(png_ptr,
+       read_transform_fn);
+
+You must supply the function
+
+    void read_transform_fn(png_ptr ptr, row_info_ptr
+       row_info, png_bytep data)
+
+See pngtest.c for a working example.  Your function will be called
+after all of the other transformations have been processed.
+
+You can also set up a pointer to a user structure for use by your
+callback function, and you can inform libpng that your transform
+function will change the number of channels or bit depth with the
+function
+
+    png_set_user_transform_info(png_ptr, user_ptr,
+       user_depth, user_channels);
+
+The user's application, not libpng, is responsible for allocating and
+freeing any memory required for the user structure.
+
+You can retrieve the pointer via the function
+png_get_user_transform_ptr().  For example:
+
+    voidp read_user_transform_ptr =
+       png_get_user_transform_ptr(png_ptr);
+
+The last thing to handle is interlacing; this is covered in detail below,
+but you must call the function here if you want libpng to handle expansion
+of the interlaced image.
+
+    number_of_passes = png_set_interlace_handling(png_ptr);
+
+After setting the transformations, libpng can update your png_info
+structure to reflect any transformations you've requested with this
+call.  This is most useful to update the info structure's rowbytes
+field so you can use it to allocate your image memory.  This function
+will also update your palette with the correct screen_gamma and
+background if these have been given with the calls above.
+
+    png_read_update_info(png_ptr, info_ptr);
+
+After you call png_read_update_info(), you can allocate any
+memory you need to hold the image.  The row data is simply
+raw byte data for all forms of images.  As the actual allocation
+varies among applications, no example will be given.  If you
+are allocating one large chunk, you will need to build an
+array of pointers to each row, as it will be needed for some
+of the functions below.
+
+.SS Reading image data
+
+After you've allocated memory, you can read the image data.
+The simplest way to do this is in one function call.  If you are
+allocating enough memory to hold the whole image, you can just
+call png_read_image() and libpng will read in all the image data
+and put it in the memory area supplied.  You will need to pass in
+an array of pointers to each row.
+
+This function automatically handles interlacing, so you don't need
+to call png_set_interlace_handling() or call this function multiple
+times, or any of that other stuff necessary with png_read_rows().
+
+   png_read_image(png_ptr, row_pointers);
+
+where row_pointers is:
+
+   png_bytep row_pointers[height];
+
+You can point to void or char or whatever you use for pixels.
+
+If you don't want to read in the whole image at once, you can
+use png_read_rows() instead.  If there is no interlacing (check
+interlace_type == PNG_INTERLACE_NONE), this is simple:
+
+    png_read_rows(png_ptr, row_pointers, NULL,
+       number_of_rows);
+
+where row_pointers is the same as in the png_read_image() call.
+
+If you are doing this just one row at a time, you can do this with
+a single row_pointer instead of an array of row_pointers:
+
+    png_bytep row_pointer = row;
+    png_read_row(png_ptr, row_pointer, NULL);
+
+If the file is interlaced (interlace_type != 0 in the IHDR chunk), things
+get somewhat harder.  The only current (PNG Specification version 1.2)
+interlacing type for PNG is (interlace_type == PNG_INTERLACE_ADAM7)
+is a somewhat complicated 2D interlace scheme, known as Adam7, that
+breaks down an image into seven smaller images of varying size, based
+on an 8x8 grid.
+
+libpng can fill out those images or it can give them to you "as is".
+If you want them filled out, there are two ways to do that.  The one
+mentioned in the PNG specification is to expand each pixel to cover
+those pixels that have not been read yet (the "rectangle" method).
+This results in a blocky image for the first pass, which gradually
+smooths out as more pixels are read.  The other method is the "sparkle"
+method, where pixels are drawn only in their final locations, with the
+rest of the image remaining whatever colors they were initialized to
+before the start of the read.  The first method usually looks better,
+but tends to be slower, as there are more pixels to put in the rows.
+
+If you don't want libpng to handle the interlacing details, just call
+png_read_rows() seven times to read in all seven images.  Each of the
+images is a valid image by itself, or they can all be combined on an
+8x8 grid to form a single image (although if you intend to combine them
+you would be far better off using the libpng interlace handling).
+
+The first pass will return an image 1/8 as wide as the entire image
+(every 8th column starting in column 0) and 1/8 as high as the original
+(every 8th row starting in row 0), the second will be 1/8 as wide
+(starting in column 4) and 1/8 as high (also starting in row 0).  The
+third pass will be 1/4 as wide (every 4th pixel starting in column 0) and
+1/8 as high (every 8th row starting in row 4), and the fourth pass will
+be 1/4 as wide and 1/4 as high (every 4th column starting in column 2,
+and every 4th row starting in row 0).  The fifth pass will return an
+image 1/2 as wide, and 1/4 as high (starting at column 0 and row 2),
+while the sixth pass will be 1/2 as wide and 1/2 as high as the original
+(starting in column 1 and row 0).  The seventh and final pass will be as
+wide as the original, and 1/2 as high, containing all of the odd
+numbered scanlines.  Phew!
+
+If you want libpng to expand the images, call this before calling
+png_start_read_image() or png_read_update_info():
+
+    if (interlace_type == PNG_INTERLACE_ADAM7)
+        number_of_passes
+           = png_set_interlace_handling(png_ptr);
+
+This will return the number of passes needed.  Currently, this
+is seven, but may change if another interlace type is added.
+This function can be called even if the file is not interlaced,
+where it will return one pass.
+
+If you are not going to display the image after each pass, but are
+going to wait until the entire image is read in, use the sparkle
+effect.  This effect is faster and the end result of either method
+is exactly the same.  If you are planning on displaying the image
+after each pass, the "rectangle" effect is generally considered the
+better looking one.
+
+If you only want the "sparkle" effect, just call png_read_rows() as
+normal, with the third parameter NULL.  Make sure you make pass over
+the image number_of_passes times, and you don't change the data in the
+rows between calls.  You can change the locations of the data, just
+not the data.  Each pass only writes the pixels appropriate for that
+pass, and assumes the data from previous passes is still valid.
+
+    png_read_rows(png_ptr, row_pointers, NULL,
+       number_of_rows);
+
+If you only want the first effect (the rectangles), do the same as
+before except pass the row buffer in the third parameter, and leave
+the second parameter NULL.
+
+    png_read_rows(png_ptr, NULL, row_pointers,
+       number_of_rows);
+
+.SS Finishing a sequential read
+
+After you are finished reading the image through the
+low-level interface, you can finish reading the file.  If you are
+interested in comments or time, which may be stored either before or
+after the image data, you should pass the separate png_info struct if
+you want to keep the comments from before and after the image
+separate.  If you are not interested, you can pass NULL.
+
+   png_read_end(png_ptr, end_info);
+
+When you are done, you can free all memory allocated by libpng like this:
+
+   png_destroy_read_struct(&png_ptr, &info_ptr,
+       &end_info);
+
+It is also possible to individually free the info_ptr members that
+point to libpng-allocated storage with the following function:
+
+    png_free_data(png_ptr, info_ptr, mask, seq)
+    mask - identifies data to be freed, a mask
+           containing the bitwise OR of one or
+           more of
+             PNG_FREE_PLTE, PNG_FREE_TRNS,
+             PNG_FREE_HIST, PNG_FREE_ICCP,
+             PNG_FREE_PCAL, PNG_FREE_ROWS,
+             PNG_FREE_SCAL, PNG_FREE_SPLT,
+             PNG_FREE_TEXT, PNG_FREE_UNKN,
+           or simply PNG_FREE_ALL
+    seq  - sequence number of item to be freed
+           (-1 for all items)
+
+This function may be safely called when the relevant storage has
+already been freed, or has not yet been allocated, or was allocated
+by the user and not by libpng,  and will in those
+cases do nothing.  The "seq" parameter is ignored if only one item
+of the selected data type, such as PLTE, is allowed.  If "seq" is not
+-1, and multiple items are allowed for the data type identified in
+the mask, such as text or sPLT, only the n'th item in the structure
+is freed, where n is "seq".
+
+The default behavior is only to free data that was allocated internally
+by libpng.  This can be changed, so that libpng will not free the data,
+or so that it will free data that was allocated by the user with png_malloc()
+or png_zalloc() and passed in via a png_set_*() function, with
+
+    png_data_freer(png_ptr, info_ptr, freer, mask)
+    mask   - which data elements are affected
+             same choices as in png_free_data()
+    freer  - one of
+               PNG_DESTROY_WILL_FREE_DATA
+               PNG_SET_WILL_FREE_DATA
+               PNG_USER_WILL_FREE_DATA
+
+This function only affects data that has already been allocated.
+You can call this function after reading the PNG data but before calling
+any png_set_*() functions, to control whether the user or the png_set_*()
+function is responsible for freeing any existing data that might be present,
+and again after the png_set_*() functions to control whether the user
+or png_destroy_*() is supposed to free the data.  When the user assumes
+responsibility for libpng-allocated data, the application must use
+png_free() to free it, and when the user transfers responsibility to libpng
+for data that the user has allocated, the user must have used png_malloc()
+or png_zalloc() to allocate it.
+
+If you allocated your row_pointers in a single block, as suggested above in
+the description of the high level read interface, you must not transfer
+responsibility for freeing it to the png_set_rows or png_read_destroy function,
+because they would also try to free the individual row_pointers[i].
+
+If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword
+separately, do not transfer responsibility for freeing text_ptr to libpng,
+because when libpng fills a png_text structure it combines these members with
+the key member, and png_free_data() will free only text_ptr.key.  Similarly,
+if you transfer responsibility for free'ing text_ptr from libpng to your
+application, your application must not separately free those members.
+
+The png_free_data() function will turn off the "valid" flag for anything
+it frees.  If you need to turn the flag off for a chunk that was freed by your
+application instead of by libpng, you can use
+
+    png_set_invalid(png_ptr, info_ptr, mask);
+    mask - identifies the chunks to be made invalid,
+           containing the bitwise OR of one or
+           more of
+             PNG_INFO_gAMA, PNG_INFO_sBIT,
+             PNG_INFO_cHRM, PNG_INFO_PLTE,
+             PNG_INFO_tRNS, PNG_INFO_bKGD,
+             PNG_INFO_hIST, PNG_INFO_pHYs,
+             PNG_INFO_oFFs, PNG_INFO_tIME,
+             PNG_INFO_pCAL, PNG_INFO_sRGB,
+             PNG_INFO_iCCP, PNG_INFO_sPLT,
+             PNG_INFO_sCAL, PNG_INFO_IDAT
+
+For a more compact example of reading a PNG image, see the file example.c.
+
+.SS Reading PNG files progressively
+
+The progressive reader is slightly different then the non-progressive
+reader.  Instead of calling png_read_info(), png_read_rows(), and
+png_read_end(), you make one call to png_process_data(), which calls
+callbacks when it has the info, a row, or the end of the image.  You
+set up these callbacks with png_set_progressive_read_fn().  You don't
+have to worry about the input/output functions of libpng, as you are
+giving the library the data directly in png_process_data().  I will
+assume that you have read the section on reading PNG files above,
+so I will only highlight the differences (although I will show
+all of the code).
+
+png_structp png_ptr;
+png_infop info_ptr;
+
+ /*  An example code fragment of how you would
+     initialize the progressive reader in your
+     application. */
+ int
+ initialize_png_reader()
+ {
+    png_ptr = png_create_read_struct
+        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+         user_error_fn, user_warning_fn);
+    if (!png_ptr)
+        return (ERROR);
+    info_ptr = png_create_info_struct(png_ptr);
+    if (!info_ptr)
+    {
+        png_destroy_read_struct(&png_ptr, (png_infopp)NULL,
+           (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+           (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    /* This one's new.  You can provide functions
+       to be called when the header info is valid,
+       when each row is completed, and when the image
+       is finished.  If you aren't using all functions,
+       you can specify NULL parameters.  Even when all
+       three functions are NULL, you need to call
+       png_set_progressive_read_fn().  You can use
+       any struct as the user_ptr (cast to a void pointer
+       for the function call), and retrieve the pointer
+       from inside the callbacks using the function
+
+          png_get_progressive_ptr(png_ptr);
+
+       which will return a void pointer, which you have
+       to cast appropriately.
+     */
+    png_set_progressive_read_fn(png_ptr, (void *)user_ptr,
+        info_callback, row_callback, end_callback);
+
+    return 0;
+ }
+
+ /* A code fragment that you call as you receive blocks
+   of data */
+ int
+ process_data(png_bytep buffer, png_uint_32 length)
+ {
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+        png_destroy_read_struct(&png_ptr, &info_ptr,
+           (png_infopp)NULL);
+        return (ERROR);
+    }
+
+    /* This one's new also.  Simply give it a chunk
+       of data from the file stream (in order, of
+       course).  On machines with segmented memory
+       models machines, don't give it any more than
+       64K.  The library seems to run fine with sizes
+       of 4K. Although you can give it much less if
+       necessary (I assume you can give it chunks of
+       1 byte, I haven't tried less then 256 bytes
+       yet).  When this function returns, you may
+       want to display any rows that were generated
+       in the row callback if you don't already do
+       so there.
+     */
+    png_process_data(png_ptr, info_ptr, buffer, length);
+    return 0;
+ }
+
+ /* This function is called (as set by
+    png_set_progressive_read_fn() above) when enough data
+    has been supplied so all of the header has been
+    read.
+ */
+ void
+ info_callback(png_structp png_ptr, png_infop info)
+ {
+    /* Do any setup here, including setting any of
+       the transformations mentioned in the Reading
+       PNG files section.  For now, you _must_ call
+       either png_start_read_image() or
+       png_read_update_info() after all the
+       transformations are set (even if you don't set
+       any).  You may start getting rows before
+       png_process_data() returns, so this is your
+       last chance to prepare for that.
+     */
+ }
+
+ /* This function is called when each row of image
+    data is complete */
+ void
+ row_callback(png_structp png_ptr, png_bytep new_row,
+    png_uint_32 row_num, int pass)
+ {
+    /* If the image is interlaced, and you turned
+       on the interlace handler, this function will
+       be called for every row in every pass.  Some
+       of these rows will not be changed from the
+       previous pass.  When the row is not changed,
+       the new_row variable will be NULL.  The rows
+       and passes are called in order, so you don't
+       really need the row_num and pass, but I'm
+       supplying them because it may make your life
+       easier.
+
+       For the non-NULL rows of interlaced images,
+       you must call png_progressive_combine_row()
+       passing in the row and the old row.  You can
+       call this function for NULL rows (it will just
+       return) and for non-interlaced images (it just
+       does the memcpy for you) if it will make the
+       code easier.  Thus, you can just do this for
+       all cases:
+     */
+
+        png_progressive_combine_row(png_ptr, old_row,
+          new_row);
+
+    /* where old_row is what was displayed for
+       previously for the row.  Note that the first
+       pass (pass == 0, really) will completely cover
+       the old row, so the rows do not have to be
+       initialized.  After the first pass (and only
+       for interlaced images), you will have to pass
+       the current row, and the function will combine
+       the old row and the new row.
+    */
+ }
+
+ void
+ end_callback(png_structp png_ptr, png_infop info)
+ {
+    /* This function is called after the whole image
+       has been read, including any chunks after the
+       image (up to and including the IEND).  You
+       will usually have the same info chunk as you
+       had in the header, although some data may have
+       been added to the comments and time fields.
+
+       Most people won't do much here, perhaps setting
+       a flag that marks the image as finished.
+     */
+ }
+
+
+
+.SH IV. Writing
+
+Much of this is very similar to reading.  However, everything of
+importance is repeated here, so you won't have to constantly look
+back up in the reading section to understand writing.
+
+.SS Setup
+
+You will want to do the I/O initialization before you get into libpng,
+so if it doesn't work, you don't have anything to undo. If you are not
+using the standard I/O functions, you will need to replace them with
+custom writing functions.  See the discussion under Customizing libpng.
+
+    FILE *fp = fopen(file_name, "wb");
+    if (!fp)
+    {
+       return (ERROR);
+    }
+
+Next, png_struct and png_info need to be allocated and initialized.
+As these can be both relatively large, you may not want to store these
+on the stack, unless you have stack space to spare.  Of course, you
+will want to check if they return NULL.  If you are also reading,
+you won't want to name your read structure and your write structure
+both "png_ptr"; you can call them anything you like, such as
+"read_ptr" and "write_ptr".  Look at pngtest.c, for example.
+
+    png_structp png_ptr = png_create_write_struct
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn);
+    if (!png_ptr)
+       return (ERROR);
+
+    png_infop info_ptr = png_create_info_struct(png_ptr);
+    if (!info_ptr)
+    {
+       png_destroy_write_struct(&png_ptr,
+         (png_infopp)NULL);
+       return (ERROR);
+    }
+
+If you want to use your own memory allocation routines,
+define PNG_USER_MEM_SUPPORTED and use
+png_create_write_struct_2() instead of png_create_write_struct():
+
+    png_structp png_ptr = png_create_write_struct_2
+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        user_error_fn, user_warning_fn, (png_voidp)
+        user_mem_ptr, user_malloc_fn, user_free_fn);
+
+After you have these structures, you will need to set up the
+error handling.  When libpng encounters an error, it expects to
+longjmp() back to your routine.  Therefore, you will need to call
+setjmp() and pass the png_jmpbuf(png_ptr).  If you
+write the file from different routines, you will need to update
+the png_jmpbuf(png_ptr) every time you enter a new routine that will
+call a png_*() function.  See your documentation of setjmp/longjmp
+for your compiler for more information on setjmp/longjmp.  See
+the discussion on libpng error handling in the Customizing Libpng
+section below for more information on the libpng error handling.
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+       png_destroy_write_struct(&png_ptr, &info_ptr);
+       fclose(fp);
+       return (ERROR);
+    }
+    ...
+    return;
+
+If you would rather avoid the complexity of setjmp/longjmp issues,
+you can compile libpng with PNG_SETJMP_NOT_SUPPORTED, in which case
+errors will result in a call to PNG_ABORT() which defaults to abort().
+
+Now you need to set up the output code.  The default for libpng is to
+use the C function fwrite().  If you use this, you will need to pass a
+valid FILE * in the function png_init_io().  Be sure that the file is
+opened in binary mode.  Again, if you wish to handle writing data in
+another way, see the discussion on libpng I/O handling in the Customizing
+Libpng section below.
+
+    png_init_io(png_ptr, fp);
+
+If you are embedding your PNG into a datastream such as MNG, and don't
+want libpng to write the 8-byte signature, or if you have already
+written the signature in your application, use
+
+    png_set_sig_bytes(png_ptr, 8);
+
+to inform libpng that it should not write a signature.
+
+.SS Write callbacks
+
+At this point, you can set up a callback function that will be
+called after each row has been written, which you can use to control
+a progress meter or the like.  It's demonstrated in pngtest.c.
+You must supply a function
+
+    void write_row_callback(png_ptr, png_uint_32 row,
+       int pass);
+    {
+      /* put your code here */
+    }
+
+(You can give it another name that you like instead of "write_row_callback")
+
+To inform libpng about your function, use
+
+    png_set_write_status_fn(png_ptr, write_row_callback);
+
+You now have the option of modifying how the compression library will
+run.  The following functions are mainly for testing, but may be useful
+in some cases, like if you need to write PNG files extremely fast and
+are willing to give up some compression, or if you want to get the
+maximum possible compression at the expense of slower writing.  If you
+have no special needs in this area, let the library do what it wants by
+not calling this function at all, as it has been tuned to deliver a good
+speed/compression ratio. The second parameter to png_set_filter() is
+the filter method, for which the only valid values are 0 (as of the
+July 1999 PNG specification, version 1.2) or 64 (if you are writing
+a PNG datastream that is to be embedded in a MNG datastream).  The third
+parameter is a flag that indicates which filter type(s) are to be tested
+for each scanline.  See the PNG specification for details on the specific filter
+types.
+
+
+    /* turn on or off filtering, and/or choose
+       specific filters.  You can use either a single
+       PNG_FILTER_VALUE_NAME or the bitwise OR of one
+       or more PNG_FILTER_NAME masks. */
+    png_set_filter(png_ptr, 0,
+       PNG_FILTER_NONE  | PNG_FILTER_VALUE_NONE |
+       PNG_FILTER_SUB   | PNG_FILTER_VALUE_SUB  |
+       PNG_FILTER_UP    | PNG_FILTER_VALUE_UP   |
+       PNG_FILTER_AVE   | PNG_FILTER_VALUE_AVE  |
+       PNG_FILTER_PAETH | PNG_FILTER_VALUE_PAETH|
+       PNG_ALL_FILTERS);
+
+If an application
+wants to start and stop using particular filters during compression,
+it should start out with all of the filters (to ensure that the previous
+row of pixels will be stored in case it's needed later), and then add
+and remove them after the start of compression.
+
+If you are writing a PNG datastream that is to be embedded in a MNG
+datastream, the second parameter can be either 0 or 64.
+
+The png_set_compression_*() functions interface to the zlib compression
+library, and should mostly be ignored unless you really know what you are
+doing.  The only generally useful call is png_set_compression_level()
+which changes how much time zlib spends on trying to compress the image
+data.  See the Compression Library (zlib.h and algorithm.txt, distributed
+with zlib) for details on the compression levels.
+
+    /* set the zlib compression level */
+    png_set_compression_level(png_ptr,
+        Z_BEST_COMPRESSION);
+
+    /* set other zlib parameters */
+    png_set_compression_mem_level(png_ptr, 8);
+    png_set_compression_strategy(png_ptr,
+        Z_DEFAULT_STRATEGY);
+    png_set_compression_window_bits(png_ptr, 15);
+    png_set_compression_method(png_ptr, 8);
+    png_set_compression_buffer_size(png_ptr, 8192)
+
+extern PNG_EXPORT(void,png_set_zbuf_size)
+
+.SS Setting the contents of info for output
+
+You now need to fill in the png_info structure with all the data you
+wish to write before the actual image.  Note that the only thing you
+are allowed to write after the image is the text chunks and the time
+chunk (as of PNG Specification 1.2, anyway).  See png_write_end() and
+the latest PNG specification for more information on that.  If you
+wish to write them before the image, fill them in now, and flag that
+data as being valid.  If you want to wait until after the data, don't
+fill them until png_write_end().  For all the fields in png_info and
+their data types, see png.h.  For explanations of what the fields
+contain, see the PNG specification.
+
+Some of the more important parts of the png_info are:
+
+    png_set_IHDR(png_ptr, info_ptr, width, height,
+       bit_depth, color_type, interlace_type,
+       compression_type, filter_method)
+    width          - holds the width of the image
+                     in pixels (up to 2^31).
+    height         - holds the height of the image
+                     in pixels (up to 2^31).
+    bit_depth      - holds the bit depth of one of the
+                     image channels.
+                     (valid values are 1, 2, 4, 8, 16
+                     and depend also on the
+                     color_type.  See also significant
+                     bits (sBIT) below).
+    color_type     - describes which color/alpha
+                     channels are present.
+                     PNG_COLOR_TYPE_GRAY
+                        (bit depths 1, 2, 4, 8, 16)
+                     PNG_COLOR_TYPE_GRAY_ALPHA
+                        (bit depths 8, 16)
+                     PNG_COLOR_TYPE_PALETTE
+                        (bit depths 1, 2, 4, 8)
+                     PNG_COLOR_TYPE_RGB
+                        (bit_depths 8, 16)
+                     PNG_COLOR_TYPE_RGB_ALPHA
+                        (bit_depths 8, 16)
+
+                     PNG_COLOR_MASK_PALETTE
+                     PNG_COLOR_MASK_COLOR
+                     PNG_COLOR_MASK_ALPHA
+
+    interlace_type - PNG_INTERLACE_NONE or
+                     PNG_INTERLACE_ADAM7
+    compression_type - (must be
+                     PNG_COMPRESSION_TYPE_DEFAULT)
+    filter_method  - (must be PNG_FILTER_TYPE_DEFAULT
+                     or, if you are writing a PNG to
+                     be embedded in a MNG datastream,
+                     can also be
+                     PNG_INTRAPIXEL_DIFFERENCING)
+
+If you call png_set_IHDR(), the call must appear before any of the
+other png_set_*() functions, which might require access to some of
+the IHDR settings.  The remaining png_set_*() functions can be called
+in any order.
+
+    png_set_PLTE(png_ptr, info_ptr, palette,
+       num_palette);
+    palette        - the palette for the file
+                     (array of png_color)
+    num_palette    - number of entries in the palette
+
+    png_set_gAMA(png_ptr, info_ptr, gamma);
+    gamma          - the gamma the image was created
+                     at (PNG_INFO_gAMA)
+
+    png_set_sRGB(png_ptr, info_ptr, srgb_intent);
+    srgb_intent    - the rendering intent
+                     (PNG_INFO_sRGB) The presence of
+                     the sRGB chunk means that the pixel
+                     data is in the sRGB color space.
+                     This chunk also implies specific
+                     values of gAMA and cHRM.  Rendering
+                     intent is the CSS-1 property that
+                     has been defined by the International
+                     Color Consortium
+                     (http://www.color.org).
+                     It can be one of
+                     PNG_sRGB_INTENT_SATURATION,
+                     PNG_sRGB_INTENT_PERCEPTUAL,
+                     PNG_sRGB_INTENT_ABSOLUTE, or
+                     PNG_sRGB_INTENT_RELATIVE.
+
+
+    png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+       srgb_intent);
+    srgb_intent    - the rendering intent
+                     (PNG_INFO_sRGB) The presence of the
+                     sRGB chunk means that the pixel
+                     data is in the sRGB color space.
+                     This function also causes gAMA and
+                     cHRM chunks with the specific values
+                     that are consistent with sRGB to be
+                     written.
+
+    png_set_iCCP(png_ptr, info_ptr, name, compression_type,
+                      profile, proflen);
+    name            - The profile name.
+    compression     - The compression type; always
+                      PNG_COMPRESSION_TYPE_BASE for PNG 1.0.
+                      You may give NULL to this argument to
+                      ignore it.
+    profile         - International Color Consortium color
+                      profile data. May contain NULs.
+    proflen         - length of profile data in bytes.
+
+    png_set_sBIT(png_ptr, info_ptr, sig_bit);
+    sig_bit        - the number of significant bits for
+                     (PNG_INFO_sBIT) each of the gray, red,
+                     green, and blue channels, whichever are
+                     appropriate for the given color type
+                     (png_color_16)
+
+    png_set_tRNS(png_ptr, info_ptr, trans, num_trans,
+       trans_values);
+    trans          - array of transparent entries for
+                     palette (PNG_INFO_tRNS)
+    trans_values   - graylevel or color sample values of
+                     the single transparent color for
+                     non-paletted images (PNG_INFO_tRNS)
+    num_trans      - number of transparent entries
+                     (PNG_INFO_tRNS)
+
+    png_set_hIST(png_ptr, info_ptr, hist);
+                    (PNG_INFO_hIST)
+    hist           - histogram of palette (array of
+                     png_uint_16)
+
+    png_set_tIME(png_ptr, info_ptr, mod_time);
+    mod_time       - time image was last modified
+                     (PNG_VALID_tIME)
+
+    png_set_bKGD(png_ptr, info_ptr, background);
+    background     - background color (PNG_VALID_bKGD)
+
+    png_set_text(png_ptr, info_ptr, text_ptr, num_text);
+    text_ptr       - array of png_text holding image
+                     comments
+    text_ptr[i].compression - type of compression used
+                 on "text" PNG_TEXT_COMPRESSION_NONE
+                           PNG_TEXT_COMPRESSION_zTXt
+                           PNG_ITXT_COMPRESSION_NONE
+                           PNG_ITXT_COMPRESSION_zTXt
+    text_ptr[i].key   - keyword for comment.  Must contain
+                 1-79 characters.
+    text_ptr[i].text  - text comments for current
+                         keyword.  Can be NULL or empty.
+    text_ptr[i].text_length - length of text string,
+                 after decompression, 0 for iTXt
+    text_ptr[i].itxt_length - length of itxt string,
+                 after decompression, 0 for tEXt/zTXt
+    text_ptr[i].lang  - language of comment (NULL or
+                         empty for unknown).
+    text_ptr[i].translated_keyword  - keyword in UTF-8 (NULL
+                         or empty for unknown).
+    num_text       - number of comments
+
+    png_set_sPLT(png_ptr, info_ptr, &palette_ptr,
+       num_spalettes);
+    palette_ptr    - array of png_sPLT_struct structures
+                     to be added to the list of palettes
+                     in the info structure.
+    num_spalettes  - number of palette structures to be
+                     added.
+
+    png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y,
+        unit_type);
+    offset_x  - positive offset from the left
+                     edge of the screen
+    offset_y  - positive offset from the top
+                     edge of the screen
+    unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER
+
+    png_set_pHYs(png_ptr, info_ptr, res_x, res_y,
+        unit_type);
+    res_x       - pixels/unit physical resolution
+                  in x direction
+    res_y       - pixels/unit physical resolution
+                  in y direction
+    unit_type   - PNG_RESOLUTION_UNKNOWN,
+                  PNG_RESOLUTION_METER
+
+    png_set_sCAL(png_ptr, info_ptr, unit, width, height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                  (width and height are doubles)
+
+    png_set_sCAL_s(png_ptr, info_ptr, unit, width, height)
+    unit        - physical scale units (an integer)
+    width       - width of a pixel in physical scale units
+    height      - height of a pixel in physical scale units
+                 (width and height are strings like "2.54")
+
+    png_set_unknown_chunks(png_ptr, info_ptr, &unknowns,
+       num_unknowns)
+    unknowns          - array of png_unknown_chunk
+                        structures holding unknown chunks
+    unknowns[i].name  - name of unknown chunk
+    unknowns[i].data  - data of unknown chunk
+    unknowns[i].size  - size of unknown chunk's data
+    unknowns[i].location - position to write chunk in file
+                           0: do not write chunk
+                           PNG_HAVE_IHDR: before PLTE
+                           PNG_HAVE_PLTE: before IDAT
+                           PNG_AFTER_IDAT: after IDAT
+
+The "location" member is set automatically according to
+what part of the output file has already been written.
+You can change its value after calling png_set_unknown_chunks()
+as demonstrated in pngtest.c.  Within each of the "locations",
+the chunks are sequenced according to their position in the
+structure (that is, the value of "i", which is the order in which
+the chunk was either read from the input file or defined with
+png_set_unknown_chunks).
+
+A quick word about text and num_text.  text is an array of png_text
+structures.  num_text is the number of valid structures in the array.
+Each png_text structure holds a language code, a keyword, a text value,
+and a compression type.
+
+The compression types have the same valid numbers as the compression
+types of the image data.  Currently, the only valid number is zero.
+However, you can store text either compressed or uncompressed, unlike
+images, which always have to be compressed.  So if you don't want the
+text compressed, set the compression type to PNG_TEXT_COMPRESSION_NONE.
+Because tEXt and zTXt chunks don't have a language field, if you
+specify PNG_TEXT_COMPRESSION_NONE or PNG_TEXT_COMPRESSION_zTXt
+any language code or translated keyword will not be written out.
+
+Until text gets around 1000 bytes, it is not worth compressing it.
+After the text has been written out to the file, the compression type
+is set to PNG_TEXT_COMPRESSION_NONE_WR or PNG_TEXT_COMPRESSION_zTXt_WR,
+so that it isn't written out again at the end (in case you are calling
+png_write_end() with the same struct.
+
+The keywords that are given in the PNG Specification are:
+
+    Title            Short (one line) title or
+                     caption for image
+    Author           Name of image's creator
+    Description      Description of image (possibly long)
+    Copyright        Copyright notice
+    Creation Time    Time of original image creation
+                     (usually RFC 1123 format, see below)
+    Software         Software used to create the image
+    Disclaimer       Legal disclaimer
+    Warning          Warning of nature of content
+    Source           Device used to create the image
+    Comment          Miscellaneous comment; conversion
+                     from other image format
+
+The keyword-text pairs work like this.  Keywords should be short
+simple descriptions of what the comment is about.  Some typical
+keywords are found in the PNG specification, as is some recommendations
+on keywords.  You can repeat keywords in a file.  You can even write
+some text before the image and some after.  For example, you may want
+to put a description of the image before the image, but leave the
+disclaimer until after, so viewers working over modem connections
+don't have to wait for the disclaimer to go over the modem before
+they start seeing the image.  Finally, keywords should be full
+words, not abbreviations.  Keywords and text are in the ISO 8859-1
+(Latin-1) character set (a superset of regular ASCII) and can not
+contain NUL characters, and should not contain control or other
+unprintable characters.  To make the comments widely readable, stick
+with basic ASCII, and avoid machine specific character set extensions
+like the IBM-PC character set.  The keyword must be present, but
+you can leave off the text string on non-compressed pairs.
+Compressed pairs must have a text string, as only the text string
+is compressed anyway, so the compression would be meaningless.
+
+PNG supports modification time via the png_time structure.  Two
+conversion routines are provided, png_convert_from_time_t() for
+time_t and png_convert_from_struct_tm() for struct tm.  The
+time_t routine uses gmtime().  You don't have to use either of
+these, but if you wish to fill in the png_time structure directly,
+you should provide the time in universal time (GMT) if possible
+instead of your local time.  Note that the year number is the full
+year (e.g. 1998, rather than 98 - PNG is year 2000 compliant!), and
+that months start with 1.
+
+If you want to store the time of the original image creation, you should
+use a plain tEXt chunk with the "Creation Time" keyword.  This is
+necessary because the "creation time" of a PNG image is somewhat vague,
+depending on whether you mean the PNG file, the time the image was
+created in a non-PNG format, a still photo from which the image was
+scanned, or possibly the subject matter itself.  In order to facilitate
+machine-readable dates, it is recommended that the "Creation Time"
+tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"),
+although this isn't a requirement.  Unlike the tIME chunk, the
+"Creation Time" tEXt chunk is not expected to be automatically changed
+by the software.  To facilitate the use of RFC 1123 dates, a function
+png_convert_to_rfc1123(png_timep) is provided to convert from PNG
+time to an RFC 1123 format string.
+
+.SS Writing unknown chunks
+
+You can use the png_set_unknown_chunks function to queue up chunks
+for writing.  You give it a chunk name, raw data, and a size; that's
+all there is to it.  The chunks will be written by the next following
+png_write_info_before_PLTE, png_write_info, or png_write_end function.
+Any chunks previously read into the info structure's unknown-chunk
+list will also be written out in a sequence that satisfies the PNG
+specification's ordering rules.
+
+.SS The high-level write interface
+
+At this point there are two ways to proceed; through the high-level
+write interface, or through a sequence of low-level write operations.
+You can use the high-level interface if your image data is present
+in the info structure.  All defined output
+transformations are permitted, enabled by the following masks.
+
+    PNG_TRANSFORM_IDENTITY      No transformation
+    PNG_TRANSFORM_PACKING       Pack 1, 2 and 4-bit samples
+    PNG_TRANSFORM_PACKSWAP      Change order of packed
+                                pixels to LSB first
+    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images
+    PNG_TRANSFORM_SHIFT         Normalize pixels to the
+                                sBIT depth
+    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA
+                                to BGRA
+    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA
+                                to AG
+    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity
+                                to transparency
+    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples
+    PNG_TRANSFORM_STRIP_FILLER  Strip out filler bytes.
+
+If you have valid image data in the info structure (you can use
+png_set_rows() to put image data in the info structure), simply do this:
+
+    png_write_png(png_ptr, info_ptr, png_transforms, NULL)
+
+where png_transforms is an integer containing the bitwise OR of some set of
+transformation flags.  This call is equivalent to png_write_info(),
+followed the set of transformations indicated by the transform mask,
+then png_write_image(), and finally png_write_end().
+
+(The final parameter of this call is not yet used.  Someday it might point
+to transformation parameters required by some future output transform.)
+
+You must use png_transforms and not call any png_set_transform() functions
+when you use png_write_png().
+
+.SS The low-level write interface
+
+If you are going the low-level route instead, you are now ready to
+write all the file information up to the actual image data.  You do
+this with a call to png_write_info().
+
+    png_write_info(png_ptr, info_ptr);
+
+Note that there is one transformation you may need to do before
+png_write_info().  In PNG files, the alpha channel in an image is the
+level of opacity.  If your data is supplied as a level of
+transparency, you can invert the alpha channel before you write it, so
+that 0 is fully transparent and 255 (in 8-bit or paletted images) or
+65535 (in 16-bit images) is fully opaque, with
+
+    png_set_invert_alpha(png_ptr);
+
+This must appear before png_write_info() instead of later with the
+other transformations because in the case of paletted images the tRNS
+chunk data has to be inverted before the tRNS chunk is written.  If
+your image is not a paletted image, the tRNS data (which in such cases
+represents a single color to be rendered as transparent) won't need to
+be changed, and you can safely do this transformation after your
+png_write_info() call.
+
+If you need to write a private chunk that you want to appear before
+the PLTE chunk when PLTE is present, you can write the PNG info in
+two steps, and insert code to write your own chunk between them:
+
+    png_write_info_before_PLTE(png_ptr, info_ptr);
+    png_set_unknown_chunks(png_ptr, info_ptr, ...);
+    png_write_info(png_ptr, info_ptr);
+
+After you've written the file information, you can set up the library
+to handle any special transformations of the image data.  The various
+ways to transform the data will be described in the order that they
+should occur.  This is important, as some of these change the color
+type and/or bit depth of the data, and some others only work on
+certain color types and bit depths.  Even though each transformation
+checks to see if it has data that it can do something with, you should
+make sure to only enable a transformation if it will be valid for the
+data.  For example, don't swap red and blue on grayscale data.
+
+PNG files store RGB pixels packed into 3 or 6 bytes.  This code tells
+the library to strip input data that has 4 or 8 bytes per pixel down
+to 3 or 6 bytes (or strip 2 or 4-byte grayscale+filler data to 1 or 2
+bytes per pixel).
+
+    png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+
+where the 0 is unused, and the location is either PNG_FILLER_BEFORE or
+PNG_FILLER_AFTER, depending upon whether the filler byte in the pixel
+is stored XRGB or RGBX.
+
+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as
+they can, resulting in, for example, 8 pixels per byte for 1 bit files.
+If the data is supplied at 1 pixel per byte, use this code, which will
+correctly pack the pixels into a single byte:
+
+    png_set_packing(png_ptr);
+
+PNG files reduce possible bit depths to 1, 2, 4, 8, and 16.  If your
+data is of another bit depth, you can write an sBIT chunk into the
+file so that decoders can recover the original data if desired.
+
+    /* Set the true bit depth of the image data */
+    if (color_type & PNG_COLOR_MASK_COLOR)
+    {
+        sig_bit.red = true_bit_depth;
+        sig_bit.green = true_bit_depth;
+        sig_bit.blue = true_bit_depth;
+    }
+    else
+    {
+        sig_bit.gray = true_bit_depth;
+    }
+    if (color_type & PNG_COLOR_MASK_ALPHA)
+    {
+        sig_bit.alpha = true_bit_depth;
+    }
+
+    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+
+If the data is stored in the row buffer in a bit depth other than
+one supported by PNG (e.g. 3 bit data in the range 0-7 for a 4-bit PNG),
+this will scale the values to appear to be the correct bit depth as
+is required by PNG.
+
+    png_set_shift(png_ptr, &sig_bit);
+
+PNG files store 16 bit pixels in network byte order (big-endian,
+ie. most significant bits first).  This code would be used if they are
+supplied the other way (little-endian, i.e. least significant bits
+first, the way PCs store them):
+
+    if (bit_depth > 8)
+       png_set_swap(png_ptr);
+
+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you
+need to change the order the pixels are packed into bytes, you can use:
+
+    if (bit_depth < 8)
+       png_set_packswap(png_ptr);
+
+PNG files store 3 color pixels in red, green, blue order.  This code
+would be used if they are supplied as blue, green, red:
+
+    png_set_bgr(png_ptr);
+
+PNG files describe monochrome as black being zero and white being
+one. This code would be used if the pixels are supplied with this reversed
+(black being one and white being zero):
+
+    png_set_invert_mono(png_ptr);
+
+Finally, you can write your own transformation function if none of
+the existing ones meets your needs.  This is done by setting a callback
+with
+
+    png_set_write_user_transform_fn(png_ptr,
+       write_transform_fn);
+
+You must supply the function
+
+    void write_transform_fn(png_ptr ptr, row_info_ptr
+       row_info, png_bytep data)
+
+See pngtest.c for a working example.  Your function will be called
+before any of the other transformations are processed.
+
+You can also set up a pointer to a user structure for use by your
+callback function.
+
+    png_set_user_transform_info(png_ptr, user_ptr, 0, 0);
+
+The user_channels and user_depth parameters of this function are ignored
+when writing; you can set them to zero as shown.
+
+You can retrieve the pointer via the function png_get_user_transform_ptr().
+For example:
+
+    voidp write_user_transform_ptr =
+       png_get_user_transform_ptr(png_ptr);
+
+It is possible to have libpng flush any pending output, either manually,
+or automatically after a certain number of lines have been written.  To
+flush the output stream a single time call:
+
+    png_write_flush(png_ptr);
+
+and to have libpng flush the output stream periodically after a certain
+number of scanlines have been written, call:
+
+    png_set_flush(png_ptr, nrows);
+
+Note that the distance between rows is from the last time png_write_flush()
+was called, or the first row of the image if it has never been called.
+So if you write 50 lines, and then png_set_flush 25, it will flush the
+output on the next scanline, and every 25 lines thereafter, unless
+png_write_flush() is called before 25 more lines have been written.
+If nrows is too small (less than about 10 lines for a 640 pixel wide
+RGB image) the image compression may decrease noticeably (although this
+may be acceptable for real-time applications).  Infrequent flushing will
+only degrade the compression performance by a few percent over images
+that do not use flushing.
+
+.SS Writing the image data
+
+That's it for the transformations.  Now you can write the image data.
+The simplest way to do this is in one function call.  If you have the
+whole image in memory, you can just call png_write_image() and libpng
+will write the image.  You will need to pass in an array of pointers to
+each row.  This function automatically handles interlacing, so you don't
+need to call png_set_interlace_handling() or call this function multiple
+times, or any of that other stuff necessary with png_write_rows().
+
+    png_write_image(png_ptr, row_pointers);
+
+where row_pointers is:
+
+    png_byte *row_pointers[height];
+
+You can point to void or char or whatever you use for pixels.
+
+If you don't want to write the whole image at once, you can
+use png_write_rows() instead.  If the file is not interlaced,
+this is simple:
+
+    png_write_rows(png_ptr, row_pointers,
+       number_of_rows);
+
+row_pointers is the same as in the png_write_image() call.
+
+If you are just writing one row at a time, you can do this with
+a single row_pointer instead of an array of row_pointers:
+
+    png_bytep row_pointer = row;
+
+    png_write_row(png_ptr, row_pointer);
+
+When the file is interlaced, things can get a good deal more
+complicated.  The only currently (as of the PNG Specification
+version 1.2, dated July 1999) defined interlacing scheme for PNG files
+is the "Adam7" interlace scheme, that breaks down an
+image into seven smaller images of varying size.  libpng will build
+these images for you, or you can do them yourself.  If you want to
+build them yourself, see the PNG specification for details of which
+pixels to write when.
+
+If you don't want libpng to handle the interlacing details, just
+use png_set_interlace_handling() and call png_write_rows() the
+correct number of times to write all seven sub-images.
+
+If you want libpng to build the sub-images, call this before you start
+writing any rows:
+
+    number_of_passes =
+       png_set_interlace_handling(png_ptr);
+
+This will return the number of passes needed.  Currently, this
+is seven, but may change if another interlace type is added.
+
+Then write the complete image number_of_passes times.
+
+    png_write_rows(png_ptr, row_pointers,
+       number_of_rows);
+
+As some of these rows are not used, and thus return immediately,
+you may want to read about interlacing in the PNG specification,
+and only update the rows that are actually used.
+
+.SS Finishing a sequential write
+
+After you are finished writing the image, you should finish writing
+the file.  If you are interested in writing comments or time, you should
+pass an appropriately filled png_info pointer.  If you are not interested,
+you can pass NULL.
+
+    png_write_end(png_ptr, info_ptr);
+
+When you are done, you can free all memory used by libpng like this:
+
+    png_destroy_write_struct(&png_ptr, &info_ptr);
+
+It is also possible to individually free the info_ptr members that
+point to libpng-allocated storage with the following function:
+
+    png_free_data(png_ptr, info_ptr, mask, seq)
+    mask  - identifies data to be freed, a mask
+            containing the bitwise OR of one or
+            more of
+              PNG_FREE_PLTE, PNG_FREE_TRNS,
+              PNG_FREE_HIST, PNG_FREE_ICCP,
+              PNG_FREE_PCAL, PNG_FREE_ROWS,
+              PNG_FREE_SCAL, PNG_FREE_SPLT,
+              PNG_FREE_TEXT, PNG_FREE_UNKN,
+            or simply PNG_FREE_ALL
+    seq   - sequence number of item to be freed
+            (-1 for all items)
+
+This function may be safely called when the relevant storage has
+already been freed, or has not yet been allocated, or was allocated
+by the user  and not by libpng,  and will in those
+cases do nothing.  The "seq" parameter is ignored if only one item
+of the selected data type, such as PLTE, is allowed.  If "seq" is not
+-1, and multiple items are allowed for the data type identified in
+the mask, such as text or sPLT, only the n'th item in the structure
+is freed, where n is "seq".
+
+If you allocated data such as a palette that you passed
+in to libpng with png_set_*, you must not free it until just before the call to
+png_destroy_write_struct().
+
+The default behavior is only to free data that was allocated internally
+by libpng.  This can be changed, so that libpng will not free the data,
+or so that it will free data that was allocated by the user with png_malloc()
+or png_zalloc() and passed in via a png_set_*() function, with
+
+    png_data_freer(png_ptr, info_ptr, freer, mask)
+    mask   - which data elements are affected
+             same choices as in png_free_data()
+    freer  - one of
+               PNG_DESTROY_WILL_FREE_DATA
+               PNG_SET_WILL_FREE_DATA
+               PNG_USER_WILL_FREE_DATA
+
+For example, to transfer responsibility for some data from a read structure
+to a write structure, you could use
+
+    png_data_freer(read_ptr, read_info_ptr,
+       PNG_USER_WILL_FREE_DATA,
+       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)
+    png_data_freer(write_ptr, write_info_ptr,
+       PNG_DESTROY_WILL_FREE_DATA,
+       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)
+
+thereby briefly reassigning responsibility for freeing to the user but
+immediately afterwards reassigning it once more to the write_destroy
+function.  Having done this, it would then be safe to destroy the read
+structure and continue to use the PLTE, tRNS, and hIST data in the write
+structure.
+
+This function only affects data that has already been allocated.
+You can call this function before calling after the png_set_*() functions
+to control whether the user or png_destroy_*() is supposed to free the data.
+When the user assumes responsibility for libpng-allocated data, the
+application must use
+png_free() to free it, and when the user transfers responsibility to libpng
+for data that the user has allocated, the user must have used png_malloc()
+or png_zalloc() to allocate it.
+
+If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword
+separately, do not transfer responsibility for freeing text_ptr to libpng,
+because when libpng fills a png_text structure it combines these members with
+the key member, and png_free_data() will free only text_ptr.key.  Similarly,
+if you transfer responsibility for free'ing text_ptr from libpng to your
+application, your application must not separately free those members.
+For a more compact example of writing a PNG image, see the file example.c.
+
+.SH V. Modifying/Customizing libpng:
+
+There are two issues here.  The first is changing how libpng does
+standard things like memory allocation, input/output, and error handling.
+The second deals with more complicated things like adding new chunks,
+adding new transformations, and generally changing how libpng works.
+Both of those are compile-time issues; that is, they are generally
+determined at the time the code is written, and there is rarely a need
+to provide the user with a means of changing them.
+
+Memory allocation, input/output, and error handling
+
+All of the memory allocation, input/output, and error handling in libpng
+goes through callbacks that are user-settable.  The default routines are
+in pngmem.c, pngrio.c, pngwio.c, and pngerror.c, respectively.  To change
+these functions, call the appropriate png_set_*_fn() function.
+
+Memory allocation is done through the functions png_malloc()
+and png_free().  These currently just call the standard C functions.  If
+your pointers can't access more then 64K at a time, you will want to set
+MAXSEG_64K in zlib.h.  Since it is unlikely that the method of handling
+memory allocation on a platform will change between applications, these
+functions must be modified in the library at compile time.  If you prefer
+to use a different method of allocating and freeing data, you can use
+png_create_read_struct_2() or png_create_write_struct_2() to register
+your own functions as described above.
+These functions also provide a void pointer that can be retrieved via
+
+    mem_ptr=png_get_mem_ptr(png_ptr);
+
+Your replacement memory functions must have prototypes as follows:
+
+    png_voidp malloc_fn(png_structp png_ptr,
+       png_size_t size);
+    void free_fn(png_structp png_ptr, png_voidp ptr);
+
+Your malloc_fn() must return NULL in case of failure.  The png_malloc()
+function will normally call png_error() if it receives a NULL from the
+system memory allocator or from your replacement malloc_fn().
+
+Your free_fn() will never be called with a NULL ptr, since libpng's
+png_free() checks for NULL before calling free_fn().
+
+Input/Output in libpng is done through png_read() and png_write(),
+which currently just call fread() and fwrite().  The FILE * is stored in
+png_struct and is initialized via png_init_io().  If you wish to change
+the method of I/O, the library supplies callbacks that you can set
+through the function png_set_read_fn() and png_set_write_fn() at run
+time, instead of calling the png_init_io() function.  These functions
+also provide a void pointer that can be retrieved via the function
+png_get_io_ptr().  For example:
+
+    png_set_read_fn(png_structp read_ptr,
+        voidp read_io_ptr, png_rw_ptr read_data_fn)
+
+    png_set_write_fn(png_structp write_ptr,
+        voidp write_io_ptr, png_rw_ptr write_data_fn,
+        png_flush_ptr output_flush_fn);
+
+    voidp read_io_ptr = png_get_io_ptr(read_ptr);
+    voidp write_io_ptr = png_get_io_ptr(write_ptr);
+
+The replacement I/O functions must have prototypes as follows:
+
+    void user_read_data(png_structp png_ptr,
+        png_bytep data, png_size_t length);
+    void user_write_data(png_structp png_ptr,
+        png_bytep data, png_size_t length);
+    void user_flush_data(png_structp png_ptr);
+
+Supplying NULL for the read, write, or flush functions sets them back
+to using the default C stream functions.  It is an error to read from
+a write stream, and vice versa.
+
+Error handling in libpng is done through png_error() and png_warning().
+Errors handled through png_error() are fatal, meaning that png_error()
+should never return to its caller.  Currently, this is handled via
+setjmp() and longjmp() (unless you have compiled libpng with
+PNG_SETJMP_NOT_SUPPORTED, in which case it is handled via PNG_ABORT()),
+but you could change this to do things like exit() if you should wish.
+
+On non-fatal errors, png_warning() is called
+to print a warning message, and then control returns to the calling code.
+By default png_error() and png_warning() print a message on stderr via
+fprintf() unless the library is compiled with PNG_NO_CONSOLE_IO defined
+(because you don't want the messages) or PNG_NO_STDIO defined (because
+fprintf() isn't available).  If you wish to change the behavior of the error
+functions, you will need to set up your own message callbacks.  These
+functions are normally supplied at the time that the png_struct is created.
+It is also possible to redirect errors and warnings to your own replacement
+functions after png_create_*_struct() has been called by calling:
+
+    png_set_error_fn(png_structp png_ptr,
+        png_voidp error_ptr, png_error_ptr error_fn,
+        png_error_ptr warning_fn);
+
+    png_voidp error_ptr = png_get_error_ptr(png_ptr);
+
+If NULL is supplied for either error_fn or warning_fn, then the libpng
+default function will be used, calling fprintf() and/or longjmp() if a
+problem is encountered.  The replacement error functions should have
+parameters as follows:
+
+    void user_error_fn(png_structp png_ptr,
+        png_const_charp error_msg);
+    void user_warning_fn(png_structp png_ptr,
+        png_const_charp warning_msg);
+
+The motivation behind using setjmp() and longjmp() is the C++ throw and
+catch exception handling methods.  This makes the code much easier to write,
+as there is no need to check every return code of every function call.
+However, there are some uncertainties about the status of local variables
+after a longjmp, so the user may want to be careful about doing anything after
+setjmp returns non-zero besides returning itself.  Consult your compiler
+documentation for more details.  For an alternative approach, you may wish
+to use the "cexcept" facility (see http://cexcept.sourceforge.net).
+
+.SS Custom chunks
+
+If you need to read or write custom chunks, you may need to get deeper
+into the libpng code.  The library now has mechanisms for storing
+and writing chunks of unknown type; you can even declare callbacks
+for custom chunks.  However, this may not be good enough if the
+library code itself needs to know about interactions between your
+chunk and existing `intrinsic' chunks.
+
+If you need to write a new intrinsic chunk, first read the PNG
+specification. Acquire a first level of
+understanding of how it works.  Pay particular attention to the
+sections that describe chunk names, and look at how other chunks were
+designed, so you can do things similarly.  Second, check out the
+sections of libpng that read and write chunks.  Try to find a chunk
+that is similar to yours and use it as a template.  More details can
+be found in the comments inside the code.  It is best to handle unknown
+chunks in a generic method, via callback functions, instead of by
+modifying libpng functions.
+
+If you wish to write your own transformation for the data, look through
+the part of the code that does the transformations, and check out some of
+the simpler ones to get an idea of how they work.  Try to find a similar
+transformation to the one you want to add and copy off of it.  More details
+can be found in the comments inside the code itself.
+
+.SS Configuring for 16 bit platforms
+
+You will want to look into zconf.h to tell zlib (and thus libpng) that
+it cannot allocate more then 64K at a time.  Even if you can, the memory
+won't be accessible.  So limit zlib and libpng to 64K by defining MAXSEG_64K.
+
+.SS Configuring for DOS
+
+For DOS users who only have access to the lower 640K, you will
+have to limit zlib's memory usage via a png_set_compression_mem_level()
+call.  See zlib.h or zconf.h in the zlib library for more information.
+
+.SS Configuring for Medium Model
+
+Libpng's support for medium model has been tested on most of the popular
+compilers.  Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets
+defined, and FAR gets defined to far in pngconf.h, and you should be
+all set.  Everything in the library (except for zlib's structure) is
+expecting far data.  You must use the typedefs with the p or pp on
+the end for pointers (or at least look at them and be careful).  Make
+note that the rows of data are defined as png_bytepp, which is an
+unsigned char far * far *.
+
+.SS Configuring for gui/windowing platforms:
+
+You will need to write new error and warning functions that use the GUI
+interface, as described previously, and set them to be the error and
+warning functions at the time that png_create_*_struct() is called,
+in order to have them available during the structure initialization.
+They can be changed later via png_set_error_fn().  On some compilers,
+you may also have to change the memory allocators (png_malloc, etc.).
+
+.SS Configuring for compiler xxx:
+
+All includes for libpng are in pngconf.h.  If you need to add/change/delete
+an include, this is the place to do it.  The includes that are not
+needed outside libpng are protected by the PNG_INTERNAL definition,
+which is only defined for those routines inside libpng itself.  The
+files in libpng proper only include png.h, which includes pngconf.h.
+
+.SS Configuring zlib:
+
+There are special functions to configure the compression.  Perhaps the
+most useful one changes the compression level, which currently uses
+input compression values in the range 0 - 9.  The library normally
+uses the default compression level (Z_DEFAULT_COMPRESSION = 6).  Tests
+have shown that for a large majority of images, compression values in
+the range 3-6 compress nearly as well as higher levels, and do so much
+faster.  For online applications it may be desirable to have maximum speed
+(Z_BEST_SPEED = 1).  With versions of zlib after v0.99, you can also
+specify no compression (Z_NO_COMPRESSION = 0), but this would create
+files larger than just storing the raw bitmap.  You can specify the
+compression level by calling:
+
+    png_set_compression_level(png_ptr, level);
+
+Another useful one is to reduce the memory level used by the library.
+The memory level defaults to 8, but it can be lowered if you are
+short on memory (running DOS, for example, where you only have 640K).
+Note that the memory level does have an effect on compression; among
+other things, lower levels will result in sections of incompressible
+data being emitted in smaller stored blocks, with a correspondingly
+larger relative overhead of up to 15% in the worst case.
+
+    png_set_compression_mem_level(png_ptr, level);
+
+The other functions are for configuring zlib.  They are not recommended
+for normal use and may result in writing an invalid PNG file.  See
+zlib.h for more information on what these mean.
+
+    png_set_compression_strategy(png_ptr,
+        strategy);
+    png_set_compression_window_bits(png_ptr,
+        window_bits);
+    png_set_compression_method(png_ptr, method);
+    png_set_compression_buffer_size(png_ptr, size);
+
+.SS Controlling row filtering
+
+If you want to control whether libpng uses filtering or not, which
+filters are used, and how it goes about picking row filters, you
+can call one of these functions.  The selection and configuration
+of row filters can have a significant impact on the size and
+encoding speed and a somewhat lesser impact on the decoding speed
+of an image.  Filtering is enabled by default for RGB and grayscale
+images (with and without alpha), but not for paletted images nor
+for any images with bit depths less than 8 bits/pixel.
+
+The 'method' parameter sets the main filtering method, which is
+currently only '0' in the PNG 1.2 specification.  The 'filters'
+parameter sets which filter(s), if any, should be used for each
+scanline.  Possible values are PNG_ALL_FILTERS and PNG_NO_FILTERS
+to turn filtering on and off, respectively.
+
+Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,
+PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise
+ORed together with '|' to specify one or more filters to use.
+These filters are described in more detail in the PNG specification.
+If you intend to change the filter type during the course of writing
+the image, you should start with flags set for all of the filters
+you intend to use so that libpng can initialize its internal
+structures appropriately for all of the filter types.  (Note that this
+means the first row must always be adaptively filtered, because libpng
+currently does not allocate the filter buffers until png_write_row()
+is called for the first time.)
+
+    filters = PNG_FILTER_NONE | PNG_FILTER_SUB
+              PNG_FILTER_UP | PNG_FILTER_AVE |
+              PNG_FILTER_PAETH | PNG_ALL_FILTERS;
+
+    png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,
+       filters);
+              The second parameter can also be
+              PNG_INTRAPIXEL_DIFFERENCING if you are
+              writing a PNG to be embedded in a MNG
+              datastream.  This parameter must be the
+              same as the value of filter_method used
+              in png_set_IHDR().
+
+It is also possible to influence how libpng chooses from among the
+available filters.  This is done in one or both of two ways - by
+telling it how important it is to keep the same filter for successive
+rows, and by telling it the relative computational costs of the filters.
+
+    double weights[3] = {1.5, 1.3, 1.1},
+       costs[PNG_FILTER_VALUE_LAST] =
+       {1.0, 1.3, 1.3, 1.5, 1.7};
+
+    png_set_filter_heuristics(png_ptr,
+       PNG_FILTER_HEURISTIC_WEIGHTED, 3,
+       weights, costs);
+
+The weights are multiplying factors that indicate to libpng that the
+row filter should be the same for successive rows unless another row filter
+is that many times better than the previous filter.  In the above example,
+if the previous 3 filters were SUB, SUB, NONE, the SUB filter could have a
+"sum of absolute differences" 1.5 x 1.3 times higher than other filters
+and still be chosen, while the NONE filter could have a sum 1.1 times
+higher than other filters and still be chosen.  Unspecified weights are
+taken to be 1.0, and the specified weights should probably be declining
+like those above in order to emphasize recent filters over older filters.
+
+The filter costs specify for each filter type a relative decoding cost
+to be considered when selecting row filters.  This means that filters
+with higher costs are less likely to be chosen over filters with lower
+costs, unless their "sum of absolute differences" is that much smaller.
+The costs do not necessarily reflect the exact computational speeds of
+the various filters, since this would unduly influence the final image
+size.
+
+Note that the numbers above were invented purely for this example and
+are given only to help explain the function usage.  Little testing has
+been done to find optimum values for either the costs or the weights.
+
+.SS Removing unwanted object code
+
+There are a bunch of #define's in pngconf.h that control what parts of
+libpng are compiled.  All the defines end in _SUPPORTED.  If you are
+never going to use a capability, you can change the #define to #undef
+before recompiling libpng and save yourself code and data space, or
+you can turn off individual capabilities with defines that begin with
+PNG_NO_.
+
+You can also turn all of the transforms and ancillary chunk capabilities
+off en masse with compiler directives that define
+PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,
+or all four,
+along with directives to turn on any of the capabilities that you do
+want.  The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable
+the extra transformations but still leave the library fully capable of reading
+and writing PNG files with all known public chunks
+Use of the PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive
+produces a library that is incapable of reading or writing ancillary chunks.
+If you are not using the progressive reading capability, you can
+turn that off with PNG_NO_PROGRESSIVE_READ (don't confuse
+this with the INTERLACING capability, which you'll still have).
+
+All the reading and writing specific code are in separate files, so the
+linker should only grab the files it needs.  However, if you want to
+make sure, or if you are building a stand alone library, all the
+reading files start with pngr and all the writing files start with
+pngw.  The files that don't match either (like png.c, pngtrans.c, etc.)
+are used for both reading and writing, and always need to be included.
+The progressive reader is in pngpread.c
+
+If you are creating or distributing a dynamically linked library (a .so
+or DLL file), you should not remove or disable any parts of the library,
+as this will cause applications linked with different versions of the
+library to fail if they call functions not available in your library.
+The size of the library itself should not be an issue, because only
+those sections that are actually used will be loaded into memory.
+
+.SS Requesting debug printout
+
+The macro definition PNG_DEBUG can be used to request debugging
+printout.  Set it to an integer value in the range 0 to 3.  Higher
+numbers result in increasing amounts of debugging information.  The
+information is printed to the "stderr" file, unless another file
+name is specified in the PNG_DEBUG_FILE macro definition.
+
+When PNG_DEBUG > 0, the following functions (macros) become available:
+
+   png_debug(level, message)
+   png_debug1(level, message, p1)
+   png_debug2(level, message, p1, p2)
+
+in which "level" is compared to PNG_DEBUG to decide whether to print
+the message, "message" is the formatted string to be printed,
+and p1 and p2 are parameters that are to be embedded in the string
+according to printf-style formatting directives.  For example,
+
+   png_debug1(2, "foo=%d\n", foo);
+
+is expanded to
+
+   if(PNG_DEBUG > 2)
+     fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);
+
+When PNG_DEBUG is defined but is zero, the macros aren't defined, but you
+can still use PNG_DEBUG to control your own debugging:
+
+   #ifdef PNG_DEBUG
+       fprintf(stderr, ...
+   #endif
+
+When PNG_DEBUG = 1, the macros are defined, but only png_debug statements
+having level = 0 will be printed.  There aren't any such statements in
+this version of libpng, but if you insert some they will be printed.
+
+.SH VII.  MNG support
+
+The MNG specification (available at http://www.libpng.org/pub/mng) allows
+certain extensions to PNG for PNG images that are embedded in MNG datastreams.
+Libpng can support some of these extensions.  To enable them, use the
+png_permit_mng_features() function:
+
+   feature_set = png_permit_mng_features(png_ptr, mask)
+   mask is a png_uint_32 containing the bitwise OR of the
+        features you want to enable.  These include
+        PNG_FLAG_MNG_EMPTY_PLTE
+        PNG_FLAG_MNG_FILTER_64
+        PNG_ALL_MNG_FEATURES
+   feature_set is a png_uint_32 that is the bitwise AND of
+      your mask with the set of MNG features that is
+      supported by the version of libpng that you are using.
+
+It is an error to use this function when reading or writing a standalone
+PNG file with the PNG 8-byte signature.  The PNG datastream must be wrapped
+in a MNG datastream.  As a minimum, it must have the MNG 8-byte signature
+and the MHDR and MEND chunks.  Libpng does not provide support for these
+or any other MNG chunks; your application must provide its own support for
+them.  You may wish to consider using libmng (available at
+http://www.libmng.com) instead.
+
+.SH VIII.  Changes to Libpng from version 0.88
+
+It should be noted that versions of libpng later than 0.96 are not
+distributed by the original libpng author, Guy Schalnat, nor by
+Andreas Dilger, who had taken over from Guy during 1996 and 1997, and
+distributed versions 0.89 through 0.96, but rather by another member
+of the original PNG Group, Glenn Randers-Pehrson.  Guy and Andreas are
+still alive and well, but they have moved on to other things.
+
+The old libpng functions png_read_init(), png_write_init(),
+png_info_init(), png_read_destroy(), and png_write_destroy() have been
+moved to PNG_INTERNAL in version 0.95 to discourage their use.  These
+functions will be removed from libpng version 2.0.0.
+
+The preferred method of creating and initializing the libpng structures is
+via the png_create_read_struct(), png_create_write_struct(), and
+png_create_info_struct() because they isolate the size of the structures
+from the application, allow version error checking, and also allow the
+use of custom error handling routines during the initialization, which
+the old functions do not.  The functions png_read_destroy() and
+png_write_destroy() do not actually free the memory that libpng
+allocated for these structs, but just reset the data structures, so they
+can be used instead of png_destroy_read_struct() and
+png_destroy_write_struct() if you feel there is too much system overhead
+allocating and freeing the png_struct for each image read.
+
+Setting the error callbacks via png_set_message_fn() before
+png_read_init() as was suggested in libpng-0.88 is no longer supported
+because this caused applications that do not use custom error functions
+to fail if the png_ptr was not initialized to zero.  It is still possible
+to set the error callbacks AFTER png_read_init(), or to change them with
+png_set_error_fn(), which is essentially the same function, but with a new
+name to force compilation errors with applications that try to use the old
+method.
+
+Starting with version 1.0.7, you can find out which version of the library
+you are using at run-time:
+
+   png_uint_32 libpng_vn = png_access_version_number();
+
+The number libpng_vn is constructed from the major version, minor
+version with leading zero, and release number with leading zero,
+(e.g., libpng_vn for version 1.0.7 is 10007).
+
+You can also check which version of png.h you used when compiling your
+application:
+
+   png_uint_32 application_vn = PNG_LIBPNG_VER;
+
+.SH IX. Y2K Compliance in libpng
+
+February 14, 2009
+
+Since the PNG Development group is an ad-hoc body, we can't make
+an official declaration.
+
+This is your unofficial assurance that libpng from version 0.71 and
+upward through 1.2.35 are Y2K compliant.  It is my belief that earlier
+versions were also Y2K compliant.
+
+Libpng only has three year fields.  One is a 2-byte unsigned integer that
+will hold years up to 65535.  The other two hold the date in text
+format, and will hold years up to 9999.
+
+The integer is
+    "png_uint_16 year" in png_time_struct.
+
+The strings are
+    "png_charp time_buffer" in png_struct and
+    "near_time_buffer", which is a local character string in png.c.
+
+There are seven time-related functions:
+
+    png_convert_to_rfc_1123() in png.c
+      (formerly png_convert_to_rfc_1152() in error)
+    png_convert_from_struct_tm() in pngwrite.c, called
+      in pngwrite.c
+    png_convert_from_time_t() in pngwrite.c
+    png_get_tIME() in pngget.c
+    png_handle_tIME() in pngrutil.c, called in pngread.c
+    png_set_tIME() in pngset.c
+    png_write_tIME() in pngwutil.c, called in pngwrite.c
+
+All appear to handle dates properly in a Y2K environment.  The
+png_convert_from_time_t() function calls gmtime() to convert from system
+clock time, which returns (year - 1900), which we properly convert to
+the full 4-digit year.  There is a possibility that applications using
+libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+function, or that they are incorrectly passing only a 2-digit year
+instead of "year - 1900" into the png_convert_from_struct_tm() function,
+but this is not under our control.  The libpng documentation has always
+stated that it works with 4-digit years, and the APIs have been
+documented as such.
+
+The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
+integer to hold the year, and can hold years as large as 65535.
+
+zlib, upon which libpng depends, is also Y2K compliant.  It contains
+no date-related code.
+
+
+   Glenn Randers-Pehrson
+   libpng maintainer
+   PNG Development Group
+
+.SH NOTE
+
+Note about libpng version numbers:
+
+Due to various miscommunications, unforeseen code incompatibilities
+and occasional factors outside the authors' control, version numbering
+on the library has not always been consistent and straightforward.
+The following table summarizes matters since version 0.89c, which was
+the first widely used release:
+
+ source             png.h  png.h  shared-lib
+ version            string   int  version
+ -------            ------  ----- ----------
+ 0.89c ("beta 3")  0.89       89  1.0.89
+ 0.90  ("beta 4")  0.90       90  0.90
+ 0.95  ("beta 5")  0.95       95  0.95
+ 0.96  ("beta 6")  0.96       96  0.96
+ 0.97b ("beta 7")  1.00.97    97  1.0.1
+ 0.97c             0.97       97  2.0.97
+ 0.98              0.98       98  2.0.98
+ 0.99              0.99       98  2.0.99
+ 0.99a-m           0.99       99  2.0.99
+ 1.00              1.00      100  2.1.0
+ 1.0.0             1.0.0     100  2.1.0
+ 1.0.0   (from here on, the  100  2.1.0
+ 1.0.1    png.h string is  10001  2.1.0
+ 1.0.1a-e identical to the 10002  from here on, the
+ 1.0.2    source version)  10002  shared library is 2.V
+ 1.0.2a-b                  10003  where V is the source
+ 1.0.1                     10001  code version except as
+ 1.0.1a-e                  10002  2.1.0.1a-e   noted.
+ 1.0.2                     10002  2.1.0.2
+ 1.0.2a-b                  10003  2.1.0.2a-b
+ 1.0.3                     10003  2.1.0.3
+ 1.0.3a-d                  10004  2.1.0.3a-d
+ 1.0.4                     10004  2.1.0.4
+ 1.0.4a-f                  10005  2.1.0.4a-f
+ 1.0.5 (+ 2 patches)       10005  2.1.0.5
+ 1.0.5a-d                  10006  2.1.0.5a-d
+ 1.0.5e-r                  10100  2.1.0.5e-r
+ 1.0.5s-v                  10006  2.1.0.5s-v
+ 1.0.6 (+ 3 patches)       10006  2.1.0.6
+ 1.0.6d-g                  10007  2.1.0.6d-g
+ 1.0.6h                    10007  10.6h
+ 1.0.6i                    10007  10.6i
+ 1.0.6j                    10007  2.1.0.6j
+ 1.0.7beta11-14    DLLNUM  10007  2.1.0.7beta11-14
+ 1.0.7beta15-18       1    10007  2.1.0.7beta15-18
+ 1.0.7rc1-2           1    10007  2.1.0.7rc1-2
+ 1.0.7                1    10007  2.1.0.7
+ 1.0.8beta1-4         1    10008  2.1.0.8beta1-4
+ 1.0.8rc1             1    10008  2.1.0.8rc1
+ 1.0.8                1    10008  2.1.0.8
+ 1.0.9beta1-6         1    10009  2.1.0.9beta1-6
+ 1.0.9rc1             1    10009  2.1.0.9rc1
+ 1.0.9beta7-10        1    10009  2.1.0.9beta7-10
+ 1.0.9rc2             1    10009  2.1.0.9rc2
+ 1.0.9                1    10009  2.1.0.9
+ 1.0.10beta1          1    10010  2.1.0.10beta1
+ 1.0.10rc1            1    10010  2.1.0.10rc1
+ 1.0.10               1    10010  2.1.0.10
+ 1.0.11beta1-3        1    10011  2.1.0.11beta1-3
+ 1.0.11rc1            1    10011  2.1.0.11rc1
+ 1.0.11               1    10011  2.1.0.11
+ 1.0.12beta1-2        2    10012  2.1.0.12beta1-2
+ 1.0.12rc1            2    10012  2.1.0.12rc1
+ 1.0.12               2    10012  2.1.0.12
+ 1.1.0a-f             -    10100  2.1.1.0a-f abandoned
+ 1.2.0beta1-2         2    10200  2.1.2.0beta1-2
+ 1.2.0beta3-5         3    10200  3.1.2.0beta3-5
+ 1.2.0rc1             3    10200  3.1.2.0rc1
+ 1.2.0                3    10200  3.1.2.0
+ 1.2.1beta-4          3    10201  3.1.2.1beta1-4
+ 1.2.1rc1-2           3    10201  3.1.2.1rc1-2
+ 1.2.1                3    10201  3.1.2.1
+ 1.2.2beta1-6        12    10202  12.so.0.1.2.2beta1-6
+ 1.0.13beta1         10    10013  10.so.0.1.0.13beta1
+ 1.0.13rc1           10    10013  10.so.0.1.0.13rc1
+ 1.2.2rc1            12    10202  12.so.0.1.2.2rc1
+ 1.0.13              10    10013  10.so.0.1.0.13
+ 1.2.2               12    10202  12.so.0.1.2.2
+ 1.2.3rc1-6          12    10203  12.so.0.1.2.3rc1-6
+ 1.2.3               12    10203  12.so.0.1.2.3
+ 1.2.4beta1-3        13    10204  12.so.0.1.2.4beta1-3
+ 1.2.4rc1            13    10204  12.so.0.1.2.4rc1
+ 1.0.14              10    10014  10.so.0.1.0.14
+ 1.2.4               13    10204  12.so.0.1.2.4
+ 1.2.5beta1-2        13    10205  12.so.0.1.2.5beta1-2
+ 1.0.15rc1           10    10015  10.so.0.1.0.15rc1
+ 1.0.15              10    10015  10.so.0.1.0.15
+ 1.2.5               13    10205  12.so.0.1.2.5
+ 1.2.6beta1-4        13    10206  12.so.0.1.2.6beta1-4
+ 1.2.6rc1-5          13    10206  12.so.0.1.2.6rc1-5
+ 1.0.16              10    10016  10.so.0.1.0.16
+ 1.2.6               13    10206  12.so.0.1.2.6
+ 1.2.7beta1-2        13    10207  12.so.0.1.2.7beta1-2
+ 1.0.17rc1           10    10017  10.so.0.1.0.17rc1
+ 1.2.7rc1            13    10207  12.so.0.1.2.7rc1
+ 1.0.17              10    10017  10.so.0.1.0.17
+ 1.2.7               13    10207  12.so.0.1.2.7
+ 1.2.8beta1-5        13    10208  12.so.0.1.2.8beta1-5
+ 1.0.18rc1-5         10    10018  10.so.0.1.0.18rc1-5
+ 1.2.8rc1-5          13    10208  12.so.0.1.2.8rc1-5
+ 1.0.18              10    10018  10.so.0.1.0.18
+ 1.2.8               13    10208  12.so.0.1.2.8
+ 1.2.9beta1-3        13    10209  12.so.0.1.2.9beta1-3
+ 1.2.9beta4-11       13    10209  12.so.0.9[.0]
+ 1.2.9rc1            13    10209  12.so.0.9[.0]
+ 1.2.9               13    10209  12.so.0.9[.0]
+ 1.2.10beta1-8       13    10210  12.so.0.10[.0]
+ 1.2.10rc1-3         13    10210  12.so.0.10[.0]
+ 1.2.10              13    10210  12.so.0.10[.0]
+ 1.2.11beta1-4       13    10211  12.so.0.11[.0]
+ 1.0.19rc1-5         10    10019  10.so.0.19[.0]
+ 1.2.11rc1-5         13    10211  12.so.0.11[.0]
+ 1.0.19              10    10019  10.so.0.19[.0]
+ 1.2.11              13    10211  12.so.0.11[.0]
+ 1.0.20              10    10020  10.so.0.20[.0]
+ 1.2.12              13    10212  12.so.0.12[.0]
+ 1.2.13beta1         13    10213  12.so.0.13[.0]
+ 1.0.21              10    10021  10.so.0.21[.0]
+ 1.2.13              13    10213  12.so.0.13[.0]
+ 1.2.14beta1-2       13    10214  12.so.0.14[.0]
+ 1.0.22rc1           10    10022  10.so.0.22[.0]
+ 1.2.14rc1           13    10214  12.so.0.14[.0]
+ 1.2.15beta1-6       13    10215  12.so.0.15[.0]
+ 1.0.23rc1-5         10    10023  10.so.0.23[.0]
+ 1.2.15rc1-5         13    10215  12.so.0.15[.0]
+ 1.0.23              10    10023  10.so.0.23[.0]
+ 1.2.15              13    10215  12.so.0.15[.0]
+ 1.2.16beta1-2       13    10216  12.so.0.16[.0]
+ 1.2.16rc1           13    10216  12.so.0.16[.0]
+ 1.0.24              10    10024  10.so.0.24[.0]
+ 1.2.16              13    10216  12.so.0.16[.0]
+ 1.2.17beta1-2       13    10217  12.so.0.17[.0]
+ 1.0.25rc1           10    10025  10.so.0.25[.0]
+ 1.2.17rc1-3         13    10217  12.so.0.17[.0]
+ 1.0.25              10    10025  10.so.0.25[.0]
+ 1.2.17              13    10217  12.so.0.17[.0]
+ 1.0.26              10    10026  10.so.0.26[.0]
+ 1.2.18              13    10218  12.so.0.18[.0]
+ 1.2.19beta1-31      13    10219  12.so.0.19[.0]
+ 1.0.27rc1-6         10    10027  10.so.0.27[.0]
+ 1.2.19rc1-6         13    10219  12.so.0.19[.0]
+ 1.0.27              10    10027  10.so.0.27[.0]
+ 1.2.19              13    10219  12.so.0.19[.0]
+ 1.2.20beta01-04     13    10220  12.so.0.20[.0]
+ 1.0.28rc1-6         10    10028  10.so.0.28[.0]
+ 1.2.20rc1-6         13    10220  12.so.0.20[.0]
+ 1.0.28              10    10028  10.so.0.28[.0]
+ 1.2.20              13    10220  12.so.0.20[.0]
+ 1.2.21beta1-2       13    10221  12.so.0.21[.0]
+ 1.2.21rc1-3         13    10221  12.so.0.21[.0]
+ 1.0.29              10    10029  10.so.0.29[.0]
+ 1.2.21              13    10221  12.so.0.21[.0]
+ 1.2.22beta1-4       13    10222  12.so.0.22[.0]
+ 1.0.30rc1           13    10030  10.so.0.30[.0]
+ 1.2.22rc1           13    10222  12.so.0.22[.0]
+ 1.0.30              10    10030  10.so.0.30[.0]
+ 1.2.22              13    10222  12.so.0.22[.0]
+ 1.2.23beta01-05     13    10223  12.so.0.23[.0]
+ 1.2.23rc01          13    10223  12.so.0.23[.0]
+ 1.2.23              13    10223  12.so.0.23[.0]
+ 1.2.24beta01-02     13    10224  12.so.0.24[.0]
+ 1.2.24rc01          13    10224  12.so.0.24[.0]
+ 1.2.24              13    10224  12.so.0.24[.0]
+ 1.2.25beta01-06     13    10225  12.so.0.25[.0]
+ 1.2.25rc01-02       13    10225  12.so.0.25[.0]
+ 1.0.31              10    10031  10.so.0.31[.0]
+ 1.2.25              13    10225  12.so.0.25[.0]
+ 1.2.26beta01-06     13    10226  12.so.0.26[.0]
+ 1.2.26rc01          13    10226  12.so.0.26[.0]
+ 1.2.26              13    10226  12.so.0.26[.0]
+ 1.0.32              10    10032  10.so.0.32[.0]
+ 1.2.27beta01-06     13    10227  12.so.0.27[.0]
+ 1.2.27rc01          13    10227  12.so.0.27[.0]
+ 1.0.33              10    10033  10.so.0.33[.0]
+ 1.2.27              13    10227  12.so.0.27[.0]
+ 1.0.34              10    10034  10.so.0.34[.0]
+ 1.2.28              13    10228  12.so.0.28[.0]
+ 1.2.29beta01-03     13    10229  12.so.0.29[.0]
+ 1.2.29rc01          13    10229  12.so.0.29[.0]
+ 1.0.35              10    10035  10.so.0.35[.0]
+ 1.2.29              13    10229  12.so.0.29[.0]
+ 1.0.37              10    10037  10.so.0.37[.0]
+ 1.2.30beta01-04     13    10230  12.so.0.30[.0]
+ 1.0.38rc01-08       10    10038  10.so.0.38[.0]
+ 1.2.30rc01-08       13    10230  12.so.0.30[.0]
+ 1.0.38              10    10038  10.so.0.38[.0]
+ 1.2.30              13    10230  12.so.0.30[.0]
+ 1.0.39rc01-03       10    10039  10.so.0.39[.0]
+ 1.2.31rc01-03       13    10231  12.so.0.31[.0]
+ 1.0.39              10    10039  10.so.0.39[.0]
+ 1.2.31              13    10231  12.so.0.31[.0]
+ 1.2.32beta01-02     13    10232  12.so.0.32[.0]
+ 1.0.40rc01          10    10040  10.so.0.40[.0]
+ 1.2.32rc01          13    10232  12.so.0.32[.0]
+ 1.0.40              10    10040  10.so.0.40[.0]
+ 1.2.32              13    10232  12.so.0.32[.0]
+ 1.2.33beta01-02     13    10233  12.so.0.33[.0]
+ 1.2.33rc01-02       13    10233  12.so.0.33[.0]
+ 1.0.41rc01          10    10041  10.so.0.41[.0]
+ 1.2.33              13    10233  12.so.0.33[.0]
+ 1.0.41              10    10041  10.so.0.41[.0]
+ 1.2.34beta01-07     13    10234  12.so.0.34[.0]
+ 1.0.42rc01          10    10042  10.so.0.42[.0]
+ 1.2.34rc01          13    10234  12.so.0.34[.0]
+ 1.0.42              10    10042  10.so.0.42[.0]
+ 1.2.34              13    10234  12.so.0.34[.0]
+ 1.2.35beta01-03     13    10235  12.so.0.35[.0]
+ 1.0.43rc01-02       10    10043  10.so.0.43[.0]
+ 1.2.35rc01-02       13    10235  12.so.0.35[.0]
+ 1.0.43              10    10043  10.so.0.43[.0]
+ 1.2.35              13    10235  12.so.0.35[.0]
+
+Henceforth the source version will match the shared-library minor
+and patch numbers; the shared-library major version number will be
+used for changes in backward compatibility, as it is intended.  The
+PNG_PNGLIB_VER macro, which is not used within libpng but is available
+for applications, is an unsigned integer of the form xyyzz corresponding
+to the source version x.y.z (leading zeros in y and z).  Beta versions
+were given the previous public release number plus a letter, until
+version 1.0.6j; from then on they were given the upcoming public
+release number plus "betaNN" or "rcN".
+
+.SH "SEE ALSO"
+.IR libpngpf(3) ", " png(5)
+.LP
+.IR libpng :
+.IP
+http://libpng.sourceforge.net (follow the [DOWNLOAD] link)
+http://www.libpng.org/pub/png
+
+.LP
+.IR zlib :
+.IP
+(generally) at the same location as
+.I libpng
+or at
+.br
+ftp://ftp.info-zip.org/pub/infozip/zlib
+
+.LP
+.IR PNG specification: RFC 2083
+.IP
+(generally) at the same location as
+.I libpng
+or at
+.br
+ftp://ftp.rfc-editor.org:/in-notes/rfc2083.txt
+.br
+or (as a W3C Recommendation) at
+.br
+http://www.w3.org/TR/REC-png.html
+
+.LP
+In the case of any inconsistency between the PNG specification
+and this library, the specification takes precedence.
+
+.SH AUTHORS
+This man page: Glenn Randers-Pehrson
+<glennrp at users.sourceforge.net>
+
+The contributing authors would like to thank all those who helped
+with testing, bug fixes, and patience.  This wouldn't have been
+possible without all of you.
+
+Thanks to Frank J. T. Wojcik for helping with the documentation.
+
+Libpng version 1.2.35 - February 14, 2009:
+Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
+Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
+
+Supported by the PNG development group
+.br
+png-mng-implement at lists.sf.net
+(subscription required; visit
+png-mng-implement at lists.sourceforge.net (subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+to subscribe).
+
+.SH COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+
+(This copy of the libpng notices is provided for your convenience.  In case of
+any discrepancy between this copy and the notices in the file png.h that is
+included in the libpng distribution, the latter shall prevail.)
+
+If you modify libpng you may insert additional notices immediately following
+this sentence.
+
+libpng versions 1.2.6, August 15, 2004, through 1.2.35, February 14, 2009, are
+Copyright (c) 2004,2006-2008 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-1.2.5
+with the following individual added to the list of Contributing Authors
+
+   Cosmin Truta
+
+libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
+Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-1.0.6
+with the following individuals added to the list of Contributing Authors
+
+   Simon-Pierre Cadieux
+   Eric S. Raymond
+   Gilles Vollant
+
+and with the following additions to the disclaimer:
+
+   There is no warranty against interference with your
+   enjoyment of the library or against infringement.
+   There is no warranty that our efforts or the library
+   will fulfill any of your particular purposes or needs.
+   This library is provided with all faults, and the entire
+   risk of satisfactory quality, performance, accuracy, and
+   effort is with the user.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+Distributed according to the same disclaimer and license as libpng-0.96,
+with the following individuals added to the list of Contributing Authors:
+
+   Tom Lane
+   Glenn Randers-Pehrson
+   Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996, 1997 Andreas Dilger
+Distributed according to the same disclaimer and license as libpng-0.88,
+with the following individuals added to the list of Contributing Authors:
+
+   John Bowler
+   Kevin Bracey
+   Sam Bushell
+   Magnus Holmgren
+   Greg Roelofs
+   Tom Tanner
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+   Andreas Dilger
+   Dave Martindale
+   Guy Eric Schalnat
+   Paul Schmidt
+   Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+and Group 42, Inc. disclaim all warranties, expressed or implied,
+including, without limitation, the warranties of merchantability and of
+fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+assume no liability for direct, indirect, incidental, special, exemplary,
+or consequential damages, which may result from the use of the PNG
+Reference Library, even if advised of the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+1. The origin of this source code must not be misrepresented.
+
+2. Altered versions must be plainly marked as such and
+   must not be misrepresented as being the original source.
+
+3. This Copyright notice may not be removed or altered from
+   any source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit, without
+fee, and encourage the use of this source code as a component to
+supporting the PNG file format in commercial products.  If you use this
+source code in a product, acknowledgment is not required but would be
+appreciated.
+
+
+A "png_get_copyright" function is available, for convenient use in "about"
+boxes and the like:
+
+   printf("%s",png_get_copyright(NULL));
+
+Also, the PNG logo (in PNG format, of course) is supplied in the
+files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+
+Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
+certification mark of the Open Source Initiative.
+
+Glenn Randers-Pehrson
+glennrp at users.sourceforge.net
+February 14, 2009
+
+.\" end of man page
+
 .TH LIBPNG 3 "May 15, 2007"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.2.18
diff --git a/src/dep/src/irrlicht/libpng/libpngpf.3 b/src/dep/src/irrlicht/libpng/libpngpf.3
index ee75e45..28b021a 100644
--- a/src/dep/src/irrlicht/libpng/libpngpf.3
+++ b/src/dep/src/irrlicht/libpng/libpngpf.3
@@ -1,3 +1,793 @@
+.TH LIBPNGPF 3 "February 14, 2009"
+.SH NAME
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.35
+(private functions)
+.SH SYNOPSIS
+\fB#include <png.h>\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_build_gamma_table (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_build_grayscale_palette (int \fP\fIbit_depth\fP\fB, png_colorp \fIpalette\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_calculate_crc (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIptr\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_check_chunk_name (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIchunk_name\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBpng_size_t png_check_keyword (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charpp \fInew_key\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fImask\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_correct_palette (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fInum_palette\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBint png_crc_error (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBint png_crc_finish (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIskip\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_crc_read (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuf\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBpng_voidp png_create_struct (int \fItype\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBpng_voidp png_create_struct_2 (int \fP\fItype\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_decompress_chunk (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcomp_type\fP\fB, png_charp \fP\fIchunkdata\fP\fB, png_size_t \fP\fIchunklength\fP\fB, png_size_t \fP\fIprefix_length\fP\fB, png_size_t \fI*data_length\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_destroy_struct (png_voidp \fIstruct_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_destroy_struct_2 (png_voidp \fP\fIstruct_ptr\fP\fB, png_free_ptr \fP\fIfree_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_background (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fP\fItrans_values\fP\fB, png_color_16p \fP\fIbackground\fP\fB, png_color_16p \fP\fIbackground_1\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_bytep \fP\fIgamma_from_1\fP\fB, png_bytep \fP\fIgamma_to_1\fP\fB, png_uint_16pp \fP\fIgamma_16\fP\fB, png_uint_16pp \fP\fIgamma_16_from_1\fP\fB, png_uint_16pp \fP\fIgamma_16_to_1\fP\fB, int \fIgamma_shift\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_bgr (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_chop (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_dither (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIpalette_lookup\fP\fB, png_bytep \fIdither_lookup\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_expand (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fItrans_value\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_expand_palette (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fInum_trans\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_gamma (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_uint_16pp \fP\fIgamma_16_table\fP\fB, int \fIgamma_shift\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_gray_to_rgb (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_invert (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_pack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIbit_depth\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_packswap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_read_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, png_uint_32 \fIflags\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_read_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fP\fIpass\fP\fB, png_uint_32 \fItransformations\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_read_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_read_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBint png_do_rgb_to_gray (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_shift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIbit_depth\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_strip_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIflags\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_swap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_unpack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_unshift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIsig_bits\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_write_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fIpass\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_write_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_write_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_do_write_transformations (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid *png_far_to_near (png_structp png_ptr,png_voidp \fP\fIptr\fP\fB, int \fIcheck\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_flush (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_IEND (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_iTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_info_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_init_mmx_flags (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_init_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_process_IDAT_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_process_some_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_check_crc (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_crc_finish (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_crc_skip (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_fill_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_have_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_have_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_have_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIrow\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_process_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_read_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_read_IDAT (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_read_sig (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_read_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_read_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_restore_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_push_save_buffer (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBpng_uint_32 png_read_chunk_header (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_read_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_read_filter_row (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIprev_row\fP\fB, int \fIfilter\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_read_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_read_push_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_read_start_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_read_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_reset_crc (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBint png_set_text_2 (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fItext_ptr\fP\fB, int \fInum_text\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_cHRM (png_structp \fP\fIpng_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwhite_x\fP\fB, png_uint_32 \fP\fIwhite_y\fP\fB, png_uint_32 \fP\fIred_x\fP\fB, png_uint_32 \fP\fIred_y\fP\fB, png_uint_32 \fP\fIgreen_x\fP\fB, png_uint_32 \fP\fIgreen_y\fP\fB, png_uint_32 \fP\fIblue_x\fP\fB, png_uint_32 \fIblue_y\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_filtered_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIfiltered_row\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_find_filter (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fIrow_info\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_gAMA (png_structp \fP\fIpng_ptr\fP\fB, double \fIfile_gamma\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIint_file_gamma\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_uint_16p \fP\fIhist\fP\fB, int \fInum_hist\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, int \fIproflen\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_IDAT (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_IEND (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fP\fIfilter_type\fP\fB, int \fIinterlace_type\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_iTXt (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcompression\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fIlang\fP\fB, png_charp \fP\fItranslated_key\fP\fB, png_charp \fItext\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_offset\fP\fB, png_uint_32 \fP\fIy_offset\fP\fB, int \fIunit_type\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIpurpose\fP\fB, png_int_32 \fP\fIX0\fP\fB, png_int_32 \fP\fIX1\fP\fB, int \fP\fItype\fP\fB, int \fP\fInparams\fP\fB, png_charp \fP\fIunits\fP\fB, png_charpp \fIparams\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_pixels_per_unit\fP\fB, png_uint_32 \fP\fIy_pixels_per_unit\fP\fB, int \fIunit_type\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_uint_32 \fInum_pal\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_color_8p \fP\fIsbit\fP\fB, int \fIcolor_type\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_sCAL_s (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, png_charp \fP\fIwidth\fP\fB, png_charp \fIheight\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_sig (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_sRGB (png_structp \fP\fIpng_ptr\fP\fB, int \fIintent\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_spalette_p \fIpalette\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_start_row (png_structp \fIpng_ptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fItext_len\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_timep \fImod_time\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, png_color_16p \fP\fIvalues\fP\fB, int \fP\fInumber\fP\fB, int \fIcolor_type\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_write_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fP\fItext_len\fP\fB, int \fIcompression\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+\fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP
+
+\fI\fB
+
+\fI\fB
+
+.SH DESCRIPTION
+The functions listed above are used privately by libpng
+and are not recommended for use by applications.  They are
+not "exported" to applications using shared libraries.  They
+are listed alphabetically here as an aid to libpng maintainers.
+See png.h for more information on these functions.
+
+.SH SEE ALSO
+.IR libpng(3) ", " png(5)
+.SH AUTHOR
+Glenn Randers-Pehrson
 .TH LIBPNGPF 3 "May 15, 2007"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.2.18
diff --git a/src/dep/src/irrlicht/libpng/png.5 b/src/dep/src/irrlicht/libpng/png.5
index 142faf6..ce87741 100644
--- a/src/dep/src/irrlicht/libpng/png.5
+++ b/src/dep/src/irrlicht/libpng/png.5
@@ -1,3 +1,77 @@
+.TH PNG 5 "February 14, 2009"
+.SH NAME
+png \- Portable Network Graphics (PNG) format
+.SH DESCRIPTION
+PNG (Portable Network Graphics) is an extensible file format for the
+lossless, portable, well-compressed storage of raster images. PNG provides
+a patent-free replacement for GIF and can also replace many
+common uses of TIFF. Indexed-color, grayscale, and truecolor images are
+supported, plus an optional alpha channel. Sample depths range from
+1 to 16 bits.
+.br
+
+PNG is designed to work well in online viewing applications, such as the
+World Wide Web, so it is fully streamable with a progressive display
+option. PNG is robust, providing both full file integrity checking and
+fast, simple detection of common transmission errors. Also, PNG can store
+gamma and chromaticity data for improved color matching on heterogeneous
+platforms.
+
+.SH "SEE ALSO"
+.IR libpng(3) ", " zlib(3) ", " deflate(5) ", and " zlib(5)
+.LP
+PNG specification (second edition), November 2003:
+.IP
+.br
+  <http://www.w3.org/TR/2003/REC-PNG-20031110/
+PNG 1.2 specification, July 1999:
+.IP
+.br
+http://www.libpng.org/pub/png
+.LP
+PNG 1.0 specification, October 1996:
+.IP
+.br
+RFC 2083
+.IP
+.br
+ftp://ftp.rfc-editor.org:/in-notes/rfc2083.txt
+.br
+or (as a W3C Recommendation) at
+.br
+http://www.w3.org/TR/REC-png.html
+.SH AUTHORS
+This man page: Glenn Randers-Pehrson
+.LP
+Portable Network Graphics (PNG) Specification (Second Edition)
+Information technology - Computer graphics and image processing -
+Portable Network Graphics (PNG): Functional specification.
+ISO/IEC 15948:2003 (E) (November 10, 2003): David Duce and others.
+.LP
+Portable Network Graphics (PNG) Specification Version 1.2 (July 8, 1999):
+Glenn Randers-Pehrson and others (png-list).
+.LP
+Portable Network Graphics (PNG) Specification Version 1.0 (October 1, 1996):
+Thomas Boutell and others (png-list).
+.LP
+
+
+.SH COPYRIGHT NOTICE
+.LP
+This man page is Copyright (c) 1998-2006 Glenn Randers-Pehrson.  See png.h
+for conditions of use and distribution.
+.LP
+The PNG Specification (Second Edition) is
+Copyright (c) 2003 W3C. (MIT, ERCIM, Keio), All Rights Reserved.
+.LP
+The PNG-1.2 specification is copyright (c) 1999 Glenn Randers-Pehrson.
+See the specification for conditions of use and distribution.
+.LP
+The PNG-1.0 specification is copyright (c) 1996 Massachusetts Institute of
+Technology.  See the specification for conditions of use and distribution.
+.LP
+.\" end of man page
+
 .TH PNG 5 "May 15, 2007"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
diff --git a/src/dep/src/irrlicht/libpng/png.c b/src/dep/src/irrlicht/libpng/png.c
index 03ca4a6..567f4f5 100644
--- a/src/dep/src/irrlicht/libpng/png.c
+++ b/src/dep/src/irrlicht/libpng/png.c
@@ -1,4 +1,915 @@
 
+/* png.c - location for general purpose libpng functions
+ *
+ * Last changed in libpng 1.2.34 [December 18, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_EXTERN
+#include "png.h"
+
+/* Generate a compiler error if there is an old png.h in the search path. */
+typedef version_1_2_35 Your_png_h_is_not_version_1_2_35;
+
+/* Version information for C files.  This had better match the version
+ * string defined in png.h.  */
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+/* png_libpng_ver was changed to a function in version 1.0.5c */
+PNG_CONST char png_libpng_ver[18] = PNG_LIBPNG_VER_STRING;
+
+#ifdef PNG_READ_SUPPORTED
+
+/* png_sig was changed to a function in version 1.0.5c */
+/* Place to hold the signature string for a PNG file. */
+PNG_CONST png_byte FARDATA png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+#endif /* PNG_READ_SUPPORTED */
+
+/* Invoke global declarations for constant strings for known chunk types */
+PNG_IHDR;
+PNG_IDAT;
+PNG_IEND;
+PNG_PLTE;
+PNG_bKGD;
+PNG_cHRM;
+PNG_gAMA;
+PNG_hIST;
+PNG_iCCP;
+PNG_iTXt;
+PNG_oFFs;
+PNG_pCAL;
+PNG_sCAL;
+PNG_pHYs;
+PNG_sBIT;
+PNG_sPLT;
+PNG_sRGB;
+PNG_tEXt;
+PNG_tIME;
+PNG_tRNS;
+PNG_zTXt;
+
+#ifdef PNG_READ_SUPPORTED
+/* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+/* start of interlace block */
+PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+
+/* offset to next interlace block */
+PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+
+/* start of interlace block in the y direction */
+PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+
+/* offset to next interlace block in the y direction */
+PNG_CONST int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+
+/* Height of interlace block.  This is not currently used - if you need
+ * it, uncomment it here and in png.h
+PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+*/
+
+/* Mask to determine which pixels are valid in a pass */
+PNG_CONST int FARDATA png_pass_mask[] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
+
+/* Mask to determine which pixels to overwrite while displaying */
+PNG_CONST int FARDATA png_pass_dsp_mask[]
+   = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
+
+#endif /* PNG_READ_SUPPORTED */
+#endif /* PNG_USE_GLOBAL_ARRAYS */
+
+/* Tells libpng that we have already handled the first "num_bytes" bytes
+ * of the PNG file signature.  If the PNG data is embedded into another
+ * stream we can set num_bytes = 8 so that libpng will not attempt to read
+ * or write any of the magic bytes before it starts on the IHDR.
+ */
+
+#ifdef PNG_READ_SUPPORTED
+void PNGAPI
+png_set_sig_bytes(png_structp png_ptr, int num_bytes)
+{
+   if (png_ptr == NULL) return;
+   png_debug(1, "in png_set_sig_bytes");
+   if (num_bytes > 8)
+      png_error(png_ptr, "Too many bytes for PNG signature.");
+
+   png_ptr->sig_bytes = (png_byte)(num_bytes < 0 ? 0 : num_bytes);
+}
+
+/* Checks whether the supplied bytes match the PNG signature.  We allow
+ * checking less than the full 8-byte signature so that those apps that
+ * already read the first few bytes of a file to determine the file type
+ * can simply check the remaining bytes for extra assurance.  Returns
+ * an integer less than, equal to, or greater than zero if sig is found,
+ * respectively, to be less than, to match, or be greater than the correct
+ * PNG signature (this is the same behaviour as strcmp, memcmp, etc).
+ */
+int PNGAPI
+png_sig_cmp(png_bytep sig, png_size_t start, png_size_t num_to_check)
+{
+   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+   if (num_to_check > 8)
+      num_to_check = 8;
+   else if (num_to_check < 1)
+      return (-1);
+
+   if (start > 7)
+      return (-1);
+
+   if (start + num_to_check > 8)
+      num_to_check = 8 - start;
+
+   return ((int)(png_memcmp(&sig[start], &png_signature[start], num_to_check)));
+}
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* (Obsolete) function to check signature bytes.  It does not allow one
+ * to check a partial signature.  This function might be removed in the
+ * future - use png_sig_cmp().  Returns true (nonzero) if the file is PNG.
+ */
+int PNGAPI
+png_check_sig(png_bytep sig, int num)
+{
+  return ((int)!png_sig_cmp(sig, (png_size_t)0, (png_size_t)num));
+}
+#endif
+#endif /* PNG_READ_SUPPORTED */
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+/* Function to allocate memory for zlib and clear it to 0. */
+#ifdef PNG_1_0_X
+voidpf PNGAPI
+#else
+voidpf /* private */
+#endif
+png_zalloc(voidpf png_ptr, uInt items, uInt size)
+{
+   png_voidp ptr;
+   png_structp p=(png_structp)png_ptr;
+   png_uint_32 save_flags=p->flags;
+   png_uint_32 num_bytes;
+
+   if (png_ptr == NULL) return (NULL);
+   if (items > PNG_UINT_32_MAX/size)
+   {
+     png_warning (p, "Potential overflow in png_zalloc()");
+     return (NULL);
+   }
+   num_bytes = (png_uint_32)items * size;
+
+   p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
+   ptr = (png_voidp)png_malloc((png_structp)png_ptr, num_bytes);
+   p->flags=save_flags;
+
+#if defined(PNG_1_0_X) && !defined(PNG_NO_ZALLOC_ZERO)
+   if (ptr == NULL)
+       return ((voidpf)ptr);
+
+   if (num_bytes > (png_uint_32)0x8000L)
+   {
+      png_memset(ptr, 0, (png_size_t)0x8000L);
+      png_memset((png_bytep)ptr + (png_size_t)0x8000L, 0,
+         (png_size_t)(num_bytes - (png_uint_32)0x8000L));
+   }
+   else
+   {
+      png_memset(ptr, 0, (png_size_t)num_bytes);
+   }
+#endif
+   return ((voidpf)ptr);
+}
+
+/* function to free memory for zlib */
+#ifdef PNG_1_0_X
+void PNGAPI
+#else
+void /* private */
+#endif
+png_zfree(voidpf png_ptr, voidpf ptr)
+{
+   png_free((png_structp)png_ptr, (png_voidp)ptr);
+}
+
+/* Reset the CRC variable to 32 bits of 1's.  Care must be taken
+ * in case CRC is > 32 bits to leave the top bits 0.
+ */
+void /* PRIVATE */
+png_reset_crc(png_structp png_ptr)
+{
+   png_ptr->crc = crc32(0, Z_NULL, 0);
+}
+
+/* Calculate the CRC over a section of data.  We can only pass as
+ * much data to this routine as the largest single buffer size.  We
+ * also check that this data will actually be used before going to the
+ * trouble of calculating it.
+ */
+void /* PRIVATE */
+png_calculate_crc(png_structp png_ptr, png_bytep ptr, png_size_t length)
+{
+   int need_crc = 1;
+
+   if (png_ptr->chunk_name[0] & 0x20)                     /* ancillary */
+   {
+      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
+          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
+         need_crc = 0;
+   }
+   else                                                    /* critical */
+   {
+      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+         need_crc = 0;
+   }
+
+   if (need_crc)
+      png_ptr->crc = crc32(png_ptr->crc, ptr, (uInt)length);
+}
+
+/* Allocate the memory for an info_struct for the application.  We don't
+ * really need the png_ptr, but it could potentially be useful in the
+ * future.  This should be used in favour of malloc(png_sizeof(png_info))
+ * and png_info_init() so that applications that want to use a shared
+ * libpng don't have to be recompiled if png_info changes size.
+ */
+png_infop PNGAPI
+png_create_info_struct(png_structp png_ptr)
+{
+   png_infop info_ptr;
+
+   png_debug(1, "in png_create_info_struct");
+   if (png_ptr == NULL) return (NULL);
+#ifdef PNG_USER_MEM_SUPPORTED
+   info_ptr = (png_infop)png_create_struct_2(PNG_STRUCT_INFO,
+      png_ptr->malloc_fn, png_ptr->mem_ptr);
+#else
+   info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
+#endif
+   if (info_ptr != NULL)
+      png_info_init_3(&info_ptr, png_sizeof(png_info));
+
+   return (info_ptr);
+}
+
+/* This function frees the memory associated with a single info struct.
+ * Normally, one would use either png_destroy_read_struct() or
+ * png_destroy_write_struct() to free an info struct, but this may be
+ * useful for some applications.
+ */
+void PNGAPI
+png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
+{
+   png_infop info_ptr = NULL;
+   if (png_ptr == NULL) return;
+
+   png_debug(1, "in png_destroy_info_struct");
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (info_ptr != NULL)
+   {
+      png_info_destroy(png_ptr, info_ptr);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, png_ptr->free_fn,
+          png_ptr->mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+}
+
+/* Initialize the info structure.  This is now an internal function (0.89)
+ * and applications using it are urged to use png_create_info_struct()
+ * instead.
+ */
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+#undef png_info_init
+void PNGAPI
+png_info_init(png_infop info_ptr)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+   png_info_init_3(&info_ptr, 0);
+}
+#endif
+
+void PNGAPI
+png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
+{
+   png_infop info_ptr = *ptr_ptr;
+
+   if (info_ptr == NULL) return;
+
+   png_debug(1, "in png_info_init_3");
+
+   if (png_sizeof(png_info) > png_info_struct_size)
+     {
+       png_destroy_struct(info_ptr);
+       info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
+       *ptr_ptr = info_ptr;
+     }
+
+   /* set everything to 0 */
+   png_memset(info_ptr, 0, png_sizeof(png_info));
+}
+
+#ifdef PNG_FREE_ME_SUPPORTED
+void PNGAPI
+png_data_freer(png_structp png_ptr, png_infop info_ptr,
+   int freer, png_uint_32 mask)
+{
+   png_debug(1, "in png_data_freer");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+   if (freer == PNG_DESTROY_WILL_FREE_DATA)
+      info_ptr->free_me |= mask;
+   else if (freer == PNG_USER_WILL_FREE_DATA)
+      info_ptr->free_me &= ~mask;
+   else
+      png_warning(png_ptr,
+         "Unknown freer parameter in png_data_freer.");
+}
+#endif
+
+void PNGAPI
+png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
+   int num)
+{
+   png_debug(1, "in png_free_data");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+#if defined(PNG_TEXT_SUPPORTED)
+/* free text item num or (if num == -1) all text items */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_TEXT) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_TEXT)
+#endif
+{
+   if (num != -1)
+   {
+     if (info_ptr->text && info_ptr->text[num].key)
+     {
+         png_free(png_ptr, info_ptr->text[num].key);
+         info_ptr->text[num].key = NULL;
+     }
+   }
+   else
+   {
+       int i;
+       for (i = 0; i < info_ptr->num_text; i++)
+           png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, i);
+       png_free(png_ptr, info_ptr->text);
+       info_ptr->text = NULL;
+       info_ptr->num_text=0;
+   }
+}
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+/* free any tRNS entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_TRNS) & info_ptr->free_me)
+#else
+if ((mask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS))
+#endif
+{
+    png_free(png_ptr, info_ptr->trans);
+    info_ptr->trans = NULL;
+    info_ptr->valid &= ~PNG_INFO_tRNS;
+#ifndef PNG_FREE_ME_SUPPORTED
+    png_ptr->flags &= ~PNG_FLAG_FREE_TRNS;
+#endif
+}
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+/* free any sCAL entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_SCAL) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_SCAL)
+#endif
+{
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+    png_free(png_ptr, info_ptr->scal_s_width);
+    png_free(png_ptr, info_ptr->scal_s_height);
+    info_ptr->scal_s_width = NULL;
+    info_ptr->scal_s_height = NULL;
+#endif
+    info_ptr->valid &= ~PNG_INFO_sCAL;
+}
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+/* free any pCAL entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_PCAL) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_PCAL)
+#endif
+{
+    png_free(png_ptr, info_ptr->pcal_purpose);
+    png_free(png_ptr, info_ptr->pcal_units);
+    info_ptr->pcal_purpose = NULL;
+    info_ptr->pcal_units = NULL;
+    if (info_ptr->pcal_params != NULL)
+    {
+        int i;
+        for (i = 0; i < (int)info_ptr->pcal_nparams; i++)
+        {
+          png_free(png_ptr, info_ptr->pcal_params[i]);
+          info_ptr->pcal_params[i]=NULL;
+        }
+        png_free(png_ptr, info_ptr->pcal_params);
+        info_ptr->pcal_params = NULL;
+    }
+    info_ptr->valid &= ~PNG_INFO_pCAL;
+}
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+/* free any iCCP entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_ICCP) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_ICCP)
+#endif
+{
+    png_free(png_ptr, info_ptr->iccp_name);
+    png_free(png_ptr, info_ptr->iccp_profile);
+    info_ptr->iccp_name = NULL;
+    info_ptr->iccp_profile = NULL;
+    info_ptr->valid &= ~PNG_INFO_iCCP;
+}
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+/* free a given sPLT entry, or (if num == -1) all sPLT entries */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_SPLT) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_SPLT)
+#endif
+{
+   if (num != -1)
+   {
+      if (info_ptr->splt_palettes)
+      {
+          png_free(png_ptr, info_ptr->splt_palettes[num].name);
+          png_free(png_ptr, info_ptr->splt_palettes[num].entries);
+          info_ptr->splt_palettes[num].name = NULL;
+          info_ptr->splt_palettes[num].entries = NULL;
+      }
+   }
+   else
+   {
+       if (info_ptr->splt_palettes_num)
+       {
+         int i;
+         for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
+            png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, i);
+
+         png_free(png_ptr, info_ptr->splt_palettes);
+         info_ptr->splt_palettes = NULL;
+         info_ptr->splt_palettes_num = 0;
+       }
+       info_ptr->valid &= ~PNG_INFO_sPLT;
+   }
+}
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+  if (png_ptr->unknown_chunk.data)
+  {
+    png_free(png_ptr, png_ptr->unknown_chunk.data);
+    png_ptr->unknown_chunk.data = NULL;
+  }
+
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_UNKN)
+#endif
+{
+   if (num != -1)
+   {
+       if (info_ptr->unknown_chunks)
+       {
+          png_free(png_ptr, info_ptr->unknown_chunks[num].data);
+          info_ptr->unknown_chunks[num].data = NULL;
+       }
+   }
+   else
+   {
+       int i;
+
+       if (info_ptr->unknown_chunks_num)
+       {
+         for (i = 0; i < (int)info_ptr->unknown_chunks_num; i++)
+            png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, i);
+
+         png_free(png_ptr, info_ptr->unknown_chunks);
+         info_ptr->unknown_chunks = NULL;
+         info_ptr->unknown_chunks_num = 0;
+       }
+   }
+}
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+/* free any hIST entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_HIST)  & info_ptr->free_me)
+#else
+if ((mask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST))
+#endif
+{
+    png_free(png_ptr, info_ptr->hist);
+    info_ptr->hist = NULL;
+    info_ptr->valid &= ~PNG_INFO_hIST;
+#ifndef PNG_FREE_ME_SUPPORTED
+    png_ptr->flags &= ~PNG_FLAG_FREE_HIST;
+#endif
+}
+#endif
+
+/* free any PLTE entry that was internally allocated */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_PLTE) & info_ptr->free_me)
+#else
+if ((mask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE))
+#endif
+{
+    png_zfree(png_ptr, info_ptr->palette);
+    info_ptr->palette = NULL;
+    info_ptr->valid &= ~PNG_INFO_PLTE;
+#ifndef PNG_FREE_ME_SUPPORTED
+    png_ptr->flags &= ~PNG_FLAG_FREE_PLTE;
+#endif
+    info_ptr->num_palette = 0;
+}
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+/* free any image bits attached to the info structure */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_ROWS) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_ROWS)
+#endif
+{
+    if (info_ptr->row_pointers)
+    {
+       int row;
+       for (row = 0; row < (int)info_ptr->height; row++)
+       {
+          png_free(png_ptr, info_ptr->row_pointers[row]);
+          info_ptr->row_pointers[row]=NULL;
+       }
+       png_free(png_ptr, info_ptr->row_pointers);
+       info_ptr->row_pointers=NULL;
+    }
+    info_ptr->valid &= ~PNG_INFO_IDAT;
+}
+#endif
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (num == -1)
+     info_ptr->free_me &= ~mask;
+   else
+     info_ptr->free_me &= ~(mask & ~PNG_FREE_MUL);
+#endif
+}
+
+/* This is an internal routine to free any memory that the info struct is
+ * pointing to before re-using it or freeing the struct itself.  Recall
+ * that png_free() checks for NULL pointers for us.
+ */
+void /* PRIVATE */
+png_info_destroy(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_info_destroy");
+
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   if (png_ptr->num_chunk_list)
+   {
+       png_free(png_ptr, png_ptr->chunk_list);
+       png_ptr->chunk_list=NULL;
+       png_ptr->num_chunk_list = 0;
+   }
+#endif
+
+   png_info_init_3(&info_ptr, png_sizeof(png_info));
+}
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+/* This function returns a pointer to the io_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy() or png_read_destroy() are called.
+ */
+png_voidp PNGAPI
+png_get_io_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL) return (NULL);
+   return (png_ptr->io_ptr);
+}
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#if !defined(PNG_NO_STDIO)
+/* Initialize the default input/output functions for the PNG file.  If you
+ * use your own read or write routines, you can call either png_set_read_fn()
+ * or png_set_write_fn() instead of png_init_io().  If you have defined
+ * PNG_NO_STDIO, you must use a function of your own because "FILE *" isn't
+ * necessarily available.
+ */
+void PNGAPI
+png_init_io(png_structp png_ptr, png_FILE_p fp)
+{
+   png_debug(1, "in png_init_io");
+   if (png_ptr == NULL) return;
+   png_ptr->io_ptr = (png_voidp)fp;
+}
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+/* Convert the supplied time into an RFC 1123 string suitable for use in
+ * a "Creation Time" or other text-based time string.
+ */
+png_charp PNGAPI
+png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)
+{
+   static PNG_CONST char short_months[12][4] =
+        {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+
+   if (png_ptr == NULL) return (NULL);
+   if (png_ptr->time_buffer == NULL)
+   {
+      png_ptr->time_buffer = (png_charp)png_malloc(png_ptr, (png_uint_32)(29*
+         png_sizeof(char)));
+   }
+
+#if defined(_WIN32_WCE)
+   {
+      wchar_t time_buf[29];
+      wsprintf(time_buf, TEXT("%d %S %d %02d:%02d:%02d +0000"),
+          ptime->day % 32, short_months[(ptime->month - 1) % 12],
+        ptime->year, ptime->hour % 24, ptime->minute % 60,
+          ptime->second % 61);
+      WideCharToMultiByte(CP_ACP, 0, time_buf, -1, png_ptr->time_buffer, 29,
+          NULL, NULL);
+   }
+#else
+#ifdef USE_FAR_KEYWORD
+   {
+      char near_time_buf[29];
+      png_snprintf6(near_time_buf, 29, "%d %s %d %02d:%02d:%02d +0000",
+          ptime->day % 32, short_months[(ptime->month - 1) % 12],
+          ptime->year, ptime->hour % 24, ptime->minute % 60,
+          ptime->second % 61);
+      png_memcpy(png_ptr->time_buffer, near_time_buf,
+          29*png_sizeof(char));
+   }
+#else
+   png_snprintf6(png_ptr->time_buffer, 29, "%d %s %d %02d:%02d:%02d +0000",
+       ptime->day % 32, short_months[(ptime->month - 1) % 12],
+       ptime->year, ptime->hour % 24, ptime->minute % 60,
+       ptime->second % 61);
+#endif
+#endif /* _WIN32_WCE */
+   return ((png_charp)png_ptr->time_buffer);
+}
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+png_charp PNGAPI
+png_get_copyright(png_structp png_ptr)
+{
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) "\n libpng version 1.2.35 - February 14, 2009\n\
+   Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\
+   Copyright (c) 1996-1997 Andreas Dilger\n\
+   Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
+}
+
+/* The following return the library version as a short string in the
+ * format 1.0.0 through 99.99.99zz.  To get the version of *.h files
+ * used with your application, print out PNG_LIBPNG_VER_STRING, which
+ * is defined in png.h.
+ * Note: now there is no difference between png_get_libpng_ver() and
+ * png_get_header_ver().  Due to the version_nn_nn_nn typedef guard,
+ * it is guaranteed that png.c uses the correct version of png.h.
+ */
+png_charp PNGAPI
+png_get_libpng_ver(png_structp png_ptr)
+{
+   /* Version of *.c files used when building libpng */
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_LIBPNG_VER_STRING);
+}
+
+png_charp PNGAPI
+png_get_header_ver(png_structp png_ptr)
+{
+   /* Version of *.h files used when building libpng */
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_LIBPNG_VER_STRING);
+}
+
+png_charp PNGAPI
+png_get_header_version(png_structp png_ptr)
+{
+   /* Returns longer string containing both version and date */
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_HEADER_VERSION_STRING
+#ifndef PNG_READ_SUPPORTED
+   "     (NO READ SUPPORT)"
+#endif
+   "\n");
+}
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+int PNGAPI
+png_handle_as_unknown(png_structp png_ptr, png_bytep chunk_name)
+{
+   /* check chunk_name and return "keep" value if it's on the list, else 0 */
+   int i;
+   png_bytep p;
+   if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list<=0)
+      return 0;
+   p = png_ptr->chunk_list + png_ptr->num_chunk_list*5 - 5;
+   for (i = png_ptr->num_chunk_list; i; i--, p -= 5)
+      if (!png_memcmp(chunk_name, p, 4))
+        return ((int)*(p + 4));
+   return 0;
+}
+#endif
+
+/* This function, added to libpng-1.0.6g, is untested. */
+int PNGAPI
+png_reset_zstream(png_structp png_ptr)
+{
+   if (png_ptr == NULL) return Z_STREAM_ERROR;
+   return (inflateReset(&png_ptr->zstream));
+}
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+/* This function was added to libpng-1.0.7 */
+png_uint_32 PNGAPI
+png_access_version_number(void)
+{
+   /* Version of *.c files used when building libpng */
+   return((png_uint_32) PNG_LIBPNG_VER);
+}
+
+
+#if defined(PNG_READ_SUPPORTED) && defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#if !defined(PNG_1_0_X)
+/* this function was added to libpng 1.2.0 */
+int PNGAPI
+png_mmx_support(void)
+{
+   /* obsolete, to be removed from libpng-1.4.0 */
+    return -1;
+}
+#endif /* PNG_1_0_X */
+#endif /* PNG_READ_SUPPORTED && PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+#ifdef PNG_SIZE_T
+/* Added at libpng version 1.2.6 */
+   PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
+png_size_t PNGAPI
+png_convert_size(size_t size)
+{
+  if (size > (png_size_t)-1)
+     PNG_ABORT();  /* We haven't got access to png_ptr, so no png_error() */
+  return ((png_size_t)size);
+}
+#endif /* PNG_SIZE_T */
+
+/* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
+#if defined(PNG_cHRM_SUPPORTED)
+#if !defined(PNG_NO_CHECK_cHRM)
+/*
+ Multiply two 32-bit numbers, V1 and V2, using 32-bit
+ arithmetic, to produce a 64 bit result in the HI/LO words.
+
+          A B
+        x C D
+       ------
+      AD || BD
+AC || CB || 0
+
+ where A and B are the high and low 16-bit words of V1,
+ C and D are the 16-bit words of V2, AD is the product of
+ A and D, and X || Y is (X << 16) + Y.
+*/
+
+void png_64bit_product (long v1, long v2, unsigned long *hi_product,
+   unsigned long *lo_product)
+{
+ int a, b, c, d;
+ long lo, hi, x, y;
+
+ a = (v1 >> 16) & 0xffff;
+ b = v1 & 0xffff;
+ c = (v2 >> 16) & 0xffff;
+ d = v2 & 0xffff;
+
+ lo = b * d;                   /* BD */
+ x = a * d + c * b;            /* AD + CB */
+ y = ((lo >> 16) & 0xffff) + x;
+
+ lo = (lo & 0xffff) | ((y & 0xffff) << 16);
+ hi = (y >> 16) & 0xffff;
+
+ hi += a * c;                  /* AC */
+
+ *hi_product = (unsigned long)hi;
+ *lo_product = (unsigned long)lo;
+}
+int /* private */
+png_check_cHRM_fixed(png_structp png_ptr,
+   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
+   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
+   png_fixed_point blue_x, png_fixed_point blue_y)
+{
+   int ret = 1;
+   unsigned long xy_hi,xy_lo,yx_hi,yx_lo;
+
+   png_debug(1, "in function png_check_cHRM_fixed");
+   if (png_ptr == NULL)
+      return 0;
+
+   if (white_x < 0 || white_y <= 0 ||
+         red_x < 0 ||   red_y <  0 ||
+       green_x < 0 || green_y <  0 ||
+        blue_x < 0 ||  blue_y <  0)
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set negative chromaticity value");
+      ret = 0;
+   }
+   if (white_x > (png_fixed_point) PNG_UINT_31_MAX ||
+       white_y > (png_fixed_point) PNG_UINT_31_MAX ||
+         red_x > (png_fixed_point) PNG_UINT_31_MAX ||
+         red_y > (png_fixed_point) PNG_UINT_31_MAX ||
+       green_x > (png_fixed_point) PNG_UINT_31_MAX ||
+       green_y > (png_fixed_point) PNG_UINT_31_MAX ||
+        blue_x > (png_fixed_point) PNG_UINT_31_MAX ||
+        blue_y > (png_fixed_point) PNG_UINT_31_MAX )
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set chromaticity value exceeding 21474.83");
+      ret = 0;
+   }
+   if (white_x > 100000L - white_y)
+   {
+      png_warning(png_ptr, "Invalid cHRM white point");
+      ret = 0;
+   }
+   if (red_x > 100000L - red_y)
+   {
+      png_warning(png_ptr, "Invalid cHRM red point");
+      ret = 0;
+   }
+   if (green_x > 100000L - green_y)
+   {
+      png_warning(png_ptr, "Invalid cHRM green point");
+      ret = 0;
+   }
+   if (blue_x > 100000L - blue_y)
+   {
+      png_warning(png_ptr, "Invalid cHRM blue point");
+      ret = 0;
+   }
+
+   png_64bit_product(green_x - red_x, blue_y - red_y, &xy_hi, &xy_lo);
+   png_64bit_product(green_y - red_y, blue_x - red_x, &yx_hi, &yx_lo);
+
+   if (xy_hi == yx_hi && xy_lo == yx_lo)
+   {
+      png_warning(png_ptr,
+         "Ignoring attempt to set cHRM RGB triangle with zero area");
+      ret = 0;
+   }
+
+   return ret;
+}
+#endif /* NO_PNG_CHECK_cHRM */
+#endif /* PNG_cHRM_SUPPORTED */
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
 /* png.c - location for general purpose libpng functions
  *
  * Last changed in libpng 1.2.17 May 15, 2007
diff --git a/src/dep/src/irrlicht/libpng/png.h b/src/dep/src/irrlicht/libpng/png.h
index f19cf81..cda7162 100644
--- a/src/dep/src/irrlicht/libpng/png.h
+++ b/src/dep/src/irrlicht/libpng/png.h
@@ -1,3 +1,3669 @@
+/* png.h - header file for PNG reference library
+ *
+ * libpng version 1.2.35 - February 14, 2009
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * Authors and maintainers:
+ *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
+ *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
+ *  libpng versions 0.97, January 1998, through 1.2.35 - February 14, 2009: Glenn
+ *  See also "Contributing Authors", below.
+ *
+ * Note about libpng version numbers:
+ *
+ *    Due to various miscommunications, unforeseen code incompatibilities
+ *    and occasional factors outside the authors' control, version numbering
+ *    on the library has not always been consistent and straightforward.
+ *    The following table summarizes matters since version 0.89c, which was
+ *    the first widely used release:
+ *
+ *    source                 png.h  png.h  shared-lib
+ *    version                string   int  version
+ *    -------                ------ -----  ----------
+ *    0.89c "1.0 beta 3"     0.89      89  1.0.89
+ *    0.90  "1.0 beta 4"     0.90      90  0.90  [should have been 2.0.90]
+ *    0.95  "1.0 beta 5"     0.95      95  0.95  [should have been 2.0.95]
+ *    0.96  "1.0 beta 6"     0.96      96  0.96  [should have been 2.0.96]
+ *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 [should have been 2.0.97]
+ *    0.97c                  0.97      97  2.0.97
+ *    0.98                   0.98      98  2.0.98
+ *    0.99                   0.99      98  2.0.99
+ *    0.99a-m                0.99      99  2.0.99
+ *    1.00                   1.00     100  2.1.0 [100 should be 10000]
+ *    1.0.0      (from here on, the   100  2.1.0 [100 should be 10000]
+ *    1.0.1       png.h string is   10001  2.1.0
+ *    1.0.1a-e    identical to the  10002  from here on, the shared library
+ *    1.0.2       source version)   10002  is 2.V where V is the source code
+ *    1.0.2a-b                      10003  version, except as noted.
+ *    1.0.3                         10003
+ *    1.0.3a-d                      10004
+ *    1.0.4                         10004
+ *    1.0.4a-f                      10005
+ *    1.0.5 (+ 2 patches)           10005
+ *    1.0.5a-d                      10006
+ *    1.0.5e-r                      10100 (not source compatible)
+ *    1.0.5s-v                      10006 (not binary compatible)
+ *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)
+ *    1.0.6d-f                      10007 (still binary incompatible)
+ *    1.0.6g                        10007
+ *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)
+ *    1.0.6i                        10007  10.6i
+ *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
+ *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)
+ *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)
+ *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
+ *    1.0.7                    1    10007  (still compatible)
+ *    1.0.8beta1-4             1    10008  2.1.0.8beta1-4
+ *    1.0.8rc1                 1    10008  2.1.0.8rc1
+ *    1.0.8                    1    10008  2.1.0.8
+ *    1.0.9beta1-6             1    10009  2.1.0.9beta1-6
+ *    1.0.9rc1                 1    10009  2.1.0.9rc1
+ *    1.0.9beta7-10            1    10009  2.1.0.9beta7-10
+ *    1.0.9rc2                 1    10009  2.1.0.9rc2
+ *    1.0.9                    1    10009  2.1.0.9
+ *    1.0.10beta1              1    10010  2.1.0.10beta1
+ *    1.0.10rc1                1    10010  2.1.0.10rc1
+ *    1.0.10                   1    10010  2.1.0.10
+ *    1.0.11beta1-3            1    10011  2.1.0.11beta1-3
+ *    1.0.11rc1                1    10011  2.1.0.11rc1
+ *    1.0.11                   1    10011  2.1.0.11
+ *    1.0.12beta1-2            2    10012  2.1.0.12beta1-2
+ *    1.0.12rc1                2    10012  2.1.0.12rc1
+ *    1.0.12                   2    10012  2.1.0.12
+ *    1.1.0a-f                 -    10100  2.1.1.0a-f (branch abandoned)
+ *    1.2.0beta1-2             2    10200  2.1.2.0beta1-2
+ *    1.2.0beta3-5             3    10200  3.1.2.0beta3-5
+ *    1.2.0rc1                 3    10200  3.1.2.0rc1
+ *    1.2.0                    3    10200  3.1.2.0
+ *    1.2.1beta1-4             3    10201  3.1.2.1beta1-4
+ *    1.2.1rc1-2               3    10201  3.1.2.1rc1-2
+ *    1.2.1                    3    10201  3.1.2.1
+ *    1.2.2beta1-6            12    10202  12.so.0.1.2.2beta1-6
+ *    1.0.13beta1             10    10013  10.so.0.1.0.13beta1
+ *    1.0.13rc1               10    10013  10.so.0.1.0.13rc1
+ *    1.2.2rc1                12    10202  12.so.0.1.2.2rc1
+ *    1.0.13                  10    10013  10.so.0.1.0.13
+ *    1.2.2                   12    10202  12.so.0.1.2.2
+ *    1.2.3rc1-6              12    10203  12.so.0.1.2.3rc1-6
+ *    1.2.3                   12    10203  12.so.0.1.2.3
+ *    1.2.4beta1-3            13    10204  12.so.0.1.2.4beta1-3
+ *    1.0.14rc1               13    10014  10.so.0.1.0.14rc1
+ *    1.2.4rc1                13    10204  12.so.0.1.2.4rc1
+ *    1.0.14                  10    10014  10.so.0.1.0.14
+ *    1.2.4                   13    10204  12.so.0.1.2.4
+ *    1.2.5beta1-2            13    10205  12.so.0.1.2.5beta1-2
+ *    1.0.15rc1-3             10    10015  10.so.0.1.0.15rc1-3
+ *    1.2.5rc1-3              13    10205  12.so.0.1.2.5rc1-3
+ *    1.0.15                  10    10015  10.so.0.1.0.15
+ *    1.2.5                   13    10205  12.so.0.1.2.5
+ *    1.2.6beta1-4            13    10206  12.so.0.1.2.6beta1-4
+ *    1.0.16                  10    10016  10.so.0.1.0.16
+ *    1.2.6                   13    10206  12.so.0.1.2.6
+ *    1.2.7beta1-2            13    10207  12.so.0.1.2.7beta1-2
+ *    1.0.17rc1               10    10017  10.so.0.1.0.17rc1
+ *    1.2.7rc1                13    10207  12.so.0.1.2.7rc1
+ *    1.0.17                  10    10017  10.so.0.1.0.17
+ *    1.2.7                   13    10207  12.so.0.1.2.7
+ *    1.2.8beta1-5            13    10208  12.so.0.1.2.8beta1-5
+ *    1.0.18rc1-5             10    10018  10.so.0.1.0.18rc1-5
+ *    1.2.8rc1-5              13    10208  12.so.0.1.2.8rc1-5
+ *    1.0.18                  10    10018  10.so.0.1.0.18
+ *    1.2.8                   13    10208  12.so.0.1.2.8
+ *    1.2.9beta1-3            13    10209  12.so.0.1.2.9beta1-3
+ *    1.2.9beta4-11           13    10209  12.so.0.9[.0]
+ *    1.2.9rc1                13    10209  12.so.0.9[.0]
+ *    1.2.9                   13    10209  12.so.0.9[.0]
+ *    1.2.10beta1-8           13    10210  12.so.0.10[.0]
+ *    1.2.10rc1-3             13    10210  12.so.0.10[.0]
+ *    1.2.10                  13    10210  12.so.0.10[.0]
+ *    1.2.11beta1-4           13    10211  12.so.0.11[.0]
+ *    1.0.19rc1-5             10    10019  10.so.0.19[.0]
+ *    1.2.11rc1-5             13    10211  12.so.0.11[.0]
+ *    1.0.19                  10    10019  10.so.0.19[.0]
+ *    1.2.11                  13    10211  12.so.0.11[.0]
+ *    1.0.20                  10    10020  10.so.0.20[.0]
+ *    1.2.12                  13    10212  12.so.0.12[.0]
+ *    1.2.13beta1             13    10213  12.so.0.13[.0]
+ *    1.0.21                  10    10021  10.so.0.21[.0]
+ *    1.2.13                  13    10213  12.so.0.13[.0]
+ *    1.2.14beta1-2           13    10214  12.so.0.14[.0]
+ *    1.0.22rc1               10    10022  10.so.0.22[.0]
+ *    1.2.14rc1               13    10214  12.so.0.14[.0]
+ *    1.0.22                  10    10022  10.so.0.22[.0]
+ *    1.2.14                  13    10214  12.so.0.14[.0]
+ *    1.2.15beta1-6           13    10215  12.so.0.15[.0]
+ *    1.0.23rc1-5             10    10023  10.so.0.23[.0]
+ *    1.2.15rc1-5             13    10215  12.so.0.15[.0]
+ *    1.0.23                  10    10023  10.so.0.23[.0]
+ *    1.2.15                  13    10215  12.so.0.15[.0]
+ *    1.2.16beta1-2           13    10216  12.so.0.16[.0]
+ *    1.2.16rc1               13    10216  12.so.0.16[.0]
+ *    1.0.24                  10    10024  10.so.0.24[.0]
+ *    1.2.16                  13    10216  12.so.0.16[.0]
+ *    1.2.17beta1-2           13    10217  12.so.0.17[.0]
+ *    1.0.25rc1               10    10025  10.so.0.25[.0]
+ *    1.2.17rc1-3             13    10217  12.so.0.17[.0]
+ *    1.0.25                  10    10025  10.so.0.25[.0]
+ *    1.2.17                  13    10217  12.so.0.17[.0]
+ *    1.0.26                  10    10026  10.so.0.26[.0]
+ *    1.2.18                  13    10218  12.so.0.18[.0]
+ *    1.2.19beta1-31          13    10219  12.so.0.19[.0]
+ *    1.0.27rc1-6             10    10027  10.so.0.27[.0]
+ *    1.2.19rc1-6             13    10219  12.so.0.19[.0]
+ *    1.0.27                  10    10027  10.so.0.27[.0]
+ *    1.2.19                  13    10219  12.so.0.19[.0]
+ *    1.2.20beta01-04         13    10220  12.so.0.20[.0]
+ *    1.0.28rc1-6             10    10028  10.so.0.28[.0]
+ *    1.2.20rc1-6             13    10220  12.so.0.20[.0]
+ *    1.0.28                  10    10028  10.so.0.28[.0]
+ *    1.2.20                  13    10220  12.so.0.20[.0]
+ *    1.2.21beta1-2           13    10221  12.so.0.21[.0]
+ *    1.2.21rc1-3             13    10221  12.so.0.21[.0]
+ *    1.0.29                  10    10029  10.so.0.29[.0]
+ *    1.2.21                  13    10221  12.so.0.21[.0]
+ *    1.2.22beta1-4           13    10222  12.so.0.22[.0]
+ *    1.0.30rc1               10    10030  10.so.0.30[.0]
+ *    1.2.22rc1               13    10222  12.so.0.22[.0]
+ *    1.0.30                  10    10030  10.so.0.30[.0]
+ *    1.2.22                  13    10222  12.so.0.22[.0]
+ *    1.2.23beta01-05         13    10223  12.so.0.23[.0]
+ *    1.2.23rc01              13    10223  12.so.0.23[.0]
+ *    1.2.23                  13    10223  12.so.0.23[.0]
+ *    1.2.24beta01-02         13    10224  12.so.0.24[.0]
+ *    1.2.24rc01              13    10224  12.so.0.24[.0]
+ *    1.2.24                  13    10224  12.so.0.24[.0]
+ *    1.2.25beta01-06         13    10225  12.so.0.25[.0]
+ *    1.2.25rc01-02           13    10225  12.so.0.25[.0]
+ *    1.0.31                  10    10031  10.so.0.31[.0]
+ *    1.2.25                  13    10225  12.so.0.25[.0]
+ *    1.2.26beta01-06         13    10226  12.so.0.26[.0]
+ *    1.2.26rc01              13    10226  12.so.0.26[.0]
+ *    1.2.26                  13    10226  12.so.0.26[.0]
+ *    1.0.32                  10    10032  10.so.0.32[.0]
+ *    1.2.27beta01-06         13    10227  12.so.0.27[.0]
+ *    1.2.27rc01              13    10227  12.so.0.27[.0]
+ *    1.0.33                  10    10033  10.so.0.33[.0]
+ *    1.2.27                  13    10227  12.so.0.27[.0]
+ *    1.0.34                  10    10034  10.so.0.34[.0]
+ *    1.2.28                  13    10228  12.so.0.28[.0]
+ *    1.2.29beta01-03         13    10229  12.so.0.29[.0]
+ *    1.2.29rc01              13    10229  12.so.0.29[.0]
+ *    1.0.35                  10    10035  10.so.0.35[.0]
+ *    1.2.29                  13    10229  12.so.0.29[.0]
+ *    1.0.37                  10    10037  10.so.0.37[.0]
+ *    1.2.30beta01-04         13    10230  12.so.0.30[.0]
+ *    1.0.38rc01-08           10    10038  10.so.0.38[.0]
+ *    1.2.30rc01-08           13    10230  12.so.0.30[.0]
+ *    1.0.38                  10    10038  10.so.0.38[.0]
+ *    1.2.30                  13    10230  12.so.0.30[.0]
+ *    1.0.39rc01-03           10    10039  10.so.0.39[.0]
+ *    1.2.31rc01-03           13    10231  12.so.0.31[.0]
+ *    1.0.39                  10    10039  10.so.0.39[.0]
+ *    1.2.31                  13    10231  12.so.0.31[.0]
+ *    1.2.32beta01-02         13    10232  12.so.0.32[.0]
+ *    1.0.40rc01              10    10040  10.so.0.40[.0]
+ *    1.2.32rc01              13    10232  12.so.0.32[.0]
+ *    1.0.40                  10    10040  10.so.0.40[.0]
+ *    1.2.32                  13    10232  12.so.0.32[.0]
+ *    1.2.33beta01-02         13    10233  12.so.0.33[.0]
+ *    1.2.33rc01-02           13    10233  12.so.0.33[.0]
+ *    1.0.41rc01              10    10041  10.so.0.41[.0]
+ *    1.2.33                  13    10233  12.so.0.33[.0]
+ *    1.0.41                  10    10041  10.so.0.41[.0]
+ *    1.2.34beta01-07         13    10234  12.so.0.34[.0]
+ *    1.0.42rc01              10    10042  10.so.0.42[.0]
+ *    1.2.34rc01              13    10234  12.so.0.34[.0]
+ *    1.0.42                  10    10042  10.so.0.42[.0]
+ *    1.2.34                  13    10234  12.so.0.34[.0]
+ *    1.2.35beta01-03         13    10235  12.so.0.35[.0]
+ *    1.0.43rc01-02           10    10043  10.so.0.43[.0]
+ *    1.2.35rc01-02           13    10235  12.so.0.35[.0]
+ *    1.0.43                  10    10043  10.so.0.43[.0]
+ *    1.2.35                  13    10235  12.so.0.35[.0]
+ *
+ *    Henceforth the source version will match the shared-library major
+ *    and minor numbers; the shared-library major version number will be
+ *    used for changes in backward compatibility, as it is intended.  The
+ *    PNG_LIBPNG_VER macro, which is not used within libpng but is available
+ *    for applications, is an unsigned integer of the form xyyzz corresponding
+ *    to the source version x.y.z (leading zeros in y and z).  Beta versions
+ *    were given the previous public release number plus a letter, until
+ *    version 1.0.6j; from then on they were given the upcoming public
+ *    release number plus "betaNN" or "rcNN".
+ *
+ *    Binary incompatibility exists only when applications make direct access
+ *    to the info_ptr or png_ptr members through png.h, and the compiled
+ *    application is loaded with a different version of the library.
+ *
+ *    DLLNUM will change each time there are forward or backward changes
+ *    in binary compatibility (e.g., when a new feature is added).
+ *
+ * See libpng.txt or libpng.3 for more information.  The PNG specification
+ * is available as a W3C Recommendation and as an ISO Specification,
+ * <http://www.w3.org/TR/2003/REC-PNG-20031110/
+ */
+
+/*
+ * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+ *
+ * If you modify libpng you may insert additional notices immediately following
+ * this sentence.
+ *
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.35, February 14, 2009, are
+ * Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-1.2.5
+ * with the following individual added to the list of Contributing Authors:
+ *
+ *    Cosmin Truta
+ *
+ * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
+ * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-1.0.6
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    Simon-Pierre Cadieux
+ *    Eric S. Raymond
+ *    Gilles Vollant
+ *
+ * and with the following additions to the disclaimer:
+ *
+ *    There is no warranty against interference with your enjoyment of the
+ *    library or against infringement.  There is no warranty that our
+ *    efforts or the library will fulfill any of your particular purposes
+ *    or needs.  This library is provided with all faults, and the entire
+ *    risk of satisfactory quality, performance, accuracy, and effort is with
+ *    the user.
+ *
+ * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+ * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-0.96,
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    Tom Lane
+ *    Glenn Randers-Pehrson
+ *    Willem van Schaik
+ *
+ * libpng versions 0.89, June 1996, through 0.96, May 1997, are
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Distributed according to the same disclaimer and license as libpng-0.88,
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    John Bowler
+ *    Kevin Bracey
+ *    Sam Bushell
+ *    Magnus Holmgren
+ *    Greg Roelofs
+ *    Tom Tanner
+ *
+ * libpng versions 0.5, May 1995, through 0.88, January 1996, are
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ *
+ * For the purposes of this copyright and license, "Contributing Authors"
+ * is defined as the following set of individuals:
+ *
+ *    Andreas Dilger
+ *    Dave Martindale
+ *    Guy Eric Schalnat
+ *    Paul Schmidt
+ *    Tim Wegner
+ *
+ * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+ * and Group 42, Inc. disclaim all warranties, expressed or implied,
+ * including, without limitation, the warranties of merchantability and of
+ * fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+ * assume no liability for direct, indirect, incidental, special, exemplary,
+ * or consequential damages, which may result from the use of the PNG
+ * Reference Library, even if advised of the possibility of such damage.
+ *
+ * Permission is hereby granted to use, copy, modify, and distribute this
+ * source code, or portions hereof, for any purpose, without fee, subject
+ * to the following restrictions:
+ *
+ * 1. The origin of this source code must not be misrepresented.
+ *
+ * 2. Altered versions must be plainly marked as such and
+ * must not be misrepresented as being the original source.
+ *
+ * 3. This Copyright notice may not be removed or altered from
+ *    any source or altered source distribution.
+ *
+ * The Contributing Authors and Group 42, Inc. specifically permit, without
+ * fee, and encourage the use of this source code as a component to
+ * supporting the PNG file format in commercial products.  If you use this
+ * source code in a product, acknowledgment is not required but would be
+ * appreciated.
+ */
+
+/*
+ * A "png_get_copyright" function is available, for convenient use in "about"
+ * boxes and the like:
+ *
+ * printf("%s",png_get_copyright(NULL));
+ *
+ * Also, the PNG logo (in PNG format, of course) is supplied in the
+ * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+ */
+
+/*
+ * Libpng is OSI Certified Open Source Software.  OSI Certified is a
+ * certification mark of the Open Source Initiative.
+ */
+
+/*
+ * The contributing authors would like to thank all those who helped
+ * with testing, bug fixes, and patience.  This wouldn't have been
+ * possible without all of you.
+ *
+ * Thanks to Frank J. T. Wojcik for helping with the documentation.
+ */
+
+/*
+ * Y2K compliance in libpng:
+ * =========================
+ *
+ *    February 14, 2009
+ *
+ *    Since the PNG Development group is an ad-hoc body, we can't make
+ *    an official declaration.
+ *
+ *    This is your unofficial assurance that libpng from version 0.71 and
+ *    upward through 1.2.35 are Y2K compliant.  It is my belief that earlier
+ *    versions were also Y2K compliant.
+ *
+ *    Libpng only has three year fields.  One is a 2-byte unsigned integer
+ *    that will hold years up to 65535.  The other two hold the date in text
+ *    format, and will hold years up to 9999.
+ *
+ *    The integer is
+ *        "png_uint_16 year" in png_time_struct.
+ *
+ *    The strings are
+ *        "png_charp time_buffer" in png_struct and
+ *        "near_time_buffer", which is a local character string in png.c.
+ *
+ *    There are seven time-related functions:
+ *        png.c: png_convert_to_rfc_1123() in png.c
+ *          (formerly png_convert_to_rfc_1152() in error)
+ *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
+ *        png_convert_from_time_t() in pngwrite.c
+ *        png_get_tIME() in pngget.c
+ *        png_handle_tIME() in pngrutil.c, called in pngread.c
+ *        png_set_tIME() in pngset.c
+ *        png_write_tIME() in pngwutil.c, called in pngwrite.c
+ *
+ *    All handle dates properly in a Y2K environment.  The
+ *    png_convert_from_time_t() function calls gmtime() to convert from system
+ *    clock time, which returns (year - 1900), which we properly convert to
+ *    the full 4-digit year.  There is a possibility that applications using
+ *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+ *    function, or that they are incorrectly passing only a 2-digit year
+ *    instead of "year - 1900" into the png_convert_from_struct_tm() function,
+ *    but this is not under our control.  The libpng documentation has always
+ *    stated that it works with 4-digit years, and the APIs have been
+ *    documented as such.
+ *
+ *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
+ *    integer to hold the year, and can hold years as large as 65535.
+ *
+ *    zlib, upon which libpng depends, is also Y2K compliant.  It contains
+ *    no date-related code.
+ *
+ *       Glenn Randers-Pehrson
+ *       libpng maintainer
+ *       PNG Development Group
+ */
+
+#ifndef PNG_H
+#define PNG_H
+
+/* This is not the place to learn how to use libpng.  The file libpng.txt
+ * describes how to use libpng, and the file example.c summarizes it
+ * with some code on which to build.  This file is useful for looking
+ * at the actual function definitions and structure components.
+ */
+
+/* Version information for png.h - this should match the version in png.c */
+#define PNG_LIBPNG_VER_STRING "1.2.35"
+#define PNG_HEADER_VERSION_STRING \
+   " libpng version 1.2.35 - February 14, 2009\n"
+
+#define PNG_LIBPNG_VER_SONUM   0
+#define PNG_LIBPNG_VER_DLLNUM  13
+
+/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
+#define PNG_LIBPNG_VER_MAJOR   1
+#define PNG_LIBPNG_VER_MINOR   2
+#define PNG_LIBPNG_VER_RELEASE 35
+/* This should match the numeric part of the final component of
+ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
+
+#define PNG_LIBPNG_VER_BUILD  0
+
+/* Release Status */
+#define PNG_LIBPNG_BUILD_ALPHA    1
+#define PNG_LIBPNG_BUILD_BETA     2
+#define PNG_LIBPNG_BUILD_RC       3
+#define PNG_LIBPNG_BUILD_STABLE   4
+#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
+  
+/* Release-Specific Flags */
+#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with
+                                       PNG_LIBPNG_BUILD_STABLE only */
+#define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with
+                                       PNG_LIBPNG_BUILD_SPECIAL */
+#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
+                                       PNG_LIBPNG_BUILD_PRIVATE */
+
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
+
+/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
+ * We must not include leading zeros.
+ * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
+ * version 1.0.0 was mis-numbered 100 instead of 10000).  From
+ * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release */
+#define PNG_LIBPNG_VER 10235 /* 1.2.35 */
+
+#ifndef PNG_VERSION_INFO_ONLY
+/* include the compression library's header */
+#include "zlib.h"
+#endif
+
+/* include all user configurable info, including optional assembler routines */
+#include "pngconf.h"
+
+/*
+ * Added at libpng-1.2.8 */
+/* Ref MSDN: Private as priority over Special
+ * VS_FF_PRIVATEBUILD File *was not* built using standard release
+ * procedures. If this value is given, the StringFileInfo block must
+ * contain a PrivateBuild string. 
+ *
+ * VS_FF_SPECIALBUILD File *was* built by the original company using
+ * standard release procedures but is a variation of the standard
+ * file of the same version number. If this value is given, the
+ * StringFileInfo block must contain a SpecialBuild string. 
+ */
+
+#if defined(PNG_USER_PRIVATEBUILD)
+#  define PNG_LIBPNG_BUILD_TYPE \
+          (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)
+#else
+#  if defined(PNG_LIBPNG_SPECIALBUILD)
+#    define PNG_LIBPNG_BUILD_TYPE \
+            (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)
+#  else
+#    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)
+#  endif
+#endif
+
+#ifndef PNG_VERSION_INFO_ONLY
+
+/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* This file is arranged in several sections.  The first section contains
+ * structure and type definitions.  The second section contains the external
+ * library functions, while the third has the internal library functions,
+ * which applications aren't expected to use directly.
+ */
+
+#ifndef PNG_NO_TYPECAST_NULL
+#define int_p_NULL                (int *)NULL
+#define png_bytep_NULL            (png_bytep)NULL
+#define png_bytepp_NULL           (png_bytepp)NULL
+#define png_doublep_NULL          (png_doublep)NULL
+#define png_error_ptr_NULL        (png_error_ptr)NULL
+#define png_flush_ptr_NULL        (png_flush_ptr)NULL
+#define png_free_ptr_NULL         (png_free_ptr)NULL
+#define png_infopp_NULL           (png_infopp)NULL
+#define png_malloc_ptr_NULL       (png_malloc_ptr)NULL
+#define png_read_status_ptr_NULL  (png_read_status_ptr)NULL
+#define png_rw_ptr_NULL           (png_rw_ptr)NULL
+#define png_structp_NULL          (png_structp)NULL
+#define png_uint_16p_NULL         (png_uint_16p)NULL
+#define png_voidp_NULL            (png_voidp)NULL
+#define png_write_status_ptr_NULL (png_write_status_ptr)NULL
+#else
+#define int_p_NULL                NULL
+#define png_bytep_NULL            NULL
+#define png_bytepp_NULL           NULL
+#define png_doublep_NULL          NULL
+#define png_error_ptr_NULL        NULL
+#define png_flush_ptr_NULL        NULL
+#define png_free_ptr_NULL         NULL
+#define png_infopp_NULL           NULL
+#define png_malloc_ptr_NULL       NULL
+#define png_read_status_ptr_NULL  NULL
+#define png_rw_ptr_NULL           NULL
+#define png_structp_NULL          NULL
+#define png_uint_16p_NULL         NULL
+#define png_voidp_NULL            NULL
+#define png_write_status_ptr_NULL NULL
+#endif
+
+/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
+#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
+/* Version information for C files, stored in png.c.  This had better match
+ * the version above.
+ */
+#ifdef PNG_USE_GLOBAL_ARRAYS
+PNG_EXPORT_VAR (PNG_CONST char) png_libpng_ver[18];
+  /* need room for 99.99.99beta99z */
+#else
+#define png_libpng_ver png_get_header_ver(NULL)
+#endif
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+/* This was removed in version 1.0.5c */
+/* Structures to facilitate easy interlacing.  See png.c for more details */
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_start[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_inc[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_ystart[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_yinc[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_mask[7];
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_dsp_mask[7];
+/* This isn't currently used.  If you need it, see png.c for more details.
+PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_height[7];
+*/
+#endif
+
+#endif /* PNG_NO_EXTERN */
+
+/* Three color definitions.  The order of the red, green, and blue, (and the
+ * exact size) is not important, although the size of the fields need to
+ * be png_byte or png_uint_16 (as defined below).
+ */
+typedef struct png_color_struct
+{
+   png_byte red;
+   png_byte green;
+   png_byte blue;
+} png_color;
+typedef png_color FAR * png_colorp;
+typedef png_color FAR * FAR * png_colorpp;
+
+typedef struct png_color_16_struct
+{
+   png_byte index;    /* used for palette files */
+   png_uint_16 red;   /* for use in red green blue files */
+   png_uint_16 green;
+   png_uint_16 blue;
+   png_uint_16 gray;  /* for use in grayscale files */
+} png_color_16;
+typedef png_color_16 FAR * png_color_16p;
+typedef png_color_16 FAR * FAR * png_color_16pp;
+
+typedef struct png_color_8_struct
+{
+   png_byte red;   /* for use in red green blue files */
+   png_byte green;
+   png_byte blue;
+   png_byte gray;  /* for use in grayscale files */
+   png_byte alpha; /* for alpha channel files */
+} png_color_8;
+typedef png_color_8 FAR * png_color_8p;
+typedef png_color_8 FAR * FAR * png_color_8pp;
+
+/*
+ * The following two structures are used for the in-core representation
+ * of sPLT chunks.
+ */
+typedef struct png_sPLT_entry_struct
+{
+   png_uint_16 red;
+   png_uint_16 green;
+   png_uint_16 blue;
+   png_uint_16 alpha;
+   png_uint_16 frequency;
+} png_sPLT_entry;
+typedef png_sPLT_entry FAR * png_sPLT_entryp;
+typedef png_sPLT_entry FAR * FAR * png_sPLT_entrypp;
+
+/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
+ *  occupy the LSB of their respective members, and the MSB of each member
+ *  is zero-filled.  The frequency member always occupies the full 16 bits.
+ */
+
+typedef struct png_sPLT_struct
+{
+   png_charp name;           /* palette name */
+   png_byte depth;           /* depth of palette samples */
+   png_sPLT_entryp entries;  /* palette entries */
+   png_int_32 nentries;      /* number of palette entries */
+} png_sPLT_t;
+typedef png_sPLT_t FAR * png_sPLT_tp;
+typedef png_sPLT_t FAR * FAR * png_sPLT_tpp;
+
+#ifdef PNG_TEXT_SUPPORTED
+/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
+ * and whether that contents is compressed or not.  The "key" field
+ * points to a regular zero-terminated C string.  The "text", "lang", and
+ * "lang_key" fields can be regular C strings, empty strings, or NULL pointers.
+ * However, the * structure returned by png_get_text() will always contain
+ * regular zero-terminated C strings (possibly empty), never NULL pointers,
+ * so they can be safely used in printf() and other string-handling functions.
+ */
+typedef struct png_text_struct
+{
+   int  compression;       /* compression value:
+                             -1: tEXt, none
+                              0: zTXt, deflate
+                              1: iTXt, none
+                              2: iTXt, deflate  */
+   png_charp key;          /* keyword, 1-79 character description of "text" */
+   png_charp text;         /* comment, may be an empty string (ie "")
+                              or a NULL pointer */
+   png_size_t text_length; /* length of the text string */
+#ifdef PNG_iTXt_SUPPORTED
+   png_size_t itxt_length; /* length of the itxt string */
+   png_charp lang;         /* language code, 0-79 characters
+                              or a NULL pointer */
+   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
+                              chars or a NULL pointer */
+#endif
+} png_text;
+typedef png_text FAR * png_textp;
+typedef png_text FAR * FAR * png_textpp;
+#endif
+
+/* Supported compression types for text in PNG files (tEXt, and zTXt).
+ * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */
+#define PNG_TEXT_COMPRESSION_NONE_WR -3
+#define PNG_TEXT_COMPRESSION_zTXt_WR -2
+#define PNG_TEXT_COMPRESSION_NONE    -1
+#define PNG_TEXT_COMPRESSION_zTXt     0
+#define PNG_ITXT_COMPRESSION_NONE     1
+#define PNG_ITXT_COMPRESSION_zTXt     2
+#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */
+
+/* png_time is a way to hold the time in an machine independent way.
+ * Two conversions are provided, both from time_t and struct tm.  There
+ * is no portable way to convert to either of these structures, as far
+ * as I know.  If you know of a portable way, send it to me.  As a side
+ * note - PNG has always been Year 2000 compliant!
+ */
+typedef struct png_time_struct
+{
+   png_uint_16 year; /* full year, as in, 1995 */
+   png_byte month;   /* month of year, 1 - 12 */
+   png_byte day;     /* day of month, 1 - 31 */
+   png_byte hour;    /* hour of day, 0 - 23 */
+   png_byte minute;  /* minute of hour, 0 - 59 */
+   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
+} png_time;
+typedef png_time FAR * png_timep;
+typedef png_time FAR * FAR * png_timepp;
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+/* png_unknown_chunk is a structure to hold queued chunks for which there is
+ * no specific support.  The idea is that we can use this to queue
+ * up private chunks for output even though the library doesn't actually
+ * know about their semantics.
+ */
+#define PNG_CHUNK_NAME_LENGTH 5
+typedef struct png_unknown_chunk_t
+{
+    png_byte name[PNG_CHUNK_NAME_LENGTH];
+    png_byte *data;
+    png_size_t size;
+
+    /* libpng-using applications should NOT directly modify this byte. */
+    png_byte location; /* mode of operation at read time */
+}
+png_unknown_chunk;
+typedef png_unknown_chunk FAR * png_unknown_chunkp;
+typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
+#endif
+
+/* png_info is a structure that holds the information in a PNG file so
+ * that the application can find out the characteristics of the image.
+ * If you are reading the file, this structure will tell you what is
+ * in the PNG file.  If you are writing the file, fill in the information
+ * you want to put into the PNG file, then call png_write_info().
+ * The names chosen should be very close to the PNG specification, so
+ * consult that document for information about the meaning of each field.
+ *
+ * With libpng < 0.95, it was only possible to directly set and read the
+ * the values in the png_info_struct, which meant that the contents and
+ * order of the values had to remain fixed.  With libpng 0.95 and later,
+ * however, there are now functions that abstract the contents of
+ * png_info_struct from the application, so this makes it easier to use
+ * libpng with dynamic libraries, and even makes it possible to use
+ * libraries that don't have all of the libpng ancillary chunk-handing
+ * functionality.
+ *
+ * In any case, the order of the parameters in png_info_struct should NOT
+ * be changed for as long as possible to keep compatibility with applications
+ * that use the old direct-access method with png_info_struct.
+ *
+ * The following members may have allocated storage attached that should be
+ * cleaned up before the structure is discarded: palette, trans, text,
+ * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,
+ * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these
+ * are automatically freed when the info structure is deallocated, if they were
+ * allocated internally by libpng.  This behavior can be changed by means
+ * of the png_data_freer() function.
+ *
+ * More allocation details: all the chunk-reading functions that
+ * change these members go through the corresponding png_set_*
+ * functions.  A function to clear these members is available: see
+ * png_free_data().  The png_set_* functions do not depend on being
+ * able to point info structure members to any of the storage they are
+ * passed (they make their own copies), EXCEPT that the png_set_text
+ * functions use the same storage passed to them in the text_ptr or
+ * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns
+ * functions do not make their own copies.
+ */
+typedef struct png_info_struct
+{
+   /* the following are necessary for every PNG file */
+   png_uint_32 width;       /* width of image in pixels (from IHDR) */
+   png_uint_32 height;      /* height of image in pixels (from IHDR) */
+   png_uint_32 valid;       /* valid chunk data (see PNG_INFO_ below) */
+   png_uint_32 rowbytes;    /* bytes needed to hold an untransformed row */
+   png_colorp palette;      /* array of color values (valid & PNG_INFO_PLTE) */
+   png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */
+   png_uint_16 num_trans;   /* number of transparent palette color (tRNS) */
+   png_byte bit_depth;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */
+   png_byte color_type;     /* see PNG_COLOR_TYPE_ below (from IHDR) */
+   /* The following three should have been named *_method not *_type */
+   png_byte compression_type; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */
+   png_byte filter_type;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */
+   png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
+
+   /* The following is informational only on read, and not used on writes. */
+   png_byte channels;       /* number of data channels per pixel (1, 2, 3, 4) */
+   png_byte pixel_depth;    /* number of bits per pixel */
+   png_byte spare_byte;     /* to align the data, and for future use */
+   png_byte signature[8];   /* magic bytes read by libpng from start of file */
+
+   /* The rest of the data is optional.  If you are reading, check the
+    * valid field to see if the information in these are valid.  If you
+    * are writing, set the valid field to those chunks you want written,
+    * and initialize the appropriate fields below.
+    */
+
+#if defined(PNG_gAMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+   /* The gAMA chunk describes the gamma characteristics of the system
+    * on which the image was created, normally in the range [1.0, 2.5].
+    * Data is valid if (valid & PNG_INFO_gAMA) is non-zero.
+    */
+   float gamma; /* gamma value of image, if (valid & PNG_INFO_gAMA) */
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+    /* GR-P, 0.96a */
+    /* Data valid if (valid & PNG_INFO_sRGB) non-zero. */
+   png_byte srgb_intent; /* sRGB rendering intent [0, 1, 2, or 3] */
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+   /* The tEXt, and zTXt chunks contain human-readable textual data in
+    * uncompressed, compressed, and optionally compressed forms, respectively.
+    * The data in "text" is an array of pointers to uncompressed,
+    * null-terminated C strings. Each chunk has a keyword that describes the
+    * textual data contained in that chunk.  Keywords are not required to be
+    * unique, and the text string may be empty.  Any number of text chunks may
+    * be in an image.
+    */
+   int num_text; /* number of comments read/to write */
+   int max_text; /* current size of text array */
+   png_textp text; /* array of comments read/to write */
+#endif /* PNG_TEXT_SUPPORTED */
+
+#if defined(PNG_tIME_SUPPORTED)
+   /* The tIME chunk holds the last time the displayed image data was
+    * modified.  See the png_time struct for the contents of this struct.
+    */
+   png_time mod_time;
+#endif
+
+#if defined(PNG_sBIT_SUPPORTED)
+   /* The sBIT chunk specifies the number of significant high-order bits
+    * in the pixel data.  Values are in the range [1, bit_depth], and are
+    * only specified for the channels in the pixel data.  The contents of
+    * the low-order bits is not specified.  Data is valid if
+    * (valid & PNG_INFO_sBIT) is non-zero.
+    */
+   png_color_8 sig_bit; /* significant bits in color channels */
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_EXPAND_SUPPORTED) || \
+defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* The tRNS chunk supplies transparency data for paletted images and
+    * other image types that don't need a full alpha channel.  There are
+    * "num_trans" transparency values for a paletted image, stored in the
+    * same order as the palette colors, starting from index 0.  Values
+    * for the data are in the range [0, 255], ranging from fully transparent
+    * to fully opaque, respectively.  For non-paletted images, there is a
+    * single color specified that should be treated as fully transparent.
+    * Data is valid if (valid & PNG_INFO_tRNS) is non-zero.
+    */
+   png_bytep trans; /* transparent values for paletted image */
+   png_color_16 trans_values; /* transparent color for non-palette image */
+#endif
+
+#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* The bKGD chunk gives the suggested image background color if the
+    * display program does not have its own background color and the image
+    * is needs to composited onto a background before display.  The colors
+    * in "background" are normally in the same color space/depth as the
+    * pixel data.  Data is valid if (valid & PNG_INFO_bKGD) is non-zero.
+    */
+   png_color_16 background;
+#endif
+
+#if defined(PNG_oFFs_SUPPORTED)
+   /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards
+    * and downwards from the top-left corner of the display, page, or other
+    * application-specific co-ordinate space.  See the PNG_OFFSET_ defines
+    * below for the unit types.  Valid if (valid & PNG_INFO_oFFs) non-zero.
+    */
+   png_int_32 x_offset; /* x offset on page */
+   png_int_32 y_offset; /* y offset on page */
+   png_byte offset_unit_type; /* offset units type */
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+   /* The pHYs chunk gives the physical pixel density of the image for
+    * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_
+    * defines below).  Data is valid if (valid & PNG_INFO_pHYs) is non-zero.
+    */
+   png_uint_32 x_pixels_per_unit; /* horizontal pixel density */
+   png_uint_32 y_pixels_per_unit; /* vertical pixel density */
+   png_byte phys_unit_type; /* resolution type (see PNG_RESOLUTION_ below) */
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+   /* The hIST chunk contains the relative frequency or importance of the
+    * various palette entries, so that a viewer can intelligently select a
+    * reduced-color palette, if required.  Data is an array of "num_palette"
+    * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST)
+    * is non-zero.
+    */
+   png_uint_16p hist;
+#endif
+
+#ifdef PNG_cHRM_SUPPORTED
+   /* The cHRM chunk describes the CIE color characteristics of the monitor
+    * on which the PNG was created.  This data allows the viewer to do gamut
+    * mapping of the input image to ensure that the viewer sees the same
+    * colors in the image as the creator.  Values are in the range
+    * [0.0, 0.8].  Data valid if (valid & PNG_INFO_cHRM) non-zero.
+    */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float x_white;
+   float y_white;
+   float x_red;
+   float y_red;
+   float x_green;
+   float y_green;
+   float x_blue;
+   float y_blue;
+#endif
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+   /* The pCAL chunk describes a transformation between the stored pixel
+    * values and original physical data values used to create the image.
+    * The integer range [0, 2^bit_depth - 1] maps to the floating-point
+    * range given by [pcal_X0, pcal_X1], and are further transformed by a
+    * (possibly non-linear) transformation function given by "pcal_type"
+    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_
+    * defines below, and the PNG-Group's PNG extensions document for a
+    * complete description of the transformations and how they should be
+    * implemented, and for a description of the ASCII parameter strings.
+    * Data values are valid if (valid & PNG_INFO_pCAL) non-zero.
+    */
+   png_charp pcal_purpose;  /* pCAL chunk description string */
+   png_int_32 pcal_X0;      /* minimum value */
+   png_int_32 pcal_X1;      /* maximum value */
+   png_charp pcal_units;    /* Latin-1 string giving physical units */
+   png_charpp pcal_params;  /* ASCII strings containing parameter values */
+   png_byte pcal_type;      /* equation type (see PNG_EQUATION_ below) */
+   png_byte pcal_nparams;   /* number of parameters given in pcal_params */
+#endif
+
+/* New members added in libpng-1.0.6 */
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_uint_32 free_me;     /* flags items libpng is responsible for freeing */
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   /* storage for unknown chunks that the library doesn't recognize. */
+   png_unknown_chunkp unknown_chunks;
+   png_size_t unknown_chunks_num;
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+   /* iCCP chunk data. */
+   png_charp iccp_name;     /* profile name */
+   png_charp iccp_profile;  /* International Color Consortium profile data */
+                            /* Note to maintainer: should be png_bytep */
+   png_uint_32 iccp_proflen;  /* ICC profile data length */
+   png_byte iccp_compression; /* Always zero */
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+   /* data on sPLT chunks (there may be more than one). */
+   png_sPLT_tp splt_palettes;
+   png_uint_32 splt_palettes_num;
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+   /* The sCAL chunk describes the actual physical dimensions of the
+    * subject matter of the graphic.  The chunk contains a unit specification
+    * a byte value, and two ASCII strings representing floating-point
+    * values.  The values are width and height corresponsing to one pixel
+    * in the image.  This external representation is converted to double
+    * here.  Data values are valid if (valid & PNG_INFO_sCAL) is non-zero.
+    */
+   png_byte scal_unit;         /* unit of physical scale */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   double scal_pixel_width;    /* width of one pixel */
+   double scal_pixel_height;   /* height of one pixel */
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_charp scal_s_width;     /* string containing height */
+   png_charp scal_s_height;    /* string containing width */
+#endif
+#endif
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+   /* Memory has been allocated if (valid & PNG_ALLOCATED_INFO_ROWS) non-zero */
+   /* Data valid if (valid & PNG_INFO_IDAT) non-zero */
+   png_bytepp row_pointers;        /* the image bits */
+#endif
+
+#if defined(PNG_FIXED_POINT_SUPPORTED) && defined(PNG_gAMA_SUPPORTED)
+   png_fixed_point int_gamma; /* gamma of image, if (valid & PNG_INFO_gAMA) */
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED) && defined(PNG_FIXED_POINT_SUPPORTED)
+   png_fixed_point int_x_white;
+   png_fixed_point int_y_white;
+   png_fixed_point int_x_red;
+   png_fixed_point int_y_red;
+   png_fixed_point int_x_green;
+   png_fixed_point int_y_green;
+   png_fixed_point int_x_blue;
+   png_fixed_point int_y_blue;
+#endif
+
+} png_info;
+
+typedef png_info FAR * png_infop;
+typedef png_info FAR * FAR * png_infopp;
+
+/* Maximum positive integer used in PNG is (2^31)-1 */
+#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
+#define PNG_UINT_32_MAX ((png_uint_32)(-1))
+#define PNG_SIZE_MAX ((png_size_t)(-1))
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* PNG_MAX_UINT is deprecated; use PNG_UINT_31_MAX instead. */
+#define PNG_MAX_UINT PNG_UINT_31_MAX
+#endif
+
+/* These describe the color_type field in png_info. */
+/* color type masks */
+#define PNG_COLOR_MASK_PALETTE    1
+#define PNG_COLOR_MASK_COLOR      2
+#define PNG_COLOR_MASK_ALPHA      4
+
+/* color types.  Note that not all combinations are legal */
+#define PNG_COLOR_TYPE_GRAY 0
+#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
+#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)
+#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
+#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
+/* aliases */
+#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA
+#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA
+
+/* This is for compression type. PNG 1.0-1.2 only define the single type. */
+#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
+#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
+
+/* This is for filter type. PNG 1.0-1.2 only define the single type. */
+#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */
+#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */
+#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE
+
+/* These are for the interlacing type.  These values should NOT be changed. */
+#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */
+#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */
+#define PNG_INTERLACE_LAST        2 /* Not a valid value */
+
+/* These are for the oFFs chunk.  These values should NOT be changed. */
+#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */
+#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */
+#define PNG_OFFSET_LAST           2 /* Not a valid value */
+
+/* These are for the pCAL chunk.  These values should NOT be changed. */
+#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
+#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
+#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
+#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
+#define PNG_EQUATION_LAST         4 /* Not a valid value */
+
+/* These are for the sCAL chunk.  These values should NOT be changed. */
+#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
+#define PNG_SCALE_METER           1 /* meters per pixel */
+#define PNG_SCALE_RADIAN          2 /* radians per pixel */
+#define PNG_SCALE_LAST            3 /* Not a valid value */
+
+/* These are for the pHYs chunk.  These values should NOT be changed. */
+#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */
+#define PNG_RESOLUTION_METER      1 /* pixels/meter */
+#define PNG_RESOLUTION_LAST       2 /* Not a valid value */
+
+/* These are for the sRGB chunk.  These values should NOT be changed. */
+#define PNG_sRGB_INTENT_PERCEPTUAL 0
+#define PNG_sRGB_INTENT_RELATIVE   1
+#define PNG_sRGB_INTENT_SATURATION 2
+#define PNG_sRGB_INTENT_ABSOLUTE   3
+#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */
+
+/* This is for text chunks */
+#define PNG_KEYWORD_MAX_LENGTH     79
+
+/* Maximum number of entries in PLTE/sPLT/tRNS arrays */
+#define PNG_MAX_PALETTE_LENGTH    256
+
+/* These determine if an ancillary chunk's data has been successfully read
+ * from the PNG header, or if the application has filled in the corresponding
+ * data in the info_struct to be written into the output file.  The values
+ * of the PNG_INFO_<chunk> defines should NOT be changed.
+ */
+#define PNG_INFO_gAMA 0x0001
+#define PNG_INFO_sBIT 0x0002
+#define PNG_INFO_cHRM 0x0004
+#define PNG_INFO_PLTE 0x0008
+#define PNG_INFO_tRNS 0x0010
+#define PNG_INFO_bKGD 0x0020
+#define PNG_INFO_hIST 0x0040
+#define PNG_INFO_pHYs 0x0080
+#define PNG_INFO_oFFs 0x0100
+#define PNG_INFO_tIME 0x0200
+#define PNG_INFO_pCAL 0x0400
+#define PNG_INFO_sRGB 0x0800   /* GR-P, 0.96a */
+#define PNG_INFO_iCCP 0x1000   /* ESR, 1.0.6 */
+#define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
+#define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
+#define PNG_INFO_IDAT 0x8000L  /* ESR, 1.0.6 */
+
+/* This is used for the transformation routines, as some of them
+ * change these values for the row.  It also should enable using
+ * the routines for other purposes.
+ */
+typedef struct png_row_info_struct
+{
+   png_uint_32 width; /* width of row */
+   png_uint_32 rowbytes; /* number of bytes in row */
+   png_byte color_type; /* color type of row */
+   png_byte bit_depth; /* bit depth of row */
+   png_byte channels; /* number of channels (1, 2, 3, or 4) */
+   png_byte pixel_depth; /* bits per pixel (depth * channels) */
+} png_row_info;
+
+typedef png_row_info FAR * png_row_infop;
+typedef png_row_info FAR * FAR * png_row_infopp;
+
+/* These are the function types for the I/O functions and for the functions
+ * that allow the user to override the default I/O functions with his or her
+ * own.  The png_error_ptr type should match that of user-supplied warning
+ * and error functions, while the png_rw_ptr type should match that of the
+ * user read/write data functions.
+ */
+typedef struct png_struct_def png_struct;
+typedef png_struct FAR * png_structp;
+
+typedef void (PNGAPI *png_error_ptr) PNGARG((png_structp, png_const_charp));
+typedef void (PNGAPI *png_rw_ptr) PNGARG((png_structp, png_bytep, png_size_t));
+typedef void (PNGAPI *png_flush_ptr) PNGARG((png_structp));
+typedef void (PNGAPI *png_read_status_ptr) PNGARG((png_structp, png_uint_32,
+   int));
+typedef void (PNGAPI *png_write_status_ptr) PNGARG((png_structp, png_uint_32,
+   int));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+typedef void (PNGAPI *png_progressive_info_ptr) PNGARG((png_structp, png_infop));
+typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
+typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
+   png_uint_32, int));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+typedef void (PNGAPI *png_user_transform_ptr) PNGARG((png_structp,
+    png_row_infop, png_bytep));
+#endif
+
+#if defined(PNG_USER_CHUNKS_SUPPORTED)
+typedef int (PNGAPI *png_user_chunk_ptr) PNGARG((png_structp, png_unknown_chunkp));
+#endif
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+typedef void (PNGAPI *png_unknown_chunk_ptr) PNGARG((png_structp));
+#endif
+
+/* Transform masks for the high-level interface */
+#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */
+#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */
+#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */
+#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */
+#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */
+#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */
+#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */
+#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */
+#define PNG_TRANSFORM_BGR            0x0080    /* read and write */
+#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
+#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
+#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
+#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* WRITE only, deprecated */
+/* Added to libpng-1.2.34 */
+#define PNG_TRANSFORM_STRIP_FILLER_BEFORE 0x0800  /* WRITE only */
+#define PNG_TRANSFORM_STRIP_FILLER_AFTER  0x1000  /* WRITE only */
+
+/* Flags for MNG supported features */
+#define PNG_FLAG_MNG_EMPTY_PLTE     0x01
+#define PNG_FLAG_MNG_FILTER_64      0x04
+#define PNG_ALL_MNG_FEATURES        0x05
+
+typedef png_voidp (*png_malloc_ptr) PNGARG((png_structp, png_size_t));
+typedef void (*png_free_ptr) PNGARG((png_structp, png_voidp));
+
+/* The structure that holds the information to read and write PNG files.
+ * The only people who need to care about what is inside of this are the
+ * people who will be modifying the library for their own special needs.
+ * It should NOT be accessed directly by an application, except to store
+ * the jmp_buf.
+ */
+
+struct png_struct_def
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf jmpbuf;            /* used in png_error */
+#endif
+   png_error_ptr error_fn;    /* function for printing errors and aborting */
+   png_error_ptr warning_fn;  /* function for printing warnings */
+   png_voidp error_ptr;       /* user supplied struct for error functions */
+   png_rw_ptr write_data_fn;  /* function for writing output data */
+   png_rw_ptr read_data_fn;   /* function for reading input data */
+   png_voidp io_ptr;          /* ptr to application struct for I/O functions */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   png_user_transform_ptr read_user_transform_fn; /* user read transform */
+#endif
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   png_user_transform_ptr write_user_transform_fn; /* user write transform */
+#endif
+
+/* These were added in libpng-1.0.2 */
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   png_voidp user_transform_ptr; /* user supplied struct for user transform */
+   png_byte user_transform_depth;    /* bit depth of user transformed pixels */
+   png_byte user_transform_channels; /* channels in user transformed pixels */
+#endif
+#endif
+
+   png_uint_32 mode;          /* tells us where we are in the PNG file */
+   png_uint_32 flags;         /* flags indicating various things to libpng */
+   png_uint_32 transformations; /* which transformations to perform */
+
+   z_stream zstream;          /* pointer to decompression structure (below) */
+   png_bytep zbuf;            /* buffer for zlib */
+   png_size_t zbuf_size;      /* size of zbuf */
+   int zlib_level;            /* holds zlib compression level */
+   int zlib_method;           /* holds zlib compression method */
+   int zlib_window_bits;      /* holds zlib compression window bits */
+   int zlib_mem_level;        /* holds zlib compression memory level */
+   int zlib_strategy;         /* holds zlib compression strategy */
+
+   png_uint_32 width;         /* width of image in pixels */
+   png_uint_32 height;        /* height of image in pixels */
+   png_uint_32 num_rows;      /* number of rows in current pass */
+   png_uint_32 usr_width;     /* width of row at start of write */
+   png_uint_32 rowbytes;      /* size of row in bytes */
+   png_uint_32 irowbytes;     /* size of current interlaced row in bytes */
+   png_uint_32 iwidth;        /* width of current interlaced row in pixels */
+   png_uint_32 row_number;    /* current row in interlace pass */
+   png_bytep prev_row;        /* buffer to save previous (unfiltered) row */
+   png_bytep row_buf;         /* buffer to save current (unfiltered) row */
+#ifndef PNG_NO_WRITE_FILTER
+   png_bytep sub_row;         /* buffer to save "sub" row when filtering */
+   png_bytep up_row;          /* buffer to save "up" row when filtering */
+   png_bytep avg_row;         /* buffer to save "avg" row when filtering */
+   png_bytep paeth_row;       /* buffer to save "Paeth" row when filtering */
+#endif
+   png_row_info row_info;     /* used for transformation routines */
+
+   png_uint_32 idat_size;     /* current IDAT size for read */
+   png_uint_32 crc;           /* current chunk CRC value */
+   png_colorp palette;        /* palette from the input file */
+   png_uint_16 num_palette;   /* number of color entries in palette */
+   png_uint_16 num_trans;     /* number of transparency values */
+   png_byte chunk_name[5];    /* null-terminated name of current chunk */
+   png_byte compression;      /* file compression type (always 0) */
+   png_byte filter;           /* file filter type (always 0) */
+   png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
+   png_byte pass;             /* current interlace pass (0 - 6) */
+   png_byte do_filter;        /* row filter flags (see PNG_FILTER_ below ) */
+   png_byte color_type;       /* color type of file */
+   png_byte bit_depth;        /* bit depth of file */
+   png_byte usr_bit_depth;    /* bit depth of users row */
+   png_byte pixel_depth;      /* number of bits per pixel */
+   png_byte channels;         /* number of channels in file */
+   png_byte usr_channels;     /* channels at start of write */
+   png_byte sig_bytes;        /* magic bytes read/written from start of file */
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+#ifdef PNG_LEGACY_SUPPORTED
+   png_byte filler;           /* filler byte for pixel expansion */
+#else
+   png_uint_16 filler;           /* filler bytes for pixel expansion */
+#endif
+#endif
+
+#if defined(PNG_bKGD_SUPPORTED)
+   png_byte background_gamma_type;
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+   float background_gamma;
+#  endif
+   png_color_16 background;   /* background color in screen gamma space */
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   png_color_16 background_1; /* background normalized to gamma 1.0 */
+#endif
+#endif /* PNG_bKGD_SUPPORTED */
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+   png_flush_ptr output_flush_fn;/* Function for flushing output */
+   png_uint_32 flush_dist;    /* how many rows apart to flush, 0 - no flush */
+   png_uint_32 flush_rows;    /* number of rows written since last flush */
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   int gamma_shift;      /* number of "insignificant" bits 16-bit gamma */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float gamma;          /* file gamma value */
+   float screen_gamma;   /* screen gamma value (display_exponent) */
+#endif
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_bytep gamma_table;     /* gamma table for 8-bit depth files */
+   png_bytep gamma_from_1;    /* converts from 1.0 to screen */
+   png_bytep gamma_to_1;      /* converts from file to 1.0 */
+   png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
+   png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
+   png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
+   png_color_8 sig_bit;       /* significant bits in each available channel */
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+   png_color_8 shift;         /* shift for significant bit tranformation */
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \
+ || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_bytep trans;           /* transparency values for paletted files */
+   png_color_16 trans_values; /* transparency values for non-paletted files */
+#endif
+
+   png_read_status_ptr read_row_fn;   /* called after each row is decoded */
+   png_write_status_ptr write_row_fn; /* called after each row is encoded */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+   png_progressive_info_ptr info_fn; /* called after header data fully read */
+   png_progressive_row_ptr row_fn;   /* called after each prog. row is decoded */
+   png_progressive_end_ptr end_fn;   /* called after image is complete */
+   png_bytep save_buffer_ptr;        /* current location in save_buffer */
+   png_bytep save_buffer;            /* buffer for previously read data */
+   png_bytep current_buffer_ptr;     /* current location in current_buffer */
+   png_bytep current_buffer;         /* buffer for recently used data */
+   png_uint_32 push_length;          /* size of current input chunk */
+   png_uint_32 skip_length;          /* bytes to skip in input data */
+   png_size_t save_buffer_size;      /* amount of data now in save_buffer */
+   png_size_t save_buffer_max;       /* total size of save_buffer */
+   png_size_t buffer_size;           /* total amount of available input data */
+   png_size_t current_buffer_size;   /* amount of data now in current_buffer */
+   int process_mode;                 /* what push library is currently doing */
+   int cur_palette;                  /* current push library palette index */
+
+#  if defined(PNG_TEXT_SUPPORTED)
+     png_size_t current_text_size;   /* current size of text input data */
+     png_size_t current_text_left;   /* how much text left to read in input */
+     png_charp current_text;         /* current text chunk buffer */
+     png_charp current_text_ptr;     /* current location in current_text */
+#  endif /* PNG_TEXT_SUPPORTED */
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
+/* for the Borland special 64K segment handler */
+   png_bytepp offset_table_ptr;
+   png_bytep offset_table;
+   png_uint_16 offset_table_number;
+   png_uint_16 offset_table_count;
+   png_uint_16 offset_table_count_free;
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   png_bytep palette_lookup;         /* lookup table for dithering */
+   png_bytep dither_index;           /* index translation for palette files */
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED) || defined(PNG_hIST_SUPPORTED)
+   png_uint_16p hist;                /* histogram */
+#endif
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_byte heuristic_method;        /* heuristic for row filter selection */
+   png_byte num_prev_filters;        /* number of weights for previous rows */
+   png_bytep prev_filters;           /* filter type(s) of previous row(s) */
+   png_uint_16p filter_weights;      /* weight(s) for previous line(s) */
+   png_uint_16p inv_filter_weights;  /* 1/weight(s) for previous line(s) */
+   png_uint_16p filter_costs;        /* relative filter calculation cost */
+   png_uint_16p inv_filter_costs;    /* 1/relative filter calculation cost */
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+   png_charp time_buffer;            /* String to hold RFC 1123 time text */
+#endif
+
+/* New members added in libpng-1.0.6 */
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_uint_32 free_me;       /* flags items libpng is responsible for freeing */
+#endif
+
+#if defined(PNG_USER_CHUNKS_SUPPORTED)
+   png_voidp user_chunk_ptr;
+   png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   int num_chunk_list;
+   png_bytep chunk_list;
+#endif
+
+/* New members added in libpng-1.0.3 */
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+   png_byte rgb_to_gray_status;
+   /* These were changed from png_byte in libpng-1.0.6 */
+   png_uint_16 rgb_to_gray_red_coeff;
+   png_uint_16 rgb_to_gray_green_coeff;
+   png_uint_16 rgb_to_gray_blue_coeff;
+#endif
+
+/* New member added in libpng-1.0.4 (renamed in 1.0.9) */
+#if defined(PNG_MNG_FEATURES_SUPPORTED) || \
+    defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+/* changed from png_byte to png_uint_32 at version 1.2.0 */
+#ifdef PNG_1_0_X
+   png_byte mng_features_permitted;
+#else
+   png_uint_32 mng_features_permitted;
+#endif /* PNG_1_0_X */
+#endif
+
+/* New member added in libpng-1.0.7 */
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_fixed_point int_gamma;
+#endif
+
+/* New member added in libpng-1.0.9, ifdef'ed out in 1.0.12, enabled in 1.2.0 */
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   png_byte filter_type;
+#endif
+
+#if defined(PNG_1_0_X)
+/* New member added in libpng-1.0.10, ifdef'ed out in 1.2.0 */
+   png_uint_32 row_buf_size;
+#endif
+
+/* New members added in libpng-1.2.0 */
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#  if !defined(PNG_1_0_X)
+#    if defined(PNG_MMX_CODE_SUPPORTED)
+   png_byte     mmx_bitdepth_threshold;
+   png_uint_32  mmx_rowbytes_threshold;
+#    endif
+   png_uint_32  asm_flags;
+#  endif
+#endif
+
+/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_voidp mem_ptr;                /* user supplied struct for mem functions */
+   png_malloc_ptr malloc_fn;         /* function for allocating memory */
+   png_free_ptr free_fn;             /* function for freeing memory */
+#endif
+
+/* New member added in libpng-1.0.13 and 1.2.0 */
+   png_bytep big_row_buf;         /* buffer to save current (unfiltered) row */
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* The following three members were added at version 1.0.14 and 1.2.4 */
+   png_bytep dither_sort;            /* working sort array */
+   png_bytep index_to_palette;       /* where the original index currently is */
+                                     /* in the palette */
+   png_bytep palette_to_index;       /* which original index points to this */
+                                     /* palette color */
+#endif
+
+/* New members added in libpng-1.0.16 and 1.2.6 */
+   png_byte compression_type;
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_uint_32 user_width_max;
+   png_uint_32 user_height_max;
+#endif
+
+/* New member added in libpng-1.0.25 and 1.2.17 */
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   /* storage for unknown chunk that the library doesn't recognize. */
+   png_unknown_chunk unknown_chunk;
+#endif
+
+/* New members added in libpng-1.2.26 */
+  png_uint_32 old_big_row_buf_size, old_prev_row_size;
+
+/* New member added in libpng-1.2.30 */
+  png_charp chunkdata;  /* buffer for reading chunk data */
+
+};
+
+
+/* This triggers a compiler error in png.c, if png.c and png.h
+ * do not agree upon the version number.
+ */
+typedef png_structp version_1_2_35;
+
+typedef png_struct FAR * FAR * png_structpp;
+
+/* Here are the function definitions most commonly used.  This is not
+ * the place to find out how to use libpng.  See libpng.txt for the
+ * full explanation, see example.c for the summary.  This just provides
+ * a simple one line description of the use of each function.
+ */
+
+/* Returns the version number of the library */
+extern PNG_EXPORT(png_uint_32,png_access_version_number) PNGARG((void));
+
+/* Tell lib we have already handled the first <num_bytes> magic bytes.
+ * Handling more than 8 bytes from the beginning of the file is an error.
+ */
+extern PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,
+   int num_bytes));
+
+/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
+ * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
+ * signature, and non-zero otherwise.  Having num_to_check == 0 or
+ * start > 7 will always fail (ie return non-zero).
+ */
+extern PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,
+   png_size_t num_to_check));
+
+/* Simple signature checking function.  This is the same as calling
+ * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
+ */
+extern PNG_EXPORT(int,png_check_sig) PNGARG((png_bytep sig, int num));
+
+/* Allocate and initialize png_ptr struct for reading, and any other memory. */
+extern PNG_EXPORT(png_structp,png_create_read_struct)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn));
+
+/* Allocate and initialize png_ptr struct for writing, and any other memory */
+extern PNG_EXPORT(png_structp,png_create_write_struct)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn));
+
+#ifdef PNG_WRITE_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_compression_buffer_size)
+   PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+extern PNG_EXPORT(void,png_set_compression_buffer_size)
+   PNGARG((png_structp png_ptr, png_uint_32 size));
+#endif
+
+/* Reset the compression stream */
+extern PNG_EXPORT(int,png_reset_zstream) PNGARG((png_structp png_ptr));
+
+/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
+#ifdef PNG_USER_MEM_SUPPORTED
+extern PNG_EXPORT(png_structp,png_create_read_struct_2)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+extern PNG_EXPORT(png_structp,png_create_write_struct_2)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+#endif
+
+/* Write a PNG chunk - size, type, (optional) data, CRC. */
+extern PNG_EXPORT(void,png_write_chunk) PNGARG((png_structp png_ptr,
+   png_bytep chunk_name, png_bytep data, png_size_t length));
+
+/* Write the start of a PNG chunk - length and chunk name. */
+extern PNG_EXPORT(void,png_write_chunk_start) PNGARG((png_structp png_ptr,
+   png_bytep chunk_name, png_uint_32 length));
+
+/* Write the data of a PNG chunk started with png_write_chunk_start(). */
+extern PNG_EXPORT(void,png_write_chunk_data) PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length));
+
+/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
+extern PNG_EXPORT(void,png_write_chunk_end) PNGARG((png_structp png_ptr));
+
+/* Allocate and initialize the info structure */
+extern PNG_EXPORT(png_infop,png_create_info_struct)
+   PNGARG((png_structp png_ptr));
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Initialize the info structure (old interface - DEPRECATED) */
+extern PNG_EXPORT(void,png_info_init) PNGARG((png_infop info_ptr));
+#undef png_info_init
+#define png_info_init(info_ptr) png_info_init_3(&info_ptr,\
+    png_sizeof(png_info));
+#endif
+
+extern PNG_EXPORT(void,png_info_init_3) PNGARG((png_infopp info_ptr,
+    png_size_t png_info_struct_size));
+
+/* Writes all the PNG information before the image. */
+extern PNG_EXPORT(void,png_write_info_before_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+extern PNG_EXPORT(void,png_write_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read the information before the actual image data. */
+extern PNG_EXPORT(void,png_read_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
+   PNGARG((png_structp png_ptr, png_timep ptime));
+#endif
+
+#if !defined(_WIN32_WCE)
+/* "time.h" functions are not supported on WindowsCE */
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+/* convert from a struct tm to png_time */
+extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
+   struct tm FAR * ttime));
+
+/* convert from time_t to png_time.  Uses gmtime() */
+extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
+   time_t ttime));
+#endif /* PNG_WRITE_tIME_SUPPORTED */
+#endif /* _WIN32_WCE */
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
+extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
+#if !defined(PNG_1_0_X)
+extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp
+  png_ptr));
+#endif
+extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Deprecated */
+extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp png_ptr));
+#endif
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* Use blue, green, red order for pixels. */
+extern PNG_EXPORT(void,png_set_bgr) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+/* Expand the grayscale to 24-bit RGB if necessary. */
+extern PNG_EXPORT(void,png_set_gray_to_rgb) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+/* Reduce RGB to grayscale. */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_rgb_to_gray) PNGARG((png_structp png_ptr,
+   int error_action, double red, double green ));
+#endif
+extern PNG_EXPORT(void,png_set_rgb_to_gray_fixed) PNGARG((png_structp png_ptr,
+   int error_action, png_fixed_point red, png_fixed_point green ));
+extern PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((png_structp
+   png_ptr));
+#endif
+
+extern PNG_EXPORT(void,png_build_grayscale_palette) PNGARG((int bit_depth,
+   png_colorp palette));
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_strip_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_swap_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_invert_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+/* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
+extern PNG_EXPORT(void,png_set_filler) PNGARG((png_structp png_ptr,
+   png_uint_32 filler, int flags));
+/* The values of the PNG_FILLER_ defines should NOT be changed */
+#define PNG_FILLER_BEFORE 0
+#define PNG_FILLER_AFTER 1
+/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
+#if !defined(PNG_1_0_X)
+extern PNG_EXPORT(void,png_set_add_alpha) PNGARG((png_structp png_ptr,
+   png_uint_32 filler, int flags));
+#endif
+#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* Swap bytes in 16-bit depth files. */
+extern PNG_EXPORT(void,png_set_swap) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
+extern PNG_EXPORT(void,png_set_packing) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+/* Swap packing order of pixels in bytes. */
+extern PNG_EXPORT(void,png_set_packswap) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+/* Converts files to legal bit depths. */
+extern PNG_EXPORT(void,png_set_shift) PNGARG((png_structp png_ptr,
+   png_color_8p true_bits));
+#endif
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+    defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* Have the code handle the interlacing.  Returns the number of passes. */
+extern PNG_EXPORT(int,png_set_interlace_handling) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+/* Invert monochrome files */
+extern PNG_EXPORT(void,png_set_invert_mono) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+/* Handle alpha and tRNS by replacing with a background color. */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,
+   png_color_16p background_color, int background_gamma_code,
+   int need_expand, double background_gamma));
+#endif
+#define PNG_BACKGROUND_GAMMA_UNKNOWN 0
+#define PNG_BACKGROUND_GAMMA_SCREEN  1
+#define PNG_BACKGROUND_GAMMA_FILE    2
+#define PNG_BACKGROUND_GAMMA_UNIQUE  3
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* strip the second byte of information from a 16-bit depth file. */
+extern PNG_EXPORT(void,png_set_strip_16) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* Turn on dithering, and reduce the palette to the number of colors available. */
+extern PNG_EXPORT(void,png_set_dither) PNGARG((png_structp png_ptr,
+   png_colorp palette, int num_palette, int maximum_colors,
+   png_uint_16p histogram, int full_dither));
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+/* Handle gamma correction. Screen_gamma=(display_exponent) */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_gamma) PNGARG((png_structp png_ptr,
+   double screen_gamma, double default_file_gamma));
+#endif
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+/* Permit or disallow empty PLTE (0: not permitted, 1: permitted) */
+/* Deprecated and will be removed.  Use png_permit_mng_features() instead. */
+extern PNG_EXPORT(void,png_permit_empty_plte) PNGARG((png_structp png_ptr,
+   int empty_plte_permitted));
+#endif
+#endif
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+/* Set how many lines between output flushes - 0 for no flushing */
+extern PNG_EXPORT(void,png_set_flush) PNGARG((png_structp png_ptr, int nrows));
+/* Flush the current PNG output buffer */
+extern PNG_EXPORT(void,png_write_flush) PNGARG((png_structp png_ptr));
+#endif
+
+/* optional update palette with requested transformations */
+extern PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr));
+
+/* optional call to update the users info structure */
+extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read one or more rows of image data. */
+extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,
+   png_bytepp row, png_bytepp display_row, png_uint_32 num_rows));
+#endif
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read a row of data. */
+extern PNG_EXPORT(void,png_read_row) PNGARG((png_structp png_ptr,
+   png_bytep row,
+   png_bytep display_row));
+#endif
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read the whole image into memory at once. */
+extern PNG_EXPORT(void,png_read_image) PNGARG((png_structp png_ptr,
+   png_bytepp image));
+#endif
+
+/* write a row of image data */
+extern PNG_EXPORT(void,png_write_row) PNGARG((png_structp png_ptr,
+   png_bytep row));
+
+/* write a few rows of image data */
+extern PNG_EXPORT(void,png_write_rows) PNGARG((png_structp png_ptr,
+   png_bytepp row, png_uint_32 num_rows));
+
+/* write the image data */
+extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
+   png_bytepp image));
+
+/* writes the end of the PNG file. */
+extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read the end of the PNG file. */
+extern PNG_EXPORT(void,png_read_end) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+/* free any memory associated with the png_info_struct */
+extern PNG_EXPORT(void,png_destroy_info_struct) PNGARG((png_structp png_ptr,
+   png_infopp info_ptr_ptr));
+
+/* free any memory associated with the png_struct and the png_info_structs */
+extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp
+   png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
+
+/* free all memory used by the read (old method - NOT DLL EXPORTED) */
+extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_infop end_info_ptr));
+
+/* free any memory associated with the png_struct and the png_info_structs */
+extern PNG_EXPORT(void,png_destroy_write_struct)
+   PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
+
+/* free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
+extern void png_write_destroy PNGARG((png_structp png_ptr));
+
+/* set the libpng method of handling chunk CRC errors */
+extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
+   int crit_action, int ancil_action));
+
+/* Values for png_set_crc_action() to say how to handle CRC errors in
+ * ancillary and critical chunks, and whether to use the data contained
+ * therein.  Note that it is impossible to "discard" data in a critical
+ * chunk.  For versions prior to 0.90, the action was always error/quit,
+ * whereas in version 0.90 and later, the action for CRC errors in ancillary
+ * chunks is warn/discard.  These values should NOT be changed.
+ *
+ *      value                       action:critical     action:ancillary
+ */
+#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */
+#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
+#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
+#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
+#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
+#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
+
+/* These functions give the user control over the scan-line filtering in
+ * libpng and the compression methods used by zlib.  These functions are
+ * mainly useful for testing, as the defaults should work with most users.
+ * Those users who are tight on memory or want faster performance at the
+ * expense of compression can modify them.  See the compression library
+ * header file (zlib.h) for an explination of the compression functions.
+ */
+
+/* set the filtering method(s) used by libpng.  Currently, the only valid
+ * value for "method" is 0.
+ */
+extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,
+   int filters));
+
+/* Flags for png_set_filter() to say which filters to use.  The flags
+ * are chosen so that they don't conflict with real filter types
+ * below, in case they are supplied instead of the #defined constants.
+ * These values should NOT be changed.
+ */
+#define PNG_NO_FILTERS     0x00
+#define PNG_FILTER_NONE    0x08
+#define PNG_FILTER_SUB     0x10
+#define PNG_FILTER_UP      0x20
+#define PNG_FILTER_AVG     0x40
+#define PNG_FILTER_PAETH   0x80
+#define PNG_ALL_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | \
+                         PNG_FILTER_AVG | PNG_FILTER_PAETH)
+
+/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
+ * These defines should NOT be changed.
+ */
+#define PNG_FILTER_VALUE_NONE  0
+#define PNG_FILTER_VALUE_SUB   1
+#define PNG_FILTER_VALUE_UP    2
+#define PNG_FILTER_VALUE_AVG   3
+#define PNG_FILTER_VALUE_PAETH 4
+#define PNG_FILTER_VALUE_LAST  5
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) /* EXPERIMENTAL */
+/* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_
+ * defines, either the default (minimum-sum-of-absolute-differences), or
+ * the experimental method (weighted-minimum-sum-of-absolute-differences).
+ *
+ * Weights are factors >= 1.0, indicating how important it is to keep the
+ * filter type consistent between rows.  Larger numbers mean the current
+ * filter is that many times as likely to be the same as the "num_weights"
+ * previous filters.  This is cumulative for each previous row with a weight.
+ * There needs to be "num_weights" values in "filter_weights", or it can be
+ * NULL if the weights aren't being specified.  Weights have no influence on
+ * the selection of the first row filter.  Well chosen weights can (in theory)
+ * improve the compression for a given image.
+ *
+ * Costs are factors >= 1.0 indicating the relative decoding costs of a
+ * filter type.  Higher costs indicate more decoding expense, and are
+ * therefore less likely to be selected over a filter with lower computational
+ * costs.  There needs to be a value in "filter_costs" for each valid filter
+ * type (given by PNG_FILTER_VALUE_LAST), or it can be NULL if you aren't
+ * setting the costs.  Costs try to improve the speed of decompression without
+ * unduly increasing the compressed image size.
+ *
+ * A negative weight or cost indicates the default value is to be used, and
+ * values in the range [0.0, 1.0) indicate the value is to remain unchanged.
+ * The default values for both weights and costs are currently 1.0, but may
+ * change if good general weighting/cost heuristics can be found.  If both
+ * the weights and costs are set to 1.0, this degenerates the WEIGHTED method
+ * to the UNWEIGHTED method, but with added encoding time/computation.
+ */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,
+   int heuristic_method, int num_weights, png_doublep filter_weights,
+   png_doublep filter_costs));
+#endif
+#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+/* Heuristic used for row filter selection.  These defines should NOT be
+ * changed.
+ */
+#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
+#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
+#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
+#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
+
+/* Set the library compression level.  Currently, valid values range from
+ * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
+ * (0 - no compression, 9 - "maximal" compression).  Note that tests have
+ * shown that zlib compression levels 3-6 usually perform as well as level 9
+ * for PNG images, and do considerably fewer caclulations.  In the future,
+ * these values may not correspond directly to the zlib compression levels.
+ */
+extern PNG_EXPORT(void,png_set_compression_level) PNGARG((png_structp png_ptr,
+   int level));
+
+extern PNG_EXPORT(void,png_set_compression_mem_level)
+   PNGARG((png_structp png_ptr, int mem_level));
+
+extern PNG_EXPORT(void,png_set_compression_strategy)
+   PNGARG((png_structp png_ptr, int strategy));
+
+extern PNG_EXPORT(void,png_set_compression_window_bits)
+   PNGARG((png_structp png_ptr, int window_bits));
+
+extern PNG_EXPORT(void,png_set_compression_method) PNGARG((png_structp png_ptr,
+   int method));
+
+/* These next functions are called for input/output, memory, and error
+ * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,
+ * and call standard C I/O routines such as fread(), fwrite(), and
+ * fprintf().  These functions can be made to use other I/O routines
+ * at run time for those applications that need to handle I/O in a
+ * different manner by calling png_set_???_fn().  See libpng.txt for
+ * more information.
+ */
+
+#if !defined(PNG_NO_STDIO)
+/* Initialize the input/output for the PNG file to the default functions. */
+extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr, png_FILE_p fp));
+#endif
+
+/* Replace the (error and abort), and warning functions with user
+ * supplied functions.  If no messages are to be printed you must still
+ * write and use replacement functions. The replacement error_fn should
+ * still do a longjmp to the last setjmp location if you are using this
+ * method of error handling.  If error_fn or warning_fn is NULL, the
+ * default function will be used.
+ */
+
+extern PNG_EXPORT(void,png_set_error_fn) PNGARG((png_structp png_ptr,
+   png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
+
+/* Return the user pointer associated with the error functions */
+extern PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_structp png_ptr));
+
+/* Replace the default data output functions with a user supplied one(s).
+ * If buffered output is not used, then output_flush_fn can be set to NULL.
+ * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
+ * output_flush_fn will be ignored (and thus can be NULL).
+ */
+extern PNG_EXPORT(void,png_set_write_fn) PNGARG((png_structp png_ptr,
+   png_voidp io_ptr, png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
+
+/* Replace the default data input function with a user supplied one. */
+extern PNG_EXPORT(void,png_set_read_fn) PNGARG((png_structp png_ptr,
+   png_voidp io_ptr, png_rw_ptr read_data_fn));
+
+/* Return the user pointer associated with the I/O functions */
+extern PNG_EXPORT(png_voidp,png_get_io_ptr) PNGARG((png_structp png_ptr));
+
+extern PNG_EXPORT(void,png_set_read_status_fn) PNGARG((png_structp png_ptr,
+   png_read_status_ptr read_row_fn));
+
+extern PNG_EXPORT(void,png_set_write_status_fn) PNGARG((png_structp png_ptr,
+   png_write_status_ptr write_row_fn));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+/* Replace the default memory allocation functions with user supplied one(s). */
+extern PNG_EXPORT(void,png_set_mem_fn) PNGARG((png_structp png_ptr,
+   png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+/* Return the user pointer associated with the memory functions */
+extern PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_read_user_transform_fn) PNGARG((png_structp
+   png_ptr, png_user_transform_ptr read_user_transform_fn));
+#endif
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_write_user_transform_fn) PNGARG((png_structp
+   png_ptr, png_user_transform_ptr write_user_transform_fn));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_user_transform_info) PNGARG((png_structp
+   png_ptr, png_voidp user_transform_ptr, int user_transform_depth,
+   int user_transform_channels));
+/* Return the user pointer associated with the user transform functions */
+extern PNG_EXPORT(png_voidp,png_get_user_transform_ptr)
+   PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_USER_CHUNKS_SUPPORTED
+extern PNG_EXPORT(void,png_set_read_user_chunk_fn) PNGARG((png_structp png_ptr,
+   png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
+extern PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((png_structp
+   png_ptr));
+#endif
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+/* Sets the function callbacks for the push reader, and a pointer to a
+ * user-defined structure available to the callback functions.
+ */
+extern PNG_EXPORT(void,png_set_progressive_read_fn) PNGARG((png_structp png_ptr,
+   png_voidp progressive_ptr,
+   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+   png_progressive_end_ptr end_fn));
+
+/* returns the user pointer associated with the push read functions */
+extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
+   PNGARG((png_structp png_ptr));
+
+/* function to be called when data becomes available */
+extern PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep buffer, png_size_t buffer_size));
+
+/* function that combines rows.  Not very much different than the
+ * png_combine_row() call.  Is this even used?????
+ */
+extern PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,
+   png_bytep old_row, png_bytep new_row));
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
+   png_uint_32 size));
+
+#if defined(PNG_1_0_X)
+#  define png_malloc_warn png_malloc
+#else
+/* Added at libpng version 1.2.4 */
+extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,
+   png_uint_32 size));
+#endif
+
+/* frees a pointer allocated by png_malloc() */
+extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));
+
+#if defined(PNG_1_0_X)
+/* Function to allocate memory for zlib. */
+extern PNG_EXPORT(voidpf,png_zalloc) PNGARG((voidpf png_ptr, uInt items,
+   uInt size));
+
+/* Function to free memory for zlib */
+extern PNG_EXPORT(void,png_zfree) PNGARG((voidpf png_ptr, voidpf ptr));
+#endif
+
+/* Free data that was allocated internally */
+extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 free_me, int num));
+#ifdef PNG_FREE_ME_SUPPORTED
+/* Reassign responsibility for freeing existing data, whether allocated
+ * by libpng or by the application */
+extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int freer, png_uint_32 mask));
+#endif
+/* assignments for png_data_freer */
+#define PNG_DESTROY_WILL_FREE_DATA 1
+#define PNG_SET_WILL_FREE_DATA 1
+#define PNG_USER_WILL_FREE_DATA 2
+/* Flags for png_ptr->free_me and info_ptr->free_me */
+#define PNG_FREE_HIST 0x0008
+#define PNG_FREE_ICCP 0x0010
+#define PNG_FREE_SPLT 0x0020
+#define PNG_FREE_ROWS 0x0040
+#define PNG_FREE_PCAL 0x0080
+#define PNG_FREE_SCAL 0x0100
+#define PNG_FREE_UNKN 0x0200
+#define PNG_FREE_LIST 0x0400
+#define PNG_FREE_PLTE 0x1000
+#define PNG_FREE_TRNS 0x2000
+#define PNG_FREE_TEXT 0x4000
+#define PNG_FREE_ALL  0x7fff
+#define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
+
+#ifdef PNG_USER_MEM_SUPPORTED
+extern PNG_EXPORT(png_voidp,png_malloc_default) PNGARG((png_structp png_ptr,
+   png_uint_32 size));
+extern PNG_EXPORT(void,png_free_default) PNGARG((png_structp png_ptr,
+   png_voidp ptr));
+#endif
+
+extern PNG_EXPORT(png_voidp,png_memcpy_check) PNGARG((png_structp png_ptr,
+   png_voidp s1, png_voidp s2, png_uint_32 size));
+
+extern PNG_EXPORT(png_voidp,png_memset_check) PNGARG((png_structp png_ptr,
+   png_voidp s1, int value, png_uint_32 size));
+
+#if defined(USE_FAR_KEYWORD)  /* memory model conversion function */
+extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,
+   int check));
+#endif /* USE_FAR_KEYWORD */
+
+#ifndef PNG_NO_ERROR_TEXT
+/* Fatal error in PNG image of libpng - can't continue */
+extern PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,
+   png_const_charp error_message));
+
+/* The same, but the chunk name is prepended to the error string. */
+extern PNG_EXPORT(void,png_chunk_error) PNGARG((png_structp png_ptr,
+   png_const_charp error_message));
+#else
+/* Fatal error in PNG image of libpng - can't continue */
+extern PNG_EXPORT(void,png_err) PNGARG((png_structp png_ptr));
+#endif
+
+#ifndef PNG_NO_WARNINGS
+/* Non-fatal error in libpng.  Can continue, but may have a problem. */
+extern PNG_EXPORT(void,png_warning) PNGARG((png_structp png_ptr,
+   png_const_charp warning_message));
+
+#ifdef PNG_READ_SUPPORTED
+/* Non-fatal error in libpng, chunk name is prepended to message. */
+extern PNG_EXPORT(void,png_chunk_warning) PNGARG((png_structp png_ptr,
+   png_const_charp warning_message));
+#endif /* PNG_READ_SUPPORTED */
+#endif /* PNG_NO_WARNINGS */
+
+/* The png_set_<chunk> functions are for storing values in the png_info_struct.
+ * Similarly, the png_get_<chunk> calls are used to read values from the
+ * png_info_struct, either storing the parameters in the passed variables, or
+ * setting pointers into the png_info_struct where the data is stored.  The
+ * png_get_<chunk> functions return a non-zero value if the data was available
+ * in info_ptr, or return zero and do not change any of the parameters if the
+ * data was not available.
+ *
+ * These functions should be used instead of directly accessing png_info
+ * to avoid problems with future changes in the size and internal layout of
+ * png_info_struct.
+ */
+/* Returns "flag" if chunk data is valid in info_ptr. */
+extern PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((png_structp png_ptr,
+png_infop info_ptr, png_uint_32 flag));
+
+/* Returns number of bytes needed to hold a transformed row. */
+extern PNG_EXPORT(png_uint_32,png_get_rowbytes) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+/* Returns row_pointers, which is an array of pointers to scanlines that was
+returned from png_read_png(). */
+extern PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+/* Set row_pointers, which is an array of pointers to scanlines for use
+by png_write_png(). */
+extern PNG_EXPORT(void,png_set_rows) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytepp row_pointers));
+#endif
+
+/* Returns number of color channels in image. */
+extern PNG_EXPORT(png_byte,png_get_channels) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+/* Returns image width in pixels. */
+extern PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image height in pixels. */
+extern PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image bit_depth. */
+extern PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image color_type. */
+extern PNG_EXPORT(png_byte, png_get_color_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image filter_type. */
+extern PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image interlace_type. */
+extern PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image compression_type. */
+extern PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image resolution in pixels per meter, from pHYs chunk data. */
+extern PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+#endif
+
+/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
+extern PNG_EXPORT(png_int_32, png_get_x_offset_pixels) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_y_offset_pixels) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_x_offset_microns) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_y_offset_microns) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+#endif /* PNG_EASY_ACCESS_SUPPORTED */
+
+/* Returns pointer to signature string read from PNG header */
+extern PNG_EXPORT(png_bytep,png_get_signature) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#if defined(PNG_bKGD_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_16p *background));
+#endif
+
+#if defined(PNG_bKGD_SUPPORTED)
+extern PNG_EXPORT(void,png_set_bKGD) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_16p background));
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double *white_x, double *white_y, double *red_x,
+   double *red_y, double *green_x, double *green_y, double *blue_x,
+   double *blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point *int_white_x, png_fixed_point
+   *int_white_y, png_fixed_point *int_red_x, png_fixed_point *int_red_y,
+   png_fixed_point *int_green_x, png_fixed_point *int_green_y, png_fixed_point
+   *int_blue_x, png_fixed_point *int_blue_y));
+#endif
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double white_x, double white_y, double red_x,
+   double red_y, double green_x, double green_y, double blue_x, double blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point int_white_x, png_fixed_point int_white_y,
+   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
+   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
+   png_fixed_point int_blue_y));
+#endif
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double *file_gamma));
+#endif
+extern PNG_EXPORT(png_uint_32,png_get_gAMA_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point *int_file_gamma));
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_gAMA) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double file_gamma));
+#endif
+extern PNG_EXPORT(void,png_set_gAMA_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point int_file_gamma));
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_16p *hist));
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+extern PNG_EXPORT(void,png_set_hIST) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_16p hist));
+#endif
+
+extern PNG_EXPORT(png_uint_32,png_get_IHDR) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 *width, png_uint_32 *height,
+   int *bit_depth, int *color_type, int *interlace_method,
+   int *compression_method, int *filter_method));
+
+extern PNG_EXPORT(void,png_set_IHDR) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
+   int color_type, int interlace_method, int compression_method,
+   int filter_method));
+
+#if defined(PNG_oFFs_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
+   int *unit_type));
+#endif
+
+#if defined(PNG_oFFs_SUPPORTED)
+extern PNG_EXPORT(void,png_set_oFFs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_int_32 offset_x, png_int_32 offset_y,
+   int unit_type));
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
+   int *type, int *nparams, png_charp *units, png_charpp *params));
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+extern PNG_EXPORT(void,png_set_pCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp purpose, png_int_32 X0, png_int_32 X1,
+   int type, int nparams, png_charp units, png_charpp params));
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+extern PNG_EXPORT(void,png_set_pHYs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
+#endif
+
+extern PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_colorp *palette, int *num_palette));
+
+extern PNG_EXPORT(void,png_set_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_colorp palette, int num_palette));
+
+#if defined(PNG_sBIT_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_8p *sig_bit));
+#endif
+
+#if defined(PNG_sBIT_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sBIT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_8p sig_bit));
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *intent));
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sRGB) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int intent));
+extern PNG_EXPORT(void,png_set_sRGB_gAMA_and_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int intent));
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_iCCP) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charpp name, int *compression_type,
+   png_charpp profile, png_uint_32 *proflen));
+   /* Note to maintainer: profile should be png_bytepp */
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+extern PNG_EXPORT(void,png_set_iCCP) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp name, int compression_type,
+   png_charp profile, png_uint_32 proflen));
+   /* Note to maintainer: profile should be png_bytep */
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sPLT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_sPLT_tpp entries));
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sPLT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_sPLT_tp entries, int nentries));
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+/* png_get_text also returns the number of text chunks in *num_text */
+extern PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp *text_ptr, int *num_text));
+#endif
+
+/*
+ *  Note while png_set_text() will accept a structure whose text,
+ *  language, and  translated keywords are NULL pointers, the structure
+ *  returned by png_get_text will always contain regular
+ *  zero-terminated C strings.  They might be empty strings but
+ *  they will never be NULL pointers.
+ */
+
+#if defined(PNG_TEXT_SUPPORTED)
+extern PNG_EXPORT(void,png_set_text) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp text_ptr, int num_text));
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_timep *mod_time));
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+extern PNG_EXPORT(void,png_set_tIME) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_timep mod_time));
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep *trans, int *num_trans,
+   png_color_16p *trans_values));
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+extern PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep trans, int num_trans,
+   png_color_16p trans_values));
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *unit, double *width, double *height));
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));
+#endif
+#endif
+#endif /* PNG_sCAL_SUPPORTED */
+
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_sCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int unit, double width, double height));
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int unit, png_charp swidth, png_charp sheight));
+#endif
+#endif
+#endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+/* provide a list of chunks and how they are to be handled, if the built-in
+   handling or default unknown chunk handling is not desired.  Any chunks not
+   listed will be handled in the default manner.  The IHDR and IEND chunks
+   must not be listed.
+      keep = 0: follow default behaviour
+           = 1: do not keep
+           = 2: keep only if safe-to-copy
+           = 3: keep even if unsafe-to-copy
+*/
+extern PNG_EXPORT(void, png_set_keep_unknown_chunks) PNGARG((png_structp
+   png_ptr, int keep, png_bytep chunk_list, int num_chunks));
+extern PNG_EXPORT(void, png_set_unknown_chunks) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns));
+extern PNG_EXPORT(void, png_set_unknown_chunk_location)
+   PNGARG((png_structp png_ptr, png_infop info_ptr, int chunk, int location));
+extern PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((png_structp
+   png_ptr, png_infop info_ptr, png_unknown_chunkpp entries));
+#endif
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep
+   chunk_name));
+#endif
+
+/* Png_free_data() will turn off the "valid" flag for anything it frees.
+   If you need to turn it off for a chunk that your application has freed,
+   you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK); */
+extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int mask));
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+/* The "params" pointer is currently not used and is for future expansion. */
+extern PNG_EXPORT(void, png_read_png) PNGARG((png_structp png_ptr,
+                        png_infop info_ptr,
+                        int transforms,
+                        png_voidp params));
+extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
+                        png_infop info_ptr,
+                        int transforms,
+                        png_voidp params));
+#endif
+
+/* Define PNG_DEBUG at compile time for debugging information.  Higher
+ * numbers for PNG_DEBUG mean more debugging information.  This has
+ * only been added since version 0.95 so it is not implemented throughout
+ * libpng yet, but more support will be added as needed.
+ */
+#ifdef PNG_DEBUG
+#if (PNG_DEBUG > 0)
+#if !defined(PNG_DEBUG_FILE) && defined(_MSC_VER)
+#include <crtdbg.h>
+#if (PNG_DEBUG > 1)
+#ifndef _DEBUG
+#  define _DEBUG
+#endif
+#ifndef png_debug
+#define png_debug(l,m)  _RPT0(_CRT_WARN,m PNG_STRING_NEWLINE)
+#endif
+#ifndef png_debug1
+#define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m PNG_STRING_NEWLINE,p1)
+#endif
+#ifndef png_debug2
+#define png_debug2(l,m,p1,p2) _RPT2(_CRT_WARN,m PNG_STRING_NEWLINE,p1,p2)
+#endif
+#endif
+#else /* PNG_DEBUG_FILE || !_MSC_VER */
+#ifndef PNG_DEBUG_FILE
+#define PNG_DEBUG_FILE stderr
+#endif /* PNG_DEBUG_FILE */
+#if (PNG_DEBUG > 1)
+#ifndef png_debug
+/* Note: ["%s"m PNG_STRING_NEWLINE] probably does not work on
+ * non-ISO compilers */
+#ifdef __STDC__
+#define png_debug(l,m) \
+{ \
+     int num_tabs=l; \
+     fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \
+}
+#endif
+#ifndef png_debug1
+#define png_debug1(l,m,p1) \
+{ \
+     int num_tabs=l; \
+     fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \
+}
+#endif
+#ifndef png_debug2
+#define png_debug2(l,m,p1,p2) \
+{ \
+     int num_tabs=l; \
+     fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \
+}
+#endif
+#else /* __STDC __ */
+#ifndef png_debug
+#define png_debug(l,m) \
+     int num_tabs=l; \
+     char format[256]; \
+     snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
+       m,PNG_STRING_NEWLINE); \
+     fprintf(PNG_DEBUG_FILE,format);
+#endif
+#ifndef png_debug1
+#define png_debug1(l,m,p1) \
+     int num_tabs=l; \
+     char format[256]; \
+     snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
+       m,PNG_STRING_NEWLINE); \
+     fprintf(PNG_DEBUG_FILE,format,p1);
+#endif
+#ifndef png_debug2
+#define png_debug2(l,m,p1,p2) \
+     int num_tabs=l; \
+     char format[256]; \
+     snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
+       m,PNG_STRING_NEWLINE); \
+     fprintf(PNG_DEBUG_FILE,format,p1,p2);
+#endif
+#endif /* __STDC __ */
+#endif /* (PNG_DEBUG > 1) */
+#endif /* _MSC_VER */
+#endif /* (PNG_DEBUG > 0) */
+#endif /* PNG_DEBUG */
+#ifndef png_debug
+#define png_debug(l, m)
+#endif
+#ifndef png_debug1
+#define png_debug1(l, m, p1)
+#endif
+#ifndef png_debug2
+#define png_debug2(l, m, p1, p2)
+#endif
+
+extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr));
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp
+   png_ptr, png_uint_32 mng_features_permitted));
+#endif
+
+/* For use in png_set_keep_unknown, added to version 1.2.6 */
+#define PNG_HANDLE_CHUNK_AS_DEFAULT   0
+#define PNG_HANDLE_CHUNK_NEVER        1
+#define PNG_HANDLE_CHUNK_IF_SAFE      2
+#define PNG_HANDLE_CHUNK_ALWAYS       3
+
+/* Added to version 1.2.0 */
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#if defined(PNG_MMX_CODE_SUPPORTED)
+#define PNG_ASM_FLAG_MMX_SUPPORT_COMPILED  0x01  /* not user-settable */
+#define PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU    0x02  /* not user-settable */
+#define PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  0x04
+#define PNG_ASM_FLAG_MMX_READ_INTERLACE    0x08
+#define PNG_ASM_FLAG_MMX_READ_FILTER_SUB   0x10
+#define PNG_ASM_FLAG_MMX_READ_FILTER_UP    0x20
+#define PNG_ASM_FLAG_MMX_READ_FILTER_AVG   0x40
+#define PNG_ASM_FLAG_MMX_READ_FILTER_PAETH 0x80
+#define PNG_ASM_FLAGS_INITIALIZED          0x80000000  /* not user-settable */
+
+#define PNG_MMX_READ_FLAGS ( PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  \
+                           | PNG_ASM_FLAG_MMX_READ_INTERLACE    \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_UP    \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH )
+#define PNG_MMX_WRITE_FLAGS ( 0 )
+
+#define PNG_MMX_FLAGS ( PNG_ASM_FLAG_MMX_SUPPORT_COMPILED \
+                      | PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU   \
+                      | PNG_MMX_READ_FLAGS                \
+                      | PNG_MMX_WRITE_FLAGS )
+
+#define PNG_SELECT_READ   1
+#define PNG_SELECT_WRITE  2
+#endif /* PNG_MMX_CODE_SUPPORTED */
+
+#if !defined(PNG_1_0_X)
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_mmx_flagmask)
+   PNGARG((int flag_select, int *compilerID));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_asm_flagmask)
+   PNGARG((int flag_select));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_asm_flags)
+   PNGARG((png_structp png_ptr));
+
+/* pngget.c */
+extern PNG_EXPORT(png_byte,png_get_mmx_bitdepth_threshold)
+   PNGARG((png_structp png_ptr));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_mmx_rowbytes_threshold)
+   PNGARG((png_structp png_ptr));
+
+/* pngset.c */
+extern PNG_EXPORT(void,png_set_asm_flags)
+   PNGARG((png_structp png_ptr, png_uint_32 asm_flags));
+
+/* pngset.c */
+extern PNG_EXPORT(void,png_set_mmx_thresholds)
+   PNGARG((png_structp png_ptr, png_byte mmx_bitdepth_threshold,
+   png_uint_32 mmx_rowbytes_threshold));
+
+#endif /* PNG_1_0_X */
+
+#if !defined(PNG_1_0_X)
+/* png.c, pnggccrd.c, or pngvcrd.c */
+extern PNG_EXPORT(int,png_mmx_support) PNGARG((void));
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+
+/* Strip the prepended error numbers ("#nnn ") from error and warning
+ * messages before passing them to the error or warning handler. */
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
+   png_ptr, png_uint_32 strip_mode));
+#endif
+
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+extern PNG_EXPORT(void,png_set_user_limits) PNGARG((png_structp
+   png_ptr, png_uint_32 user_width_max, png_uint_32 user_height_max));
+extern PNG_EXPORT(png_uint_32,png_get_user_width_max) PNGARG((png_structp
+   png_ptr));
+extern PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_structp
+   png_ptr));
+#endif
+
+
+/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
+
+#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
+/* With these routines we avoid an integer divide, which will be slower on
+ * most machines.  However, it does take more operations than the corresponding
+ * divide method, so it may be slower on a few RISC systems.  There are two
+ * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
+ *
+ * Note that the rounding factors are NOT supposed to be the same!  128 and
+ * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
+ * standard method.
+ *
+ * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
+ */
+
+ /* fg and bg should be in `gamma 1.0' space; alpha is the opacity          */
+
+#  define png_composite(composite, fg, alpha, bg)                            \
+     { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) * (png_uint_16)(alpha) \
+                        +        (png_uint_16)(bg)*(png_uint_16)(255 -       \
+                        (png_uint_16)(alpha)) + (png_uint_16)128);           \
+       (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
+
+#  define png_composite_16(composite, fg, alpha, bg)                         \
+     { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) * (png_uint_32)(alpha) \
+                        + (png_uint_32)(bg)*(png_uint_32)(65535L -           \
+                        (png_uint_32)(alpha)) + (png_uint_32)32768L);        \
+       (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
+
+#else  /* standard method using integer division */
+
+#  define png_composite(composite, fg, alpha, bg)                            \
+     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +    \
+       (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \
+       (png_uint_16)127) / 255)
+
+#  define png_composite_16(composite, fg, alpha, bg)                         \
+     (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
+       (png_uint_32)(bg)*(png_uint_32)(65535L - (png_uint_32)(alpha)) +      \
+       (png_uint_32)32767) / (png_uint_32)65535L)
+
+#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
+
+/* Inline macros to do direct reads of bytes from the input buffer.  These
+ * require that you are using an architecture that uses PNG byte ordering
+ * (MSB first) and supports unaligned data storage.  I think that PowerPC
+ * in big-endian mode and 680x0 are the only ones that will support this.
+ * The x86 line of processors definitely do not.  The png_get_int_32()
+ * routine also assumes we are using two's complement format for negative
+ * values, which is almost certainly true.
+ */
+#if defined(PNG_READ_BIG_ENDIAN_SUPPORTED)
+#  define png_get_uint_32(buf) ( *((png_uint_32p) (buf)))
+#  define png_get_uint_16(buf) ( *((png_uint_16p) (buf)))
+#  define png_get_int_32(buf)  ( *((png_int_32p)  (buf)))
+#else
+extern PNG_EXPORT(png_uint_32,png_get_uint_32) PNGARG((png_bytep buf));
+extern PNG_EXPORT(png_uint_16,png_get_uint_16) PNGARG((png_bytep buf));
+extern PNG_EXPORT(png_int_32,png_get_int_32) PNGARG((png_bytep buf));
+#endif /* !PNG_READ_BIG_ENDIAN_SUPPORTED */
+extern PNG_EXPORT(png_uint_32,png_get_uint_31)
+  PNGARG((png_structp png_ptr, png_bytep buf));
+/* No png_get_int_16 -- may be added if there's a real need for it. */
+
+/* Place a 32-bit number into a buffer in PNG byte order (big-endian).
+ */
+extern PNG_EXPORT(void,png_save_uint_32)
+   PNGARG((png_bytep buf, png_uint_32 i));
+extern PNG_EXPORT(void,png_save_int_32)
+   PNGARG((png_bytep buf, png_int_32 i));
+
+/* Place a 16-bit number into a buffer in PNG byte order.
+ * The parameter is declared unsigned int, not png_uint_16,
+ * just to avoid potential problems on pre-ANSI C compilers.
+ */
+extern PNG_EXPORT(void,png_save_uint_16)
+   PNGARG((png_bytep buf, unsigned int i));
+/* No png_save_int_16 -- may be added if there's a real need for it. */
+
+/* ************************************************************************* */
+
+/* These next functions are used internally in the code.  They generally
+ * shouldn't be used unless you are writing code to add or replace some
+ * functionality in libpng.  More information about most functions can
+ * be found in the files where the functions are located.
+ */
+
+
+/* Various modes of operation, that are visible to applications because
+ * they are used for unknown chunk location.
+ */
+#define PNG_HAVE_IHDR               0x01
+#define PNG_HAVE_PLTE               0x02
+#define PNG_HAVE_IDAT               0x04
+#define PNG_AFTER_IDAT              0x08 /* Have complete zlib datastream */
+#define PNG_HAVE_IEND               0x10
+
+#if defined(PNG_INTERNAL)
+
+/* More modes of operation.  Note that after an init, mode is set to
+ * zero automatically when the structure is created.
+ */
+#define PNG_HAVE_gAMA               0x20
+#define PNG_HAVE_cHRM               0x40
+#define PNG_HAVE_sRGB               0x80
+#define PNG_HAVE_CHUNK_HEADER      0x100
+#define PNG_WROTE_tIME             0x200
+#define PNG_WROTE_INFO_BEFORE_PLTE 0x400
+#define PNG_BACKGROUND_IS_GRAY     0x800
+#define PNG_HAVE_PNG_SIGNATURE    0x1000
+#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
+
+/* flags for the transformations the PNG library does on the image data */
+#define PNG_BGR                0x0001
+#define PNG_INTERLACE          0x0002
+#define PNG_PACK               0x0004
+#define PNG_SHIFT              0x0008
+#define PNG_SWAP_BYTES         0x0010
+#define PNG_INVERT_MONO        0x0020
+#define PNG_DITHER             0x0040
+#define PNG_BACKGROUND         0x0080
+#define PNG_BACKGROUND_EXPAND  0x0100
+                          /*   0x0200 unused */
+#define PNG_16_TO_8            0x0400
+#define PNG_RGBA               0x0800
+#define PNG_EXPAND             0x1000
+#define PNG_GAMMA              0x2000
+#define PNG_GRAY_TO_RGB        0x4000
+#define PNG_FILLER             0x8000L
+#define PNG_PACKSWAP          0x10000L
+#define PNG_SWAP_ALPHA        0x20000L
+#define PNG_STRIP_ALPHA       0x40000L
+#define PNG_INVERT_ALPHA      0x80000L
+#define PNG_USER_TRANSFORM   0x100000L
+#define PNG_RGB_TO_GRAY_ERR  0x200000L
+#define PNG_RGB_TO_GRAY_WARN 0x400000L
+#define PNG_RGB_TO_GRAY      0x600000L  /* two bits, RGB_TO_GRAY_ERR|WARN */
+                       /*    0x800000L     Unused */
+#define PNG_ADD_ALPHA       0x1000000L  /* Added to libpng-1.2.7 */
+#define PNG_EXPAND_tRNS     0x2000000L  /* Added to libpng-1.2.9 */
+                       /*   0x4000000L  unused */
+                       /*   0x8000000L  unused */
+                       /*  0x10000000L  unused */
+                       /*  0x20000000L  unused */
+                       /*  0x40000000L  unused */
+
+/* flags for png_create_struct */
+#define PNG_STRUCT_PNG   0x0001
+#define PNG_STRUCT_INFO  0x0002
+
+/* Scaling factor for filter heuristic weighting calculations */
+#define PNG_WEIGHT_SHIFT 8
+#define PNG_WEIGHT_FACTOR (1<<(PNG_WEIGHT_SHIFT))
+#define PNG_COST_SHIFT 3
+#define PNG_COST_FACTOR (1<<(PNG_COST_SHIFT))
+
+/* flags for the png_ptr->flags rather than declaring a byte for each one */
+#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY     0x0001
+#define PNG_FLAG_ZLIB_CUSTOM_LEVEL        0x0002
+#define PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL    0x0004
+#define PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS  0x0008
+#define PNG_FLAG_ZLIB_CUSTOM_METHOD       0x0010
+#define PNG_FLAG_ZLIB_FINISHED            0x0020
+#define PNG_FLAG_ROW_INIT                 0x0040
+#define PNG_FLAG_FILLER_AFTER             0x0080
+#define PNG_FLAG_CRC_ANCILLARY_USE        0x0100
+#define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200
+#define PNG_FLAG_CRC_CRITICAL_USE         0x0400
+#define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800
+#define PNG_FLAG_FREE_PLTE                0x1000
+#define PNG_FLAG_FREE_TRNS                0x2000
+#define PNG_FLAG_FREE_HIST                0x4000
+#define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000L
+#define PNG_FLAG_KEEP_UNSAFE_CHUNKS       0x10000L
+#define PNG_FLAG_LIBRARY_MISMATCH         0x20000L
+#define PNG_FLAG_STRIP_ERROR_NUMBERS      0x40000L
+#define PNG_FLAG_STRIP_ERROR_TEXT         0x80000L
+#define PNG_FLAG_MALLOC_NULL_MEM_OK       0x100000L
+#define PNG_FLAG_ADD_ALPHA                0x200000L  /* Added to libpng-1.2.8 */
+#define PNG_FLAG_STRIP_ALPHA              0x400000L  /* Added to libpng-1.2.8 */
+                                  /*      0x800000L  unused */
+                                  /*     0x1000000L  unused */
+                                  /*     0x2000000L  unused */
+                                  /*     0x4000000L  unused */
+                                  /*     0x8000000L  unused */
+                                  /*    0x10000000L  unused */
+                                  /*    0x20000000L  unused */
+                                  /*    0x40000000L  unused */
+
+#define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
+                                     PNG_FLAG_CRC_ANCILLARY_NOWARN)
+
+#define PNG_FLAG_CRC_CRITICAL_MASK  (PNG_FLAG_CRC_CRITICAL_USE | \
+                                     PNG_FLAG_CRC_CRITICAL_IGNORE)
+
+#define PNG_FLAG_CRC_MASK           (PNG_FLAG_CRC_ANCILLARY_MASK | \
+                                     PNG_FLAG_CRC_CRITICAL_MASK)
+
+/* save typing and make code easier to understand */
+
+#define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \
+   abs((int)((c1).green) - (int)((c2).green)) + \
+   abs((int)((c1).blue) - (int)((c2).blue)))
+
+/* Added to libpng-1.2.6 JB */
+#define PNG_ROWBYTES(pixel_bits, width) \
+    ((pixel_bits) >= 8 ? \
+    ((width) * (((png_uint_32)(pixel_bits)) >> 3)) : \
+    (( ((width) * ((png_uint_32)(pixel_bits))) + 7) >> 3) )
+
+/* PNG_OUT_OF_RANGE returns true if value is outside the range
+   ideal-delta..ideal+delta.  Each argument is evaluated twice.
+   "ideal" and "delta" should be constants, normally simple
+   integers, "value" a variable. Added to libpng-1.2.6 JB */
+#define PNG_OUT_OF_RANGE(value, ideal, delta) \
+        ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta) )
+
+/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
+#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
+/* place to hold the signature string for a PNG file. */
+#ifdef PNG_USE_GLOBAL_ARRAYS
+   PNG_EXPORT_VAR (PNG_CONST png_byte FARDATA) png_sig[8];
+#else
+#endif
+#endif /* PNG_NO_EXTERN */
+
+/* Constant strings for known chunk types.  If you need to add a chunk,
+ * define the name here, and add an invocation of the macro in png.c and
+ * wherever it's needed.
+ */
+#define PNG_IHDR png_byte png_IHDR[5] = { 73,  72,  68,  82, '\0'}
+#define PNG_IDAT png_byte png_IDAT[5] = { 73,  68,  65,  84, '\0'}
+#define PNG_IEND png_byte png_IEND[5] = { 73,  69,  78,  68, '\0'}
+#define PNG_PLTE png_byte png_PLTE[5] = { 80,  76,  84,  69, '\0'}
+#define PNG_bKGD png_byte png_bKGD[5] = { 98,  75,  71,  68, '\0'}
+#define PNG_cHRM png_byte png_cHRM[5] = { 99,  72,  82,  77, '\0'}
+#define PNG_gAMA png_byte png_gAMA[5] = {103,  65,  77,  65, '\0'}
+#define PNG_hIST png_byte png_hIST[5] = {104,  73,  83,  84, '\0'}
+#define PNG_iCCP png_byte png_iCCP[5] = {105,  67,  67,  80, '\0'}
+#define PNG_iTXt png_byte png_iTXt[5] = {105,  84,  88, 116, '\0'}
+#define PNG_oFFs png_byte png_oFFs[5] = {111,  70,  70, 115, '\0'}
+#define PNG_pCAL png_byte png_pCAL[5] = {112,  67,  65,  76, '\0'}
+#define PNG_sCAL png_byte png_sCAL[5] = {115,  67,  65,  76, '\0'}
+#define PNG_pHYs png_byte png_pHYs[5] = {112,  72,  89, 115, '\0'}
+#define PNG_sBIT png_byte png_sBIT[5] = {115,  66,  73,  84, '\0'}
+#define PNG_sPLT png_byte png_sPLT[5] = {115,  80,  76,  84, '\0'}
+#define PNG_sRGB png_byte png_sRGB[5] = {115,  82,  71,  66, '\0'}
+#define PNG_tEXt png_byte png_tEXt[5] = {116,  69,  88, 116, '\0'}
+#define PNG_tIME png_byte png_tIME[5] = {116,  73,  77,  69, '\0'}
+#define PNG_tRNS png_byte png_tRNS[5] = {116,  82,  78,  83, '\0'}
+#define PNG_zTXt png_byte png_zTXt[5] = {122,  84,  88, 116, '\0'}
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_IDAT[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_IEND[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_PLTE[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_bKGD[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_cHRM[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_gAMA[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_hIST[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_iCCP[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_iTXt[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_oFFs[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_pCAL[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sCAL[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_pHYs[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sBIT[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sPLT[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_sRGB[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_tEXt[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_tIME[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_tRNS[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_zTXt[5];
+#endif /* PNG_USE_GLOBAL_ARRAYS */
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Initialize png_ptr struct for reading, and allocate any other memory.
+ * (old interface - DEPRECATED - use png_create_read_struct instead).
+ */
+extern PNG_EXPORT(void,png_read_init) PNGARG((png_structp png_ptr));
+#undef png_read_init
+#define png_read_init(png_ptr) png_read_init_3(&png_ptr, \
+    PNG_LIBPNG_VER_STRING,  png_sizeof(png_struct));
+#endif
+
+extern PNG_EXPORT(void,png_read_init_3) PNGARG((png_structpp ptr_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size));
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+extern PNG_EXPORT(void,png_read_init_2) PNGARG((png_structp png_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size, png_size_t
+    png_info_size));
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Initialize png_ptr struct for writing, and allocate any other memory.
+ * (old interface - DEPRECATED - use png_create_write_struct instead).
+ */
+extern PNG_EXPORT(void,png_write_init) PNGARG((png_structp png_ptr));
+#undef png_write_init
+#define png_write_init(png_ptr) png_write_init_3(&png_ptr, \
+    PNG_LIBPNG_VER_STRING, png_sizeof(png_struct));
+#endif
+
+extern PNG_EXPORT(void,png_write_init_3) PNGARG((png_structpp ptr_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size));
+extern PNG_EXPORT(void,png_write_init_2) PNGARG((png_structp png_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size, png_size_t
+    png_info_size));
+
+/* Allocate memory for an internal libpng struct */
+PNG_EXTERN png_voidp png_create_struct PNGARG((int type));
+
+/* Free memory from internal libpng struct */
+PNG_EXTERN void png_destroy_struct PNGARG((png_voidp struct_ptr));
+
+PNG_EXTERN png_voidp png_create_struct_2 PNGARG((int type, png_malloc_ptr
+  malloc_fn, png_voidp mem_ptr));
+PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
+   png_free_ptr free_fn, png_voidp mem_ptr));
+
+/* Free any memory that info_ptr points to and reset struct. */
+PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_1_0_X
+/* Function to allocate memory for zlib. */
+PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items, uInt size));
+
+/* Function to free memory for zlib */
+PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr));
+
+#ifdef PNG_SIZE_T
+/* Function to convert a sizeof an item to png_sizeof item */
+   PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
+#endif
+
+/* Next four functions are used internally as callbacks.  PNGAPI is required
+ * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3. */
+
+PNG_EXTERN void PNGAPI png_default_read_data PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void PNGAPI png_push_fill_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t length));
+#endif
+
+PNG_EXTERN void PNGAPI png_default_write_data PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length));
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+#if !defined(PNG_NO_STDIO)
+PNG_EXTERN void PNGAPI png_default_flush PNGARG((png_structp png_ptr));
+#endif
+#endif
+#else /* PNG_1_0_X */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_fill_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t length));
+#endif
+#endif /* PNG_1_0_X */
+
+/* Reset the CRC variable */
+PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
+
+/* Write the "data" buffer to whatever output you are using. */
+PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length));
+
+/* Read data from whatever input you are using into the "data" buffer */
+PNG_EXTERN void png_read_data PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length));
+
+/* Read bytes into buf, and update png_ptr->crc */
+PNG_EXTERN void png_crc_read PNGARG((png_structp png_ptr, png_bytep buf,
+   png_size_t length));
+
+/* Decompress data in a chunk that uses compression */
+#if defined(PNG_zTXt_SUPPORTED) || defined(PNG_iTXt_SUPPORTED) || \
+    defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)
+PNG_EXTERN void png_decompress_chunk PNGARG((png_structp png_ptr,
+   int comp_type, png_size_t chunklength,
+   png_size_t prefix_length, png_size_t *data_length));
+#endif
+
+/* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
+PNG_EXTERN int png_crc_finish PNGARG((png_structp png_ptr, png_uint_32 skip));
+
+/* Read the CRC from the file and compare it to the libpng calculated CRC */
+PNG_EXTERN int png_crc_error PNGARG((png_structp png_ptr));
+
+/* Calculate the CRC over a section of data.  Note that we are only
+ * passing a maximum of 64K on systems that have this as a memory limit,
+ * since this is the maximum buffer size we can specify.
+ */
+PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr, png_bytep ptr,
+   png_size_t length));
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));
+#endif
+
+/* simple function to write the signature */
+PNG_EXTERN void png_write_sig PNGARG((png_structp png_ptr));
+
+/* write various chunks */
+
+/* Write the IHDR chunk, and update the png_struct with the necessary
+ * information.
+ */
+PNG_EXTERN void png_write_IHDR PNGARG((png_structp png_ptr, png_uint_32 width,
+   png_uint_32 height,
+   int bit_depth, int color_type, int compression_method, int filter_method,
+   int interlace_method));
+
+PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr, png_colorp palette,
+   png_uint_32 num_pal));
+
+PNG_EXTERN void png_write_IDAT PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length));
+
+PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr));
+
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr, png_fixed_point
+    file_gamma));
+#endif
+#endif
+
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr, png_color_8p sbit,
+   int color_type));
+#endif
+
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,
+   double white_x, double white_y,
+   double red_x, double red_y, double green_x, double green_y,
+   double blue_x, double blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,
+   png_fixed_point int_white_x, png_fixed_point int_white_y,
+   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
+   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
+   png_fixed_point int_blue_y));
+#endif
+#endif
+
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
+   int intent));
+#endif
+
+#if defined(PNG_WRITE_iCCP_SUPPORTED)
+PNG_EXTERN void png_write_iCCP PNGARG((png_structp png_ptr,
+   png_charp name, int compression_type,
+   png_charp profile, int proflen));
+   /* Note to maintainer: profile should be png_bytep */
+#endif
+
+#if defined(PNG_WRITE_sPLT_SUPPORTED)
+PNG_EXTERN void png_write_sPLT PNGARG((png_structp png_ptr,
+   png_sPLT_tp palette));
+#endif
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr, png_bytep trans,
+   png_color_16p values, int number, int color_type));
+#endif
+
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+PNG_EXTERN void png_write_bKGD PNGARG((png_structp png_ptr,
+   png_color_16p values, int color_type));
+#endif
+
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr, png_uint_16p hist,
+   int num_hist));
+#endif
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
+    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+PNG_EXTERN png_size_t png_check_keyword PNGARG((png_structp png_ptr,
+   png_charp key, png_charpp new_key));
+#endif
+
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_charp key,
+   png_charp text, png_size_t text_len));
+#endif
+
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_charp key,
+   png_charp text, png_size_t text_len, int compression));
+#endif
+
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+PNG_EXTERN void png_write_iTXt PNGARG((png_structp png_ptr,
+   int compression, png_charp key, png_charp lang, png_charp lang_key,
+   png_charp text));
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)  /* Added at version 1.0.14 and 1.2.4 */
+PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp text_ptr, int num_text));
+#endif
+
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+PNG_EXTERN void png_write_oFFs PNGARG((png_structp png_ptr,
+   png_int_32 x_offset, png_int_32 y_offset, int unit_type));
+#endif
+
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+PNG_EXTERN void png_write_pCAL PNGARG((png_structp png_ptr, png_charp purpose,
+   png_int_32 X0, png_int_32 X1, int type, int nparams,
+   png_charp units, png_charpp params));
+#endif
+
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+PNG_EXTERN void png_write_pHYs PNGARG((png_structp png_ptr,
+   png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
+   int unit_type));
+#endif
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+PNG_EXTERN void png_write_tIME PNGARG((png_structp png_ptr,
+   png_timep mod_time));
+#endif
+
+#if defined(PNG_WRITE_sCAL_SUPPORTED)
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
+PNG_EXTERN void png_write_sCAL PNGARG((png_structp png_ptr,
+   int unit, double width, double height));
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_sCAL_s PNGARG((png_structp png_ptr,
+   int unit, png_charp width, png_charp height));
+#endif
+#endif
+#endif
+
+/* Called when finished processing a row of data */
+PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
+
+/* Internal use only.   Called before first row of data */
+PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr));
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr));
+#endif
+
+/* combine a row of data, dealing with alpha, etc. if requested */
+PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
+   int mask));
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+/* expand an interlaced row */
+/* OLD pre-1.0.9 interface:
+PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,
+   png_bytep row, int pass, png_uint_32 transformations));
+ */
+PNG_EXTERN void png_do_read_interlace PNGARG((png_structp png_ptr));
+#endif
+
+/* GRR TO DO (2.0 or whenever):  simplify other internal calling interfaces */
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* grab pixels out of a row for an interlaced pass */
+PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,
+   png_bytep row, int pass));
+#endif
+
+/* unfilter a row */
+PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr,
+   png_row_infop row_info, png_bytep row, png_bytep prev_row, int filter));
+
+/* Choose the best filter to use and filter the row data */
+PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr,
+   png_row_infop row_info));
+
+/* Write out the filtered row. */
+PNG_EXTERN void png_write_filtered_row PNGARG((png_structp png_ptr,
+   png_bytep filtered_row));
+/* finish a row while reading, dealing with interlacing passes, etc. */
+PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));
+
+/* initialize the row buffers, etc. */
+PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr));
+/* optional call to update the users info structure */
+PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+/* these are the functions that do the transformations */
+#if defined(PNG_READ_FILLER_SUPPORTED)
+PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 filler, png_uint_32 flags));
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_read_swap_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_write_swap_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_read_invert_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
+    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 flags));
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr, png_row_infop
+   row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+PNG_EXTERN void png_do_gray_to_rgb PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_8p sig_bits));
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+PNG_EXTERN void png_do_dither PNGARG((png_row_infop row_info,
+   png_bytep row, png_bytep palette_lookup, png_bytep dither_lookup));
+
+#  if defined(PNG_CORRECT_PALETTE_SUPPORTED)
+PNG_EXTERN void png_correct_palette PNGARG((png_structp png_ptr,
+   png_colorp palette, int num_palette));
+#  endif
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+PNG_EXTERN void png_do_pack PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 bit_depth));
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_8p bit_depth));
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background,
+   png_color_16p background_1,
+   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
+   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
+   png_uint_16pp gamma_16_to_1, int gamma_shift));
+#else
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background));
+#endif
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info, png_bytep row,
+   png_bytep gamma_table, png_uint_16pp gamma_16_table,
+   int gamma_shift));
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+PNG_EXTERN void png_do_expand_palette PNGARG((png_row_infop row_info,
+   png_bytep row, png_colorp palette, png_bytep trans, int num_trans));
+PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,
+   png_bytep row, png_color_16p trans_value));
+#endif
+
+/* The following decodes the appropriate chunks, and does error correction,
+ * then calls the appropriate callback for the chunk if it is valid.
+ */
+
+/* decode the IHDR chunk */
+PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+PNG_EXTERN void png_handle_IEND PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+
+#if defined(PNG_READ_bKGD_SUPPORTED)
+PNG_EXTERN void png_handle_bKGD PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED)
+PNG_EXTERN void png_handle_cHRM PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_gAMA_SUPPORTED)
+PNG_EXTERN void png_handle_gAMA PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_hIST_SUPPORTED)
+PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_iCCP_SUPPORTED)
+extern void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif /* PNG_READ_iCCP_SUPPORTED */
+
+#if defined(PNG_READ_iTXt_SUPPORTED)
+PNG_EXTERN void png_handle_iTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_oFFs_SUPPORTED)
+PNG_EXTERN void png_handle_oFFs PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+PNG_EXTERN void png_handle_pCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+PNG_EXTERN void png_handle_pHYs PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sBIT_SUPPORTED)
+PNG_EXTERN void png_handle_sBIT PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sCAL_SUPPORTED)
+PNG_EXTERN void png_handle_sCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sPLT_SUPPORTED)
+extern void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif /* PNG_READ_sPLT_SUPPORTED */
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+PNG_EXTERN void png_handle_sRGB PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+PNG_EXTERN void png_handle_tEXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tIME_SUPPORTED)
+PNG_EXTERN void png_handle_tIME PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+PNG_EXTERN void png_handle_tRNS PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+
+PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
+   png_bytep chunk_name));
+
+/* handle the transformations for reading and writing */
+PNG_EXTERN void png_do_read_transformations PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_do_write_transformations PNGARG((png_structp png_ptr));
+
+PNG_EXTERN void png_init_read_transformations PNGARG((png_structp png_ptr));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_read_chunk PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_read_sig PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_crc_skip PNGARG((png_structp png_ptr,
+   png_uint_32 length));
+PNG_EXTERN void png_push_crc_finish PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t buffer_length));
+PNG_EXTERN void png_push_read_IDAT PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_process_IDAT_data PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t buffer_length));
+PNG_EXTERN void png_push_process_row PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_handle_unknown PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_have_info PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_have_end PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_have_row PNGARG((png_structp png_ptr, png_bytep row));
+PNG_EXTERN void png_push_read_end PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_process_some_data PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_read_push_finish_row PNGARG((png_structp png_ptr));
+#if defined(PNG_READ_tEXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_tEXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_tEXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_zTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_zTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_iTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_iTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+PNG_EXTERN void png_do_read_intrapixel PNGARG((png_row_infop row_info,
+   png_bytep row));
+PNG_EXTERN void png_do_write_intrapixel PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#if defined(PNG_MMX_CODE_SUPPORTED)
+/* png.c */ /* PRIVATE */
+PNG_EXTERN void png_init_mmx_flags PNGARG((png_structp png_ptr));
+#endif
+#endif
+
+#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
+PNG_EXTERN png_uint_32 png_get_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN png_uint_32 png_get_x_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN png_uint_32 png_get_y_pixels_per_inch PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN float png_get_x_offset_inches PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+PNG_EXTERN float png_get_y_offset_inches PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#if defined(PNG_pHYs_SUPPORTED)
+PNG_EXTERN png_uint_32 png_get_pHYs_dpi PNGARG((png_structp png_ptr,
+png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+#endif /* PNG_pHYs_SUPPORTED */
+#endif  /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
+
+/* Read the chunk header (length + type name) */
+PNG_EXTERN png_uint_32 png_read_chunk_header PNGARG((png_structp png_ptr));
+
+/* Added at libpng version 1.2.34 */
+#if defined(PNG_cHRM_SUPPORTED)
+PNG_EXTERN int png_check_cHRM_fixed  PNGARG((png_structp png_ptr,
+   png_fixed_point int_white_x, png_fixed_point int_white_y,
+   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
+   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
+   png_fixed_point int_blue_y));
+#endif
+
+/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
+
+#endif /* PNG_INTERNAL */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PNG_VERSION_INFO_ONLY */
+/* do not put anything past this line */
+#endif /* PNG_H */
 
 /* png.h - header file for PNG reference library
  *
diff --git a/src/dep/src/irrlicht/libpng/pngconf.h b/src/dep/src/irrlicht/libpng/pngconf.h
index f1c2767..0c98995 100644
--- a/src/dep/src/irrlicht/libpng/pngconf.h
+++ b/src/dep/src/irrlicht/libpng/pngconf.h
@@ -1,4 +1,1497 @@
 
+/* pngconf.h - machine configurable file for libpng
+ *
+ * libpng version 1.2.35 - February 14, 2009
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+/* Any machine specific code is near the front of this file, so if you
+ * are configuring libpng for a machine, you may want to read the section
+ * starting here down to where it starts to typedef png_color, png_text,
+ * and png_info.
+ */
+
+#ifndef PNGCONF_H
+#define PNGCONF_H
+
+#define PNG_1_2_X
+
+/* 
+ * PNG_USER_CONFIG has to be defined on the compiler command line. This
+ * includes the resource compiler for Windows DLL configurations.
+ */
+#ifdef PNG_USER_CONFIG
+#  ifndef PNG_USER_PRIVATEBUILD
+#    define PNG_USER_PRIVATEBUILD
+#  endif
+#include "pngusr.h"
+#endif
+
+/* PNG_CONFIGURE_LIBPNG is set by the "configure" script. */
+#ifdef PNG_CONFIGURE_LIBPNG
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#endif
+
+/*
+ * Added at libpng-1.2.8
+ *  
+ * If you create a private DLL you need to define in "pngusr.h" the followings:
+ * #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
+ *        the DLL was built>
+ *  e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."
+ * #define PNG_USER_DLLFNAME_POSTFIX <two-letter postfix that serve to
+ *        distinguish your DLL from those of the official release. These
+ *        correspond to the trailing letters that come after the version
+ *        number and must match your private DLL name>
+ *  e.g. // private DLL "libpng13gx.dll"
+ *       #define PNG_USER_DLLFNAME_POSTFIX "gx"
+ * 
+ * The following macros are also at your disposal if you want to complete the 
+ * DLL VERSIONINFO structure.
+ * - PNG_USER_VERSIONINFO_COMMENTS
+ * - PNG_USER_VERSIONINFO_COMPANYNAME
+ * - PNG_USER_VERSIONINFO_LEGALTRADEMARKS
+ */
+
+#ifdef __STDC__
+#ifdef SPECIALBUILD
+#  pragma message("PNG_LIBPNG_SPECIALBUILD (and deprecated SPECIALBUILD)\
+ are now LIBPNG reserved macros. Use PNG_USER_PRIVATEBUILD instead.")
+#endif
+
+#ifdef PRIVATEBUILD
+# pragma message("PRIVATEBUILD is deprecated.\
+ Use PNG_USER_PRIVATEBUILD instead.")
+# define PNG_USER_PRIVATEBUILD PRIVATEBUILD
+#endif
+#endif /* __STDC__ */
+
+#ifndef PNG_VERSION_INFO_ONLY
+
+/* End of material added to libpng-1.2.8 */
+
+/* Added at libpng-1.2.19, removed at libpng-1.2.20 because it caused trouble
+   Restored at libpng-1.2.21 */
+#if !defined(PNG_NO_WARN_UNINITIALIZED_ROW) && \
+    !defined(PNG_WARN_UNINITIALIZED_ROW)
+#  define PNG_WARN_UNINITIALIZED_ROW 1
+#endif
+/* End of material added at libpng-1.2.19/1.2.21 */
+
+/* This is the size of the compression buffer, and thus the size of
+ * an IDAT chunk.  Make this whatever size you feel is best for your
+ * machine.  One of these will be allocated per png_struct.  When this
+ * is full, it writes the data to the disk, and does some other
+ * calculations.  Making this an extremely small size will slow
+ * the library down, but you may want to experiment to determine
+ * where it becomes significant, if you are concerned with memory
+ * usage.  Note that zlib allocates at least 32Kb also.  For readers,
+ * this describes the size of the buffer available to read the data in.
+ * Unless this gets smaller than the size of a row (compressed),
+ * it should not make much difference how big this is.
+ */
+
+#ifndef PNG_ZBUF_SIZE
+#  define PNG_ZBUF_SIZE 8192
+#endif
+
+/* Enable if you want a write-only libpng */
+
+#ifndef PNG_NO_READ_SUPPORTED
+#  define PNG_READ_SUPPORTED
+#endif
+
+/* Enable if you want a read-only libpng */
+
+#ifndef PNG_NO_WRITE_SUPPORTED
+#  define PNG_WRITE_SUPPORTED
+#endif
+
+/* Enabled by default in 1.2.0.  You can disable this if you don't need to
+   support PNGs that are embedded in MNG datastreams */
+#if !defined(PNG_1_0_X) && !defined(PNG_NO_MNG_FEATURES)
+#  ifndef PNG_MNG_FEATURES_SUPPORTED
+#    define PNG_MNG_FEATURES_SUPPORTED
+#  endif
+#endif
+
+#ifndef PNG_NO_FLOATING_POINT_SUPPORTED
+#  ifndef PNG_FLOATING_POINT_SUPPORTED
+#    define PNG_FLOATING_POINT_SUPPORTED
+#  endif
+#endif
+
+/* If you are running on a machine where you cannot allocate more
+ * than 64K of memory at once, uncomment this.  While libpng will not
+ * normally need that much memory in a chunk (unless you load up a very
+ * large file), zlib needs to know how big of a chunk it can use, and
+ * libpng thus makes sure to check any memory allocation to verify it
+ * will fit into memory.
+#define PNG_MAX_MALLOC_64K
+ */
+#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
+#  define PNG_MAX_MALLOC_64K
+#endif
+
+/* Special munging to support doing things the 'cygwin' way:
+ * 'Normal' png-on-win32 defines/defaults:
+ *   PNG_BUILD_DLL -- building dll
+ *   PNG_USE_DLL   -- building an application, linking to dll
+ *   (no define)   -- building static library, or building an
+ *                    application and linking to the static lib
+ * 'Cygwin' defines/defaults:
+ *   PNG_BUILD_DLL -- (ignored) building the dll
+ *   (no define)   -- (ignored) building an application, linking to the dll
+ *   PNG_STATIC    -- (ignored) building the static lib, or building an 
+ *                    application that links to the static lib.
+ *   ALL_STATIC    -- (ignored) building various static libs, or building an 
+ *                    application that links to the static libs.
+ * Thus,
+ * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and
+ * this bit of #ifdefs will define the 'correct' config variables based on
+ * that. If a cygwin user *wants* to define 'PNG_USE_DLL' that's okay, but
+ * unnecessary.
+ *
+ * Also, the precedence order is:
+ *   ALL_STATIC (since we can't #undef something outside our namespace)
+ *   PNG_BUILD_DLL
+ *   PNG_STATIC
+ *   (nothing) == PNG_USE_DLL
+ * 
+ * CYGWIN (2002-01-20): The preceding is now obsolete. With the advent
+ *   of auto-import in binutils, we no longer need to worry about 
+ *   __declspec(dllexport) / __declspec(dllimport) and friends.  Therefore,
+ *   we don't need to worry about PNG_STATIC or ALL_STATIC when it comes
+ *   to __declspec() stuff.  However, we DO need to worry about 
+ *   PNG_BUILD_DLL and PNG_STATIC because those change some defaults
+ *   such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
+ */
+#if defined(__CYGWIN__)
+#  if defined(ALL_STATIC)
+#    if defined(PNG_BUILD_DLL)
+#      undef PNG_BUILD_DLL
+#    endif
+#    if defined(PNG_USE_DLL)
+#      undef PNG_USE_DLL
+#    endif
+#    if defined(PNG_DLL)
+#      undef PNG_DLL
+#    endif
+#    if !defined(PNG_STATIC)
+#      define PNG_STATIC
+#    endif
+#  else
+#    if defined (PNG_BUILD_DLL)
+#      if defined(PNG_STATIC)
+#        undef PNG_STATIC
+#      endif
+#      if defined(PNG_USE_DLL)
+#        undef PNG_USE_DLL
+#      endif
+#      if !defined(PNG_DLL)
+#        define PNG_DLL
+#      endif
+#    else
+#      if defined(PNG_STATIC)
+#        if defined(PNG_USE_DLL)
+#          undef PNG_USE_DLL
+#        endif
+#        if defined(PNG_DLL)
+#          undef PNG_DLL
+#        endif
+#      else
+#        if !defined(PNG_USE_DLL)
+#          define PNG_USE_DLL
+#        endif
+#        if !defined(PNG_DLL)
+#          define PNG_DLL
+#        endif
+#      endif  
+#    endif  
+#  endif
+#endif
+
+/* This protects us against compilers that run on a windowing system
+ * and thus don't have or would rather us not use the stdio types:
+ * stdin, stdout, and stderr.  The only one currently used is stderr
+ * in png_error() and png_warning().  #defining PNG_NO_CONSOLE_IO will
+ * prevent these from being compiled and used. #defining PNG_NO_STDIO
+ * will also prevent these, plus will prevent the entire set of stdio
+ * macros and functions (FILE *, printf, etc.) from being compiled and used,
+ * unless (PNG_DEBUG > 0) has been #defined.
+ *
+ * #define PNG_NO_CONSOLE_IO
+ * #define PNG_NO_STDIO
+ */
+
+#if defined(_WIN32_WCE)
+#  include <windows.h>
+   /* Console I/O functions are not supported on WindowsCE */
+#  define PNG_NO_CONSOLE_IO
+   /* abort() may not be supported on some/all Windows CE platforms */
+#  define PNG_ABORT() exit(-1)
+#  ifdef PNG_DEBUG
+#    undef PNG_DEBUG
+#  endif
+#endif
+
+#ifdef PNG_BUILD_DLL
+#  ifndef PNG_CONSOLE_IO_SUPPORTED
+#    ifndef PNG_NO_CONSOLE_IO
+#      define PNG_NO_CONSOLE_IO
+#    endif
+#  endif
+#endif
+
+#  ifdef PNG_NO_STDIO
+#    ifndef PNG_NO_CONSOLE_IO
+#      define PNG_NO_CONSOLE_IO
+#    endif
+#    ifdef PNG_DEBUG
+#      if (PNG_DEBUG > 0)
+#        include <stdio.h>
+#      endif
+#    endif
+#  else
+#    if !defined(_WIN32_WCE)
+/* "stdio.h" functions are not supported on WindowsCE */
+#      include <stdio.h>
+#    endif
+#  endif
+
+/* This macro protects us against machines that don't have function
+ * prototypes (ie K&R style headers).  If your compiler does not handle
+ * function prototypes, define this macro and use the included ansi2knr.
+ * I've always been able to use _NO_PROTO as the indicator, but you may
+ * need to drag the empty declaration out in front of here, or change the
+ * ifdef to suit your own needs.
+ */
+#ifndef PNGARG
+
+#ifdef OF /* zlib prototype munger */
+#  define PNGARG(arglist) OF(arglist)
+#else
+
+#ifdef _NO_PROTO
+#  define PNGARG(arglist) ()
+#  ifndef PNG_TYPECAST_NULL
+#     define PNG_TYPECAST_NULL
+#  endif
+#else
+#  define PNGARG(arglist) arglist
+#endif /* _NO_PROTO */
+
+
+#endif /* OF */
+
+#endif /* PNGARG */
+
+/* Try to determine if we are compiling on a Mac.  Note that testing for
+ * just __MWERKS__ is not good enough, because the Codewarrior is now used
+ * on non-Mac platforms.
+ */
+#ifndef MACOS
+#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
+      defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
+#    define MACOS
+#  endif
+#endif
+
+/* enough people need this for various reasons to include it here */
+#if !defined(MACOS) && !defined(RISCOS) && !defined(_WIN32_WCE)
+#  include <sys/types.h>
+#endif
+
+#if !defined(PNG_SETJMP_NOT_SUPPORTED) && !defined(PNG_NO_SETJMP_SUPPORTED)
+#  define PNG_SETJMP_SUPPORTED
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* This is an attempt to force a single setjmp behaviour on Linux.  If
+ * the X config stuff didn't define _BSD_SOURCE we wouldn't need this.
+ */
+
+#  ifdef __linux__
+#    ifdef _BSD_SOURCE
+#      define PNG_SAVE_BSD_SOURCE
+#      undef _BSD_SOURCE
+#    endif
+#    ifdef _SETJMP_H
+     /* If you encounter a compiler error here, see the explanation
+      * near the end of INSTALL.
+      */
+         __pngconf.h__ already includes setjmp.h;
+         __dont__ include it again.;
+#    endif
+#  endif /* __linux__ */
+
+   /* include setjmp.h for error handling */
+#  include <setjmp.h>
+
+#  ifdef __linux__
+#    ifdef PNG_SAVE_BSD_SOURCE
+#      ifndef _BSD_SOURCE
+#        define _BSD_SOURCE
+#      endif
+#      undef PNG_SAVE_BSD_SOURCE
+#    endif
+#  endif /* __linux__ */
+#endif /* PNG_SETJMP_SUPPORTED */
+
+#ifdef BSD
+#  include <strings.h>
+#else
+#  include <string.h>
+#endif
+
+/* Other defines for things like memory and the like can go here.  */
+#ifdef PNG_INTERNAL
+
+#include <stdlib.h>
+
+/* The functions exported by PNG_EXTERN are PNG_INTERNAL functions, which
+ * aren't usually used outside the library (as far as I know), so it is
+ * debatable if they should be exported at all.  In the future, when it is
+ * possible to have run-time registry of chunk-handling functions, some of
+ * these will be made available again.
+#define PNG_EXTERN extern
+ */
+#define PNG_EXTERN
+
+/* Other defines specific to compilers can go here.  Try to keep
+ * them inside an appropriate ifdef/endif pair for portability.
+ */
+
+#if defined(PNG_FLOATING_POINT_SUPPORTED)
+#  if defined(MACOS)
+     /* We need to check that <math.h> hasn't already been included earlier
+      * as it seems it doesn't agree with <fp.h>, yet we should really use
+      * <fp.h> if possible.
+      */
+#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
+#      include <fp.h>
+#    endif
+#  else
+#    include <math.h>
+#  endif
+#  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
+     /* Amiga SAS/C: We must include builtin FPU functions when compiling using
+      * MATH=68881
+      */
+#    include <m68881.h>
+#  endif
+#endif
+
+/* Codewarrior on NT has linking problems without this. */
+#if (defined(__MWERKS__) && defined(WIN32)) || defined(__STDC__)
+#  define PNG_ALWAYS_EXTERN
+#endif
+
+/* This provides the non-ANSI (far) memory allocation routines. */
+#if defined(__TURBOC__) && defined(__MSDOS__)
+#  include <mem.h>
+#  include <alloc.h>
+#endif
+
+/* I have no idea why is this necessary... */
+#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
+    defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
+#  include <malloc.h>
+#endif
+
+/* This controls how fine the dithering gets.  As this allocates
+ * a largish chunk of memory (32K), those who are not as concerned
+ * with dithering quality can decrease some or all of these.
+ */
+#ifndef PNG_DITHER_RED_BITS
+#  define PNG_DITHER_RED_BITS 5
+#endif
+#ifndef PNG_DITHER_GREEN_BITS
+#  define PNG_DITHER_GREEN_BITS 5
+#endif
+#ifndef PNG_DITHER_BLUE_BITS
+#  define PNG_DITHER_BLUE_BITS 5
+#endif
+
+/* This controls how fine the gamma correction becomes when you
+ * are only interested in 8 bits anyway.  Increasing this value
+ * results in more memory being used, and more pow() functions
+ * being called to fill in the gamma tables.  Don't set this value
+ * less then 8, and even that may not work (I haven't tested it).
+ */
+
+#ifndef PNG_MAX_GAMMA_8
+#  define PNG_MAX_GAMMA_8 11
+#endif
+
+/* This controls how much a difference in gamma we can tolerate before
+ * we actually start doing gamma conversion.
+ */
+#ifndef PNG_GAMMA_THRESHOLD
+#  define PNG_GAMMA_THRESHOLD 0.05
+#endif
+
+#endif /* PNG_INTERNAL */
+
+/* The following uses const char * instead of char * for error
+ * and warning message functions, so some compilers won't complain.
+ * If you do not want to use const, define PNG_NO_CONST here.
+ */
+
+#ifndef PNG_NO_CONST
+#  define PNG_CONST const
+#else
+#  define PNG_CONST
+#endif
+
+/* The following defines give you the ability to remove code from the
+ * library that you will not be using.  I wish I could figure out how to
+ * automate this, but I can't do that without making it seriously hard
+ * on the users.  So if you are not using an ability, change the #define
+ * to and #undef, and that part of the library will not be compiled.  If
+ * your linker can't find a function, you may want to make sure the
+ * ability is defined here.  Some of these depend upon some others being
+ * defined.  I haven't figured out all the interactions here, so you may
+ * have to experiment awhile to get everything to compile.  If you are
+ * creating or using a shared library, you probably shouldn't touch this,
+ * as it will affect the size of the structures, and this will cause bad
+ * things to happen if the library and/or application ever change.
+ */
+
+/* Any features you will not be using can be undef'ed here */
+
+/* GR-P, 0.96a: Set "*TRANSFORMS_SUPPORTED as default but allow user
+ * to turn it off with "*TRANSFORMS_NOT_SUPPORTED" or *PNG_NO_*_TRANSFORMS
+ * on the compile line, then pick and choose which ones to define without
+ * having to edit this file. It is safe to use the *TRANSFORMS_NOT_SUPPORTED
+ * if you only want to have a png-compliant reader/writer but don't need
+ * any of the extra transformations.  This saves about 80 kbytes in a
+ * typical installation of the library. (PNG_NO_* form added in version
+ * 1.0.1c, for consistency)
+ */
+
+/* The size of the png_text structure changed in libpng-1.0.6 when
+ * iTXt support was added.  iTXt support was turned off by default through
+ * libpng-1.2.x, to support old apps that malloc the png_text structure
+ * instead of calling png_set_text() and letting libpng malloc it.  It
+ * was turned on by default in libpng-1.3.0.
+ */
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#  ifndef PNG_NO_iTXt_SUPPORTED
+#    define PNG_NO_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_iTXt
+#    define PNG_NO_READ_iTXt
+#  endif
+#  ifndef PNG_NO_WRITE_iTXt
+#    define PNG_NO_WRITE_iTXt
+#  endif
+#endif
+
+#if !defined(PNG_NO_iTXt_SUPPORTED)
+#  if !defined(PNG_READ_iTXt_SUPPORTED) && !defined(PNG_NO_READ_iTXt)
+#    define PNG_READ_iTXt
+#  endif
+#  if !defined(PNG_WRITE_iTXt_SUPPORTED) && !defined(PNG_NO_WRITE_iTXt)
+#    define PNG_WRITE_iTXt
+#  endif
+#endif
+
+/* The following support, added after version 1.0.0, can be turned off here en
+ * masse by defining PNG_LEGACY_SUPPORTED in case you need binary compatibility
+ * with old applications that require the length of png_struct and png_info
+ * to remain unchanged.
+ */
+
+#ifdef PNG_LEGACY_SUPPORTED
+#  define PNG_NO_FREE_ME
+#  define PNG_NO_READ_UNKNOWN_CHUNKS
+#  define PNG_NO_WRITE_UNKNOWN_CHUNKS
+#  define PNG_NO_READ_USER_CHUNKS
+#  define PNG_NO_READ_iCCP
+#  define PNG_NO_WRITE_iCCP
+#  define PNG_NO_READ_iTXt
+#  define PNG_NO_WRITE_iTXt
+#  define PNG_NO_READ_sCAL
+#  define PNG_NO_WRITE_sCAL
+#  define PNG_NO_READ_sPLT
+#  define PNG_NO_WRITE_sPLT
+#  define PNG_NO_INFO_IMAGE
+#  define PNG_NO_READ_RGB_TO_GRAY
+#  define PNG_NO_READ_USER_TRANSFORM
+#  define PNG_NO_WRITE_USER_TRANSFORM
+#  define PNG_NO_USER_MEM
+#  define PNG_NO_READ_EMPTY_PLTE
+#  define PNG_NO_MNG_FEATURES
+#  define PNG_NO_FIXED_POINT_SUPPORTED
+#endif
+
+/* Ignore attempt to turn off both floating and fixed point support */
+#if !defined(PNG_FLOATING_POINT_SUPPORTED) || \
+    !defined(PNG_NO_FIXED_POINT_SUPPORTED)
+#  define PNG_FIXED_POINT_SUPPORTED
+#endif
+
+#ifndef PNG_NO_FREE_ME
+#  define PNG_FREE_ME_SUPPORTED
+#endif
+
+#if defined(PNG_READ_SUPPORTED)
+
+#if !defined(PNG_READ_TRANSFORMS_NOT_SUPPORTED) && \
+      !defined(PNG_NO_READ_TRANSFORMS)
+#  define PNG_READ_TRANSFORMS_SUPPORTED
+#endif
+
+#ifdef PNG_READ_TRANSFORMS_SUPPORTED
+#  ifndef PNG_NO_READ_EXPAND
+#    define PNG_READ_EXPAND_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SHIFT
+#    define PNG_READ_SHIFT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_PACK
+#    define PNG_READ_PACK_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_BGR
+#    define PNG_READ_BGR_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SWAP
+#    define PNG_READ_SWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_PACKSWAP
+#    define PNG_READ_PACKSWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_INVERT
+#    define PNG_READ_INVERT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_DITHER
+#    define PNG_READ_DITHER_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_BACKGROUND
+#    define PNG_READ_BACKGROUND_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_16_TO_8
+#    define PNG_READ_16_TO_8_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_FILLER
+#    define PNG_READ_FILLER_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_GAMMA
+#    define PNG_READ_GAMMA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_GRAY_TO_RGB
+#    define PNG_READ_GRAY_TO_RGB_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SWAP_ALPHA
+#    define PNG_READ_SWAP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_INVERT_ALPHA
+#    define PNG_READ_INVERT_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_STRIP_ALPHA
+#    define PNG_READ_STRIP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_USER_TRANSFORM
+#    define PNG_READ_USER_TRANSFORM_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_RGB_TO_GRAY
+#    define PNG_READ_RGB_TO_GRAY_SUPPORTED
+#  endif
+#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
+
+#if !defined(PNG_NO_PROGRESSIVE_READ) && \
+ !defined(PNG_PROGRESSIVE_READ_SUPPORTED) /* if you don't do progressive   */
+#  define PNG_PROGRESSIVE_READ_SUPPORTED  /* reading.  This is not talking */
+#endif                            /* about interlacing capability!  You'll */
+           /* still have interlacing unless you change the following line: */
+
+#define PNG_READ_INTERLACING_SUPPORTED /* required in PNG-compliant decoders */
+
+#ifndef PNG_NO_READ_COMPOSITE_NODIV
+#  ifndef PNG_NO_READ_COMPOSITED_NODIV  /* libpng-1.0.x misspelling */
+#    define PNG_READ_COMPOSITE_NODIV_SUPPORTED  /* well tested on Intel, SGI */
+#  endif
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Deprecated, will be removed from version 2.0.0.
+   Use PNG_MNG_FEATURES_SUPPORTED instead. */
+#ifndef PNG_NO_READ_EMPTY_PLTE
+#  define PNG_READ_EMPTY_PLTE_SUPPORTED
+#endif
+#endif
+
+#endif /* PNG_READ_SUPPORTED */
+
+#if defined(PNG_WRITE_SUPPORTED)
+
+# if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_WRITE_TRANSFORMS)
+#  define PNG_WRITE_TRANSFORMS_SUPPORTED
+#endif
+
+#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
+#  ifndef PNG_NO_WRITE_SHIFT
+#    define PNG_WRITE_SHIFT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_PACK
+#    define PNG_WRITE_PACK_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_BGR
+#    define PNG_WRITE_BGR_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_SWAP
+#    define PNG_WRITE_SWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_PACKSWAP
+#    define PNG_WRITE_PACKSWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_INVERT
+#    define PNG_WRITE_INVERT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_FILLER
+#    define PNG_WRITE_FILLER_SUPPORTED   /* same as WRITE_STRIP_ALPHA */
+#  endif
+#  ifndef PNG_NO_WRITE_SWAP_ALPHA
+#    define PNG_WRITE_SWAP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_INVERT_ALPHA
+#    define PNG_WRITE_INVERT_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_USER_TRANSFORM
+#    define PNG_WRITE_USER_TRANSFORM_SUPPORTED
+#  endif
+#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
+
+#if !defined(PNG_NO_WRITE_INTERLACING_SUPPORTED) && \
+    !defined(PNG_WRITE_INTERLACING_SUPPORTED)
+#define PNG_WRITE_INTERLACING_SUPPORTED  /* not required for PNG-compliant
+                                            encoders, but can cause trouble
+                                            if left undefined */
+#endif
+
+#if !defined(PNG_NO_WRITE_WEIGHTED_FILTER) && \
+    !defined(PNG_WRITE_WEIGHTED_FILTER) && \
+     defined(PNG_FLOATING_POINT_SUPPORTED)
+#  define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+#endif
+
+#ifndef PNG_NO_WRITE_FLUSH
+#  define PNG_WRITE_FLUSH_SUPPORTED
+#endif
+
+#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+/* Deprecated, see PNG_MNG_FEATURES_SUPPORTED, above */
+#ifndef PNG_NO_WRITE_EMPTY_PLTE
+#  define PNG_WRITE_EMPTY_PLTE_SUPPORTED
+#endif
+#endif
+
+#endif /* PNG_WRITE_SUPPORTED */
+
+#ifndef PNG_1_0_X
+#  ifndef PNG_NO_ERROR_NUMBERS
+#    define PNG_ERROR_NUMBERS_SUPPORTED
+#  endif
+#endif /* PNG_1_0_X */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+#  ifndef PNG_NO_USER_TRANSFORM_PTR
+#    define PNG_USER_TRANSFORM_PTR_SUPPORTED
+#  endif
+#endif
+
+#ifndef PNG_NO_STDIO
+#  define PNG_TIME_RFC1123_SUPPORTED
+#endif
+
+/* This adds extra functions in pngget.c for accessing data from the
+ * info pointer (added in version 0.99)
+ * png_get_image_width()
+ * png_get_image_height()
+ * png_get_bit_depth()
+ * png_get_color_type()
+ * png_get_compression_type()
+ * png_get_filter_type()
+ * png_get_interlace_type()
+ * png_get_pixel_aspect_ratio()
+ * png_get_pixels_per_meter()
+ * png_get_x_offset_pixels()
+ * png_get_y_offset_pixels()
+ * png_get_x_offset_microns()
+ * png_get_y_offset_microns()
+ */
+#if !defined(PNG_NO_EASY_ACCESS) && !defined(PNG_EASY_ACCESS_SUPPORTED)
+#  define PNG_EASY_ACCESS_SUPPORTED
+#endif
+
+/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0 
+ * and removed from version 1.2.20.  The following will be removed
+ * from libpng-1.4.0
+*/
+
+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_OPTIMIZED_CODE)
+#  ifndef PNG_OPTIMIZED_CODE_SUPPORTED
+#    define PNG_OPTIMIZED_CODE_SUPPORTED
+#  endif
+#endif
+
+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
+#  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
+#    define PNG_ASSEMBLER_CODE_SUPPORTED
+#  endif
+
+#  if defined(__GNUC__) && defined(__x86_64__) && (__GNUC__ < 4)
+     /* work around 64-bit gcc compiler bugs in gcc-3.x */
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
+#  endif
+
+#  if defined(__APPLE__)
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
+#  endif
+
+#  if (defined(__MWERKS__) && ((__MWERKS__ < 0x0900) || macintosh))
+#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#      define PNG_NO_MMX_CODE
+#    endif
+#  endif
+
+#  if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#    define PNG_MMX_CODE_SUPPORTED
+#  endif
+
+#endif
+/* end of obsolete code to be removed from libpng-1.4.0 */
+
+#if !defined(PNG_1_0_X)
+#if !defined(PNG_NO_USER_MEM) && !defined(PNG_USER_MEM_SUPPORTED)
+#  define PNG_USER_MEM_SUPPORTED
+#endif
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.2.6 */
+#if !defined(PNG_1_0_X)
+#ifndef PNG_SET_USER_LIMITS_SUPPORTED
+#if !defined(PNG_NO_SET_USER_LIMITS) && !defined(PNG_SET_USER_LIMITS_SUPPORTED)
+#  define PNG_SET_USER_LIMITS_SUPPORTED
+#endif
+#endif
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.0.16 and 1.2.6.  To accept all valid PNGS no matter
+ * how large, set these limits to 0x7fffffffL
+ */
+#ifndef PNG_USER_WIDTH_MAX
+#  define PNG_USER_WIDTH_MAX 1000000L
+#endif
+#ifndef PNG_USER_HEIGHT_MAX
+#  define PNG_USER_HEIGHT_MAX 1000000L
+#endif
+
+
+/* Added at libpng-1.2.34 and 1.4.0 */
+#ifndef PNG_STRING_NEWLINE
+#define PNG_STRING_NEWLINE "\n"
+#endif
+
+/* These are currently experimental features, define them if you want */
+
+/* very little testing */
+/*
+#ifdef PNG_READ_SUPPORTED
+#  ifndef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+#    define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+#  endif
+#endif
+*/
+
+/* This is only for PowerPC big-endian and 680x0 systems */
+/* some testing */
+/*
+#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
+#  define PNG_READ_BIG_ENDIAN_SUPPORTED
+#endif
+*/
+
+/* Buggy compilers (e.g., gcc 2.7.2.2) need this */
+/*
+#define PNG_NO_POINTER_INDEXING
+*/
+
+/* These functions are turned off by default, as they will be phased out. */
+/*
+#define  PNG_USELESS_TESTS_SUPPORTED
+#define  PNG_CORRECT_PALETTE_SUPPORTED
+*/
+
+/* Any chunks you are not interested in, you can undef here.  The
+ * ones that allocate memory may be expecially important (hIST,
+ * tEXt, zTXt, tRNS, pCAL).  Others will just save time and make png_info
+ * a bit smaller.
+ */
+
+#if defined(PNG_READ_SUPPORTED) && \
+    !defined(PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_READ_ANCILLARY_CHUNKS)
+#  define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
+#endif
+
+#if defined(PNG_WRITE_SUPPORTED) && \
+    !defined(PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_WRITE_ANCILLARY_CHUNKS)
+#  define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
+#endif
+
+#ifdef PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
+
+#ifdef PNG_NO_READ_TEXT
+#  define PNG_NO_READ_iTXt
+#  define PNG_NO_READ_tEXt
+#  define PNG_NO_READ_zTXt
+#endif
+#ifndef PNG_NO_READ_bKGD
+#  define PNG_READ_bKGD_SUPPORTED
+#  define PNG_bKGD_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_cHRM
+#  define PNG_READ_cHRM_SUPPORTED
+#  define PNG_cHRM_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_gAMA
+#  define PNG_READ_gAMA_SUPPORTED
+#  define PNG_gAMA_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_hIST
+#  define PNG_READ_hIST_SUPPORTED
+#  define PNG_hIST_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_iCCP
+#  define PNG_READ_iCCP_SUPPORTED
+#  define PNG_iCCP_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_iTXt
+#  ifndef PNG_READ_iTXt_SUPPORTED
+#    define PNG_READ_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_iTXt_SUPPORTED
+#    define PNG_iTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_READ_oFFs
+#  define PNG_READ_oFFs_SUPPORTED
+#  define PNG_oFFs_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_pCAL
+#  define PNG_READ_pCAL_SUPPORTED
+#  define PNG_pCAL_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sCAL
+#  define PNG_READ_sCAL_SUPPORTED
+#  define PNG_sCAL_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_pHYs
+#  define PNG_READ_pHYs_SUPPORTED
+#  define PNG_pHYs_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sBIT
+#  define PNG_READ_sBIT_SUPPORTED
+#  define PNG_sBIT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sPLT
+#  define PNG_READ_sPLT_SUPPORTED
+#  define PNG_sPLT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sRGB
+#  define PNG_READ_sRGB_SUPPORTED
+#  define PNG_sRGB_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tEXt
+#  define PNG_READ_tEXt_SUPPORTED
+#  define PNG_tEXt_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tIME
+#  define PNG_READ_tIME_SUPPORTED
+#  define PNG_tIME_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tRNS
+#  define PNG_READ_tRNS_SUPPORTED
+#  define PNG_tRNS_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_zTXt
+#  define PNG_READ_zTXt_SUPPORTED
+#  define PNG_zTXt_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_UNKNOWN_CHUNKS
+#  define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#    define PNG_UNKNOWN_CHUNKS_SUPPORTED
+#  endif
+#  ifndef PNG_NO_HANDLE_AS_UNKNOWN
+#    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#  endif
+#endif
+#if !defined(PNG_NO_READ_USER_CHUNKS) && \
+     defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+#  define PNG_READ_USER_CHUNKS_SUPPORTED
+#  define PNG_USER_CHUNKS_SUPPORTED
+#  ifdef PNG_NO_READ_UNKNOWN_CHUNKS
+#    undef PNG_NO_READ_UNKNOWN_CHUNKS
+#  endif
+#  ifdef PNG_NO_HANDLE_AS_UNKNOWN
+#    undef PNG_NO_HANDLE_AS_UNKNOWN
+#  endif
+#endif
+#ifndef PNG_NO_READ_OPT_PLTE
+#  define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the */
+#endif                      /* optional PLTE chunk in RGB and RGBA images */
+#if defined(PNG_READ_iTXt_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) || \
+    defined(PNG_READ_zTXt_SUPPORTED)
+#  define PNG_READ_TEXT_SUPPORTED
+#  define PNG_TEXT_SUPPORTED
+#endif
+
+#endif /* PNG_READ_ANCILLARY_CHUNKS_SUPPORTED */
+
+#ifdef PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
+
+#ifdef PNG_NO_WRITE_TEXT
+#  define PNG_NO_WRITE_iTXt
+#  define PNG_NO_WRITE_tEXt
+#  define PNG_NO_WRITE_zTXt
+#endif
+#ifndef PNG_NO_WRITE_bKGD
+#  define PNG_WRITE_bKGD_SUPPORTED
+#  ifndef PNG_bKGD_SUPPORTED
+#    define PNG_bKGD_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_cHRM
+#  define PNG_WRITE_cHRM_SUPPORTED
+#  ifndef PNG_cHRM_SUPPORTED
+#    define PNG_cHRM_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_gAMA
+#  define PNG_WRITE_gAMA_SUPPORTED
+#  ifndef PNG_gAMA_SUPPORTED
+#    define PNG_gAMA_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_hIST
+#  define PNG_WRITE_hIST_SUPPORTED
+#  ifndef PNG_hIST_SUPPORTED
+#    define PNG_hIST_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_iCCP
+#  define PNG_WRITE_iCCP_SUPPORTED
+#  ifndef PNG_iCCP_SUPPORTED
+#    define PNG_iCCP_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_iTXt
+#  ifndef PNG_WRITE_iTXt_SUPPORTED
+#    define PNG_WRITE_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_iTXt_SUPPORTED
+#    define PNG_iTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_oFFs
+#  define PNG_WRITE_oFFs_SUPPORTED
+#  ifndef PNG_oFFs_SUPPORTED
+#    define PNG_oFFs_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_pCAL
+#  define PNG_WRITE_pCAL_SUPPORTED
+#  ifndef PNG_pCAL_SUPPORTED
+#    define PNG_pCAL_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sCAL
+#  define PNG_WRITE_sCAL_SUPPORTED
+#  ifndef PNG_sCAL_SUPPORTED
+#    define PNG_sCAL_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_pHYs
+#  define PNG_WRITE_pHYs_SUPPORTED
+#  ifndef PNG_pHYs_SUPPORTED
+#    define PNG_pHYs_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sBIT
+#  define PNG_WRITE_sBIT_SUPPORTED
+#  ifndef PNG_sBIT_SUPPORTED
+#    define PNG_sBIT_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sPLT
+#  define PNG_WRITE_sPLT_SUPPORTED
+#  ifndef PNG_sPLT_SUPPORTED
+#    define PNG_sPLT_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sRGB
+#  define PNG_WRITE_sRGB_SUPPORTED
+#  ifndef PNG_sRGB_SUPPORTED
+#    define PNG_sRGB_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tEXt
+#  define PNG_WRITE_tEXt_SUPPORTED
+#  ifndef PNG_tEXt_SUPPORTED
+#    define PNG_tEXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tIME
+#  define PNG_WRITE_tIME_SUPPORTED
+#  ifndef PNG_tIME_SUPPORTED
+#    define PNG_tIME_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tRNS
+#  define PNG_WRITE_tRNS_SUPPORTED
+#  ifndef PNG_tRNS_SUPPORTED
+#    define PNG_tRNS_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_zTXt
+#  define PNG_WRITE_zTXt_SUPPORTED
+#  ifndef PNG_zTXt_SUPPORTED
+#    define PNG_zTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS
+#  define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#    define PNG_UNKNOWN_CHUNKS_SUPPORTED
+#  endif
+#  ifndef PNG_NO_HANDLE_AS_UNKNOWN
+#     ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#       define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#     endif
+#  endif
+#endif
+#if defined(PNG_WRITE_iTXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \
+    defined(PNG_WRITE_zTXt_SUPPORTED)
+#  define PNG_WRITE_TEXT_SUPPORTED
+#  ifndef PNG_TEXT_SUPPORTED
+#    define PNG_TEXT_SUPPORTED
+#  endif
+#endif
+
+#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
+
+/* Turn this off to disable png_read_png() and
+ * png_write_png() and leave the row_pointers member
+ * out of the info structure.
+ */
+#ifndef PNG_NO_INFO_IMAGE
+#  define PNG_INFO_IMAGE_SUPPORTED
+#endif
+
+/* need the time information for reading tIME chunks */
+#if defined(PNG_tIME_SUPPORTED)
+#  if !defined(_WIN32_WCE)
+     /* "time.h" functions are not supported on WindowsCE */
+#    include <time.h>
+#  endif
+#endif
+
+/* Some typedefs to get us started.  These should be safe on most of the
+ * common platforms.  The typedefs should be at least as large as the
+ * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
+ * don't have to be exactly that size.  Some compilers dislike passing
+ * unsigned shorts as function parameters, so you may be better off using
+ * unsigned int for png_uint_16.  Likewise, for 64-bit systems, you may
+ * want to have unsigned int for png_uint_32 instead of unsigned long.
+ */
+
+typedef unsigned int png_uint_32;
+typedef int png_int_32;
+typedef unsigned short png_uint_16;
+typedef short png_int_16;
+typedef unsigned char png_byte;
+
+/* This is usually size_t.  It is typedef'ed just in case you need it to
+   change (I'm not sure if you will or not, so I thought I'd be safe) */
+#ifdef PNG_SIZE_T
+   typedef PNG_SIZE_T png_size_t;
+#  define png_sizeof(x) png_convert_size(sizeof(x))
+#else
+   typedef size_t png_size_t;
+#  define png_sizeof(x) sizeof(x)
+#endif
+
+/* The following is needed for medium model support.  It cannot be in the
+ * PNG_INTERNAL section.  Needs modification for other compilers besides
+ * MSC.  Model independent support declares all arrays and pointers to be
+ * large using the far keyword.  The zlib version used must also support
+ * model independent data.  As of version zlib 1.0.4, the necessary changes
+ * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
+ * changes that are needed. (Tim Wegner)
+ */
+
+/* Separate compiler dependencies (problem here is that zlib.h always
+   defines FAR. (SJT) */
+#ifdef __BORLANDC__
+#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
+#    define LDATA 1
+#  else
+#    define LDATA 0
+#  endif
+   /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
+#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
+#    define PNG_MAX_MALLOC_64K
+#    if (LDATA != 1)
+#      ifndef FAR
+#        define FAR __far
+#      endif
+#      define USE_FAR_KEYWORD
+#    endif   /* LDATA != 1 */
+     /* Possibly useful for moving data out of default segment.
+      * Uncomment it if you want. Could also define FARDATA as
+      * const if your compiler supports it. (SJT)
+#    define FARDATA FAR
+      */
+#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
+#endif   /* __BORLANDC__ */
+
+
+/* Suggest testing for specific compiler first before testing for
+ * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
+ * making reliance oncertain keywords suspect. (SJT)
+ */
+
+/* MSC Medium model */
+#if defined(FAR)
+#  if defined(M_I86MM)
+#    define USE_FAR_KEYWORD
+#    define FARDATA FAR
+#    include <dos.h>
+#  endif
+#endif
+
+/* SJT: default case */
+#ifndef FAR
+#  define FAR
+#endif
+
+/* At this point FAR is always defined */
+#ifndef FARDATA
+#  define FARDATA
+#endif
+
+/* Typedef for floating-point numbers that are converted
+   to fixed-point with a multiple of 100,000, e.g., int_gamma */
+typedef png_int_32 png_fixed_point;
+
+/* Add typedefs for pointers */
+typedef void            FAR * png_voidp;
+typedef png_byte        FAR * png_bytep;
+typedef png_uint_32     FAR * png_uint_32p;
+typedef png_int_32      FAR * png_int_32p;
+typedef png_uint_16     FAR * png_uint_16p;
+typedef png_int_16      FAR * png_int_16p;
+typedef PNG_CONST char  FAR * png_const_charp;
+typedef char            FAR * png_charp;
+typedef png_fixed_point FAR * png_fixed_point_p;
+
+#ifndef PNG_NO_STDIO
+#if defined(_WIN32_WCE)
+typedef HANDLE                png_FILE_p;
+#else
+typedef FILE                * png_FILE_p;
+#endif
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+typedef double          FAR * png_doublep;
+#endif
+
+/* Pointers to pointers; i.e. arrays */
+typedef png_byte        FAR * FAR * png_bytepp;
+typedef png_uint_32     FAR * FAR * png_uint_32pp;
+typedef png_int_32      FAR * FAR * png_int_32pp;
+typedef png_uint_16     FAR * FAR * png_uint_16pp;
+typedef png_int_16      FAR * FAR * png_int_16pp;
+typedef PNG_CONST char  FAR * FAR * png_const_charpp;
+typedef char            FAR * FAR * png_charpp;
+typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+typedef double          FAR * FAR * png_doublepp;
+#endif
+
+/* Pointers to pointers to pointers; i.e., pointer to array */
+typedef char            FAR * FAR * FAR * png_charppp;
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* SPC -  Is this stuff deprecated? */
+/* It'll be removed as of libpng-1.3.0 - GR-P */
+/* libpng typedefs for types in zlib. If zlib changes
+ * or another compression library is used, then change these.
+ * Eliminates need to change all the source files.
+ */
+typedef charf *         png_zcharp;
+typedef charf * FAR *   png_zcharpp;
+typedef z_stream FAR *  png_zstreamp;
+#endif /* (PNG_1_0_X) || defined(PNG_1_2_X) */
+
+/*
+ * Define PNG_BUILD_DLL if the module being built is a Windows
+ * LIBPNG DLL.
+ *
+ * Define PNG_USE_DLL if you want to *link* to the Windows LIBPNG DLL.
+ * It is equivalent to Microsoft predefined macro _DLL that is
+ * automatically defined when you compile using the share
+ * version of the CRT (C Run-Time library)
+ *
+ * The cygwin mods make this behavior a little different:
+ * Define PNG_BUILD_DLL if you are building a dll for use with cygwin
+ * Define PNG_STATIC if you are building a static library for use with cygwin,
+ *   -or- if you are building an application that you want to link to the
+ *   static library.
+ * PNG_USE_DLL is defined by default (no user action needed) unless one of
+ *   the other flags is defined.
+ */
+
+#if !defined(PNG_DLL) && (defined(PNG_BUILD_DLL) || defined(PNG_USE_DLL))
+#  define PNG_DLL
+#endif
+/* If CYGWIN, then disallow GLOBAL ARRAYS unless building a static lib.
+ * When building a static lib, default to no GLOBAL ARRAYS, but allow
+ * command-line override
+ */
+#if defined(__CYGWIN__)
+#  if !defined(PNG_STATIC)
+#    if defined(PNG_USE_GLOBAL_ARRAYS)
+#      undef PNG_USE_GLOBAL_ARRAYS
+#    endif
+#    if !defined(PNG_USE_LOCAL_ARRAYS)
+#      define PNG_USE_LOCAL_ARRAYS
+#    endif
+#  else
+#    if defined(PNG_USE_LOCAL_ARRAYS) || defined(PNG_NO_GLOBAL_ARRAYS)
+#      if defined(PNG_USE_GLOBAL_ARRAYS)
+#        undef PNG_USE_GLOBAL_ARRAYS
+#      endif
+#    endif
+#  endif
+#  if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
+#    define PNG_USE_LOCAL_ARRAYS
+#  endif
+#endif
+
+/* Do not use global arrays (helps with building DLL's)
+ * They are no longer used in libpng itself, since version 1.0.5c,
+ * but might be required for some pre-1.0.5c applications.
+ */
+#if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
+#  if defined(PNG_NO_GLOBAL_ARRAYS) || \
+      (defined(__GNUC__) && defined(PNG_DLL)) || defined(_MSC_VER)
+#    define PNG_USE_LOCAL_ARRAYS
+#  else
+#    define PNG_USE_GLOBAL_ARRAYS
+#  endif
+#endif
+
+#if defined(__CYGWIN__)
+#  undef PNGAPI
+#  define PNGAPI __cdecl
+#  undef PNG_IMPEXP
+#  define PNG_IMPEXP
+#endif  
+
+/* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
+ * you may get warnings regarding the linkage of png_zalloc and png_zfree.
+ * Don't ignore those warnings; you must also reset the default calling
+ * convention in your compiler to match your PNGAPI, and you must build
+ * zlib and your applications the same way you build libpng.
+ */
+
+#if defined(__MINGW32__) && !defined(PNG_MODULEDEF)
+#  ifndef PNG_NO_MODULEDEF
+#    define PNG_NO_MODULEDEF
+#  endif
+#endif
+
+#if !defined(PNG_IMPEXP) && defined(PNG_BUILD_DLL) && !defined(PNG_NO_MODULEDEF)
+#  define PNG_IMPEXP
+#endif
+
+#if defined(PNG_DLL) || defined(_DLL) || defined(__DLL__ ) || \
+    (( defined(_Windows) || defined(_WINDOWS) || \
+       defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ))
+
+#  ifndef PNGAPI
+#     if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
+#        define PNGAPI __cdecl
+#     else
+#        define PNGAPI _cdecl
+#     endif
+#  endif
+
+#  if !defined(PNG_IMPEXP) && (!defined(PNG_DLL) || \
+       0 /* WINCOMPILER_WITH_NO_SUPPORT_FOR_DECLIMPEXP */)
+#     define PNG_IMPEXP
+#  endif
+
+#  if !defined(PNG_IMPEXP)
+
+#     define PNG_EXPORT_TYPE1(type,symbol)  PNG_IMPEXP type PNGAPI symbol
+#     define PNG_EXPORT_TYPE2(type,symbol)  type PNG_IMPEXP PNGAPI symbol
+
+      /* Borland/Microsoft */
+#     if defined(_MSC_VER) || defined(__BORLANDC__)
+#        if (_MSC_VER >= 800) || (__BORLANDC__ >= 0x500)
+#           define PNG_EXPORT PNG_EXPORT_TYPE1
+#        else
+#           define PNG_EXPORT PNG_EXPORT_TYPE2
+#           if defined(PNG_BUILD_DLL)
+#              define PNG_IMPEXP __export
+#           else
+#              define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in
+                                                 VC++ */
+#           endif                             /* Exists in Borland C++ for
+                                                 C++ classes (== huge) */
+#        endif
+#     endif
+
+#     if !defined(PNG_IMPEXP)
+#        if defined(PNG_BUILD_DLL)
+#           define PNG_IMPEXP __declspec(dllexport)
+#        else
+#           define PNG_IMPEXP __declspec(dllimport)
+#        endif
+#     endif
+#  endif  /* PNG_IMPEXP */
+#else /* !(DLL || non-cygwin WINDOWS) */
+#   if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
+#      ifndef PNGAPI
+#         define PNGAPI _System
+#      endif
+#   else
+#      if 0 /* ... other platforms, with other meanings */
+#      endif
+#   endif
+#endif
+
+#ifndef PNGAPI
+#  define PNGAPI
+#endif
+#ifndef PNG_IMPEXP
+#  define PNG_IMPEXP
+#endif
+
+#ifdef PNG_BUILDSYMS
+#  ifndef PNG_EXPORT
+#    define PNG_EXPORT(type,symbol) PNG_FUNCTION_EXPORT symbol END
+#  endif
+#  ifdef PNG_USE_GLOBAL_ARRAYS
+#    ifndef PNG_EXPORT_VAR
+#      define PNG_EXPORT_VAR(type) PNG_DATA_EXPORT
+#    endif
+#  endif
+#endif
+
+#ifndef PNG_EXPORT
+#  define PNG_EXPORT(type,symbol) PNG_IMPEXP type PNGAPI symbol
+#endif
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+#  ifndef PNG_EXPORT_VAR
+#    define PNG_EXPORT_VAR(type) extern PNG_IMPEXP type
+#  endif
+#endif
+
+/* User may want to use these so they are not in PNG_INTERNAL. Any library
+ * functions that are passed far data must be model independent.
+ */
+
+#ifndef PNG_ABORT
+	#if !defined(_WIN32_WCE )
+		#define PNG_ABORT() abort()
+	#else
+		#define PNG_ABORT()
+	#endif
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#else
+#  define png_jmpbuf(png_ptr) \
+   (LIBPNG_WAS_COMPILED_WITH__PNG_SETJMP_NOT_SUPPORTED)
+#endif
+
+#if defined(USE_FAR_KEYWORD)  /* memory model independent fns */
+/* use this to make far-to-near assignments */
+#  define CHECK   1
+#  define NOCHECK 0
+#  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
+#  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
+#  define png_snprintf _fsnprintf   /* Added to v 1.2.19 */
+#  define png_strlen  _fstrlen
+#  define png_memcmp  _fmemcmp    /* SJT: added */
+#  define png_memcpy  _fmemcpy
+#  define png_memset  _fmemset
+#else /* use the usual functions */
+#  define CVT_PTR(ptr)         (ptr)
+#  define CVT_PTR_NOCHECK(ptr) (ptr)
+#  ifndef PNG_NO_SNPRINTF
+#    ifdef _MSC_VER
+#      define png_snprintf _snprintf   /* Added to v 1.2.19 */
+#      define png_snprintf2 _snprintf
+#      define png_snprintf6 _snprintf
+#    else
+#      define png_snprintf snprintf   /* Added to v 1.2.19 */
+#      define png_snprintf2 snprintf
+#      define png_snprintf6 snprintf
+#    endif
+#  else
+     /* You don't have or don't want to use snprintf().  Caution: Using
+      * sprintf instead of snprintf exposes your application to accidental
+      * or malevolent buffer overflows.  If you don't have snprintf()
+      * as a general rule you should provide one (you can get one from
+      * Portable OpenSSH). */
+#    define png_snprintf(s1,n,fmt,x1) sprintf(s1,fmt,x1)
+#    define png_snprintf2(s1,n,fmt,x1,x2) sprintf(s1,fmt,x1,x2)
+#    define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \
+        sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)
+#  endif
+#  define png_strlen  strlen
+#  define png_memcmp  memcmp      /* SJT: added */
+#  define png_memcpy  memcpy
+#  define png_memset  memset
+#endif
+/* End of memory model independent support */
+
+/* Just a little check that someone hasn't tried to define something
+ * contradictory.
+ */
+#if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K)
+#  undef PNG_ZBUF_SIZE
+#  define PNG_ZBUF_SIZE 65536L
+#endif
+
+/* Added at libpng-1.2.8 */
+#endif /* PNG_VERSION_INFO_ONLY */
+
+#endif /* PNGCONF_H */
+
 /* pngconf.h - machine configurable file for libpng
  *
  * libpng version 1.2.18 - May 15, 2007
diff --git a/src/dep/src/irrlicht/libpng/pngerror.c b/src/dep/src/irrlicht/libpng/pngerror.c
index ddc96cd..0111872 100644
--- a/src/dep/src/irrlicht/libpng/pngerror.c
+++ b/src/dep/src/irrlicht/libpng/pngerror.c
@@ -1,4 +1,349 @@
 
+/* pngerror.c - stub functions for i/o and memory allocation
+ *
+ * Last changed in libpng 1.2.34 [December 18, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all error handling.  Users who
+ * need special error handling are expected to write replacement functions
+ * and use png_set_error_fn() to use those functions.  See the instructions
+ * at each function.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+static void /* PRIVATE */
+png_default_error PNGARG((png_structp png_ptr,
+  png_const_charp error_message));
+#ifndef PNG_NO_WARNINGS
+static void /* PRIVATE */
+png_default_warning PNGARG((png_structp png_ptr,
+  png_const_charp warning_message));
+#endif /* PNG_NO_WARNINGS */
+
+/* This function is called whenever there is a fatal error.  This function
+ * should not be changed.  If there is a need to handle errors differently,
+ * you should supply a replacement error function and use png_set_error_fn()
+ * to replace the error function at run-time.
+ */
+#ifndef PNG_NO_ERROR_TEXT
+void PNGAPI
+png_error(png_structp png_ptr, png_const_charp error_message)
+{
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   char msg[16];
+   if (png_ptr != NULL)
+   {
+     if (png_ptr->flags&
+       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+     {
+       if (*error_message == '#')
+       {
+         /* Strip "#nnnn " from beginning of error message. */
+           int offset;
+           for (offset = 1; offset<15; offset++)
+              if (error_message[offset] == ' ')
+                  break;
+           if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+           {
+              int i;
+              for (i = 0; i < offset - 1; i++)
+                 msg[i] = error_message[i + 1];
+              msg[i - 1] = '\0';
+              error_message = msg;
+           }
+           else
+              error_message += offset;
+       }
+       else
+       {
+           if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+           {
+              msg[0] = '0';
+              msg[1] = '\0';
+              error_message = msg;
+           }
+       }
+     }
+   }
+#endif
+   if (png_ptr != NULL && png_ptr->error_fn != NULL)
+      (*(png_ptr->error_fn))(png_ptr, error_message);
+
+   /* If the custom handler doesn't exist, or if it returns,
+      use the default handler, which will not return. */
+   png_default_error(png_ptr, error_message);
+}
+#else
+void PNGAPI
+png_err(png_structp png_ptr)
+{
+   if (png_ptr != NULL && png_ptr->error_fn != NULL)
+      (*(png_ptr->error_fn))(png_ptr, '\0');
+
+   /* If the custom handler doesn't exist, or if it returns,
+      use the default handler, which will not return. */
+   png_default_error(png_ptr, '\0');
+}
+#endif /* PNG_NO_ERROR_TEXT */
+
+#ifndef PNG_NO_WARNINGS
+/* This function is called whenever there is a non-fatal error.  This function
+ * should not be changed.  If there is a need to handle warnings differently,
+ * you should supply a replacement warning function and use
+ * png_set_error_fn() to replace the warning function at run-time.
+ */
+void PNGAPI
+png_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+   int offset = 0;
+   if (png_ptr != NULL)
+   {
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (png_ptr->flags&
+     (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+#endif
+     {
+       if (*warning_message == '#')
+       {
+           for (offset = 1; offset < 15; offset++)
+              if (warning_message[offset] == ' ')
+                  break;
+       }
+     }
+   }
+   if (png_ptr != NULL && png_ptr->warning_fn != NULL)
+      (*(png_ptr->warning_fn))(png_ptr, warning_message + offset);
+   else
+      png_default_warning(png_ptr, warning_message + offset);
+}
+#endif /* PNG_NO_WARNINGS */
+
+
+/* These utilities are used internally to build an error message that relates
+ * to the current chunk.  The chunk name comes from png_ptr->chunk_name,
+ * this is used to prefix the message.  The message is limited in length
+ * to 63 bytes, the name characters are output as hex digits wrapped in []
+ * if the character is invalid.
+ */
+#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+static PNG_CONST char png_digit[16] = {
+   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+   'A', 'B', 'C', 'D', 'E', 'F'
+};
+
+#define PNG_MAX_ERROR_TEXT 64
+
+#if !defined(PNG_NO_WARNINGS) || !defined(PNG_NO_ERROR_TEXT)
+static void /* PRIVATE */
+png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
+   error_message)
+{
+   int iout = 0, iin = 0;
+
+   while (iin < 4)
+   {
+      int c = png_ptr->chunk_name[iin++];
+      if (isnonalpha(c))
+      {
+         buffer[iout++] = '[';
+         buffer[iout++] = png_digit[(c & 0xf0) >> 4];
+         buffer[iout++] = png_digit[c & 0x0f];
+         buffer[iout++] = ']';
+      }
+      else
+      {
+         buffer[iout++] = (png_byte)c;
+      }
+   }
+
+   if (error_message == NULL)
+      buffer[iout] = '\0';
+   else
+   {
+      buffer[iout++] = ':';
+      buffer[iout++] = ' ';
+      png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT);
+      buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0';
+   }
+}
+
+#ifdef PNG_READ_SUPPORTED
+void PNGAPI
+png_chunk_error(png_structp png_ptr, png_const_charp error_message)
+{
+   char msg[18+PNG_MAX_ERROR_TEXT];
+   if (png_ptr == NULL)
+     png_error(png_ptr, error_message);
+   else
+   {
+     png_format_buffer(png_ptr, msg, error_message);
+     png_error(png_ptr, msg);
+   }
+}
+#endif /* PNG_READ_SUPPORTED */
+#endif /* !defined(PNG_NO_WARNINGS) || !defined(PNG_NO_ERROR_TEXT) */
+
+#ifndef PNG_NO_WARNINGS
+void PNGAPI
+png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+   char msg[18+PNG_MAX_ERROR_TEXT];
+   if (png_ptr == NULL)
+     png_warning(png_ptr, warning_message);
+   else
+   {
+     png_format_buffer(png_ptr, msg, warning_message);
+     png_warning(png_ptr, msg);
+   }
+}
+#endif /* PNG_NO_WARNINGS */
+
+
+/* This is the default error handling function.  Note that replacements for
+ * this function MUST NOT RETURN, or the program will likely crash.  This
+ * function is used by default, or if the program supplies NULL for the
+ * error function pointer in png_set_error_fn().
+ */
+static void /* PRIVATE */
+png_default_error(png_structp png_ptr, png_const_charp error_message)
+{
+#ifndef PNG_NO_CONSOLE_IO
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (*error_message == '#')
+   {
+     /* Strip "#nnnn " from beginning of warning message. */
+     int offset;
+     char error_number[16];
+     for (offset = 0; offset<15; offset++)
+     {
+         error_number[offset] = error_message[offset + 1];
+         if (error_message[offset] == ' ')
+             break;
+     }
+     if ((offset > 1) && (offset < 15))
+     {
+       error_number[offset - 1] = '\0';
+       fprintf(stderr, "libpng error no. %s: %s\n", error_number,
+          error_message + offset + 1);
+     }
+     else
+       fprintf(stderr, "libpng error: %s, offset=%d\n", error_message, offset);
+   }
+   else
+#endif
+   fprintf(stderr, "libpng error: %s\n", error_message);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   if (png_ptr)
+   {
+#  ifdef USE_FAR_KEYWORD
+   {
+      jmp_buf jmpbuf;
+      png_memcpy(jmpbuf, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+      longjmp(jmpbuf, 1);
+   }
+#  else
+   longjmp(png_ptr->jmpbuf, 1);
+#  endif
+   }
+#else
+   PNG_ABORT();
+#endif
+#ifdef PNG_NO_CONSOLE_IO
+   error_message = error_message; /* make compiler happy */
+#endif
+}
+
+#ifndef PNG_NO_WARNINGS
+/* This function is called when there is a warning, but the library thinks
+ * it can continue anyway.  Replacement functions don't have to do anything
+ * here if you don't want them to.  In the default configuration, png_ptr is
+ * not used, but it is passed in case it may be useful.
+ */
+static void /* PRIVATE */
+png_default_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+#ifndef PNG_NO_CONSOLE_IO
+#  ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (*warning_message == '#')
+   {
+     int offset;
+     char warning_number[16];
+     for (offset = 0; offset < 15; offset++)
+     {
+        warning_number[offset] = warning_message[offset + 1];
+        if (warning_message[offset] == ' ')
+            break;
+     }
+     if ((offset > 1) && (offset < 15))
+     {
+       warning_number[offset + 1] = '\0';
+       fprintf(stderr, "libpng warning no. %s: %s\n", warning_number,
+          warning_message + offset);
+     }
+     else
+       fprintf(stderr, "libpng warning: %s\n", warning_message);
+   }
+   else
+#  endif
+     fprintf(stderr, "libpng warning: %s\n", warning_message);
+#else
+   warning_message = warning_message; /* make compiler happy */
+#endif
+   png_ptr = png_ptr; /* make compiler happy */
+}
+#endif /* PNG_NO_WARNINGS */
+
+/* This function is called when the application wants to use another method
+ * of handling errors and warnings.  Note that the error function MUST NOT
+ * return to the calling routine or serious problems will occur.  The return
+ * method used in the default routine calls longjmp(png_ptr->jmpbuf, 1)
+ */
+void PNGAPI
+png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warning_fn)
+{
+   if (png_ptr == NULL)
+      return;
+   png_ptr->error_ptr = error_ptr;
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+}
+
+
+/* This function returns a pointer to the error_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy and png_read_destroy are called.
+ */
+png_voidp PNGAPI
+png_get_error_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL)
+      return NULL;
+   return ((png_voidp)png_ptr->error_ptr);
+}
+
+
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+void PNGAPI
+png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
+{
+   if (png_ptr != NULL)
+   {
+     png_ptr->flags &=
+       ((~(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
+   }
+}
+#endif
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
 /* pngerror.c - stub functions for i/o and memory allocation
  *
  * Last changed in libpng 1.2.13 November 13, 2006
diff --git a/src/dep/src/irrlicht/libpng/pnggccrd.c b/src/dep/src/irrlicht/libpng/pnggccrd.c
index 08ab5e2..f4f9180 100644
--- a/src/dep/src/irrlicht/libpng/pnggccrd.c
+++ b/src/dep/src/irrlicht/libpng/pnggccrd.c
@@ -1,3 +1,106 @@
+/* pnggccrd.c was removed from libpng-1.2.20. */
+
+/* This code snippet is for use by configure's compilation test. */
+
+#if (!defined _MSC_VER) && \
+    defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
+    defined(PNG_MMX_CODE_SUPPORTED)
+
+int PNGAPI png_dummy_mmx_support(void);
+
+static int _mmx_supported = 2; // 0: no MMX; 1: MMX supported; 2: not tested
+
+int PNGAPI
+png_dummy_mmx_support(void) __attribute__((noinline));
+
+int PNGAPI
+png_dummy_mmx_support(void)
+{
+   int result;
+#if defined(PNG_MMX_CODE_SUPPORTED)  // superfluous, but what the heck
+    __asm__ __volatile__ (
+#if defined(__x86_64__)
+        "pushq %%rbx          \n\t"  // rbx gets clobbered by CPUID instruction
+        "pushq %%rcx          \n\t"  // so does rcx...
+        "pushq %%rdx          \n\t"  // ...and rdx (but rcx & rdx safe on Linux)
+        "pushfq               \n\t"  // save Eflag to stack
+        "popq %%rax           \n\t"  // get Eflag from stack into rax
+        "movq %%rax, %%rcx    \n\t"  // make another copy of Eflag in rcx
+        "xorl $0x200000, %%eax \n\t" // toggle ID bit in Eflag (i.e., bit 21)
+        "pushq %%rax          \n\t"  // save modified Eflag back to stack
+        "popfq                \n\t"  // restore modified value to Eflag reg
+        "pushfq               \n\t"  // save Eflag to stack
+        "popq %%rax           \n\t"  // get Eflag from stack
+        "pushq %%rcx          \n\t"  // save original Eflag to stack
+        "popfq                \n\t"  // restore original Eflag
+#else
+        "pushl %%ebx          \n\t"  // ebx gets clobbered by CPUID instruction
+        "pushl %%ecx          \n\t"  // so does ecx...
+        "pushl %%edx          \n\t"  // ...and edx (but ecx & edx safe on Linux)
+        "pushfl               \n\t"  // save Eflag to stack
+        "popl %%eax           \n\t"  // get Eflag from stack into eax
+        "movl %%eax, %%ecx    \n\t"  // make another copy of Eflag in ecx
+        "xorl $0x200000, %%eax \n\t" // toggle ID bit in Eflag (i.e., bit 21)
+        "pushl %%eax          \n\t"  // save modified Eflag back to stack
+        "popfl                \n\t"  // restore modified value to Eflag reg
+        "pushfl               \n\t"  // save Eflag to stack
+        "popl %%eax           \n\t"  // get Eflag from stack
+        "pushl %%ecx          \n\t"  // save original Eflag to stack
+        "popfl                \n\t"  // restore original Eflag
+#endif
+        "xorl %%ecx, %%eax    \n\t"  // compare new Eflag with original Eflag
+        "jz 0f                \n\t"  // if same, CPUID instr. is not supported
+
+        "xorl %%eax, %%eax    \n\t"  // set eax to zero
+//      ".byte  0x0f, 0xa2    \n\t"  // CPUID instruction (two-byte opcode)
+        "cpuid                \n\t"  // get the CPU identification info
+        "cmpl $1, %%eax       \n\t"  // make sure eax return non-zero value
+        "jl 0f                \n\t"  // if eax is zero, MMX is not supported
+
+        "xorl %%eax, %%eax    \n\t"  // set eax to zero and...
+        "incl %%eax           \n\t"  // ...increment eax to 1.  This pair is
+                                     // faster than the instruction "mov eax, 1"
+        "cpuid                \n\t"  // get the CPU identification info again
+        "andl $0x800000, %%edx \n\t" // mask out all bits but MMX bit (23)
+        "cmpl $0, %%edx       \n\t"  // 0 = MMX not supported
+        "jz 0f                \n\t"  // non-zero = yes, MMX IS supported
+
+        "movl $1, %%eax       \n\t"  // set return value to 1
+        "jmp  1f              \n\t"  // DONE:  have MMX support
+
+    "0:                       \n\t"  // .NOT_SUPPORTED: target label for jump instructions
+        "movl $0, %%eax       \n\t"  // set return value to 0
+    "1:                       \n\t"  // .RETURN: target label for jump instructions
+#if defined(__x86_64__)
+        "popq %%rdx           \n\t"  // restore rdx
+        "popq %%rcx           \n\t"  // restore rcx
+        "popq %%rbx           \n\t"  // restore rbx
+#else
+        "popl %%edx           \n\t"  // restore edx
+        "popl %%ecx           \n\t"  // restore ecx
+        "popl %%ebx           \n\t"  // restore ebx
+#endif
+
+//      "ret                  \n\t"  // DONE:  no MMX support
+                                     // (fall through to standard C "ret")
+
+        : "=a" (result)              // output list
+
+        :                            // any variables used on input (none)
+
+                                     // no clobber list
+//      , "%ebx", "%ecx", "%edx"     // GRR:  we handle these manually
+//      , "memory"   // if write to a variable gcc thought was in a reg
+//      , "cc"       // "condition codes" (flag bits)
+    );
+    _mmx_supported = result;
+#else
+    _mmx_supported = 0;
+#endif /* PNG_MMX_CODE_SUPPORTED */
+
+    return _mmx_supported;
+}
+#endif
 
 /* pnggccrd.c - mixed C/assembler version of utilities to read a PNG file
  *
diff --git a/src/dep/src/irrlicht/libpng/pngget.c b/src/dep/src/irrlicht/libpng/pngget.c
index fc41b9b..3fb160b 100644
--- a/src/dep/src/irrlicht/libpng/pngget.c
+++ b/src/dep/src/irrlicht/libpng/pngget.c
@@ -1,4 +1,904 @@
 
+/* pngget.c - retrieval of values from info struct
+ *
+ * Last changed in libpng 1.2.30 [August 15, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+png_uint_32 PNGAPI
+png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->valid & flag);
+   else
+      return(0);
+}
+
+png_uint_32 PNGAPI
+png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->rowbytes);
+   else
+      return(0);
+}
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+png_bytepp PNGAPI
+png_get_rows(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->row_pointers);
+   else
+      return(0);
+}
+#endif
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+/* easy access to info, added in libpng-0.99 */
+png_uint_32 PNGAPI
+png_get_image_width(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->width;
+   }
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_image_height(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->height;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->bit_depth;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_color_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->color_type;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_filter_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->filter_type;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->interlace_type;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_compression_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->compression_type;
+   }
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_x_pixels_per_meter");
+      if (info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
+          return (0);
+      else return (info_ptr->x_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_y_pixels_per_meter");
+      if (info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
+          return (0);
+      else return (info_ptr->y_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");
+      if (info_ptr->phys_unit_type != PNG_RESOLUTION_METER ||
+         info_ptr->x_pixels_per_unit != info_ptr->y_pixels_per_unit)
+          return (0);
+      else return (info_ptr->x_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+float PNGAPI
+png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)
+   {
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");
+      if (info_ptr->x_pixels_per_unit == 0)
+         return ((float)0.0);
+      else
+         return ((float)((float)info_ptr->y_pixels_per_unit
+            /(float)info_ptr->x_pixels_per_unit));
+   }
+#else
+   return (0.0);
+#endif
+   return ((float)0.0);
+}
+#endif
+
+png_int_32 PNGAPI
+png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
+      if (info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
+          return (0);
+      else return (info_ptr->x_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
+      if (info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
+          return (0);
+      else return (info_ptr->y_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
+      if (info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
+          return (0);
+      else return (info_ptr->x_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
+      if (info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
+          return (0);
+      else return (info_ptr->y_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+png_uint_32 PNGAPI
+png_get_x_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_x_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+png_uint_32 PNGAPI
+png_get_y_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_y_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+float PNGAPI
+png_get_x_offset_inches(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((float)png_get_x_offset_microns(png_ptr, info_ptr)
+     *.00003937);
+}
+
+float PNGAPI
+png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((float)png_get_y_offset_microns(png_ptr, info_ptr)
+     *.00003937);
+}
+
+#if defined(PNG_pHYs_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
+{
+   png_uint_32 retval = 0;
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_debug1(1, "in %s retrieval function", "pHYs");
+      if (res_x != NULL)
+      {
+         *res_x = info_ptr->x_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (res_y != NULL)
+      {
+         *res_y = info_ptr->y_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (unit_type != NULL)
+      {
+         *unit_type = (int)info_ptr->phys_unit_type;
+         retval |= PNG_INFO_pHYs;
+         if (*unit_type == 1)
+         {
+            if (res_x != NULL) *res_x = (png_uint_32)(*res_x * .0254 + .50);
+            if (res_y != NULL) *res_y = (png_uint_32)(*res_y * .0254 + .50);
+         }
+      }
+   }
+   return (retval);
+}
+#endif /* PNG_pHYs_SUPPORTED */
+#endif  /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
+
+/* png_get_channels really belongs in here, too, but it's been around longer */
+
+#endif  /* PNG_EASY_ACCESS_SUPPORTED */
+
+png_byte PNGAPI
+png_get_channels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->channels);
+   else
+      return (0);
+}
+
+png_bytep PNGAPI
+png_get_signature(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->signature);
+   else
+      return (NULL);
+}
+
+#if defined(PNG_bKGD_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_bKGD(png_structp png_ptr, png_infop info_ptr,
+   png_color_16p *background)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
+      && background != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "bKGD");
+      *background = &(info_ptr->background);
+      return (PNG_INFO_bKGD);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cHRM(png_structp png_ptr, png_infop info_ptr,
+   double *white_x, double *white_y, double *red_x, double *red_y,
+   double *green_x, double *green_y, double *blue_x, double *blue_y)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+   {
+      png_debug1(1, "in %s retrieval function", "cHRM");
+      if (white_x != NULL)
+         *white_x = (double)info_ptr->x_white;
+      if (white_y != NULL)
+         *white_y = (double)info_ptr->y_white;
+      if (red_x != NULL)
+         *red_x = (double)info_ptr->x_red;
+      if (red_y != NULL)
+         *red_y = (double)info_ptr->y_red;
+      if (green_x != NULL)
+         *green_x = (double)info_ptr->x_green;
+      if (green_y != NULL)
+         *green_y = (double)info_ptr->y_green;
+      if (blue_x != NULL)
+         *blue_x = (double)info_ptr->x_blue;
+      if (blue_y != NULL)
+         *blue_y = (double)info_ptr->y_blue;
+      return (PNG_INFO_cHRM);
+   }
+   return (0);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+   png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
+   png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
+   png_fixed_point *blue_x, png_fixed_point *blue_y)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+   {
+      png_debug1(1, "in %s retrieval function", "cHRM");
+      if (white_x != NULL)
+         *white_x = info_ptr->int_x_white;
+      if (white_y != NULL)
+         *white_y = info_ptr->int_y_white;
+      if (red_x != NULL)
+         *red_x = info_ptr->int_x_red;
+      if (red_y != NULL)
+         *red_y = info_ptr->int_y_red;
+      if (green_x != NULL)
+         *green_x = info_ptr->int_x_green;
+      if (green_y != NULL)
+         *green_y = info_ptr->int_y_green;
+      if (blue_x != NULL)
+         *blue_x = info_ptr->int_x_blue;
+      if (blue_y != NULL)
+         *blue_y = info_ptr->int_y_blue;
+      return (PNG_INFO_cHRM);
+   }
+   return (0);
+}
+#endif
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+      && file_gamma != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "gAMA");
+      *file_gamma = (double)info_ptr->gamma;
+      return (PNG_INFO_gAMA);
+   }
+   return (0);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_gAMA_fixed(png_structp png_ptr, png_infop info_ptr,
+    png_fixed_point *int_file_gamma)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+      && int_file_gamma != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "gAMA");
+      *int_file_gamma = info_ptr->int_gamma;
+      return (PNG_INFO_gAMA);
+   }
+   return (0);
+}
+#endif
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
+      && file_srgb_intent != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "sRGB");
+      *file_srgb_intent = (int)info_ptr->srgb_intent;
+      return (PNG_INFO_sRGB);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_iCCP(png_structp png_ptr, png_infop info_ptr,
+             png_charpp name, int *compression_type,
+             png_charpp profile, png_uint_32 *proflen)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)
+      && name != NULL && profile != NULL && proflen != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "iCCP");
+      *name = info_ptr->iccp_name;
+      *profile = info_ptr->iccp_profile;
+      /* compression_type is a dummy so the API won't have to change
+         if we introduce multiple compression types later. */
+      *proflen = (int)info_ptr->iccp_proflen;
+      *compression_type = (int)info_ptr->iccp_compression;
+      return (PNG_INFO_iCCP);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_sPLT(png_structp png_ptr, png_infop info_ptr,
+             png_sPLT_tpp spalettes)
+{
+   if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
+   {
+     *spalettes = info_ptr->splt_palettes;
+     return ((png_uint_32)info_ptr->splt_palettes_num);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p *hist)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
+      && hist != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "hIST");
+      *hist = info_ptr->hist;
+      return (PNG_INFO_hIST);
+   }
+   return (0);
+}
+#endif
+
+png_uint_32 PNGAPI
+png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *width, png_uint_32 *height, int *bit_depth,
+   int *color_type, int *interlace_type, int *compression_type,
+   int *filter_type)
+
+{
+   if (png_ptr != NULL && info_ptr != NULL && width != NULL && height != NULL &&
+      bit_depth != NULL && color_type != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "IHDR");
+      *width = info_ptr->width;
+      *height = info_ptr->height;
+      *bit_depth = info_ptr->bit_depth;
+      if (info_ptr->bit_depth < 1 || info_ptr->bit_depth > 16)
+        png_error(png_ptr, "Invalid bit depth");
+      *color_type = info_ptr->color_type;
+      if (info_ptr->color_type > 6)
+        png_error(png_ptr, "Invalid color type");
+      if (compression_type != NULL)
+         *compression_type = info_ptr->compression_type;
+      if (filter_type != NULL)
+         *filter_type = info_ptr->filter_type;
+      if (interlace_type != NULL)
+         *interlace_type = info_ptr->interlace_type;
+
+      /* check for potential overflow of rowbytes */
+      if (*width == 0 || *width > PNG_UINT_31_MAX)
+        png_error(png_ptr, "Invalid image width");
+      if (*height == 0 || *height > PNG_UINT_31_MAX)
+        png_error(png_ptr, "Invalid image height");
+      if (info_ptr->width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      {
+         png_warning(png_ptr,
+            "Width too large for libpng to process image data.");
+      }
+      return (1);
+   }
+   return (0);
+}
+
+#if defined(PNG_oFFs_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_oFFs(png_structp png_ptr, png_infop info_ptr,
+   png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
+      && offset_x != NULL && offset_y != NULL && unit_type != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "oFFs");
+      *offset_x = info_ptr->x_offset;
+      *offset_y = info_ptr->y_offset;
+      *unit_type = (int)info_ptr->offset_unit_type;
+      return (PNG_INFO_oFFs);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pCAL(png_structp png_ptr, png_infop info_ptr,
+   png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
+   png_charp *units, png_charpp *params)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)
+      && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
+      nparams != NULL && units != NULL && params != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "pCAL");
+      *purpose = info_ptr->pcal_purpose;
+      *X0 = info_ptr->pcal_X0;
+      *X1 = info_ptr->pcal_X1;
+      *type = (int)info_ptr->pcal_type;
+      *nparams = (int)info_ptr->pcal_nparams;
+      *units = info_ptr->pcal_units;
+      *params = info_ptr->pcal_params;
+      return (PNG_INFO_pCAL);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sCAL(png_structp png_ptr, png_infop info_ptr,
+             int *unit, double *width, double *height)
+{
+    if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_sCAL))
+    {
+        *unit = info_ptr->scal_unit;
+        *width = info_ptr->scal_pixel_width;
+        *height = info_ptr->scal_pixel_height;
+        return (PNG_INFO_sCAL);
+    }
+    return(0);
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+             int *unit, png_charpp width, png_charpp height)
+{
+    if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_sCAL))
+    {
+        *unit = info_ptr->scal_unit;
+        *width = info_ptr->scal_s_width;
+        *height = info_ptr->scal_s_height;
+        return (PNG_INFO_sCAL);
+    }
+    return(0);
+}
+#endif
+#endif
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pHYs(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
+{
+   png_uint_32 retval = 0;
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_debug1(1, "in %s retrieval function", "pHYs");
+      if (res_x != NULL)
+      {
+         *res_x = info_ptr->x_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (res_y != NULL)
+      {
+         *res_y = info_ptr->y_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (unit_type != NULL)
+      {
+         *unit_type = (int)info_ptr->phys_unit_type;
+         retval |= PNG_INFO_pHYs;
+      }
+   }
+   return (retval);
+}
+#endif
+
+png_uint_32 PNGAPI
+png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,
+   int *num_palette)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)
+       && palette != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "PLTE");
+      *palette = info_ptr->palette;
+      *num_palette = info_ptr->num_palette;
+      png_debug1(3, "num_palette = %d", *num_palette);
+      return (PNG_INFO_PLTE);
+   }
+   return (0);
+}
+
+#if defined(PNG_sBIT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)
+      && sig_bit != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "sBIT");
+      *sig_bit = &(info_ptr->sig_bit);
+      return (PNG_INFO_sBIT);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,
+   int *num_text)
+{
+   if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
+   {
+      png_debug1(1, "in %s retrieval function",
+         (png_ptr->chunk_name[0] == '\0' ? "text"
+             : (png_const_charp)png_ptr->chunk_name));
+      if (text_ptr != NULL)
+         *text_ptr = info_ptr->text;
+      if (num_text != NULL)
+         *num_text = info_ptr->num_text;
+      return ((png_uint_32)info_ptr->num_text);
+   }
+   if (num_text != NULL)
+     *num_text = 0;
+   return(0);
+}
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)
+       && mod_time != NULL)
+   {
+      png_debug1(1, "in %s retrieval function", "tIME");
+      *mod_time = &(info_ptr->mod_time);
+      return (PNG_INFO_tIME);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_tRNS(png_structp png_ptr, png_infop info_ptr,
+   png_bytep *trans, int *num_trans, png_color_16p *trans_values)
+{
+   png_uint_32 retval = 0;
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+   {
+      png_debug1(1, "in %s retrieval function", "tRNS");
+      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+          if (trans != NULL)
+          {
+             *trans = info_ptr->trans;
+             retval |= PNG_INFO_tRNS;
+          }
+          if (trans_values != NULL)
+             *trans_values = &(info_ptr->trans_values);
+      }
+      else /* if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) */
+      {
+          if (trans_values != NULL)
+          {
+             *trans_values = &(info_ptr->trans_values);
+             retval |= PNG_INFO_tRNS;
+          }
+          if (trans != NULL)
+             *trans = NULL;
+      }
+      if (num_trans != NULL)
+      {
+         *num_trans = info_ptr->num_trans;
+         retval |= PNG_INFO_tRNS;
+      }
+   }
+   return (retval);
+}
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
+             png_unknown_chunkpp unknowns)
+{
+   if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
+   {
+     *unknowns = info_ptr->unknown_chunks;
+     return ((png_uint_32)info_ptr->unknown_chunks_num);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+png_byte PNGAPI
+png_get_rgb_to_gray_status (png_structp png_ptr)
+{
+   return (png_byte)(png_ptr? png_ptr->rgb_to_gray_status : 0);
+}
+#endif
+
+#if defined(PNG_USER_CHUNKS_SUPPORTED)
+png_voidp PNGAPI
+png_get_user_chunk_ptr(png_structp png_ptr)
+{
+   return (png_ptr? png_ptr->user_chunk_ptr : NULL);
+}
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+png_uint_32 PNGAPI
+png_get_compression_buffer_size(png_structp png_ptr)
+{
+   return (png_uint_32)(png_ptr? png_ptr->zbuf_size : 0L);
+}
+#endif
+
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+#ifndef PNG_1_0_X
+/* this function was added to libpng 1.2.0 and should exist by default */
+png_uint_32 PNGAPI
+png_get_asm_flags (png_structp png_ptr)
+{
+    /* obsolete, to be removed from libpng-1.4.0 */
+    return (png_ptr? 0L: 0L);
+}
+
+/* this function was added to libpng 1.2.0 and should exist by default */
+png_uint_32 PNGAPI
+png_get_asm_flagmask (int flag_select)
+{
+    /* obsolete, to be removed from libpng-1.4.0 */
+    flag_select=flag_select;
+    return 0L;
+}
+
+    /* GRR:  could add this:   && defined(PNG_MMX_CODE_SUPPORTED) */
+/* this function was added to libpng 1.2.0 */
+png_uint_32 PNGAPI
+png_get_mmx_flagmask (int flag_select, int *compilerID)
+{
+    /* obsolete, to be removed from libpng-1.4.0 */
+    flag_select=flag_select;
+    *compilerID = -1;   /* unknown (i.e., no asm/MMX code compiled) */
+    return 0L;
+}
+
+/* this function was added to libpng 1.2.0 */
+png_byte PNGAPI
+png_get_mmx_bitdepth_threshold (png_structp png_ptr)
+{
+    /* obsolete, to be removed from libpng-1.4.0 */
+    return (png_ptr? 0: 0);
+}
+
+/* this function was added to libpng 1.2.0 */
+png_uint_32 PNGAPI
+png_get_mmx_rowbytes_threshold (png_structp png_ptr)
+{
+    /* obsolete, to be removed from libpng-1.4.0 */
+    return (png_ptr? 0L: 0L);
+}
+#endif /* ?PNG_1_0_X */
+#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+/* These functions were added to libpng 1.2.6 */
+png_uint_32 PNGAPI
+png_get_user_width_max (png_structp png_ptr)
+{
+    return (png_ptr? png_ptr->user_width_max : 0);
+}
+png_uint_32 PNGAPI
+png_get_user_height_max (png_structp png_ptr)
+{
+    return (png_ptr? png_ptr->user_height_max : 0);
+}
+#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+ 
+
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
 /* pngget.c - retrieval of values from info struct
  *
  * Last changed in libpng 1.2.15 January 5, 2007
diff --git a/src/dep/src/irrlicht/libpng/pngmem.c b/src/dep/src/irrlicht/libpng/pngmem.c
index 6aa70af..6325ca7 100644
--- a/src/dep/src/irrlicht/libpng/pngmem.c
+++ b/src/dep/src/irrlicht/libpng/pngmem.c
@@ -1,4 +1,613 @@
 
+/* pngmem.c - stub functions for memory allocation
+ *
+ * Last changed in libpng 1.2.30 [August 15, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all memory allocation.  Users who
+ * need special memory handling are expected to supply replacement
+ * functions for png_malloc() and png_free(), and to use
+ * png_create_read_struct_2() and png_create_write_struct_2() to
+ * identify the replacement functions.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+/* Borland DOS special memory handler */
+#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
+/* if you change this, be sure to change the one in png.h also */
+
+/* Allocate memory for a png_struct.  The malloc and memset can be replaced
+   by a single call to calloc() if this is thought to improve performance. */
+png_voidp /* PRIVATE */
+png_create_struct(int type)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
+}
+
+/* Alternate version of png_create_struct, for use with user-defined malloc. */
+png_voidp /* PRIVATE */
+png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_size_t size;
+   png_voidp struct_ptr;
+
+   if (type == PNG_STRUCT_INFO)
+     size = png_sizeof(png_info);
+   else if (type == PNG_STRUCT_PNG)
+     size = png_sizeof(png_struct);
+   else
+     return (png_get_copyright(NULL));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (malloc_fn != NULL)
+   {
+      png_struct dummy_struct;
+      png_structp png_ptr = &dummy_struct;
+      png_ptr->mem_ptr=mem_ptr;
+      struct_ptr = (*(malloc_fn))(png_ptr, (png_uint_32)size);
+   }
+   else
+#endif /* PNG_USER_MEM_SUPPORTED */
+      struct_ptr = (png_voidp)farmalloc(size);
+   if (struct_ptr != NULL)
+      png_memset(struct_ptr, 0, size);
+   return (struct_ptr);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct(png_voidp struct_ptr)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
+    png_voidp mem_ptr)
+{
+#endif
+   if (struct_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      if (free_fn != NULL)
+      {
+         png_struct dummy_struct;
+         png_structp png_ptr = &dummy_struct;
+         png_ptr->mem_ptr=mem_ptr;
+         (*(free_fn))(png_ptr, struct_ptr);
+         return;
+      }
+#endif /* PNG_USER_MEM_SUPPORTED */
+      farfree (struct_ptr);
+   }
+}
+
+/* Allocate memory.  For reasonable files, size should never exceed
+ * 64K.  However, zlib may allocate more then 64K if you don't tell
+ * it not to.  See zconf.h and png.h for more information. zlib does
+ * need to allocate exactly 64K, so whatever you call here must
+ * have the ability to do that.
+ *
+ * Borland seems to have a problem in DOS mode for exactly 64K.
+ * It gives you a segment with an offset of 8 (perhaps to store its
+ * memory stuff).  zlib doesn't like this at all, so we have to
+ * detect and deal with it.  This code should not be needed in
+ * Windows or OS/2 modes, and only in 16 bit mode.  This code has
+ * been updated by Alexander Lehmann for version 0.89 to waste less
+ * memory.
+ *
+ * Note that we can't use png_size_t for the "size" declaration,
+ * since on some systems a png_size_t is a 16-bit quantity, and as a
+ * result, we would be truncating potentially larger memory requests
+ * (which should cause a fatal error) and introducing major problems.
+ */
+
+png_voidp PNGAPI
+png_malloc(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr->malloc_fn != NULL)
+       ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
+   else
+       ret = (png_malloc_default(png_ptr, size));
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+       png_error(png_ptr, "Out of memory!");
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc_default(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (size > (png_uint_32)65536L)
+   {
+      png_warning(png_ptr, "Cannot Allocate > 64K");
+      ret = NULL;
+   }
+   else
+#endif
+
+   if (size != (size_t)size)
+     ret = NULL;
+   else if (size == (png_uint_32)65536L)
+   {
+      if (png_ptr->offset_table == NULL)
+      {
+         /* try to see if we need to do any of this fancy stuff */
+         ret = farmalloc(size);
+         if (ret == NULL || ((png_size_t)ret & 0xffff))
+         {
+            int num_blocks;
+            png_uint_32 total_size;
+            png_bytep table;
+            int i;
+            png_byte huge * hptr;
+
+            if (ret != NULL)
+            {
+               farfree(ret);
+               ret = NULL;
+            }
+
+            if (png_ptr->zlib_window_bits > 14)
+               num_blocks = (int)(1 << (png_ptr->zlib_window_bits - 14));
+            else
+               num_blocks = 1;
+            if (png_ptr->zlib_mem_level >= 7)
+               num_blocks += (int)(1 << (png_ptr->zlib_mem_level - 7));
+            else
+               num_blocks++;
+
+            total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
+
+            table = farmalloc(total_size);
+
+            if (table == NULL)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr, "Out Of Memory."); /* Note "O" and "M" */
+               else
+                  png_warning(png_ptr, "Out Of Memory.");
+#endif
+               return (NULL);
+            }
+
+            if ((png_size_t)table & 0xfff0)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr,
+                    "Farmalloc didn't return normalized pointer");
+               else
+                  png_warning(png_ptr,
+                    "Farmalloc didn't return normalized pointer");
+#endif
+               return (NULL);
+            }
+
+            png_ptr->offset_table = table;
+            png_ptr->offset_table_ptr = farmalloc(num_blocks *
+               png_sizeof(png_bytep));
+
+            if (png_ptr->offset_table_ptr == NULL)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr, "Out Of memory."); /* Note "O" and "M" */
+               else
+                  png_warning(png_ptr, "Out Of memory.");
+#endif
+               return (NULL);
+            }
+
+            hptr = (png_byte huge *)table;
+            if ((png_size_t)hptr & 0xf)
+            {
+               hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
+               hptr = hptr + 16L;  /* "hptr += 16L" fails on Turbo C++ 3.0 */
+            }
+            for (i = 0; i < num_blocks; i++)
+            {
+               png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
+               hptr = hptr + (png_uint_32)65536L;  /* "+=" fails on TC++3.0 */
+            }
+
+            png_ptr->offset_table_number = num_blocks;
+            png_ptr->offset_table_count = 0;
+            png_ptr->offset_table_count_free = 0;
+         }
+      }
+
+      if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
+      {
+#ifndef PNG_USER_MEM_SUPPORTED
+         if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+            png_error(png_ptr, "Out of Memory."); /* Note "o" and "M" */
+         else
+            png_warning(png_ptr, "Out of Memory.");
+#endif
+         return (NULL);
+      }
+
+      ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
+   }
+   else
+      ret = farmalloc(size);
+
+#ifndef PNG_USER_MEM_SUPPORTED
+   if (ret == NULL)
+   {
+      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+         png_error(png_ptr, "Out of memory."); /* Note "o" and "m" */
+      else
+         png_warning(png_ptr, "Out of memory."); /* Note "o" and "m" */
+   }
+#endif
+
+   return (ret);
+}
+
+/* free a pointer allocated by png_malloc().  In the default
+   configuration, png_ptr is not used, but is passed in case it
+   is needed.  If ptr is NULL, return without taking any action. */
+
+void PNGAPI
+png_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr->free_fn != NULL)
+   {
+      (*(png_ptr->free_fn))(png_ptr, ptr);
+      return;
+   }
+   else png_free_default(png_ptr, ptr);
+}
+
+void PNGAPI
+png_free_default(png_structp png_ptr, png_voidp ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if (png_ptr == NULL || ptr == NULL) return;
+
+   if (png_ptr->offset_table != NULL)
+   {
+      int i;
+
+      for (i = 0; i < png_ptr->offset_table_count; i++)
+      {
+         if (ptr == png_ptr->offset_table_ptr[i])
+         {
+            ptr = NULL;
+            png_ptr->offset_table_count_free++;
+            break;
+         }
+      }
+      if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
+      {
+         farfree(png_ptr->offset_table);
+         farfree(png_ptr->offset_table_ptr);
+         png_ptr->offset_table = NULL;
+         png_ptr->offset_table_ptr = NULL;
+      }
+   }
+
+   if (ptr != NULL)
+   {
+      farfree(ptr);
+   }
+}
+
+#else /* Not the Borland DOS special memory handler */
+
+/* Allocate memory for a png_struct or a png_info.  The malloc and
+   memset can be replaced by a single call to calloc() if this is thought
+   to improve performance noticably. */
+png_voidp /* PRIVATE */
+png_create_struct(int type)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
+}
+
+/* Allocate memory for a png_struct or a png_info.  The malloc and
+   memset can be replaced by a single call to calloc() if this is thought
+   to improve performance noticably. */
+png_voidp /* PRIVATE */
+png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_size_t size;
+   png_voidp struct_ptr;
+
+   if (type == PNG_STRUCT_INFO)
+      size = png_sizeof(png_info);
+   else if (type == PNG_STRUCT_PNG)
+      size = png_sizeof(png_struct);
+   else
+      return (NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (malloc_fn != NULL)
+   {
+      png_struct dummy_struct;
+      png_structp png_ptr = &dummy_struct;
+      png_ptr->mem_ptr=mem_ptr;
+      struct_ptr = (*(malloc_fn))(png_ptr, size);
+      if (struct_ptr != NULL)
+         png_memset(struct_ptr, 0, size);
+      return (struct_ptr);
+   }
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+   struct_ptr = (png_voidp)farmalloc(size);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+   struct_ptr = (png_voidp)halloc(size, 1);
+# else
+   struct_ptr = (png_voidp)malloc(size);
+# endif
+#endif
+   if (struct_ptr != NULL)
+      png_memset(struct_ptr, 0, size);
+
+   return (struct_ptr);
+}
+
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct(png_voidp struct_ptr)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
+    png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   if (struct_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      if (free_fn != NULL)
+      {
+         png_struct dummy_struct;
+         png_structp png_ptr = &dummy_struct;
+         png_ptr->mem_ptr=mem_ptr;
+         (*(free_fn))(png_ptr, struct_ptr);
+         return;
+      }
+#endif /* PNG_USER_MEM_SUPPORTED */
+#if defined(__TURBOC__) && !defined(__FLAT__)
+      farfree(struct_ptr);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+      hfree(struct_ptr);
+# else
+      free(struct_ptr);
+# endif
+#endif
+   }
+}
+
+/* Allocate memory.  For reasonable files, size should never exceed
+   64K.  However, zlib may allocate more then 64K if you don't tell
+   it not to.  See zconf.h and png.h for more information.  zlib does
+   need to allocate exactly 64K, so whatever you call here must
+   have the ability to do that. */
+
+png_voidp PNGAPI
+png_malloc(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+   if (png_ptr->malloc_fn != NULL)
+       ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
+   else
+       ret = (png_malloc_default(png_ptr, size));
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+       png_error(png_ptr, "Out of Memory!");
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc_default(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (size > (png_uint_32)65536L)
+   {
+#ifndef PNG_USER_MEM_SUPPORTED
+      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+         png_error(png_ptr, "Cannot Allocate > 64K");
+      else
+#endif
+         return NULL;
+   }
+#endif
+
+ /* Check for overflow */
+#if defined(__TURBOC__) && !defined(__FLAT__)
+ if (size != (unsigned long)size)
+   ret = NULL;
+ else
+   ret = farmalloc(size);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+ if (size != (unsigned long)size)
+   ret = NULL;
+ else
+   ret = halloc(size, 1);
+# else
+ if (size != (size_t)size)
+   ret = NULL;
+ else
+   ret = malloc((size_t)size);
+# endif
+#endif
+
+#ifndef PNG_USER_MEM_SUPPORTED
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+      png_error(png_ptr, "Out of Memory");
+#endif
+
+   return (ret);
+}
+
+/* Free a pointer allocated by png_malloc().  If ptr is NULL, return
+   without taking any action. */
+void PNGAPI
+png_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr->free_fn != NULL)
+   {
+      (*(png_ptr->free_fn))(png_ptr, ptr);
+      return;
+   }
+   else png_free_default(png_ptr, ptr);
+}
+void PNGAPI
+png_free_default(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+   farfree(ptr);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+   hfree(ptr);
+# else
+   free(ptr);
+# endif
+#endif
+}
+
+#endif /* Not Borland DOS special memory handler */
+
+#if defined(PNG_1_0_X)
+#  define png_malloc_warn png_malloc
+#else
+/* This function was added at libpng version 1.2.3.  The png_malloc_warn()
+ * function will set up png_malloc() to issue a png_warning and return NULL
+ * instead of issuing a png_error, if it fails to allocate the requested
+ * memory.
+ */
+png_voidp PNGAPI
+png_malloc_warn(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ptr;
+   png_uint_32 save_flags;
+   if (png_ptr == NULL) return (NULL);
+
+   save_flags = png_ptr->flags;
+   png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
+   ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
+   png_ptr->flags=save_flags;
+   return(ptr);
+}
+#endif
+
+png_voidp PNGAPI
+png_memcpy_check (png_structp png_ptr, png_voidp s1, png_voidp s2,
+   png_uint_32 length)
+{
+   png_size_t size;
+
+   size = (png_size_t)length;
+   if ((png_uint_32)size != length)
+      png_error(png_ptr, "Overflow in png_memcpy_check.");
+
+   return(png_memcpy (s1, s2, size));
+}
+
+png_voidp PNGAPI
+png_memset_check (png_structp png_ptr, png_voidp s1, int value,
+   png_uint_32 length)
+{
+   png_size_t size;
+
+   size = (png_size_t)length;
+   if ((png_uint_32)size != length)
+      png_error(png_ptr, "Overflow in png_memset_check.");
+
+   return (png_memset (s1, value, size));
+
+}
+
+#ifdef PNG_USER_MEM_SUPPORTED
+/* This function is called when the application wants to use another method
+ * of allocating and freeing memory.
+ */
+void PNGAPI
+png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
+  malloc_fn, png_free_ptr free_fn)
+{
+   if (png_ptr != NULL)
+   {
+      png_ptr->mem_ptr = mem_ptr;
+      png_ptr->malloc_fn = malloc_fn;
+      png_ptr->free_fn = free_fn;
+   }
+}
+
+/* This function returns a pointer to the mem_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy and png_read_destroy are called.
+ */
+png_voidp PNGAPI
+png_get_mem_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL) return (NULL);
+   return ((png_voidp)png_ptr->mem_ptr);
+}
+#endif /* PNG_USER_MEM_SUPPORTED */
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
 /* pngmem.c - stub functions for memory allocation
  *
  * Last changed in libpng 1.2.13 November 13, 2006
diff --git a/src/dep/src/irrlicht/libpng/pngpread.c b/src/dep/src/irrlicht/libpng/pngpread.c
index 69c5959..76bcc90 100644
--- a/src/dep/src/irrlicht/libpng/pngpread.c
+++ b/src/dep/src/irrlicht/libpng/pngpread.c
@@ -1,4 +1,1598 @@
 
+/* pngpread.c - read a png file in push mode
+ *
+ * Last changed in libpng 1.2.32 [September 18, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+
+/* push model modes */
+#define PNG_READ_SIG_MODE   0
+#define PNG_READ_CHUNK_MODE 1
+#define PNG_READ_IDAT_MODE  2
+#define PNG_SKIP_MODE       3
+#define PNG_READ_tEXt_MODE  4
+#define PNG_READ_zTXt_MODE  5
+#define PNG_READ_DONE_MODE  6
+#define PNG_READ_iTXt_MODE  7
+#define PNG_ERROR_MODE      8
+
+void PNGAPI
+png_process_data(png_structp png_ptr, png_infop info_ptr,
+   png_bytep buffer, png_size_t buffer_size)
+{
+   if (png_ptr == NULL || info_ptr == NULL) return;
+   png_push_restore_buffer(png_ptr, buffer, buffer_size);
+
+   while (png_ptr->buffer_size)
+   {
+      png_process_some_data(png_ptr, info_ptr);
+   }
+}
+
+/* What we do with the incoming data depends on what we were previously
+ * doing before we ran out of data...
+ */
+void /* PRIVATE */
+png_process_some_data(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr == NULL) return;
+   switch (png_ptr->process_mode)
+   {
+      case PNG_READ_SIG_MODE:
+      {
+         png_push_read_sig(png_ptr, info_ptr);
+         break;
+      }
+      case PNG_READ_CHUNK_MODE:
+      {
+         png_push_read_chunk(png_ptr, info_ptr);
+         break;
+      }
+      case PNG_READ_IDAT_MODE:
+      {
+         png_push_read_IDAT(png_ptr);
+         break;
+      }
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      case PNG_READ_tEXt_MODE:
+      {
+         png_push_read_tEXt(png_ptr, info_ptr);
+         break;
+      }
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      case PNG_READ_zTXt_MODE:
+      {
+         png_push_read_zTXt(png_ptr, info_ptr);
+         break;
+      }
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      case PNG_READ_iTXt_MODE:
+      {
+         png_push_read_iTXt(png_ptr, info_ptr);
+         break;
+      }
+#endif
+      case PNG_SKIP_MODE:
+      {
+         png_push_crc_finish(png_ptr);
+         break;
+      }
+      default:
+      {
+         png_ptr->buffer_size = 0;
+         break;
+      }
+   }
+}
+
+/* Read any remaining signature bytes from the stream and compare them with
+ * the correct PNG signature.  It is possible that this routine is called
+ * with bytes already read from the signature, either because they have been
+ * checked by the calling application, or because of multiple calls to this
+ * routine.
+ */
+void /* PRIVATE */
+png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
+{
+   png_size_t num_checked = png_ptr->sig_bytes,
+             num_to_check = 8 - num_checked;
+
+   if (png_ptr->buffer_size < num_to_check)
+   {
+      num_to_check = png_ptr->buffer_size;
+   }
+
+   png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
+      num_to_check);
+   png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);
+
+   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+   {
+      if (num_checked < 4 &&
+          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+         png_error(png_ptr, "Not a PNG file");
+      else
+         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+   }
+   else
+   {
+      if (png_ptr->sig_bytes >= 8)
+      {
+         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+      }
+   }
+}
+
+void /* PRIVATE */
+png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IHDR;
+      PNG_CONST PNG_IDAT;
+      PNG_CONST PNG_IEND;
+      PNG_CONST PNG_PLTE;
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      PNG_CONST PNG_bKGD;
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      PNG_CONST PNG_cHRM;
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      PNG_CONST PNG_gAMA;
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      PNG_CONST PNG_hIST;
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      PNG_CONST PNG_iCCP;
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      PNG_CONST PNG_iTXt;
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      PNG_CONST PNG_oFFs;
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      PNG_CONST PNG_pCAL;
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      PNG_CONST PNG_pHYs;
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      PNG_CONST PNG_sBIT;
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      PNG_CONST PNG_sCAL;
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      PNG_CONST PNG_sRGB;
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      PNG_CONST PNG_sPLT;
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      PNG_CONST PNG_tEXt;
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      PNG_CONST PNG_tIME;
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      PNG_CONST PNG_tRNS;
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      PNG_CONST PNG_zTXt;
+#endif
+#endif /* PNG_USE_LOCAL_ARRAYS */
+   /* First we make sure we have enough data for the 4 byte chunk name
+    * and the 4 byte chunk length before proceeding with decoding the
+    * chunk data.  To fully decode each of these chunks, we also make
+    * sure we have enough data in the buffer for the 4 byte CRC at the
+    * end of every chunk (except IDAT, which is handled separately).
+    */
+   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+   {
+      png_byte chunk_length[4];
+
+      if (png_ptr->buffer_size < 8)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_fill_buffer(png_ptr, chunk_length, 4);
+      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+      png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+   }
+
+   if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+     if (png_ptr->mode & PNG_AFTER_IDAT)
+        png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+
+   if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+   {
+      if (png_ptr->push_length != 13)
+         png_error(png_ptr, "Invalid IHDR length");
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
+   }
+   else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
+
+      png_ptr->process_mode = PNG_READ_DONE_MODE;
+      png_push_have_end(png_ptr, info_ptr);
+   }
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+   else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+         png_ptr->mode |= PNG_HAVE_IDAT;
+      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+      if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+         png_ptr->mode |= PNG_HAVE_PLTE;
+      else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         if (!(png_ptr->mode & PNG_HAVE_IHDR))
+            png_error(png_ptr, "Missing IHDR before IDAT");
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                  !(png_ptr->mode & PNG_HAVE_PLTE))
+            png_error(png_ptr, "Missing PLTE before IDAT");
+      }
+   }
+#endif
+   else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
+   }
+   else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+   {
+      /* If we reach an IDAT chunk, this means we have read all of the
+       * header chunks, and we can start reading the image (or if this
+       * is called after the image has been read - we have an error).
+       */
+     if (!(png_ptr->mode & PNG_HAVE_IHDR))
+       png_error(png_ptr, "Missing IHDR before IDAT");
+     else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+         !(png_ptr->mode & PNG_HAVE_PLTE))
+       png_error(png_ptr, "Missing PLTE before IDAT");
+
+      if (png_ptr->mode & PNG_HAVE_IDAT)
+      {
+         if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+           if (png_ptr->push_length == 0)
+              return;
+
+         if (png_ptr->mode & PNG_AFTER_IDAT)
+            png_error(png_ptr, "Too many IDAT's found");
+      }
+
+      png_ptr->idat_size = png_ptr->push_length;
+      png_ptr->mode |= PNG_HAVE_IDAT;
+      png_ptr->process_mode = PNG_READ_IDAT_MODE;
+      png_push_have_info(png_ptr, info_ptr);
+      png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+      png_ptr->zstream.next_out = png_ptr->row_buf;
+      return;
+   }
+#if defined(PNG_READ_gAMA_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_bKGD_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+   else
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+   png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
+}
+
+void /* PRIVATE */
+png_push_crc_skip(png_structp png_ptr, png_uint_32 skip)
+{
+   png_ptr->process_mode = PNG_SKIP_MODE;
+   png_ptr->skip_length = skip;
+}
+
+void /* PRIVATE */
+png_push_crc_finish(png_structp png_ptr)
+{
+   if (png_ptr->skip_length && png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->skip_length < (png_uint_32)png_ptr->save_buffer_size)
+         save_size = (png_size_t)png_ptr->skip_length;
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
+
+      png_ptr->skip_length -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (png_ptr->skip_length && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->skip_length < (png_uint_32)png_ptr->current_buffer_size)
+         save_size = (png_size_t)png_ptr->skip_length;
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+      png_ptr->skip_length -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+   if (!png_ptr->skip_length)
+   {
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_crc_finish(png_ptr, 0);
+      png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+   }
+}
+
+void PNGAPI
+png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
+{
+   png_bytep ptr;
+
+   if (png_ptr == NULL) return;
+   ptr = buffer;
+   if (png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (length < png_ptr->save_buffer_size)
+         save_size = length;
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
+      length -= save_size;
+      ptr += save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (length && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (length < png_ptr->current_buffer_size)
+         save_size = length;
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+}
+
+void /* PRIVATE */
+png_push_save_buffer(png_structp png_ptr)
+{
+   if (png_ptr->save_buffer_size)
+   {
+      if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
+      {
+         png_size_t i, istop;
+         png_bytep sp;
+         png_bytep dp;
+
+         istop = png_ptr->save_buffer_size;
+         for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
+            i < istop; i++, sp++, dp++)
+         {
+            *dp = *sp;
+         }
+      }
+   }
+   if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
+      png_ptr->save_buffer_max)
+   {
+      png_size_t new_max;
+      png_bytep old_buffer;
+
+      if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
+         (png_ptr->current_buffer_size + 256))
+      {
+        png_error(png_ptr, "Potential overflow of save_buffer");
+      }
+      new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
+      old_buffer = png_ptr->save_buffer;
+      png_ptr->save_buffer = (png_bytep)png_malloc(png_ptr,
+         (png_uint_32)new_max);
+      png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+      png_free(png_ptr, old_buffer);
+      png_ptr->save_buffer_max = new_max;
+   }
+   if (png_ptr->current_buffer_size)
+   {
+      png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
+         png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
+      png_ptr->save_buffer_size += png_ptr->current_buffer_size;
+      png_ptr->current_buffer_size = 0;
+   }
+   png_ptr->save_buffer_ptr = png_ptr->save_buffer;
+   png_ptr->buffer_size = 0;
+}
+
+void /* PRIVATE */
+png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
+   png_size_t buffer_length)
+{
+   png_ptr->current_buffer = buffer;
+   png_ptr->current_buffer_size = buffer_length;
+   png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
+   png_ptr->current_buffer_ptr = png_ptr->current_buffer;
+}
+
+void /* PRIVATE */
+png_push_read_IDAT(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_CONST PNG_IDAT;
+#endif
+   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+   {
+      png_byte chunk_length[4];
+
+      if (png_ptr->buffer_size < 8)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_fill_buffer(png_ptr, chunk_length, 4);
+      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+
+      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+         if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+            png_error(png_ptr, "Not enough compressed data");
+         return;
+      }
+
+      png_ptr->idat_size = png_ptr->push_length;
+   }
+   if (png_ptr->idat_size && png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->idat_size < (png_uint_32)png_ptr->save_buffer_size)
+      {
+         save_size = (png_size_t)png_ptr->idat_size;
+         /* check for overflow */
+         if ((png_uint_32)save_size != png_ptr->idat_size)
+            png_error(png_ptr, "save_size overflowed in pngpread");
+      }
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
+      if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+         png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
+      png_ptr->idat_size -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (png_ptr->idat_size && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->idat_size < (png_uint_32)png_ptr->current_buffer_size)
+      {
+         save_size = (png_size_t)png_ptr->idat_size;
+         /* check for overflow */
+         if ((png_uint_32)save_size != png_ptr->idat_size)
+            png_error(png_ptr, "save_size overflowed in pngpread");
+      }
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
+      if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+        png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+      png_ptr->idat_size -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+   if (!png_ptr->idat_size)
+   {
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_crc_finish(png_ptr, 0);
+      png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
+      png_ptr->mode |= PNG_AFTER_IDAT;
+   }
+}
+
+void /* PRIVATE */
+png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
+   png_size_t buffer_length)
+{
+   int ret;
+
+   if ((png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) && buffer_length)
+      png_error(png_ptr, "Extra compression data");
+
+   png_ptr->zstream.next_in = buffer;
+   png_ptr->zstream.avail_in = (uInt)buffer_length;
+   for (;;)
+   {
+      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+      if (ret != Z_OK)
+      {
+         if (ret == Z_STREAM_END)
+         {
+            if (png_ptr->zstream.avail_in)
+               png_error(png_ptr, "Extra compressed data");
+            if (!(png_ptr->zstream.avail_out))
+            {
+               png_push_process_row(png_ptr);
+            }
+
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+         else if (ret == Z_BUF_ERROR)
+            break;
+         else
+            png_error(png_ptr, "Decompression Error");
+      }
+      if (!(png_ptr->zstream.avail_out))
+      {
+         if ((
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+             png_ptr->interlaced && png_ptr->pass > 6) ||
+             (!png_ptr->interlaced &&
+#endif
+             png_ptr->row_number == png_ptr->num_rows))
+         {
+           if (png_ptr->zstream.avail_in)
+             png_warning(png_ptr, "Too much data in IDAT chunks");
+           png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+           break;
+         }
+         png_push_process_row(png_ptr);
+         png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+         png_ptr->zstream.next_out = png_ptr->row_buf;
+      }
+      else
+         break;
+   }
+}
+
+void /* PRIVATE */
+png_push_process_row(png_structp png_ptr)
+{
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->iwidth;
+   png_ptr->row_info.channels = png_ptr->channels;
+   png_ptr->row_info.bit_depth = png_ptr->bit_depth;
+   png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
+
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+       png_ptr->row_info.width);
+
+   png_read_filter_row(png_ptr, &(png_ptr->row_info),
+      png_ptr->row_buf + 1, png_ptr->prev_row + 1,
+      (int)(png_ptr->row_buf[0]));
+
+   png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+      png_ptr->rowbytes + 1);
+
+   if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
+      png_do_read_transformations(png_ptr);
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+   /* blow up interlaced rows to full size */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      if (png_ptr->pass < 6)
+/*       old interface (pre-1.0.9):
+         png_do_read_interlace(&(png_ptr->row_info),
+            png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
+ */
+         png_do_read_interlace(png_ptr);
+
+    switch (png_ptr->pass)
+    {
+         case 0:
+         {
+            int i;
+            for (i = 0; i < 8 && png_ptr->pass == 0; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr); /* updates png_ptr->pass */
+            }
+            if (png_ptr->pass == 2) /* pass 1 might be empty */
+            {
+               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            if (png_ptr->pass == 4 && png_ptr->height <= 4)
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            if (png_ptr->pass == 6 && png_ptr->height <= 4)
+            {
+                png_push_have_row(png_ptr, png_bytep_NULL);
+                png_read_push_finish_row(png_ptr);
+            }
+            break;
+         }
+         case 1:
+         {
+            int i;
+            for (i = 0; i < 8 && png_ptr->pass == 1; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 2) /* skip top 4 generated rows */
+            {
+               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            break;
+         }
+         case 2:
+         {
+            int i;
+            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 4) /* pass 3 might be empty */
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            break;
+         }
+         case 3:
+         {
+            int i;
+            for (i = 0; i < 4 && png_ptr->pass == 3; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 4) /* skip top two generated rows */
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            break;
+         }
+         case 4:
+         {
+            int i;
+            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 6) /* pass 5 might be empty */
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            break;
+         }
+         case 5:
+         {
+            int i;
+            for (i = 0; i < 2 && png_ptr->pass == 5; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 6) /* skip top generated row */
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            break;
+         }
+         case 6:
+         {
+            png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+            png_read_push_finish_row(png_ptr);
+            if (png_ptr->pass != 6)
+               break;
+            png_push_have_row(png_ptr, png_bytep_NULL);
+            png_read_push_finish_row(png_ptr);
+         }
+      }
+   }
+   else
+#endif
+   {
+      png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+      png_read_push_finish_row(png_ptr);
+   }
+}
+
+void /* PRIVATE */
+png_read_push_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   PNG_CONST int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+
+   /* Height of interlace block.  This is not currently used - if you need
+    * it, uncomment it here and in png.h
+   PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+   */
+#endif
+
+   png_ptr->row_number++;
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      png_memset_check(png_ptr, png_ptr->prev_row, 0,
+         png_ptr->rowbytes + 1);
+      do
+      {
+         png_ptr->pass++;
+         if ((png_ptr->pass == 1 && png_ptr->width < 5) ||
+             (png_ptr->pass == 3 && png_ptr->width < 3) ||
+             (png_ptr->pass == 5 && png_ptr->width < 2))
+           png_ptr->pass++;
+
+         if (png_ptr->pass > 7)
+            png_ptr->pass--;
+         if (png_ptr->pass >= 7)
+            break;
+
+         png_ptr->iwidth = (png_ptr->width +
+            png_pass_inc[png_ptr->pass] - 1 -
+            png_pass_start[png_ptr->pass]) /
+            png_pass_inc[png_ptr->pass];
+
+         png_ptr->irowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,
+            png_ptr->iwidth) + 1;
+
+         if (png_ptr->transformations & PNG_INTERLACE)
+            break;
+
+         png_ptr->num_rows = (png_ptr->height +
+            png_pass_yinc[png_ptr->pass] - 1 -
+            png_pass_ystart[png_ptr->pass]) /
+            png_pass_yinc[png_ptr->pass];
+
+      } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
+   }
+}
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+void /* PRIVATE */
+png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
+      {
+         png_error(png_ptr, "Out of place tEXt");
+         info_ptr = info_ptr; /* to quiet some compiler warnings */
+      }
+
+#ifdef PNG_MAX_MALLOC_64K
+   png_ptr->skip_length = 0;  /* This may not be necessary */
+
+   if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
+   {
+      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
+      png_ptr->skip_length = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+      (png_uint_32)(length + 1));
+   png_ptr->current_text[length] = '\0';
+   png_ptr->current_text_ptr = png_ptr->current_text;
+   png_ptr->current_text_size = (png_size_t)length;
+   png_ptr->current_text_left = (png_size_t)length;
+   png_ptr->process_mode = PNG_READ_tEXt_MODE;
+}
+
+void /* PRIVATE */
+png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->buffer_size && png_ptr->current_text_left)
+   {
+      png_size_t text_size;
+
+      if (png_ptr->buffer_size < png_ptr->current_text_left)
+         text_size = png_ptr->buffer_size;
+      else
+         text_size = png_ptr->current_text_left;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+      png_ptr->current_text_left -= text_size;
+      png_ptr->current_text_ptr += text_size;
+   }
+   if (!(png_ptr->current_text_left))
+   {
+      png_textp text_ptr;
+      png_charp text;
+      png_charp key;
+      int ret;
+
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_crc_finish(png_ptr);
+
+#if defined(PNG_MAX_MALLOC_64K)
+      if (png_ptr->skip_length)
+         return;
+#endif
+
+      key = png_ptr->current_text;
+
+      for (text = key; *text; text++)
+         /* empty loop */ ;
+
+      if (text < key + png_ptr->current_text_size)
+         text++;
+
+      text_ptr = (png_textp)png_malloc(png_ptr,
+         (png_uint_32)png_sizeof(png_text));
+      text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
+      text_ptr->key = key;
+#ifdef PNG_iTXt_SUPPORTED
+      text_ptr->lang = NULL;
+      text_ptr->lang_key = NULL;
+#endif
+      text_ptr->text = text;
+
+      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+      png_free(png_ptr, key);
+      png_free(png_ptr, text_ptr);
+      png_ptr->current_text = NULL;
+
+      if (ret)
+        png_warning(png_ptr, "Insufficient memory to store text chunk.");
+   }
+}
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+void /* PRIVATE */
+png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
+      {
+         png_error(png_ptr, "Out of place zTXt");
+         info_ptr = info_ptr; /* to quiet some compiler warnings */
+      }
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We can't handle zTXt chunks > 64K, since we don't have enough space
+    * to be able to store the uncompressed data.  Actually, the threshold
+    * is probably around 32K, but it isn't as definite as 64K is.
+    */
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "zTXt chunk too large to fit in memory");
+      png_push_crc_skip(png_ptr, length);
+      return;
+   }
+#endif
+
+   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+      (png_uint_32)(length + 1));
+   png_ptr->current_text[length] = '\0';
+   png_ptr->current_text_ptr = png_ptr->current_text;
+   png_ptr->current_text_size = (png_size_t)length;
+   png_ptr->current_text_left = (png_size_t)length;
+   png_ptr->process_mode = PNG_READ_zTXt_MODE;
+}
+
+void /* PRIVATE */
+png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->buffer_size && png_ptr->current_text_left)
+   {
+      png_size_t text_size;
+
+      if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
+         text_size = png_ptr->buffer_size;
+      else
+         text_size = png_ptr->current_text_left;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+      png_ptr->current_text_left -= text_size;
+      png_ptr->current_text_ptr += text_size;
+   }
+   if (!(png_ptr->current_text_left))
+   {
+      png_textp text_ptr;
+      png_charp text;
+      png_charp key;
+      int ret;
+      png_size_t text_size, key_size;
+
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_crc_finish(png_ptr);
+
+      key = png_ptr->current_text;
+
+      for (text = key; *text; text++)
+         /* empty loop */ ;
+
+      /* zTXt can't have zero text */
+      if (text >= key + png_ptr->current_text_size)
+      {
+         png_ptr->current_text = NULL;
+         png_free(png_ptr, key);
+         return;
+      }
+
+      text++;
+
+      if (*text != PNG_TEXT_COMPRESSION_zTXt) /* check compression byte */
+      {
+         png_ptr->current_text = NULL;
+         png_free(png_ptr, key);
+         return;
+      }
+
+      text++;
+
+      png_ptr->zstream.next_in = (png_bytep )text;
+      png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
+         (text - key));
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+      key_size = text - key;
+      text_size = 0;
+      text = NULL;
+      ret = Z_STREAM_END;
+
+      while (png_ptr->zstream.avail_in)
+      {
+         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+         if (ret != Z_OK && ret != Z_STREAM_END)
+         {
+            inflateReset(&png_ptr->zstream);
+            png_ptr->zstream.avail_in = 0;
+            png_ptr->current_text = NULL;
+            png_free(png_ptr, key);
+            png_free(png_ptr, text);
+            return;
+         }
+         if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
+         {
+            if (text == NULL)
+            {
+               text = (png_charp)png_malloc(png_ptr,
+                     (png_uint_32)(png_ptr->zbuf_size
+                     - png_ptr->zstream.avail_out + key_size + 1));
+               png_memcpy(text + key_size, png_ptr->zbuf,
+                  png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+               png_memcpy(text, key, key_size);
+               text_size = key_size + png_ptr->zbuf_size -
+                  png_ptr->zstream.avail_out;
+               *(text + text_size) = '\0';
+            }
+            else
+            {
+               png_charp tmp;
+
+               tmp = text;
+               text = (png_charp)png_malloc(png_ptr, text_size +
+                  (png_uint_32)(png_ptr->zbuf_size 
+                  - png_ptr->zstream.avail_out + 1));
+               png_memcpy(text, tmp, text_size);
+               png_free(png_ptr, tmp);
+               png_memcpy(text + text_size, png_ptr->zbuf,
+                  png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+               text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+               *(text + text_size) = '\0';
+            }
+            if (ret != Z_STREAM_END)
+            {
+               png_ptr->zstream.next_out = png_ptr->zbuf;
+               png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+            }
+         }
+         else
+         {
+            break;
+         }
+
+         if (ret == Z_STREAM_END)
+            break;
+      }
+
+      inflateReset(&png_ptr->zstream);
+      png_ptr->zstream.avail_in = 0;
+
+      if (ret != Z_STREAM_END)
+      {
+         png_ptr->current_text = NULL;
+         png_free(png_ptr, key);
+         png_free(png_ptr, text);
+         return;
+      }
+
+      png_ptr->current_text = NULL;
+      png_free(png_ptr, key);
+      key = text;
+      text += key_size;
+
+      text_ptr = (png_textp)png_malloc(png_ptr,
+          (png_uint_32)png_sizeof(png_text));
+      text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
+      text_ptr->key = key;
+#ifdef PNG_iTXt_SUPPORTED
+      text_ptr->lang = NULL;
+      text_ptr->lang_key = NULL;
+#endif
+      text_ptr->text = text;
+
+      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+      png_free(png_ptr, key);
+      png_free(png_ptr, text_ptr);
+
+      if (ret)
+        png_warning(png_ptr, "Insufficient memory to store text chunk.");
+   }
+}
+#endif
+
+#if defined(PNG_READ_iTXt_SUPPORTED)
+void /* PRIVATE */
+png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
+      {
+         png_error(png_ptr, "Out of place iTXt");
+         info_ptr = info_ptr; /* to quiet some compiler warnings */
+      }
+
+#ifdef PNG_MAX_MALLOC_64K
+   png_ptr->skip_length = 0;  /* This may not be necessary */
+
+   if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
+   {
+      png_warning(png_ptr, "iTXt chunk too large to fit in memory");
+      png_ptr->skip_length = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+      (png_uint_32)(length + 1));
+   png_ptr->current_text[length] = '\0';
+   png_ptr->current_text_ptr = png_ptr->current_text;
+   png_ptr->current_text_size = (png_size_t)length;
+   png_ptr->current_text_left = (png_size_t)length;
+   png_ptr->process_mode = PNG_READ_iTXt_MODE;
+}
+
+void /* PRIVATE */
+png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)
+{
+
+   if (png_ptr->buffer_size && png_ptr->current_text_left)
+   {
+      png_size_t text_size;
+
+      if (png_ptr->buffer_size < png_ptr->current_text_left)
+         text_size = png_ptr->buffer_size;
+      else
+         text_size = png_ptr->current_text_left;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+      png_ptr->current_text_left -= text_size;
+      png_ptr->current_text_ptr += text_size;
+   }
+   if (!(png_ptr->current_text_left))
+   {
+      png_textp text_ptr;
+      png_charp key;
+      int comp_flag;
+      png_charp lang;
+      png_charp lang_key;
+      png_charp text;
+      int ret;
+
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_crc_finish(png_ptr);
+
+#if defined(PNG_MAX_MALLOC_64K)
+      if (png_ptr->skip_length)
+         return;
+#endif
+
+      key = png_ptr->current_text;
+
+      for (lang = key; *lang; lang++)
+         /* empty loop */ ;
+
+      if (lang < key + png_ptr->current_text_size - 3)
+         lang++;
+
+      comp_flag = *lang++;
+      lang++;     /* skip comp_type, always zero */
+
+      for (lang_key = lang; *lang_key; lang_key++)
+         /* empty loop */ ;
+      lang_key++;        /* skip NUL separator */
+
+      text=lang_key;
+      if (lang_key < key + png_ptr->current_text_size - 1)
+      {
+        for (; *text; text++)
+           /* empty loop */ ;
+      }
+
+      if (text < key + png_ptr->current_text_size)
+         text++;
+
+      text_ptr = (png_textp)png_malloc(png_ptr,
+         (png_uint_32)png_sizeof(png_text));
+      text_ptr->compression = comp_flag + 2;
+      text_ptr->key = key;
+      text_ptr->lang = lang;
+      text_ptr->lang_key = lang_key;
+      text_ptr->text = text;
+      text_ptr->text_length = 0;
+      text_ptr->itxt_length = png_strlen(text);
+
+      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+      png_ptr->current_text = NULL;
+
+      png_free(png_ptr, text_ptr);
+      if (ret)
+        png_warning(png_ptr, "Insufficient memory to store iTXt chunk.");
+   }
+}
+#endif
+
+/* This function is called when we haven't found a handler for this
+ * chunk.  If there isn't a problem with the chunk itself (ie a bad chunk
+ * name or a critical chunk), the chunk is (currently) silently ignored.
+ */
+void /* PRIVATE */
+png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   png_uint_32 skip = 0;
+
+   if (!(png_ptr->chunk_name[0] & 0x20))
+   {
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+      if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+         PNG_HANDLE_CHUNK_ALWAYS
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+         && png_ptr->read_user_chunk_fn == NULL
+#endif
+         )
+#endif
+         png_chunk_error(png_ptr, "unknown critical chunk");
+
+      info_ptr = info_ptr; /* to quiet some compiler warnings */
+   }
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
+   {
+#ifdef PNG_MAX_MALLOC_64K
+      if (length > (png_uint_32)65535L)
+      {
+          png_warning(png_ptr, "unknown chunk too large to fit in memory");
+          skip = length - (png_uint_32)65535L;
+          length = (png_uint_32)65535L;
+      }
+#endif
+      png_memcpy((png_charp)png_ptr->unknown_chunk.name,
+                 (png_charp)png_ptr->chunk_name, 
+                 png_sizeof(png_ptr->unknown_chunk.name));
+      png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name) - 1]
+        = '\0';
+
+      png_ptr->unknown_chunk.size = (png_size_t)length;
+      if (length == 0)
+         png_ptr->unknown_chunk.data = NULL;
+      else
+      {
+         png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr,
+       (png_uint_32)length);
+         png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
+      }
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+      if (png_ptr->read_user_chunk_fn != NULL)
+      {
+         /* callback to user unknown chunk handler */
+         int ret;
+         ret = (*(png_ptr->read_user_chunk_fn))
+           (png_ptr, &png_ptr->unknown_chunk);
+         if (ret < 0)
+            png_chunk_error(png_ptr, "error in user chunk");
+         if (ret == 0)
+         {
+            if (!(png_ptr->chunk_name[0] & 0x20))
+               if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+                    PNG_HANDLE_CHUNK_ALWAYS)
+                  png_chunk_error(png_ptr, "unknown critical chunk");
+            png_set_unknown_chunks(png_ptr, info_ptr,
+               &png_ptr->unknown_chunk, 1);
+         }
+      }
+      else
+#endif
+        png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
+      png_free(png_ptr, png_ptr->unknown_chunk.data);
+      png_ptr->unknown_chunk.data = NULL;
+   }
+   else
+#endif
+      skip=length;
+   png_push_crc_skip(png_ptr, skip);
+}
+
+void /* PRIVATE */
+png_push_have_info(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->info_fn != NULL)
+      (*(png_ptr->info_fn))(png_ptr, info_ptr);
+}
+
+void /* PRIVATE */
+png_push_have_end(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->end_fn != NULL)
+      (*(png_ptr->end_fn))(png_ptr, info_ptr);
+}
+
+void /* PRIVATE */
+png_push_have_row(png_structp png_ptr, png_bytep row)
+{
+   if (png_ptr->row_fn != NULL)
+      (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
+         (int)png_ptr->pass);
+}
+
+void PNGAPI
+png_progressive_combine_row (png_structp png_ptr,
+   png_bytep old_row, png_bytep new_row)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_CONST int FARDATA png_pass_dsp_mask[7] =
+      {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
+#endif
+   if (png_ptr == NULL) return;
+   if (new_row != NULL)    /* new_row must == png_ptr->row_buf here. */
+      png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]);
+}
+
+void PNGAPI
+png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
+   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+   png_progressive_end_ptr end_fn)
+{
+   if (png_ptr == NULL) return;
+   png_ptr->info_fn = info_fn;
+   png_ptr->row_fn = row_fn;
+   png_ptr->end_fn = end_fn;
+
+   png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
+}
+
+png_voidp PNGAPI
+png_get_progressive_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL) return (NULL);
+   return png_ptr->io_ptr;
+}
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
 /* pngpread.c - read a png file in push mode
  *
  * Last changed in libpng 1.2.17 May 15, 2007
diff --git a/src/dep/src/irrlicht/libpng/pngread.c b/src/dep/src/irrlicht/libpng/pngread.c
index 0d0a7c9..c8ec4da 100644
--- a/src/dep/src/irrlicht/libpng/pngread.c
+++ b/src/dep/src/irrlicht/libpng/pngread.c
@@ -1,4 +1,1463 @@
 
+/* pngread.c - read a PNG file
+ *
+ * Last changed in libpng 1.2.35 [February 14, 2009]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file contains routines that an application calls directly to
+ * read a PNG file or stream.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED)
+
+/* Create a PNG structure for reading, and allocate any memory needed. */
+png_structp PNGAPI
+png_create_read_struct(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn)
+{
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
+      warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
+}
+
+/* Alternate create PNG structure for reading, and allocate any memory needed. */
+png_structp PNGAPI
+png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#ifdef PNG_SETJMP_SUPPORTED
+   volatile
+#endif
+   png_structp png_ptr;
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+
+   int i;
+
+   png_debug(1, "in png_create_read_struct");
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
+      (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
+#else
+   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+#endif
+   if (png_ptr == NULL)
+      return (NULL);
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_ptr->jmpbuf))
+#endif
+   {
+      png_free(png_ptr, png_ptr->zbuf);
+      png_ptr->zbuf = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr,
+         (png_free_ptr)free_fn, (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      return (NULL);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_ptr->jmpbuf, jmpbuf, png_sizeof(jmp_buf));
+#endif
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif
+
+   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+
+   if (user_png_ver)
+   {
+     i = 0;
+     do
+     {
+       if (user_png_ver[i] != png_libpng_ver[i])
+          png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+     } while (png_libpng_ver[i++]);
+   }
+   else
+        png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+   
+
+   if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
+   {
+     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+      * we must recompile any applications that use any older library version.
+      * For versions after libpng 1.0, we will be compatible, so we need
+      * only check the first digit.
+      */
+     if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+         (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
+         (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
+     {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+        char msg[80];
+        if (user_png_ver)
+        {
+          png_snprintf(msg, 80,
+             "Application was compiled with png.h from libpng-%.20s",
+             user_png_ver);
+          png_warning(png_ptr, msg);
+        }
+        png_snprintf(msg, 80,
+             "Application  is  running with png.c from libpng-%.20s",
+           png_libpng_ver);
+        png_warning(png_ptr, msg);
+#endif
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+        png_ptr->flags = 0;
+#endif
+        png_error(png_ptr,
+           "Incompatible libpng version in application and library");
+     }
+   }
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)png_ptr->zbuf_size);
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+
+   switch (inflateInit(&png_ptr->zstream))
+   {
+     case Z_OK: /* Do nothing */ break;
+     case Z_MEM_ERROR:
+     case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory error"); break;
+     case Z_VERSION_ERROR: png_error(png_ptr, "zlib version error"); break;
+     default: png_error(png_ptr, "Unknown zlib error");
+   }
+
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+   png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* Applications that neglect to set up their own setjmp() and then encounter
+   a png_error() will longjmp here.  Since the jmpbuf is then meaningless we
+   abort instead of returning. */
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+      PNG_ABORT();
+   png_memcpy(png_ptr->jmpbuf, jmpbuf, png_sizeof(jmp_buf));
+#else
+   if (setjmp(png_ptr->jmpbuf))
+      PNG_ABORT();
+#endif
+#endif
+   return (png_ptr);
+}
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Initialize PNG structure for reading, and allocate any memory needed.
+   This interface is deprecated in favour of the png_create_read_struct(),
+   and it will disappear as of libpng-1.3.0. */
+#undef png_read_init
+void PNGAPI
+png_read_init(png_structp png_ptr)
+{
+   /* We only come here via pre-1.0.7-compiled applications */
+   png_read_init_2(png_ptr, "1.0.6 or earlier", 0, 0);
+}
+
+void PNGAPI
+png_read_init_2(png_structp png_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size, png_size_t png_info_size)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+   if (png_ptr == NULL) return;
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+   if (png_sizeof(png_struct) > png_struct_size ||
+      png_sizeof(png_info) > png_info_size)
+   {
+      char msg[80];
+      png_ptr->warning_fn = NULL;
+      if (user_png_ver)
+      {
+        png_snprintf(msg, 80,
+           "Application was compiled with png.h from libpng-%.20s",
+           user_png_ver);
+        png_warning(png_ptr, msg);
+      }
+      png_snprintf(msg, 80,
+         "Application  is  running with png.c from libpng-%.20s",
+         png_libpng_ver);
+      png_warning(png_ptr, msg);
+   }
+#endif
+   if (png_sizeof(png_struct) > png_struct_size)
+     {
+       png_ptr->error_fn = NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags = 0;
+#endif
+       png_error(png_ptr,
+       "The png struct allocated by the application for reading is too small.");
+     }
+   if (png_sizeof(png_info) > png_info_size)
+     {
+       png_ptr->error_fn = NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags = 0;
+#endif
+       png_error(png_ptr,
+         "The info struct allocated by application for reading is too small.");
+     }
+   png_read_init_3(&png_ptr, user_png_ver, png_struct_size);
+}
+#endif /* PNG_1_0_X || PNG_1_2_X */
+
+void PNGAPI
+png_read_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp;  /* to save current jump buffer */
+#endif
+
+   int i = 0;
+
+   png_structp png_ptr=*ptr_ptr;
+
+   if (png_ptr == NULL) return;
+
+   do
+   {
+     if (user_png_ver[i] != png_libpng_ver[i])
+     {
+#ifdef PNG_LEGACY_SUPPORTED
+       png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+#else
+       png_ptr->warning_fn = NULL;
+       png_warning(png_ptr,
+        "Application uses deprecated png_read_init() and should be recompiled.");
+       break;
+#endif
+     }
+   } while (png_libpng_ver[i++]);
+
+   png_debug(1, "in png_read_init_3");
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* save jump buffer and error functions */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+#endif
+
+   if (png_sizeof(png_struct) > png_struct_size)
+   {
+      png_destroy_struct(png_ptr);
+      *ptr_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+      png_ptr = *ptr_ptr;
+   }
+
+   /* reset all variables to 0 */
+   png_memset(png_ptr, 0, png_sizeof(png_struct));
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* restore jump buffer */
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
+#endif
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)png_ptr->zbuf_size);
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+
+   switch (inflateInit(&png_ptr->zstream))
+   {
+     case Z_OK: /* Do nothing */ break;
+     case Z_MEM_ERROR:
+     case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory"); break;
+     case Z_VERSION_ERROR: png_error(png_ptr, "zlib version"); break;
+     default: png_error(png_ptr, "Unknown zlib error");
+   }
+
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+   png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
+}
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the information before the actual image data.  This has been
+ * changed in v0.90 to allow reading a file that already has the magic
+ * bytes read from the stream.  You can tell libpng how many bytes have
+ * been read from the beginning of the stream (up to the maximum of 8)
+ * via png_set_sig_bytes(), and we will only check the remaining bytes
+ * here.  The application can then have access to the signature bytes we
+ * read if it is determined that this isn't a valid PNG file.
+ */
+void PNGAPI
+png_read_info(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr == NULL || info_ptr == NULL) return;
+   png_debug(1, "in png_read_info");
+   /* If we haven't checked all of the PNG signature bytes, do so now. */
+   if (png_ptr->sig_bytes < 8)
+   {
+      png_size_t num_checked = png_ptr->sig_bytes,
+                 num_to_check = 8 - num_checked;
+
+      png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
+      png_ptr->sig_bytes = 8;
+
+      if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+      {
+         if (num_checked < 4 &&
+             png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+            png_error(png_ptr, "Not a PNG file");
+         else
+            png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+      }
+      if (num_checked < 3)
+         png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
+   }
+
+   for (;;)
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IHDR;
+      PNG_CONST PNG_IDAT;
+      PNG_CONST PNG_IEND;
+      PNG_CONST PNG_PLTE;
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      PNG_CONST PNG_bKGD;
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      PNG_CONST PNG_cHRM;
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      PNG_CONST PNG_gAMA;
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      PNG_CONST PNG_hIST;
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      PNG_CONST PNG_iCCP;
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      PNG_CONST PNG_iTXt;
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      PNG_CONST PNG_oFFs;
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      PNG_CONST PNG_pCAL;
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      PNG_CONST PNG_pHYs;
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      PNG_CONST PNG_sBIT;
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      PNG_CONST PNG_sCAL;
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      PNG_CONST PNG_sPLT;
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      PNG_CONST PNG_sRGB;
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      PNG_CONST PNG_tEXt;
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      PNG_CONST PNG_tIME;
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      PNG_CONST PNG_tRNS;
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      PNG_CONST PNG_zTXt;
+#endif
+#endif /* PNG_USE_LOCAL_ARRAYS */
+      png_uint_32 length = png_read_chunk_header(png_ptr);
+      PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
+
+      /* This should be a binary subdivision search or a hash for
+       * matching the chunk name rather than a linear search.
+       */
+      if (!png_memcmp(chunk_name, png_IDAT, 4))
+        if (png_ptr->mode & PNG_AFTER_IDAT)
+          png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+
+      if (!png_memcmp(chunk_name, png_IHDR, 4))
+         png_handle_IHDR(png_ptr, info_ptr, length);
+      else if (!png_memcmp(chunk_name, png_IEND, 4))
+         png_handle_IEND(png_ptr, info_ptr, length);
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+      else if (png_handle_as_unknown(png_ptr, chunk_name))
+      {
+         if (!png_memcmp(chunk_name, png_IDAT, 4))
+            png_ptr->mode |= PNG_HAVE_IDAT;
+         png_handle_unknown(png_ptr, info_ptr, length);
+         if (!png_memcmp(chunk_name, png_PLTE, 4))
+            png_ptr->mode |= PNG_HAVE_PLTE;
+         else if (!png_memcmp(chunk_name, png_IDAT, 4))
+         {
+            if (!(png_ptr->mode & PNG_HAVE_IHDR))
+               png_error(png_ptr, "Missing IHDR before IDAT");
+            else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                     !(png_ptr->mode & PNG_HAVE_PLTE))
+               png_error(png_ptr, "Missing PLTE before IDAT");
+            break;
+         }
+      }
+#endif
+      else if (!png_memcmp(chunk_name, png_PLTE, 4))
+         png_handle_PLTE(png_ptr, info_ptr, length);
+      else if (!png_memcmp(chunk_name, png_IDAT, 4))
+      {
+         if (!(png_ptr->mode & PNG_HAVE_IHDR))
+            png_error(png_ptr, "Missing IHDR before IDAT");
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                  !(png_ptr->mode & PNG_HAVE_PLTE))
+            png_error(png_ptr, "Missing PLTE before IDAT");
+
+         png_ptr->idat_size = length;
+         png_ptr->mode |= PNG_HAVE_IDAT;
+         break;
+      }
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_bKGD, 4))
+         png_handle_bKGD(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_cHRM, 4))
+         png_handle_cHRM(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_gAMA, 4))
+         png_handle_gAMA(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_hIST, 4))
+         png_handle_hIST(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_oFFs, 4))
+         png_handle_oFFs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_pCAL, 4))
+         png_handle_pCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_sCAL, 4))
+         png_handle_sCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_pHYs, 4))
+         png_handle_pHYs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_sBIT, 4))
+         png_handle_sBIT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_sRGB, 4))
+         png_handle_sRGB(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_iCCP, 4))
+         png_handle_iCCP(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_sPLT, 4))
+         png_handle_sPLT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_tEXt, 4))
+         png_handle_tEXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_tIME, 4))
+         png_handle_tIME(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_tRNS, 4))
+         png_handle_tRNS(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_zTXt, 4))
+         png_handle_zTXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_iTXt, 4))
+         png_handle_iTXt(png_ptr, info_ptr, length);
+#endif
+      else
+         png_handle_unknown(png_ptr, info_ptr, length);
+   }
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+/* optional call to update the users info_ptr structure */
+void PNGAPI
+png_read_update_info(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_update_info");
+   if (png_ptr == NULL) return;
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+   else
+      png_warning(png_ptr,
+      "Ignoring extra png_read_update_info() call; row buffer not reallocated");
+   png_read_transform_info(png_ptr, info_ptr);
+}
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Initialize palette, background, etc, after transformations
+ * are set, but before any reading takes place.  This allows
+ * the user to obtain a gamma-corrected palette, for example.
+ * If the user doesn't call this, we will do it ourselves.
+ */
+void PNGAPI
+png_start_read_image(png_structp png_ptr)
+{
+   png_debug(1, "in png_start_read_image");
+   if (png_ptr == NULL) return;
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+void PNGAPI
+png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_CONST PNG_IDAT;
+   PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
+      0xff};
+   PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
+#endif
+   int ret;
+   if (png_ptr == NULL) return;
+   png_debug2(1, "in png_read_row (row %lu, pass %d)",
+      png_ptr->row_number, png_ptr->pass);
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
+   {
+   /* check for transforms that have been set but were defined out */
+#if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && !defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined.");
+#endif
+   }
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+   /* if interlaced and we do not need a new row, combine row and return */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      switch (png_ptr->pass)
+      {
+         case 0:
+            if (png_ptr->row_number & 0x07)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 1:
+            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 2:
+            if ((png_ptr->row_number & 0x07) != 4)
+            {
+               if (dsp_row != NULL && (png_ptr->row_number & 4))
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 3:
+            if ((png_ptr->row_number & 3) || png_ptr->width < 3)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 4:
+            if ((png_ptr->row_number & 3) != 2)
+            {
+               if (dsp_row != NULL && (png_ptr->row_number & 2))
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 5:
+            if ((png_ptr->row_number & 1) || png_ptr->width < 2)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 6:
+            if (!(png_ptr->row_number & 1))
+            {
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+      }
+   }
+#endif
+
+   if (!(png_ptr->mode & PNG_HAVE_IDAT))
+      png_error(png_ptr, "Invalid attempt to read row data");
+
+   png_ptr->zstream.next_out = png_ptr->row_buf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+   do
+   {
+      if (!(png_ptr->zstream.avail_in))
+      {
+         while (!png_ptr->idat_size)
+         {
+            png_crc_finish(png_ptr, 0);
+
+            png_ptr->idat_size = png_read_chunk_header(png_ptr);
+            if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+               png_error(png_ptr, "Not enough image data");
+         }
+         png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+         png_ptr->zstream.next_in = png_ptr->zbuf;
+         if (png_ptr->zbuf_size > png_ptr->idat_size)
+            png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
+         png_crc_read(png_ptr, png_ptr->zbuf,
+            (png_size_t)png_ptr->zstream.avail_in);
+         png_ptr->idat_size -= png_ptr->zstream.avail_in;
+      }
+      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+      if (ret == Z_STREAM_END)
+      {
+         if (png_ptr->zstream.avail_out || png_ptr->zstream.avail_in ||
+            png_ptr->idat_size)
+            png_error(png_ptr, "Extra compressed data");
+         png_ptr->mode |= PNG_AFTER_IDAT;
+         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+         break;
+      }
+      if (ret != Z_OK)
+         png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+                   "Decompression error");
+
+   } while (png_ptr->zstream.avail_out);
+
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->iwidth;
+   png_ptr->row_info.channels = png_ptr->channels;
+   png_ptr->row_info.bit_depth = png_ptr->bit_depth;
+   png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+       png_ptr->row_info.width);
+
+   if (png_ptr->row_buf[0])
+   png_read_filter_row(png_ptr, &(png_ptr->row_info),
+      png_ptr->row_buf + 1, png_ptr->prev_row + 1,
+      (int)(png_ptr->row_buf[0]));
+
+   png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+      png_ptr->rowbytes + 1);
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
+   {
+      /* Intrapixel differencing */
+      png_do_read_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
+   }
+#endif
+
+
+   if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
+      png_do_read_transformations(png_ptr);
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+   /* blow up interlaced rows to full size */
+   if (png_ptr->interlaced &&
+      (png_ptr->transformations & PNG_INTERLACE))
+   {
+      if (png_ptr->pass < 6)
+/*       old interface (pre-1.0.9):
+         png_do_read_interlace(&(png_ptr->row_info),
+            png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
+ */
+         png_do_read_interlace(png_ptr);
+
+      if (dsp_row != NULL)
+         png_combine_row(png_ptr, dsp_row,
+            png_pass_dsp_mask[png_ptr->pass]);
+      if (row != NULL)
+         png_combine_row(png_ptr, row,
+            png_pass_mask[png_ptr->pass]);
+   }
+   else
+#endif
+   {
+      if (row != NULL)
+         png_combine_row(png_ptr, row, 0xff);
+      if (dsp_row != NULL)
+         png_combine_row(png_ptr, dsp_row, 0xff);
+   }
+   png_read_finish_row(png_ptr);
+
+   if (png_ptr->read_row_fn != NULL)
+      (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read one or more rows of image data.  If the image is interlaced,
+ * and png_set_interlace_handling() has been called, the rows need to
+ * contain the contents of the rows from the previous pass.  If the
+ * image has alpha or transparency, and png_handle_alpha()[*] has been
+ * called, the rows contents must be initialized to the contents of the
+ * screen.
+ *
+ * "row" holds the actual image, and pixels are placed in it
+ * as they arrive.  If the image is displayed after each pass, it will
+ * appear to "sparkle" in.  "display_row" can be used to display a
+ * "chunky" progressive image, with finer detail added as it becomes
+ * available.  If you do not want this "chunky" display, you may pass
+ * NULL for display_row.  If you do not want the sparkle display, and
+ * you have not called png_handle_alpha(), you may pass NULL for rows.
+ * If you have called png_handle_alpha(), and the image has either an
+ * alpha channel or a transparency chunk, you must provide a buffer for
+ * rows.  In this case, you do not have to provide a display_row buffer
+ * also, but you may.  If the image is not interlaced, or if you have
+ * not called png_set_interlace_handling(), the display_row buffer will
+ * be ignored, so pass NULL to it.
+ *
+ * [*] png_handle_alpha() does not exist yet, as of this version of libpng
+ */
+
+void PNGAPI
+png_read_rows(png_structp png_ptr, png_bytepp row,
+   png_bytepp display_row, png_uint_32 num_rows)
+{
+   png_uint_32 i;
+   png_bytepp rp;
+   png_bytepp dp;
+
+   png_debug(1, "in png_read_rows");
+   if (png_ptr == NULL) return;
+   rp = row;
+   dp = display_row;
+   if (rp != NULL && dp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep rptr = *rp++;
+         png_bytep dptr = *dp++;
+
+         png_read_row(png_ptr, rptr, dptr);
+      }
+   else if (rp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep rptr = *rp;
+         png_read_row(png_ptr, rptr, png_bytep_NULL);
+         rp++;
+      }
+   else if (dp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep dptr = *dp;
+         png_read_row(png_ptr, png_bytep_NULL, dptr);
+         dp++;
+      }
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the entire image.  If the image has an alpha channel or a tRNS
+ * chunk, and you have called png_handle_alpha()[*], you will need to
+ * initialize the image to the current image that PNG will be overlaying.
+ * We set the num_rows again here, in case it was incorrectly set in
+ * png_read_start_row() by a call to png_read_update_info() or
+ * png_start_read_image() if png_set_interlace_handling() wasn't called
+ * prior to either of these functions like it should have been.  You can
+ * only call this function once.  If you desire to have an image for
+ * each pass of a interlaced image, use png_read_rows() instead.
+ *
+ * [*] png_handle_alpha() does not exist yet, as of this version of libpng
+ */
+void PNGAPI
+png_read_image(png_structp png_ptr, png_bytepp image)
+{
+   png_uint_32 i, image_height;
+   int pass, j;
+   png_bytepp rp;
+
+   png_debug(1, "in png_read_image");
+   if (png_ptr == NULL) return;
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   pass = png_set_interlace_handling(png_ptr);
+#else
+   if (png_ptr->interlaced)
+      png_error(png_ptr,
+        "Cannot read interlaced image -- interlace handler disabled.");
+   pass = 1;
+#endif
+
+
+   image_height=png_ptr->height;
+   png_ptr->num_rows = image_height; /* Make sure this is set correctly */
+
+   for (j = 0; j < pass; j++)
+   {
+      rp = image;
+      for (i = 0; i < image_height; i++)
+      {
+         png_read_row(png_ptr, *rp, png_bytep_NULL);
+         rp++;
+      }
+   }
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the end of the PNG file.  Will not read past the end of the
+ * file, will verify the end is accurate, and will read any comments
+ * or time information at the end of the file, if info is not NULL.
+ */
+void PNGAPI
+png_read_end(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_end");
+   if (png_ptr == NULL) return;
+   png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
+
+   do
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IHDR;
+      PNG_CONST PNG_IDAT;
+      PNG_CONST PNG_IEND;
+      PNG_CONST PNG_PLTE;
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      PNG_CONST PNG_bKGD;
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      PNG_CONST PNG_cHRM;
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      PNG_CONST PNG_gAMA;
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      PNG_CONST PNG_hIST;
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      PNG_CONST PNG_iCCP;
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      PNG_CONST PNG_iTXt;
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      PNG_CONST PNG_oFFs;
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      PNG_CONST PNG_pCAL;
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      PNG_CONST PNG_pHYs;
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      PNG_CONST PNG_sBIT;
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      PNG_CONST PNG_sCAL;
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      PNG_CONST PNG_sPLT;
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      PNG_CONST PNG_sRGB;
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      PNG_CONST PNG_tEXt;
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      PNG_CONST PNG_tIME;
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      PNG_CONST PNG_tRNS;
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      PNG_CONST PNG_zTXt;
+#endif
+#endif /* PNG_USE_LOCAL_ARRAYS */
+      png_uint_32 length = png_read_chunk_header(png_ptr);
+      PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
+
+      if (!png_memcmp(chunk_name, png_IHDR, 4))
+         png_handle_IHDR(png_ptr, info_ptr, length);
+      else if (!png_memcmp(chunk_name, png_IEND, 4))
+         png_handle_IEND(png_ptr, info_ptr, length);
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+      else if (png_handle_as_unknown(png_ptr, chunk_name))
+      {
+         if (!png_memcmp(chunk_name, png_IDAT, 4))
+         {
+            if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+               png_error(png_ptr, "Too many IDAT's found");
+         }
+         png_handle_unknown(png_ptr, info_ptr, length);
+         if (!png_memcmp(chunk_name, png_PLTE, 4))
+            png_ptr->mode |= PNG_HAVE_PLTE;
+      }
+#endif
+      else if (!png_memcmp(chunk_name, png_IDAT, 4))
+      {
+         /* Zero length IDATs are legal after the last IDAT has been
+          * read, but not after other chunks have been read.
+          */
+         if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+            png_error(png_ptr, "Too many IDAT's found");
+         png_crc_finish(png_ptr, length);
+      }
+      else if (!png_memcmp(chunk_name, png_PLTE, 4))
+         png_handle_PLTE(png_ptr, info_ptr, length);
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_bKGD, 4))
+         png_handle_bKGD(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_cHRM, 4))
+         png_handle_cHRM(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_gAMA, 4))
+         png_handle_gAMA(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_hIST, 4))
+         png_handle_hIST(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_oFFs, 4))
+         png_handle_oFFs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_pCAL, 4))
+         png_handle_pCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_sCAL, 4))
+         png_handle_sCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_pHYs, 4))
+         png_handle_pHYs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_sBIT, 4))
+         png_handle_sBIT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_sRGB, 4))
+         png_handle_sRGB(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_iCCP, 4))
+         png_handle_iCCP(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_sPLT, 4))
+         png_handle_sPLT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_tEXt, 4))
+         png_handle_tEXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_tIME, 4))
+         png_handle_tIME(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_tRNS, 4))
+         png_handle_tRNS(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_zTXt, 4))
+         png_handle_zTXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      else if (!png_memcmp(chunk_name, png_iTXt, 4))
+         png_handle_iTXt(png_ptr, info_ptr, length);
+#endif
+      else
+         png_handle_unknown(png_ptr, info_ptr, length);
+   } while (!(png_ptr->mode & PNG_HAVE_IEND));
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+/* free all memory used by the read */
+void PNGAPI
+png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
+   png_infopp end_info_ptr_ptr)
+{
+   png_structp png_ptr = NULL;
+   png_infop info_ptr = NULL, end_info_ptr = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn = NULL;
+   png_voidp mem_ptr = NULL;
+#endif
+
+   png_debug(1, "in png_destroy_read_struct");
+   if (png_ptr_ptr != NULL)
+      png_ptr = *png_ptr_ptr;
+   if (png_ptr == NULL)
+      return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+   mem_ptr = png_ptr->mem_ptr;
+#endif
+
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (end_info_ptr_ptr != NULL)
+      end_info_ptr = *end_info_ptr_ptr;
+
+   png_read_destroy(png_ptr, info_ptr, end_info_ptr);
+
+   if (info_ptr != NULL)
+   {
+#if defined(PNG_TEXT_SUPPORTED)
+      png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, -1);
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
+          (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+
+   if (end_info_ptr != NULL)
+   {
+#if defined(PNG_READ_TEXT_SUPPORTED)
+      png_free_data(png_ptr, end_info_ptr, PNG_FREE_TEXT, -1);
+#endif
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)end_info_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)end_info_ptr);
+#endif
+      *end_info_ptr_ptr = NULL;
+   }
+
+   if (png_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
+          (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      *png_ptr_ptr = NULL;
+   }
+}
+
+/* free all memory used by the read (old method) */
+void /* PRIVATE */
+png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp;
+#endif
+   png_error_ptr error_fn;
+   png_error_ptr warning_fn;
+   png_voidp error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn;
+#endif
+
+   png_debug(1, "in png_read_destroy");
+   if (info_ptr != NULL)
+      png_info_destroy(png_ptr, info_ptr);
+
+   if (end_info_ptr != NULL)
+      png_info_destroy(png_ptr, end_info_ptr);
+
+   png_free(png_ptr, png_ptr->zbuf);
+   png_free(png_ptr, png_ptr->big_row_buf);
+   png_free(png_ptr, png_ptr->prev_row);
+   png_free(png_ptr, png_ptr->chunkdata);
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   png_free(png_ptr, png_ptr->palette_lookup);
+   png_free(png_ptr, png_ptr->dither_index);
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   png_free(png_ptr, png_ptr->gamma_table);
+#endif
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_free(png_ptr, png_ptr->gamma_from_1);
+   png_free(png_ptr, png_ptr->gamma_to_1);
+#endif
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_PLTE)
+      png_zfree(png_ptr, png_ptr->palette);
+   png_ptr->free_me &= ~PNG_FREE_PLTE;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_PLTE)
+      png_zfree(png_ptr, png_ptr->palette);
+   png_ptr->flags &= ~PNG_FLAG_FREE_PLTE;
+#endif
+#if defined(PNG_tRNS_SUPPORTED) || \
+    defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_TRNS)
+      png_free(png_ptr, png_ptr->trans);
+   png_ptr->free_me &= ~PNG_FREE_TRNS;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_TRNS)
+      png_free(png_ptr, png_ptr->trans);
+   png_ptr->flags &= ~PNG_FLAG_FREE_TRNS;
+#endif
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_HIST)
+      png_free(png_ptr, png_ptr->hist);
+   png_ptr->free_me &= ~PNG_FREE_HIST;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_HIST)
+      png_free(png_ptr, png_ptr->hist);
+   png_ptr->flags &= ~PNG_FLAG_FREE_HIST;
+#endif
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if (png_ptr->gamma_16_table != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_table[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_table);
+   }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr->gamma_16_from_1 != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_from_1);
+   }
+   if (png_ptr->gamma_16_to_1 != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_to_1);
+   }
+#endif
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+   png_free(png_ptr, png_ptr->time_buffer);
+#endif
+
+   inflateEnd(&png_ptr->zstream);
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+   png_free(png_ptr, png_ptr->save_buffer);
+#endif
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+#ifdef PNG_TEXT_SUPPORTED
+   png_free(png_ptr, png_ptr->current_text);
+#endif /* PNG_TEXT_SUPPORTED */
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+   /* Save the important info out of the png_struct, in case it is
+    * being used again.
+    */
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+#endif
+
+   error_fn = png_ptr->error_fn;
+   warning_fn = png_ptr->warning_fn;
+   error_ptr = png_ptr->error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+#endif
+
+   png_memset(png_ptr, 0, png_sizeof(png_struct));
+
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+   png_ptr->error_ptr = error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr->free_fn = free_fn;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
+#endif
+
+}
+
+void PNGAPI
+png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)
+{
+   if (png_ptr == NULL) return;
+   png_ptr->read_row_fn = read_row_fn;
+}
+
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+void PNGAPI
+png_read_png(png_structp png_ptr, png_infop info_ptr,
+                           int transforms,
+                           voidp params)
+{
+   int row;
+
+   if (png_ptr == NULL) return;
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+   /* invert the alpha channel from opacity to transparency
+    */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+       png_set_invert_alpha(png_ptr);
+#endif
+
+   /* png_read_info() gives us all of the information from the
+    * PNG file before the first IDAT (image data chunk).
+    */
+   png_read_info(png_ptr, info_ptr);
+   if (info_ptr->height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
+      png_error(png_ptr, "Image is too high to process with png_read_png()");
+
+   /* -------------- image transformations start here ------------------- */
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+   /* tell libpng to strip 16 bit/color files down to 8 bits per color
+    */
+   if (transforms & PNG_TRANSFORM_STRIP_16)
+       png_set_strip_16(png_ptr);
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+   /* Strip alpha bytes from the input data without combining with
+    * the background (not recommended).
+    */
+   if (transforms & PNG_TRANSFORM_STRIP_ALPHA)
+       png_set_strip_alpha(png_ptr);
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) && !defined(PNG_READ_EXPAND_SUPPORTED)
+   /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single
+    * byte into separate bytes (useful for paletted and grayscale images).
+    */
+   if (transforms & PNG_TRANSFORM_PACKING)
+       png_set_packing(png_ptr);
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+   /* Change the order of packed pixels to least significant bit first
+    * (not useful if you are using png_set_packing).
+    */
+   if (transforms & PNG_TRANSFORM_PACKSWAP)
+       png_set_packswap(png_ptr);
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   /* Expand paletted colors into true RGB triplets
+    * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel
+    * Expand paletted or RGB images with transparency to full alpha
+    * channels so the data will be available as RGBA quartets.
+    */
+   if (transforms & PNG_TRANSFORM_EXPAND)
+       if ((png_ptr->bit_depth < 8) ||
+           (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
+           (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
+         png_set_expand(png_ptr);
+#endif
+
+   /* We don't handle background color or gamma transformation or dithering.
+    */
+
+#if defined(PNG_READ_INVERT_SUPPORTED)
+   /* invert monochrome files to have 0 as white and 1 as black
+    */
+   if (transforms & PNG_TRANSFORM_INVERT_MONO)
+       png_set_invert_mono(png_ptr);
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+   /* If you want to shift the pixel values from the range [0,255] or
+    * [0,65535] to the original [0,7] or [0,31], or whatever range the
+    * colors were originally in:
+    */
+   if ((transforms & PNG_TRANSFORM_SHIFT)
+       && png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
+   {
+      png_color_8p sig_bit;
+
+      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+      png_set_shift(png_ptr, sig_bit);
+   }
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED)
+   /* flip the RGB pixels to BGR (or RGBA to BGRA)
+    */
+   if (transforms & PNG_TRANSFORM_BGR)
+       png_set_bgr(png_ptr);
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+   /* swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR)
+    */
+   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+       png_set_swap_alpha(png_ptr);
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED)
+   /* swap bytes of 16 bit files to least significant byte first
+    */
+   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+       png_set_swap(png_ptr);
+#endif
+
+   /* We don't handle adding filler bytes */
+
+   /* Optional call to gamma correct and add the background to the palette
+    * and update info structure.  REQUIRED if you are expecting libpng to
+    * update the palette for you (i.e., you selected such a transform above).
+    */
+   png_read_update_info(png_ptr, info_ptr);
+
+   /* -------------- image transformations end here ------------------- */
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
+#endif
+   if (info_ptr->row_pointers == NULL)
+   {
+      info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
+         info_ptr->height * png_sizeof(png_bytep));
+#ifdef PNG_FREE_ME_SUPPORTED
+      info_ptr->free_me |= PNG_FREE_ROWS;
+#endif
+      png_memset(info_ptr->row_pointers, 0, info_ptr->height
+         * png_sizeof(png_bytep));
+      for (row = 0; row < (int)info_ptr->height; row++)
+         info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
+            png_get_rowbytes(png_ptr, info_ptr));
+   }
+
+   png_read_image(png_ptr, info_ptr->row_pointers);
+   info_ptr->valid |= PNG_INFO_IDAT;
+
+   /* read rest of file, and get additional chunks in info_ptr - REQUIRED */
+   png_read_end(png_ptr, info_ptr);
+
+   transforms = transforms; /* quiet compiler warnings */
+   params = params;
+
+}
+#endif /* PNG_INFO_IMAGE_SUPPORTED */
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+#endif /* PNG_READ_SUPPORTED */
+
 /* pngread.c - read a PNG file
  *
  * Last changed in libpng 1.2.15 January 5, 2007
diff --git a/src/dep/src/irrlicht/libpng/pngrio.c b/src/dep/src/irrlicht/libpng/pngrio.c
index 2275683..de64d77 100644
--- a/src/dep/src/irrlicht/libpng/pngrio.c
+++ b/src/dep/src/irrlicht/libpng/pngrio.c
@@ -1,4 +1,170 @@
 
+/* pngrio.c - functions for data input
+ *
+ * Last changed in libpng 1.2.30 [August 15, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all input.  Users who need
+ * special handling are expected to write a function that has the same
+ * arguments as this and performs a similar function, but that possibly
+ * has a different input method.  Note that you shouldn't change this
+ * function, but rather write a replacement function and then make
+ * libpng use it at run time with png_set_read_fn(...).
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED)
+
+/* Read the data from whatever input you are using.  The default routine
+   reads from a file pointer.  Note that this routine sometimes gets called
+   with very small lengths, so you should implement some kind of simple
+   buffering if you are using unbuffered reads.  This should never be asked
+   to read more then 64K on a 16 bit machine. */
+void /* PRIVATE */
+png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_debug1(4, "reading %d bytes", (int)length);
+   if (png_ptr->read_data_fn != NULL)
+      (*(png_ptr->read_data_fn))(png_ptr, data, length);
+   else
+      png_error(png_ptr, "Call to NULL read function");
+}
+
+#if !defined(PNG_NO_STDIO)
+/* This is the function that does the actual reading of data.  If you are
+   not reading from a standard C stream, you should create a replacement
+   read_data function and use it at run time with png_set_read_fn(), rather
+   than changing the library. */
+#ifndef USE_FAR_KEYWORD
+void PNGAPI
+png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_size_t check;
+
+   if (png_ptr == NULL) return;
+   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+    * instead of an int, which is what fread() actually returns.
+    */
+#if defined(_WIN32_WCE)
+   if ( !ReadFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+      check = 0;
+#else
+   check = (png_size_t)fread(data, (png_size_t)1, length,
+      (png_FILE_p)png_ptr->io_ptr);
+#endif
+
+   if (check != length)
+      png_error(png_ptr, "Read Error");
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void PNGAPI
+png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   int check;
+   png_byte *n_data;
+   png_FILE_p io_ptr;
+
+   if (png_ptr == NULL) return;
+   /* Check if data really is near. If so, use usual code. */
+   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)n_data == data)
+   {
+#if defined(_WIN32_WCE)
+      if ( !ReadFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+         check = 0;
+#else
+      check = fread(n_data, 1, length, io_ptr);
+#endif
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t read, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         read = MIN(NEAR_BUF_SIZE, remaining);
+#if defined(_WIN32_WCE)
+         if ( !ReadFile((HANDLE)(io_ptr), buf, read, &err, NULL) )
+            err = 0;
+#else
+         err = fread(buf, (png_size_t)1, read, io_ptr);
+#endif
+         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
+         if (err != read)
+            break;
+         else
+            check += err;
+         data += read;
+         remaining -= read;
+      }
+      while (remaining != 0);
+   }
+   if ((png_uint_32)check != (png_uint_32)length)
+      png_error(png_ptr, "read Error");
+}
+#endif
+#endif
+
+/* This function allows the application to supply a new input function
+   for libpng if standard C streams aren't being used.
+
+   This function takes as its arguments:
+   png_ptr      - pointer to a png input data structure
+   io_ptr       - pointer to user supplied structure containing info about
+                  the input functions.  May be NULL.
+   read_data_fn - pointer to a new input function that takes as its
+                  arguments a pointer to a png_struct, a pointer to
+                  a location where input data can be stored, and a 32-bit
+                  unsigned int that is the number of bytes to be read.
+                  To exit and output any fatal error messages the new write
+                  function should call png_error(png_ptr, "Error msg"). */
+void PNGAPI
+png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
+   png_rw_ptr read_data_fn)
+{
+   if (png_ptr == NULL) return;
+   png_ptr->io_ptr = io_ptr;
+
+#if !defined(PNG_NO_STDIO)
+   if (read_data_fn != NULL)
+      png_ptr->read_data_fn = read_data_fn;
+   else
+      png_ptr->read_data_fn = png_default_read_data;
+#else
+   png_ptr->read_data_fn = read_data_fn;
+#endif
+
+   /* It is an error to write to a read device */
+   if (png_ptr->write_data_fn != NULL)
+   {
+      png_ptr->write_data_fn = NULL;
+      png_warning(png_ptr,
+         "It's an error to set both read_data_fn and write_data_fn in the ");
+      png_warning(png_ptr,
+         "same structure.  Resetting write_data_fn to NULL.");
+   }
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+   png_ptr->output_flush_fn = NULL;
+#endif
+}
+#endif /* PNG_READ_SUPPORTED */
+
 /* pngrio.c - functions for data input
  *
  * Last changed in libpng 1.2.13 November 13, 2006
diff --git a/src/dep/src/irrlicht/libpng/pngrtran.c b/src/dep/src/irrlicht/libpng/pngrtran.c
index 87de5b5..a5a656a 100644
--- a/src/dep/src/irrlicht/libpng/pngrtran.c
+++ b/src/dep/src/irrlicht/libpng/pngrtran.c
@@ -1,4 +1,4305 @@
 
+/* pngrtran.c - transforms the data in a row for PNG readers
+ *
+ * Last changed in libpng 1.2.35 [February 14, 2009]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file contains functions optionally called by an application
+ * in order to tell libpng how to handle data when reading a PNG.
+ * Transformations that are used in both reading and writing are
+ * in pngtrans.c.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED)
+
+/* Set the action on getting a CRC error for an ancillary or critical chunk. */
+void PNGAPI
+png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
+{
+   png_debug(1, "in png_set_crc_action");
+   /* Tell libpng how we react to CRC errors in critical chunks */
+   if (png_ptr == NULL) return;
+   switch (crit_action)
+   {
+      case PNG_CRC_NO_CHANGE:                        /* leave setting as is */
+         break;
+      case PNG_CRC_WARN_USE:                               /* warn/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE;
+         break;
+      case PNG_CRC_QUIET_USE:                             /* quiet/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE |
+                           PNG_FLAG_CRC_CRITICAL_IGNORE;
+         break;
+      case PNG_CRC_WARN_DISCARD:    /* not a valid action for critical data */
+         png_warning(png_ptr,
+            "Can't discard critical data on CRC error.");
+      case PNG_CRC_ERROR_QUIT:                                /* error/quit */
+      case PNG_CRC_DEFAULT:
+      default:
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         break;
+   }
+
+   switch (ancil_action)
+   {
+      case PNG_CRC_NO_CHANGE:                       /* leave setting as is */
+         break;
+      case PNG_CRC_WARN_USE:                              /* warn/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE;
+         break;
+      case PNG_CRC_QUIET_USE:                            /* quiet/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE |
+                           PNG_FLAG_CRC_ANCILLARY_NOWARN;
+         break;
+      case PNG_CRC_ERROR_QUIT:                               /* error/quit */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN;
+         break;
+      case PNG_CRC_WARN_DISCARD:                      /* warn/discard data */
+      case PNG_CRC_DEFAULT:
+      default:
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         break;
+   }
+}
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
+    defined(PNG_FLOATING_POINT_SUPPORTED)
+/* handle alpha and tRNS via a background color */
+void PNGAPI
+png_set_background(png_structp png_ptr,
+   png_color_16p background_color, int background_gamma_code,
+   int need_expand, double background_gamma)
+{
+   png_debug(1, "in png_set_background");
+   if (png_ptr == NULL) return;
+   if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
+   {
+      png_warning(png_ptr, "Application must supply a known background gamma");
+      return;
+   }
+
+   png_ptr->transformations |= PNG_BACKGROUND;
+   png_memcpy(&(png_ptr->background), background_color,
+      png_sizeof(png_color_16));
+   png_ptr->background_gamma = (float)background_gamma;
+   png_ptr->background_gamma_type = (png_byte)(background_gamma_code);
+   png_ptr->transformations |= (need_expand ? PNG_BACKGROUND_EXPAND : 0);
+}
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* strip 16 bit depth files to 8 bit depth */
+void PNGAPI
+png_set_strip_16(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_strip_16");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_16_TO_8;
+}
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_strip_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_strip_alpha");
+   if (png_ptr == NULL) return;
+   png_ptr->flags |= PNG_FLAG_STRIP_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* Dither file to 8 bit.  Supply a palette, the current number
+ * of elements in the palette, the maximum number of elements
+ * allowed, and a histogram if possible.  If the current number
+ * of colors is greater then the maximum number, the palette will be
+ * modified to fit in the maximum number.  "full_dither" indicates
+ * whether we need a dithering cube set up for RGB images, or if we
+ * simply are reducing the number of colors in a paletted image.
+ */
+
+typedef struct png_dsort_struct
+{
+   struct png_dsort_struct FAR * next;
+   png_byte left;
+   png_byte right;
+} png_dsort;
+typedef png_dsort FAR *       png_dsortp;
+typedef png_dsort FAR * FAR * png_dsortpp;
+
+void PNGAPI
+png_set_dither(png_structp png_ptr, png_colorp palette,
+   int num_palette, int maximum_colors, png_uint_16p histogram,
+   int full_dither)
+{
+   png_debug(1, "in png_set_dither");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_DITHER;
+
+   if (!full_dither)
+   {
+      int i;
+
+      png_ptr->dither_index = (png_bytep)png_malloc(png_ptr,
+         (png_uint_32)(num_palette * png_sizeof(png_byte)));
+      for (i = 0; i < num_palette; i++)
+         png_ptr->dither_index[i] = (png_byte)i;
+   }
+
+   if (num_palette > maximum_colors)
+   {
+      if (histogram != NULL)
+      {
+         /* This is easy enough, just throw out the least used colors.
+            Perhaps not the best solution, but good enough. */
+
+         int i;
+
+         /* initialize an array to sort colors */
+         png_ptr->dither_sort = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof(png_byte)));
+
+         /* initialize the dither_sort array */
+         for (i = 0; i < num_palette; i++)
+            png_ptr->dither_sort[i] = (png_byte)i;
+
+         /* Find the least used palette entries by starting a
+            bubble sort, and running it until we have sorted
+            out enough colors.  Note that we don't care about
+            sorting all the colors, just finding which are
+            least used. */
+
+         for (i = num_palette - 1; i >= maximum_colors; i--)
+         {
+            int done; /* to stop early if the list is pre-sorted */
+            int j;
+
+            done = 1;
+            for (j = 0; j < i; j++)
+            {
+               if (histogram[png_ptr->dither_sort[j]]
+                   < histogram[png_ptr->dither_sort[j + 1]])
+               {
+                  png_byte t;
+
+                  t = png_ptr->dither_sort[j];
+                  png_ptr->dither_sort[j] = png_ptr->dither_sort[j + 1];
+                  png_ptr->dither_sort[j + 1] = t;
+                  done = 0;
+               }
+            }
+            if (done)
+               break;
+         }
+
+         /* swap the palette around, and set up a table, if necessary */
+         if (full_dither)
+         {
+            int j = num_palette;
+
+            /* put all the useful colors within the max, but don't
+               move the others */
+            for (i = 0; i < maximum_colors; i++)
+            {
+               if ((int)png_ptr->dither_sort[i] >= maximum_colors)
+               {
+                  do
+                     j--;
+                  while ((int)png_ptr->dither_sort[j] >= maximum_colors);
+                  palette[i] = palette[j];
+               }
+            }
+         }
+         else
+         {
+            int j = num_palette;
+
+            /* move all the used colors inside the max limit, and
+               develop a translation table */
+            for (i = 0; i < maximum_colors; i++)
+            {
+               /* only move the colors we need to */
+               if ((int)png_ptr->dither_sort[i] >= maximum_colors)
+               {
+                  png_color tmp_color;
+
+                  do
+                     j--;
+                  while ((int)png_ptr->dither_sort[j] >= maximum_colors);
+
+                  tmp_color = palette[j];
+                  palette[j] = palette[i];
+                  palette[i] = tmp_color;
+                  /* indicate where the color went */
+                  png_ptr->dither_index[j] = (png_byte)i;
+                  png_ptr->dither_index[i] = (png_byte)j;
+               }
+            }
+
+            /* find closest color for those colors we are not using */
+            for (i = 0; i < num_palette; i++)
+            {
+               if ((int)png_ptr->dither_index[i] >= maximum_colors)
+               {
+                  int min_d, k, min_k, d_index;
+
+                  /* find the closest color to one we threw out */
+                  d_index = png_ptr->dither_index[i];
+                  min_d = PNG_COLOR_DIST(palette[d_index], palette[0]);
+                  for (k = 1, min_k = 0; k < maximum_colors; k++)
+                  {
+                     int d;
+
+                     d = PNG_COLOR_DIST(palette[d_index], palette[k]);
+
+                     if (d < min_d)
+                     {
+                        min_d = d;
+                        min_k = k;
+                     }
+                  }
+                  /* point to closest color */
+                  png_ptr->dither_index[i] = (png_byte)min_k;
+               }
+            }
+         }
+         png_free(png_ptr, png_ptr->dither_sort);
+         png_ptr->dither_sort = NULL;
+      }
+      else
+      {
+         /* This is much harder to do simply (and quickly).  Perhaps
+            we need to go through a median cut routine, but those
+            don't always behave themselves with only a few colors
+            as input.  So we will just find the closest two colors,
+            and throw out one of them (chosen somewhat randomly).
+            [We don't understand this at all, so if someone wants to
+             work on improving it, be our guest - AED, GRP]
+            */
+         int i;
+         int max_d;
+         int num_new_palette;
+         png_dsortp t;
+         png_dsortpp hash;
+
+         t = NULL;
+
+         /* initialize palette index arrays */
+         png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof(png_byte)));
+         png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof(png_byte)));
+
+         /* initialize the sort array */
+         for (i = 0; i < num_palette; i++)
+         {
+            png_ptr->index_to_palette[i] = (png_byte)i;
+            png_ptr->palette_to_index[i] = (png_byte)i;
+         }
+
+         hash = (png_dsortpp)png_malloc(png_ptr, (png_uint_32)(769 *
+            png_sizeof(png_dsortp)));
+         png_memset(hash, 0, 769 * png_sizeof(png_dsortp));
+
+         num_new_palette = num_palette;
+
+         /* initial wild guess at how far apart the farthest pixel
+            pair we will be eliminating will be.  Larger
+            numbers mean more areas will be allocated, Smaller
+            numbers run the risk of not saving enough data, and
+            having to do this all over again.
+
+            I have not done extensive checking on this number.
+            */
+         max_d = 96;
+
+         while (num_new_palette > maximum_colors)
+         {
+            for (i = 0; i < num_new_palette - 1; i++)
+            {
+               int j;
+
+               for (j = i + 1; j < num_new_palette; j++)
+               {
+                  int d;
+
+                  d = PNG_COLOR_DIST(palette[i], palette[j]);
+
+                  if (d <= max_d)
+                  {
+
+                     t = (png_dsortp)png_malloc_warn(png_ptr,
+                         (png_uint_32)(png_sizeof(png_dsort)));
+                     if (t == NULL)
+                         break;
+                     t->next = hash[d];
+                     t->left = (png_byte)i;
+                     t->right = (png_byte)j;
+                     hash[d] = t;
+                  }
+               }
+               if (t == NULL)
+                  break;
+            }
+
+            if (t != NULL)
+            for (i = 0; i <= max_d; i++)
+            {
+               if (hash[i] != NULL)
+               {
+                  png_dsortp p;
+
+                  for (p = hash[i]; p; p = p->next)
+                  {
+                     if ((int)png_ptr->index_to_palette[p->left]
+                        < num_new_palette &&
+                        (int)png_ptr->index_to_palette[p->right]
+                        < num_new_palette)
+                     {
+                        int j, next_j;
+
+                        if (num_new_palette & 0x01)
+                        {
+                           j = p->left;
+                           next_j = p->right;
+                        }
+                        else
+                        {
+                           j = p->right;
+                           next_j = p->left;
+                        }
+
+                        num_new_palette--;
+                        palette[png_ptr->index_to_palette[j]]
+                          = palette[num_new_palette];
+                        if (!full_dither)
+                        {
+                           int k;
+
+                           for (k = 0; k < num_palette; k++)
+                           {
+                              if (png_ptr->dither_index[k] ==
+                                 png_ptr->index_to_palette[j])
+                                 png_ptr->dither_index[k] =
+                                    png_ptr->index_to_palette[next_j];
+                              if ((int)png_ptr->dither_index[k] ==
+                                 num_new_palette)
+                                 png_ptr->dither_index[k] =
+                                    png_ptr->index_to_palette[j];
+                           }
+                        }
+
+                        png_ptr->index_to_palette[png_ptr->palette_to_index
+                           [num_new_palette]] = png_ptr->index_to_palette[j];
+                        png_ptr->palette_to_index[png_ptr->index_to_palette[j]]
+                           = png_ptr->palette_to_index[num_new_palette];
+
+                        png_ptr->index_to_palette[j] = (png_byte)num_new_palette;
+                        png_ptr->palette_to_index[num_new_palette] = (png_byte)j;
+                     }
+                     if (num_new_palette <= maximum_colors)
+                        break;
+                  }
+                  if (num_new_palette <= maximum_colors)
+                     break;
+               }
+            }
+
+            for (i = 0; i < 769; i++)
+            {
+               if (hash[i] != NULL)
+               {
+                  png_dsortp p = hash[i];
+                  while (p)
+                  {
+                     t = p->next;
+                     png_free(png_ptr, p);
+                     p = t;
+                  }
+               }
+               hash[i] = 0;
+            }
+            max_d += 96;
+         }
+         png_free(png_ptr, hash);
+         png_free(png_ptr, png_ptr->palette_to_index);
+         png_free(png_ptr, png_ptr->index_to_palette);
+         png_ptr->palette_to_index = NULL;
+         png_ptr->index_to_palette = NULL;
+      }
+      num_palette = maximum_colors;
+   }
+   if (png_ptr->palette == NULL)
+   {
+      png_ptr->palette = palette;
+   }
+   png_ptr->num_palette = (png_uint_16)num_palette;
+
+   if (full_dither)
+   {
+      int i;
+      png_bytep distance;
+      int total_bits = PNG_DITHER_RED_BITS + PNG_DITHER_GREEN_BITS +
+         PNG_DITHER_BLUE_BITS;
+      int num_red = (1 << PNG_DITHER_RED_BITS);
+      int num_green = (1 << PNG_DITHER_GREEN_BITS);
+      int num_blue = (1 << PNG_DITHER_BLUE_BITS);
+      png_size_t num_entries = ((png_size_t)1 << total_bits);
+
+      png_ptr->palette_lookup = (png_bytep )png_malloc(png_ptr,
+         (png_uint_32)(num_entries * png_sizeof(png_byte)));
+
+      png_memset(png_ptr->palette_lookup, 0, num_entries *
+         png_sizeof(png_byte));
+
+      distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries *
+         png_sizeof(png_byte)));
+
+      png_memset(distance, 0xff, num_entries * png_sizeof(png_byte));
+
+      for (i = 0; i < num_palette; i++)
+      {
+         int ir, ig, ib;
+         int r = (palette[i].red >> (8 - PNG_DITHER_RED_BITS));
+         int g = (palette[i].green >> (8 - PNG_DITHER_GREEN_BITS));
+         int b = (palette[i].blue >> (8 - PNG_DITHER_BLUE_BITS));
+
+         for (ir = 0; ir < num_red; ir++)
+         {
+            /* int dr = abs(ir - r); */
+            int dr = ((ir > r) ? ir - r : r - ir);
+            int index_r = (ir << (PNG_DITHER_BLUE_BITS + PNG_DITHER_GREEN_BITS));
+
+            for (ig = 0; ig < num_green; ig++)
+            {
+               /* int dg = abs(ig - g); */
+               int dg = ((ig > g) ? ig - g : g - ig);
+               int dt = dr + dg;
+               int dm = ((dr > dg) ? dr : dg);
+               int index_g = index_r | (ig << PNG_DITHER_BLUE_BITS);
+
+               for (ib = 0; ib < num_blue; ib++)
+               {
+                  int d_index = index_g | ib;
+                  /* int db = abs(ib - b); */
+                  int db = ((ib > b) ? ib - b : b - ib);
+                  int dmax = ((dm > db) ? dm : db);
+                  int d = dmax + dt + db;
+
+                  if (d < (int)distance[d_index])
+                  {
+                     distance[d_index] = (png_byte)d;
+                     png_ptr->palette_lookup[d_index] = (png_byte)i;
+                  }
+               }
+            }
+         }
+      }
+
+      png_free(png_ptr, distance);
+   }
+}
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+/* Transform the image from the file_gamma to the screen_gamma.  We
+ * only do transformations on images where the file_gamma and screen_gamma
+ * are not close reciprocals, otherwise it slows things down slightly, and
+ * also needlessly introduces small errors.
+ *
+ * We will turn off gamma transformation later if no semitransparent entries
+ * are present in the tRNS array for palette images.  We can't do it here
+ * because we don't necessarily have the tRNS chunk yet.
+ */
+void PNGAPI
+png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)
+{
+   png_debug(1, "in png_set_gamma");
+   if (png_ptr == NULL) return;
+   if ((fabs(scrn_gamma * file_gamma - 1.0) > PNG_GAMMA_THRESHOLD) ||
+       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) ||
+       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
+     png_ptr->transformations |= PNG_GAMMA;
+   png_ptr->gamma = (float)file_gamma;
+   png_ptr->screen_gamma = (float)scrn_gamma;
+}
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expand paletted images to RGB, expand grayscale images of
+ * less than 8-bit depth to 8-bit depth, and expand tRNS chunks
+ * to alpha channels.
+ */
+void PNGAPI
+png_set_expand(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+}
+
+/* GRR 19990627:  the following three functions currently are identical
+ *  to png_set_expand().  However, it is entirely reasonable that someone
+ *  might wish to expand an indexed image to RGB but *not* expand a single,
+ *  fully transparent palette entry to a full alpha channel--perhaps instead
+ *  convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace
+ *  the transparent color with a particular RGB value, or drop tRNS entirely.
+ *  IOW, a future version of the library may make the transformations flag
+ *  a bit more fine-grained, with separate bits for each of these three
+ *  functions.
+ *
+ *  More to the point, these functions make it obvious what libpng will be
+ *  doing, whereas "expand" can (and does) mean any number of things.
+ *
+ *  GRP 20060307: In libpng-1.4.0, png_set_gray_1_2_4_to_8() was modified
+ *  to expand only the sample depth but not to expand the tRNS to alpha.
+ */
+
+/* Expand paletted images to RGB. */
+void PNGAPI
+png_set_palette_to_rgb(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_palette_to_rgb");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+}
+
+#if !defined(PNG_1_0_X)
+/* Expand grayscale images of less than 8-bit depth to 8 bits. */
+void PNGAPI
+png_set_expand_gray_1_2_4_to_8(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand_gray_1_2_4_to_8");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_EXPAND;
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+}
+#endif
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Expand grayscale images of less than 8-bit depth to 8 bits. */
+/* Deprecated as of libpng-1.2.9 */
+void PNGAPI
+png_set_gray_1_2_4_to_8(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_gray_1_2_4_to_8");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+}
+#endif
+
+
+/* Expand tRNS chunks to alpha channels. */
+void PNGAPI
+png_set_tRNS_to_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_tRNS_to_alpha");
+   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+}
+#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+void PNGAPI
+png_set_gray_to_rgb(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_gray_to_rgb");
+   png_ptr->transformations |= PNG_GRAY_TO_RGB;
+   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+#if defined(PNG_FLOATING_POINT_SUPPORTED)
+/* Convert a RGB image to a grayscale of the same width.  This allows us,
+ * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.
+ */
+
+void PNGAPI
+png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
+   double green)
+{
+      int red_fixed = (int)((float)red*100000.0 + 0.5);
+      int green_fixed = (int)((float)green*100000.0 + 0.5);
+      if (png_ptr == NULL) return;
+      png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed);
+}
+#endif
+
+void PNGAPI
+png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
+   png_fixed_point red, png_fixed_point green)
+{
+   png_debug(1, "in png_set_rgb_to_gray");
+   if (png_ptr == NULL) return;
+   switch(error_action)
+   {
+      case 1: png_ptr->transformations |= PNG_RGB_TO_GRAY;
+              break;
+      case 2: png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN;
+              break;
+      case 3: png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;
+   }
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+      png_ptr->transformations |= PNG_EXPAND;
+#else
+   {
+      png_warning(png_ptr,
+        "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED.");
+      png_ptr->transformations &= ~PNG_RGB_TO_GRAY;
+   }
+#endif
+   {
+      png_uint_16 red_int, green_int;
+      if (red < 0 || green < 0)
+      {
+         red_int   =  6968; /* .212671 * 32768 + .5 */
+         green_int = 23434; /* .715160 * 32768 + .5 */
+      }
+      else if (red + green < 100000L)
+      {
+        red_int = (png_uint_16)(((png_uint_32)red*32768L)/100000L);
+        green_int = (png_uint_16)(((png_uint_32)green*32768L)/100000L);
+      }
+      else
+      {
+         png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
+         red_int   =  6968;
+         green_int = 23434;
+      }
+      png_ptr->rgb_to_gray_red_coeff   = red_int;
+      png_ptr->rgb_to_gray_green_coeff = green_int;
+      png_ptr->rgb_to_gray_blue_coeff  =
+         (png_uint_16)(32768 - red_int - green_int);
+   }
+}
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+void PNGAPI
+png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+   read_user_transform_fn)
+{
+   png_debug(1, "in png_set_read_user_transform_fn");
+   if (png_ptr == NULL) return;
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   png_ptr->transformations |= PNG_USER_TRANSFORM;
+   png_ptr->read_user_transform_fn = read_user_transform_fn;
+#endif
+#ifdef PNG_LEGACY_SUPPORTED
+   if (read_user_transform_fn)
+      png_warning(png_ptr,
+        "This version of libpng does not support user transforms");
+#endif
+}
+#endif
+
+/* Initialize everything needed for the read.  This includes modifying
+ * the palette.
+ */
+void /* PRIVATE */
+png_init_read_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_init_read_transformations");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (png_ptr != NULL)
+#endif
+  {
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || defined(PNG_READ_SHIFT_SUPPORTED) \
+ || defined(PNG_READ_GAMMA_SUPPORTED)
+   int color_type = png_ptr->color_type;
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   /* Detect gray background and attempt to enable optimization
+    * for gray --> RGB case */
+   /* Note:  if PNG_BACKGROUND_EXPAND is set and color_type is either RGB or
+    * RGB_ALPHA (in which case need_expand is superfluous anyway), the
+    * background color might actually be gray yet not be flagged as such.
+    * This is not a problem for the current code, which uses
+    * PNG_BACKGROUND_IS_GRAY only to decide when to do the
+    * png_do_gray_to_rgb() transformation.
+    */
+   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
+       !(color_type & PNG_COLOR_MASK_COLOR))
+   {
+          png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
+   } else if ((png_ptr->transformations & PNG_BACKGROUND) &&
+              !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
+              (png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+              png_ptr->background.red == png_ptr->background.green &&
+              png_ptr->background.red == png_ptr->background.blue)
+   {
+          png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
+          png_ptr->background.gray = png_ptr->background.red;
+   }
+#endif
+
+   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
+       (png_ptr->transformations & PNG_EXPAND))
+   {
+      if (!(color_type & PNG_COLOR_MASK_COLOR))  /* i.e., GRAY or GRAY_ALPHA */
+      {
+         /* expand background and tRNS chunks */
+         switch (png_ptr->bit_depth)
+         {
+            case 1:
+               png_ptr->background.gray *= (png_uint_16)0xff;
+               png_ptr->background.red = png_ptr->background.green
+                 =  png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0xff;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
+               break;
+            case 2:
+               png_ptr->background.gray *= (png_uint_16)0x55;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0x55;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
+               break;
+            case 4:
+               png_ptr->background.gray *= (png_uint_16)0x11;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+               {
+                 png_ptr->trans_values.gray *= (png_uint_16)0x11;
+                 png_ptr->trans_values.red = png_ptr->trans_values.green
+                   = png_ptr->trans_values.blue = png_ptr->trans_values.gray;
+               }
+               break;
+            case 8:
+            case 16:
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               break;
+         }
+      }
+      else if (color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_ptr->background.red   =
+            png_ptr->palette[png_ptr->background.index].red;
+         png_ptr->background.green =
+            png_ptr->palette[png_ptr->background.index].green;
+         png_ptr->background.blue  =
+            png_ptr->palette[png_ptr->background.index].blue;
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+        if (png_ptr->transformations & PNG_INVERT_ALPHA)
+        {
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+           if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+#endif
+           {
+           /* invert the alpha channel (in tRNS) unless the pixels are
+              going to be expanded, in which case leave it for later */
+              int i, istop;
+              istop=(int)png_ptr->num_trans;
+              for (i=0; i<istop; i++)
+                 png_ptr->trans[i] = (png_byte)(255 - png_ptr->trans[i]);
+           }
+        }
+#endif
+
+      }
+   }
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
+   png_ptr->background_1 = png_ptr->background;
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+
+   if ((color_type == PNG_COLOR_TYPE_PALETTE && png_ptr->num_trans != 0)
+       && (fabs(png_ptr->screen_gamma * png_ptr->gamma - 1.0)
+         < PNG_GAMMA_THRESHOLD))
+   {
+    int i, k;
+    k=0;
+    for (i=0; i<png_ptr->num_trans; i++)
+    {
+      if (png_ptr->trans[i] != 0 && png_ptr->trans[i] != 0xff)
+        k=1; /* partial transparency is present */
+    }
+    if (k == 0)
+      png_ptr->transformations &= ~PNG_GAMMA;
+   }
+
+   if ((png_ptr->transformations & (PNG_GAMMA | PNG_RGB_TO_GRAY)) &&
+        png_ptr->gamma != 0.0)
+   {
+      png_build_gamma_table(png_ptr);
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+      if (png_ptr->transformations & PNG_BACKGROUND)
+      {
+         if (color_type == PNG_COLOR_TYPE_PALETTE)
+         {
+           /* could skip if no transparency and
+           */
+            png_color back, back_1;
+            png_colorp palette = png_ptr->palette;
+            int num_palette = png_ptr->num_palette;
+            int i;
+            if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
+            {
+               back.red = png_ptr->gamma_table[png_ptr->background.red];
+               back.green = png_ptr->gamma_table[png_ptr->background.green];
+               back.blue = png_ptr->gamma_table[png_ptr->background.blue];
+
+               back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
+               back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
+               back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
+            }
+            else
+            {
+               double g, gs;
+
+               switch (png_ptr->background_gamma_type)
+               {
+                  case PNG_BACKGROUND_GAMMA_SCREEN:
+                     g = (png_ptr->screen_gamma);
+                     gs = 1.0;
+                     break;
+                  case PNG_BACKGROUND_GAMMA_FILE:
+                     g = 1.0 / (png_ptr->gamma);
+                     gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+                     break;
+                  case PNG_BACKGROUND_GAMMA_UNIQUE:
+                     g = 1.0 / (png_ptr->background_gamma);
+                     gs = 1.0 / (png_ptr->background_gamma *
+                                 png_ptr->screen_gamma);
+                     break;
+                  default:
+                     g = 1.0;    /* back_1 */
+                     gs = 1.0;   /* back */
+               }
+
+               if ( fabs(gs - 1.0) < PNG_GAMMA_THRESHOLD)
+               {
+                  back.red   = (png_byte)png_ptr->background.red;
+                  back.green = (png_byte)png_ptr->background.green;
+                  back.blue  = (png_byte)png_ptr->background.blue;
+               }
+               else
+               {
+                  back.red = (png_byte)(pow(
+                     (double)png_ptr->background.red/255, gs) * 255.0 + .5);
+                  back.green = (png_byte)(pow(
+                     (double)png_ptr->background.green/255, gs) * 255.0 + .5);
+                  back.blue = (png_byte)(pow(
+                     (double)png_ptr->background.blue/255, gs) * 255.0 + .5);
+               }
+
+               back_1.red = (png_byte)(pow(
+                  (double)png_ptr->background.red/255, g) * 255.0 + .5);
+               back_1.green = (png_byte)(pow(
+                  (double)png_ptr->background.green/255, g) * 255.0 + .5);
+               back_1.blue = (png_byte)(pow(
+                  (double)png_ptr->background.blue/255, g) * 255.0 + .5);
+            }
+            for (i = 0; i < num_palette; i++)
+            {
+               if (i < (int)png_ptr->num_trans && png_ptr->trans[i] != 0xff)
+               {
+                  if (png_ptr->trans[i] == 0)
+                  {
+                     palette[i] = back;
+                  }
+                  else /* if (png_ptr->trans[i] != 0xff) */
+                  {
+                     png_byte v, w;
+
+                     v = png_ptr->gamma_to_1[palette[i].red];
+                     png_composite(w, v, png_ptr->trans[i], back_1.red);
+                     palette[i].red = png_ptr->gamma_from_1[w];
+
+                     v = png_ptr->gamma_to_1[palette[i].green];
+                     png_composite(w, v, png_ptr->trans[i], back_1.green);
+                     palette[i].green = png_ptr->gamma_from_1[w];
+
+                     v = png_ptr->gamma_to_1[palette[i].blue];
+                     png_composite(w, v, png_ptr->trans[i], back_1.blue);
+                     palette[i].blue = png_ptr->gamma_from_1[w];
+                  }
+               }
+               else
+               {
+                  palette[i].red = png_ptr->gamma_table[palette[i].red];
+                  palette[i].green = png_ptr->gamma_table[palette[i].green];
+                  palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+               }
+            }
+	    /* Prevent the transformations being done again, and make sure
+	     * that the now spurious alpha channel is stripped - the code
+	     * has just reduced background composition and gamma correction
+	     * to a simple alpha channel strip.
+	     */
+	    png_ptr->transformations &= ~PNG_BACKGROUND;
+	    png_ptr->transformations &= ~PNG_GAMMA;
+	    png_ptr->transformations |= PNG_STRIP_ALPHA;
+         }
+         /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
+         else
+         /* color_type != PNG_COLOR_TYPE_PALETTE */
+         {
+            double m = (double)(((png_uint_32)1 << png_ptr->bit_depth) - 1);
+            double g = 1.0;
+            double gs = 1.0;
+
+            switch (png_ptr->background_gamma_type)
+            {
+               case PNG_BACKGROUND_GAMMA_SCREEN:
+                  g = (png_ptr->screen_gamma);
+                  gs = 1.0;
+                  break;
+               case PNG_BACKGROUND_GAMMA_FILE:
+                  g = 1.0 / (png_ptr->gamma);
+                  gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+                  break;
+               case PNG_BACKGROUND_GAMMA_UNIQUE:
+                  g = 1.0 / (png_ptr->background_gamma);
+                  gs = 1.0 / (png_ptr->background_gamma *
+                     png_ptr->screen_gamma);
+                  break;
+            }
+
+            png_ptr->background_1.gray = (png_uint_16)(pow(
+               (double)png_ptr->background.gray / m, g) * m + .5);
+            png_ptr->background.gray = (png_uint_16)(pow(
+               (double)png_ptr->background.gray / m, gs) * m + .5);
+
+            if ((png_ptr->background.red != png_ptr->background.green) ||
+                (png_ptr->background.red != png_ptr->background.blue) ||
+                (png_ptr->background.red != png_ptr->background.gray))
+            {
+               /* RGB or RGBA with color background */
+               png_ptr->background_1.red = (png_uint_16)(pow(
+                  (double)png_ptr->background.red / m, g) * m + .5);
+               png_ptr->background_1.green = (png_uint_16)(pow(
+                  (double)png_ptr->background.green / m, g) * m + .5);
+               png_ptr->background_1.blue = (png_uint_16)(pow(
+                  (double)png_ptr->background.blue / m, g) * m + .5);
+               png_ptr->background.red = (png_uint_16)(pow(
+                  (double)png_ptr->background.red / m, gs) * m + .5);
+               png_ptr->background.green = (png_uint_16)(pow(
+                  (double)png_ptr->background.green / m, gs) * m + .5);
+               png_ptr->background.blue = (png_uint_16)(pow(
+                  (double)png_ptr->background.blue / m, gs) * m + .5);
+            }
+            else
+            {
+               /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */
+               png_ptr->background_1.red = png_ptr->background_1.green
+                 = png_ptr->background_1.blue = png_ptr->background_1.gray;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+            }
+         }
+      }
+      else
+      /* transformation does not include PNG_BACKGROUND */
+#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+      if (color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_colorp palette = png_ptr->palette;
+         int num_palette = png_ptr->num_palette;
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            palette[i].red = png_ptr->gamma_table[palette[i].red];
+            palette[i].green = png_ptr->gamma_table[palette[i].green];
+            palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+         }
+
+	 /* Done the gamma correction. */
+	 png_ptr->transformations &= ~PNG_GAMMA;
+      }
+   }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   else
+#endif
+#endif /* PNG_READ_GAMMA_SUPPORTED && PNG_FLOATING_POINT_SUPPORTED */
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* No GAMMA transformation */
+   if ((png_ptr->transformations & PNG_BACKGROUND) &&
+       (color_type == PNG_COLOR_TYPE_PALETTE))
+   {
+      int i;
+      int istop = (int)png_ptr->num_trans;
+      png_color back;
+      png_colorp palette = png_ptr->palette;
+
+      back.red   = (png_byte)png_ptr->background.red;
+      back.green = (png_byte)png_ptr->background.green;
+      back.blue  = (png_byte)png_ptr->background.blue;
+
+      for (i = 0; i < istop; i++)
+      {
+         if (png_ptr->trans[i] == 0)
+         {
+            palette[i] = back;
+         }
+         else if (png_ptr->trans[i] != 0xff)
+         {
+            /* The png_composite() macro is defined in png.h */
+            png_composite(palette[i].red, palette[i].red,
+               png_ptr->trans[i], back.red);
+            png_composite(palette[i].green, palette[i].green,
+               png_ptr->trans[i], back.green);
+            png_composite(palette[i].blue, palette[i].blue,
+               png_ptr->trans[i], back.blue);
+         }
+      }
+
+      /* Handled alpha, still need to strip the channel. */
+      png_ptr->transformations &= ~PNG_BACKGROUND;
+      png_ptr->transformations |= PNG_STRIP_ALPHA;
+   }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+   if ((png_ptr->transformations & PNG_SHIFT) &&
+      (color_type == PNG_COLOR_TYPE_PALETTE))
+   {
+      png_uint_16 i;
+      png_uint_16 istop = png_ptr->num_palette;
+      int sr = 8 - png_ptr->sig_bit.red;
+      int sg = 8 - png_ptr->sig_bit.green;
+      int sb = 8 - png_ptr->sig_bit.blue;
+
+      if (sr < 0 || sr > 8)
+         sr = 0;
+      if (sg < 0 || sg > 8)
+         sg = 0;
+      if (sb < 0 || sb > 8)
+         sb = 0;
+      for (i = 0; i < istop; i++)
+      {
+         png_ptr->palette[i].red >>= sr;
+         png_ptr->palette[i].green >>= sg;
+         png_ptr->palette[i].blue >>= sb;
+      }
+   }
+#endif  /* PNG_READ_SHIFT_SUPPORTED */
+ }
+#if !defined(PNG_READ_GAMMA_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED) \
+ && !defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr)
+      return;
+#endif
+}
+
+/* Modify the info structure to reflect the transformations.  The
+ * info should be updated so a PNG file could be written with it,
+ * assuming the transformations result in valid PNG data.
+ */
+void /* PRIVATE */
+png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_transform_info");
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         if (png_ptr->num_trans &&
+              (png_ptr->transformations & PNG_EXPAND_tRNS))
+            info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+         else
+            info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+         info_ptr->bit_depth = 8;
+         info_ptr->num_trans = 0;
+      }
+      else
+      {
+         if (png_ptr->num_trans)
+         {
+            if (png_ptr->transformations & PNG_EXPAND_tRNS)
+              info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+#if 0 /* Removed from libpng-1.2.27 */
+            else
+              info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
+#endif
+         }
+         if (info_ptr->bit_depth < 8)
+            info_ptr->bit_depth = 8;
+         info_ptr->num_trans = 0;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr->transformations & PNG_BACKGROUND)
+   {
+      info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
+      info_ptr->num_trans = 0;
+      info_ptr->background = png_ptr->background;
+   }
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if (png_ptr->transformations & PNG_GAMMA)
+   {
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      info_ptr->gamma = png_ptr->gamma;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      info_ptr->int_gamma = png_ptr->int_gamma;
+#endif
+   }
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+   if ((png_ptr->transformations & PNG_16_TO_8) && (info_ptr->bit_depth == 16))
+      info_ptr->bit_depth = 8;
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+      info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+      info_ptr->color_type &= ~PNG_COLOR_MASK_COLOR;
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   if (png_ptr->transformations & PNG_DITHER)
+   {
+      if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
+         (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
+         png_ptr->palette_lookup && info_ptr->bit_depth == 8)
+      {
+         info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+   if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8))
+      info_ptr->bit_depth = 8;
+#endif
+
+   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      info_ptr->channels = 1;
+   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      info_ptr->channels = 3;
+   else
+      info_ptr->channels = 1;
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+   if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)
+      info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
+#endif
+
+   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+      info_ptr->channels++;
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+   /* STRIP_ALPHA and FILLER allowed:  MASK_ALPHA bit stripped above */
+   if ((png_ptr->transformations & PNG_FILLER) &&
+       ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
+       (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)))
+   {
+      info_ptr->channels++;
+      /* if adding a true alpha channel not just filler */
+#if !defined(PNG_1_0_X)
+      if (png_ptr->transformations & PNG_ADD_ALPHA)
+        info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+#endif
+   }
+#endif
+
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \
+defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+     {
+       if (info_ptr->bit_depth < png_ptr->user_transform_depth)
+         info_ptr->bit_depth = png_ptr->user_transform_depth;
+       if (info_ptr->channels < png_ptr->user_transform_channels)
+         info_ptr->channels = png_ptr->user_transform_channels;
+     }
+#endif
+
+   info_ptr->pixel_depth = (png_byte)(info_ptr->channels *
+      info_ptr->bit_depth);
+
+   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, info_ptr->width);
+
+#if !defined(PNG_READ_EXPAND_SUPPORTED)
+   if (png_ptr)
+      return;
+#endif
+}
+
+/* Transform the row.  The order of transformations is significant,
+ * and is very touchy.  If you add a transformation, take care to
+ * decide how it fits in with the other transformations here.
+ */
+void /* PRIVATE */
+png_do_read_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_do_read_transformations");
+   if (png_ptr->row_buf == NULL)
+   {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+      char msg[50];
+
+      png_snprintf2(msg, 50,
+         "NULL row buffer for row %ld, pass %d", (long)png_ptr->row_number,
+         png_ptr->pass);
+      png_error(png_ptr, msg);
+#else
+      png_error(png_ptr, "NULL row buffer");
+#endif
+   }
+#ifdef PNG_WARN_UNINITIALIZED_ROW
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      /* Application has failed to call either png_read_start_image()
+       * or png_read_update_info() after setting transforms that expand
+       * pixels.  This check added to libpng-1.2.19 */
+#if (PNG_WARN_UNINITIALIZED_ROW==1)
+      png_error(png_ptr, "Uninitialized row");
+#else
+      png_warning(png_ptr, "Uninitialized row");
+#endif
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1,
+            png_ptr->palette, png_ptr->trans, png_ptr->num_trans);
+      }
+      else
+      {
+         if (png_ptr->num_trans &&
+             (png_ptr->transformations & PNG_EXPAND_tRNS))
+            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
+               &(png_ptr->trans_values));
+         else
+            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
+               NULL);
+      }
+   }
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+   if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)
+      png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         PNG_FLAG_FILLER_AFTER | (png_ptr->flags & PNG_FLAG_STRIP_ALPHA));
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+   {
+      int rgb_error =
+         png_do_rgb_to_gray(png_ptr, &(png_ptr->row_info), png_ptr->row_buf + 1);
+      if (rgb_error)
+      {
+         png_ptr->rgb_to_gray_status=1;
+         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
+             PNG_RGB_TO_GRAY_WARN)
+            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
+             PNG_RGB_TO_GRAY_ERR)
+            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+      }
+   }
+#endif
+
+/*
+From Andreas Dilger e-mail to png-implement, 26 March 1998:
+
+  In most cases, the "simple transparency" should be done prior to doing
+  gray-to-RGB, or you will have to test 3x as many bytes to check if a
+  pixel is transparent.  You would also need to make sure that the
+  transparency information is upgraded to RGB.
+
+  To summarize, the current flow is:
+  - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
+                                  with background "in place" if transparent,
+                                  convert to RGB if necessary
+  - Gray + alpha -> composite with gray background and remove alpha bytes,
+                                  convert to RGB if necessary
+
+  To support RGB backgrounds for gray images we need:
+  - Gray + simple transparency -> convert to RGB + simple transparency, compare
+                                  3 or 6 bytes and composite with background
+                                  "in place" if transparent (3x compare/pixel
+                                  compared to doing composite with gray bkgrnd)
+  - Gray + alpha -> convert to RGB + alpha, composite with background and
+                                  remove alpha bytes (3x float operations/pixel
+                                  compared with composite on gray background)
+
+  Greg's change will do this.  The reason it wasn't done before is for
+  performance, as this increases the per-pixel operations.  If we would check
+  in advance if the background was gray or RGB, and position the gray-to-RGB
+  transform appropriately, then it would save a lot of work/time.
+ */
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   /* if gray -> RGB, do so now only if background is non-gray; else do later
+    * for performance reasons */
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+       !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
+      png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if ((png_ptr->transformations & PNG_BACKGROUND) &&
+      ((png_ptr->num_trans != 0 ) ||
+      (png_ptr->color_type & PNG_COLOR_MASK_ALPHA)))
+      png_do_background(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->trans_values), &(png_ptr->background)
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+         , &(png_ptr->background_1),
+         png_ptr->gamma_table, png_ptr->gamma_from_1,
+         png_ptr->gamma_to_1, png_ptr->gamma_16_table,
+         png_ptr->gamma_16_from_1, png_ptr->gamma_16_to_1,
+         png_ptr->gamma_shift
+#endif
+);
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if ((png_ptr->transformations & PNG_GAMMA) &&
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+      !((png_ptr->transformations & PNG_BACKGROUND) &&
+      ((png_ptr->num_trans != 0) ||
+      (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) &&
+#endif
+      (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
+      png_do_gamma(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->gamma_table, png_ptr->gamma_16_table,
+         png_ptr->gamma_shift);
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+   if (png_ptr->transformations & PNG_16_TO_8)
+      png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   if (png_ptr->transformations & PNG_DITHER)
+   {
+      png_do_dither((png_row_infop)&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->palette_lookup, png_ptr->dither_index);
+      if (png_ptr->row_info.rowbytes == (png_uint_32)0)
+         png_error(png_ptr, "png_do_dither returned rowbytes=0");
+   }
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_do_unshift(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->shift));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_do_unpack(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   /* if gray -> RGB, do so now only if we did not do so above */
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
+      png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_do_read_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         (png_uint_32)png_ptr->filler, png_ptr->flags);
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_ALPHA)
+      png_do_read_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_ALPHA)
+      png_do_read_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+    {
+      if (png_ptr->read_user_transform_fn != NULL)
+        (*(png_ptr->read_user_transform_fn)) /* user read transform function */
+          (png_ptr,                    /* png_ptr */
+           &(png_ptr->row_info),       /* row_info:     */
+             /*  png_uint_32 width;          width of row */
+             /*  png_uint_32 rowbytes;       number of bytes in row */
+             /*  png_byte color_type;        color type of pixels */
+             /*  png_byte bit_depth;         bit depth of samples */
+             /*  png_byte channels;          number of channels (1-4) */
+             /*  png_byte pixel_depth;       bits per pixel (depth*channels) */
+           png_ptr->row_buf + 1);      /* start of pixel data for row */
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+      if (png_ptr->user_transform_depth)
+         png_ptr->row_info.bit_depth = png_ptr->user_transform_depth;
+      if (png_ptr->user_transform_channels)
+         png_ptr->row_info.channels = png_ptr->user_transform_channels;
+#endif
+      png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
+         png_ptr->row_info.channels);
+      png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+         png_ptr->row_info.width);
+   }
+#endif
+
+}
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+/* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,
+ * without changing the actual values.  Thus, if you had a row with
+ * a bit depth of 1, you would end up with bytes that only contained
+ * the numbers 0 or 1.  If you would rather they contain 0 and 255, use
+ * png_do_shift() after this.
+ */
+void /* PRIVATE */
+png_do_unpack(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_unpack");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL && row_info->bit_depth < 8)
+#else
+   if (row_info->bit_depth < 8)
+#endif
+   {
+      png_uint_32 i;
+      png_uint_32 row_width=row_info->width;
+
+      switch (row_info->bit_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = 7 - (int)((row_width + 7) & 0x07);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x01);
+               if (shift == 7)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift++;
+
+               dp--;
+            }
+            break;
+         }
+         case 2:
+         {
+
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x03);
+               if (shift == 6)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift += 2;
+
+               dp--;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x0f);
+               if (shift == 4)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift = 4;
+
+               dp--;
+            }
+            break;
+         }
+      }
+      row_info->bit_depth = 8;
+      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
+      row_info->rowbytes = row_width * row_info->channels;
+   }
+}
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+/* Reverse the effects of png_do_shift.  This routine merely shifts the
+ * pixels back to their significant bits values.  Thus, if you have
+ * a row of bit depth 8, but only 5 are significant, this will shift
+ * the values back to 0 through 31.
+ */
+void /* PRIVATE */
+png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)
+{
+   png_debug(1, "in png_do_unshift");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL && sig_bits != NULL &&
+#endif
+       row_info->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      int shift[4];
+      int channels = 0;
+      int c;
+      png_uint_16 value = 0;
+      png_uint_32 row_width = row_info->width;
+
+      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->red;
+         shift[channels++] = row_info->bit_depth - sig_bits->green;
+         shift[channels++] = row_info->bit_depth - sig_bits->blue;
+      }
+      else
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->gray;
+      }
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->alpha;
+      }
+
+      for (c = 0; c < channels; c++)
+      {
+         if (shift[c] <= 0)
+            shift[c] = 0;
+         else
+            value = 1;
+      }
+
+      if (!value)
+         return;
+
+      switch (row_info->bit_depth)
+      {
+         case 2:
+         {
+            png_bytep bp;
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+
+            for (bp = row, i = 0; i < istop; i++)
+            {
+               *bp >>= 1;
+               *bp++ &= 0x55;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+            png_byte mask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) |
+               (png_byte)((int)0xf >> shift[0]));
+
+            for (i = 0; i < istop; i++)
+            {
+               *bp >>= shift[0];
+               *bp++ &= mask;
+            }
+            break;
+         }
+         case 8:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = row_width * channels;
+
+            for (i = 0; i < istop; i++)
+            {
+               *bp++ >>= shift[i%channels];
+            }
+            break;
+         }
+         case 16:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = channels * row_width;
+
+            for (i = 0; i < istop; i++)
+            {
+               value = (png_uint_16)((*bp << 8) + *(bp + 1));
+               value >>= shift[i%channels];
+               *bp++ = (png_byte)(value >> 8);
+               *bp++ = (png_byte)(value & 0xff);
+            }
+            break;
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* chop rows of bit depth 16 down to 8 */
+void /* PRIVATE */
+png_do_chop(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_chop");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL && row_info->bit_depth == 16)
+#else
+   if (row_info->bit_depth == 16)
+#endif
+   {
+      png_bytep sp = row;
+      png_bytep dp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->width * row_info->channels;
+
+      for (i = 0; i<istop; i++, sp += 2, dp++)
+      {
+#if defined(PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED)
+      /* This does a more accurate scaling of the 16-bit color
+       * value, rather than a simple low-byte truncation.
+       *
+       * What the ideal calculation should be:
+       *   *dp = (((((png_uint_32)(*sp) << 8) |
+       *          (png_uint_32)(*(sp + 1))) * 255 + 127) / (png_uint_32)65535L;
+       *
+       * GRR: no, I think this is what it really should be:
+       *   *dp = (((((png_uint_32)(*sp) << 8) |
+       *           (png_uint_32)(*(sp + 1))) + 128L) / (png_uint_32)257L;
+       *
+       * GRR: here's the exact calculation with shifts:
+       *   temp = (((png_uint_32)(*sp) << 8) | (png_uint_32)(*(sp + 1))) + 128L;
+       *   *dp = (temp - (temp >> 8)) >> 8;
+       *
+       * Approximate calculation with shift/add instead of multiply/divide:
+       *   *dp = ((((png_uint_32)(*sp) << 8) |
+       *          (png_uint_32)((int)(*(sp + 1)) - *sp)) + 128) >> 8;
+       *
+       * What we actually do to avoid extra shifting and conversion:
+       */
+
+         *dp = *sp + ((((int)(*(sp + 1)) - *sp) > 128) ? 1 : 0);
+#else
+       /* Simply discard the low order byte */
+         *dp = *sp;
+#endif
+      }
+      row_info->bit_depth = 8;
+      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
+      row_info->rowbytes = row_info->width * row_info->channels;
+   }
+}
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_swap_alpha");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This converts from RGBA to ARGB */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save;
+            }
+         }
+         /* This converts from RRGGBBAA to AARRGGBB */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save[2];
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save[0] = *(--sp);
+               save[1] = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save[0];
+               *(--dp) = save[1];
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This converts from GA to AG */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save;
+            }
+         }
+         /* This converts from GGAA to AAGG */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save[2];
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save[0] = *(--sp);
+               save[1] = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save[0];
+               *(--dp) = save[1];
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_invert_alpha");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This inverts the alpha channel in RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+
+/*             This does nothing:
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               We can replace it with:
+*/
+               sp-=3;
+               dp=sp;
+            }
+         }
+         /* This inverts the alpha channel in RRGGBBAA */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = (png_byte)(255 - *(--sp));
+
+/*             This does nothing:
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               We can replace it with:
+*/
+               sp-=6;
+               dp=sp;
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This inverts the alpha channel in GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = *(--sp);
+            }
+         }
+         /* This inverts the alpha channel in GGAA */
+         else
+         {
+            png_bytep sp  = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = (png_byte)(255 - *(--sp));
+/*
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+*/
+               sp-=2;
+               dp=sp;
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+/* Add filler channel if we have RGB color */
+void /* PRIVATE */
+png_do_read_filler(png_row_infop row_info, png_bytep row,
+   png_uint_32 filler, png_uint_32 flags)
+{
+   png_uint_32 i;
+   png_uint_32 row_width = row_info->width;
+
+   png_byte hi_filler = (png_byte)((filler>>8) & 0xff);
+   png_byte lo_filler = (png_byte)(filler & 0xff);
+
+   png_debug(1, "in png_do_read_filler");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL  && row_info != NULL &&
+#endif
+       row_info->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      if (row_info->bit_depth == 8)
+      {
+         /* This changes the data from G to GX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width;
+            png_bytep dp =  sp + (png_size_t)row_width;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = lo_filler;
+            row_info->channels = 2;
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+      /* This changes the data from G to XG */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width;
+            png_bytep dp = sp  + (png_size_t)row_width;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 2;
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         /* This changes the data from GG to GGXX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = hi_filler;
+            *(--dp) = lo_filler;
+            row_info->channels = 2;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+         /* This changes the data from GG to XXGG */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 2;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      }
+   } /* COLOR_TYPE == GRAY */
+   else if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      if (row_info->bit_depth == 8)
+      {
+         /* This changes the data from RGB to RGBX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 3;
+            png_bytep dp = sp  + (png_size_t)row_width;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = lo_filler;
+            row_info->channels = 4;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      /* This changes the data from RGB to XRGB */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 3;
+            png_bytep dp = sp + (png_size_t)row_width;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 4;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         /* This changes the data from RRGGBB to RRGGBBXX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 6;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = hi_filler;
+            *(--dp) = lo_filler;
+            row_info->channels = 4;
+            row_info->pixel_depth = 64;
+            row_info->rowbytes = row_width * 8;
+         }
+         /* This changes the data from RRGGBB to XXRRGGBB */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 6;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 4;
+            row_info->pixel_depth = 64;
+            row_info->rowbytes = row_width * 8;
+         }
+      }
+   } /* COLOR_TYPE == RGB */
+}
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+/* expand grayscale files to RGB, with or without alpha */
+void /* PRIVATE */
+png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
+{
+   png_uint_32 i;
+   png_uint_32 row_width = row_info->width;
+
+   png_debug(1, "in png_do_gray_to_rgb");
+   if (row_info->bit_depth >= 8 &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      !(row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + (png_size_t)row_width - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *sp;
+               *(dp--) = *sp;
+               *(dp--) = *(sp--);
+            }
+         }
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 4;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *(sp--);
+               *(dp--) = *sp;
+               *(dp--) = *sp;
+               *(dp--) = *(sp--);
+            }
+         }
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 4 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 4;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+            }
+         }
+      }
+      row_info->channels += (png_byte)2;
+      row_info->color_type |= PNG_COLOR_MASK_COLOR;
+      row_info->pixel_depth = (png_byte)(row_info->channels *
+         row_info->bit_depth);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+   }
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+/* reduce RGB files to grayscale, with or without alpha
+ * using the equation given in Poynton's ColorFAQ at
+ * <http://www.inforamp.net/~poynton/>  (THIS LINK IS DEAD June 2008)
+ * New link:
+ * <http://www.poynton.com/notes/colour_and_gamma/>
+ * Charles Poynton poynton at poynton.com
+ *
+ *     Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
+ *
+ *  We approximate this with
+ *
+ *     Y = 0.21268 * R    + 0.7151 * G    + 0.07217 * B
+ *
+ *  which can be expressed with integers as
+ *
+ *     Y = (6969 * R + 23434 * G + 2365 * B)/32768
+ *
+ *  The calculation is to be done in a linear colorspace.
+ *
+ *  Other integer coefficents can be used via png_set_rgb_to_gray().
+ */
+int /* PRIVATE */
+png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
+
+{
+   png_uint_32 i;
+
+   png_uint_32 row_width = row_info->width;
+   int rgb_error = 0;
+
+   png_debug(1, "in png_do_rgb_to_gray");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
+      png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
+      png_uint_32 bc = png_ptr->rgb_to_gray_blue_coeff;
+
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (row_info->bit_depth == 8)
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte green = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte blue  = png_ptr->gamma_to_1[*(sp++)];
+                  if (red != green || red != blue)
+                  {
+                     rgb_error |= 1;
+                     *(dp++) = png_ptr->gamma_from_1[
+                       (rc*red + gc*green + bc*blue)>>15];
+                  }
+                  else
+                     *(dp++) = *(sp - 1);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = *(sp++);
+                  png_byte green = *(sp++);
+                  png_byte blue  = *(sp++);
+                  if (red != green || red != blue)
+                  {
+                     rgb_error |= 1;
+                     *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15);
+                  }
+                  else
+                     *(dp++) = *(sp - 1);
+               }
+            }
+         }
+
+         else /* RGB bit_depth == 16 */
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_16_to_1 != NULL &&
+                png_ptr->gamma_16_from_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, w;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if (red == green && red == blue)
+                     w = red;
+                  else
+                  {
+                     png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff) >>
+                                  png_ptr->gamma_shift][red>>8];
+                     png_uint_16 green_1 = png_ptr->gamma_16_to_1[(green&0xff) >>
+                                  png_ptr->gamma_shift][green>>8];
+                     png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff) >>
+                                  png_ptr->gamma_shift][blue>>8];
+                     png_uint_16 gray16  = (png_uint_16)((rc*red_1 + gc*green_1
+                                  + bc*blue_1)>>15);
+                     w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+                         png_ptr->gamma_shift][gray16 >> 8];
+                     rgb_error |= 1;
+                  }
+
+                  *(dp++) = (png_byte)((w>>8) & 0xff);
+                  *(dp++) = (png_byte)(w & 0xff);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, gray16;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if (red != green || red != blue)
+                     rgb_error |= 1;
+                  gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = (png_byte)((gray16>>8) & 0xff);
+                  *(dp++) = (png_byte)(gray16 & 0xff);
+               }
+            }
+         }
+      }
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         if (row_info->bit_depth == 8)
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte green = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte blue  = png_ptr->gamma_to_1[*(sp++)];
+                  if (red != green || red != blue)
+                     rgb_error |= 1;
+                  *(dp++) =  png_ptr->gamma_from_1
+                             [(rc*red + gc*green + bc*blue)>>15];
+                  *(dp++) = *(sp++);  /* alpha */
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = *(sp++);
+                  png_byte green = *(sp++);
+                  png_byte blue  = *(sp++);
+                  if (red != green || red != blue)
+                     rgb_error |= 1;
+                  *(dp++) =  (png_byte)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = *(sp++);  /* alpha */
+               }
+            }
+         }
+         else /* RGBA bit_depth == 16 */
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_16_to_1 != NULL &&
+                png_ptr->gamma_16_from_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, w;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if (red == green && red == blue)
+                     w = red;
+                  else
+                  {
+                     png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff) >>
+                                  png_ptr->gamma_shift][red>>8];
+                     png_uint_16 green_1 = png_ptr->gamma_16_to_1[(green&0xff) >>
+                                  png_ptr->gamma_shift][green>>8];
+                     png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff) >>
+                                  png_ptr->gamma_shift][blue>>8];
+                     png_uint_16 gray16  = (png_uint_16)((rc * red_1
+                                  + gc * green_1 + bc * blue_1)>>15);
+                     w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+                         png_ptr->gamma_shift][gray16 >> 8];
+                     rgb_error |= 1;
+                  }
+
+                  *(dp++) = (png_byte)((w>>8) & 0xff);
+                  *(dp++) = (png_byte)(w & 0xff);
+                  *(dp++) = *(sp++);  /* alpha */
+                  *(dp++) = *(sp++);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, gray16;
+                  red   = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  if (red != green || red != blue)
+                     rgb_error |= 1;
+                  gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = (png_byte)((gray16>>8) & 0xff);
+                  *(dp++) = (png_byte)(gray16 & 0xff);
+                  *(dp++) = *(sp++);  /* alpha */
+                  *(dp++) = *(sp++);
+               }
+            }
+         }
+      }
+   row_info->channels -= (png_byte)2;
+      row_info->color_type &= ~PNG_COLOR_MASK_COLOR;
+      row_info->pixel_depth = (png_byte)(row_info->channels *
+         row_info->bit_depth);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+   }
+   return rgb_error;
+}
+#endif
+
+/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth
+ * large of png_color.  This lets grayscale images be treated as
+ * paletted.  Most useful for gamma correction and simplification
+ * of code.
+ */
+void PNGAPI
+png_build_grayscale_palette(int bit_depth, png_colorp palette)
+{
+   int num_palette;
+   int color_inc;
+   int i;
+   int v;
+
+   png_debug(1, "in png_do_build_grayscale_palette");
+   if (palette == NULL)
+      return;
+
+   switch (bit_depth)
+   {
+      case 1:
+         num_palette = 2;
+         color_inc = 0xff;
+         break;
+      case 2:
+         num_palette = 4;
+         color_inc = 0x55;
+         break;
+      case 4:
+         num_palette = 16;
+         color_inc = 0x11;
+         break;
+      case 8:
+         num_palette = 256;
+         color_inc = 1;
+         break;
+      default:
+         num_palette = 0;
+         color_inc = 0;
+         break;
+   }
+
+   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
+   {
+      palette[i].red = (png_byte)v;
+      palette[i].green = (png_byte)v;
+      palette[i].blue = (png_byte)v;
+   }
+}
+
+/* This function is currently unused.  Do we really need it? */
+#if defined(PNG_READ_DITHER_SUPPORTED) && defined(PNG_CORRECT_PALETTE_SUPPORTED)
+void /* PRIVATE */
+png_correct_palette(png_structp png_ptr, png_colorp palette,
+   int num_palette)
+{
+   png_debug(1, "in png_correct_palette");
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
+    defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+   if (png_ptr->transformations & (PNG_GAMMA | PNG_BACKGROUND))
+   {
+      png_color back, back_1;
+
+      if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
+      {
+         back.red = png_ptr->gamma_table[png_ptr->background.red];
+         back.green = png_ptr->gamma_table[png_ptr->background.green];
+         back.blue = png_ptr->gamma_table[png_ptr->background.blue];
+
+         back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
+         back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
+         back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
+      }
+      else
+      {
+         double g;
+
+         g = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma);
+
+         if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_SCREEN ||
+             fabs(g - 1.0) < PNG_GAMMA_THRESHOLD)
+         {
+            back.red = png_ptr->background.red;
+            back.green = png_ptr->background.green;
+            back.blue = png_ptr->background.blue;
+         }
+         else
+         {
+            back.red =
+               (png_byte)(pow((double)png_ptr->background.red/255, g) *
+                255.0 + 0.5);
+            back.green =
+               (png_byte)(pow((double)png_ptr->background.green/255, g) *
+                255.0 + 0.5);
+            back.blue =
+               (png_byte)(pow((double)png_ptr->background.blue/255, g) *
+                255.0 + 0.5);
+         }
+
+         g = 1.0 / png_ptr->background_gamma;
+
+         back_1.red =
+            (png_byte)(pow((double)png_ptr->background.red/255, g) *
+             255.0 + 0.5);
+         back_1.green =
+            (png_byte)(pow((double)png_ptr->background.green/255, g) *
+             255.0 + 0.5);
+         back_1.blue =
+            (png_byte)(pow((double)png_ptr->background.blue/255, g) *
+             255.0 + 0.5);
+      }
+
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_uint_32 i;
+
+         for (i = 0; i < (png_uint_32)num_palette; i++)
+         {
+            if (i < png_ptr->num_trans && png_ptr->trans[i] == 0)
+            {
+               palette[i] = back;
+            }
+            else if (i < png_ptr->num_trans && png_ptr->trans[i] != 0xff)
+            {
+               png_byte v, w;
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].red];
+               png_composite(w, v, png_ptr->trans[i], back_1.red);
+               palette[i].red = png_ptr->gamma_from_1[w];
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].green];
+               png_composite(w, v, png_ptr->trans[i], back_1.green);
+               palette[i].green = png_ptr->gamma_from_1[w];
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].blue];
+               png_composite(w, v, png_ptr->trans[i], back_1.blue);
+               palette[i].blue = png_ptr->gamma_from_1[w];
+            }
+            else
+            {
+               palette[i].red = png_ptr->gamma_table[palette[i].red];
+               palette[i].green = png_ptr->gamma_table[palette[i].green];
+               palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+            }
+         }
+      }
+      else
+      {
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            if (palette[i].red == (png_byte)png_ptr->trans_values.gray)
+            {
+               palette[i] = back;
+            }
+            else
+            {
+               palette[i].red = png_ptr->gamma_table[palette[i].red];
+               palette[i].green = png_ptr->gamma_table[palette[i].green];
+               palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+            }
+         }
+      }
+   }
+   else
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if (png_ptr->transformations & PNG_GAMMA)
+   {
+      int i;
+
+      for (i = 0; i < num_palette; i++)
+      {
+         palette[i].red = png_ptr->gamma_table[palette[i].red];
+         palette[i].green = png_ptr->gamma_table[palette[i].green];
+         palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+      }
+   }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   else
+#endif
+#endif
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr->transformations & PNG_BACKGROUND)
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_color back;
+
+         back.red   = (png_byte)png_ptr->background.red;
+         back.green = (png_byte)png_ptr->background.green;
+         back.blue  = (png_byte)png_ptr->background.blue;
+
+         for (i = 0; i < (int)png_ptr->num_trans; i++)
+         {
+            if (png_ptr->trans[i] == 0)
+            {
+               palette[i].red = back.red;
+               palette[i].green = back.green;
+               palette[i].blue = back.blue;
+            }
+            else if (png_ptr->trans[i] != 0xff)
+            {
+               png_composite(palette[i].red, png_ptr->palette[i].red,
+                  png_ptr->trans[i], back.red);
+               png_composite(palette[i].green, png_ptr->palette[i].green,
+                  png_ptr->trans[i], back.green);
+               png_composite(palette[i].blue, png_ptr->palette[i].blue,
+                  png_ptr->trans[i], back.blue);
+            }
+         }
+      }
+      else /* assume grayscale palette (what else could it be?) */
+      {
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            if (i == (png_byte)png_ptr->trans_values.gray)
+            {
+               palette[i].red = (png_byte)png_ptr->background.red;
+               palette[i].green = (png_byte)png_ptr->background.green;
+               palette[i].blue = (png_byte)png_ptr->background.blue;
+            }
+         }
+      }
+   }
+#endif
+}
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+/* Replace any alpha or transparency with the supplied background color.
+ * "background" is already in the screen gamma, while "background_1" is
+ * at a gamma of 1.0.  Paletted files have already been taken care of.
+ */
+void /* PRIVATE */
+png_do_background(png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   , png_color_16p background_1,
+   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
+   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
+   png_uint_16pp gamma_16_to_1, int gamma_shift
+#endif
+   )
+{
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+   int shift;
+
+   png_debug(1, "in png_do_background");
+   if (background != NULL &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      (!(row_info->color_type & PNG_COLOR_MASK_ALPHA) ||
+      (row_info->color_type != PNG_COLOR_TYPE_PALETTE && trans_values)))
+   {
+      switch (row_info->color_type)
+      {
+         case PNG_COLOR_TYPE_GRAY:
+         {
+            switch (row_info->bit_depth)
+            {
+               case 1:
+               {
+                  sp = row;
+                  shift = 7;
+                  for (i = 0; i < row_width; i++)
+                  {
+                     if ((png_uint_16)((*sp >> shift) & 0x01)
+                        == trans_values->gray)
+                     {
+                        *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+                        *sp |= (png_byte)(background->gray << shift);
+                     }
+                     if (!shift)
+                     {
+                        shift = 7;
+                        sp++;
+                     }
+                     else
+                        shift--;
+                  }
+                  break;
+               }
+               case 2:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     shift = 6;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x03)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        else
+                        {
+                           png_byte p = (png_byte)((*sp >> shift) & 0x03);
+                           png_byte g = (png_byte)((gamma_table [p | (p << 2) |
+                               (p << 4) | (p << 6)] >> 6) & 0x03);
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(g << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 6;
+                           sp++;
+                        }
+                        else
+                           shift -= 2;
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     shift = 6;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x03)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 6;
+                           sp++;
+                        }
+                        else
+                           shift -= 2;
+                     }
+                  }
+                  break;
+               }
+               case 4:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     shift = 4;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x0f)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        else
+                        {
+                           png_byte p = (png_byte)((*sp >> shift) & 0x0f);
+                           png_byte g = (png_byte)((gamma_table[p |
+                             (p << 4)] >> 4) & 0x0f);
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(g << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 4;
+                           sp++;
+                        }
+                        else
+                           shift -= 4;
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     shift = 4;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x0f)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 4;
+                           sp++;
+                        }
+                        else
+                           shift -= 4;
+                     }
+                  }
+                  break;
+               }
+               case 8:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp++)
+                     {
+                        if (*sp == trans_values->gray)
+                        {
+                           *sp = (png_byte)background->gray;
+                        }
+                        else
+                        {
+                           *sp = gamma_table[*sp];
+                        }
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp++)
+                     {
+                        if (*sp == trans_values->gray)
+                        {
+                           *sp = (png_byte)background->gray;
+                        }
+                     }
+                  }
+                  break;
+               }
+               case 16:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_16 != NULL)
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp += 2)
+                     {
+                        png_uint_16 v;
+
+                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        if (v == trans_values->gray)
+                        {
+                           /* background is already in screen gamma */
+                           *sp = (png_byte)((background->gray >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(background->gray & 0xff);
+                        }
+                        else
+                        {
+                           v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                           *sp = (png_byte)((v >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(v & 0xff);
+                        }
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp += 2)
+                     {
+                        png_uint_16 v;
+
+                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        if (v == trans_values->gray)
+                        {
+                           *sp = (png_byte)((background->gray >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(background->gray & 0xff);
+                        }
+                     }
+                  }
+                  break;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_RGB:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_table != NULL)
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 3)
+                  {
+                     if (*sp == trans_values->red &&
+                        *(sp + 1) == trans_values->green &&
+                        *(sp + 2) == trans_values->blue)
+                     {
+                        *sp = (png_byte)background->red;
+                        *(sp + 1) = (png_byte)background->green;
+                        *(sp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        *sp = gamma_table[*sp];
+                        *(sp + 1) = gamma_table[*(sp + 1)];
+                        *(sp + 2) = gamma_table[*(sp + 2)];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 3)
+                  {
+                     if (*sp == trans_values->red &&
+                        *(sp + 1) == trans_values->green &&
+                        *(sp + 2) == trans_values->blue)
+                     {
+                        *sp = (png_byte)background->red;
+                        *(sp + 1) = (png_byte)background->green;
+                        *(sp + 2) = (png_byte)background->blue;
+                     }
+                  }
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_16 != NULL)
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 6)
+                  {
+                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                     png_uint_16 g = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     png_uint_16 b = (png_uint_16)(((*(sp+4)) << 8) + *(sp+5));
+                     if (r == trans_values->red && g == trans_values->green &&
+                        b == trans_values->blue)
+                     {
+                        /* background is already in screen gamma */
+                        *sp = (png_byte)((background->red >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(background->red & 0xff);
+                        *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(background->green & 0xff);
+                        *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *sp = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(v & 0xff);
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 6)
+                  {
+                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp+1));
+                     png_uint_16 g = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     png_uint_16 b = (png_uint_16)(((*(sp+4)) << 8) + *(sp+5));
+
+                     if (r == trans_values->red && g == trans_values->green &&
+                        b == trans_values->blue)
+                     {
+                        *sp = (png_byte)((background->red >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(background->red & 0xff);
+                        *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(background->green & 0xff);
+                        *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                  }
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_GRAY_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+                   gamma_table != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 2, dp++)
+                  {
+                     png_uint_16 a = *(sp + 1);
+
+                     if (a == 0xff)
+                     {
+                        *dp = gamma_table[*sp];
+                     }
+                     else if (a == 0)
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)background->gray;
+                     }
+                     else
+                     {
+                        png_byte v, w;
+
+                        v = gamma_to_1[*sp];
+                        png_composite(w, v, a, background_1->gray);
+                        *dp = gamma_from_1[w];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 2, dp++)
+                  {
+                     png_byte a = *(sp + 1);
+
+                     if (a == 0xff)
+                     {
+                        *dp = *sp;
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)background->gray;
+                     }
+                     else
+                     {
+                        png_composite(*dp, *sp, a, background_1->gray);
+                     }
+#else
+                     *dp = (png_byte)background->gray;
+#endif
+                  }
+               }
+            }
+            else /* if (png_ptr->bit_depth == 16) */
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+                   gamma_16_to_1 != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 2)
+                  {
+                     png_uint_16 a = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_uint_16 v;
+
+                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else if (a == 0)
+#else
+                     else
+#endif
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)((background->gray >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->gray & 0xff);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else
+                     {
+                        png_uint_16 g, v, w;
+
+                        g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+                        png_composite_16(v, g, a, background_1->gray);
+                        w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8];
+                        *dp = (png_byte)((w >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(w & 0xff);
+                     }
+#endif
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 2)
+                  {
+                     png_uint_16 a = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_memcpy(dp, sp, 2);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else if (a == 0)
+#else
+                     else
+#endif
+                     {
+                        *dp = (png_byte)((background->gray >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->gray & 0xff);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else
+                     {
+                        png_uint_16 g, v;
+
+                        g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        png_composite_16(v, g, a, background_1->gray);
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                     }
+#endif
+                  }
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_RGB_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+                   gamma_table != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 3)
+                  {
+                     png_byte a = *(sp + 3);
+
+                     if (a == 0xff)
+                     {
+                        *dp = gamma_table[*sp];
+                        *(dp + 1) = gamma_table[*(sp + 1)];
+                        *(dp + 2) = gamma_table[*(sp + 2)];
+                     }
+                     else if (a == 0)
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)background->red;
+                        *(dp + 1) = (png_byte)background->green;
+                        *(dp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        png_byte v, w;
+
+                        v = gamma_to_1[*sp];
+                        png_composite(w, v, a, background_1->red);
+                        *dp = gamma_from_1[w];
+                        v = gamma_to_1[*(sp + 1)];
+                        png_composite(w, v, a, background_1->green);
+                        *(dp + 1) = gamma_from_1[w];
+                        v = gamma_to_1[*(sp + 2)];
+                        png_composite(w, v, a, background_1->blue);
+                        *(dp + 2) = gamma_from_1[w];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 3)
+                  {
+                     png_byte a = *(sp + 3);
+
+                     if (a == 0xff)
+                     {
+                        *dp = *sp;
+                        *(dp + 1) = *(sp + 1);
+                        *(dp + 2) = *(sp + 2);
+                     }
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)background->red;
+                        *(dp + 1) = (png_byte)background->green;
+                        *(dp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        png_composite(*dp, *sp, a, background->red);
+                        png_composite(*(dp + 1), *(sp + 1), a,
+                           background->green);
+                        png_composite(*(dp + 2), *(sp + 2), a,
+                           background->blue);
+                     }
+                  }
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+                   gamma_16_to_1 != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 8, dp += 6)
+                  {
+                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+                         << 8) + (png_uint_16)(*(sp + 7)));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_uint_16 v;
+
+                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        *(dp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        *(dp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(v & 0xff);
+                     }
+                     else if (a == 0)
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)((background->red >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->red & 0xff);
+                        *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(background->green & 0xff);
+                        *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v, w, x;
+
+                        v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+                        png_composite_16(w, v, a, background_1->red);
+                        x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
+                        *dp = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(x & 0xff);
+                        v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        png_composite_16(w, v, a, background_1->green);
+                        x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
+                        *(dp + 2) = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(x & 0xff);
+                        v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        png_composite_16(w, v, a, background_1->blue);
+                        x = gamma_16_from_1[(w & 0xff) >> gamma_shift][w >> 8];
+                        *(dp + 4) = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(x & 0xff);
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 8, dp += 6)
+                  {
+                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+                        << 8) + (png_uint_16)(*(sp + 7)));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_memcpy(dp, sp, 6);
+                     }
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)((background->red >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->red & 0xff);
+                        *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(background->green & 0xff);
+                        *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v;
+
+                        png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
+                            + *(sp + 3));
+                        png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
+                            + *(sp + 5));
+
+                        png_composite_16(v, r, a, background->red);
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                        png_composite_16(v, g, a, background->green);
+                        *(dp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(v & 0xff);
+                        png_composite_16(v, b, a, background->blue);
+                        *(dp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(v & 0xff);
+                     }
+                  }
+               }
+            }
+            break;
+         }
+      }
+
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
+         row_info->channels--;
+         row_info->pixel_depth = (png_byte)(row_info->channels *
+            row_info->bit_depth);
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+/* Gamma correct the image, avoiding the alpha channel.  Make sure
+ * you do this after you deal with the transparency issue on grayscale
+ * or RGB images. If your bit depth is 8, use gamma_table, if it
+ * is 16, use gamma_16_table and gamma_shift.  Build these with
+ * build_gamma_table().
+ */
+void /* PRIVATE */
+png_do_gamma(png_row_infop row_info, png_bytep row,
+   png_bytep gamma_table, png_uint_16pp gamma_16_table,
+   int gamma_shift)
+{
+   png_bytep sp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_gamma");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       ((row_info->bit_depth <= 8 && gamma_table != NULL) ||
+        (row_info->bit_depth == 16 && gamma_16_table != NULL)))
+   {
+      switch (row_info->color_type)
+      {
+         case PNG_COLOR_TYPE_RGB:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v;
+
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_RGB_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  sp++;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 4;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_GRAY_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp += 2;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 4;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_GRAY:
+         {
+            if (row_info->bit_depth == 2)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i += 4)
+               {
+                  int a = *sp & 0xc0;
+                  int b = *sp & 0x30;
+                  int c = *sp & 0x0c;
+                  int d = *sp & 0x03;
+
+                  *sp = (png_byte)(
+                        ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)])   ) & 0xc0)|
+                        ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)|
+                        ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)|
+                        ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) ));
+                  sp++;
+               }
+            }
+            if (row_info->bit_depth == 4)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i += 2)
+               {
+                  int msb = *sp & 0xf0;
+                  int lsb = *sp & 0x0f;
+
+                  *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0)
+                          | (((int)gamma_table[(lsb << 4) | lsb]) >> 4));
+                  sp++;
+               }
+            }
+            else if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+               }
+            }
+            else if (row_info->bit_depth == 16)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+               }
+            }
+            break;
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expands a palette row to an RGB or RGBA row depending
+ * upon whether you supply trans and num_trans.
+ */
+void /* PRIVATE */
+png_do_expand_palette(png_row_infop row_info, png_bytep row,
+   png_colorp palette, png_bytep trans, int num_trans)
+{
+   int shift, value;
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_expand_palette");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (row_info->bit_depth < 8)
+      {
+         switch (row_info->bit_depth)
+         {
+            case 1:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 3);
+               dp = row + (png_size_t)row_width - 1;
+               shift = 7 - (int)((row_width + 7) & 0x07);
+               for (i = 0; i < row_width; i++)
+               {
+                  if ((*sp >> shift) & 0x01)
+                     *dp = 1;
+                  else
+                     *dp = 0;
+                  if (shift == 7)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift++;
+
+                  dp--;
+               }
+               break;
+            }
+            case 2:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 2);
+               dp = row + (png_size_t)row_width - 1;
+               shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+               for (i = 0; i < row_width; i++)
+               {
+                  value = (*sp >> shift) & 0x03;
+                  *dp = (png_byte)value;
+                  if (shift == 6)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift += 2;
+
+                  dp--;
+               }
+               break;
+            }
+            case 4:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 1);
+               dp = row + (png_size_t)row_width - 1;
+               shift = (int)((row_width & 0x01) << 2);
+               for (i = 0; i < row_width; i++)
+               {
+                  value = (*sp >> shift) & 0x0f;
+                  *dp = (png_byte)value;
+                  if (shift == 4)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift += 4;
+
+                  dp--;
+               }
+               break;
+            }
+         }
+         row_info->bit_depth = 8;
+         row_info->pixel_depth = 8;
+         row_info->rowbytes = row_width;
+      }
+      switch (row_info->bit_depth)
+      {
+         case 8:
+         {
+            if (trans != NULL)
+            {
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width << 2) - 1;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  if ((int)(*sp) >= num_trans)
+                     *dp-- = 0xff;
+                  else
+                     *dp-- = trans[*sp];
+                  *dp-- = palette[*sp].blue;
+                  *dp-- = palette[*sp].green;
+                  *dp-- = palette[*sp].red;
+                  sp--;
+               }
+               row_info->bit_depth = 8;
+               row_info->pixel_depth = 32;
+               row_info->rowbytes = row_width * 4;
+               row_info->color_type = 6;
+               row_info->channels = 4;
+            }
+            else
+            {
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width * 3) - 1;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  *dp-- = palette[*sp].blue;
+                  *dp-- = palette[*sp].green;
+                  *dp-- = palette[*sp].red;
+                  sp--;
+               }
+               row_info->bit_depth = 8;
+               row_info->pixel_depth = 24;
+               row_info->rowbytes = row_width * 3;
+               row_info->color_type = 2;
+               row_info->channels = 3;
+            }
+            break;
+         }
+      }
+   }
+}
+
+/* If the bit depth < 8, it is expanded to 8.  Also, if the already
+ * expanded transparency value is supplied, an alpha channel is built.
+ */
+void /* PRIVATE */
+png_do_expand(png_row_infop row_info, png_bytep row,
+   png_color_16p trans_value)
+{
+   int shift, value;
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_expand");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         png_uint_16 gray = (png_uint_16)(trans_value ? trans_value->gray : 0);
+
+         if (row_info->bit_depth < 8)
+         {
+            switch (row_info->bit_depth)
+            {
+               case 1:
+               {
+                  gray = (png_uint_16)((gray&0x01)*0xff);
+                  sp = row + (png_size_t)((row_width - 1) >> 3);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = 7 - (int)((row_width + 7) & 0x07);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     if ((*sp >> shift) & 0x01)
+                        *dp = 0xff;
+                     else
+                        *dp = 0;
+                     if (shift == 7)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift++;
+
+                     dp--;
+                  }
+                  break;
+               }
+               case 2:
+               {
+                  gray = (png_uint_16)((gray&0x03)*0x55);
+                  sp = row + (png_size_t)((row_width - 1) >> 2);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     value = (*sp >> shift) & 0x03;
+                     *dp = (png_byte)(value | (value << 2) | (value << 4) |
+                        (value << 6));
+                     if (shift == 6)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift += 2;
+
+                     dp--;
+                  }
+                  break;
+               }
+               case 4:
+               {
+                  gray = (png_uint_16)((gray&0x0f)*0x11);
+                  sp = row + (png_size_t)((row_width - 1) >> 1);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     value = (*sp >> shift) & 0x0f;
+                     *dp = (png_byte)(value | (value << 4));
+                     if (shift == 4)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift = 4;
+
+                     dp--;
+                  }
+                  break;
+               }
+            }
+            row_info->bit_depth = 8;
+            row_info->pixel_depth = 8;
+            row_info->rowbytes = row_width;
+         }
+
+         if (trans_value != NULL)
+         {
+            if (row_info->bit_depth == 8)
+            {
+               gray = gray & 0xff;
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width << 1) - 1;
+               for (i = 0; i < row_width; i++)
+               {
+                  if (*sp == gray)
+                     *dp-- = 0;
+                  else
+                     *dp-- = 0xff;
+                  *dp-- = *sp--;
+               }
+            }
+            else if (row_info->bit_depth == 16)
+            {
+               png_byte gray_high = (gray >> 8) & 0xff;
+               png_byte gray_low = gray & 0xff;
+               sp = row + row_info->rowbytes - 1;
+               dp = row + (row_info->rowbytes << 1) - 1;
+               for (i = 0; i < row_width; i++)
+               {
+                  if (*(sp - 1) == gray_high && *(sp) == gray_low)
+                  {
+                     *dp-- = 0;
+                     *dp-- = 0;
+                  }
+                  else
+                  {
+                     *dp-- = 0xff;
+                     *dp-- = 0xff;
+                  }
+                  *dp-- = *sp--;
+                  *dp-- = *sp--;
+               }
+            }
+            row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+            row_info->channels = 2;
+            row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
+            row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+               row_width);
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_value)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_byte red = trans_value->red & 0xff;
+            png_byte green = trans_value->green & 0xff;
+            png_byte blue = trans_value->blue & 0xff;
+            sp = row + (png_size_t)row_info->rowbytes - 1;
+            dp = row + (png_size_t)(row_width << 2) - 1;
+            for (i = 0; i < row_width; i++)
+            {
+               if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue)
+                  *dp-- = 0;
+               else
+                  *dp-- = 0xff;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+            }
+         }
+         else if (row_info->bit_depth == 16)
+         {
+            png_byte red_high = (trans_value->red >> 8) & 0xff;
+            png_byte green_high = (trans_value->green >> 8) & 0xff;
+            png_byte blue_high = (trans_value->blue >> 8) & 0xff;
+            png_byte red_low = trans_value->red & 0xff;
+            png_byte green_low = trans_value->green & 0xff;
+            png_byte blue_low = trans_value->blue & 0xff;
+            sp = row + row_info->rowbytes - 1;
+            dp = row + (png_size_t)(row_width << 3) - 1;
+            for (i = 0; i < row_width; i++)
+            {
+               if (*(sp - 5) == red_high &&
+                  *(sp - 4) == red_low &&
+                  *(sp - 3) == green_high &&
+                  *(sp - 2) == green_low &&
+                  *(sp - 1) == blue_high &&
+                  *(sp    ) == blue_low)
+               {
+                  *dp-- = 0;
+                  *dp-- = 0;
+               }
+               else
+               {
+                  *dp-- = 0xff;
+                  *dp-- = 0xff;
+               }
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+            }
+         }
+         row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+         row_info->channels = 4;
+         row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+void /* PRIVATE */
+png_do_dither(png_row_infop row_info, png_bytep row,
+    png_bytep palette_lookup, png_bytep dither_lookup)
+{
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_dither");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
+         palette_lookup && row_info->bit_depth == 8)
+      {
+         int r, g, b, p;
+         sp = row;
+         dp = row;
+         for (i = 0; i < row_width; i++)
+         {
+            r = *sp++;
+            g = *sp++;
+            b = *sp++;
+
+            /* this looks real messy, but the compiler will reduce
+               it down to a reasonable formula.  For example, with
+               5 bits per color, we get:
+               p = (((r >> 3) & 0x1f) << 10) |
+                  (((g >> 3) & 0x1f) << 5) |
+                  ((b >> 3) & 0x1f);
+               */
+            p = (((r >> (8 - PNG_DITHER_RED_BITS)) &
+               ((1 << PNG_DITHER_RED_BITS) - 1)) <<
+               (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |
+               (((g >> (8 - PNG_DITHER_GREEN_BITS)) &
+               ((1 << PNG_DITHER_GREEN_BITS) - 1)) <<
+               (PNG_DITHER_BLUE_BITS)) |
+               ((b >> (8 - PNG_DITHER_BLUE_BITS)) &
+               ((1 << PNG_DITHER_BLUE_BITS) - 1));
+
+            *dp++ = palette_lookup[p];
+         }
+         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
+         row_info->channels = 1;
+         row_info->pixel_depth = row_info->bit_depth;
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+         palette_lookup != NULL && row_info->bit_depth == 8)
+      {
+         int r, g, b, p;
+         sp = row;
+         dp = row;
+         for (i = 0; i < row_width; i++)
+         {
+            r = *sp++;
+            g = *sp++;
+            b = *sp++;
+            sp++;
+
+            p = (((r >> (8 - PNG_DITHER_RED_BITS)) &
+               ((1 << PNG_DITHER_RED_BITS) - 1)) <<
+               (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |
+               (((g >> (8 - PNG_DITHER_GREEN_BITS)) &
+               ((1 << PNG_DITHER_GREEN_BITS) - 1)) <<
+               (PNG_DITHER_BLUE_BITS)) |
+               ((b >> (8 - PNG_DITHER_BLUE_BITS)) &
+               ((1 << PNG_DITHER_BLUE_BITS) - 1));
+
+            *dp++ = palette_lookup[p];
+         }
+         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
+         row_info->channels = 1;
+         row_info->pixel_depth = row_info->bit_depth;
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
+         dither_lookup && row_info->bit_depth == 8)
+      {
+         sp = row;
+         for (i = 0; i < row_width; i++, sp++)
+         {
+            *sp = dither_lookup[*sp];
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+static PNG_CONST int png_gamma_shift[] =
+   {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0, 0x00};
+
+/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit
+ * tables, we don't make a full table if we are reducing to 8-bit in
+ * the future.  Note also how the gamma_16 tables are segmented so that
+ * we don't need to allocate > 64K chunks for a full 16-bit table.
+ */
+void /* PRIVATE */
+png_build_gamma_table(png_structp png_ptr)
+{
+  png_debug(1, "in png_build_gamma_table");
+
+  if (png_ptr->bit_depth <= 8)
+  {
+     int i;
+     double g;
+
+     if (png_ptr->screen_gamma > .000001)
+        g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+     else
+        g = 1.0;
+
+     png_ptr->gamma_table = (png_bytep)png_malloc(png_ptr,
+        (png_uint_32)256);
+
+     for (i = 0; i < 256; i++)
+     {
+        png_ptr->gamma_table[i] = (png_byte)(pow((double)i / 255.0,
+           g) * 255.0 + .5);
+     }
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+     if (png_ptr->transformations & ((PNG_BACKGROUND) | PNG_RGB_TO_GRAY))
+     {
+
+        g = 1.0 / (png_ptr->gamma);
+
+        png_ptr->gamma_to_1 = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)256);
+
+        for (i = 0; i < 256; i++)
+        {
+           png_ptr->gamma_to_1[i] = (png_byte)(pow((double)i / 255.0,
+              g) * 255.0 + .5);
+        }
+
+
+        png_ptr->gamma_from_1 = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)256);
+
+        if (png_ptr->screen_gamma > 0.000001)
+           g = 1.0 / png_ptr->screen_gamma;
+        else
+           g = png_ptr->gamma;   /* probably doing rgb_to_gray */
+
+        for (i = 0; i < 256; i++)
+        {
+           png_ptr->gamma_from_1[i] = (png_byte)(pow((double)i / 255.0,
+              g) * 255.0 + .5);
+
+        }
+     }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
+  }
+  else
+  {
+     double g;
+     int i, j, shift, num;
+     int sig_bit;
+     png_uint_32 ig;
+
+     if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+     {
+        sig_bit = (int)png_ptr->sig_bit.red;
+        if ((int)png_ptr->sig_bit.green > sig_bit)
+           sig_bit = png_ptr->sig_bit.green;
+        if ((int)png_ptr->sig_bit.blue > sig_bit)
+           sig_bit = png_ptr->sig_bit.blue;
+     }
+     else
+     {
+        sig_bit = (int)png_ptr->sig_bit.gray;
+     }
+
+     if (sig_bit > 0)
+        shift = 16 - sig_bit;
+     else
+        shift = 0;
+
+     if (png_ptr->transformations & PNG_16_TO_8)
+     {
+        if (shift < (16 - PNG_MAX_GAMMA_8))
+           shift = (16 - PNG_MAX_GAMMA_8);
+     }
+
+     if (shift > 8)
+        shift = 8;
+     if (shift < 0)
+        shift = 0;
+
+     png_ptr->gamma_shift = (png_byte)shift;
+
+     num = (1 << (8 - shift));
+
+     if (png_ptr->screen_gamma > .000001)
+        g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+     else
+        g = 1.0;
+
+     png_ptr->gamma_16_table = (png_uint_16pp)png_malloc(png_ptr,
+        (png_uint_32)(num * png_sizeof(png_uint_16p)));
+
+     if (png_ptr->transformations & (PNG_16_TO_8 | PNG_BACKGROUND))
+     {
+        double fin, fout;
+        png_uint_32 last, max;
+
+        png_memset(png_ptr->gamma_16_table, 0, num * png_sizeof(png_uint_16p)); 
+
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof(png_uint_16)));
+        }
+
+        g = 1.0 / g;
+        last = 0;
+        for (i = 0; i < 256; i++)
+        {
+           fout = ((double)i + 0.5) / 256.0;
+           fin = pow(fout, g);
+           max = (png_uint_32)(fin * (double)((png_uint_32)num << 8));
+           while (last <= max)
+           {
+              png_ptr->gamma_16_table[(int)(last & (0xff >> shift))]
+                 [(int)(last >> (8 - shift))] = (png_uint_16)(
+                 (png_uint_16)i | ((png_uint_16)i << 8));
+              last++;
+           }
+        }
+        while (last < ((png_uint_32)num << 8))
+        {
+           png_ptr->gamma_16_table[(int)(last & (0xff >> shift))]
+              [(int)(last >> (8 - shift))] = (png_uint_16)65535L;
+           last++;
+        }
+     }
+     else
+     {
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof(png_uint_16)));
+
+           ig = (((png_uint_32)i * (png_uint_32)png_gamma_shift[shift]) >> 4);
+           for (j = 0; j < 256; j++)
+           {
+              png_ptr->gamma_16_table[i][j] =
+                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                    65535.0, g) * 65535.0 + .5);
+           }
+        }
+     }
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+     if (png_ptr->transformations & (PNG_BACKGROUND | PNG_RGB_TO_GRAY))
+     {
+
+        g = 1.0 / (png_ptr->gamma);
+
+        png_ptr->gamma_16_to_1 = (png_uint_16pp)png_malloc(png_ptr,
+           (png_uint_32)(num * png_sizeof(png_uint_16p )));
+
+        png_memset(png_ptr->gamma_16_to_1, 0, num * png_sizeof(png_uint_16p)); 
+
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_to_1[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof(png_uint_16)));
+
+           ig = (((png_uint_32)i *
+              (png_uint_32)png_gamma_shift[shift]) >> 4);
+           for (j = 0; j < 256; j++)
+           {
+              png_ptr->gamma_16_to_1[i][j] =
+                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                    65535.0, g) * 65535.0 + .5);
+           }
+        }
+
+        if (png_ptr->screen_gamma > 0.000001)
+           g = 1.0 / png_ptr->screen_gamma;
+        else
+           g = png_ptr->gamma;   /* probably doing rgb_to_gray */
+
+        png_ptr->gamma_16_from_1 = (png_uint_16pp)png_malloc(png_ptr,
+           (png_uint_32)(num * png_sizeof(png_uint_16p)));
+
+        png_memset(png_ptr->gamma_16_from_1, 0,
+           num * png_sizeof(png_uint_16p)); 
+
+        for (i = 0; i < num; i++)
+        {
+           png_ptr->gamma_16_from_1[i] = (png_uint_16p)png_malloc(png_ptr,
+              (png_uint_32)(256 * png_sizeof(png_uint_16)));
+
+           ig = (((png_uint_32)i *
+              (png_uint_32)png_gamma_shift[shift]) >> 4);
+           for (j = 0; j < 256; j++)
+           {
+              png_ptr->gamma_16_from_1[i][j] =
+                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                    65535.0, g) * 65535.0 + .5);
+           }
+        }
+     }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
+  }
+}
+#endif
+/* To do: install integer version of png_build_gamma_table here */
+#endif
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+/* undoes intrapixel differencing  */
+void /* PRIVATE */
+png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_intrapixel");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      int bytes_per_pixel;
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 3;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 4;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            *(rp) = (png_byte)((256 + *rp + *(rp+1))&0xff);
+            *(rp+2) = (png_byte)((256 + *(rp+2) + *(rp+1))&0xff);
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 6;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 8;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            png_uint_32 s0   = (*(rp    ) << 8) | *(rp + 1);
+            png_uint_32 s1   = (*(rp + 2) << 8) | *(rp + 3);
+            png_uint_32 s2   = (*(rp + 4) << 8) | *(rp + 5);
+            png_uint_32 red  = (png_uint_32)((s0 + s1 + 65536L) & 0xffffL);
+            png_uint_32 blue = (png_uint_32)((s2 + s1 + 65536L) & 0xffffL);
+            *(rp  ) = (png_byte)((red >> 8) & 0xff);
+            *(rp+1) = (png_byte)(red & 0xff);
+            *(rp+4) = (png_byte)((blue >> 8) & 0xff);
+            *(rp+5) = (png_byte)(blue & 0xff);
+         }
+      }
+   }
+}
+#endif /* PNG_MNG_FEATURES_SUPPORTED */
+#endif /* PNG_READ_SUPPORTED */
+
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
  * Last changed in libpng 1.2.15 January 5, 2007
diff --git a/src/dep/src/irrlicht/libpng/pngrutil.c b/src/dep/src/irrlicht/libpng/pngrutil.c
index 9860768..32275bd 100644
--- a/src/dep/src/irrlicht/libpng/pngrutil.c
+++ b/src/dep/src/irrlicht/libpng/pngrutil.c
@@ -1,4 +1,3225 @@
 
+/* pngrutil.c - utilities to read a PNG file
+ *
+ * Last changed in libpng 1.2.34 [December 18, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file contains routines that are only called from within
+ * libpng itself during the course of reading an image.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED)
+
+#if defined(_WIN32_WCE) && (_WIN32_WCE<0x500)
+#  define WIN32_WCE_OLD
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+#  if defined(WIN32_WCE_OLD)
+/* strtod() function is not supported on WindowsCE */
+__inline double png_strtod(png_structp png_ptr, PNG_CONST char *nptr, char **endptr)
+{
+   double result = 0;
+   int len;
+   wchar_t *str, *end;
+
+   len = MultiByteToWideChar(CP_ACP, 0, nptr, -1, NULL, 0);
+   str = (wchar_t *)png_malloc(png_ptr, len * png_sizeof(wchar_t));
+   if ( NULL != str )
+   {
+      MultiByteToWideChar(CP_ACP, 0, nptr, -1, str, len);
+      result = wcstod(str, &end);
+      len = WideCharToMultiByte(CP_ACP, 0, end, -1, NULL, 0, NULL, NULL);
+      *endptr = (char *)nptr + (png_strlen(nptr) - len + 1);
+      png_free(png_ptr, str);
+   }
+   return result;
+}
+#  else
+#    define png_strtod(p,a,b) strtod(a,b)
+#  endif
+#endif
+
+png_uint_32 PNGAPI
+png_get_uint_31(png_structp png_ptr, png_bytep buf)
+{
+#ifdef PNG_READ_BIG_ENDIAN_SUPPORTED
+   png_uint_32 i = png_get_uint_32(buf);
+#else
+   /* Avoid an extra function call by inlining the result. */
+   png_uint_32 i = ((png_uint_32)(*buf) << 24) +
+      ((png_uint_32)(*(buf + 1)) << 16) +
+      ((png_uint_32)(*(buf + 2)) << 8) +
+      (png_uint_32)(*(buf + 3));
+#endif
+   if (i > PNG_UINT_31_MAX)
+     png_error(png_ptr, "PNG unsigned integer out of range.");
+   return (i);
+}
+#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
+/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
+png_uint_32 PNGAPI
+png_get_uint_32(png_bytep buf)
+{
+   png_uint_32 i = ((png_uint_32)(*buf) << 24) +
+      ((png_uint_32)(*(buf + 1)) << 16) +
+      ((png_uint_32)(*(buf + 2)) << 8) +
+      (png_uint_32)(*(buf + 3));
+
+   return (i);
+}
+
+/* Grab a signed 32-bit integer from a buffer in big-endian format.  The
+ * data is stored in the PNG file in two's complement format, and it is
+ * assumed that the machine format for signed integers is the same. */
+png_int_32 PNGAPI
+png_get_int_32(png_bytep buf)
+{
+   png_int_32 i = ((png_int_32)(*buf) << 24) +
+      ((png_int_32)(*(buf + 1)) << 16) +
+      ((png_int_32)(*(buf + 2)) << 8) +
+      (png_int_32)(*(buf + 3));
+
+   return (i);
+}
+
+/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
+png_uint_16 PNGAPI
+png_get_uint_16(png_bytep buf)
+{
+   png_uint_16 i = (png_uint_16)(((png_uint_16)(*buf) << 8) +
+      (png_uint_16)(*(buf + 1)));
+
+   return (i);
+}
+#endif /* PNG_READ_BIG_ENDIAN_SUPPORTED */
+
+/* Read the chunk header (length + type name).
+ * Put the type name into png_ptr->chunk_name, and return the length.
+ */
+png_uint_32 /* PRIVATE */
+png_read_chunk_header(png_structp png_ptr)
+{
+   png_byte buf[8];
+   png_uint_32 length;
+
+   /* read the length and the chunk name */
+   png_read_data(png_ptr, buf, 8);
+   length = png_get_uint_31(png_ptr, buf);
+
+   /* put the chunk name into png_ptr->chunk_name */
+   png_memcpy(png_ptr->chunk_name, buf + 4, 4);
+
+   png_debug2(0, "Reading %s chunk, length = %lu",
+      png_ptr->chunk_name, length);
+
+   /* reset the crc and run it over the chunk name */
+   png_reset_crc(png_ptr);
+   png_calculate_crc(png_ptr, png_ptr->chunk_name, 4);
+
+   /* check to see if chunk name is valid */
+   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+
+   return length;
+}
+
+/* Read data, and (optionally) run it through the CRC. */
+void /* PRIVATE */
+png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
+{
+   if (png_ptr == NULL) return;
+   png_read_data(png_ptr, buf, length);
+   png_calculate_crc(png_ptr, buf, length);
+}
+
+/* Optionally skip data and then check the CRC.  Depending on whether we
+   are reading a ancillary or critical chunk, and how the program has set
+   things up, we may calculate the CRC on the data and print a message.
+   Returns '1' if there was a CRC error, '0' otherwise. */
+int /* PRIVATE */
+png_crc_finish(png_structp png_ptr, png_uint_32 skip)
+{
+   png_size_t i;
+   png_size_t istop = png_ptr->zbuf_size;
+
+   for (i = (png_size_t)skip; i > istop; i -= istop)
+   {
+      png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+   }
+   if (i)
+   {
+      png_crc_read(png_ptr, png_ptr->zbuf, i);
+   }
+
+   if (png_crc_error(png_ptr))
+   {
+      if (((png_ptr->chunk_name[0] & 0x20) &&                /* Ancillary */
+           !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)) ||
+          (!(png_ptr->chunk_name[0] & 0x20) &&             /* Critical  */
+          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE)))
+      {
+         png_chunk_warning(png_ptr, "CRC error");
+      }
+      else
+      {
+         png_chunk_error(png_ptr, "CRC error");
+      }
+      return (1);
+   }
+
+   return (0);
+}
+
+/* Compare the CRC stored in the PNG file with that calculated by libpng from
+   the data it has read thus far. */
+int /* PRIVATE */
+png_crc_error(png_structp png_ptr)
+{
+   png_byte crc_bytes[4];
+   png_uint_32 crc;
+   int need_crc = 1;
+
+   if (png_ptr->chunk_name[0] & 0x20)                     /* ancillary */
+   {
+      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
+          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
+         need_crc = 0;
+   }
+   else                                                    /* critical */
+   {
+      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+         need_crc = 0;
+   }
+
+   png_read_data(png_ptr, crc_bytes, 4);
+
+   if (need_crc)
+   {
+      crc = png_get_uint_32(crc_bytes);
+      return ((int)(crc != png_ptr->crc));
+   }
+   else
+      return (0);
+}
+
+#if defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) || \
+    defined(PNG_READ_iCCP_SUPPORTED)
+/*
+ * Decompress trailing data in a chunk.  The assumption is that chunkdata
+ * points at an allocated area holding the contents of a chunk with a
+ * trailing compressed part.  What we get back is an allocated area
+ * holding the original prefix part and an uncompressed version of the
+ * trailing part (the malloc area passed in is freed).
+ */
+void /* PRIVATE */
+png_decompress_chunk(png_structp png_ptr, int comp_type,
+                              png_size_t chunklength,
+                              png_size_t prefix_size, png_size_t *newlength)
+{
+   static PNG_CONST char msg[] = "Error decoding compressed text";
+   png_charp text;
+   png_size_t text_size;
+
+   if (comp_type == PNG_COMPRESSION_TYPE_BASE)
+   {
+      int ret = Z_OK;
+      png_ptr->zstream.next_in = (png_bytep)(png_ptr->chunkdata + prefix_size);
+      png_ptr->zstream.avail_in = (uInt)(chunklength - prefix_size);
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+      text_size = 0;
+      text = NULL;
+
+      while (png_ptr->zstream.avail_in)
+      {
+         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+         if (ret != Z_OK && ret != Z_STREAM_END)
+         {
+            if (png_ptr->zstream.msg != NULL)
+               png_warning(png_ptr, png_ptr->zstream.msg);
+            else
+               png_warning(png_ptr, msg);
+            inflateReset(&png_ptr->zstream);
+            png_ptr->zstream.avail_in = 0;
+
+            if (text ==  NULL)
+            {
+               text_size = prefix_size + png_sizeof(msg) + 1;
+               text = (png_charp)png_malloc_warn(png_ptr, text_size);
+               if (text ==  NULL)
+                 {
+                    png_free(png_ptr, png_ptr->chunkdata);
+                    png_ptr->chunkdata = NULL;
+                    png_error(png_ptr, "Not enough memory to decompress chunk");
+                 }
+               png_memcpy(text, png_ptr->chunkdata, prefix_size);
+            }
+
+            text[text_size - 1] = 0x00;
+
+            /* Copy what we can of the error message into the text chunk */
+            text_size = (png_size_t)(chunklength -
+              (text - png_ptr->chunkdata) - 1);
+            if (text_size > png_sizeof(msg))
+               text_size = png_sizeof(msg);
+            png_memcpy(text + prefix_size, msg, text_size);
+            break;
+         }
+         if (!png_ptr->zstream.avail_out || ret == Z_STREAM_END)
+         {
+            if (text == NULL)
+            {
+               text_size = prefix_size +
+                   png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+               text = (png_charp)png_malloc_warn(png_ptr, text_size + 1);
+               if (text ==  NULL)
+               {
+                  png_free(png_ptr, png_ptr->chunkdata);
+                  png_ptr->chunkdata = NULL;
+                  png_error(png_ptr,
+                    "Not enough memory to decompress chunk.");
+               }
+               png_memcpy(text + prefix_size, png_ptr->zbuf,
+                    text_size - prefix_size);
+               png_memcpy(text, png_ptr->chunkdata, prefix_size);
+               *(text + text_size) = 0x00;
+            }
+            else
+            {
+               png_charp tmp;
+
+               tmp = text;
+               text = (png_charp)png_malloc_warn(png_ptr,
+                  (png_uint_32)(text_size +
+                  png_ptr->zbuf_size - png_ptr->zstream.avail_out + 1));
+               if (text == NULL)
+               {
+                  png_free(png_ptr, tmp);
+                  png_free(png_ptr, png_ptr->chunkdata);
+                  png_ptr->chunkdata = NULL;
+                  png_error(png_ptr,
+                    "Not enough memory to decompress chunk..");
+               }
+               png_memcpy(text, tmp, text_size);
+               png_free(png_ptr, tmp);
+               png_memcpy(text + text_size, png_ptr->zbuf,
+                  (png_ptr->zbuf_size - png_ptr->zstream.avail_out));
+               text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+               *(text + text_size) = 0x00;
+            }
+            if (ret == Z_STREAM_END)
+               break;
+            else
+            {
+               png_ptr->zstream.next_out = png_ptr->zbuf;
+               png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+            }
+         }
+      }
+      if (ret != Z_STREAM_END)
+      {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+         char umsg[52];
+
+         if (ret == Z_BUF_ERROR)
+            png_snprintf(umsg, 52,
+                "Buffer error in compressed datastream in %s chunk",
+                png_ptr->chunk_name);
+         else if (ret == Z_DATA_ERROR)
+            png_snprintf(umsg, 52,
+                "Data error in compressed datastream in %s chunk",
+                png_ptr->chunk_name);
+         else
+            png_snprintf(umsg, 52,
+                "Incomplete compressed datastream in %s chunk",
+                png_ptr->chunk_name);
+         png_warning(png_ptr, umsg);
+#else
+         png_warning(png_ptr,
+            "Incomplete compressed datastream in chunk other than IDAT");
+#endif
+         text_size = prefix_size;
+         if (text ==  NULL)
+         {
+            text = (png_charp)png_malloc_warn(png_ptr, text_size+1);
+            if (text == NULL)
+              {
+                png_free(png_ptr, png_ptr->chunkdata);
+                png_ptr->chunkdata = NULL;
+                png_error(png_ptr, "Not enough memory for text.");
+              }
+            png_memcpy(text, png_ptr->chunkdata, prefix_size);
+         }
+         *(text + text_size) = 0x00;
+      }
+
+      inflateReset(&png_ptr->zstream);
+      png_ptr->zstream.avail_in = 0;
+
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = text;
+      *newlength=text_size;
+   }
+   else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */
+   {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+      char umsg[50];
+
+      png_snprintf(umsg, 50, "Unknown zTXt compression type %d", comp_type);
+      png_warning(png_ptr, umsg);
+#else
+      png_warning(png_ptr, "Unknown zTXt compression type");
+#endif
+
+      *(png_ptr->chunkdata + prefix_size) = 0x00;
+      *newlength = prefix_size;
+   }
+}
+#endif
+
+/* read and check the IDHR chunk */
+void /* PRIVATE */
+png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[13];
+   png_uint_32 width, height;
+   int bit_depth, color_type, compression_type, filter_type;
+   int interlace_type;
+
+   png_debug(1, "in png_handle_IHDR");
+
+   if (png_ptr->mode & PNG_HAVE_IHDR)
+      png_error(png_ptr, "Out of place IHDR");
+
+   /* check the length */
+   if (length != 13)
+      png_error(png_ptr, "Invalid IHDR chunk");
+
+   png_ptr->mode |= PNG_HAVE_IHDR;
+
+   png_crc_read(png_ptr, buf, 13);
+   png_crc_finish(png_ptr, 0);
+
+   width = png_get_uint_31(png_ptr, buf);
+   height = png_get_uint_31(png_ptr, buf + 4);
+   bit_depth = buf[8];
+   color_type = buf[9];
+   compression_type = buf[10];
+   filter_type = buf[11];
+   interlace_type = buf[12];
+
+   /* set internal variables */
+   png_ptr->width = width;
+   png_ptr->height = height;
+   png_ptr->bit_depth = (png_byte)bit_depth;
+   png_ptr->interlaced = (png_byte)interlace_type;
+   png_ptr->color_type = (png_byte)color_type;
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   png_ptr->filter_type = (png_byte)filter_type;
+#endif
+   png_ptr->compression_type = (png_byte)compression_type;
+
+   /* find number of channels */
+   switch (png_ptr->color_type)
+   {
+      case PNG_COLOR_TYPE_GRAY:
+      case PNG_COLOR_TYPE_PALETTE:
+         png_ptr->channels = 1;
+         break;
+      case PNG_COLOR_TYPE_RGB:
+         png_ptr->channels = 3;
+         break;
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+         png_ptr->channels = 2;
+         break;
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+         png_ptr->channels = 4;
+         break;
+   }
+
+   /* set up other useful info */
+   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *
+   png_ptr->channels);
+   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);
+   png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
+   png_debug1(3, "channels = %d", png_ptr->channels);
+   png_debug1(3, "rowbytes = %lu", png_ptr->rowbytes);
+   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
+      color_type, interlace_type, compression_type, filter_type);
+}
+
+/* read and check the palette */
+void /* PRIVATE */
+png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_color palette[PNG_MAX_PALETTE_LENGTH];
+   int num, i;
+#ifndef PNG_NO_POINTER_INDEXING
+   png_colorp pal_ptr;
+#endif
+
+   png_debug(1, "in png_handle_PLTE");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before PLTE");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid PLTE after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      png_error(png_ptr, "Duplicate PLTE chunk");
+
+   png_ptr->mode |= PNG_HAVE_PLTE;
+
+   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+   {
+      png_warning(png_ptr,
+        "Ignoring PLTE chunk in grayscale PNG");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+   if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+#endif
+
+   if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
+   {
+      if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+      {
+         png_warning(png_ptr, "Invalid palette chunk");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      else
+      {
+         png_error(png_ptr, "Invalid palette chunk");
+      }
+   }
+
+   num = (int)length / 3;
+
+#ifndef PNG_NO_POINTER_INDEXING
+   for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
+   {
+      png_byte buf[3];
+
+      png_crc_read(png_ptr, buf, 3);
+      pal_ptr->red = buf[0];
+      pal_ptr->green = buf[1];
+      pal_ptr->blue = buf[2];
+   }
+#else
+   for (i = 0; i < num; i++)
+   {
+      png_byte buf[3];
+
+      png_crc_read(png_ptr, buf, 3);
+      /* don't depend upon png_color being any order */
+      palette[i].red = buf[0];
+      palette[i].green = buf[1];
+      palette[i].blue = buf[2];
+   }
+#endif
+
+   /* If we actually NEED the PLTE chunk (ie for a paletted image), we do
+      whatever the normal CRC configuration tells us.  However, if we
+      have an RGB image, the PLTE can be considered ancillary, so
+      we will act as though it is. */
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+#endif
+   {
+      png_crc_finish(png_ptr, 0);
+   }
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+   else if (png_crc_error(png_ptr))  /* Only if we have a CRC error */
+   {
+      /* If we don't want to use the data from an ancillary chunk,
+         we have two options: an error abort, or a warning and we
+         ignore the data in this chunk (which should be OK, since
+         it's considered ancillary for a RGB or RGBA image). */
+      if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
+      {
+         if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
+         {
+            png_chunk_error(png_ptr, "CRC error");
+         }
+         else
+         {
+            png_chunk_warning(png_ptr, "CRC error");
+            return;
+         }
+      }
+      /* Otherwise, we (optionally) emit a warning and use the chunk. */
+      else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
+      {
+         png_chunk_warning(png_ptr, "CRC error");
+      }
+   }
+#endif
+
+   png_set_PLTE(png_ptr, info_ptr, palette, num);
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+      {
+         if (png_ptr->num_trans > (png_uint_16)num)
+         {
+            png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
+            png_ptr->num_trans = (png_uint_16)num;
+         }
+         if (info_ptr->num_trans > (png_uint_16)num)
+         {
+            png_warning(png_ptr, "Truncating incorrect info tRNS chunk length");
+            info_ptr->num_trans = (png_uint_16)num;
+         }
+      }
+   }
+#endif
+
+}
+
+void /* PRIVATE */
+png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_debug(1, "in png_handle_IEND");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
+   {
+      png_error(png_ptr, "No image in file");
+   }
+
+   png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
+
+   if (length != 0)
+   {
+      png_warning(png_ptr, "Incorrect IEND chunk length");
+   }
+   png_crc_finish(png_ptr, length);
+
+   info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */
+}
+
+#if defined(PNG_READ_gAMA_SUPPORTED)
+void /* PRIVATE */
+png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_fixed_point igamma;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float file_gamma;
+#endif
+   png_byte buf[4];
+
+   png_debug(1, "in png_handle_gAMA");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before gAMA");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid gAMA after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place gAMA chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      && !(info_ptr->valid & PNG_INFO_sRGB)
+#endif
+      )
+   {
+      png_warning(png_ptr, "Duplicate gAMA chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 4)
+   {
+      png_warning(png_ptr, "Incorrect gAMA chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 4);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   igamma = (png_fixed_point)png_get_uint_32(buf);
+   /* check for zero gamma */
+   if (igamma == 0)
+      {
+         png_warning(png_ptr,
+           "Ignoring gAMA chunk with gamma=0");
+         return;
+      }
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
+      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
+      {
+         png_warning(png_ptr,
+           "Ignoring incorrect gAMA value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+         fprintf(stderr, "gamma = (%d/100000)", (int)igamma);
+#endif
+         return;
+      }
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   file_gamma = (float)igamma / (float)100000.0;
+#  ifdef PNG_READ_GAMMA_SUPPORTED
+     png_ptr->gamma = file_gamma;
+#  endif
+     png_set_gAMA(png_ptr, info_ptr, file_gamma);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_gAMA_fixed(png_ptr, info_ptr, igamma);
+#endif
+}
+#endif
+
+#if defined(PNG_READ_sBIT_SUPPORTED)
+void /* PRIVATE */
+png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_size_t truelen;
+   png_byte buf[4];
+
+   png_debug(1, "in png_handle_sBIT");
+
+   buf[0] = buf[1] = buf[2] = buf[3] = 0;
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sBIT");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sBIT after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+   {
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place sBIT chunk");
+   }
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
+   {
+      png_warning(png_ptr, "Duplicate sBIT chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      truelen = 3;
+   else
+      truelen = (png_size_t)png_ptr->channels;
+
+   if (length != truelen || length > 4)
+   {
+      png_warning(png_ptr, "Incorrect sBIT chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, truelen);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_ptr->sig_bit.red = buf[0];
+      png_ptr->sig_bit.green = buf[1];
+      png_ptr->sig_bit.blue = buf[2];
+      png_ptr->sig_bit.alpha = buf[3];
+   }
+   else
+   {
+      png_ptr->sig_bit.gray = buf[0];
+      png_ptr->sig_bit.red = buf[0];
+      png_ptr->sig_bit.green = buf[0];
+      png_ptr->sig_bit.blue = buf[0];
+      png_ptr->sig_bit.alpha = buf[1];
+   }
+   png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
+}
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED)
+void /* PRIVATE */
+png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[32];
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+#endif
+   png_fixed_point int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,
+      int_y_green, int_x_blue, int_y_blue;
+
+   png_uint_32 uint_x, uint_y;
+
+   png_debug(1, "in png_handle_cHRM");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before cHRM");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid cHRM after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Missing PLTE before cHRM");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      && !(info_ptr->valid & PNG_INFO_sRGB)
+#endif
+      )
+   {
+      png_warning(png_ptr, "Duplicate cHRM chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 32)
+   {
+      png_warning(png_ptr, "Incorrect cHRM chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 32);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   uint_x = png_get_uint_32(buf);
+   uint_y = png_get_uint_32(buf + 4);
+   int_x_white = (png_fixed_point)uint_x;
+   int_y_white = (png_fixed_point)uint_y;
+
+   uint_x = png_get_uint_32(buf + 8);
+   uint_y = png_get_uint_32(buf + 12);
+   int_x_red = (png_fixed_point)uint_x;
+   int_y_red = (png_fixed_point)uint_y;
+
+   uint_x = png_get_uint_32(buf + 16);
+   uint_y = png_get_uint_32(buf + 20);
+   int_x_green = (png_fixed_point)uint_x;
+   int_y_green = (png_fixed_point)uint_y;
+
+   uint_x = png_get_uint_32(buf + 24);
+   uint_y = png_get_uint_32(buf + 28);
+   int_x_blue = (png_fixed_point)uint_x;
+   int_y_blue = (png_fixed_point)uint_y;
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   white_x = (float)int_x_white / (float)100000.0;
+   white_y = (float)int_y_white / (float)100000.0;
+   red_x   = (float)int_x_red   / (float)100000.0;
+   red_y   = (float)int_y_red   / (float)100000.0;
+   green_x = (float)int_x_green / (float)100000.0;
+   green_y = (float)int_y_green / (float)100000.0;
+   blue_x  = (float)int_x_blue  / (float)100000.0;
+   blue_y  = (float)int_y_blue  / (float)100000.0;
+#endif
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+   if ((info_ptr != NULL) && (info_ptr->valid & PNG_INFO_sRGB))
+      {
+      if (PNG_OUT_OF_RANGE(int_x_white, 31270,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_white, 32900,  1000) ||
+          PNG_OUT_OF_RANGE(int_x_red,   64000L, 1000) ||
+          PNG_OUT_OF_RANGE(int_y_red,   33000,  1000) ||
+          PNG_OUT_OF_RANGE(int_x_green, 30000,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_green, 60000L, 1000) ||
+          PNG_OUT_OF_RANGE(int_x_blue,  15000,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_blue,   6000,  1000))
+         {
+            png_warning(png_ptr,
+              "Ignoring incorrect cHRM value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+            fprintf(stderr, "wx=%f, wy=%f, rx=%f, ry=%f\n",
+               white_x, white_y, red_x, red_y);
+            fprintf(stderr, "gx=%f, gy=%f, bx=%f, by=%f\n",
+               green_x, green_y, blue_x, blue_y);
+#else
+            fprintf(stderr, "wx=%ld, wy=%ld, rx=%ld, ry=%ld\n",
+               int_x_white, int_y_white, int_x_red, int_y_red);
+            fprintf(stderr, "gx=%ld, gy=%ld, bx=%ld, by=%ld\n",
+               int_x_green, int_y_green, int_x_blue, int_y_blue);
+#endif
+#endif /* PNG_NO_CONSOLE_IO */
+         }
+         return;
+      }
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   png_set_cHRM(png_ptr, info_ptr,
+      white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_cHRM_fixed(png_ptr, info_ptr,
+      int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,
+      int_y_green, int_x_blue, int_y_blue);
+#endif
+}
+#endif
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+void /* PRIVATE */
+png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   int intent;
+   png_byte buf[1];
+
+   png_debug(1, "in png_handle_sRGB");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sRGB");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sRGB after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place sRGB chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
+   {
+      png_warning(png_ptr, "Duplicate sRGB chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 1)
+   {
+      png_warning(png_ptr, "Incorrect sRGB chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 1);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   intent = buf[0];
+   /* check for bad intent */
+   if (intent >= PNG_sRGB_INTENT_LAST)
+   {
+      png_warning(png_ptr, "Unknown sRGB intent");
+      return;
+   }
+
+#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA))
+   {
+   png_fixed_point igamma;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      igamma=info_ptr->int_gamma;
+#else
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+      igamma=(png_fixed_point)(info_ptr->gamma * 100000.);
+#  endif
+#endif
+      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
+      {
+         png_warning(png_ptr,
+           "Ignoring incorrect gAMA value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+         fprintf(stderr, "incorrect gamma=(%d/100000)\n",
+            (int)png_ptr->int_gamma);
+#  else
+#    ifdef PNG_FLOATING_POINT_SUPPORTED
+         fprintf(stderr, "incorrect gamma=%f\n", png_ptr->gamma);
+#    endif
+#  endif
+#endif
+      }
+   }
+#endif /* PNG_READ_gAMA_SUPPORTED */
+
+#ifdef PNG_READ_cHRM_SUPPORTED
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+      if (PNG_OUT_OF_RANGE(info_ptr->int_x_white, 31270,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_white, 32900,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_red,   64000L, 1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_red,   33000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_green, 30000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_green, 60000L, 1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_blue,  15000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_blue,   6000,  1000))
+         {
+            png_warning(png_ptr,
+              "Ignoring incorrect cHRM value when sRGB is also present");
+         }
+#endif /* PNG_FIXED_POINT_SUPPORTED */
+#endif /* PNG_READ_cHRM_SUPPORTED */
+
+   png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);
+}
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#if defined(PNG_READ_iCCP_SUPPORTED)
+void /* PRIVATE */
+png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+{
+   png_byte compression_type;
+   png_bytep pC;
+   png_charp profile;
+   png_uint_32 skip = 0;
+   png_uint_32 profile_size, profile_length;
+   png_size_t slength, prefix_length, data_length;
+
+   png_debug(1, "in png_handle_iCCP");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before iCCP");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid iCCP after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place iCCP chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
+   {
+      png_warning(png_ptr, "Duplicate iCCP chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "iCCP chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00;
+
+   for (profile = png_ptr->chunkdata; *profile; profile++)
+      /* empty loop to find end of name */ ;
+
+   ++profile;
+
+   /* there should be at least one zero (the compression type byte)
+      following the separator, and we should be on it  */
+   if ( profile >= png_ptr->chunkdata + slength - 1)
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      png_warning(png_ptr, "Malformed iCCP chunk");
+      return;
+   }
+
+   /* compression_type should always be zero */
+   compression_type = *profile++;
+   if (compression_type)
+   {
+      png_warning(png_ptr, "Ignoring nonzero compression type in iCCP chunk");
+      compression_type = 0x00;  /* Reset it to zero (libpng-1.0.6 through 1.0.8
+                                 wrote nonzero) */
+   }
+
+   prefix_length = profile - png_ptr->chunkdata;
+   png_decompress_chunk(png_ptr, compression_type,
+     slength, prefix_length, &data_length);
+
+   profile_length = data_length - prefix_length;
+
+   if ( prefix_length > data_length || profile_length < 4)
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      png_warning(png_ptr, "Profile size field missing from iCCP chunk");
+      return;
+   }
+
+   /* Check the profile_size recorded in the first 32 bits of the ICC profile */
+   pC = (png_bytep)(png_ptr->chunkdata + prefix_length);
+   profile_size = ((*(pC    ))<<24) |
+                  ((*(pC + 1))<<16) |
+                  ((*(pC + 2))<< 8) |
+                  ((*(pC + 3))    );
+
+   if (profile_size < profile_length)
+      profile_length = profile_size;
+
+   if (profile_size > profile_length)
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      png_warning(png_ptr, "Ignoring truncated iCCP profile.");
+      return;
+   }
+
+   png_set_iCCP(png_ptr, info_ptr, png_ptr->chunkdata,
+     compression_type, png_ptr->chunkdata + prefix_length, profile_length);
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+}
+#endif /* PNG_READ_iCCP_SUPPORTED */
+
+#if defined(PNG_READ_sPLT_SUPPORTED)
+void /* PRIVATE */
+png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+{
+   png_bytep entry_start;
+   png_sPLT_t new_palette;
+#ifdef PNG_NO_POINTER_INDEXING
+   png_sPLT_entryp pp;
+#endif
+   int data_length, entry_size, i;
+   png_uint_32 skip = 0;
+   png_size_t slength;
+
+   png_debug(1, "in png_handle_sPLT");
+
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sPLT");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sPLT after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "sPLT chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00;
+
+   for (entry_start = (png_bytep)png_ptr->chunkdata; *entry_start; entry_start++)
+      /* empty loop to find end of name */ ;
+   ++entry_start;
+
+   /* a sample depth should follow the separator, and we should be on it  */
+   if (entry_start > (png_bytep)png_ptr->chunkdata + slength - 2)
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      png_warning(png_ptr, "malformed sPLT chunk");
+      return;
+   }
+
+   new_palette.depth = *entry_start++;
+   entry_size = (new_palette.depth == 8 ? 6 : 10);
+   data_length = (slength - (entry_start - (png_bytep)png_ptr->chunkdata));
+
+   /* integrity-check the data length */
+   if (data_length % entry_size)
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      png_warning(png_ptr, "sPLT chunk has bad length");
+      return;
+   }
+
+   new_palette.nentries = (png_int_32) ( data_length / entry_size);
+   if ((png_uint_32) new_palette.nentries >
+       (png_uint_32) (PNG_SIZE_MAX / png_sizeof(png_sPLT_entry)))
+   {
+       png_warning(png_ptr, "sPLT chunk too long");
+       return;
+   }
+   new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
+       png_ptr, new_palette.nentries * png_sizeof(png_sPLT_entry));
+   if (new_palette.entries == NULL)
+   {
+       png_warning(png_ptr, "sPLT chunk requires too much memory");
+       return;
+   }
+
+#ifndef PNG_NO_POINTER_INDEXING
+   for (i = 0; i < new_palette.nentries; i++)
+   {
+      png_sPLT_entryp pp = new_palette.entries + i;
+
+      if (new_palette.depth == 8)
+      {
+          pp->red = *entry_start++;
+          pp->green = *entry_start++;
+          pp->blue = *entry_start++;
+          pp->alpha = *entry_start++;
+      }
+      else
+      {
+          pp->red   = png_get_uint_16(entry_start); entry_start += 2;
+          pp->green = png_get_uint_16(entry_start); entry_start += 2;
+          pp->blue  = png_get_uint_16(entry_start); entry_start += 2;
+          pp->alpha = png_get_uint_16(entry_start); entry_start += 2;
+      }
+      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
+   }
+#else
+   pp = new_palette.entries;
+   for (i = 0; i < new_palette.nentries; i++)
+   {
+
+      if (new_palette.depth == 8)
+      {
+          pp[i].red   = *entry_start++;
+          pp[i].green = *entry_start++;
+          pp[i].blue  = *entry_start++;
+          pp[i].alpha = *entry_start++;
+      }
+      else
+      {
+          pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].green = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
+      }
+      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
+   }
+#endif
+
+   /* discard all chunk data except the name and stash that */
+   new_palette.name = png_ptr->chunkdata;
+
+   png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+   png_free(png_ptr, new_palette.entries);
+}
+#endif /* PNG_READ_sPLT_SUPPORTED */
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+void /* PRIVATE */
+png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
+
+   png_debug(1, "in png_handle_tRNS");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before tRNS");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid tRNS after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+   {
+      png_warning(png_ptr, "Duplicate tRNS chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      png_byte buf[2];
+
+      if (length != 2)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+
+      png_crc_read(png_ptr, buf, 2);
+      png_ptr->num_trans = 1;
+      png_ptr->trans_values.gray = png_get_uint_16(buf);
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      png_byte buf[6];
+
+      if (length != 6)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      png_crc_read(png_ptr, buf, (png_size_t)length);
+      png_ptr->num_trans = 1;
+      png_ptr->trans_values.red = png_get_uint_16(buf);
+      png_ptr->trans_values.green = png_get_uint_16(buf + 2);
+      png_ptr->trans_values.blue = png_get_uint_16(buf + 4);
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (!(png_ptr->mode & PNG_HAVE_PLTE))
+      {
+         /* Should be an error, but we can cope with it. */
+         png_warning(png_ptr, "Missing PLTE before tRNS");
+      }
+      if (length > (png_uint_32)png_ptr->num_palette ||
+          length > PNG_MAX_PALETTE_LENGTH)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      if (length == 0)
+      {
+         png_warning(png_ptr, "Zero length tRNS chunk");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      png_crc_read(png_ptr, readbuf, (png_size_t)length);
+      png_ptr->num_trans = (png_uint_16)length;
+   }
+   else
+   {
+      png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_ptr->num_trans = 0;
+      return;
+   }
+
+   png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
+      &(png_ptr->trans_values));
+}
+#endif
+
+#if defined(PNG_READ_bKGD_SUPPORTED)
+void /* PRIVATE */
+png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_size_t truelen;
+   png_byte buf[6];
+
+   png_debug(1, "in png_handle_bKGD");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before bKGD");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid bKGD after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+            !(png_ptr->mode & PNG_HAVE_PLTE))
+   {
+      png_warning(png_ptr, "Missing PLTE before bKGD");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD))
+   {
+      png_warning(png_ptr, "Duplicate bKGD chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      truelen = 1;
+   else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      truelen = 6;
+   else
+      truelen = 2;
+
+   if (length != truelen)
+   {
+      png_warning(png_ptr, "Incorrect bKGD chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, truelen);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   /* We convert the index value into RGB components so that we can allow
+    * arbitrary RGB values for background when we have transparency, and
+    * so it is easy to determine the RGB values of the background color
+    * from the info_ptr struct. */
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      png_ptr->background.index = buf[0];
+      if (info_ptr && info_ptr->num_palette)
+      {
+          if (buf[0] >= info_ptr->num_palette)
+          {
+             png_warning(png_ptr, "Incorrect bKGD chunk index value");
+             return;
+          }
+          png_ptr->background.red =
+             (png_uint_16)png_ptr->palette[buf[0]].red;
+          png_ptr->background.green =
+             (png_uint_16)png_ptr->palette[buf[0]].green;
+          png_ptr->background.blue =
+             (png_uint_16)png_ptr->palette[buf[0]].blue;
+      }
+   }
+   else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
+   {
+      png_ptr->background.red =
+      png_ptr->background.green =
+      png_ptr->background.blue =
+      png_ptr->background.gray = png_get_uint_16(buf);
+   }
+   else
+   {
+      png_ptr->background.red = png_get_uint_16(buf);
+      png_ptr->background.green = png_get_uint_16(buf + 2);
+      png_ptr->background.blue = png_get_uint_16(buf + 4);
+   }
+
+   png_set_bKGD(png_ptr, info_ptr, &(png_ptr->background));
+}
+#endif
+
+#if defined(PNG_READ_hIST_SUPPORTED)
+void /* PRIVATE */
+png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   unsigned int num, i;
+   png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];
+
+   png_debug(1, "in png_handle_hIST");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before hIST");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid hIST after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (!(png_ptr->mode & PNG_HAVE_PLTE))
+   {
+      png_warning(png_ptr, "Missing PLTE before hIST");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST))
+   {
+      png_warning(png_ptr, "Duplicate hIST chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   num = length / 2 ;
+   if (num != (unsigned int) png_ptr->num_palette || num >
+      (unsigned int) PNG_MAX_PALETTE_LENGTH)
+   {
+      png_warning(png_ptr, "Incorrect hIST chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   for (i = 0; i < num; i++)
+   {
+      png_byte buf[2];
+
+      png_crc_read(png_ptr, buf, 2);
+      readbuf[i] = png_get_uint_16(buf);
+   }
+
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   png_set_hIST(png_ptr, info_ptr, readbuf);
+}
+#endif
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+void /* PRIVATE */
+png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[9];
+   png_uint_32 res_x, res_y;
+   int unit_type;
+
+   png_debug(1, "in png_handle_pHYs");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before pHYs");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid pHYs after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_warning(png_ptr, "Duplicate pHYs chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 9)
+   {
+      png_warning(png_ptr, "Incorrect pHYs chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 9);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   res_x = png_get_uint_32(buf);
+   res_y = png_get_uint_32(buf + 4);
+   unit_type = buf[8];
+   png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
+}
+#endif
+
+#if defined(PNG_READ_oFFs_SUPPORTED)
+void /* PRIVATE */
+png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[9];
+   png_int_32 offset_x, offset_y;
+   int unit_type;
+
+   png_debug(1, "in png_handle_oFFs");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before oFFs");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid oFFs after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+   {
+      png_warning(png_ptr, "Duplicate oFFs chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 9)
+   {
+      png_warning(png_ptr, "Incorrect oFFs chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 9);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   offset_x = png_get_int_32(buf);
+   offset_y = png_get_int_32(buf + 4);
+   unit_type = buf[8];
+   png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
+}
+#endif
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+/* read the pCAL chunk (described in the PNG Extensions document) */
+void /* PRIVATE */
+png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_int_32 X0, X1;
+   png_byte type, nparams;
+   png_charp buf, units, endptr;
+   png_charpp params;
+   png_size_t slength;
+   int i;
+
+   png_debug(1, "in png_handle_pCAL");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before pCAL");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid pCAL after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL))
+   {
+      png_warning(png_ptr, "Duplicate pCAL chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_debug1(2, "Allocating and reading pCAL chunk data (%lu bytes)",
+      length + 1);
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (png_ptr->chunkdata == NULL)
+     {
+       png_warning(png_ptr, "No memory for pCAL purpose.");
+       return;
+     }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00; /* null terminate the last string */
+
+   png_debug(3, "Finding end of pCAL purpose string");
+   for (buf = png_ptr->chunkdata; *buf; buf++)
+      /* empty loop */ ;
+
+   endptr = png_ptr->chunkdata + slength;
+
+   /* We need to have at least 12 bytes after the purpose string
+      in order to get the parameter information. */
+   if (endptr <= buf + 12)
+   {
+      png_warning(png_ptr, "Invalid pCAL data");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_debug(3, "Reading pCAL X0, X1, type, nparams, and units");
+   X0 = png_get_int_32((png_bytep)buf+1);
+   X1 = png_get_int_32((png_bytep)buf+5);
+   type = buf[9];
+   nparams = buf[10];
+   units = buf + 11;
+
+   png_debug(3, "Checking pCAL equation type and number of parameters");
+   /* Check that we have the right number of parameters for known
+      equation types. */
+   if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||
+       (type == PNG_EQUATION_BASE_E && nparams != 3) ||
+       (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
+       (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
+   {
+      png_warning(png_ptr, "Invalid pCAL parameters for equation type");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+   else if (type >= PNG_EQUATION_LAST)
+   {
+      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+   }
+
+   for (buf = units; *buf; buf++)
+      /* Empty loop to move past the units string. */ ;
+
+   png_debug(3, "Allocating pCAL parameters array");
+   params = (png_charpp)png_malloc_warn(png_ptr,
+      (png_uint_32)(nparams * png_sizeof(png_charp))) ;
+   if (params == NULL)
+     {
+       png_free(png_ptr, png_ptr->chunkdata);
+       png_ptr->chunkdata = NULL;
+       png_warning(png_ptr, "No memory for pCAL params.");
+       return;
+     }
+
+   /* Get pointers to the start of each parameter string. */
+   for (i = 0; i < (int)nparams; i++)
+   {
+      buf++; /* Skip the null string terminator from previous parameter. */
+
+      png_debug1(3, "Reading pCAL parameter %d", i);
+      for (params[i] = buf; buf <= endptr && *buf != 0x00; buf++)
+         /* Empty loop to move past each parameter string */ ;
+
+      /* Make sure we haven't run out of data yet */
+      if (buf > endptr)
+      {
+         png_warning(png_ptr, "Invalid pCAL data");
+         png_free(png_ptr, png_ptr->chunkdata);
+         png_ptr->chunkdata = NULL;
+         png_free(png_ptr, params);
+         return;
+      }
+   }
+
+   png_set_pCAL(png_ptr, info_ptr, png_ptr->chunkdata, X0, X1, type, nparams,
+      units, params);
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+   png_free(png_ptr, params);
+}
+#endif
+
+#if defined(PNG_READ_sCAL_SUPPORTED)
+/* read the sCAL chunk */
+void /* PRIVATE */
+png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_charp ep;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   double width, height;
+   png_charp vp;
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_charp swidth, sheight;
+#endif
+#endif
+   png_size_t slength;
+
+   png_debug(1, "in png_handle_sCAL");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sCAL");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sCAL after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL))
+   {
+      png_warning(png_ptr, "Duplicate sCAL chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)",
+      length + 1);
+   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (png_ptr->chunkdata == NULL)
+   {
+      png_warning(png_ptr, "Out of memory while processing sCAL chunk");
+      return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00; /* null terminate the last string */
+
+   ep = png_ptr->chunkdata + 1;        /* skip unit byte */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   width = png_strtod(png_ptr, ep, &vp);
+   if (*vp)
+   {
+      png_warning(png_ptr, "malformed width string in sCAL chunk");
+      return;
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   swidth = (png_charp)png_malloc_warn(png_ptr, png_strlen(ep) + 1);
+   if (swidth == NULL)
+   {
+      png_warning(png_ptr, "Out of memory while processing sCAL chunk width");
+      return;
+   }
+   png_memcpy(swidth, ep, (png_size_t)png_strlen(ep));
+#endif
+#endif
+
+   for (ep = png_ptr->chunkdata; *ep; ep++)
+      /* empty loop */ ;
+   ep++;
+
+   if (png_ptr->chunkdata + slength < ep)
+   {
+      png_warning(png_ptr, "Truncated sCAL chunk");
+#if defined(PNG_FIXED_POINT_SUPPORTED) && \
+    !defined(PNG_FLOATING_POINT_SUPPORTED)
+      png_free(png_ptr, swidth);
+#endif
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   height = png_strtod(png_ptr, ep, &vp);
+   if (*vp)
+   {
+      png_warning(png_ptr, "malformed height string in sCAL chunk");
+      return;
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   sheight = (png_charp)png_malloc_warn(png_ptr, png_strlen(ep) + 1);
+   if (sheight == NULL)
+   {
+      png_warning(png_ptr, "Out of memory while processing sCAL chunk height");
+      return;
+   }
+   png_memcpy(sheight, ep, (png_size_t)png_strlen(ep));
+#endif
+#endif
+
+   if (png_ptr->chunkdata + slength < ep
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      || width <= 0. || height <= 0.
+#endif
+      )
+   {
+      png_warning(png_ptr, "Invalid sCAL data");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+      png_free(png_ptr, swidth);
+      png_free(png_ptr, sheight);
+#endif
+      return;
+   }
+
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   png_set_sCAL(png_ptr, info_ptr, png_ptr->chunkdata[0], width, height);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_sCAL_s(png_ptr, info_ptr, png_ptr->chunkdata[0], swidth, sheight);
+#endif
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+   png_free(png_ptr, swidth);
+   png_free(png_ptr, sheight);
+#endif
+}
+#endif
+
+#if defined(PNG_READ_tIME_SUPPORTED)
+void /* PRIVATE */
+png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[7];
+   png_time mod_time;
+
+   png_debug(1, "in png_handle_tIME");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Out of place tIME chunk");
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME))
+   {
+      png_warning(png_ptr, "Duplicate tIME chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+   if (length != 7)
+   {
+      png_warning(png_ptr, "Incorrect tIME chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 7);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   mod_time.second = buf[6];
+   mod_time.minute = buf[5];
+   mod_time.hour = buf[4];
+   mod_time.day = buf[3];
+   mod_time.month = buf[2];
+   mod_time.year = png_get_uint_16(buf);
+
+   png_set_tIME(png_ptr, info_ptr, &mod_time);
+}
+#endif
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp key;
+   png_charp text;
+   png_uint_32 skip = 0;
+   png_size_t slength;
+   int ret;
+
+   png_debug(1, "in png_handle_tEXt");
+
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before tEXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+
+   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (png_ptr->chunkdata == NULL)
+   {
+     png_warning(png_ptr, "No memory to process text chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   key = png_ptr->chunkdata;
+
+   key[slength] = 0x00;
+
+   for (text = key; *text; text++)
+      /* empty loop to find end of key */ ;
+
+   if (text != key + slength)
+      text++;
+
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+      (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr, "Not enough memory to process text chunk.");
+     png_free(png_ptr, png_ptr->chunkdata);
+     png_ptr->chunkdata = NULL;
+     return;
+   }
+   text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
+   text_ptr->key = key;
+#ifdef PNG_iTXt_SUPPORTED
+   text_ptr->lang = NULL;
+   text_ptr->lang_key = NULL;
+   text_ptr->itxt_length = 0;
+#endif
+   text_ptr->text = text;
+   text_ptr->text_length = png_strlen(text);
+
+   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+   png_free(png_ptr, text_ptr);
+   if (ret)
+     png_warning(png_ptr, "Insufficient memory to process text chunk.");
+}
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+/* note: this does not correctly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp text;
+   int comp_type;
+   int ret;
+   png_size_t slength, prefix_len, data_len;
+
+   png_debug(1, "in png_handle_zTXt");
+
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before zTXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We will no doubt have problems with chunks even half this size, but
+      there is no hard and fast rule to tell us where to stop. */
+   if (length > (png_uint_32)65535L)
+   {
+     png_warning(png_ptr, "zTXt chunk too large to fit in memory");
+     png_crc_finish(png_ptr, length);
+     return;
+   }
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (png_ptr->chunkdata == NULL)
+   {
+     png_warning(png_ptr, "Out of memory processing zTXt chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00;
+
+   for (text = png_ptr->chunkdata; *text; text++)
+      /* empty loop */ ;
+
+   /* zTXt must have some text after the chunkdataword */
+   if (text >= png_ptr->chunkdata + slength - 2)
+   {
+      png_warning(png_ptr, "Truncated zTXt chunk");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+   else
+   {
+       comp_type = *(++text);
+       if (comp_type != PNG_TEXT_COMPRESSION_zTXt)
+       {
+          png_warning(png_ptr, "Unknown compression type in zTXt chunk");
+          comp_type = PNG_TEXT_COMPRESSION_zTXt;
+       }
+       text++;        /* skip the compression_method byte */
+   }
+   prefix_len = text - png_ptr->chunkdata;
+
+   png_decompress_chunk(png_ptr, comp_type,
+     (png_size_t)length, prefix_len, &data_len);
+
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+      (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr, "Not enough memory to process zTXt chunk.");
+     png_free(png_ptr, png_ptr->chunkdata);
+     png_ptr->chunkdata = NULL;
+     return;
+   }
+   text_ptr->compression = comp_type;
+   text_ptr->key = png_ptr->chunkdata;
+#ifdef PNG_iTXt_SUPPORTED
+   text_ptr->lang = NULL;
+   text_ptr->lang_key = NULL;
+   text_ptr->itxt_length = 0;
+#endif
+   text_ptr->text = png_ptr->chunkdata + prefix_len;
+   text_ptr->text_length = data_len;
+
+   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, text_ptr);
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store zTXt chunk.");
+}
+#endif
+
+#if defined(PNG_READ_iTXt_SUPPORTED)
+/* note: this does not correctly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp key, lang, text, lang_key;
+   int comp_flag;
+   int comp_type = 0;
+   int ret;
+   png_size_t slength, prefix_len, data_len;
+
+   png_debug(1, "in png_handle_iTXt");
+
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before iTXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We will no doubt have problems with chunks even half this size, but
+      there is no hard and fast rule to tell us where to stop. */
+   if (length > (png_uint_32)65535L)
+   {
+     png_warning(png_ptr, "iTXt chunk too large to fit in memory");
+     png_crc_finish(png_ptr, length);
+     return;
+   }
+#endif
+
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (png_ptr->chunkdata == NULL)
+   {
+     png_warning(png_ptr, "No memory to process iTXt chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   png_ptr->chunkdata[slength] = 0x00;
+
+   for (lang = png_ptr->chunkdata; *lang; lang++)
+      /* empty loop */ ;
+   lang++;        /* skip NUL separator */
+
+   /* iTXt must have a language tag (possibly empty), two compression bytes,
+      translated keyword (possibly empty), and possibly some text after the
+      keyword */
+
+   if (lang >= png_ptr->chunkdata + slength - 3)
+   {
+      png_warning(png_ptr, "Truncated iTXt chunk");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+   else
+   {
+       comp_flag = *lang++;
+       comp_type = *lang++;
+   }
+
+   for (lang_key = lang; *lang_key; lang_key++)
+      /* empty loop */ ;
+   lang_key++;        /* skip NUL separator */
+
+   if (lang_key >= png_ptr->chunkdata + slength)
+   {
+      png_warning(png_ptr, "Truncated iTXt chunk");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   for (text = lang_key; *text; text++)
+      /* empty loop */ ;
+   text++;        /* skip NUL separator */
+   if (text >= png_ptr->chunkdata + slength)
+   {
+      png_warning(png_ptr, "Malformed iTXt chunk");
+      png_free(png_ptr, png_ptr->chunkdata);
+      png_ptr->chunkdata = NULL;
+      return;
+   }
+
+   prefix_len = text - png_ptr->chunkdata;
+
+   key=png_ptr->chunkdata;
+   if (comp_flag)
+       png_decompress_chunk(png_ptr, comp_type,
+         (size_t)length, prefix_len, &data_len);
+   else
+       data_len = png_strlen(png_ptr->chunkdata + prefix_len);
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+      (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr, "Not enough memory to process iTXt chunk.");
+     png_free(png_ptr, png_ptr->chunkdata);
+     png_ptr->chunkdata = NULL;
+     return;
+   }
+   text_ptr->compression = (int)comp_flag + 1;
+   text_ptr->lang_key = png_ptr->chunkdata + (lang_key - key);
+   text_ptr->lang = png_ptr->chunkdata + (lang - key);
+   text_ptr->itxt_length = data_len;
+   text_ptr->text_length = 0;
+   text_ptr->key = png_ptr->chunkdata;
+   text_ptr->text = png_ptr->chunkdata + prefix_len;
+
+   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, text_ptr);
+   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->chunkdata = NULL;
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store iTXt chunk.");
+}
+#endif
+
+/* This function is called when we haven't found a handler for a
+   chunk.  If there isn't a problem with the chunk itself (ie bad
+   chunk name, CRC, or a critical chunk), the chunk is silently ignored
+   -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which
+   case it will be saved away to be written out later. */
+void /* PRIVATE */
+png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_uint_32 skip = 0;
+
+   png_debug(1, "in png_handle_unknown");
+
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IDAT;
+#endif
+      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))  /* not an IDAT */
+         png_ptr->mode |= PNG_AFTER_IDAT;
+   }
+
+   if (!(png_ptr->chunk_name[0] & 0x20))
+   {
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+      if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+           PNG_HANDLE_CHUNK_ALWAYS
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+           && png_ptr->read_user_chunk_fn == NULL
+#endif
+        )
+#endif
+          png_chunk_error(png_ptr, "unknown critical chunk");
+   }
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS) ||
+       (png_ptr->read_user_chunk_fn != NULL))
+   {
+#ifdef PNG_MAX_MALLOC_64K
+       if (length > (png_uint_32)65535L)
+       {
+           png_warning(png_ptr, "unknown chunk too large to fit in memory");
+           skip = length - (png_uint_32)65535L;
+           length = (png_uint_32)65535L;
+       }
+#endif
+       png_memcpy((png_charp)png_ptr->unknown_chunk.name,
+                  (png_charp)png_ptr->chunk_name, 
+                  png_sizeof(png_ptr->unknown_chunk.name));
+       png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name)-1] = '\0';
+       png_ptr->unknown_chunk.size = (png_size_t)length;
+       if (length == 0)
+         png_ptr->unknown_chunk.data = NULL;
+       else
+       {
+         png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
+         png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
+       }
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+       if (png_ptr->read_user_chunk_fn != NULL)
+       {
+          /* callback to user unknown chunk handler */
+          int ret;
+          ret = (*(png_ptr->read_user_chunk_fn))
+            (png_ptr, &png_ptr->unknown_chunk);
+          if (ret < 0)
+             png_chunk_error(png_ptr, "error in user chunk");
+          if (ret == 0)
+          {
+             if (!(png_ptr->chunk_name[0] & 0x20))
+                if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+                     PNG_HANDLE_CHUNK_ALWAYS)
+                   png_chunk_error(png_ptr, "unknown critical chunk");
+             png_set_unknown_chunks(png_ptr, info_ptr,
+               &png_ptr->unknown_chunk, 1);
+          }
+       }
+       else
+#endif
+       png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
+       png_free(png_ptr, png_ptr->unknown_chunk.data);
+       png_ptr->unknown_chunk.data = NULL;
+   }
+   else
+#endif
+      skip = length;
+
+   png_crc_finish(png_ptr, skip);
+
+#if !defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+   info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */
+#endif
+}
+
+/* This function is called to verify that a chunk name is valid.
+   This function can't have the "critical chunk check" incorporated
+   into it, since in the future we will need to be able to call user
+   functions to handle unknown critical chunks after we check that
+   the chunk name itself is valid. */
+
+#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+
+void /* PRIVATE */
+png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)
+{
+   png_debug(1, "in png_check_chunk_name");
+   if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||
+       isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3]))
+   {
+      png_chunk_error(png_ptr, "invalid chunk type");
+   }
+}
+
+/* Combines the row recently read in with the existing pixels in the
+   row.  This routine takes care of alpha and transparency if requested.
+   This routine also handles the two methods of progressive display
+   of interlaced images, depending on the mask value.
+   The mask value describes which pixels are to be combined with
+   the row.  The pattern always repeats every 8 pixels, so just 8
+   bits are needed.  A one indicates the pixel is to be combined,
+   a zero indicates the pixel is to be skipped.  This is in addition
+   to any alpha or transparency value associated with the pixel.  If
+   you want all pixels to be combined, pass 0xff (255) in mask.  */
+
+void /* PRIVATE */
+png_combine_row(png_structp png_ptr, png_bytep row, int mask)
+{
+   png_debug(1, "in png_combine_row");
+   if (mask == 0xff)
+   {
+      png_memcpy(row, png_ptr->row_buf + 1,
+         PNG_ROWBYTES(png_ptr->row_info.pixel_depth, png_ptr->width));
+   }
+   else
+   {
+      switch (png_ptr->row_info.pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_inc, s_start, s_end;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+                s_start = 0;
+                s_end = 7;
+                s_inc = 1;
+            }
+            else
+#endif
+            {
+                s_start = 7;
+                s_end = 0;
+                s_inc = -1;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  int value;
+
+                  value = (*sp >> shift) & 0x01;
+                  *dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_start, s_end, s_inc;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            int value;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+            else
+#endif
+            {
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0x03;
+                  *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_start, s_end, s_inc;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            int value;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+            else
+#endif
+            {
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0xf;
+                  *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         default:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            png_size_t pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            png_byte m = 0x80;
+
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  png_memcpy(dp, sp, pixel_bytes);
+               }
+
+               sp += pixel_bytes;
+               dp += pixel_bytes;
+
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+      }
+   }
+}
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+/* OLD pre-1.0.9 interface:
+void png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
+   png_uint_32 transformations)
+ */
+void /* PRIVATE */
+png_do_read_interlace(png_structp png_ptr)
+{
+   png_row_infop row_info = &(png_ptr->row_info);
+   png_bytep row = png_ptr->row_buf + 1;
+   int pass = png_ptr->pass;
+   png_uint_32 transformations = png_ptr->transformations;
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+   /* offset to next interlace block */
+   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+#endif
+
+   png_debug(1, "in png_do_read_interlace");
+   if (row != NULL && row_info != NULL)
+   {
+      png_uint_32 final_width;
+
+      final_width = row_info->width * png_pass_inc[pass];
+
+      switch (row_info->pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
+            png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            int jstop = png_pass_inc[pass];
+            png_byte v;
+            png_uint_32 i;
+            int j;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+                sshift = (int)((row_info->width + 7) & 0x07);
+                dshift = (int)((final_width + 7) & 0x07);
+                s_start = 7;
+                s_end = 0;
+                s_inc = -1;
+            }
+            else
+#endif
+            {
+                sshift = 7 - (int)((row_info->width + 7) & 0x07);
+                dshift = 7 - (int)((final_width + 7) & 0x07);
+                s_start = 0;
+                s_end = 7;
+                s_inc = 1;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               v = (png_byte)((*sp >> sshift) & 0x01);
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
+            png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            int jstop = png_pass_inc[pass];
+            png_uint_32 i;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (int)(((row_info->width + 3) & 0x03) << 1);
+               dshift = (int)(((final_width + 3) & 0x03) << 1);
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+            else
+#endif
+            {
+               sshift = (int)((3 - ((row_info->width + 3) & 0x03)) << 1);
+               dshift = (int)((3 - ((final_width + 3) & 0x03)) << 1);
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v;
+               int j;
+
+               v = (png_byte)((*sp >> sshift) & 0x03);
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
+            png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            png_uint_32 i;
+            int jstop = png_pass_inc[pass];
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (int)(((row_info->width + 1) & 0x01) << 2);
+               dshift = (int)(((final_width + 1) & 0x01) << 2);
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            else
+#endif
+            {
+               sshift = (int)((1 - ((row_info->width + 1) & 0x01)) << 2);
+               dshift = (int)((1 - ((final_width + 1) & 0x01)) << 2);
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v = (png_byte)((*sp >> sshift) & 0xf);
+               int j;
+
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         default:
+         {
+            png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
+            png_bytep sp = row + (png_size_t)(row_info->width - 1) * pixel_bytes;
+            png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
+
+            int jstop = png_pass_inc[pass];
+            png_uint_32 i;
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v[8];
+               int j;
+
+               png_memcpy(v, sp, pixel_bytes);
+               for (j = 0; j < jstop; j++)
+               {
+                  png_memcpy(dp, v, pixel_bytes);
+                  dp -= pixel_bytes;
+               }
+               sp -= pixel_bytes;
+            }
+            break;
+         }
+      }
+      row_info->width = final_width;
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, final_width);
+   }
+#if !defined(PNG_READ_PACKSWAP_SUPPORTED)
+   transformations = transformations; /* silence compiler warning */
+#endif
+}
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+
+void /* PRIVATE */
+png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
+   png_bytep prev_row, int filter)
+{
+   png_debug(1, "in png_read_filter_row");
+   png_debug2(2, "row = %lu, filter = %d", png_ptr->row_number, filter);
+   switch (filter)
+   {
+      case PNG_FILTER_VALUE_NONE:
+         break;
+      case PNG_FILTER_VALUE_SUB:
+      {
+         png_uint_32 i;
+         png_uint_32 istop = row_info->rowbytes;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_bytep rp = row + bpp;
+         png_bytep lp = row;
+
+         for (i = bpp; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_UP:
+      {
+         png_uint_32 i;
+         png_uint_32 istop = row_info->rowbytes;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+
+         for (i = 0; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_AVG:
+      {
+         png_uint_32 i;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+         png_bytep lp = row;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_uint_32 istop = row_info->rowbytes - bpp;
+
+         for (i = 0; i < bpp; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) +
+               ((int)(*pp++) / 2 )) & 0xff);
+            rp++;
+         }
+
+         for (i = 0; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) +
+               (int)(*pp++ + *lp++) / 2 ) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_PAETH:
+      {
+         png_uint_32 i;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+         png_bytep lp = row;
+         png_bytep cp = prev_row;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_uint_32 istop=row_info->rowbytes - bpp;
+
+         for (i = 0; i < bpp; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+            rp++;
+         }
+
+         for (i = 0; i < istop; i++)   /* use leftover rp,pp */
+         {
+            int a, b, c, pa, pb, pc, p;
+
+            a = *lp++;
+            b = *pp++;
+            c = *cp++;
+
+            p = b - c;
+            pc = a - c;
+
+#ifdef PNG_USE_ABS
+            pa = abs(p);
+            pb = abs(pc);
+            pc = abs(p + pc);
+#else
+            pa = p < 0 ? -p : p;
+            pb = pc < 0 ? -pc : pc;
+            pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+            /*
+               if (pa <= pb && pa <= pc)
+                  p = a;
+               else if (pb <= pc)
+                  p = b;
+               else
+                  p = c;
+             */
+
+            p = (pa <= pb && pa <= pc) ? a : (pb <= pc) ? b : c;
+
+            *rp = (png_byte)(((int)(*rp) + p) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      default:
+         png_warning(png_ptr, "Ignoring bad adaptive filter type");
+         *row = 0;
+         break;
+   }
+}
+
+void /* PRIVATE */
+png_read_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   PNG_CONST int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   PNG_CONST int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+#endif
+
+   png_debug(1, "in png_read_finish_row");
+   png_ptr->row_number++;
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      png_memset_check(png_ptr, png_ptr->prev_row, 0,
+         png_ptr->rowbytes + 1);
+      do
+      {
+         png_ptr->pass++;
+         if (png_ptr->pass >= 7)
+            break;
+         png_ptr->iwidth = (png_ptr->width +
+            png_pass_inc[png_ptr->pass] - 1 -
+            png_pass_start[png_ptr->pass]) /
+            png_pass_inc[png_ptr->pass];
+
+         png_ptr->irowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,
+            png_ptr->iwidth) + 1;
+
+         if (!(png_ptr->transformations & PNG_INTERLACE))
+         {
+            png_ptr->num_rows = (png_ptr->height +
+               png_pass_yinc[png_ptr->pass] - 1 -
+               png_pass_ystart[png_ptr->pass]) /
+               png_pass_yinc[png_ptr->pass];
+            if (!(png_ptr->num_rows))
+               continue;
+         }
+         else  /* if (png_ptr->transformations & PNG_INTERLACE) */
+            break;
+      } while (png_ptr->iwidth == 0);
+
+      if (png_ptr->pass < 7)
+         return;
+   }
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_CONST PNG_IDAT;
+#endif
+      char extra;
+      int ret;
+
+      png_ptr->zstream.next_out = (Byte *)&extra;
+      png_ptr->zstream.avail_out = (uInt)1;
+      for (;;)
+      {
+         if (!(png_ptr->zstream.avail_in))
+         {
+            while (!png_ptr->idat_size)
+            {
+               png_byte chunk_length[4];
+
+               png_crc_finish(png_ptr, 0);
+
+               png_read_data(png_ptr, chunk_length, 4);
+               png_ptr->idat_size = png_get_uint_31(png_ptr, chunk_length);
+               png_reset_crc(png_ptr);
+               png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+               if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+                  png_error(png_ptr, "Not enough image data");
+
+            }
+            png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+            png_ptr->zstream.next_in = png_ptr->zbuf;
+            if (png_ptr->zbuf_size > png_ptr->idat_size)
+               png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
+            png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zstream.avail_in);
+            png_ptr->idat_size -= png_ptr->zstream.avail_in;
+         }
+         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+         if (ret == Z_STREAM_END)
+         {
+            if (!(png_ptr->zstream.avail_out) || png_ptr->zstream.avail_in ||
+               png_ptr->idat_size)
+               png_warning(png_ptr, "Extra compressed data");
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+         if (ret != Z_OK)
+            png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+                      "Decompression Error");
+
+         if (!(png_ptr->zstream.avail_out))
+         {
+            png_warning(png_ptr, "Extra compressed data.");
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+
+      }
+      png_ptr->zstream.avail_out = 0;
+   }
+
+   if (png_ptr->idat_size || png_ptr->zstream.avail_in)
+      png_warning(png_ptr, "Extra compression data");
+
+   inflateReset(&png_ptr->zstream);
+
+   png_ptr->mode |= PNG_AFTER_IDAT;
+}
+
+void /* PRIVATE */
+png_read_start_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   PNG_CONST int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   PNG_CONST int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+#endif
+
+   int max_pixel_depth;
+   png_size_t row_bytes;
+
+   png_debug(1, "in png_read_start_row");
+   png_ptr->zstream.avail_in = 0;
+   png_init_read_transformations(png_ptr);
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   if (png_ptr->interlaced)
+   {
+      if (!(png_ptr->transformations & PNG_INTERLACE))
+         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
+            png_pass_ystart[0]) / png_pass_yinc[0];
+      else
+         png_ptr->num_rows = png_ptr->height;
+
+      png_ptr->iwidth = (png_ptr->width +
+         png_pass_inc[png_ptr->pass] - 1 -
+         png_pass_start[png_ptr->pass]) /
+         png_pass_inc[png_ptr->pass];
+
+         png_ptr->irowbytes =
+            PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1;
+   }
+   else
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+   {
+      png_ptr->num_rows = png_ptr->height;
+      png_ptr->iwidth = png_ptr->width;
+      png_ptr->irowbytes = png_ptr->rowbytes + 1;
+   }
+   max_pixel_depth = png_ptr->pixel_depth;
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+   if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
+      max_pixel_depth = 8;
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         if (png_ptr->num_trans)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 24;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (max_pixel_depth < 8)
+            max_pixel_depth = 8;
+         if (png_ptr->num_trans)
+            max_pixel_depth *= 2;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (png_ptr->num_trans)
+         {
+            max_pixel_depth *= 4;
+            max_pixel_depth /= 3;
+         }
+      }
+   }
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & (PNG_FILLER))
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         max_pixel_depth = 32;
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (max_pixel_depth <= 8)
+            max_pixel_depth = 16;
+         else
+            max_pixel_depth = 32;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (max_pixel_depth <= 32)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 64;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+   {
+      if (
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+        (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
+#endif
+#if defined(PNG_READ_FILLER_SUPPORTED)
+        (png_ptr->transformations & (PNG_FILLER)) ||
+#endif
+        png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         if (max_pixel_depth <= 16)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 64;
+      }
+      else
+      {
+         if (max_pixel_depth <= 8)
+           {
+             if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+               max_pixel_depth = 32;
+             else
+               max_pixel_depth = 24;
+           }
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            max_pixel_depth = 64;
+         else
+            max_pixel_depth = 48;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
+defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+     {
+       int user_pixel_depth = png_ptr->user_transform_depth*
+         png_ptr->user_transform_channels;
+       if (user_pixel_depth > max_pixel_depth)
+         max_pixel_depth=user_pixel_depth;
+     }
+#endif
+
+   /* align the width on the next larger 8 pixels.  Mainly used
+      for interlacing */
+   row_bytes = ((png_ptr->width + 7) & ~((png_uint_32)7));
+   /* calculate the maximum bytes needed, adding a byte and a pixel
+      for safety's sake */
+   row_bytes = PNG_ROWBYTES(max_pixel_depth, row_bytes) +
+      1 + ((max_pixel_depth + 7) >> 3);
+#ifdef PNG_MAX_MALLOC_64K
+   if (row_bytes > (png_uint_32)65536L)
+      png_error(png_ptr, "This image requires a row greater than 64KB");
+#endif
+
+   if (row_bytes + 64 > png_ptr->old_big_row_buf_size)
+   {
+     png_free(png_ptr, png_ptr->big_row_buf);
+     png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64);
+     png_ptr->row_buf = png_ptr->big_row_buf+32;
+     png_ptr->old_big_row_buf_size = row_bytes+64;
+   }
+
+#ifdef PNG_MAX_MALLOC_64K
+   if ((png_uint_32)png_ptr->rowbytes + 1 > (png_uint_32)65536L)
+      png_error(png_ptr, "This image requires a row greater than 64KB");
+#endif
+   if ((png_uint_32)png_ptr->rowbytes > (png_uint_32)(PNG_SIZE_MAX - 1))
+      png_error(png_ptr, "Row has too many bytes to allocate in memory.");
+
+   if (png_ptr->rowbytes+1 > png_ptr->old_prev_row_size)
+   {
+     png_free(png_ptr, png_ptr->prev_row);
+     png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(
+        png_ptr->rowbytes + 1));
+     png_ptr->old_prev_row_size = png_ptr->rowbytes+1;
+   }
+
+   png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
+
+   png_debug1(3, "width = %lu,", png_ptr->width);
+   png_debug1(3, "height = %lu,", png_ptr->height);
+   png_debug1(3, "iwidth = %lu,", png_ptr->iwidth);
+   png_debug1(3, "num_rows = %lu,", png_ptr->num_rows);
+   png_debug1(3, "rowbytes = %lu,", png_ptr->rowbytes);
+   png_debug1(3, "irowbytes = %lu", png_ptr->irowbytes);
+
+   png_ptr->flags |= PNG_FLAG_ROW_INIT;
+}
+#endif /* PNG_READ_SUPPORTED */
+
 /* pngrutil.c - utilities to read a PNG file
  *
  * Last changed in libpng 1.2.17 May 15, 2007
diff --git a/src/dep/src/irrlicht/libpng/pngset.c b/src/dep/src/irrlicht/libpng/pngset.c
index 9cf6150..8eb2d57 100644
--- a/src/dep/src/irrlicht/libpng/pngset.c
+++ b/src/dep/src/irrlicht/libpng/pngset.c
@@ -1,4 +1,1259 @@
 
+/* pngset.c - storage of image information into info struct
+ *
+ * Last changed in libpng 1.2.35 [February 14, 2009]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * The functions here are used during reads to store data from the file
+ * into the info struct, and during writes to store application data
+ * into the info struct for writing into the file.  This abstracts the
+ * info struct and allows us to change the structure in the future.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+#if defined(PNG_bKGD_SUPPORTED)
+void PNGAPI
+png_set_bKGD(png_structp png_ptr, png_infop info_ptr, png_color_16p background)
+{
+   png_debug1(1, "in %s storage function", "bKGD");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_memcpy(&(info_ptr->background), background, png_sizeof(png_color_16));
+   info_ptr->valid |= PNG_INFO_bKGD;
+}
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
+   double white_x, double white_y, double red_x, double red_y,
+   double green_x, double green_y, double blue_x, double blue_y)
+{
+   png_debug1(1, "in %s storage function", "cHRM");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->x_white = (float)white_x;
+   info_ptr->y_white = (float)white_y;
+   info_ptr->x_red   = (float)red_x;
+   info_ptr->y_red   = (float)red_y;
+   info_ptr->x_green = (float)green_x;
+   info_ptr->y_green = (float)green_y;
+   info_ptr->x_blue  = (float)blue_x;
+   info_ptr->y_blue  = (float)blue_y;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_x_white = (png_fixed_point)(white_x*100000.+0.5);
+   info_ptr->int_y_white = (png_fixed_point)(white_y*100000.+0.5);
+   info_ptr->int_x_red   = (png_fixed_point)(  red_x*100000.+0.5);
+   info_ptr->int_y_red   = (png_fixed_point)(  red_y*100000.+0.5);
+   info_ptr->int_x_green = (png_fixed_point)(green_x*100000.+0.5);
+   info_ptr->int_y_green = (png_fixed_point)(green_y*100000.+0.5);
+   info_ptr->int_x_blue  = (png_fixed_point)( blue_x*100000.+0.5);
+   info_ptr->int_y_blue  = (png_fixed_point)( blue_y*100000.+0.5);
+#endif
+   info_ptr->valid |= PNG_INFO_cHRM;
+}
+#endif /* PNG_FLOATING_POINT_SUPPORTED */
+
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void PNGAPI
+png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
+   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
+   png_fixed_point blue_x, png_fixed_point blue_y)
+{
+   png_debug1(1, "in %s storage function", "cHRM fixed");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+#if !defined(PNG_NO_CHECK_cHRM)
+   if (png_check_cHRM_fixed(png_ptr,
+      white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))
+#endif
+   {
+     info_ptr->int_x_white = white_x;
+     info_ptr->int_y_white = white_y;
+     info_ptr->int_x_red   = red_x;
+     info_ptr->int_y_red   = red_y;
+     info_ptr->int_x_green = green_x;
+     info_ptr->int_y_green = green_y;
+     info_ptr->int_x_blue  = blue_x;
+     info_ptr->int_y_blue  = blue_y;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+     info_ptr->x_white = (float)(white_x/100000.);
+     info_ptr->y_white = (float)(white_y/100000.);
+     info_ptr->x_red   = (float)(  red_x/100000.);
+     info_ptr->y_red   = (float)(  red_y/100000.);
+     info_ptr->x_green = (float)(green_x/100000.);
+     info_ptr->y_green = (float)(green_y/100000.);
+     info_ptr->x_blue  = (float)( blue_x/100000.);
+     info_ptr->y_blue  = (float)( blue_y/100000.);
+#endif
+     info_ptr->valid |= PNG_INFO_cHRM;
+   }
+}
+#endif /* PNG_FIXED_POINT_SUPPORTED */
+#endif /* PNG_cHRM_SUPPORTED */
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
+{
+   double gamma;
+   png_debug1(1, "in %s storage function", "gAMA");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* Check for overflow */
+   if (file_gamma > 21474.83)
+   {
+      png_warning(png_ptr, "Limiting gamma to 21474.83");
+      gamma=21474.83;
+   }
+   else
+      gamma = file_gamma;
+   info_ptr->gamma = (float)gamma;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_gamma = (int)(gamma*100000.+.5);
+#endif
+   info_ptr->valid |= PNG_INFO_gAMA;
+   if (gamma == 0.0)
+      png_warning(png_ptr, "Setting gamma=0");
+}
+#endif
+void PNGAPI
+png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
+   int_gamma)
+{
+   png_fixed_point gamma;
+
+   png_debug1(1, "in %s storage function", "gAMA");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (int_gamma > (png_fixed_point) PNG_UINT_31_MAX)
+   {
+     png_warning(png_ptr, "Limiting gamma to 21474.83");
+     gamma=PNG_UINT_31_MAX;
+   }
+   else
+   {
+     if (int_gamma < 0)
+     {
+       png_warning(png_ptr, "Setting negative gamma to zero");
+       gamma = 0;
+     }
+     else
+       gamma = int_gamma;
+   }
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   info_ptr->gamma = (float)(gamma/100000.);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_gamma = gamma;
+#endif
+   info_ptr->valid |= PNG_INFO_gAMA;
+   if (gamma == 0)
+      png_warning(png_ptr, "Setting gamma=0");
+}
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+void PNGAPI
+png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p hist)
+{
+   int i;
+
+   png_debug1(1, "in %s storage function", "hIST");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+   if (info_ptr->num_palette == 0 || info_ptr->num_palette
+       > PNG_MAX_PALETTE_LENGTH)
+   {
+       png_warning(png_ptr,
+          "Invalid palette size, hIST allocation skipped.");
+       return;
+   }
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);
+#endif
+   /* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in version
+      1.2.1 */
+   png_ptr->hist = (png_uint_16p)png_malloc_warn(png_ptr,
+      (png_uint_32)(PNG_MAX_PALETTE_LENGTH * png_sizeof(png_uint_16)));
+   if (png_ptr->hist == NULL)
+     {
+       png_warning(png_ptr, "Insufficient memory for hIST chunk data.");
+       return;
+     }
+
+   for (i = 0; i < info_ptr->num_palette; i++)
+       png_ptr->hist[i] = hist[i];
+   info_ptr->hist = png_ptr->hist;
+   info_ptr->valid |= PNG_INFO_hIST;
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_HIST;
+#else
+   png_ptr->flags |= PNG_FLAG_FREE_HIST;
+#endif
+}
+#endif
+
+void PNGAPI
+png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 width, png_uint_32 height, int bit_depth,
+   int color_type, int interlace_type, int compression_type,
+   int filter_type)
+{
+   png_debug1(1, "in %s storage function", "IHDR");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* check for width and height valid values */
+   if (width == 0 || height == 0)
+      png_error(png_ptr, "Image width or height is zero in IHDR");
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   if (width > png_ptr->user_width_max || height > png_ptr->user_height_max)
+      png_error(png_ptr, "image size exceeds user limits in IHDR");
+#else
+   if (width > PNG_USER_WIDTH_MAX || height > PNG_USER_HEIGHT_MAX)
+      png_error(png_ptr, "image size exceeds user limits in IHDR");
+#endif
+   if (width > PNG_UINT_31_MAX || height > PNG_UINT_31_MAX)
+      png_error(png_ptr, "Invalid image size in IHDR");
+   if ( width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      png_warning(png_ptr, "Width is too large for libpng to process pixels");
+
+   /* check other values */
+   if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
+      bit_depth != 8 && bit_depth != 16)
+      png_error(png_ptr, "Invalid bit depth in IHDR");
+
+   if (color_type < 0 || color_type == 1 ||
+      color_type == 5 || color_type > 6)
+      png_error(png_ptr, "Invalid color type in IHDR");
+
+   if (((color_type == PNG_COLOR_TYPE_PALETTE) && bit_depth > 8) ||
+       ((color_type == PNG_COLOR_TYPE_RGB ||
+         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
+         color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))
+      png_error(png_ptr, "Invalid color type/bit depth combination in IHDR");
+
+   if (interlace_type >= PNG_INTERLACE_LAST)
+      png_error(png_ptr, "Unknown interlace method in IHDR");
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+      png_error(png_ptr, "Unknown compression method in IHDR");
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   /* Accept filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not read a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE)&&png_ptr->mng_features_permitted)
+      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
+   if (filter_type != PNG_FILTER_TYPE_BASE)
+   {
+     if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+        (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
+        ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
+        (color_type == PNG_COLOR_TYPE_RGB ||
+         color_type == PNG_COLOR_TYPE_RGB_ALPHA)))
+        png_error(png_ptr, "Unknown filter method in IHDR");
+     if (png_ptr->mode&PNG_HAVE_PNG_SIGNATURE)
+        png_warning(png_ptr, "Invalid filter method in IHDR");
+   }
+#else
+   if (filter_type != PNG_FILTER_TYPE_BASE)
+      png_error(png_ptr, "Unknown filter method in IHDR");
+#endif
+
+   info_ptr->width = width;
+   info_ptr->height = height;
+   info_ptr->bit_depth = (png_byte)bit_depth;
+   info_ptr->color_type =(png_byte) color_type;
+   info_ptr->compression_type = (png_byte)compression_type;
+   info_ptr->filter_type = (png_byte)filter_type;
+   info_ptr->interlace_type = (png_byte)interlace_type;
+   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      info_ptr->channels = 1;
+   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      info_ptr->channels = 3;
+   else
+      info_ptr->channels = 1;
+   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+      info_ptr->channels++;
+   info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
+
+   /* check for potential overflow */
+   if (width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      info_ptr->rowbytes = (png_size_t)0;
+   else
+      info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
+}
+
+#if defined(PNG_oFFs_SUPPORTED)
+void PNGAPI
+png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
+   png_int_32 offset_x, png_int_32 offset_y, int unit_type)
+{
+   png_debug1(1, "in %s storage function", "oFFs");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->x_offset = offset_x;
+   info_ptr->y_offset = offset_y;
+   info_ptr->offset_unit_type = (png_byte)unit_type;
+   info_ptr->valid |= PNG_INFO_oFFs;
+}
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+void PNGAPI
+png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
+   png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,
+   png_charp units, png_charpp params)
+{
+   png_uint_32 length;
+   int i;
+
+   png_debug1(1, "in %s storage function", "pCAL");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   length = png_strlen(purpose) + 1;
+   png_debug1(3, "allocating purpose for info (%lu bytes)",
+     (unsigned long)length);
+   info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->pcal_purpose == NULL)
+   {
+       png_warning(png_ptr, "Insufficient memory for pCAL purpose.");
+      return;
+   }
+   png_memcpy(info_ptr->pcal_purpose, purpose, (png_size_t)length);
+
+   png_debug(3, "storing X0, X1, type, and nparams in info");
+   info_ptr->pcal_X0 = X0;
+   info_ptr->pcal_X1 = X1;
+   info_ptr->pcal_type = (png_byte)type;
+   info_ptr->pcal_nparams = (png_byte)nparams;
+
+   length = png_strlen(units) + 1;
+   png_debug1(3, "allocating units for info (%lu bytes)",
+     (unsigned long)length);
+   info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->pcal_units == NULL)
+   {
+       png_warning(png_ptr, "Insufficient memory for pCAL units.");
+      return;
+   }
+   png_memcpy(info_ptr->pcal_units, units, (png_size_t)length);
+
+   info_ptr->pcal_params = (png_charpp)png_malloc_warn(png_ptr,
+      (png_uint_32)((nparams + 1) * png_sizeof(png_charp)));
+   if (info_ptr->pcal_params == NULL)
+   {
+       png_warning(png_ptr, "Insufficient memory for pCAL params.");
+      return;
+   }
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_PCAL;
+#endif
+
+   png_memset(info_ptr->pcal_params, 0, (nparams + 1) * png_sizeof(png_charp));
+
+   for (i = 0; i < nparams; i++)
+   {
+      length = png_strlen(params[i]) + 1;
+      png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,
+        (unsigned long)length);
+      info_ptr->pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);
+      if (info_ptr->pcal_params[i] == NULL)
+      {
+          png_warning(png_ptr, "Insufficient memory for pCAL parameter.");
+          return;
+      }
+      png_memcpy(info_ptr->pcal_params[i], params[i], (png_size_t)length);
+   }
+
+   info_ptr->valid |= PNG_INFO_pCAL;
+}
+#endif
+
+#if defined(PNG_READ_sCAL_SUPPORTED) || defined(PNG_WRITE_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_sCAL(png_structp png_ptr, png_infop info_ptr,
+             int unit, double width, double height)
+{
+   png_debug1(1, "in %s storage function", "sCAL");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->scal_unit = (png_byte)unit;
+   info_ptr->scal_pixel_width = width;
+   info_ptr->scal_pixel_height = height;
+
+   info_ptr->valid |= PNG_INFO_sCAL;
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void PNGAPI
+png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+             int unit, png_charp swidth, png_charp sheight)
+{
+   png_uint_32 length;
+
+   png_debug1(1, "in %s storage function", "sCAL");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->scal_unit = (png_byte)unit;
+
+   length = png_strlen(swidth) + 1;
+   png_debug1(3, "allocating unit for info (%u bytes)",
+      (unsigned int)length);
+   info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->scal_s_width == NULL)
+   {
+      png_warning(png_ptr,
+       "Memory allocation failed while processing sCAL.");
+      return;
+   }
+   png_memcpy(info_ptr->scal_s_width, swidth, (png_size_t)length);
+
+   length = png_strlen(sheight) + 1;
+   png_debug1(3, "allocating unit for info (%u bytes)",
+      (unsigned int)length);
+   info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->scal_s_height == NULL)
+   {
+      png_free (png_ptr, info_ptr->scal_s_width);
+      info_ptr->scal_s_width = NULL;
+      png_warning(png_ptr,
+       "Memory allocation failed while processing sCAL.");
+      return;
+   }
+   png_memcpy(info_ptr->scal_s_height, sheight, (png_size_t)length);
+   info_ptr->valid |= PNG_INFO_sCAL;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_SCAL;
+#endif
+}
+#endif
+#endif
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+void PNGAPI
+png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 res_x, png_uint_32 res_y, int unit_type)
+{
+   png_debug1(1, "in %s storage function", "pHYs");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->x_pixels_per_unit = res_x;
+   info_ptr->y_pixels_per_unit = res_y;
+   info_ptr->phys_unit_type = (png_byte)unit_type;
+   info_ptr->valid |= PNG_INFO_pHYs;
+}
+#endif
+
+void PNGAPI
+png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
+   png_colorp palette, int num_palette)
+{
+
+   png_debug1(1, "in %s storage function", "PLTE");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (num_palette < 0 || num_palette > PNG_MAX_PALETTE_LENGTH)
+     {
+       if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         png_error(png_ptr, "Invalid palette length");
+       else
+       {
+         png_warning(png_ptr, "Invalid palette length");
+         return;
+       }
+     }
+
+   /*
+    * It may not actually be necessary to set png_ptr->palette here;
+    * we do it for backward compatibility with the way the png_handle_tRNS
+    * function used to do the allocation.
+    */
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
+#endif
+
+   /* Changed in libpng-1.2.1 to allocate PNG_MAX_PALETTE_LENGTH instead
+      of num_palette entries,
+      in case of an invalid PNG file that has too-large sample values. */
+   png_ptr->palette = (png_colorp)png_malloc(png_ptr,
+      PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));
+   png_memset(png_ptr->palette, 0, PNG_MAX_PALETTE_LENGTH *
+      png_sizeof(png_color));
+   png_memcpy(png_ptr->palette, palette, num_palette * png_sizeof(png_color));
+   info_ptr->palette = png_ptr->palette;
+   info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_PLTE;
+#else
+   png_ptr->flags |= PNG_FLAG_FREE_PLTE;
+#endif
+
+   info_ptr->valid |= PNG_INFO_PLTE;
+}
+
+#if defined(PNG_sBIT_SUPPORTED)
+void PNGAPI
+png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
+   png_color_8p sig_bit)
+{
+   png_debug1(1, "in %s storage function", "sBIT");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_memcpy(&(info_ptr->sig_bit), sig_bit, png_sizeof(png_color_8));
+   info_ptr->valid |= PNG_INFO_sBIT;
+}
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+void PNGAPI
+png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int intent)
+{
+   png_debug1(1, "in %s storage function", "sRGB");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->srgb_intent = (png_byte)intent;
+   info_ptr->valid |= PNG_INFO_sRGB;
+}
+
+void PNGAPI
+png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
+   int intent)
+{
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float file_gamma;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_fixed_point int_file_gamma;
+#endif
+#endif
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+#endif
+   png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
+      int_green_y, int_blue_x, int_blue_y;
+#endif
+   png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_set_sRGB(png_ptr, info_ptr, intent);
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   file_gamma = (float).45455;
+   png_set_gAMA(png_ptr, info_ptr, file_gamma);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   int_file_gamma = 45455L;
+   png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);
+#endif
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+   int_white_x = 31270L;
+   int_white_y = 32900L;
+   int_red_x   = 64000L;
+   int_red_y   = 33000L;
+   int_green_x = 30000L;
+   int_green_y = 60000L;
+   int_blue_x  = 15000L;
+   int_blue_y  =  6000L;
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   white_x = (float).3127;
+   white_y = (float).3290;
+   red_x   = (float).64;
+   red_y   = (float).33;
+   green_x = (float).30;
+   green_y = (float).60;
+   blue_x  = (float).15;
+   blue_y  = (float).06;
+#endif
+
+#if !defined(PNG_NO_CHECK_cHRM)
+   if (png_check_cHRM_fixed(png_ptr,
+      int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
+      int_green_y, int_blue_x, int_blue_y))
+#endif
+   {
+#ifdef PNG_FIXED_POINT_SUPPORTED
+     png_set_cHRM_fixed(png_ptr, info_ptr,
+        int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
+        int_green_y, int_blue_x, int_blue_y);
+#endif
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      png_set_cHRM(png_ptr, info_ptr,
+         white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
+#endif
+   }
+#endif /* cHRM */
+}
+#endif /* sRGB */
+
+
+#if defined(PNG_iCCP_SUPPORTED)
+void PNGAPI
+png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
+             png_charp name, int compression_type,
+             png_charp profile, png_uint_32 proflen)
+{
+   png_charp new_iccp_name;
+   png_charp new_iccp_profile;
+   png_uint_32 length;
+
+   png_debug1(1, "in %s storage function", "iCCP");
+   if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
+      return;
+
+   length = png_strlen(name)+1;
+   new_iccp_name = (png_charp)png_malloc_warn(png_ptr, length);
+   if (new_iccp_name == NULL)
+   {
+      png_warning(png_ptr, "Insufficient memory to process iCCP chunk.");
+      return;
+   }
+   png_memcpy(new_iccp_name, name, length);
+   new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen);
+   if (new_iccp_profile == NULL)
+   {
+      png_free (png_ptr, new_iccp_name);
+      png_warning(png_ptr,
+      "Insufficient memory to process iCCP profile.");
+      return;
+   }
+   png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);
+
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
+
+   info_ptr->iccp_proflen = proflen;
+   info_ptr->iccp_name = new_iccp_name;
+   info_ptr->iccp_profile = new_iccp_profile;
+   /* Compression is always zero but is here so the API and info structure
+    * does not have to change if we introduce multiple compression types */
+   info_ptr->iccp_compression = (png_byte)compression_type;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_ICCP;
+#endif
+   info_ptr->valid |= PNG_INFO_iCCP;
+}
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+void PNGAPI
+png_set_text(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
+   int num_text)
+{
+   int ret;
+   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store text");
+}
+
+int /* PRIVATE */
+png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
+   int num_text)
+{
+   int i;
+
+   png_debug1(1, "in %s storage function", (png_ptr->chunk_name[0] == '\0' ?
+      "text" : (png_const_charp)png_ptr->chunk_name));
+
+   if (png_ptr == NULL || info_ptr == NULL || num_text == 0)
+      return(0);
+
+   /* Make sure we have enough space in the "text" array in info_struct
+    * to hold all of the incoming text_ptr objects.
+    */
+   if (info_ptr->num_text + num_text > info_ptr->max_text)
+   {
+      if (info_ptr->text != NULL)
+      {
+         png_textp old_text;
+         int old_max;
+
+         old_max = info_ptr->max_text;
+         info_ptr->max_text = info_ptr->num_text + num_text + 8;
+         old_text = info_ptr->text;
+         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
+            (png_uint_32)(info_ptr->max_text * png_sizeof(png_text)));
+         if (info_ptr->text == NULL)
+           {
+             png_free(png_ptr, old_text);
+             return(1);
+           }
+         png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *
+            png_sizeof(png_text)));
+         png_free(png_ptr, old_text);
+      }
+      else
+      {
+         info_ptr->max_text = num_text + 8;
+         info_ptr->num_text = 0;
+         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
+            (png_uint_32)(info_ptr->max_text * png_sizeof(png_text)));
+         if (info_ptr->text == NULL)
+           return(1);
+#ifdef PNG_FREE_ME_SUPPORTED
+         info_ptr->free_me |= PNG_FREE_TEXT;
+#endif
+      }
+      png_debug1(3, "allocated %d entries for info_ptr->text",
+         info_ptr->max_text);
+   }
+   for (i = 0; i < num_text; i++)
+   {
+      png_size_t text_length, key_len;
+      png_size_t lang_len, lang_key_len;
+      png_textp textp = &(info_ptr->text[info_ptr->num_text]);
+
+      if (text_ptr[i].key == NULL)
+          continue;
+
+      key_len = png_strlen(text_ptr[i].key);
+
+      if (text_ptr[i].compression <= 0)
+      {
+        lang_len = 0;
+        lang_key_len = 0;
+      }
+      else
+#ifdef PNG_iTXt_SUPPORTED
+      {
+        /* set iTXt data */
+        if (text_ptr[i].lang != NULL)
+          lang_len = png_strlen(text_ptr[i].lang);
+        else
+          lang_len = 0;
+        if (text_ptr[i].lang_key != NULL)
+          lang_key_len = png_strlen(text_ptr[i].lang_key);
+        else
+          lang_key_len = 0;
+      }
+#else
+      {
+        png_warning(png_ptr, "iTXt chunk not supported.");
+        continue;
+      }
+#endif
+
+      if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')
+      {
+         text_length = 0;
+#ifdef PNG_iTXt_SUPPORTED
+         if (text_ptr[i].compression > 0)
+            textp->compression = PNG_ITXT_COMPRESSION_NONE;
+         else
+#endif
+            textp->compression = PNG_TEXT_COMPRESSION_NONE;
+      }
+      else
+      {
+         text_length = png_strlen(text_ptr[i].text);
+         textp->compression = text_ptr[i].compression;
+      }
+
+      textp->key = (png_charp)png_malloc_warn(png_ptr,
+         (png_uint_32)
+         (key_len + text_length + lang_len + lang_key_len + 4));
+      if (textp->key == NULL)
+        return(1);
+      png_debug2(2, "Allocated %lu bytes at %x in png_set_text",
+         (png_uint_32)
+         (key_len + lang_len + lang_key_len + text_length + 4),
+         (int)textp->key);
+
+      png_memcpy(textp->key, text_ptr[i].key,
+         (png_size_t)(key_len));
+      *(textp->key + key_len) = '\0';
+#ifdef PNG_iTXt_SUPPORTED
+      if (text_ptr[i].compression > 0)
+      {
+         textp->lang = textp->key + key_len + 1;
+         png_memcpy(textp->lang, text_ptr[i].lang, lang_len);
+         *(textp->lang + lang_len) = '\0';
+         textp->lang_key = textp->lang + lang_len + 1;
+         png_memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
+         *(textp->lang_key + lang_key_len) = '\0';
+         textp->text = textp->lang_key + lang_key_len + 1;
+      }
+      else
+#endif
+      {
+#ifdef PNG_iTXt_SUPPORTED
+         textp->lang=NULL;
+         textp->lang_key=NULL;
+#endif
+         textp->text = textp->key + key_len + 1;
+      }
+      if (text_length)
+         png_memcpy(textp->text, text_ptr[i].text,
+            (png_size_t)(text_length));
+      *(textp->text + text_length) = '\0';
+
+#ifdef PNG_iTXt_SUPPORTED
+      if (textp->compression > 0)
+      {
+         textp->text_length = 0;
+         textp->itxt_length = text_length;
+      }
+      else
+#endif
+      {
+         textp->text_length = text_length;
+#ifdef PNG_iTXt_SUPPORTED
+         textp->itxt_length = 0;
+#endif
+      }
+      info_ptr->num_text++;
+      png_debug1(3, "transferred text chunk %d", info_ptr->num_text);
+   }
+   return(0);
+}
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+void PNGAPI
+png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_timep mod_time)
+{
+   png_debug1(1, "in %s storage function", "tIME");
+   if (png_ptr == NULL || info_ptr == NULL ||
+       (png_ptr->mode & PNG_WROTE_tIME))
+      return;
+
+   png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof(png_time));
+   info_ptr->valid |= PNG_INFO_tIME;
+}
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+void PNGAPI
+png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
+   png_bytep trans, int num_trans, png_color_16p trans_values)
+{
+   png_debug1(1, "in %s storage function", "tRNS");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (trans != NULL)
+   {
+       /*
+        * It may not actually be necessary to set png_ptr->trans here;
+        * we do it for backward compatibility with the way the png_handle_tRNS
+        * function used to do the allocation.
+        */
+
+#ifdef PNG_FREE_ME_SUPPORTED
+       png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
+#endif
+
+       /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
+       png_ptr->trans = info_ptr->trans = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)PNG_MAX_PALETTE_LENGTH);
+       if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
+         png_memcpy(info_ptr->trans, trans, (png_size_t)num_trans);
+   }
+
+   if (trans_values != NULL)
+   {
+      int sample_max = (1 << info_ptr->bit_depth);
+      if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&
+          (int)trans_values->gray > sample_max) ||
+          (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
+          ((int)trans_values->red > sample_max ||
+          (int)trans_values->green > sample_max ||
+          (int)trans_values->blue > sample_max)))
+        png_warning(png_ptr,
+           "tRNS chunk has out-of-range samples for bit_depth");
+      png_memcpy(&(info_ptr->trans_values), trans_values,
+         png_sizeof(png_color_16));
+      if (num_trans == 0)
+        num_trans = 1;
+   }
+
+   info_ptr->num_trans = (png_uint_16)num_trans;
+   if (num_trans != 0)
+   {
+      info_ptr->valid |= PNG_INFO_tRNS;
+#ifdef PNG_FREE_ME_SUPPORTED
+      info_ptr->free_me |= PNG_FREE_TRNS;
+#else
+      png_ptr->flags |= PNG_FLAG_FREE_TRNS;
+#endif
+   }
+}
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+void PNGAPI
+png_set_sPLT(png_structp png_ptr,
+             png_infop info_ptr, png_sPLT_tp entries, int nentries)
+/*
+ *  entries        - array of png_sPLT_t structures
+ *                   to be added to the list of palettes
+ *                   in the info structure.
+ *  nentries       - number of palette structures to be
+ *                   added.
+ */
+{
+    png_sPLT_tp np;
+    int i;
+
+    if (png_ptr == NULL || info_ptr == NULL)
+       return;
+
+    np = (png_sPLT_tp)png_malloc_warn(png_ptr,
+        (info_ptr->splt_palettes_num + nentries) *
+        (png_uint_32)png_sizeof(png_sPLT_t));
+    if (np == NULL)
+    {
+      png_warning(png_ptr, "No memory for sPLT palettes.");
+      return;
+    }
+
+    png_memcpy(np, info_ptr->splt_palettes,
+           info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));
+
+    png_free(png_ptr, info_ptr->splt_palettes);
+    info_ptr->splt_palettes=NULL;
+
+    for (i = 0; i < nentries; i++)
+    {
+        png_sPLT_tp to = np + info_ptr->splt_palettes_num + i;
+        png_sPLT_tp from = entries + i;
+        png_uint_32 length;
+
+        length = png_strlen(from->name) + 1;
+        to->name = (png_charp)png_malloc_warn(png_ptr, length);
+        if (to->name == NULL)
+        {
+           png_warning(png_ptr,
+             "Out of memory while processing sPLT chunk");
+           continue;
+        }
+        png_memcpy(to->name, from->name, length);
+        to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
+            (png_uint_32)(from->nentries * png_sizeof(png_sPLT_entry)));
+        if (to->entries == NULL)
+        {
+           png_warning(png_ptr,
+             "Out of memory while processing sPLT chunk");
+           png_free(png_ptr, to->name);
+           to->name = NULL;
+           continue;
+        }
+        png_memcpy(to->entries, from->entries,
+            from->nentries * png_sizeof(png_sPLT_entry));
+        to->nentries = from->nentries;
+        to->depth = from->depth;
+    }
+
+    info_ptr->splt_palettes = np;
+    info_ptr->splt_palettes_num += nentries;
+    info_ptr->valid |= PNG_INFO_sPLT;
+#ifdef PNG_FREE_ME_SUPPORTED
+    info_ptr->free_me |= PNG_FREE_SPLT;
+#endif
+}
+#endif /* PNG_sPLT_SUPPORTED */
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+void PNGAPI
+png_set_unknown_chunks(png_structp png_ptr,
+   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns)
+{
+    png_unknown_chunkp np;
+    int i;
+
+    if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
+        return;
+
+    np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
+        (png_uint_32)((info_ptr->unknown_chunks_num + num_unknowns) *
+        png_sizeof(png_unknown_chunk)));
+    if (np == NULL)
+    {
+       png_warning(png_ptr,
+          "Out of memory while processing unknown chunk.");
+       return;
+    }
+
+    png_memcpy(np, info_ptr->unknown_chunks,
+           info_ptr->unknown_chunks_num * png_sizeof(png_unknown_chunk));
+    png_free(png_ptr, info_ptr->unknown_chunks);
+    info_ptr->unknown_chunks=NULL;
+
+    for (i = 0; i < num_unknowns; i++)
+    {
+       png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
+       png_unknown_chunkp from = unknowns + i;
+
+       png_memcpy((png_charp)to->name, 
+                  (png_charp)from->name, 
+                  png_sizeof(from->name));
+       to->name[png_sizeof(to->name)-1] = '\0';
+       to->size = from->size;
+       /* note our location in the read or write sequence */
+       to->location = (png_byte)(png_ptr->mode & 0xff);
+
+       if (from->size == 0)
+          to->data=NULL;
+       else
+       {
+          to->data = (png_bytep)png_malloc_warn(png_ptr,
+            (png_uint_32)from->size);
+          if (to->data == NULL)
+          {
+             png_warning(png_ptr,
+              "Out of memory while processing unknown chunk.");
+             to->size = 0;
+          }
+          else
+             png_memcpy(to->data, from->data, from->size);
+       }
+    }
+
+    info_ptr->unknown_chunks = np;
+    info_ptr->unknown_chunks_num += num_unknowns;
+#ifdef PNG_FREE_ME_SUPPORTED
+    info_ptr->free_me |= PNG_FREE_UNKN;
+#endif
+}
+void PNGAPI
+png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
+   int chunk, int location)
+{
+   if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk <
+         (int)info_ptr->unknown_chunks_num)
+      info_ptr->unknown_chunks[chunk].location = (png_byte)location;
+}
+#endif
+
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+#if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+void PNGAPI
+png_permit_empty_plte (png_structp png_ptr, int empty_plte_permitted)
+{
+   /* This function is deprecated in favor of png_permit_mng_features()
+      and will be removed from libpng-1.3.0 */
+   png_debug(1, "in png_permit_empty_plte, DEPRECATED.");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->mng_features_permitted = (png_byte)
+     ((png_ptr->mng_features_permitted & (~PNG_FLAG_MNG_EMPTY_PLTE)) |
+     ((empty_plte_permitted & PNG_FLAG_MNG_EMPTY_PLTE)));
+}
+#endif
+#endif
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+png_uint_32 PNGAPI
+png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
+{
+   png_debug(1, "in png_permit_mng_features");
+   if (png_ptr == NULL)
+      return (png_uint_32)0;
+   png_ptr->mng_features_permitted =
+     (png_byte)(mng_features & PNG_ALL_MNG_FEATURES);
+   return (png_uint_32)png_ptr->mng_features_permitted;
+}
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+void PNGAPI
+png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep
+   chunk_list, int num_chunks)
+{
+    png_bytep new_list, p;
+    int i, old_num_chunks;
+    if (png_ptr == NULL)
+       return;
+    if (num_chunks == 0)
+    {
+      if (keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)
+        png_ptr->flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+      else
+        png_ptr->flags &= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+
+      if (keep == PNG_HANDLE_CHUNK_ALWAYS)
+        png_ptr->flags |= PNG_FLAG_KEEP_UNSAFE_CHUNKS;
+      else
+        png_ptr->flags &= ~PNG_FLAG_KEEP_UNSAFE_CHUNKS;
+      return;
+    }
+    if (chunk_list == NULL)
+      return;
+    old_num_chunks = png_ptr->num_chunk_list;
+    new_list=(png_bytep)png_malloc(png_ptr,
+       (png_uint_32)
+       (5*(num_chunks + old_num_chunks)));
+    if (png_ptr->chunk_list != NULL)
+    {
+       png_memcpy(new_list, png_ptr->chunk_list,
+          (png_size_t)(5*old_num_chunks));
+       png_free(png_ptr, png_ptr->chunk_list);
+       png_ptr->chunk_list=NULL;
+    }
+    png_memcpy(new_list + 5*old_num_chunks, chunk_list,
+       (png_size_t)(5*num_chunks));
+    for (p = new_list + 5*old_num_chunks + 4, i = 0; i<num_chunks; i++, p += 5)
+       *p=(png_byte)keep;
+    png_ptr->num_chunk_list = old_num_chunks + num_chunks;
+    png_ptr->chunk_list = new_list;
+#ifdef PNG_FREE_ME_SUPPORTED
+    png_ptr->free_me |= PNG_FREE_LIST;
+#endif
+}
+#endif
+
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+void PNGAPI
+png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,
+   png_user_chunk_ptr read_user_chunk_fn)
+{
+   png_debug(1, "in png_set_read_user_chunk_fn");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->read_user_chunk_fn = read_user_chunk_fn;
+   png_ptr->user_chunk_ptr = user_chunk_ptr;
+}
+#endif
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+void PNGAPI
+png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
+{
+   png_debug1(1, "in %s storage function", "rows");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (info_ptr->row_pointers && (info_ptr->row_pointers != row_pointers))
+      png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
+   info_ptr->row_pointers = row_pointers;
+   if (row_pointers)
+      info_ptr->valid |= PNG_INFO_IDAT;
+}
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+void PNGAPI
+png_set_compression_buffer_size(png_structp png_ptr,
+    png_uint_32 size)
+{
+    if (png_ptr == NULL)
+       return;
+    png_free(png_ptr, png_ptr->zbuf);
+    png_ptr->zbuf_size = (png_size_t)size;
+    png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, size);
+    png_ptr->zstream.next_out = png_ptr->zbuf;
+    png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+}
+#endif
+
+void PNGAPI
+png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
+{
+   if (png_ptr && info_ptr)
+      info_ptr->valid &= ~mask;
+}
+
+
+#ifndef PNG_1_0_X
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+/* function was added to libpng 1.2.0 and should always exist by default */
+void PNGAPI
+png_set_asm_flags (png_structp png_ptr, png_uint_32 asm_flags)
+{
+/* Obsolete as of libpng-1.2.20 and will be removed from libpng-1.4.0 */
+    if (png_ptr != NULL)
+    png_ptr->asm_flags = 0;
+    asm_flags = asm_flags; /* Quiet the compiler */
+}
+
+/* this function was added to libpng 1.2.0 */
+void PNGAPI
+png_set_mmx_thresholds (png_structp png_ptr,
+                        png_byte mmx_bitdepth_threshold,
+                        png_uint_32 mmx_rowbytes_threshold)
+{
+/* Obsolete as of libpng-1.2.20 and will be removed from libpng-1.4.0 */
+    if (png_ptr == NULL)
+       return;
+    /* Quiet the compiler */
+    mmx_bitdepth_threshold = mmx_bitdepth_threshold;
+    mmx_rowbytes_threshold = mmx_rowbytes_threshold;
+}
+#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+/* this function was added to libpng 1.2.6 */
+void PNGAPI
+png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
+    png_uint_32 user_height_max)
+{
+    /* Images with dimensions larger than these limits will be
+     * rejected by png_set_IHDR().  To accept any PNG datastream
+     * regardless of dimensions, set both limits to 0x7ffffffL.
+     */
+    if (png_ptr == NULL) return;
+    png_ptr->user_width_max = user_width_max;
+    png_ptr->user_height_max = user_height_max;
+}
+#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+
+#endif /* ?PNG_1_0_X */
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
 /* pngset.c - storage of image information into info struct
  *
  * Last changed in libpng 1.2.17 May 15, 2007
diff --git a/src/dep/src/irrlicht/libpng/pngtest.c b/src/dep/src/irrlicht/libpng/pngtest.c
index 4f6d602..cc9286a 100644
--- a/src/dep/src/irrlicht/libpng/pngtest.c
+++ b/src/dep/src/irrlicht/libpng/pngtest.c
@@ -1,4 +1,1692 @@
 
+/* pngtest.c - a simple test program to test libpng
+ *
+ * Last changed in libpng 1.2.32 [September 18, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This program reads in a PNG image, writes it out again, and then
+ * compares the two files.  If the files are identical, this shows that
+ * the basic chunk handling, filtering, and (de)compression code is working
+ * properly.  It does not currently test all of the transforms, although
+ * it probably should.
+ *
+ * The program will report "FAIL" in certain legitimate cases:
+ * 1) when the compression level or filter selection method is changed.
+ * 2) when the maximum IDAT size (PNG_ZBUF_SIZE in pngconf.h) is not 8192.
+ * 3) unknown unsafe-to-copy ancillary chunks or unknown critical chunks
+ *    exist in the input file.
+ * 4) others not listed here...
+ * In these cases, it is best to check with another tool such as "pngcheck"
+ * to see what the differences between the two files are.
+ *
+ * If a filename is given on the command-line, then this file is used
+ * for the input, rather than the default "pngtest.png".  This allows
+ * testing a wide variety of files easily.  You can also test a number
+ * of files at once by typing "pngtest -m file1.png file2.png ..."
+ */
+
+#include "png.h"
+
+#if defined(_WIN32_WCE)
+#  if _WIN32_WCE < 211
+     __error__ (f|w)printf functions are not supported on old WindowsCE.;
+#  endif
+#  include <windows.h>
+#  include <stdlib.h>
+#  define READFILE(file, data, length, check) \
+     if (ReadFile(file, data, length, &check, NULL)) check = 0
+#  define WRITEFILE(file, data, length, check)) \
+     if (WriteFile(file, data, length, &check, NULL)) check = 0
+#  define FCLOSE(file) CloseHandle(file)
+#else
+#  include <stdio.h>
+#  include <stdlib.h>
+#  define READFILE(file, data, length, check) \
+     check=(png_size_t)fread(data, (png_size_t)1, length, file)
+#  define WRITEFILE(file, data, length, check) \
+     check=(png_size_t)fwrite(data, (png_size_t)1, length, file)
+#  define FCLOSE(file) fclose(file)
+#endif
+
+#if defined(PNG_NO_STDIO)
+#  if defined(_WIN32_WCE)
+     typedef HANDLE                png_FILE_p;
+#  else
+     typedef FILE                * png_FILE_p;
+#  endif
+#endif
+
+/* Makes pngtest verbose so we can find problems (needs to be before png.h) */
+#ifndef PNG_DEBUG
+#  define PNG_DEBUG 0
+#endif
+
+#if !PNG_DEBUG
+#  define SINGLE_ROWBUF_ALLOC  /* makes buffer overruns easier to nail */
+#endif
+
+/* Turn on CPU timing
+#define PNGTEST_TIMING
+*/
+
+#ifdef PNG_NO_FLOATING_POINT_SUPPORTED
+#undef PNGTEST_TIMING
+#endif
+
+#ifdef PNGTEST_TIMING
+static float t_start, t_stop, t_decode, t_encode, t_misc;
+#include <time.h>
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+#define PNG_tIME_STRING_LENGTH 29
+static int tIME_chunk_present = 0;
+static char tIME_string[PNG_tIME_STRING_LENGTH] = "tIME chunk is not present";
+#endif
+
+static int verbose = 0;
+
+int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
+
+#ifdef __TURBOC__
+#include <mem.h>
+#endif
+
+/* defined so I can write to a file on gui/windowing platforms */
+/*  #define STDERR stderr  */
+#define STDERR stdout   /* for DOS */
+
+/* In case a system header (e.g., on AIX) defined jmpbuf */
+#ifdef jmpbuf
+#  undef jmpbuf
+#endif
+
+/* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */
+#ifndef png_jmpbuf
+#  define png_jmpbuf(png_ptr) png_ptr->jmpbuf
+#endif
+
+/* example of using row callbacks to make a simple progress meter */
+static int status_pass = 1;
+static int status_dots_requested = 0;
+static int status_dots = 1;
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
+{
+    if (png_ptr == NULL || row_number > PNG_UINT_31_MAX) return;
+    if (status_pass != pass)
+    {
+       fprintf(stdout, "\n Pass %d: ", pass);
+       status_pass = pass;
+       status_dots = 31;
+    }
+    status_dots--;
+    if (status_dots == 0)
+    {
+       fprintf(stdout, "\n         ");
+       status_dots=30;
+    }
+    fprintf(stdout, "r");
+}
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
+{
+    if (png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7) return;
+    fprintf(stdout, "w");
+}
+
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+/* Example of using user transform callback (we don't transform anything,
+   but merely examine the row filters.  We set this to 256 rather than
+   5 in case illegal filter values are present.) */
+static png_uint_32 filters_used[256];
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)
+{
+    if (png_ptr != NULL && row_info != NULL)
+      ++filters_used[*(data - 1)];
+}
+#endif
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+/* example of using user transform callback (we don't transform anything,
+   but merely count the zero samples) */
+
+static png_uint_32 zero_samples;
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
+{
+   png_bytep dp = data;
+   if (png_ptr == NULL)return;
+
+   /* contents of row_info:
+    *  png_uint_32 width      width of row
+    *  png_uint_32 rowbytes   number of bytes in row
+    *  png_byte color_type    color type of pixels
+    *  png_byte bit_depth     bit depth of samples
+    *  png_byte channels      number of channels (1-4)
+    *  png_byte pixel_depth   bits per pixel (depth*channels)
+    */
+
+
+    /* counts the number of zero samples (or zero pixels if color_type is 3 */
+
+    if (row_info->color_type == 0 || row_info->color_type == 3)
+    {
+       int pos = 0;
+       png_uint_32 n, nstop;
+       for (n = 0, nstop=row_info->width; n<nstop; n++)
+       {
+          if (row_info->bit_depth == 1)
+          {
+             if (((*dp << pos++ ) & 0x80) == 0) zero_samples++;
+             if (pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if (row_info->bit_depth == 2)
+          {
+             if (((*dp << (pos+=2)) & 0xc0) == 0) zero_samples++;
+             if (pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if (row_info->bit_depth == 4)
+          {
+             if (((*dp << (pos+=4)) & 0xf0) == 0) zero_samples++;
+             if (pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if (row_info->bit_depth == 8)
+             if (*dp++ == 0) zero_samples++;
+          if (row_info->bit_depth == 16)
+          {
+             if ((*dp | *(dp+1)) == 0) zero_samples++;
+             dp+=2;
+          }
+       }
+    }
+    else /* other color types */
+    {
+       png_uint_32 n, nstop;
+       int channel;
+       int color_channels = row_info->channels;
+       if (row_info->color_type > 3)color_channels--;
+
+       for (n = 0, nstop=row_info->width; n<nstop; n++)
+       {
+          for (channel = 0; channel < color_channels; channel++)
+          {
+             if (row_info->bit_depth == 8)
+                if (*dp++ == 0) zero_samples++;
+             if (row_info->bit_depth == 16)
+             {
+                if ((*dp | *(dp+1)) == 0) zero_samples++;
+                dp+=2;
+             }
+          }
+          if (row_info->color_type > 3)
+          {
+             dp++;
+             if (row_info->bit_depth == 16)dp++;
+          }
+       }
+    }
+}
+#endif /* PNG_WRITE_USER_TRANSFORM_SUPPORTED */
+
+static int wrote_question = 0;
+
+#if defined(PNG_NO_STDIO)
+/* START of code to validate stdio-free compilation */
+/* These copies of the default read/write functions come from pngrio.c and */
+/* pngwio.c.  They allow "don't include stdio" testing of the library. */
+/* This is the function that does the actual reading of data.  If you are
+   not reading from a standard C stream, you should create a replacement
+   read_data function and use it at run time with png_set_read_fn(), rather
+   than changing the library. */
+
+#ifndef USE_FAR_KEYWORD
+static void
+pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_size_t check;
+
+   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+    * instead of an int, which is what fread() actually returns.
+    */
+   READFILE((png_FILE_p)png_ptr->io_ptr, data, length, check);
+
+   if (check != length)
+   {
+      png_error(png_ptr, "Read Error!");
+   }
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void
+pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   int check;
+   png_byte *n_data;
+   png_FILE_p io_ptr;
+
+   /* Check if data really is near. If so, use usual code. */
+   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)n_data == data)
+   {
+      READFILE(io_ptr, n_data, length, check);
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t read, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         read = MIN(NEAR_BUF_SIZE, remaining);
+         READFILE(io_ptr, buf, 1, err);
+         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
+         if (err != read)
+            break;
+         else
+            check += err;
+         data += read;
+         remaining -= read;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+   {
+      png_error(png_ptr, "read Error");
+   }
+}
+#endif /* USE_FAR_KEYWORD */
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+static void
+pngtest_flush(png_structp png_ptr)
+{
+#if !defined(_WIN32_WCE)
+   png_FILE_p io_ptr;
+   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
+   if (io_ptr != NULL)
+      fflush(io_ptr);
+#endif
+}
+#endif
+
+/* This is the function that does the actual writing of data.  If you are
+   not writing to a standard C stream, you should create a replacement
+   write_data function and use it at run time with png_set_write_fn(), rather
+   than changing the library. */
+#ifndef USE_FAR_KEYWORD
+static void
+pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+
+   WRITEFILE((png_FILE_p)png_ptr->io_ptr,  data, length, check);
+   if (check != length)
+   {
+      png_error(png_ptr, "Write Error");
+   }
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void
+pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
+   png_FILE_p io_ptr;
+
+   /* Check if data really is near. If so, use usual code. */
+   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)near_data == data)
+   {
+      WRITEFILE(io_ptr, near_data, length, check);
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t written, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         written = MIN(NEAR_BUF_SIZE, remaining);
+         png_memcpy(buf, data, written); /* copy far buffer to near buffer */
+         WRITEFILE(io_ptr, buf, written, err);
+         if (err != written)
+            break;
+         else
+            check += err;
+         data += written;
+         remaining -= written;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+   {
+      png_error(png_ptr, "Write Error");
+   }
+}
+#endif /* USE_FAR_KEYWORD */
+
+/* This function is called when there is a warning, but the library thinks
+ * it can continue anyway.  Replacement functions don't have to do anything
+ * here if you don't want to.  In the default configuration, png_ptr is
+ * not used, but it is passed in case it may be useful.
+ */
+static void
+pngtest_warning(png_structp png_ptr, png_const_charp message)
+{
+   PNG_CONST char *name = "UNKNOWN (ERROR!)";
+   if (png_ptr != NULL && png_ptr->error_ptr != NULL)
+      name = png_ptr->error_ptr;
+   fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
+}
+
+/* This is the default error handling function.  Note that replacements for
+ * this function MUST NOT RETURN, or the program will likely crash.  This
+ * function is used by default, or if the program supplies NULL for the
+ * error function pointer in png_set_error_fn().
+ */
+static void
+pngtest_error(png_structp png_ptr, png_const_charp message)
+{
+   pngtest_warning(png_ptr, message);
+   /* We can return because png_error calls the default handler, which is
+    * actually OK in this case. */
+}
+#endif /* PNG_NO_STDIO */
+/* END of code to validate stdio-free compilation */
+
+/* START of code to validate memory allocation and deallocation */
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+
+/* Allocate memory.  For reasonable files, size should never exceed
+   64K.  However, zlib may allocate more then 64K if you don't tell
+   it not to.  See zconf.h and png.h for more information.  zlib does
+   need to allocate exactly 64K, so whatever you call here must
+   have the ability to do that.
+
+   This piece of code can be compiled to validate max 64K allocations
+   by setting MAXSEG_64K in zlib zconf.h *or* PNG_MAX_MALLOC_64K. */
+typedef struct memory_information
+{
+   png_uint_32               size;
+   png_voidp                 pointer;
+   struct memory_information FAR *next;
+} memory_information;
+typedef memory_information FAR *memory_infop;
+
+static memory_infop pinformation = NULL;
+static int current_allocation = 0;
+static int maximum_allocation = 0;
+static int total_allocation = 0;
+static int num_allocations = 0;
+
+png_voidp png_debug_malloc PNGARG((png_structp png_ptr, png_uint_32 size));
+void png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));
+
+png_voidp
+png_debug_malloc(png_structp png_ptr, png_uint_32 size)
+{
+
+   /* png_malloc has already tested for NULL; png_create_struct calls
+      png_debug_malloc directly, with png_ptr == NULL which is OK */
+
+   if (size == 0)
+      return (NULL);
+
+   /* This calls the library allocator twice, once to get the requested
+      buffer and once to get a new free list entry. */
+   {
+      /* Disable malloc_fn and free_fn */
+      memory_infop pinfo;
+      png_set_mem_fn(png_ptr, NULL, NULL, NULL);
+      pinfo = (memory_infop)png_malloc(png_ptr,
+         (png_uint_32)png_sizeof(*pinfo));
+      pinfo->size = size;
+      current_allocation += size;
+      total_allocation += size;
+      num_allocations ++;
+      if (current_allocation > maximum_allocation)
+         maximum_allocation = current_allocation;
+      pinfo->pointer = (png_voidp)png_malloc(png_ptr, size);
+      /* Restore malloc_fn and free_fn */
+      png_set_mem_fn(png_ptr,
+          png_voidp_NULL, (png_malloc_ptr)png_debug_malloc,
+          (png_free_ptr)png_debug_free);
+      if (size != 0 && pinfo->pointer == NULL)
+      {
+         current_allocation -= size;
+         total_allocation -= size;
+         png_error(png_ptr,
+           "out of memory in pngtest->png_debug_malloc.");
+      }
+      pinfo->next = pinformation;
+      pinformation = pinfo;
+      /* Make sure the caller isn't assuming zeroed memory. */
+      png_memset(pinfo->pointer, 0xdd, pinfo->size);
+      if (verbose)
+         printf("png_malloc %lu bytes at %x\n", (unsigned long)size,
+            pinfo->pointer);
+      return (png_voidp)(pinfo->pointer);
+   }
+}
+
+/* Free a pointer.  It is removed from the list at the same time. */
+void
+png_debug_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL)
+      fprintf(STDERR, "NULL pointer to png_debug_free.\n");
+   if (ptr == 0)
+   {
+#if 0 /* This happens all the time. */
+      fprintf(STDERR, "WARNING: freeing NULL pointer\n");
+#endif
+      return;
+   }
+
+   /* Unlink the element from the list. */
+   {
+      memory_infop FAR *ppinfo = &pinformation;
+      for (;;)
+      {
+         memory_infop pinfo = *ppinfo;
+         if (pinfo->pointer == ptr)
+         {
+            *ppinfo = pinfo->next;
+            current_allocation -= pinfo->size;
+            if (current_allocation < 0)
+               fprintf(STDERR, "Duplicate free of memory\n");
+            /* We must free the list element too, but first kill
+               the memory that is to be freed. */
+            png_memset(ptr, 0x55, pinfo->size);
+            png_free_default(png_ptr, pinfo);
+            pinfo = NULL;
+            break;
+         }
+         if (pinfo->next == NULL)
+         {
+            fprintf(STDERR, "Pointer %x not found\n", (unsigned int)ptr);
+            break;
+         }
+         ppinfo = &pinfo->next;
+      }
+   }
+
+   /* Finally free the data. */
+   if (verbose)
+      printf("Freeing %x\n", ptr);
+   png_free_default(png_ptr, ptr);
+   ptr = NULL;
+}
+#endif /* PNG_USER_MEM_SUPPORTED && PNG_DEBUG */
+/* END of code to test memory allocation/deallocation */
+
+
+/* Demonstration of user chunk support of the sTER and vpAg chunks */
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+
+/* (sTER is a public chunk not yet understood by libpng.  vpAg is a private
+chunk used in ImageMagick to store "virtual page" size).  */
+
+static png_uint_32 user_chunk_data[4];
+
+    /* 0: sTER mode + 1
+     * 1: vpAg width
+     * 2: vpAg height
+     * 3: vpAg units
+     */
+
+static int read_user_chunk_callback(png_struct *png_ptr,
+   png_unknown_chunkp chunk)
+{
+  png_uint_32
+    *user_chunk_data;
+
+  /* Return one of the following: */
+     /* return (-n);  chunk had an error */
+     /* return (0);  did not recognize */
+     /* return (n);  success */
+
+  /* The unknown chunk structure contains the chunk data:
+   * png_byte name[5];
+   * png_byte *data;
+   * png_size_t size;
+   *
+   *  Note that libpng has already taken care of the CRC handling.
+   */
+
+  if (chunk->name[0] == 115 && chunk->name[1] ==  84 &&     /* s  T */
+      chunk->name[2] ==  69 && chunk->name[3] ==  82)       /* E  R */
+     {
+       /* Found sTER chunk */
+       if (chunk->size != 1)
+         return (-1); /* Error return */
+       if (chunk->data[0] != 0 && chunk->data[0] != 1)
+          return (-1);  /* Invalid mode */
+       user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
+       user_chunk_data[0]=chunk->data[0]+1;
+       return (1);
+     }
+  if (chunk->name[0] != 118 || chunk->name[1] != 112 ||    /* v  p */
+      chunk->name[2] !=  65 || chunk->name[3] != 103)      /* A  g */
+    return (0); /* Did not recognize */
+
+  /* Found ImageMagick vpAg chunk */
+
+  if (chunk->size != 9)
+    return (-1); /* Error return */
+
+  user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
+
+  user_chunk_data[1]=png_get_uint_31(png_ptr, chunk->data);
+  user_chunk_data[2]=png_get_uint_31(png_ptr, chunk->data + 4);
+  user_chunk_data[3]=(png_uint_32)chunk->data[8];
+
+  return (1);
+
+}
+#endif
+/* END of code to demonstrate user chunk support */
+
+/* Test one file */
+int
+test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
+{
+   static png_FILE_p fpin;
+   static png_FILE_p fpout;  /* "static" prevents setjmp corruption */
+   png_structp read_ptr;
+   png_infop read_info_ptr, end_info_ptr;
+#ifdef PNG_WRITE_SUPPORTED
+   png_structp write_ptr;
+   png_infop write_info_ptr;
+   png_infop write_end_info_ptr;
+#else
+   png_structp write_ptr = NULL;
+   png_infop write_info_ptr = NULL;
+   png_infop write_end_info_ptr = NULL;
+#endif
+   png_bytep row_buf;
+   png_uint_32 y;
+   png_uint_32 width, height;
+   int num_pass, pass;
+   int bit_depth, color_type;
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+
+#if defined(_WIN32_WCE)
+   TCHAR path[MAX_PATH];
+#endif
+   char inbuf[256], outbuf[256];
+
+   row_buf = NULL;
+
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
+   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpin = fopen(inname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find input file %s\n", inname);
+      return (1);
+   }
+
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
+   if ((fpout = CreateFile(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpout = fopen(outname, "wb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not open output file %s\n", outname);
+      FCLOSE(fpin);
+      return (1);
+   }
+
+   png_debug(0, "Allocating read and write structures");
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+   read_ptr =
+      png_create_read_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
+      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
+#else
+   read_ptr =
+      png_create_read_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL);
+#endif
+#if defined(PNG_NO_STDIO)
+   png_set_error_fn(read_ptr, (png_voidp)inname, pngtest_error,
+       pngtest_warning);
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+  user_chunk_data[0] = 0;
+  user_chunk_data[1] = 0;
+  user_chunk_data[2] = 0;
+  user_chunk_data[3] = 0;
+  png_set_read_user_chunk_fn(read_ptr, user_chunk_data,
+    read_user_chunk_callback);
+
+#endif
+#ifdef PNG_WRITE_SUPPORTED
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+   write_ptr =
+      png_create_write_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
+      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
+#else
+   write_ptr =
+      png_create_write_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL);
+#endif
+#if defined(PNG_NO_STDIO)
+   png_set_error_fn(write_ptr, (png_voidp)inname, pngtest_error,
+       pngtest_warning);
+#endif
+#endif
+   png_debug(0, "Allocating read_info, write_info and end_info structures");
+   read_info_ptr = png_create_info_struct(read_ptr);
+   end_info_ptr = png_create_info_struct(read_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+   write_info_ptr = png_create_info_struct(write_ptr);
+   write_end_info_ptr = png_create_info_struct(write_ptr);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_debug(0, "Setting jmpbuf for read struct");
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_jmpbuf(read_ptr)))
+#endif
+   {
+      fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);
+      png_free(read_ptr, row_buf);
+      row_buf = NULL;
+      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+      png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+      FCLOSE(fpin);
+      FCLOSE(fpout);
+      return (1);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_jmpbuf(read_ptr), jmpbuf, png_sizeof(jmp_buf));
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(0, "Setting jmpbuf for write struct");
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_jmpbuf(write_ptr)))
+#endif
+   {
+      fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);
+      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+      png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+      FCLOSE(fpin);
+      FCLOSE(fpout);
+      return (1);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_jmpbuf(write_ptr), jmpbuf, png_sizeof(jmp_buf));
+#endif
+#endif
+#endif
+
+   png_debug(0, "Initializing input and output streams");
+#if !defined(PNG_NO_STDIO)
+   png_init_io(read_ptr, fpin);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_init_io(write_ptr, fpout);
+#  endif
+#else
+   png_set_read_fn(read_ptr, (png_voidp)fpin, pngtest_read_data);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_set_write_fn(write_ptr, (png_voidp)fpout,  pngtest_write_data,
+#    if defined(PNG_WRITE_FLUSH_SUPPORTED)
+      pngtest_flush);
+#    else
+      NULL);
+#    endif
+#  endif
+#endif
+   if (status_dots_requested == 1)
+   {
+#ifdef PNG_WRITE_SUPPORTED
+      png_set_write_status_fn(write_ptr, write_row_callback);
+#endif
+      png_set_read_status_fn(read_ptr, read_row_callback);
+   }
+   else
+   {
+#ifdef PNG_WRITE_SUPPORTED
+      png_set_write_status_fn(write_ptr, png_write_status_ptr_NULL);
+#endif
+      png_set_read_status_fn(read_ptr, png_read_status_ptr_NULL);
+   }
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   {
+     int i;
+     for (i = 0; i<256; i++)
+        filters_used[i] = 0;
+     png_set_read_user_transform_fn(read_ptr, count_filters);
+   }
+#endif
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   zero_samples = 0;
+   png_set_write_user_transform_fn(write_ptr, count_zero_samples);
+#endif
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+#  ifndef PNG_HANDLE_CHUNK_ALWAYS
+#    define PNG_HANDLE_CHUNK_ALWAYS       3
+#  endif
+   png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,
+      png_bytep_NULL, 0);
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+#  ifndef PNG_HANDLE_CHUNK_IF_SAFE
+#    define PNG_HANDLE_CHUNK_IF_SAFE      2
+#  endif
+   png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_IF_SAFE,
+      png_bytep_NULL, 0);
+#endif
+
+   png_debug(0, "Reading info struct");
+   png_read_info(read_ptr, read_info_ptr);
+
+   png_debug(0, "Transferring info struct");
+   {
+      int interlace_type, compression_type, filter_type;
+
+      if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth,
+          &color_type, &interlace_type, &compression_type, &filter_type))
+      {
+         png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+            color_type, interlace_type, compression_type, filter_type);
+#else
+            color_type, PNG_INTERLACE_NONE, compression_type, filter_type);
+#endif
+      }
+   }
+#if defined(PNG_FIXED_POINT_SUPPORTED)
+#if defined(PNG_cHRM_SUPPORTED)
+   {
+      png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
+         blue_y;
+      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
+         &red_y, &green_x, &green_y, &blue_x, &blue_y))
+      {
+         png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
+            red_y, green_x, green_y, blue_x, blue_y);
+      }
+   }
+#endif
+#if defined(PNG_gAMA_SUPPORTED)
+   {
+      png_fixed_point gamma;
+
+      if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma))
+      {
+         png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);
+      }
+   }
+#endif
+#else /* Use floating point versions */
+#if defined(PNG_FLOATING_POINT_SUPPORTED)
+#if defined(PNG_cHRM_SUPPORTED)
+   {
+      double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
+         blue_y;
+      if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
+         &red_y, &green_x, &green_y, &blue_x, &blue_y))
+      {
+         png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,
+            red_y, green_x, green_y, blue_x, blue_y);
+      }
+   }
+#endif
+#if defined(PNG_gAMA_SUPPORTED)
+   {
+      double gamma;
+
+      if (png_get_gAMA(read_ptr, read_info_ptr, &gamma))
+      {
+         png_set_gAMA(write_ptr, write_info_ptr, gamma);
+      }
+   }
+#endif
+#endif /* floating point */
+#endif /* fixed point */
+#if defined(PNG_iCCP_SUPPORTED)
+   {
+      png_charp name;
+      png_charp profile;
+      png_uint_32 proflen;
+      int compression_type;
+
+      if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,
+                      &profile, &proflen))
+      {
+         png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,
+                      profile, proflen);
+      }
+   }
+#endif
+#if defined(PNG_sRGB_SUPPORTED)
+   {
+      int intent;
+
+      if (png_get_sRGB(read_ptr, read_info_ptr, &intent))
+      {
+         png_set_sRGB(write_ptr, write_info_ptr, intent);
+      }
+   }
+#endif
+   {
+      png_colorp palette;
+      int num_palette;
+
+      if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette))
+      {
+         png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
+      }
+   }
+#if defined(PNG_bKGD_SUPPORTED)
+   {
+      png_color_16p background;
+
+      if (png_get_bKGD(read_ptr, read_info_ptr, &background))
+      {
+         png_set_bKGD(write_ptr, write_info_ptr, background);
+      }
+   }
+#endif
+#if defined(PNG_hIST_SUPPORTED)
+   {
+      png_uint_16p hist;
+
+      if (png_get_hIST(read_ptr, read_info_ptr, &hist))
+      {
+         png_set_hIST(write_ptr, write_info_ptr, hist);
+      }
+   }
+#endif
+#if defined(PNG_oFFs_SUPPORTED)
+   {
+      png_int_32 offset_x, offset_y;
+      int unit_type;
+
+      if (png_get_oFFs(read_ptr, read_info_ptr, &offset_x, &offset_y,
+         &unit_type))
+      {
+         png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
+      }
+   }
+#endif
+#if defined(PNG_pCAL_SUPPORTED)
+   {
+      png_charp purpose, units;
+      png_charpp params;
+      png_int_32 X0, X1;
+      int type, nparams;
+
+      if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,
+         &nparams, &units, &params))
+      {
+         png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,
+            nparams, units, params);
+      }
+   }
+#endif
+#if defined(PNG_pHYs_SUPPORTED)
+   {
+      png_uint_32 res_x, res_y;
+      int unit_type;
+
+      if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, &unit_type))
+      {
+         png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);
+      }
+   }
+#endif
+#if defined(PNG_sBIT_SUPPORTED)
+   {
+      png_color_8p sig_bit;
+
+      if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))
+      {
+         png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
+      }
+   }
+#endif
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   {
+      int unit;
+      double scal_width, scal_height;
+
+      if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,
+         &scal_height))
+      {
+         png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);
+      }
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   {
+      int unit;
+      png_charp scal_width, scal_height;
+
+      if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
+          &scal_height))
+      {
+         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width, scal_height);
+      }
+   }
+#endif
+#endif
+#endif
+#if defined(PNG_TEXT_SUPPORTED)
+   {
+      png_textp text_ptr;
+      int num_text;
+
+      if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)
+      {
+         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks", num_text);
+         png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);
+      }
+   }
+#endif
+#if defined(PNG_tIME_SUPPORTED)
+   {
+      png_timep mod_time;
+
+      if (png_get_tIME(read_ptr, read_info_ptr, &mod_time))
+      {
+         png_set_tIME(write_ptr, write_info_ptr, mod_time);
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         /* we have to use png_memcpy instead of "=" because the string
+            pointed to by png_convert_to_rfc1123() gets free'ed before
+            we use it */
+         png_memcpy(tIME_string,
+                    png_convert_to_rfc1123(read_ptr, mod_time),
+                    png_sizeof(tIME_string));
+         tIME_string[png_sizeof(tIME_string) - 1] = '\0';
+         tIME_chunk_present++;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+      }
+   }
+#endif
+#if defined(PNG_tRNS_SUPPORTED)
+   {
+      png_bytep trans;
+      int num_trans;
+      png_color_16p trans_values;
+
+      if (png_get_tRNS(read_ptr, read_info_ptr, &trans, &num_trans,
+         &trans_values))
+      {
+         int sample_max = (1 << read_info_ptr->bit_depth);
+         /* libpng doesn't reject a tRNS chunk with out-of-range samples */
+         if (!((read_info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&
+            (int)trans_values->gray > sample_max) ||
+            (read_info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
+            ((int)trans_values->red > sample_max ||
+            (int)trans_values->green > sample_max ||
+            (int)trans_values->blue > sample_max))))
+           png_set_tRNS(write_ptr, write_info_ptr, trans, num_trans,
+              trans_values);
+      }
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   {
+      png_unknown_chunkp unknowns;
+      int num_unknowns = (int)png_get_unknown_chunks(read_ptr, read_info_ptr,
+         &unknowns);
+      if (num_unknowns)
+      {
+         png_size_t i;
+         png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,
+           num_unknowns);
+         /* copy the locations from the read_info_ptr.  The automatically
+            generated locations in write_info_ptr are wrong because we
+            haven't written anything yet */
+         for (i = 0; i < (png_size_t)num_unknowns; i++)
+           png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
+             unknowns[i].location);
+      }
+   }
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(0, "Writing info struct");
+
+/* If we wanted, we could write info in two steps:
+   png_write_info_before_PLTE(write_ptr, write_info_ptr);
+ */
+   png_write_info(write_ptr, write_info_ptr);
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   if (user_chunk_data[0] != 0)
+   {
+     png_byte png_sTER[5] = {115,  84,  69,  82, '\0'};
+
+     unsigned char
+       ster_chunk_data[1];
+
+     if (verbose)
+        fprintf(STDERR, "stereo mode = %lu\n",
+          (unsigned long)(user_chunk_data[0] - 1));
+     ster_chunk_data[0]=(unsigned char)(user_chunk_data[0] - 1);
+     png_write_chunk(write_ptr, png_sTER, ster_chunk_data, 1);
+   }
+   if (user_chunk_data[1] != 0 || user_chunk_data[2] != 0)
+   {
+     png_byte png_vpAg[5] = {118, 112,  65, 103, '\0'};
+
+     unsigned char
+       vpag_chunk_data[9];
+
+     if (verbose)
+        fprintf(STDERR, "vpAg = %lu x %lu, units=%lu\n",
+          (unsigned long)user_chunk_data[1],
+          (unsigned long)user_chunk_data[2],
+          (unsigned long)user_chunk_data[3]);
+     png_save_uint_32(vpag_chunk_data, user_chunk_data[1]);
+     png_save_uint_32(vpag_chunk_data + 4, user_chunk_data[2]);
+     vpag_chunk_data[8] = (unsigned char)(user_chunk_data[3] & 0xff);
+     png_write_chunk(write_ptr, png_vpAg, vpag_chunk_data, 9);
+   }
+
+#endif
+#endif
+
+#ifdef SINGLE_ROWBUF_ALLOC
+   png_debug(0, "Allocating row buffer...");
+   row_buf = (png_bytep)png_malloc(read_ptr,
+      png_get_rowbytes(read_ptr, read_info_ptr));
+   png_debug1(0, "0x%08lx", (unsigned long)row_buf);
+#endif /* SINGLE_ROWBUF_ALLOC */
+   png_debug(0, "Writing row data");
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+  defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   num_pass = png_set_interlace_handling(read_ptr);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_set_interlace_handling(write_ptr);
+#  endif
+#else
+   num_pass = 1;
+#endif
+
+#ifdef PNGTEST_TIMING
+   t_stop = (float)clock();
+   t_misc += (t_stop - t_start);
+   t_start = t_stop;
+#endif
+   for (pass = 0; pass < num_pass; pass++)
+   {
+      png_debug1(0, "Writing row data for pass %d", pass);
+      for (y = 0; y < height; y++)
+      {
+#ifndef SINGLE_ROWBUF_ALLOC
+         png_debug2(0, "Allocating row buffer (pass %d, y = %ld)...", pass, y);
+         row_buf = (png_bytep)png_malloc(read_ptr,
+            png_get_rowbytes(read_ptr, read_info_ptr));
+         png_debug2(0, "0x%08lx (%ld bytes)", (unsigned long)row_buf,
+            png_get_rowbytes(read_ptr, read_info_ptr));
+#endif /* !SINGLE_ROWBUF_ALLOC */
+         png_read_rows(read_ptr, (png_bytepp)&row_buf, png_bytepp_NULL, 1);
+
+#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNGTEST_TIMING
+         t_stop = (float)clock();
+         t_decode += (t_stop - t_start);
+         t_start = t_stop;
+#endif
+         png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);
+#ifdef PNGTEST_TIMING
+         t_stop = (float)clock();
+         t_encode += (t_stop - t_start);
+         t_start = t_stop;
+#endif
+#endif /* PNG_WRITE_SUPPORTED */
+
+#ifndef SINGLE_ROWBUF_ALLOC
+         png_debug2(0, "Freeing row buffer (pass %d, y = %ld)", pass, y);
+         png_free(read_ptr, row_buf);
+         row_buf = NULL;
+#endif /* !SINGLE_ROWBUF_ALLOC */
+      }
+   }
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
+#endif
+
+   png_debug(0, "Reading and writing end_info data");
+
+   png_read_end(read_ptr, end_info_ptr);
+#if defined(PNG_TEXT_SUPPORTED)
+   {
+      png_textp text_ptr;
+      int num_text;
+
+      if (png_get_text(read_ptr, end_info_ptr, &text_ptr, &num_text) > 0)
+      {
+         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks", num_text);
+         png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);
+      }
+   }
+#endif
+#if defined(PNG_tIME_SUPPORTED)
+   {
+      png_timep mod_time;
+
+      if (png_get_tIME(read_ptr, end_info_ptr, &mod_time))
+      {
+         png_set_tIME(write_ptr, write_end_info_ptr, mod_time);
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         /* we have to use png_memcpy instead of "=" because the string
+            pointed to by png_convert_to_rfc1123() gets free'ed before
+            we use it */
+         png_memcpy(tIME_string,
+                    png_convert_to_rfc1123(read_ptr, mod_time),
+                    png_sizeof(tIME_string));
+         tIME_string[png_sizeof(tIME_string) - 1] = '\0';
+         tIME_chunk_present++;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+      }
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   {
+      png_unknown_chunkp unknowns;
+      int num_unknowns;
+      num_unknowns = (int)png_get_unknown_chunks(read_ptr, end_info_ptr,
+         &unknowns);
+      if (num_unknowns)
+      {
+         png_size_t i;
+         png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,
+           num_unknowns);
+         /* copy the locations from the read_info_ptr.  The automatically
+            generated locations in write_end_info_ptr are wrong because we
+            haven't written the end_info yet */
+         for (i = 0; i < (png_size_t)num_unknowns; i++)
+           png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
+             unknowns[i].location);
+      }
+   }
+#endif
+#ifdef PNG_WRITE_SUPPORTED
+   png_write_end(write_ptr, write_end_info_ptr);
+#endif
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+   if (verbose)
+   {
+      png_uint_32 iwidth, iheight;
+      iwidth = png_get_image_width(write_ptr, write_info_ptr);
+      iheight = png_get_image_height(write_ptr, write_info_ptr);
+      fprintf(STDERR, "Image width = %lu, height = %lu\n",
+         (unsigned long)iwidth, (unsigned long)iheight);
+   }
+#endif
+
+   png_debug(0, "Destroying data structs");
+#ifdef SINGLE_ROWBUF_ALLOC
+   png_debug(1, "destroying row_buf for read_ptr");
+   png_free(read_ptr, row_buf);
+   row_buf = NULL;
+#endif /* SINGLE_ROWBUF_ALLOC */
+   png_debug(1, "destroying read_ptr, read_info_ptr, end_info_ptr");
+   png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(1, "destroying write_end_info_ptr");
+   png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+   png_debug(1, "destroying write_ptr, write_info_ptr");
+   png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+   png_debug(0, "Destruction complete.");
+
+   FCLOSE(fpin);
+   FCLOSE(fpout);
+
+   png_debug(0, "Opening files for comparison");
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
+   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpin = fopen(inname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find file %s\n", inname);
+      return (1);
+   }
+
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
+   if ((fpout = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpout = fopen(outname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find file %s\n", outname);
+      FCLOSE(fpin);
+      return (1);
+   }
+
+   for (;;)
+   {
+      png_size_t num_in, num_out;
+
+         READFILE(fpin, inbuf, 1, num_in);
+         READFILE(fpout, outbuf, 1, num_out);
+
+      if (num_in != num_out)
+      {
+         fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
+                 inname, outname);
+         if (wrote_question == 0)
+         {
+            fprintf(STDERR,
+         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
+              inname, PNG_ZBUF_SIZE);
+            fprintf(STDERR,
+              "\n   filtering heuristic (libpng default), compression");
+            fprintf(STDERR,
+              " level (zlib default),\n   and zlib version (%s)?\n\n",
+              ZLIB_VERSION);
+            wrote_question = 1;
+         }
+         FCLOSE(fpin);
+         FCLOSE(fpout);
+         return (0);
+      }
+
+      if (!num_in)
+         break;
+
+      if (png_memcmp(inbuf, outbuf, num_in))
+      {
+         fprintf(STDERR, "\nFiles %s and %s are different\n", inname, outname);
+         if (wrote_question == 0)
+         {
+            fprintf(STDERR,
+         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
+                 inname, PNG_ZBUF_SIZE);
+            fprintf(STDERR,
+              "\n   filtering heuristic (libpng default), compression");
+            fprintf(STDERR,
+              " level (zlib default),\n   and zlib version (%s)?\n\n",
+              ZLIB_VERSION);
+            wrote_question = 1;
+         }
+         FCLOSE(fpin);
+         FCLOSE(fpout);
+         return (0);
+      }
+   }
+
+   FCLOSE(fpin);
+   FCLOSE(fpout);
+
+   return (0);
+}
+
+/* input and output filenames */
+#ifdef RISCOS
+static PNG_CONST char *inname = "pngtest/png";
+static PNG_CONST char *outname = "pngout/png";
+#else
+static PNG_CONST char *inname = "pngtest.png";
+static PNG_CONST char *outname = "pngout.png";
+#endif
+
+int
+main(int argc, char *argv[])
+{
+   int multiple = 0;
+   int ierror = 0;
+
+   fprintf(STDERR, "Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);
+   fprintf(STDERR, "   with zlib   version %s\n", ZLIB_VERSION);
+   fprintf(STDERR, "%s", png_get_copyright(NULL));
+   /* Show the version of libpng used in building the library */
+   fprintf(STDERR, " library (%lu):%s",
+      (unsigned long)png_access_version_number(),
+      png_get_header_version(NULL));
+   /* Show the version of libpng used in building the application */
+   fprintf(STDERR, " pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,
+      PNG_HEADER_VERSION_STRING);
+   fprintf(STDERR, " sizeof(png_struct)=%ld, sizeof(png_info)=%ld\n",
+                    (long)png_sizeof(png_struct), (long)png_sizeof(png_info));
+
+   /* Do some consistency checking on the memory allocation settings, I'm
+      not sure this matters, but it is nice to know, the first of these
+      tests should be impossible because of the way the macros are set
+      in pngconf.h */
+#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
+      fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");
+#endif
+   /* I think the following can happen. */
+#if !defined(MAXSEG_64K) && defined(PNG_MAX_MALLOC_64K)
+      fprintf(STDERR, " NOTE: libpng compiled for max 64k, zlib not\n");
+#endif
+
+   if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING))
+   {
+      fprintf(STDERR,
+         "Warning: versions are different between png.h and png.c\n");
+      fprintf(STDERR, "  png.h version: %s\n", PNG_LIBPNG_VER_STRING);
+      fprintf(STDERR, "  png.c version: %s\n\n", png_libpng_ver);
+      ++ierror;
+   }
+
+   if (argc > 1)
+   {
+      if (strcmp(argv[1], "-m") == 0)
+      {
+         multiple = 1;
+         status_dots_requested = 0;
+      }
+      else if (strcmp(argv[1], "-mv") == 0 ||
+               strcmp(argv[1], "-vm") == 0 )
+      {
+         multiple = 1;
+         verbose = 1;
+         status_dots_requested = 1;
+      }
+      else if (strcmp(argv[1], "-v") == 0)
+      {
+         verbose = 1;
+         status_dots_requested = 1;
+         inname = argv[2];
+      }
+      else
+      {
+         inname = argv[1];
+         status_dots_requested = 0;
+      }
+   }
+
+   if (!multiple && argc == 3 + verbose)
+     outname = argv[2 + verbose];
+
+   if ((!multiple && argc > 3 + verbose) || (multiple && argc < 2))
+   {
+     fprintf(STDERR,
+       "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
+        argv[0], argv[0]);
+     fprintf(STDERR,
+       "  reads/writes one PNG file (without -m) or multiple files (-m)\n");
+     fprintf(STDERR,
+       "  with -m %s is used as a temporary file\n", outname);
+     exit(1);
+   }
+
+   if (multiple)
+   {
+      int i;
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+      int allocation_now = current_allocation;
+#endif
+      for (i=2; i<argc; ++i)
+      {
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+         int k;
+#endif
+         int kerror;
+         fprintf(STDERR, "Testing %s:", argv[i]);
+         kerror = test_one_file(argv[i], outname);
+         if (kerror == 0)
+         {
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+            fprintf(STDERR, "\n PASS (%lu zero samples)\n",
+               (unsigned long)zero_samples);
+#else
+            fprintf(STDERR, " PASS\n");
+#endif
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+            for (k = 0; k<256; k++)
+               if (filters_used[k])
+                  fprintf(STDERR, " Filter %d was used %lu times\n",
+                     k, (unsigned long)filters_used[k]);
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         if (tIME_chunk_present != 0)
+            fprintf(STDERR, " tIME = %s\n", tIME_string);
+         tIME_chunk_present = 0;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+         }
+         else
+         {
+            fprintf(STDERR, " FAIL\n");
+            ierror += kerror;
+         }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         if (allocation_now != current_allocation)
+            fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
+               current_allocation - allocation_now);
+         if (current_allocation != 0)
+         {
+            memory_infop pinfo = pinformation;
+
+            fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
+               current_allocation);
+            while (pinfo != NULL)
+            {
+               fprintf(STDERR, " %lu bytes at %x\n",
+                 (unsigned long)pinfo->size,
+                 (unsigned int) pinfo->pointer);
+               pinfo = pinfo->next;
+            }
+         }
+#endif
+      }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+            current_allocation);
+         fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
+            maximum_allocation);
+         fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
+            total_allocation);
+         fprintf(STDERR, "     Number of allocations: %10d\n",
+            num_allocations);
+#endif
+   }
+   else
+   {
+      int i;
+      for (i = 0; i<3; ++i)
+      {
+         int kerror;
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         int allocation_now = current_allocation;
+#endif
+         if (i == 1) status_dots_requested = 1;
+         else if (verbose == 0)status_dots_requested = 0;
+         if (i == 0 || verbose == 1 || ierror != 0)
+            fprintf(STDERR, "Testing %s:", inname);
+         kerror = test_one_file(inname, outname);
+         if (kerror == 0)
+         {
+            if (verbose == 1 || i == 2)
+            {
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+                int k;
+#endif
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+                fprintf(STDERR, "\n PASS (%lu zero samples)\n",
+                   (unsigned long)zero_samples);
+#else
+                fprintf(STDERR, " PASS\n");
+#endif
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+                for (k = 0; k<256; k++)
+                   if (filters_used[k])
+                      fprintf(STDERR, " Filter %d was used %lu times\n",
+                         k,
+                         (unsigned long)filters_used[k]);
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+             if (tIME_chunk_present != 0)
+                fprintf(STDERR, " tIME = %s\n", tIME_string);
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+            }
+         }
+         else
+         {
+            if (verbose == 0 && i != 2)
+               fprintf(STDERR, "Testing %s:", inname);
+            fprintf(STDERR, " FAIL\n");
+            ierror += kerror;
+         }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         if (allocation_now != current_allocation)
+             fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
+               current_allocation - allocation_now);
+         if (current_allocation != 0)
+         {
+             memory_infop pinfo = pinformation;
+
+             fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
+                current_allocation);
+             while (pinfo != NULL)
+             {
+                fprintf(STDERR, " %lu bytes at %x\n",
+                   (unsigned long)pinfo->size, (unsigned int)pinfo->pointer);
+                pinfo = pinfo->next;
+             }
+          }
+#endif
+       }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+       fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+          current_allocation);
+       fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
+          maximum_allocation);
+       fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
+          total_allocation);
+       fprintf(STDERR, "     Number of allocations: %10d\n",
+            num_allocations);
+#endif
+   }
+
+#ifdef PNGTEST_TIMING
+   t_stop = (float)clock();
+   t_misc += (t_stop - t_start);
+   t_start = t_stop;
+   fprintf(STDERR, " CPU time used = %.3f seconds",
+      (t_misc+t_decode+t_encode)/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR, " (decoding %.3f,\n",
+      t_decode/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR, "        encoding %.3f ,",
+      t_encode/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR, " other %.3f seconds)\n\n",
+      t_misc/(float)CLOCKS_PER_SEC);
+#endif
+
+   if (ierror == 0)
+      fprintf(STDERR, "libpng passes test\n");
+   else
+      fprintf(STDERR, "libpng FAILS test\n");
+   return (int)(ierror != 0);
+}
+
+/* Generate a compiler error if there is an old png.h in the search path. */
+typedef version_1_2_35 your_png_h_is_not_version_1_2_35;
+
 /* pngtest.c - a simple test program to test libpng
  *
  * Last changed in libpng 1.2.6 - August 15, 2004
diff --git a/src/dep/src/irrlicht/libpng/pngtrans.c b/src/dep/src/irrlicht/libpng/pngtrans.c
index f91190a..6409298 100644
--- a/src/dep/src/irrlicht/libpng/pngtrans.c
+++ b/src/dep/src/irrlicht/libpng/pngtrans.c
@@ -1,4 +1,666 @@
 
+/* pngtrans.c - transforms the data in a row (used by both readers and writers)
+ *
+ * Last changed in libpng 1.2.30 [August 15, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* turn on BGR-to-RGB mapping */
+void PNGAPI
+png_set_bgr(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_bgr");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_BGR;
+}
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* turn on 16 bit byte swapping */
+void PNGAPI
+png_set_swap(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_swap");
+   if (png_ptr == NULL) return;
+   if (png_ptr->bit_depth == 16)
+      png_ptr->transformations |= PNG_SWAP_BYTES;
+}
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+/* turn on pixel packing */
+void PNGAPI
+png_set_packing(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_packing");
+   if (png_ptr == NULL) return;
+   if (png_ptr->bit_depth < 8)
+   {
+      png_ptr->transformations |= PNG_PACK;
+      png_ptr->usr_bit_depth = 8;
+   }
+}
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+/* turn on packed pixel swapping */
+void PNGAPI
+png_set_packswap(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_packswap");
+   if (png_ptr == NULL) return;
+   if (png_ptr->bit_depth < 8)
+      png_ptr->transformations |= PNG_PACKSWAP;
+}
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+void PNGAPI
+png_set_shift(png_structp png_ptr, png_color_8p true_bits)
+{
+   png_debug(1, "in png_set_shift");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_SHIFT;
+   png_ptr->shift = *true_bits;
+}
+#endif
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+    defined(PNG_WRITE_INTERLACING_SUPPORTED)
+int PNGAPI
+png_set_interlace_handling(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_interlace handling");
+   if (png_ptr && png_ptr->interlaced)
+   {
+      png_ptr->transformations |= PNG_INTERLACE;
+      return (7);
+   }
+
+   return (1);
+}
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+/* Add a filler byte on read, or remove a filler or alpha byte on write.
+ * The filler type has changed in v0.95 to allow future 2-byte fillers
+ * for 48-bit input data, as well as to avoid problems with some compilers
+ * that don't like bytes as parameters.
+ */
+void PNGAPI
+png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+{
+   png_debug(1, "in png_set_filler");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_FILLER;
+   png_ptr->filler = (png_byte)filler;
+   if (filler_loc == PNG_FILLER_AFTER)
+      png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
+   else
+      png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
+
+   /* This should probably go in the "do_read_filler" routine.
+    * I attempted to do that in libpng-1.0.1a but that caused problems
+    * so I restored it in libpng-1.0.2a
+   */
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      png_ptr->usr_channels = 4;
+   }
+
+   /* Also I added this in libpng-1.0.2a (what happens when we expand
+    * a less-than-8-bit grayscale to GA? */
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY && png_ptr->bit_depth >= 8)
+   {
+      png_ptr->usr_channels = 2;
+   }
+}
+
+#if !defined(PNG_1_0_X)
+/* Added to libpng-1.2.7 */
+void PNGAPI
+png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+{
+   png_debug(1, "in png_set_add_alpha");
+   if (png_ptr == NULL) return;
+   png_set_filler(png_ptr, filler, filler_loc);
+   png_ptr->transformations |= PNG_ADD_ALPHA;
+}
+#endif
+
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_swap_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_swap_alpha");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_SWAP_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_invert_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_invert_alpha");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_INVERT_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+void PNGAPI
+png_set_invert_mono(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_invert_mono");
+   if (png_ptr == NULL) return;
+   png_ptr->transformations |= PNG_INVERT_MONO;
+}
+
+/* invert monochrome grayscale data */
+void /* PRIVATE */
+png_do_invert(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_invert");
+  /* This test removed from libpng version 1.0.13 and 1.2.0:
+   *   if (row_info->bit_depth == 1 &&
+   */
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row == NULL || row_info == NULL)
+     return;
+#endif
+   if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i++)
+      {
+         *rp = (png_byte)(~(*rp));
+         rp++;
+      }
+   }
+   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+      row_info->bit_depth == 8)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i+=2)
+      {
+         *rp = (png_byte)(~(*rp));
+         rp+=2;
+      }
+   }
+   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+      row_info->bit_depth == 16)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i+=4)
+      {
+         *rp = (png_byte)(~(*rp));
+         *(rp+1) = (png_byte)(~(*(rp+1)));
+         rp+=4;
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* swaps byte order on 16 bit depth images */
+void /* PRIVATE */
+png_do_swap(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_swap");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->bit_depth == 16)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop= row_info->width * row_info->channels;
+
+      for (i = 0; i < istop; i++, rp += 2)
+      {
+         png_byte t = *rp;
+         *rp = *(rp + 1);
+         *(rp + 1) = t;
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+static PNG_CONST png_byte onebppswaptable[256] = {
+   0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
+   0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+   0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
+   0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+   0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
+   0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+   0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
+   0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+   0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
+   0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+   0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
+   0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+   0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
+   0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+   0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
+   0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
+   0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
+   0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
+   0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
+   0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
+   0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
+   0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
+   0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
+   0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
+   0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
+   0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
+   0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
+   0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
+   0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
+   0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
+   0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
+   0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
+};
+
+static PNG_CONST png_byte twobppswaptable[256] = {
+   0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
+   0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
+   0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
+   0x24, 0x64, 0xA4, 0xE4, 0x34, 0x74, 0xB4, 0xF4,
+   0x08, 0x48, 0x88, 0xC8, 0x18, 0x58, 0x98, 0xD8,
+   0x28, 0x68, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8,
+   0x0C, 0x4C, 0x8C, 0xCC, 0x1C, 0x5C, 0x9C, 0xDC,
+   0x2C, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,
+   0x01, 0x41, 0x81, 0xC1, 0x11, 0x51, 0x91, 0xD1,
+   0x21, 0x61, 0xA1, 0xE1, 0x31, 0x71, 0xB1, 0xF1,
+   0x05, 0x45, 0x85, 0xC5, 0x15, 0x55, 0x95, 0xD5,
+   0x25, 0x65, 0xA5, 0xE5, 0x35, 0x75, 0xB5, 0xF5,
+   0x09, 0x49, 0x89, 0xC9, 0x19, 0x59, 0x99, 0xD9,
+   0x29, 0x69, 0xA9, 0xE9, 0x39, 0x79, 0xB9, 0xF9,
+   0x0D, 0x4D, 0x8D, 0xCD, 0x1D, 0x5D, 0x9D, 0xDD,
+   0x2D, 0x6D, 0xAD, 0xED, 0x3D, 0x7D, 0xBD, 0xFD,
+   0x02, 0x42, 0x82, 0xC2, 0x12, 0x52, 0x92, 0xD2,
+   0x22, 0x62, 0xA2, 0xE2, 0x32, 0x72, 0xB2, 0xF2,
+   0x06, 0x46, 0x86, 0xC6, 0x16, 0x56, 0x96, 0xD6,
+   0x26, 0x66, 0xA6, 0xE6, 0x36, 0x76, 0xB6, 0xF6,
+   0x0A, 0x4A, 0x8A, 0xCA, 0x1A, 0x5A, 0x9A, 0xDA,
+   0x2A, 0x6A, 0xAA, 0xEA, 0x3A, 0x7A, 0xBA, 0xFA,
+   0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xDE,
+   0x2E, 0x6E, 0xAE, 0xEE, 0x3E, 0x7E, 0xBE, 0xFE,
+   0x03, 0x43, 0x83, 0xC3, 0x13, 0x53, 0x93, 0xD3,
+   0x23, 0x63, 0xA3, 0xE3, 0x33, 0x73, 0xB3, 0xF3,
+   0x07, 0x47, 0x87, 0xC7, 0x17, 0x57, 0x97, 0xD7,
+   0x27, 0x67, 0xA7, 0xE7, 0x37, 0x77, 0xB7, 0xF7,
+   0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x5B, 0x9B, 0xDB,
+   0x2B, 0x6B, 0xAB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB,
+   0x0F, 0x4F, 0x8F, 0xCF, 0x1F, 0x5F, 0x9F, 0xDF,
+   0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
+};
+
+static PNG_CONST png_byte fourbppswaptable[256] = {
+   0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
+   0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
+   0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
+   0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,
+   0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
+   0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0xF2,
+   0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
+   0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3, 0xF3,
+   0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
+   0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4,
+   0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
+   0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5, 0xF5,
+   0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
+   0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6, 0xF6,
+   0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
+   0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7,
+   0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
+   0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8,
+   0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
+   0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9,
+   0x0A, 0x1A, 0x2A, 0x3A, 0x4A, 0x5A, 0x6A, 0x7A,
+   0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,
+   0x0B, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B,
+   0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB, 0xFB,
+   0x0C, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C,
+   0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC, 0xFC,
+   0x0D, 0x1D, 0x2D, 0x3D, 0x4D, 0x5D, 0x6D, 0x7D,
+   0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD,
+   0x0E, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,
+   0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,
+   0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,
+   0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF
+};
+
+/* swaps pixel packing order within bytes */
+void /* PRIVATE */
+png_do_packswap(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_packswap");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->bit_depth < 8)
+   {
+      png_bytep rp, end, table;
+
+      end = row + row_info->rowbytes;
+
+      if (row_info->bit_depth == 1)
+         table = (png_bytep)onebppswaptable;
+      else if (row_info->bit_depth == 2)
+         table = (png_bytep)twobppswaptable;
+      else if (row_info->bit_depth == 4)
+         table = (png_bytep)fourbppswaptable;
+      else
+         return;
+
+      for (rp = row; rp < end; rp++)
+         *rp = table[*rp];
+   }
+}
+#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
+    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+/* remove filler or alpha byte(s) */
+void /* PRIVATE */
+png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)
+{
+   png_debug(1, "in png_do_strip_filler");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_bytep sp=row;
+      png_bytep dp=row;
+      png_uint_32 row_width=row_info->width;
+      png_uint_32 i;
+
+      if ((row_info->color_type == PNG_COLOR_TYPE_RGB ||
+         (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+         (flags & PNG_FLAG_STRIP_ALPHA))) &&
+         row_info->channels == 4)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            /* This converts from RGBX or RGBA to RGB */
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               dp+=3; sp+=4;
+               for (i = 1; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp++;
+               }
+            }
+            /* This converts from XRGB or ARGB to RGB */
+            else
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 24;
+            row_info->rowbytes = row_width * 3;
+         }
+         else /* if (row_info->bit_depth == 16) */
+         {
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               /* This converts from RRGGBBXX or RRGGBBAA to RRGGBB */
+               sp += 8; dp += 6;
+               for (i = 1; i < row_width; i++)
+               {
+                  /* This could be (although png_memcpy is probably slower):
+                  png_memcpy(dp, sp, 6);
+                  sp += 8;
+                  dp += 6;
+                  */
+
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp += 2;
+               }
+            }
+            else
+            {
+               /* This converts from XXRRGGBB or AARRGGBB to RRGGBB */
+               for (i = 0; i < row_width; i++)
+               {
+                  /* This could be (although png_memcpy is probably slower):
+                  png_memcpy(dp, sp, 6);
+                  sp += 8;
+                  dp += 6;
+                  */
+
+                  sp+=2;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 48;
+            row_info->rowbytes = row_width * 6;
+         }
+         row_info->channels = 3;
+      }
+      else if ((row_info->color_type == PNG_COLOR_TYPE_GRAY ||
+         (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+         (flags & PNG_FLAG_STRIP_ALPHA))) &&
+          row_info->channels == 2)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            /* This converts from GX or GA to G */
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  sp++;
+               }
+            }
+            /* This converts from XG or AG to G */
+            else
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 8;
+            row_info->rowbytes = row_width;
+         }
+         else /* if (row_info->bit_depth == 16) */
+         {
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               /* This converts from GGXX or GGAA to GG */
+               sp += 4; dp += 2;
+               for (i = 1; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp += 2;
+               }
+            }
+            else
+            {
+               /* This converts from XXGG or AAGG to GG */
+               for (i = 0; i < row_width; i++)
+               {
+                  sp += 2;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+         row_info->channels = 1;
+      }
+      if (flags & PNG_FLAG_STRIP_ALPHA)
+        row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
+   }
+}
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* swaps red and blue bytes within a pixel */
+void /* PRIVATE */
+png_do_bgr(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_bgr");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 3)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 2);
+               *(rp + 2) = save;
+            }
+         }
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 4)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 2);
+               *(rp + 2) = save;
+            }
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 6)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 4);
+               *(rp + 4) = save;
+               save = *(rp + 1);
+               *(rp + 1) = *(rp + 5);
+               *(rp + 5) = save;
+            }
+         }
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 8)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 4);
+               *(rp + 4) = save;
+               save = *(rp + 1);
+               *(rp + 1) = *(rp + 5);
+               *(rp + 5) = save;
+            }
+         }
+      }
+   }
+}
+#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+void PNGAPI
+png_set_user_transform_info(png_structp png_ptr, png_voidp
+   user_transform_ptr, int user_transform_depth, int user_transform_channels)
+{
+   png_debug(1, "in png_set_user_transform_info");
+   if (png_ptr == NULL) return;
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+   png_ptr->user_transform_ptr = user_transform_ptr;
+   png_ptr->user_transform_depth = (png_byte)user_transform_depth;
+   png_ptr->user_transform_channels = (png_byte)user_transform_channels;
+#else
+   if (user_transform_ptr || user_transform_depth || user_transform_channels)
+      png_warning(png_ptr,
+        "This version of libpng does not support user transform info");
+#endif
+}
+#endif
+
+/* This function returns a pointer to the user_transform_ptr associated with
+ * the user transform functions.  The application should free any memory
+ * associated with this pointer before png_write_destroy and png_read_destroy
+ * are called.
+ */
+png_voidp PNGAPI
+png_get_user_transform_ptr(png_structp png_ptr)
+{
+   if (png_ptr == NULL) return (NULL);
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+   return ((png_voidp)png_ptr->user_transform_ptr);
+#else
+   return (NULL);
+#endif
+}
+#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
  * Last changed in libpng 1.2.13 November 13, 2006
diff --git a/src/dep/src/irrlicht/libpng/pngvcrd.c b/src/dep/src/irrlicht/libpng/pngvcrd.c
index 7bb6280..27b93dc 100644
--- a/src/dep/src/irrlicht/libpng/pngvcrd.c
+++ b/src/dep/src/irrlicht/libpng/pngvcrd.c
@@ -1,3 +1,4 @@
+/* pnggvrd.c was removed from libpng-1.2.20. */
 
 /* pngvcrd.c - mixed C/assembler version of utilities to read a PNG file
  *
diff --git a/src/dep/src/irrlicht/libpng/pngwio.c b/src/dep/src/irrlicht/libpng/pngwio.c
index f40bccb..a61b9a8 100644
--- a/src/dep/src/irrlicht/libpng/pngwio.c
+++ b/src/dep/src/irrlicht/libpng/pngwio.c
@@ -1,4 +1,238 @@
 
+/* pngwio.c - functions for data output
+ *
+ * Last changed in libpng 1.2.35 [February 14, 2009]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all output.  Users who need
+ * special handling are expected to write functions that have the same
+ * arguments as these and perform similar functions, but that possibly
+ * use different output methods.  Note that you shouldn't change these
+ * functions, but rather write replacement functions and then change
+ * them at run time with png_set_write_fn(...).
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Write the data to whatever output you are using.  The default routine
+   writes to a file pointer.  Note that this routine sometimes gets called
+   with very small lengths, so you should implement some kind of simple
+   buffering if you are using unbuffered writes.  This should never be asked
+   to write more than 64K on a 16 bit machine.  */
+
+void /* PRIVATE */
+png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   if (png_ptr->write_data_fn != NULL )
+      (*(png_ptr->write_data_fn))(png_ptr, data, length);
+   else
+      png_error(png_ptr, "Call to NULL write function");
+}
+
+#if !defined(PNG_NO_STDIO)
+/* This is the function that does the actual writing of data.  If you are
+   not writing to a standard C stream, you should create a replacement
+   write_data function and use it at run time with png_set_write_fn(), rather
+   than changing the library. */
+#ifndef USE_FAR_KEYWORD
+void PNGAPI
+png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+
+   if (png_ptr == NULL) return;
+#if defined(_WIN32_WCE)
+   if ( !WriteFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+      check = 0;
+#else
+   check = fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
+#endif
+   if (check != length)
+      png_error(png_ptr, "Write Error");
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+void PNGAPI
+png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
+   png_FILE_p io_ptr;
+
+   if (png_ptr == NULL) return;
+   /* Check if data really is near. If so, use usual code. */
+   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)near_data == data)
+   {
+#if defined(_WIN32_WCE)
+      if ( !WriteFile(io_ptr, near_data, length, &check, NULL) )
+         check = 0;
+#else
+      check = fwrite(near_data, 1, length, io_ptr);
+#endif
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t written, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         written = MIN(NEAR_BUF_SIZE, remaining);
+         png_memcpy(buf, data, written); /* copy far buffer to near buffer */
+#if defined(_WIN32_WCE)
+         if ( !WriteFile(io_ptr, buf, written, &err, NULL) )
+            err = 0;
+#else
+         err = fwrite(buf, 1, written, io_ptr);
+#endif
+         if (err != written)
+            break;
+         else
+            check += err;
+         data += written;
+         remaining -= written;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+      png_error(png_ptr, "Write Error");
+}
+
+#endif
+#endif
+
+/* This function is called to output any data pending writing (normally
+   to disk).  After png_flush is called, there should be no data pending
+   writing in any buffers. */
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+void /* PRIVATE */
+png_flush(png_structp png_ptr)
+{
+   if (png_ptr->output_flush_fn != NULL)
+      (*(png_ptr->output_flush_fn))(png_ptr);
+}
+
+#if !defined(PNG_NO_STDIO)
+void PNGAPI
+png_default_flush(png_structp png_ptr)
+{
+#if !defined(_WIN32_WCE)
+   png_FILE_p io_ptr;
+#endif
+   if (png_ptr == NULL) return;
+#if !defined(_WIN32_WCE)
+   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
+   if (io_ptr != NULL && fileno(io_ptr) != -1)
+      fflush(io_ptr);
+#endif
+}
+#endif
+#endif
+
+/* This function allows the application to supply new output functions for
+   libpng if standard C streams aren't being used.
+
+   This function takes as its arguments:
+   png_ptr       - pointer to a png output data structure
+   io_ptr        - pointer to user supplied structure containing info about
+                   the output functions.  May be NULL.
+   write_data_fn - pointer to a new output function that takes as its
+                   arguments a pointer to a png_struct, a pointer to
+                   data to be written, and a 32-bit unsigned int that is
+                   the number of bytes to be written.  The new write
+                   function should call png_error(png_ptr, "Error msg")
+                   to exit and output any fatal error messages.
+   flush_data_fn - pointer to a new flush function that takes as its
+                   arguments a pointer to a png_struct.  After a call to
+                   the flush function, there should be no data in any buffers
+                   or pending transmission.  If the output method doesn't do
+                   any buffering of ouput, a function prototype must still be
+                   supplied although it doesn't have to do anything.  If
+                   PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile
+                   time, output_flush_fn will be ignored, although it must be
+                   supplied for compatibility. */
+void PNGAPI
+png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
+   png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
+{
+   if (png_ptr == NULL) return;
+   png_ptr->io_ptr = io_ptr;
+
+#if !defined(PNG_NO_STDIO)
+   if (write_data_fn != NULL)
+      png_ptr->write_data_fn = write_data_fn;
+   else
+      png_ptr->write_data_fn = png_default_write_data;
+#else
+   png_ptr->write_data_fn = write_data_fn;
+#endif
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+#if !defined(PNG_NO_STDIO)
+   if (output_flush_fn != NULL)
+      png_ptr->output_flush_fn = output_flush_fn;
+   else
+      png_ptr->output_flush_fn = png_default_flush;
+#else
+   png_ptr->output_flush_fn = output_flush_fn;
+#endif
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+   /* It is an error to read while writing a png file */
+   if (png_ptr->read_data_fn != NULL)
+   {
+      png_ptr->read_data_fn = NULL;
+      png_warning(png_ptr,
+         "Attempted to set both read_data_fn and write_data_fn in");
+      png_warning(png_ptr,
+         "the same structure.  Resetting read_data_fn to NULL.");
+   }
+}
+
+#if defined(USE_FAR_KEYWORD)
+#if defined(_MSC_VER)
+void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
+{
+   void *near_ptr;
+   void FAR *far_ptr;
+   FP_OFF(near_ptr) = FP_OFF(ptr);
+   far_ptr = (void FAR *)near_ptr;
+   if (check != 0)
+      if (FP_SEG(ptr) != FP_SEG(far_ptr))
+         png_error(png_ptr, "segment lost in conversion");
+   return(near_ptr);
+}
+#  else
+void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
+{
+   void *near_ptr;
+   void FAR *far_ptr;
+   near_ptr = (void FAR *)ptr;
+   far_ptr = (void FAR *)near_ptr;
+   if (check != 0)
+      if (far_ptr != ptr)
+         png_error(png_ptr, "segment lost in conversion");
+   return(near_ptr);
+}
+#   endif
+#   endif
+#endif /* PNG_WRITE_SUPPORTED */
+
 /* pngwio.c - functions for data output
  *
  * Last changed in libpng 1.2.13 November 13, 2006
diff --git a/src/dep/src/irrlicht/libpng/pngwrite.c b/src/dep/src/irrlicht/libpng/pngwrite.c
index b4fd7df..754f221 100644
--- a/src/dep/src/irrlicht/libpng/pngwrite.c
+++ b/src/dep/src/irrlicht/libpng/pngwrite.c
@@ -1,4 +1,1551 @@
 
+/* pngwrite.c - general routines to write a PNG file
+ *
+ * Last changed in libpng 1.2.34 [December 18, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+/* get internal access to png.h */
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Writes all the PNG information.  This is the suggested way to use the
+ * library.  If you have a new chunk to add, make a function to write it,
+ * and put it in the correct location here.  If you want the chunk written
+ * after the image data, put it in png_write_end().  I strongly encourage
+ * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing
+ * the chunk, as that will keep the code from breaking if you want to just
+ * write a plain PNG file.  If you have long comments, I suggest writing
+ * them in png_write_end(), and compressing them.
+ */
+void PNGAPI
+png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_write_info_before_PLTE");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+   {
+   png_write_sig(png_ptr); /* write PNG signature */
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   if ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE)&&(png_ptr->mng_features_permitted))
+   {
+      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
+      png_ptr->mng_features_permitted=0;
+   }
+#endif
+   /* write IHDR information. */
+   png_write_IHDR(png_ptr, info_ptr->width, info_ptr->height,
+      info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,
+      info_ptr->filter_type,
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+      info_ptr->interlace_type);
+#else
+      0);
+#endif
+   /* the rest of these check to see if the valid field has the appropriate
+      flag set, and if it does, writes the chunk. */
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_gAMA)
+   {
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+      png_write_gAMA(png_ptr, info_ptr->gamma);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_gAMA_fixed(png_ptr, info_ptr->int_gamma);
+#  endif
+#endif
+   }
+#endif
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sRGB)
+      png_write_sRGB(png_ptr, (int)info_ptr->srgb_intent);
+#endif
+#if defined(PNG_WRITE_iCCP_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_iCCP)
+      png_write_iCCP(png_ptr, info_ptr->iccp_name, PNG_COMPRESSION_TYPE_BASE,
+                     info_ptr->iccp_profile, (int)info_ptr->iccp_proflen);
+#endif
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sBIT)
+      png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
+#endif
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_cHRM)
+   {
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      png_write_cHRM(png_ptr,
+         info_ptr->x_white, info_ptr->y_white,
+         info_ptr->x_red, info_ptr->y_red,
+         info_ptr->x_green, info_ptr->y_green,
+         info_ptr->x_blue, info_ptr->y_blue);
+#else
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_cHRM_fixed(png_ptr,
+         info_ptr->int_x_white, info_ptr->int_y_white,
+         info_ptr->int_x_red, info_ptr->int_y_red,
+         info_ptr->int_x_green, info_ptr->int_y_green,
+         info_ptr->int_x_blue, info_ptr->int_y_blue);
+#  endif
+#endif
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   if (info_ptr->unknown_chunks_num)
+   {
+       png_unknown_chunk *up;
+
+       png_debug(5, "writing extra chunks");
+
+       for (up = info_ptr->unknown_chunks;
+            up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+            up++)
+       {
+         int keep=png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && !(up->location & PNG_HAVE_PLTE) &&
+            !(up->location & PNG_HAVE_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            if (up->size == 0)
+               png_warning(png_ptr, "Writing zero-length unknown chunk");
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+       }
+   }
+#endif
+      png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;
+   }
+}
+
+void PNGAPI
+png_write_info(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+   int i;
+#endif
+
+   png_debug(1, "in png_write_info");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_write_info_before_PLTE(png_ptr, info_ptr);
+
+   if (info_ptr->valid & PNG_INFO_PLTE)
+      png_write_PLTE(png_ptr, info_ptr->palette,
+         (png_uint_32)info_ptr->num_palette);
+   else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      png_error(png_ptr, "Valid palette required for paletted images");
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_tRNS)
+      {
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+         /* invert the alpha channel (in tRNS) */
+         if ((png_ptr->transformations & PNG_INVERT_ALPHA) &&
+            info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         {
+            int j;
+            for (j=0; j<(int)info_ptr->num_trans; j++)
+               info_ptr->trans[j] = (png_byte)(255 - info_ptr->trans[j]);
+         }
+#endif
+      png_write_tRNS(png_ptr, info_ptr->trans, &(info_ptr->trans_values),
+         info_ptr->num_trans, info_ptr->color_type);
+      }
+#endif
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_bKGD)
+      png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
+#endif
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_hIST)
+      png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
+#endif
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+      png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
+         info_ptr->offset_unit_type);
+#endif
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pCAL)
+      png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
+         info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
+         info_ptr->pcal_units, info_ptr->pcal_params);
+#endif
+#if defined(PNG_WRITE_sCAL_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sCAL)
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
+      png_write_sCAL(png_ptr, (int)info_ptr->scal_unit,
+          info_ptr->scal_pixel_width, info_ptr->scal_pixel_height);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,
+          info_ptr->scal_s_width, info_ptr->scal_s_height);
+#else
+      png_warning(png_ptr,
+          "png_write_sCAL not supported; sCAL chunk not written.");
+#endif
+#endif
+#endif
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+      png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
+         info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
+#endif
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_tIME)
+   {
+      png_write_tIME(png_ptr, &(info_ptr->mod_time));
+      png_ptr->mode |= PNG_WROTE_tIME;
+   }
+#endif
+#if defined(PNG_WRITE_sPLT_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sPLT)
+     for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
+       png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);
+#endif
+#if defined(PNG_WRITE_TEXT_SUPPORTED)
+   /* Check to see if we need to write text chunks */
+   for (i = 0; i < info_ptr->num_text; i++)
+   {
+      png_debug2(2, "Writing header text chunk %d, type %d", i,
+         info_ptr->text[i].compression);
+      /* an internationalized chunk? */
+      if (info_ptr->text[i].compression > 0)
+      {
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+          /* write international chunk */
+          png_write_iTXt(png_ptr,
+                         info_ptr->text[i].compression,
+                         info_ptr->text[i].key,
+                         info_ptr->text[i].lang,
+                         info_ptr->text[i].lang_key,
+                         info_ptr->text[i].text);
+#else
+          png_warning(png_ptr, "Unable to write international text");
+#endif
+          /* Mark this chunk as written */
+          info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+      }
+      /* If we want a compressed text chunk */
+      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_zTXt)
+      {
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+         /* write compressed chunk */
+         png_write_zTXt(png_ptr, info_ptr->text[i].key,
+            info_ptr->text[i].text, 0,
+            info_ptr->text[i].compression);
+#else
+         png_warning(png_ptr, "Unable to write compressed text");
+#endif
+         /* Mark this chunk as written */
+         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
+      }
+      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+      {
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+         /* write uncompressed chunk */
+         png_write_tEXt(png_ptr, info_ptr->text[i].key,
+                         info_ptr->text[i].text,
+                         0);
+#else
+         png_warning(png_ptr, "Unable to write uncompressed text");
+#endif
+         /* Mark this chunk as written */
+         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+      }
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   if (info_ptr->unknown_chunks_num)
+   {
+       png_unknown_chunk *up;
+
+       png_debug(5, "writing extra chunks");
+
+       for (up = info_ptr->unknown_chunks;
+            up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+            up++)
+       {
+         int keep=png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && (up->location & PNG_HAVE_PLTE) &&
+            !(up->location & PNG_HAVE_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+       }
+   }
+#endif
+}
+
+/* Writes the end of the PNG file.  If you don't want to write comments or
+ * time information, you can pass NULL for info.  If you already wrote these
+ * in png_write_info(), do not write them again here.  If you have long
+ * comments, I suggest writing them here, and compressing them.
+ */
+void PNGAPI
+png_write_end(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_write_end");
+   if (png_ptr == NULL)
+      return;
+   if (!(png_ptr->mode & PNG_HAVE_IDAT))
+      png_error(png_ptr, "No IDATs written into file");
+
+   /* see if user wants us to write information chunks */
+   if (info_ptr != NULL)
+   {
+#if defined(PNG_WRITE_TEXT_SUPPORTED)
+      int i; /* local index variable */
+#endif
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+      /* check to see if user has supplied a time chunk */
+      if ((info_ptr->valid & PNG_INFO_tIME) &&
+         !(png_ptr->mode & PNG_WROTE_tIME))
+         png_write_tIME(png_ptr, &(info_ptr->mod_time));
+#endif
+#if defined(PNG_WRITE_TEXT_SUPPORTED)
+      /* loop through comment chunks */
+      for (i = 0; i < info_ptr->num_text; i++)
+      {
+         png_debug2(2, "Writing trailer text chunk %d, type %d", i,
+            info_ptr->text[i].compression);
+         /* an internationalized chunk? */
+         if (info_ptr->text[i].compression > 0)
+         {
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+             /* write international chunk */
+             png_write_iTXt(png_ptr,
+                         info_ptr->text[i].compression,
+                         info_ptr->text[i].key,
+                         info_ptr->text[i].lang,
+                         info_ptr->text[i].lang_key,
+                         info_ptr->text[i].text);
+#else
+             png_warning(png_ptr, "Unable to write international text");
+#endif
+             /* Mark this chunk as written */
+             info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+         }
+         else if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)
+         {
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+            /* write compressed chunk */
+            png_write_zTXt(png_ptr, info_ptr->text[i].key,
+               info_ptr->text[i].text, 0,
+               info_ptr->text[i].compression);
+#else
+            png_warning(png_ptr, "Unable to write compressed text");
+#endif
+            /* Mark this chunk as written */
+            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
+         }
+         else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+         {
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+            /* write uncompressed chunk */
+            png_write_tEXt(png_ptr, info_ptr->text[i].key,
+               info_ptr->text[i].text, 0);
+#else
+            png_warning(png_ptr, "Unable to write uncompressed text");
+#endif
+
+            /* Mark this chunk as written */
+            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+         }
+      }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   if (info_ptr->unknown_chunks_num)
+   {
+       png_unknown_chunk *up;
+
+       png_debug(5, "writing extra chunks");
+
+       for (up = info_ptr->unknown_chunks;
+            up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+            up++)
+       {
+         int keep=png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && (up->location & PNG_AFTER_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+       }
+   }
+#endif
+   }
+
+   png_ptr->mode |= PNG_AFTER_IDAT;
+
+   /* write end of PNG file */
+   png_write_IEND(png_ptr);
+   /* This flush, added in libpng-1.0.8, removed from libpng-1.0.9beta03,
+    * and restored again in libpng-1.2.30, may cause some applications that
+    * do not set png_ptr->output_flush_fn to crash.  If your application
+    * experiences a problem, please try building libpng with
+    * PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED defined, and report the event to
+    * png-mng-implement at lists.sf.net .  This kludge will be removed
+    * from libpng-1.4.0.
+    */
+#if defined(PNG_WRITE_FLUSH_SUPPORTED) && \
+    defined(PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED)
+   png_flush(png_ptr);
+#endif
+}
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+#if !defined(_WIN32_WCE)
+/* "time.h" functions are not supported on WindowsCE */
+void PNGAPI
+png_convert_from_struct_tm(png_timep ptime, struct tm FAR * ttime)
+{
+   png_debug(1, "in png_convert_from_struct_tm");
+   ptime->year = (png_uint_16)(1900 + ttime->tm_year);
+   ptime->month = (png_byte)(ttime->tm_mon + 1);
+   ptime->day = (png_byte)ttime->tm_mday;
+   ptime->hour = (png_byte)ttime->tm_hour;
+   ptime->minute = (png_byte)ttime->tm_min;
+   ptime->second = (png_byte)ttime->tm_sec;
+}
+
+void PNGAPI
+png_convert_from_time_t(png_timep ptime, time_t ttime)
+{
+   struct tm *tbuf;
+
+   png_debug(1, "in png_convert_from_time_t");
+   tbuf = gmtime(&ttime);
+   png_convert_from_struct_tm(ptime, tbuf);
+}
+#endif
+#endif
+
+/* Initialize png_ptr structure, and allocate any memory needed */
+png_structp PNGAPI
+png_create_write_struct(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
+      warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
+}
+
+/* Alternate initialize png_ptr structure, and allocate any memory needed */
+png_structp PNGAPI
+png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+#ifdef PNG_SETJMP_SUPPORTED
+    volatile
+#endif
+    png_structp png_ptr;
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+   int i;
+   png_debug(1, "in png_create_write_struct");
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
+      (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
+#else
+   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+#endif /* PNG_USER_MEM_SUPPORTED */
+   if (png_ptr == NULL)
+      return (NULL);
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_ptr->jmpbuf))
+#endif
+   {
+      png_free(png_ptr, png_ptr->zbuf);
+       png_ptr->zbuf=NULL;
+      png_destroy_struct(png_ptr);
+      return (NULL);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_ptr->jmpbuf, jmpbuf, png_sizeof(jmp_buf));
+#endif
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+
+   if (user_png_ver)
+   {
+     i=0;
+     do
+     {
+       if (user_png_ver[i] != png_libpng_ver[i])
+          png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+     } while (png_libpng_ver[i++]);
+   }
+
+   if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
+   {
+     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+      * we must recompile any applications that use any older library version.
+      * For versions after libpng 1.0, we will be compatible, so we need
+      * only check the first digit.
+      */
+     if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+         (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
+         (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
+     {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+        char msg[80];
+        if (user_png_ver)
+        {
+          png_snprintf(msg, 80,
+             "Application was compiled with png.h from libpng-%.20s",
+             user_png_ver);
+          png_warning(png_ptr, msg);
+        }
+        png_snprintf(msg, 80,
+           "Application  is  running with png.c from libpng-%.20s",
+           png_libpng_ver);
+        png_warning(png_ptr, msg);
+#endif
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+        png_ptr->flags=0;
+#endif
+        png_error(png_ptr,
+           "Incompatible libpng version in application and library");
+     }
+   }
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+      (png_uint_32)png_ptr->zbuf_size);
+
+   png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+      png_flush_ptr_NULL);
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
+      1, png_doublep_NULL, png_doublep_NULL);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* Applications that neglect to set up their own setjmp() and then encounter
+   a png_error() will longjmp here.  Since the jmpbuf is then meaningless we
+   abort instead of returning. */
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+      PNG_ABORT();
+   png_memcpy(png_ptr->jmpbuf, jmpbuf, png_sizeof(jmp_buf));
+#else
+   if (setjmp(png_ptr->jmpbuf))
+      PNG_ABORT();
+#endif
+#endif
+   return (png_ptr);
+}
+
+/* Initialize png_ptr structure, and allocate any memory needed */
+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Deprecated. */
+#undef png_write_init
+void PNGAPI
+png_write_init(png_structp png_ptr)
+{
+   /* We only come here via pre-1.0.7-compiled applications */
+   png_write_init_2(png_ptr, "1.0.6 or earlier", 0, 0);
+}
+
+void PNGAPI
+png_write_init_2(png_structp png_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size, png_size_t png_info_size)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+   if (png_ptr == NULL) return;
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+   if (png_sizeof(png_struct) > png_struct_size ||
+      png_sizeof(png_info) > png_info_size)
+   {
+      char msg[80];
+      png_ptr->warning_fn=NULL;
+      if (user_png_ver)
+      {
+        png_snprintf(msg, 80,
+           "Application was compiled with png.h from libpng-%.20s",
+           user_png_ver);
+        png_warning(png_ptr, msg);
+      }
+      png_snprintf(msg, 80,
+         "Application  is  running with png.c from libpng-%.20s",
+         png_libpng_ver);
+      png_warning(png_ptr, msg);
+   }
+#endif
+   if (png_sizeof(png_struct) > png_struct_size)
+     {
+       png_ptr->error_fn=NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags=0;
+#endif
+       png_error(png_ptr,
+       "The png struct allocated by the application for writing is too small.");
+     }
+   if (png_sizeof(png_info) > png_info_size)
+     {
+       png_ptr->error_fn=NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags=0;
+#endif
+       png_error(png_ptr,
+       "The info struct allocated by the application for writing is too small.");
+     }
+   png_write_init_3(&png_ptr, user_png_ver, png_struct_size);
+}
+#endif /* PNG_1_0_X || PNG_1_2_X */
+
+
+void PNGAPI
+png_write_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size)
+{
+   png_structp png_ptr=*ptr_ptr;
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp; /* to save current jump buffer */
+#endif
+
+   int i = 0;
+
+   if (png_ptr == NULL)
+      return;
+
+   do
+   {
+     if (user_png_ver[i] != png_libpng_ver[i])
+     {
+#ifdef PNG_LEGACY_SUPPORTED
+       png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+#else
+       png_ptr->warning_fn=NULL;
+       png_warning(png_ptr,
+ "Application uses deprecated png_write_init() and should be recompiled.");
+       break;
+#endif
+     }
+   } while (png_libpng_ver[i++]);
+
+   png_debug(1, "in png_write_init_3");
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* save jump buffer and error functions */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+#endif
+
+   if (png_sizeof(png_struct) > png_struct_size)
+     {
+       png_destroy_struct(png_ptr);
+       png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+       *ptr_ptr = png_ptr;
+     }
+
+   /* reset all variables to 0 */
+   png_memset(png_ptr, 0, png_sizeof(png_struct));
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* restore jump buffer */
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
+#endif
+
+   png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+      png_flush_ptr_NULL);
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+      (png_uint_32)png_ptr->zbuf_size);
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
+      1, png_doublep_NULL, png_doublep_NULL);
+#endif
+}
+
+/* Write a few rows of image data.  If the image is interlaced,
+ * either you will have to write the 7 sub images, or, if you
+ * have called png_set_interlace_handling(), you will have to
+ * "write" the image seven times.
+ */
+void PNGAPI
+png_write_rows(png_structp png_ptr, png_bytepp row,
+   png_uint_32 num_rows)
+{
+   png_uint_32 i; /* row counter */
+   png_bytepp rp; /* row pointer */
+
+   png_debug(1, "in png_write_rows");
+
+   if (png_ptr == NULL)
+      return;
+
+   /* loop through the rows */
+   for (i = 0, rp = row; i < num_rows; i++, rp++)
+   {
+      png_write_row(png_ptr, *rp);
+   }
+}
+
+/* Write the image.  You only need to call this function once, even
+ * if you are writing an interlaced image.
+ */
+void PNGAPI
+png_write_image(png_structp png_ptr, png_bytepp image)
+{
+   png_uint_32 i; /* row index */
+   int pass, num_pass; /* pass variables */
+   png_bytepp rp; /* points to current row */
+
+   if (png_ptr == NULL)
+      return;
+
+   png_debug(1, "in png_write_image");
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   /* intialize interlace handling.  If image is not interlaced,
+      this will set pass to 1 */
+   num_pass = png_set_interlace_handling(png_ptr);
+#else
+   num_pass = 1;
+#endif
+   /* loop through passes */
+   for (pass = 0; pass < num_pass; pass++)
+   {
+      /* loop through image */
+      for (i = 0, rp = image; i < png_ptr->height; i++, rp++)
+      {
+         png_write_row(png_ptr, *rp);
+      }
+   }
+}
+
+/* called by user to write a row of image data */
+void PNGAPI
+png_write_row(png_structp png_ptr, png_bytep row)
+{
+   if (png_ptr == NULL)
+      return;
+   png_debug2(1, "in png_write_row (row %ld, pass %d)",
+      png_ptr->row_number, png_ptr->pass);
+
+   /* initialize transformations and other stuff if first time */
+   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
+   {
+   /* make sure we wrote the header info */
+   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+      png_error(png_ptr,
+         "png_write_info was never called before png_write_row.");
+
+   /* check for transforms that have been set but were defined out */
+#if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_warning(png_ptr, "PNG_WRITE_PACKSWAP_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined.");
+#endif
+
+      png_write_start_row(png_ptr);
+   }
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   /* if interlaced and not interested in row, return */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      switch (png_ptr->pass)
+      {
+         case 0:
+            if (png_ptr->row_number & 0x07)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 1:
+            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 2:
+            if ((png_ptr->row_number & 0x07) != 4)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 3:
+            if ((png_ptr->row_number & 0x03) || png_ptr->width < 3)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 4:
+            if ((png_ptr->row_number & 0x03) != 2)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 5:
+            if ((png_ptr->row_number & 0x01) || png_ptr->width < 2)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 6:
+            if (!(png_ptr->row_number & 0x01))
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+      }
+   }
+#endif
+
+   /* set up row info for transformations */
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->usr_width;
+   png_ptr->row_info.channels = png_ptr->usr_channels;
+   png_ptr->row_info.bit_depth = png_ptr->usr_bit_depth;
+   png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
+      png_ptr->row_info.channels);
+
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+      png_ptr->row_info.width);
+
+   png_debug1(3, "row_info->color_type = %d", png_ptr->row_info.color_type);
+   png_debug1(3, "row_info->width = %lu", png_ptr->row_info.width);
+   png_debug1(3, "row_info->channels = %d", png_ptr->row_info.channels);
+   png_debug1(3, "row_info->bit_depth = %d", png_ptr->row_info.bit_depth);
+   png_debug1(3, "row_info->pixel_depth = %d", png_ptr->row_info.pixel_depth);
+   png_debug1(3, "row_info->rowbytes = %lu", png_ptr->row_info.rowbytes);
+
+   /* Copy user's row into buffer, leaving room for filter byte. */
+   png_memcpy_check(png_ptr, png_ptr->row_buf + 1, row,
+      png_ptr->row_info.rowbytes);
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   /* handle interlacing */
+   if (png_ptr->interlaced && png_ptr->pass < 6 &&
+      (png_ptr->transformations & PNG_INTERLACE))
+   {
+      png_do_write_interlace(&(png_ptr->row_info),
+         png_ptr->row_buf + 1, png_ptr->pass);
+      /* this should always get caught above, but still ... */
+      if (!(png_ptr->row_info.width))
+      {
+         png_write_finish_row(png_ptr);
+         return;
+      }
+   }
+#endif
+
+   /* handle other transformations */
+   if (png_ptr->transformations)
+      png_do_write_transformations(png_ptr);
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   /* Write filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not write a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
+   {
+      /* Intrapixel differencing */
+      png_do_write_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
+   }
+#endif
+
+   /* Find a filter if necessary, filter the row and write it out. */
+   png_write_find_filter(png_ptr, &(png_ptr->row_info));
+
+   if (png_ptr->write_row_fn != NULL)
+      (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+}
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+/* Set the automatic flush interval or 0 to turn flushing off */
+void PNGAPI
+png_set_flush(png_structp png_ptr, int nrows)
+{
+   png_debug(1, "in png_set_flush");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flush_dist = (nrows < 0 ? 0 : nrows);
+}
+
+/* flush the current output buffers now */
+void PNGAPI
+png_write_flush(png_structp png_ptr)
+{
+   int wrote_IDAT;
+
+   png_debug(1, "in png_write_flush");
+   if (png_ptr == NULL)
+      return;
+   /* We have already written out all of the data */
+   if (png_ptr->row_number >= png_ptr->num_rows)
+     return;
+
+   do
+   {
+      int ret;
+
+      /* compress the data */
+      ret = deflate(&png_ptr->zstream, Z_SYNC_FLUSH);
+      wrote_IDAT = 0;
+
+      /* check for compression errors */
+      if (ret != Z_OK)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* write the IDAT and reset the zlib output buffer */
+         png_write_IDAT(png_ptr, png_ptr->zbuf,
+                        png_ptr->zbuf_size);
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         wrote_IDAT = 1;
+      }
+   } while(wrote_IDAT == 1);
+
+   /* If there is any data left to be output, write it into a new IDAT */
+   if (png_ptr->zbuf_size != png_ptr->zstream.avail_out)
+   {
+      /* write the IDAT and reset the zlib output buffer */
+      png_write_IDAT(png_ptr, png_ptr->zbuf,
+                     png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   }
+   png_ptr->flush_rows = 0;
+   png_flush(png_ptr);
+}
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+/* free all memory used by the write */
+void PNGAPI
+png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
+{
+   png_structp png_ptr = NULL;
+   png_infop info_ptr = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn = NULL;
+   png_voidp mem_ptr = NULL;
+#endif
+
+   png_debug(1, "in png_destroy_write_struct");
+   if (png_ptr_ptr != NULL)
+   {
+      png_ptr = *png_ptr_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+      free_fn = png_ptr->free_fn;
+      mem_ptr = png_ptr->mem_ptr;
+#endif
+   }
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr != NULL)
+   {
+      free_fn = png_ptr->free_fn;
+      mem_ptr = png_ptr->mem_ptr;
+   }
+#endif
+
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (info_ptr != NULL)
+   {
+      if (png_ptr != NULL)
+      {
+        png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+        if (png_ptr->num_chunk_list)
+        {
+           png_free(png_ptr, png_ptr->chunk_list);
+           png_ptr->chunk_list=NULL;
+           png_ptr->num_chunk_list = 0;
+        }
+#endif
+      }
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+
+   if (png_ptr != NULL)
+   {
+      png_write_destroy(png_ptr);
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      *png_ptr_ptr = NULL;
+   }
+}
+
+
+/* Free any memory used in png_ptr struct (old method) */
+void /* PRIVATE */
+png_write_destroy(png_structp png_ptr)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp; /* save jump buffer */
+#endif
+   png_error_ptr error_fn;
+   png_error_ptr warning_fn;
+   png_voidp error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn;
+#endif
+
+   png_debug(1, "in png_write_destroy");
+   /* free any memory zlib uses */
+   deflateEnd(&png_ptr->zstream);
+
+   /* free our memory.  png_free checks NULL for us. */
+   png_free(png_ptr, png_ptr->zbuf);
+   png_free(png_ptr, png_ptr->row_buf);
+#ifndef PNG_NO_WRITE_FILTER
+   png_free(png_ptr, png_ptr->prev_row);
+   png_free(png_ptr, png_ptr->sub_row);
+   png_free(png_ptr, png_ptr->up_row);
+   png_free(png_ptr, png_ptr->avg_row);
+   png_free(png_ptr, png_ptr->paeth_row);
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+   png_free(png_ptr, png_ptr->time_buffer);
+#endif
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_free(png_ptr, png_ptr->prev_filters);
+   png_free(png_ptr, png_ptr->filter_weights);
+   png_free(png_ptr, png_ptr->inv_filter_weights);
+   png_free(png_ptr, png_ptr->filter_costs);
+   png_free(png_ptr, png_ptr->inv_filter_costs);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* reset structure */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof(jmp_buf));
+#endif
+
+   error_fn = png_ptr->error_fn;
+   warning_fn = png_ptr->warning_fn;
+   error_ptr = png_ptr->error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+#endif
+
+   png_memset(png_ptr, 0, png_sizeof(png_struct));
+
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+   png_ptr->error_ptr = error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr->free_fn = free_fn;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
+#endif
+}
+
+/* Allow the application to select one or more row filters to use. */
+void PNGAPI
+png_set_filter(png_structp png_ptr, int method, int filters)
+{
+   png_debug(1, "in png_set_filter");
+   if (png_ptr == NULL)
+      return;
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (method == PNG_INTRAPIXEL_DIFFERENCING))
+         method = PNG_FILTER_TYPE_BASE;
+#endif
+   if (method == PNG_FILTER_TYPE_BASE)
+   {
+      switch (filters & (PNG_ALL_FILTERS | 0x07))
+      {
+#ifndef PNG_NO_WRITE_FILTER
+         case 5:
+         case 6:
+         case 7: png_warning(png_ptr, "Unknown row filter for method 0");
+#endif /* PNG_NO_WRITE_FILTER */
+         case PNG_FILTER_VALUE_NONE:
+              png_ptr->do_filter=PNG_FILTER_NONE; break;
+#ifndef PNG_NO_WRITE_FILTER
+         case PNG_FILTER_VALUE_SUB:
+              png_ptr->do_filter=PNG_FILTER_SUB; break;
+         case PNG_FILTER_VALUE_UP:
+              png_ptr->do_filter=PNG_FILTER_UP; break;
+         case PNG_FILTER_VALUE_AVG:
+              png_ptr->do_filter=PNG_FILTER_AVG; break;
+         case PNG_FILTER_VALUE_PAETH:
+              png_ptr->do_filter=PNG_FILTER_PAETH; break;
+         default: png_ptr->do_filter = (png_byte)filters; break;
+#else
+         default: png_warning(png_ptr, "Unknown row filter for method 0");
+#endif /* PNG_NO_WRITE_FILTER */
+      }
+
+      /* If we have allocated the row_buf, this means we have already started
+       * with the image and we should have allocated all of the filter buffers
+       * that have been selected.  If prev_row isn't already allocated, then
+       * it is too late to start using the filters that need it, since we
+       * will be missing the data in the previous row.  If an application
+       * wants to start and stop using particular filters during compression,
+       * it should start out with all of the filters, and then add and
+       * remove them after the start of compression.
+       */
+      if (png_ptr->row_buf != NULL)
+      {
+#ifndef PNG_NO_WRITE_FILTER
+         if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL)
+         {
+            png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
+              (png_ptr->rowbytes + 1));
+            png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_UP) && png_ptr->up_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Up filter after starting");
+               png_ptr->do_filter &= ~PNG_FILTER_UP;
+            }
+            else
+            {
+               png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
+            }
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_AVG) && png_ptr->avg_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Average filter after starting");
+               png_ptr->do_filter &= ~PNG_FILTER_AVG;
+            }
+            else
+            {
+               png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
+            }
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_PAETH) &&
+             png_ptr->paeth_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Paeth filter after starting");
+               png_ptr->do_filter &= (png_byte)(~PNG_FILTER_PAETH);
+            }
+            else
+            {
+               png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
+            }
+         }
+
+         if (png_ptr->do_filter == PNG_NO_FILTERS)
+#endif /* PNG_NO_WRITE_FILTER */
+            png_ptr->do_filter = PNG_FILTER_NONE;
+      }
+   }
+   else
+      png_error(png_ptr, "Unknown custom filter method");
+}
+
+/* This allows us to influence the way in which libpng chooses the "best"
+ * filter for the current scanline.  While the "minimum-sum-of-absolute-
+ * differences metric is relatively fast and effective, there is some
+ * question as to whether it can be improved upon by trying to keep the
+ * filtered data going to zlib more consistent, hopefully resulting in
+ * better compression.
+ */
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)      /* GRR 970116 */
+void PNGAPI
+png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
+   int num_weights, png_doublep filter_weights,
+   png_doublep filter_costs)
+{
+   int i;
+
+   png_debug(1, "in png_set_filter_heuristics");
+   if (png_ptr == NULL)
+      return;
+   if (heuristic_method >= PNG_FILTER_HEURISTIC_LAST)
+   {
+      png_warning(png_ptr, "Unknown filter heuristic method");
+      return;
+   }
+
+   if (heuristic_method == PNG_FILTER_HEURISTIC_DEFAULT)
+   {
+      heuristic_method = PNG_FILTER_HEURISTIC_UNWEIGHTED;
+   }
+
+   if (num_weights < 0 || filter_weights == NULL ||
+      heuristic_method == PNG_FILTER_HEURISTIC_UNWEIGHTED)
+   {
+      num_weights = 0;
+   }
+
+   png_ptr->num_prev_filters = (png_byte)num_weights;
+   png_ptr->heuristic_method = (png_byte)heuristic_method;
+
+   if (num_weights > 0)
+   {
+      if (png_ptr->prev_filters == NULL)
+      {
+         png_ptr->prev_filters = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_byte) * num_weights));
+
+         /* To make sure that the weighting starts out fairly */
+         for (i = 0; i < num_weights; i++)
+         {
+            png_ptr->prev_filters[i] = 255;
+         }
+      }
+
+      if (png_ptr->filter_weights == NULL)
+      {
+         png_ptr->filter_weights = (png_uint_16p)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
+
+         png_ptr->inv_filter_weights = (png_uint_16p)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
+         for (i = 0; i < num_weights; i++)
+         {
+            png_ptr->inv_filter_weights[i] =
+            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
+         }
+      }
+
+      for (i = 0; i < num_weights; i++)
+      {
+         if (filter_weights[i] < 0.0)
+         {
+            png_ptr->inv_filter_weights[i] =
+            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
+         }
+         else
+         {
+            png_ptr->inv_filter_weights[i] =
+               (png_uint_16)((double)PNG_WEIGHT_FACTOR*filter_weights[i]+0.5);
+            png_ptr->filter_weights[i] =
+               (png_uint_16)((double)PNG_WEIGHT_FACTOR/filter_weights[i]+0.5);
+         }
+      }
+   }
+
+   /* If, in the future, there are other filter methods, this would
+    * need to be based on png_ptr->filter.
+    */
+   if (png_ptr->filter_costs == NULL)
+   {
+      png_ptr->filter_costs = (png_uint_16p)png_malloc(png_ptr,
+         (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
+
+      png_ptr->inv_filter_costs = (png_uint_16p)png_malloc(png_ptr,
+         (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
+
+      for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
+      {
+         png_ptr->inv_filter_costs[i] =
+         png_ptr->filter_costs[i] = PNG_COST_FACTOR;
+      }
+   }
+
+   /* Here is where we set the relative costs of the different filters.  We
+    * should take the desired compression level into account when setting
+    * the costs, so that Paeth, for instance, has a high relative cost at low
+    * compression levels, while it has a lower relative cost at higher
+    * compression settings.  The filter types are in order of increasing
+    * relative cost, so it would be possible to do this with an algorithm.
+    */
+   for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
+   {
+      if (filter_costs == NULL || filter_costs[i] < 0.0)
+      {
+         png_ptr->inv_filter_costs[i] =
+         png_ptr->filter_costs[i] = PNG_COST_FACTOR;
+      }
+      else if (filter_costs[i] >= 1.0)
+      {
+         png_ptr->inv_filter_costs[i] =
+            (png_uint_16)((double)PNG_COST_FACTOR / filter_costs[i] + 0.5);
+         png_ptr->filter_costs[i] =
+            (png_uint_16)((double)PNG_COST_FACTOR * filter_costs[i] + 0.5);
+      }
+   }
+}
+#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+void PNGAPI
+png_set_compression_level(png_structp png_ptr, int level)
+{
+   png_debug(1, "in png_set_compression_level");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;
+   png_ptr->zlib_level = level;
+}
+
+void PNGAPI
+png_set_compression_mem_level(png_structp png_ptr, int mem_level)
+{
+   png_debug(1, "in png_set_compression_mem_level");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;
+   png_ptr->zlib_mem_level = mem_level;
+}
+
+void PNGAPI
+png_set_compression_strategy(png_structp png_ptr, int strategy)
+{
+   png_debug(1, "in png_set_compression_strategy");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
+   png_ptr->zlib_strategy = strategy;
+}
+
+void PNGAPI
+png_set_compression_window_bits(png_structp png_ptr, int window_bits)
+{
+   if (png_ptr == NULL)
+      return;
+   if (window_bits > 15)
+      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
+   else if (window_bits < 8)
+      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
+#ifndef WBITS_8_OK
+   /* avoid libpng bug with 256-byte windows */
+   if (window_bits == 8)
+     {
+       png_warning(png_ptr, "Compression window is being reset to 512");
+       window_bits=9;
+     }
+#endif
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS;
+   png_ptr->zlib_window_bits = window_bits;
+}
+
+void PNGAPI
+png_set_compression_method(png_structp png_ptr, int method)
+{
+   png_debug(1, "in png_set_compression_method");
+   if (png_ptr == NULL)
+      return;
+   if (method != 8)
+      png_warning(png_ptr, "Only compression method 8 is supported by PNG");
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;
+   png_ptr->zlib_method = method;
+}
+
+void PNGAPI
+png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
+{
+   if (png_ptr == NULL)
+      return;
+   png_ptr->write_row_fn = write_row_fn;
+}
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+void PNGAPI
+png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+   write_user_transform_fn)
+{
+   png_debug(1, "in png_set_write_user_transform_fn");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->transformations |= PNG_USER_TRANSFORM;
+   png_ptr->write_user_transform_fn = write_user_transform_fn;
+}
+#endif
+
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+void PNGAPI
+png_write_png(png_structp png_ptr, png_infop info_ptr,
+              int transforms, voidp params)
+{
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+   /* invert the alpha channel from opacity to transparency */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+       png_set_invert_alpha(png_ptr);
+#endif
+
+   /* Write the file header information. */
+   png_write_info(png_ptr, info_ptr);
+
+   /* ------ these transformations don't touch the info structure ------- */
+
+#if defined(PNG_WRITE_INVERT_SUPPORTED)
+   /* invert monochrome pixels */
+   if (transforms & PNG_TRANSFORM_INVERT_MONO)
+       png_set_invert_mono(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+   /* Shift the pixels up to a legal bit depth and fill in
+    * as appropriate to correctly scale the image.
+    */
+   if ((transforms & PNG_TRANSFORM_SHIFT)
+               && (info_ptr->valid & PNG_INFO_sBIT))
+       png_set_shift(png_ptr, &info_ptr->sig_bit);
+#endif
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+   /* pack pixels into bytes */
+   if (transforms & PNG_TRANSFORM_PACKING)
+       png_set_packing(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+   /* swap location of alpha bytes from ARGB to RGBA */
+   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+       png_set_swap_alpha(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED)
+   /* Pack XRGB/RGBX/ARGB/RGBA into * RGB (4 channels -> 3 channels) */
+  if (transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER)
+      png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
+  else if (transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE)
+      png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+#endif
+
+#if defined(PNG_WRITE_BGR_SUPPORTED)
+   /* flip BGR pixels to RGB */
+   if (transforms & PNG_TRANSFORM_BGR)
+       png_set_bgr(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_SWAP_SUPPORTED)
+   /* swap bytes of 16-bit files to most significant byte first */
+   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+       png_set_swap(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+   /* swap bits of 1, 2, 4 bit packed pixel formats */
+   if (transforms & PNG_TRANSFORM_PACKSWAP)
+       png_set_packswap(png_ptr);
+#endif
+
+   /* ----------------------- end of transformations ------------------- */
+
+   /* write the bits */
+   if (info_ptr->valid & PNG_INFO_IDAT)
+       png_write_image(png_ptr, info_ptr->row_pointers);
+
+   /* It is REQUIRED to call this to finish writing the rest of the file */
+   png_write_end(png_ptr, info_ptr);
+
+   transforms = transforms; /* quiet compiler warnings */
+   params = params;
+}
+#endif
+#endif /* PNG_WRITE_SUPPORTED */
+
 /* pngwrite.c - general routines to write a PNG file
  *
  * Last changed in libpng 1.2.15 January 5, 2007
diff --git a/src/dep/src/irrlicht/libpng/pngwtran.c b/src/dep/src/irrlicht/libpng/pngwtran.c
index 19b2968..e6d76a0 100644
--- a/src/dep/src/irrlicht/libpng/pngwtran.c
+++ b/src/dep/src/irrlicht/libpng/pngwtran.c
@@ -12,6 +12,578 @@
 #include "png.h"
 #ifdef PNG_WRITE_SUPPORTED
 
+/* Transform the data according to the user's wishes.  The order of
+ * transformations is significant.
+ */
+void /* PRIVATE */
+png_do_write_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_do_write_transformations");
+
+   if (png_ptr == NULL)
+      return;
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+      if (png_ptr->write_user_transform_fn != NULL)
+        (*(png_ptr->write_user_transform_fn)) /* user write transform function */
+          (png_ptr,                    /* png_ptr */
+           &(png_ptr->row_info),       /* row_info:     */
+             /*  png_uint_32 width;          width of row */
+             /*  png_uint_32 rowbytes;       number of bytes in row */
+             /*  png_byte color_type;        color type of pixels */
+             /*  png_byte bit_depth;         bit depth of samples */
+             /*  png_byte channels;          number of channels (1-4) */
+             /*  png_byte pixel_depth;       bits per pixel (depth*channels) */
+           png_ptr->row_buf + 1);      /* start of pixel data for row */
+#endif
+#if defined(PNG_WRITE_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->flags);
+#endif
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_do_pack(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         (png_uint_32)png_ptr->bit_depth);
+#endif
+#if defined(PNG_WRITE_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_do_shift(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->shift));
+#endif
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_ALPHA)
+      png_do_write_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_ALPHA)
+      png_do_write_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+}
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+/* Pack pixels into bytes.  Pass the true bit depth in bit_depth.  The
+ * row_info bit depth should be 8 (one pixel per byte).  The channels
+ * should be 1 (this only happens on grayscale and paletted images).
+ */
+void /* PRIVATE */
+png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
+{
+   png_debug(1, "in png_do_pack");
+   if (row_info->bit_depth == 8 &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      row_info->channels == 1)
+   {
+      switch ((int)bit_depth)
+      {
+         case 1:
+         {
+            png_bytep sp, dp;
+            int mask, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            mask = 0x80;
+            v = 0;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (*sp != 0)
+                  v |= mask;
+               sp++;
+               if (mask > 1)
+                  mask >>= 1;
+               else
+               {
+                  mask = 0x80;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+            }
+            if (mask != 0x80)
+               *dp = (png_byte)v;
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp, dp;
+            int shift, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            shift = 6;
+            v = 0;
+            for (i = 0; i < row_width; i++)
+            {
+               png_byte value;
+
+               value = (png_byte)(*sp & 0x03);
+               v |= (value << shift);
+               if (shift == 0)
+               {
+                  shift = 6;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+               else
+                  shift -= 2;
+               sp++;
+            }
+            if (shift != 6)
+               *dp = (png_byte)v;
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp, dp;
+            int shift, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            shift = 4;
+            v = 0;
+            for (i = 0; i < row_width; i++)
+            {
+               png_byte value;
+
+               value = (png_byte)(*sp & 0x0f);
+               v |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 4;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+               else
+                  shift -= 4;
+
+               sp++;
+            }
+            if (shift != 4)
+               *dp = (png_byte)v;
+            break;
+         }
+      }
+      row_info->bit_depth = (png_byte)bit_depth;
+      row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+         row_info->width);
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+/* Shift pixel values to take advantage of whole range.  Pass the
+ * true number of bits in bit_depth.  The row should be packed
+ * according to row_info->bit_depth.  Thus, if you had a row of
+ * bit depth 4, but the pixels only had values from 0 to 7, you
+ * would pass 3 as bit_depth, and this routine would translate the
+ * data to 0 to 15.
+ */
+void /* PRIVATE */
+png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)
+{
+   png_debug(1, "in png_do_shift");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL &&
+#else
+   if (
+#endif
+      row_info->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      int shift_start[4], shift_dec[4];
+      int channels = 0;
+
+      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->red;
+         shift_dec[channels] = bit_depth->red;
+         channels++;
+         shift_start[channels] = row_info->bit_depth - bit_depth->green;
+         shift_dec[channels] = bit_depth->green;
+         channels++;
+         shift_start[channels] = row_info->bit_depth - bit_depth->blue;
+         shift_dec[channels] = bit_depth->blue;
+         channels++;
+      }
+      else
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->gray;
+         shift_dec[channels] = bit_depth->gray;
+         channels++;
+      }
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
+         shift_dec[channels] = bit_depth->alpha;
+         channels++;
+      }
+
+      /* with low row depths, could only be grayscale, so one channel */
+      if (row_info->bit_depth < 8)
+      {
+         png_bytep bp = row;
+         png_uint_32 i;
+         png_byte mask;
+         png_uint_32 row_bytes = row_info->rowbytes;
+
+         if (bit_depth->gray == 1 && row_info->bit_depth == 2)
+            mask = 0x55;
+         else if (row_info->bit_depth == 4 && bit_depth->gray == 3)
+            mask = 0x11;
+         else
+            mask = 0xff;
+
+         for (i = 0; i < row_bytes; i++, bp++)
+         {
+            png_uint_16 v;
+            int j;
+
+            v = *bp;
+            *bp = 0;
+            for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
+            {
+               if (j > 0)
+                  *bp |= (png_byte)((v << j) & 0xff);
+               else
+                  *bp |= (png_byte)((v >> (-j)) & mask);
+            }
+         }
+      }
+      else if (row_info->bit_depth == 8)
+      {
+         png_bytep bp = row;
+         png_uint_32 i;
+         png_uint_32 istop = channels * row_info->width;
+
+         for (i = 0; i < istop; i++, bp++)
+         {
+
+            png_uint_16 v;
+            int j;
+            int c = (int)(i%channels);
+
+            v = *bp;
+            *bp = 0;
+            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
+            {
+               if (j > 0)
+                  *bp |= (png_byte)((v << j) & 0xff);
+               else
+                  *bp |= (png_byte)((v >> (-j)) & 0xff);
+            }
+         }
+      }
+      else
+      {
+         png_bytep bp;
+         png_uint_32 i;
+         png_uint_32 istop = channels * row_info->width;
+
+         for (bp = row, i = 0; i < istop; i++)
+         {
+            int c = (int)(i%channels);
+            png_uint_16 value, v;
+            int j;
+
+            v = (png_uint_16)(((png_uint_16)(*bp) << 8) + *(bp + 1));
+            value = 0;
+            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
+            {
+               if (j > 0)
+                  value |= (png_uint_16)((v << j) & (png_uint_16)0xffff);
+               else
+                  value |= (png_uint_16)((v >> (-j)) & (png_uint_16)0xffff);
+            }
+            *bp++ = (png_byte)(value >> 8);
+            *bp++ = (png_byte)(value & 0xff);
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_swap_alpha");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This converts from ARGB to RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save;
+            }
+         }
+         /* This converts from AARRGGBB to RRGGBBAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save[2];
+               save[0] = *(sp++);
+               save[1] = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save[0];
+               *(dp++) = save[1];
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This converts from AG to GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save;
+            }
+         }
+         /* This converts from AAGG to GGAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save[2];
+               save[0] = *(sp++);
+               save[1] = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save[0];
+               *(dp++) = save[1];
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_invert_alpha");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This inverts the alpha channel in RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               /* does nothing
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               */
+               sp+=3; dp = sp;
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+         /* This inverts the alpha channel in RRGGBBAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               /* does nothing
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               */
+               sp+=6; dp = sp;
+               *(dp++) = (png_byte)(255 - *(sp++));
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This inverts the alpha channel in GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               *(dp++) = *(sp++);
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+         /* This inverts the alpha channel in GGAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               /* does nothing
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               */
+               sp+=2; dp = sp;
+               *(dp++) = (png_byte)(255 - *(sp++));
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+/* undoes intrapixel differencing  */
+void /* PRIVATE */
+png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_intrapixel");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      int bytes_per_pixel;
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 3;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 4;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            *(rp)   = (png_byte)((*rp     - *(rp+1))&0xff);
+            *(rp+2) = (png_byte)((*(rp+2) - *(rp+1))&0xff);
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 6;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 8;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            png_uint_32 s0   = (*(rp  ) << 8) | *(rp+1);
+            png_uint_32 s1   = (*(rp+2) << 8) | *(rp+3);
+            png_uint_32 s2   = (*(rp+4) << 8) | *(rp+5);
+            png_uint_32 red  = (png_uint_32)((s0 - s1) & 0xffffL);
+            png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);
+            *(rp  ) = (png_byte)((red >> 8) & 0xff);
+            *(rp+1) = (png_byte)(red & 0xff);
+            *(rp+4) = (png_byte)((blue >> 8) & 0xff);
+            *(rp+5) = (png_byte)(blue & 0xff);
+         }
+      }
+   }
+}
+#endif /* PNG_MNG_FEATURES_SUPPORTED */
+#endif /* PNG_WRITE_SUPPORTED */
+
+/* pngwtran.c - transforms the data in a row for PNG writers
+ *
+ * Last changed in libpng 1.2.9 April 14, 2006
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2006 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
 /* Transform the data according to the user's wishes.  The order of
  * transformations is significant.
  */
diff --git a/src/dep/src/irrlicht/libpng/pngwutil.c b/src/dep/src/irrlicht/libpng/pngwutil.c
index 4e5b75b..79b600d 100644
--- a/src/dep/src/irrlicht/libpng/pngwutil.c
+++ b/src/dep/src/irrlicht/libpng/pngwutil.c
@@ -1,4 +1,2789 @@
 
+/* pngwutil.c - utilities to write a PNG file
+ *
+ * Last changed in libpng 1.2.34 [December 18, 2008]
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Place a 32-bit number into a buffer in PNG byte order.  We work
+ * with unsigned numbers for convenience, although one supported
+ * ancillary chunk uses signed (two's complement) numbers.
+ */
+void PNGAPI
+png_save_uint_32(png_bytep buf, png_uint_32 i)
+{
+   buf[0] = (png_byte)((i >> 24) & 0xff);
+   buf[1] = (png_byte)((i >> 16) & 0xff);
+   buf[2] = (png_byte)((i >> 8) & 0xff);
+   buf[3] = (png_byte)(i & 0xff);
+}
+
+/* The png_save_int_32 function assumes integers are stored in two's
+ * complement format.  If this isn't the case, then this routine needs to
+ * be modified to write data in two's complement format.
+ */
+void PNGAPI
+png_save_int_32(png_bytep buf, png_int_32 i)
+{
+   buf[0] = (png_byte)((i >> 24) & 0xff);
+   buf[1] = (png_byte)((i >> 16) & 0xff);
+   buf[2] = (png_byte)((i >> 8) & 0xff);
+   buf[3] = (png_byte)(i & 0xff);
+}
+
+/* Place a 16-bit number into a buffer in PNG byte order.
+ * The parameter is declared unsigned int, not png_uint_16,
+ * just to avoid potential problems on pre-ANSI C compilers.
+ */
+void PNGAPI
+png_save_uint_16(png_bytep buf, unsigned int i)
+{
+   buf[0] = (png_byte)((i >> 8) & 0xff);
+   buf[1] = (png_byte)(i & 0xff);
+}
+
+/* Simple function to write the signature.  If we have already written
+ * the magic bytes of the signature, or more likely, the PNG stream is
+ * being embedded into another stream and doesn't need its own signature,
+ * we should call png_set_sig_bytes() to tell libpng how many of the
+ * bytes have already been written.
+ */
+void /* PRIVATE */
+png_write_sig(png_structp png_ptr)
+{
+   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+
+   /* write the rest of the 8 byte signature */
+   png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],
+      (png_size_t)(8 - png_ptr->sig_bytes));
+   if (png_ptr->sig_bytes < 3)
+      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
+}
+
+/* Write a PNG chunk all at once.  The type is an array of ASCII characters
+ * representing the chunk name.  The array must be at least 4 bytes in
+ * length, and does not need to be null terminated.  To be safe, pass the
+ * pre-defined chunk names here, and if you need a new one, define it
+ * where the others are defined.  The length is the length of the data.
+ * All the data must be present.  If that is not possible, use the
+ * png_write_chunk_start(), png_write_chunk_data(), and png_write_chunk_end()
+ * functions instead.
+ */
+void PNGAPI
+png_write_chunk(png_structp png_ptr, png_bytep chunk_name,
+   png_bytep data, png_size_t length)
+{
+   if (png_ptr == NULL) return;
+   png_write_chunk_start(png_ptr, chunk_name, (png_uint_32)length);
+   png_write_chunk_data(png_ptr, data, (png_size_t)length);
+   png_write_chunk_end(png_ptr);
+}
+
+/* Write the start of a PNG chunk.  The type is the chunk type.
+ * The total_length is the sum of the lengths of all the data you will be
+ * passing in png_write_chunk_data().
+ */
+void PNGAPI
+png_write_chunk_start(png_structp png_ptr, png_bytep chunk_name,
+   png_uint_32 length)
+{
+   png_byte buf[8];
+
+   png_debug2(0, "Writing %s chunk, length = %lu", chunk_name,
+      (unsigned long)length);
+   if (png_ptr == NULL) return;
+
+   /* write the length and the chunk name */
+   png_save_uint_32(buf, length);
+   png_memcpy(buf + 4, chunk_name, 4);
+   png_write_data(png_ptr, buf, (png_size_t)8);
+   /* put the chunk name into png_ptr->chunk_name */
+   png_memcpy(png_ptr->chunk_name, chunk_name, 4);
+   /* reset the crc and run it over the chunk name */
+   png_reset_crc(png_ptr);
+   png_calculate_crc(png_ptr, chunk_name, (png_size_t)4);
+}
+
+/* Write the data of a PNG chunk started with png_write_chunk_start().
+ * Note that multiple calls to this function are allowed, and that the
+ * sum of the lengths from these calls *must* add up to the total_length
+ * given to png_write_chunk_start().
+ */
+void PNGAPI
+png_write_chunk_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   /* write the data, and run the CRC over it */
+   if (png_ptr == NULL) return;
+   if (data != NULL && length > 0)
+   {
+      png_write_data(png_ptr, data, length);
+      /* update the CRC after writing the data,
+       * in case that the user I/O routine alters it.
+       */
+      png_calculate_crc(png_ptr, data, length);
+   }
+}
+
+/* Finish a chunk started with png_write_chunk_start(). */
+void PNGAPI
+png_write_chunk_end(png_structp png_ptr)
+{
+   png_byte buf[4];
+
+   if (png_ptr == NULL) return;
+
+   /* write the crc in a single operation */
+   png_save_uint_32(buf, png_ptr->crc);
+
+   png_write_data(png_ptr, buf, (png_size_t)4);
+}
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_iCCP_SUPPORTED)
+/*
+ * This pair of functions encapsulates the operation of (a) compressing a
+ * text string, and (b) issuing it later as a series of chunk data writes.
+ * The compression_state structure is shared context for these functions
+ * set up by the caller in order to make the whole mess thread-safe.
+ */
+
+typedef struct
+{
+    char *input;   /* the uncompressed input data */
+    int input_len;   /* its length */
+    int num_output_ptr; /* number of output pointers used */
+    int max_output_ptr; /* size of output_ptr */
+    png_charpp output_ptr; /* array of pointers to output */
+} compression_state;
+
+/* compress given text into storage in the png_ptr structure */
+static int /* PRIVATE */
+png_text_compress(png_structp png_ptr,
+        png_charp text, png_size_t text_len, int compression,
+        compression_state *comp)
+{
+   int ret;
+
+   comp->num_output_ptr = 0;
+   comp->max_output_ptr = 0;
+   comp->output_ptr = NULL;
+   comp->input = NULL;
+   comp->input_len = 0;
+
+   /* we may just want to pass the text right through */
+   if (compression == PNG_TEXT_COMPRESSION_NONE)
+   {
+       comp->input = text;
+       comp->input_len = text_len;
+       return((int)text_len);
+   }
+
+   if (compression >= PNG_TEXT_COMPRESSION_LAST)
+   {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+      char msg[50];
+      png_snprintf(msg, 50, "Unknown compression type %d", compression);
+      png_warning(png_ptr, msg);
+#else
+      png_warning(png_ptr, "Unknown compression type");
+#endif
+   }
+
+   /* We can't write the chunk until we find out how much data we have,
+    * which means we need to run the compressor first and save the
+    * output.  This shouldn't be a problem, as the vast majority of
+    * comments should be reasonable, but we will set up an array of
+    * malloc'd pointers to be sure.
+    *
+    * If we knew the application was well behaved, we could simplify this
+    * greatly by assuming we can always malloc an output buffer large
+    * enough to hold the compressed text ((1001 * text_len / 1000) + 12)
+    * and malloc this directly.  The only time this would be a bad idea is
+    * if we can't malloc more than 64K and we have 64K of random input
+    * data, or if the input string is incredibly large (although this
+    * wouldn't cause a failure, just a slowdown due to swapping).
+    */
+
+   /* set up the compression buffers */
+   png_ptr->zstream.avail_in = (uInt)text_len;
+   png_ptr->zstream.next_in = (Bytef *)text;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   png_ptr->zstream.next_out = (Bytef *)png_ptr->zbuf;
+
+   /* this is the same compression loop as in png_write_row() */
+   do
+   {
+      /* compress the data */
+      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+      if (ret != Z_OK)
+      {
+         /* error */
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+      /* check to see if we need more room */
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* make sure the output array has room */
+         if (comp->num_output_ptr >= comp->max_output_ptr)
+         {
+            int old_max;
+
+            old_max = comp->max_output_ptr;
+            comp->max_output_ptr = comp->num_output_ptr + 4;
+            if (comp->output_ptr != NULL)
+            {
+               png_charpp old_ptr;
+
+               old_ptr = comp->output_ptr;
+               comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                  (png_uint_32)
+                  (comp->max_output_ptr * png_sizeof(png_charpp)));
+               png_memcpy(comp->output_ptr, old_ptr, old_max
+                  * png_sizeof(png_charp));
+               png_free(png_ptr, old_ptr);
+            }
+            else
+               comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                  (png_uint_32)
+                  (comp->max_output_ptr * png_sizeof(png_charp)));
+         }
+
+         /* save the data */
+         comp->output_ptr[comp->num_output_ptr] =
+            (png_charp)png_malloc(png_ptr,
+            (png_uint_32)png_ptr->zbuf_size);
+         png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
+            png_ptr->zbuf_size);
+         comp->num_output_ptr++;
+
+         /* and reset the buffer */
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+      }
+   /* continue until we don't have any more to compress */
+   } while (png_ptr->zstream.avail_in);
+
+   /* finish the compression */
+   do
+   {
+      /* tell zlib we are finished */
+      ret = deflate(&png_ptr->zstream, Z_FINISH);
+
+      if (ret == Z_OK)
+      {
+         /* check to see if we need more room */
+         if (!(png_ptr->zstream.avail_out))
+         {
+            /* check to make sure our output array has room */
+            if (comp->num_output_ptr >= comp->max_output_ptr)
+            {
+               int old_max;
+
+               old_max = comp->max_output_ptr;
+               comp->max_output_ptr = comp->num_output_ptr + 4;
+               if (comp->output_ptr != NULL)
+               {
+                  png_charpp old_ptr;
+
+                  old_ptr = comp->output_ptr;
+                  /* This could be optimized to realloc() */
+                  comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                     (png_uint_32)(comp->max_output_ptr *
+                     png_sizeof(png_charp)));
+                  png_memcpy(comp->output_ptr, old_ptr,
+                     old_max * png_sizeof(png_charp));
+                  png_free(png_ptr, old_ptr);
+               }
+               else
+                  comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                     (png_uint_32)(comp->max_output_ptr *
+                     png_sizeof(png_charp)));
+            }
+
+            /* save off the data */
+            comp->output_ptr[comp->num_output_ptr] =
+               (png_charp)png_malloc(png_ptr,
+               (png_uint_32)png_ptr->zbuf_size);
+            png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
+               png_ptr->zbuf_size);
+            comp->num_output_ptr++;
+
+            /* and reset the buffer pointers */
+            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+            png_ptr->zstream.next_out = png_ptr->zbuf;
+         }
+      }
+      else if (ret != Z_STREAM_END)
+      {
+         /* we got an error */
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+   } while (ret != Z_STREAM_END);
+
+   /* text length is number of buffers plus last buffer */
+   text_len = png_ptr->zbuf_size * comp->num_output_ptr;
+   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
+      text_len += png_ptr->zbuf_size - (png_size_t)png_ptr->zstream.avail_out;
+
+   return((int)text_len);
+}
+
+/* ship the compressed text out via chunk writes */
+static void /* PRIVATE */
+png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
+{
+   int i;
+
+   /* handle the no-compression case */
+   if (comp->input)
+   {
+       png_write_chunk_data(png_ptr, (png_bytep)comp->input,
+                            (png_size_t)comp->input_len);
+       return;
+   }
+
+   /* write saved output buffers, if any */
+   for (i = 0; i < comp->num_output_ptr; i++)
+   {
+      png_write_chunk_data(png_ptr, (png_bytep)comp->output_ptr[i],
+         (png_size_t)png_ptr->zbuf_size);
+      png_free(png_ptr, comp->output_ptr[i]);
+       comp->output_ptr[i]=NULL;
+   }
+   if (comp->max_output_ptr != 0)
+      png_free(png_ptr, comp->output_ptr);
+       comp->output_ptr=NULL;
+   /* write anything left in zbuf */
+   if (png_ptr->zstream.avail_out < (png_uint_32)png_ptr->zbuf_size)
+      png_write_chunk_data(png_ptr, png_ptr->zbuf,
+         (png_size_t)(png_ptr->zbuf_size - png_ptr->zstream.avail_out));
+
+   /* reset zlib for another zTXt/iTXt or image data */
+   deflateReset(&png_ptr->zstream);
+   png_ptr->zstream.data_type = Z_BINARY;
+}
+#endif
+
+/* Write the IHDR chunk, and update the png_struct with the necessary
+ * information.  Note that the rest of this code depends upon this
+ * information being correct.
+ */
+void /* PRIVATE */
+png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
+   int bit_depth, int color_type, int compression_type, int filter_type,
+   int interlace_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IHDR;
+#endif
+   int ret;
+
+   png_byte buf[13]; /* buffer to store the IHDR info */
+
+   png_debug(1, "in png_write_IHDR");
+   /* Check that we have valid input data from the application info */
+   switch (color_type)
+   {
+      case PNG_COLOR_TYPE_GRAY:
+         switch (bit_depth)
+         {
+            case 1:
+            case 2:
+            case 4:
+            case 8:
+            case 16: png_ptr->channels = 1; break;
+            default: png_error(png_ptr, "Invalid bit depth for grayscale image");
+         }
+         break;
+      case PNG_COLOR_TYPE_RGB:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for RGB image");
+         png_ptr->channels = 3;
+         break;
+      case PNG_COLOR_TYPE_PALETTE:
+         switch (bit_depth)
+         {
+            case 1:
+            case 2:
+            case 4:
+            case 8: png_ptr->channels = 1; break;
+            default: png_error(png_ptr, "Invalid bit depth for paletted image");
+         }
+         break;
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for grayscale+alpha image");
+         png_ptr->channels = 2;
+         break;
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for RGBA image");
+         png_ptr->channels = 4;
+         break;
+      default:
+         png_error(png_ptr, "Invalid image color type specified");
+   }
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+   {
+      png_warning(png_ptr, "Invalid compression type specified");
+      compression_type = PNG_COMPRESSION_TYPE_BASE;
+   }
+
+   /* Write filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not write a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if (
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+      !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
+      (color_type == PNG_COLOR_TYPE_RGB ||
+       color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&
+      (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&
+#endif
+      filter_type != PNG_FILTER_TYPE_BASE)
+   {
+      png_warning(png_ptr, "Invalid filter type specified");
+      filter_type = PNG_FILTER_TYPE_BASE;
+   }
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   if (interlace_type != PNG_INTERLACE_NONE &&
+      interlace_type != PNG_INTERLACE_ADAM7)
+   {
+      png_warning(png_ptr, "Invalid interlace type specified");
+      interlace_type = PNG_INTERLACE_ADAM7;
+   }
+#else
+   interlace_type=PNG_INTERLACE_NONE;
+#endif
+
+   /* save off the relevent information */
+   png_ptr->bit_depth = (png_byte)bit_depth;
+   png_ptr->color_type = (png_byte)color_type;
+   png_ptr->interlaced = (png_byte)interlace_type;
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   png_ptr->filter_type = (png_byte)filter_type;
+#endif
+   png_ptr->compression_type = (png_byte)compression_type;
+   png_ptr->width = width;
+   png_ptr->height = height;
+
+   png_ptr->pixel_depth = (png_byte)(bit_depth * png_ptr->channels);
+   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
+   /* set the usr info, so any transformations can modify it */
+   png_ptr->usr_width = png_ptr->width;
+   png_ptr->usr_bit_depth = png_ptr->bit_depth;
+   png_ptr->usr_channels = png_ptr->channels;
+
+   /* pack the header information into the buffer */
+   png_save_uint_32(buf, width);
+   png_save_uint_32(buf + 4, height);
+   buf[8] = (png_byte)bit_depth;
+   buf[9] = (png_byte)color_type;
+   buf[10] = (png_byte)compression_type;
+   buf[11] = (png_byte)filter_type;
+   buf[12] = (png_byte)interlace_type;
+
+   /* write the chunk */
+   png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
+
+   /* initialize zlib with PNG info */
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+   if (!(png_ptr->do_filter))
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
+         png_ptr->bit_depth < 8)
+         png_ptr->do_filter = PNG_FILTER_NONE;
+      else
+         png_ptr->do_filter = PNG_ALL_FILTERS;
+   }
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY))
+   {
+      if (png_ptr->do_filter != PNG_FILTER_NONE)
+         png_ptr->zlib_strategy = Z_FILTERED;
+      else
+         png_ptr->zlib_strategy = Z_DEFAULT_STRATEGY;
+   }
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_LEVEL))
+      png_ptr->zlib_level = Z_DEFAULT_COMPRESSION;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL))
+      png_ptr->zlib_mem_level = 8;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS))
+      png_ptr->zlib_window_bits = 15;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD))
+      png_ptr->zlib_method = 8;
+   ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
+         png_ptr->zlib_method, png_ptr->zlib_window_bits,
+         png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
+   if (ret != Z_OK)
+   {
+      if (ret == Z_VERSION_ERROR) png_error(png_ptr,
+          "zlib failed to initialize compressor -- version error");
+      if (ret == Z_STREAM_ERROR) png_error(png_ptr,
+           "zlib failed to initialize compressor -- stream error");
+      if (ret == Z_MEM_ERROR) png_error(png_ptr,
+           "zlib failed to initialize compressor -- mem error");
+      png_error(png_ptr, "zlib failed to initialize compressor");
+   }
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   /* libpng is not interested in zstream.data_type */
+   /* set it to a predefined value, to avoid its evaluation inside zlib */
+   png_ptr->zstream.data_type = Z_BINARY;
+
+   png_ptr->mode = PNG_HAVE_IHDR;
+}
+
+/* write the palette.  We are careful not to trust png_color to be in the
+ * correct order for PNG, so people can redefine it to any convenient
+ * structure.
+ */
+void /* PRIVATE */
+png_write_PLTE(png_structp png_ptr, png_colorp palette, png_uint_32 num_pal)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_PLTE;
+#endif
+   png_uint_32 i;
+   png_colorp pal_ptr;
+   png_byte buf[3];
+
+   png_debug(1, "in png_write_PLTE");
+   if ((
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+        !(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) &&
+#endif
+        num_pal == 0) || num_pal > 256)
+   {
+     if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+     {
+        png_error(png_ptr, "Invalid number of colors in palette");
+     }
+     else
+     {
+        png_warning(png_ptr, "Invalid number of colors in palette");
+        return;
+     }
+   }
+
+   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+   {
+      png_warning(png_ptr,
+        "Ignoring request to write a PLTE chunk in grayscale PNG");
+      return;
+   }
+
+   png_ptr->num_palette = (png_uint_16)num_pal;
+   png_debug1(3, "num_palette = %d", png_ptr->num_palette);
+
+   png_write_chunk_start(png_ptr, (png_bytep)png_PLTE,
+     (png_uint_32)(num_pal * 3));
+#ifndef PNG_NO_POINTER_INDEXING
+   for (i = 0, pal_ptr = palette; i < num_pal; i++, pal_ptr++)
+   {
+      buf[0] = pal_ptr->red;
+      buf[1] = pal_ptr->green;
+      buf[2] = pal_ptr->blue;
+      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+   }
+#else
+   /* This is a little slower but some buggy compilers need to do this instead */
+   pal_ptr=palette;
+   for (i = 0; i < num_pal; i++)
+   {
+      buf[0] = pal_ptr[i].red;
+      buf[1] = pal_ptr[i].green;
+      buf[2] = pal_ptr[i].blue;
+      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+   }
+#endif
+   png_write_chunk_end(png_ptr);
+   png_ptr->mode |= PNG_HAVE_PLTE;
+}
+
+/* write an IDAT chunk */
+void /* PRIVATE */
+png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IDAT;
+#endif
+   png_debug(1, "in png_write_IDAT");
+
+   /* Optimize the CMF field in the zlib stream. */
+   /* This hack of the zlib stream is compliant to the stream specification. */
+   if (!(png_ptr->mode & PNG_HAVE_IDAT) &&
+       png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
+   {
+      unsigned int z_cmf = data[0];  /* zlib compression method and flags */
+      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
+      {
+         /* Avoid memory underflows and multiplication overflows. */
+         /* The conditions below are practically always satisfied;
+            however, they still must be checked. */
+         if (length >= 2 &&
+             png_ptr->height < 16384 && png_ptr->width < 16384)
+         {
+            png_uint_32 uncompressed_idat_size = png_ptr->height *
+               ((png_ptr->width *
+               png_ptr->channels * png_ptr->bit_depth + 15) >> 3);
+            unsigned int z_cinfo = z_cmf >> 4;
+            unsigned int half_z_window_size = 1 << (z_cinfo + 7);
+            while (uncompressed_idat_size <= half_z_window_size &&
+                   half_z_window_size >= 256)
+            {
+               z_cinfo--;
+               half_z_window_size >>= 1;
+            }
+            z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
+            if (data[0] != (png_byte)z_cmf)
+            {
+               data[0] = (png_byte)z_cmf;
+               data[1] &= 0xe0;
+               data[1] += (png_byte)(0x1f - ((z_cmf << 8) + data[1]) % 0x1f);
+            }
+         }
+      }
+      else
+         png_error(png_ptr,
+            "Invalid zlib compression method or flags in IDAT");
+   }
+
+   png_write_chunk(png_ptr, (png_bytep)png_IDAT, data, length);
+   png_ptr->mode |= PNG_HAVE_IDAT;
+}
+
+/* write an IEND chunk */
+void /* PRIVATE */
+png_write_IEND(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IEND;
+#endif
+   png_debug(1, "in png_write_IEND");
+   png_write_chunk(png_ptr, (png_bytep)png_IEND, png_bytep_NULL,
+     (png_size_t)0);
+   png_ptr->mode |= PNG_HAVE_IEND;
+}
+
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+/* write a gAMA chunk */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_gAMA(png_structp png_ptr, double file_gamma)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_gAMA;
+#endif
+   png_uint_32 igamma;
+   png_byte buf[4];
+
+   png_debug(1, "in png_write_gAMA");
+   /* file_gamma is saved in 1/100,000ths */
+   igamma = (png_uint_32)(file_gamma * 100000.0 + 0.5);
+   png_save_uint_32(buf, igamma);
+   png_write_chunk(png_ptr, (png_bytep)png_gAMA, buf, (png_size_t)4);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_gAMA;
+#endif
+   png_byte buf[4];
+
+   png_debug(1, "in png_write_gAMA");
+   /* file_gamma is saved in 1/100,000ths */
+   png_save_uint_32(buf, (png_uint_32)file_gamma);
+   png_write_chunk(png_ptr, (png_bytep)png_gAMA, buf, (png_size_t)4);
+}
+#endif
+#endif
+
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+/* write a sRGB chunk */
+void /* PRIVATE */
+png_write_sRGB(png_structp png_ptr, int srgb_intent)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sRGB;
+#endif
+   png_byte buf[1];
+
+   png_debug(1, "in png_write_sRGB");
+   if (srgb_intent >= PNG_sRGB_INTENT_LAST)
+         png_warning(png_ptr,
+            "Invalid sRGB rendering intent specified");
+   buf[0]=(png_byte)srgb_intent;
+   png_write_chunk(png_ptr, (png_bytep)png_sRGB, buf, (png_size_t)1);
+}
+#endif
+
+#if defined(PNG_WRITE_iCCP_SUPPORTED)
+/* write an iCCP chunk */
+void /* PRIVATE */
+png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,
+   png_charp profile, int profile_len)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_iCCP;
+#endif
+   png_size_t name_len;
+   png_charp new_name;
+   compression_state comp;
+   int embedded_profile_len = 0;
+
+   png_debug(1, "in png_write_iCCP");
+
+   comp.num_output_ptr = 0;
+   comp.max_output_ptr = 0;
+   comp.output_ptr = NULL;
+   comp.input = NULL;
+   comp.input_len = 0;
+
+   if ((name_len = png_check_keyword(png_ptr, name,
+      &new_name)) == 0)
+      return;
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+      png_warning(png_ptr, "Unknown compression type in iCCP chunk");
+
+   if (profile == NULL)
+      profile_len = 0;
+
+   if (profile_len > 3)
+      embedded_profile_len =
+          ((*( (png_bytep)profile    ))<<24) |
+          ((*( (png_bytep)profile + 1))<<16) |
+          ((*( (png_bytep)profile + 2))<< 8) |
+          ((*( (png_bytep)profile + 3))    );
+
+   if (profile_len < embedded_profile_len)
+   {
+      png_warning(png_ptr,
+        "Embedded profile length too large in iCCP chunk");
+      return;
+   }
+
+   if (profile_len > embedded_profile_len)
+   {
+      png_warning(png_ptr,
+        "Truncating profile to actual length in iCCP chunk");
+      profile_len = embedded_profile_len;
+   }
+
+   if (profile_len)
+      profile_len = png_text_compress(png_ptr, profile,
+        (png_size_t)profile_len, PNG_COMPRESSION_TYPE_BASE, &comp);
+
+   /* make sure we include the NULL after the name and the compression type */
+   png_write_chunk_start(png_ptr, (png_bytep)png_iCCP,
+          (png_uint_32)(name_len + profile_len + 2));
+   new_name[name_len + 1] = 0x00;
+   png_write_chunk_data(png_ptr, (png_bytep)new_name,
+     (png_size_t)(name_len + 2));
+
+   if (profile_len)
+      png_write_compressed_data_out(png_ptr, &comp);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_name);
+}
+#endif
+
+#if defined(PNG_WRITE_sPLT_SUPPORTED)
+/* write a sPLT chunk */
+void /* PRIVATE */
+png_write_sPLT(png_structp png_ptr, png_sPLT_tp spalette)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sPLT;
+#endif
+   png_size_t name_len;
+   png_charp new_name;
+   png_byte entrybuf[10];
+   int entry_size = (spalette->depth == 8 ? 6 : 10);
+   int palette_size = entry_size * spalette->nentries;
+   png_sPLT_entryp ep;
+#ifdef PNG_NO_POINTER_INDEXING
+   int i;
+#endif
+
+   png_debug(1, "in png_write_sPLT");
+   if ((name_len = png_check_keyword(png_ptr,
+      spalette->name, &new_name))==0)
+     return;
+
+   /* make sure we include the NULL after the name */
+   png_write_chunk_start(png_ptr, (png_bytep)png_sPLT,
+     (png_uint_32)(name_len + 2 + palette_size));
+   png_write_chunk_data(png_ptr, (png_bytep)new_name,
+     (png_size_t)(name_len + 1));
+   png_write_chunk_data(png_ptr, (png_bytep)&spalette->depth, (png_size_t)1);
+
+   /* loop through each palette entry, writing appropriately */
+#ifndef PNG_NO_POINTER_INDEXING
+   for (ep = spalette->entries; ep<spalette->entries + spalette->nentries; ep++)
+   {
+      if (spalette->depth == 8)
+      {
+          entrybuf[0] = (png_byte)ep->red;
+          entrybuf[1] = (png_byte)ep->green;
+          entrybuf[2] = (png_byte)ep->blue;
+          entrybuf[3] = (png_byte)ep->alpha;
+          png_save_uint_16(entrybuf + 4, ep->frequency);
+      }
+      else
+      {
+          png_save_uint_16(entrybuf + 0, ep->red);
+          png_save_uint_16(entrybuf + 2, ep->green);
+          png_save_uint_16(entrybuf + 4, ep->blue);
+          png_save_uint_16(entrybuf + 6, ep->alpha);
+          png_save_uint_16(entrybuf + 8, ep->frequency);
+      }
+      png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
+   }
+#else
+   ep=spalette->entries;
+   for (i=0; i>spalette->nentries; i++)
+   {
+      if (spalette->depth == 8)
+      {
+          entrybuf[0] = (png_byte)ep[i].red;
+          entrybuf[1] = (png_byte)ep[i].green;
+          entrybuf[2] = (png_byte)ep[i].blue;
+          entrybuf[3] = (png_byte)ep[i].alpha;
+          png_save_uint_16(entrybuf + 4, ep[i].frequency);
+      }
+      else
+      {
+          png_save_uint_16(entrybuf + 0, ep[i].red);
+          png_save_uint_16(entrybuf + 2, ep[i].green);
+          png_save_uint_16(entrybuf + 4, ep[i].blue);
+          png_save_uint_16(entrybuf + 6, ep[i].alpha);
+          png_save_uint_16(entrybuf + 8, ep[i].frequency);
+      }
+      png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
+   }
+#endif
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_name);
+}
+#endif
+
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+/* write the sBIT chunk */
+void /* PRIVATE */
+png_write_sBIT(png_structp png_ptr, png_color_8p sbit, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sBIT;
+#endif
+   png_byte buf[4];
+   png_size_t size;
+
+   png_debug(1, "in png_write_sBIT");
+   /* make sure we don't depend upon the order of PNG_COLOR_8 */
+   if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_byte maxbits;
+
+      maxbits = (png_byte)(color_type==PNG_COLOR_TYPE_PALETTE ? 8 :
+                png_ptr->usr_bit_depth);
+      if (sbit->red == 0 || sbit->red > maxbits ||
+          sbit->green == 0 || sbit->green > maxbits ||
+          sbit->blue == 0 || sbit->blue > maxbits)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[0] = sbit->red;
+      buf[1] = sbit->green;
+      buf[2] = sbit->blue;
+      size = 3;
+   }
+   else
+   {
+      if (sbit->gray == 0 || sbit->gray > png_ptr->usr_bit_depth)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[0] = sbit->gray;
+      size = 1;
+   }
+
+   if (color_type & PNG_COLOR_MASK_ALPHA)
+   {
+      if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[size++] = sbit->alpha;
+   }
+
+   png_write_chunk(png_ptr, (png_bytep)png_sBIT, buf, size);
+}
+#endif
+
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+/* write the cHRM chunk */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_cHRM(png_structp png_ptr, double white_x, double white_y,
+   double red_x, double red_y, double green_x, double green_y,
+   double blue_x, double blue_y)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_cHRM;
+#endif
+   png_byte buf[32];
+
+   png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y,
+      int_green_x, int_green_y, int_blue_x, int_blue_y;
+
+   png_debug(1, "in png_write_cHRM");
+
+   int_white_x = (png_uint_32)(white_x * 100000.0 + 0.5);
+   int_white_y = (png_uint_32)(white_y * 100000.0 + 0.5);
+   int_red_x   = (png_uint_32)(red_x   * 100000.0 + 0.5);
+   int_red_y   = (png_uint_32)(red_y   * 100000.0 + 0.5);
+   int_green_x = (png_uint_32)(green_x * 100000.0 + 0.5);
+   int_green_y = (png_uint_32)(green_y * 100000.0 + 0.5);
+   int_blue_x  = (png_uint_32)(blue_x  * 100000.0 + 0.5);
+   int_blue_y  = (png_uint_32)(blue_y  * 100000.0 + 0.5);
+
+#if !defined(PNG_NO_CHECK_cHRM)
+   if (png_check_cHRM_fixed(png_ptr, int_white_x, int_white_y,
+      int_red_x, int_red_y, int_green_x, int_green_y, int_blue_x, int_blue_y))
+#endif
+   {
+     /* each value is saved in 1/100,000ths */
+   
+     png_save_uint_32(buf, int_white_x);
+     png_save_uint_32(buf + 4, int_white_y);
+
+     png_save_uint_32(buf + 8, int_red_x);
+     png_save_uint_32(buf + 12, int_red_y);
+
+     png_save_uint_32(buf + 16, int_green_x);
+     png_save_uint_32(buf + 20, int_green_y);
+
+     png_save_uint_32(buf + 24, int_blue_x);
+     png_save_uint_32(buf + 28, int_blue_y);
+
+     png_write_chunk(png_ptr, (png_bytep)png_cHRM, buf, (png_size_t)32);
+   }
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,
+   png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y,
+   png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x,
+   png_fixed_point blue_y)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_cHRM;
+#endif
+   png_byte buf[32];
+
+   png_debug(1, "in png_write_cHRM");
+   /* each value is saved in 1/100,000ths */
+#if !defined(PNG_NO_CHECK_cHRM)
+   if (png_check_cHRM_fixed(png_ptr, white_x, white_y, red_x, red_y,
+      green_x, green_y, blue_x, blue_y))
+#endif
+   {
+   png_save_uint_32(buf, (png_uint_32)white_x);
+   png_save_uint_32(buf + 4, (png_uint_32)white_y);
+
+   png_save_uint_32(buf + 8, (png_uint_32)red_x);
+   png_save_uint_32(buf + 12, (png_uint_32)red_y);
+
+   png_save_uint_32(buf + 16, (png_uint_32)green_x);
+   png_save_uint_32(buf + 20, (png_uint_32)green_y);
+
+   png_save_uint_32(buf + 24, (png_uint_32)blue_x);
+   png_save_uint_32(buf + 28, (png_uint_32)blue_y);
+
+   png_write_chunk(png_ptr, (png_bytep)png_cHRM, buf, (png_size_t)32);
+   }
+}
+#endif
+#endif
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+/* write the tRNS chunk */
+void /* PRIVATE */
+png_write_tRNS(png_structp png_ptr, png_bytep trans, png_color_16p tran,
+   int num_trans, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tRNS;
+#endif
+   png_byte buf[6];
+
+   png_debug(1, "in png_write_tRNS");
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)
+      {
+         png_warning(png_ptr, "Invalid number of transparent colors specified");
+         return;
+      }
+      /* write the chunk out as it is */
+      png_write_chunk(png_ptr, (png_bytep)png_tRNS, trans,
+        (png_size_t)num_trans);
+   }
+   else if (color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      /* one 16 bit value */
+      if (tran->gray >= (1 << png_ptr->bit_depth))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");
+         return;
+      }
+      png_save_uint_16(buf, tran->gray);
+      png_write_chunk(png_ptr, (png_bytep)png_tRNS, buf, (png_size_t)2);
+   }
+   else if (color_type == PNG_COLOR_TYPE_RGB)
+   {
+      /* three 16 bit values */
+      png_save_uint_16(buf, tran->red);
+      png_save_uint_16(buf + 2, tran->green);
+      png_save_uint_16(buf + 4, tran->blue);
+      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
+         return;
+      }
+      png_write_chunk(png_ptr, (png_bytep)png_tRNS, buf, (png_size_t)6);
+   }
+   else
+   {
+      png_warning(png_ptr, "Can't write tRNS with an alpha channel");
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+/* write the background chunk */
+void /* PRIVATE */
+png_write_bKGD(png_structp png_ptr, png_color_16p back, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_bKGD;
+#endif
+   png_byte buf[6];
+
+   png_debug(1, "in png_write_bKGD");
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+          (png_ptr->num_palette ||
+          (!(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE))) &&
+#endif
+         back->index >= png_ptr->num_palette)
+      {
+         png_warning(png_ptr, "Invalid background palette index");
+         return;
+      }
+      buf[0] = back->index;
+      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)1);
+   }
+   else if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_save_uint_16(buf, back->red);
+      png_save_uint_16(buf + 2, back->green);
+      png_save_uint_16(buf + 4, back->blue);
+      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write 16-bit bKGD chunk when bit_depth is 8");
+         return;
+      }
+      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)6);
+   }
+   else
+   {
+      if (back->gray >= (1 << png_ptr->bit_depth))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write bKGD chunk out-of-range for bit_depth");
+         return;
+      }
+      png_save_uint_16(buf, back->gray);
+      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)2);
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+/* write the histogram */
+void /* PRIVATE */
+png_write_hIST(png_structp png_ptr, png_uint_16p hist, int num_hist)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_hIST;
+#endif
+   int i;
+   png_byte buf[3];
+
+   png_debug(1, "in png_write_hIST");
+   if (num_hist > (int)png_ptr->num_palette)
+   {
+      png_debug2(3, "num_hist = %d, num_palette = %d", num_hist,
+         png_ptr->num_palette);
+      png_warning(png_ptr, "Invalid number of histogram entries specified");
+      return;
+   }
+
+   png_write_chunk_start(png_ptr, (png_bytep)png_hIST,
+     (png_uint_32)(num_hist * 2));
+   for (i = 0; i < num_hist; i++)
+   {
+      png_save_uint_16(buf, hist[i]);
+      png_write_chunk_data(png_ptr, buf, (png_size_t)2);
+   }
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
+    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
+ * and if invalid, correct the keyword rather than discarding the entire
+ * chunk.  The PNG 1.0 specification requires keywords 1-79 characters in
+ * length, forbids leading or trailing whitespace, multiple internal spaces,
+ * and the non-break space (0x80) from ISO 8859-1.  Returns keyword length.
+ *
+ * The new_key is allocated to hold the corrected keyword and must be freed
+ * by the calling routine.  This avoids problems with trying to write to
+ * static keywords without having to have duplicate copies of the strings.
+ */
+png_size_t /* PRIVATE */
+png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)
+{
+   png_size_t key_len;
+   png_charp kp, dp;
+   int kflag;
+   int kwarn=0;
+
+   png_debug(1, "in png_check_keyword");
+   *new_key = NULL;
+
+   if (key == NULL || (key_len = png_strlen(key)) == 0)
+   {
+      png_warning(png_ptr, "zero length keyword");
+      return ((png_size_t)0);
+   }
+
+   png_debug1(2, "Keyword to be checked is '%s'", key);
+
+   *new_key = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)(key_len + 2));
+   if (*new_key == NULL)
+   {
+      png_warning(png_ptr, "Out of memory while procesing keyword");
+      return ((png_size_t)0);
+   }
+
+   /* Replace non-printing characters with a blank and print a warning */
+   for (kp = key, dp = *new_key; *kp != '\0'; kp++, dp++)
+   {
+      if ((png_byte)*kp < 0x20 ||
+         ((png_byte)*kp > 0x7E && (png_byte)*kp < 0xA1))
+      {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+         char msg[40];
+
+         png_snprintf(msg, 40,
+           "invalid keyword character 0x%02X", (png_byte)*kp);
+         png_warning(png_ptr, msg);
+#else
+         png_warning(png_ptr, "invalid character in keyword");
+#endif
+         *dp = ' ';
+      }
+      else
+      {
+         *dp = *kp;
+      }
+   }
+   *dp = '\0';
+
+   /* Remove any trailing white space. */
+   kp = *new_key + key_len - 1;
+   if (*kp == ' ')
+   {
+      png_warning(png_ptr, "trailing spaces removed from keyword");
+
+      while (*kp == ' ')
+      {
+        *(kp--) = '\0';
+        key_len--;
+      }
+   }
+
+   /* Remove any leading white space. */
+   kp = *new_key;
+   if (*kp == ' ')
+   {
+      png_warning(png_ptr, "leading spaces removed from keyword");
+
+      while (*kp == ' ')
+      {
+        kp++;
+        key_len--;
+      }
+   }
+
+   png_debug1(2, "Checking for multiple internal spaces in '%s'", kp);
+
+   /* Remove multiple internal spaces. */
+   for (kflag = 0, dp = *new_key; *kp != '\0'; kp++)
+   {
+      if (*kp == ' ' && kflag == 0)
+      {
+         *(dp++) = *kp;
+         kflag = 1;
+      }
+      else if (*kp == ' ')
+      {
+         key_len--;
+         kwarn=1;
+      }
+      else
+      {
+         *(dp++) = *kp;
+         kflag = 0;
+      }
+   }
+   *dp = '\0';
+   if (kwarn)
+      png_warning(png_ptr, "extra interior spaces removed from keyword");
+
+   if (key_len == 0)
+   {
+      png_free(png_ptr, *new_key);
+       *new_key=NULL;
+      png_warning(png_ptr, "Zero length keyword");
+   }
+
+   if (key_len > 79)
+   {
+      png_warning(png_ptr, "keyword length must be 1 - 79 characters");
+      (*new_key)[79] = '\0';
+      key_len = 79;
+   }
+
+   return (key_len);
+}
+#endif
+
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+/* write a tEXt chunk */
+void /* PRIVATE */
+png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text,
+   png_size_t text_len)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tEXt;
+#endif
+   png_size_t key_len;
+   png_charp new_key;
+
+   png_debug(1, "in png_write_tEXt");
+   if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+      return;
+
+   if (text == NULL || *text == '\0')
+      text_len = 0;
+   else
+      text_len = png_strlen(text);
+
+   /* make sure we include the 0 after the key */
+   png_write_chunk_start(png_ptr, (png_bytep)png_tEXt,
+      (png_uint_32)(key_len + text_len + 1));
+   /*
+    * We leave it to the application to meet PNG-1.0 requirements on the
+    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
+    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
+    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
+    */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key,
+     (png_size_t)(key_len + 1));
+   if (text_len)
+      png_write_chunk_data(png_ptr, (png_bytep)text, (png_size_t)text_len);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_key);
+}
+#endif
+
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+/* write a compressed text chunk */
+void /* PRIVATE */
+png_write_zTXt(png_structp png_ptr, png_charp key, png_charp text,
+   png_size_t text_len, int compression)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_zTXt;
+#endif
+   png_size_t key_len;
+   char buf[1];
+   png_charp new_key;
+   compression_state comp;
+
+   png_debug(1, "in png_write_zTXt");
+
+   comp.num_output_ptr = 0;
+   comp.max_output_ptr = 0;
+   comp.output_ptr = NULL;
+   comp.input = NULL;
+   comp.input_len = 0;
+
+   if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+   {
+      png_free(png_ptr, new_key);
+      return;
+   }
+
+   if (text == NULL || *text == '\0' || compression==PNG_TEXT_COMPRESSION_NONE)
+   {
+      png_write_tEXt(png_ptr, new_key, text, (png_size_t)0);
+      png_free(png_ptr, new_key);
+      return;
+   }
+
+   text_len = png_strlen(text);
+
+   /* compute the compressed data; do it now for the length */
+   text_len = png_text_compress(png_ptr, text, text_len, compression,
+       &comp);
+
+   /* write start of chunk */
+   png_write_chunk_start(png_ptr, (png_bytep)png_zTXt,
+     (png_uint_32)(key_len+text_len + 2));
+   /* write key */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key,
+     (png_size_t)(key_len + 1));
+   png_free(png_ptr, new_key);
+
+   buf[0] = (png_byte)compression;
+   /* write compression */
+   png_write_chunk_data(png_ptr, (png_bytep)buf, (png_size_t)1);
+   /* write the compressed data */
+   png_write_compressed_data_out(png_ptr, &comp);
+
+   /* close the chunk */
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+/* write an iTXt chunk */
+void /* PRIVATE */
+png_write_iTXt(png_structp png_ptr, int compression, png_charp key,
+    png_charp lang, png_charp lang_key, png_charp text)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_iTXt;
+#endif
+   png_size_t lang_len, key_len, lang_key_len, text_len;
+   png_charp new_lang;
+   png_charp new_key = NULL;
+   png_byte cbuf[2];
+   compression_state comp;
+
+   png_debug(1, "in png_write_iTXt");
+
+   comp.num_output_ptr = 0;
+   comp.max_output_ptr = 0;
+   comp.output_ptr = NULL;
+   comp.input = NULL;
+
+   if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+      return;
+
+   if ((lang_len = png_check_keyword(png_ptr, lang, &new_lang))==0)
+   {
+      png_warning(png_ptr, "Empty language field in iTXt chunk");
+      new_lang = NULL;
+      lang_len = 0;
+   }
+
+   if (lang_key == NULL)
+     lang_key_len = 0;
+   else
+     lang_key_len = png_strlen(lang_key);
+
+   if (text == NULL)
+      text_len = 0;
+   else
+     text_len = png_strlen(text);
+
+   /* compute the compressed data; do it now for the length */
+   text_len = png_text_compress(png_ptr, text, text_len, compression-2,
+      &comp);
+
+
+   /* make sure we include the compression flag, the compression byte,
+    * and the NULs after the key, lang, and lang_key parts */
+
+   png_write_chunk_start(png_ptr, (png_bytep)png_iTXt,
+          (png_uint_32)(
+        5 /* comp byte, comp flag, terminators for key, lang and lang_key */
+        + key_len
+        + lang_len
+        + lang_key_len
+        + text_len));
+
+   /*
+    * We leave it to the application to meet PNG-1.0 requirements on the
+    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
+    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
+    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
+    */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key,
+     (png_size_t)(key_len + 1));
+
+   /* set the compression flag */
+   if (compression == PNG_ITXT_COMPRESSION_NONE || \
+       compression == PNG_TEXT_COMPRESSION_NONE)
+       cbuf[0] = 0;
+   else /* compression == PNG_ITXT_COMPRESSION_zTXt */
+       cbuf[0] = 1;
+   /* set the compression method */
+   cbuf[1] = 0;
+   png_write_chunk_data(png_ptr, cbuf, (png_size_t)2);
+
+   cbuf[0] = 0;
+   png_write_chunk_data(png_ptr, (new_lang ? (png_bytep)new_lang : cbuf),
+     (png_size_t)(lang_len + 1));
+   png_write_chunk_data(png_ptr, (lang_key ? (png_bytep)lang_key : cbuf),
+     (png_size_t)(lang_key_len + 1));
+   png_write_compressed_data_out(png_ptr, &comp);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_key);
+   png_free(png_ptr, new_lang);
+}
+#endif
+
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+/* write the oFFs chunk */
+void /* PRIVATE */
+png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
+   int unit_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_oFFs;
+#endif
+   png_byte buf[9];
+
+   png_debug(1, "in png_write_oFFs");
+   if (unit_type >= PNG_OFFSET_LAST)
+      png_warning(png_ptr, "Unrecognized unit type for oFFs chunk");
+
+   png_save_int_32(buf, x_offset);
+   png_save_int_32(buf + 4, y_offset);
+   buf[8] = (png_byte)unit_type;
+
+   png_write_chunk(png_ptr, (png_bytep)png_oFFs, buf, (png_size_t)9);
+}
+#endif
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+/* write the pCAL chunk (described in the PNG extensions document) */
+void /* PRIVATE */
+png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
+   png_int_32 X1, int type, int nparams, png_charp units, png_charpp params)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_pCAL;
+#endif
+   png_size_t purpose_len, units_len, total_len;
+   png_uint_32p params_len;
+   png_byte buf[10];
+   png_charp new_purpose;
+   int i;
+
+   png_debug1(1, "in png_write_pCAL (%d parameters)", nparams);
+   if (type >= PNG_EQUATION_LAST)
+      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+
+   purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1;
+   png_debug1(3, "pCAL purpose length = %d", (int)purpose_len);
+   units_len = png_strlen(units) + (nparams == 0 ? 0 : 1);
+   png_debug1(3, "pCAL units length = %d", (int)units_len);
+   total_len = purpose_len + units_len + 10;
+
+   params_len = (png_uint_32p)png_malloc(png_ptr,
+      (png_uint_32)(nparams * png_sizeof(png_uint_32)));
+
+   /* Find the length of each parameter, making sure we don't count the
+      null terminator for the last parameter. */
+   for (i = 0; i < nparams; i++)
+   {
+      params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
+      png_debug2(3, "pCAL parameter %d length = %lu", i,
+        (unsigned long) params_len[i]);
+      total_len += (png_size_t)params_len[i];
+   }
+
+   png_debug1(3, "pCAL total length = %d", (int)total_len);
+   png_write_chunk_start(png_ptr, (png_bytep)png_pCAL, (png_uint_32)total_len);
+   png_write_chunk_data(png_ptr, (png_bytep)new_purpose,
+     (png_size_t)purpose_len);
+   png_save_int_32(buf, X0);
+   png_save_int_32(buf + 4, X1);
+   buf[8] = (png_byte)type;
+   buf[9] = (png_byte)nparams;
+   png_write_chunk_data(png_ptr, buf, (png_size_t)10);
+   png_write_chunk_data(png_ptr, (png_bytep)units, (png_size_t)units_len);
+
+   png_free(png_ptr, new_purpose);
+
+   for (i = 0; i < nparams; i++)
+   {
+      png_write_chunk_data(png_ptr, (png_bytep)params[i],
+         (png_size_t)params_len[i]);
+   }
+
+   png_free(png_ptr, params_len);
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_sCAL_SUPPORTED)
+/* write the sCAL chunk */
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
+void /* PRIVATE */
+png_write_sCAL(png_structp png_ptr, int unit, double width, double height)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sCAL;
+#endif
+   char buf[64];
+   png_size_t total_len;
+
+   png_debug(1, "in png_write_sCAL");
+
+   buf[0] = (char)unit;
+#if defined(_WIN32_WCE)
+/* sprintf() function is not supported on WindowsCE */
+   {
+      wchar_t wc_buf[32];
+      size_t wc_len;
+      swprintf(wc_buf, TEXT("%12.12e"), width);
+      wc_len = wcslen(wc_buf);
+      WideCharToMultiByte(CP_ACP, 0, wc_buf, -1, buf + 1, wc_len, NULL, NULL);
+      total_len = wc_len + 2;
+      swprintf(wc_buf, TEXT("%12.12e"), height);
+      wc_len = wcslen(wc_buf);
+      WideCharToMultiByte(CP_ACP, 0, wc_buf, -1, buf + total_len, wc_len,
+         NULL, NULL);
+      total_len += wc_len;
+   }
+#else
+   png_snprintf(buf + 1, 63, "%12.12e", width);
+   total_len = 1 + png_strlen(buf + 1) + 1;
+   png_snprintf(buf + total_len, 64-total_len, "%12.12e", height);
+   total_len += png_strlen(buf + total_len);
+#endif
+
+   png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);
+   png_write_chunk(png_ptr, (png_bytep)png_sCAL, (png_bytep)buf, total_len);
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_sCAL_s(png_structp png_ptr, int unit, png_charp width,
+   png_charp height)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sCAL;
+#endif
+   png_byte buf[64];
+   png_size_t wlen, hlen, total_len;
+
+   png_debug(1, "in png_write_sCAL_s");
+
+   wlen = png_strlen(width);
+   hlen = png_strlen(height);
+   total_len = wlen + hlen + 2;
+   if (total_len > 64)
+   {
+      png_warning(png_ptr, "Can't write sCAL (buffer too small)");
+      return;
+   }
+
+   buf[0] = (png_byte)unit;
+   png_memcpy(buf + 1, width, wlen + 1);      /* append the '\0' here */
+   png_memcpy(buf + wlen + 2, height, hlen);  /* do NOT append the '\0' here */
+
+   png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);
+   png_write_chunk(png_ptr, (png_bytep)png_sCAL, buf, total_len);
+}
+#endif
+#endif
+#endif
+
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+/* write the pHYs chunk */
+void /* PRIVATE */
+png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,
+   png_uint_32 y_pixels_per_unit,
+   int unit_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_pHYs;
+#endif
+   png_byte buf[9];
+
+   png_debug(1, "in png_write_pHYs");
+   if (unit_type >= PNG_RESOLUTION_LAST)
+      png_warning(png_ptr, "Unrecognized unit type for pHYs chunk");
+
+   png_save_uint_32(buf, x_pixels_per_unit);
+   png_save_uint_32(buf + 4, y_pixels_per_unit);
+   buf[8] = (png_byte)unit_type;
+
+   png_write_chunk(png_ptr, (png_bytep)png_pHYs, buf, (png_size_t)9);
+}
+#endif
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+/* Write the tIME chunk.  Use either png_convert_from_struct_tm()
+ * or png_convert_from_time_t(), or fill in the structure yourself.
+ */
+void /* PRIVATE */
+png_write_tIME(png_structp png_ptr, png_timep mod_time)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tIME;
+#endif
+   png_byte buf[7];
+
+   png_debug(1, "in png_write_tIME");
+   if (mod_time->month  > 12 || mod_time->month  < 1 ||
+       mod_time->day    > 31 || mod_time->day    < 1 ||
+       mod_time->hour   > 23 || mod_time->second > 60)
+   {
+      png_warning(png_ptr, "Invalid time specified for tIME chunk");
+      return;
+   }
+
+   png_save_uint_16(buf, mod_time->year);
+   buf[2] = mod_time->month;
+   buf[3] = mod_time->day;
+   buf[4] = mod_time->hour;
+   buf[5] = mod_time->minute;
+   buf[6] = mod_time->second;
+
+   png_write_chunk(png_ptr, (png_bytep)png_tIME, buf, (png_size_t)7);
+}
+#endif
+
+/* initializes the row writing capability of libpng */
+void /* PRIVATE */
+png_write_start_row(png_structp png_ptr)
+{
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+#endif
+
+   png_size_t buf_size;
+
+   png_debug(1, "in png_write_start_row");
+   buf_size = (png_size_t)(PNG_ROWBYTES(
+      png_ptr->usr_channels*png_ptr->usr_bit_depth, png_ptr->width) + 1);
+
+   /* set up row buffer */
+   png_ptr->row_buf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)buf_size);
+   png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;
+
+#ifndef PNG_NO_WRITE_FILTER
+   /* set up filtering buffer, if using this filter */
+   if (png_ptr->do_filter & PNG_FILTER_SUB)
+   {
+      png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
+         (png_uint_32)(png_ptr->rowbytes + 1));
+      png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+   }
+
+   /* We only need to keep the previous row if we are using one of these. */
+   if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH))
+   {
+     /* set up previous row buffer */
+      png_ptr->prev_row = (png_bytep)png_malloc(png_ptr,
+        (png_uint_32)buf_size);
+      png_memset(png_ptr->prev_row, 0, buf_size);
+
+      if (png_ptr->do_filter & PNG_FILTER_UP)
+      {
+         png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)(png_ptr->rowbytes + 1));
+         png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
+      }
+
+      if (png_ptr->do_filter & PNG_FILTER_AVG)
+      {
+         png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)(png_ptr->rowbytes + 1));
+         png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
+      }
+
+      if (png_ptr->do_filter & PNG_FILTER_PAETH)
+      {
+         png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)(png_ptr->rowbytes + 1));
+         png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
+      }
+   }
+#endif /* PNG_NO_WRITE_FILTER */
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* if interlaced, we need to set up width and height of pass */
+   if (png_ptr->interlaced)
+   {
+      if (!(png_ptr->transformations & PNG_INTERLACE))
+      {
+         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
+            png_pass_ystart[0]) / png_pass_yinc[0];
+         png_ptr->usr_width = (png_ptr->width + png_pass_inc[0] - 1 -
+            png_pass_start[0]) / png_pass_inc[0];
+      }
+      else
+      {
+         png_ptr->num_rows = png_ptr->height;
+         png_ptr->usr_width = png_ptr->width;
+      }
+   }
+   else
+#endif
+   {
+      png_ptr->num_rows = png_ptr->height;
+      png_ptr->usr_width = png_ptr->width;
+   }
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+}
+
+/* Internal use only.  Called when finished processing a row of data. */
+void /* PRIVATE */
+png_write_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+#endif
+
+   int ret;
+
+   png_debug(1, "in png_write_finish_row");
+   /* next row */
+   png_ptr->row_number++;
+
+   /* see if we are done */
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* if interlaced, go to next pass */
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      if (png_ptr->transformations & PNG_INTERLACE)
+      {
+         png_ptr->pass++;
+      }
+      else
+      {
+         /* loop until we find a non-zero width or height pass */
+         do
+         {
+            png_ptr->pass++;
+            if (png_ptr->pass >= 7)
+               break;
+            png_ptr->usr_width = (png_ptr->width +
+               png_pass_inc[png_ptr->pass] - 1 -
+               png_pass_start[png_ptr->pass]) /
+               png_pass_inc[png_ptr->pass];
+            png_ptr->num_rows = (png_ptr->height +
+               png_pass_yinc[png_ptr->pass] - 1 -
+               png_pass_ystart[png_ptr->pass]) /
+               png_pass_yinc[png_ptr->pass];
+            if (png_ptr->transformations & PNG_INTERLACE)
+               break;
+         } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
+
+      }
+
+      /* reset the row above the image for the next pass */
+      if (png_ptr->pass < 7)
+      {
+         if (png_ptr->prev_row != NULL)
+            png_memset(png_ptr->prev_row, 0,
+               (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*
+               png_ptr->usr_bit_depth, png_ptr->width)) + 1);
+         return;
+      }
+   }
+#endif
+
+   /* if we get here, we've just written the last row, so we need
+      to flush the compressor */
+   do
+   {
+      /* tell the compressor we are done */
+      ret = deflate(&png_ptr->zstream, Z_FINISH);
+      /* check for an error */
+      if (ret == Z_OK)
+      {
+         /* check to see if we need more room */
+         if (!(png_ptr->zstream.avail_out))
+         {
+            png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+            png_ptr->zstream.next_out = png_ptr->zbuf;
+            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         }
+      }
+      else if (ret != Z_STREAM_END)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+   } while (ret != Z_STREAM_END);
+
+   /* write any extra space */
+   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
+   {
+      png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size -
+         png_ptr->zstream.avail_out);
+   }
+
+   deflateReset(&png_ptr->zstream);
+   png_ptr->zstream.data_type = Z_BINARY;
+}
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* Pick out the correct pixels for the interlace pass.
+ * The basic idea here is to go through the row with a source
+ * pointer and a destination pointer (sp and dp), and copy the
+ * correct pixels for the pass.  As the row gets compacted,
+ * sp will always be >= dp, so we should never overwrite anything.
+ * See the default: case for the easiest code to understand.
+ */
+void /* PRIVATE */
+png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+#endif
+
+   png_debug(1, "in png_do_write_interlace");
+   /* we don't have to do anything on the last pass (6) */
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL && pass < 6)
+#else
+   if (pass < 6)
+#endif
+   {
+      /* each pixel depth is handled separately */
+      switch (row_info->pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            d = 0;
+            shift = 7;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 3);
+               value = (int)(*sp >> (7 - (int)(i & 0x07))) & 0x01;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 7;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift--;
+
+            }
+            if (shift != 7)
+               *dp = (png_byte)d;
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            shift = 6;
+            d = 0;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 2);
+               value = (*sp >> ((3 - (int)(i & 0x03)) << 1)) & 0x03;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 6;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift -= 2;
+            }
+            if (shift != 6)
+                   *dp = (png_byte)d;
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            shift = 4;
+            d = 0;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 1);
+               value = (*sp >> ((1 - (int)(i & 0x01)) << 2)) & 0x0f;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 4;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift -= 4;
+            }
+            if (shift != 4)
+               *dp = (png_byte)d;
+            break;
+         }
+         default:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            png_size_t pixel_bytes;
+
+            /* start at the beginning */
+            dp = row;
+            /* find out how many bytes each pixel takes up */
+            pixel_bytes = (row_info->pixel_depth >> 3);
+            /* loop through the row, only looking at the pixels that
+               matter */
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               /* find out where the original pixel is */
+               sp = row + (png_size_t)i * pixel_bytes;
+               /* move the pixel */
+               if (dp != sp)
+                  png_memcpy(dp, sp, pixel_bytes);
+               /* next pixel */
+               dp += pixel_bytes;
+            }
+            break;
+         }
+      }
+      /* set new row width */
+      row_info->width = (row_info->width +
+         png_pass_inc[pass] - 1 -
+         png_pass_start[pass]) /
+         png_pass_inc[pass];
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+            row_info->width);
+   }
+}
+#endif
+
+/* This filters the row, chooses which filter to use, if it has not already
+ * been specified by the application, and then writes the row out with the
+ * chosen filter.
+ */
+#define PNG_MAXSUM (((png_uint_32)(-1)) >> 1)
+#define PNG_HISHIFT 10
+#define PNG_LOMASK ((png_uint_32)0xffffL)
+#define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT))
+void /* PRIVATE */
+png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
+{
+   png_bytep best_row;
+#ifndef PNG_NO_WRITE_FILTER
+   png_bytep prev_row, row_buf;
+   png_uint_32 mins, bpp;
+   png_byte filter_to_do = png_ptr->do_filter;
+   png_uint_32 row_bytes = row_info->rowbytes;
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   int num_p_filters = (int)png_ptr->num_prev_filters;
+#endif
+
+   png_debug(1, "in png_write_find_filter");
+   /* find out how many bytes offset each pixel is */
+   bpp = (row_info->pixel_depth + 7) >> 3;
+
+   prev_row = png_ptr->prev_row;
+#endif
+   best_row = png_ptr->row_buf;
+#ifndef PNG_NO_WRITE_FILTER
+   row_buf = best_row;
+   mins = PNG_MAXSUM;
+
+   /* The prediction method we use is to find which method provides the
+    * smallest value when summing the absolute values of the distances
+    * from zero, using anything >= 128 as negative numbers.  This is known
+    * as the "minimum sum of absolute differences" heuristic.  Other
+    * heuristics are the "weighted minimum sum of absolute differences"
+    * (experimental and can in theory improve compression), and the "zlib
+    * predictive" method (not implemented yet), which does test compressions
+    * of lines using different filter methods, and then chooses the
+    * (series of) filter(s) that give minimum compressed data size (VERY
+    * computationally expensive).
+    *
+    * GRR 980525:  consider also
+    *   (1) minimum sum of absolute differences from running average (i.e.,
+    *       keep running sum of non-absolute differences & count of bytes)
+    *       [track dispersion, too?  restart average if dispersion too large?]
+    *  (1b) minimum sum of absolute differences from sliding average, probably
+    *       with window size <= deflate window (usually 32K)
+    *   (2) minimum sum of squared differences from zero or running average
+    *       (i.e., ~ root-mean-square approach)
+    */
+
+
+   /* We don't need to test the 'no filter' case if this is the only filter
+    * that has been chosen, as it doesn't actually do anything to the data.
+    */
+   if ((filter_to_do & PNG_FILTER_NONE) &&
+       filter_to_do != PNG_FILTER_NONE)
+   {
+      png_bytep rp;
+      png_uint_32 sum = 0;
+      png_uint_32 i;
+      int v;
+
+      for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
+      {
+         v = *rp;
+         sum += (v < 128) ? v : 256 - v;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         png_uint_32 sumhi, sumlo;
+         int j;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK; /* Gives us some footroom */
+
+         /* Reduce the sum if we match any of the previous rows */
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         /* Factor in the cost of this filter (this is here for completeness,
+          * but it makes no sense to have a "cost" for the NONE filter, as
+          * it has the minimum possible computational cost - none).
+          */
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+      mins = sum;
+   }
+
+   /* sub filter */
+   if (filter_to_do == PNG_FILTER_SUB)
+   /* it's the only filter so no testing is needed */
+   {
+      png_bytep rp, lp, dp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
+           i++, rp++, dp++)
+      {
+         *dp = *rp;
+      }
+      for (lp = row_buf + 1; i < row_bytes;
+         i++, rp++, lp++, dp++)
+      {
+         *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+      }
+      best_row = png_ptr->sub_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_SUB)
+   {
+      png_bytep rp, dp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      /* We temporarily increase the "minimum sum" by the factor we
+       * would reduce the sum of this filter, so that we can do the
+       * early exit comparison without scaling the sum each time.
+       */
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
+           i++, rp++, dp++)
+      {
+         v = *dp = *rp;
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+      for (lp = row_buf + 1; i < row_bytes;
+         i++, rp++, lp++, dp++)
+      {
+         v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
+            {
+               sumlo = (sumlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->sub_row;
+      }
+   }
+
+   /* up filter */
+   if (filter_to_do == PNG_FILTER_UP)
+   {
+      png_bytep rp, dp, pp;
+      png_uint_32 i;
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
+           pp = prev_row + 1; i < row_bytes;
+           i++, rp++, pp++, dp++)
+      {
+         *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
+      }
+      best_row = png_ptr->up_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_UP)
+   {
+      png_bytep rp, dp, pp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
+           pp = prev_row + 1; i < row_bytes; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->up_row;
+      }
+   }
+
+   /* avg filter */
+   if (filter_to_do == PNG_FILTER_AVG)
+   {
+      png_bytep rp, dp, pp, lp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+      }
+      for (lp = row_buf + 1; i < row_bytes; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
+                 & 0xff);
+      }
+      best_row = png_ptr->avg_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_AVG)
+   {
+      png_bytep rp, dp, pp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_AVG)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+      for (lp = row_buf + 1; i < row_bytes; i++)
+      {
+         v = *dp++ =
+          (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->avg_row;
+      }
+   }
+
+   /* Paeth filter */
+   if (filter_to_do == PNG_FILTER_PAETH)
+   {
+      png_bytep rp, dp, pp, cp, lp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+      }
+
+      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
+      {
+         int a, b, c, pa, pb, pc, p;
+
+         b = *pp++;
+         c = *cp++;
+         a = *lp++;
+
+         p = b - c;
+         pc = a - c;
+
+#ifdef PNG_USE_ABS
+         pa = abs(p);
+         pb = abs(pc);
+         pc = abs(p + pc);
+#else
+         pa = p < 0 ? -p : p;
+         pb = pc < 0 ? -pc : pc;
+         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+         *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+      }
+      best_row = png_ptr->paeth_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_PAETH)
+   {
+      png_bytep rp, dp, pp, cp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+
+      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
+      {
+         int a, b, c, pa, pb, pc, p;
+
+         b = *pp++;
+         c = *cp++;
+         a = *lp++;
+
+#ifndef PNG_SLOW_PAETH
+         p = b - c;
+         pc = a - c;
+#ifdef PNG_USE_ABS
+         pa = abs(p);
+         pb = abs(pc);
+         pc = abs(p + pc);
+#else
+         pa = p < 0 ? -p : p;
+         pb = pc < 0 ? -pc : pc;
+         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+#else /* PNG_SLOW_PAETH */
+         p = a + b - c;
+         pa = abs(p - a);
+         pb = abs(p - b);
+         pc = abs(p - c);
+         if (pa <= pb && pa <= pc)
+            p = a;
+         else if (pb <= pc)
+            p = b;
+         else
+            p = c;
+#endif /* PNG_SLOW_PAETH */
+
+         v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         best_row = png_ptr->paeth_row;
+      }
+   }
+#endif /* PNG_NO_WRITE_FILTER */
+   /* Do the actual writing of the filtered row data from the chosen filter. */
+
+   png_write_filtered_row(png_ptr, best_row);
+
+#ifndef PNG_NO_WRITE_FILTER
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   /* Save the type of filter we picked this time for future calculations */
+   if (png_ptr->num_prev_filters > 0)
+   {
+      int j;
+      for (j = 1; j < num_p_filters; j++)
+      {
+         png_ptr->prev_filters[j] = png_ptr->prev_filters[j - 1];
+      }
+      png_ptr->prev_filters[j] = best_row[0];
+   }
+#endif
+#endif /* PNG_NO_WRITE_FILTER */
+}
+
+
+/* Do the actual writing of a previously filtered row. */
+void /* PRIVATE */
+png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row)
+{
+   png_debug(1, "in png_write_filtered_row");
+   png_debug1(2, "filter = %d", filtered_row[0]);
+   /* set up the zlib input buffer */
+
+   png_ptr->zstream.next_in = filtered_row;
+   png_ptr->zstream.avail_in = (uInt)png_ptr->row_info.rowbytes + 1;
+   /* repeat until we have compressed all the data */
+   do
+   {
+      int ret; /* return of zlib */
+
+      /* compress the data */
+      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+      /* check for compression errors */
+      if (ret != Z_OK)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+
+      /* see if it is time to write another IDAT */
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* write the IDAT and reset the zlib output buffer */
+         png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+      }
+   /* repeat until all data has been compressed */
+   } while (png_ptr->zstream.avail_in);
+
+   /* swap the current and previous rows */
+   if (png_ptr->prev_row != NULL)
+   {
+      png_bytep tptr;
+
+      tptr = png_ptr->prev_row;
+      png_ptr->prev_row = png_ptr->row_buf;
+      png_ptr->row_buf = tptr;
+   }
+
+   /* finish row - updates counters and flushes zlib if last row */
+   png_write_finish_row(png_ptr);
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+   png_ptr->flush_rows++;
+
+   if (png_ptr->flush_dist > 0 &&
+       png_ptr->flush_rows >= png_ptr->flush_dist)
+   {
+      png_write_flush(png_ptr);
+   }
+#endif
+}
+#endif /* PNG_WRITE_SUPPORTED */
+
 /* pngwutil.c - utilities to write a PNG file
  *
  * Last changed in libpng 1.2.15 January 5, 2007
diff --git a/src/dep/src/irrlicht/os.cpp b/src/dep/src/irrlicht/os.cpp
index afee872..dcb307e 100644
--- a/src/dep/src/irrlicht/os.cpp
+++ b/src/dep/src/irrlicht/os.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -21,7 +21,8 @@
 		#define bswap_32(X) ( (((X)&0x000000FF)<<24) | (((X)&0xFF000000) >> 24) | (((X)&0x0000FF00) << 8) | (((X) &0x00FF0000) >> 8))
 	#endif
 #else
-	#ifdef MACOSX
+	#if defined(_IRR_OSX_PLATFORM_)
+		#include <libkern/OSByteOrder.h>
 		#define bswap_16(X) OSReadSwapInt16(&X,0)
 		#define bswap_32(X) OSReadSwapInt32(&X,0)
 	#elif defined(__FreeBSD__)
@@ -67,42 +68,26 @@ namespace os
 	//! prints a debuginfo string
 	void Printer::print(const c8* message)
 	{
-		c8* tmp = new c8[strlen(message) + 2];
-		sprintf(tmp, "%s\n", message);
-		OutputDebugString(tmp);
-		printf(tmp);
-		delete [] tmp;
+#if !defined (_WIN32_WCE )
+		OutputDebugString(message);
+		OutputDebugString("\n");
+		printf("%s\n", message);
+#endif
 	}
 
-	LARGE_INTEGER HighPerformanceFreq;
-	BOOL HighPerformanceTimerSupport = FALSE;
+	static LARGE_INTEGER HighPerformanceFreq;
+	static BOOL HighPerformanceTimerSupport = FALSE;
+	static BOOL MultiCore = FALSE;
 
 	void Timer::initTimer()
 	{
+#if !defined(_WIN32_WCE)
 		// disable hires timer on multiple core systems, bios bugs result in bad hires timers.
 		SYSTEM_INFO sysinfo;
-		DWORD affinity, sysaffinity;
 		GetSystemInfo(&sysinfo);
-		s32 affinityCount = 0;
-
-		// count the processors that can be used by this process
-		if (GetProcessAffinityMask( GetCurrentProcess(), &affinity, &sysaffinity ))
-		{
-			for (u32 i=0; i<32; ++i)
-			{
-				if ((1<<i) & affinity)
-					affinityCount++;
-			}
-		}
-
-		if (sysinfo.dwNumberOfProcessors == 1 || affinityCount == 1)
-		{
-			HighPerformanceTimerSupport = QueryPerformanceFrequency(&HighPerformanceFreq);
-		}
-		else
-		{
-			HighPerformanceTimerSupport = false;
-		}
+		MultiCore = (sysinfo.dwNumberOfProcessors > 1);	
+#endif
+		HighPerformanceTimerSupport = QueryPerformanceFrequency(&HighPerformanceFreq);
 		initVirtualTimer();
 	}
 
@@ -110,10 +95,26 @@ namespace os
 	{
 		if (HighPerformanceTimerSupport)
 		{
+#if !defined(_WIN32_WCE)
+			// Avoid potential timing inaccuracies across multiple cores by 
+			// temporarily setting the affinity of this process to one core.
+			DWORD_PTR affinityMask;
+			if(MultiCore)
+				affinityMask = SetThreadAffinityMask(GetCurrentThread(), 1); 
+#endif
 			LARGE_INTEGER nTime;
-			QueryPerformanceCounter(&nTime);
-			return u32((nTime.QuadPart) * 1000 / HighPerformanceFreq.QuadPart);
+			BOOL queriedOK = QueryPerformanceCounter(&nTime);
+
+#if !defined(_WIN32_WCE)
+			// Restore the true affinity.
+			if(MultiCore)
+				(void)SetThreadAffinityMask(GetCurrentThread(), affinityMask);
+#endif
+			if(queriedOK)
+				return u32((nTime.QuadPart) * 1000 / HighPerformanceFreq.QuadPart);
+
 		}
+
 		return GetTickCount();
 	}
 
@@ -297,3 +298,4 @@ namespace os
 } // end namespace os
 } // end namespace irr
 
+
diff --git a/src/dep/src/irrlicht/os.h b/src/dep/src/irrlicht/os.h
index 5c3b8c2..0aa9cfa 100644
--- a/src/dep/src/irrlicht/os.h
+++ b/src/dep/src/irrlicht/os.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2002-2009 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/dep/src/irrlicht/source.txt b/src/dep/src/irrlicht/source.txt
index f1a06be..f90ea06 100644
--- a/src/dep/src/irrlicht/source.txt
+++ b/src/dep/src/irrlicht/source.txt
@@ -37,4 +37,4 @@ A) This disables the use of OpenGL extensions:
 B) Replace all occurrences of 'glXGetProcAddress' with 'glXGetProcAddressARB' and run a
    make
    This will solve the issue but keep the OpenGL extension enabled.
-   
+   
diff --git a/src/dep/src/irrlicht/zlib/ChangeLog b/src/dep/src/irrlicht/zlib/ChangeLog
index 1ac9463..e69de29 100644
--- a/src/dep/src/irrlicht/zlib/ChangeLog
+++ b/src/dep/src/irrlicht/zlib/ChangeLog
@@ -1,855 +0,0 @@
-
-                ChangeLog file for zlib
-
-Changes in 1.2.3 (18 July 2005)
-- Apply security vulnerability fixes to contrib/infback9 as well
-- Clean up some text files (carriage returns, trailing space)
-- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
-
-Changes in 1.2.2.4 (11 July 2005)
-- Add inflatePrime() function for starting inflation at bit boundary
-- Avoid some Visual C warnings in deflate.c
-- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
-  compile
-- Fix some spelling errors in comments [Betts]
-- Correct inflateInit2() error return documentation in zlib.h
-- Added zran.c example of compressed data random access to examples
-  directory, shows use of inflatePrime()
-- Fix cast for assignments to strm->state in inflate.c and infback.c
-- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
-- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
-- Add cast in trees.c t avoid a warning [Oberhumer]
-- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
-- Update make_vms.com [Zinser]
-- Initialize state->write in inflateReset() since copied in inflate_fast()
-- Be more strict on incomplete code sets in inflate_table() and increase
-  ENOUGH and MAXD -- this repairs a possible security vulnerability for
-  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
-  discovering the vulnerability and providing test cases.
-- Add ia64 support to configure for HP-UX [Smith]
-- Add error return to gzread() for format or i/o error [Levin]
-- Use malloc.h for OS/2 [Necasek]
-
-Changes in 1.2.2.3 (27 May 2005)
-- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
-- Typecast fread() return values in gzio.c [Vollant]
-- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
-- Fix crc check bug in gzread() after gzungetc() [Heiner]
-- Add the deflateTune() function to adjust internal compression parameters
-- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
-- Remove an incorrect assertion in examples/zpipe.c
-- Add C++ wrapper in infback9.h [Donais]
-- Fix bug in inflateCopy() when decoding fixed codes
-- Note in zlib.h how much deflateSetDictionary() actually uses
-- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
-- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
-- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
-- Add gzdirect() function to indicate transparent reads
-- Update contrib/minizip [Vollant]
-- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
-- Add casts in crc32.c to avoid warnings [Oberhumer]
-- Add contrib/masmx64 [Vollant]
-- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
-
-Changes in 1.2.2.2 (30 December 2004)
-- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
-  avoid implicit memcpy calls (portability for no-library compilation)
-- Increase sprintf() buffer size in gzdopen() to allow for large numbers
-- Add INFLATE_STRICT to check distances against zlib header
-- Improve WinCE errno handling and comments [Chang]
-- Remove comment about no gzip header processing in FAQ
-- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
-- Add updated make_vms.com [Coghlan], update README
-- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
-  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
-- Add FAQ entry and comments in deflate.c on uninitialized memory access
-- Add Solaris 9 make options in configure [Gilbert]
-- Allow strerror() usage in gzio.c for STDC
-- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
-- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
-- Use z_off_t for adler32_combine() and crc32_combine() lengths
-- Make adler32() much faster for small len
-- Use OS_CODE in deflate() default gzip header
-
-Changes in 1.2.2.1 (31 October 2004)
-- Allow inflateSetDictionary() call for raw inflate
-- Fix inflate header crc check bug for file names and comments
-- Add deflateSetHeader() and gz_header structure for custom gzip headers
-- Add inflateGetheader() to retrieve gzip headers
-- Add crc32_combine() and adler32_combine() functions
-- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
-- Use zstreamp consistently in zlib.h (inflate_back functions)
-- Remove GUNZIP condition from definition of inflate_mode in inflate.h
-  and in contrib/inflate86/inffast.S [Truta, Anderson]
-- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
-- Update projects/README.projects and projects/visualc6 [Truta]
-- Update win32/DLL_FAQ.txt [Truta]
-- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
-- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
-- Use a new algorithm for setting strm->data_type in trees.c [Truta]
-- Do not define an exit() prototype in zutil.c unless DEBUG defined
-- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
-- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
-- Fix Darwin build version identification [Peterson]
-
-Changes in 1.2.2 (3 October 2004)
-- Update zlib.h comments on gzip in-memory processing
-- Set adler to 1 in inflateReset() to support Java test suite [Walles]
-- Add contrib/dotzlib [Ravn]
-- Update win32/DLL_FAQ.txt [Truta]
-- Update contrib/minizip [Vollant]
-- Move contrib/visual-basic.txt to old/ [Truta]
-- Fix assembler builds in projects/visualc6/ [Truta]
-
-Changes in 1.2.1.2 (9 September 2004)
-- Update INDEX file
-- Fix trees.c to update strm->data_type (no one ever noticed!)
-- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
-- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
-- Add limited multitasking protection to DYNAMIC_CRC_TABLE
-- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
-- Don't declare strerror() under VMS [Mozilla]
-- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
-- Update contrib/ada [Anisimkov]
-- Update contrib/minizip [Vollant]
-- Fix configure to not hardcode directories for Darwin [Peterson]
-- Fix gzio.c to not return error on empty files [Brown]
-- Fix indentation; update version in contrib/delphi/ZLib.pas and
-  contrib/pascal/zlibpas.pas [Truta]
-- Update mkasm.bat in contrib/masmx86 [Truta]
-- Update contrib/untgz [Truta]
-- Add projects/README.projects [Truta]
-- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
-- Update win32/DLL_FAQ.txt [Truta]
-- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
-- Remove an unnecessary assignment to curr in inftrees.c [Truta]
-- Add OS/2 to exe builds in configure [Poltorak]
-- Remove err dummy parameter in zlib.h [Kientzle]
-
-Changes in 1.2.1.1 (9 January 2004)
-- Update email address in README
-- Several FAQ updates
-- Fix a big fat bug in inftrees.c that prevented decoding valid
-  dynamic blocks with only literals and no distance codes --
-  Thanks to "Hot Emu" for the bug report and sample file
-- Add a note to puff.c on no distance codes case.
-
-Changes in 1.2.1 (17 November 2003)
-- Remove a tab in contrib/gzappend/gzappend.c
-- Update some interfaces in contrib for new zlib functions
-- Update zlib version number in some contrib entries
-- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
-- Support shared libraries on Hurd and KFreeBSD [Brown]
-- Fix error in NO_DIVIDE option of adler32.c
-
-Changes in 1.2.0.8 (4 November 2003)
-- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
-- Add experimental NO_DIVIDE #define in adler32.c
-    - Possibly faster on some processors (let me know if it is)
-- Correct Z_BLOCK to not return on first inflate call if no wrap
-- Fix strm->data_type on inflate() return to correctly indicate EOB
-- Add deflatePrime() function for appending in the middle of a byte
-- Add contrib/gzappend for an example of appending to a stream
-- Update win32/DLL_FAQ.txt [Truta]
-- Delete Turbo C comment in README [Truta]
-- Improve some indentation in zconf.h [Truta]
-- Fix infinite loop on bad input in configure script [Church]
-- Fix gzeof() for concatenated gzip files [Johnson]
-- Add example to contrib/visual-basic.txt [Michael B.]
-- Add -p to mkdir's in Makefile.in [vda]
-- Fix configure to properly detect presence or lack of printf functions
-- Add AS400 support [Monnerat]
-- Add a little Cygwin support [Wilson]
-
-Changes in 1.2.0.7 (21 September 2003)
-- Correct some debug formats in contrib/infback9
-- Cast a type in a debug statement in trees.c
-- Change search and replace delimiter in configure from % to # [Beebe]
-- Update contrib/untgz to 0.2 with various fixes [Truta]
-- Add build support for Amiga [Nikl]
-- Remove some directories in old that have been updated to 1.2
-- Add dylib building for Mac OS X in configure and Makefile.in
-- Remove old distribution stuff from Makefile
-- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
-- Update links in README
-
-Changes in 1.2.0.6 (13 September 2003)
-- Minor FAQ updates
-- Update contrib/minizip to 1.00 [Vollant]
-- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
-- Update POSTINC comment for 68060 [Nikl]
-- Add contrib/infback9 with deflate64 decoding (unsupported)
-- For MVS define NO_vsnprintf and undefine FAR [van Burik]
-- Add pragma for fdopen on MVS [van Burik]
-
-Changes in 1.2.0.5 (8 September 2003)
-- Add OF to inflateBackEnd() declaration in zlib.h
-- Remember start when using gzdopen in the middle of a file
-- Use internal off_t counters in gz* functions to properly handle seeks
-- Perform more rigorous check for distance-too-far in inffast.c
-- Add Z_BLOCK flush option to return from inflate at block boundary
-- Set strm->data_type on return from inflate
-    - Indicate bits unused, if at block boundary, and if in last block
-- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
-- Add condition so old NO_DEFLATE define still works for compatibility
-- FAQ update regarding the Windows DLL [Truta]
-- INDEX update: add qnx entry, remove aix entry [Truta]
-- Install zlib.3 into mandir [Wilson]
-- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
-- Adapt the zlib interface to the new DLL convention guidelines [Truta]
-- Introduce ZLIB_WINAPI macro to allow the export of functions using
-  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
-- Update msdos and win32 scripts and makefiles [Truta]
-- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
-- Add contrib/ada [Anisimkov]
-- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
-- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
-- Add contrib/masm686 [Truta]
-- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
-  [Truta, Vollant]
-- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
-- Remove contrib/delphi2; add a new contrib/delphi [Truta]
-- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
-  and fix some method prototypes [Truta]
-- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
-  [Truta]
-- Avoid the use of backslash (\) in contrib/minizip [Vollant]
-- Fix file time handling in contrib/untgz; update makefiles [Truta]
-- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
-  [Vollant]
-- Remove contrib/vstudio/vc15_16 [Vollant]
-- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
-- Update README.contrib [Truta]
-- Invert the assignment order of match_head and s->prev[...] in
-  INSERT_STRING [Truta]
-- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
-  [Truta]
-- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
-- Fix prototype of syncsearch in inflate.c [Truta]
-- Introduce ASMINF macro to be enabled when using an ASM implementation
-  of inflate_fast [Truta]
-- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
-- Modify test_gzio in example.c to take a single file name as a
-  parameter [Truta]
-- Exit the example.c program if gzopen fails [Truta]
-- Add type casts around strlen in example.c [Truta]
-- Remove casting to sizeof in minigzip.c; give a proper type
-  to the variable compared with SUFFIX_LEN [Truta]
-- Update definitions of STDC and STDC99 in zconf.h [Truta]
-- Synchronize zconf.h with the new Windows DLL interface [Truta]
-- Use SYS16BIT instead of __32BIT__ to distinguish between
-  16- and 32-bit platforms [Truta]
-- Use far memory allocators in small 16-bit memory models for
-  Turbo C [Truta]
-- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
-  zlibCompileFlags [Truta]
-- Cygwin has vsnprintf [Wilson]
-- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
-- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
-
-Changes in 1.2.0.4 (10 August 2003)
-- Minor FAQ updates
-- Be more strict when checking inflateInit2's windowBits parameter
-- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
-- Add gzip wrapper option to deflateInit2 using windowBits
-- Add updated QNX rule in configure and qnx directory [Bonnefoy]
-- Make inflate distance-too-far checks more rigorous
-- Clean up FAR usage in inflate
-- Add casting to sizeof() in gzio.c and minigzip.c
-
-Changes in 1.2.0.3 (19 July 2003)
-- Fix silly error in gzungetc() implementation [Vollant]
-- Update contrib/minizip and contrib/vstudio [Vollant]
-- Fix printf format in example.c
-- Correct cdecl support in zconf.in.h [Anisimkov]
-- Minor FAQ updates
-
-Changes in 1.2.0.2 (13 July 2003)
-- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
-- Attempt to avoid warnings in crc32.c for pointer-int conversion
-- Add AIX to configure, remove aix directory [Bakker]
-- Add some casts to minigzip.c
-- Improve checking after insecure sprintf() or vsprintf() calls
-- Remove #elif's from crc32.c
-- Change leave label to inf_leave in inflate.c and infback.c to avoid
-  library conflicts
-- Remove inflate gzip decoding by default--only enable gzip decoding by
-  special request for stricter backward compatibility
-- Add zlibCompileFlags() function to return compilation information
-- More typecasting in deflate.c to avoid warnings
-- Remove leading underscore from _Capital #defines [Truta]
-- Fix configure to link shared library when testing
-- Add some Windows CE target adjustments [Mai]
-- Remove #define ZLIB_DLL in zconf.h [Vollant]
-- Add zlib.3 [Rodgers]
-- Update RFC URL in deflate.c and algorithm.txt [Mai]
-- Add zlib_dll_FAQ.txt to contrib [Truta]
-- Add UL to some constants [Truta]
-- Update minizip and vstudio [Vollant]
-- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
-- Expand use of NO_DUMMY_DECL to avoid all dummy structures
-- Added iostream3 to contrib [Schwardt]
-- Replace rewind() with fseek() for WinCE [Truta]
-- Improve setting of zlib format compression level flags
-    - Report 0 for huffman and rle strategies and for level == 0 or 1
-    - Report 2 only for level == 6
-- Only deal with 64K limit when necessary at compile time [Truta]
-- Allow TOO_FAR check to be turned off at compile time [Truta]
-- Add gzclearerr() function [Souza]
-- Add gzungetc() function
-
-Changes in 1.2.0.1 (17 March 2003)
-- Add Z_RLE strategy for run-length encoding [Truta]
-    - When Z_RLE requested, restrict matches to distance one
-    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
-- Correct FASTEST compilation to allow level == 0
-- Clean up what gets compiled for FASTEST
-- Incorporate changes to zconf.in.h [Vollant]
-    - Refine detection of Turbo C need for dummy returns
-    - Refine ZLIB_DLL compilation
-    - Include additional header file on VMS for off_t typedef
-- Try to use _vsnprintf where it supplants vsprintf [Vollant]
-- Add some casts in inffast.c
-- Enchance comments in zlib.h on what happens if gzprintf() tries to
-  write more than 4095 bytes before compression
-- Remove unused state from inflateBackEnd()
-- Remove exit(0) from minigzip.c, example.c
-- Get rid of all those darn tabs
-- Add "check" target to Makefile.in that does the same thing as "test"
-- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
-- Update contrib/inflate86 [Anderson]
-- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
-- Add msdos and win32 directories with makefiles [Truta]
-- More additions and improvements to the FAQ
-
-Changes in 1.2.0 (9 March 2003)
-- New and improved inflate code
-    - About 20% faster
-    - Does not allocate 32K window unless and until needed
-    - Automatically detects and decompresses gzip streams
-    - Raw inflate no longer needs an extra dummy byte at end
-    - Added inflateBack functions using a callback interface--even faster
-      than inflate, useful for file utilities (gzip, zip)
-    - Added inflateCopy() function to record state for random access on
-      externally generated deflate streams (e.g. in gzip files)
-    - More readable code (I hope)
-- New and improved crc32()
-    - About 50% faster, thanks to suggestions from Rodney Brown
-- Add deflateBound() and compressBound() functions
-- Fix memory leak in deflateInit2()
-- Permit setting dictionary for raw deflate (for parallel deflate)
-- Fix const declaration for gzwrite()
-- Check for some malloc() failures in gzio.c
-- Fix bug in gzopen() on single-byte file 0x1f
-- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
-  and next buffer doesn't start with 0x8b
-- Fix uncompress() to return Z_DATA_ERROR on truncated input
-- Free memory at end of example.c
-- Remove MAX #define in trees.c (conflicted with some libraries)
-- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
-- Declare malloc() and free() in gzio.c if STDC not defined
-- Use malloc() instead of calloc() in zutil.c if int big enough
-- Define STDC for AIX
-- Add aix/ with approach for compiling shared library on AIX
-- Add HP-UX support for shared libraries in configure
-- Add OpenUNIX support for shared libraries in configure
-- Use $cc instead of gcc to build shared library
-- Make prefix directory if needed when installing
-- Correct Macintosh avoidance of typedef Byte in zconf.h
-- Correct Turbo C memory allocation when under Linux
-- Use libz.a instead of -lz in Makefile (assure use of compiled library)
-- Update configure to check for snprintf or vsnprintf functions and their
-  return value, warn during make if using an insecure function
-- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
-  is lost when library is used--resolution is to build new zconf.h
-- Documentation improvements (in zlib.h):
-    - Document raw deflate and inflate
-    - Update RFCs URL
-    - Point out that zlib and gzip formats are different
-    - Note that Z_BUF_ERROR is not fatal
-    - Document string limit for gzprintf() and possible buffer overflow
-    - Note requirement on avail_out when flushing
-    - Note permitted values of flush parameter of inflate()
-- Add some FAQs (and even answers) to the FAQ
-- Add contrib/inflate86/ for x86 faster inflate
-- Add contrib/blast/ for PKWare Data Compression Library decompression
-- Add contrib/puff/ simple inflate for deflate format description
-
-Changes in 1.1.4 (11 March 2002)
-- ZFREE was repeated on same allocation on some error conditions.
-  This creates a security problem described in
-  http://www.zlib.org/advisory-2002-03-11.txt
-- Returned incorrect error (Z_MEM_ERROR) on some invalid data
-- Avoid accesses before window for invalid distances with inflate window
-  less than 32K.
-- force windowBits > 8 to avoid a bug in the encoder for a window size
-  of 256 bytes. (A complete fix will be available in 1.1.5).
-
-Changes in 1.1.3 (9 July 1998)
-- fix "an inflate input buffer bug that shows up on rare but persistent
-  occasions" (Mark)
-- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
-- fix gzseek(..., SEEK_SET) in write mode
-- fix crc check after a gzeek (Frank Faubert)
-- fix miniunzip when the last entry in a zip file is itself a zip file
-  (J Lillge)
-- add contrib/asm586 and contrib/asm686 (Brian Raiter)
-  See http://www.muppetlabs.com/~breadbox/software/assembly.html
-- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
-- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
-- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
-- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
-- added a FAQ file
-
-- Support gzdopen on Mac with Metrowerks (Jason Linhart)
-- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
-- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
-- avoid some warnings with Borland C (Tom Tanner)
-- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
-- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)
-- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
-- use libdir and includedir in Makefile.in (Tim Mooney)
-- support shared libraries on OSF1 V4 (Tim Mooney)
-- remove so_locations in "make clean"  (Tim Mooney)
-- fix maketree.c compilation error (Glenn, Mark)
-- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
-- new Makefile.riscos (Rich Walker)
-- initialize static descriptors in trees.c for embedded targets (Nick Smith)
-- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
-- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
-- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
-- fix maketree.c to allow clean compilation of inffixed.h (Mark)
-- fix parameter check in deflateCopy (Gunther Nikl)
-- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
-- Many portability patches by Christian Spieler:
-  . zutil.c, zutil.h: added "const" for zmem*
-  . Make_vms.com: fixed some typos
-  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
-  . msdos/Makefile.msc: remove "default rtl link library" info from obj files
-  . msdos/Makefile.*: use model-dependent name for the built zlib library
-  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
-     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
-- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
-- replace __far with _far for better portability (Christian Spieler, Tom Lane)
-- fix test for errno.h in configure (Tim Newsham)
-
-Changes in 1.1.2 (19 March 98)
-- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
-  See http://www.winimage.com/zLibDll/unzip.html
-- preinitialize the inflate tables for fixed codes, to make the code
-  completely thread safe (Mark)
-- some simplifications and slight speed-up to the inflate code (Mark)
-- fix gzeof on non-compressed files (Allan Schrum)
-- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
-- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
-- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
-- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
-- do not wrap extern "C" around system includes (Tom Lane)
-- mention zlib binding for TCL in README (Andreas Kupries)
-- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
-- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
-- allow "configure --prefix $HOME" (Tim Mooney)
-- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
-- move Makefile.sas to amiga/Makefile.sas
-
-Changes in 1.1.1 (27 Feb 98)
-- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
-- remove block truncation heuristic which had very marginal effect for zlib
-  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
-  compression ratio on some files. This also allows inlining _tr_tally for
-  matches in deflate_slow.
-- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
-
-Changes in 1.1.0 (24 Feb 98)
-- do not return STREAM_END prematurely in inflate (John Bowler)
-- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
-- compile with -DFASTEST to get compression code optimized for speed only
-- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
-- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
-  on Sun but significant on HP)
-
-- add a pointer to experimental unzip library in README (Gilles Vollant)
-- initialize variable gcc in configure (Chris Herborth)
-
-Changes in 1.0.9 (17 Feb 1998)
-- added gzputs and gzgets functions
-- do not clear eof flag in gzseek (Mark Diekhans)
-- fix gzseek for files in transparent mode (Mark Diekhans)
-- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
-- replace EXPORT with ZEXPORT to avoid conflict with other programs
-- added compress2 in zconf.h, zlib.def, zlib.dnt
-- new asm code from Gilles Vollant in contrib/asm386
-- simplify the inflate code (Mark):
- . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
- . ZALLOC the length list in inflate_trees_fixed() instead of using stack
- . ZALLOC the value area for huft_build() instead of using stack
- . Simplify Z_FINISH check in inflate()
-
-- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
-- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
-- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
-  the declaration of FAR (Gilles VOllant)
-- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
-- read_buf buf parameter of type Bytef* instead of charf*
-- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
-- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
-- fix check for presence of directories in "make install" (Ian Willis)
-
-Changes in 1.0.8 (27 Jan 1998)
-- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
-- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
-- added compress2() to allow setting the compression level
-- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
-- use constant arrays for the static trees in trees.c instead of computing
-  them at run time (thanks to Ken Raeburn for this suggestion). To create
-  trees.h, compile with GEN_TREES_H and run "make test".
-- check return code of example in "make test" and display result
-- pass minigzip command line options to file_compress
-- simplifying code of inflateSync to avoid gcc 2.8 bug
-
-- support CC="gcc -Wall" in configure -s (QingLong)
-- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
-- fix test for shared library support to avoid compiler warnings
-- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
-- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
-- do not use fdopen for Metrowerks on Mac (Brad Pettit))
-- add checks for gzputc and gzputc in example.c
-- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
-- use const for the CRC table (Ken Raeburn)
-- fixed "make uninstall" for shared libraries
-- use Tracev instead of Trace in infblock.c
-- in example.c use correct compressed length for test_sync
-- suppress +vnocompatwarnings in configure for HPUX (not always supported)
-
-Changes in 1.0.7 (20 Jan 1998)
-- fix gzseek which was broken in write mode
-- return error for gzseek to negative absolute position
-- fix configure for Linux (Chun-Chung Chen)
-- increase stack space for MSC (Tim Wegner)
-- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
-- define EXPORTVA for gzprintf (Gilles Vollant)
-- added man page zlib.3 (Rick Rodgers)
-- for contrib/untgz, fix makedir() and improve Makefile
-
-- check gzseek in write mode in example.c
-- allocate extra buffer for seeks only if gzseek is actually called
-- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
-- add inflateSyncPoint in zconf.h
-- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
-
-Changes in 1.0.6 (19 Jan 1998)
-- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
-  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
-- Fix a deflate bug occurring only with compression level 0 (thanks to
-  Andy Buckler for finding this one).
-- In minigzip, pass transparently also the first byte for .Z files.
-- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
-- check Z_FINISH in inflate (thanks to Marc Schluper)
-- Implement deflateCopy (thanks to Adam Costello)
-- make static libraries by default in configure, add --shared option.
-- move MSDOS or Windows specific files to directory msdos
-- suppress the notion of partial flush to simplify the interface
-  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
-- suppress history buffer provided by application to simplify the interface
-  (this feature was not implemented anyway in 1.0.4)
-- next_in and avail_in must be initialized before calling inflateInit or
-  inflateInit2
-- add EXPORT in all exported functions (for Windows DLL)
-- added Makefile.nt (thanks to Stephen Williams)
-- added the unsupported "contrib" directory:
-   contrib/asm386/ by Gilles Vollant <info@winimage.com>
-        386 asm code replacing longest_match().
-   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
-        A C++ I/O streams interface to the zlib gz* functions
-   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
-        Another C++ I/O streams interface
-   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
-        A very simple tar.gz file extractor using zlib
-   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
-        How to use compress(), uncompress() and the gz* functions from VB.
-- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
-  level) in minigzip (thanks to Tom Lane)
-
-- use const for rommable constants in deflate
-- added test for gzseek and gztell in example.c
-- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
-- add undocumented function zError to convert error code to string
-  (for Tim Smithers)
-- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
-- Use default memcpy for Symantec MSDOS compiler.
-- Add EXPORT keyword for check_func (needed for Windows DLL)
-- add current directory to LD_LIBRARY_PATH for "make test"
-- create also a link for libz.so.1
-- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
-- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
-- added -soname for Linux in configure (Chun-Chung Chen,
-- assign numbers to the exported functions in zlib.def (for Windows DLL)
-- add advice in zlib.h for best usage of deflateSetDictionary
-- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
-- allow compilation with ANSI keywords only enabled for TurboC in large model
-- avoid "versionString"[0] (Borland bug)
-- add NEED_DUMMY_RETURN for Borland
-- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
-- allow compilation with CC
-- defined STDC for OS/2 (David Charlap)
-- limit external names to 8 chars for MVS (Thomas Lund)
-- in minigzip.c, use static buffers only for 16-bit systems
-- fix suffix check for "minigzip -d foo.gz"
-- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
-- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
-- added makelcc.bat for lcc-win32 (Tom St Denis)
-- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
-- check for unistd.h in configure (for off_t)
-- remove useless check parameter in inflate_blocks_free
-- avoid useless assignment of s->check to itself in inflate_blocks_new
-- do not flush twice in gzclose (thanks to Ken Raeburn)
-- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
-- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
-- work around buggy fclose on pipes for HP/UX
-- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
-- fix configure if CC is already equal to gcc
-
-Changes in 1.0.5 (3 Jan 98)
-- Fix inflate to terminate gracefully when fed corrupted or invalid data
-- Use const for rommable constants in inflate
-- Eliminate memory leaks on error conditions in inflate
-- Removed some vestigial code in inflate
-- Update web address in README
-
-Changes in 1.0.4 (24 Jul 96)
-- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
-  bit, so the decompressor could decompress all the correct data but went
-  on to attempt decompressing extra garbage data. This affected minigzip too.
-- zlibVersion and gzerror return const char* (needed for DLL)
-- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
-- use z_error only for DEBUG (avoid problem with DLLs)
-
-Changes in 1.0.3 (2 Jul 96)
-- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
-  small and medium models; this makes the library incompatible with previous
-  versions for these models. (No effect in large model or on other systems.)
-- return OK instead of BUF_ERROR if previous deflate call returned with
-  avail_out as zero but there is nothing to do
-- added memcmp for non STDC compilers
-- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
-- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
-- better check for 16-bit mode MSC (avoids problem with Symantec)
-
-Changes in 1.0.2 (23 May 96)
-- added Windows DLL support
-- added a function zlibVersion (for the DLL support)
-- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
-- Bytef is define's instead of typedef'd only for Borland C
-- avoid reading uninitialized memory in example.c
-- mention in README that the zlib format is now RFC1950
-- updated Makefile.dj2
-- added algorithm.doc
-
-Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
-- fix array overlay in deflate.c which sometimes caused bad compressed data
-- fix inflate bug with empty stored block
-- fix MSDOS medium model which was broken in 0.99
-- fix deflateParams() which could generated bad compressed data.
-- Bytef is define'd instead of typedef'ed (work around Borland bug)
-- added an INDEX file
-- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
-  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
-- speed up adler32 for modern machines without auto-increment
-- added -ansi for IRIX in configure
-- static_init_done in trees.c is an int
-- define unlink as delete for VMS
-- fix configure for QNX
-- add configure branch for SCO and HPUX
-- avoid many warnings (unused variables, dead assignments, etc...)
-- no fdopen for BeOS
-- fix the Watcom fix for 32 bit mode (define FAR as empty)
-- removed redefinition of Byte for MKWERKS
-- work around an MWKERKS bug (incorrect merge of all .h files)
-
-Changes in 0.99 (27 Jan 96)
-- allow preset dictionary shared between compressor and decompressor
-- allow compression level 0 (no compression)
-- add deflateParams in zlib.h: allow dynamic change of compression level
-  and compression strategy.
-- test large buffers and deflateParams in example.c
-- add optional "configure" to build zlib as a shared library
-- suppress Makefile.qnx, use configure instead
-- fixed deflate for 64-bit systems (detected on Cray)
-- fixed inflate_blocks for 64-bit systems (detected on Alpha)
-- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
-- always return Z_BUF_ERROR when deflate() has nothing to do
-- deflateInit and inflateInit are now macros to allow version checking
-- prefix all global functions and types with z_ with -DZ_PREFIX
-- make falloc completely reentrant (inftrees.c)
-- fixed very unlikely race condition in ct_static_init
-- free in reverse order of allocation to help memory manager
-- use zlib-1.0/* instead of zlib/* inside the tar.gz
-- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
-  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
-- allow gzread on concatenated .gz files
-- deflateEnd now returns Z_DATA_ERROR if it was premature
-- deflate is finally (?) fully deterministic (no matches beyond end of input)
-- Document Z_SYNC_FLUSH
-- add uninstall in Makefile
-- Check for __cpluplus in zlib.h
-- Better test in ct_align for partial flush
-- avoid harmless warnings for Borland C++
-- initialize hash_head in deflate.c
-- avoid warning on fdopen (gzio.c) for HP cc -Aa
-- include stdlib.h for STDC compilers
-- include errno.h for Cray
-- ignore error if ranlib doesn't exist
-- call ranlib twice for NeXTSTEP
-- use exec_prefix instead of prefix for libz.a
-- renamed ct_* as _tr_* to avoid conflict with applications
-- clear z->msg in inflateInit2 before any error return
-- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
-- fixed typo in zconf.h (_GNUC__ => __GNUC__)
-- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
-- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
-- in fcalloc, normalize pointer if size > 65520 bytes
-- don't use special fcalloc for 32 bit Borland C++
-- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
-- use Z_BINARY instead of BINARY
-- document that gzclose after gzdopen will close the file
-- allow "a" as mode in gzopen.
-- fix error checking in gzread
-- allow skipping .gz extra-field on pipes
-- added reference to Perl interface in README
-- put the crc table in FAR data (I dislike more and more the medium model :)
-- added get_crc_table
-- added a dimension to all arrays (Borland C can't count).
-- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
-- guard against multiple inclusion of *.h (for precompiled header on Mac)
-- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
-- don't use unsized arrays to avoid silly warnings by Visual C++:
-     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
-     (what's wrong with far data in far model?).
-- define enum out of inflate_blocks_state to allow compilation with C++
-
-Changes in 0.95 (16 Aug 95)
-- fix MSDOS small and medium model (now easier to adapt to any compiler)
-- inlined send_bits
-- fix the final (:-) bug for deflate with flush (output was correct but
-  not completely flushed in rare occasions).
-- default window size is same for compression and decompression
-  (it's now sufficient to set MAX_WBITS in zconf.h).
-- voidp -> voidpf and voidnp -> voidp (for consistency with other
-  typedefs and because voidnp was not near in large model).
-
-Changes in 0.94 (13 Aug 95)
-- support MSDOS medium model
-- fix deflate with flush (could sometimes generate bad output)
-- fix deflateReset (zlib header was incorrectly suppressed)
-- added support for VMS
-- allow a compression level in gzopen()
-- gzflush now calls fflush
-- For deflate with flush, flush even if no more input is provided.
-- rename libgz.a as libz.a
-- avoid complex expression in infcodes.c triggering Turbo C bug
-- work around a problem with gcc on Alpha (in INSERT_STRING)
-- don't use inline functions (problem with some gcc versions)
-- allow renaming of Byte, uInt, etc... with #define.
-- avoid warning about (unused) pointer before start of array in deflate.c
-- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
-- avoid reserved word 'new' in trees.c
-
-Changes in 0.93 (25 June 95)
-- temporarily disable inline functions
-- make deflate deterministic
-- give enough lookahead for PARTIAL_FLUSH
-- Set binary mode for stdin/stdout in minigzip.c for OS/2
-- don't even use signed char in inflate (not portable enough)
-- fix inflate memory leak for segmented architectures
-
-Changes in 0.92 (3 May 95)
-- don't assume that char is signed (problem on SGI)
-- Clear bit buffer when starting a stored block
-- no memcpy on Pyramid
-- suppressed inftest.c
-- optimized fill_window, put longest_match inline for gcc
-- optimized inflate on stored blocks.
-- untabify all sources to simplify patches
-
-Changes in 0.91 (2 May 95)
-- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
-- Document the memory requirements in zconf.h
-- added "make install"
-- fix sync search logic in inflateSync
-- deflate(Z_FULL_FLUSH) now works even if output buffer too short
-- after inflateSync, don't scare people with just "lo world"
-- added support for DJGPP
-
-Changes in 0.9 (1 May 95)
-- don't assume that zalloc clears the allocated memory (the TurboC bug
-  was Mark's bug after all :)
-- let again gzread copy uncompressed data unchanged (was working in 0.71)
-- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
-- added a test of inflateSync in example.c
-- moved MAX_WBITS to zconf.h because users might want to change that.
-- document explicitly that zalloc(64K) on MSDOS must return a normalized
-  pointer (zero offset)
-- added Makefiles for Microsoft C, Turbo C, Borland C++
-- faster crc32()
-
-Changes in 0.8 (29 April 95)
-- added fast inflate (inffast.c)
-- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
-  is incompatible with previous versions of zlib which returned Z_OK.
-- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
-  (actually that was not a compiler bug, see 0.81 above)
-- gzread no longer reads one extra byte in certain cases
-- In gzio destroy(), don't reference a freed structure
-- avoid many warnings for MSDOS
-- avoid the ERROR symbol which is used by MS Windows
-
-Changes in 0.71 (14 April 95)
-- Fixed more MSDOS compilation problems :( There is still a bug with
-  TurboC large model.
-
-Changes in 0.7 (14 April 95)
-- Added full inflate support.
-- Simplified the crc32() interface. The pre- and post-conditioning
-  (one's complement) is now done inside crc32(). WARNING: this is
-  incompatible with previous versions; see zlib.h for the new usage.
-
-Changes in 0.61 (12 April 95)
-- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
-
-Changes in 0.6 (11 April 95)
-- added minigzip.c
-- added gzdopen to reopen a file descriptor as gzFile
-- added transparent reading of non-gziped files in gzread.
-- fixed bug in gzread (don't read crc as data)
-- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
-- don't allocate big arrays in the stack (for MSDOS)
-- fix some MSDOS compilation problems
-
-Changes in 0.5:
-- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
-  not yet Z_FULL_FLUSH.
-- support decompression but only in a single step (forced Z_FINISH)
-- added opaque object for zalloc and zfree.
-- added deflateReset and inflateReset
-- added a variable zlib_version for consistency checking.
-- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
-  Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
-
-Changes in 0.4:
-- avoid "zip" everywhere, use zlib instead of ziplib.
-- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
-  if compression method == 8.
-- added adler32 and crc32
-- renamed deflateOptions as deflateInit2, call one or the other but not both
-- added the method parameter for deflateInit2.
-- added inflateInit2
-- simplied considerably deflateInit and inflateInit by not supporting
-  user-provided history buffer. This is supported only in deflateInit2
-  and inflateInit2.
-
-Changes in 0.3:
-- prefix all macro names with Z_
-- use Z_FINISH instead of deflateEnd to finish compression.
-- added Z_HUFFMAN_ONLY
-- added gzerror()
diff --git a/src/dep/src/irrlicht/zlib/FAQ b/src/dep/src/irrlicht/zlib/FAQ
index 15d0436..e69de29 100644
--- a/src/dep/src/irrlicht/zlib/FAQ
+++ b/src/dep/src/irrlicht/zlib/FAQ
@@ -1,339 +0,0 @@
-
-                Frequently Asked Questions about zlib
-
-
-If your question is not there, please check the zlib home page
-http://www.zlib.org which may have more recent information.
-The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
-
-
- 1. Is zlib Y2K-compliant?
-
-    Yes. zlib doesn't handle dates.
-
- 2. Where can I get a Windows DLL version?
-
-    The zlib sources can be compiled without change to produce a DLL.
-    See the file win32/DLL_FAQ.txt in the zlib distribution.
-    Pointers to the precompiled DLL are found in the zlib web site at
-    http://www.zlib.org.
-
- 3. Where can I get a Visual Basic interface to zlib?
-
-    See
-        * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm
-        * contrib/visual-basic.txt in the zlib distribution
-        * win32/DLL_FAQ.txt in the zlib distribution
-
- 4. compress() returns Z_BUF_ERROR.
-
-    Make sure that before the call of compress, the length of the compressed
-    buffer is equal to the total size of the compressed buffer and not
-    zero. For Visual Basic, check that this parameter is passed by reference
-    ("as any"), not by value ("as long").
-
- 5. deflate() or inflate() returns Z_BUF_ERROR.
-
-    Before making the call, make sure that avail_in and avail_out are not
-    zero. When setting the parameter flush equal to Z_FINISH, also make sure
-    that avail_out is big enough to allow processing all pending input.
-    Note that a Z_BUF_ERROR is not fatal--another call to deflate() or
-    inflate() can be made with more input or output space. A Z_BUF_ERROR
-    may in fact be unavoidable depending on how the functions are used, since
-    it is not possible to tell whether or not there is more output pending
-    when strm.avail_out returns with zero.
-
- 6. Where's the zlib documentation (man pages, etc.)?
-
-    It's in zlib.h for the moment, and Francis S. Lin has converted it to a
-    web page zlib.html. Volunteers to transform this to Unix-style man pages,
-    please contact us (zlib@gzip.org). Examples of zlib usage are in the files
-    example.c and minigzip.c.
-
- 7. Why don't you use GNU autoconf or libtool or ...?
-
-    Because we would like to keep zlib as a very small and simple
-    package. zlib is rather portable and doesn't need much configuration.
-
- 8. I found a bug in zlib.
-
-    Most of the time, such problems are due to an incorrect usage of
-    zlib. Please try to reproduce the problem with a small program and send
-    the corresponding source to us at zlib@gzip.org . Do not send
-    multi-megabyte data files without prior agreement.
-
- 9. Why do I get "undefined reference to gzputc"?
-
-    If "make test" produces something like
-
-       example.o(.text+0x154): undefined reference to `gzputc'
-
-    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
-    /usr/X11R6/lib. Remove any old versions, then do "make install".
-
-10. I need a Delphi interface to zlib.
-
-    See the contrib/delphi directory in the zlib distribution.
-
-11. Can zlib handle .zip archives?
-
-    Not by itself, no.  See the directory contrib/minizip in the zlib
-    distribution.
-
-12. Can zlib handle .Z files?
-
-    No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt
-    the code of uncompress on your own.
-
-13. How can I make a Unix shared library?
-
-    make clean
-    ./configure -s
-    make
-
-14. How do I install a shared zlib library on Unix?
-
-    After the above, then:
-
-    make install
-
-    However, many flavors of Unix come with a shared zlib already installed.
-    Before going to the trouble of compiling a shared version of zlib and
-    trying to install it, you may want to check if it's already there! If you
-    can #include <zlib.h>, it's there. The -lz option will probably link to it.
-
-15. I have a question about OttoPDF.
-
-    We are not the authors of OttoPDF. The real author is on the OttoPDF web
-    site: Joel Hainley, jhainley@myndkryme.com.
-
-16. Can zlib decode Flate data in an Adobe PDF file?
-
-    Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ .
-    To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ .
-
-17. Why am I getting this "register_frame_info not found" error on Solaris?
-
-    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
-    generates an error such as:
-
-        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
-        symbol __register_frame_info: referenced symbol not found
-
-    The symbol __register_frame_info is not part of zlib, it is generated by
-    the C compiler (cc or gcc). You must recompile applications using zlib
-    which have this problem. This problem is specific to Solaris. See
-    http://www.sunfreeware.com for Solaris versions of zlib and applications
-    using zlib.
-
-18. Why does gzip give an error on a file I make with compress/deflate?
-
-    The compress and deflate functions produce data in the zlib format, which
-    is different and incompatible with the gzip format. The gz* functions in
-    zlib on the other hand use the gzip format. Both the zlib and gzip
-    formats use the same compressed data format internally, but have different
-    headers and trailers around the compressed data.
-
-19. Ok, so why are there two different formats?
-
-    The gzip format was designed to retain the directory information about
-    a single file, such as the name and last modification date. The zlib
-    format on the other hand was designed for in-memory and communication
-    channel applications, and has a much more compact header and trailer and
-    uses a faster integrity check than gzip.
-
-20. Well that's nice, but how do I make a gzip file in memory?
-
-    You can request that deflate write the gzip format instead of the zlib
-    format using deflateInit2(). You can also request that inflate decode
-    the gzip format using inflateInit2(). Read zlib.h for more details.
-
-21. Is zlib thread-safe?
-
-    Yes. However any library routines that zlib uses and any application-
-    provided memory allocation routines must also be thread-safe. zlib's gz*
-    functions use stdio library routines, and most of zlib's functions use the
-    library memory allocation routines by default. zlib's Init functions allow
-    for the application to provide custom memory allocation routines.
-
-    Of course, you should only operate on any given zlib or gzip stream from a
-    single thread at a time.
-
-22. Can I use zlib in my commercial application?
-
-    Yes. Please read the license in zlib.h.
-
-23. Is zlib under the GNU license?
-
-    No. Please read the license in zlib.h.
-
-24. The license says that altered source versions must be "plainly marked". So
-    what exactly do I need to do to meet that requirement?
-
-    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In
-    particular, the final version number needs to be changed to "f", and an
-    identification string should be appended to ZLIB_VERSION. Version numbers
-    x.x.x.f are reserved for modifications to zlib by others than the zlib
-    maintainers. For example, if the version of the base zlib you are altering
-    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
-    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also
-    update the version strings in deflate.c and inftrees.c.
-
-    For altered source distributions, you should also note the origin and
-    nature of the changes in zlib.h, as well as in ChangeLog and README, along
-    with the dates of the alterations. The origin should include at least your
-    name (or your company's name), and an email address to contact for help or
-    issues with the library.
-
-    Note that distributing a compiled zlib library along with zlib.h and
-    zconf.h is also a source distribution, and so you should change
-    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
-    in zlib.h as you would for a full source distribution.
-
-25. Will zlib work on a big-endian or little-endian architecture, and can I
-    exchange compressed data between them?
-
-    Yes and yes.
-
-26. Will zlib work on a 64-bit machine?
-
-    It should. It has been tested on 64-bit machines, and has no dependence
-    on any data types being limited to 32-bits in length. If you have any
-    difficulties, please provide a complete problem report to zlib@gzip.org
-
-27. Will zlib decompress data from the PKWare Data Compression Library?
-
-    No. The PKWare DCL uses a completely different compressed data format
-    than does PKZIP and zlib. However, you can look in zlib's contrib/blast
-    directory for a possible solution to your problem.
-
-28. Can I access data randomly in a compressed stream?
-
-    No, not without some preparation. If when compressing you periodically
-    use Z_FULL_FLUSH, carefully write all the pending data at those points,
-    and keep an index of those locations, then you can start decompression
-    at those points. You have to be careful to not use Z_FULL_FLUSH too
-    often, since it can significantly degrade compression.
-
-29. Does zlib work on MVS, OS/390, CICS, etc.?
-
-    We don't know for sure. We have heard occasional reports of success on
-    these systems. If you do use it on one of these, please provide us with
-    a report, instructions, and patches that we can reference when we get
-    these questions. Thanks.
-
-30. Is there some simpler, easier to read version of inflate I can look at
-    to understand the deflate format?
-
-    First off, you should read RFC 1951. Second, yes. Look in zlib's
-    contrib/puff directory.
-
-31. Does zlib infringe on any patents?
-
-    As far as we know, no. In fact, that was originally the whole point behind
-    zlib. Look here for some more information:
-
-    http://www.gzip.org/#faq11
-
-32. Can zlib work with greater than 4 GB of data?
-
-    Yes. inflate() and deflate() will process any amount of data correctly.
-    Each call of inflate() or deflate() is limited to input and output chunks
-    of the maximum value that can be stored in the compiler's "unsigned int"
-    type, but there is no limit to the number of chunks. Note however that the
-    strm.total_in and strm_total_out counters may be limited to 4 GB. These
-    counters are provided as a convenience and are not used internally by
-    inflate() or deflate(). The application can easily set up its own counters
-    updated after each call of inflate() or deflate() to count beyond 4 GB.
-    compress() and uncompress() may be limited to 4 GB, since they operate in a
-    single call. gzseek() and gztell() may be limited to 4 GB depending on how
-    zlib is compiled. See the zlibCompileFlags() function in zlib.h.
-
-    The word "may" appears several times above since there is a 4 GB limit
-    only if the compiler's "long" type is 32 bits. If the compiler's "long"
-    type is 64 bits, then the limit is 16 exabytes.
-
-33. Does zlib have any security vulnerabilities?
-
-    The only one that we are aware of is potentially in gzprintf(). If zlib
-    is compiled to use sprintf() or vsprintf(), then there is no protection
-    against a buffer overflow of a 4K string space, other than the caller of
-    gzprintf() assuring that the output will not exceed 4K. On the other
-    hand, if zlib is compiled to use snprintf() or vsnprintf(), which should
-    normally be the case, then there is no vulnerability. The ./configure
-    script will display warnings if an insecure variation of sprintf() will
-    be used by gzprintf(). Also the zlibCompileFlags() function will return
-    information on what variant of sprintf() is used by gzprintf().
-
-    If you don't have snprintf() or vsnprintf() and would like one, you can
-    find a portable implementation here:
-
-        http://www.ijs.si/software/snprintf/
-
-    Note that you should be using the most recent version of zlib. Versions
-    1.1.3 and before were subject to a double-free vulnerability.
-
-34. Is there a Java version of zlib?
-
-    Probably what you want is to use zlib in Java. zlib is already included
-    as part of the Java SDK in the java.util.zip package. If you really want
-    a version of zlib written in the Java language, look on the zlib home
-    page for links: http://www.zlib.org/
-
-35. I get this or that compiler or source-code scanner warning when I crank it
-    up to maximally-pedantic. Can't you guys write proper code?
-
-    Many years ago, we gave up attempting to avoid warnings on every compiler
-    in the universe. It just got to be a waste of time, and some compilers
-    were downright silly. So now, we simply make sure that the code always
-    works.
-
-36. Valgrind (or some similar memory access checker) says that deflate is
-    performing a conditional jump that depends on an uninitialized value.
-    Isn't that a bug?
-
-    No.  That is intentional for performance reasons, and the output of
-    deflate is not affected.  This only started showing up recently since
-    zlib 1.2.x uses malloc() by default for allocations, whereas earlier
-    versions used calloc(), which zeros out the allocated memory.
-
-37. Will zlib read the (insert any ancient or arcane format here) compressed
-    data format?
-
-    Probably not. Look in the comp.compression FAQ for pointers to various
-    formats and associated software.
-
-38. How can I encrypt/decrypt zip files with zlib?
-
-    zlib doesn't support encryption. The original PKZIP encryption is very weak
-    and can be broken with freely available programs. To get strong encryption,
-    use GnuPG, http://www.gnupg.org/ , which already includes zlib compression.
-    For PKZIP compatible "encryption", look at http://www.info-zip.org/
-
-39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
-
-    "gzip" is the gzip format, and "deflate" is the zlib format. They should
-    probably have called the second one "zlib" instead to avoid confusion
-    with the raw deflate compressed data format. While the HTTP 1.1 RFC 2616
-    correctly points to the zlib specification in RFC 1950 for the "deflate"
-    transfer encoding, there have been reports of servers and browsers that
-    incorrectly produce or expect raw deflate data per the deflate
-    specficiation in RFC 1951, most notably Microsoft. So even though the
-    "deflate" transfer encoding using the zlib format would be the more
-    efficient approach (and in fact exactly what the zlib format was designed
-    for), using the "gzip" transfer encoding is probably more reliable due to
-    an unfortunate choice of name on the part of the HTTP 1.1 authors.
-
-    Bottom line: use the gzip format for HTTP 1.1 encoding.
-
-40. Does zlib support the new "Deflate64" format introduced by PKWare?
-
-    No. PKWare has apparently decided to keep that format proprietary, since
-    they have not documented it as they have previous compression formats.
-    In any case, the compression improvements are so modest compared to other
-    more modern approaches, that it's not worth the effort to implement.
-
-41. Can you please sign these lengthy legal documents and fax them back to us
-    so that we can use your software in our product?
-
-    No. Go away. Shoo.
diff --git a/src/dep/src/irrlicht/zlib/INDEX b/src/dep/src/irrlicht/zlib/INDEX
index 4d7eac4..e69de29 100644
--- a/src/dep/src/irrlicht/zlib/INDEX
+++ b/src/dep/src/irrlicht/zlib/INDEX
@@ -1,51 +0,0 @@
-ChangeLog       history of changes
-FAQ             Frequently Asked Questions about zlib
-INDEX           this file
-Makefile        makefile for Unix (generated by configure)
-Makefile.in     makefile for Unix (template for configure)
-README          guess what
-algorithm.txt   description of the (de)compression algorithm
-configure       configure script for Unix
-zconf.in.h      template for zconf.h (used by configure)
-
-amiga/          makefiles for Amiga SAS C
-as400/          makefiles for IBM AS/400
-msdos/          makefiles for MSDOS
-old/            makefiles for various architectures and zlib documentation
-                files that have not yet been updated for zlib 1.2.x
-projects/       projects for various Integrated Development Environments
-qnx/            makefiles for QNX
-win32/          makefiles for Windows
-
-                zlib public header files (must be kept):
-zconf.h
-zlib.h
-
-                private source files used to build the zlib library:
-adler32.c
-compress.c
-crc32.c
-crc32.h
-deflate.c
-deflate.h
-gzio.c
-infback.c
-inffast.c
-inffast.h
-inffixed.h
-inflate.c
-inflate.h
-inftrees.c
-inftrees.h
-trees.c
-trees.h
-uncompr.c
-zutil.c
-zutil.h
-
-                source files for sample programs:
-example.c
-minigzip.c
-
-                unsupported contribution by third parties
-See contrib/README.contrib
diff --git a/src/dep/src/irrlicht/zlib/README b/src/dep/src/irrlicht/zlib/README
index 80f71ae..e69de29 100644
--- a/src/dep/src/irrlicht/zlib/README
+++ b/src/dep/src/irrlicht/zlib/README
@@ -1,125 +0,0 @@
-ZLIB DATA COMPRESSION LIBRARY
-
-zlib 1.2.3 is a general purpose data compression library.  All the code is
-thread safe.  The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
-and rfc1952.txt (gzip format). These documents are also available in other
-formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
-of the library is given in the file example.c which also tests that the library
-is working correctly. Another example is given in the file minigzip.c. The
-compression library itself is composed of all source files except example.c and
-minigzip.c.
-
-To compile all files and run the test program, follow the instructions given at
-the top of Makefile. In short "make test; make install" should work for most
-machines. For Unix: "./configure; make test; make install". For MSDOS, use one
-of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.
-
-Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
-<info@winimage.com> for the Windows DLL version. The zlib home page is
-http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem,
-please check this site to verify that you have the latest version of zlib;
-otherwise get the latest version and check whether the problem still exists or
-not.
-
-PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking
-for help.
-
-Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
-issue of  Dr. Dobb's Journal; a copy of the article is available in
-http://dogma.net/markn/articles/zlibtool/zlibtool.htm
-
-The changes made in version 1.2.3 are documented in the file ChangeLog.
-
-Unsupported third party contributions are provided in directory "contrib".
-
-A Java implementation of zlib is available in the Java Development Kit
-http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html
-See the zlib home page http://www.zlib.org for details.
-
-A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is in the
-CPAN (Comprehensive Perl Archive Network) sites
-http://www.cpan.org/modules/by-module/Compress/
-
-A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
-available in Python 1.5 and later versions, see
-http://www.python.org/doc/lib/module-zlib.html
-
-A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com> is
-availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html
-
-An experimental package to read and write files in .zip format, written on top
-of zlib by Gilles Vollant <info@winimage.com>, is available in the
-contrib/minizip directory of zlib.
-
-
-Notes for some targets:
-
-- For Windows DLL versions, please see win32/DLL_FAQ.txt
-
-- For 64-bit Irix, deflate.c must be compiled without any optimization. With
-  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
-  compiler flag). The compiler bug has been reported to SGI.
-
-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
-  when compiled with cc.
-
-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
-  necessary to get gzprintf working correctly. This is done by configure.
-
-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
-  other compilers. Use "make test" to check your compiler.
-
-- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
-
-- For PalmOs, see http://palmzlib.sourceforge.net/
-
-- When building a shared, i.e. dynamic library on Mac OS X, the library must be
-  installed before testing (do "make install" before "make test"), since the
-  library location is specified in the library.
-
-
-Acknowledgments:
-
-  The deflate format used by zlib was defined by Phil Katz. The deflate
-  and zlib specifications were written by L. Peter Deutsch. Thanks to all the
-  people who reported problems and suggested various improvements in zlib;
-  they are too numerous to cite here.
-
-Copyright notice:
-
- (C) 1995-2004 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not*
-receiving lengthy legal documents to sign. The sources are provided
-for free but without warranty of any kind.  The library has been
-entirely written by Jean-loup Gailly and Mark Adler; it does not
-include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include
-in the file ChangeLog history information documenting your changes. Please
-read the FAQ for more information on the distribution of modified source
-versions.
diff --git a/src/dep/src/zlib/Makefile.am b/src/dep/src/zlib/Makefile.am
index c7d57b1..da76e02 100644
--- a/src/dep/src/zlib/Makefile.am
+++ b/src/dep/src/zlib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES += -I$(srcdir)/../../include -I$(srcdir)/../../include/zlib
+INCLUDES = -I../../include/zlib -I../../include
 
 noinst_LIBRARIES = libzlib.a
 
diff --git a/src/dep/src/zlib/Makefile.in b/src/dep/src/zlib/Makefile.in
index 2af7b13..e69de29 100644
--- a/src/dep/src/zlib/Makefile.in
+++ b/src/dep/src/zlib/Makefile.in
@@ -1,482 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = dep/src/zlib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
-libzlib_a_AR = $(AR) $(ARFLAGS)
-libzlib_a_LIBADD =
-am_libzlib_a_OBJECTS = adler32.$(OBJEXT) compress.$(OBJEXT) \
-	crc32.$(OBJEXT) deflate.$(OBJEXT) example.$(OBJEXT) \
-	gzio.$(OBJEXT) infback.$(OBJEXT) inffast.$(OBJEXT) \
-	inflate.$(OBJEXT) inftrees.$(OBJEXT) trees.$(OBJEXT) \
-	uncompr.$(OBJEXT) zutil.$(OBJEXT)
-libzlib_a_OBJECTS = $(am_libzlib_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libzlib_a_SOURCES)
-DIST_SOURCES = $(libzlib_a_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COMPILER_OPTIONS = @COMPILER_OPTIONS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTRA_COMPILER_OPTIONS = @EXTRA_COMPILER_OPTIONS@
-EXTRA_LINKER_OPTIONS = @EXTRA_LINKER_OPTIONS@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-INCLUDES = @INCLUDES@ -I$(srcdir)/../../include \
-	-I$(srcdir)/../../include/zlib
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINKER_OPTIONS = @LINKER_OPTIONS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LTMS_AGE = @LTMS_AGE@
-LTMS_CURRENT = @LTMS_CURRENT@
-LTMS_RELEASE = @LTMS_RELEASE@
-LTMS_REVISION = @LTMS_REVISION@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MANGOSD_CONFIG = @MANGOSD_CONFIG@
-MANGOSD_CONFIGDIR = @MANGOSD_CONFIGDIR@
-MANGOSD_DATA = @MANGOSD_DATA@
-MANGOSD_ENABLE_CLI = @MANGOSD_ENABLE_CLI@
-MANGOSD_ENABLE_RA = @MANGOSD_ENABLE_RA@
-MYSQL_INCLUDES = @MYSQL_INCLUDES@
-MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
-OBJEXT = @OBJEXT@
-OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
-OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-REALMD_CONFIG = @REALMD_CONFIG@
-REALMD_CONFIGDIR = @REALMD_CONFIGDIR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-WITH_APIDOCS = @WITH_APIDOCS@
-WITH_APIDOCS_TARGET = @WITH_APIDOCS_TARGET@
-WITH_PYTHON_SUBDIR = @WITH_PYTHON_SUBDIR@
-WITH_PYTHON_SUBPACKAGE = @WITH_PYTHON_SUBPACKAGE@
-WITH_PYTHON_VERSION = @WITH_PYTHON_VERSION@
-__DOXYGEN = @__DOXYGEN@
-__PYTHON = @__PYTHON@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-noinst_LIBRARIES = libzlib.a
-libzlib_a_SOURCES = \
-adler32.c \
-compress.c \
-crc32.c \
-deflate.c \
-example.c \
-gzio.c \
-infback.c \
-inffast.c \
-inflate.c \
-inftrees.c \
-trees.c \
-uncompr.c \
-zutil.c
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  dep/src/zlib/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  dep/src/zlib/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libzlib.a: $(libzlib_a_OBJECTS) $(libzlib_a_DEPENDENCIES) 
-	-rm -f libzlib.a
-	$(libzlib_a_AR) libzlib.a $(libzlib_a_OBJECTS) $(libzlib_a_LIBADD)
-	$(RANLIB) libzlib.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/example.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzio.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/dep/src/zthread/Makefile.am b/src/dep/src/zthread/Makefile.am
index dc47166..63275bc 100644
--- a/src/dep/src/zthread/Makefile.am
+++ b/src/dep/src/zthread/Makefile.am
@@ -17,24 +17,24 @@
 ## WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 ## CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-AM_CXXFLAGS = @COMPILER_OPTIONS@ @EXTRA_COMPILER_OPTIONS@
-INCLUDES += -I$(srcdir)/../../include -I$(srcdir)/../../include/zthread
+#AM_CXXFLAGS = @COMPILER_OPTIONS@ @EXTRA_COMPILER_OPTIONS@
+INCLUDES = -I../../include/zthread -I../../include
 SUBDIRS=.
 
-libdir=$(prefix)/lib
+#libdir=$(top_builddir)/src/dep/lib/linux-gcc
+noinst_LIBRARIES = libZThread.a
+# lib_LTLIBRARIES = libZThread.la
 
-lib_LTLIBRARIES = libZThread.la
-
-libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
-libZThread_la_LDFLAGS= \
-        -release $(LT_RELEASE)  \
-        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+#libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
+#libZThread_a_LDFLAGS= \
+#        -release $(LT_RELEASE)  \
+#        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 
-LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
+#LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
 
 
-libZThread_la_SOURCES = \
+libZThread_a_SOURCES = \
 AtomicCount.cxx \
 Condition.cxx \
 ConcurrentExecutor.cxx \
diff --git a/src/dep/src/zthread/Makefile.in b/src/dep/src/zthread/Makefile.in
index e167ce4..e69de29 100644
--- a/src/dep/src/zthread/Makefile.in
+++ b/src/dep/src/zthread/Makefile.in
@@ -1,659 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = dep/src/zthread
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libZThread_la_DEPENDENCIES =
-am_libZThread_la_OBJECTS = AtomicCount.lo Condition.lo \
-	ConcurrentExecutor.lo CountingSemaphore.lo FastMutex.lo \
-	FastRecursiveMutex.lo Mutex.lo RecursiveMutexImpl.lo \
-	RecursiveMutex.lo Monitor.lo PoolExecutor.lo \
-	PriorityCondition.lo PriorityInheritanceMutex.lo \
-	PriorityMutex.lo PrioritySemaphore.lo Semaphore.lo \
-	SynchronousExecutor.lo Thread.lo ThreadedExecutor.lo \
-	ThreadImpl.lo ThreadLocalImpl.lo ThreadQueue.lo Time.lo \
-	ThreadOps.lo
-libZThread_la_OBJECTS = $(am_libZThread_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libZThread_la_SOURCES)
-DIST_SOURCES = $(libZThread_la_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COMPILER_OPTIONS = @COMPILER_OPTIONS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTRA_COMPILER_OPTIONS = @EXTRA_COMPILER_OPTIONS@
-EXTRA_LINKER_OPTIONS = @EXTRA_LINKER_OPTIONS@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-INCLUDES = @INCLUDES@ -I$(srcdir)/../../include \
-	-I$(srcdir)/../../include/zthread
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINKER_OPTIONS = @LINKER_OPTIONS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LTMS_AGE = @LTMS_AGE@
-LTMS_CURRENT = @LTMS_CURRENT@
-LTMS_RELEASE = @LTMS_RELEASE@
-LTMS_REVISION = @LTMS_REVISION@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MANGOSD_CONFIG = @MANGOSD_CONFIG@
-MANGOSD_CONFIGDIR = @MANGOSD_CONFIGDIR@
-MANGOSD_DATA = @MANGOSD_DATA@
-MANGOSD_ENABLE_CLI = @MANGOSD_ENABLE_CLI@
-MANGOSD_ENABLE_RA = @MANGOSD_ENABLE_RA@
-MYSQL_INCLUDES = @MYSQL_INCLUDES@
-MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
-OBJEXT = @OBJEXT@
-OPENSSL_INCLUDES = @OPENSSL_INCLUDES@
-OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-REALMD_CONFIG = @REALMD_CONFIG@
-REALMD_CONFIGDIR = @REALMD_CONFIGDIR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-WITH_APIDOCS = @WITH_APIDOCS@
-WITH_APIDOCS_TARGET = @WITH_APIDOCS_TARGET@
-WITH_PYTHON_SUBDIR = @WITH_PYTHON_SUBDIR@
-WITH_PYTHON_SUBPACKAGE = @WITH_PYTHON_SUBPACKAGE@
-WITH_PYTHON_VERSION = @WITH_PYTHON_VERSION@
-__DOXYGEN = @__DOXYGEN@
-__PYTHON = @__PYTHON@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = $(prefix)/lib
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AM_CXXFLAGS = @COMPILER_OPTIONS@ @EXTRA_COMPILER_OPTIONS@
-SUBDIRS = .
-lib_LTLIBRARIES = libZThread.la
-libZThread_la_LIBADD = @LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
-libZThread_la_LDFLAGS = \
-        -release $(LT_RELEASE)  \
-        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
-LIBADD = @LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
-libZThread_la_SOURCES = \
-AtomicCount.cxx \
-Condition.cxx \
-ConcurrentExecutor.cxx \
-CountingSemaphore.cxx \
-FastMutex.cxx \
-FastRecursiveMutex.cxx \
-Mutex.cxx \
-RecursiveMutexImpl.cxx \
-RecursiveMutex.cxx \
-Monitor.cxx \
-PoolExecutor.cxx \
-PriorityCondition.cxx \
-PriorityInheritanceMutex.cxx \
-PriorityMutex.cxx \
-PrioritySemaphore.cxx \
-Semaphore.cxx \
-SynchronousExecutor.cxx \
-Thread.cxx \
-ThreadedExecutor.cxx \
-ThreadImpl.cxx \
-ThreadLocalImpl.cxx \
-ThreadQueue.cxx \
-Time.cxx \
-ThreadOps.cxx
-
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .cxx .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  dep/src/zthread/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  dep/src/zthread/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libZThread.la: $(libZThread_la_OBJECTS) $(libZThread_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libZThread_la_LDFLAGS) $(libZThread_la_OBJECTS) $(libZThread_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AtomicCount.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConcurrentExecutor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Condition.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CountingSemaphore.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FastMutex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FastRecursiveMutex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Monitor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Mutex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PoolExecutor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PriorityCondition.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PriorityInheritanceMutex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PriorityMutex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PrioritySemaphore.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RecursiveMutex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RecursiveMutexImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Semaphore.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SynchronousExecutor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Thread.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ThreadImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ThreadLocalImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ThreadOps.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ThreadQueue.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ThreadedExecutor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Time.Plo@am__quote@
-
-.cxx.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-
-.cxx.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cxx.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(LTLIBRARIES)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/shared/ADTFile.cpp b/src/shared/ADTFile.cpp
index 7d778ac..f91775e 100644
--- a/src/shared/ADTFile.cpp
+++ b/src/shared/ADTFile.cpp
@@ -259,7 +259,7 @@ bool ADTFile::LoadMem(ByteBuffer& buf)
                     {
                         _chunks[mcnkid].layer[i] = buf.read<MCLY_chunk>();
                     }
-                    if(_chunks[mcnkid].layer[i].flags & 0x200)
+                    if(_chunks[mcnkid].layer[_chunks[mcnkid].nTextures].flags & 0x200)
                         mcal_compressed = true;
                 }
                 else if(!strcmp((char*)mfcc,"MCSH"))
diff --git a/src/shared/Auth/Makefile.am b/src/shared/Auth/Makefile.am
index 0742f6d..55a953d 100644
--- a/src/shared/Auth/Makefile.am
+++ b/src/shared/Auth/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm  -Wall
+AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -I$(top_builddir)/src/dep/include -Wall
 ## Build pseuwow
 noinst_LIBRARIES = libauth.a
 libauth_a_SOURCES = AuthCrypt.cpp  BigNumber.cpp  md5.c  Sha1.cpp  Hmac.cpp
diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am
index d535ee4..bdd0bfe 100644
--- a/src/shared/Makefile.am
+++ b/src/shared/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 SUBDIRS = Auth Network
-AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm  -Wall
+AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -I$(top_builddir)/src/dep/include  -Wall
 ## Build pseuwow
 noinst_LIBRARIES = libshared.a
 libshared_a_SOURCES = 	ADTFile.cpp       common.h      log.h        MapTile.h        tools.cpp    Widen.h\
diff --git a/src/tools/stuffextract/Makefile.am b/src/tools/stuffextract/Makefile.am
index 2093768..0a073a4 100644
--- a/src/tools/stuffextract/Makefile.am
+++ b/src/tools/stuffextract/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 SUBDIRS = StormLib
-AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm  -Wall
+AM_CPPFLAGS = -I$(top_builddir)/src/Client -I$(top_builddir)/src/shared -I$(top_builddir)/src/Client/DefScript -I$(top_builddir)/src/Client/World -I$(top_builddir)/src/Client/Realm -I$(top_builddir)/src/dep/include -Wall
 ## Build pseuwow
 bin_PROGRAMS = stuffextract
 stuffextract_SOURCES = 	dbcfile.cpp  Locale.cpp  MPQFile.cpp  MPQHelper.cpp  StuffExtract.cpp