Merge branch 'master' into opengl3

[irrlicht.git] / include / irrlicht.h

diff --git a/include/irrlicht.h b/include/irrlicht.h
index 978643625c9a5365d7920740cf7cfb55e676c5af..359f810f4aa140956e5d509406f89d6324468f25 100644 (file)
--- a/include/irrlicht.h
+++ b/include/irrlicht.h
@@ -29,13 +29,11 @@
 #ifndef __IRRLICHT_H_INCLUDED__\r
 #define __IRRLICHT_H_INCLUDED__\r
 \r
-#include "IrrCompileConfig.h"\r
 #include "aabbox3d.h"\r
 #include "CIndexBuffer.h"\r
 #include "CMeshBuffer.h"\r
 #include "coreutil.h"\r
 #include "CVertexBuffer.h"\r
-#include "IProfiler.h"\r
 #include "dimension2d.h"\r
 #include "ECullingTypes.h"\r
 #include "EDebugSceneTypes.h"\r
@@ -47,7 +45,6 @@
 #include "EMaterialFlags.h"\r
 #include "EMaterialTypes.h"\r
 #include "EMeshWriterEnums.h"\r
-#include "EMessageBoxFlags.h"\r
 #include "ESceneNodeTypes.h"\r
 #include "fast_atof.h"\r
 #include "IAnimatedMesh.h"\r
@@ -65,31 +62,21 @@
 #include "IGPUProgrammingServices.h"\r
 #include "IGUIButton.h"\r
 #include "IGUICheckBox.h"\r
-#include "IGUIColorSelectDialog.h"\r
 #include "IGUIComboBox.h"\r
-#include "IGUIContextMenu.h"\r
 #include "IGUIEditBox.h"\r
 #include "IGUIElement.h"\r
-#include "IGUIElementFactory.h"\r
 #include "IGUIEnvironment.h"\r
 #include "IGUIFileOpenDialog.h"\r
 #include "IGUIFont.h"\r
 #include "IGUIFontBitmap.h"\r
 #include "IGUIImage.h"\r
-#include "IGUIInOutFader.h"\r
 #include "IGUIListBox.h"\r
-#include "IGUIMeshViewer.h"\r
 #include "IGUIScrollBar.h"\r
 #include "IGUISkin.h"\r
-#include "IGUISpinBox.h"\r
 #include "IGUISpriteBank.h"\r
 #include "IGUIStaticText.h"\r
 #include "IGUITabControl.h"\r
-#include "IGUITable.h"\r
 #include "IGUIToolbar.h"\r
-#include "IGUIWindow.h"\r
-#include "IGUITreeView.h"\r
-#include "IGUIProfiler.h"\r
 #include "IImage.h"\r
 #include "IImageLoader.h"\r
 #include "IImageWriter.h"\r
@@ -108,10 +95,8 @@
 #include "IReadFile.h"\r
 #include "IReferenceCounted.h"\r
 #include "irrArray.h"\r
-#include "IRandomizer.h"\r
 #include "IRenderTarget.h"\r
 #include "IrrlichtDevice.h"\r
-#include "irrList.h"\r
 #include "irrMath.h"\r
 #include "irrString.h"\r
 #include "irrTypes.h"\r
@@ -119,14 +104,12 @@
 #include "ISceneCollisionManager.h"\r
 #include "ISceneManager.h"\r
 #include "ISceneNode.h"\r
-#include "ISceneNodeFactory.h"\r
 #include "IShaderConstantSetCallBack.h"\r
 #include "ISkinnedMesh.h"\r
 #include "ITexture.h"\r
 #include "ITimer.h"\r
 #include "IVertexBuffer.h"\r
 #include "IVideoDriver.h"\r
-#include "IVideoModeList.h"\r
 #include "IWriteFile.h"\r
 #include "Keycodes.h"\r
 #include "line2d.h"\r
@@ -142,7 +125,6 @@
 #include "SColor.h"\r
 #include "SExposedVideoData.h"\r
 #include "SIrrCreationParameters.h"\r
-#include "SLight.h"\r
 #include "SMaterial.h"\r
 #include "SMesh.h"\r
 #include "SMeshBuffer.h"\r
@@ -152,6 +134,7 @@
 #include "triangle3d.h"\r
 #include "vector2d.h"\r
 #include "vector3d.h"\r
+#include "IrrCompileConfig.h" // for IRRLICHT_API and IRRCALLCONV\r
 \r
 /*! \mainpage Irrlicht Engine 1.9 API documentation\r
  *\r
@@ -288,7 +271,7 @@ namespace irr
        device could not be created.\r
        */\r
        extern "C" IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDevice(\r
-               video::E_DRIVER_TYPE driverType = video::EDT_SOFTWARE,\r
+               video::E_DRIVER_TYPE driverType = video::EDT_OPENGL,\r
                // parentheses are necessary for some compilers\r
                const core::dimension2d<u32>& windowSize = (core::dimension2d<u32>(640,480)),\r
                u32 bits = 32,\r