diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/EDeviceTypes.h | 2 | ||||
| -rw-r--r-- | include/EDriverTypes.h | 59 | ||||
| -rw-r--r-- | include/IEventReceiver.h | 8 | ||||
| -rw-r--r-- | include/IVideoDriver.h | 146 | ||||
| -rw-r--r-- | include/IrrCompileConfig.h | 446 | ||||
| -rw-r--r-- | include/IrrlichtDevice.h | 36 | ||||
| -rw-r--r-- | include/SIrrCreationParameters.h | 6 | ||||
| -rw-r--r-- | include/SMaterial.h | 3 | ||||
| -rwxr-xr-x | include/exampleHelper.h | 3 | ||||
| -rw-r--r-- | include/irrMath.h | 9 | ||||
| -rw-r--r-- | include/irrTypes.h | 3 | ||||
| -rw-r--r-- | include/irrUString.h | 4 | ||||
| -rw-r--r-- | include/irrlicht.h | 4 | ||||
| -rw-r--r-- | include/matrix4.h | 1 | ||||
| -rwxr-xr-x | include/mt_opengl.h | 2 |
15 files changed, 30 insertions, 702 deletions
diff --git a/include/EDeviceTypes.h b/include/EDeviceTypes.h index be61460..a0c1ca7 100644 --- a/include/EDeviceTypes.h +++ b/include/EDeviceTypes.h @@ -31,7 +31,7 @@ namespace irr //! A device which uses Simple DirectMedia Layer
/** The SDL device works under all platforms supported by SDL but first must be compiled
- in by defining the _IRR_COMPILE_WITH_SDL_DEVICE_ macro in IrrCompileConfig.h */
+ in by setting the USE_SDL2 CMake option to ON */
EIDT_SDL,
//! This selection allows Irrlicht to choose the best device from the ones available.
diff --git a/include/EDriverTypes.h b/include/EDriverTypes.h index f5a2e92..0409757 100644 --- a/include/EDriverTypes.h +++ b/include/EDriverTypes.h @@ -20,39 +20,12 @@ namespace video 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. */
- EDT_SOFTWARE,
-
- //! 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,
-
- //! Direct3D8 device is longer supported in Irrlicht. You have to go back to Irrlicht 1.8 if you still need that.
- DEPRECATED_EDT_DIRECT3D8_NO_LONGER_EXISTS, // keep enum to avoid breaking enumeration order (might be used in ini-files, serialization, etc)
-
- //! Direct3D 9 device, only available on Win32 platforms.
- /** 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. */
EDT_OPENGL,
- //! OpenGL-ES 1.x driver, for embedded and mobile systems
+ //! OpenGL-ES 1.x driver, for embedded and mobile systems
EDT_OGLES1,
//! OpenGL-ES 2.x driver, for embedded and mobile systems
@@ -62,38 +35,12 @@ namespace video //! WebGL1 friendly subset of OpenGL-ES 2.x driver for Emscripten
EDT_WEBGL1,
+ EDT_OPENGL3,
+
//! No driver, just for counting the elements
EDT_COUNT
};
- const c8* const DRIVER_TYPE_NAMES[] =
- {
- "NullDriver",
- "Software Renderer",
- "Burning's Video",
- "Direct3D 8.1",
- "Direct3D 9.0c",
- "OpenGL 1.x/2.x/3.x",
- "OpenGL ES1",
- "OpenGL ES2",
- "WebGL 1",
- 0
- };
-
- const c8* const DRIVER_TYPE_NAMES_SHORT[] =
- {
- "null",
- "software",
- "burning",
- "d3d8",
- "d3d9",
- "opengl",
- "ogles1",
- "ogles2",
- "webgl1",
- 0
- };
-
} // end namespace video
} // end namespace irr
diff --git a/include/IEventReceiver.h b/include/IEventReceiver.h index 91588a3..ed82b5f 100644 --- a/include/IEventReceiver.h +++ b/include/IEventReceiver.h @@ -452,10 +452,10 @@ struct SEvent /** 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 irr::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. */
+ * active device, and @ref irr::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
diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h index a8cea13..4f00f44 100644 --- a/include/IVideoDriver.h +++ b/include/IVideoDriver.h @@ -56,32 +56,13 @@ namespace video ETS_WORLD,
//! Projection transformation
ETS_PROJECTION,
- //! Texture transformation
+ //! Texture 0 transformation
+ //! Use ETS_TEXTURE_0 + texture_number to access other texture transformations
ETS_TEXTURE_0,
- //! Texture transformation
+ //! Texture 1 transformation
ETS_TEXTURE_1,
- //! Texture transformation
- ETS_TEXTURE_2,
- //! Texture transformation
- ETS_TEXTURE_3,
-#if _IRR_MATERIAL_MAX_TEXTURES_>4
- //! Texture transformation
- ETS_TEXTURE_4,
-#if _IRR_MATERIAL_MAX_TEXTURES_>5
- //! Texture transformation
- ETS_TEXTURE_5,
-#if _IRR_MATERIAL_MAX_TEXTURES_>6
- //! Texture transformation
- ETS_TEXTURE_6,
-#if _IRR_MATERIAL_MAX_TEXTURES_>7
- //! Texture transformation
- ETS_TEXTURE_7,
-#endif
-#endif
-#endif
-#endif
//! Only used internally
- ETS_COUNT = ETS_TEXTURE_0 + _IRR_MATERIAL_MAX_TEXTURES_
+ ETS_COUNT = ETS_TEXTURE_0 + MATERIAL_MAX_TEXTURES
};
//! Special render targets, which usually map to dedicated hardware
@@ -738,23 +719,6 @@ namespace video 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 drawVertexPrimitiveList for some triangles.
- This method works with all drivers because it simply calls
- drawVertexPrimitiveList, 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
- \code
- driver->setMaterial(someMaterial);
- driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
- \endcode
- for some properly set up material before drawing the triangle.
- \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 draw3DLine for the edges of the
box. Note that the box is drawn using the current transformation
@@ -800,35 +764,6 @@ namespace video 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.
- /** 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 draw2DImageBatch(const video::ITexture* texture,
- const core::position2d<s32>& pos,
- const core::array<core::rect<s32> >& sourceRects,
- const core::array<s32>& indices,
- s32 kerningWidth=0,
- 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.
/** All drawings are clipped against clipRect (if != 0).
The subtextures are defined by the array of sourceRects and are
positioned using the array of positions.
@@ -898,13 +833,6 @@ namespace video 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.
/** In theory both start and end will be included in coloring.
BUG: Currently d3d ignores the last pixel
@@ -918,72 +846,6 @@ namespace video 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 polygon.
- /** 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;
-
- //! 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.
- 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 Array of 3d vectors, specifying the shadow
- volume.
- \param zfail If set to true, zfail method is used, otherwise
- zpass.
- \param debugDataVisible The debug data that is enabled for this
- shadow node
- */
- virtual void drawStencilShadowVolume(const core::array<core::vector3df>& triangles, bool zfail=true, u32 debugDataVisible=0) =0;
-
- //! 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.
- 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),
- video::SColor leftDownEdge = video::SColor(255,0,0,0),
- 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;
diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h index fe1e29d..0271289 100644 --- a/include/IrrCompileConfig.h +++ b/include/IrrCompileConfig.h @@ -20,454 +20,14 @@ #include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
-//! The defines for different operating system are:
-//! _IRR_WINDOWS_ for all irrlicht supported Windows versions
-//! _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_IOS_PLATFORM_ for Apple devices running iOS
-//! _IRR_ANDROID_PLATFORM_ for devices running Android
-//! _IRR_POSIX_API_ for Posix compatible systems
-//! Note: PLATFORM defines the OS specific layer, API can group several platforms
-
-//! DEVICE is the windowing system used, several PLATFORMs support more than one DEVICE
-//! Irrlicht can be compiled with more than one device
-//! _IRR_COMPILE_WITH_WINDOWS_DEVICE_ for Windows API based device
-//! _IRR_COMPILE_WITH_OSX_DEVICE_ for Cocoa native windowing on OSX
-//! _IRR_COMPILE_WITH_X11_DEVICE_ for Linux X11 based device
-//! _IRR_COMPILE_WITH_SDL_DEVICE_ for platform independent SDL framework
-
-//! Passing defines to the compiler which have NO in front of the _IRR definename is an alternative
-//! way which can be used to disable defines (instead of outcommenting them in this header).
-//! So defines can be controlled from Makefiles or Projectfiles which allows building
-//! different library versions without having to change the sources.
-//! Example: NO_IRR_COMPILE_WITH_X11_ would disable X11
-
-//! Uncomment this line to compile with the SDL device
-//#define _IRR_COMPILE_WITH_SDL_DEVICE_
-#ifdef NO_IRR_COMPILE_WITH_SDL_DEVICE_
-#undef _IRR_COMPILE_WITH_SDL_DEVICE_
-#endif
-
-//! WIN32 for Windows32
-//! WIN64 for Windows64
-// The windows platform and API support SDL and WINDOW device
-#if defined(_WIN32) || defined(_WIN64)
-#define _IRR_WINDOWS_
-#define _IRR_WINDOWS_API_
-#ifndef _IRR_COMPILE_WITH_SDL_DEVICE_
-#define _IRR_COMPILE_WITH_WINDOWS_DEVICE_
-#endif
-#endif
-
-#if defined(__APPLE__)
-#if defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) || defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
-#define _IRR_IOS_PLATFORM_
-#define _IRR_COMPILE_WITH_IOS_DEVICE_
-#define NO_IRR_COMPILE_WITH_OPENGL_
-// The application state events and following methods: IrrlichtDevice::isWindowActive, IrrlichtDevice::isWindowFocused,
-// IrrlichtDevice::isWindowMinimized works out of box only if you'll use built-in CIrrDelegateiOS,
-// so _IRR_COMPILE_WITH_IOS_BUILTIN_MAIN_ must be enabled in this case. If you need a custom UIApplicationDelegate
-// you must disable _IRR_COMPILE_WITH_IOS_BUILTIN_MAIN_ definition and handle all application events yourself.
-#define _IRR_COMPILE_WITH_IOS_BUILTIN_MAIN_
-#else
-#define _IRR_OSX_PLATFORM_
-#ifndef _IRR_COMPILE_WITH_SDL_DEVICE_
-#define _IRR_COMPILE_WITH_OSX_DEVICE_
-#endif
-#define NO_IRR_COMPILE_WITH_OGLES1_
-#define NO_IRR_COMPILE_WITH_OGLES2_
-#define NO_IRR_COMPILE_WITH_WEBGL1_
-#endif
-#endif
-
-#if defined(__EMSCRIPTEN__)
-#define _IRR_EMSCRIPTEN_PLATFORM_
-#define NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_
-#define NO_IRR_COMPILE_WITH_OPENGL_
-#define NO_IRR_COMPILE_WITH_OGLES1_
-#define _IRR_COMPILE_WITH_OGLES2_
-#define _IRR_COMPILE_WITH_WEBGL1_
-#define _IRR_COMPILE_WITH_EGL_MANAGER_
-#define _IRR_COMPILE_WITH_SDL_DEVICE_
-#define NO_IRR_COMPILE_WITH_X11_DEVICE_
-#define _IRR_LINUX_PLATFORM_ // emscripten basically working like a unix
-#endif // __EMSCRIPTEN__
-
-#if defined(__ANDROID__)
-#define _IRR_ANDROID_PLATFORM_
-#define _IRR_COMPILE_WITH_ANDROID_DEVICE_
-#define _IRR_COMPILE_ANDROID_ASSET_READER_
-#define NO_IRR_COMPILE_WITH_OPENGL_
-#endif
-
-#if defined(__SVR4) && defined(__sun)
-#define _IRR_SOLARIS_PLATFORM_
-#if defined(__sparc)
- #define __BIG_ENDIAN__
-#endif
-#endif
-
-#if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_) && !defined(_IRR_IOS_PLATFORM_) && !defined(_IRR_ANDROID_PLATFORM_) && !defined(_IRR_EMSCRIPTEN_PLATFORM_)
-#ifndef _IRR_SOLARIS_PLATFORM_
-#define _IRR_LINUX_PLATFORM_
-#endif
-#define _IRR_POSIX_API_
-#ifndef _IRR_COMPILE_WITH_SDL_DEVICE_
-#define _IRR_COMPILE_WITH_X11_DEVICE_
-#endif
-#endif
-
-
-//! Define _IRR_COMPILE_WITH_JOYSTICK_SUPPORT_ if you want joystick events.
-#if !(defined(__FreeBSD__) || defined(__OpenBSD__))
-#define _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
-#endif
-#ifdef NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_
-#undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
-#endif
-
-
-//! Maximum number of texture an SMaterial can have, up to 8 are supported by Irrlicht.
-#define _IRR_MATERIAL_MAX_TEXTURES_ 4
-
-//! Add a leak-hunter to Irrlicht which helps finding unreleased reference counted objects.
-//! NOTE: This is slow and should only be used for debugging
-//#define _IRR_COMPILE_WITH_LEAK_HUNTER_
-#ifdef NO_IRR_COMPILE_WITH_LEAK_HUNTER_
-#undef _IRR_COMPILE_WITH_LEAK_HUNTER_
-#endif
-
-//! Enable profiling information in the engine
-/** NOTE: The profiler itself always exists and can be used by applications.
-This define is about the engine creating profile data
-while it runs and enabling it will slow down the engine. */
-//#define _IRR_COMPILE_WITH_PROFILING_
-#ifdef NO_IRR_COMPILE_WITH_PROFILING_
-#undef _IRR_COMPILE_WITH_PROFILING_
-#endif
-
-//! Define _IRR_COMPILE_WITH_DIRECT3D_9_ to compile the Irrlicht engine with DIRECT3D9.
-/** If you only want to use the software device or opengl you can disable those defines.
-This switch is mostly disabled because people do not get the g++ compiler compile
-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
-*/
-#if defined(_IRR_WINDOWS_API_) && defined(IRR_COMPILE_WITH_DX9_DEV_PACK)
-
-//! Define _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_ if you want to use DirectInput for joystick handling.
-/** This only applies to Windows devices, currently only supported under Win32 device.
-If not defined, Windows Multimedia library is used, which offers also broad support for joystick devices. */
-#define _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
-#ifdef NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
-#undef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
-#endif
-
-#endif
-
-//! Define _IRR_COMPILE_WITH_OPENGL_ to compile the Irrlicht engine with OpenGL.
-/** If you do not wish the engine to be compiled with OpenGL, comment this
-define out. */
-#define _IRR_COMPILE_WITH_OPENGL_
-#ifdef NO_IRR_COMPILE_WITH_OPENGL_
-#undef _IRR_COMPILE_WITH_OPENGL_
-#endif
-
-//! Define required options for OpenGL drivers.
-#if defined(_IRR_COMPILE_WITH_OPENGL_)
- #if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
- #define _IRR_OPENGL_USE_EXTPOINTER_
- #define _IRR_COMPILE_WITH_WGL_MANAGER_
- #elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
- #define _IRR_OPENGL_USE_EXTPOINTER_
- #define _IRR_COMPILE_WITH_GLX_MANAGER_
- #elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
- #define _IRR_COMPILE_WITH_NSOGL_MANAGER_
- #elif defined(_IRR_SOLARIS_PLATFORM_)
- #define _IRR_COMPILE_WITH_GLX_MANAGER_
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
- #define _IRR_OPENGL_USE_EXTPOINTER_
- #endif
-#endif
-
-//! Define _IRR_COMPILE_WITH_OGLES1_ to compile the Irrlicht engine with OpenGL ES 1.1.
-/** If you do not wish the engine to be compiled with OpenGL ES 1.1, comment this
-define out.
-Depending on platform you may have to enable _IRR_OGLES1_USE_KHRONOS_API_HEADERS_ as well when using it.
-*/
-#if defined(_IRR_ANDROID_PLATFORM_) || defined(_IRR_IOS_PLATFORM_)
-#define _IRR_COMPILE_WITH_OGLES1_
-#endif
-#ifdef NO_IRR_COMPILE_WITH_OGLES1_
-#undef _IRR_COMPILE_WITH_OGLES1_
-#endif
-
-#ifdef _IRR_COMPILE_WITH_OGLES1_
-//! Define _IRR_OGLES1_USE_KHRONOS_API_HEADERS_ to use the OpenGL ES headers from the Debian Khronos-api package
-//#define _IRR_OGLES1_USE_KHRONOS_API_HEADERS_
-#endif
-
-//! Define required options for OpenGL ES 1.1 drivers.
-#if defined(_IRR_COMPILE_WITH_OGLES1_)
-#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_)
-#define _IRR_OGLES1_USE_EXTPOINTER_
-#ifndef _IRR_COMPILE_WITH_EGL_MANAGER_
-#define _IRR_COMPILE_WITH_EGL_MANAGER_
-#endif
-#elif defined(_IRR_COMPILE_WITH_IOS_DEVICE_)
-#ifndef _IRR_COMPILE_WITH_EAGL_MANAGER_
-#define _IRR_COMPILE_WITH_EAGL_MANAGER_
-#endif
-#endif
-#endif
-
-//! Define _IRR_COMPILE_WITH_OGLES2_ to compile the Irrlicht engine with OpenGL ES 2.0.
-/** If you do not wish the engine to be compiled with OpenGL ES 2.0, comment this
-define out. */
-#if defined(_IRR_ANDROID_PLATFORM_) || defined(_IRR_IOS_PLATFORM_)
-#define _IRR_COMPILE_WITH_OGLES2_
-#else
-//#define _IRR_COMPILE_WITH_OGLES2_
-#endif
-#ifdef NO_IRR_COMPILE_WITH_OGLES2_
-#undef _IRR_COMPILE_WITH_OGLES2_
-#endif
-
-//! Define _IRR_COMPILE_WITH_WEBGL1_ to compile Irrlicht engine with a WebGL friendly
-//! subset of the OpenGL ES 2.0 driver.
-//#define _IRR_COMPILE_WITH_WEBGL1_
-#ifdef NO_IRR_COMPILE_WITH_WEBGL1_
-#undef _IRR_COMPILE_WITH_WEBGL1_
-#endif
-#ifdef _IRR_COMPILE_WITH_WEBGL1_
-#define _IRR_COMPILE_WITH_OGLES2_ // it's a subset of OGL ES2, so always needed when using WebGL
-#endif
-
-//! Define required options for OpenGL ES 2.0 drivers.
-#if defined(_IRR_COMPILE_WITH_OGLES2_)
-#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) || defined(__EMSCRIPTEN__)
-#define _IRR_OGLES2_USE_EXTPOINTER_
-#ifndef _IRR_COMPILE_WITH_EGL_MANAGER_
-#define _IRR_COMPILE_WITH_EGL_MANAGER_
-#endif
-#elif defined(_IRR_COMPILE_WITH_IOS_DEVICE_)
-#ifndef _IRR_COMPILE_WITH_EAGL_MANAGER_
-#define _IRR_COMPILE_WITH_EAGL_MANAGER_
-#endif
-#endif
-#endif
-
-
-
-//! Define _IRR_COMPILE_WITH_X11_ to compile the Irrlicht engine with X11 support.
-/** If you do not wish the engine to be compiled with X11, comment this
-define out. */
-// Only used in LinuxDevice.
-#define _IRR_COMPILE_WITH_X11_
-#ifdef NO_IRR_COMPILE_WITH_X11_
-#undef _IRR_COMPILE_WITH_X11_
-#endif
-
-#if defined(_IRR_LINUX_PLATFORM_) && defined(_IRR_COMPILE_WITH_X11_)
-//! XInput2 (library called Xi) is currently only used to support touch-input.
-#define _IRR_LINUX_X11_XINPUT2_
-#ifdef NO_IRR_LINUX_X11_XINPUT2_
-#undef _IRR_LINUX_X11_XINPUT2_
-#endif
-
-//! X11 has by default only monochrome cursors, but using the Xcursor library we can also get color cursor support.
-//! If you have the need for custom color cursors on X11 then enable this and make sure you also link
-//! to the Xcursor library in your Makefile/Projectfile.
-//#define _IRR_LINUX_XCURSOR_
-#ifdef NO_IRR_LINUX_XCURSOR_
-#undef _IRR_LINUX_XCURSOR_
-#endif
-
-#endif
-
-//! Define _IRR_COMPILE_WITH_GUI_ to compile the engine with the built-in GUI
-/** Disable this if you are using an external library to draw the GUI. If you disable this then
-you will not be able to use anything provided by the GUI Environment, including loading fonts. */
-#define _IRR_COMPILE_WITH_GUI_
-#ifdef NO_IRR_COMPILE_WITH_GUI_
-#undef _IRR_COMPILE_WITH_GUI_
-#endif
-
-//! Define _IRR_COMPILE_WITH_LIBJPEG_ to enable compiling the engine using libjpeg.
-/** This enables the engine to read jpeg images. If you comment this out,
-the engine will no longer read .jpeg images. */
-#define _IRR_COMPILE_WITH_LIBJPEG_
-#ifdef NO_IRR_COMPILE_WITH_LIBJPEG_
-#undef _IRR_COMPILE_WITH_LIBJPEG_
-#endif
-
-//! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
-/** This enables the engine to read png images. If you comment this out,
-the engine will no longer read .png images. */
-#define _IRR_COMPILE_WITH_LIBPNG_
-#ifdef NO_IRR_COMPILE_WITH_LIBPNG_
-#undef _IRR_COMPILE_WITH_LIBPNG_
-#endif
-
-//! Uncomment the following line if you want to ignore the deprecated warnings
-//#define IGNORE_DEPRECATED_WARNING
-
-//! Define _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_ to support BillboardSceneNodes
-#define _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_
-#ifdef NO_IRR_COMPILE_WITH_BILLBOARD_SCENENODE_
-#undef _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_
-#endif
-
-//! Define _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_ if you want to use bone based
-/** animated meshes. If you compile without this, you will be unable to load
-B3D, MS3D or X meshes */
-#define _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-#ifdef NO_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-#undef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-#endif
-
-#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-//! Define _IRR_COMPILE_WITH_B3D_LOADER_ if you want to use Blitz3D files
-#define _IRR_COMPILE_WITH_B3D_LOADER_
-#ifdef NO_IRR_COMPILE_WITH_B3D_LOADER_
-#undef _IRR_COMPILE_WITH_B3D_LOADER_
-#endif
-//! Define _IRR_COMPILE_WITH_X_LOADER_ if you want to use Microsoft X files
-#define _IRR_COMPILE_WITH_X_LOADER_
-#ifdef NO_IRR_COMPILE_WITH_X_LOADER_
-#undef _IRR_COMPILE_WITH_X_LOADER_
-#endif
-#endif // _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-
-//! Define _IRR_COMPILE_WITH_OBJ_LOADER_ if you want to load Wavefront OBJ files
-#define _IRR_COMPILE_WITH_OBJ_LOADER_
-#ifdef NO_IRR_COMPILE_WITH_OBJ_LOADER_
-#undef _IRR_COMPILE_WITH_OBJ_LOADER_
-#endif
-
-//! 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_
-#ifdef NO_IRR_COMPILE_WITH_BMP_LOADER_
-#undef _IRR_COMPILE_WITH_BMP_LOADER_
-#endif
-//! Define _IRR_COMPILE_WITH_JPG_LOADER_ if you want to load .jpg files
-#define _IRR_COMPILE_WITH_JPG_LOADER_
-#ifdef NO_IRR_COMPILE_WITH_JPG_LOADER_
-#undef _IRR_COMPILE_WITH_JPG_LOADER_
-#endif
-//! Define _IRR_COMPILE_WITH_PNG_LOADER_ if you want to load .png files
-#define _IRR_COMPILE_WITH_PNG_LOADER_
-#ifdef NO_IRR_COMPILE_WITH_PNG_LOADER_
-#undef _IRR_COMPILE_WITH_PNG_LOADER_
-#endif
-//! Define _IRR_COMPILE_WITH_TGA_LOADER_ if you want to load .tga files
-#define _IRR_COMPILE_WITH_TGA_LOADER_
-#ifdef NO_IRR_COMPILE_WITH_TGA_LOADER_
-#undef _IRR_COMPILE_WITH_TGA_LOADER_
-#endif
-
-//! Define _IRR_COMPILE_WITH_JPG_WRITER_ if you want to write .jpg files
-#define _IRR_COMPILE_WITH_JPG_WRITER_
-#ifdef NO_IRR_COMPILE_WITH_JPG_WRITER_
-#undef _IRR_COMPILE_WITH_JPG_WRITER_
-#endif
-//! Define _IRR_COMPILE_WITH_PNG_WRITER_ if you want to write .png files
-#define _IRR_COMPILE_WITH_PNG_WRITER_
-#ifdef NO_IRR_COMPILE_WITH_PNG_WRITER_
-#undef _IRR_COMPILE_WITH_PNG_WRITER_
-#endif
-
-//! Define __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_ if you want to open ZIP and GZIP archives
-/** ZIP reading has several more options below to configure. */
-#define __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
-#ifdef NO__IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
-#undef __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
-#endif
-#ifdef __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
-//! Define _IRR_COMPILE_WITH_ZLIB_ to enable compiling the engine using zlib.
-/** This enables the engine to read from compressed .zip archives. If you
-disable this feature, the engine can still read archives, but only uncompressed
-ones. */
-#define _IRR_COMPILE_WITH_ZLIB_
-#ifdef NO_IRR_COMPILE_WITH_ZLIB_
-#undef _IRR_COMPILE_WITH_ZLIB_
-#endif
-#endif
-
-//! Define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ if you want to mount folders as archives
-#define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
-#ifdef NO__IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
-#undef __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
-#endif
-
-// 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)
+#ifdef _WIN32
#define IRRCALLCONV __stdcall
#else
-#define IRRCALLCONV __cdecl
-#endif // STDCALL_SUPPORTED
-
-#else // _IRR_WINDOWS_API_
-
-// Force symbol export in shared libraries built with gcc.
-#if defined(__GNUC__) && !defined(_IRR_STATIC_LIB_) && defined(IRRLICHT_EXPORTS)
-#define IRRLICHT_API __attribute__ ((visibility("default")))
-#else
-#define IRRLICHT_API
-#endif
-
#define IRRCALLCONV
-
-#endif // _IRR_WINDOWS_API_
-
-#if defined(_IRR_SOLARIS_PLATFORM_)
- #undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
-#endif
-
-//! Define __IRR_HAS_S64 if the irr::s64 type should be enable (needs long long, available on most platforms, but not part of ISO C++ 98)
-#define __IRR_HAS_S64
-#ifdef NO__IRR_HAS_S64
-#undef __IRR_HAS_S64
#endif
-#ifndef __has_feature
- #define __has_feature(x) 0 // Compatibility with non-clang compilers.
-#endif
-
-#ifdef _DEBUG
- //! A few attributes are written in CSceneManager when _IRR_SCENEMANAGER_DEBUG is enabled
- // NOTE: Those attributes were used always until 1.8.0 and became a global define for 1.8.1
- // which is only enabled in debug because it had a large (sometimes >5%) impact on speed.
- // A better solution in the long run is to break the interface and remove _all_ attribute
- // access in functions like CSceneManager::drawAll and instead put that information in some
- // own struct/class or in CSceneManager.
- // See http://irrlicht.sourceforge.net/forum/viewtopic.php?f=2&t=48211 for the discussion.
- #define _IRR_SCENEMANAGER_DEBUG
- #ifdef NO_IRR_SCENEMANAGER_DEBUG
- #undef _IRR_SCENEMANAGER_DEBUG
- #endif
+#ifndef IRRLICHT_API
+#define IRRLICHT_API
#endif
#endif // __IRR_COMPILE_CONFIG_H_INCLUDED__
-
diff --git a/include/IrrlichtDevice.h b/include/IrrlichtDevice.h index b967d70..07d4f9f 100644 --- a/include/IrrlichtDevice.h +++ b/include/IrrlichtDevice.h @@ -235,8 +235,8 @@ namespace irr 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.
+ \return true if joysticks are supported on this device, false if joysticks are not
+ supported or support is compiled out.
*/
virtual bool activateJoysticks(core::array<SJoystickInfo>& joystickInfo) =0;
@@ -310,37 +310,7 @@ namespace irr for a configuration requested when creating the device. */
static bool isDriverSupported(video::E_DRIVER_TYPE driver)
{
- switch (driver)
- {
- case video::EDT_NULL:
- return true;
- case video::EDT_OPENGL:
-#ifdef _IRR_COMPILE_WITH_OPENGL_
- return true;
-#else
- return false;
-#endif
- case video::EDT_OGLES1:
-#ifdef _IRR_COMPILE_WITH_OGLES1_
- return true;
-#else
- return false;
-#endif
- case video::EDT_OGLES2:
-#ifdef _IRR_COMPILE_WITH_OGLES2_
- return true;
-#else
- return false;
-#endif
- case video::EDT_WEBGL1:
-#ifdef _IRR_COMPILE_WITH_WEBGL1_
- return true;
-#else
- return false;
-#endif
- default:
- return false;
- }
+ return true;
}
};
diff --git a/include/SIrrCreationParameters.h b/include/SIrrCreationParameters.h index f99fce5..7439604 100644 --- a/include/SIrrCreationParameters.h +++ b/include/SIrrCreationParameters.h @@ -11,7 +11,7 @@ #include "ILogger.h"
#include "position2d.h"
#include "path.h"
-#include "IrrCompileConfig.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_SDK_VERSION
namespace irr
{
@@ -24,7 +24,7 @@ namespace irr //! Constructs a SIrrlichtCreationParameters structure with default values.
SIrrlichtCreationParameters() :
DeviceType(EIDT_BEST),
- DriverType(video::EDT_BURNINGSVIDEO),
+ DriverType(video::EDT_OPENGL),
WindowSize(core::dimension2d<u32>(800, 600)),
WindowPosition(core::position2di(-1,-1)),
Bits(32),
@@ -53,7 +53,7 @@ namespace irr UsePerformanceTimer(true),
SDK_version_do_not_use(IRRLICHT_SDK_VERSION),
PrivateData(0),
-#if defined(_IRR_COMPILE_WITH_IOS_DEVICE_) || defined(_IRR_ANDROID_PLATFORM_) || defined(_IRR_EMSCRIPTEN_PLATFORM_)
+#ifdef IRR_MOBILE_PATHS
OGLES2ShaderPath("media/Shaders/")
#else
OGLES2ShaderPath("../../media/Shaders/")
diff --git a/include/SMaterial.h b/include/SMaterial.h index 43dadb6..88460e0 100644 --- a/include/SMaterial.h +++ b/include/SMaterial.h @@ -12,6 +12,7 @@ #include "EMaterialTypes.h"
#include "EMaterialFlags.h"
#include "SMaterialLayer.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API
namespace irr
{
@@ -280,7 +281,7 @@ namespace video /** SMaterial might ignore some textures in most function, like assignment and comparison,
when SIrrlichtCreationParameters::MaxTextureUnits is set to a lower number.
*/
- const u32 MATERIAL_MAX_TEXTURES = _IRR_MATERIAL_MAX_TEXTURES_;
+ const u32 MATERIAL_MAX_TEXTURES = 4;
//! Struct for holding parameters for a material renderer
// Note for implementors: Serialization is in CNullDriver
diff --git a/include/exampleHelper.h b/include/exampleHelper.h index e1e7cb2..a98ed96 100755 --- a/include/exampleHelper.h +++ b/include/exampleHelper.h @@ -5,7 +5,6 @@ #ifndef __EXAMPLE_HELPER_H_INCLUDED__
#define __EXAMPLE_HELPER_H_INCLUDED__
-#include "IrrCompileConfig.h"
#include "path.h"
namespace irr
@@ -13,7 +12,7 @@ namespace irr static io::path getExampleMediaPath()
{
-#if defined (_IRR_IOS_PLATFORM_) || defined (_IRR_ANDROID_PLATFORM_) || defined (_IRR_OSX_PLATFORM_) || defined (_IRR_EMSCRIPTEN_PLATFORM_)
+#ifdef IRR_MOBILE_PATHS
return io::path("media/");
#else
return io::path("../../media/");
diff --git a/include/irrMath.h b/include/irrMath.h index 994f8cd..c4e8619 100644 --- a/include/irrMath.h +++ b/include/irrMath.h @@ -5,7 +5,6 @@ #ifndef __IRR_MATH_H_INCLUDED__
#define __IRR_MATH_H_INCLUDED__
-#include "IrrCompileConfig.h"
#include "irrTypes.h"
#include <math.h>
#include <float.h>
@@ -21,9 +20,7 @@ namespace core const s32 ROUNDING_ERROR_S32 = 0;
-#ifdef __IRR_HAS_S64
const s64 ROUNDING_ERROR_S64 = 0;
-#endif
const f32 ROUNDING_ERROR_f32 = 0.000001f;
const f64 ROUNDING_ERROR_f64 = 0.00000001;
@@ -186,7 +183,6 @@ namespace core return ROUNDING_ERROR_S32;
}
-#ifdef __IRR_HAS_S64
template <>
inline s64 roundingError()
{
@@ -198,7 +194,6 @@ namespace core {
return ROUNDING_ERROR_S64;
}
-#endif
template <class T>
inline T relativeErrorFactor()
@@ -310,13 +305,11 @@ namespace core return a <= tolerance;
}
-#ifdef __IRR_HAS_S64
//! returns if a equals zero, taking rounding errors into account
inline bool iszero(const s64 a, const s64 tolerance = 0)
{
return abs_(a) <= tolerance;
}
-#endif
inline s32 s32_min(s32 a, s32 b)
{
@@ -406,13 +399,11 @@ namespace core return static_cast<s32>(squareroot(static_cast<f32>(f)));
}
-#ifdef __IRR_HAS_S64
// calculate: sqrt ( x )
REALINLINE s64 squareroot(const s64 f)
{
return static_cast<s64>(squareroot(static_cast<f64>(f)));
}
-#endif
// calculate: 1 / sqrt ( x )
REALINLINE f64 reciprocal_squareroot(const f64 x)
diff --git a/include/irrTypes.h b/include/irrTypes.h index e67b395..98b1ed6 100644 --- a/include/irrTypes.h +++ b/include/irrTypes.h @@ -5,7 +5,6 @@ #ifndef __IRR_TYPES_H_INCLUDED__
#define __IRR_TYPES_H_INCLUDED__
-#include "IrrCompileConfig.h"
#include <stdint.h>
namespace irr
@@ -38,13 +37,11 @@ typedef uint32_t u32; typedef int32_t s32;
-#ifdef __IRR_HAS_S64
//! 64 bit unsigned variable.
typedef uint64_t u64;
//! 64 bit signed variable.
typedef int64_t s64;
-#endif // __IRR_HAS_S64
diff --git a/include/irrUString.h b/include/irrUString.h index 8e553fd..b0b730f 100644 --- a/include/irrUString.h +++ b/include/irrUString.h @@ -174,7 +174,7 @@ inline core::array<u8> getUnicodeBOM(EUTF_ENCODE mode) COPY_ARRAY(BOM_ENCODE_UTF8, BOM_ENCODE_UTF8_LEN); break; case EUTFE_UTF16: - #ifdef __BIG_ENDIAN__ + #if __BYTE_ORDER == __BIG_ENDIAN COPY_ARRAY(BOM_ENCODE_UTF16_BE, BOM_ENCODE_UTF16_LEN); #else COPY_ARRAY(BOM_ENCODE_UTF16_LE, BOM_ENCODE_UTF16_LEN); @@ -187,7 +187,7 @@ inline core::array<u8> getUnicodeBOM(EUTF_ENCODE mode) COPY_ARRAY(BOM_ENCODE_UTF16_LE, BOM_ENCODE_UTF16_LEN); break; case EUTFE_UTF32: - #ifdef __BIG_ENDIAN__ + #if __BYTE_ORDER == __BIG_ENDIAN COPY_ARRAY(BOM_ENCODE_UTF32_BE, BOM_ENCODE_UTF32_LEN); #else COPY_ARRAY(BOM_ENCODE_UTF32_LE, BOM_ENCODE_UTF32_LEN); diff --git a/include/irrlicht.h b/include/irrlicht.h index 065ed60..359f810 100644 --- a/include/irrlicht.h +++ b/include/irrlicht.h @@ -29,7 +29,6 @@ #ifndef __IRRLICHT_H_INCLUDED__
#define __IRRLICHT_H_INCLUDED__
-#include "IrrCompileConfig.h"
#include "aabbox3d.h"
#include "CIndexBuffer.h"
#include "CMeshBuffer.h"
@@ -135,6 +134,7 @@ #include "triangle3d.h"
#include "vector2d.h"
#include "vector3d.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API and IRRCALLCONV
/*! \mainpage Irrlicht Engine 1.9 API documentation
*
@@ -271,7 +271,7 @@ namespace irr device could not be created.
*/
extern "C" IRRLICHT_API IrrlichtDevice* IRRCALLCONV createDevice(
- video::E_DRIVER_TYPE driverType = video::EDT_SOFTWARE,
+ video::E_DRIVER_TYPE driverType = video::EDT_OPENGL,
// parentheses are necessary for some compilers
const core::dimension2d<u32>& windowSize = (core::dimension2d<u32>(640,480)),
u32 bits = 32,
diff --git a/include/matrix4.h b/include/matrix4.h index c410973..efd353d 100644 --- a/include/matrix4.h +++ b/include/matrix4.h @@ -12,6 +12,7 @@ #include "aabbox3d.h"
#include "rect.h"
#include "irrString.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API
// enable this to keep track of changes to the matrix
// and make simpler identity check for seldom changing matrices
diff --git a/include/mt_opengl.h b/include/mt_opengl.h index e7876cf..7b76cd9 100755 --- a/include/mt_opengl.h +++ b/include/mt_opengl.h @@ -5,7 +5,7 @@ #include <string> #include <unordered_set> -#include "IrrCompileConfig.h" +#include "IrrCompileConfig.h" // for IRRLICHT_API #include "irrTypes.h" #include "IContextManager.h" #include <KHR/khrplatform.h> |