Merge pull request 'master' (#5) from Mirrorlandia_minetest/irrlicht:master into master

Reviewed-on: #5

.editorconfig

@@ -1,3 +1,5 @@
+root = true
+
 [*]
 charset = utf-8
 

.github/workflows/build.yml

@@ -8,43 +8,46 @@ on:
 jobs:
 
   linux-gl:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
           sudo apt-get update
-          sudo apt-get install g++ cmake libxxf86vm-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+          sudo apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
 
       - name: Build
         run: |
-          cmake .
+          cmake . -DUSE_SDL2=OFF
           make VERBOSE=1 -j2
 
+      - name: Test
+        run: |
+          ctest --output-on-failure
+
       - name: Package
         run: |
           make DESTDIR=$PWD/_install install
           tar -c -I "gzip -9" -f irrlicht-linux.tar.gz -C ./_install/usr/local .
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: irrlicht-linux
           path: ./irrlicht-linux.tar.gz
 
   linux-gles:
-    runs-on: ubuntu-18.04
+    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
           sudo apt-get update
-          sudo apt-get install g++ cmake libxxf86vm-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          sudo apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
-          sed '/#define _IRR_COMPILE_WITH_OGLES2_/ s|^//||g' -i include/IrrCompileConfig.h
-          sed '/#define _IRR_COMPILE_WITH_OPENGL_/ s|^|//|g' -i include/IrrCompileConfig.h
-          cmake . -DBUILD_EXAMPLES=1
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=OFF -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
           make -j2
 
       - name: Test (headless)
@@ -55,44 +58,113 @@ jobs:
       - name: Test (Xvfb)
         run: |
           cd bin/Linux
-          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
 
-  win32:
-    runs-on: ubuntu-18.04
+  linux-sdl:
+    # something is wrong with the SDL cmake files on 20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
           sudo apt-get update
-          sudo apt-get install cmake g++-mingw-w64-i686 -qyy
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
 
       - name: Build
         run: |
-          ./scripts/ci-build-mingw.sh
-        env:
-          CC: i686-w64-mingw32-gcc
-          CXX: i686-w64-mingw32-g++
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DCMAKE_BUILD_TYPE=Debug
+          make -j2
 
-  win64:
-    runs-on: ubuntu-18.04
+      - name: Test (headless)
+        run: |
+          cd bin/Linux
+          ./AutomatedTest null
+
+  linux-sdl-gl3:
+    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
           sudo apt-get update
-          sudo apt-get install cmake g++-mingw-w64-x86-64 -qyy
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
-          ./scripts/ci-build-mingw.sh
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_OPENGL3=ON
+          make -j2
+
+      - name: Test (headless)
+        run: |
+          cd bin/Linux
+          ./AutomatedTest null
+
+      - name: Test (Xvfb)
+        run: |
+          cd bin/Linux
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest opengl3
+
+  linux-sdl-gles2:
+    # something is wrong with the SDL cmake files on 20.04
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+
+      - name: Build
+        run: |
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
+          make -j2
+
+      - name: Test (headless)
+        run: |
+          cd bin/Linux
+          ./AutomatedTest null
+
+      - name: Test (Xvfb)
+        run: |
+          cd bin/Linux
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
+
+  mingw:
+    name: "MinGW ${{matrix.config.variant}}${{matrix.config.extras}}"
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {variant: win32, arch: i686}
+          - {variant: win64, arch: x86_64}
+          - {variant: win32, arch: i686, extras: "-sdl"}
+          - {variant: win64, arch: x86_64, extras: "-sdl"}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install compiler
+        run: |
+          sudo apt-get update && sudo apt-get install cmake -qyy
+          ./scripts/ci-get-mingw.sh
+
+      - name: Build
+        run: |
+          ./scripts/ci-build-mingw.sh package
         env:
-          CC: x86_64-w64-mingw32-gcc
-          CXX: x86_64-w64-mingw32-g++
+          CC: ${{matrix.config.arch}}-w64-mingw32-clang
+          CXX: ${{matrix.config.arch}}-w64-mingw32-clang++
+          extras: ${{matrix.config.extras}}
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}
+          path: ./irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}.zip
 
   macos:
-    runs-on: macos-10.15
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
           brew update
@@ -100,5 +172,135 @@ jobs:
 
       - name: Build
         run: |
-          cmake . -DCMAKE_FIND_FRAMEWORK=LAST
+          cmake . -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_EXAMPLES=1
           make -j3
+
+      - name: Test (headless)
+        run: |
+          ./bin/OSX/AutomatedTest null
+
+  macos-sdl:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          brew update
+          brew install cmake libpng jpeg sdl2
+
+      - name: Build
+        run: |
+          cmake . -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_EXAMPLES=1 -DUSE_SDL2=1
+          make -j3
+
+  msvc:
+    name: VS 2019 ${{ matrix.config.arch }} ${{ matrix.sdl.label }}
+    runs-on: windows-2019
+    env:
+      VCPKG_VERSION: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
+      # 2023.10.19
+      vcpkg_packages: zlib libpng libjpeg-turbo
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          -
+            arch: x86
+            generator: "-G'Visual Studio 16 2019' -A Win32"
+            vcpkg_triplet: x86-windows
+          -
+            arch: x64
+            generator: "-G'Visual Studio 16 2019' -A x64"
+            vcpkg_triplet: x64-windows
+        sdl:
+          -
+            use: FALSE
+            label: '(no SDL)'
+            vcpkg_packages: opengl-registry
+          -
+            use: TRUE
+            label: '(with SDL)'
+            vcpkg_packages: sdl2
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Restore from cache and run vcpkg
+        uses: lukka/run-vcpkg@v7
+        with:
+          vcpkgArguments: ${{env.vcpkg_packages}} ${{matrix.sdl.vcpkg_packages}}
+          vcpkgDirectory: '${{ github.workspace }}\vcpkg'
+          appendedCacheKey: ${{ matrix.config.vcpkg_triplet }}
+          vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
+          vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }}
+
+      - name: CMake
+        run: |
+            cmake ${{matrix.config.generator}}  `
+            -DUSE_SDL2=${{matrix.sdl.use}}  `
+            -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake"  `
+            -DCMAKE_BUILD_TYPE=Release .
+
+      - name: Build
+        run: cmake --build . --config Release
+
+      - name: Create artifact folder
+        run: |
+          mkdir artifact/
+          mkdir artifact/lib/
+
+      - name: Move dlls into artifact folder
+        run: move bin\Win32-VisualStudio\Release\* artifact\lib\
+
+      - name: Move includes into artifact folder
+        run: move include artifact/
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: msvc-${{ matrix.config.arch }}-${{matrix.sdl.use}}
+          path: artifact/
+
+  android:
+    name: Android ${{ matrix.arch }}
+    runs-on: ubuntu-20.04
+    env:
+       ndk_version: "r25c"
+       ANDROID_NDK: ${{ github.workspace }}/android-ndk
+    strategy:
+      matrix:
+        arch: [armeabi-v7a, arm64-v8a, x86, x86_64]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install deps
+        run: |
+          sudo rm /var/lib/man-db/auto-update
+          sudo apt-get update
+          sudo apt-get install -qyy wget unzip zip gcc-multilib make cmake
+
+      - name: Cache NDK
+        id: cache-ndk
+        uses: actions/cache@v4
+        with:
+          key: android-ndk-${{ env.ndk_version }}-linux
+          path: ${{ env.ANDROID_NDK }}
+
+      - name: Install NDK
+        run: |
+          wget --progress=bar:force "http://dl.google.com/android/repository/android-ndk-${ndk_version}-linux.zip"
+          unzip -q "android-ndk-${ndk_version}-linux.zip"
+          rm "android-ndk-${ndk_version}-linux.zip"
+          mv "android-ndk-${ndk_version}" "${ANDROID_NDK}"
+        if: ${{ steps.cache-ndk.outputs.cache-hit != 'true' }}
+
+      - name: Build
+        run: ./scripts/ci-build-android.sh ${{ matrix.arch }}
+
+      #- name: Upload Artifact
+      #  uses: actions/upload-artifact@v4
+      #  with:
+      #    name: irrlicht-android-${{ matrix.arch }}
+      #    path: ${{ runner.temp }}/pkg/${{ matrix.arch }}

.gitignore

@@ -5,6 +5,7 @@ install_manifest.txt
 IrrlichtMtConfig.cmake
 IrrlichtMtConfigVersion.cmake
 IrrlichtMtTargets.cmake
+CTestTestfile.cmake
 Makefile
 libs/*
 *.so*
@@ -15,3 +16,10 @@ bin/Linux
 scripts/gl2ext.h
 scripts/glcorearb.h
 scripts/glext.h
+*.vcxproj*
+*.dir/
+*.sln
+*visualstudio/
+
+# vscode cmake plugin
+build/*

CMakeLists.txt

@@ -1,19 +1,17 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 
-# Set policies up to 3.9 since we want to enable the IPO option
-if(${CMAKE_VERSION} VERSION_LESS 3.9)
-	cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
-	cmake_policy(VERSION 3.9)
-endif()
+set(IRRLICHTMT_REVISION 15)
 
 project(Irrlicht
-	VERSION 1.9.0
+	VERSION 1.9.0.${IRRLICHTMT_REVISION}
 	LANGUAGES CXX
 )
 
 message(STATUS "*** Building IrrlichtMt ${PROJECT_VERSION} ***")
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 include(GNUInstallDirs)
 
 if(ANDROID)
@@ -36,7 +34,9 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+enable_testing()
 add_subdirectory(source/Irrlicht)
+add_subdirectory(test)
 
 option(BUILD_EXAMPLES "Build example applications" FALSE)
 if(BUILD_EXAMPLES)

Config.cmake.in

@@ -1,5 +1,11 @@
 @PACKAGE_INIT@
 
+include(CMakeFindDependencyMacro)
+
 if(NOT TARGET IrrlichtMt::IrrlichtMt)
+	# private dependency only explicitly needed with static libs
+	if(@USE_SDL2@ AND NOT @BUILD_SHARED_LIBS@)
+		find_dependency(SDL2)
+	endif()
 	include("${CMAKE_CURRENT_LIST_DIR}/IrrlichtMtTargets.cmake")
 endif()

README.md

@@ -1,9 +1,9 @@
 IrrlichtMt version 1.9
 ======================
 
-The Irrlicht Engine is an open source realtime 3D engine written in C++.
-
-This is a fork by the [Minetest](https://github.com/minetest) developers that contains features, customizations and fixes specifically for use in Minetest.
+IrrlichtMt is the 3D engine of [Minetest](https://github.com/minetest).
+It is based on the [Irrlicht Engine](https://irrlicht.sourceforge.io/) but is now developed independently.
+It is intentionally not compatible to upstream and is planned to be eventually absorbed into Minetest.
 
 Build
 -----
@@ -15,10 +15,16 @@ The following libraries are required to be installed:
 * OpenGL
   * or on mobile: OpenGL ES (can be optionally enabled on desktop too)
 * on Unix: X11
+* SDL2 (see below)
 
 Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the following options are available:
 * `BUILD_SHARED_LIBS` (default: `ON`) - Build IrrlichtMt as a shared library
 * `BUILD_EXAMPLES` (default: `OFF`) - Build example applications
+* `ENABLE_OPENGL` - Enable OpenGL driver
+* `ENABLE_OPENGL3` (default: `OFF`) - Enable OpenGL 3+ driver
+* `ENABLE_GLES1` - Enable OpenGL ES driver, legacy
+* `ENABLE_GLES2` - Enable OpenGL ES 2+ driver
+* `USE_SDL2` (default: platform-dependent, usually `ON`) - Use SDL2 instead of older native device code
 
 e.g. on a Linux system you might want to build for local use like this:
 
@@ -29,6 +35,21 @@ e.g. on a Linux system you might want to build for local use like this:
 
 This will put an IrrlichtMtTargets.cmake file into the cmake directory in the current build directory, and it can then be imported from another project by pointing `find_package()` to the build directory, or by setting the `CMAKE_PREFIX_PATH` variable to that same path.
 
+on Windows system:
+
+It is highly recommended to use vcpkg as package manager.
+
+After you successfully built vcpkg you can easily install the required libraries:
+
+	vcpkg install zlib libjpeg-turbo libpng sdl2 --triplet x64-windows
+	
+Run the following script in PowerShell:
+
+	git clone https://github.com/minetest/irrlicht
+	cd irrlicht
+	cmake -B build -G "Visual Studio 17 2022" -A "Win64" -DCMAKE_TOOLCHAIN_FILE=[vcpkg-root]/scripts/buildsystems/vcpkg.cmake -DBUILD_SHARED_LIBS=OFF
+	cmake --build build --config Release
+	
 Platforms
 ---------
 

bin/Linux/readme.txt

@@ -1,4 +0,0 @@
-If you wish to compile the engine in linux yourself, 
-goto the \source directory. Run a 'make' in the subfolder 'Irrlicht'.
-After this, you should be able to make all example applications in \examples.
-Then just start an X Server and run them, from the directory where they are.

bin/OSX/readme.txt

@@ -1 +0,0 @@
-If you want to compile only the Irrlicht Engine you should use XCode project available at source/Irrlicht/ directory. You can also use examples/BuildAllExamples.xcworkspace file to build the Irrlicht Engine + all examples.

bin/Win32-VisualStudio/readme.txt

@@ -1,25 +0,0 @@
-The Win32-VisualStudio version is currently (Irrlicht 1.8) compiled with VS 2010 using the Windows 7.1 SDK as platform toolset.
-You might get the necessary Windows Platform SDK here: http://msdn.microsoft.com/en-us/windows/bb980924.aspx
-
-To link to that Irrlicht.dll you need to set platform toolset in your VS version to the same target or re-compile the Irrlicht.dll using another platform toolset.
-
-To re-compile Irrlicht for Win32-VisualStudio:
-There are several project files for different VS versions in source/Irrlicht.
-Irrlicht10.0.sln is for VS 2010
-Irrlicht11.0.sln is for VS 2012
-Irrlicht12.0.sln is for VS 2013
-
-To compile Irrlicht + all examples and all tools check the BuildAllExamples_*.sln files in the examples folder.
-
-For newer VS versions you have update one of those projects (VS usually can do that automatically when you open an older solution file).
-
-Currently each of those solutions does set the platform toolset "Windows 7.1 SDK" (to be compatible to each other). 
-You might want to change that in the project settings and set it to your current version.
-Make sure you use the same platform toolset in your application and in the engine.
-Also when compiling examples each example has to use the same platform toolset as was used for the engine.
-
-Platform should be Win32
-Configuration is by default "Release"
-But you can also chose "Debug" if you want Irrlicht with Debug information.
-Static builds are possible but you have to additionally set the _IRR_STATIC_LIB_ define in the application when linking to a static Irrlicht.lib
-

bin/Win32-gcc/readme.txt

@@ -1,16 +0,0 @@
-If you wish to compile Irrlicht for Win32-gcc you have several choices.
-
-1. You can work from within a MinGW shell.
-Go to the folder source/Irrlicht and run the Makefile with:
-make win32 
-Examples can be build by going into the folder of the example (for example examples/01.HelloWorld) and running the Makefile with:
-make all_win32
-
-2. Use the Code::Blocks IDE
-There is a project file called Irrlicht-gcc.cbp in source/Irrlicht to compile just the engine.
-Be sure to select a Windows target like "Win32 - release - accurate math - dll"
-
-There is also Code::Blocks workspace file in the examples folder called BuildAllExamples.workspace
-Again be sure to select a Windows target like "Win32 - release - accurate math - dll"
-This workspace allows you to compile the engine together with all examples and tools.
-

bin/Win64-VisualStudio/readme.txt

@@ -1,24 +0,0 @@
-The Win64-VisualStudio version is currently (Irrlicht 1.8) compiled with VS 2010 using the Windows 7.1 SDK as platform toolset.
-You might get the necessary Windows Platform SDK here: http://msdn.microsoft.com/en-us/windows/bb980924.aspx
-
-To link to that Irrlicht.dll you need to set platform toolset in your VS version to the same target or re-compile the Irrlicht.dll using another platform toolset.
-
-To re-compile Irrlicht for Win32-VisualStudio:
-There are several project files for different VS versions in source/Irrlicht.
-Irrlicht10.0.sln is for VS 2010
-Irrlicht11.0.sln is for VS 2012
-Irrlicht12.0.sln is for VS 2013
-
-To compile Irrlicht + all examples and all tools check the BuildAllExamples_*.sln files in the examples folder.
-
-For newer VS versions you have update one of those projects (VS usually can do that automatically when you open an older solution file).
-
-Currently each of those solutions does set the platform toolset "Windows 7.1 SDK" (to be compatible to each other). 
-You might want to change that in the project settings and set it to your current version.
-Make sure you use the same platform toolset in your application and in the engine.
-Also when compiling examples each example has to use the same platform toolset as was used for the engine.
-
-Platform should be Win64
-Configuration is by default "Release"
-But you can also chose "Debug" if you want Irrlicht with Debug information.
-Static builds are possible but you have to additionally set the _IRR_STATIC_LIB_ define in the application when linking to a static Irrlicht.lib

bin/emscripten/readme.txt

@@ -1 +0,0 @@
-If you wish to compile Irrlicht for emscripten please check the documenation in examples/01.HelloWorld_emscripten.

doc/aesGladman.txt

@@ -1,34 +0,0 @@
-The Irrlicht Engine may be compiled to provide support for AES encrypted files. The implementation used by Irrlicht is provided by Dr Brian Gladman. The license for these files (including AES, a PRNG, SHA, and other algorithms) is as follows
-
-/*
- ---------------------------------------------------------------------------
- Copyright (c) 2002, Dr Brian Gladman <                 >, Worcester, UK.
- All rights reserved.
-
- LICENSE TERMS
-
- The free distribution and use of this software in both source and binary
- form is allowed (with or without changes) provided that:
-
-   1. distributions of this source code include the above copyright
-      notice, this list of conditions and the following disclaimer;
-
-   2. distributions in binary form include the above copyright
-      notice, this list of conditions and the following disclaimer
-      in the documentation and/or other associated materials;
-
-   3. the copyright holder's name is not used to endorse products
-      built using this software without specific written permission.
-
- ALTERNATIVELY, provided that this notice is retained in full, this product
- may be distributed under the terms of the GNU General Public License (GPL),
- in which case the provisions of the GPL apply INSTEAD OF those given above.
-
- DISCLAIMER
-
- This software is provided 'as is' with no explicit or implied warranties
- in respect of its properties, including, but not limited to, correctness
- and/or fitness for purpose.
- ---------------------------------------------------------------------------
-*/
-

doc/bzip2-license.txt

@@ -1,42 +0,0 @@
-
---------------------------------------------------------------------------
-
-This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2007 Julian R Seward.  All
-rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. 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.
-
-3. Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
-
-4. The name of the author may not be used to endorse or promote 
-   products derived from this software without specific prior written 
-   permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Julian Seward, jseward@bzip.org
-bzip2/libbzip2 version 1.0.5 of 10 December 2007
-
---------------------------------------------------------------------------

doc/jpglib-license.txt

@@ -1,351 +0,0 @@
-The Independent JPEG Group's JPEG software
-==========================================
-
-README for release 8d of 15-Jan-2012
-====================================
-
-This distribution contains the eighth 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.
-
-This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone,
-Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,
-Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,
-and other members of the Independent JPEG Group.
-
-IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee
-(also known as JPEG, together with ITU-T SG16).
-
-
-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.
-ACKNOWLEDGMENTS     Special thanks.
-FILE FORMAT WARS    Software *not* to get.
-TO DO               Plans for future IJG releases.
-
-Other documentation files in the distribution are:
-
-User documentation:
-  install.txt       How to configure and install the IJG software.
-  usage.txt         Usage instructions for cjpeg, djpeg, jpegtran,
-                    rdjpgcom, and wrjpgcom.
-  *.1               Unix-style man pages for programs (same info as usage.txt).
-  wizard.txt        Advanced usage instructions for JPEG wizards only.
-  change.log        Version-to-version change highlights.
-Programmer and internal documentation:
-  libjpeg.txt       How to use the JPEG library in your own programs.
-  example.c         Sample code for calling the JPEG library.
-  structure.txt     Overview of the JPEG library's internal structure.
-  filelist.txt      Road map of IJG files.
-  coderules.txt     Coding style rules --- please read if you contribute code.
-
-Please read at least the files install.txt and usage.txt.  Some 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 encoding, decoding,
-and transcoding.  JPEG (pronounced "jay-peg") is a standardized compression
-method for full-color and gray-scale images.
-
-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.
-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-2012, Thomas G. Lane, Guido Vollbeding.
-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,
-ltmain.sh).  Another support script, install-sh, is copyright by X Consortium
-but is also freely distributable.
-
-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 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 http://www.ijg.org/files/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 currently available 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).
-Although this is by far the most detailed and comprehensive exposition of
-JPEG publicly available, we point out that it is still missing an explanation
-of the most essential properties and algorithms of the underlying DCT
-technology.
-If you think that you know about DCT-based JPEG after reading this book,
-then you are in delusion.  The real fundamentals and corresponding potential
-of DCT-based JPEG are not publicly known so far, and that is the reason for
-all the mistaken developments taking place in the image coding domain.
-
-The original JPEG 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.
-IJG JPEG 8 introduces an implementation of the JPEG SmartScale extension
-which is specified in two documents:  A contributed document at ITU and ISO
-with title "ITU-T JPEG-Plus Proposal for Extending ITU-T T.81 for Advanced
-Image Coding", April 2006, Geneva, Switzerland.  The latest version of this
-document is Revision 3.  And a contributed document ISO/IEC JTC1/SC29/WG1 N
-5799 with title "Evolution of JPEG", June/July 2011, Berlin, Germany.
-
-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.  JFIF 1.02 has been adopted as an Ecma International Technical Report
-and thus received a formal publication status.  It is available as a free
-download in PDF format from
-http://www.ecma-international.org/publications/techreports/E-TR-098.htm.
-A PostScript version of the JFIF document is available at
-http://www.ijg.org/files/jfif.ps.gz.  There is also a plain text version at
-http://www.ijg.org/files/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
-http://www.ijg.org/files/.  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.
-
-
-ARCHIVE LOCATIONS
-=================
-
-The "official" archive site for this software is www.ijg.org.
-The most recent released version can always be found there in
-directory "files".  This particular version will be archived as
-http://www.ijg.org/files/jpegsrc.v8d.tar.gz, and in Windows-compatible
-"zip" archive format as http://www.ijg.org/files/jpegsr8d.zip.
-
-The JPEG FAQ (Frequently Asked Questions) article is a source of some
-general information about JPEG.
-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
-
-
-ACKNOWLEDGMENTS
-===============
-
-Thank to Juergen Bruder for providing me with a copy of the common DCT
-algorithm article, only to find out that I had come to the same result
-in a more direct and comprehensible way with a more generative approach.
-
-Thank to Istvan Sebestyen and Joan L. Mitchell for inviting me to the
-ITU JPEG (Study Group 16) meeting in Geneva, Switzerland.
-
-Thank to Thomas Wiegand and Gary Sullivan for inviting me to the
-Joint Video Team (MPEG & ITU) meeting in Geneva, Switzerland.
-
-Thank to Thomas Richter and Daniel Lee for inviting me to the
-ISO/IEC JTC1/SC29/WG1 (also known as JPEG, together with ITU-T SG16)
-meeting in Berlin, Germany.
-
-Thank to John Korejwa and Massimo Ballerini for inviting me to
-fruitful consultations in Boston, MA and Milan, Italy.
-
-Thank to Hendrik Elstner, Roland Fassauer, Simone Zuck, Guenther
-Maier-Gerber, Walter Stoeber, Fred Schmitz, and Norbert Braunagel
-for corresponding business development.
-
-Thank to Nico Zschach and Dirk Stelling of the technical support team
-at the Digital Images company in Halle for providing me with extra
-equipment for configuration tests.
-
-Thank to Richard F. Lyon (then of Foveon Inc.) for fruitful
-communication about JPEG configuration in Sigma Photo Pro software.
-
-Thank to Andrew Finkenstadt for hosting the ijg.org site.
-
-Last but not least special thank to Thomas G. Lane for the original
-design and development of this singular software package.
-
-
-FILE FORMAT WARS
-================
-
-The ISO/IEC JTC1/SC29/WG1 standards committee (also known as JPEG, together
-with ITU-T SG16) currently promotes different formats containing the name
-"JPEG" which is misleading because these formats are incompatible with
-original DCT-based JPEG and are based on faulty technologies.
-IJG therefore does not and will not support such momentary mistakes
-(see REFERENCES).
-There exist also distributions under the name "OpenJPEG" promoting such
-kind of formats which is misleading because they don't support original
-JPEG images.
-We have no sympathy for the promotion of inferior formats.  Indeed, one of
-the original reasons for developing this free software was to help force
-convergence on common, interoperable format standards for JPEG files.
-Don't use an incompatible file format!
-(In any case, our decoder will remain capable of reading existing JPEG
-image files indefinitely.)
-
-Furthermore, the ISO committee pretends to be "responsible for the popular
-JPEG" in their public reports which is not true because they don't respond to
-actual requirements for the maintenance of the original JPEG specification.
-
-There are currently distributions in circulation containing the name
-"libjpeg" which claim to be a "derivative" or "fork" of the original
-libjpeg, but don't have the features and are incompatible with formats
-supported by actual IJG libjpeg distributions.  Furthermore, they
-violate the license conditions as described under LEGAL ISSUES above.
-We have no sympathy for the release of misleading and illegal
-distributions derived from obsolete code bases.
-Don't use an obsolete code base!
-
-
-TO DO
-=====
-
-Version 8 is the first release of a new generation JPEG standard
-to overcome the limitations of the original JPEG specification.
-More features are being prepared for coming releases...
-
-Please send bug reports, offers of help, etc. to jpeg-info@jpegclub.org.

doc/libpng-license.txt

@@ -1,111 +0,0 @@
-
-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.
-
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
-
-If you modify libpng you may insert additional notices immediately following
-this sentence.
-
-This code is released under the libpng license.
-
-libpng versions 1.2.6, August 15, 2004, through 1.5.9, February 18, 2012, are
-Copyright (c) 2004, 2006-2011 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, 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 Open Source is a
-certification mark of the Open Source Initiative.
-
-Glenn Randers-Pehrson
-glennrp at users.sourceforge.net
-February 18, 2012

doc/readme.txt

@@ -1,2 +0,0 @@
-Linux Users: There are some tools at the web for reading .chm files (try http://xchm.sourceforge.net/).
-You can find a html version of this documentation at http://irrlicht.sourceforge.net/docu/index.html

doc/release_checklist.txt

@@ -1,63 +0,0 @@
-Checklist for Irrlicht developers doing releases.
-
-Note: Generally the more platforms, compilers, settings you can test the better. Ask for help for platforms which you don't own.
-
-- PRE-BUILD TESTS:
-- - Run tests in the tests folder
-- - Compile and run examples.
-- - Compile and run the tools. Note that some tools are in the buildall-examples VS project files on Windows, 
-    but on Linux command line you have to compile them individually.
-
-- VERSION UPDATES:
-- - check IRRLICHT_SDK_VERSION (in IrrCompileConfig.h)
-- - check version number in the Makefile
-- - update readme.txt (version number, supported compilers)
-- - Add new release information (date+version-number) in changes.txt
-- - go through folders if other .txt files still make sense (things change and updating those files tends to be forgotten)
-
-- DOCUMENTATION UPDATES:
-- - run makedocumentation.sh in scripts\doc\irrlicht
-- - run maketutorial.sh in scripts\doc\irrlicht (commit changed tutorial.html's)
-
-- BUILDING THE RELEASE
-  (TBD - should we still release dll's? Newer and older VS builds are no longer compatible anyway)
-- - run a clean build for buildAllExamples in the examples folder with the 
-    target compiler for 32-bit and for release (old VS compiler - so far VS2010)
-- - when possible compile the dll for MinGW on Windows (in release and with -s for smaller size)
-- - when possible compile the dll for 64 bit (again with Visual Studio and release)
-- - create a target directory, like irrlicht-1.8.1 for example
-- - svn export to the target directory
-- - copy the subfolders of doctemp into the doc folder of the target directory
-    careful, this should only be one(!) subfolder (we ended up with copies before, maybe Windows/Linux builds use different names?)
-- - copy all .exe files (except test.exe) from bin\Win32-VisualStudio (.pdb's are not necessary)
-- - copy Irrlicht.dll from bin\Win32-visualstudio 
-- - copy the files in lib\Win32-visualstudio
-- - copy Irrlicht.dll from bin\Win64-VisualStudio 
-- - copy the files in lib\Win64-visualstudio 
-- - copy Irrlicht.dll from bin\Win32-gcc 
-- - copy the files in lib\Win32-gcc
-- - remove the tests folder
-- - remove scripts folder (if the release comes with docs, if you do a release 
-without docs for smaller filesizes then the script folder has to stay in).
-- - create a zip file 
-- - figure out how to fix unix access right for shell-scripts in the zip file (my 
-trick so far is: unzip in Linux, set +x for all .sh files, zip again)
-
-RELEASING:
-- - upload the zip-file somewhere, then download it again on all platforms and do 
-  another quick test with that file (do examples still run, can you compile)
-- - give the link to the zip out on the mailinglist for others to look at
-- - Upload new documentation (the content of doc/html) to: web.sourceforge.net 
-  (sftp protocol, user and passwd are your sourceforge account, the folder 
-  might not be shown - but you can still cd into it!):
-  /home/project-web/i/ir/irrlicht/htdocs 
-  Best create first a folder with a new name, copy stuff in there, test (just 
-  check the website), rename old folder and give new folder the "docu" name. 
-  Then you can delete the old folder if you want.
-- - upload the zip by logging in to sourceforge and using the "Files" menu (needs 
-	admin privileges and it's the 'Files' menu between 'Summary' and 'Reviews'). 
-	The target is in one of the Irrlicht SDK subfolders. Then click the "i" beside 
-	the file and "select all" to make it the active download.
-- - write a forum post, tell everyone in facebook, reddit, your friends...
-- - login to wordpress at http://irrlicht.sourceforge.net/wp-login.php, update the 
-	downloads section and write a release post.

examples/AutomatedTest/main.cpp

@@ -1,32 +1,74 @@
+#include <iostream>
 #include <irrlicht.h>
 #include "exampleHelper.h"
 
 using namespace irr;
 
-static video::E_DRIVER_TYPE chooseDriver(const char *arg_)
-{
-	if (core::stringc(arg_) == "null")
-		return video::EDT_NULL;
+static IrrlichtDevice *device = nullptr;
+static int test_fail = 0;
 
-	if (IrrlichtDevice::isDriverSupported(video::EDT_OGLES1))
+void test_irr_array();
+void test_irr_string();
+
+static video::E_DRIVER_TYPE chooseDriver(core::stringc arg_)
+{
+	if (arg_ == "null")
+		return video::EDT_NULL;
+	if (arg_ == "ogles1")
 		return video::EDT_OGLES1;
-	if (IrrlichtDevice::isDriverSupported(video::EDT_OGLES2))
+	if (arg_ == "ogles2")
 		return video::EDT_OGLES2;
+	if (arg_ == "opengl")
 		return video::EDT_OPENGL;
+	if (arg_ == "opengl3")
+		return video::EDT_OPENGL3;
+	std::cerr << "Unknown driver type: " << arg_.c_str() << ". Trying OpenGL." << std::endl;
+	return video::EDT_OPENGL;
+}
+
+static inline void check(bool ok, const char *msg)
+{
+	if (!ok)
+	{
+		test_fail++;
+		device->getLogger()->log((core::stringc("FAILED TEST: ") + msg).c_str(), ELL_ERROR);
+	}
+}
+
+void run_unit_tests() {
+	std::cout << "Running unit tests:" << std::endl;
+	try {
+		test_irr_array();
+		test_irr_string();
+	} catch (const std::exception &e) {
+		std::cerr << e.what() << std::endl;
+		test_fail++;
+	}
+	std::cout << std::endl;
 }
 
 int main(int argc, char *argv[])
 {
+	run_unit_tests();
+
 	SIrrlichtCreationParameters p;
 	p.DriverType = chooseDriver(argc > 1 ? argv[1] : "");
 	p.WindowSize = core::dimension2du(640, 480);
 	p.Vsync = true;
 	p.LoggingLevel = ELL_DEBUG;
 
-	IrrlichtDevice *device = createDeviceEx(p);
+	device = createDeviceEx(p);
 	if (!device)
 		return 1;
 
+	{
+		u32 total = 0;
+		device->getOSOperator()->getSystemMemory(&total, nullptr);
+		core::stringc message = core::stringc("Total RAM in MiB: ") + core::stringc(total >> 10);
+		device->getLogger()->log(message.c_str(), ELL_INFORMATION);
+		check(total > 130 * 1024, "RAM amount");
+	}
+
 	device->setWindowCaption(L"Hello World!");
 	device->setResizable(true);
 
@@ -45,16 +87,26 @@ int main(int argc, char *argv[])
 
 	const io::path mediaPath = getExampleMediaPath();
 
-	scene::IAnimatedMesh* mesh = smgr->getMesh(mediaPath + "coolguy_opt.x");
-	if (!mesh)
-		return 1;
+	auto mesh_file = device->getFileSystem()->createAndOpenFile(mediaPath + "coolguy_opt.x");
+	check(mesh_file, "mesh file loading");
+	scene::IAnimatedMesh* mesh = smgr->getMesh(mesh_file);
+	check(mesh, "mesh loading");
+	if (mesh_file)
+		mesh_file->drop();
+	if (mesh)
+	{
+		video::ITexture* tex = driver->getTexture(mediaPath + "cooltexture.png");
+		check(tex, "texture loading");
 		scene::IAnimatedMeshSceneNode* node = smgr->addAnimatedMeshSceneNode(mesh);
 		if (node)
 		{
-		node->setMaterialFlag(video::EMF_LIGHTING, false);
+			node->forEachMaterial([tex] (video::SMaterial &mat) {
+				mat.Lighting = false;
+				mat.setTexture(0, tex);
+			});
 			node->setFrameLoop(0, 29);
 			node->setAnimationSpeed(30);
-		node->setMaterialTexture(0, driver->getTexture(mediaPath + "cooltexture.png"));
+		}
 	}
 
 	smgr->addCameraSceneNode(0, core::vector3df(0,4,5), core::vector3df(0,2,0));
@@ -65,7 +117,7 @@ int main(int argc, char *argv[])
 
 	while (device->run())
 	{
-		if (device->getTimer()->getTime() >= 1300)
+		if (device->getTimer()->getTime() >= 1000)
 		{
 			device->getTimer()->setTime(0);
 			++n;
@@ -102,12 +154,9 @@ int main(int argc, char *argv[])
 		driver->endScene();
 	}
 
-	if (core::stringw(L"a") != editbox->getText()) {
-		device->getLogger()->log("EditBox text mismatch", ELL_INFORMATION);
-		return 1;
-	}
+	check(core::stringw(L"a") == editbox->getText(), "EditBox text");
 
 	device->getLogger()->log("Done.", ELL_INFORMATION);
 	device->drop();
-	return 0;
+	return test_fail > 0 ? 1 : 0;
 }

examples/AutomatedTest/test_array.cpp

@@ -0,0 +1,135 @@
+#include <irrArray.h>
+#include "test_helper.h"
+
+using namespace irr;
+using core::array;
+
+static void test_basics() {
+	array<int> v;
+	v.push_back(1);  // 1
+	v.push_front(2); // 2, 1
+	v.insert(4, 0);  // 4, 2, 1
+	v.insert(3, 1);  // 4, 3, 2, 1
+	v.insert(0, 4);  // 4, 3, 2, 1, 0
+	UASSERTEQ(v.size(), 5);
+	UASSERTEQ(v[0], 4);
+	UASSERTEQ(v[1], 3);
+	UASSERTEQ(v[2], 2);
+	UASSERTEQ(v[3], 1);
+	UASSERTEQ(v[4], 0);
+	array<int> w = v;
+	UASSERTEQ(w.size(), 5);
+	UASSERT(w == v);
+	w.clear();
+	UASSERTEQ(w.size(), 0);
+	UASSERTEQ(w.allocated_size(), 0);
+	UASSERT(w.empty());
+	w = v;
+	UASSERTEQ(w.size(), 5);
+	w.set_used(3);
+	UASSERTEQ(w.size(), 3);
+	UASSERTEQ(w[0], 4);
+	UASSERTEQ(w[1], 3);
+	UASSERTEQ(w[2], 2);
+	UASSERTEQ(w.getLast(), 2);
+	w.set_used(20);
+	UASSERTEQ(w.size(), 20);
+	w = v;
+	w.sort();
+	UASSERTEQ(w.size(), 5);
+	UASSERTEQ(w[0], 0);
+	UASSERTEQ(w[1], 1);
+	UASSERTEQ(w[2], 2);
+	UASSERTEQ(w[3], 3);
+	UASSERTEQ(w[4], 4);
+	w.erase(0);
+	UASSERTEQ(w.size(), 4);
+	UASSERTEQ(w[0], 1);
+	UASSERTEQ(w[1], 2);
+	UASSERTEQ(w[2], 3);
+	UASSERTEQ(w[3], 4);
+	w.erase(1, 2);
+	UASSERTEQ(w.size(), 2);
+	UASSERTEQ(w[0], 1);
+	UASSERTEQ(w[1], 4);
+	w.swap(v);
+	UASSERTEQ(w.size(), 5);
+	UASSERTEQ(v.size(), 2);
+}
+
+static void test_linear_searches() {
+	// Populate the array with 0, 1, 2, ..., 100, 100, 99, 98, 97, ..., 0
+	array<int> arr;
+	for (int i = 0; i <= 100; i++)
+		arr.push_back(i);
+	for (int i = 100; i >= 0; i--)
+		arr.push_back(i);
+	s32 end = arr.size() - 1;
+	for (int i = 0; i <= 100; i++) {
+		s32 index = arr.linear_reverse_search(i);
+		UASSERTEQ(index, end - i);
+	}
+	for (int i = 0; i <= 100; i++) {
+		s32 index = arr.linear_search(i);
+		UASSERTEQ(index, i);
+	}
+}
+
+static void test_binary_searches() {
+	const auto& values = { 3, 5, 1, 2, 5, 10, 19, 9, 7, 1, 2, 5, 8, 15 };
+	array<int> arr;
+	for (int value : values) {
+		arr.push_back(value);
+	}
+	// Test the const form first, it uses a linear search without sorting
+	const array<int> & carr = arr;
+	UASSERTEQ(carr.binary_search(20), -1);
+	UASSERTEQ(carr.binary_search(0), -1);
+	UASSERTEQ(carr.binary_search(1), 2);
+
+	// Sorted: 1, 1, 2, 2, 3, 5, 5, 5, 7, 8, 9, 10, 15, 19
+	UASSERTEQ(arr.binary_search(20), -1);
+	UASSERTEQ(arr.binary_search(0), -1);
+
+	for (int value : values) {
+		s32 i = arr.binary_search(value);
+		UASSERTNE(i, -1);
+		UASSERTEQ(arr[i], value);
+	}
+
+	s32 first, last;
+	first = arr.binary_search_multi(1, last);
+	UASSERTEQ(first, 0);
+	UASSERTEQ(last, 1);
+
+	first = arr.binary_search_multi(2, last);
+	UASSERTEQ(first, 2);
+	UASSERTEQ(last, 3);
+
+	first = arr.binary_search_multi(3, last);
+	UASSERTEQ(first, 4);
+	UASSERTEQ(last, 4);
+
+	first = arr.binary_search_multi(4, last);
+	UASSERTEQ(first, -1);
+
+	first = arr.binary_search_multi(5, last);
+	UASSERTEQ(first, 5);
+	UASSERTEQ(last, 7);
+
+	first = arr.binary_search_multi(7, last);
+	UASSERTEQ(first, 8);
+	UASSERTEQ(last, 8);
+
+	first = arr.binary_search_multi(19, last);
+	UASSERTEQ(first, 13);
+	UASSERTEQ(last, 13);
+}
+
+void test_irr_array()
+{
+	test_basics();
+	test_linear_searches();
+	test_binary_searches();
+	std::cout << "    test_irr_array PASSED" << std::endl;
+}

examples/AutomatedTest/test_helper.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <exception>
+#include <iostream>
+
+class TestFailedException : public std::exception {
+};
+
+// Asserts the comparison specified by CMP is true, or fails the current unit test
+#define UASSERTCMP(CMP, actual, expected) do {                                        \
+	const auto &a = (actual);                                                     \
+	const auto &e = (expected);                                                   \
+	if (!CMP(a, e)) {                                                             \
+		std::cout                                                             \
+			<< "Test assertion failed: " << #actual << " " << #CMP << " " \
+			<< #expected << std::endl                                     \
+			<< "    at " << __FILE__ << ":" << __LINE__ << std::endl      \
+			<< "    actual:   " << a << std::endl << "    expected: "     \
+			<< e << std::endl;                                            \
+		throw TestFailedException();                                          \
+	}                                                                             \
+} while (0)
+
+#define CMPEQ(a, e)    (a == e)
+#define CMPTRUE(a, e)  (a)
+#define CMPNE(a, e)    (a != e)
+
+#define UASSERTEQ(actual, expected)  UASSERTCMP(CMPEQ, actual, expected)
+#define UASSERTNE(actual, nexpected) UASSERTCMP(CMPNE, actual, nexpected)
+#define UASSERT(actual)              UASSERTCMP(CMPTRUE, actual, true)

examples/AutomatedTest/test_string.cpp

@@ -0,0 +1,205 @@
+#include <irrString.h>
+#include <cstring>
+#include <clocale>
+#include <vector>
+#include "test_helper.h"
+
+using namespace irr;
+using namespace irr::core;
+
+#define CMPSTR(a, b) (!strcmp(a, b))
+#define UASSERTSTR(actual, expected) UASSERTCMP(CMPSTR, actual.c_str(), expected)
+
+static void test_basics()
+{
+	// ctor
+	stringc s;
+	UASSERTEQ(s.c_str()[0], '\0');
+	s = stringc(0.1234567);
+	UASSERTSTR(s, "0.123457");
+	s = stringc(0x1p+53);
+	UASSERTSTR(s, "9007199254740992.000000");
+	s = stringc(static_cast<int>(-102400));
+	UASSERTSTR(s, "-102400");
+	s = stringc(static_cast<unsigned int>(102400));
+	UASSERTSTR(s, "102400");
+	s = stringc(static_cast<long>(-1024000));
+	UASSERTSTR(s, "-1024000");
+	s = stringc(static_cast<unsigned long>(1024000));
+	UASSERTSTR(s, "1024000");
+	s = stringc("YESno", 3);
+	UASSERTSTR(s, "YES");
+	s = stringc(L"test", 4);
+	UASSERTSTR(s, "test");
+	s = stringc("Hello World!");
+	UASSERTSTR(s, "Hello World!");
+	// operator=
+	s = stringw(L"abcdef");
+	UASSERTSTR(s, "abcdef");
+	s = L"abcdef";
+	UASSERTSTR(s, "abcdef");
+	s = static_cast<const char*>(nullptr);
+	UASSERTSTR(s, "");
+	// operator+
+	s = s + stringc("foo");
+	UASSERTSTR(s, "foo");
+	s = s + L"bar";
+	UASSERTSTR(s, "foobar");
+	// the rest
+	s = "f";
+	UASSERTEQ(s[0], 'f');
+	const auto &sref = s;
+	UASSERTEQ(sref[0], 'f');
+	UASSERT(sref == "f");
+	UASSERT(sref == stringc("f"));
+	s = "a";
+	UASSERT(sref < stringc("aa"));
+	UASSERT(sref < stringc("b"));
+	UASSERT(stringc("Z") < sref);
+	UASSERT(!(sref < stringc("a")));
+	UASSERT(sref.lower_ignore_case("AA"));
+	UASSERT(sref.lower_ignore_case("B"));
+	UASSERT(!sref.lower_ignore_case("A"));
+	s = "dog";
+	UASSERT(sref != "cat");
+	UASSERT(sref != stringc("cat"));
+}
+
+static void test_methods()
+{
+	stringc s;
+	const auto &sref = s;
+	s = "irrlicht";
+	UASSERTEQ(sref.size(), 8);
+	UASSERT(!sref.empty());
+	s.clear();
+	UASSERTEQ(sref.size(), 0);
+	UASSERT(sref.empty());
+	UASSERT(sref[0] == 0);
+	s = "\tAz#`";
+	s.make_lower();
+	UASSERTSTR(s, "\taz#`");
+	s.make_upper();
+	UASSERTSTR(s, "\tAZ#`");
+	UASSERT(sref.equals_ignore_case("\taz#`"));
+	UASSERT(sref.equals_substring_ignore_case("Z#`", 2));
+	s = "irrlicht";
+	UASSERT(sref.equalsn(stringc("irr"), 3));
+	UASSERT(sref.equalsn("irr", 3));
+	s = "fo";
+	s.append('o');
+	UASSERTSTR(s, "foo");
+	s.append("bar", 1);
+	UASSERTSTR(s, "foob");
+	s.append("ar", 999999);
+	UASSERTSTR(s, "foobar");
+	s = "nyan";
+	s.append(stringc("cat"));
+	UASSERTSTR(s, "nyancat");
+	s.append(stringc("sam"), 1);
+	UASSERTSTR(s, "nyancats");
+	s = "fbar";
+	s.insert(1, "ooXX", 2);
+	UASSERTSTR(s, "foobar");
+	UASSERTEQ(sref.findFirst('o'), 1);
+	UASSERTEQ(sref.findFirst('X'), -1);
+	UASSERTEQ(sref.findFirstChar("abff", 2), 3);
+	UASSERTEQ(sref.findFirstCharNotInList("fobb", 2), 3);
+	UASSERTEQ(sref.findLast('o'), 2);
+	UASSERTEQ(sref.findLast('X'), -1);
+	UASSERTEQ(sref.findLastChar("abrr", 2), 4);
+	UASSERTEQ(sref.findLastCharNotInList("rabb", 2), 3);
+	UASSERTEQ(sref.findNext('o', 2), 2);
+	UASSERTEQ(sref.findLast('o', 1), 1);
+	s = "ob-oob";
+	UASSERTEQ(sref.find("ob", 1), 4);
+	UASSERTEQ(sref.find("ob"), 0);
+	UASSERTEQ(sref.find("?"), -1);
+	s = "HOMEOWNER";
+	stringc s2 = sref.subString(2, 4);
+	UASSERTSTR(s2, "MEOW");
+	s2 = sref.subString(2, 4, true);
+	UASSERTSTR(s2, "meow");
+	s = "land";
+	s.replace('l', 's');
+	UASSERTSTR(s, "sand");
+	s = ">dog<";
+	s.replace("dog", "cat");
+	UASSERTSTR(s, ">cat<");
+	s.replace("cat", "horse");
+	UASSERTSTR(s, ">horse<");
+	s.replace("horse", "gnu");
+	UASSERTSTR(s, ">gnu<");
+	s = " h e l p ";
+	s.remove(' ');
+	UASSERTSTR(s, "help");
+	s.remove("el");
+	UASSERTSTR(s, "hp");
+	s = "irrlicht";
+	s.removeChars("it");
+	UASSERTSTR(s, "rrlch");
+	s = "\r\nfoo bar ";
+	s.trim();
+	UASSERTSTR(s, "foo bar");
+	s = "foxo";
+	s.erase(2);
+	UASSERTSTR(s, "foo");
+	s = "a";
+	s.append('\0');
+	s.append('b');
+	UASSERTEQ(s.size(), 3);
+	s.validate();
+	UASSERTEQ(s.size(), 1);
+	UASSERTEQ(s.lastChar(), 'a');
+	std::vector<stringc> res;
+	s = "a,,b,c";
+	s.split(res, ",aa", 1, true, false);
+	UASSERTEQ(res.size(), 3);
+	UASSERTSTR(res[0], "a");
+	UASSERTSTR(res[2], "c");
+	res.clear();
+	s.split(res, ",", 1, false, true);
+	UASSERTEQ(res.size(), 7);
+	UASSERTSTR(res[0], "a");
+	UASSERTSTR(res[2], "");
+	for (int i = 0; i < 3; i++)
+		UASSERTSTR(res[2*i+1], ",");
+}
+
+static void test_conv()
+{
+	// locale-independent
+
+	stringw out;
+	utf8ToWString(out, "†††");
+	UASSERTEQ(out.size(), 3);
+	for (int i = 0; i < 3; i++)
+		UASSERTEQ(static_cast<u16>(out[i]), 0x2020);
+
+	stringc out2;
+	wStringToUTF8(out2, L"†††");
+	UASSERTEQ(out2.size(), 9);
+	for (int i = 0; i < 3; i++) {
+		UASSERTEQ(static_cast<u8>(out2[3*i]), 0xe2);
+		UASSERTEQ(static_cast<u8>(out2[3*i+1]), 0x80);
+		UASSERTEQ(static_cast<u8>(out2[3*i+2]), 0xa0);
+	}
+
+	// locale-dependent
+	if (!setlocale(LC_CTYPE, "C.UTF-8"))
+		setlocale(LC_CTYPE, "UTF-8"); // macOS
+
+	stringw out3;
+	multibyteToWString(out3, "†††");
+	UASSERTEQ(out3.size(), 3);
+	for (int i = 0; i < 3; i++)
+		UASSERTEQ(static_cast<u16>(out3[i]), 0x2020);
+}
+
+void test_irr_string()
+{
+	test_basics();
+	test_methods();
+	test_conv();
+	std::cout << "    test_irr_string PASSED" << std::endl;
+}

examples/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 set(IRREXAMPLES
 	# removed
 )

include/CDynamicMeshBuffer.h

@@ -1,133 +0,0 @@
-// Copyright (C) 2008-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_DYNAMIC_MESHBUFFER_H_INCLUDED__
-#define __C_DYNAMIC_MESHBUFFER_H_INCLUDED__
-
-#include "IDynamicMeshBuffer.h"
-
-#include "CVertexBuffer.h"
-#include "CIndexBuffer.h"
-
-namespace irr
-{
-namespace scene
-{
-
-	class CDynamicMeshBuffer: public IDynamicMeshBuffer
-	{
-	public:
-		//! constructor
-		CDynamicMeshBuffer(video::E_VERTEX_TYPE vertexType, video::E_INDEX_TYPE indexType)
-		: PrimitiveType(EPT_TRIANGLES)
-		{
-			VertexBuffer=new CVertexBuffer(vertexType);
-			IndexBuffer=new CIndexBuffer(indexType);
-		}
-
-		//! destructor
-		virtual ~CDynamicMeshBuffer()
-		{
-			if (VertexBuffer)
-				VertexBuffer->drop();
-			if (IndexBuffer)
-				IndexBuffer->drop();
-		}
-
-		virtual IVertexBuffer& getVertexBuffer() const _IRR_OVERRIDE_
-		{
-			return *VertexBuffer;
-		}
-
-		virtual IIndexBuffer& getIndexBuffer() const _IRR_OVERRIDE_
-		{
-			return *IndexBuffer;
-		}
-
-		virtual void setVertexBuffer(IVertexBuffer *newVertexBuffer) _IRR_OVERRIDE_
-		{
-			if (newVertexBuffer)
-				newVertexBuffer->grab();
-			if (VertexBuffer)
-				VertexBuffer->drop();
-
-			VertexBuffer=newVertexBuffer;
-		}
-
-		virtual void setIndexBuffer(IIndexBuffer *newIndexBuffer) _IRR_OVERRIDE_
-		{
-			if (newIndexBuffer)
-				newIndexBuffer->grab();
-			if (IndexBuffer)
-				IndexBuffer->drop();
-
-			IndexBuffer=newIndexBuffer;
-		}
-
-		//! Get Material of this buffer.
-		virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_
-		{
-			return Material;
-		}
-
-		//! Get Material of this buffer.
-		virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_
-		{
-			return Material;
-		}
-
-		//! Get bounding box
-		virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_
-		{
-			return BoundingBox;
-		}
-
-		//! Set bounding box
-		virtual void setBoundingBox( const core::aabbox3df& box) _IRR_OVERRIDE_
-		{
-			BoundingBox = box;
-		}
-
-		//! Recalculate bounding box
-		virtual void recalculateBoundingBox() _IRR_OVERRIDE_
-		{
-			if (!getVertexBuffer().size())
-				BoundingBox.reset(0,0,0);
-			else
-			{
-				BoundingBox.reset(getVertexBuffer()[0].Pos);
-				for (u32 i=1; i<getVertexBuffer().size(); ++i)
-					BoundingBox.addInternalPoint(getVertexBuffer()[i].Pos);
-			}
-		}
-
-		//! Describe what kind of primitive geometry is used by the meshbuffer
-		virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_
-		{
-			PrimitiveType = type;
-		}
-
-		//! Get the kind of primitive geometry which is used by the meshbuffer
-		virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_
-		{
-			return PrimitiveType;
-		}
-
-		video::SMaterial Material;
-		core::aabbox3d<f32> BoundingBox;
-		//! Primitive type used for rendering (triangles, lines, ...)
-		E_PRIMITIVE_TYPE PrimitiveType;
-	private:
-		CDynamicMeshBuffer(const CDynamicMeshBuffer&); // = delete in c++11, prevent copying
-
-		IVertexBuffer *VertexBuffer;
-		IIndexBuffer *IndexBuffer;
-	};
-
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-

include/CIndexBuffer.h

@@ -1,226 +0,0 @@
-// Copyright (C) 2008-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_INDEX_BUFFER_H_INCLUDED__
-#define __C_INDEX_BUFFER_H_INCLUDED__
-
-#include "IIndexBuffer.h"
-
-namespace irr
-{
-namespace scene
-{
-
-	class CIndexBuffer : public IIndexBuffer
-	{
-
-		class IIndexList
-		{
-		public:
-			virtual ~IIndexList(){};
-
-			virtual u32 stride() const =0;
-			virtual u32 size() const =0;
-			virtual void push_back(const u32 &element) =0;
-			virtual u32 operator [](u32 index) const =0;
-			virtual u32 getLast() =0;
-			virtual void setValue(u32 index, u32 value) =0;
-			virtual void set_used(u32 usedNow) =0;
-			virtual void reallocate(u32 new_size) =0;
-			virtual u32 allocated_size() const =0;
-			virtual void* pointer() =0;
-			virtual video::E_INDEX_TYPE getType() const =0;
-		};
-
-		template <class T>
-		class CSpecificIndexList : public IIndexList
-		{
-		public:
-			core::array<T> Indices;
-
-			virtual u32 stride() const _IRR_OVERRIDE_ {return sizeof(T);}
-
-			virtual u32 size() const _IRR_OVERRIDE_ {return Indices.size();}
-
-			virtual void push_back(const u32 &element) _IRR_OVERRIDE_
-			{
-				// push const ref due to compiler problem with gcc 4.6, big endian
-				Indices.push_back((const T&)element);
-			}
-
-			virtual u32 operator [](u32 index) const _IRR_OVERRIDE_
-			{
-				return (u32)(Indices[index]);
-			}
-
-			virtual u32 getLast() _IRR_OVERRIDE_ {return (u32)Indices.getLast();}
-
-			virtual void setValue(u32 index, u32 value) _IRR_OVERRIDE_
-			{
-				Indices[index]=(T)value;
-			}
-
-			virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
-			{
-				Indices.set_used(usedNow);
-			}
-
-			virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
-			{
-				Indices.reallocate(new_size);
-			}
-
-			virtual u32 allocated_size() const _IRR_OVERRIDE_
-			{
-				return Indices.allocated_size();
-			}
-
-			virtual void* pointer() _IRR_OVERRIDE_  {return Indices.pointer();}
-
-			virtual video::E_INDEX_TYPE getType() const _IRR_OVERRIDE_
-			{
-				if (sizeof(T)==sizeof(u16))
-					return video::EIT_16BIT;
-				else
-					return video::EIT_32BIT;
-			}
-		};
-
-	public:
-		IIndexList *Indices;
-
-		CIndexBuffer(video::E_INDEX_TYPE IndexType) :Indices(0), MappingHint(EHM_NEVER), ChangedID(1)
-		{
-			setType(IndexType);
-		}
-
-		CIndexBuffer(const IIndexBuffer &IndexBufferCopy) :Indices(0), MappingHint(EHM_NEVER), ChangedID(1)
-		{
-			setType(IndexBufferCopy.getType());
-			reallocate(IndexBufferCopy.size());
-
-			for (u32 n=0;n<IndexBufferCopy.size();++n)
-				push_back(IndexBufferCopy[n]);
-		}
-
-		virtual ~CIndexBuffer()
-		{
-			delete Indices;
-		}
-
-		//virtual void setType(video::E_INDEX_TYPE IndexType);
-		virtual void setType(video::E_INDEX_TYPE IndexType) _IRR_OVERRIDE_
-		{
-			IIndexList *NewIndices=0;
-
-			switch (IndexType)
-			{
-				case video::EIT_16BIT:
-				{
-					NewIndices=new CSpecificIndexList<u16>;
-					break;
-				}
-				case video::EIT_32BIT:
-				{
-					NewIndices=new CSpecificIndexList<u32>;
-					break;
-				}
-			}
-
-			if (Indices)
-			{
-				NewIndices->reallocate( Indices->size() );
-
-				for(u32 n=0;n<Indices->size();++n)
-					NewIndices->push_back((*Indices)[n]);
-
-				delete Indices;
-			}
-
-			Indices=NewIndices;
-		}
-
-		virtual void* getData() _IRR_OVERRIDE_ {return Indices->pointer();}
-
-		virtual video::E_INDEX_TYPE getType() const _IRR_OVERRIDE_ {return Indices->getType();}
-
-		virtual u32 stride() const _IRR_OVERRIDE_ {return Indices->stride();}
-
-		virtual u32 size() const _IRR_OVERRIDE_
-		{
-			return Indices->size();
-		}
-
-		virtual void push_back(const u32 &element) _IRR_OVERRIDE_
-		{
-			Indices->push_back(element);
-		}
-
-		virtual u32 operator [](u32 index) const _IRR_OVERRIDE_
-		{
-			return (*Indices)[index];
-		}
-
-		virtual u32 getLast() _IRR_OVERRIDE_
-		{
-			return Indices->getLast();
-		}
-
-		virtual void setValue(u32 index, u32 value) _IRR_OVERRIDE_
-		{
-			Indices->setValue(index, value);
-		}
-
-		virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
-		{
-			Indices->set_used(usedNow);
-		}
-
-		virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
-		{
-			Indices->reallocate(new_size);
-		}
-
-		virtual u32 allocated_size() const _IRR_OVERRIDE_
-		{
-			return Indices->allocated_size();
-		}
-
-		virtual void* pointer() _IRR_OVERRIDE_
-		{
-			return Indices->pointer();
-		}
-
-		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint() const _IRR_OVERRIDE_
-		{
-			return MappingHint;
-		}
-
-		//! set the hardware mapping hint, for driver
-		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) _IRR_OVERRIDE_
-		{
-			MappingHint=NewMappingHint;
-		}
-
-		//! flags the mesh as changed, reloads hardware buffers
-		virtual void setDirty() _IRR_OVERRIDE_
-		{
-			++ChangedID;
-		}
-
-		//! Get the currently used ID for identification of changes.
-		/** This shouldn't be used for anything outside the VideoDriver. */
-		virtual u32 getChangedID() const _IRR_OVERRIDE_ {return ChangedID;}
-
-		E_HARDWARE_MAPPING MappingHint;
-		u32 ChangedID;
-	};
-
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-

include/CMeshBuffer.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __T_MESH_BUFFER_H_INCLUDED__
-#define __T_MESH_BUFFER_H_INCLUDED__
+#pragma once
 
 #include "irrArray.h"
 #include "IMeshBuffer.h"
@@ -21,6 +20,7 @@ namespace scene
 		CMeshBuffer()
 			: ChangedID_Vertex(1), ChangedID_Index(1)
 			, MappingHint_Vertex(EHM_NEVER), MappingHint_Index(EHM_NEVER)
+			, HWBuffer(NULL)
 			, PrimitiveType(EPT_TRIANGLES)
 		{
 			#ifdef _DEBUG
@@ -31,7 +31,7 @@ namespace scene
 
 		//! Get material of this meshbuffer
 		/** \return Material of this buffer */
-		virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_
+		const video::SMaterial& getMaterial() const override
 		{
 			return Material;
 		}
@@ -39,7 +39,7 @@ namespace scene
 
 		//! Get material of this meshbuffer
 		/** \return Material of this buffer */
-		virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_
+		video::SMaterial& getMaterial() override
 		{
 			return Material;
 		}
@@ -47,7 +47,7 @@ namespace scene
 
 		//! Get pointer to vertices
 		/** \return Pointer to vertices. */
-		virtual const void* getVertices() const _IRR_OVERRIDE_
+		const void* getVertices() const override
 		{
 			return Vertices.const_pointer();
 		}
@@ -55,7 +55,7 @@ namespace scene
 
 		//! Get pointer to vertices
 		/** \return Pointer to vertices. */
-		virtual void* getVertices() _IRR_OVERRIDE_
+		void* getVertices() override
 		{
 			return Vertices.pointer();
 		}
@@ -63,21 +63,21 @@ namespace scene
 
 		//! Get number of vertices
 		/** \return Number of vertices. */
-		virtual u32 getVertexCount() const _IRR_OVERRIDE_
+		u32 getVertexCount() const override
 		{
 			return Vertices.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 _IRR_OVERRIDE_
+		video::E_INDEX_TYPE getIndexType() const override
 		{
 			return video::EIT_16BIT;
 		}
 
 		//! Get pointer to indices
 		/** \return Pointer to indices. */
-		virtual const u16* getIndices() const _IRR_OVERRIDE_
+		const u16* getIndices() const override
 		{
 			return Indices.const_pointer();
 		}
@@ -85,7 +85,7 @@ namespace scene
 
 		//! Get pointer to indices
 		/** \return Pointer to indices. */
-		virtual u16* getIndices() _IRR_OVERRIDE_
+		u16* getIndices() override
 		{
 			return Indices.pointer();
 		}
@@ -93,7 +93,7 @@ namespace scene
 
 		//! Get number of indices
 		/** \return Number of indices. */
-		virtual u32 getIndexCount() const _IRR_OVERRIDE_
+		u32 getIndexCount() const override
 		{
 			return Indices.size();
 		}
@@ -101,7 +101,7 @@ namespace scene
 
 		//! Get the axis aligned bounding box
 		/** \return Axis aligned bounding box of this buffer. */
-		virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_
+		const core::aabbox3d<f32>& getBoundingBox() const override
 		{
 			return BoundingBox;
 		}
@@ -110,7 +110,7 @@ namespace scene
 		//! 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) _IRR_OVERRIDE_
+		void setBoundingBox(const core::aabbox3df& box) override
 		{
 			BoundingBox = box;
 		}
@@ -118,7 +118,7 @@ namespace scene
 
 		//! Recalculate the bounding box.
 		/** should be called if the mesh changed. */
-		virtual void recalculateBoundingBox() _IRR_OVERRIDE_
+		void recalculateBoundingBox() override
 		{
 			if (!Vertices.empty())
 			{
@@ -135,43 +135,43 @@ namespace scene
 
 		//! Get type of vertex data stored in this buffer.
 		/** \return Type of vertex data. */
-		virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_
+		video::E_VERTEX_TYPE getVertexType() const override
 		{
 			return T::getType();
 		}
 
 		//! returns position of vertex i
-		virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_
+		const core::vector3df& getPosition(u32 i) const override
 		{
 			return Vertices[i].Pos;
 		}
 
 		//! returns position of vertex i
-		virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_
+		core::vector3df& getPosition(u32 i) override
 		{
 			return Vertices[i].Pos;
 		}
 
 		//! returns normal of vertex i
-		virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_
+		const core::vector3df& getNormal(u32 i) const override
 		{
 			return Vertices[i].Normal;
 		}
 
 		//! returns normal of vertex i
-		virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_
+		core::vector3df& getNormal(u32 i) override
 		{
 			return Vertices[i].Normal;
 		}
 
 		//! returns texture coord of vertex i
-		virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_
+		const core::vector2df& getTCoords(u32 i) const override
 		{
 			return Vertices[i].TCoords;
 		}
 
 		//! returns texture coord of vertex i
-		virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_
+		core::vector2df& getTCoords(u32 i) override
 		{
 			return Vertices[i].TCoords;
 		}
@@ -182,7 +182,7 @@ namespace scene
 		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) _IRR_OVERRIDE_
+		void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) override
 		{
 			if (vertices == getVertices())
 				return;
@@ -193,8 +193,8 @@ namespace scene
 			Vertices.reallocate(vertexCount+numVertices);
 			for (i=0; i<numVertices; ++i)
 			{
-				Vertices.push_back(reinterpret_cast<const T*>(vertices)[i]);
-				BoundingBox.addInternalPoint(reinterpret_cast<const T*>(vertices)[i].Pos);
+				Vertices.push_back(static_cast<const T*>(vertices)[i]);
+				BoundingBox.addInternalPoint(static_cast<const T*>(vertices)[i].Pos);
 			}
 
 			Indices.reallocate(getIndexCount()+numIndices);
@@ -205,51 +205,20 @@ namespace scene
 		}
 
 
-		//! 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) _IRR_OVERRIDE_
-		{
-			/*
-			if (this==other)
-				return;
-
-			const u32 vertexCount = getVertexCount();
-			u32 i;
-
-			Vertices.reallocate(vertexCount+other->getVertexCount());
-			for (i=0; i<other->getVertexCount(); ++i)
-			{
-				Vertices.push_back(reinterpret_cast<const T*>(other->getVertices())[i]);
-			}
-
-			Indices.reallocate(getIndexCount()+other->getIndexCount());
-			for (i=0; i<other->getIndexCount(); ++i)
-			{
-				Indices.push_back(other->getIndices()[i]+vertexCount);
-			}
-			BoundingBox.addInternalBox(other->getBoundingBox());
-			*/
-		}
-
-
 		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_
+		E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const override
 		{
 			return MappingHint_Vertex;
 		}
 
 		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_
+		E_HARDWARE_MAPPING getHardwareMappingHint_Index() const override
 		{
 			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 ) _IRR_OVERRIDE_
+		void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) override
 		{
 			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
 				MappingHint_Vertex=NewMappingHint;
@@ -258,19 +227,19 @@ namespace scene
 		}
 
 		//! Describe what kind of primitive geometry is used by the meshbuffer
-		virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) _IRR_OVERRIDE_
+		void setPrimitiveType(E_PRIMITIVE_TYPE type) override
 		{
 			PrimitiveType = type;
 		}
 
 		//! Get the kind of primitive geometry which is used by the meshbuffer
-		virtual E_PRIMITIVE_TYPE getPrimitiveType() const _IRR_OVERRIDE_
+		E_PRIMITIVE_TYPE getPrimitiveType() const override
 		{
 			return PrimitiveType;
 		}
 
 		//! flags the mesh as changed, reloads hardware buffers
-		virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_
+		void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) override
 		{
 			if (Buffer==EBT_VERTEX_AND_INDEX ||Buffer==EBT_VERTEX)
 				++ChangedID_Vertex;
@@ -280,11 +249,20 @@ namespace scene
 
 		//! Get the currently used ID for identification of changes.
 		/** This shouldn't be used for anything outside the VideoDriver. */
-		virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_ {return ChangedID_Vertex;}
+		u32 getChangedID_Vertex() const override {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 _IRR_OVERRIDE_ {return ChangedID_Index;}
+		u32 getChangedID_Index() const override {return ChangedID_Index;}
+
+		void setHWBuffer(void *ptr) const override {
+			HWBuffer = ptr;
+		}
+
+		void *getHWBuffer() const override {
+			return HWBuffer;
+		}
+
 
 		u32 ChangedID_Vertex;
 		u32 ChangedID_Index;
@@ -292,6 +270,7 @@ namespace scene
 		//! hardware mapping hint
 		E_HARDWARE_MAPPING MappingHint_Vertex;
 		E_HARDWARE_MAPPING MappingHint_Index;
+		mutable void *HWBuffer;
 
 		//! Material for this meshbuffer.
 		video::SMaterial Material;
@@ -313,7 +292,3 @@ namespace scene
 	typedef CMeshBuffer<video::S3DVertexTangents> SMeshBufferTangents;
 } // end namespace scene
 } // end namespace irr
-
-#endif
-
-

include/CVertexBuffer.h

@@ -1,210 +0,0 @@
-// Copyright (C) 2008-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_VERTEX_BUFFER_H_INCLUDED__
-#define __C_VERTEX_BUFFER_H_INCLUDED__
-
-#include "IVertexBuffer.h"
-
-
-namespace irr
-{
-namespace scene
-{
-
-	class CVertexBuffer : public IVertexBuffer
-	{
-		class IVertexList
-		{
-		public:
-			virtual ~IVertexList(){};
-
-			virtual u32 stride() const =0;
-
-			virtual u32 size() const =0;
-
-			virtual void push_back (const video::S3DVertex &element) =0;
-			virtual video::S3DVertex& operator [](const u32 index) const =0;
-			virtual video::S3DVertex& getLast() =0;
-			virtual void set_used(u32 usedNow) =0;
-			virtual void reallocate(u32 new_size) =0;
-			virtual u32 allocated_size() const =0;
-			virtual video::S3DVertex* pointer() =0;
-			virtual video::E_VERTEX_TYPE getType() const =0;
-		};
-
-		template <class T>
-		class CSpecificVertexList : public IVertexList
-		{
-		public:
-			core::array<T> Vertices;
-
-			virtual u32 stride() const _IRR_OVERRIDE_ {return sizeof(T);}
-
-			virtual u32 size() const _IRR_OVERRIDE_ {return Vertices.size();}
-
-			virtual void push_back (const video::S3DVertex &element) _IRR_OVERRIDE_
-			{Vertices.push_back((T&)element);}
-
-			virtual video::S3DVertex& operator [](const u32 index) const _IRR_OVERRIDE_
-			{return (video::S3DVertex&)Vertices[index];}
-
-			virtual video::S3DVertex& getLast() _IRR_OVERRIDE_
-			{return (video::S3DVertex&)Vertices.getLast();}
-
-			virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
-			{Vertices.set_used(usedNow);}
-
-			virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
-			{Vertices.reallocate(new_size);}
-
-			virtual u32 allocated_size() const _IRR_OVERRIDE_
-			{
-				return Vertices.allocated_size();
-			}
-
-			virtual video::S3DVertex* pointer() _IRR_OVERRIDE_ {return Vertices.pointer();}
-
-			virtual video::E_VERTEX_TYPE getType() const _IRR_OVERRIDE_ {return T::getType();}
-		};
-
-	public:
-		IVertexList *Vertices;
-
-		CVertexBuffer(video::E_VERTEX_TYPE vertexType) : Vertices(0),
-				MappingHint(EHM_NEVER), ChangedID(1)
-		{
-			setType(vertexType);
-		}
-
-		CVertexBuffer(const IVertexBuffer &VertexBufferCopy) :
-				Vertices(0), MappingHint(EHM_NEVER),
-				ChangedID(1)
-		{
-			setType(VertexBufferCopy.getType());
-			reallocate(VertexBufferCopy.size());
-
-			for (u32 n=0;n<VertexBufferCopy.size();++n)
-				push_back(VertexBufferCopy[n]);
-		}
-
-		virtual ~CVertexBuffer()
-		{
-			delete Vertices;
-		}
-
-
-		virtual void setType(video::E_VERTEX_TYPE vertexType) _IRR_OVERRIDE_
-		{
-			IVertexList *NewVertices=0;
-
-			switch (vertexType)
-			{
-				case video::EVT_STANDARD:
-				{
-					NewVertices=new CSpecificVertexList<video::S3DVertex>;
-					break;
-				}
-				case video::EVT_2TCOORDS:
-				{
-					NewVertices=new CSpecificVertexList<video::S3DVertex2TCoords>;
-					break;
-				}
-				case video::EVT_TANGENTS:
-				{
-					NewVertices=new CSpecificVertexList<video::S3DVertexTangents>;
-					break;
-				}
-			}
-			if (Vertices)
-			{
-				NewVertices->reallocate( Vertices->size() );
-
-				for(u32 n=0;n<Vertices->size();++n)
-					NewVertices->push_back((*Vertices)[n]);
-
-				delete Vertices;
-			}
-
-			Vertices=NewVertices;
-		}
-
-		virtual void* getData() _IRR_OVERRIDE_ {return Vertices->pointer();}
-
-		virtual video::E_VERTEX_TYPE getType() const _IRR_OVERRIDE_ {return Vertices->getType();}
-
-		virtual u32 stride() const _IRR_OVERRIDE_ {return Vertices->stride();}
-
-		virtual u32 size() const _IRR_OVERRIDE_
-		{
-			return Vertices->size();
-		}
-
-		virtual void push_back (const video::S3DVertex &element) _IRR_OVERRIDE_
-		{
-			Vertices->push_back(element);
-		}
-
-		virtual video::S3DVertex& operator [](const u32 index) const _IRR_OVERRIDE_
-		{
-			return (*Vertices)[index];
-		}
-
-		virtual video::S3DVertex& getLast() _IRR_OVERRIDE_
-		{
-			return Vertices->getLast();
-		}
-
-		virtual void set_used(u32 usedNow) _IRR_OVERRIDE_
-		{
-			Vertices->set_used(usedNow);
-		}
-
-		virtual void reallocate(u32 new_size) _IRR_OVERRIDE_
-		{
-			Vertices->reallocate(new_size);
-		}
-
-		virtual u32 allocated_size() const _IRR_OVERRIDE_
-		{
-			return Vertices->allocated_size();
-		}
-
-		virtual video::S3DVertex* pointer() _IRR_OVERRIDE_
-		{
-			return Vertices->pointer();
-		}
-
-		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint() const _IRR_OVERRIDE_
-		{
-			return MappingHint;
-		}
-
-		//! set the hardware mapping hint, for driver
-		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) _IRR_OVERRIDE_
-		{
-			MappingHint=NewMappingHint;
-		}
-
-		//! flags the mesh as changed, reloads hardware buffers
-		virtual void setDirty() _IRR_OVERRIDE_
-		{
-			++ChangedID;
-		}
-
-		//! Get the currently used ID for identification of changes.
-		/** This shouldn't be used for anything outside the VideoDriver. */
-		virtual u32 getChangedID() const _IRR_OVERRIDE_  {return ChangedID;}
-
-		E_HARDWARE_MAPPING MappingHint;
-		u32 ChangedID;
-	};
-
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-

include/EAttributes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_ATTRIBUTES_H_INCLUDED__
-#define __E_ATTRIBUTES_H_INCLUDED__
+#pragma once
 
 namespace irr
 {
@@ -19,75 +18,9 @@ enum E_ATTRIBUTE_TYPE
 	// float attribute
 	EAT_FLOAT,
 
-	// string attribute
-	EAT_STRING,
-
 	// boolean attribute
 	EAT_BOOL,
 
-	// enumeration attribute
-	EAT_ENUM,
-
-	// color attribute
-	EAT_COLOR,
-
-	// floating point color attribute
-	EAT_COLORF,
-
-	// 3d vector attribute
-	EAT_VECTOR3D,
-
-	// 2d position attribute
-	EAT_POSITION2D,
-
-	// vector 2d attribute
-	EAT_VECTOR2D,
-
-	// rectangle attribute
-	EAT_RECT,
-
-	// matrix attribute
-	EAT_MATRIX,
-
-	// quaternion attribute
-	EAT_QUATERNION,
-
-	// 3d bounding box
-	EAT_BBOX,
-
-	// plane
-	EAT_PLANE,
-
-	// 3d triangle
-	EAT_TRIANGLE3D,
-
-	// line 2d
-	EAT_LINE2D,
-
-	// line 3d
-	EAT_LINE3D,
-
-	// array of stringws attribute
-	EAT_STRINGWARRAY,
-
-	// array of float
-	EAT_FLOATARRAY,
-
-	// array of int
-	EAT_INTARRAY,
-
-	// binary data attribute
-	EAT_BINARY,
-
-	// texture reference attribute
-	EAT_TEXTURE,
-
-	// user pointer void*
-	EAT_USER_POINTER,
-
-	// dimension attribute
-	EAT_DIMENSION2D,
-
 	// known attribute type count
 	EAT_COUNT,
 
@@ -97,5 +30,3 @@ enum E_ATTRIBUTE_TYPE
 
 } // end namespace io
 } // end namespace irr
-
-#endif

include/ECullingTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_CULLING_TYPES_H_INCLUDED__
-#define __E_CULLING_TYPES_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 
@@ -35,7 +34,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif // __E_CULLING_TYPES_H_INCLUDED__
-

include/EDebugSceneTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DEBUG_SCENE_TYPES_H_INCLUDED__
-#define __E_DEBUG_SCENE_TYPES_H_INCLUDED__
+#pragma once
 
 namespace irr
 {
@@ -28,9 +27,6 @@ namespace scene
 		//! Overlays Mesh Wireframe
 		EDS_MESH_WIRE_OVERLAY = 8,
 
-		//! Temporary use transparency Material Type
-		EDS_HALF_TRANSPARENCY = 16,
-
 		//! Show Bounding Boxes of all MeshBuffers
 		EDS_BBOX_BUFFERS = 32,
 
@@ -44,7 +40,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif // __E_DEBUG_SCENE_TYPES_H_INCLUDED__
-

include/EDeviceTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DEVICE_TYPES_H_INCLUDED__
-#define __E_DEVICE_TYPES_H_INCLUDED__
+#pragma once
 
 namespace irr
 {
@@ -16,10 +15,6 @@ namespace irr
 		/** This device uses the Win32 API and works in all versions of Windows. */
 		EIDT_WIN32,
 
-		//! A device native to Windows CE devices
-		/** This device works on Windows Mobile, Pocket PC and Microsoft SmartPhone devices */
-		EIDT_WINCE,
-
 		//! A device native to Unix style operating systems.
 		/** This device uses the X11 windowing system and works in Linux, Solaris, FreeBSD, OSX and
 		other operating systems which support X11. */
@@ -29,27 +24,11 @@ namespace irr
 		/** This device uses Apple's Cocoa API and works in Mac OSX 10.2 and above. */
 		EIDT_OSX,
 
-        //! A device native to the iOS
-		/** This device should be used with the OpenGL-ES driver. */
-		EIDT_IOS,
-
 		//! 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,
 
-		//! A device for raw framebuffer access
-		/** Best used with embedded devices and mobile systems.
-		Does not need X11 or other graphical subsystems.
-		May support hw-acceleration via OpenGL-ES for FBDirect */
-		EIDT_FRAMEBUFFER,
-
-		//! A simple text only device supported by all platforms.
-		/** This device allows applications to run from the command line without opening a window.
-		It can render the output of the software drivers to the console as ASCII. It only supports
-		mouse and keyboard in Windows operating systems. */
-		EIDT_CONSOLE,
-
 		//! This selection allows Irrlicht to choose the best device from the ones available.
 		/** If this selection is chosen then Irrlicht will try to use the IrrlichtDevice native
 		to your operating system. If this is unavailable then the X11, SDL and then console device
@@ -65,6 +44,3 @@ namespace irr
 	};
 
 } // end namespace irr
-
-#endif // __E_DEVICE_TYPES_H_INCLUDED__
-

include/EDriverFeatures.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DRIVER_FEATURES_H_INCLUDED__
-#define __E_DRIVER_FEATURES_H_INCLUDED__
+#pragma once
 
 namespace irr
 {
@@ -121,21 +120,6 @@ namespace video
 		//! Support for texture coord transformation via texture matrix
 		EVDF_TEXTURE_MATRIX,
 
-		//! Support for DXTn compressed textures.
-		EVDF_TEXTURE_COMPRESSED_DXT,
-
-		//! Support for PVRTC compressed textures.
-		EVDF_TEXTURE_COMPRESSED_PVRTC,
-
-		//! Support for PVRTC2 compressed textures.
-		EVDF_TEXTURE_COMPRESSED_PVRTC2,
-
-		//! Support for ETC1 compressed textures.
-		EVDF_TEXTURE_COMPRESSED_ETC1,
-
-		//! Support for ETC2 compressed textures.
-		EVDF_TEXTURE_COMPRESSED_ETC2,
-
 		//! Support for cube map textures.
 		EVDF_TEXTURE_CUBEMAP,
 
@@ -151,7 +135,3 @@ namespace video
 
 } // end namespace video
 } // end namespace irr
-
-
-#endif
-

include/EDriverTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DRIVER_TYPES_H_INCLUDED__
-#define __E_DRIVER_TYPES_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 
@@ -20,33 +19,6 @@ 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. */
@@ -62,40 +34,11 @@ 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
-
-
-#endif

include/EFocusFlags.h

@@ -1,8 +1,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef E_FOCUS_FLAGS_H_INCLUDED__
-#define E_FOCUS_FLAGS_H_INCLUDED__
+#pragma once
 
 namespace irr
 {
@@ -33,6 +32,3 @@ enum EFOCUS_FLAG
 
 } // namespace gui
 } // namespace irr
-
-#endif
-

include/EGUIAlignment.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_GUI_ALIGNMENT_H_INCLUDED__
-#define __E_GUI_ALIGNMENT_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 
@@ -35,5 +34,3 @@ const c8* const GUIAlignmentNames[] =
 
 } // namespace gui
 } // namespace irr
-
-#endif // __E_GUI_ALIGNMENT_H_INCLUDED__

include/EGUIElementTypes.h

@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "irrTypes.h"
 
@@ -91,9 +90,6 @@ enum EGUI_ELEMENT_TYPE
 	//! The root of the GUI
 	EGUIET_ROOT,
 
-	//! IGUIProfiler
-	EGUIET_PROFILER,
-
 	//! Not an element, amount of elements in there
 	EGUIET_COUNT,
 
@@ -136,9 +132,3 @@ const c8* const GUIElementTypeNames[] =
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-
-
-
-

include/EHardwareBufferFlags.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_HARDWARE_BUFFER_FLAGS_INCLUDED__
-#define __E_HARDWARE_BUFFER_FLAGS_INCLUDED__
+#pragma once
 
 namespace irr
 {
@@ -39,6 +38,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/EMaterialFlags.h

@@ -1,101 +0,0 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __E_MATERIAL_FLAGS_H_INCLUDED__
-#define __E_MATERIAL_FLAGS_H_INCLUDED__
-
-namespace irr
-{
-namespace video
-{
-
-	//! Material flags
-	enum E_MATERIAL_FLAG
-	{
-		//! Draw as wireframe or filled triangles? Default: false
-		EMF_WIREFRAME = 0x1,
-
-		//! Draw as point cloud or filled triangles? Default: false
-		EMF_POINTCLOUD = 0x2,
-
-		//! Flat or Gouraud shading? Default: true
-		EMF_GOURAUD_SHADING = 0x4,
-
-		//! Will this material be lighted? Default: true
-		EMF_LIGHTING = 0x8,
-
-		//! Is the ZBuffer enabled? Default: true
-		EMF_ZBUFFER = 0x10,
-
-		//! May be written to the zbuffer or is it readonly. Default: true
-		/** This flag is ignored, if the material type is a transparent type. */
-		EMF_ZWRITE_ENABLE = 0x20,
-
-		//! Is backface culling enabled? Default: true
-		EMF_BACK_FACE_CULLING = 0x40,
-
-		//! Is frontface culling enabled? Default: false
-		/** Overrides EMF_BACK_FACE_CULLING if both are enabled. */
-		EMF_FRONT_FACE_CULLING = 0x80,
-
-		//! Is bilinear filtering enabled? Default: true
-		EMF_BILINEAR_FILTER = 0x100,
-
-		//! Is trilinear filtering enabled? Default: false
-		/** If the trilinear filter flag is enabled,
-		the bilinear filtering flag is ignored. */
-		EMF_TRILINEAR_FILTER = 0x200,
-
-		//! 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. */
-		EMF_ANISOTROPIC_FILTER = 0x400,
-
-		//! Is fog enabled? Default: false
-		EMF_FOG_ENABLE = 0x800,
-
-		//! 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 = 0x1000,
-
-		//! Access to all layers texture wrap settings. Overwrites separate layer settings.
-		/** Note that if you want to change TextureWrapU, TextureWrapV, TextureWrapW 
-		independently, then you can't work with this flag, but will have to set the variables
-		directly. */
-		EMF_TEXTURE_WRAP = 0x2000,
-
-		//! AntiAliasing mode
-		EMF_ANTI_ALIASING = 0x4000,
-
-		//! ColorMask bits, for enabling the color planes
-		EMF_COLOR_MASK = 0x8000,
-
-		//! ColorMaterial enum for vertex color interpretation
-		EMF_COLOR_MATERIAL = 0x10000,
-
-		//! Flag for enabling/disabling mipmap usage
-		EMF_USE_MIP_MAPS = 0x20000,
-
-		//! Flag for blend operation
-		EMF_BLEND_OPERATION = 0x40000,
-
-		//! Flag for polygon offset
-		EMF_POLYGON_OFFSET = 0x80000,
-
-        //! Flag for blend factor
-		EMF_BLEND_FACTOR = 0x160000
-	};
-
-} // end namespace video
-} // end namespace irr
-
-
-#endif // __E_MATERIAL_FLAGS_H_INCLUDED__
-

include/EMaterialProps.h

@@ -0,0 +1,82 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+namespace video
+{
+
+	//! Material properties
+	enum E_MATERIAL_PROP
+	{
+		//! Corresponds to SMaterial::Wireframe.
+		EMP_WIREFRAME = 0x1,
+
+		//! Corresponds to SMaterial::PointCloud.
+		EMP_POINTCLOUD = 0x2,
+
+		//! Corresponds to SMaterial::GouraudShading.
+		EMP_GOURAUD_SHADING = 0x4,
+
+		//! Corresponds to SMaterial::Lighting.
+		EMP_LIGHTING = 0x8,
+
+		//! Corresponds to SMaterial::ZBuffer.
+		EMP_ZBUFFER = 0x10,
+
+		//! Corresponds to SMaterial::ZWriteEnable.
+		EMP_ZWRITE_ENABLE = 0x20,
+
+		//! Corresponds to SMaterial::BackfaceCulling.
+		EMP_BACK_FACE_CULLING = 0x40,
+
+		//! Corresponds to SMaterial::FrontfaceCulling.
+		EMP_FRONT_FACE_CULLING = 0x80,
+
+		//! Corresponds to SMaterialLayer::MinFilter.
+		EMP_MIN_FILTER = 0x100,
+
+		//! Corresponds to SMaterialLayer::MagFilter.
+		EMP_MAG_FILTER = 0x200,
+
+		//! Corresponds to SMaterialLayer::AnisotropicFilter.
+		EMP_ANISOTROPIC_FILTER = 0x400,
+
+		//! Corresponds to SMaterial::FogEnable.
+		EMP_FOG_ENABLE = 0x800,
+
+		//! Corresponds to SMaterial::NormalizeNormals.
+		EMP_NORMALIZE_NORMALS = 0x1000,
+
+		//! Corresponds to SMaterialLayer::TextureWrapU, TextureWrapV and
+		//! TextureWrapW.
+		EMP_TEXTURE_WRAP = 0x2000,
+
+		//! Corresponds to SMaterial::AntiAliasing.
+		EMP_ANTI_ALIASING = 0x4000,
+
+		//! Corresponds to SMaterial::ColorMask.
+		EMP_COLOR_MASK = 0x8000,
+
+		//! Corresponds to SMaterial::ColorMaterial.
+		EMP_COLOR_MATERIAL = 0x10000,
+
+		//! Corresponds to SMaterial::UseMipMaps.
+		EMP_USE_MIP_MAPS = 0x20000,
+
+		//! Corresponds to SMaterial::BlendOperation.
+		EMP_BLEND_OPERATION = 0x40000,
+
+		//! Corresponds to SMaterial::PolygonOffsetFactor, PolygonOffsetDirection,
+		//! PolygonOffsetDepthBias and PolygonOffsetSlopeScale.
+		EMP_POLYGON_OFFSET = 0x80000,
+
+		//! Corresponds to SMaterial::BlendFactor.
+		EMP_BLEND_FACTOR = 0x100000,
+	};
+
+} // end namespace video
+} // end namespace irr

include/EMaterialTypes.h

@@ -2,8 +2,9 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_MATERIAL_TYPES_H_INCLUDED__
-#define __E_MATERIAL_TYPES_H_INCLUDED__
+#pragma once
+
+#include "irrTypes.h"
 
 namespace irr
 {
@@ -18,75 +19,6 @@ namespace video
 		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.
-		*/
-		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. Dynamic light is
-		ignored. */
-		EMT_LIGHTMAP,
-
-		//! 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. 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. Dynamic light is
-		ignored. The texture colors are effectively multiplied by 4
-		for brightening. Like known in DirectX as D3DTOP_MODULATE4X. */
-		EMT_LIGHTMAP_M4,
-
-		//! Like EMT_LIGHTMAP, but also supports dynamic lighting.
-		EMT_LIGHTMAP_LIGHTING,
-
-		//! Like EMT_LIGHTMAP_M2, but also supports dynamic lighting.
-		EMT_LIGHTMAP_LIGHTING_M2,
-
-		//! Like EMT_LIGHTMAP_M4, 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 subtract
-		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,
-
-		//! 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 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
-		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
@@ -115,77 +47,6 @@ namespace video
 		//! 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 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.*/
-		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 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 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 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.
-		/** 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 like EMT_PARALLAX_MAP_SOLID, but transparent.
-		/** Using EMT_TRANSPARENT_ADD_COLOR as base material. */
-		EMT_PARALLAX_MAP_TRANSPARENT_ADD_COLOR,
-
-		//! 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 first texture. Generic blending method.
 		The blend function is set to SMaterial::MaterialTypeParam with
@@ -200,35 +61,15 @@ namespace video
 	const char* const sBuiltInMaterialTypeNames[] =
 	{
 		"solid",
-		"solid_2layer",
-		"lightmap",
-		"lightmap_add",
-		"lightmap_m2",
-		"lightmap_m4",
-		"lightmap_light",
-		"lightmap_light_m2",
-		"lightmap_light_m4",
-		"detail_map",
-		"sphere_map",
-		"reflection_2layer",
-		"trans_add",
 		"trans_alphach",
 		"trans_alphach_ref",
 		"trans_vertex_alpha",
-		"trans_reflection_2layer",
-		"normalmap_solid",
-		"normalmap_trans_add",
-		"normalmap_trans_vertexalpha",
-		"parallaxmap_solid",
-		"parallaxmap_trans_add",
-		"parallaxmap_trans_vertexalpha",
 		"onetexture_blend",
 		0
 	};
 
+	constexpr u32 numBuiltInMaterials =
+		sizeof(sBuiltInMaterialTypeNames) / sizeof(char*) - 1;
+
 } // end namespace video
 } // end namespace irr
-
-
-#endif // __E_MATERIAL_TYPES_H_INCLUDED__
-

include/EMeshWriterEnums.h

@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "irrTypes.h"
 
@@ -59,7 +58,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif // __E_MESH_WRITER_ENUMS_H_INCLUDED__
-

include/EMessageBoxFlags.h

@@ -1,36 +0,0 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __E_MESSAGE_BOX_FLAGS_H_INCLUDED__
-#define __E_MESSAGE_BOX_FLAGS_H_INCLUDED__
-
-namespace irr
-{
-namespace gui
-{
-
-//! enumeration for message box layout flags
-enum EMESSAGE_BOX_FLAG
-{
-	//! Flag for the OK button
-	EMBF_OK = 0x1,
-
-	//! Flag for the cancel button
-	EMBF_CANCEL = 0x2,
-
-	//! Flag for the yes button
-	EMBF_YES = 0x4,
-
-	//! Flag for the no button
-	EMBF_NO = 0x8,
-
-	//! This value is not used. It only forces this enumeration to compile in 32 bit.
-	EMBF_FORCE_32BIT = 0x7fffffff
-};
-
-} // namespace gui
-} // namespace irr
-
-#endif
-

include/EPrimitiveTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_PRIMITIVE_TYPES_H_INCLUDED__
-#define __E_PRIMITIVE_TYPES_H_INCLUDED__
+#pragma once
 
 namespace irr
 {
@@ -36,26 +35,9 @@ namespace scene
 		//! Explicitly set all vertices for each triangle.
 		EPT_TRIANGLES,
 
-		//! After the first two vertices each further two vertices create a quad with the preceding two.
-		//! Not supported by Direct3D
-		EPT_QUAD_STRIP,
-
-		//! Every four vertices create a quad.
-		//! Not supported by Direct3D
-		//! Deprecated with newer OpenGL drivers
-		EPT_QUADS,
-
-		//! Just as LINE_LOOP, but filled.
-		//! Not supported by Direct3D
-		//! Deprecated with newer OpenGL drivers
-		EPT_POLYGON,
-
 		//! The single vertices are expanded to quad billboards on the GPU.
 		EPT_POINT_SPRITES
 	};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/EReadFileType.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_READ_FILE_TYPES_H_INCLUDED__
-#define __E_READ_FILE_TYPES_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 
@@ -29,6 +28,3 @@ namespace io
 	};
 } // end namespace io
 } // end namespace irr
-
-
-#endif

include/ESceneNodeTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_SCENE_NODE_TYPES_H_INCLUDED__
-#define __E_SCENE_NODE_TYPES_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 
@@ -50,7 +49,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif
-

include/EShaderTypes.h

@@ -1,5 +1,4 @@
-#ifndef __E_SHADER_TYPES_H_INCLUDED__
-#define __E_SHADER_TYPES_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 
@@ -85,6 +84,3 @@ const c8* const GEOMETRY_SHADER_TYPE_NAMES[] = {
 
 } // end namespace video
 } // end namespace irr
-
-#endif // __E_SHADER_TYPES_H_INCLUDED__
-

include/ETerrainElements.h

@@ -1,36 +0,0 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __E_TERRAIN_ELEMENTS_H__
-#define __E_TERRAIN_ELEMENTS_H__
-
-namespace irr
-{
-namespace scene
-{
-
-	//! enumeration for patch sizes specifying the size of patches in the TerrainSceneNode
-	enum E_TERRAIN_PATCH_SIZE
-	{
-		//! patch size of 9, at most, use 4 levels of detail with this patch size.
-		ETPS_9 = 9,
-
-		//! patch size of 17, at most, use 5 levels of detail with this patch size.
-		ETPS_17 = 17,
-
-		//! patch size of 33, at most, use 6 levels of detail with this patch size.
-		ETPS_33 = 33,
-
-		//! patch size of 65, at most, use 7 levels of detail with this patch size.
-		ETPS_65 = 65,
-
-		//! patch size of 129, at most, use 8 levels of detail with this patch size.
-		ETPS_129 = 129
-	};
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-

include/EVertexAttributes.h

@@ -1,5 +1,4 @@
-#ifndef __E_VERTEX_ATTRIBUTES_H_INCLUDED__
-#define __E_VERTEX_ATTRIBUTES_H_INCLUDED__
+#pragma once
 
 namespace irr
 {
@@ -34,5 +33,3 @@ const char* const sBuiltInVertexAttributeNames[] =
 
 } // end namespace video
 } // end namespace irr
-
-#endif //__E_VERTEX_ATTRIBUTES_H_INCLUDED__

include/IAnimatedMesh.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ANIMATED_MESH_H_INCLUDED__
-#define __I_ANIMATED_MESH_H_INCLUDED__
+#pragma once
 
 #include "aabbox3d.h"
 #include "IMesh.h"
@@ -61,7 +60,7 @@ namespace scene
 		if getMeshType() returns EAMT_MD2 it's safe to cast the
 		IAnimatedMesh to IAnimatedMeshMD2.
 		\returns Type of the mesh. */
-		virtual E_ANIMATED_MESH_TYPE getMeshType() const _IRR_OVERRIDE_
+		E_ANIMATED_MESH_TYPE getMeshType() const override
 		{
 			return EAMT_UNKNOWN;
 		}
@@ -69,6 +68,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IAnimatedMeshSceneNode.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
-#define __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
+#pragma once
 
 #include "ISceneNode.h"
 #include "IBoneSceneNode.h"
@@ -172,6 +171,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IAttributeExchangingObject.h

@@ -1,71 +0,0 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED__
-#define __I_ATTRIBUTE_EXCHANGING_OBJECT_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-
-
-namespace irr
-{
-
-namespace io
-{
-
-class IAttributes;
-
-//! Enumeration flags passed through SAttributeReadWriteOptions to the IAttributeExchangingObject object
-enum E_ATTRIBUTE_READ_WRITE_FLAGS
-{
-	//! Serialization/Deserializion is done for an xml file
-	EARWF_FOR_FILE = 0x00000001,
-
-	//! Serialization/Deserializion is done for an editor property box
-	EARWF_FOR_EDITOR = 0x00000002,
-
-	//! When writing filenames, relative paths should be used
-	EARWF_USE_RELATIVE_PATHS = 0x00000004
-};
-
-
-//! struct holding data describing options
-struct SAttributeReadWriteOptions
-{
-	//! Constructor
-	SAttributeReadWriteOptions()
-		: Flags(0), Filename(0)
-	{
-	}
-
-	//! Combination of E_ATTRIBUTE_READ_WRITE_FLAGS or other, custom ones
-	s32 Flags;
-
-	//! Optional filename
-	const fschar_t* Filename;
-};
-
-
-//! An object which is able to serialize and deserialize its attributes into an attributes object
-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. */
-	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. */
-	virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) {}
-
-};
-
-} // end namespace io
-} // end namespace irr
-
-#endif
-

include/IAttributes.h

@@ -2,29 +2,13 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ATTRIBUTES_H_INCLUDED__
-#define __I_ATTRIBUTES_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
-#include "SColor.h"
-#include "vector3d.h"
-#include "vector2d.h"
-#include "line2d.h"
-#include "line3d.h"
-#include "triangle3d.h"
-#include "position2d.h"
-#include "rect.h"
-#include "dimension2d.h"
-#include "matrix4.h"
-#include "quaternion.h"
-#include "plane3d.h"
-#include "triangle3d.h"
-#include "line2d.h"
-#include "line3d.h"
-#include "irrString.h"
-#include "irrArray.h"
 #include "EAttributes.h"
-#include "path.h"
+
+// not needed here but I can't be bothered to clean the transitive includes up.
+#include "quaternion.h"
 
 namespace irr
 {
@@ -55,16 +39,6 @@ public:
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
 	virtual E_ATTRIBUTE_TYPE getAttributeType(s32 index) const = 0;
 
-	//! Returns the type string of the attribute
-	//! \param attributeName: String for the attribute type
-	//! \param defaultNotFound Value returned when attributeName was not found
-	virtual const wchar_t* getAttributeTypeString(const c8* attributeName, const wchar_t* defaultNotFound = L"unknown") const = 0;
-
-	//! Returns the type string of the attribute by index.
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	//! \param defaultNotFound Value returned for an invalid index
-	virtual const wchar_t* getAttributeTypeString(s32 index, const wchar_t* defaultNotFound = L"unknown") const = 0;
-
 	//! Returns if an attribute with a name exists
 	virtual bool existsAttribute(const c8* attributeName) const = 0;
 
@@ -125,133 +99,9 @@ public:
 	//! Sets an attribute as float value
 	virtual void setAttribute(s32 index, f32 value) = 0;
 
-	/*
-
-		String Attribute
-
-	*/
-
-	//! Adds an attribute as string
-	virtual void addString(const c8* attributeName, const c8* value) = 0;
-
-	//! 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.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	//! or defaultNotFound if attribute is not set.
-	virtual core::stringc getAttributeAsString(const c8* attributeName, const core::stringc& defaultNotFound=core::stringc()) const = 0;
-
-	//! Gets an attribute as string.
-	//! \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) const = 0;
-
-	//! Returns attribute value as string by index.
-	//! \param index Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::stringc getAttributeAsString(s32 index) const = 0;
-
-	//! 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
-
-	//! Adds an attribute as string
-	virtual void addString(const c8* attributeName, const wchar_t* value) = 0;
-
-	//! 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.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	//! or defaultNotFound if attribute is not set.
-	virtual core::stringw getAttributeAsStringW(const c8* attributeName, const core::stringw& defaultNotFound = core::stringw()) const = 0;
-
-	//! Gets an attribute as string.
-	//! \param attributeName: Name of the attribute to get.
-	//! \param target: Buffer where the string is copied to.
-	virtual void getAttributeAsStringW(const c8* attributeName, wchar_t* target) const = 0;
-
-	//! Returns attribute value as string by index.
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::stringw getAttributeAsStringW(s32 index) const = 0;
-
-	//! 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;
 
 	/*
-
-		Binary Data Attribute
-
-	*/
-
-	//! Adds an attribute as binary data
-	virtual void addBinary(const c8* attributeName, void* data, s32 dataSizeInBytes) = 0;
-
-	//! Sets an attribute as binary data
-	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 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) const = 0;
-
-	//! Gets an attribute as binary data
-	/** \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) const = 0;
-
-	//! Sets an attribute as binary data
-	virtual void setAttribute(s32 index, void* data, s32 dataSizeInBytes ) = 0;
-
-
-	/*
-		Array Attribute
-	*/
-
-	//! Adds an attribute as wide string array
-	virtual void addArray(const c8* attributeName, const core::array<core::stringw>& value) = 0;
-
-	//! 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.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	//! or defaultNotFound if attribute is not set.
-	virtual core::array<core::stringw> getAttributeAsArray(const c8* attributeName, const core::array<core::stringw>& defaultNotFound = core::array<core::stringw>()) const = 0;
-
-	//! 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) const = 0;
-
-	//! Sets an attribute as an array of wide strings
-	virtual void setAttribute(s32 index, const core::array<core::stringw>& value) = 0;
-
-
-	/*
-
 		Bool Attribute
-
 	*/
 
 	//! Adds an attribute as bool
@@ -273,476 +123,7 @@ public:
 	//! Sets an attribute as boolean value
 	virtual void setAttribute(s32 index, bool value) = 0;
 
-	/*
-
-		Enumeration Attribute
-
-	*/
-
-	//! Adds an attribute as enum
-	virtual void addEnum(const c8* attributeName, const c8* enumValue, const c8* const* enumerationLiterals) = 0;
-
-	//! Adds an attribute as enum
-	virtual void addEnum(const c8* attributeName, s32 enumValue, const c8* const* enumerationLiterals) = 0;
-
-	//! Sets an attribute as enumeration
-	virtual void setAttribute(const c8* attributeName, const c8* enumValue, const c8* const* enumerationLiterals) = 0;
-
-	//! Gets an attribute as enumeration
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual const c8* getAttributeAsEnumeration(const c8* attributeName, const c8* defaultNotFound = 0) const = 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()
-	*/
-	virtual s32 getAttributeAsEnumeration(const c8* attributeName, const c8* const* enumerationLiteralsToUse, s32 defaultNotFound = -1) const = 0;
-
-	//! Gets an attribute as enumeration
-	/** \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.
-	\param defaultNotFound Value returned when the attribute referenced by the index was not found.
-	\return Returns value of the attribute previously set by setAttribute()
-	*/
-	virtual s32 getAttributeAsEnumeration(s32 index, const c8* const* enumerationLiteralsToUse, s32 defaultNotFound = -1) const = 0;
-
-	//! Gets an attribute as enumeration
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual const c8* getAttributeAsEnumeration(s32 index) const = 0;
-
-	//! 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) const = 0;
-
-	//! 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) const = 0;
-
-	//! Sets an attribute as enumeration
-	virtual void setAttribute(s32 index, const c8* enumValue, const c8* const* enumerationLiterals) = 0;
-
-
-	/*
-
-		SColor Attribute
-
-	*/
-
-	//! Adds an attribute as color
-	virtual void addColor(const c8* attributeName, video::SColor value) = 0;
-
-
-	//! Sets a attribute as color
-	virtual void setAttribute(const c8* attributeName, video::SColor color) = 0;
-
-	//! Gets an attribute as color
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual video::SColor getAttributeAsColor(const c8* attributeName, const video::SColor& defaultNotFound = video::SColor(0)) const = 0;
-
-	//! Gets an attribute as color
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual video::SColor getAttributeAsColor(s32 index) const = 0;
-
-	//! Sets an attribute as color
-	virtual void setAttribute(s32 index, video::SColor color) = 0;
-
-	/*
-
-		SColorf Attribute
-
-	*/
-
-	//! Adds an attribute as floating point color
-	virtual void addColorf(const c8* attributeName, video::SColorf value) = 0;
-
-	//! Sets a attribute as floating point color
-	virtual void setAttribute(const c8* attributeName, video::SColorf color) = 0;
-
-	//! Gets an attribute as floating point color
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual video::SColorf getAttributeAsColorf(const c8* attributeName, const video::SColorf& defaultNotFound = video::SColorf(0)) const = 0;
-
-	//! Gets an attribute as floating point color
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual video::SColorf getAttributeAsColorf(s32 index) const = 0;
-
-	//! Sets an attribute as floating point color
-	virtual void setAttribute(s32 index, video::SColorf color) = 0;
-
-
-	/*
-
-		Vector3d Attribute
-
-	*/
-
-	//! Adds an attribute as 3d vector
-	virtual void addVector3d(const c8* attributeName, const core::vector3df& value) = 0;
-
-	//! Sets a attribute as 3d vector
-	virtual void setAttribute(const c8* attributeName, const core::vector3df& v) = 0;
-
-	//! Gets an attribute as 3d vector
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::vector3df getAttributeAsVector3d(const c8* attributeName, const core::vector3df& defaultNotFound=core::vector3df(0,0,0)) const = 0;
-
-	//! Gets an attribute as 3d vector
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::vector3df getAttributeAsVector3d(s32 index) const = 0;
-
-	//! Sets an attribute as vector
-	virtual void setAttribute(s32 index, const core::vector3df& v) = 0;
-
-	/*
-
-		Vector2d Attribute
-
-	*/
-
-	//! Adds an attribute as 2d vector
-	virtual void addVector2d(const c8* attributeName, const core::vector2df& value) = 0;
-
-	//! Sets a attribute as 2d vector
-	virtual void setAttribute(const c8* attributeName, const core::vector2df& v) = 0;
-
-	//! Gets an attribute as vector
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::vector2df getAttributeAsVector2d(const c8* attributeName, const core::vector2df& defaultNotFound=core::vector2df(0,0)) const = 0;
-
-	//! Gets an attribute as position
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::vector2df getAttributeAsVector2d(s32 index) const = 0;
-
-	//! Sets an attribute as 2d vector
-	virtual void setAttribute(s32 index, const core::vector2df& v) = 0;
-
-	/*
-
-		Position2d Attribute
-
-	*/
-
-	//! Adds an attribute as 2d position
-	virtual void addPosition2d(const c8* attributeName, const core::position2di& value) = 0;
-
-	//! Sets a attribute as 2d position
-	virtual void setAttribute(const c8* attributeName, const core::position2di& v) = 0;
-
-	//! Gets an attribute as position
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::position2di getAttributeAsPosition2d(const c8* attributeName, const core::position2di& defaultNotFound=core::position2di(0,0)) const = 0;
-
-	//! Gets an attribute as position
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::position2di getAttributeAsPosition2d(s32 index) const = 0;
-
-	//! Sets an attribute as 2d position
-	virtual void setAttribute(s32 index, const core::position2di& v) = 0;
-
-	/*
-
-		Rectangle Attribute
-
-	*/
-
-	//! Adds an attribute as rectangle
-	virtual void addRect(const c8* attributeName, const core::rect<s32>& value) = 0;
-
-	//! Sets an attribute as rectangle
-	virtual void setAttribute(const c8* attributeName, const core::rect<s32>& v) = 0;
-
-	//! Gets an attribute as rectangle
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::rect<s32> getAttributeAsRect(const c8* attributeName, const core::rect<s32>& defaultNotFound = core::rect<s32>()) const = 0;
-
-	//! Gets an attribute as rectangle
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::rect<s32> getAttributeAsRect(s32 index) const = 0;
-
-	//! Sets an attribute as rectangle
-	virtual void setAttribute(s32 index, const core::rect<s32>& v) = 0;
-
-
-	/*
-
-		Dimension2d Attribute
-
-	*/
-
-	//! Adds an attribute as dimension2d
-	virtual void addDimension2d(const c8* attributeName, const core::dimension2d<u32>& value) = 0;
-
-	//! Sets an attribute as dimension2d
-	virtual void setAttribute(const c8* attributeName, const core::dimension2d<u32>& v) = 0;
-
-	//! Gets an attribute as dimension2d
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::dimension2d<u32> getAttributeAsDimension2d(const c8* attributeName, const core::dimension2d<u32>& defaultNotFound = core::dimension2d<u32>()) const = 0;
-
-	//! Gets an attribute as dimension2d
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::dimension2d<u32> getAttributeAsDimension2d(s32 index) const = 0;
-
-	//! Sets an attribute as dimension2d
-	virtual void setAttribute(s32 index, const core::dimension2d<u32>& v) = 0;
-
-
-	/*
-		matrix attribute
-	*/
-
-	//! Adds an attribute as matrix
-	virtual void addMatrix(const c8* attributeName, const core::matrix4& v) = 0;
-
-	//! Sets an attribute as matrix
-	virtual void setAttribute(const c8* attributeName, const core::matrix4& v) = 0;
-
-	//! Gets an attribute as a matrix4
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::matrix4 getAttributeAsMatrix(const c8* attributeName, const core::matrix4& defaultNotFound=core::matrix4()) const = 0;
-
-	//! Gets an attribute as matrix
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::matrix4 getAttributeAsMatrix(s32 index) const = 0;
-
-	//! Sets an attribute as matrix
-	virtual void setAttribute(s32 index, const core::matrix4& v) = 0;
-
-	/*
-		quaternion attribute
-
-	*/
-
-	//! Adds an attribute as quaternion
-	virtual void addQuaternion(const c8* attributeName, const core::quaternion& v) = 0;
-
-	//! Sets an attribute as quaternion
-	virtual void setAttribute(const c8* attributeName, const core::quaternion& v) = 0;
-
-	//! Gets an attribute as a quaternion
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::quaternion getAttributeAsQuaternion(const c8* attributeName, const core::quaternion& defaultNotFound=core::quaternion(0,1,0, 0)) const = 0;
-
-	//! Gets an attribute as quaternion
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::quaternion getAttributeAsQuaternion(s32 index) const = 0;
-
-	//! Sets an attribute as quaternion
-	virtual void setAttribute(s32 index, const core::quaternion& v) = 0;
-
-	/*
-
-		3d bounding box
-
-	*/
-
-	//! Adds an attribute as axis aligned bounding box
-	virtual void addBox3d(const c8* attributeName, const core::aabbox3df& v) = 0;
-
-	//! Sets an attribute as axis aligned bounding box
-	virtual void setAttribute(const c8* attributeName, const core::aabbox3df& v) = 0;
-
-	//! Gets an attribute as a axis aligned bounding box
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::aabbox3df getAttributeAsBox3d(const c8* attributeName, const core::aabbox3df& defaultNotFound=core::aabbox3df(0,0,0, 0,0,0)) const = 0;
-
-	//! Gets an attribute as axis aligned bounding box
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::aabbox3df getAttributeAsBox3d(s32 index) const = 0;
-
-	//! Sets an attribute as axis aligned bounding box
-	virtual void setAttribute(s32 index, const core::aabbox3df& v) = 0;
-
-	/*
-
-		plane
-
-	*/
-
-	//! Adds an attribute as 3d plane
-	virtual void addPlane3d(const c8* attributeName, const core::plane3df& v) = 0;
-
-	//! Sets an attribute as 3d plane
-	virtual void setAttribute(const c8* attributeName, const core::plane3df& v) = 0;
-
-	//! Gets an attribute as a 3d plane
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::plane3df getAttributeAsPlane3d(const c8* attributeName, const core::plane3df& defaultNotFound=core::plane3df(0,0,0, 0,1,0)) const = 0;
-
-	//! Gets an attribute as 3d plane
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::plane3df getAttributeAsPlane3d(s32 index) const = 0;
-
-	//! Sets an attribute as 3d plane
-	virtual void setAttribute(s32 index, const core::plane3df& v) = 0;
-
-
-	/*
-
-		3d triangle
-
-	*/
-
-	//! Adds an attribute as 3d triangle
-	virtual void addTriangle3d(const c8* attributeName, const core::triangle3df& v) = 0;
-
-	//! Sets an attribute as 3d trianle
-	virtual void setAttribute(const c8* attributeName, const core::triangle3df& v) = 0;
-
-	//! Gets an attribute as a 3d triangle
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::triangle3df getAttributeAsTriangle3d(const c8* attributeName, const core::triangle3df& defaultNotFound = core::triangle3df(core::vector3df(0,0,0), core::vector3df(0,0,0), core::vector3df(0,0,0))) const = 0;
-
-	//! Gets an attribute as 3d triangle
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::triangle3df getAttributeAsTriangle3d(s32 index) const = 0;
-
-	//! Sets an attribute as 3d triangle
-	virtual void setAttribute(s32 index, const core::triangle3df& v) = 0;
-
-
-	/*
-
-		line 2d
-
-	*/
-
-	//! Adds an attribute as a 2d line
-	virtual void addLine2d(const c8* attributeName, const core::line2df& v) = 0;
-
-	//! Sets an attribute as a 2d line
-	virtual void setAttribute(const c8* attributeName, const core::line2df& v) = 0;
-
-	//! Gets an attribute as a 2d line
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::line2df getAttributeAsLine2d(const c8* attributeName, const core::line2df& defaultNotFound = core::line2df(0,0, 0,0)) const = 0;
-
-	//! Gets an attribute as a 2d line
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::line2df getAttributeAsLine2d(s32 index) const = 0;
-
-	//! Sets an attribute as a 2d line
-	virtual void setAttribute(s32 index, const core::line2df& v) = 0;
-
-
-	/*
-
-		line 3d
-
-	*/
-
-	//! Adds an attribute as a 3d line
-	virtual void addLine3d(const c8* attributeName, const core::line3df& v) = 0;
-
-	//! Sets an attribute as a 3d line
-	virtual void setAttribute(const c8* attributeName, const core::line3df& v) = 0;
-
-	//! Gets an attribute as a 3d line
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::line3df getAttributeAsLine3d(const c8* attributeName, const core::line3df& defaultNotFound=core::line3df(0,0,0, 0,0,0)) const = 0;
-
-	//! Gets an attribute as a 3d line
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::line3df getAttributeAsLine3d(s32 index) const = 0;
-
-	//! Sets an attribute as a 3d line
-	virtual void setAttribute(s32 index, const core::line3df& v) = 0;
-
-
-	/*
-
-		Texture Attribute
-
-	*/
-
-	//! Adds an attribute as texture reference
-	virtual void addTexture(const c8* attributeName, video::ITexture* texture, const io::path& filename = "") = 0;
-
-	//! Sets an attribute as texture reference
-	virtual void setAttribute(const c8* attributeName, video::ITexture* texture, const io::path& filename = "") = 0;
-
-	//! Gets an attribute as texture reference
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	virtual video::ITexture* getAttributeAsTexture(const c8* attributeName, video::ITexture* defaultNotFound=0) const = 0;
-
-	//! Gets an attribute as texture reference
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual video::ITexture* getAttributeAsTexture(s32 index) const = 0;
-
-	//! Sets an attribute as texture reference
-	virtual void setAttribute(s32 index, video::ITexture* texture, const io::path& filename = "") = 0;
-
-
-	/*
-
-		User Pointer Attribute
-
-	*/
-
-	//! Adds an attribute as user pointer
-	virtual void addUserPointer(const c8* attributeName, void* userPointer) = 0;
-
-	//! Sets an attribute as user pointer
-	virtual void setAttribute(const c8* attributeName, void* userPointer) = 0;
-
-	//! Gets an attribute as user pointer
-	//! \param attributeName: Name of the attribute to get.
-	//! \param defaultNotFound Value returned when attributeName was not found
-	virtual void* getAttributeAsUserPointer(const c8* attributeName, void* defaultNotFound = 0) const = 0;
-
-	//! Gets an attribute as user pointer
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual void* getAttributeAsUserPointer(s32 index) const = 0;
-
-	//! Sets an attribute as user pointer
-	virtual void setAttribute(s32 index, void* userPointer) = 0;
-
 };
 
 } // end namespace io
 } // end namespace irr
-
-#endif
-
-
-

include/IBillboardSceneNode.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_BILLBOARD_SCENE_NODE_H_INCLUDED__
-#define __I_BILLBOARD_SCENE_NODE_H_INCLUDED__
+#pragma once
 
 #include "ISceneNode.h"
 
@@ -12,6 +11,7 @@ namespace irr
 namespace scene
 {
 	class ICameraSceneNode;
+	class IMeshBuffer;
 
 //! A billboard scene node.
 /** A billboard is like a 3d sprite: A 2d element,
@@ -74,11 +74,18 @@ public:
 	    That is why the usual getBoundingBox will return a "safe" boundingbox which is guaranteed
 	    to contain the billboard. While this function can return the real one. */
 	virtual const core::aabbox3d<f32>& getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode* camera) = 0;
+
+	//! Get the amount of mesh buffers.
+	/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
+	virtual u32 getMeshBufferCount() const = 0;
+
+	//! Get pointer to a mesh buffer.
+	/** NOTE: Positions and normals of this meshbuffers are re-calculated before rendering.
+	So this is mainly useful to access/modify the uv-coordinates.
+	\param nr: Zero based index of the mesh buffer.
+	\return Pointer to the mesh buffer or 0 if there is no such	mesh buffer. */
+	virtual IMeshBuffer* getMeshBuffer(u32 nr) const = 0;
 };
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif
-

include/IBoneSceneNode.h

@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "ISceneNode.h"
 
@@ -59,10 +58,6 @@ namespace scene
 		IBoneSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id=-1) :
 			ISceneNode(parent, mgr, id),positionHint(-1),scaleHint(-1),rotationHint(-1) { }
 
-		//! Get the name of the bone
-		/** \deprecated Use getName instead. This method may be removed by Irrlicht 1.9 */
-		_IRR_DEPRECATED_ virtual const c8* getBoneName() const { return getName(); }
-
 		//! Get the index of the bone
 		virtual u32 getBoneIndex() const = 0;
 
@@ -74,17 +69,17 @@ namespace scene
 		virtual E_BONE_ANIMATION_MODE getAnimationMode() const = 0;
 
 		//! Get the axis aligned bounding box of this node
-		virtual const core::aabbox3d<f32>& getBoundingBox() const _IRR_OVERRIDE_ = 0;
+		const core::aabbox3d<f32>& getBoundingBox() const override = 0;
 
 		//! Returns the relative transformation of the scene node.
 		//virtual core::matrix4 getRelativeTransformation() const = 0;
 
 		//! The animation method.
-		virtual void OnAnimate(u32 timeMs) _IRR_OVERRIDE_ =0;
+		void OnAnimate(u32 timeMs) override =0;
 
 		//! The render method.
 		/** Does nothing as bones are not visible. */
-		virtual void render() _IRR_OVERRIDE_ { }
+		void render() override { }
 
 		//! How the relative transformation of the bone is used
 		virtual void setSkinningSpace( E_BONE_SKINNING_SPACE space ) =0;
@@ -103,6 +98,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/ICameraSceneNode.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_CAMERA_SCENE_NODE_H_INCLUDED__
-#define __I_CAMERA_SCENE_NODE_H_INCLUDED__
+#pragma once
 
 #include "ISceneNode.h"
 #include "IEventReceiver.h"
@@ -72,7 +71,7 @@ namespace scene
 		ISceneManager::addCameraSceneNodeFPS, may want to get
 		this input for changing their position, look at target or
 		whatever. */
-		virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_ =0;
+		bool OnEvent(const SEvent& event) override =0;
 
 		//! Sets the look at target of the camera
 		/** If the camera's target and rotation are bound ( @see
@@ -90,7 +89,7 @@ namespace scene
 		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) _IRR_OVERRIDE_ =0;
+		void setRotation(const core::vector3df& rotation) override =0;
 
 		//! Gets the current look at target of the camera
 		/** \return The current look at target of the camera, in world co-ordinates */
@@ -172,27 +171,6 @@ namespace scene
 		/** @see bindTargetAndRotation() */
 		virtual bool getTargetAndRotationBinding(void) const =0;
 
-		//! Writes attributes of the camera node
-		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_
-		{
-			ISceneNode::serializeAttributes(out, options);
-
-			if (!out)
-				return;
-			out->addBool("IsOrthogonal", IsOrthogonal);
-		}
-
-		//! Reads attributes of the camera node
-		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_
-		{
-			ISceneNode::deserializeAttributes(in, options);
-			if (!in)
-				return;
-
-			if ( in->findAttribute("IsOrthogonal") )
-				IsOrthogonal = in->getAttributeAsBool("IsOrthogonal");
-		}
-
 	protected:
 
 		void cloneMembers(const ICameraSceneNode* toCopyFrom)
@@ -205,6 +183,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IContextManager.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
-#define __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
+#pragma once
 
 #include "SExposedVideoData.h"
 #include "SIrrCreationParameters.h"
@@ -60,4 +59,3 @@ namespace video
 } // end namespace irr
 
 
-#endif

include/ICursorControl.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_CURSOR_CONTROL_H_INCLUDED__
-#define __I_CURSOR_CONTROL_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
@@ -26,7 +25,7 @@ namespace gui
 		ECI_HELP,	// Arrow and question mark
 		ECI_IBEAM,	// typical text-selection cursor
 		ECI_NO,		// should not click icon
-		ECI_WAIT,	// hourclass
+		ECI_WAIT,	// hourglass
 		ECI_SIZEALL,	// arrow in all directions
 		ECI_SIZENESW,	// resizes in direction north-east or south-west
 		ECI_SIZENWSE,	// resizes in direction north-west or south-east
@@ -160,6 +159,9 @@ namespace gui
 		\param rect: A pointer to an reference rectangle or 0 to disable the reference rectangle.*/
 		virtual void setReferenceRect(core::rect<s32>* rect=0) = 0;
 
+		//! Internally fixes the mouse position, and reports relative mouse movement compared to the old position
+		/** Specific to SDL */
+		virtual void setRelativeMode(bool relative) {};
 
 		//! Sets the active cursor icon
 		/** Setting cursor icons is so far only supported on Win32 and Linux */
@@ -194,6 +196,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IDummyTransformationSceneNode.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
-#define __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
+#pragma once
 
 #include "ISceneNode.h"
 
@@ -36,7 +35,3 @@ public:
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif
-

include/IDynamicMeshBuffer.h

@@ -1,211 +0,0 @@
-// Copyright (C) 2008-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_DYNAMIC_MESH_BUFFER_H_INCLUDED__
-#define __I_DYNAMIC_MESH_BUFFER_H_INCLUDED__
-
-#include "IMeshBuffer.h"
-#include "IVertexBuffer.h"
-#include "IIndexBuffer.h"
-
-namespace irr
-{
-namespace scene
-{
-
-	/** a dynamic meshBuffer */
-	class IDynamicMeshBuffer : public IMeshBuffer
-	{
-	public:
-		virtual IVertexBuffer &getVertexBuffer() const =0;
-		virtual IIndexBuffer &getIndexBuffer() const =0;
-
-		virtual void setVertexBuffer(IVertexBuffer *vertexBuffer) =0;
-		virtual void setIndexBuffer(IIndexBuffer *indexBuffer) =0;
-
-		//! Get the material of this meshbuffer
-		/** \return Material of this buffer. */
-		virtual video::SMaterial& getMaterial() _IRR_OVERRIDE_ =0;
-
-		//! Get the material of this meshbuffer
-		/** \return Material of this buffer. */
-		virtual const video::SMaterial& getMaterial() const _IRR_OVERRIDE_ =0;
-
-		//! Get the axis aligned bounding box of this meshbuffer.
-		/** \return Axis aligned bounding box of this buffer. */
-		virtual const core::aabbox3df& getBoundingBox() const _IRR_OVERRIDE_ =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) _IRR_OVERRIDE_ =0;
-
-		//! Recalculates the bounding box. Should be called if the mesh changed.
-		virtual void recalculateBoundingBox() _IRR_OVERRIDE_ =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) _IRR_OVERRIDE_
-		{
-
-		}
-
-		//! 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) _IRR_OVERRIDE_
-		{
-
-		}
-
-		// ------------------- To be removed? -------------------  //
-
-		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const _IRR_OVERRIDE_
-		{
-			return getVertexBuffer().getHardwareMappingHint();
-		}
-
-		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const _IRR_OVERRIDE_
-		{
-			return getIndexBuffer().getHardwareMappingHint();
-		}
-
-		//! set the hardware mapping hint, for driver
-		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) _IRR_OVERRIDE_
-		{
-			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
-				getVertexBuffer().setHardwareMappingHint(NewMappingHint);
-			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_INDEX)
-				getIndexBuffer().setHardwareMappingHint(NewMappingHint);
-		}
-
-		//! flags the mesh as changed, reloads hardware buffers
-		virtual void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) _IRR_OVERRIDE_
-		{
-			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
-				getVertexBuffer().setDirty();
-			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_INDEX)
-				getIndexBuffer().setDirty();
-		}
-
-		virtual u32 getChangedID_Vertex() const _IRR_OVERRIDE_
-		{
-			return getVertexBuffer().getChangedID();
-		}
-
-		virtual u32 getChangedID_Index() const _IRR_OVERRIDE_
-		{
-			return getIndexBuffer().getChangedID();
-		}
-
-		// ------------------- Old interface -------------------  //
-
-		//! Get type of vertex data which is stored in this meshbuffer.
-		/** \return Vertex type of this buffer. */
-		virtual video::E_VERTEX_TYPE getVertexType() const _IRR_OVERRIDE_
-		{
-			return getVertexBuffer().getType();
-		}
-
-		//! 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 _IRR_OVERRIDE_
-		{
-			return getVertexBuffer().getData();
-		}
-
-		//! 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() _IRR_OVERRIDE_
-		{
-			return getVertexBuffer().getData();
-		}
-
-		//! Get amount of vertices in meshbuffer.
-		/** \return Number of vertices in this buffer. */
-		virtual u32 getVertexCount() const _IRR_OVERRIDE_
-		{
-			return getVertexBuffer().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 _IRR_OVERRIDE_
-		{
-			return getIndexBuffer().getType();
-		}
-
-		//! Get access to indices.
-		/** \return Pointer to indices array. */
-		virtual const u16* getIndices() const _IRR_OVERRIDE_
-		{
-			return (u16*)getIndexBuffer().getData();
-		}
-
-		//! Get access to indices.
-		/** \return Pointer to indices array. */
-		virtual u16* getIndices() _IRR_OVERRIDE_
-		{
-			return (u16*)getIndexBuffer().getData();
-		}
-
-		//! Get amount of indices in this meshbuffer.
-		/** \return Number of indices in this buffer. */
-		virtual u32 getIndexCount() const _IRR_OVERRIDE_
-		{ 
-			return getIndexBuffer().size();
-		}
-
-		//! returns position of vertex i
-		virtual const core::vector3df& getPosition(u32 i) const _IRR_OVERRIDE_
-		{
-			return getVertexBuffer()[i].Pos;
-		}
-
-		//! returns position of vertex i
-		virtual core::vector3df& getPosition(u32 i) _IRR_OVERRIDE_
-		{
-			return getVertexBuffer()[i].Pos;
-		}
-
-		//! returns texture coords of vertex i
-		virtual const core::vector2df& getTCoords(u32 i) const _IRR_OVERRIDE_
-		{
-			return getVertexBuffer()[i].TCoords;
-		}
-
-		//! returns texture coords of vertex i
-		virtual core::vector2df& getTCoords(u32 i) _IRR_OVERRIDE_
-		{
-			return getVertexBuffer()[i].TCoords;
-		}
-
-		//! returns normal of vertex i
-		virtual const core::vector3df& getNormal(u32 i) const _IRR_OVERRIDE_
-		{
-			return getVertexBuffer()[i].Normal;
-		}
-
-		//! returns normal of vertex i
-		virtual core::vector3df& getNormal(u32 i) _IRR_OVERRIDE_
-		{
-			return getVertexBuffer()[i].Normal;
-		}
-	};
-
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-
-

include/IEventReceiver.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_EVENT_RECEIVER_H_INCLUDED__
-#define __I_EVENT_RECEIVER_H_INCLUDED__
+#pragma once
 
 #include "ILogger.h"
 #include "Keycodes.h"
@@ -263,6 +262,10 @@ namespace irr
 			//! A checkbox has changed its check state.
 			EGET_CHECKBOX_CHANGED,
 
+			//! A listbox would like to open.
+			/** You can prevent the listbox from opening by absorbing the event. */
+			EGET_LISTBOX_OPENED,
+
 			//! A new item in a listbox was selected.
 			/** NOTE: You also get this event currently when the same item was clicked again after more than 500 ms. */
 			EGET_LISTBOX_CHANGED,
@@ -280,18 +283,6 @@ namespace irr
 			//! A file open dialog has been closed without choosing a file
 			EGET_FILE_CHOOSE_DIALOG_CANCELLED,
 
-			//! 'Yes' was clicked on a messagebox
-			EGET_MESSAGEBOX_YES,
-
-			//! 'No' was clicked on a messagebox
-			EGET_MESSAGEBOX_NO,
-
-			//! 'OK' was clicked on a messagebox
-			EGET_MESSAGEBOX_OK,
-
-			//! 'Cancel' was clicked on a messagebox
-			EGET_MESSAGEBOX_CANCEL,
-
 			//! In an editbox 'ENTER' was pressed
 			EGET_EDITBOX_ENTER,
 
@@ -304,36 +295,14 @@ namespace irr
 			//! The tab was changed in an tab control
 			EGET_TAB_CHANGED,
 
-			//! A menu item was selected in a (context) menu
-			EGET_MENU_ITEM_SELECTED,
-
 			//! The selection in a combo box has been changed
 			EGET_COMBO_BOX_CHANGED,
 
-			//! The value of a spin box has changed
-			EGET_SPINBOX_CHANGED,
-
 			//! A table has changed
 			EGET_TABLE_CHANGED,
 			EGET_TABLE_HEADER_CHANGED,
 			EGET_TABLE_SELECTED_AGAIN,
 
-			//! A tree view node lost selection. See IGUITreeView::getLastEventNode().
-			EGET_TREEVIEW_NODE_DESELECT,
-
-			//! A tree view node was selected. See IGUITreeView::getLastEventNode().
-			EGET_TREEVIEW_NODE_SELECT,
-
-			//! A tree view node was expanded. See IGUITreeView::getLastEventNode().
-			EGET_TREEVIEW_NODE_EXPAND,
-
-			//! A tree view node was collapsed. See IGUITreeView::getLastEventNode().
-			EGET_TREEVIEW_NODE_COLLAPSE,
-
-			//! deprecated - use EGET_TREEVIEW_NODE_COLLAPSE instead. This
-			//! may be removed by Irrlicht 1.9
-			EGET_TREEVIEW_NODE_COLLAPS = EGET_TREEVIEW_NODE_COLLAPSE,
-
 			//! No real event. Just for convenience to get number of events
 			EGET_COUNT
 		};
@@ -486,10 +455,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
@@ -667,6 +636,3 @@ struct SJoystickInfo
 
 
 } // end namespace irr
-
-#endif
-

include/IFileArchive.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_FILE_ARCHIVE_H_INCLUDED__
-#define __I_FILE_ARCHIVE_H_INCLUDED__
+#pragma once
 
 #include "IReadFile.h"
 #include "IFileList.h"
@@ -143,6 +142,3 @@ public:
 
 } // end namespace io
 } // end namespace irr
-
-#endif
-

include/IFileList.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_FILE_LIST_H_INCLUDED__
-#define __I_FILE_LIST_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "path.h"
@@ -88,7 +87,3 @@ public:
 
 } // end namespace irr
 } // end namespace io
-
-
-#endif
-

include/IFileSystem.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_FILE_SYSTEM_H_INCLUDED__
-#define __I_FILE_SYSTEM_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "IFileArchive.h"
@@ -210,58 +209,6 @@ public:
 	\return A pointer to the specified loader, 0 if the index is incorrect. */
 	virtual IArchiveLoader* getArchiveLoader(u32 index) const = 0;
 
-	//! Adds a zip archive to the file system.
-	/** \deprecated This function is provided for compatibility
-	with older versions of Irrlicht and may be removed in Irrlicht 1.9,
-	you should use addFileArchive instead.
-	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 no 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.
-	\param ignorePaths: If set to true, files in the added archive can be accessed
-	without its complete path.
-	\return True if the archive was added successfully, false if not. */
-	_IRR_DEPRECATED_ virtual bool addZipFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
-	{
-		return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_ZIP);
-	}
-
-	//! Adds an unzipped archive (or basedirectory with subdirectories..) to the file system.
-	/** \deprecated This function is provided for compatibility
-	with older versions of Irrlicht and may be removed in Irrlicht 1.9,
-	you should use addFileArchive instead.
-	Useful for handling data which will be in a zip file
-	\param filename: Filename of the unzipped zip archive base directory 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.
-	\param ignorePaths: If set to true, files in the added archive can be accessed
-	without its complete path.
-	\return True if the archive was added successful, false if not. */
-	_IRR_DEPRECATED_ virtual bool addFolderFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
-	{
-		return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_FOLDER);
-	}
-
-	//! Adds a pak archive to the file system.
-	/** \deprecated This function is provided for compatibility
-	with older versions of Irrlicht and may be removed in Irrlicht 1.9,
-	you should use addFileArchive instead.
-	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.
-	\param ignorePaths: If set to true, files in the added archive can be accessed
-	without its complete path.(should not use with Quake2 paks
-	\return True if the archive was added successful, false if not. */
-	_IRR_DEPRECATED_ virtual bool addPakFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
-	{
-		return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_PAK);
-	}
-
 	//! Get the current working directory.
 	/** \return Current working directory as a string. */
 	virtual const path& getWorkingDirectory() =0;
@@ -315,19 +262,8 @@ public:
 	/** \param filename is the string identifying the file which should be tested for existence.
 	\return True if file exists, and false if it does not exist or an error occurred. */
 	virtual bool existFile(const path& filename) const =0;
-
-	//! 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 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;
 };
 
 
 } // end namespace io
 } // end namespace irr
-
-#endif
-

include/IGPUProgrammingServices.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
-#define __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
+#pragma once
 
 #include "EShaderTypes.h"
 #include "EMaterialTypes.h"
@@ -155,7 +154,7 @@ public:
 			callback, baseMaterial, userData);
 	}
 
-	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
+	//! Like addHighLevelShaderMaterial(), but loads from files.
 	/** \param vertexShaderProgramFileName Text file containing the source
 	of the vertex shader program. Set to empty string if no vertex shader
 	shall be created.
@@ -279,7 +278,7 @@ public:
 			callback, baseMaterial, userData);
 	}
 
-	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
+	//! Like addHighLevelShaderMaterial(), but loads from files.
 	/** \param vertexShaderProgram Text file handle containing the source
 	of the vertex shader program. Set to 0 if no vertex shader shall be
 	created.
@@ -357,99 +356,16 @@ public:
 			callback, baseMaterial, userData);
 	}
 
-	//! 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 coordinates, 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 occurred. -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 caught 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 occurred. -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 caught 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 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 occurred. -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 caught with a custom event receiver. */
-	virtual s32 addShaderMaterialFromFiles(const io::path& vertexShaderProgramFileName,
-		const io::path& pixelShaderProgramFileName,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0;
+	//! Delete a shader material and associated data.
+	/**
+	After you have deleted a material it is invalid to still use and doing
+	so might result in a crash. The ID may be reused in the future when new
+	materials are added.
+	\param material Number of the material type. Must not be a built-in
+	material. */
+	virtual void deleteShaderMaterial(s32 material) = 0;
 };
 
 
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/IGUIButton.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_BUTTON_H_INCLUDED__
-#define __I_GUI_BUTTON_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 
@@ -263,6 +262,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUICheckBox.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_CHECKBOX_H_INCLUDED__
-#define __I_GUI_CHECKBOX_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 
@@ -48,6 +47,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIColorSelectDialog.h

@@ -1,37 +0,0 @@
-// Copyright (C) 2002-2012 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_COLOR_SELECT_DIALOG_H_INCLUDED__
-#define __I_GUI_COLOR_SELECT_DIALOG_H_INCLUDED__
-
-#include "IGUIElement.h"
-
-namespace irr
-{
-namespace gui
-{
-
-	//! Standard color chooser dialog.
-	class IGUIColorSelectDialog : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIColorSelectDialog(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_COLOR_SELECT_DIALOG, environment, parent, id, rectangle) {}
-
-		//! get chosen color as usual SColor struct
-		virtual video::SColor getColor() =0;
-
-		//! get chosen color as HSL values
-		virtual video::SColorHSL getColorHSL() =0;
-
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-

include/IGUIComboBox.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_COMBO_BOX_H_INCLUDED__
-#define __I_GUI_COMBO_BOX_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 
@@ -52,11 +51,15 @@ namespace gui
 		//! Sets the selected item. Set this to -1 if no item should be selected
 		virtual void setSelected(s32 idx) = 0;
 
+		//! Sets the selected item and emits a change event.
+		/** Set this to -1 if no item should be selected */
+		virtual void setAndSendSelected(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.
+		EGUIA_LOWERRIGHT 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). */
+		EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
 		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
 
 		//! Set the maximal number of rows for the selection listbox
@@ -69,6 +72,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIContextMenu.h

@@ -1,162 +0,0 @@
-// Copyright (C) 2002-2012 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_CONTEXT_MENU_H_INCLUDED__
-#define __I_GUI_CONTEXT_MENU_H_INCLUDED__
-
-#include "IGUIElement.h"
-
-namespace irr
-{
-namespace gui
-{
-	//! Close behavior.
-	//! Default is ECMC_REMOVE
-	enum ECONTEXT_MENU_CLOSE
-	{
-		//! do nothing - menu stays open
-		ECMC_IGNORE = 0,
-
-		//! remove the gui element
-		ECMC_REMOVE = 1,
-
-		//! call setVisible(false)
-		ECMC_HIDE = 2
-
-		// note to implementers - this is planned as bitset, so continue with 4 if you need to add further flags.
-	};
-
-	//! GUI Context menu interface.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_ELEMENT_CLOSED
-	\li EGET_MENU_ITEM_SELECTED
-	*/
-	class IGUIContextMenu : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIContextMenu(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_CONTEXT_MENU, environment, parent, id, rectangle) {}
-
-		//! set behavior when menus are closed
-		virtual void setCloseHandling(ECONTEXT_MENU_CLOSE onClose) = 0;
-
-		//! get current behavior when the menu will be closed
-		virtual ECONTEXT_MENU_CLOSE getCloseHandling() const = 0;
-
-		//! 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 access this submenu via getSubMenu().
-		\param checked: Specifies if the menu item should be initially checked.
-		\param autoChecking: Specifies if the item should be checked by clicking
-		\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, bool autoChecking=false) = 0;
-
-		//! Insert a menu item at specified position.
-		/** \param idx: Position to insert the new element,
-		should be smaller than itemcount otherwise the item is added to the end.
-		\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 access this submenu via getSubMenu().
-		\param checked: Specifies if the menu item should be initially checked.
-		\param autoChecking: Specifies if the item should be checked by clicking
-		\return Returns the index of the new item */
-		virtual u32 insertItem(u32 idx, const wchar_t* text, s32 commandId=-1, bool enabled=true,
-			bool hasSubMenu=false, bool checked=false, bool autoChecking=false) = 0;
-
-		//! Find an item by its CommandID
-		/**
-		\param commandId: We are looking for the first item which has this commandID
-		\param idxStartSearch: Start searching from this index.
-		\return Returns the index of the item when found or otherwise -1. */
-		virtual s32 findItemWithCommandId(s32 commandId, u32 idxStartSearch=0) const = 0;
-
-		//! Adds a separator item to the menu
-		virtual void addSeparator() = 0;
-
-		//! Get text of the menu item.
-		/** \param idx: Zero based index of the menu item */
-		virtual const wchar_t* getItemText(u32 idx) const = 0;
-
-		//! Sets text of the menu item.
-		/** \param idx: Zero based index of the menu 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
-		/** \param idx: Zero based index of the menu item */
-		virtual bool isItemEnabled(u32 idx) const = 0;
-
-		//! 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. */
-		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. */
-		virtual void setItemChecked(u32 idx, bool enabled) = 0;
-
-		//! Check if a menu item is checked
-		/** \param idx: Zero based index of the menu item */
-		virtual bool isItemChecked(u32 idx) const = 0;
-
-		//! Removes a menu item
-		/** \param idx: Zero based index of the menu item */
-		virtual void removeItem(u32 idx) = 0;
-
-		//! Removes all menu items
-		virtual void removeAllItems() = 0;
-
-		//! Get the selected item in the menu
-		/** \return Index of the selected item, -1 if none selected. */
-		virtual s32 getSelectedItem() const = 0;
-
-		//! Get the command id of a menu item
-		/** \param idx: Zero based index of the menu item */
-		virtual s32 getItemCommandId(u32 idx) const = 0;
-
-		//! 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. */
-		virtual void setItemCommandId(u32 idx, s32 id) = 0;
-
-		//! 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. */
-		virtual IGUIContextMenu* getSubMenu(u32 idx) const = 0;
-
-		//! should the element change the checked status on clicking
-		virtual void setItemAutoChecking(u32 idx, bool autoChecking) = 0;
-
-		//! does the element change the checked status on clicking
-		virtual bool getItemAutoChecking(u32 idx) const = 0;
-
-		//! When an eventparent is set it receives events instead of the usual parent element
-		virtual void setEventParent(IGUIElement *parent) = 0;
-	};
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-

include/IGUIEditBox.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_EDIT_BOX_H_INCLUDED__
-#define __I_GUI_EDIT_BOX_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -152,6 +151,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIElement.h

@@ -2,11 +2,9 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_ELEMENT_H_INCLUDED__
-#define __I_GUI_ELEMENT_H_INCLUDED__
+#pragma once
 
-#include "IAttributeExchangingObject.h"
-#include "irrList.h"
+#include "IReferenceCounted.h"
 #include "rect.h"
 #include "irrString.h"
 #include "IEventReceiver.h"
@@ -14,13 +12,17 @@
 #include "EGUIAlignment.h"
 #include "IAttributes.h"
 #include "IGUIEnvironment.h"
+#include <cassert>
+#include <algorithm>
+#include <list>
+#include <vector>
 
 namespace irr
 {
 namespace gui
 {
 //! Base class of all GUI elements.
-class IGUIElement : public virtual io::IAttributeExchangingObject, public IEventReceiver
+class IGUIElement : virtual public IReferenceCounted, public IEventReceiver
 {
 public:
 
@@ -50,12 +52,9 @@ public:
 	//! Destructor
 	virtual ~IGUIElement()
 	{
-		// delete all children
-		core::list<IGUIElement*>::Iterator it = Children.begin();
-		for (; it != Children.end(); ++it)
-		{
-			(*it)->Parent = 0;
-			(*it)->drop();
+		for (auto child : Children) {
+			child->Parent = nullptr;
+			child->drop();
 		}
 	}
 
@@ -239,10 +238,9 @@ public:
 		recalculateAbsolutePosition(false);
 
 		// update all children
-		core::list<IGUIElement*>::Iterator it = Children.begin();
-		for (; it != Children.end(); ++it)
+		for (auto child : Children)
 		{
-			(*it)->updateAbsolutePosition();
+			child->updateAbsolutePosition();
 		}
 	}
 
@@ -263,20 +261,19 @@ public:
 	{
 		IGUIElement* target = 0;
 
-		// we have to search from back to front, because later children
-		// might be drawn over the top of earlier ones.
-
-		core::list<IGUIElement*>::ConstIterator it = Children.getLast();
-
 		if (isVisible())
 		{
-			while(it != Children.end())
+			// we have to search from back to front, because later children
+			// might be drawn over the top of earlier ones.
+			auto it = Children.rbegin();
+			auto ie = Children.rend();
+			while (it != ie)
 			{
 				target = (*it)->getElementFromPoint(point);
 				if (target)
 					return target;
 
-				--it;
+				++it;
 			}
 		}
 
@@ -308,17 +305,19 @@ public:
 	//! Removes a child.
 	virtual void removeChild(IGUIElement* child)
 	{
-		core::list<IGUIElement*>::Iterator it = Children.begin();
-		for (; it != Children.end(); ++it)
-			if ((*it) == child)
-			{
-				(*it)->Parent = 0;
-				(*it)->drop();
-				Children.erase(it);
-				return;
-			}
+		assert(child->Parent == this);
+		Children.erase(child->ParentPos);
+		child->Parent = nullptr;
+		child->drop();
 	}
 
+	//! Removes all children.
+	virtual void removeAllChildren() {
+		while (!Children.empty()) {
+			auto child = Children.back();
+			child->remove();
+		}
+	}
 
 	//! Removes this element from its parent.
 	virtual void remove()
@@ -333,9 +332,8 @@ public:
 	{
 		if ( isVisible() )
 		{
-			core::list<IGUIElement*>::Iterator it = Children.begin();
-			for (; it != Children.end(); ++it)
-				(*it)->draw();
+			for (auto child : Children)
+				child->draw();
 		}
 	}
 
@@ -345,9 +343,8 @@ public:
 	{
 		if ( isVisible() )
 		{
-			core::list<IGUIElement*>::Iterator it = Children.begin();
-			for (; it != Children.end(); ++it)
-				(*it)->OnPostRender( timeMs );
+			for (auto child : Children)
+				child->OnPostRender( timeMs );
 		}
 	}
 
@@ -435,7 +432,7 @@ public:
 			if (el)
 			{
 				// find the highest element number
-				el->getNextElement(-1, true, IsTabGroup, first, closest, true);
+				el->getNextElement(-1, true, IsTabGroup, first, closest, true, true);
 				if (first)
 				{
 					TabOrder = first->getTabOrder() + 1;
@@ -547,7 +544,7 @@ public:
 
 
 	//! Called if an event happened.
-	virtual bool OnEvent(const SEvent& event) _IRR_OVERRIDE_
+	bool OnEvent(const SEvent& event) override
 	{
 		return Parent ? Parent->OnEvent(event) : false;
 	}
@@ -555,20 +552,15 @@ public:
 
 	//! Brings a child to front
 	/** \return True if successful, false if not. */
-	virtual bool bringToFront(IGUIElement* element)
+	virtual bool bringToFront(IGUIElement* child)
 	{
-		core::list<IGUIElement*>::Iterator it = Children.begin();
-		for (; it != Children.end(); ++it)
-		{
-			if (element == (*it))
-			{
-				Children.erase(it);
-				Children.push_back(element);
-				return true;
-			}
-		}
-
+		if (child->Parent != this)
 			return false;
+		if (std::next(child->ParentPos) == Children.end()) // already there
+			return true;
+		Children.erase(child->ParentPos);
+		child->ParentPos = Children.insert(Children.end(), child);
+		return true;
 	}
 
 
@@ -576,24 +568,17 @@ public:
 	/** \return True if successful, false if not. */
 	virtual bool sendToBack(IGUIElement* child)
 	{
-		core::list<IGUIElement*>::Iterator it = Children.begin();
-		if (child == (*it)) // already there
-			return true;
-		for (; it != Children.end(); ++it)
-		{
-			if (child == (*it))
-			{
-				Children.erase(it);
-				Children.push_front(child);
-				return true;
-			}
-		}
-
+		if (child->Parent != this)
 			return false;
+		if (child->ParentPos == Children.begin()) // already there
+			return true;
+		Children.erase(child->ParentPos);
+		child->ParentPos = Children.insert(Children.begin(), child);
+		return true;
 	}
 
 	//! Returns list with children of this element
-	virtual const core::list<IGUIElement*>& getChildren() const
+	virtual const std::list<IGUIElement*>& getChildren() const
 	{
 		return Children;
 	}
@@ -610,14 +595,13 @@ public:
 	{
 		IGUIElement* e = 0;
 
-		core::list<IGUIElement*>::ConstIterator it = Children.begin();
-		for (; it != Children.end(); ++it)
+		for (auto child : Children)
 		{
-			if ((*it)->getID() == id)
-				return (*it);
+			if (child->getID() == id)
+				return child;
 
 			if (searchchildren)
-				e = (*it)->getElementFromId(id, true);
+				e = child->getElementFromId(id, true);
 
 			if (e)
 				return e;
@@ -663,7 +647,7 @@ public:
 		if (wanted==-2)
 			wanted = 1073741824; // maximum s32
 
-		core::list<IGUIElement*>::ConstIterator it = Children.begin();
+		auto it = Children.begin();
 
 		s32 closestOrder, currentOrder;
 
@@ -721,7 +705,7 @@ public:
 					}
 				}
 				// search within children
-				if ((*it)->getNextElement(startOrder, reverse, group, first, closest))
+				if ((*it)->getNextElement(startOrder, reverse, group, first, closest, includeInvisible, includeDisabled))
 				{
 					return true;
 				}
@@ -758,8 +742,7 @@ public:
 
 
 	//! 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 */
+	/** This is needed serializing elements. */
 	virtual const c8* getTypeName() const
 	{
 		return GUIElementTypeNames[Type];
@@ -796,62 +779,6 @@ 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. */
-	virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_
-	{
-		out->addString("Name", Name.c_str());
-		out->addInt("Id", ID );
-		out->addString("Caption", getText());
-		out->addString("ToolTip", getToolTipText().c_str());
-		out->addRect("Rect", DesiredRect);
-		out->addPosition2d("MinSize", core::position2di(MinSize.Width, MinSize.Height));
-		out->addPosition2d("MaxSize", core::position2di(MaxSize.Width, MaxSize.Height));
-		out->addEnum("LeftAlign", AlignLeft, GUIAlignmentNames);
-		out->addEnum("RightAlign", AlignRight, GUIAlignmentNames);
-		out->addEnum("TopAlign", AlignTop, GUIAlignmentNames);
-		out->addEnum("BottomAlign", AlignBottom, GUIAlignmentNames);
-		out->addBool("Visible", IsVisible);
-		out->addBool("Enabled", IsEnabled);
-		out->addBool("TabStop", IsTabStop);
-		out->addBool("TabGroup", IsTabGroup);
-		out->addInt("TabOrder", TabOrder);
-		out->addBool("NoClip", NoClip);
-	}
-
-
-	//! 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. */
-	virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_
-	{
-		setName(in->getAttributeAsString("Name", Name));
-		setID(in->getAttributeAsInt("Id", ID));
-		setText(in->getAttributeAsStringW("Caption", Text).c_str());
-		setToolTipText(in->getAttributeAsStringW("ToolTip").c_str());
-		setVisible(in->getAttributeAsBool("Visible", IsVisible));
-		setEnabled(in->getAttributeAsBool("Enabled", IsEnabled));
-		IsTabStop = in->getAttributeAsBool("TabStop", IsTabStop);
-		IsTabGroup = in->getAttributeAsBool("TabGroup", IsTabGroup);
-		TabOrder = in->getAttributeAsInt("TabOrder", TabOrder);
-
-		core::position2di p = in->getAttributeAsPosition2d("MaxSize", core::position2di(MaxSize.Width, MaxSize.Height));
-		setMaxSize(core::dimension2du(p.X,p.Y));
-
-		p = in->getAttributeAsPosition2d("MinSize", core::position2di(MinSize.Width, MinSize.Height));
-		setMinSize(core::dimension2du(p.X,p.Y));
-
-		setAlignment((EGUI_ALIGNMENT) in->getAttributeAsEnumeration("LeftAlign", GUIAlignmentNames, AlignLeft),
-			(EGUI_ALIGNMENT)in->getAttributeAsEnumeration("RightAlign", GUIAlignmentNames, AlignRight),
-			(EGUI_ALIGNMENT)in->getAttributeAsEnumeration("TopAlign", GUIAlignmentNames, AlignTop),
-			(EGUI_ALIGNMENT)in->getAttributeAsEnumeration("BottomAlign", GUIAlignmentNames, AlignBottom));
-
-		setRelativePosition(in->getAttributeAsRect("Rect", DesiredRect));
-
-		setNotClipped(in->getAttributeAsBool("NoClip", NoClip));
-	}
-
 protected:
 	// not virtual because needed in constructor
 	void addChildToEnd(IGUIElement* child)
@@ -862,10 +789,40 @@ protected:
 			child->remove(); // remove from old parent
 			child->LastParentRect = getAbsolutePosition();
 			child->Parent = this;
-			Children.push_back(child);
+			child->ParentPos = Children.insert(Children.end(), child);
 		}
 	}
 
+#ifndef NDEBUG
+	template<typename Iterator>
+	static size_t _fastSetChecksum(Iterator begin, Iterator end) {
+		std::hash<typename Iterator::value_type> hasher;
+		size_t checksum = 0;
+		for (Iterator it = begin; it != end; ++it) {
+			size_t h = hasher(*it);
+			checksum ^= 966073049 + (h * 3432918353) + ((h >> 16) * 461845907);
+		}
+		return checksum;
+	}
+#endif
+
+	// Reorder children [from, to) to the order given by `neworder`
+	void reorderChildren(
+		std::list<IGUIElement*>::iterator from,
+		std::list<IGUIElement*>::iterator to,
+		const std::vector<IGUIElement*> &neworder)
+	{
+		assert(_fastSetChecksum(from, to) == _fastSetChecksum(neworder.begin(), neworder.end()));
+		for (auto e : neworder)
+		{
+			*from = e;
+			e->ParentPos = from;
+			++from;
+		}
+		assert(from == to);
+	}
+
+
 	// not virtual because needed in constructor
 	void recalculateAbsolutePosition(bool recursive)
 	{
@@ -987,10 +944,9 @@ protected:
 		if ( recursive )
 		{
 			// update all children
-			core::list<IGUIElement*>::Iterator it = Children.begin();
-			for (; it != Children.end(); ++it)
+			for (auto child : Children)
 			{
-				(*it)->recalculateAbsolutePosition(recursive);
+				child->recalculateAbsolutePosition(recursive);
 			}
 		}
 	}
@@ -998,11 +954,14 @@ protected:
 protected:
 
 	//! List of all children of this element
-	core::list<IGUIElement*> Children;
+	std::list<IGUIElement*> Children;
 
 	//! Pointer to the parent
 	IGUIElement* Parent;
 
+	//! Our position in the parent list. Only valid when Parent != nullptr
+	std::list<IGUIElement*>::iterator ParentPos;
+
 	//! relative rect of element
 	core::rect<s32> RelativeRect;
 
@@ -1071,6 +1030,3 @@ protected:
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIElementFactory.h

@@ -1,66 +0,0 @@
-// Copyright (C) 2002-2012 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_ELEMENT_FACTORY_H_INCLUDED__
-#define __I_GUI_ELEMENT_FACTORY_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "EGUIElementTypes.h"
-
-namespace irr
-{
-
-namespace gui
-{
-	class IGUIElement;
-
-	//! Interface making it possible to dynamically 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
-	it will grab() the factory anyway, and otherwise cyclic references will be created.
-	*/
-	class IGUIElementFactory : public virtual IReferenceCounted
-	{
-	public:
-
-		//! 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 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 Pointer to the new element or null if not successful. */
-		virtual IGUIElement* addGUIElement(const c8* typeName, IGUIElement* parent=0) = 0;
-
-		//! Get amount of GUI element types this factory is able to create
-		virtual s32 getCreatableGUIElementTypeCount() const = 0;
-
-		//! Get type of a creatable 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;
-
-		//! Get type name of a creatable 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 creatable GUI element
-		/** \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;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif // __I_GUI_ELEMENT_FACTORY_H_INCLUDED__
-

include/IGUIEnvironment.h

@@ -2,13 +2,11 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_ENVIRONMENT_H_INCLUDED__
-#define __I_GUI_ENVIRONMENT_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "IGUISkin.h"
 #include "rect.h"
-#include "EMessageBoxFlags.h"
 #include "EFocusFlags.h"
 #include "IEventReceiver.h"
 #include "path.h"
@@ -38,27 +36,17 @@ class IGUIFont;
 class IGUISpriteBank;
 class IGUIScrollBar;
 class IGUIImage;
-class IGUIMeshViewer;
 class IGUICheckBox;
 class IGUIListBox;
-class IGUITreeView;
 class IGUIImageList;
 class IGUIFileOpenDialog;
-class IGUIColorSelectDialog;
-class IGUIInOutFader;
 class IGUIStaticText;
 class IGUIEditBox;
-class IGUISpinBox;
 class IGUITabControl;
 class IGUITab;
-class IGUITable;
-class IGUIContextMenu;
 class IGUIComboBox;
-class IGUIToolBar;
 class IGUIButton;
 class IGUIWindow;
-class IGUIProfiler;
-class IGUIElementFactory;
 
 //! GUI Environment. Used as factory and manager of all other GUI elements.
 /** \par This element can create the following events of type EGUI_EVENT_TYPE (which are passed on to focused sub-elements):
@@ -235,55 +223,6 @@ 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) = 0;
 
-	//! 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 occurred.
-	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.
-	/** Input focus stays with children of the modal screen. 
-	If you have some window x which should keep the input focus you 
-	do something like: addModalScreen()->addChild(x). And x will then get the focus 
-	and not lose it anymore. 
-	The  modal screen removes itself when it no longer has any children.
-	Note that it usually works badly to pass the modal screen already as parent when creating
-	a new element. It's better to add that new element later to the modal screen with addChild.
-	\param parent Parent gui element of the modal.
-	\param blinkMode Bitset of when to blink (can be combined)
-		0 = never
-		1 = focus changes
-		2 = Left mouse button pressed down
-	\return Pointer to the created modal. Returns 0 if an error occurred.
-	This pointer should not be dropped. See IReferenceCounted::drop() for
-	more information. */
-	virtual IGUIElement* addModalScreen(IGUIElement* parent, int blinkMode = 3) = 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 using ::EMESSAGE_BOX_FLAG.
-	Create a message box with an OK and CANCEL button for example with (EMBF_OK | EMBF_CANCEL).
-	\param parent Parent gui element of the message box.
-	\param id Id with which the gui element can be identified.
-	\param image Optional texture which will be displayed beside the text as an image
-	\return Pointer to the created message box. Returns 0 if an error
-	occurred. 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, video::ITexture* image=0) = 0;
-
 	//! Adds a scrollbar.
 	/** \param horizontal Specifies if the scroll bar is drawn horizontal
 	or vertical.
@@ -348,31 +287,6 @@ public:
 	virtual IGUIListBox* addListBox(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) = 0;
 
-	//! Adds a tree view element.
-	/** \param rectangle Position and dimension of 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.
-	\param scrollBarVertical Flag whether a vertical scrollbar should be used
-	\param scrollBarHorizontal Flag whether a horizontal scrollbar should be used
-	\return Pointer to the created list box. Returns 0 if an error occurred.
-	This pointer should not be dropped. See IReferenceCounted::drop() for
-	more information. */
-	virtual IGUITreeView* addTreeView(const core::rect<s32>& rectangle,
-		IGUIElement* parent=0, s32 id=-1, bool drawBackground=false,
-		bool scrollBarVertical = true, bool scrollBarHorizontal = false) = 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
-	occurred. 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 title Text to be displayed as the title of the dialog.
 	\param modal Defines if the dialog is modal. This means, that all other
@@ -391,19 +305,6 @@ public:
 		bool modal=true, IGUIElement* parent=0, s32 id=-1,
 		bool restoreCWD=false, io::path::char_type* startDir=0) = 0;
 
-	//! Adds a color select dialog.
-	/** \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
-	occurred. 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.
 	/** \param text Text to be displayed. Can be altered after creation by SetText().
 	\param rectangle Rectangle specifying the borders of the static text
@@ -438,30 +339,6 @@ public:
 	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 Text to be displayed. Can be altered after creation by setText().
-	\param rectangle Rectangle specifying the borders of the spin box.
-	\param border Set to true if the spin box should have a 3d border.
-	\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 occurred.
-	This pointer should not be dropped. See IReferenceCounted::drop() for
-	more information. */
-	virtual IGUISpinBox* addSpinBox(const wchar_t* text, const core::rect<s32>& rectangle,
-		bool border=true,IGUIElement* parent=0, s32 id=-1) = 0;
-
-	//! Adds an element for fading in or out.
-	/** \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
-	occurred. 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 Rectangle specifying the borders of the tab control.
 	\param parent Parent item of the element, e.g. a window.
@@ -493,40 +370,6 @@ public:
 	virtual IGUITab* addTab(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1) = 0;
 
-	//! Adds a context menu to the environment.
-	/** \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 occurred. 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 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 occurred. 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 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 occurred. 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 rectangle Rectangle specifying the borders of the combo box.
 	\param parent Parent item of the element, e.g. a window.
@@ -538,92 +381,6 @@ public:
 	virtual IGUIComboBox* addComboBox(const core::rect<s32>& rectangle,
 		IGUIElement* parent=0, s32 id=-1) = 0;
 
-	//! 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 element directly in the environment.
-	\param id An identifier for the table.
-	\param drawBackground Flag whether the background should be drawn.
-	\return Pointer to the created table. Returns 0 if an error occurred.
-	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;
-
-	//! Adds an element to display the information from the Irrlicht profiler
-	/** \param rectangle Rectangle specifying the borders of the element.
-	\param parent Parent of the element. When 0 the environment itself will
-	be the parent.
-	\param id An identifier for the element. */
-	virtual IGUIProfiler* addProfilerDisplay(const core::rect<s32>& rectangle,
-		IGUIElement* parent=0, s32 id=-1) = 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 automatically, for example when loading
-	data from xml files.
-	\param factoryToAdd Pointer to new factory. */
-	virtual void registerGUIElementFactory(IGUIElementFactory* factoryToAdd) = 0;
-
-	//! Get amount of registered gui element factories.
-	/** \return Amount of registered gui element factories. */
-	virtual u32 getRegisteredGUIElementFactoryCount() const = 0;
-
-	//! 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
-	/** 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.
-	\return True if saving succeeded, else false. */
-	virtual bool saveGUI(const io::path& 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.
-	\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.
-	/** When a parent is set the elements will be added below the parent, the parent itself does not deserialize.
-	When the file contains skin-settings from the gui-environment those are always serialized into the
-	guienvironment independent of the parent setting.
-	\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 io::path& filename, IGUIElement* parent=0) = 0;
-
-	//! Loads the gui. Note that the current gui is not cleared before.
-	/** When a parent is set the elements will be added below the parent, the parent itself does not deserialize.
-	When the file contains skin-settings from the gui-environment those are always serialized into the
-	guienvironment independent of the parent setting.
-	\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;
-
-	//! Reads attributes of the gui environment
-	virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)=0;
-
 	//! Find the next element which would be selected when pressing the tab-key
 	/** If you set the focus for the result you can manually force focus-changes like they
 	would happen otherwise by the tab-keys.
@@ -658,6 +415,3 @@ public:
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIFileOpenDialog.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
-#define __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 #include "path.h"
@@ -45,6 +44,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIFont.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_FONT_H_INCLUDED__
-#define __I_GUI_FONT_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "SColor.h"
@@ -99,6 +98,3 @@ public:
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIFontBitmap.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_FONT_BITMAP_H_INCLUDED__
-#define __I_GUI_FONT_BITMAP_H_INCLUDED__
+#pragma once
 
 #include "IGUIFont.h"
 
@@ -19,7 +18,7 @@ class IGUIFontBitmap : public IGUIFont
 public:
 
 	//! Returns the type of this font
-	virtual EGUI_FONT_TYPE getType() const _IRR_OVERRIDE_ { return EGFT_BITMAP; }
+	EGUI_FONT_TYPE getType() const override { return EGFT_BITMAP; }
 
 	//! returns the parsed Symbol Information
 	virtual IGUISpriteBank* getSpriteBank() const = 0;
@@ -36,11 +35,8 @@ public:
 	kerning value. For example, EGFT_BITMAP will add the right kerning value of previousLetter to the
 	left side kerning value of thisLetter, then add the global value.
 	*/
-	virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const _IRR_OVERRIDE_ = 0;
+	s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const override = 0;
 };
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIImage.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_IMAGE_H_INCLUDED__
-#define __I_GUI_IMAGE_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 
@@ -83,5 +82,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif

include/IGUIImageList.h

@@ -1,8 +1,7 @@
 // This file is part of the "Irrlicht Engine".
 // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
 
-#ifndef __I_GUI_IMAGE_LIST_H_INCLUDED__
-#define __I_GUI_IMAGE_LIST_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 #include "rect.h"
@@ -40,6 +39,3 @@ public:
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIInOutFader.h

@@ -1,67 +0,0 @@
-// Copyright (C) 2002-2012 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_IN_OUT_FADER_H_INCLUDED__
-#define __I_GUI_IN_OUT_FADER_H_INCLUDED__
-
-#include "IGUIElement.h"
-#include "SColor.h"
-
-namespace irr
-{
-namespace gui
-{
-
-	//! Element for fading out or in
-	/** 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.
-	\code
-	gui::IGUIInOutFader* fader = device->getGUIEnvironment()->addInOutFader();
-	fader->setColor(video::SColor(0,255,0,0));
-	fader->fadeIn(4000);
-	\endcode
-	*/
-	class IGUIInOutFader : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIInOutFader(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_IN_OUT_FADER, environment, parent, id, rectangle) {}
-
-		//! 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. */
-		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 specifying 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 specifying 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.
-		virtual bool isReady() const = 0;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-

include/IGUIListBox.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_LIST_BOX_H_INCLUDED__
-#define __I_GUI_LIST_BOX_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -137,6 +136,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIMeshViewer.h

@@ -1,53 +0,0 @@
-// Copyright (C) 2002-2012 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_MESH_VIEWER_H_INCLUDED__
-#define __I_GUI_MESH_VIEWER_H_INCLUDED__
-
-#include "IGUIElement.h"
-
-namespace irr
-{
-
-namespace video
-{
-	class SMaterial;
-} // end namespace video
-
-namespace scene
-{
-	class IAnimatedMesh;
-} // end namespace scene
-
-namespace gui
-{
-
-	//! 3d mesh viewing GUI element.
-	class IGUIMeshViewer : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIMeshViewer(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_MESH_VIEWER, environment, parent, id, rectangle) {}
-
-		//! Sets the mesh to be shown
-		virtual void setMesh(scene::IAnimatedMesh* mesh) = 0;
-
-		//! Gets the displayed mesh
-		virtual scene::IAnimatedMesh* getMesh() const = 0;
-
-		//! Sets the material
-		virtual void setMaterial(const video::SMaterial& material) = 0;
-
-		//! Gets the material
-		virtual const video::SMaterial& getMaterial() const = 0;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-

include/IGUIProfiler.h

@@ -1,82 +0,0 @@
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-// Written by Michael Zeilfelder
-
-#ifndef I_GUI_PROFILER_H_INCLUDED__
-#define I_GUI_PROFILER_H_INCLUDED__
-
-#include "IGUIElement.h"
-
-namespace irr
-{
-class IProfiler;
-
-namespace gui
-{
-	class IGUIFont;
-
-	//! Element to display profiler information
-	class IGUIProfiler : public IGUIElement
-	{
-	public:
-		//! constructor
-		/** \param profiler You can pass a custom profiler, but typically you can pass 0 in which cases it takes the global profiler from Irrlicht */
-		IGUIProfiler(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle, IProfiler* profiler = NULL)
-			: IGUIElement(EGUIET_PROFILER, environment, parent, id, rectangle)
-		{}
-
-		//! Show first page of profile data
-		/** \param includeOverview When true show the group-overview page, when false show the profile data of the first group */
-		virtual void firstPage(bool includeOverview=true) = 0;
-
-		//! Show next page of profile data
-		/** \param includeOverview Include the group-overview page  */
-		virtual void nextPage(bool includeOverview=true) = 0;
-
-		//! Show previous page of profile data
-		/** \param includeOverview Include the group-overview page  */
-		virtual void previousPage(bool includeOverview=true) = 0;
-
-		//! Try to show as many group-pages together as possible instead of showing at most one group per page.
-		/** \param groupsTogether When true show several groups on one page, when false show max. one group per page. Default is false. */
-		virtual void setShowGroupsTogether(bool groupsTogether) = 0;
-
-		//! Can several groups be displayed per page?
-		virtual bool getShowGroupsTogether() const = 0;
-
-		//! 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) */
-		virtual IGUIFont* getOverrideFont(void) const = 0;
-
-		//! Get the font which is used right now for drawing
-		/** Currently this is the override font when one is set and the
-		font of the active skin otherwise */
-		virtual IGUIFont* getActiveFont() const = 0;
-
-		//! Sets whether to draw the background. By default disabled,
-		virtual void setDrawBackground(bool draw) = 0;
-
-		//! Checks if background drawing is enabled
-		/** \return true if background drawing is enabled, false otherwise */
-		virtual bool isDrawBackgroundEnabled() const = 0;
-
-		//! Allows to freeze updates which makes it easier to read the numbers
-		/** Numbers are updated once when you switch pages. */
-		virtual void setFrozen(bool freeze) = 0;
-
-		//! Are updates currently frozen
-		virtual bool getFrozen() const = 0;
-
-		//! Filters prevents data that doesn't achieve the conditions from being displayed
-		virtual void setFilters(irr::u32 minCalls = 0, irr::u32 minTimeSum = 0, irr::f32 minTimeAverage = 0.f, irr::u32 minTimeMax = 0) = 0;
-	};
-
-} // end namespace gui
-} // end namespace irr
-
-#endif

include/IGUIScrollBar.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_SCROLL_BAR_H_INCLUDED__
-#define __I_GUI_SCROLL_BAR_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 
@@ -60,6 +59,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUISkin.h

@@ -2,10 +2,9 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_SKIN_H_INCLUDED__
-#define __I_GUI_SKIN_H_INCLUDED__
+#pragma once
 
-#include "IAttributeExchangingObject.h"
+#include "IReferenceCounted.h"
 #include "EGUIAlignment.h"
 #include "SColor.h"
 #include "rect.h"
@@ -381,7 +380,7 @@ namespace gui
 	};
 
 	//! A skin modifies the look of the GUI elements.
-	class IGUISkin : public virtual io::IAttributeExchangingObject
+	class IGUISkin : virtual public IReferenceCounted
 	{
 	public:
 
@@ -575,6 +574,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUISpinBox.h

@@ -1,92 +0,0 @@
-// Copyright (C) 2006-2012 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__
-
-#include "IGUIElement.h"
-
-namespace irr
-{
-namespace gui
-{
-	class IGUIEditBox;
-
-	//! Enumeration bitflag for when to validate the text typed into the spinbox
-	//! Default used by Irrlicht is: (EGUI_SBV_ENTER|EGUI_SBV_LOSE_FOCUS)
-	enum EGUI_SPINBOX_VALIDATION
-	{
-		//! Does not validate typed text, probably a bad idea setting this usually.
-		EGUI_SBV_NEVER  = 0,
-		//! Validate on each change. Was default up to Irrlicht 1.8
-		EGUI_SBV_CHANGE = 1,
-		//! Validate when enter was pressed
-		EGUI_SBV_ENTER = 2,
-		//! Validate when the editbox loses the focus
-		EGUI_SBV_LOSE_FOCUS = 4
-	};
-
-
-	//! Single line edit box + spin buttons
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_SPINBOX_CHANGED
-	*/
-	class IGUISpinBox : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUISpinBox(IGUIEnvironment* environment, IGUIElement* parent,
-					s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_SPIN_BOX, environment, parent, id, rectangle) {}
-
-		//! Access the edit box used in the spin control
-		virtual IGUIEditBox* getEditBox() const = 0;
-
-		//! set the current value of the spinbox
-		/** \param val: value to be set in the spinbox */
-		virtual void setValue(f32 val) = 0;
-
-		//! Get the current value of the spinbox
-		virtual f32 getValue() const = 0;
-
-		//! set the range of values which can be used in the spinbox
-		/** \param min: minimum value
-		\param max: maximum value */
-		virtual void setRange(f32 min, f32 max) = 0;
-
-		//! get the minimum value which can be used in the spinbox
-		virtual f32 getMin() const = 0;
-
-		//! get the maximum value which can be used in the spinbox
-		virtual f32 getMax() const = 0;
-
-		//! Step size by which values are changed when pressing the spinbuttons
-		/** The step size also determines the number of decimal places to display
-		\param step: stepsize used for value changes when pressing spinbuttons */
-		virtual void setStepSize(f32 step=1.f) = 0;
-
-		//! Sets the number of decimal places to display.
-		//! Note that this also rounds the range to the same number of decimal places.
-		/** \param places: The number of decimal places to display, use -1 to reset */
-		virtual void setDecimalPlaces(s32 places) = 0;
-
-		//! get the current step size
-		virtual f32 getStepSize() const = 0;
-
-		//! Sets when the spinbox has to validate entered text.
-		/** \param validateOn Can be any combination of EGUI_SPINBOX_VALIDATION bit flags */
-		virtual void setValidateOn(u32 validateOn) = 0;
-
-		//! Gets when the spinbox has to validate entered text.
-		/** \return A combination of EGUI_SPINBOX_VALIDATION bit flags */
-		virtual u32 getValidateOn() const = 0;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif // __I_GUI_SPIN_BOX_H_INCLUDED__
-

include/IGUISpriteBank.h

@@ -2,8 +2,7 @@
 // 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__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
@@ -137,6 +136,3 @@ public:
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __I_GUI_SPRITE_BANK_H_INCLUDED__
-

include/IGUIStaticText.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_STATIC_TEXT_H_INCLUDED__
-#define __I_GUI_STATIC_TEXT_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -88,9 +87,9 @@ namespace gui
 
 		//! Sets text justification mode
 		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
-		EGUIA_LOWEERRIGHT for right justified, or EGUIA_CENTER for centered text.
+		EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
 		\param vertical: EGUIA_UPPERLEFT to align with top edge (default),
-		EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text. */
+		EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text. */
 		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
 
 		//! Enables or disables word wrap for using the static text as multiline text control.
@@ -134,6 +133,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUITabControl.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_TAB_CONTROL_H_INCLUDED__
-#define __I_GUI_TAB_CONTROL_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -129,15 +128,6 @@ namespace gui
 		IGUITab(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
 			: IGUIElement(EGUIET_TAB, environment, parent, id, rectangle) {}
 
-		//! Returns zero based index of tab if in tabcontrol.
-		/** \deprecated Deprecated in 1.9, use IGUITabControl::getTabIndex instead*/
-		_IRR_DEPRECATED_ virtual s32 getNumber() const
-		{
-			if (Parent && Parent->getType() == EGUIET_TAB_CONTROL)
-				return static_cast<IGUITabControl*>(Parent)->getTabIndex(this);
-			return -1;
-		}
-
 		//! sets if the tab should draw its background
 		virtual void setDrawBackground(bool draw=true) = 0;
 
@@ -159,6 +149,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUITable.h

@@ -1,235 +0,0 @@
-// Copyright (C) 2003-2012 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_TABLE_H_INCLUDED__
-#define __I_GUI_TABLE_H_INCLUDED__
-
-#include "IGUIElement.h"
-#include "SColor.h"
-
-namespace irr
-{
-namespace gui
-{
-	class IGUIFont;
-	class IGUIScrollBar;
-
-	//! modes for ordering used when a column header is clicked
-	enum EGUI_COLUMN_ORDERING
-	{
-		//! Do not use ordering
-		EGCO_NONE,
-
-		//! Send a EGET_TABLE_HEADER_CHANGED message when a column header is clicked.
-		EGCO_CUSTOM,
-
-		//! Sort it ascending by it's ascii value like: a,b,c,...
-		EGCO_ASCENDING,
-
-		//! Sort it descending by it's ascii value like: z,x,y,...
-		EGCO_DESCENDING,
-
-		//! Sort it ascending on first click, descending on next, etc
-		EGCO_FLIP_ASCENDING_DESCENDING,
-
-		//! Not used as mode, only to get maximum value for this enum
-		EGCO_COUNT
-	};
-
-	//! Names for EGUI_COLUMN_ORDERING types
-	const c8* const GUIColumnOrderingNames[] =
-	{
-		"none",
-		"custom",
-		"ascend",
-		"descend",
-		"ascend_descend",
-		0,
-	};
-
-	enum EGUI_ORDERING_MODE
-	{
-		//! No element ordering
-		EGOM_NONE,
-
-		//! Elements are ordered from the smallest to the largest.
-		EGOM_ASCENDING,
-
-		//! Elements are ordered from the largest to the smallest.
-		EGOM_DESCENDING,
-
-		//! this value is not used, it only specifies the amount of default ordering types
-		//! available.
-		EGOM_COUNT
-	};
-
-	const c8* const GUIOrderingModeNames[] =
-	{
-		"none",
-		"ascending",
-		"descending",
-		0
-	};
-
-	enum EGUI_TABLE_DRAW_FLAGS
-	{
-		EGTDF_ROWS = 1,
-		EGTDF_COLUMNS = 2,
-		EGTDF_ACTIVE_ROW = 4,
-		EGTDF_COUNT
-	};
-
-	//! Default list box GUI element.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_TABLE_CHANGED
-	\li EGET_TABLE_SELECTED_AGAIN
-	\li EGET_TABLE_HEADER_CHANGED
-	*/
-	class IGUITable : public IGUIElement
-	{
-	public:
-		//! constructor
-		IGUITable(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_TABLE, environment, parent, id, rectangle) {}
-
-		//! Adds a column
-		/** If columnIndex is outside the current range, do push new column at the end */
-		virtual void addColumn(const wchar_t* caption, s32 columnIndex=-1) = 0;
-
-		//! remove a column from the table
-		virtual void removeColumn(u32 columnIndex) = 0;
-
-		//! Returns the number of columns in the table control
-		virtual s32 getColumnCount() const = 0;
-
-		//! Makes a column active. This will trigger an ordering process.
-		/** \param idx: The id of the column to make active or a negative number to make non active.
-		\param doOrder: Do also the ordering which depending on mode for active column
-		\return True when the column could be set active (aka - it did exist). */
-		virtual bool setActiveColumn(s32 idx, bool doOrder=false) = 0;
-
-		//! Returns which header is currently active
-		virtual s32 getActiveColumn() const = 0;
-
-		//! Returns the ordering used by the currently active column
-		virtual EGUI_ORDERING_MODE getActiveColumnOrdering() const = 0;
-
-		//! Set the width of a column
-		virtual void setColumnWidth(u32 columnIndex, u32 width) = 0;
-
-		//! Get the width of a column
-		virtual u32 getColumnWidth(u32 columnIndex) const = 0;
-
-		//! columns can be resized by drag 'n drop
-		virtual void setResizableColumns(bool resizable) = 0;
-
-		//! can columns be resized by drag 'n drop?
-		virtual bool hasResizableColumns() const = 0;
-
-		//! This tells the table control which ordering mode should be used when a column header is clicked.
-		/** \param columnIndex The index of the column header.
-		\param mode: One of the modes defined in EGUI_COLUMN_ORDERING */
-		virtual void setColumnOrdering(u32 columnIndex, EGUI_COLUMN_ORDERING mode) = 0;
-
-		//! Returns which row is currently selected
-		virtual s32 getSelected() const = 0;
-
-		//! set which row is currently selected
-		virtual void setSelected( s32 index ) = 0;
-
-		//! Get amount of rows in the tabcontrol
-		virtual s32 getRowCount() const = 0;
-
-		//! adds a row to the table
-		/** \param rowIndex Zero based index of rows. The row will be
-		inserted at this position, if a row already exist there, it
-		will be placed after it. If the row is larger than the actual
-		number of row by more than one, it won't be created.  Note that
-		if you create a row that's not at the end, there might be
-		performance issues.
-		\return index of inserted row. */
-		virtual u32 addRow(u32 rowIndex) = 0;
-
-		//! Remove a row from the table
-		virtual void removeRow(u32 rowIndex) = 0;
-
-		//! clears the table rows, but keeps the columns intact
-		virtual void clearRows() = 0;
-
-		//! Swap two row positions.
-		virtual void swapRows(u32 rowIndexA, u32 rowIndexB) = 0;
-
-		//! This tells the table to start ordering all the rows.
-		/** You need to explicitly tell the table to re order the rows
-		when a new row is added or the cells data is changed. This
-		makes the system more flexible and doesn't make you pay the
-		cost of ordering when adding a lot of rows.
-		\param columnIndex: When set to -1 the active column is used.
-		\param mode Ordering mode of the rows. */
-		virtual void orderRows(s32 columnIndex=-1, EGUI_ORDERING_MODE mode=EGOM_NONE) = 0;
-
-		//! Set the text of a cell
-		virtual void setCellText(u32 rowIndex, u32 columnIndex, const core::stringw& text) = 0;
-
-		//! Set the text of a cell, and set a color of this cell.
-		virtual void setCellText(u32 rowIndex, u32 columnIndex, const core::stringw& text, video::SColor color) = 0;
-
-		//! Set the data of a cell
-		virtual void setCellData(u32 rowIndex, u32 columnIndex, void *data) = 0;
-
-		//! Set the color of a cell text
-		virtual void setCellColor(u32 rowIndex, u32 columnIndex, video::SColor color) = 0;
-
-		//! Get the text of a cell
-		virtual const wchar_t* getCellText(u32 rowIndex, u32 columnIndex ) const = 0;
-
-		//! Get the data of a cell
-		virtual void* getCellData(u32 rowIndex, u32 columnIndex ) const = 0;
-
-		//! clears the table, deletes all items in the table
-		virtual void clear() = 0;
-
-		//! Set flags, as defined in ::EGUI_TABLE_DRAW_FLAGS, which influence the layout
-		virtual void setDrawFlags(s32 flags) = 0;
-
-		//! Get the flags, as defined in ::EGUI_TABLE_DRAW_FLAGS, which influence the layout
-		virtual s32 getDrawFlags() const = 0;
-
-		//! 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) */
-		virtual IGUIFont* getOverrideFont(void) const = 0;
-
-		//! Get the font which is used right now for drawing
-		/** Currently this is the override font when one is set and the
-		font of the active skin otherwise */
-		virtual IGUIFont* getActiveFont() const = 0;
-
-		//! Get the height of items/rows
-		virtual s32 getItemHeight() const = 0;
-
-		//! Access the vertical scrollbar
-		virtual IGUIScrollBar* getVerticalScrollBar() const = 0;
-
-		//! Access the horizontal scrollbar
-		virtual IGUIScrollBar* getHorizontalScrollBar() const = 0;
-
-		//! Sets whether to draw the background.
-		virtual void setDrawBackground(bool draw) = 0;
-
-		//! Checks if background drawing is enabled
-		/** \return true if background drawing is enabled, false otherwise */
-		virtual bool isDrawBackgroundEnabled() const = 0;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-

include/IGUIToolbar.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_TOOL_BAR_H_INCLUDED__
-#define __I_GUI_TOOL_BAR_H_INCLUDED__
+#pragma once
 
 #include "IGUIElement.h"
 
@@ -35,6 +34,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUITreeView.h

@@ -1,298 +0,0 @@
-// written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_TREE_VIEW_H_INCLUDED__
-#define __I_GUI_TREE_VIEW_H_INCLUDED__
-
-#include "IGUIElement.h"
-#include "IGUIImageList.h"
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace gui
-{
-	class IGUIFont;
-	class IGUITreeView;
-	class IGUIScrollBar;
-
-
-	//! Node for gui tree view
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_TREEVIEW_NODE_EXPAND
-	\li EGET_TREEVIEW_NODE_COLLAPS
-	\li EGET_TREEVIEW_NODE_DESELECT
-	\li EGET_TREEVIEW_NODE_SELECT
-	*/
-	class IGUITreeViewNode : public IReferenceCounted
-	{
-	public:
-		//! returns the owner (tree view) of this node
-		virtual IGUITreeView* getOwner() const = 0;
-
-		//! Returns the parent node of this node.
-		/** For the root node this will return 0. */
-		virtual IGUITreeViewNode* getParent() const = 0;
-
-		//! returns the text of the node
-		virtual const wchar_t* getText() const = 0;
-
-		//! sets the text of the node
-		virtual void setText( const wchar_t* text ) = 0;
-
-		//! returns the icon text of the node
-		virtual const wchar_t* getIcon() const = 0;
-
-		//! sets the icon text of the node
-		virtual void setIcon( const wchar_t* icon ) = 0;
-
-		//! returns the image index of the node
-		virtual u32 getImageIndex() const = 0;
-
-		//! sets the image index of the node
-		virtual void setImageIndex( u32 imageIndex ) = 0;
-
-		//! returns the image index of the node
-		virtual u32 getSelectedImageIndex() const = 0;
-
-		//! sets the image index of the node
-		virtual void setSelectedImageIndex( u32 imageIndex ) = 0;
-
-		//! returns the user data (void*) of this node
-		virtual void* getData() const = 0;
-
-		//! sets the user data (void*) of this node
-		virtual void setData( void* data ) = 0;
-
-		//! returns the user data2 (IReferenceCounted) of this node
-		virtual IReferenceCounted* getData2() const = 0;
-
-		//! sets the user data2 (IReferenceCounted) of this node
-		virtual void setData2( IReferenceCounted* data ) = 0;
-
-		//! returns the child item count
-		virtual u32 getChildCount() const = 0;
-
-		//! removes all children (recursive) from this node
-		virtual void clearChildren() = 0;
-
-		//! removes all children (recursive) from this node
-		/** \deprecated Deprecated in 1.8, use clearChildren() instead.
-		This method may be removed by Irrlicht 1.9 */
-		_IRR_DEPRECATED_ void clearChilds()
-		{
-			return clearChildren();
-		}
-
-		//! returns true if this node has child nodes
-		virtual bool hasChildren() const = 0;
-
-		//! returns true if this node has child nodes
-		/** \deprecated Deprecated in 1.8, use hasChildren() instead.
-		This method may be removed by Irrlicht 1.9 */
-		_IRR_DEPRECATED_ bool hasChilds() const
-		{
-			return hasChildren();
-		}
-
-		//! Adds a new node behind the last child node.
-		/** \param text text of the new node
-		\param icon icon text of the new node
-		\param imageIndex index of the image for the new node (-1 = none)
-		\param selectedImageIndex index of the selected image for the new node (-1 = same as imageIndex)
-		\param data user data (void*) of the new node
-		\param data2 user data2 (IReferenceCounted*) of the new node
-		\return The new node
-		*/
-		virtual IGUITreeViewNode* addChildBack(
-				const wchar_t* text, const wchar_t* icon = 0,
-				s32 imageIndex=-1, s32 selectedImageIndex=-1,
-				void* data=0, IReferenceCounted* data2=0) =0;
-
-		//! Adds a new node before the first child node.
-		/** \param text text of the new node
-		\param icon icon text of the new node
-		\param imageIndex index of the image for the new node (-1 = none)
-		\param selectedImageIndex index of the selected image for the new node (-1 = same as imageIndex)
-		\param data user data (void*) of the new node
-		\param data2 user data2 (IReferenceCounted*) of the new node
-		\return The new node
-		*/
-		virtual IGUITreeViewNode* addChildFront(
-				const wchar_t* text, const wchar_t* icon = 0,
-				s32 imageIndex=-1, s32 selectedImageIndex=-1,
-				void* data=0, IReferenceCounted* data2=0 ) =0;
-
-		//! Adds a new node behind the other node.
-		/** The other node has also to be a child node from this node.
-		\param other Node to insert after
-		\param text text of the new node
-		\param icon icon text of the new node
-		\param imageIndex index of the image for the new node (-1 = none)
-		\param selectedImageIndex index of the selected image for the new node (-1 = same as imageIndex)
-		\param data user data (void*) of the new node
-		\param data2 user data2 (IReferenceCounted*) of the new node
-		\return The new node or 0 if other is no child node from this
-		*/
-		virtual IGUITreeViewNode* insertChildAfter(
-				IGUITreeViewNode* other,
-				const wchar_t* text, const wchar_t* icon = 0,
-				s32 imageIndex=-1, s32 selectedImageIndex=-1,
-				void* data=0, IReferenceCounted* data2=0) =0;
-
-		//! Adds a new node before the other node.
-		/** The other node has also to be a child node from this node.
-		\param other Node to insert before
-		\param text text of the new node
-		\param icon icon text of the new node
-		\param imageIndex index of the image for the new node (-1 = none)
-		\param selectedImageIndex index of the selected image for the new node (-1 = same as imageIndex)
-		\param data user data (void*) of the new node
-		\param data2 user data2 (IReferenceCounted*) of the new node
-		\return The new node or 0 if other is no child node from this
-		*/
-		virtual IGUITreeViewNode* insertChildBefore(
-				IGUITreeViewNode* other,
-				const wchar_t* text, const wchar_t* icon = 0,
-				s32 imageIndex=-1, s32 selectedImageIndex=-1,
-				void* data=0, IReferenceCounted* data2=0) = 0;
-
-		//! Return the first child node from this node.
-		/** \return The first child node or 0 if this node has no children. */
-		virtual IGUITreeViewNode* getFirstChild() const = 0;
-
-		//! Return the last child node from this node.
-		/** \return The last child node or 0 if this node has no children. */
-		virtual IGUITreeViewNode* getLastChild() const = 0;
-
-		//! Returns the previous sibling node from this node.
-		/** \return The previous sibling node from this node or 0 if this is
-		the first node from the parent node.
-		*/
-		virtual IGUITreeViewNode* getPrevSibling() const = 0;
-
-		//! Returns the next sibling node from this node.
-		/** \return The next sibling node from this node or 0 if this is
-		the last node from the parent node.
-		*/
-		virtual IGUITreeViewNode* getNextSibling() const = 0;
-
-		//! Returns the next visible (expanded, may be out of scrolling) node from this node.
-		/** \return The next visible node from this node or 0 if this is
-		the last visible node. */
-		virtual IGUITreeViewNode* getNextVisible() const = 0;
-
-		//! Deletes a child node.
-		/** \return Returns true if the node was found as a child and is deleted. */
-		virtual bool deleteChild( IGUITreeViewNode* child ) = 0;
-
-		//! Moves a child node one position up.
-		/** \return True if the node was found as a child node and was not already the first child. */
-		virtual bool moveChildUp( IGUITreeViewNode* child ) = 0;
-
-		//! Moves a child node one position down.
-		/** \return True if the node was found as a child node and was not already the last child. */
-		virtual bool moveChildDown( IGUITreeViewNode* child ) = 0;
-
-		//! Returns true if the node is expanded (children are visible).
-		virtual bool getExpanded() const = 0;
-
-		//! Sets if the node is expanded.
-		virtual void setExpanded( bool expanded ) = 0;
-
-		//! Returns true if the node is currently selected.
-		virtual bool getSelected() const = 0;
-
-		//! Sets this node as selected.
-		virtual void setSelected( bool selected ) = 0;
-
-		//! Returns true if this node is the root node.
-		virtual bool isRoot() const = 0;
-
-		//! Returns the level of this node.
-		/** The root node has level 0. Direct children of the root has level 1 ... */
-		virtual s32 getLevel() const = 0;
-
-		//! Returns true if this node is visible (all parents are expanded).
-		virtual bool isVisible() const = 0;
-	};
-
-
-	//! Default tree view GUI element.
-	/** Displays a windows like tree buttons to expand/collapse the child
-	nodes of an node and optional tree lines. Each node consists of an
-	text, an icon text and a void pointer for user data. */
-	class IGUITreeView : public IGUIElement
-	{
-	public:
-		//! constructor
-		IGUITreeView(IGUIEnvironment* environment, IGUIElement* parent,
-				s32 id, core::rect<s32> rectangle)
-			: IGUIElement( EGUIET_TREE_VIEW, environment, parent, id, rectangle ) {}
-
-		//! returns the root node (not visible) from the tree.
-		virtual IGUITreeViewNode* getRoot() const = 0;
-
-		//! returns the selected node of the tree or 0 if none is selected
-		virtual IGUITreeViewNode* getSelected() const = 0;
-
-		//! returns true if the tree lines are visible
-		virtual bool getLinesVisible() const = 0;
-
-		//! sets if the tree lines are visible
-		/** \param visible true for visible, false for invisible */
-		virtual void setLinesVisible( bool visible ) = 0;
-
-		//! Sets the font which should be used as icon font.
-		/** This font is set to the Irrlicht engine built-in-font by
-		default. Icons can be displayed in front of every list item.
-		An icon is a string, displayed with the icon font. When using
-		the build-in-font of the Irrlicht engine as icon font, the icon
-		strings defined in GUIIcons.h can be used.
-		*/
-		virtual void setIconFont( IGUIFont* font ) = 0;
-
-		//! Sets a skin independent font.
-		/** \param font: New font to set or 0 to use the skin-font. */
-		virtual void setOverrideFont(IGUIFont* font=0) = 0;
-
-		//! Gets the override font (if any)
-		/** \return The override font (may be 0) */
-		virtual IGUIFont* getOverrideFont(void) const = 0;
-
-		//! Get the font which is used for drawing
-		/** This is the override font when one is set and the
-		font of the skin otherwise. */
-		virtual IGUIFont* getActiveFont() const = 0;
-
-		//! Sets the image list which should be used for the image and selected image of every node.
-		/** The default is 0 (no images). */
-		virtual void setImageList( IGUIImageList* imageList ) = 0;
-
-		//! Returns the image list which is used for the nodes.
-		virtual IGUIImageList* getImageList() const = 0;
-
-		//! Sets if the image is left of the icon. Default is true.
-		virtual void setImageLeftOfIcon( bool bLeftOf ) = 0;
-
-		//! Returns if the Image is left of the icon. Default is true.
-		virtual bool getImageLeftOfIcon() const = 0;
-
-		//! Returns the node which is associated to the last event.
-		/** This pointer is only valid inside the OnEvent call! */
-		virtual IGUITreeViewNode* getLastEventNode() const = 0;
-
-		//! Access the vertical scrollbar
-		virtual IGUIScrollBar* getVerticalScrollBar() const = 0;
-
-		//! Access the horizontal scrollbar
-		virtual IGUIScrollBar* getHorizontalScrollBar() const = 0;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-

include/IGUIWindow.h

@@ -1,74 +0,0 @@
-// Copyright (C) 2002-2012 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_WINDOW_H_INCLUDED__
-#define __I_GUI_WINDOW_H_INCLUDED__
-
-#include "IGUIElement.h"
-#include "EMessageBoxFlags.h"
-
-namespace irr
-{
-namespace gui
-{
-	class IGUIButton;
-
-	//! Default moveable window GUI element with border, caption and close icons.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_ELEMENT_CLOSED
-	*/
-	class IGUIWindow : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIWindow(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_WINDOW, environment, parent, id, rectangle) {}
-
-		//! Returns pointer to the close button
-		/** You can hide the button by calling setVisible(false) on the result. */
-		virtual IGUIButton* getCloseButton() const = 0;
-
-		//! Returns pointer to the minimize button
-		/** You can hide the button by calling setVisible(false) on the result. */
-		virtual IGUIButton* getMinimizeButton() const = 0;
-
-		//! Returns pointer to the maximize button
-		/** You can hide the button by calling setVisible(false) on the result. */
-		virtual IGUIButton* getMaximizeButton() const = 0;
-
-		//! Returns true if the window can be dragged with the mouse, false if not
-		virtual bool isDraggable() const = 0;
-
-		//! Sets whether the window can be dragged by the mouse
-		virtual void setDraggable(bool draggable) = 0;
-
-		//! Set if the window background will be drawn
-		virtual void setDrawBackground(bool draw) = 0;
-
-		//! Get if the window background will be drawn
-		virtual bool getDrawBackground() const = 0;
-
-		//! Set if the window titlebar will be drawn
-		//! Note: If the background is not drawn, then the titlebar is automatically also not drawn
-		virtual void setDrawTitlebar(bool draw) = 0;
-
-		//! Get if the window titlebar will be drawn
-		virtual bool getDrawTitlebar() const = 0;
-
-		//! Returns the rectangle of the drawable area (without border and without titlebar)
-		/** The coordinates are given relative to the top-left position of the gui element.<br>
-		So to get absolute positions you have to add the resulting rectangle to getAbsolutePosition().UpperLeftCorner.<br>
-		To get it relative to the parent element you have to add the resulting rectangle to getRelativePosition().UpperLeftCorner.
-		Beware that adding a menu will not change the clientRect as menus are own gui elements, so in that case you might want to subtract
-		the menu area additionally. */
-		virtual core::rect<s32> getClientRect() const = 0;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-

include/IImage.h

@@ -2,15 +2,13 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_IMAGE_H_INCLUDED__
-#define __I_IMAGE_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
 #include "rect.h"
 #include "SColor.h"
-#include "irrAllocator.h"
-#include <string.h>
+#include <cstring>
 
 namespace irr
 {
@@ -44,7 +42,7 @@ public:
 			delete[] Data;
 
 		if (DeleteMipMapsMemory)
-			Allocator.deallocate(MipMapsData);
+			delete[] MipMapsData;
 	}
 
 	//! Returns the color format
@@ -184,24 +182,6 @@ public:
 		return Data;
 	}
 
-	//! Lock function. Use this to get a pointer to the image data.
-	/** Use getData instead.
-	\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. */
-	_IRR_DEPRECATED_ void* lock()
-	{
-		return getData();
-	}
-
-	//! Unlock function.
-	/** Should be called after the pointer received by lock() is not
-	needed anymore. */
-	_IRR_DEPRECATED_ void unlock()
-	{
-	}
-
 	//! Get the mipmap size for this image for a certain mipmap level
 	/** level 0 will be full image size. Every further level is half the size.
 		Doesn't care if the image actually has mipmaps, just which size would be needed. */
@@ -275,13 +255,13 @@ public:
 	will by copied internally.
 	\param deleteMemory Whether the memory is deallocated upon
 	destruction. */
-	void setMipMapsData(void* data, bool ownForeignMemory, bool deleteMemory)
+	void setMipMapsData(void* data, bool ownForeignMemory)
 	{
 		if (data != MipMapsData)
 		{
 			if (DeleteMipMapsMemory)
 			{
-				Allocator.deallocate(MipMapsData);
+				delete[] MipMapsData;
 
 				DeleteMipMapsMemory = false;
 			}
@@ -292,7 +272,7 @@ public:
 				{
 					MipMapsData = static_cast<u8*>(data);
 
-					DeleteMipMapsMemory = deleteMemory;
+					DeleteMipMapsMemory = false;
 				}
 				else
 				{
@@ -311,7 +291,7 @@ public:
 						dataSize += getDataSizeFromFormat(Format, width, height);
 					} while (width != 1 || height != 1);
 
-					MipMapsData = Allocator.allocate(dataSize);
+					MipMapsData = new u8[dataSize];
 					memcpy(MipMapsData, data, dataSize);
 
 					DeleteMipMapsMemory = true;
@@ -330,6 +310,12 @@ public:
 	//! Sets a pixel
 	virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false ) = 0;
 
+	//! Copies this surface into another, if it has the exact same size and format.
+	/**	NOTE: mipmaps are ignored
+	\return True if it was copied, false otherwise.
+	*/
+	virtual bool copyToNoScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format=ECF_A8R8G8B8, u32 pitch=0) const = 0;
+
 	//! Copies the image into the target, scaling the image to fit
 	/**	NOTE: mipmaps are ignored */
 	virtual void copyToScaling(void* target, u32 width, u32 height, ECOLOR_FORMAT format=ECF_A8R8G8B8, u32 pitch=0) =0;
@@ -362,19 +348,6 @@ public:
 	//! fills the surface with given color
 	virtual void fill(const SColor &color) =0;
 
-	//! Inform whether the image is compressed
-	_IRR_DEPRECATED_ bool isCompressed() const
-	{
-		return IImage::isCompressedFormat(Format);
-	}
-
-	//! Check whether the image has MipMaps
-	/** \return True if image has MipMaps, else false. */
-	_IRR_DEPRECATED_ bool hasMipMaps() const
-	{
-		return (getMipMapsData() != 0);
-	}
-
 	//! get the amount of Bits per Pixel of the given color format
 	static u32 getBitsPerPixelFromFormat(const ECOLOR_FORMAT format)
 	{
@@ -388,28 +361,6 @@ public:
 			return 24;
 		case ECF_A8R8G8B8:
 			return 32;
-		case ECF_DXT1:
-			return 16;
-		case ECF_DXT2:
-		case ECF_DXT3:
-		case ECF_DXT4:
-		case ECF_DXT5:
-			return 32;
-		case ECF_PVRTC_RGB2:
-			return 12;
-		case ECF_PVRTC_ARGB2:
-		case ECF_PVRTC2_ARGB2:
-			return 16;
-		case ECF_PVRTC_RGB4:
-			return 24;
-		case ECF_PVRTC_ARGB4:
-		case ECF_PVRTC2_ARGB4:
-			return 32;
-		case ECF_ETC1:
-		case ECF_ETC2_RGB:
-			return 24;
-		case ECF_ETC2_ARGB:
-			return 32;
 		case ECF_D16:
 			return 16;
 		case ECF_D32:
@@ -444,75 +395,18 @@ public:
 	//! calculate image data size in bytes for selected format, width and height.
 	static u32 getDataSizeFromFormat(ECOLOR_FORMAT format, u32 width, u32 height)
 	{
-		u32 imageSize = 0;
-
-		switch (format)
-		{
-		case ECF_DXT1:
-			imageSize = ((width + 3) / 4) * ((height + 3) / 4) * 8;
-			break;
-		case ECF_DXT2:
-		case ECF_DXT3:
-		case ECF_DXT4:
-		case ECF_DXT5:
-			imageSize = ((width + 3) / 4) * ((height + 3) / 4) * 16;
-			break;
-		case ECF_PVRTC_RGB2:
-		case ECF_PVRTC_ARGB2:
-			imageSize = (core::max_<u32>(width, 16) * core::max_<u32>(height, 8) * 2 + 7) / 8;
-			break;
-		case ECF_PVRTC_RGB4:
-		case ECF_PVRTC_ARGB4:
-			imageSize = (core::max_<u32>(width, 8) * core::max_<u32>(height, 8) * 4 + 7) / 8;
-			break;
-		case ECF_PVRTC2_ARGB2:
-			imageSize = core::ceil32(width / 8.0f) * core::ceil32(height / 4.0f) * 8;
-			break;
-		case ECF_PVRTC2_ARGB4:
-		case ECF_ETC1:
-		case ECF_ETC2_RGB:
-			imageSize = core::ceil32(width / 4.0f) * core::ceil32(height / 4.0f) * 8;
-			break;
-		case ECF_ETC2_ARGB:
-			imageSize = core::ceil32(width / 4.0f) * core::ceil32(height / 4.0f) * 16;
-			break;
-		default: // uncompressed formats
-			imageSize = getBitsPerPixelFromFormat(format) / 8 * width;
+		// non-compressed formats
+		u32 imageSize = getBitsPerPixelFromFormat(format) / 8 * width;
 		imageSize *= height;
-			break;
-		}
 
 		return imageSize;
 	}
 
-// Define to check for all compressed image formats cases in a switch
-#define IRR_CASE_IIMAGE_COMPRESSED_FORMAT\
-	case ECF_DXT1:\
-	case ECF_DXT2:\
-	case ECF_DXT3:\
-	case ECF_DXT4:\
-	case ECF_DXT5:\
-	case ECF_PVRTC_RGB2:\
-	case ECF_PVRTC_ARGB2:\
-	case ECF_PVRTC2_ARGB2:\
-	case ECF_PVRTC_RGB4:\
-	case ECF_PVRTC_ARGB4:\
-	case ECF_PVRTC2_ARGB4:\
-	case ECF_ETC1:\
-	case ECF_ETC2_RGB:\
-	case ECF_ETC2_ARGB:
-
 	//! check if this is compressed color format
 	static bool isCompressedFormat(const ECOLOR_FORMAT format)
 	{
-		switch(format)
-		{
-			IRR_CASE_IIMAGE_COMPRESSED_FORMAT
-				return true;
-			default:
 		return false;
 	}
-	}
 
 	//! check if the color format is only viable for depth/stencil textures
 	static bool isDepthFormat(const ECOLOR_FORMAT format)
@@ -549,22 +443,6 @@ public:
 		return false;
 	}
 
-#if defined(PATCH_SUPERTUX_8_0_1_with_1_9_0)
-	static bool isRenderTargetOnlyFormat(const ECOLOR_FORMAT format)
-	{
-		switch (format)
-		{
-		case ECF_A1R5G5B5:
-		case ECF_R5G6B5:
-		case ECF_R8G8B8:
-		case ECF_A8R8G8B8:
-			return false;
-		default:
-			return true;
-		}
-	}
-#endif
-
 protected:
 	ECOLOR_FORMAT Format;
 	core::dimension2d<u32> Size;
@@ -578,7 +456,6 @@ protected:
 	bool DeleteMemory;
 	bool DeleteMipMapsMemory;
 
-	core::irrAllocator<u8> Allocator;
 #if defined(IRRLICHT_sRGB)
 	int Format_sRGB;
 #endif
@@ -587,6 +464,3 @@ protected:
 
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/IImageLoader.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_SURFACE_LOADER_H_INCLUDED__
-#define __I_SURFACE_LOADER_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "IImage.h"
@@ -45,22 +44,8 @@ public:
 	/** \param file File handle to check.
 	\return Pointer to newly created image, or 0 upon error. */
 	virtual IImage* loadImage(io::IReadFile* file) const = 0;
-
-	//! Creates a multiple surfaces from the file eg. whole cube map.
-	/** \param file File handle to check.
-	\param type Pointer to E_TEXTURE_TYPE where a recommended type of the texture will be stored.
-	\return Array of pointers to newly created images. */
-	virtual core::array<IImage*> loadImages(io::IReadFile* file, E_TEXTURE_TYPE* type) const
-	{
-		core::array<IImage*> image;
-
-		return image;
-	}
 };
 
 
 } // end namespace video
 } // end namespace irr
-
-#endif
-