v2

.github/workflows/build.yml

@@ -8,46 +8,47 @@ on:
 jobs:
 
   linux-gl:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:bionic
+      env: { LANG: "C.UTF-8" }
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Install deps
         run: |
-          sudo apt-get update
-          sudo apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+          apt-get update
+          apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
 
       - name: Build
         run: |
-          cmake . -DUSE_SDL2=OFF
+          cmake .
           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@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: irrlicht-linux
           path: ./irrlicht-linux.tar.gz
 
   linux-gles:
-    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:bionic
+      env: { LANG: "C.UTF-8" }
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Install deps
         run: |
-          sudo apt-get update
-          sudo apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          apt-get update
+          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 -DUSE_SDL2=OFF -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
+          cmake . -DBUILD_EXAMPLES=1 -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
           make -j2
 
       - name: Test (headless)
@@ -61,18 +62,20 @@ jobs:
           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
 
   linux-sdl:
-    # something is wrong with the SDL cmake files on 20.04
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:jammy
+      env: { LANG: "C.UTF-8" }
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Install deps
         run: |
-          sudo apt-get update
-          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+          apt-get update
+          apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
 
       - name: Build
         run: |
-          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DCMAKE_BUILD_TYPE=Debug
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON
           make -j2
 
       - name: Test (headless)
@@ -81,14 +84,16 @@ jobs:
           ./AutomatedTest null
 
   linux-sdl-gl3:
-    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:jammy
+      env: { LANG: "C.UTF-8" }
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Install deps
         run: |
-          sudo apt-get update
-          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          apt-get update
+          apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
@@ -106,14 +111,16 @@ jobs:
           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest opengl3
 
   linux-sdl-gles2:
-    # something is wrong with the SDL cmake files on 20.04
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:jammy
+      env: { LANG: "C.UTF-8" }
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Install deps
         run: |
-          sudo apt-get update
-          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          apt-get update
+          apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
@@ -132,7 +139,7 @@ jobs:
 
   mingw:
     name: "MinGW ${{matrix.config.variant}}${{matrix.config.extras}}"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -142,21 +149,22 @@ jobs:
           - {variant: win32, arch: i686, extras: "-sdl"}
           - {variant: win64, arch: x86_64, extras: "-sdl"}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Install compiler
         run: |
           sudo apt-get update && sudo apt-get install cmake -qyy
-          ./scripts/ci-get-mingw.sh
+          wget http://minetest.kitsunemimi.pw/mingw-w64-${{matrix.config.arch}}_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: ${{matrix.config.arch}}-w64-mingw32-clang
-          CXX: ${{matrix.config.arch}}-w64-mingw32-clang++
+          CC: ${{matrix.config.arch}}-w64-mingw32-gcc
+          CXX: ${{matrix.config.arch}}-w64-mingw32-g++
           extras: ${{matrix.config.extras}}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}
           path: ./irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}.zip
@@ -164,7 +172,7 @@ jobs:
   macos:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Install deps
         run: |
           brew update
@@ -179,27 +187,13 @@ jobs:
         run: |
           ./bin/OSX/AutomatedTest null
 
-  macos-sdl:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install deps
-        run: |
-          brew update
-          brew install cmake libpng jpeg sdl2
-
-      - name: Build
-        run: |
-          cmake . -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_EXAMPLES=1 -DUSE_SDL2=1
-          make -j3
-
   msvc:
     name: VS 2019 ${{ matrix.config.arch }} ${{ matrix.sdl.label }}
     runs-on: windows-2019
     env:
-      VCPKG_VERSION: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
-      # 2023.10.19
-      vcpkg_packages: zlib libpng libjpeg-turbo
+      VCPKG_VERSION: 14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44
+        # 2022.05.10
+      vcpkg_packages: zlib libpng libjpeg-turbo opengl-registry
     strategy:
       fail-fast: false
       matrix:
@@ -216,7 +210,6 @@ jobs:
           -
             use: FALSE
             label: '(no SDL)'
-            vcpkg_packages: opengl-registry
           -
             use: TRUE
             label: '(with SDL)'
@@ -224,7 +217,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Restore from cache and run vcpkg
         uses: lukka/run-vcpkg@v7
@@ -257,50 +250,7 @@ jobs:
         run: move include artifact/
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: msvc-${{ matrix.config.arch }}-${{matrix.sdl.use}}
+          name: msvc-${{ matrix.config.arch }}
           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,7 +5,6 @@ install_manifest.txt
 IrrlichtMtConfig.cmake
 IrrlichtMtConfigVersion.cmake
 IrrlichtMtTargets.cmake
-CTestTestfile.cmake
 Makefile
 libs/*
 *.so*

CMakeLists.txt

@@ -1,6 +1,13 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.5)
 
-set(IRRLICHTMT_REVISION 15)
+# >=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 12)
 
 project(Irrlicht
 	VERSION 1.9.0.${IRRLICHTMT_REVISION}
@@ -9,9 +16,6 @@ project(Irrlicht
 
 message(STATUS "*** Building IrrlichtMt ${PROJECT_VERSION} ***")
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 include(GNUInstallDirs)
 
 if(ANDROID)
@@ -34,9 +38,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-enable_testing()
 add_subdirectory(source/Irrlicht)
-add_subdirectory(test)
 
 option(BUILD_EXAMPLES "Build example applications" FALSE)
 if(BUILD_EXAMPLES)

Config.cmake.in

@@ -1,11 +1,5 @@
 @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,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.

LICENSE

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

README.md

@@ -1,8 +1,9 @@
 IrrlichtMt version 1.9
 ======================
 
-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.
+The Irrlicht Engine is an open source realtime 3D engine written in C++.
+
+This is a fork by the [Minetest](https://github.com/minetest) developers that was stripped-down and customized specifically for use in Minetest.
 It is intentionally not compatible to upstream and is planned to be eventually absorbed into Minetest.
 
 Build
@@ -15,7 +16,6 @@ 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 +24,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: platform-dependent, usually `ON`) - Use SDL2 instead of older native device code
+* `USE_SDL2` (default: `OFF`) - Use SDL2 instead of native platform device
 
 e.g. on a Linux system you might want to build for local use like this:
 
@@ -41,7 +41,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 sdl2 --triplet x64-windows
+	vcpkg install zlib libjpeg-turbo libpng opengl-registry --triplet x64-windows
 	
 Run the following script in PowerShell:
 

bin/Linux/readme.txt

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1 @@
+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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,16 @@
+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

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

build.sh

@@ -0,0 +1,27 @@
+#!/bin/bash -e
+args=(-DBUILD_EXAMPLES=ON -DENABLE_OPENGL=OFF -DBUILD_SHARED_LIBS=OFF)
+
+export CC=afl-clang-fast
+export CXX=afl-clang-fast++
+export LD=$CXX
+unset AFL_USE_ASAN
+if ! grep -Fq '/afl-' build2/CMakeCache.txt; then
+	rm -rf build2
+	cmake -S . -B build2 "${args[@]}"
+fi
+nice make -C build2 clean
+nice make -C build2 -j10
+for f in build2/bin/Linux/*; do
+	ln -snfv "../../$f" "bin/Linux/${f##*/}_noasan"
+done
+
+export CC=afl-clang-lto
+export CXX=afl-clang-lto++
+export LD=$CXX
+export AFL_USE_ASAN=1
+if ! grep -Fq '/afl-' CMakeCache.txt; then
+	rm -f CMakeCache.txt
+	cmake . "${args[@]}"
+fi
+nice make clean
+nice make -j10

doc/irrlicht-license.txt

@@ -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.

doc/release_checklist.txt

@@ -0,0 +1,63 @@
+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/test_string.cpp

@@ -168,32 +168,22 @@ static void test_methods()
 
 static void test_conv()
 {
-	// locale-independent
+	// assumes Unicode and UTF-8 locale
+	setlocale(LC_CTYPE, "");
 
 	stringw out;
-	utf8ToWString(out, "†††");
+	multibyteToWString(out, "†††");
 	UASSERTEQ(out.size(), 3);
 	for (int i = 0; i < 3; i++)
 		UASSERTEQ(static_cast<u16>(out[i]), 0x2020);
-
 	stringc out2;
-	wStringToUTF8(out2, L"†††");
+	wStringToMultibyte(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,7 +1,11 @@
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 set(IRREXAMPLES
-	# removed
+	LoadTexture
+	LoadMesh
 )
-if(UNIX)
+if(FALSE)
 	list(APPEND IRREXAMPLES AutomatedTest)
 endif()
 

examples/LoadMesh/main.cpp

@@ -0,0 +1,44 @@
+#include <irrlicht.h>
+#include <iostream>
+
+using namespace irr;
+
+int main(int argc, char *argv[])
+{
+	if (argc < 2)
+		return 1;
+
+	SIrrlichtCreationParameters p;
+	p.DriverType = video::EDT_NULL;
+	p.WindowSize = core::dimension2du(640, 480);
+	p.LoggingLevel = ELL_DEBUG;
+
+	auto *device = createDeviceEx(p);
+	if (!device)
+		return 1;
+	auto *smgr = device->getSceneManager();
+
+	while (__AFL_LOOP(10000)) {
+		auto *mfile = device->getFileSystem()->createAndOpenFile(argv[1]);
+		if (!mfile)
+			continue;
+		scene::IAnimatedMesh *mesh;
+		// Irrlicht matches on file extension so we have to do this by hand
+		for (u32 i = 0; i < smgr->getMeshLoaderCount(); i++) {
+			mfile->seek(0);
+			mesh = smgr->getMeshLoader(i)->createMesh(mfile);
+			if (mesh) {
+				core::stringc msg("Loaded using loader #");
+				msg += core::stringc(i);
+				device->getLogger()->log(msg.c_str(), ELL_DEBUG);
+				break;
+			}
+		}
+		if (mesh)
+			mesh->drop();
+		mfile->drop();
+	}
+
+	device->drop();
+	return 0;
+}

examples/LoadTexture/main.cpp

@@ -0,0 +1,29 @@
+#include <irrlicht.h>
+#include <iostream>
+
+using namespace irr;
+
+int main(int argc, char *argv[])
+{
+	if (argc < 2)
+		return 1;
+
+	SIrrlichtCreationParameters p;
+	p.DriverType = video::EDT_NULL;
+	p.WindowSize = core::dimension2du(640, 480);
+	p.LoggingLevel = ELL_DEBUG;
+
+	auto *device = createDeviceEx(p);
+	if (!device)
+		return 1;
+	auto *driver = device->getVideoDriver();
+
+	while (__AFL_LOOP(10000)) {
+		auto *tex = driver->getTexture(argv[1]);
+		if (tex)
+			driver->removeTexture(tex);
+	}
+
+	device->drop();
+	return 0;
+}

include/CIndexBuffer.h

@@ -0,0 +1,226 @@
+// 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,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __T_MESH_BUFFER_H_INCLUDED__
+#define __T_MESH_BUFFER_H_INCLUDED__
 
 #include "irrArray.h"
 #include "IMeshBuffer.h"
@@ -205,6 +206,37 @@ namespace scene
 		}
 
 
+		//! Append the meshbuffer to the current buffer
+		/** Only works for compatible types, i.e. either the same type
+		or the main buffer is of standard type. Otherwise, behavior is
+		undefined.
+		\param other Meshbuffer to be appended to this one.
+		*/
+		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
 		{
@@ -292,3 +324,7 @@ namespace scene
 	typedef CMeshBuffer<video::S3DVertexTangents> SMeshBufferTangents;
 } // end namespace scene
 } // end namespace irr
+
+#endif
+
+

include/CVertexBuffer.h

@@ -0,0 +1,213 @@
+// 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,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __E_ATTRIBUTES_H_INCLUDED__
+#define __E_ATTRIBUTES_H_INCLUDED__
 
 namespace irr
 {
@@ -18,9 +19,75 @@ 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,
 
@@ -30,3 +97,5 @@ enum E_ATTRIBUTE_TYPE
 
 } // end namespace io
 } // end namespace irr
+
+#endif

include/ECullingTypes.h

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

include/EDebugSceneTypes.h

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

include/EDeviceTypes.h

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

include/EDriverFeatures.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __E_DRIVER_FEATURES_H_INCLUDED__
+#define __E_DRIVER_FEATURES_H_INCLUDED__
 
 namespace irr
 {
@@ -120,6 +121,21 @@ 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,
 
@@ -135,3 +151,7 @@ namespace video
 
 } // end namespace video
 } // end namespace irr
+
+
+#endif
+

include/EDriverTypes.h

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

include/EFocusFlags.h

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

include/EGUIAlignment.h

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

include/EGUIElementTypes.h

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

include/EHardwareBufferFlags.h

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

include/EMaterialProps.h

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

include/EMaterialTypes.h

@@ -2,9 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
-
-#include "irrTypes.h"
+#ifndef __E_MATERIAL_TYPES_H_INCLUDED__
+#define __E_MATERIAL_TYPES_H_INCLUDED__
 
 namespace irr
 {
@@ -68,8 +67,9 @@ namespace video
 		0
 	};
 
-	constexpr u32 numBuiltInMaterials =
-		sizeof(sBuiltInMaterialTypeNames) / sizeof(char*) - 1;
-
 } // end namespace video
 } // end namespace irr
+
+
+#endif // __E_MATERIAL_TYPES_H_INCLUDED__
+

include/EMeshWriterEnums.h

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

include/EPrimitiveTypes.h

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

include/EReadFileType.h

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

include/ESceneNodeTypes.h

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

include/EShaderTypes.h

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

include/EVertexAttributes.h

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

include/IAnimatedMesh.h

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

include/IAnimatedMeshSceneNode.h

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

include/IAttributes.h

@@ -2,13 +2,29 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_ATTRIBUTES_H_INCLUDED__
+#define __I_ATTRIBUTES_H_INCLUDED__
 
 #include "IReferenceCounted.h"
-#include "EAttributes.h"
-
-// not needed here but I can't be bothered to clean the transitive includes up.
+#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"
 
 namespace irr
 {
@@ -39,6 +55,16 @@ 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;
 
@@ -127,3 +153,5 @@ public:
 
 } // end namespace io
 } // end namespace irr
+
+#endif

include/IBillboardSceneNode.h

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

include/IBoneSceneNode.h

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

include/ICameraSceneNode.h

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

include/IContextManager.h

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

include/ICursorControl.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_CURSOR_CONTROL_H_INCLUDED__
+#define __I_CURSOR_CONTROL_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
@@ -25,7 +26,7 @@ namespace gui
 		ECI_HELP,	// Arrow and question mark
 		ECI_IBEAM,	// typical text-selection cursor
 		ECI_NO,		// should not click icon
-		ECI_WAIT,	// hourglass
+		ECI_WAIT,	// hourclass
 		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
@@ -196,3 +197,6 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
+
+#endif
+

include/IDummyTransformationSceneNode.h

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

include/IEventReceiver.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_EVENT_RECEIVER_H_INCLUDED__
+#define __I_EVENT_RECEIVER_H_INCLUDED__
 
 #include "ILogger.h"
 #include "Keycodes.h"
@@ -262,10 +263,6 @@ 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,
@@ -636,3 +633,6 @@ struct SJoystickInfo
 
 
 } // end namespace irr
+
+#endif
+

include/IFileArchive.h

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

include/IFileList.h

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

include/IFileSystem.h

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

include/IGPUProgrammingServices.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
+#define __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
 
 #include "EShaderTypes.h"
 #include "EMaterialTypes.h"
@@ -154,7 +155,7 @@ public:
 			callback, baseMaterial, userData);
 	}
 
-	//! Like addHighLevelShaderMaterial(), but loads from files.
+	//! Like IGPUProgrammingServices::addShaderMaterial(), 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.
@@ -278,7 +279,7 @@ public:
 			callback, baseMaterial, userData);
 	}
 
-	//! Like addHighLevelShaderMaterial(), but loads from files.
+	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
 	/** \param vertexShaderProgram Text file handle containing the source
 	of the vertex shader program. Set to 0 if no vertex shader shall be
 	created.
@@ -356,16 +357,99 @@ public:
 			callback, baseMaterial, userData);
 	}
 
-	//! 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;
+	//! 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;
 };
 
 
 } // end namespace video
 } // end namespace irr
+
+#endif
+

include/IGUIButton.h

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

include/IGUICheckBox.h

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

include/IGUIComboBox.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_GUI_COMBO_BOX_H_INCLUDED__
+#define __I_GUI_COMBO_BOX_H_INCLUDED__
 
 #include "IGUIElement.h"
 
@@ -51,10 +52,6 @@ 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.
@@ -72,3 +69,6 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
+
+#endif
+

include/IGUIEditBox.h

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

include/IGUIElement.h

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

include/IGUIEnvironment.h

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

include/IGUIFileOpenDialog.h

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

include/IGUIFont.h

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

include/IGUIFontBitmap.h

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

include/IGUIImage.h

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

include/IGUIImageList.h

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

include/IGUIListBox.h

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

include/IGUIScrollBar.h

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

include/IGUISkin.h

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

include/IGUISpriteBank.h

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

include/IGUIStaticText.h

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

include/IGUITabControl.h

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

include/IGUIToolbar.h

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

include/IImage.h

@@ -2,13 +2,14 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_IMAGE_H_INCLUDED__
+#define __I_IMAGE_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
 #include "rect.h"
 #include "SColor.h"
-#include <cstring>
+#include <string.h>
 
 namespace irr
 {
@@ -361,6 +362,28 @@ 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:
@@ -395,18 +418,75 @@ public:
 	//! calculate image data size in bytes for selected format, width and height.
 	static u32 getDataSizeFromFormat(ECOLOR_FORMAT format, u32 width, u32 height)
 	{
-		// non-compressed formats
-		u32 imageSize = getBitsPerPixelFromFormat(format) / 8 * width;
+		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;
 			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)
@@ -443,6 +523,22 @@ 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;
@@ -464,3 +560,6 @@ protected:
 
 } // end namespace video
 } // end namespace irr
+
+#endif
+

include/IImageLoader.h

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

include/IImageWriter.h

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

include/IIndexBuffer.h

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

include/ILogger.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_LOGGER_H_INCLUDED__
+#define __I_LOGGER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 
@@ -18,7 +19,7 @@ enum ELOG_LEVEL
 	//! Used for printing information helpful in debugging
 	ELL_DEBUG,
 
-	//! Useful information to print. For example hardware info or something started/stopped.
+	//! Useful information to print. For example hardware infos or something started/stopped.
 	ELL_INFORMATION,
 
 	//! Warnings that something isn't as expected and can cause oddities
@@ -72,6 +73,30 @@ 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,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_MATERIAL_RENDERER_H_INCLUDED__
+#define __I_MATERIAL_RENDERER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -101,3 +102,6 @@ public:
 
 } // end namespace video
 } // end namespace irr
+
+#endif
+

include/IMaterialRendererServices.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
+#define __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
 
 #include "SMaterial.h"
 #include "S3DVertex.h"
@@ -37,11 +38,30 @@ public:
 		const SMaterial& lastMaterial,
 		bool resetAllRenderstates) = 0;
 
-	//! Return an index constant for the vertex shader based on a uniform variable name.
+	//! Return an index constant for the vertex shader based on a name.
 	virtual s32 getVertexShaderConstantID(const c8* name) = 0;
 
-	//! Sets a value for a vertex shader uniform variable.
-	/** \param index Index of the variable (as received from getVertexShaderConstantID)
+	//! 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
 	\param floats Pointer to array of floats
 	\param count Amount of floats in array.
 	\return True if successful.
@@ -52,16 +72,27 @@ 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;
 
-	//! Return an index constant for the pixel shader for the given uniform variable name
+	//! 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.
 	virtual s32 getPixelShaderConstantID(const c8* name) = 0;
 
-	//! Sets a value for the given pixel shader uniform variable
+	//! Sets a constant for the pixel shader based on a name.
 	/** This can be used if you used a high level shader language like GLSL
 	or HLSL to create a shader. See setVertexShaderConstant() for an
 	example on how to use this.
-	\param index Index of the variable (as received from getPixelShaderConstantID)
+	\param index Index of the variable
 	\param floats Pointer to array of floats
 	\param count Amount of floats in array.
 	\return True if successful. */
@@ -71,8 +102,19 @@ 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;
+
 	//! Get pointer to the IVideoDriver interface
 	/** \return Pointer to the IVideoDriver interface */
 	virtual IVideoDriver* getVideoDriver() = 0;
@@ -80,3 +122,6 @@ public:
 
 } // end namespace video
 } // end namespace irr
+
+#endif
+

include/IMemoryReadFile.h

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

include/IMesh.h

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

include/IMeshBuffer.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_MESH_BUFFER_H_INCLUDED__
+#define __I_MESH_BUFFER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -119,6 +120,11 @@ 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;
 
@@ -175,3 +181,5 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
+
+#endif

include/IMeshCache.h

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

include/IMeshLoader.h

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

include/IMeshManipulator.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_MESH_MANIPULATOR_H_INCLUDED__
+#define __I_MESH_MANIPULATOR_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "vector3d.h"
@@ -181,3 +182,6 @@ protected:
 
 } // end namespace scene
 } // end namespace irr
+
+
+#endif

include/IMeshSceneNode.h

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

include/IMeshWriter.h

@@ -2,7 +2,9 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __IRR_I_MESH_WRITER_H_INCLUDED__
+#define __IRR_I_MESH_WRITER_H_INCLUDED__
+
 #include "IReferenceCounted.h"
 #include "EMeshWriterEnums.h"
 
@@ -52,4 +54,5 @@ namespace scene
 } // end namespace
 } // end namespace
 
+#endif
 

include/IOSOperator.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_OS_OPERATOR_H_INCLUDED__
+#define __I_OS_OPERATOR_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "irrString.h"
@@ -10,11 +11,11 @@
 namespace irr
 {
 
-//! The OSOperator provides OS-specific methods and information.
+//! The Operating system operator provides operation system specific methods and information.
 class IOSOperator : public virtual IReferenceCounted
 {
 public:
-	//! Get the current OS version as string.
+	//! Get the current operation system version as string.
 	virtual const core::stringc& getOperatingSystemVersion() const = 0;
 
 	//! Copies text to the clipboard
@@ -44,3 +45,5 @@ public:
 };
 
 } // end namespace
+
+#endif

include/IReadFile.h

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

include/IReferenceCounted.h

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

include/IRenderTarget.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_RENDER_TARGET_H_INCLUDED__
+#define __I_RENDER_TARGET_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "EDriverTypes.h"
@@ -124,3 +125,5 @@ namespace video
 
 }
 }
+
+#endif

include/ISceneCollisionManager.h

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

include/ISceneManager.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_SCENE_MANAGER_H_INCLUDED__
+#define __I_SCENE_MANAGER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
@@ -129,7 +130,7 @@ namespace scene
 	{
 	public:
 
-		//! Get pointer to an animatable mesh. Loads the file if not loaded already.
+		//! Get pointer to an animateable mesh. Loads the file if not loaded already.
 		/**
 		 * If you want to remove a loaded mesh from the cache again, use removeMesh().
 		 *  Currently there are the following mesh formats supported:
@@ -508,7 +509,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 manually reset this.
+		after rendering them. But sometimes you might have to manully reset this.
 		For example when you deleted nodes between registering and rendering. */
 		virtual void clearAllRegisteredNodesForRendering() = 0;
 
@@ -639,3 +640,6 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
+
+#endif
+

include/ISceneNode.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_SCENE_NODE_H_INCLUDED__
+#define __I_SCENE_NODE_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "ESceneNodeTypes.h"
@@ -13,9 +14,7 @@
 #include "aabbox3d.h"
 #include "matrix4.h"
 #include "IAttributes.h"
-
 #include <list>
-#include <optional>
 
 namespace irr
 {
@@ -66,7 +65,7 @@ namespace scene
 
 		//! This method is called just before the rendering process of the whole scene.
 		/** Nodes may register themselves in the render pipeline during this call,
-		precalculate the geometry which should be rendered, and prevent their
+		precalculate the geometry which should be renderered, and prevent their
 		children from being able to register themselves if they are clipped by simply
 		not calling their OnRegisterSceneNode method.
 		If you are implementing your own scene node, you should overwrite this method
@@ -117,14 +116,23 @@ namespace scene
 
 		//! Returns the name of the node.
 		/** \return Name as character string. */
-		virtual const std::optional<std::string> &getName() const
+		virtual const c8* getName() const
 		{
-			return Name;
+			return Name.c_str();
 		}
 
+
 		//! Sets the name of the node.
 		/** \param name New name of the scene node. */
-		virtual void setName(const std::optional<std::string> &name)
+		virtual void setName(const c8* 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;
 		}
@@ -267,33 +275,33 @@ namespace scene
 
 				child->grab();
 				child->remove(); // remove from old parent
-				// Note: This iterator is not invalidated until we erase it.
-				child->ThisIterator = Children.insert(Children.end(), child);
+				Children.push_back(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 belongs to a different parent or no parent. */
+		e.g. because it couldn't be found in the children list. */
 		virtual bool removeChild(ISceneNode* child)
 		{
-			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();
+			ISceneNodeList::iterator it = Children.begin();
+			for (; it != Children.end(); ++it)
+				if ((*it) == child)
+				{
+					(*it)->Parent = 0;
+					(*it)->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
@@ -301,11 +309,13 @@ namespace scene
 		*/
 		virtual void removeAll()
 		{
-			for (auto &child : Children) {
-				child->Parent = nullptr;
-				child->ThisIterator = std::nullopt;
-				child->drop();
+			ISceneNodeList::iterator it = Children.begin();
+			for (; it != Children.end(); ++it)
+			{
+				(*it)->Parent = 0;
+				(*it)->drop();
 			}
+
 			Children.clear();
 		}
 
@@ -498,8 +508,10 @@ namespace scene
 			grab();
 			remove();
 
-			if (newParent)
-				newParent->addChild(this);
+			Parent = newParent;
+
+			if (Parent)
+				Parent->addChild(this);
 
 			drop();
 		}
@@ -592,7 +604,7 @@ namespace scene
 		}
 
 		//! Name of the scene node.
-		std::optional<std::string> Name;
+		core::stringc Name;
 
 		//! Absolute transformation of the node.
 		core::matrix4 AbsoluteTransformation;
@@ -606,15 +618,12 @@ namespace scene
 		//! Relative scale of the scene node.
 		core::vector3df RelativeScale;
 
-		//! 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;
 
+		//! List of all children of this node
+		std::list<ISceneNode*> Children;
+
 		//! Pointer to the scene manager
 		ISceneManager* SceneManager;
 
@@ -637,3 +646,6 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
+
+#endif
+

include/IShaderConstantSetCallBack.h

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

include/ISkinnedMesh.h

@@ -2,15 +2,14 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_SKINNED_MESH_H_INCLUDED__
+#define __I_SKINNED_MESH_H_INCLUDED__
 
 #include "irrArray.h"
 #include "IBoneSceneNode.h"
 #include "IAnimatedMesh.h"
 #include "SSkinMeshBuffer.h"
 
-#include <optional>
-
 namespace irr
 {
 namespace scene
@@ -42,12 +41,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 std::optional<std::string> &getJointName(u32 number) const = 0;
+		virtual const c8* getJointName(u32 number) const = 0;
 
 		//! Gets a joint number from its name
 		/** \param name: Name of the joint.
-		\return Number of the joint or std::nullopt if not found. */
-		virtual std::optional<u32> getJointNumber(const std::string &name) const = 0;
+		\return Number of the joint or -1 if not found. */
+		virtual s32 getJointNumber(const c8* name) const = 0;
 
 		//! Use animation from another mesh
 		/** The animation is linked (not copied) based on joint names
@@ -137,7 +136,7 @@ namespace scene
 			}
 
 			//! The name of this joint
-			std::optional<std::string> Name;
+			core::stringc Name;
 
 			//! Local matrix of this joint
 			core::matrix4 LocalMatrix;
@@ -221,3 +220,6 @@ namespace scene
 
 } // end namespace scene
 } // end namespace irr
+
+#endif
+

include/ITexture.h

@@ -2,7 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#pragma once
+#ifndef __I_TEXTURE_H_INCLUDED__
+#define __I_TEXTURE_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "IImage.h"
@@ -291,6 +292,11 @@ public:
 		{
 		case ECF_A8R8G8B8:
 		case ECF_A1R5G5B5:
+		case ECF_DXT1:
+		case ECF_DXT2:
+		case ECF_DXT3:
+		case ECF_DXT4:
+		case ECF_DXT5:
 		case ECF_A16B16G16R16F:
 		case ECF_A32B32G32R32F:
 			status = true;
@@ -339,3 +345,6 @@ protected:
 
 } // end namespace video
 } // end namespace irr
+
+#endif
+