Update README.md: Add notice about IrrlichtMt having been moved into the main repo

find -type f |  # list all regular files
  grep -E '\.(h|cpp|mm)$' |  # filter for source files
  grep -v '/mt_' |  # filter out generated files
  grep -v '/vendor/' | # and vendored GL
  xargs -n 1 -P $(nproc) ./replace_non_leading_tabs.lua  # reformat everything

.github/workflows/build.yml

@@ -8,47 +8,46 @@ on:
 jobs:
 
   linux-gl:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:bionic
-      env: { LANG: "C.UTF-8" }
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
-          apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+          sudo apt-get update
+          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@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: irrlicht-linux
           path: ./irrlicht-linux.tar.gz
 
   linux-gles:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:bionic
-      env: { LANG: "C.UTF-8" }
+    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
-          apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          sudo apt-get update
+          sudo apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
-          cmake . -DBUILD_EXAMPLES=1 -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=OFF -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
           make -j2
 
       - name: Test (headless)
@@ -62,20 +61,17 @@ jobs:
           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
 
   linux-sdl:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:jammy
-      env: { LANG: "C.UTF-8" }
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
-          apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+          sudo apt-get update
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
 
       - name: Build
         run: |
-          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DCMAKE_BUILD_TYPE=Debug
           make -j2
 
       - name: Test (headless)
@@ -84,16 +80,14 @@ jobs:
           ./AutomatedTest null
 
   linux-sdl-gl3:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:jammy
-      env: { LANG: "C.UTF-8" }
+    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
-          apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          sudo apt-get update
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
@@ -111,16 +105,13 @@ jobs:
           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest opengl3
 
   linux-sdl-gles2:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:jammy
-      env: { LANG: "C.UTF-8" }
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
-          apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          sudo apt-get update
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
@@ -137,58 +128,48 @@ jobs:
           cd bin/Linux
           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
 
-  win32:
-    runs-on: ubuntu-20.04
+  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@v3
+      - uses: actions/checkout@v4
       - name: Install compiler
         run: |
           sudo apt-get update && sudo apt-get install cmake -qyy
-          wget http://minetest.kitsunemimi.pw/mingw-w64-i686_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz
-          sudo tar -xaf mingw.tar.xz -C /usr
+          ./scripts/ci-get-mingw.sh
 
       - name: Build
         run: |
           ./scripts/ci-build-mingw.sh package
         env:
-          CC: i686-w64-mingw32-gcc
-          CXX: i686-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@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: irrlicht-win32
-          path: ./irrlicht-win32.zip
-
-  win64:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install compiler
-        run: |
-          sudo apt-get update && sudo apt-get install cmake -qyy
-          wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz
-          sudo tar -xaf mingw.tar.xz -C /usr
-
-      - name: Build
-        run: |
-          ./scripts/ci-build-mingw.sh package
-        env:
-          CC: x86_64-w64-mingw32-gcc
-          CXX: x86_64-w64-mingw32-g++
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: irrlicht-win64
-          path: ./irrlicht-win64.zip
+          name: irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}
+          path: ./irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}.zip
 
   macos:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          brew update
+          brew update --auto-update
           brew install cmake libpng jpeg
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
 
       - name: Build
         run: |
@@ -199,13 +180,30 @@ jobs:
         run: |
           ./bin/OSX/AutomatedTest null
 
+  macos-sdl:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          brew update --auto-update
+          brew install cmake libpng jpeg sdl2
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+
+      - name: Build
+        run: |
+          cmake . -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_EXAMPLES=1 -DUSE_SDL2=1
+          make -j3
+
   msvc:
-    name: VS 2019 ${{ matrix.config.arch }}
+    name: VS 2019 ${{ matrix.config.arch }} ${{ matrix.sdl.label }}
     runs-on: windows-2019
     env:
-      VCPKG_VERSION: 14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44
-        # 2022.05.10
-      vcpkg_packages: zlib libpng libjpeg-turbo opengl-registry
+      VCPKG_VERSION: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
+      # 2023.10.19
+      vcpkg_packages: zlib libpng libjpeg-turbo
     strategy:
       fail-fast: false
       matrix:
@@ -218,15 +216,24 @@ jobs:
             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@v3
+        uses: actions/checkout@v4
 
       - name: Restore from cache and run vcpkg
         uses: lukka/run-vcpkg@v7
         with:
-          vcpkgArguments: ${{env.vcpkg_packages}}
+          vcpkgArguments: ${{env.vcpkg_packages}} ${{matrix.sdl.vcpkg_packages}}
           vcpkgDirectory: '${{ github.workspace }}\vcpkg'
           appendedCacheKey: ${{ matrix.config.vcpkg_triplet }}
           vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
@@ -235,6 +242,7 @@ jobs:
       - 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 .
 
@@ -253,7 +261,50 @@ jobs:
         run: move include artifact/
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: msvc-${{ matrix.config.arch }}
+          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*
@@ -19,3 +20,6 @@ scripts/glext.h
 *.dir/
 *.sln
 *visualstudio/
+
+# vscode cmake plugin
+build/*

CMakeLists.txt

@@ -1,13 +1,6 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 
-# >=3.9 enables IPO; >=3.11 prefers GLVND
-if(${CMAKE_VERSION} VERSION_LESS 3.11)
-	cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
-	cmake_policy(VERSION 3.11)
-endif()
-
-set(IRRLICHTMT_REVISION 11)
+set(IRRLICHTMT_REVISION 15)
 
 project(Irrlicht
 	VERSION 1.9.0.${IRRLICHTMT_REVISION}
@@ -16,6 +9,9 @@ project(Irrlicht
 
 message(STATUS "*** Building IrrlichtMt ${PROJECT_VERSION} ***")
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 include(GNUInstallDirs)
 
 if(ANDROID)
@@ -38,7 +34,9 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-add_subdirectory(source/Irrlicht)
+enable_testing()
+add_subdirectory(src)
+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()

LICENSE

@@ -1 +0,0 @@
-doc/irrlicht-license.txt

LICENSE

@@ -0,0 +1,26 @@
+Copyright (C) 2002-2012 Nikolaus Gebhardt
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Please note that the Irrlicht Engine is based in part on the work of the
+  Independent JPEG Group, the zlib, libPng and aesGladman. This means that if you use
+  the Irrlicht Engine in your product, you must acknowledge somewhere in your
+  documentation that you've used the IJPG code. It would also be nice to mention
+  that you use the Irrlicht Engine, the zlib, libPng and aesGladman. See the
+  corresponding license files for further informations. It is also possible to disable
+  usage of those additional libraries by defines in the IrrCompileConfig.h header and
+  recompiling the engine.

README.md

@@ -1,9 +1,16 @@
 IrrlichtMt version 1.9
 ======================
 
-The Irrlicht Engine is an open source realtime 3D engine written in C++.
+Notice
+------
 
-This is a fork by the [Minetest](https://github.com/minetest) developers that was stripped-down and customized specifically for use in Minetest.
+IrrlichtMt has been moved into the [main Minetest repository](https://github.com/minetest) during Minetest 5.9 development. This repository is an archive useful for building older versions of Minetest.
+
+About
+-----
+
+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
@@ -16,6 +23,7 @@ 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
@@ -24,7 +32,7 @@ Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the
 * `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: `OFF`) - Use SDL2 instead of native platform device
+* `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:
 
@@ -41,7 +49,7 @@ 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 opengl-registry --triplet x64-windows
+	vcpkg install zlib libjpeg-turbo libpng sdl2 --triplet x64-windows
 	
 Run the following script in PowerShell:
 

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/emscripten/readme.txt

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

doc/irrlicht-license.txt

@@ -1,26 +0,0 @@
-Copyright (C) 2002-2012 Nikolaus Gebhardt
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Please note that the Irrlicht Engine is based in part on the work of the
-  Independent JPEG Group, the zlib, libPng and aesGladman. This means that if you use
-  the Irrlicht Engine in your product, you must acknowledge somewhere in your
-  documentation that you've used the IJPG code. It would also be nice to mention
-  that you use the Irrlicht Engine, the zlib, libPng and aesGladman. See the 
-  corresponding license files for further informations. It is also possible to disable
-  usage of those additional libraries by defines in the IrrCompileConfig.h header and 
-  recompiling the engine.

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

@@ -28,14 +28,14 @@ static video::E_DRIVER_TYPE chooseDriver(core::stringc arg_)
 
 static inline void check(bool ok, const char *msg)
 {
-	if (!ok)
-	{
+	if (!ok) {
 		test_fail++;
 		device->getLogger()->log((core::stringc("FAILED TEST: ") + msg).c_str(), ELL_ERROR);
 	}
 }
 
-void run_unit_tests() {
+void run_unit_tests()
+{
 	std::cout << "Running unit tests:" << std::endl;
 	try {
 		test_irr_array();
@@ -93,17 +93,17 @@ int main(int argc, char *argv[])
 	check(mesh, "mesh loading");
 	if (mesh_file)
 		mesh_file->drop();
-	if (mesh)
-	{
+	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);
+		if (node) {
+			node->forEachMaterial([tex](video::SMaterial &mat) {
+				mat.Lighting = false;
+				mat.setTexture(0, tex);
+			});
 			node->setFrameLoop(0, 29);
 			node->setAnimationSpeed(30);
-			node->setMaterialTexture(0, tex);
 		}
 	}
 
@@ -113,25 +113,20 @@ int main(int argc, char *argv[])
 	SEvent event;
 	device->getTimer()->start();
 
-	while (device->run())
-	{
-		if (device->getTimer()->getTime() >= 1000)
-		{
+	while (device->run()) {
+		if (device->getTimer()->getTime() >= 1000) {
 			device->getTimer()->setTime(0);
 			++n;
-			if (n == 1) // Tooltip display
-			{
+			if (n == 1) { // Tooltip display
 				bzero(&event, sizeof(SEvent));
 				event.EventType = irr::EET_MOUSE_INPUT_EVENT;
 				event.MouseInput.Event = irr::EMIE_MOUSE_MOVED;
 				event.MouseInput.X = button->getAbsolutePosition().getCenter().X;
 				event.MouseInput.Y = button->getAbsolutePosition().getCenter().Y;
 				device->postEventFromUser(event);
-			}
-			else if (n == 2) // Text input focus
+			} else if (n == 2) // Text input focus
 				guienv->setFocus(editbox);
-			else if (n == 3) // Keypress for Text input
-			{
+			else if (n == 3) { // Keypress for Text input
 				bzero(&event, sizeof(SEvent));
 				event.EventType = irr::EET_KEY_INPUT_EVENT;
 				event.KeyInput.Char = L'a';
@@ -140,8 +135,7 @@ int main(int argc, char *argv[])
 				device->postEventFromUser(event);
 				event.KeyInput.PressedDown = false;
 				device->postEventFromUser(event);
-			}
-			else
+			} else
 				device->closeDevice();
 		}
 

examples/AutomatedTest/test_array.cpp

@@ -4,7 +4,8 @@
 using namespace irr;
 using core::array;
 
-static void test_basics() {
+static void test_basics()
+{
 	array<int> v;
 	v.push_back(1);  // 1
 	v.push_front(2); // 2, 1
@@ -57,7 +58,8 @@ static void test_basics() {
 	UASSERTEQ(v.size(), 2);
 }
 
-static void test_linear_searches() {
+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++)
@@ -75,7 +77,8 @@ static void test_linear_searches() {
 	}
 }
 
-static void test_binary_searches() {
+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) {

examples/AutomatedTest/test_helper.h

@@ -3,11 +3,13 @@
 #include <exception>
 #include <iostream>
 
-class TestFailedException : public std::exception {
+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 {                                        \
+#define UASSERTCMP(CMP, actual, expected)                                         \
+	do {                                                                          \
 		const auto &a = (actual);                                                 \
 		const auto &e = (expected);                                               \
 		if (!CMP(a, e)) {                                                         \
@@ -15,7 +17,8 @@ class TestFailedException : public std::exception {
 					<< "Test assertion failed: " << #actual << " " << #CMP << " " \
 					<< #expected << std::endl                                     \
 					<< "    at " << __FILE__ << ":" << __LINE__ << std::endl      \
-			<< "    actual:   " << a << std::endl << "    expected: "     \
+					<< "    actual:   " << a << std::endl                         \
+					<< "    expected: "                                           \
 					<< e << std::endl;                                            \
 			throw TestFailedException();                                          \
 		}                                                                         \

examples/AutomatedTest/test_string.cpp

@@ -168,22 +168,32 @@ static void test_methods()
 
 static void test_conv()
 {
-	// assumes Unicode and UTF-8 locale
-	setlocale(LC_CTYPE, "");
+	// locale-independent
 
 	stringw out;
-	multibyteToWString(out, "†††");
+	utf8ToWString(out, "†††");
 	UASSERTEQ(out.size(), 3);
 	for (int i = 0; i < 3; i++)
 		UASSERTEQ(static_cast<u16>(out[i]), 0x2020);
+
 	stringc out2;
-	wStringToMultibyte(out2, L"†††");
+	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()

examples/CMakeLists.txt

@@ -1,6 +1,3 @@
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 set(IRREXAMPLES
 	# removed
 )

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;
-
-			u32 stride() const override {return sizeof(T);}
-
-			u32 size() const override {return Indices.size();}
-
-			void push_back(const u32 &element) override
-			{
-				// push const ref due to compiler problem with gcc 4.6, big endian
-				Indices.push_back((const T&)element);
-			}
-
-			u32 operator [](u32 index) const override
-			{
-				return (u32)(Indices[index]);
-			}
-
-			u32 getLast() override {return (u32)Indices.getLast();}
-
-			void setValue(u32 index, u32 value) override
-			{
-				Indices[index]=(T)value;
-			}
-
-			void set_used(u32 usedNow) override
-			{
-				Indices.set_used(usedNow);
-			}
-
-			void reallocate(u32 new_size) override
-			{
-				Indices.reallocate(new_size);
-			}
-
-			u32 allocated_size() const override
-			{
-				return Indices.allocated_size();
-			}
-
-			void* pointer() override  {return Indices.pointer();}
-
-			video::E_INDEX_TYPE getType() const 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);
-		void setType(video::E_INDEX_TYPE IndexType) 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;
-		}
-
-		void* getData() override {return Indices->pointer();}
-
-		video::E_INDEX_TYPE getType() const override {return Indices->getType();}
-
-		u32 stride() const override {return Indices->stride();}
-
-		u32 size() const override
-		{
-			return Indices->size();
-		}
-
-		void push_back(const u32 &element) override
-		{
-			Indices->push_back(element);
-		}
-
-		u32 operator [](u32 index) const override
-		{
-			return (*Indices)[index];
-		}
-
-		u32 getLast() override
-		{
-			return Indices->getLast();
-		}
-
-		void setValue(u32 index, u32 value) override
-		{
-			Indices->setValue(index, value);
-		}
-
-		void set_used(u32 usedNow) override
-		{
-			Indices->set_used(usedNow);
-		}
-
-		void reallocate(u32 new_size) override
-		{
-			Indices->reallocate(new_size);
-		}
-
-		u32 allocated_size() const override
-		{
-			return Indices->allocated_size();
-		}
-
-		void* pointer() override
-		{
-			return Indices->pointer();
-		}
-
-		//! get the current hardware mapping hint
-		E_HARDWARE_MAPPING getHardwareMappingHint() const override
-		{
-			return MappingHint;
-		}
-
-		//! set the hardware mapping hint, for driver
-		void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) override
-		{
-			MappingHint=NewMappingHint;
-		}
-
-		//! flags the mesh as changed, reloads hardware buffers
-		void setDirty() override
-		{
-			++ChangedID;
-		}
-
-		//! Get the currently used ID for identification of changes.
-		/** This shouldn't be used for anything outside the VideoDriver. */
-		u32 getChangedID() const 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"
@@ -18,18 +17,14 @@ namespace scene
 {
 public:
 	//! Default constructor for empty meshbuffer
-		CMeshBuffer()
-			: ChangedID_Vertex(1), ChangedID_Index(1)
-			, MappingHint_Vertex(EHM_NEVER), MappingHint_Index(EHM_NEVER)
-			, HWBuffer(NULL)
-			, PrimitiveType(EPT_TRIANGLES)
+	CMeshBuffer() :
+			ChangedID_Vertex(1), ChangedID_Index(1), MappingHint_Vertex(EHM_NEVER), MappingHint_Index(EHM_NEVER), HWBuffer(NULL), PrimitiveType(EPT_TRIANGLES)
 	{
 #ifdef _DEBUG
 		setDebugName("CMeshBuffer");
 #endif
 	}
 
-
 	//! Get material of this meshbuffer
 	/** \return Material of this buffer */
 	const video::SMaterial &getMaterial() const override
@@ -37,7 +32,6 @@ namespace scene
 		return Material;
 	}
 
-
 	//! Get material of this meshbuffer
 	/** \return Material of this buffer */
 	video::SMaterial &getMaterial() override
@@ -45,7 +39,6 @@ namespace scene
 		return Material;
 	}
 
-
 	//! Get pointer to vertices
 	/** \return Pointer to vertices. */
 	const void *getVertices() const override
@@ -53,7 +46,6 @@ namespace scene
 		return Vertices.const_pointer();
 	}
 
-
 	//! Get pointer to vertices
 	/** \return Pointer to vertices. */
 	void *getVertices() override
@@ -61,7 +53,6 @@ namespace scene
 		return Vertices.pointer();
 	}
 
-
 	//! Get number of vertices
 	/** \return Number of vertices. */
 	u32 getVertexCount() const override
@@ -83,7 +74,6 @@ namespace scene
 		return Indices.const_pointer();
 	}
 
-
 	//! Get pointer to indices
 	/** \return Pointer to indices. */
 	u16 *getIndices() override
@@ -91,7 +81,6 @@ namespace scene
 		return Indices.pointer();
 	}
 
-
 	//! Get number of indices
 	/** \return Number of indices. */
 	u32 getIndexCount() const override
@@ -99,7 +88,6 @@ namespace scene
 		return Indices.size();
 	}
 
-
 	//! Get the axis aligned bounding box
 	/** \return Axis aligned bounding box of this buffer. */
 	const core::aabbox3d<f32> &getBoundingBox() const override
@@ -107,7 +95,6 @@ namespace scene
 		return BoundingBox;
 	}
 
-
 	//! Set the axis aligned bounding box
 	/** \param box New axis aligned bounding box for this buffer. */
 	//! set user axis aligned bounding box
@@ -116,24 +103,19 @@ namespace scene
 		BoundingBox = box;
 	}
 
-
 	//! Recalculate the bounding box.
 	/** should be called if the mesh changed. */
 	void recalculateBoundingBox() override
 	{
-			if (!Vertices.empty())
-			{
+		if (!Vertices.empty()) {
 			BoundingBox.reset(Vertices[0].Pos);
 			const irr::u32 vsize = Vertices.size();
 			for (u32 i = 1; i < vsize; ++i)
 				BoundingBox.addInternalPoint(Vertices[i].Pos);
-			}
-			else
+		} else
 			BoundingBox.reset(0, 0, 0);
-
 	}
 
-
 	//! Get type of vertex data stored in this buffer.
 	/** \return Type of vertex data. */
 	video::E_VERTEX_TYPE getVertexType() const override
@@ -177,7 +159,6 @@ namespace scene
 		return Vertices[i].TCoords;
 	}
 
-
 	//! Append the vertices and indices to the current buffer
 	/** Only works for compatible types, i.e. either the same type
 	or the main buffer is of standard type. Otherwise, behavior is
@@ -192,51 +173,17 @@ namespace scene
 		u32 i;
 
 		Vertices.reallocate(vertexCount + numVertices);
-			for (i=0; i<numVertices; ++i)
-			{
+		for (i = 0; i < numVertices; ++i) {
 			Vertices.push_back(static_cast<const T *>(vertices)[i]);
 			BoundingBox.addInternalPoint(static_cast<const T *>(vertices)[i].Pos);
 		}
 
 		Indices.reallocate(getIndexCount() + numIndices);
-			for (i=0; i<numIndices; ++i)
-			{
+		for (i = 0; i < numIndices; ++i) {
 			Indices.push_back(indices[i] + vertexCount);
 		}
 	}
 
-
-		//! 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.
-		*/
-		void append(const IMeshBuffer* const other) 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
 	E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const override
 	{
@@ -287,15 +234,16 @@ namespace scene
 	/** This shouldn't be used for anything outside the VideoDriver. */
 	u32 getChangedID_Index() const override { return ChangedID_Index; }
 
-		void setHWBuffer(void *ptr) const override {
+	void setHWBuffer(void *ptr) const override
+	{
 		HWBuffer = ptr;
 	}
 
-		void *getHWBuffer() const override {
+	void *getHWBuffer() const override
+	{
 		return HWBuffer;
 	}
 
-
 	u32 ChangedID_Vertex;
 	u32 ChangedID_Index;
 
@@ -324,7 +272,3 @@ namespace scene
 typedef CMeshBuffer<video::S3DVertexTangents> SMeshBufferTangents;
 } // end namespace scene
 } // end namespace irr
-
-#endif
-
-

include/CVertexBuffer.h

@@ -1,213 +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;
-
-			u32 stride() const override {return sizeof(T);}
-
-			u32 size() const override {return Vertices.size();}
-
-			void push_back (const video::S3DVertex &element) override
-			{Vertices.push_back((T&)element);}
-
-			video::S3DVertex& operator [](const u32 index) const override
-			{return (video::S3DVertex&)Vertices[index];}
-
-			video::S3DVertex& getLast() override
-			{return (video::S3DVertex&)Vertices.getLast();}
-
-			void set_used(u32 usedNow) override
-			{Vertices.set_used(usedNow);}
-
-			void reallocate(u32 new_size) override
-			{Vertices.reallocate(new_size);}
-
-			u32 allocated_size() const override
-			{
-				return Vertices.allocated_size();
-			}
-
-			video::S3DVertex* pointer() override {return Vertices.pointer();}
-
-			video::E_VERTEX_TYPE getType() const override {return T::getType();}
-		};
-
-	public:
-		IVertexList *Vertices;
-
-		CVertexBuffer(video::E_VERTEX_TYPE vertexType) : Vertices(0),
-				MappingHint(EHM_NEVER), ChangedID(1)
-		{
-			CVertexBuffer::setType(vertexType);
-		}
-
-		CVertexBuffer(const IVertexBuffer &VertexBufferCopy) :
-				Vertices(0), MappingHint(EHM_NEVER),
-				ChangedID(1)
-		{
-			CVertexBuffer::setType(VertexBufferCopy.getType());
-			CVertexBuffer::reallocate(VertexBufferCopy.size());
-
-			for (u32 n=0;n<VertexBufferCopy.size();++n)
-				CVertexBuffer::push_back(VertexBufferCopy[n]);
-		}
-
-		virtual ~CVertexBuffer()
-		{
-			delete Vertices;
-		}
-
-
-		void setType(video::E_VERTEX_TYPE vertexType) override
-		{
-			if ( Vertices && Vertices->getType() == vertexType )
-				return;
-
-			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;
-		}
-
-		void* getData() override {return Vertices->pointer();}
-
-		video::E_VERTEX_TYPE getType() const override {return Vertices->getType();}
-
-		u32 stride() const override {return Vertices->stride();}
-
-		u32 size() const override
-		{
-			return Vertices->size();
-		}
-
-		void push_back (const video::S3DVertex &element) override
-		{
-			Vertices->push_back(element);
-		}
-
-		video::S3DVertex& operator [](const u32 index) const override
-		{
-			return (*Vertices)[index];
-		}
-
-		video::S3DVertex& getLast() override
-		{
-			return Vertices->getLast();
-		}
-
-		void set_used(u32 usedNow) override
-		{
-			Vertices->set_used(usedNow);
-		}
-
-		void reallocate(u32 new_size) override
-		{
-			Vertices->reallocate(new_size);
-		}
-
-		u32 allocated_size() const override
-		{
-			return Vertices->allocated_size();
-		}
-
-		video::S3DVertex* pointer() override
-		{
-			return Vertices->pointer();
-		}
-
-		//! get the current hardware mapping hint
-		E_HARDWARE_MAPPING getHardwareMappingHint() const override
-		{
-			return MappingHint;
-		}
-
-		//! set the hardware mapping hint, for driver
-		void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) override
-		{
-			MappingHint=NewMappingHint;
-		}
-
-		//! flags the mesh as changed, reloads hardware buffers
-		void setDirty() override
-		{
-			++ChangedID;
-		}
-
-		//! Get the currently used ID for identification of changes.
-		/** This shouldn't be used for anything outside the VideoDriver. */
-		u32 getChangedID() const 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"
 
@@ -23,19 +22,14 @@ namespace scene
 };
 
 //! Names for culling type
-	const c8* const AutomaticCullingNames[] =
-	{
+const c8 *const AutomaticCullingNames[] = {
 		"false",
 		"box",            // camera box against node box
 		"frustum_box",    // camera frustum against node box
 		"frustum_sphere", // camera frustum against node sphere
 		"occ_query",      // occlusion query
-		0
+		0,
 	};
 
 } // 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,
 
@@ -41,10 +37,5 @@ namespace scene
 	EDS_FULL = 0xffffffff
 };
 
-
 } // 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
 {
@@ -45,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,13 +19,6 @@ namespace video
 	render and display any graphics. */
 	EDT_NULL,
 
-		// obsolete constants to make some code happy
-		// TODO delete
-		EDT_SOFTWARE,
-		EDT_BURNINGSVIDEO,
-		DEPRECATED_EDT_DIRECT3D8_NO_LONGER_EXISTS,
-		EDT_DIRECT3D9,
-
 	//! OpenGL device, available on most platforms.
 	/** Performs hardware accelerated rendering of 3D and 2D
 	primitives. */
@@ -50,6 +42,3 @@ namespace video
 
 } // 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"
 
@@ -24,16 +23,13 @@ enum EGUI_ALIGNMENT
 };
 
 //! Names for alignments
-const c8* const GUIAlignmentNames[] =
-{
+const c8 *const GUIAlignmentNames[] = {
 		"upperLeft",
 		"lowerRight",
 		"center",
 		"scale",
-	0
+		0,
 	};
 
 } // 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"
 
@@ -100,8 +99,7 @@ enum EGUI_ELEMENT_TYPE
 };
 
 //! Names for built-in element types
-const c8* const GUIElementTypeNames[] =
-{
+const c8 *const GUIElementTypeNames[] = {
 		"button",
 		"checkBox",
 		"comboBox",
@@ -128,14 +126,8 @@ const c8* const GUIElementTypeNames[] =
 		"element",
 		"root",
 		"profiler",
-	0
+		0,
 	};
 
 } // 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,12 +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,
-
 	//! BlendFunc = source * sourceFactor + dest * destFactor ( E_BLEND_FUNC )
 	/** Using only first texture. Generic blending method.
 	The blend function is set to SMaterial::MaterialTypeParam with
@@ -132,32 +58,17 @@ namespace video
 };
 
 //! Array holding the built in material type names
-	const char* const sBuiltInMaterialTypeNames[] =
-	{
+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",
 		"onetexture_blend",
-		0
+		0,
 	};
 
+constexpr u32 numBuiltInMaterials =
+		sizeof(sBuiltInMaterialTypeNames) / sizeof(char *) - 1;
+
 } // end namespace video
 } // end namespace irr
-
-
-#endif // __E_MATERIAL_TYPES_H_INCLUDED__
-

include/EMeshWriterEnums.h

@@ -1,65 +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_MESH_WRITER_ENUMS_H_INCLUDED__
-#define __E_MESH_WRITER_ENUMS_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace scene
-{
-
-	//! An enumeration for all supported types of built-in mesh writers
-	/** A scene mesh writers is represented by a four character code
-	such as 'irrm' or 'coll' instead of simple numbers, to avoid
-	name clashes with external mesh writers.*/
-	enum EMESH_WRITER_TYPE
-	{
-		//! Irrlicht native mesh writer, for static .irrmesh files.
-		EMWT_IRR_MESH     = MAKE_IRR_ID('i','r','r','m'),
-
-		//! COLLADA mesh writer for .dae and .xml files
-		EMWT_COLLADA      = MAKE_IRR_ID('c','o','l','l'),
-
-		//! STL mesh writer for .stl files
-		EMWT_STL          = MAKE_IRR_ID('s','t','l',0),
-
-		//! OBJ mesh writer for .obj files
-		EMWT_OBJ          = MAKE_IRR_ID('o','b','j',0),
-
-		//! PLY mesh writer for .ply files
-		EMWT_PLY          = MAKE_IRR_ID('p','l','y',0),
-		
-		//! B3D mesh writer, for static .b3d files
-		EMWT_B3D          = MAKE_IRR_ID('b', '3', 'd', 0)
-	};
-
-
-	//! flags configuring mesh writing
-	enum E_MESH_WRITER_FLAGS
-	{
-		//! no writer flags
-		EMWF_NONE = 0,
-
-		//! write lightmap textures out if possible
-		//! Currently not used by any Irrlicht mesh-writer
-		// (Note: User meshwriters can still use it)
-		EMWF_WRITE_LIGHTMAPS = 0x1,
-
-		//! write in a way that consumes less disk space
-		// (Note: Mainly there for user meshwriters)
-		EMWF_WRITE_COMPRESSED = 0x2,
-
-		//! write in binary format rather than text
-		EMWF_WRITE_BINARY = 0x4
-	};
-
-} // end namespace scene
-} // end namespace irr
-
-
-#endif // __E_MESH_WRITER_ENUMS_H_INCLUDED__
-

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"
 
@@ -46,11 +45,5 @@ namespace scene
 	ESNT_ANY = MAKE_IRR_ID('a', 'n', 'y', '_')
 };
 
-
-
 } // 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"
 
@@ -82,9 +81,5 @@ const c8* const GEOMETRY_SHADER_TYPE_NAMES[] = {
 		"gs_4_0",
 		0};
 
-
 } // end namespace video
 } // end namespace irr
-
-#endif // __E_SHADER_TYPES_H_INCLUDED__
-

include/EVertexAttributes.h

@@ -1,5 +1,4 @@
-#ifndef __E_VERTEX_ATTRIBUTES_H_INCLUDED__
-#define __E_VERTEX_ATTRIBUTES_H_INCLUDED__
+#pragma once
 
 namespace irr
 {
@@ -20,8 +19,7 @@ enum E_VERTEX_ATTRIBUTES
 };
 
 //! Array holding the built in vertex attribute names
-const char* const sBuiltInVertexAttributeNames[] =
-{
+const char *const sBuiltInVertexAttributeNames[] = {
 		"inVertexPosition",
 		"inVertexNormal",
 		"inVertexColor",
@@ -29,10 +27,8 @@ const char* const sBuiltInVertexAttributeNames[] =
 		"inTexCoord1",
 		"inVertexTangent",
 		"inVertexBinormal",
-	0
+		0,
 	};
 
 } // 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"
@@ -20,7 +19,6 @@ namespace scene
 class IAnimatedMesh : public IMesh
 {
 public:
-
 	//! Gets the frame count of the animated mesh.
 	/** Note that the play-time is usually getFrameCount()-1 as it stops as soon as the last frame-key is reached.
 	\return The amount of frames. If the amount is 1,
@@ -69,6 +67,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"
@@ -25,7 +24,6 @@ namespace scene
 	EJUOR_CONTROL
 };
 
-
 class IAnimatedMeshSceneNode;
 
 //! Callback interface for catching events of ended animations.
@@ -36,7 +34,6 @@ namespace scene
 class IAnimationEndCallBack : public virtual IReferenceCounted
 {
 public:
-
 	//! Will be called when the animation playback has ended.
 	/** See IAnimatedMeshSceneNode::setAnimationEndCallback for
 	more information.
@@ -48,13 +45,12 @@ namespace scene
 class IAnimatedMeshSceneNode : public ISceneNode
 {
 public:
-
 	//! Constructor
 	IAnimatedMeshSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
 			const core::vector3df &position = core::vector3df(0, 0, 0),
 			const core::vector3df &rotation = core::vector3df(0, 0, 0),
-			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f))
-			: ISceneNode(parent, mgr, id, position, rotation, scale) {}
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f)) :
+			ISceneNode(parent, mgr, id, position, rotation, scale) {}
 
 	//! Destructor
 	virtual ~IAnimatedMeshSceneNode() {}
@@ -167,11 +163,7 @@ namespace scene
 	\param newManager An optional new scene manager.
 	\return The newly created clone of this node. */
 	virtual ISceneNode *clone(ISceneNode *newParent = 0, ISceneManager *newManager = 0) = 0;
-
 };
 
 } // end namespace scene
 } // 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
 {
@@ -39,7 +23,6 @@ namespace io
 class IAttributes : public virtual IReferenceCounted
 {
 public:
-
 	//! Returns amount of attributes in this collection of attributes.
 	virtual u32 getAttributeCount() const = 0;
 
@@ -55,16 +38,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;
 
@@ -74,7 +47,6 @@ public:
 	//! Removes all attributes
 	virtual void clear() = 0;
 
-
 	/*
 
 		Integer Attribute
@@ -125,7 +97,6 @@ public:
 	//! Sets an attribute as float value
 	virtual void setAttribute(s32 index, f32 value) = 0;
 
-
 	/*
 		Bool Attribute
 	*/
@@ -148,10 +119,7 @@ public:
 
 	//! Sets an attribute as boolean value
 	virtual void setAttribute(s32 index, bool value) = 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"
 
@@ -22,11 +21,10 @@ lensflares, particles and things like that.
 class IBillboardSceneNode : public ISceneNode
 {
 public:
-
 	//! Constructor
 	IBillboardSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
-		const core::vector3df& position = core::vector3df(0,0,0))
-		: ISceneNode(parent, mgr, id, position) {}
+			const core::vector3df &position = core::vector3df(0, 0, 0)) :
+			ISceneNode(parent, mgr, id, position) {}
 
 	//! Sets the size of the billboard, making it rectangular.
 	virtual void setSize(const core::dimension2d<f32> &size) = 0;
@@ -90,7 +88,3 @@ public:
 
 } // 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"
 
@@ -41,28 +40,21 @@ namespace scene
 };
 
 //! Names for bone animation modes
-	const c8* const BoneAnimationModeNames[] =
-	{
+const c8 *const BoneAnimationModeNames[] = {
 		"automatic",
 		"animated",
 		"unanimated",
 		0,
 	};
 
-
 //! Interface for bones used for skeletal animation.
 /** Used with ISkinnedMesh and IAnimatedMeshSceneNode. */
 class IBoneSceneNode : public ISceneNode
 {
 public:
-
 	IBoneSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id = -1) :
 			ISceneNode(parent, mgr, id), positionHint(-1), scaleHint(-1), rotationHint(-1) {}
 
-		//! 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;
 
@@ -100,9 +92,5 @@ namespace scene
 	s32 rotationHint;
 };
 
-
 } // 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"
@@ -23,13 +22,13 @@ namespace scene
 class ICameraSceneNode : public ISceneNode, public IEventReceiver
 {
 public:
-
 	//! Constructor
 	ICameraSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
 			const core::vector3df &position = core::vector3df(0, 0, 0),
 			const core::vector3df &rotation = core::vector3df(0, 0, 0),
-			const core::vector3df& scale = core::vector3df(1.0f,1.0f,1.0f))
-			: ISceneNode(parent, mgr, id, position, rotation, scale), IsOrthogonal(false) {}
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f)) :
+			ISceneNode(parent, mgr, id, position, rotation, scale),
+			IsOrthogonal(false) {}
 
 	//! Sets the projection matrix of the camera.
 	/** The core::matrix4 class has some methods to build a
@@ -173,7 +172,6 @@ namespace scene
 	virtual bool getTargetAndRotationBinding(void) const = 0;
 
 protected:
-
 	void cloneMembers(const ICameraSceneNode *toCopyFrom)
 	{
 		IsOrthogonal = toCopyFrom->IsOrthogonal;
@@ -184,6 +182,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"
@@ -58,6 +57,3 @@ namespace video
 
 } // end 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
@@ -42,8 +41,7 @@ namespace gui
 };
 
 //! Names for ECURSOR_ICON
-	const c8* const GUICursorIconNames[ECI_COUNT+1] =
-	{
+const c8 *const GUICursorIconNames[ECI_COUNT + 1] = {
 		"normal",
 		"cross",
 		"hand",
@@ -57,19 +55,19 @@ namespace gui
 		"sizens",
 		"sizewe",
 		"sizeup",
-		0
+		0,
 	};
 
 //! structure used to set sprites as cursors.
 struct SCursorSprite
 {
-		SCursorSprite()
-		: SpriteBank(0), SpriteId(-1)
+	SCursorSprite() :
+			SpriteBank(0), SpriteId(-1)
 	{
 	}
 
-		SCursorSprite( gui::IGUISpriteBank * spriteBank, s32 spriteId, const core::position2d<s32> &hotspot=(core::position2d<s32>(0,0)) )
-		: SpriteBank(spriteBank), SpriteId(spriteId), HotSpot(hotspot)
+	SCursorSprite(gui::IGUISpriteBank *spriteBank, s32 spriteId, const core::position2d<s32> &hotspot = (core::position2d<s32>(0, 0))) :
+			SpriteBank(spriteBank), SpriteId(spriteId), HotSpot(hotspot)
 	{
 	}
 
@@ -97,7 +95,6 @@ namespace gui
 class ICursorControl : public virtual IReferenceCounted
 {
 public:
-
 	//! Changes the visible state of the mouse cursor.
 	/** \param visible: The new visible state. If true, the cursor will be visible,
 	if false, it will be invisible. */
@@ -194,9 +191,5 @@ namespace gui
 	virtual ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const { return ECPB_NONE; }
 };
 
-
 } // 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"
 
@@ -23,10 +22,9 @@ joint scene nodes when playing skeletal animations.
 class IDummyTransformationSceneNode : public ISceneNode
 {
 public:
-
 	//! Constructor
-	IDummyTransformationSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id)
-		: ISceneNode(parent, mgr, id) {}
+	IDummyTransformationSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id) :
+			ISceneNode(parent, mgr, id) {}
 
 	//! Returns a reference to the current relative transformation matrix.
 	/** This is the matrix, this scene node uses instead of scale, translation
@@ -36,7 +34,3 @@ public:
 
 } // 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,
@@ -305,7 +308,6 @@ namespace irr
 };
 } // end namespace gui
 
-
 //! SEvents hold information about an event. See irr::IEventReceiver for details on event handling.
 struct SEvent
 {
@@ -320,7 +322,6 @@ struct SEvent
 
 		//! Type of GUI Event
 		gui::EGUI_EVENT_TYPE EventType;
-
 	};
 
 	//! Any kind of mouse event.
@@ -569,7 +570,6 @@ struct SEvent
 		struct SSystemEvent SystemEvent;
 		struct SApplicationEvent ApplicationEvent;
 	};
-
 };
 
 //! Interface of an object which can receive events.
@@ -581,7 +581,6 @@ path it takes through the system. */
 class IEventReceiver
 {
 public:
-
 	//! Destructor
 	virtual ~IEventReceiver() {}
 
@@ -594,7 +593,6 @@ public:
 	virtual bool OnEvent(const SEvent &event) = 0;
 };
 
-
 //! Information on a joystick, returned from @ref irr::IrrlichtDevice::activateJoysticks()
 struct SJoystickInfo
 {
@@ -631,8 +629,4 @@ struct SJoystickInfo
 	} PovHat;
 }; // 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"
@@ -30,21 +29,6 @@ enum E_FILE_ARCHIVE_TYPE
 	//! A gzip archive
 	EFAT_GZIP = MAKE_IRR_ID('g', 'z', 'i', 'p'),
 
-	//! A virtual directory
-	EFAT_FOLDER  = MAKE_IRR_ID('f','l','d','r'),
-
-	//! An ID Software PAK archive
-	EFAT_PAK     = MAKE_IRR_ID('P','A','K', 0),
-
-	//! A Nebula Device archive
-	EFAT_NPK     = MAKE_IRR_ID('N','P','K', 0),
-
-	//! A Tape ARchive
-	EFAT_TAR     = MAKE_IRR_ID('T','A','R', 0),
-
-	//! A wad Archive, Quake2, Halflife
-	EFAT_WAD     = MAKE_IRR_ID('W','A','D', 0),
-
 	//! An Android asset file archive
 	EFAT_ANDROID_ASSET = MAKE_IRR_ID('A', 'S', 'S', 'E'),
 
@@ -56,7 +40,6 @@ enum E_FILE_ARCHIVE_TYPE
 class IFileArchive : public virtual IReferenceCounted
 {
 public:
-
 	//! Opens a file based on its name
 	/** Creates and returns a new IReadFile for a file in the archive.
 	\param filename The file to open
@@ -140,9 +123,5 @@ public:
 	virtual IFileArchive *createArchive(io::IReadFile *file, bool ignoreCase, bool ignorePaths) const = 0;
 };
 
-
 } // 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"
@@ -22,7 +21,6 @@ class IWriteFile;
 class IFileList;
 class IAttributes;
 
-
 //! The FileSystem manages files and archives and provides access to them.
 /** It manages where files are, so that modules which use the the IO do not
 need to know where every file is located. A file could be in a .zip-Archive or
@@ -30,7 +28,6 @@ as file on disk, using the IFileSystem makes no difference to this. */
 class IFileSystem : public virtual IReferenceCounted
 {
 public:
-
 	//! Opens a file for read access.
 	/** \param filename: Name of file to open.
 	\return Pointer to the created file interface.
@@ -78,7 +75,6 @@ public:
 	*/
 	virtual IWriteFile *createMemoryWriteFile(void *memory, s32 len, const path &fileName, bool deleteMemoryWhenDropped = false) = 0;
 
-
 	//! Opens a file for write access.
 	/** \param filename: Name of file to open.
 	\param append: If the file already exist, all write operations are
@@ -210,58 +206,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;
@@ -317,9 +261,5 @@ public:
 	virtual bool existFile(const path &filename) const = 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"
@@ -28,7 +27,6 @@ class IShaderConstantSetCallBack;
 class IGPUProgrammingServices
 {
 public:
-
 	//! Destructor
 	virtual ~IGPUProgrammingServices() {}
 
@@ -155,7 +153,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 +277,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 +355,15 @@ 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"
 
@@ -46,8 +45,7 @@ namespace gui
 };
 
 //! Names for gui button state icons
-	const c8* const GUIButtonStateNames[EGBS_COUNT+1] =
-	{
+const c8 *const GUIButtonStateNames[EGBS_COUNT + 1] = {
 		"buttonUp",
 		"buttonDown",
 		"buttonMouseOver",
@@ -55,7 +53,7 @@ namespace gui
 		"buttonFocused",
 		"buttonNotFocused",
 		"buttonDisabled",
-		0	// count
+		0, // count
 	};
 
 //! State of buttons used for drawing texture images.
@@ -88,8 +86,7 @@ namespace gui
 };
 
 //! Names for gui button image states
-	const c8* const GUIButtonImageStateNames[EGBIS_COUNT+1] =
-	{
+const c8 *const GUIButtonImageStateNames[EGBIS_COUNT + 1] = {
 		"Image", // not "ImageUp" as it otherwise breaks serialization of old files
 		"ImageUpOver",
 		"ImageUpFocused",
@@ -99,7 +96,7 @@ namespace gui
 		"ImageDownFocused",
 		"ImageDownFocusedOver",
 		"ImageDisabled",
-		0	// count
+		0, // count
 	};
 
 //! GUI Button interface.
@@ -109,10 +106,9 @@ namespace gui
 class IGUIButton : public IGUIElement
 {
 public:
-
 	//! constructor
-		IGUIButton(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_BUTTON, environment, parent, id, rectangle) {}
+	IGUIButton(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_BUTTON, environment, parent, id, rectangle) {}
 
 	//! Sets another skin independent font.
 	/** If this is set to zero, the button uses the font of the skin.
@@ -188,7 +184,6 @@ namespace gui
 	\param sourceRect: Position in the texture, where the image is located */
 	virtual void setPressedImage(video::ITexture *image, const core::rect<s32> &sourceRect) = 0;
 
-
 	//! Sets the sprite bank used by the button
 	/** NOTE: The spritebank itself is _not_ serialized so far. The sprites are serialized.
 	Which means after loading the gui you still have to set the spritebank manually. */
@@ -260,9 +255,5 @@ namespace gui
 	virtual bool getClickControlState() const = 0;
 };
 
-
 } // 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"
 
@@ -19,10 +18,9 @@ namespace gui
 class IGUICheckBox : public IGUIElement
 {
 public:
-
 	//! constructor
-		IGUICheckBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_CHECK_BOX, environment, parent, id, rectangle) {}
+	IGUICheckBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_CHECK_BOX, environment, parent, id, rectangle) {}
 
 	//! Set if box is checked.
 	virtual void setChecked(bool checked) = 0;
@@ -43,11 +41,7 @@ namespace gui
 	//! Checks if border drawing is enabled
 	/** \return true if border drawing is enabled, false otherwise */
 	virtual bool isDrawBorderEnabled() const = 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"
 
@@ -19,10 +18,9 @@ namespace gui
 class IGUIComboBox : public IGUIElement
 {
 public:
-
 	//! constructor
-		IGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_COMBO_BOX, environment, parent, id, rectangle) {}
+	IGUIComboBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_COMBO_BOX, environment, parent, id, rectangle) {}
 
 	//! Returns amount of items in box
 	virtual u32 getItemCount() const = 0;
@@ -52,6 +50,10 @@ 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_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
@@ -66,9 +68,5 @@ namespace gui
 	virtual u32 getMaxSelectionRows() const = 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"
@@ -23,10 +22,9 @@ namespace gui
 class IGUIEditBox : public IGUIElement
 {
 public:
-
 	//! constructor
-		IGUIEditBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_EDIT_BOX, environment, parent, id, rectangle) {}
+	IGUIEditBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_EDIT_BOX, environment, parent, id, rectangle) {}
 
 	//! Sets another skin independent font.
 	/** If this is set to zero, the button uses the font of the skin.
@@ -149,9 +147,5 @@ namespace gui
 	virtual irr::u32 getCursorBlinkTime() const = 0;
 };
 
-
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIElement.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_ELEMENT_H_INCLUDED__
-#define __I_GUI_ELEMENT_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "rect.h"
@@ -26,11 +25,11 @@ namespace gui
 class IGUIElement : virtual public IReferenceCounted, public IEventReceiver
 {
 public:
-
 	//! Constructor
 	IGUIElement(EGUI_ELEMENT_TYPE type, IGUIEnvironment *environment, IGUIElement *parent,
-		s32 id, const core::rect<s32>& rectangle)
-		: Parent(0), RelativeRect(rectangle), AbsoluteRect(rectangle),
+			s32 id, const core::rect<s32> &rectangle) :
+			Parent(0),
+			RelativeRect(rectangle), AbsoluteRect(rectangle),
 			AbsoluteClippingRect(rectangle), DesiredRect(rectangle),
 			MaxSize(0, 0), MinSize(1, 1), IsVisible(true), IsEnabled(true),
 			IsSubElement(false), NoClip(false), ID(id), IsTabStop(false), TabOrder(-1), IsTabGroup(false),
@@ -42,14 +41,12 @@ public:
 #endif
 
 		// if we were given a parent to attach to
-		if (parent)
-		{
+		if (parent) {
 			parent->addChildToEnd(this);
 			recalculateAbsolutePosition(true);
 		}
 	}
 
-
 	//! Destructor
 	virtual ~IGUIElement()
 	{
@@ -59,7 +56,6 @@ public:
 		}
 	}
 
-
 	//! Returns parent of this element.
 	IGUIElement *getParent() const
 	{
@@ -72,13 +68,11 @@ public:
 		return RelativeRect;
 	}
 
-
 	//! Sets the relative rectangle of this element.
 	/** \param r The absolute position to set */
 	void setRelativePosition(const core::rect<s32> &r)
 	{
-		if (Parent)
-		{
+		if (Parent) {
 			const core::rect<s32> &r2 = Parent->getAbsolutePosition();
 
 			core::dimension2df d((f32)(r2.getSize().Width), (f32)(r2.getSize().Height));
@@ -107,7 +101,6 @@ public:
 		setRelativePosition(rectangle);
 	}
 
-
 	//! Sets the relative rectangle of this element as a proportion of its parent's area.
 	/** \note This method used to be 'void setRelativePosition(const core::rect<f32>& r)'
 	\param r  The rectangle to set, interpreted as a proportion of the parent's area.
@@ -131,21 +124,18 @@ public:
 		updateAbsolutePosition();
 	}
 
-
 	//! Gets the absolute rectangle of this element
 	core::rect<s32> getAbsolutePosition() const
 	{
 		return AbsoluteRect;
 	}
 
-
 	//! Returns the visible area of the element.
 	core::rect<s32> getAbsoluteClippingRect() const
 	{
 		return AbsoluteClippingRect;
 	}
 
-
 	//! Sets whether the element will ignore its parent's clipping rectangle
 	/** \param noClip If true, the element will not be clipped by its parent's clipping rectangle. */
 	void setNotClipped(bool noClip)
@@ -154,7 +144,6 @@ public:
 		updateAbsolutePosition();
 	}
 
-
 	//! Gets whether the element will ignore its parent's clipping rectangle
 	/** \return true if the element is not clipped by its parent's clipping rectangle. */
 	bool isNotClipped() const
@@ -162,7 +151,6 @@ public:
 		return NoClip;
 	}
 
-
 	//! Sets the maximum size allowed for this element
 	/** If set to 0,0, there is no maximum size */
 	void setMaxSize(core::dimension2du size)
@@ -171,7 +159,6 @@ public:
 		updateAbsolutePosition();
 	}
 
-
 	//! Sets the minimum size allowed for this element
 	void setMinSize(core::dimension2du size)
 	{
@@ -183,7 +170,6 @@ public:
 		updateAbsolutePosition();
 	}
 
-
 	//! The alignment defines how the borders of this element will be positioned when the parent element is resized.
 	void setAlignment(EGUI_ALIGNMENT left, EGUI_ALIGNMENT right, EGUI_ALIGNMENT top, EGUI_ALIGNMENT bottom)
 	{
@@ -192,8 +178,7 @@ public:
 		AlignTop = top;
 		AlignBottom = bottom;
 
-		if (Parent)
-		{
+		if (Parent) {
 			core::rect<s32> r(Parent->getAbsolutePosition());
 
 			core::dimension2df d((f32)r.getSize().Width, (f32)r.getSize().Height);
@@ -239,13 +224,11 @@ public:
 		recalculateAbsolutePosition(false);
 
 		// update all children
-		for (auto child : Children)
-		{
+		for (auto child : Children) {
 			child->updateAbsolutePosition();
 		}
 	}
 
-
 	//! Returns the topmost GUI element at the specific position.
 	/**
 	This will check this GUI element and all of its descendants, so it
@@ -262,14 +245,12 @@ public:
 	{
 		IGUIElement *target = 0;
 
-		if (isVisible())
-		{
+		if (isVisible()) {
 			// 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)
-			{
+			while (it != ie) {
 				target = (*it)->getElementFromPoint(point);
 				if (target)
 					return target;
@@ -284,7 +265,6 @@ public:
 		return target;
 	}
 
-
 	//! Returns true if a point is within this element.
 	/** Elements with a shape other than a rectangle should override this method */
 	virtual bool isPointInside(const core::position2d<s32> &point) const
@@ -292,12 +272,10 @@ public:
 		return AbsoluteClippingRect.isPointInside(point);
 	}
 
-
 	//! Adds a GUI element as new child of this element.
 	virtual void addChild(IGUIElement *child)
 	{
-		if ( child && child != this )
-		{
+		if (child && child != this) {
 			addChildToEnd(child);
 			child->updateAbsolutePosition();
 		}
@@ -313,7 +291,8 @@ public:
 	}
 
 	//! Removes all children.
-	virtual void removeAllChildren() {
+	virtual void removeAllChildren()
+	{
 		while (!Children.empty()) {
 			auto child = Children.back();
 			child->remove();
@@ -327,36 +306,30 @@ public:
 			Parent->removeChild(this);
 	}
 
-
 	//! Draws the element and its children.
 	virtual void draw()
 	{
-		if ( isVisible() )
-		{
+		if (isVisible()) {
 			for (auto child : Children)
 				child->draw();
 		}
 	}
 
-
 	//! animate the element and its children.
 	virtual void OnPostRender(u32 timeMs)
 	{
-		if ( isVisible() )
-		{
+		if (isVisible()) {
 			for (auto child : Children)
 				child->OnPostRender(timeMs);
 		}
 	}
 
-
 	//! Moves this element.
 	virtual void move(core::position2d<s32> absoluteMovement)
 	{
 		setRelativePosition(DesiredRect + absoluteMovement);
 	}
 
-
 	//! Returns true if element is visible.
 	virtual bool isVisible() const
 	{
@@ -383,14 +356,12 @@ public:
 		IsVisible = visible;
 	}
 
-
 	//! Returns true if this element was created as part of its parent control
 	virtual bool isSubElement() const
 	{
 		return IsSubElement;
 	}
 
-
 	//! Sets whether this control was created as part of its parent.
 	/** For example, it is true when a scrollbar is part of a listbox.
 	SubElements are not saved to disk when calling guiEnvironment->saveGUI() */
@@ -399,7 +370,6 @@ public:
 		IsSubElement = subElement;
 	}
 
-
 	//! If set to true, the focus will visit this element when using the tab key to cycle through elements.
 	/** If this element is a tab group (see isTabGroup/setTabGroup) then
 	ctrl+tab will be used instead. */
@@ -408,51 +378,43 @@ public:
 		IsTabStop = enable;
 	}
 
-
 	//! Returns true if this element can be focused by navigating with the tab key
 	bool isTabStop() const
 	{
 		return IsTabStop;
 	}
 
-
 	//! Sets the priority of focus when using the tab key to navigate between a group of elements.
 	/** See setTabGroup, isTabGroup and getTabGroup for information on tab groups.
 	Elements with a lower number are focused first */
 	void setTabOrder(s32 index)
 	{
 		// negative = autonumber
-		if (index < 0)
-		{
+		if (index < 0) {
 			TabOrder = 0;
 			IGUIElement *el = getTabGroup();
 			while (IsTabGroup && el && el->Parent)
 				el = el->Parent;
 
 			IGUIElement *first = 0, *closest = 0;
-			if (el)
-			{
+			if (el) {
 				// find the highest element number
 				el->getNextElement(-1, true, IsTabGroup, first, closest, true, true);
-				if (first)
-				{
+				if (first) {
 					TabOrder = first->getTabOrder() + 1;
 				}
 			}
 
-		}
-		else
+		} else
 			TabOrder = index;
 	}
 
-
 	//! Returns the number in the tab order sequence
 	s32 getTabOrder() const
 	{
 		return TabOrder;
 	}
 
-
 	//! Sets whether this element is a container for a group of elements which can be navigated using the tab key.
 	/** For example, windows are tab groups.
 	Groups can be navigated using ctrl+tab, providing isTabStop is true. */
@@ -461,14 +423,12 @@ public:
 		IsTabGroup = isGroup;
 	}
 
-
 	//! Returns true if this element is a tab group.
 	bool isTabGroup() const
 	{
 		return IsTabGroup;
 	}
 
-
 	//! Returns the container element which holds all elements in this element's tab group.
 	IGUIElement *getTabGroup()
 	{
@@ -480,7 +440,6 @@ public:
 		return ret;
 	}
 
-
 	//! Returns true if element is enabled
 	/** Currently elements do _not_ care about parent-states.
 		So if you want to affect children you have to enable/disable them all.
@@ -494,63 +453,54 @@ public:
 		return IsEnabled;
 	}
 
-
 	//! Sets the enabled state of this element.
 	virtual void setEnabled(bool enabled)
 	{
 		IsEnabled = enabled;
 	}
 
-
 	//! Sets the new caption of this element.
 	virtual void setText(const wchar_t *text)
 	{
 		Text = text;
 	}
 
-
 	//! Returns caption of this element.
 	virtual const wchar_t *getText() const
 	{
 		return Text.c_str();
 	}
 
-
 	//! Sets the new caption of this element.
 	virtual void setToolTipText(const wchar_t *text)
 	{
 		ToolTipText = text;
 	}
 
-
 	//! Returns caption of this element.
 	virtual const core::stringw &getToolTipText() const
 	{
 		return ToolTipText;
 	}
 
-
 	//! Returns id. Can be used to identify the element.
 	virtual s32 getID() const
 	{
 		return ID;
 	}
 
-
 	//! Sets the id of this element
 	virtual void setID(s32 id)
 	{
 		ID = id;
 	}
 
-
 	//! Called if an event happened.
 	bool OnEvent(const SEvent &event) override
 	{
 		return Parent ? Parent->OnEvent(event) : false;
 	}
 
-
 	//! Brings a child to front
 	/** \return True if successful, false if not. */
 	virtual bool bringToFront(IGUIElement *child)
@@ -564,7 +514,6 @@ public:
 		return true;
 	}
 
-
 	//! Moves a child to the back, so it's siblings are drawn on top of it
 	/** \return True if successful, false if not. */
 	virtual bool sendToBack(IGUIElement *child)
@@ -584,7 +533,6 @@ public:
 		return Children;
 	}
 
-
 	//! Finds the first element with the given id.
 	/** \param id: Id to search for.
 	\param searchchildren: Set this to true, if also children of this
@@ -596,8 +544,7 @@ public:
 	{
 		IGUIElement *e = 0;
 
-		for (auto child : Children)
-		{
+		for (auto child : Children) {
 			if (child->getID() == id)
 				return child;
 
@@ -611,25 +558,21 @@ public:
 		return e;
 	}
 
-
 	//! returns true if the given element is a child of this one.
 	//! \param child: The child element to check
 	bool isMyChild(IGUIElement *child) const
 	{
 		if (!child)
 			return false;
-		do
-		{
+		do {
 			if (child->Parent)
 				child = child->Parent;
 
 		} while (child->Parent && child != this);
 
-
 		return child == this;
 	}
 
-
 	//! searches elements to find the closest next element to tab to
 	/** \param startOrder: The TabOrder of the current element, -1 if none
 	\param reverse: true if searching for a lower number
@@ -652,62 +595,46 @@ public:
 
 		s32 closestOrder, currentOrder;
 
-		while(it != Children.end())
-		{
+		while (it != Children.end()) {
 			// ignore invisible elements and their children
 			if (((*it)->isVisible() || includeInvisible) &&
-				(group == true || (*it)->isTabGroup() == false) )
-			{
+					(group == true || (*it)->isTabGroup() == false)) {
 				// ignore disabled, but children are checked (disabled is currently per element ignoring parent states)
-				if ( (*it)->isEnabled() || includeDisabled )
-				{
+				if ((*it)->isEnabled() || includeDisabled) {
 					// only check tab stops and those with the same group status
-					if ((*it)->isTabStop() && ((*it)->isTabGroup() == group))
-					{
+					if ((*it)->isTabStop() && ((*it)->isTabGroup() == group)) {
 						currentOrder = (*it)->getTabOrder();
 
 						// is this what we're looking for?
-						if (currentOrder == wanted)
-						{
+						if (currentOrder == wanted) {
 							closest = *it;
 							return true;
 						}
 
 						// is it closer than the current closest?
-						if (closest)
-						{
+						if (closest) {
 							closestOrder = closest->getTabOrder();
-							if ( ( reverse && currentOrder > closestOrder && currentOrder < startOrder)
-								||(!reverse && currentOrder < closestOrder && currentOrder > startOrder))
-							{
+							if ((reverse && currentOrder > closestOrder && currentOrder < startOrder) || (!reverse && currentOrder < closestOrder && currentOrder > startOrder)) {
 								closest = *it;
 							}
-						}
-						else
-						if ( (reverse && currentOrder < startOrder) || (!reverse && currentOrder > startOrder) )
-						{
+						} else if ((reverse && currentOrder < startOrder) || (!reverse && currentOrder > startOrder)) {
 							closest = *it;
 						}
 
 						// is it before the current first?
-						if (first)
-						{
+						if (first) {
 							closestOrder = first->getTabOrder();
 
-							if ( (reverse && closestOrder < currentOrder) || (!reverse && closestOrder > currentOrder) )
-							{
+							if ((reverse && closestOrder < currentOrder) || (!reverse && closestOrder > currentOrder)) {
 								first = *it;
 							}
-						}
-						else
-						{
+						} else {
 							first = *it;
 						}
 					}
 				}
 				// search within children
-				if ((*it)->getNextElement(startOrder, reverse, group, first, closest, includeInvisible, includeDisabled))
-				{
+				if ((*it)->getNextElement(startOrder, reverse, group, first, closest, includeInvisible, includeDisabled)) {
 					return true;
 				}
 			}
@@ -716,7 +643,6 @@ public:
 		return false;
 	}
 
-
 	//! Returns the type of the gui element.
 	/** This is needed for the .NET wrapper but will be used
 	later for serializing and deserializing.
@@ -741,7 +667,6 @@ public:
 		return type == Type;
 	}
 
-
 	//! Returns the type name of the gui element.
 	/** This is needed serializing elements. */
 	virtual const c8 *getTypeName() const
@@ -756,7 +681,6 @@ public:
 		return Name.c_str();
 	}
 
-
 	//! Sets the name of the element.
 	/** \param name New name of the gui element. */
 	virtual void setName(const c8 *name)
@@ -764,7 +688,6 @@ public:
 		Name = name;
 	}
 
-
 	//! Sets the name of the element.
 	/** \param name New name of the gui element. */
 	virtual void setName(const core::stringc &name)
@@ -772,20 +695,17 @@ public:
 		Name = name;
 	}
 
-
 	//! Returns whether the element takes input from the IME
 	virtual bool acceptsIME()
 	{
 		return false;
 	}
 
-
 protected:
 	// not virtual because needed in constructor
 	void addChildToEnd(IGUIElement *child)
 	{
-		if (child)
-		{
+		if (child) {
 			child->grab();   // prevent destruction when removed
 			child->remove(); // remove from old parent
 			child->LastParentRect = getAbsolutePosition();
@@ -796,7 +716,8 @@ protected:
 
 #ifndef NDEBUG
 	template <typename Iterator>
-	static size_t _fastSetChecksum(Iterator begin, Iterator end) {
+	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) {
@@ -814,8 +735,7 @@ protected:
 			const std::vector<IGUIElement *> &neworder)
 	{
 		assert(_fastSetChecksum(from, to) == _fastSetChecksum(neworder.begin(), neworder.end()));
-		for (auto e : neworder)
-		{
+		for (auto e : neworder) {
 			*from = e;
 			e->ParentPos = from;
 			++from;
@@ -823,7 +743,6 @@ protected:
 		assert(from == to);
 	}
 
-
 	// not virtual because needed in constructor
 	void recalculateAbsolutePosition(bool recursive)
 	{
@@ -831,18 +750,15 @@ protected:
 		core::rect<s32> parentAbsoluteClip;
 		f32 fw = 0.f, fh = 0.f;
 
-		if (Parent)
-		{
+		if (Parent) {
 			parentAbsolute = Parent->AbsoluteRect;
 
-			if (NoClip)
-			{
+			if (NoClip) {
 				IGUIElement *p = this;
 				while (p->Parent)
 					p = p->Parent;
 				parentAbsoluteClip = p->AbsoluteClippingRect;
-			}
-			else
+			} else
 				parentAbsoluteClip = Parent->AbsoluteClippingRect;
 		}
 
@@ -855,8 +771,7 @@ protected:
 		if (AlignTop == EGUIA_SCALE || AlignBottom == EGUIA_SCALE)
 			fh = (f32)parentAbsolute.getHeight();
 
-		switch (AlignLeft)
-		{
+		switch (AlignLeft) {
 		case EGUIA_UPPERLEFT:
 			break;
 		case EGUIA_LOWERRIGHT:
@@ -870,8 +785,7 @@ protected:
 			break;
 		}
 
-		switch (AlignRight)
-		{
+		switch (AlignRight) {
 		case EGUIA_UPPERLEFT:
 			break;
 		case EGUIA_LOWERRIGHT:
@@ -885,8 +799,7 @@ protected:
 			break;
 		}
 
-		switch (AlignTop)
-		{
+		switch (AlignTop) {
 		case EGUIA_UPPERLEFT:
 			break;
 		case EGUIA_LOWERRIGHT:
@@ -900,8 +813,7 @@ protected:
 			break;
 		}
 
-		switch (AlignBottom)
-		{
+		switch (AlignBottom) {
 		case EGUIA_UPPERLEFT:
 			break;
 		case EGUIA_LOWERRIGHT:
@@ -942,18 +854,15 @@ protected:
 
 		LastParentRect = parentAbsolute;
 
-		if ( recursive )
-		{
+		if (recursive) {
 			// update all children
-			for (auto child : Children)
-			{
+			for (auto child : Children) {
 				child->recalculateAbsolutePosition(recursive);
 			}
 		}
 	}
 
 protected:
-
 	//! List of all children of this element
 	std::list<IGUIElement *> Children;
 
@@ -1028,9 +937,5 @@ protected:
 	EGUI_ELEMENT_TYPE Type;
 };
 
-
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIEnvironment.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_ENVIRONMENT_H_INCLUDED__
-#define __I_GUI_ENVIRONMENT_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "IGUISkin.h"
@@ -59,7 +58,6 @@ class IGUIWindow;
 class IGUIEnvironment : public virtual IReferenceCounted
 {
 public:
-
 	//! Draws all gui elements by traversing the GUI environment starting at the root node.
 	/** \param  When true ensure the GuiEnvironment (aka the RootGUIElement) has the same size as the current driver screensize.
 				Can be set to false to control that size yourself, p.E when not the full size should be used for UI. */
@@ -153,7 +151,6 @@ public:
 	See IReferenceCounted::drop() for more information. */
 	virtual IGUISkin *createSkin(EGUI_SKIN_TYPE type) = 0;
 
-
 	//! Creates the image list from the given texture.
 	/** \param texture Texture to split into images
 	\param imageSize Dimension of each image
@@ -413,9 +410,5 @@ public:
 	virtual void addToDeletionQueue(IGUIElement *element) = 0;
 };
 
-
 } // 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"
@@ -24,10 +23,9 @@ namespace gui
 class IGUIFileOpenDialog : public IGUIElement
 {
 public:
-
 	//! constructor
-		IGUIFileOpenDialog(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_FILE_OPEN_DIALOG, environment, parent, id, rectangle) {}
+	IGUIFileOpenDialog(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_FILE_OPEN_DIALOG, environment, parent, id, rectangle) {}
 
 	//! Returns the filename of the selected file converted to wide characters. Returns NULL if no file was selected.
 	virtual const wchar_t *getFileName() const = 0;
@@ -42,9 +40,5 @@ namespace gui
 	virtual const wchar_t *getDirectoryNameW() const = 0;
 };
 
-
 } // 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"
@@ -39,7 +38,6 @@ enum EGUI_FONT_TYPE
 class IGUIFont : public virtual IReferenceCounted
 {
 public:
-
 	//! Draws some text and clips it to the specified rectangle if wanted.
 	/** \param text: Text to draw
 	\param position: Rectangle specifying position where to draw the text.
@@ -99,6 +97,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"
 
@@ -17,7 +16,6 @@ namespace gui
 class IGUIFontBitmap : public IGUIFont
 {
 public:
-
 	//! Returns the type of this font
 	EGUI_FONT_TYPE getType() const override { return EGFT_BITMAP; }
 
@@ -41,6 +39,3 @@ public:
 
 } // 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"
 
@@ -19,10 +18,9 @@ namespace gui
 class IGUIImage : public IGUIElement
 {
 public:
-
 	//! constructor
-		IGUIImage(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_IMAGE, environment, parent, id, rectangle) {}
+	IGUIImage(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_IMAGE, environment, parent, id, rectangle) {}
 
 	//! Sets an image texture
 	virtual void setImage(video::ITexture *image) = 0;
@@ -80,8 +78,5 @@ namespace gui
 	virtual bool isDrawBackgroundEnabled() const = 0;
 };
 
-
 } // 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"
@@ -17,7 +16,6 @@ namespace gui
 class IGUIImageList : public virtual IReferenceCounted
 {
 public:
-
 	//! Destructor
 	virtual ~IGUIImageList(){};
 
@@ -40,6 +38,3 @@ public:
 
 } // 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"
@@ -30,7 +29,6 @@ namespace gui
 	EGUI_LBC_COUNT
 };
 
-
 //! Default list box GUI element.
 /** \par This element can create the following events of type EGUI_EVENT_TYPE:
 \li EGET_LISTBOX_CHANGED
@@ -40,8 +38,8 @@ namespace gui
 {
 public:
 	//! constructor
-		IGUIListBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_LIST_BOX, environment, parent, id, rectangle) {}
+	IGUIListBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_LIST_BOX, environment, parent, id, rectangle) {}
 
 	//! returns amount of list items
 	virtual u32 getItemCount() const = 0;
@@ -134,9 +132,5 @@ namespace gui
 	virtual IGUIScrollBar *getVerticalScrollBar() const = 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"
 
@@ -19,10 +18,9 @@ namespace gui
 class IGUIScrollBar : public IGUIElement
 {
 public:
-
 	//! constructor
-		IGUIScrollBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_SCROLL_BAR, environment, parent, id, rectangle) {}
+	IGUIScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_SCROLL_BAR, environment, parent, id, rectangle) {}
 
 	//! sets the maximum value of the scrollbar.
 	virtual void setMax(s32 max) = 0;
@@ -57,9 +55,5 @@ namespace gui
 	virtual void setPos(s32 pos) = 0;
 };
 
-
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUISkin.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_SKIN_H_INCLUDED__
-#define __I_GUI_SKIN_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "EGUIAlignment.h"
@@ -46,8 +45,7 @@ namespace gui
 };
 
 //! Names for gui element types
-	const c8* const GUISkinTypeNames[EGST_COUNT+1] =
-	{
+const c8 *const GUISkinTypeNames[EGST_COUNT + 1] = {
 		"windowsClassic",
 		"windowsMetallic",
 		"burning",
@@ -55,7 +53,6 @@ namespace gui
 		0,
 	};
 
-
 //! Enumeration for skin colors
 enum EGUI_DEFAULT_COLOR
 {
@@ -116,8 +113,7 @@ namespace gui
 };
 
 //! Names for default skin colors
-	const c8* const GUISkinColorNames[EGDC_COUNT+1] =
-	{
+const c8 *const GUISkinColorNames[EGDC_COUNT + 1] = {
 		"3DDarkShadow",
 		"3DShadow",
 		"3DFace",
@@ -201,10 +197,8 @@ namespace gui
 	EGDS_COUNT
 };
 
-
 //! Names for default skin sizes
-	const c8* const GUISkinSizeNames[EGDS_COUNT+1] =
-	{
+const c8 *const GUISkinSizeNames[EGDS_COUNT + 1] = {
 		"ScrollBarSize",
 		"MenuHeight",
 		"WindowButtonWidth",
@@ -228,10 +222,9 @@ namespace gui
 		"ButtonPressedTextOffsetY",
 		"ButtonPressedSpriteOffsetX",
 		"ButtonPressedSpriteOffsetY",
-		0
+		0,
 	};
 
-
 enum EGUI_DEFAULT_TEXT
 {
 	//! Text for the OK button on a message box
@@ -256,8 +249,7 @@ namespace gui
 };
 
 //! Names for default skin sizes
-	const c8* const GUISkinTextNames[EGDT_COUNT+1] =
-	{
+const c8 *const GUISkinTextNames[EGDT_COUNT + 1] = {
 		"MessageBoxOkay",
 		"MessageBoxCancel",
 		"MessageBoxYes",
@@ -266,7 +258,7 @@ namespace gui
 		"WindowButtonMaximize",
 		"WindowButtonMinimize",
 		"WindowButtonRestore",
-		0
+		0,
 	};
 
 //! Customizable symbols for GUI
@@ -324,8 +316,7 @@ namespace gui
 	EGDI_COUNT
 };
 
-	const c8* const GUISkinIconNames[EGDI_COUNT+1] =
-	{
+const c8 *const GUISkinIconNames[EGDI_COUNT + 1] = {
 		"windowMaximize",
 		"windowRestore",
 		"windowClose",
@@ -349,7 +340,7 @@ namespace gui
 		"collapse",
 		"file",
 		"directory",
-		0
+		0,
 	};
 
 // Customizable fonts
@@ -370,21 +361,19 @@ namespace gui
 	EGDF_COUNT
 };
 
-	const c8* const GUISkinFontNames[EGDF_COUNT+1] =
-	{
+const c8 *const GUISkinFontNames[EGDF_COUNT + 1] = {
 		"defaultFont",
 		"buttonFont",
 		"windowFont",
 		"menuFont",
 		"tooltipFont",
-		0
+		0,
 	};
 
 //! A skin modifies the look of the GUI elements.
 class IGUISkin : virtual public IReferenceCounted
 {
 public:
-
 	//! returns default color
 	virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const = 0;
 
@@ -572,9 +561,5 @@ namespace gui
 	virtual EGUI_SKIN_TYPE getType() const { return EGST_UNKNOWN; }
 };
 
-
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

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"
@@ -25,12 +24,13 @@ namespace gui
 // Note for implementer: Can't fix variable names to uppercase as this is a public interface used since a while
 struct SGUISpriteFrame
 {
-	SGUISpriteFrame() : textureNumber(0), rectNumber(0)
+	SGUISpriteFrame() :
+			textureNumber(0), rectNumber(0)
 	{
 	}
 
-	SGUISpriteFrame(u32 textureIndex, u32 positionIndex)
-	: textureNumber(textureIndex), rectNumber(positionIndex)
+	SGUISpriteFrame(u32 textureIndex, u32 positionIndex) :
+			textureNumber(textureIndex), rectNumber(positionIndex)
 	{
 	}
 
@@ -45,8 +45,10 @@ struct SGUISpriteFrame
 // Note for implementer: Can't fix variable names to uppercase as this is a public interface used since a while
 struct SGUISprite
 {
-	SGUISprite() : frameTime(0) {}
-	SGUISprite(const SGUISpriteFrame& firstFrame) : frameTime(0)
+	SGUISprite() :
+			frameTime(0) {}
+	SGUISprite(const SGUISpriteFrame &firstFrame) :
+			frameTime(0)
 	{
 		Frames.push_back(firstFrame);
 	}
@@ -55,7 +57,6 @@ struct SGUISprite
 	u32 frameTime;
 };
 
-
 //! Sprite bank interface.
 /** See http://http://irrlicht.sourceforge.net/forum//viewtopic.php?f=9&t=25742
  * for more information how to use the spritebank.
@@ -63,7 +64,6 @@ struct SGUISprite
 class IGUISpriteBank : public virtual IReferenceCounted
 {
 public:
-
 	//! Returns the list of rectangles held by the sprite bank
 	virtual core::array<core::rect<s32>> &getPositions() = 0;
 
@@ -134,9 +134,5 @@ public:
 			bool loop = true, bool center = false) = 0;
 };
 
-
 } // 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"
@@ -18,10 +17,9 @@ namespace gui
 class IGUIStaticText : public IGUIElement
 {
 public:
-
 	//! constructor
-		IGUIStaticText(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_STATIC_TEXT, environment, parent, id, rectangle) {}
+	IGUIStaticText(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_STATIC_TEXT, environment, parent, id, rectangle) {}
 
 	//! Sets another skin independent font.
 	/** If this is set to zero, the button uses the font of the skin.
@@ -131,9 +129,5 @@ namespace gui
 	virtual bool isRightToLeft() const = 0;
 };
 
-
 } // 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"
@@ -22,10 +21,9 @@ namespace gui
 class IGUITabControl : public IGUIElement
 {
 public:
-
 	//! constructor
-		IGUITabControl(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_TAB_CONTROL, environment, parent, id, rectangle) {}
+	IGUITabControl(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TAB_CONTROL, environment, parent, id, rectangle) {}
 
 	//! Adds a tab
 	virtual IGUITab *addTab(const wchar_t *caption, s32 id = -1) = 0;
@@ -124,19 +122,9 @@ namespace gui
 class IGUITab : public IGUIElement
 {
 public:
-
 	//! constructor
-		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;
-		}
+	IGUITab(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TAB, environment, parent, id, rectangle) {}
 
 	//! sets if the tab should draw its background
 	virtual void setDrawBackground(bool draw = true) = 0;
@@ -159,6 +147,3 @@ namespace gui
 
 } // 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"
 
@@ -21,10 +20,9 @@ namespace gui
 class IGUIToolBar : public IGUIElement
 {
 public:
-
 	//! constructor
-		IGUIToolBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_TOOL_BAR, environment, parent, id, rectangle) {}
+	IGUIToolBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TOOL_BAR, environment, parent, id, rectangle) {}
 
 	//! Adds a button to the tool bar
 	virtual IGUIButton *addButton(s32 id = -1, const wchar_t *text = 0, const wchar_t *tooltiptext = 0,
@@ -32,9 +30,5 @@ namespace gui
 			bool isPushButton = false, bool useAlphaChannel = false) = 0;
 };
 
-
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IImage.h

@@ -2,14 +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 <string.h>
+#include <cstring>
 
 namespace irr
 {
@@ -24,13 +23,9 @@ NOTE: Floating point formats are not well supported yet. Basically only getData(
 class IImage : public virtual IReferenceCounted
 {
 public:
-
 	//! constructor
 	IImage(ECOLOR_FORMAT format, const core::dimension2d<u32> &size, bool deleteMemory) :
 			Format(format), Size(size), Data(0), MipMapsData(0), BytesPerPixel(0), Pitch(0), DeleteMemory(deleteMemory), DeleteMipMapsMemory(false)
-#if defined(IRRLICHT_sRGB)
-		,Format_sRGB(1)
-#endif
 	{
 		BytesPerPixel = getBitsPerPixelFromFormat(Format) / 8;
 		Pitch = BytesPerPixel * Size.Width;
@@ -52,18 +47,6 @@ public:
 		return Format;
 	}
 
-#if defined(IRRLICHT_sRGB)
-	//! Texture is linear/sRGB (should be part of ColorFormat: default yes)
-	int get_sRGB() const
-	{
-		return Format_sRGB;
-	}
-	void set_sRGB(int val)
-	{
-		Format_sRGB = val;
-	}
-#endif
-
 	//! Returns width and height of image data.
 	const core::dimension2d<u32> &getDimension() const
 	{
@@ -104,8 +87,7 @@ public:
 	//! Returns mask for red value of a pixel
 	u32 getRedMask() const
 	{
-		switch (Format)
-		{
+		switch (Format) {
 		case ECF_A1R5G5B5:
 			return 0x1F << 10;
 		case ECF_R5G6B5:
@@ -122,8 +104,7 @@ public:
 	//! Returns mask for green value of a pixel
 	u32 getGreenMask() const
 	{
-		switch (Format)
-		{
+		switch (Format) {
 		case ECF_A1R5G5B5:
 			return 0x1F << 5;
 		case ECF_R5G6B5:
@@ -140,8 +121,7 @@ public:
 	//! Returns mask for blue value of a pixel
 	u32 getBlueMask() const
 	{
-		switch (Format)
-		{
+		switch (Format) {
 		case ECF_A1R5G5B5:
 			return 0x1F;
 		case ECF_R5G6B5:
@@ -158,8 +138,7 @@ public:
 	//! Returns mask for alpha value of a pixel
 	u32 getAlphaMask() const
 	{
-		switch (Format)
-		{
+		switch (Format) {
 		case ECF_A1R5G5B5:
 			return 0x1 << 15;
 		case ECF_R5G6B5:
@@ -183,24 +162,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. */
@@ -209,15 +170,13 @@ public:
 		return getMipMapsSize(Size, mipmapLevel);
 	}
 
-
 	//! Calculate mipmap size for a certain level
 	/** level 0 will be full image size. Every further level is half the size.	*/
 	static core::dimension2du getMipMapsSize(const core::dimension2du &sizeLevel0, u32 mipmapLevel)
 	{
 		core::dimension2du result(sizeLevel0);
 		u32 i = 0;
-		while (i != mipmapLevel)
-		{
+		while (i != mipmapLevel) {
 			if (result.Width > 1)
 				result.Width >>= 1;
 			if (result.Height > 1)
@@ -230,7 +189,6 @@ public:
 		return result;
 	}
 
-
 	//! Get mipmaps data.
 	/** Note that different mip levels are just behind each other in memory block.
 		So if you just get level 1 you also have the data for all other levels.
@@ -238,14 +196,12 @@ public:
 	*/
 	void *getMipMapsData(irr::u32 mipLevel = 1) const
 	{
-		if ( MipMapsData && mipLevel > 0)
-		{
+		if (MipMapsData && mipLevel > 0) {
 			size_t dataSize = 0;
 			core::dimension2du mipSize(Size);
 			u32 i = 1; // We want the start of data for this level, not end.
 
-			while (i != mipLevel)
-			{
+			while (i != mipLevel) {
 				if (mipSize.Width > 1)
 					mipSize.Width >>= 1;
 
@@ -276,31 +232,24 @@ public:
 	destruction. */
 	void setMipMapsData(void *data, bool ownForeignMemory)
 	{
-		if (data != MipMapsData)
-		{
-			if (DeleteMipMapsMemory)
-			{
+		if (data != MipMapsData) {
+			if (DeleteMipMapsMemory) {
 				delete[] MipMapsData;
 
 				DeleteMipMapsMemory = false;
 			}
 
-			if (data)
-			{
-				if (ownForeignMemory)
-				{
+			if (data) {
+				if (ownForeignMemory) {
 					MipMapsData = static_cast<u8 *>(data);
 
 					DeleteMipMapsMemory = false;
-				}
-				else
-				{
+				} else {
 					u32 dataSize = 0;
 					u32 width = Size.Width;
 					u32 height = Size.Height;
 
-					do
-					{
+					do {
 						if (width > 1)
 							width >>= 1;
 
@@ -315,9 +264,7 @@ public:
 
 					DeleteMipMapsMemory = true;
 				}
-			}
-			else
-			{
+			} else {
 				MipMapsData = 0;
 			}
 		}
@@ -367,24 +314,10 @@ 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)
 	{
-		switch(format)
-		{
+		switch (format) {
 		case ECF_A1R5G5B5:
 			return 16;
 		case ECF_R5G6B5:
@@ -393,28 +326,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:
@@ -449,81 +360,23 @@ 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)
 	{
-		switch(format)
-		{
+		switch (format) {
 		case ECF_D16:
 		case ECF_D32:
 		case ECF_D24S8:
@@ -539,8 +392,7 @@ public:
 		if (isCompressedFormat(format))
 			return false;
 
-		switch(format)
-		{
+		switch (format) {
 		case ECF_R16F:
 		case ECF_G16R16F:
 		case ECF_A16B16G16R16F:
@@ -554,22 +406,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;
@@ -582,15 +418,7 @@ protected:
 
 	bool DeleteMemory;
 	bool DeleteMipMapsMemory;
-
-#if defined(IRRLICHT_sRGB)
-	int Format_sRGB;
-#endif
 };
 
-
 } // 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"
@@ -28,7 +27,6 @@ IVideoDriver::addExternalImageLoader() to the engine. */
 class IImageLoader : public virtual IReferenceCounted
 {
 public:
-
 	//! Check if the file might be loaded by this class
 	/** Check is based on the file extension (e.g. ".tga")
 	\param filename Name of file to check.
@@ -47,9 +45,5 @@ public:
 	virtual IImage *loadImage(io::IReadFile *file) const = 0;
 };
 
-
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/IImageWriter.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_IMAGE_WRITER_H_INCLUDED__
-#define _I_IMAGE_WRITER_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "irrString.h"
@@ -20,7 +19,6 @@ namespace video
 {
 class IImage;
 
-
 //! Interface for writing software image data.
 class IImageWriter : public IReferenceCounted
 {
@@ -40,6 +38,3 @@ public:
 
 } // namespace video
 } // namespace irr
-
-#endif // _I_IMAGE_WRITER_H_INCLUDED__
-

include/IIndexBuffer.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_INDEX_BUFFER_H_INCLUDED__
-#define __I_INDEX_BUFFER_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
@@ -24,7 +23,6 @@ namespace scene
 class IIndexBuffer : public virtual IReferenceCounted
 {
 public:
-
 	virtual void *getData() = 0;
 
 	virtual video::E_INDEX_TYPE getType() const = 0;
@@ -57,9 +55,5 @@ namespace scene
 	virtual u32 getChangedID() const = 0;
 };
 
-
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/ILogger.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_LOGGER_H_INCLUDED__
-#define __I_LOGGER_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 
@@ -19,7 +18,7 @@ enum ELOG_LEVEL
 	//! Used for printing information helpful in debugging
 	ELL_DEBUG,
 
-	//! Useful information to print. For example hardware infos or something started/stopped.
+	//! Useful information to print. For example hardware info or something started/stopped.
 	ELL_INFORMATION,
 
 	//! Warnings that something isn't as expected and can cause oddities
@@ -33,12 +32,10 @@ enum ELOG_LEVEL
 	ELL_NONE
 };
 
-
 //! Interface for logging messages, warnings and errors
 class ILogger : public virtual IReferenceCounted
 {
 public:
-
 	//! Destructor
 	virtual ~ILogger() {}
 
@@ -73,30 +70,6 @@ public:
 	filtered with these levels. If you want to be a text displayed,
 	independent on what level filter is set, use ELL_NONE. */
 	virtual void log(const c8 *text, const c8 *hint, ELOG_LEVEL ll = ELL_INFORMATION) = 0;
-	virtual void log(const c8* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) = 0;
-
-	//! Prints out a text into the log
-	/** \param text: Text to print out.
-	\param hint: Additional info. This string is added after a " :" to the
-	string.
-	\param ll: Log level of the text. If the text is an error, set
-	it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
-	is just an informational text, set it to ELL_INFORMATION. Texts are
-	filtered with these levels. If you want to be a text displayed,
-	independent on what level filter is set, use ELL_NONE. */
-	virtual void log(const wchar_t* text, const wchar_t* hint, ELOG_LEVEL ll=ELL_INFORMATION) = 0;
-
-	//! Prints out a text into the log
-	/** \param text: Text to print out.
-	\param ll: Log level of the text. If the text is an error, set
-	it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
-	is just an informational text, set it to ELL_INFORMATION. Texts are
-	filtered with these levels. If you want to be a text displayed,
-	independent on what level filter is set, use ELL_NONE. */
-	virtual void log(const wchar_t* text, ELOG_LEVEL ll=ELL_INFORMATION) = 0;
 };
 
 } // end namespace
-
-#endif
-

include/IMaterialRenderer.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_MATERIAL_RENDERER_H_INCLUDED__
-#define __I_MATERIAL_RENDERER_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -25,7 +24,6 @@ engine with new materials. */
 class IMaterialRenderer : public virtual IReferenceCounted
 {
 public:
-
 	//! Called by the IVideoDriver implementation the let the renderer set its needed render states.
 	/** This is called during the IVideoDriver::setMaterial() call.
 	When overriding this, you can set some renderstates or for example a
@@ -99,9 +97,5 @@ public:
 	virtual IShaderConstantSetCallBack *getShaderConstantSetCallBack() const { return 0; }
 };
 
-
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/IMaterialRendererServices.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_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
-#define __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
+#pragma once
 
 #include "SMaterial.h"
 #include "S3DVertex.h"
@@ -15,12 +14,10 @@ namespace video
 
 class IVideoDriver;
 
-
 //! Interface providing some methods for changing advanced, internal states of a IVideoDriver.
 class IMaterialRendererServices
 {
 public:
-
 	//! Destructor
 	virtual ~IMaterialRendererServices() {}
 
@@ -38,30 +35,11 @@ public:
 			const SMaterial &lastMaterial,
 			bool resetAllRenderstates) = 0;
 
-	//! Return an index constant for the vertex shader based on a name.
+	//! Return an index constant for the vertex shader based on a uniform variable name.
 	virtual s32 getVertexShaderConstantID(const c8 *name) = 0;
 
-	//! Sets a constant for the vertex shader based on a name.
-	/** This can be used if you used a high level shader language like GLSL
-	or HLSL to create a shader. Example: If you created a shader which has
-	variables named 'mWorldViewProj' (containing the WorldViewProjection
-	matrix) and another one named 'fTime' containing one float, you can set
-	them in your IShaderConstantSetCallBack derived class like this:
-	\code
-	virtual void OnSetConstants(video::IMaterialRendererServices* services, s32 userData)
-	{
-		video::IVideoDriver* driver = services->getVideoDriver();
-
-		f32 time = (f32)os::Timer::getTime()/100000.0f;
-		services->setVertexShaderConstant("fTime", &time, 1);
-
-		core::matrix4 worldViewProj(driver->getTransform(video::ETS_PROJECTION));
-		worldViewProj *= driver->getTransform(video::ETS_VIEW);
-		worldViewProj *= driver->getTransform(video::ETS_WORLD);
-		services->setVertexShaderConstant("mWorldViewProj", worldViewProj.M, 16);
-	}
-	\endcode
-	\param index Index of the variable
+	//! Sets a value for a vertex shader uniform variable.
+	/** \param index Index of the variable (as received from getVertexShaderConstantID)
 	\param floats Pointer to array of floats
 	\param count Amount of floats in array.
 	\return True if successful.
@@ -72,27 +50,16 @@ public:
 	virtual bool setVertexShaderConstant(s32 index, const s32 *ints, int count) = 0;
 
 	//! Uint interface for the above.
-	/* NOTE: UINT only works with GLSL, not supported for other shaders.
-	         Also GLES drivers in Irrlicht do not support it as this needs at least GLES 3.0.
-	*/
 	virtual bool setVertexShaderConstant(s32 index, const u32 *ints, int count) = 0;
 
-	//! Sets a vertex shader constant.
-	/** Can be used if you created a shader using pixel/vertex shader
-	assembler or ARB_fragment_program or ARB_vertex_program.
-	\param data: Data to be set in the constants
-	\param startRegister: First register to be set
-	\param constantAmount: Amount of registers to be set. One register consists of 4 floats. */
-	virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) = 0;
-
-	//! Return an index constant for the pixel shader based on a name.
+	//! Return an index constant for the pixel shader for the given uniform variable name
 	virtual s32 getPixelShaderConstantID(const c8 *name) = 0;
 
-	//! Sets a constant for the pixel shader based on a name.
+	//! Sets a value for the given pixel shader uniform variable
 	/** This can be used if you used a high level shader language like GLSL
 	or HLSL to create a shader. See setVertexShaderConstant() for an
 	example on how to use this.
-	\param index Index of the variable
+	\param index Index of the variable (as received from getPixelShaderConstantID)
 	\param floats Pointer to array of floats
 	\param count Amount of floats in array.
 	\return True if successful. */
@@ -102,43 +69,8 @@ public:
 	virtual bool setPixelShaderConstant(s32 index, const s32 *ints, int count) = 0;
 
 	//! Uint interface for the above.
-	/* NOTE: UINT only works with GLSL, not supported for other shaders.
-	         Also GLES drivers in Irrlicht do not support it as this needs at least GLES 3.0.
-	*/
 	virtual bool setPixelShaderConstant(s32 index, const u32 *ints, int count) = 0;
 
-	//! Sets a pixel shader constant.
-	/** Can be used if you created a shader using pixel/vertex shader
-	assembler or ARB_fragment_program or ARB_vertex_program.
-	\param data Data to be set in the constants
-	\param startRegister First register to be set.
-	\param constantAmount Amount of registers to be set. One register consists of 4 floats. */
-	virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) = 0;
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setVertexShaderConstant(const c8* name, const f32* floats, int count)
-	{
-		return setVertexShaderConstant(getVertexShaderConstantID(name), floats, count);
-	}
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setVertexShaderConstant(const c8* name, const s32* ints, int count)
-	{
-		return setVertexShaderConstant(getVertexShaderConstantID(name), ints, count);
-	}
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setPixelShaderConstant(const c8* name, const f32* floats, int count)
-	{
-		return setPixelShaderConstant(getPixelShaderConstantID(name), floats, count);
-	}
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setPixelShaderConstant(const c8* name, const s32* ints, int count)
-	{
-		return setPixelShaderConstant(getPixelShaderConstantID(name), ints, count);
-	}
-
 	//! Get pointer to the IVideoDriver interface
 	/** \return Pointer to the IVideoDriver interface */
 	virtual IVideoDriver *getVideoDriver() = 0;
@@ -146,6 +78,3 @@ public:
 
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/IMemoryReadFile.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_MEMORY_READ_FILE_H_INCLUDED__
-#define __I_MEMORY_READ_FILE_H_INCLUDED__
+#pragma once
 
 #include "IReadFile.h"
 
@@ -26,6 +25,3 @@ namespace io
 };
 } // end namespace io
 } // end namespace irr
-
-#endif
-

include/IMesh.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_MESH_H_INCLUDED__
-#define __I_MESH_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -60,7 +59,6 @@ namespace scene
 	EAMT_STATIC
 };
 
-
 class IMeshBuffer;
 
 //! Class which holds the geometry of an object.
@@ -71,7 +69,6 @@ namespace scene
 class IMesh : public virtual IReferenceCounted
 {
 public:
-
 	//! Get the amount of mesh buffers.
 	/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
 	virtual u32 getMeshBufferCount() const = 0;
@@ -97,11 +94,6 @@ namespace scene
 	/** \param box New bounding box to use for the mesh. */
 	virtual void setBoundingBox(const core::aabbox3df &box) = 0;
 
-		//! Sets a flag of all contained materials to a new value.
-		/** \param flag: Flag to set in all materials.
-		\param newvalue: New value to set in all materials. */
-		virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) = 0;
-
 	//! Set the hardware mapping hint
 	/** This methods allows to define optimization hints for the
 	hardware. This enables, e.g., the use of hardware buffers on
@@ -129,6 +121,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IMeshBuffer.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_MESH_BUFFER_H_INCLUDED__
-#define __I_MESH_BUFFER_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -39,7 +38,6 @@ namespace scene
 class IMeshBuffer : public virtual IReferenceCounted
 {
 public:
-
 	//! Get the material of this meshbuffer
 	/** \return Material of this buffer. */
 	virtual video::SMaterial &getMaterial() = 0;
@@ -120,11 +118,6 @@ namespace scene
 	\param numIndices Number of indices in array. */
 	virtual void append(const void *const vertices, u32 numVertices, const u16 *const indices, u32 numIndices) = 0;
 
-		//! Append the meshbuffer to the current buffer
-		/** Only works for compatible vertex types
-		\param other Buffer to append to this one. */
-		virtual void append(const IMeshBuffer* const other) = 0;
-
 	//! get the current hardware mapping hint
 	virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const = 0;
 
@@ -163,26 +156,27 @@ namespace scene
 	virtual u32 getPrimitiveCount() const
 	{
 		const u32 indexCount = getIndexCount();
-			switch (getPrimitiveType())
-			{
-                case scene::EPT_POINTS:	        return indexCount;
-                case scene::EPT_LINE_STRIP:     return indexCount-1;
-                case scene::EPT_LINE_LOOP:      return indexCount;
-                case scene::EPT_LINES:          return indexCount/2;
-                case scene::EPT_TRIANGLE_STRIP: return (indexCount-2);
-                case scene::EPT_TRIANGLE_FAN:   return (indexCount-2);
-                case scene::EPT_TRIANGLES:      return indexCount/3;
-                case scene::EPT_QUAD_STRIP:     return (indexCount-2)/2;
-                case scene::EPT_QUADS:          return indexCount/4;
-                case scene::EPT_POLYGON:        return indexCount; // (not really primitives, that would be 1, works like line_strip)
-                case scene::EPT_POINT_SPRITES:  return indexCount;
+		switch (getPrimitiveType()) {
+		case scene::EPT_POINTS:
+			return indexCount;
+		case scene::EPT_LINE_STRIP:
+			return indexCount - 1;
+		case scene::EPT_LINE_LOOP:
+			return indexCount;
+		case scene::EPT_LINES:
+			return indexCount / 2;
+		case scene::EPT_TRIANGLE_STRIP:
+			return (indexCount - 2);
+		case scene::EPT_TRIANGLE_FAN:
+			return (indexCount - 2);
+		case scene::EPT_TRIANGLES:
+			return indexCount / 3;
+		case scene::EPT_POINT_SPRITES:
+			return indexCount;
 		}
 		return 0;
 	}
-
 };
 
 } // end namespace scene
 } // end namespace irr
-
-#endif

include/IMeshCache.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_MESH_CACHE_H_INCLUDED__
-#define __I_MESH_CACHE_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "path.h"
@@ -27,7 +26,6 @@ namespace scene
 class IMeshCache : public virtual IReferenceCounted
 {
 public:
-
 	//! Destructor
 	virtual ~IMeshCache() {}
 
@@ -78,46 +76,6 @@ namespace scene
 	number. */
 	virtual IAnimatedMesh *getMeshByIndex(u32 index) = 0;
 
-		//! Returns a mesh based on its name (often a filename).
-		/** \deprecated Use getMeshByName() instead. This method may be removed by
-		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ IAnimatedMesh* getMeshByFilename(const io::path& filename)
-		{
-			return getMeshByName(filename);
-		}
-
-		//! Get the name of a loaded mesh, based on its index. (Name is often identical to the filename).
-		/** \deprecated Use getMeshName() instead. This method may be removed by
-		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ const io::path& getMeshFilename(u32 index) const
-		{
-			return getMeshName(index).getInternalName();
-		}
-
-		//! Get the name of a loaded mesh, if there is any. (Name is often identical to the filename).
-		/** \deprecated Use getMeshName() instead. This method may be removed by
-		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ const io::path& getMeshFilename(const IMesh* const mesh) const
-		{
-			return getMeshName(mesh).getInternalName();
-		}
-
-		//! Renames a loaded mesh.
-		/** \deprecated Use renameMesh() instead. This method may be removed by
-		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ bool setMeshFilename(u32 index, const io::path& filename)
-		{
-			return renameMesh(index, filename);
-		}
-
-		//! Renames a loaded mesh.
-		/** \deprecated Use renameMesh() instead. This method may be removed by
-		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ bool setMeshFilename(const IMesh* const mesh, const io::path& filename)
-		{
-			return renameMesh(mesh, filename);
-		}
-
 	//! Returns a mesh based on its name.
 	/** \param name Name of the mesh. Usually a filename.
 	\return Pointer to the mesh or 0 if there is none with this number. */
@@ -169,9 +127,5 @@ namespace scene
 	virtual void clearUnusedMeshes() = 0;
 };
 
-
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IMeshLoader.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_MESH_LOADER_H_INCLUDED__
-#define __I_MESH_LOADER_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "path.h"
@@ -26,7 +25,6 @@ ISceneManager::addExternalMeshLoader() to the engine. */
 class IMeshLoader : public virtual IReferenceCounted
 {
 public:
-
 	//! Constructor
 	IMeshLoader() {}
 
@@ -48,8 +46,5 @@ public:
 	virtual IAnimatedMesh *createMesh(io::IReadFile *file) = 0;
 };
 
-
 } // end namespace scene
 } // end namespace irr
-
-#endif

include/IMeshManipulator.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_MESH_MANIPULATOR_H_INCLUDED__
-#define __I_MESH_MANIPULATOR_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "vector3d.h"
@@ -29,7 +28,6 @@ namespace scene
 class IMeshManipulator : public virtual IReferenceCounted
 {
 public:
-
 	//! Recalculates all normals of the mesh.
 	/** \param mesh: Mesh on which the operation is performed.
 	\param smooth: If the normals shall be smoothed.
@@ -100,7 +98,6 @@ namespace scene
 		return apply_(func, buffer, boundingBoxUpdate, func);
 	}
 
-
 	//! Apply a manipulator on the Mesh
 	/** \param func A functor defining the mesh manipulation.
 	\param mesh The Mesh to apply the manipulator to.
@@ -113,11 +110,9 @@ namespace scene
 			return true;
 		bool result = true;
 		core::aabbox3df bufferbox;
-			for (u32 i=0; i<mesh->getMeshBufferCount(); ++i)
-			{
+		for (u32 i = 0; i < mesh->getMeshBufferCount(); ++i) {
 			result &= apply(func, mesh->getMeshBuffer(i), boundingBoxUpdate);
-				if (boundingBoxUpdate)
-				{
+			if (boundingBoxUpdate) {
 				if (0 == i)
 					bufferbox.reset(mesh->getMeshBuffer(i)->getBoundingBox());
 				else
@@ -143,31 +138,22 @@ protected:
 			return true;
 
 		core::aabbox3df bufferbox;
-			for (u32 i=0; i<buffer->getVertexCount(); ++i)
-			{
-				switch (buffer->getVertexType())
-				{
-				case video::EVT_STANDARD:
-					{
+		for (u32 i = 0; i < buffer->getVertexCount(); ++i) {
+			switch (buffer->getVertexType()) {
+			case video::EVT_STANDARD: {
 				video::S3DVertex *verts = (video::S3DVertex *)buffer->getVertices();
 				func(verts[i]);
-					}
-					break;
-				case video::EVT_2TCOORDS:
-					{
+			} break;
+			case video::EVT_2TCOORDS: {
 				video::S3DVertex2TCoords *verts = (video::S3DVertex2TCoords *)buffer->getVertices();
 				func(verts[i]);
-					}
-					break;
-				case video::EVT_TANGENTS:
-					{
+			} break;
+			case video::EVT_TANGENTS: {
 				video::S3DVertexTangents *verts = (video::S3DVertexTangents *)buffer->getVertices();
 				func(verts[i]);
+			} break;
 			}
-					break;
-				}
-				if (boundingBoxUpdate)
-				{
+			if (boundingBoxUpdate) {
 				if (0 == i)
 					bufferbox.reset(buffer->getPosition(0));
 				else
@@ -182,6 +168,3 @@ protected:
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif

include/IMeshSceneNode.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_MESH_SCENE_NODE_H_INCLUDED__
-#define __I_MESH_SCENE_NODE_H_INCLUDED__
+#pragma once
 
 #include "ISceneNode.h"
 
@@ -14,20 +13,18 @@ namespace scene
 
 class IMesh;
 
-
 //! A scene node displaying a static mesh
 class IMeshSceneNode : public ISceneNode
 {
 public:
-
 	//! Constructor
 	/** Use setMesh() to set the mesh to display.
 	 */
 	IMeshSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
 			const core::vector3df &position = core::vector3df(0, 0, 0),
 			const core::vector3df &rotation = core::vector3df(0, 0, 0),
-			const core::vector3df& scale = core::vector3df(1,1,1))
-		: ISceneNode(parent, mgr, id, position, rotation, scale) {}
+			const core::vector3df &scale = core::vector3df(1, 1, 1)) :
+			ISceneNode(parent, mgr, id, position, rotation, scale) {}
 
 	//! Sets a new mesh to display
 	/** \param mesh Mesh to display. */
@@ -51,7 +48,3 @@ public:
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif
-

include/IMeshWriter.h

@@ -1,58 +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 __IRR_I_MESH_WRITER_H_INCLUDED__
-#define __IRR_I_MESH_WRITER_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "EMeshWriterEnums.h"
-
-namespace irr
-{
-namespace io
-{
-	class IWriteFile;
-} // end namespace io
-
-namespace scene
-{
-	class IMesh;
-
-	//! Interface for writing meshes
-	class IMeshWriter : public virtual IReferenceCounted
-	{
-	public:
-
-		//! Destructor
-		virtual ~IMeshWriter() {}
-
-		//! Get the type of the mesh writer
-		/** For own implementations, use MAKE_IRR_ID as shown in the
-		EMESH_WRITER_TYPE enumeration to return your own unique mesh
-		type id.
-		\return Type of the mesh writer. */
-		virtual EMESH_WRITER_TYPE getType() const = 0;
-
-		//! Write a static mesh.
-		/** \param file File handle to write the mesh to.
-		\param mesh Pointer to mesh to be written.
-		\param flags Optional flags to set properties of the writer.
-		\return True if successful */
-		virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh,
-							s32 flags=EMWF_NONE) = 0;
-
-		// Writes an animated mesh
-		// for future use, only b3d writer is able to write animated meshes currently and that was implemented using the writeMesh above.
-		/* \return Returns true if successful */
-		//virtual bool writeAnimatedMesh(io::IWriteFile* file,
-		// scene::IAnimatedMesh* mesh,
-		// s32 flags=EMWF_NONE) = 0;
-	};
-
-
-} // end namespace
-} // end namespace
-
-#endif
-

include/IOSOperator.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_OS_OPERATOR_H_INCLUDED__
-#define __I_OS_OPERATOR_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "irrString.h"
@@ -11,20 +10,13 @@
 namespace irr
 {
 
-//! The Operating system operator provides operation system specific methods and information.
+//! The OSOperator provides OS-specific methods and information.
 class IOSOperator : public virtual IReferenceCounted
 {
 public:
-	//! Get the current operation system version as string.
+	//! Get the current OS version as string.
 	virtual const core::stringc &getOperatingSystemVersion() const = 0;
 
-	//! Get the current operation system version as string.
-	/** \deprecated Use getOperatingSystemVersion instead. This method will be removed in Irrlicht 1.9. */
-	_IRR_DEPRECATED_ const wchar_t* getOperationSystemVersion() const
-	{
-		return core::stringw(getOperatingSystemVersion()).c_str();
-	}
-
 	//! Copies text to the clipboard
 	//! \param text: text in utf-8
 	virtual void copyToClipboard(const c8 *text) const = 0;
@@ -48,9 +40,6 @@ public:
 	\param availableBytes: will contain the available memory in Kilobytes (1024 B)
 	\return True if successful, false if not */
 	virtual bool getSystemMemory(u32 *totalBytes, u32 *availableBytes) const = 0;
-
 };
 
 } // end namespace
-
-#endif

include/IReadFile.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_READ_FILE_H_INCLUDED__
-#define __I_READ_FILE_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "coreutil.h"
@@ -56,6 +55,3 @@ namespace io
 
 } // end namespace io
 } // end namespace irr
-
-#endif
-

include/IReferenceCounted.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_IREFERENCE_COUNTED_H_INCLUDED__
-#define __I_IREFERENCE_COUNTED_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 
@@ -41,10 +40,9 @@ namespace irr
 class IReferenceCounted
 {
 public:
-
 	//! Constructor.
-		IReferenceCounted()
-			: DebugName(0), ReferenceCounter(1)
+	IReferenceCounted() :
+			DebugName(0), ReferenceCounter(1)
 	{
 	}
 
@@ -119,8 +117,7 @@ namespace irr
 		_IRR_DEBUG_BREAK_IF(ReferenceCounter <= 0)
 
 		--ReferenceCounter;
-			if (!ReferenceCounter)
-			{
+		if (!ReferenceCounter) {
 			delete this;
 			return true;
 		}
@@ -145,7 +142,6 @@ namespace irr
 	}
 
 protected:
-
 	//! Sets the debug name of the object.
 	/** The Debugname may only be set and changed by the object
 	itself. This method should only be used in Debug mode.
@@ -156,7 +152,6 @@ namespace irr
 	}
 
 private:
-
 	//! The debug name.
 	const c8 *DebugName;
 
@@ -165,6 +160,3 @@ namespace irr
 };
 
 } // end namespace irr
-
-#endif
-

include/IRenderTarget.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_RENDER_TARGET_H_INCLUDED__
-#define __I_RENDER_TARGET_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "EDriverTypes.h"
@@ -30,9 +29,9 @@ namespace video
 class IRenderTarget : public virtual IReferenceCounted
 {
 public:
-
 	//! constructor
-		IRenderTarget() : DepthStencil(0), DriverType(EDT_NULL)
+	IRenderTarget() :
+			DepthStencil(0), DriverType(EDT_NULL)
 	{
 	}
 
@@ -70,12 +69,9 @@ namespace video
 	//! You can pass getDepthStencil() for depthStencil if you don't want to change that one
 	void setTexture(ITexture *texture, ITexture *depthStencil)
 	{
-			if ( texture )
-			{
+		if (texture) {
 			setTextures(&texture, 1, depthStencil);
-			}
-			else
-			{
+		} else {
 			setTextures(0, 0, depthStencil);
 		}
 	}
@@ -83,12 +79,9 @@ namespace video
 	//! Set one cube surface texture.
 	void setTexture(ITexture *texture, ITexture *depthStencil, E_CUBE_SURFACE cubeSurface)
 	{
-			if ( texture )
-			{
+		if (texture) {
 			setTextures(&texture, 1, depthStencil, &cubeSurface, 1);
-			}
-			else
-			{
+		} else {
 			setTextures(0, 0, depthStencil, &cubeSurface, 1);
 		}
 	}
@@ -100,7 +93,6 @@ namespace video
 	}
 
 protected:
-
 	//! Set multiple textures.
 	// NOTE: working with pointers instead of arrays to avoid unnecessary memory allocations for the single textures case
 	virtual void setTextures(ITexture *const *textures, u32 numTextures, ITexture *depthStencil, const E_CUBE_SURFACE *cubeSurfaces = 0, u32 numCubeSurfaces = 0) = 0;
@@ -125,5 +117,3 @@ namespace video
 
 }
 }
-
-#endif

include/ISceneCollisionManager.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_SCENE_COLLISION_MANAGER_H_INCLUDED__
-#define __I_SCENE_COLLISION_MANAGER_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
@@ -19,7 +18,6 @@ namespace scene
 class ISceneCollisionManager : public virtual IReferenceCounted
 {
 public:
-
 	//! Returns a 3d ray which would go through the 2d screen coordinates.
 	/** \param pos: Screen coordinates in pixels.
 	\param camera: Camera from which the ray starts. If null, the
@@ -29,10 +27,7 @@ namespace scene
 	would be behind the 2d screen coordinates. */
 	virtual core::line3d<f32> getRayFromScreenCoordinates(
 			const core::position2d<s32> &pos, const ICameraSceneNode *camera = 0) = 0;
-
 };
 
 } // end namespace scene
 } // end namespace irr
-
-#endif

include/ISceneManager.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_SCENE_MANAGER_H_INCLUDED__
-#define __I_SCENE_MANAGER_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
@@ -13,7 +12,6 @@
 #include "dimension2d.h"
 #include "SColor.h"
 #include "ESceneNodeTypes.h"
-#include "EMeshWriterEnums.h"
 #include "SceneParameters.h"
 #include "ISkinnedMesh.h"
 
@@ -109,7 +107,6 @@ namespace scene
 class IMeshLoader;
 class IMeshManipulator;
 class IMeshSceneNode;
-	class IMeshWriter;
 class ISceneNode;
 class ISceneNodeFactory;
 
@@ -129,8 +126,7 @@ namespace scene
 class ISceneManager : public virtual IReferenceCounted
 {
 public:
-
-		//! Get pointer to an animateable mesh. Loads the file if not loaded already.
+	//! Get pointer to an animatable mesh. Loads the file if not loaded already.
 	/**
 	 * If you want to remove a loaded mesh from the cache again, use removeMesh().
 	 *  Currently there are the following mesh formats supported:
@@ -509,7 +505,7 @@ namespace scene
 
 	//! Clear all nodes which are currently registered for rendering
 	/** Usually you don't have to care about this as drawAll will clear nodes
-		after rendering them. But sometimes you might have to manully reset this.
+	after rendering them. But sometimes you might have to manually reset this.
 	For example when you deleted nodes between registering and rendering. */
 	virtual void clearAllRegisteredNodesForRendering() = 0;
 
@@ -603,11 +599,6 @@ namespace scene
 	See IReferenceCounted::drop() for more information. */
 	virtual ISceneManager *createNewSceneManager(bool cloneContent = false) = 0;
 
-		//! Get a mesh writer implementation if available
-		/** Note: You need to drop() the pointer after use again, see IReferenceCounted::drop()
-		for details. */
-		virtual IMeshWriter* createMeshWriter(EMESH_WRITER_TYPE type) = 0;
-
 	//! Get a skinned mesh, which is not available as header-only code
 	/** Note: You need to drop() the pointer after use again, see IReferenceCounted::drop()
 	for details. */
@@ -637,9 +628,5 @@ namespace scene
 	virtual bool isCulled(const ISceneNode *node) const = 0;
 };
 
-
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/ISceneNode.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_SCENE_NODE_H_INCLUDED__
-#define __I_SCENE_NODE_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 #include "ESceneNodeTypes.h"
@@ -14,7 +13,9 @@
 #include "aabbox3d.h"
 #include "matrix4.h"
 #include "IAttributes.h"
+
 #include <list>
+#include <optional>
 
 namespace irr
 {
@@ -37,13 +38,13 @@ namespace scene
 class ISceneNode : virtual public IReferenceCounted
 {
 public:
-
 	//! Constructor
 	ISceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id = -1,
 			const core::vector3df &position = core::vector3df(0, 0, 0),
 			const core::vector3df &rotation = core::vector3df(0, 0, 0),
-				const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f))
-			: RelativeTranslation(position), RelativeRotation(rotation), RelativeScale(scale),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f)) :
+			RelativeTranslation(position),
+			RelativeRotation(rotation), RelativeScale(scale),
 			Parent(0), SceneManager(mgr), ID(id),
 			AutomaticCullingState(EAC_BOX), DebugDataVisible(EDS_OFF),
 			IsVisible(true), IsDebugObject(false)
@@ -54,7 +55,6 @@ namespace scene
 		updateAbsolutePosition();
 	}
 
-
 	//! Destructor
 	virtual ~ISceneNode()
 	{
@@ -62,10 +62,9 @@ namespace scene
 		removeAll();
 	}
 
-
 	//! This method is called just before the rendering process of the whole scene.
 	/** Nodes may register themselves in the render pipeline during this call,
-		precalculate the geometry which should be renderered, and prevent their
+	precalculate the geometry which should be rendered, and prevent their
 	children from being able to register themselves if they are clipped by simply
 	not calling their OnRegisterSceneNode method.
 	If you are implementing your own scene node, you should overwrite this method
@@ -79,15 +78,13 @@ namespace scene
 	*/
 	virtual void OnRegisterSceneNode()
 	{
-			if (IsVisible)
-			{
+		if (IsVisible) {
 			ISceneNodeList::iterator it = Children.begin();
 			for (; it != Children.end(); ++it)
 				(*it)->OnRegisterSceneNode();
 		}
 	}
 
-
 	//! OnAnimate() is called just before rendering the whole scene.
 	/** Nodes may calculate or store animations here, and may do other useful things,
 	depending on what they are. Also, OnAnimate() should be called for all
@@ -96,8 +93,7 @@ namespace scene
 	\param timeMs Current time in milliseconds. */
 	virtual void OnAnimate(u32 timeMs)
 	{
-			if (IsVisible)
-			{
+		if (IsVisible) {
 			// update absolute position
 			updateAbsolutePosition();
 
@@ -109,35 +105,23 @@ namespace scene
 		}
 	}
 
-
 	//! Renders the node.
 	virtual void render() = 0;
 
-
 	//! Returns the name of the node.
 	/** \return Name as character string. */
-		virtual const c8* getName() const
+	virtual const std::optional<std::string> &getName() const
 	{
-			return Name.c_str();
+		return Name;
 	}
 
-
 	//! Sets the name of the node.
 	/** \param name New name of the scene node. */
-		virtual void setName(const c8* name)
+	virtual void setName(const std::optional<std::string> &name)
 	{
 		Name = name;
 	}
 
-
-		//! Sets the name of the node.
-		/** \param name New name of the scene node. */
-		virtual void setName(const core::stringc& name)
-		{
-			Name = name;
-		}
-
-
 	//! Get the axis aligned, not transformed bounding box of this node.
 	/** This means that if this node is an animated 3d character,
 	moving in a room, the bounding box will always be around the
@@ -148,7 +132,6 @@ namespace scene
 	\return The non-transformed bounding box. */
 	virtual const core::aabbox3d<f32> &getBoundingBox() const = 0;
 
-
 	//! Get the axis aligned, transformed and animated absolute bounding box of this node.
 	/** Note: The result is still an axis-aligned bounding box, so it's size
 	changes with rotation.
@@ -185,7 +168,6 @@ namespace scene
 		return AbsoluteTransformation;
 	}
 
-
 	//! Returns the relative transformation of the scene node.
 	/** The relative transformation is stored internally as 3
 	vectors: translation, rotation and scale. To get the relative
@@ -197,8 +179,7 @@ namespace scene
 		mat.setRotationDegrees(RelativeRotation);
 		mat.setTranslation(RelativeTranslation);
 
-			if (RelativeScale != core::vector3df(1.f,1.f,1.f))
-			{
+		if (RelativeScale != core::vector3df(1.f, 1.f, 1.f)) {
 			core::matrix4 smat;
 			smat.setScale(RelativeScale);
 			mat *= smat;
@@ -207,7 +188,6 @@ namespace scene
 		return mat;
 	}
 
-
 	//! Returns whether the node should be visible (if all of its parents are visible).
 	/** This is only an option set by the user, but has nothing to
 	do with geometry culling
@@ -242,7 +222,6 @@ namespace scene
 		IsVisible = isVisible;
 	}
 
-
 	//! Get the id of the scene node.
 	/** This id can be used to identify the node.
 	\return The id. */
@@ -251,7 +230,6 @@ namespace scene
 		return ID;
 	}
 
-
 	//! Sets the id of the scene node.
 	/** This id can be used to identify the node.
 	\param id The new id. */
@@ -260,66 +238,59 @@ namespace scene
 		ID = id;
 	}
 
-
 	//! Adds a child to this scene node.
 	/** If the scene node already has a parent it is first removed
 	from the other parent.
 	\param child A pointer to the new child. */
 	virtual void addChild(ISceneNode *child)
 	{
-			if (child && (child != this))
-			{
+		if (child && (child != this)) {
 			// Change scene manager?
 			if (SceneManager != child->SceneManager)
 				child->setSceneManager(SceneManager);
 
 			child->grab();
 			child->remove(); // remove from old parent
-				Children.push_back(child);
+			// Note: This iterator is not invalidated until we erase it.
+			child->ThisIterator = Children.insert(Children.end(), child);
 			child->Parent = this;
 		}
 	}
 
-
 	//! Removes a child from this scene node.
-		/** If found in the children list, the child pointer is also
-		dropped and might be deleted if no other grab exists.
+	/**
 	\param child A pointer to the child which shall be removed.
 	\return True if the child was removed, and false if not,
-		e.g. because it couldn't be found in the children list. */
+	e.g. because it belongs to a different parent or no parent. */
 	virtual bool removeChild(ISceneNode *child)
 	{
-			ISceneNodeList::iterator it = Children.begin();
-			for (; it != Children.end(); ++it)
-				if ((*it) == child)
-				{
-					(*it)->Parent = 0;
-					(*it)->drop();
+		if (child->Parent != this)
+			return false;
+
+		// The iterator must be set since the parent is not null.
+		_IRR_DEBUG_BREAK_IF(!child->ThisIterator.has_value());
+		auto it = *child->ThisIterator;
+		child->ThisIterator = std::nullopt;
+		child->Parent = nullptr;
+		child->drop();
 		Children.erase(it);
 		return true;
 	}
 
-			return false;
-		}
-
-
 	//! Removes all children of this scene node
 	/** The scene nodes found in the children list are also dropped
 	and might be deleted if no other grab exists on them.
 	*/
 	virtual void removeAll()
 	{
-			ISceneNodeList::iterator it = Children.begin();
-			for (; it != Children.end(); ++it)
-			{
-				(*it)->Parent = 0;
-				(*it)->drop();
+		for (auto &child : Children) {
+			child->Parent = nullptr;
+			child->ThisIterator = std::nullopt;
+			child->drop();
 		}
-
 		Children.clear();
 	}
 
-
 	//! Removes this scene node from the scene
 	/** If no other grab exists for this node, it will be deleted.
 	 */
@@ -329,7 +300,6 @@ namespace scene
 			Parent->removeChild(this);
 	}
 
-
 	//! Returns the material based on the zero based index i.
 	/** To get the amount of materials used by this scene node, use
 	getMaterialCount(). This function is needed for inserting the
@@ -343,7 +313,6 @@ namespace scene
 		return video::IdentityMaterial;
 	}
 
-
 	//! Get amount of materials used by this scene node.
 	/** \return Current amount of materials of this scene node. */
 	virtual u32 getMaterialCount() const
@@ -351,42 +320,17 @@ namespace scene
 		return 0;
 	}
 
-
-		//! Sets all material flags at once to a new value.
-		/** Useful, for example, if you want the whole mesh to be
-		affected by light.
-		\param flag Which flag of all materials to be set.
-		\param newvalue New value of that flag. */
-		void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue)
+	//! Execute a function on all materials of this scene node.
+	/** Useful for setting material properties, e.g. if you want the whole
+	mesh to be affected by light. */
+	template <typename F>
+	void forEachMaterial(F &&fn)
 	{
-			for (u32 i=0; i<getMaterialCount(); ++i)
-				getMaterial(i).setFlag(flag, newvalue);
+		for (u32 i = 0; i < getMaterialCount(); i++) {
+			fn(getMaterial(i));
 		}
-
-
-		//! Sets the texture of the specified layer in all materials of this scene node to the new texture.
-		/** \param textureLayer Layer of texture to be set. Must be a
-		value smaller than MATERIAL_MAX_TEXTURES.
-		\param texture New texture to be used. */
-		void setMaterialTexture(u32 textureLayer, video::ITexture* texture)
-		{
-			if (textureLayer >= video::MATERIAL_MAX_TEXTURES)
-				return;
-
-			for (u32 i=0; i<getMaterialCount(); ++i)
-				getMaterial(i).setTexture(textureLayer, texture);
 	}
 
-
-		//! Sets the material type of all materials in this scene node to a new material type.
-		/** \param newType New type of material to be set. */
-		void setMaterialType(video::E_MATERIAL_TYPE newType)
-		{
-			for (u32 i=0; i<getMaterialCount(); ++i)
-				getMaterial(i).MaterialType = newType;
-		}
-
-
 	//! Gets the scale of the scene node relative to its parent.
 	/** This is the scale of this node relative to its parent.
 	If you want the absolute scale, use
@@ -397,7 +341,6 @@ namespace scene
 		return RelativeScale;
 	}
 
-
 	//! Sets the relative scale of the scene node.
 	/** \param scale New scale of the node, relative to its parent. */
 	virtual void setScale(const core::vector3df &scale)
@@ -405,7 +348,6 @@ namespace scene
 		RelativeScale = scale;
 	}
 
-
 	//! Gets the rotation of the node relative to its parent.
 	/** Note that this is the relative rotation of the node.
 	If you want the absolute rotation, use
@@ -416,7 +358,6 @@ namespace scene
 		return RelativeRotation;
 	}
 
-
 	//! Sets the rotation of the node relative to its parent.
 	/** This only modifies the relative rotation of the node.
 	\param rotation New rotation of the node in degrees. */
@@ -425,7 +366,6 @@ namespace scene
 		RelativeRotation = rotation;
 	}
 
-
 	//! Gets the position of the node relative to its parent.
 	/** Note that the position is relative to the parent. If you want
 	the position in world coordinates, use getAbsolutePosition() instead.
@@ -435,7 +375,6 @@ namespace scene
 		return RelativeTranslation;
 	}
 
-
 	//! Sets the position of the node relative to its parent.
 	/** Note that the position is relative to the parent.
 	\param newpos New relative position of the scene node. */
@@ -444,7 +383,6 @@ namespace scene
 		RelativeTranslation = newpos;
 	}
 
-
 	//! Gets the absolute position of the node in world coordinates.
 	/** If you want the position of the node relative to its parent,
 	use getPosition() instead.
@@ -459,7 +397,6 @@ namespace scene
 		return AbsoluteTransformation.getTranslation();
 	}
 
-
 	//! Set a culling style or disable culling completely.
 	/** Box cullling (EAC_BOX) is set by default. Note that not
 	all SceneNodes support culling and that some nodes always cull
@@ -471,7 +408,6 @@ namespace scene
 		AutomaticCullingState = state;
 	}
 
-
 	//! Gets the automatic culling state.
 	/** \return The automatic culling state. */
 	u32 getAutomaticCulling() const
@@ -479,7 +415,6 @@ namespace scene
 		return AutomaticCullingState;
 	}
 
-
 	//! Sets if debug data like bounding boxes should be drawn.
 	/** A bitwise OR of the types from @ref irr::scene::E_DEBUG_SCENE_TYPE.
 	Please note that not all scene nodes support all debug data types.
@@ -497,7 +432,6 @@ namespace scene
 		return DebugDataVisible;
 	}
 
-
 	//! Sets if this scene node is a debug object.
 	/** Debug objects have some special properties, for example they can be easily
 	excluded from collision detection or from serialization, etc. */
@@ -506,7 +440,6 @@ namespace scene
 		IsDebugObject = debugObject;
 	}
 
-
 	//! Returns if this scene node is a debug object.
 	/** Debug objects have some special properties, for example they can be easily
 	excluded from collision detection or from serialization, etc.
@@ -516,7 +449,6 @@ namespace scene
 		return IsDebugObject;
 	}
 
-
 	//! Returns a const reference to the list of all children.
 	/** \return The list of all children of this node. */
 	const std::list<ISceneNode *> &getChildren() const
@@ -524,7 +456,6 @@ namespace scene
 		return Children;
 	}
 
-
 	//! Changes the parent of the scene node.
 	/** \param newParent The new parent to be used. */
 	virtual void setParent(ISceneNode *newParent)
@@ -532,30 +463,24 @@ namespace scene
 		grab();
 		remove();
 
-			Parent = newParent;
-
-			if (Parent)
-				Parent->addChild(this);
+		if (newParent)
+			newParent->addChild(this);
 
 		drop();
 	}
 
-
 	//! Updates the absolute position based on the relative and the parents position
 	/** Note: This does not recursively update the parents absolute positions, so if you have a deeper
 		hierarchy you might want to update the parents first.*/
 	virtual void updateAbsolutePosition()
 	{
-			if (Parent)
-			{
+		if (Parent) {
 			AbsoluteTransformation =
 					Parent->getAbsoluteTransformation() * getRelativeTransformation();
-			}
-			else
+		} else
 			AbsoluteTransformation = getRelativeTransformation();
 	}
 
-
 	//! Returns the parent of this scene node
 	/** \return A pointer to the parent. */
 	scene::ISceneNode *getParent() const
@@ -563,7 +488,6 @@ namespace scene
 		return Parent;
 	}
 
-
 	//! Returns type of the scene node
 	/** \return The type of this node. */
 	virtual ESCENE_NODE_TYPE getType() const
@@ -585,7 +509,6 @@ namespace scene
 	virtual ISceneManager *getSceneManager(void) const { return SceneManager; }
 
 protected:
-
 	//! A clone function for the ISceneNode members.
 	/** This method can be used by clone() implementations of
 	derived classes
@@ -628,7 +551,7 @@ namespace scene
 	}
 
 	//! Name of the scene node.
-		core::stringc Name;
+	std::optional<std::string> Name;
 
 	//! Absolute transformation of the node.
 	core::matrix4 AbsoluteTransformation;
@@ -642,12 +565,15 @@ namespace scene
 	//! Relative scale of the scene node.
 	core::vector3df RelativeScale;
 
-		//! Pointer to the parent
-		ISceneNode* Parent;
-
 	//! List of all children of this node
 	std::list<ISceneNode *> Children;
 
+	//! Iterator pointing to this node in the parent's child list.
+	std::optional<ISceneNodeList::iterator> ThisIterator;
+
+	//! Pointer to the parent
+	ISceneNode *Parent;
+
 	//! Pointer to the scene manager
 	ISceneManager *SceneManager;
 
@@ -667,9 +593,5 @@ namespace scene
 	bool IsDebugObject;
 };
 
-
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IShaderConstantSetCallBack.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_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__
-#define __I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__
+#pragma once
 
 #include "IReferenceCounted.h"
 
@@ -21,7 +20,6 @@ OnSetConstants method will be called every frame now. */
 class IShaderConstantSetCallBack : public virtual IReferenceCounted
 {
 public:
-
 	//! Called to let the callBack know the used material (optional method)
 	/**
 	 \code
@@ -77,9 +75,5 @@ public:
 	virtual void OnSetConstants(IMaterialRendererServices *services, s32 userData) = 0;
 };
 
-
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/ISkinnedMesh.h

@@ -2,14 +2,15 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_SKINNED_MESH_H_INCLUDED__
-#define __I_SKINNED_MESH_H_INCLUDED__
+#pragma once
 
 #include "irrArray.h"
 #include "IBoneSceneNode.h"
 #include "IAnimatedMesh.h"
 #include "SSkinMeshBuffer.h"
 
+#include <optional>
+
 namespace irr
 {
 namespace scene
@@ -27,12 +28,10 @@ namespace scene
 	EIM_COUNT
 };
 
-
 //! Interface for using some special functions of Skinned meshes
 class ISkinnedMesh : public IAnimatedMesh
 {
 public:
-
 	//! Gets joint count.
 	/** \return Amount of joints in the skeletal animated mesh. */
 	virtual u32 getJointCount() const = 0;
@@ -41,12 +40,12 @@ namespace scene
 	/** \param number: Zero based index of joint. The last joint
 	has the number getJointCount()-1;
 	\return Name of joint and null if an error happened. */
-		virtual const c8* getJointName(u32 number) const = 0;
+	virtual const std::optional<std::string> &getJointName(u32 number) const = 0;
 
 	//! Gets a joint number from its name
 	/** \param name: Name of the joint.
-		\return Number of the joint or -1 if not found. */
-		virtual s32 getJointNumber(const c8* name) const = 0;
+	\return Number of the joint or std::nullopt if not found. */
+	virtual std::optional<u32> getJointNumber(const std::string &name) const = 0;
 
 	//! Use animation from another mesh
 	/** The animation is linked (not copied) based on joint names
@@ -105,7 +104,6 @@ namespace scene
 		core::vector3df StaticNormal;
 	};
 
-
 	//! Animation keyframe which describes a new position
 	struct SPositionKey
 	{
@@ -130,13 +128,14 @@ namespace scene
 	//! Joints
 	struct SJoint
 	{
-			SJoint() : UseAnimationFrom(0), GlobalSkinningSpace(false),
+		SJoint() :
+				UseAnimationFrom(0), GlobalSkinningSpace(false),
 				positionHint(-1), scaleHint(-1), rotationHint(-1)
 		{
 		}
 
 		//! The name of this joint
-			core::stringc Name;
+		std::optional<std::string> Name;
 
 		//! Local matrix of this joint
 		core::matrix4 LocalMatrix;
@@ -181,7 +180,6 @@ namespace scene
 		s32 rotationHint;
 	};
 
-
 	// Interface for the mesh loaders (finalize should lock these functions, and they should have some prefix like loader_
 
 	// these functions will use the needed arrays, set values, etc to help the loaders
@@ -220,6 +218,3 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-