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

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

.github/workflows/build.yml

@@ -8,47 +8,46 @@ on:
 jobs:
 
   linux-gl:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
-    container:
-      image: ubuntu:bionic
-      env: { LANG: "C.UTF-8" }
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
+          sudo apt-get update
-          apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+          sudo apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
 
       - name: Build
         run: |
-          cmake .
+          cmake . -DUSE_SDL2=OFF
           make VERBOSE=1 -j2
 
+      - name: Test
+        run: |
+          ctest --output-on-failure
+
       - name: Package
         run: |
           make DESTDIR=$PWD/_install install
           tar -c -I "gzip -9" -f irrlicht-linux.tar.gz -C ./_install/usr/local .
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: irrlicht-linux
           path: ./irrlicht-linux.tar.gz
 
   linux-gles:
-    runs-on: ubuntu-latest
+    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
-    container:
+    runs-on: ubuntu-22.04
-      image: ubuntu:bionic
-      env: { LANG: "C.UTF-8" }
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
+          sudo apt-get update
-          apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          sudo apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
-          cmake . -DBUILD_EXAMPLES=1 -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=OFF -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
           make -j2
 
       - name: Test (headless)
@@ -62,20 +61,17 @@ jobs:
           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
 
   linux-sdl:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
-    container:
-      image: ubuntu:jammy
-      env: { LANG: "C.UTF-8" }
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
+          sudo apt-get update
-          apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
 
       - name: Build
         run: |
-          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DCMAKE_BUILD_TYPE=Debug
           make -j2
 
       - name: Test (headless)
@@ -84,16 +80,14 @@ jobs:
           ./AutomatedTest null
 
   linux-sdl-gl3:
-    runs-on: ubuntu-latest
+    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
-    container:
+    runs-on: ubuntu-22.04
-      image: ubuntu:jammy
-      env: { LANG: "C.UTF-8" }
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
+          sudo apt-get update
-          apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
@@ -111,16 +105,13 @@ jobs:
           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest opengl3
 
   linux-sdl-gles2:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
-    container:
-      image: ubuntu:jammy
-      env: { LANG: "C.UTF-8" }
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
+          sudo apt-get update
-          apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
@@ -137,58 +128,48 @@ jobs:
           cd bin/Linux
           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
 
-  win32:
+  mingw:
-    runs-on: ubuntu-20.04
+    name: "MinGW ${{matrix.config.variant}}${{matrix.config.extras}}"
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {variant: win32, arch: i686}
+          - {variant: win64, arch: x86_64}
+          - {variant: win32, arch: i686, extras: "-sdl"}
+          - {variant: win64, arch: x86_64, extras: "-sdl"}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install compiler
         run: |
           sudo apt-get update && sudo apt-get install cmake -qyy
-          wget http://minetest.kitsunemimi.pw/mingw-w64-i686_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz
+          ./scripts/ci-get-mingw.sh
-          sudo tar -xaf mingw.tar.xz -C /usr
 
       - name: Build
         run: |
           ./scripts/ci-build-mingw.sh package
         env:
-          CC: i686-w64-mingw32-gcc
+          CC: ${{matrix.config.arch}}-w64-mingw32-clang
-          CXX: i686-w64-mingw32-g++
+          CXX: ${{matrix.config.arch}}-w64-mingw32-clang++
+          extras: ${{matrix.config.extras}}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: irrlicht-win32
+          name: irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}
-          path: ./irrlicht-win32.zip
+          path: ./irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}.zip
-
-  win64:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install compiler
-        run: |
-          sudo apt-get update && sudo apt-get install cmake -qyy
-          wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz
-          sudo tar -xaf mingw.tar.xz -C /usr
-
-      - name: Build
-        run: |
-          ./scripts/ci-build-mingw.sh package
-        env:
-          CC: x86_64-w64-mingw32-gcc
-          CXX: x86_64-w64-mingw32-g++
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: irrlicht-win64
-          path: ./irrlicht-win64.zip
 
   macos:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          brew update
+          brew update --auto-update
           brew install cmake libpng jpeg
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
 
       - name: Build
         run: |
@@ -199,13 +180,30 @@ jobs:
         run: |
           ./bin/OSX/AutomatedTest null
 
+  macos-sdl:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          brew update --auto-update
+          brew install cmake libpng jpeg sdl2
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+
+      - name: Build
+        run: |
+          cmake . -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_EXAMPLES=1 -DUSE_SDL2=1
+          make -j3
+
   msvc:
-    name: VS 2019 ${{ matrix.config.arch }}
+    name: VS 2019 ${{ matrix.config.arch }} ${{ matrix.sdl.label }}
     runs-on: windows-2019
     env:
-      VCPKG_VERSION: 14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44
+      VCPKG_VERSION: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
-        # 2022.05.10
+      # 2023.10.19
-      vcpkg_packages: zlib libpng libjpeg-turbo opengl-registry
+      vcpkg_packages: zlib libpng libjpeg-turbo
     strategy:
       fail-fast: false
       matrix:
@@ -218,15 +216,24 @@ jobs:
             arch: x64
             generator: "-G'Visual Studio 16 2019' -A x64"
             vcpkg_triplet: x64-windows
+        sdl:
+          -
+            use: FALSE
+            label: '(no SDL)'
+            vcpkg_packages: opengl-registry
+          -
+            use: TRUE
+            label: '(with SDL)'
+            vcpkg_packages: sdl2
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Restore from cache and run vcpkg
         uses: lukka/run-vcpkg@v7
         with:
-          vcpkgArguments: ${{env.vcpkg_packages}}
+          vcpkgArguments: ${{env.vcpkg_packages}} ${{matrix.sdl.vcpkg_packages}}
           vcpkgDirectory: '${{ github.workspace }}\vcpkg'
           appendedCacheKey: ${{ matrix.config.vcpkg_triplet }}
           vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
@@ -235,6 +242,7 @@ jobs:
       - name: CMake
         run: |
             cmake ${{matrix.config.generator}}  `
+            -DUSE_SDL2=${{matrix.sdl.use}}  `
             -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake"  `
             -DCMAKE_BUILD_TYPE=Release .
 
@@ -253,7 +261,50 @@ jobs:
         run: move include artifact/
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: msvc-${{ matrix.config.arch }}
+          name: msvc-${{ matrix.config.arch }}-${{matrix.sdl.use}}
           path: artifact/
+
+  android:
+    name: Android ${{ matrix.arch }}
+    runs-on: ubuntu-20.04
+    env:
+       ndk_version: "r25c"
+       ANDROID_NDK: ${{ github.workspace }}/android-ndk
+    strategy:
+      matrix:
+        arch: [armeabi-v7a, arm64-v8a, x86, x86_64]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install deps
+        run: |
+          sudo rm /var/lib/man-db/auto-update
+          sudo apt-get update
+          sudo apt-get install -qyy wget unzip zip gcc-multilib make cmake
+
+      - name: Cache NDK
+        id: cache-ndk
+        uses: actions/cache@v4
+        with:
+          key: android-ndk-${{ env.ndk_version }}-linux
+          path: ${{ env.ANDROID_NDK }}
+
+      - name: Install NDK
+        run: |
+          wget --progress=bar:force "http://dl.google.com/android/repository/android-ndk-${ndk_version}-linux.zip"
+          unzip -q "android-ndk-${ndk_version}-linux.zip"
+          rm "android-ndk-${ndk_version}-linux.zip"
+          mv "android-ndk-${ndk_version}" "${ANDROID_NDK}"
+        if: ${{ steps.cache-ndk.outputs.cache-hit != 'true' }}
+
+      - name: Build
+        run: ./scripts/ci-build-android.sh ${{ matrix.arch }}
+
+      #- name: Upload Artifact
+      #  uses: actions/upload-artifact@v4
+      #  with:
+      #    name: irrlicht-android-${{ matrix.arch }}
+      #    path: ${{ runner.temp }}/pkg/${{ matrix.arch }}

.gitignore

@@ -5,6 +5,7 @@ install_manifest.txt
 IrrlichtMtConfig.cmake
 IrrlichtMtConfigVersion.cmake
 IrrlichtMtTargets.cmake
+CTestTestfile.cmake
 Makefile
 libs/*
 *.so*
@@ -19,3 +20,6 @@ scripts/glext.h
 *.dir/
 *.sln
 *visualstudio/
+
+# vscode cmake plugin
+build/*

CMakeLists.txt

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

Config.cmake.in

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

LICENSE

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

LICENSE

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

README.md

@@ -1,9 +1,16 @@
 IrrlichtMt version 1.9
 ======================
 
-The Irrlicht Engine is an open source realtime 3D engine written in C++.
+Notice
+------
 
-This is a fork by the [Minetest](https://github.com/minetest) developers that was stripped-down and customized specifically for use in Minetest.
+IrrlichtMt has been moved into the [main Minetest repository](https://github.com/minetest) during Minetest 5.9 development. This repository is an archive useful for building older versions of Minetest.
+
+About
+-----
+
+IrrlichtMt is the 3D engine of [Minetest](https://github.com/minetest).
+It is based on the [Irrlicht Engine](https://irrlicht.sourceforge.io/) but is now developed independently.
 It is intentionally not compatible to upstream and is planned to be eventually absorbed into Minetest.
 
 Build
@@ -16,6 +23,7 @@ The following libraries are required to be installed:
 * OpenGL
   * or on mobile: OpenGL ES (can be optionally enabled on desktop too)
 * on Unix: X11
+* SDL2 (see below)
 
 Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the following options are available:
 * `BUILD_SHARED_LIBS` (default: `ON`) - Build IrrlichtMt as a shared library
@@ -24,7 +32,7 @@ Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the
 * `ENABLE_OPENGL3` (default: `OFF`) - Enable OpenGL 3+ driver
 * `ENABLE_GLES1` - Enable OpenGL ES driver, legacy
 * `ENABLE_GLES2` - Enable OpenGL ES 2+ driver
-* `USE_SDL2` (default: `OFF`) - Use SDL2 instead of native platform device
+* `USE_SDL2` (default: platform-dependent, usually `ON`) - Use SDL2 instead of older native device code
 
 e.g. on a Linux system you might want to build for local use like this:
 
@@ -41,7 +49,7 @@ It is highly recommended to use vcpkg as package manager.
 
 After you successfully built vcpkg you can easily install the required libraries:
 
-	vcpkg install zlib libjpeg-turbo libpng opengl-registry --triplet x64-windows
+	vcpkg install zlib libjpeg-turbo libpng sdl2 --triplet x64-windows
 	
 Run the following script in PowerShell:
 

bin/Linux/readme.txt

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

bin/OSX/readme.txt

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

bin/Win32-VisualStudio/readme.txt

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

bin/Win32-gcc/readme.txt

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

bin/emscripten/readme.txt

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

doc/irrlicht-license.txt

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

doc/release_checklist.txt

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

examples/AutomatedTest/main.cpp

@@ -28,14 +28,14 @@ static video::E_DRIVER_TYPE chooseDriver(core::stringc arg_)
 
 static inline void check(bool ok, const char *msg)
 {
-	if (!ok)
+	if (!ok) {
-	{
 		test_fail++;
 		device->getLogger()->log((core::stringc("FAILED TEST: ") + msg).c_str(), ELL_ERROR);
 	}
 }
 
-void run_unit_tests() {
+void run_unit_tests()
+{
 	std::cout << "Running unit tests:" << std::endl;
 	try {
 		test_irr_array();
@@ -72,66 +72,61 @@ int main(int argc, char *argv[])
 	device->setWindowCaption(L"Hello World!");
 	device->setResizable(true);
 
-	video::IVideoDriver* driver = device->getVideoDriver();
+	video::IVideoDriver *driver = device->getVideoDriver();
-	scene::ISceneManager* smgr = device->getSceneManager();
+	scene::ISceneManager *smgr = device->getSceneManager();
-	gui::IGUIEnvironment* guienv = device->getGUIEnvironment();
+	gui::IGUIEnvironment *guienv = device->getGUIEnvironment();
 
-	guienv->addStaticText(L"sample text", core::rect<s32>(10,10,110,22), false);
+	guienv->addStaticText(L"sample text", core::rect<s32>(10, 10, 110, 22), false);
 
-	gui::IGUIButton* button = guienv->addButton(
+	gui::IGUIButton *button = guienv->addButton(
-		core::rect<s32>(10,30,110,30 + 32), 0, -1, L"sample button",
+			core::rect<s32>(10, 30, 110, 30 + 32), 0, -1, L"sample button",
-		L"sample tooltip");
+			L"sample tooltip");
 
-	gui::IGUIEditBox* editbox = guienv->addEditBox(L"",
+	gui::IGUIEditBox *editbox = guienv->addEditBox(L"",
-		core::rect<s32>(10,70,60,70 + 16));
+			core::rect<s32>(10, 70, 60, 70 + 16));
 
 	const io::path mediaPath = getExampleMediaPath();
 
 	auto mesh_file = device->getFileSystem()->createAndOpenFile(mediaPath + "coolguy_opt.x");
 	check(mesh_file, "mesh file loading");
-	scene::IAnimatedMesh* mesh = smgr->getMesh(mesh_file);
+	scene::IAnimatedMesh *mesh = smgr->getMesh(mesh_file);
 	check(mesh, "mesh loading");
 	if (mesh_file)
 		mesh_file->drop();
-	if (mesh)
+	if (mesh) {
-	{
+		video::ITexture *tex = driver->getTexture(mediaPath + "cooltexture.png");
-		video::ITexture* tex = driver->getTexture(mediaPath + "cooltexture.png");
 		check(tex, "texture loading");
-		scene::IAnimatedMeshSceneNode* node = smgr->addAnimatedMeshSceneNode(mesh);
+		scene::IAnimatedMeshSceneNode *node = smgr->addAnimatedMeshSceneNode(mesh);
-		if (node)
+		if (node) {
-		{
+			node->forEachMaterial([tex](video::SMaterial &mat) {
-			node->setMaterialFlag(video::EMF_LIGHTING, false);
+				mat.Lighting = false;
+				mat.setTexture(0, tex);
+			});
 			node->setFrameLoop(0, 29);
 			node->setAnimationSpeed(30);
-			node->setMaterialTexture(0, tex);
 		}
 	}
 
-	smgr->addCameraSceneNode(0, core::vector3df(0,4,5), core::vector3df(0,2,0));
+	smgr->addCameraSceneNode(0, core::vector3df(0, 4, 5), core::vector3df(0, 2, 0));
 
 	s32 n = 0;
 	SEvent event;
 	device->getTimer()->start();
 
-	while (device->run())
+	while (device->run()) {
-	{
+		if (device->getTimer()->getTime() >= 1000) {
-		if (device->getTimer()->getTime() >= 1000)
-		{
 			device->getTimer()->setTime(0);
 			++n;
-			if (n == 1) // Tooltip display
+			if (n == 1) { // Tooltip display
-			{
 				bzero(&event, sizeof(SEvent));
 				event.EventType = irr::EET_MOUSE_INPUT_EVENT;
 				event.MouseInput.Event = irr::EMIE_MOUSE_MOVED;
 				event.MouseInput.X = button->getAbsolutePosition().getCenter().X;
 				event.MouseInput.Y = button->getAbsolutePosition().getCenter().Y;
 				device->postEventFromUser(event);
-			}
+			} else if (n == 2) // Text input focus
-			else if (n == 2) // Text input focus
 				guienv->setFocus(editbox);
-			else if (n == 3) // Keypress for Text input
+			else if (n == 3) { // Keypress for Text input
-			{
 				bzero(&event, sizeof(SEvent));
 				event.EventType = irr::EET_KEY_INPUT_EVENT;
 				event.KeyInput.Char = L'a';
@@ -140,13 +135,12 @@ int main(int argc, char *argv[])
 				device->postEventFromUser(event);
 				event.KeyInput.PressedDown = false;
 				device->postEventFromUser(event);
-			}
+			} else
-			else
 				device->closeDevice();
 		}
 
 		driver->beginScene(video::ECBF_COLOR | video::ECBF_DEPTH,
-			video::SColor(255,100,100,150));
+				video::SColor(255, 100, 100, 150));
 		smgr->drawAll();
 		guienv->drawAll();
 		driver->endScene();

examples/AutomatedTest/test_array.cpp

@@ -4,7 +4,8 @@
 using namespace irr;
 using core::array;
 
-static void test_basics() {
+static void test_basics()
+{
 	array<int> v;
 	v.push_back(1);  // 1
 	v.push_front(2); // 2, 1
@@ -57,7 +58,8 @@ static void test_basics() {
 	UASSERTEQ(v.size(), 2);
 }
 
-static void test_linear_searches() {
+static void test_linear_searches()
+{
 	// Populate the array with 0, 1, 2, ..., 100, 100, 99, 98, 97, ..., 0
 	array<int> arr;
 	for (int i = 0; i <= 100; i++)
@@ -75,14 +77,15 @@ static void test_linear_searches() {
 	}
 }
 
-static void test_binary_searches() {
+static void test_binary_searches()
-	const auto& values = { 3, 5, 1, 2, 5, 10, 19, 9, 7, 1, 2, 5, 8, 15 };
+{
+	const auto &values = {3, 5, 1, 2, 5, 10, 19, 9, 7, 1, 2, 5, 8, 15};
 	array<int> arr;
 	for (int value : values) {
 		arr.push_back(value);
 	}
 	// Test the const form first, it uses a linear search without sorting
-	const array<int> & carr = arr;
+	const array<int> &carr = arr;
 	UASSERTEQ(carr.binary_search(20), -1);
 	UASSERTEQ(carr.binary_search(0), -1);
 	UASSERTEQ(carr.binary_search(1), 2);

examples/AutomatedTest/test_helper.h

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

examples/AutomatedTest/test_string.cpp

@@ -38,7 +38,7 @@ static void test_basics()
 	UASSERTSTR(s, "abcdef");
 	s = L"abcdef";
 	UASSERTSTR(s, "abcdef");
-	s = static_cast<const char*>(nullptr);
+	s = static_cast<const char *>(nullptr);
 	UASSERTSTR(s, "");
 	// operator+
 	s = s + stringc("foo");
@@ -163,27 +163,37 @@ static void test_methods()
 	UASSERTSTR(res[0], "a");
 	UASSERTSTR(res[2], "");
 	for (int i = 0; i < 3; i++)
-		UASSERTSTR(res[2*i+1], ",");
+		UASSERTSTR(res[2 * i + 1], ",");
 }
 
 static void test_conv()
 {
-	// assumes Unicode and UTF-8 locale
+	// locale-independent
-	setlocale(LC_CTYPE, "");
 
 	stringw out;
-	multibyteToWString(out, "†††");
+	utf8ToWString(out, "†††");
 	UASSERTEQ(out.size(), 3);
 	for (int i = 0; i < 3; i++)
 		UASSERTEQ(static_cast<u16>(out[i]), 0x2020);
+
 	stringc out2;
-	wStringToMultibyte(out2, L"†††");
+	wStringToUTF8(out2, L"†††");
 	UASSERTEQ(out2.size(), 9);
 	for (int i = 0; i < 3; i++) {
-		UASSERTEQ(static_cast<u8>(out2[3*i]), 0xe2);
+		UASSERTEQ(static_cast<u8>(out2[3 * i]), 0xe2);
-		UASSERTEQ(static_cast<u8>(out2[3*i+1]), 0x80);
+		UASSERTEQ(static_cast<u8>(out2[3 * i + 1]), 0x80);
-		UASSERTEQ(static_cast<u8>(out2[3*i+2]), 0xa0);
+		UASSERTEQ(static_cast<u8>(out2[3 * i + 2]), 0xa0);
 	}
+
+	// locale-dependent
+	if (!setlocale(LC_CTYPE, "C.UTF-8"))
+		setlocale(LC_CTYPE, "UTF-8"); // macOS
+
+	stringw out3;
+	multibyteToWString(out3, "†††");
+	UASSERTEQ(out3.size(), 3);
+	for (int i = 0; i < 3; i++)
+		UASSERTEQ(static_cast<u16>(out3[i]), 0x2020);
 }
 
 void test_irr_string()

examples/CMakeLists.txt

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

include/CIndexBuffer.h

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

include/CMeshBuffer.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __T_MESH_BUFFER_H_INCLUDED__
+#pragma once
-#define __T_MESH_BUFFER_H_INCLUDED__
 
 #include "irrArray.h"
 #include "IMeshBuffer.h"
@@ -12,319 +11,264 @@ namespace irr
 {
 namespace scene
 {
-	//! Template implementation of the IMeshBuffer interface
+//! Template implementation of the IMeshBuffer interface
-	template <class T>
+template <class T>
-	class CMeshBuffer : public IMeshBuffer
+class CMeshBuffer : public IMeshBuffer
+{
+public:
+	//! Default constructor for empty meshbuffer
+	CMeshBuffer() :
+			ChangedID_Vertex(1), ChangedID_Index(1), MappingHint_Vertex(EHM_NEVER), MappingHint_Index(EHM_NEVER), HWBuffer(NULL), PrimitiveType(EPT_TRIANGLES)
 	{
-	public:
+#ifdef _DEBUG
-		//! Default constructor for empty meshbuffer
+		setDebugName("CMeshBuffer");
-		CMeshBuffer()
+#endif
-			: ChangedID_Vertex(1), ChangedID_Index(1)
+	}
-			, MappingHint_Vertex(EHM_NEVER), MappingHint_Index(EHM_NEVER)
+
-			, HWBuffer(NULL)
+	//! Get material of this meshbuffer
-			, PrimitiveType(EPT_TRIANGLES)
+	/** \return Material of this buffer */
-		{
+	const video::SMaterial &getMaterial() const override
-			#ifdef _DEBUG
+	{
-			setDebugName("CMeshBuffer");
+		return Material;
-			#endif
+	}
+
+	//! Get material of this meshbuffer
+	/** \return Material of this buffer */
+	video::SMaterial &getMaterial() override
+	{
+		return Material;
+	}
+
+	//! Get pointer to vertices
+	/** \return Pointer to vertices. */
+	const void *getVertices() const override
+	{
+		return Vertices.const_pointer();
+	}
+
+	//! Get pointer to vertices
+	/** \return Pointer to vertices. */
+	void *getVertices() override
+	{
+		return Vertices.pointer();
+	}
+
+	//! Get number of vertices
+	/** \return Number of vertices. */
+	u32 getVertexCount() const override
+	{
+		return Vertices.size();
+	}
+
+	//! Get type of index data which is stored in this meshbuffer.
+	/** \return Index type of this buffer. */
+	video::E_INDEX_TYPE getIndexType() const override
+	{
+		return video::EIT_16BIT;
+	}
+
+	//! Get pointer to indices
+	/** \return Pointer to indices. */
+	const u16 *getIndices() const override
+	{
+		return Indices.const_pointer();
+	}
+
+	//! Get pointer to indices
+	/** \return Pointer to indices. */
+	u16 *getIndices() override
+	{
+		return Indices.pointer();
+	}
+
+	//! Get number of indices
+	/** \return Number of indices. */
+	u32 getIndexCount() const override
+	{
+		return Indices.size();
+	}
+
+	//! Get the axis aligned bounding box
+	/** \return Axis aligned bounding box of this buffer. */
+	const core::aabbox3d<f32> &getBoundingBox() const override
+	{
+		return BoundingBox;
+	}
+
+	//! Set the axis aligned bounding box
+	/** \param box New axis aligned bounding box for this buffer. */
+	//! set user axis aligned bounding box
+	void setBoundingBox(const core::aabbox3df &box) override
+	{
+		BoundingBox = box;
+	}
+
+	//! Recalculate the bounding box.
+	/** should be called if the mesh changed. */
+	void recalculateBoundingBox() override
+	{
+		if (!Vertices.empty()) {
+			BoundingBox.reset(Vertices[0].Pos);
+			const irr::u32 vsize = Vertices.size();
+			for (u32 i = 1; i < vsize; ++i)
+				BoundingBox.addInternalPoint(Vertices[i].Pos);
+		} else
+			BoundingBox.reset(0, 0, 0);
+	}
+
+	//! Get type of vertex data stored in this buffer.
+	/** \return Type of vertex data. */
+	video::E_VERTEX_TYPE getVertexType() const override
+	{
+		return T::getType();
+	}
+
+	//! returns position of vertex i
+	const core::vector3df &getPosition(u32 i) const override
+	{
+		return Vertices[i].Pos;
+	}
+
+	//! returns position of vertex i
+	core::vector3df &getPosition(u32 i) override
+	{
+		return Vertices[i].Pos;
+	}
+
+	//! returns normal of vertex i
+	const core::vector3df &getNormal(u32 i) const override
+	{
+		return Vertices[i].Normal;
+	}
+
+	//! returns normal of vertex i
+	core::vector3df &getNormal(u32 i) override
+	{
+		return Vertices[i].Normal;
+	}
+
+	//! returns texture coord of vertex i
+	const core::vector2df &getTCoords(u32 i) const override
+	{
+		return Vertices[i].TCoords;
+	}
+
+	//! returns texture coord of vertex i
+	core::vector2df &getTCoords(u32 i) override
+	{
+		return Vertices[i].TCoords;
+	}
+
+	//! Append the vertices and indices to the current buffer
+	/** Only works for compatible types, i.e. either the same type
+	or the main buffer is of standard type. Otherwise, behavior is
+	undefined.
+	*/
+	void append(const void *const vertices, u32 numVertices, const u16 *const indices, u32 numIndices) override
+	{
+		if (vertices == getVertices())
+			return;
+
+		const u32 vertexCount = getVertexCount();
+		u32 i;
+
+		Vertices.reallocate(vertexCount + numVertices);
+		for (i = 0; i < numVertices; ++i) {
+			Vertices.push_back(static_cast<const T *>(vertices)[i]);
+			BoundingBox.addInternalPoint(static_cast<const T *>(vertices)[i].Pos);
 		}
 
-
+		Indices.reallocate(getIndexCount() + numIndices);
-		//! Get material of this meshbuffer
+		for (i = 0; i < numIndices; ++i) {
-		/** \return Material of this buffer */
+			Indices.push_back(indices[i] + vertexCount);
-		const video::SMaterial& getMaterial() const override
-		{
-			return Material;
 		}
+	}
 
+	//! get the current hardware mapping hint
+	E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const override
+	{
+		return MappingHint_Vertex;
+	}
 
-		//! Get material of this meshbuffer
+	//! get the current hardware mapping hint
-		/** \return Material of this buffer */
+	E_HARDWARE_MAPPING getHardwareMappingHint_Index() const override
-		video::SMaterial& getMaterial() override
+	{
-		{
+		return MappingHint_Index;
-			return Material;
+	}
-		}
 
+	//! set the hardware mapping hint, for driver
+	void setHardwareMappingHint(E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer = EBT_VERTEX_AND_INDEX) override
+	{
+		if (Buffer == EBT_VERTEX_AND_INDEX || Buffer == EBT_VERTEX)
+			MappingHint_Vertex = NewMappingHint;
+		if (Buffer == EBT_VERTEX_AND_INDEX || Buffer == EBT_INDEX)
+			MappingHint_Index = NewMappingHint;
+	}
 
-		//! Get pointer to vertices
+	//! Describe what kind of primitive geometry is used by the meshbuffer
-		/** \return Pointer to vertices. */
+	void setPrimitiveType(E_PRIMITIVE_TYPE type) override
-		const void* getVertices() const override
+	{
-		{
+		PrimitiveType = type;
-			return Vertices.const_pointer();
+	}
-		}
 
+	//! Get the kind of primitive geometry which is used by the meshbuffer
+	E_PRIMITIVE_TYPE getPrimitiveType() const override
+	{
+		return PrimitiveType;
+	}
 
-		//! Get pointer to vertices
+	//! flags the mesh as changed, reloads hardware buffers
-		/** \return Pointer to vertices. */
+	void setDirty(E_BUFFER_TYPE Buffer = EBT_VERTEX_AND_INDEX) override
-		void* getVertices() override
+	{
-		{
+		if (Buffer == EBT_VERTEX_AND_INDEX || Buffer == EBT_VERTEX)
-			return Vertices.pointer();
+			++ChangedID_Vertex;
-		}
+		if (Buffer == EBT_VERTEX_AND_INDEX || Buffer == EBT_INDEX)
+			++ChangedID_Index;
+	}
 
+	//! Get the currently used ID for identification of changes.
+	/** This shouldn't be used for anything outside the VideoDriver. */
+	u32 getChangedID_Vertex() const override { return ChangedID_Vertex; }
 
-		//! Get number of vertices
+	//! Get the currently used ID for identification of changes.
-		/** \return Number of vertices. */
+	/** This shouldn't be used for anything outside the VideoDriver. */
-		u32 getVertexCount() const override
+	u32 getChangedID_Index() const override { return ChangedID_Index; }
-		{
-			return Vertices.size();
-		}
 
-		//! Get type of index data which is stored in this meshbuffer.
+	void setHWBuffer(void *ptr) const override
-		/** \return Index type of this buffer. */
+	{
-		video::E_INDEX_TYPE getIndexType() const override
+		HWBuffer = ptr;
-		{
+	}
-			return video::EIT_16BIT;
-		}
 
-		//! Get pointer to indices
+	void *getHWBuffer() const override
-		/** \return Pointer to indices. */
+	{
-		const u16* getIndices() const override
+		return HWBuffer;
-		{
+	}
-			return Indices.const_pointer();
-		}
 
+	u32 ChangedID_Vertex;
+	u32 ChangedID_Index;
 
-		//! Get pointer to indices
+	//! hardware mapping hint
-		/** \return Pointer to indices. */
+	E_HARDWARE_MAPPING MappingHint_Vertex;
-		u16* getIndices() override
+	E_HARDWARE_MAPPING MappingHint_Index;
-		{
+	mutable void *HWBuffer;
-			return Indices.pointer();
-		}
 
+	//! Material for this meshbuffer.
+	video::SMaterial Material;
+	//! Vertices of this buffer
+	core::array<T> Vertices;
+	//! Indices into the vertices of this buffer.
+	core::array<u16> Indices;
+	//! Bounding box of this meshbuffer.
+	core::aabbox3d<f32> BoundingBox;
+	//! Primitive type used for rendering (triangles, lines, ...)
+	E_PRIMITIVE_TYPE PrimitiveType;
+};
 
-		//! Get number of indices
+//! Standard meshbuffer
-		/** \return Number of indices. */
+typedef CMeshBuffer<video::S3DVertex> SMeshBuffer;
-		u32 getIndexCount() const override
+//! Meshbuffer with two texture coords per vertex, e.g. for lightmaps
-		{
+typedef CMeshBuffer<video::S3DVertex2TCoords> SMeshBufferLightMap;
-			return Indices.size();
+//! Meshbuffer with vertices having tangents stored, e.g. for normal mapping
-		}
+typedef CMeshBuffer<video::S3DVertexTangents> SMeshBufferTangents;
-
-
-		//! Get the axis aligned bounding box
-		/** \return Axis aligned bounding box of this buffer. */
-		const core::aabbox3d<f32>& getBoundingBox() const override
-		{
-			return BoundingBox;
-		}
-
-
-		//! Set the axis aligned bounding box
-		/** \param box New axis aligned bounding box for this buffer. */
-		//! set user axis aligned bounding box
-		void setBoundingBox(const core::aabbox3df& box) override
-		{
-			BoundingBox = box;
-		}
-
-
-		//! Recalculate the bounding box.
-		/** should be called if the mesh changed. */
-		void recalculateBoundingBox() override
-		{
-			if (!Vertices.empty())
-			{
-				BoundingBox.reset(Vertices[0].Pos);
-				const irr::u32 vsize = Vertices.size();
-				for (u32 i=1; i<vsize; ++i)
-					BoundingBox.addInternalPoint(Vertices[i].Pos);
-			}
-			else
-				BoundingBox.reset(0,0,0);
-
-		}
-
-
-		//! Get type of vertex data stored in this buffer.
-		/** \return Type of vertex data. */
-		video::E_VERTEX_TYPE getVertexType() const override
-		{
-			return T::getType();
-		}
-
-		//! returns position of vertex i
-		const core::vector3df& getPosition(u32 i) const override
-		{
-			return Vertices[i].Pos;
-		}
-
-		//! returns position of vertex i
-		core::vector3df& getPosition(u32 i) override
-		{
-			return Vertices[i].Pos;
-		}
-
-		//! returns normal of vertex i
-		const core::vector3df& getNormal(u32 i) const override
-		{
-			return Vertices[i].Normal;
-		}
-
-		//! returns normal of vertex i
-		core::vector3df& getNormal(u32 i) override
-		{
-			return Vertices[i].Normal;
-		}
-
-		//! returns texture coord of vertex i
-		const core::vector2df& getTCoords(u32 i) const override
-		{
-			return Vertices[i].TCoords;
-		}
-
-		//! returns texture coord of vertex i
-		core::vector2df& getTCoords(u32 i) override
-		{
-			return Vertices[i].TCoords;
-		}
-
-
-		//! Append the vertices and indices to the current buffer
-		/** Only works for compatible types, i.e. either the same type
-		or the main buffer is of standard type. Otherwise, behavior is
-		undefined.
-		*/
-		void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) override
-		{
-			if (vertices == getVertices())
-				return;
-
-			const u32 vertexCount = getVertexCount();
-			u32 i;
-
-			Vertices.reallocate(vertexCount+numVertices);
-			for (i=0; i<numVertices; ++i)
-			{
-				Vertices.push_back(static_cast<const T*>(vertices)[i]);
-				BoundingBox.addInternalPoint(static_cast<const T*>(vertices)[i].Pos);
-			}
-
-			Indices.reallocate(getIndexCount()+numIndices);
-			for (i=0; i<numIndices; ++i)
-			{
-				Indices.push_back(indices[i]+vertexCount);
-			}
-		}
-
-
-		//! Append the meshbuffer to the current buffer
-		/** Only works for compatible types, i.e. either the same type
-		or the main buffer is of standard type. Otherwise, behavior is
-		undefined.
-		\param other Meshbuffer to be appended to this one.
-		*/
-		void append(const IMeshBuffer* const other) override
-		{
-			/*
-			if (this==other)
-				return;
-
-			const u32 vertexCount = getVertexCount();
-			u32 i;
-
-			Vertices.reallocate(vertexCount+other->getVertexCount());
-			for (i=0; i<other->getVertexCount(); ++i)
-			{
-				Vertices.push_back(reinterpret_cast<const T*>(other->getVertices())[i]);
-			}
-
-			Indices.reallocate(getIndexCount()+other->getIndexCount());
-			for (i=0; i<other->getIndexCount(); ++i)
-			{
-				Indices.push_back(other->getIndices()[i]+vertexCount);
-			}
-			BoundingBox.addInternalBox(other->getBoundingBox());
-			*/
-		}
-
-
-		//! get the current hardware mapping hint
-		E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const override
-		{
-			return MappingHint_Vertex;
-		}
-
-		//! get the current hardware mapping hint
-		E_HARDWARE_MAPPING getHardwareMappingHint_Index() const override
-		{
-			return MappingHint_Index;
-		}
-
-		//! set the hardware mapping hint, for driver
-		void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX ) override
-		{
-			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_VERTEX)
-				MappingHint_Vertex=NewMappingHint;
-			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_INDEX)
-				MappingHint_Index=NewMappingHint;
-		}
-
-		//! Describe what kind of primitive geometry is used by the meshbuffer
-		void setPrimitiveType(E_PRIMITIVE_TYPE type) override
-		{
-			PrimitiveType = type;
-		}
-
-		//! Get the kind of primitive geometry which is used by the meshbuffer
-		E_PRIMITIVE_TYPE getPrimitiveType() const override
-		{
-			return PrimitiveType;
-		}
-
-		//! flags the mesh as changed, reloads hardware buffers
-		void setDirty(E_BUFFER_TYPE Buffer=EBT_VERTEX_AND_INDEX) override
-		{
-			if (Buffer==EBT_VERTEX_AND_INDEX ||Buffer==EBT_VERTEX)
-				++ChangedID_Vertex;
-			if (Buffer==EBT_VERTEX_AND_INDEX || Buffer==EBT_INDEX)
-				++ChangedID_Index;
-		}
-
-		//! Get the currently used ID for identification of changes.
-		/** This shouldn't be used for anything outside the VideoDriver. */
-		u32 getChangedID_Vertex() const override {return ChangedID_Vertex;}
-
-		//! Get the currently used ID for identification of changes.
-		/** This shouldn't be used for anything outside the VideoDriver. */
-		u32 getChangedID_Index() const override {return ChangedID_Index;}
-
-		void setHWBuffer(void *ptr) const override {
-			HWBuffer = ptr;
-		}
-
-		void *getHWBuffer() const override {
-			return HWBuffer;
-		}
-
-
-		u32 ChangedID_Vertex;
-		u32 ChangedID_Index;
-
-		//! hardware mapping hint
-		E_HARDWARE_MAPPING MappingHint_Vertex;
-		E_HARDWARE_MAPPING MappingHint_Index;
-		mutable void *HWBuffer;
-
-		//! Material for this meshbuffer.
-		video::SMaterial Material;
-		//! Vertices of this buffer
-		core::array<T> Vertices;
-		//! Indices into the vertices of this buffer.
-		core::array<u16> Indices;
-		//! Bounding box of this meshbuffer.
-		core::aabbox3d<f32> BoundingBox;
-		//! Primitive type used for rendering (triangles, lines, ...)
-		E_PRIMITIVE_TYPE PrimitiveType;
-	};
-
-	//! Standard meshbuffer
-	typedef CMeshBuffer<video::S3DVertex> SMeshBuffer;
-	//! Meshbuffer with two texture coords per vertex, e.g. for lightmaps
-	typedef CMeshBuffer<video::S3DVertex2TCoords> SMeshBufferLightMap;
-	//! Meshbuffer with vertices having tangents stored, e.g. for normal mapping
-	typedef CMeshBuffer<video::S3DVertexTangents> SMeshBufferTangents;
 } // end namespace scene
 } // end namespace irr
-
-#endif
-
-

include/CVertexBuffer.h

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

include/EAttributes.h

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

include/ECullingTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_CULLING_TYPES_H_INCLUDED__
+#pragma once
-#define __E_CULLING_TYPES_H_INCLUDED__
 
 #include "irrTypes.h"
 
@@ -12,30 +11,25 @@ namespace irr
 namespace scene
 {
 
-	//! An enumeration for all types of automatic culling for built-in scene nodes
+//! An enumeration for all types of automatic culling for built-in scene nodes
-	enum E_CULLING_TYPE
+enum E_CULLING_TYPE
-	{
+{
-		EAC_OFF = 0,
+	EAC_OFF = 0,
-		EAC_BOX = 1,
+	EAC_BOX = 1,
-		EAC_FRUSTUM_BOX = 2,
+	EAC_FRUSTUM_BOX = 2,
-		EAC_FRUSTUM_SPHERE = 4,
+	EAC_FRUSTUM_SPHERE = 4,
-		EAC_OCC_QUERY = 8
+	EAC_OCC_QUERY = 8
-	};
+};
 
-	//! Names for culling type
+//! Names for culling type
-	const c8* const AutomaticCullingNames[] =
+const c8 *const AutomaticCullingNames[] = {
-	{
 		"false",
-		"box",			// camera box against node box
+		"box",            // camera box against node box
-		"frustum_box",		// camera frustum against node box
+		"frustum_box",    // camera frustum against node box
-		"frustum_sphere",	// camera frustum against node sphere
+		"frustum_sphere", // camera frustum against node sphere
-		"occ_query",		// occlusion query
+		"occ_query",      // occlusion query
-		0
+		0,
 	};
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif // __E_CULLING_TYPES_H_INCLUDED__
-

include/EDebugSceneTypes.h

@@ -2,49 +2,40 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DEBUG_SCENE_TYPES_H_INCLUDED__
+#pragma once
-#define __E_DEBUG_SCENE_TYPES_H_INCLUDED__
 
 namespace irr
 {
 namespace scene
 {
 
-	//! An enumeration for all types of debug data for built-in scene nodes (flags)
+//! An enumeration for all types of debug data for built-in scene nodes (flags)
-	enum E_DEBUG_SCENE_TYPE
+enum E_DEBUG_SCENE_TYPE
-	{
+{
-		//! No Debug Data ( Default )
+	//! No Debug Data ( Default )
-		EDS_OFF = 0,
+	EDS_OFF = 0,
 
-		//! Show Bounding Boxes of SceneNode
+	//! Show Bounding Boxes of SceneNode
-		EDS_BBOX = 1,
+	EDS_BBOX = 1,
 
-		//! Show Vertex Normals
+	//! Show Vertex Normals
-		EDS_NORMALS = 2,
+	EDS_NORMALS = 2,
 
-		//! Shows Skeleton/Tags
+	//! Shows Skeleton/Tags
-		EDS_SKELETON = 4,
+	EDS_SKELETON = 4,
 
-		//! Overlays Mesh Wireframe
+	//! Overlays Mesh Wireframe
-		EDS_MESH_WIRE_OVERLAY = 8,
+	EDS_MESH_WIRE_OVERLAY = 8,
 
-		//! Temporary use transparency Material Type
+	//! Show Bounding Boxes of all MeshBuffers
-		EDS_HALF_TRANSPARENCY = 16,
+	EDS_BBOX_BUFFERS = 32,
 
-		//! Show Bounding Boxes of all MeshBuffers
+	//! EDS_BBOX | EDS_BBOX_BUFFERS
-		EDS_BBOX_BUFFERS = 32,
+	EDS_BBOX_ALL = EDS_BBOX | EDS_BBOX_BUFFERS,
-
-		//! EDS_BBOX | EDS_BBOX_BUFFERS
-		EDS_BBOX_ALL = EDS_BBOX | EDS_BBOX_BUFFERS,
-
-		//! Show all debug infos
-		EDS_FULL = 0xffffffff
-	};
 
+	//! Show all debug infos
+	EDS_FULL = 0xffffffff
+};
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif // __E_DEBUG_SCENE_TYPES_H_INCLUDED__
-

include/EDeviceTypes.h

@@ -2,49 +2,45 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DEVICE_TYPES_H_INCLUDED__
+#pragma once
-#define __E_DEVICE_TYPES_H_INCLUDED__
 
 namespace irr
 {
 
-	//! An enum for the different device types supported by the Irrlicht Engine.
+//! An enum for the different device types supported by the Irrlicht Engine.
-	enum E_DEVICE_TYPE
+enum E_DEVICE_TYPE
-	{
+{
 
-		//! A device native to Microsoft Windows
+	//! A device native to Microsoft Windows
-		/** This device uses the Win32 API and works in all versions of Windows. */
+	/** This device uses the Win32 API and works in all versions of Windows. */
-		EIDT_WIN32,
+	EIDT_WIN32,
 
-		//! A device native to Unix style operating systems.
+	//! A device native to Unix style operating systems.
-		/** This device uses the X11 windowing system and works in Linux, Solaris, FreeBSD, OSX and
+	/** This device uses the X11 windowing system and works in Linux, Solaris, FreeBSD, OSX and
-		other operating systems which support X11. */
+	other operating systems which support X11. */
-		EIDT_X11,
+	EIDT_X11,
 
-		//! A device native to Mac OSX
+	//! A device native to Mac OSX
-		/** This device uses Apple's Cocoa API and works in Mac OSX 10.2 and above. */
+	/** This device uses Apple's Cocoa API and works in Mac OSX 10.2 and above. */
-		EIDT_OSX,
+	EIDT_OSX,
 
-		//! A device which uses Simple DirectMedia Layer
+	//! A device which uses Simple DirectMedia Layer
-		/** The SDL device works under all platforms supported by SDL but first must be compiled
+	/** The SDL device works under all platforms supported by SDL but first must be compiled
-		in by setting the USE_SDL2 CMake option to ON */
+	in by setting the USE_SDL2 CMake option to ON */
-		EIDT_SDL,
+	EIDT_SDL,
 
-		//! This selection allows Irrlicht to choose the best device from the ones available.
+	//! This selection allows Irrlicht to choose the best device from the ones available.
-		/** If this selection is chosen then Irrlicht will try to use the IrrlichtDevice native
+	/** If this selection is chosen then Irrlicht will try to use the IrrlichtDevice native
-		to your operating system. If this is unavailable then the X11, SDL and then console device
+	to your operating system. If this is unavailable then the X11, SDL and then console device
-		will be tried. This ensures that Irrlicht will run even if your platform is unsupported,
+	will be tried. This ensures that Irrlicht will run even if your platform is unsupported,
-		although it may not be able to render anything. */
+	although it may not be able to render anything. */
-		EIDT_BEST,
+	EIDT_BEST,
 
-		//! A device for Android platforms
+	//! A device for Android platforms
-		/** Best used with embedded devices and mobile systems.
+	/** Best used with embedded devices and mobile systems.
-		Does not need X11 or other graphical subsystems.
+	Does not need X11 or other graphical subsystems.
-		May support hw-acceleration via OpenGL-ES */
+	May support hw-acceleration via OpenGL-ES */
-		EIDT_ANDROID,		
+	EIDT_ANDROID,
-	};
+};
 
 } // end namespace irr
-
-#endif // __E_DEVICE_TYPES_H_INCLUDED__
-

include/EDriverFeatures.h

@@ -2,156 +2,136 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DRIVER_FEATURES_H_INCLUDED__
+#pragma once
-#define __E_DRIVER_FEATURES_H_INCLUDED__
 
 namespace irr
 {
 namespace video
 {
 
-	//! enumeration for querying features of the video driver.
+//! enumeration for querying features of the video driver.
-	enum E_VIDEO_DRIVER_FEATURE
+enum E_VIDEO_DRIVER_FEATURE
-	{
+{
-		//! Is driver able to render to a surface?
+	//! Is driver able to render to a surface?
-		EVDF_RENDER_TO_TARGET = 0,
+	EVDF_RENDER_TO_TARGET = 0,
 
-		//! Is hardware transform and lighting supported?
+	//! Is hardware transform and lighting supported?
-		EVDF_HARDWARE_TL,
+	EVDF_HARDWARE_TL,
 
-		//! Are multiple textures per material possible?
+	//! Are multiple textures per material possible?
-		EVDF_MULTITEXTURE,
+	EVDF_MULTITEXTURE,
 
-		//! Is driver able to render with a bilinear filter applied?
+	//! Is driver able to render with a bilinear filter applied?
-		EVDF_BILINEAR_FILTER,
+	EVDF_BILINEAR_FILTER,
 
-		//! Can the driver handle mip maps?
+	//! Can the driver handle mip maps?
-		EVDF_MIP_MAP,
+	EVDF_MIP_MAP,
 
-		//! Can the driver update mip maps automatically?
+	//! Can the driver update mip maps automatically?
-		EVDF_MIP_MAP_AUTO_UPDATE,
+	EVDF_MIP_MAP_AUTO_UPDATE,
 
-		//! Are stencilbuffers switched on and does the device support stencil buffers?
+	//! Are stencilbuffers switched on and does the device support stencil buffers?
-		EVDF_STENCIL_BUFFER,
+	EVDF_STENCIL_BUFFER,
 
-		//! Is Vertex Shader 1.1 supported?
+	//! Is Vertex Shader 1.1 supported?
-		EVDF_VERTEX_SHADER_1_1,
+	EVDF_VERTEX_SHADER_1_1,
 
-		//! Is Vertex Shader 2.0 supported?
+	//! Is Vertex Shader 2.0 supported?
-		EVDF_VERTEX_SHADER_2_0,
+	EVDF_VERTEX_SHADER_2_0,
 
-		//! Is Vertex Shader 3.0 supported?
+	//! Is Vertex Shader 3.0 supported?
-		EVDF_VERTEX_SHADER_3_0,
+	EVDF_VERTEX_SHADER_3_0,
 
-		//! Is Pixel Shader 1.1 supported?
+	//! Is Pixel Shader 1.1 supported?
-		EVDF_PIXEL_SHADER_1_1,
+	EVDF_PIXEL_SHADER_1_1,
 
-		//! Is Pixel Shader 1.2 supported?
+	//! Is Pixel Shader 1.2 supported?
-		EVDF_PIXEL_SHADER_1_2,
+	EVDF_PIXEL_SHADER_1_2,
 
-		//! Is Pixel Shader 1.3 supported?
+	//! Is Pixel Shader 1.3 supported?
-		EVDF_PIXEL_SHADER_1_3,
+	EVDF_PIXEL_SHADER_1_3,
 
-		//! Is Pixel Shader 1.4 supported?
+	//! Is Pixel Shader 1.4 supported?
-		EVDF_PIXEL_SHADER_1_4,
+	EVDF_PIXEL_SHADER_1_4,
 
-		//! Is Pixel Shader 2.0 supported?
+	//! Is Pixel Shader 2.0 supported?
-		EVDF_PIXEL_SHADER_2_0,
+	EVDF_PIXEL_SHADER_2_0,
 
-		//! Is Pixel Shader 3.0 supported?
+	//! Is Pixel Shader 3.0 supported?
-		EVDF_PIXEL_SHADER_3_0,
+	EVDF_PIXEL_SHADER_3_0,
 
-		//! Are ARB vertex programs v1.0 supported?
+	//! Are ARB vertex programs v1.0 supported?
-		EVDF_ARB_VERTEX_PROGRAM_1,
+	EVDF_ARB_VERTEX_PROGRAM_1,
 
-		//! Are ARB fragment programs v1.0 supported?
+	//! Are ARB fragment programs v1.0 supported?
-		EVDF_ARB_FRAGMENT_PROGRAM_1,
+	EVDF_ARB_FRAGMENT_PROGRAM_1,
 
-		//! Is GLSL supported?
+	//! Is GLSL supported?
-		EVDF_ARB_GLSL,
+	EVDF_ARB_GLSL,
 
-		//! Is HLSL supported?
+	//! Is HLSL supported?
-		EVDF_HLSL,
+	EVDF_HLSL,
 
-		//! Are non-square textures supported?
+	//! Are non-square textures supported?
-		EVDF_TEXTURE_NSQUARE,
+	EVDF_TEXTURE_NSQUARE,
 
-		//! Are non-power-of-two textures supported?
+	//! Are non-power-of-two textures supported?
-		EVDF_TEXTURE_NPOT,
+	EVDF_TEXTURE_NPOT,
 
-		//! Are framebuffer objects supported?
+	//! Are framebuffer objects supported?
-		EVDF_FRAMEBUFFER_OBJECT,
+	EVDF_FRAMEBUFFER_OBJECT,
 
-		//! Are vertex buffer objects supported?
+	//! Are vertex buffer objects supported?
-		EVDF_VERTEX_BUFFER_OBJECT,
+	EVDF_VERTEX_BUFFER_OBJECT,
 
-		//! Supports Alpha To Coverage
+	//! Supports Alpha To Coverage
-		EVDF_ALPHA_TO_COVERAGE,
+	EVDF_ALPHA_TO_COVERAGE,
 
-		//! Supports Color masks (disabling color planes in output)
+	//! Supports Color masks (disabling color planes in output)
-		EVDF_COLOR_MASK,
+	EVDF_COLOR_MASK,
 
-		//! Supports multiple render targets at once
+	//! Supports multiple render targets at once
-		EVDF_MULTIPLE_RENDER_TARGETS,
+	EVDF_MULTIPLE_RENDER_TARGETS,
 
-		//! Supports separate blend settings for multiple render targets
+	//! Supports separate blend settings for multiple render targets
-		EVDF_MRT_BLEND,
+	EVDF_MRT_BLEND,
 
-		//! Supports separate color masks for multiple render targets
+	//! Supports separate color masks for multiple render targets
-		EVDF_MRT_COLOR_MASK,
+	EVDF_MRT_COLOR_MASK,
 
-		//! Supports separate blend functions for multiple render targets
+	//! Supports separate blend functions for multiple render targets
-		EVDF_MRT_BLEND_FUNC,
+	EVDF_MRT_BLEND_FUNC,
 
-		//! Supports geometry shaders
+	//! Supports geometry shaders
-		EVDF_GEOMETRY_SHADER,
+	EVDF_GEOMETRY_SHADER,
 
-		//! Supports occlusion queries
+	//! Supports occlusion queries
-		EVDF_OCCLUSION_QUERY,
+	EVDF_OCCLUSION_QUERY,
 
-		//! Supports polygon offset/depth bias for avoiding z-fighting
+	//! Supports polygon offset/depth bias for avoiding z-fighting
-		EVDF_POLYGON_OFFSET,
+	EVDF_POLYGON_OFFSET,
 
-		//! Support for different blend functions. Without, only ADD is available
+	//! Support for different blend functions. Without, only ADD is available
-		EVDF_BLEND_OPERATIONS,
+	EVDF_BLEND_OPERATIONS,
 
-		//! Support for separate blending for RGB and Alpha.
+	//! Support for separate blending for RGB and Alpha.
-		EVDF_BLEND_SEPARATE,
+	EVDF_BLEND_SEPARATE,
 
-		//! Support for texture coord transformation via texture matrix
+	//! Support for texture coord transformation via texture matrix
-		EVDF_TEXTURE_MATRIX,
+	EVDF_TEXTURE_MATRIX,
 
-		//! Support for DXTn compressed textures.
+	//! Support for cube map textures.
-		EVDF_TEXTURE_COMPRESSED_DXT,
+	EVDF_TEXTURE_CUBEMAP,
 
-		//! Support for PVRTC compressed textures.
+	//! Support for filtering across different faces of the cubemap
-		EVDF_TEXTURE_COMPRESSED_PVRTC,
+	EVDF_TEXTURE_CUBEMAP_SEAMLESS,
 
-		//! Support for PVRTC2 compressed textures.
+	//! Support for clamping vertices beyond far-plane to depth instead of capping them.
-		EVDF_TEXTURE_COMPRESSED_PVRTC2,
+	EVDF_DEPTH_CLAMP,
 
-		//! Support for ETC1 compressed textures.
+	//! Only used for counting the elements of this enum
-		EVDF_TEXTURE_COMPRESSED_ETC1,
+	EVDF_COUNT
-
+};
-		//! Support for ETC2 compressed textures.
-		EVDF_TEXTURE_COMPRESSED_ETC2,
-
-		//! Support for cube map textures.
-		EVDF_TEXTURE_CUBEMAP,
-
-		//! Support for filtering across different faces of the cubemap
-		EVDF_TEXTURE_CUBEMAP_SEAMLESS,
-
-		//! Support for clamping vertices beyond far-plane to depth instead of capping them.
-		EVDF_DEPTH_CLAMP,
-
-		//! Only used for counting the elements of this enum
-		EVDF_COUNT
-	};
 
 } // end namespace video
 } // end namespace irr
-
-
-#endif
-

include/EDriverTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_DRIVER_TYPES_H_INCLUDED__
+#pragma once
-#define __E_DRIVER_TYPES_H_INCLUDED__
 
 #include "irrTypes.h"
 
@@ -12,44 +11,34 @@ namespace irr
 namespace video
 {
 
-	//! An enum for all types of drivers the Irrlicht Engine supports.
+//! An enum for all types of drivers the Irrlicht Engine supports.
-	enum E_DRIVER_TYPE
+enum E_DRIVER_TYPE
-	{
+{
-		//! Null driver, useful for applications to run the engine without visualization.
+	//! Null driver, useful for applications to run the engine without visualization.
-		/** The null device is able to load textures, but does not
+	/** The null device is able to load textures, but does not
-		render and display any graphics. */
+	render and display any graphics. */
-		EDT_NULL,
+	EDT_NULL,
 
-		// obsolete constants to make some code happy
+	//! OpenGL device, available on most platforms.
-		// TODO delete
+	/** Performs hardware accelerated rendering of 3D and 2D
-		EDT_SOFTWARE,
+	primitives. */
-		EDT_BURNINGSVIDEO,
+	EDT_OPENGL,
-		DEPRECATED_EDT_DIRECT3D8_NO_LONGER_EXISTS,
-		EDT_DIRECT3D9,
 
-		//! OpenGL device, available on most platforms.
+	//! OpenGL-ES 1.x driver, for embedded and mobile systems
-		/** Performs hardware accelerated rendering of 3D and 2D
+	EDT_OGLES1,
-		primitives. */
-		EDT_OPENGL,
 
-		//! OpenGL-ES 1.x driver, for embedded and mobile systems
+	//! OpenGL-ES 2.x driver, for embedded and mobile systems
-		EDT_OGLES1,
+	/** Supports shaders etc. */
+	EDT_OGLES2,
 
-		//! OpenGL-ES 2.x driver, for embedded and mobile systems
+	//! WebGL1 friendly subset of OpenGL-ES 2.x driver for Emscripten
-		/** Supports shaders etc. */
+	EDT_WEBGL1,
-		EDT_OGLES2,
 
-		//! WebGL1 friendly subset of OpenGL-ES 2.x driver for Emscripten
+	EDT_OPENGL3,
-		EDT_WEBGL1,
 
-		EDT_OPENGL3,
+	//! No driver, just for counting the elements
-
+	EDT_COUNT
-		//! No driver, just for counting the elements
+};
-		EDT_COUNT
-	};
 
 } // end namespace video
 } // end namespace irr
-
-
-#endif

include/EFocusFlags.h

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

include/EGUIAlignment.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_GUI_ALIGNMENT_H_INCLUDED__
+#pragma once
-#define __E_GUI_ALIGNMENT_H_INCLUDED__
 
 #include "irrTypes.h"
 
@@ -14,7 +13,7 @@ namespace gui
 enum EGUI_ALIGNMENT
 {
 	//! Aligned to parent's top or left side (default)
-	EGUIA_UPPERLEFT=0,
+	EGUIA_UPPERLEFT = 0,
 	//! Aligned to parent's bottom or right side
 	EGUIA_LOWERRIGHT,
 	//! Aligned to the center of parent
@@ -24,16 +23,13 @@ enum EGUI_ALIGNMENT
 };
 
 //! Names for alignments
-const c8* const GUIAlignmentNames[] =
+const c8 *const GUIAlignmentNames[] = {
-{
+		"upperLeft",
-	"upperLeft",
+		"lowerRight",
-	"lowerRight",
+		"center",
-	"center",
+		"scale",
-	"scale",
+		0,
-	0
+	};
-};
 
 } // namespace gui
 } // namespace irr
-
-#endif // __E_GUI_ALIGNMENT_H_INCLUDED__

include/EGUIElementTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_GUI_ELEMENT_TYPES_H_INCLUDED__
+#pragma once
-#define __E_GUI_ELEMENT_TYPES_H_INCLUDED__
 
 #include "irrTypes.h"
 
@@ -100,42 +99,35 @@ enum EGUI_ELEMENT_TYPE
 };
 
 //! Names for built-in element types
-const c8* const GUIElementTypeNames[] =
+const c8 *const GUIElementTypeNames[] = {
-{
+		"button",
-	"button",
+		"checkBox",
-	"checkBox",
+		"comboBox",
-	"comboBox",
+		"contextMenu",
-	"contextMenu",
+		"menu",
-	"menu",
+		"editBox",
-	"editBox",
+		"fileOpenDialog",
-	"fileOpenDialog",
+		"colorSelectDialog",
-	"colorSelectDialog",
+		"inOutFader",
-	"inOutFader",
+		"image",
-	"image",
+		"listBox",
-	"listBox",
+		"meshViewer",
-	"meshViewer",
+		"messageBox",
-	"messageBox",
+		"modalScreen",
-	"modalScreen",
+		"scrollBar",
-	"scrollBar",
+		"spinBox",
-	"spinBox",
+		"staticText",
-	"staticText",
+		"tab",
-	"tab",
+		"tabControl",
-	"tabControl",
+		"table",
-	"table",
+		"toolBar",
-	"toolBar",
+		"treeview",
-	"treeview",
+		"window",
-	"window",
+		"element",
-	"element",
+		"root",
-	"root",
+		"profiler",
-	"profiler",
+		0,
-	0
+	};
-};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-
-
-
-

include/EHardwareBufferFlags.h

@@ -2,43 +2,39 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_HARDWARE_BUFFER_FLAGS_INCLUDED__
+#pragma once
-#define __E_HARDWARE_BUFFER_FLAGS_INCLUDED__
 
 namespace irr
 {
 namespace scene
 {
 
-	enum E_HARDWARE_MAPPING
+enum E_HARDWARE_MAPPING
-	{
+{
-		//! Don't store on the hardware
+	//! Don't store on the hardware
-		EHM_NEVER=0,
+	EHM_NEVER = 0,
 
-		//! Rarely changed, usually stored completely on the hardware
+	//! Rarely changed, usually stored completely on the hardware
-		EHM_STATIC,
+	EHM_STATIC,
 
-		//! Sometimes changed, driver optimized placement
+	//! Sometimes changed, driver optimized placement
-		EHM_DYNAMIC,
+	EHM_DYNAMIC,
 
-		//! Always changed, cache optimizing on the GPU
+	//! Always changed, cache optimizing on the GPU
-		EHM_STREAM
+	EHM_STREAM
-	};
+};
 
-	enum E_BUFFER_TYPE
+enum E_BUFFER_TYPE
-	{
+{
-		//! Does not change anything
+	//! Does not change anything
-		EBT_NONE=0,
+	EBT_NONE = 0,
-		//! Change the vertex mapping
+	//! Change the vertex mapping
-		EBT_VERTEX,
+	EBT_VERTEX,
-		//! Change the index mapping
+	//! Change the index mapping
-		EBT_INDEX,
+	EBT_INDEX,
-		//! Change both vertex and index mapping to the same value
+	//! Change both vertex and index mapping to the same value
-		EBT_VERTEX_AND_INDEX
+	EBT_VERTEX_AND_INDEX
-	};
+};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/EMaterialFlags.h

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

include/EMaterialProps.h

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

include/EMaterialTypes.h

@@ -2,162 +2,73 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_MATERIAL_TYPES_H_INCLUDED__
+#pragma once
-#define __E_MATERIAL_TYPES_H_INCLUDED__
+
+#include "irrTypes.h"
 
 namespace irr
 {
 namespace video
 {
 
-	//! Abstracted and easy to use fixed function/programmable pipeline material modes.
+//! Abstracted and easy to use fixed function/programmable pipeline material modes.
-	enum E_MATERIAL_TYPE
+enum E_MATERIAL_TYPE
-	{
+{
-		//! Standard solid material.
+	//! Standard solid material.
-		/** Only first texture is used, which is supposed to be the
+	/** Only first texture is used, which is supposed to be the
-		diffuse material. */
+	diffuse material. */
-		EMT_SOLID = 0,
+	EMT_SOLID = 0,
 
-		//! Solid material with 2 texture layers.
+	//! Makes the material transparent based on the texture alpha channel.
-		/** The second is blended onto the first using the alpha value
+	/** The final color is blended together from the destination
-		of the vertex colors. This material is currently not implemented in OpenGL.
+	color and the texture color, using the alpha channel value as
-		*/
+	blend factor. Only first texture is used. If you are using
-		EMT_SOLID_2_LAYER,
+	this material with small textures, it is a good idea to load
+	the texture in 32 bit mode
+	(video::IVideoDriver::setTextureCreationFlag()). Also, an alpha
+	ref is used, which can be manipulated using
+	SMaterial::MaterialTypeParam. This value controls how sharp the
+	edges become when going from a transparent to a solid spot on
+	the texture. */
+	EMT_TRANSPARENT_ALPHA_CHANNEL,
 
-		//! Material type with standard lightmap technique
+	//! Makes the material transparent based on the texture alpha channel.
-		/** There should be 2 textures: The first texture layer is a
+	/** If the alpha channel value is greater than 127, a
-		diffuse map, the second is a light map. Dynamic light is
+	pixel is written to the target, otherwise not. This
-		ignored. */
+	material does not use alpha blending and is a lot faster
-		EMT_LIGHTMAP,
+	than EMT_TRANSPARENT_ALPHA_CHANNEL. It is ideal for drawing
+	stuff like leaves of plants, because the borders are not
+	blurry but sharp. Only first texture is used. If you are
+	using this material with small textures and 3d object, it
+	is a good idea to load the texture in 32 bit mode
+	(video::IVideoDriver::setTextureCreationFlag()). */
+	EMT_TRANSPARENT_ALPHA_CHANNEL_REF,
 
-		//! Material type with lightmap technique like EMT_LIGHTMAP.
+	//! Makes the material transparent based on the vertex alpha value.
-		/** But lightmap and diffuse texture are added instead of modulated. */
+	EMT_TRANSPARENT_VERTEX_ALPHA,
-		EMT_LIGHTMAP_ADD,
 
-		//! Material type with standard lightmap technique
+	//! BlendFunc = source * sourceFactor + dest * destFactor ( E_BLEND_FUNC )
-		/** There should be 2 textures: The first texture layer is a
+	/** Using only first texture. Generic blending method.
-		diffuse map, the second is a light map. Dynamic light is
+	The blend function is set to SMaterial::MaterialTypeParam with
-		ignored. The texture colors are effectively multiplied by 2
+	pack_textureBlendFunc (for 2D) or pack_textureBlendFuncSeparate (for 3D). */
-		for brightening. Like known in DirectX as D3DTOP_MODULATE2X. */
+	EMT_ONETEXTURE_BLEND,
-		EMT_LIGHTMAP_M2,
 
-		//! Material type with standard lightmap technique
+	//! This value is not used. It only forces this enumeration to compile to 32 bit.
-		/** There should be 2 textures: The first texture layer is a
+	EMT_FORCE_32BIT = 0x7fffffff
-		diffuse map, the second is a light map. Dynamic light is
+};
-		ignored. The texture colors are effectively multiplied by 4
-		for brightening. Like known in DirectX as D3DTOP_MODULATE4X. */
-		EMT_LIGHTMAP_M4,
 
-		//! Like EMT_LIGHTMAP, but also supports dynamic lighting.
+//! Array holding the built in material type names
-		EMT_LIGHTMAP_LIGHTING,
+const char *const sBuiltInMaterialTypeNames[] = {
-
-		//! Like EMT_LIGHTMAP_M2, but also supports dynamic lighting.
-		EMT_LIGHTMAP_LIGHTING_M2,
-
-		//! Like EMT_LIGHTMAP_M4, but also supports dynamic lighting.
-		EMT_LIGHTMAP_LIGHTING_M4,
-
-		//! Detail mapped material.
-		/** The first texture is diffuse color map, the second is added
-		to this and usually displayed with a bigger scale value so that
-		it adds more detail. The detail map is added to the diffuse map
-		using ADD_SIGNED, so that it is possible to add and subtract
-		color from the diffuse map. For example a value of
-		(127,127,127) will not change the appearance of the diffuse map
-		at all. Often used for terrain rendering. */
-		EMT_DETAIL_MAP,
-
-		//! Look like a reflection of the environment around it.
-		/** To make this possible, a texture called 'sphere map' is
-		used, which must be set as the first texture. */
-		EMT_SPHERE_MAP,
-
-		//! A reflecting material with an optional non reflecting texture layer.
-		/** The reflection map should be set as first texture. */
-		EMT_REFLECTION_2_LAYER,
-
-		//! A transparent material.
-		/** Only the first texture is used. The new color is calculated
-		by simply adding the source color and the dest color. This
-		means if for example a billboard using a texture with black
-		background and a red circle on it is drawn with this material,
-		the result is that only the red circle will be drawn a little
-		bit transparent, and everything which was black is 100%
-		transparent and not visible. This material type is useful for
-		particle effects. */
-		EMT_TRANSPARENT_ADD_COLOR,
-
-		//! Makes the material transparent based on the texture alpha channel.
-		/** The final color is blended together from the destination
-		color and the texture color, using the alpha channel value as
-		blend factor. Only first texture is used. If you are using
-		this material with small textures, it is a good idea to load
-		the texture in 32 bit mode
-		(video::IVideoDriver::setTextureCreationFlag()). Also, an alpha
-		ref is used, which can be manipulated using
-		SMaterial::MaterialTypeParam. This value controls how sharp the
-		edges become when going from a transparent to a solid spot on
-		the texture. */
-		EMT_TRANSPARENT_ALPHA_CHANNEL,
-
-		//! Makes the material transparent based on the texture alpha channel.
-		/** If the alpha channel value is greater than 127, a
-		pixel is written to the target, otherwise not. This
-		material does not use alpha blending and is a lot faster
-		than EMT_TRANSPARENT_ALPHA_CHANNEL. It is ideal for drawing
-		stuff like leaves of plants, because the borders are not
-		blurry but sharp. Only first texture is used. If you are
-		using this material with small textures and 3d object, it
-		is a good idea to load the texture in 32 bit mode
-		(video::IVideoDriver::setTextureCreationFlag()). */
-		EMT_TRANSPARENT_ALPHA_CHANNEL_REF,
-
-		//! Makes the material transparent based on the vertex alpha value.
-		EMT_TRANSPARENT_VERTEX_ALPHA,
-
-		//! A transparent reflecting material with an optional additional non reflecting texture layer.
-		/** The reflection map should be set as first texture. The
-		transparency depends on the alpha value in the vertex colors. A
-		texture which will not reflect can be set as second texture.*/
-		EMT_TRANSPARENT_REFLECTION_2_LAYER,
-
-		//! BlendFunc = source * sourceFactor + dest * destFactor ( E_BLEND_FUNC )
-		/** Using only first texture. Generic blending method. 
-		The blend function is set to SMaterial::MaterialTypeParam with 
-		pack_textureBlendFunc (for 2D) or pack_textureBlendFuncSeparate (for 3D). */
-		EMT_ONETEXTURE_BLEND,
-
-		//! This value is not used. It only forces this enumeration to compile to 32 bit.
-		EMT_FORCE_32BIT = 0x7fffffff
-	};
-
-	//! Array holding the built in material type names
-	const char* const sBuiltInMaterialTypeNames[] =
-	{
 		"solid",
-		"solid_2layer",
-		"lightmap",
-		"lightmap_add",
-		"lightmap_m2",
-		"lightmap_m4",
-		"lightmap_light",
-		"lightmap_light_m2",
-		"lightmap_light_m4",
-		"detail_map",
-		"sphere_map",
-		"reflection_2layer",
-		"trans_add",
 		"trans_alphach",
 		"trans_alphach_ref",
 		"trans_vertex_alpha",
-		"trans_reflection_2layer",
 		"onetexture_blend",
-		0
+		0,
 	};
 
+constexpr u32 numBuiltInMaterials =
+		sizeof(sBuiltInMaterialTypeNames) / sizeof(char *) - 1;
+
 } // end namespace video
 } // end namespace irr
-
-
-#endif // __E_MATERIAL_TYPES_H_INCLUDED__
-

include/EMeshWriterEnums.h

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

include/EPrimitiveTypes.h

@@ -2,60 +2,42 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_PRIMITIVE_TYPES_H_INCLUDED__
+#pragma once
-#define __E_PRIMITIVE_TYPES_H_INCLUDED__
 
 namespace irr
 {
 namespace scene
 {
 
-	//! Enumeration for all primitive types there are.
+//! Enumeration for all primitive types there are.
-	enum E_PRIMITIVE_TYPE
+enum E_PRIMITIVE_TYPE
-	{
+{
-		//! All vertices are non-connected points.
+	//! All vertices are non-connected points.
-		EPT_POINTS=0,
+	EPT_POINTS = 0,
 
-		//! All vertices form a single connected line.
+	//! All vertices form a single connected line.
-		EPT_LINE_STRIP,
+	EPT_LINE_STRIP,
 
-		//! Just as LINE_STRIP, but the last and the first vertex is also connected.
+	//! Just as LINE_STRIP, but the last and the first vertex is also connected.
-		EPT_LINE_LOOP,
+	EPT_LINE_LOOP,
 
-		//! Every two vertices are connected creating n/2 lines.
+	//! Every two vertices are connected creating n/2 lines.
-		EPT_LINES,
+	EPT_LINES,
 
-		//! After the first two vertices each vertex defines a new triangle.
+	//! After the first two vertices each vertex defines a new triangle.
-		//! Always the two last and the new one form a new triangle.
+	//! Always the two last and the new one form a new triangle.
-		EPT_TRIANGLE_STRIP,
+	EPT_TRIANGLE_STRIP,
 
-		//! After the first two vertices each vertex defines a new triangle.
+	//! After the first two vertices each vertex defines a new triangle.
-		//! All around the common first vertex.
+	//! All around the common first vertex.
-		EPT_TRIANGLE_FAN,
+	EPT_TRIANGLE_FAN,
 
-		//! Explicitly set all vertices for each triangle.
+	//! Explicitly set all vertices for each triangle.
-		EPT_TRIANGLES,
+	EPT_TRIANGLES,
 
-		//! After the first two vertices each further two vertices create a quad with the preceding two.
+	//! The single vertices are expanded to quad billboards on the GPU.
-		//! Not supported by Direct3D
+	EPT_POINT_SPRITES
-		EPT_QUAD_STRIP,
+};
-
-		//! Every four vertices create a quad.
-		//! Not supported by Direct3D
-		//! Deprecated with newer OpenGL drivers
-		EPT_QUADS,
-
-		//! Just as LINE_LOOP, but filled.
-		//! Not supported by Direct3D
-		//! Deprecated with newer OpenGL drivers
-		EPT_POLYGON,
-
-		//! The single vertices are expanded to quad billboards on the GPU.
-		EPT_POINT_SPRITES
-	};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/EReadFileType.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_READ_FILE_TYPES_H_INCLUDED__
+#pragma once
-#define __E_READ_FILE_TYPES_H_INCLUDED__
 
 #include "irrTypes.h"
 
@@ -12,23 +11,20 @@ namespace irr
 namespace io
 {
 
-	//! An enumeration for different class types implementing IReadFile
+//! An enumeration for different class types implementing IReadFile
-	enum EREAD_FILE_TYPE
+enum EREAD_FILE_TYPE
-	{
+{
-		//! CReadFile
+	//! CReadFile
-		ERFT_READ_FILE  = MAKE_IRR_ID('r','e','a','d'),
+	ERFT_READ_FILE = MAKE_IRR_ID('r', 'e', 'a', 'd'),
 
-		//! CMemoryReadFile
+	//! CMemoryReadFile
-		ERFT_MEMORY_READ_FILE = MAKE_IRR_ID('r','m','e','m'),
+	ERFT_MEMORY_READ_FILE = MAKE_IRR_ID('r', 'm', 'e', 'm'),
 
-		//! CLimitReadFile
+	//! CLimitReadFile
-		ERFT_LIMIT_READ_FILE = MAKE_IRR_ID('r','l','i','m'),
+	ERFT_LIMIT_READ_FILE = MAKE_IRR_ID('r', 'l', 'i', 'm'),
 
-		//! Unknown type
+	//! Unknown type
-		EFIT_UNKNOWN        = MAKE_IRR_ID('u','n','k','n')
+	EFIT_UNKNOWN = MAKE_IRR_ID('u', 'n', 'k', 'n')
-	};
+};
 } // end namespace io
 } // end namespace irr
-
-
-#endif

include/ESceneNodeTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __E_SCENE_NODE_TYPES_H_INCLUDED__
+#pragma once
-#define __E_SCENE_NODE_TYPES_H_INCLUDED__
 
 #include "irrTypes.h"
 
@@ -12,45 +11,39 @@ namespace irr
 namespace scene
 {
 
-	//! An enumeration for all types of built-in scene nodes
+//! An enumeration for all types of built-in scene nodes
-	/** A scene node type is represented by a four character code
+/** A scene node type is represented by a four character code
-	such as 'cube' or 'mesh' instead of simple numbers, to avoid
+such as 'cube' or 'mesh' instead of simple numbers, to avoid
-	name clashes with external scene nodes.*/
+name clashes with external scene nodes.*/
-	enum ESCENE_NODE_TYPE
+enum ESCENE_NODE_TYPE
-	{
+{
-		//! of type CSceneManager (note that ISceneManager is not(!) an ISceneNode)
+	//! of type CSceneManager (note that ISceneManager is not(!) an ISceneNode)
-		ESNT_SCENE_MANAGER  = MAKE_IRR_ID('s','m','n','g'),
+	ESNT_SCENE_MANAGER = MAKE_IRR_ID('s', 'm', 'n', 'g'),
 
-		//! Mesh Scene Node
+	//! Mesh Scene Node
-		ESNT_MESH           = MAKE_IRR_ID('m','e','s','h'),
+	ESNT_MESH = MAKE_IRR_ID('m', 'e', 's', 'h'),
 
-		//! Empty Scene Node
+	//! Empty Scene Node
-		ESNT_EMPTY          = MAKE_IRR_ID('e','m','t','y'),
+	ESNT_EMPTY = MAKE_IRR_ID('e', 'm', 't', 'y'),
 
-		//! Dummy Transformation Scene Node
+	//! Dummy Transformation Scene Node
-		ESNT_DUMMY_TRANSFORMATION = MAKE_IRR_ID('d','m','m','y'),
+	ESNT_DUMMY_TRANSFORMATION = MAKE_IRR_ID('d', 'm', 'm', 'y'),
 
-		//! Camera Scene Node
+	//! Camera Scene Node
-		ESNT_CAMERA         = MAKE_IRR_ID('c','a','m','_'),
+	ESNT_CAMERA = MAKE_IRR_ID('c', 'a', 'm', '_'),
 
-		//! Billboard Scene Node
+	//! Billboard Scene Node
-		ESNT_BILLBOARD      = MAKE_IRR_ID('b','i','l','l'),
+	ESNT_BILLBOARD = MAKE_IRR_ID('b', 'i', 'l', 'l'),
 
-		//! Animated Mesh Scene Node
+	//! Animated Mesh Scene Node
-		ESNT_ANIMATED_MESH  = MAKE_IRR_ID('a','m','s','h'),
+	ESNT_ANIMATED_MESH = MAKE_IRR_ID('a', 'm', 's', 'h'),
-
-		//! Unknown scene node
-		ESNT_UNKNOWN        = MAKE_IRR_ID('u','n','k','n'),
-
-		//! Will match with any scene node when checking types
-		ESNT_ANY            = MAKE_IRR_ID('a','n','y','_')
-	};
 
+	//! Unknown scene node
+	ESNT_UNKNOWN = MAKE_IRR_ID('u', 'n', 'k', 'n'),
 
+	//! Will match with any scene node when checking types
+	ESNT_ANY = MAKE_IRR_ID('a', 'n', 'y', '_')
+};
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif
-

include/EShaderTypes.h

@@ -1,5 +1,4 @@
-#ifndef __E_SHADER_TYPES_H_INCLUDED__
+#pragma once
-#define __E_SHADER_TYPES_H_INCLUDED__
 
 #include "irrTypes.h"
 
@@ -24,15 +23,15 @@ enum E_VERTEX_SHADER_TYPE
 };
 
 //! Names for all vertex shader types, each entry corresponds to a E_VERTEX_SHADER_TYPE entry.
-const c8* const VERTEX_SHADER_TYPE_NAMES[] = {
+const c8 *const VERTEX_SHADER_TYPE_NAMES[] = {
-	"vs_1_1",
+		"vs_1_1",
-	"vs_2_0",
+		"vs_2_0",
-	"vs_2_a",
+		"vs_2_a",
-	"vs_3_0",
+		"vs_3_0",
-	"vs_4_0",
+		"vs_4_0",
-	"vs_4_1",
+		"vs_4_1",
-	"vs_5_0",
+		"vs_5_0",
-	0 };
+		0};
 
 //! Compile target enumeration for the addHighLevelShaderMaterial() method.
 enum E_PIXEL_SHADER_TYPE
@@ -54,19 +53,19 @@ enum E_PIXEL_SHADER_TYPE
 };
 
 //! Names for all pixel shader types, each entry corresponds to a E_PIXEL_SHADER_TYPE entry.
-const c8* const PIXEL_SHADER_TYPE_NAMES[] = {
+const c8 *const PIXEL_SHADER_TYPE_NAMES[] = {
-	"ps_1_1",
+		"ps_1_1",
-	"ps_1_2",
+		"ps_1_2",
-	"ps_1_3",
+		"ps_1_3",
-	"ps_1_4",
+		"ps_1_4",
-	"ps_2_0",
+		"ps_2_0",
-	"ps_2_a",
+		"ps_2_a",
-	"ps_2_b",
+		"ps_2_b",
-	"ps_3_0",
+		"ps_3_0",
-	"ps_4_0",
+		"ps_4_0",
-	"ps_4_1",
+		"ps_4_1",
-	"ps_5_0",
+		"ps_5_0",
-	0 };
+		0};
 
 //! Enum for supported geometry shader types
 enum E_GEOMETRY_SHADER_TYPE
@@ -78,13 +77,9 @@ enum E_GEOMETRY_SHADER_TYPE
 };
 
 //! String names for supported geometry shader types
-const c8* const GEOMETRY_SHADER_TYPE_NAMES[] = {
+const c8 *const GEOMETRY_SHADER_TYPE_NAMES[] = {
-	"gs_4_0",
+		"gs_4_0",
-	0 };
+		0};
-
 
 } // end namespace video
 } // end namespace irr
-
-#endif // __E_SHADER_TYPES_H_INCLUDED__
-

include/EVertexAttributes.h

@@ -1,5 +1,4 @@
-#ifndef __E_VERTEX_ATTRIBUTES_H_INCLUDED__
+#pragma once
-#define __E_VERTEX_ATTRIBUTES_H_INCLUDED__
 
 namespace irr
 {
@@ -20,19 +19,16 @@ enum E_VERTEX_ATTRIBUTES
 };
 
 //! Array holding the built in vertex attribute names
-const char* const sBuiltInVertexAttributeNames[] =
+const char *const sBuiltInVertexAttributeNames[] = {
-{
+		"inVertexPosition",
-	"inVertexPosition",
+		"inVertexNormal",
-	"inVertexNormal",
+		"inVertexColor",
-	"inVertexColor",
+		"inTexCoord0",
-	"inTexCoord0",
+		"inTexCoord1",
-	"inTexCoord1",
+		"inVertexTangent",
-	"inVertexTangent",
+		"inVertexBinormal",
-	"inVertexBinormal",
+		0,
-	0
+	};
-};
 
 } // end namespace video
 } // end namespace irr
-
-#endif //__E_VERTEX_ATTRIBUTES_H_INCLUDED__

include/IAnimatedMesh.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ANIMATED_MESH_H_INCLUDED__
+#pragma once
-#define __I_ANIMATED_MESH_H_INCLUDED__
 
 #include "aabbox3d.h"
 #include "IMesh.h"
@@ -12,63 +11,59 @@ namespace irr
 {
 namespace scene
 {
-	//! Interface for an animated mesh.
+//! Interface for an animated mesh.
-	/** There are already simple implementations of this interface available so
+/** There are already simple implementations of this interface available so
-	you don't have to implement this interface on your own if you need to:
+you don't have to implement this interface on your own if you need to:
-	You might want to use irr::scene::SAnimatedMesh, irr::scene::SMesh,
+You might want to use irr::scene::SAnimatedMesh, irr::scene::SMesh,
-	irr::scene::SMeshBuffer etc. */
+irr::scene::SMeshBuffer etc. */
-	class IAnimatedMesh : public IMesh
+class IAnimatedMesh : public IMesh
+{
+public:
+	//! Gets the frame count of the animated mesh.
+	/** Note that the play-time is usually getFrameCount()-1 as it stops as soon as the last frame-key is reached.
+	\return The amount of frames. If the amount is 1,
+	it is a static, non animated mesh. 	*/
+	virtual u32 getFrameCount() const = 0;
+
+	//! Gets the animation speed of the animated mesh.
+	/** \return The number of frames per second to play the
+	animation with by default. If the amount is 0,
+	it is a static, non animated mesh. */
+	virtual f32 getAnimationSpeed() const = 0;
+
+	//! Sets the animation speed of the animated mesh.
+	/** \param fps Number of frames per second to play the
+	animation with by default. If the amount is 0,
+	it is not animated. The actual speed is set in the
+	scene node the mesh is instantiated in.*/
+	virtual void setAnimationSpeed(f32 fps) = 0;
+
+	//! Returns the IMesh interface for a frame.
+	/** \param frame: Frame number as zero based index. The maximum
+	frame number is getFrameCount() - 1;
+	\param detailLevel: Level of detail. 0 is the lowest, 255 the
+	highest level of detail. Most meshes will ignore the detail level.
+	\param startFrameLoop: Because some animated meshes (.MD2) are
+	blended between 2 static frames, and maybe animated in a loop,
+	the startFrameLoop and the endFrameLoop have to be defined, to
+	prevent the animation to be blended between frames which are
+	outside of this loop.
+	If startFrameLoop and endFrameLoop are both -1, they are ignored.
+	\param endFrameLoop: see startFrameLoop.
+	\return Returns the animated mesh based on a detail level. */
+	virtual IMesh *getMesh(s32 frame, s32 detailLevel = 255, s32 startFrameLoop = -1, s32 endFrameLoop = -1) = 0;
+
+	//! Returns the type of the animated mesh.
+	/** In most cases it is not necessary to use this method.
+	This is useful for making a safe downcast. For example,
+	if getMeshType() returns EAMT_MD2 it's safe to cast the
+	IAnimatedMesh to IAnimatedMeshMD2.
+	\returns Type of the mesh. */
+	E_ANIMATED_MESH_TYPE getMeshType() const override
 	{
-	public:
+		return EAMT_UNKNOWN;
-
+	}
-		//! Gets the frame count of the animated mesh.
+};
-		/** Note that the play-time is usually getFrameCount()-1 as it stops as soon as the last frame-key is reached.
-		\return The amount of frames. If the amount is 1,
-		it is a static, non animated mesh. 	*/
-		virtual u32 getFrameCount() const = 0;
-
-		//! Gets the animation speed of the animated mesh.
-		/** \return The number of frames per second to play the
-		animation with by default. If the amount is 0,
-		it is a static, non animated mesh. */
-		virtual f32 getAnimationSpeed() const = 0;
-
-		//! Sets the animation speed of the animated mesh.
-		/** \param fps Number of frames per second to play the
-		animation with by default. If the amount is 0,
-		it is not animated. The actual speed is set in the
-		scene node the mesh is instantiated in.*/
-		virtual void setAnimationSpeed(f32 fps) =0;
-
-		//! Returns the IMesh interface for a frame.
-		/** \param frame: Frame number as zero based index. The maximum
-		frame number is getFrameCount() - 1;
-		\param detailLevel: Level of detail. 0 is the lowest, 255 the
-		highest level of detail. Most meshes will ignore the detail level.
-		\param startFrameLoop: Because some animated meshes (.MD2) are
-		blended between 2 static frames, and maybe animated in a loop,
-		the startFrameLoop and the endFrameLoop have to be defined, to
-		prevent the animation to be blended between frames which are
-		outside of this loop.
-		If startFrameLoop and endFrameLoop are both -1, they are ignored.
-		\param endFrameLoop: see startFrameLoop.
-		\return Returns the animated mesh based on a detail level. */
-		virtual IMesh* getMesh(s32 frame, s32 detailLevel=255, s32 startFrameLoop=-1, s32 endFrameLoop=-1) = 0;
-
-		//! Returns the type of the animated mesh.
-		/** In most cases it is not necessary to use this method.
-		This is useful for making a safe downcast. For example,
-		if getMeshType() returns EAMT_MD2 it's safe to cast the
-		IAnimatedMesh to IAnimatedMeshMD2.
-		\returns Type of the mesh. */
-		E_ANIMATED_MESH_TYPE getMeshType() const override
-		{
-			return EAMT_UNKNOWN;
-		}
-	};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IAnimatedMeshSceneNode.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
+#pragma once
-#define __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
 
 #include "ISceneNode.h"
 #include "IBoneSceneNode.h"
@@ -13,165 +12,158 @@ namespace irr
 {
 namespace scene
 {
-	enum E_JOINT_UPDATE_ON_RENDER
+enum E_JOINT_UPDATE_ON_RENDER
-	{
+{
-		//! do nothing
+	//! do nothing
-		EJUOR_NONE = 0,
+	EJUOR_NONE = 0,
 
-		//! get joints positions from the mesh (for attached nodes, etc)
+	//! get joints positions from the mesh (for attached nodes, etc)
-		EJUOR_READ,
+	EJUOR_READ,
 
-		//! control joint positions in the mesh (eg. ragdolls, or set the animation from animateJoints() )
+	//! control joint positions in the mesh (eg. ragdolls, or set the animation from animateJoints() )
-		EJUOR_CONTROL
+	EJUOR_CONTROL
-	};
+};
 
+class IAnimatedMeshSceneNode;
 
-	class IAnimatedMeshSceneNode;
+//! Callback interface for catching events of ended animations.
+/** Implement this interface and use
+IAnimatedMeshSceneNode::setAnimationEndCallback to be able to
+be notified if an animation playback has ended.
+**/
+class IAnimationEndCallBack : public virtual IReferenceCounted
+{
+public:
+	//! Will be called when the animation playback has ended.
+	/** See IAnimatedMeshSceneNode::setAnimationEndCallback for
+	more information.
+	\param node: Node of which the animation has ended. */
+	virtual void OnAnimationEnd(IAnimatedMeshSceneNode *node) = 0;
+};
 
-	//! Callback interface for catching events of ended animations.
+//! Scene node capable of displaying an animated mesh.
-	/** Implement this interface and use
+class IAnimatedMeshSceneNode : public ISceneNode
-	IAnimatedMeshSceneNode::setAnimationEndCallback to be able to
+{
-	be notified if an animation playback has ended.
+public:
-	**/
+	//! Constructor
-	class IAnimationEndCallBack : public virtual IReferenceCounted
+	IAnimatedMeshSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
-	{
+			const core::vector3df &position = core::vector3df(0, 0, 0),
-	public:
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f)) :
+			ISceneNode(parent, mgr, id, position, rotation, scale) {}
 
-		//! Will be called when the animation playback has ended.
+	//! Destructor
-		/** See IAnimatedMeshSceneNode::setAnimationEndCallback for
+	virtual ~IAnimatedMeshSceneNode() {}
-		more information.
-		\param node: Node of which the animation has ended. */
-		virtual void OnAnimationEnd(IAnimatedMeshSceneNode* node) = 0;
-	};
 
-	//! Scene node capable of displaying an animated mesh.
+	//! Sets the current frame number.
-	class IAnimatedMeshSceneNode : public ISceneNode
+	/** From now on the animation is played from this frame.
-	{
+	\param frame: Number of the frame to let the animation be started from.
-	public:
+	The frame number must be a valid frame number of the IMesh used by this
+	scene node. Set IAnimatedMesh::getMesh() for details. */
+	virtual void setCurrentFrame(f32 frame) = 0;
 
-		//! Constructor
+	//! Sets the frame numbers between the animation is looped.
-		IAnimatedMeshSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
+	/** The default is 0 to getFrameCount()-1 of the mesh.
-			const core::vector3df& position = core::vector3df(0,0,0),
+	Number of played frames is end-start.
-			const core::vector3df& rotation = core::vector3df(0,0,0),
+	It interpolates toward the last frame but stops when it is reached.
-			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f))
+	It does not interpolate back to start even when looping.
-			: ISceneNode(parent, mgr, id, position, rotation, scale) {}
+	Looping animations should ensure last and first frame-key are identical.
+	\param begin: Start frame number of the loop.
+	\param end: End frame number of the loop.
+	\return True if successful, false if not. */
+	virtual bool setFrameLoop(s32 begin, s32 end) = 0;
 
-		//! Destructor
+	//! Sets the speed with which the animation is played.
-		virtual ~IAnimatedMeshSceneNode() {}
+	/** \param framesPerSecond: Frames per second played. */
+	virtual void setAnimationSpeed(f32 framesPerSecond) = 0;
 
-		//! Sets the current frame number.
+	//! Gets the speed with which the animation is played.
-		/** From now on the animation is played from this frame.
+	/** \return Frames per second played. */
-		\param frame: Number of the frame to let the animation be started from.
+	virtual f32 getAnimationSpeed() const = 0;
-		The frame number must be a valid frame number of the IMesh used by this
-		scene node. Set IAnimatedMesh::getMesh() for details. */
-		virtual void setCurrentFrame(f32 frame) = 0;
 
-		//! Sets the frame numbers between the animation is looped.
+	//! Get a pointer to a joint in the mesh (if the mesh is a bone based mesh).
-		/** The default is 0 to getFrameCount()-1 of the mesh.
+	/** With this method it is possible to attach scene nodes to
-		Number of played frames is end-start.
+	joints for example possible to attach a weapon to the left hand
-		It interpolates toward the last frame but stops when it is reached.
+	of an animated model. This example shows how:
-		It does not interpolate back to start even when looping.
+	\code
-		Looping animations should ensure last and first frame-key are identical.
+	ISceneNode* hand =
-		\param begin: Start frame number of the loop.
+		yourAnimatedMeshSceneNode->getJointNode("LeftHand");
-		\param end: End frame number of the loop.
+	hand->addChild(weaponSceneNode);
-		\return True if successful, false if not. */
+	\endcode
-		virtual bool setFrameLoop(s32 begin, s32 end) = 0;
+	Please note that the joint returned by this method may not exist
+	before this call and the joints in the node were created by it.
+	\param jointName: Name of the joint.
+	\return Pointer to the scene node which represents the joint
+	with the specified name. Returns 0 if the contained mesh is not
+	an skinned mesh or the name of the joint could not be found. */
+	virtual IBoneSceneNode *getJointNode(const c8 *jointName) = 0;
 
-		//! Sets the speed with which the animation is played.
+	//! same as getJointNode(const c8* jointName), but based on id
-		/** \param framesPerSecond: Frames per second played. */
+	virtual IBoneSceneNode *getJointNode(u32 jointID) = 0;
-		virtual void setAnimationSpeed(f32 framesPerSecond) = 0;
 
-		//! Gets the speed with which the animation is played.
+	//! Gets joint count.
-		/** \return Frames per second played. */
+	/** \return Amount of joints in the mesh. */
-		virtual f32 getAnimationSpeed() const =0;
+	virtual u32 getJointCount() const = 0;
 
-		//! Get a pointer to a joint in the mesh (if the mesh is a bone based mesh).
+	//! Returns the currently displayed frame number.
-		/** With this method it is possible to attach scene nodes to
+	virtual f32 getFrameNr() const = 0;
-		joints for example possible to attach a weapon to the left hand
+	//! Returns the current start frame number.
-		of an animated model. This example shows how:
+	virtual s32 getStartFrame() const = 0;
-		\code
+	//! Returns the current end frame number.
-		ISceneNode* hand =
+	virtual s32 getEndFrame() const = 0;
-			yourAnimatedMeshSceneNode->getJointNode("LeftHand");
-		hand->addChild(weaponSceneNode);
-		\endcode
-		Please note that the joint returned by this method may not exist
-		before this call and the joints in the node were created by it.
-		\param jointName: Name of the joint.
-		\return Pointer to the scene node which represents the joint
-		with the specified name. Returns 0 if the contained mesh is not
-		an skinned mesh or the name of the joint could not be found. */
-		virtual IBoneSceneNode* getJointNode(const c8* jointName)=0;
 
-		//! same as getJointNode(const c8* jointName), but based on id
+	//! Sets looping mode which is on by default.
-		virtual IBoneSceneNode* getJointNode(u32 jointID) = 0;
+	/** If set to false, animations will not be played looped. */
+	virtual void setLoopMode(bool playAnimationLooped) = 0;
 
-		//! Gets joint count.
+	//! returns the current loop mode
-		/** \return Amount of joints in the mesh. */
+	/** When true the animations are played looped */
-		virtual u32 getJointCount() const = 0;
+	virtual bool getLoopMode() const = 0;
 
-		//! Returns the currently displayed frame number.
+	//! Sets a callback interface which will be called if an animation playback has ended.
-		virtual f32 getFrameNr() const = 0;
+	/** Set this to 0 to disable the callback again.
-		//! Returns the current start frame number.
+	Please note that this will only be called when in non looped
-		virtual s32 getStartFrame() const = 0;
+	mode, see IAnimatedMeshSceneNode::setLoopMode(). */
-		//! Returns the current end frame number.
+	virtual void setAnimationEndCallback(IAnimationEndCallBack *callback = 0) = 0;
-		virtual s32 getEndFrame() const = 0;
 
-		//! Sets looping mode which is on by default.
+	//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
-		/** If set to false, animations will not be played looped. */
+	/** In this way it is possible to change the materials a mesh
-		virtual void setLoopMode(bool playAnimationLooped) = 0;
+	causing all mesh scene nodes referencing this mesh to change
+	too. */
+	virtual void setReadOnlyMaterials(bool readonly) = 0;
 
-		//! returns the current loop mode
+	//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
-		/** When true the animations are played looped */
+	virtual bool isReadOnlyMaterials() const = 0;
-		virtual bool getLoopMode() const = 0;
 
-		//! Sets a callback interface which will be called if an animation playback has ended.
+	//! Sets a new mesh
-		/** Set this to 0 to disable the callback again.
+	virtual void setMesh(IAnimatedMesh *mesh) = 0;
-		Please note that this will only be called when in non looped
-		mode, see IAnimatedMeshSceneNode::setLoopMode(). */
-		virtual void setAnimationEndCallback(IAnimationEndCallBack* callback=0) = 0;
 
-		//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
+	//! Returns the current mesh
-		/** In this way it is possible to change the materials a mesh
+	virtual IAnimatedMesh *getMesh(void) = 0;
-		causing all mesh scene nodes referencing this mesh to change
-		too. */
-		virtual void setReadOnlyMaterials(bool readonly) = 0;
 
-		//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
+	//! Set how the joints should be updated on render
-		virtual bool isReadOnlyMaterials() const = 0;
+	virtual void setJointMode(E_JOINT_UPDATE_ON_RENDER mode) = 0;
 
-		//! Sets a new mesh
+	//! Sets the transition time in seconds
-		virtual void setMesh(IAnimatedMesh* mesh) = 0;
+	/** Note: This needs to enable joints, and setJointmode set to
+	EJUOR_CONTROL. You must call animateJoints(), or the mesh will
+	not animate. */
+	virtual void setTransitionTime(f32 Time) = 0;
 
-		//! Returns the current mesh
+	//! animates the joints in the mesh based on the current frame.
-		virtual IAnimatedMesh* getMesh(void) = 0;
+	/** Also takes in to account transitions. */
+	virtual void animateJoints(bool CalculateAbsolutePositions = true) = 0;
 
-		//! Set how the joints should be updated on render
+	//! render mesh ignoring its transformation.
-		virtual void setJointMode(E_JOINT_UPDATE_ON_RENDER mode)=0;
+	/** Culling is unaffected. */
+	virtual void setRenderFromIdentity(bool On) = 0;
 
-		//! Sets the transition time in seconds
+	//! Creates a clone of this scene node and its children.
-		/** Note: This needs to enable joints, and setJointmode set to
+	/** \param newParent An optional new parent.
-		EJUOR_CONTROL. You must call animateJoints(), or the mesh will
+	\param newManager An optional new scene manager.
-		not animate. */
+	\return The newly created clone of this node. */
-		virtual void setTransitionTime(f32 Time) =0;
+	virtual ISceneNode *clone(ISceneNode *newParent = 0, ISceneManager *newManager = 0) = 0;
-
+};
-		//! animates the joints in the mesh based on the current frame.
-		/** Also takes in to account transitions. */
-		virtual void animateJoints(bool CalculateAbsolutePositions=true) = 0;
-
-		//! render mesh ignoring its transformation.
-		/** Culling is unaffected. */
-		virtual void setRenderFromIdentity( bool On )=0;
-
-		//! Creates a clone of this scene node and its children.
-		/** \param newParent An optional new parent.
-		\param newManager An optional new scene manager.
-		\return The newly created clone of this node. */
-		virtual ISceneNode* clone(ISceneNode* newParent=0, ISceneManager* newManager=0) = 0;
-
-	};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IAttributes.h

@@ -2,35 +2,19 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_ATTRIBUTES_H_INCLUDED__
+#pragma once
-#define __I_ATTRIBUTES_H_INCLUDED__
 
 #include "IReferenceCounted.h"
-#include "SColor.h"
-#include "vector3d.h"
-#include "vector2d.h"
-#include "line2d.h"
-#include "line3d.h"
-#include "triangle3d.h"
-#include "position2d.h"
-#include "rect.h"
-#include "dimension2d.h"
-#include "matrix4.h"
-#include "quaternion.h"
-#include "plane3d.h"
-#include "triangle3d.h"
-#include "line2d.h"
-#include "line3d.h"
-#include "irrString.h"
-#include "irrArray.h"
 #include "EAttributes.h"
-#include "path.h"
+
+// not needed here but I can't be bothered to clean the transitive includes up.
+#include "quaternion.h"
 
 namespace irr
 {
 namespace video
 {
-	class ITexture;
+class ITexture;
 } // end namespace video
 namespace io
 {
@@ -39,42 +23,30 @@ namespace io
 class IAttributes : public virtual IReferenceCounted
 {
 public:
-
 	//! Returns amount of attributes in this collection of attributes.
 	virtual u32 getAttributeCount() const = 0;
 
 	//! Returns attribute name by index.
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual const c8* getAttributeName(s32 index) const = 0;
+	virtual const c8 *getAttributeName(s32 index) const = 0;
 
 	//! Returns the type of an attribute
 	//! \param attributeName: Name for the attribute
-	virtual E_ATTRIBUTE_TYPE getAttributeType(const c8* attributeName) const = 0;
+	virtual E_ATTRIBUTE_TYPE getAttributeType(const c8 *attributeName) const = 0;
 
 	//! Returns attribute type by index.
 	//! \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;
+	virtual bool existsAttribute(const c8 *attributeName) const = 0;
 
 	//! Returns attribute index from name, -1 if not found
-	virtual s32 findAttribute(const c8* attributeName) const = 0;
+	virtual s32 findAttribute(const c8 *attributeName) const = 0;
 
 	//! Removes all attributes
 	virtual void clear() = 0;
 
-
 	/*
 
 		Integer Attribute
@@ -82,16 +54,16 @@ public:
 	*/
 
 	//! Adds an attribute as integer
-	virtual void addInt(const c8* attributeName, s32 value) = 0;
+	virtual void addInt(const c8 *attributeName, s32 value) = 0;
 
 	//! Sets an attribute as integer value
-	virtual void setAttribute(const c8* attributeName, s32 value) = 0;
+	virtual void setAttribute(const c8 *attributeName, s32 value) = 0;
 
 	//! Gets an attribute as integer value
 	//! \param attributeName: Name of the attribute to get.
 	//! \param defaultNotFound Value returned when attributeName was not found
 	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual s32 getAttributeAsInt(const c8* attributeName, irr::s32 defaultNotFound=0) const = 0;
+	virtual s32 getAttributeAsInt(const c8 *attributeName, irr::s32 defaultNotFound = 0) const = 0;
 
 	//! Gets an attribute as integer value
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
@@ -107,16 +79,16 @@ public:
 	*/
 
 	//! Adds an attribute as float
-	virtual void addFloat(const c8* attributeName, f32 value) = 0;
+	virtual void addFloat(const c8 *attributeName, f32 value) = 0;
 
 	//! Sets a attribute as float value
-	virtual void setAttribute(const c8* attributeName, f32 value) = 0;
+	virtual void setAttribute(const c8 *attributeName, f32 value) = 0;
 
 	//! Gets an attribute as float value
 	//! \param attributeName: Name of the attribute to get.
 	//! \param defaultNotFound Value returned when attributeName was not found
 	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual f32 getAttributeAsFloat(const c8* attributeName, irr::f32 defaultNotFound=0.f) const = 0;
+	virtual f32 getAttributeAsFloat(const c8 *attributeName, irr::f32 defaultNotFound = 0.f) const = 0;
 
 	//! Gets an attribute as float value
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
@@ -125,22 +97,21 @@ public:
 	//! Sets an attribute as float value
 	virtual void setAttribute(s32 index, f32 value) = 0;
 
-
 	/*
 		Bool Attribute
 	*/
 
 	//! Adds an attribute as bool
-	virtual void addBool(const c8* attributeName, bool value) = 0;
+	virtual void addBool(const c8 *attributeName, bool value) = 0;
 
 	//! Sets an attribute as boolean value
-	virtual void setAttribute(const c8* attributeName, bool value) = 0;
+	virtual void setAttribute(const c8 *attributeName, bool value) = 0;
 
 	//! Gets an attribute as boolean value
 	//! \param attributeName: Name of the attribute to get.
 	//! \param defaultNotFound Value returned when attributeName was not found
 	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual bool getAttributeAsBool(const c8* attributeName, bool defaultNotFound=false) const = 0;
+	virtual bool getAttributeAsBool(const c8 *attributeName, bool defaultNotFound = false) const = 0;
 
 	//! Gets an attribute as boolean value
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
@@ -148,10 +119,7 @@ public:
 
 	//! Sets an attribute as boolean value
 	virtual void setAttribute(s32 index, bool value) = 0;
-
 };
 
 } // end namespace io
 } // end namespace irr
-
-#endif

include/IBillboardSceneNode.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_BILLBOARD_SCENE_NODE_H_INCLUDED__
+#pragma once
-#define __I_BILLBOARD_SCENE_NODE_H_INCLUDED__
 
 #include "ISceneNode.h"
 
@@ -11,8 +10,8 @@ namespace irr
 {
 namespace scene
 {
-	class ICameraSceneNode;
+class ICameraSceneNode;
-	class IMeshBuffer;
+class IMeshBuffer;
 
 //! A billboard scene node.
 /** A billboard is like a 3d sprite: A 2d element,
@@ -22,14 +21,13 @@ lensflares, particles and things like that.
 class IBillboardSceneNode : public ISceneNode
 {
 public:
-
 	//! Constructor
-	IBillboardSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
+	IBillboardSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
-		const core::vector3df& position = core::vector3df(0,0,0))
+			const core::vector3df &position = core::vector3df(0, 0, 0)) :
-		: ISceneNode(parent, mgr, id, position) {}
+			ISceneNode(parent, mgr, id, position) {}
 
 	//! Sets the size of the billboard, making it rectangular.
-	virtual void setSize(const core::dimension2d<f32>& size) = 0;
+	virtual void setSize(const core::dimension2d<f32> &size) = 0;
 
 	//! Sets the size of the billboard with independent widths of the bottom and top edges.
 	/** \param[in] height The height of the billboard.
@@ -43,38 +41,38 @@ public:
 	Use getWidths() to retrieve the bottom and top edges independently.
 	\return Size of the billboard.
 	*/
-	virtual const core::dimension2d<f32>& getSize() const = 0;
+	virtual const core::dimension2d<f32> &getSize() const = 0;
 
 	//! Gets the size of the the billboard and handles independent top and bottom edge widths correctly.
 	/** \param[out] height The height of the billboard.
 	\param[out] bottomEdgeWidth The width of the bottom edge of the billboard.
 	\param[out] topEdgeWidth The width of the top edge of the billboard.
 	*/
-	virtual void getSize(f32& height, f32& bottomEdgeWidth, f32& topEdgeWidth) const =0;
+	virtual void getSize(f32 &height, f32 &bottomEdgeWidth, f32 &topEdgeWidth) const = 0;
 
 	//! Set the color of all vertices of the billboard
 	/** \param[in] overallColor Color to set */
-	virtual void setColor(const video::SColor& overallColor) = 0;
+	virtual void setColor(const video::SColor &overallColor) = 0;
 
 	//! Set the color of the top and bottom vertices of the billboard
 	/** \param[in] topColor Color to set the top vertices
 	\param[in] bottomColor Color to set the bottom vertices */
-	virtual void setColor(const video::SColor& topColor,
+	virtual void setColor(const video::SColor &topColor,
-			const video::SColor& bottomColor) = 0;
+			const video::SColor &bottomColor) = 0;
 
 	//! Gets the color of the top and bottom vertices of the billboard
 	/** \param[out] topColor Stores the color of the top vertices
 	\param[out] bottomColor Stores the color of the bottom vertices */
-	virtual void getColor(video::SColor& topColor,
+	virtual void getColor(video::SColor &topColor,
-			video::SColor& bottomColor) const = 0;
+			video::SColor &bottomColor) const = 0;
 
 	//! Get the real boundingbox used by the billboard, which can depend on the active camera.
 	/** The boundingbox returned will use absolute coordinates.
 		The billboard orients itself toward the camera and some only update in render().
-	    So we don't know the real boundingboxes before that. Which would be too late for culling.
+		So we don't know the real boundingboxes before that. Which would be too late for culling.
-	    That is why the usual getBoundingBox will return a "safe" boundingbox which is guaranteed
+		That is why the usual getBoundingBox will return a "safe" boundingbox which is guaranteed
-	    to contain the billboard. While this function can return the real one. */
+		to contain the billboard. While this function can return the real one. */
-	virtual const core::aabbox3d<f32>& getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode* camera) = 0;
+	virtual const core::aabbox3d<f32> &getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode *camera) = 0;
 
 	//! Get the amount of mesh buffers.
 	/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
@@ -85,12 +83,8 @@ public:
 	So this is mainly useful to access/modify the uv-coordinates.
 	\param nr: Zero based index of the mesh buffer.
 	\return Pointer to the mesh buffer or 0 if there is no such	mesh buffer. */
-	virtual IMeshBuffer* getMeshBuffer(u32 nr) const = 0;
+	virtual IMeshBuffer *getMeshBuffer(u32 nr) const = 0;
 };
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif
-

include/IBoneSceneNode.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_BONE_SCENE_NODE_H_INCLUDED__
+#pragma once
-#define __I_BONE_SCENE_NODE_H_INCLUDED__
 
 #include "ISceneNode.h"
 
@@ -12,97 +11,86 @@ namespace irr
 namespace scene
 {
 
-	//! Enumeration for different bone animation modes
+//! Enumeration for different bone animation modes
-	enum E_BONE_ANIMATION_MODE
+enum E_BONE_ANIMATION_MODE
-	{
+{
-		//! The bone is usually animated, unless it's parent is not animated
+	//! The bone is usually animated, unless it's parent is not animated
-		EBAM_AUTOMATIC=0,
+	EBAM_AUTOMATIC = 0,
 
-		//! The bone is animated by the skin, if it's parent is not animated then animation will resume from this bone onward
+	//! The bone is animated by the skin, if it's parent is not animated then animation will resume from this bone onward
-		EBAM_ANIMATED,
+	EBAM_ANIMATED,
 
-		//! The bone is not animated by the skin
+	//! The bone is not animated by the skin
-		EBAM_UNANIMATED,
+	EBAM_UNANIMATED,
 
-		//! Not an animation mode, just here to count the available modes
+	//! Not an animation mode, just here to count the available modes
-		EBAM_COUNT
+	EBAM_COUNT
 
-	};
+};
 
-	enum E_BONE_SKINNING_SPACE
+enum E_BONE_SKINNING_SPACE
-	{
+{
-		//! local skinning, standard
+	//! local skinning, standard
-		EBSS_LOCAL=0,
+	EBSS_LOCAL = 0,
 
-		//! global skinning
+	//! global skinning
-		EBSS_GLOBAL,
+	EBSS_GLOBAL,
 
-		EBSS_COUNT
+	EBSS_COUNT
-	};
+};
 
-	//! Names for bone animation modes
+//! Names for bone animation modes
-	const c8* const BoneAnimationModeNames[] =
+const c8 *const BoneAnimationModeNames[] = {
-	{
 		"automatic",
 		"animated",
 		"unanimated",
 		0,
 	};
 
+//! Interface for bones used for skeletal animation.
+/** Used with ISkinnedMesh and IAnimatedMeshSceneNode. */
+class IBoneSceneNode : public ISceneNode
+{
+public:
+	IBoneSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id = -1) :
+			ISceneNode(parent, mgr, id), positionHint(-1), scaleHint(-1), rotationHint(-1) {}
 
-	//! Interface for bones used for skeletal animation.
+	//! Get the index of the bone
-	/** Used with ISkinnedMesh and IAnimatedMeshSceneNode. */
+	virtual u32 getBoneIndex() const = 0;
-	class IBoneSceneNode : public ISceneNode
-	{
-	public:
 
-		IBoneSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id=-1) :
+	//! Sets the animation mode of the bone.
-			ISceneNode(parent, mgr, id),positionHint(-1),scaleHint(-1),rotationHint(-1) { }
+	/** \return True if successful. (Unused) */
+	virtual bool setAnimationMode(E_BONE_ANIMATION_MODE mode) = 0;
 
-		//! Get the name of the bone
+	//! Gets the current animation mode of the bone
-		/** \deprecated Use getName instead. This method may be removed by Irrlicht 1.9 */
+	virtual E_BONE_ANIMATION_MODE getAnimationMode() const = 0;
-		_IRR_DEPRECATED_ virtual const c8* getBoneName() const { return getName(); }
 
-		//! Get the index of the bone
+	//! Get the axis aligned bounding box of this node
-		virtual u32 getBoneIndex() const = 0;
+	const core::aabbox3d<f32> &getBoundingBox() const override = 0;
 
-		//! Sets the animation mode of the bone.
+	//! Returns the relative transformation of the scene node.
-		/** \return True if successful. (Unused) */
+	// virtual core::matrix4 getRelativeTransformation() const = 0;
-		virtual bool setAnimationMode(E_BONE_ANIMATION_MODE mode) = 0;
 
-		//! Gets the current animation mode of the bone
+	//! The animation method.
-		virtual E_BONE_ANIMATION_MODE getAnimationMode() const = 0;
+	void OnAnimate(u32 timeMs) override = 0;
 
-		//! Get the axis aligned bounding box of this node
+	//! The render method.
-		const core::aabbox3d<f32>& getBoundingBox() const override = 0;
+	/** Does nothing as bones are not visible. */
+	void render() override {}
 
-		//! Returns the relative transformation of the scene node.
+	//! How the relative transformation of the bone is used
-		//virtual core::matrix4 getRelativeTransformation() const = 0;
+	virtual void setSkinningSpace(E_BONE_SKINNING_SPACE space) = 0;
 
-		//! The animation method.
+	//! How the relative transformation of the bone is used
-		void OnAnimate(u32 timeMs) override =0;
+	virtual E_BONE_SKINNING_SPACE getSkinningSpace() const = 0;
 
-		//! The render method.
+	//! Updates the absolute position based on the relative and the parents position
-		/** Does nothing as bones are not visible. */
+	virtual void updateAbsolutePositionOfAllChildren() = 0;
-		void render() override { }
-
-		//! How the relative transformation of the bone is used
-		virtual void setSkinningSpace( E_BONE_SKINNING_SPACE space ) =0;
-
-		//! How the relative transformation of the bone is used
-		virtual E_BONE_SKINNING_SPACE getSkinningSpace() const =0;
-
-		//! Updates the absolute position based on the relative and the parents position
-		virtual void updateAbsolutePositionOfAllChildren()=0;
-
-		s32 positionHint;
-		s32 scaleHint;
-		s32 rotationHint;
-	};
 
+	s32 positionHint;
+	s32 scaleHint;
+	s32 rotationHint;
+};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/ICameraSceneNode.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_CAMERA_SCENE_NODE_H_INCLUDED__
+#pragma once
-#define __I_CAMERA_SCENE_NODE_H_INCLUDED__
 
 #include "ISceneNode.h"
 #include "IEventReceiver.h"
@@ -12,178 +11,174 @@ namespace irr
 {
 namespace scene
 {
-	struct SViewFrustum;
+struct SViewFrustum;
 
-	//! Scene Node which is a (controllable) camera.
+//! Scene Node which is a (controllable) camera.
-	/** The whole scene will be rendered from the cameras point of view.
+/** The whole scene will be rendered from the cameras point of view.
-	Because the ICameraSceneNode is a SceneNode, it can be attached to any
+Because the ICameraSceneNode is a SceneNode, it can be attached to any
-	other scene node, and will follow its parents movement, rotation and so
+other scene node, and will follow its parents movement, rotation and so
-	on.
+on.
+*/
+class ICameraSceneNode : public ISceneNode, public IEventReceiver
+{
+public:
+	//! Constructor
+	ICameraSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f)) :
+			ISceneNode(parent, mgr, id, position, rotation, scale),
+			IsOrthogonal(false) {}
+
+	//! Sets the projection matrix of the camera.
+	/** The core::matrix4 class has some methods to build a
+	projection matrix. e.g:
+	core::matrix4::buildProjectionMatrixPerspectiveFovLH.
+	Note that the matrix will only stay as set by this method until
+	one of the following Methods are called: setNearValue,
+	setFarValue, setAspectRatio, setFOV.
+	NOTE: The frustum is not updated before render() is called
+	unless you explicitly call updateMatrices()
+	\param projection The new projection matrix of the camera.
+	\param isOrthogonal Set this to true if the matrix is an
+	orthogonal one (e.g. from matrix4::buildProjectionMatrixOrtho).
 	*/
-	class ICameraSceneNode : public ISceneNode, public IEventReceiver
+	virtual void setProjectionMatrix(const core::matrix4 &projection, bool isOrthogonal = false) = 0;
+
+	//! Gets the current projection matrix of the camera.
+	/** \return The current projection matrix of the camera. */
+	virtual const core::matrix4 &getProjectionMatrix() const = 0;
+
+	//! Gets the current view matrix of the camera.
+	/** \return The current view matrix of the camera. */
+	virtual const core::matrix4 &getViewMatrix() const = 0;
+
+	//! Sets a custom view matrix affector.
+	/** The matrix passed here, will be multiplied with the view
+	matrix when it gets updated. This allows for custom camera
+	setups like, for example, a reflection camera.
+	\param affector The affector matrix. */
+	virtual void setViewMatrixAffector(const core::matrix4 &affector) = 0;
+
+	//! Get the custom view matrix affector.
+	/** \return The affector matrix. */
+	virtual const core::matrix4 &getViewMatrixAffector() const = 0;
+
+	//! It is possible to send mouse and key events to the camera.
+	/** Most cameras may ignore this input, but camera scene nodes
+	which are created for example with
+	ISceneManager::addCameraSceneNodeMaya or
+	ISceneManager::addCameraSceneNodeFPS, may want to get
+	this input for changing their position, look at target or
+	whatever. */
+	bool OnEvent(const SEvent &event) override = 0;
+
+	//! Sets the look at target of the camera
+	/** If the camera's target and rotation are bound ( @see
+	bindTargetAndRotation() ) then calling this will also change
+	the camera's scene node rotation to match the target.
+	Note that setTarget uses the current absolute position
+	internally, so if you changed setPosition since last rendering you must
+	call updateAbsolutePosition before using this function.
+	\param pos Look at target of the camera, in world co-ordinates. */
+	virtual void setTarget(const core::vector3df &pos) = 0;
+
+	//! Sets the rotation of the node.
+	/** This only modifies the relative rotation of the node.
+	If the camera's target and rotation are bound ( @see
+	bindTargetAndRotation() ) then calling this will also change
+	the camera's target to match the rotation.
+	\param rotation New rotation of the node in degrees. */
+	void setRotation(const core::vector3df &rotation) override = 0;
+
+	//! Gets the current look at target of the camera
+	/** \return The current look at target of the camera, in world co-ordinates */
+	virtual const core::vector3df &getTarget() const = 0;
+
+	//! Sets the up vector of the camera.
+	/** \param pos: New upvector of the camera. */
+	virtual void setUpVector(const core::vector3df &pos) = 0;
+
+	//! Gets the up vector of the camera.
+	/** \return The up vector of the camera, in world space. */
+	virtual const core::vector3df &getUpVector() const = 0;
+
+	//! Gets the value of the near plane of the camera.
+	/** \return The value of the near plane of the camera. */
+	virtual f32 getNearValue() const = 0;
+
+	//! Gets the value of the far plane of the camera.
+	/** \return The value of the far plane of the camera. */
+	virtual f32 getFarValue() const = 0;
+
+	//! Gets the aspect ratio of the camera.
+	/** \return The aspect ratio of the camera. */
+	virtual f32 getAspectRatio() const = 0;
+
+	//! Gets the field of view of the camera.
+	/** \return The field of view of the camera in radians. */
+	virtual f32 getFOV() const = 0;
+
+	//! Sets the value of the near clipping plane. (default: 1.0f)
+	/** \param zn: New z near value. */
+	virtual void setNearValue(f32 zn) = 0;
+
+	//! Sets the value of the far clipping plane (default: 2000.0f)
+	/** \param zf: New z far value. */
+	virtual void setFarValue(f32 zf) = 0;
+
+	//! Sets the aspect ratio (default: 4.0f / 3.0f)
+	/** \param aspect: New aspect ratio. */
+	virtual void setAspectRatio(f32 aspect) = 0;
+
+	//! Sets the field of view (Default: PI / 2.5f)
+	/** \param fovy: New field of view in radians. */
+	virtual void setFOV(f32 fovy) = 0;
+
+	//! Get the view frustum.
+	/** \return The current view frustum. */
+	virtual const SViewFrustum *getViewFrustum() const = 0;
+
+	//! Disables or enables the camera to get key or mouse inputs.
+	/** If this is set to true, the camera will respond to key
+	inputs otherwise not. */
+	virtual void setInputReceiverEnabled(bool enabled) = 0;
+
+	//! Checks if the input receiver of the camera is currently enabled.
+	virtual bool isInputReceiverEnabled() const = 0;
+
+	//! Checks if a camera is orthogonal.
+	virtual bool isOrthogonal() const
 	{
-	public:
+		return IsOrthogonal;
+	}
 
-		//! Constructor
+	//! Binds the camera scene node's rotation to its target position and vice versa, or unbinds them.
-		ICameraSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
+	/** When bound, calling setRotation() will update the camera's
-			const core::vector3df& position = core::vector3df(0,0,0),
+	target position to be along its +Z axis, and likewise calling
-			const core::vector3df& rotation = core::vector3df(0,0,0),
+	setTarget() will update its rotation so that its +Z axis will
-			const core::vector3df& scale = core::vector3df(1.0f,1.0f,1.0f))
+	point at the target point. FPS camera use this binding by
-			: ISceneNode(parent, mgr, id, position, rotation, scale), IsOrthogonal(false) {}
+	default; other cameras do not.
+	\param bound True to bind the camera's scene node rotation
+	and targeting, false to unbind them.
+	@see getTargetAndRotationBinding() */
+	virtual void bindTargetAndRotation(bool bound) = 0;
 
-		//! Sets the projection matrix of the camera.
+	//! Updates the matrices without uploading them to the driver
-		/** The core::matrix4 class has some methods to build a
+	virtual void updateMatrices() = 0;
-		projection matrix. e.g:
-		core::matrix4::buildProjectionMatrixPerspectiveFovLH.
-		Note that the matrix will only stay as set by this method until
-		one of the following Methods are called: setNearValue,
-		setFarValue, setAspectRatio, setFOV.
-		NOTE: The frustum is not updated before render() is called
-		unless you explicitly call updateMatrices()
-		\param projection The new projection matrix of the camera.
-		\param isOrthogonal Set this to true if the matrix is an
-		orthogonal one (e.g. from matrix4::buildProjectionMatrixOrtho).
-		*/
-		virtual void setProjectionMatrix(const core::matrix4& projection, bool isOrthogonal=false) =0;
 
-		//! Gets the current projection matrix of the camera.
+	//! Queries if the camera scene node's rotation and its target position are bound together.
-		/** \return The current projection matrix of the camera. */
+	/** @see bindTargetAndRotation() */
-		virtual const core::matrix4& getProjectionMatrix() const =0;
+	virtual bool getTargetAndRotationBinding(void) const = 0;
 
-		//! Gets the current view matrix of the camera.
+protected:
-		/** \return The current view matrix of the camera. */
+	void cloneMembers(const ICameraSceneNode *toCopyFrom)
-		virtual const core::matrix4& getViewMatrix() const =0;
+	{
+		IsOrthogonal = toCopyFrom->IsOrthogonal;
+	}
 
-		//! Sets a custom view matrix affector.
+	bool IsOrthogonal;
-		/** The matrix passed here, will be multiplied with the view
+};
-		matrix when it gets updated. This allows for custom camera
-		setups like, for example, a reflection camera.
-		\param affector The affector matrix. */
-		virtual void setViewMatrixAffector(const core::matrix4& affector) =0;
-
-		//! Get the custom view matrix affector.
-		/** \return The affector matrix. */
-		virtual const core::matrix4& getViewMatrixAffector() const =0;
-
-		//! It is possible to send mouse and key events to the camera.
-		/** Most cameras may ignore this input, but camera scene nodes
-		which are created for example with
-		ISceneManager::addCameraSceneNodeMaya or
-		ISceneManager::addCameraSceneNodeFPS, may want to get
-		this input for changing their position, look at target or
-		whatever. */
-		bool OnEvent(const SEvent& event) override =0;
-
-		//! Sets the look at target of the camera
-		/** If the camera's target and rotation are bound ( @see
-		bindTargetAndRotation() ) then calling this will also change
-		the camera's scene node rotation to match the target.
-		Note that setTarget uses the current absolute position
-		internally, so if you changed setPosition since last rendering you must
-		call updateAbsolutePosition before using this function.
-		\param pos Look at target of the camera, in world co-ordinates. */
-		virtual void setTarget(const core::vector3df& pos) =0;
-
-		//! Sets the rotation of the node.
-		/** This only modifies the relative rotation of the node.
-		If the camera's target and rotation are bound ( @see
-		bindTargetAndRotation() ) then calling this will also change
-		the camera's target to match the rotation.
-		\param rotation New rotation of the node in degrees. */
-		void setRotation(const core::vector3df& rotation) override =0;
-
-		//! Gets the current look at target of the camera
-		/** \return The current look at target of the camera, in world co-ordinates */
-		virtual const core::vector3df& getTarget() const =0;
-
-		//! Sets the up vector of the camera.
-		/** \param pos: New upvector of the camera. */
-		virtual void setUpVector(const core::vector3df& pos) =0;
-
-		//! Gets the up vector of the camera.
-		/** \return The up vector of the camera, in world space. */
-		virtual const core::vector3df& getUpVector() const =0;
-
-		//! Gets the value of the near plane of the camera.
-		/** \return The value of the near plane of the camera. */
-		virtual f32 getNearValue() const =0;
-
-		//! Gets the value of the far plane of the camera.
-		/** \return The value of the far plane of the camera. */
-		virtual f32 getFarValue() const =0;
-
-		//! Gets the aspect ratio of the camera.
-		/** \return The aspect ratio of the camera. */
-		virtual f32 getAspectRatio() const =0;
-
-		//! Gets the field of view of the camera.
-		/** \return The field of view of the camera in radians. */
-		virtual f32 getFOV() const =0;
-
-		//! Sets the value of the near clipping plane. (default: 1.0f)
-		/** \param zn: New z near value. */
-		virtual void setNearValue(f32 zn) =0;
-
-		//! Sets the value of the far clipping plane (default: 2000.0f)
-		/** \param zf: New z far value. */
-		virtual void setFarValue(f32 zf) =0;
-
-		//! Sets the aspect ratio (default: 4.0f / 3.0f)
-		/** \param aspect: New aspect ratio. */
-		virtual void setAspectRatio(f32 aspect) =0;
-
-		//! Sets the field of view (Default: PI / 2.5f)
-		/** \param fovy: New field of view in radians. */
-		virtual void setFOV(f32 fovy) =0;
-
-		//! Get the view frustum.
-		/** \return The current view frustum. */
-		virtual const SViewFrustum* getViewFrustum() const =0;
-
-		//! Disables or enables the camera to get key or mouse inputs.
-		/** If this is set to true, the camera will respond to key
-		inputs otherwise not. */
-		virtual void setInputReceiverEnabled(bool enabled) =0;
-
-		//! Checks if the input receiver of the camera is currently enabled.
-		virtual bool isInputReceiverEnabled() const =0;
-
-		//! Checks if a camera is orthogonal.
-		virtual bool isOrthogonal() const
-		{
-			return IsOrthogonal;
-		}
-
-		//! Binds the camera scene node's rotation to its target position and vice versa, or unbinds them.
-		/** When bound, calling setRotation() will update the camera's
-		target position to be along its +Z axis, and likewise calling
-		setTarget() will update its rotation so that its +Z axis will
-		point at the target point. FPS camera use this binding by
-		default; other cameras do not.
-		\param bound True to bind the camera's scene node rotation
-		and targeting, false to unbind them.
-		@see getTargetAndRotationBinding() */
-		virtual void bindTargetAndRotation(bool bound) =0;
-
-		//! Updates the matrices without uploading them to the driver
-		virtual void updateMatrices() = 0;
-
-		//! Queries if the camera scene node's rotation and its target position are bound together.
-		/** @see bindTargetAndRotation() */
-		virtual bool getTargetAndRotationBinding(void) const =0;
-
-	protected:
-
-		void cloneMembers(const ICameraSceneNode* toCopyFrom)
-		{
-			IsOrthogonal = toCopyFrom->IsOrthogonal;
-		}
-
-		bool IsOrthogonal;
-	};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IContextManager.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
+#pragma once
-#define __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
 
 #include "SExposedVideoData.h"
 #include "SIrrCreationParameters.h"
@@ -13,51 +12,48 @@ namespace irr
 {
 namespace video
 {
-	// For system specific window contexts (used for OpenGL)
+// For system specific window contexts (used for OpenGL)
-	class IContextManager : public virtual IReferenceCounted
+class IContextManager : public virtual IReferenceCounted
-	{
+{
-	public:
+public:
-        //! Initialize manager with device creation parameters and device window (passed as exposed video data)
+	//! Initialize manager with device creation parameters and device window (passed as exposed video data)
-        virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) =0;
+	virtual bool initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &data) = 0;
 
-        //! Terminate manager, any cleanup that is left over. Manager needs a new initialize to be usable again
+	//! Terminate manager, any cleanup that is left over. Manager needs a new initialize to be usable again
-        virtual void terminate() =0;
+	virtual void terminate() = 0;
 
-        //! Create surface based on current window set
+	//! Create surface based on current window set
-        virtual bool generateSurface() =0;
+	virtual bool generateSurface() = 0;
 
-        //! Destroy current surface
+	//! Destroy current surface
-        virtual void destroySurface() =0;
+	virtual void destroySurface() = 0;
 
-        //! Create context based on current surface
+	//! Create context based on current surface
-        virtual bool generateContext() =0;
+	virtual bool generateContext() = 0;
 
-        //! Destroy current context
+	//! Destroy current context
-        virtual void destroyContext() =0;
+	virtual void destroyContext() = 0;
 
-		//! Get current context
+	//! Get current context
-		virtual const SExposedVideoData& getContext() const =0;
+	virtual const SExposedVideoData &getContext() const = 0;
 
-		//! Change render context, disable old and activate new defined by videoData
+	//! Change render context, disable old and activate new defined by videoData
-		//\param restorePrimaryOnZero When true: restore original driver context when videoData is set to 0 values.
+	//\param restorePrimaryOnZero When true: restore original driver context when videoData is set to 0 values.
-		//                            When false: resets the context when videoData is set to 0 values.
+	//                            When false: resets the context when videoData is set to 0 values.
-		/** This is mostly used internally by IVideoDriver::beginScene().
+	/** This is mostly used internally by IVideoDriver::beginScene().
-			But if you want to switch threads which access your OpenGL driver you will have to
+		But if you want to switch threads which access your OpenGL driver you will have to
-			call this function as follows:
+		call this function as follows:
-			Old thread gives up context with: activateContext(irr::video::SExposedVideoData());
+		Old thread gives up context with: activateContext(irr::video::SExposedVideoData());
-			New thread takes over context with: activateContext(videoDriver->getExposedVideoData());
+		New thread takes over context with: activateContext(videoDriver->getExposedVideoData());
-			Note that only 1 thread at a time may access an OpenGL context.	*/
+		Note that only 1 thread at a time may access an OpenGL context.	*/
-		virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero=false) =0;
+	virtual bool activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero = false) = 0;
 
-		//! Get the address of any OpenGL procedure (including core procedures).
+	//! Get the address of any OpenGL procedure (including core procedures).
-		virtual void* getProcAddress(const std::string &procName) =0;
+	virtual void *getProcAddress(const std::string &procName) = 0;
 
-        //! Swap buffers.
+	//! Swap buffers.
-        virtual bool swapBuffers() =0;
+	virtual bool swapBuffers() = 0;
-	};
+};
 
 } // end namespace video
 } // end namespace irr
-
-
-#endif

include/ICursorControl.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_CURSOR_CONTROL_H_INCLUDED__
+#pragma once
-#define __I_CURSOR_CONTROL_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
@@ -14,36 +13,35 @@ namespace irr
 namespace gui
 {
 
-	class IGUISpriteBank;
+class IGUISpriteBank;
 
-	//! Default icons for cursors
+//! Default icons for cursors
-	enum ECURSOR_ICON
+enum ECURSOR_ICON
-	{
+{
-		// Following cursors might be system specific, or might use an Irrlicht icon-set. No guarantees so far.
+	// Following cursors might be system specific, or might use an Irrlicht icon-set. No guarantees so far.
-		ECI_NORMAL,	// arrow
+	ECI_NORMAL,   // arrow
-		ECI_CROSS,	// Crosshair
+	ECI_CROSS,    // Crosshair
-		ECI_HAND,	// Hand
+	ECI_HAND,     // Hand
-		ECI_HELP,	// Arrow and question mark
+	ECI_HELP,     // Arrow and question mark
-		ECI_IBEAM,	// typical text-selection cursor
+	ECI_IBEAM,    // typical text-selection cursor
-		ECI_NO,		// should not click icon
+	ECI_NO,       // should not click icon
-		ECI_WAIT,	// hourclass
+	ECI_WAIT,     // hourglass
-		ECI_SIZEALL,	// arrow in all directions
+	ECI_SIZEALL,  // arrow in all directions
-		ECI_SIZENESW,	// resizes in direction north-east or south-west
+	ECI_SIZENESW, // resizes in direction north-east or south-west
-		ECI_SIZENWSE,	// resizes in direction north-west or south-east
+	ECI_SIZENWSE, // resizes in direction north-west or south-east
-		ECI_SIZENS,	// resizes in direction north or south
+	ECI_SIZENS,   // resizes in direction north or south
-		ECI_SIZEWE,	// resizes in direction west or east
+	ECI_SIZEWE,   // resizes in direction west or east
-		ECI_UP,		// up-arrow
+	ECI_UP,       // up-arrow
 
-		// Implementer note: Should we add system specific cursors, which use guaranteed the system icons,
+	// Implementer note: Should we add system specific cursors, which use guaranteed the system icons,
-		// then I would recommend using a naming scheme like ECI_W32_CROSS, ECI_X11_CROSSHAIR and adding those
+	// then I would recommend using a naming scheme like ECI_W32_CROSS, ECI_X11_CROSSHAIR and adding those
-		// additionally.
+	// additionally.
 
-		ECI_COUNT		// maximal of defined cursors. Note that higher values can be created at runtime
+	ECI_COUNT // maximal of defined cursors. Note that higher values can be created at runtime
-	};
+};
 
-	//! Names for ECURSOR_ICON
+//! Names for ECURSOR_ICON
-	const c8* const GUICursorIconNames[ECI_COUNT+1] =
+const c8 *const GUICursorIconNames[ECI_COUNT + 1] = {
-	{
 		"normal",
 		"cross",
 		"hand",
@@ -57,146 +55,141 @@ namespace gui
 		"sizens",
 		"sizewe",
 		"sizeup",
-		0
+		0,
 	};
 
-	//! structure used to set sprites as cursors.
+//! structure used to set sprites as cursors.
-	struct SCursorSprite
+struct SCursorSprite
+{
+	SCursorSprite() :
+			SpriteBank(0), SpriteId(-1)
 	{
-		SCursorSprite()
+	}
-		: SpriteBank(0), SpriteId(-1)
-		{
-		}
 
-		SCursorSprite( gui::IGUISpriteBank * spriteBank, s32 spriteId, const core::position2d<s32> &hotspot=(core::position2d<s32>(0,0)) )
+	SCursorSprite(gui::IGUISpriteBank *spriteBank, s32 spriteId, const core::position2d<s32> &hotspot = (core::position2d<s32>(0, 0))) :
-		: SpriteBank(spriteBank), SpriteId(spriteId), HotSpot(hotspot)
+			SpriteBank(spriteBank), SpriteId(spriteId), HotSpot(hotspot)
-		{
-		}
-
-		IGUISpriteBank * SpriteBank;
-		s32 SpriteId;
-		core::position2d<s32> HotSpot;
-	};
-
-	//! platform specific behavior flags for the cursor
-	enum ECURSOR_PLATFORM_BEHAVIOR
 	{
-		//! default - no platform specific behavior
+	}
-		ECPB_NONE = 0,
 
-		//! On X11 try caching cursor updates as XQueryPointer calls can be expensive.
+	IGUISpriteBank *SpriteBank;
-		/** Update cursor positions only when the irrlicht timer has been updated or the timer is stopped.
+	s32 SpriteId;
-			This means you usually get one cursor update per device->run() which will be fine in most cases.
+	core::position2d<s32> HotSpot;
-			See this forum-thread for a more detailed explanation:
+};
-			http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=45525
-		*/
-		ECPB_X11_CACHE_UPDATES = 1
-	};
 
-	//! Interface to manipulate the mouse cursor.
+//! platform specific behavior flags for the cursor
-	class ICursorControl : public virtual IReferenceCounted
+enum ECURSOR_PLATFORM_BEHAVIOR
-	{
+{
-	public:
+	//! default - no platform specific behavior
+	ECPB_NONE = 0,
 
-		//! Changes the visible state of the mouse cursor.
+	//! On X11 try caching cursor updates as XQueryPointer calls can be expensive.
-		/** \param visible: The new visible state. If true, the cursor will be visible,
+	/** Update cursor positions only when the irrlicht timer has been updated or the timer is stopped.
-		if false, it will be invisible. */
+		This means you usually get one cursor update per device->run() which will be fine in most cases.
-		virtual void setVisible(bool visible) = 0;
+		See this forum-thread for a more detailed explanation:
+		http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=45525
+	*/
+	ECPB_X11_CACHE_UPDATES = 1
+};
 
-		//! Returns if the cursor is currently visible.
+//! Interface to manipulate the mouse cursor.
-		/** \return True if the cursor flag is set to visible, false if not. */
+class ICursorControl : public virtual IReferenceCounted
-		virtual bool isVisible() const = 0;
+{
+public:
+	//! Changes the visible state of the mouse cursor.
+	/** \param visible: The new visible state. If true, the cursor will be visible,
+	if false, it will be invisible. */
+	virtual void setVisible(bool visible) = 0;
 
-		//! Sets the new position of the cursor.
+	//! Returns if the cursor is currently visible.
-		/** The position must be
+	/** \return True if the cursor flag is set to visible, false if not. */
-		between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
+	virtual bool isVisible() const = 0;
-		the top left corner and (1.0f, 1.0f) is the bottom right corner of the
-		render window.
-		\param pos New position of the cursor. */
-		virtual void setPosition(const core::position2d<f32> &pos) = 0;
 
-		//! Sets the new position of the cursor.
+	//! Sets the new position of the cursor.
-		/** The position must be
+	/** The position must be
-		between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
+	between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
-		the top left corner and (1.0f, 1.0f) is the bottom right corner of the
+	the top left corner and (1.0f, 1.0f) is the bottom right corner of the
-		render window.
+	render window.
-		\param x New x-coord of the cursor.
+	\param pos New position of the cursor. */
-		\param y New x-coord of the cursor. */
+	virtual void setPosition(const core::position2d<f32> &pos) = 0;
-		virtual void setPosition(f32 x, f32 y) = 0;
 
-		//! Sets the new position of the cursor.
+	//! Sets the new position of the cursor.
-		/** \param pos: New position of the cursor. The coordinates are pixel units. */
+	/** The position must be
-		virtual void setPosition(const core::position2d<s32> &pos) = 0;
+	between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
+	the top left corner and (1.0f, 1.0f) is the bottom right corner of the
+	render window.
+	\param x New x-coord of the cursor.
+	\param y New x-coord of the cursor. */
+	virtual void setPosition(f32 x, f32 y) = 0;
 
-		//! Sets the new position of the cursor.
+	//! Sets the new position of the cursor.
-		/** \param x New x-coord of the cursor. The coordinates are pixel units.
+	/** \param pos: New position of the cursor. The coordinates are pixel units. */
-		\param y New y-coord of the cursor. The coordinates are pixel units. */
+	virtual void setPosition(const core::position2d<s32> &pos) = 0;
-		virtual void setPosition(s32 x, s32 y) = 0;
 
-		//! Returns the current position of the mouse cursor.
+	//! Sets the new position of the cursor.
-		/** \param updateCursor When true ask system/OS for current cursor position. 
+	/** \param x New x-coord of the cursor. The coordinates are pixel units.
-			When false return the last known (buffered) position ( this is useful to 
+	\param y New y-coord of the cursor. The coordinates are pixel units. */
-			check what has become of a setPosition call with float numbers).
+	virtual void setPosition(s32 x, s32 y) = 0;
-		\return Returns the current position of the cursor. The returned position
-		is the position of the mouse cursor in pixel units. */
-		virtual const core::position2d<s32>& getPosition(bool updateCursor=true) = 0;
 
-		//! Returns the current position of the mouse cursor.
+	//! Returns the current position of the mouse cursor.
-		/** \param updateCursor When true ask system/OS for current cursor position. 
+	/** \param updateCursor When true ask system/OS for current cursor position.
-			When false return the last known (buffered) position (this is 
+		When false return the last known (buffered) position ( this is useful to
-			useful to check what has become of a setPosition call with float numbers
+		check what has become of a setPosition call with float numbers).
-			and is often different from the values you passed in setPosition).
+	\return Returns the current position of the cursor. The returned position
-		\return Returns the current position of the cursor. The returned position
+	is the position of the mouse cursor in pixel units. */
-		is a value between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
+	virtual const core::position2d<s32> &getPosition(bool updateCursor = true) = 0;
-		the top left corner and (1.0f, 1.0f) is the bottom right corner of the
-		render window. */
-		virtual core::position2d<f32> getRelativePosition(bool updateCursor=true) = 0;
 
-		//! Sets an absolute reference rect for setting and retrieving the cursor position.
+	//! Returns the current position of the mouse cursor.
-		/** If this rect is set, the cursor position is not being calculated relative to
+	/** \param updateCursor When true ask system/OS for current cursor position.
-		the rendering window but to this rect. You can set the rect pointer to 0 to disable
+		When false return the last known (buffered) position (this is
-		this feature again. This feature is useful when rendering into parts of foreign windows
+		useful to check what has become of a setPosition call with float numbers
-		for example in an editor.
+		and is often different from the values you passed in setPosition).
-		\param rect: A pointer to an reference rectangle or 0 to disable the reference rectangle.*/
+	\return Returns the current position of the cursor. The returned position
-		virtual void setReferenceRect(core::rect<s32>* rect=0) = 0;
+	is a value between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
+	the top left corner and (1.0f, 1.0f) is the bottom right corner of the
+	render window. */
+	virtual core::position2d<f32> getRelativePosition(bool updateCursor = true) = 0;
 
-		//! Internally fixes the mouse position, and reports relative mouse movement compared to the old position 
+	//! Sets an absolute reference rect for setting and retrieving the cursor position.
-		/** Specific to SDL */
+	/** If this rect is set, the cursor position is not being calculated relative to
-		virtual void setRelativeMode(bool relative) {};
+	the rendering window but to this rect. You can set the rect pointer to 0 to disable
+	this feature again. This feature is useful when rendering into parts of foreign windows
+	for example in an editor.
+	\param rect: A pointer to an reference rectangle or 0 to disable the reference rectangle.*/
+	virtual void setReferenceRect(core::rect<s32> *rect = 0) = 0;
 
-		//! Sets the active cursor icon
+	//! Internally fixes the mouse position, and reports relative mouse movement compared to the old position
-		/** Setting cursor icons is so far only supported on Win32 and Linux */
+	/** Specific to SDL */
-		virtual void setActiveIcon(ECURSOR_ICON iconId) {}
+	virtual void setRelativeMode(bool relative){};
 
-		//! Gets the currently active icon
+	//! Sets the active cursor icon
-		virtual ECURSOR_ICON getActiveIcon() const { return gui::ECI_NORMAL; }
+	/** Setting cursor icons is so far only supported on Win32 and Linux */
+	virtual void setActiveIcon(ECURSOR_ICON iconId) {}
 
-		//! Add a custom sprite as cursor icon.
+	//! Gets the currently active icon
-		/** \return Identification for the icon */
+	virtual ECURSOR_ICON getActiveIcon() const { return gui::ECI_NORMAL; }
-		virtual ECURSOR_ICON addIcon(const gui::SCursorSprite& icon) { return gui::ECI_NORMAL; }
 
-		//! replace a cursor icon.
+	//! Add a custom sprite as cursor icon.
-		/** Changing cursor icons is so far only supported on Win32 and Linux
+	/** \return Identification for the icon */
-			Note that this only changes the icons within your application, system cursors outside your
+	virtual ECURSOR_ICON addIcon(const gui::SCursorSprite &icon) { return gui::ECI_NORMAL; }
-			application will not be affected.
-		*/
-		virtual void changeIcon(ECURSOR_ICON iconId, const gui::SCursorSprite& sprite) {}
 
-		//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
+	//! replace a cursor icon.
-		virtual core::dimension2di getSupportedIconSize() const { return core::dimension2di(0,0); }
+	/** Changing cursor icons is so far only supported on Win32 and Linux
+		Note that this only changes the icons within your application, system cursors outside your
+		application will not be affected.
+	*/
+	virtual void changeIcon(ECURSOR_ICON iconId, const gui::SCursorSprite &sprite) {}
 
-		//! Set platform specific behavior flags.
+	//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
-		virtual void setPlatformBehavior(ECURSOR_PLATFORM_BEHAVIOR behavior) {}
+	virtual core::dimension2di getSupportedIconSize() const { return core::dimension2di(0, 0); }
 
-		//! Return platform specific behavior.
+	//! Set platform specific behavior flags.
-		/** \return Behavior set by setPlatformBehavior or ECPB_NONE for platforms not implementing specific behaviors.
+	virtual void setPlatformBehavior(ECURSOR_PLATFORM_BEHAVIOR behavior) {}
-		*/
-		virtual ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const { return ECPB_NONE; }
-	};
 
+	//! Return platform specific behavior.
+	/** \return Behavior set by setPlatformBehavior or ECPB_NONE for platforms not implementing specific behaviors.
+	 */
+	virtual ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const { return ECPB_NONE; }
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IDummyTransformationSceneNode.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
+#pragma once
-#define __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
 
 #include "ISceneNode.h"
 
@@ -23,20 +22,15 @@ joint scene nodes when playing skeletal animations.
 class IDummyTransformationSceneNode : public ISceneNode
 {
 public:
-
 	//! Constructor
-	IDummyTransformationSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id)
+	IDummyTransformationSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id) :
-		: ISceneNode(parent, mgr, id) {}
+			ISceneNode(parent, mgr, id) {}
 
 	//! Returns a reference to the current relative transformation matrix.
 	/** This is the matrix, this scene node uses instead of scale, translation
 	and rotation. */
-	virtual core::matrix4& getRelativeTransformationMatrix() = 0;
+	virtual core::matrix4 &getRelativeTransformationMatrix() = 0;
 };
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif
-

include/IEventReceiver.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_EVENT_RECEIVER_H_INCLUDED__
+#pragma once
-#define __I_EVENT_RECEIVER_H_INCLUDED__
 
 #include "ILogger.h"
 #include "Keycodes.h"
@@ -11,300 +10,303 @@
 
 namespace irr
 {
-	//! Enumeration for all event types there are.
+//! Enumeration for all event types there are.
-	enum EEVENT_TYPE
+enum EEVENT_TYPE
-	{
+{
-		//! An event of the graphical user interface.
+	//! An event of the graphical user interface.
-		/** GUI events are created by the GUI environment or the GUI elements in response
+	/** GUI events are created by the GUI environment or the GUI elements in response
-		to mouse or keyboard events. When a GUI element receives an event it will either
+	to mouse or keyboard events. When a GUI element receives an event it will either
-		process it and return true, or pass the event to its parent. If an event is not absorbed
+	process it and return true, or pass the event to its parent. If an event is not absorbed
-		before it reaches the root element then it will then be passed to the user receiver. */
+	before it reaches the root element then it will then be passed to the user receiver. */
-		EET_GUI_EVENT = 0,
+	EET_GUI_EVENT = 0,
-
+
-		//! A mouse input event.
+	//! A mouse input event.
-		/** Mouse events are created by the device and passed to IrrlichtDevice::postEventFromUser
+	/** Mouse events are created by the device and passed to IrrlichtDevice::postEventFromUser
-		in response to mouse input received from the operating system.
+	in response to mouse input received from the operating system.
-		Mouse events are first passed to the user receiver, then to the GUI environment and its elements,
+	Mouse events are first passed to the user receiver, then to the GUI environment and its elements,
-		then finally the input receiving scene manager where it is passed to the active camera.
+	then finally the input receiving scene manager where it is passed to the active camera.
-		*/
+	*/
-		EET_MOUSE_INPUT_EVENT,
+	EET_MOUSE_INPUT_EVENT,
-
+
-		//! A key input event.
+	//! A key input event.
-		/** Like mouse events, keyboard events are created by the device and passed to
+	/** Like mouse events, keyboard events are created by the device and passed to
-		IrrlichtDevice::postEventFromUser. They take the same path as mouse events. */
+	IrrlichtDevice::postEventFromUser. They take the same path as mouse events. */
-		EET_KEY_INPUT_EVENT,
+	EET_KEY_INPUT_EVENT,
-
+
-		//! A string input event.
+	//! A string input event.
-		/** This event is created when multiple characters are sent at a time (e.g. using an IME). */
+	/** This event is created when multiple characters are sent at a time (e.g. using an IME). */
-		EET_STRING_INPUT_EVENT,
+	EET_STRING_INPUT_EVENT,
-
+
-		//! A touch input event.
+	//! A touch input event.
-		EET_TOUCH_INPUT_EVENT,
+	EET_TOUCH_INPUT_EVENT,
-
+
-		//! A accelerometer event.
+	//! A accelerometer event.
-		EET_ACCELEROMETER_EVENT,
+	EET_ACCELEROMETER_EVENT,
-
+
-		//! A gyroscope event.
+	//! A gyroscope event.
-		EET_GYROSCOPE_EVENT,
+	EET_GYROSCOPE_EVENT,
-
+
-		//! A device motion event.
+	//! A device motion event.
-		EET_DEVICE_MOTION_EVENT,
+	EET_DEVICE_MOTION_EVENT,
-
+
-		//! A joystick (joypad, gamepad) input event.
+	//! A joystick (joypad, gamepad) input event.
-		/** Joystick events are created by polling all connected joysticks once per
+	/** Joystick events are created by polling all connected joysticks once per
-		device run() and then passing the events to IrrlichtDevice::postEventFromUser.
+	device run() and then passing the events to IrrlichtDevice::postEventFromUser.
-		They take the same path as mouse events.
+	They take the same path as mouse events.
-		Windows, SDL: Implemented.
+	Windows, SDL: Implemented.
-		Linux: Implemented, with POV hat issues.
+	Linux: Implemented, with POV hat issues.
-		MacOS / Other: Not yet implemented.
+	MacOS / Other: Not yet implemented.
-		*/
+	*/
-		EET_JOYSTICK_INPUT_EVENT,
+	EET_JOYSTICK_INPUT_EVENT,
-
+
-		//! A log event
+	//! A log event
-		/** Log events are only passed to the user receiver if there is one. If they are absorbed by the
+	/** Log events are only passed to the user receiver if there is one. If they are absorbed by the
-		user receiver then no text will be sent to the console. */
+	user receiver then no text will be sent to the console. */
-		EET_LOG_TEXT_EVENT,
+	EET_LOG_TEXT_EVENT,
-
+
-		//! A user event with user data.
+	//! A user event with user data.
-		/** This is not used by Irrlicht and can be used to send user
+	/** This is not used by Irrlicht and can be used to send user
-		specific data though the system. The Irrlicht 'window handle'
+	specific data though the system. The Irrlicht 'window handle'
-		can be obtained from IrrlichtDevice::getExposedVideoData()
+	can be obtained from IrrlichtDevice::getExposedVideoData()
-		The usage and behavior depends on the operating system:
+	The usage and behavior depends on the operating system:
-		Windows: send a WM_USER message to the Irrlicht Window; the
+	Windows: send a WM_USER message to the Irrlicht Window; the
-			wParam and lParam will be used to populate the
+		wParam and lParam will be used to populate the
-			UserData1 and UserData2 members of the SUserEvent.
+		UserData1 and UserData2 members of the SUserEvent.
-		Linux: send a ClientMessage via XSendEvent to the Irrlicht
+	Linux: send a ClientMessage via XSendEvent to the Irrlicht
-			Window; the data.l[0] and data.l[1] members will be
+		Window; the data.l[0] and data.l[1] members will be
-			cast to s32 and used as UserData1 and UserData2.
+		cast to s32 and used as UserData1 and UserData2.
-		MacOS: Not yet implemented
+	MacOS: Not yet implemented
-		*/
+	*/
-		EET_USER_EVENT,
+	EET_USER_EVENT,
-
+
-		//! Pass on raw events from the OS
+	//! Pass on raw events from the OS
-		EET_SYSTEM_EVENT,
+	EET_SYSTEM_EVENT,
-
+
-		//! Application state events like a resume, pause etc.
+	//! Application state events like a resume, pause etc.
-		EET_APPLICATION_EVENT,
+	EET_APPLICATION_EVENT,
-
+
-		//! This enum is never used, it only forces the compiler to
+	//! This enum is never used, it only forces the compiler to
-		//! compile these enumeration values to 32 bit.
+	//! compile these enumeration values to 32 bit.
-		EGUIET_FORCE_32_BIT = 0x7fffffff
+	EGUIET_FORCE_32_BIT = 0x7fffffff
-
+
-	};
+};
-
+
-	//! Enumeration for all mouse input events
+//! Enumeration for all mouse input events
-	enum EMOUSE_INPUT_EVENT
+enum EMOUSE_INPUT_EVENT
-	{
+{
-		//! Left mouse button was pressed down.
+	//! Left mouse button was pressed down.
-		EMIE_LMOUSE_PRESSED_DOWN = 0,
+	EMIE_LMOUSE_PRESSED_DOWN = 0,
-
+
-		//! Right mouse button was pressed down.
+	//! Right mouse button was pressed down.
-		EMIE_RMOUSE_PRESSED_DOWN,
+	EMIE_RMOUSE_PRESSED_DOWN,
-
+
-		//! Middle mouse button was pressed down.
+	//! Middle mouse button was pressed down.
-		EMIE_MMOUSE_PRESSED_DOWN,
+	EMIE_MMOUSE_PRESSED_DOWN,
-
+
-		//! Left mouse button was left up.
+	//! Left mouse button was left up.
-		EMIE_LMOUSE_LEFT_UP,
+	EMIE_LMOUSE_LEFT_UP,
-
+
-		//! Right mouse button was left up.
+	//! Right mouse button was left up.
-		EMIE_RMOUSE_LEFT_UP,
+	EMIE_RMOUSE_LEFT_UP,
-
+
-		//! Middle mouse button was left up.
+	//! Middle mouse button was left up.
-		EMIE_MMOUSE_LEFT_UP,
+	EMIE_MMOUSE_LEFT_UP,
-
+
-		//! The mouse cursor changed its position.
+	//! The mouse cursor changed its position.
-		EMIE_MOUSE_MOVED,
+	EMIE_MOUSE_MOVED,
-
+
-		//! The mouse wheel was moved. Use Wheel value in event data to find out
+	//! The mouse wheel was moved. Use Wheel value in event data to find out
-		//! in what direction and how fast.
+	//! in what direction and how fast.
-		EMIE_MOUSE_WHEEL,
+	EMIE_MOUSE_WHEEL,
-
+
-		//! Left mouse button double click.
+	//! Left mouse button double click.
-		//! This event is generated after the second EMIE_LMOUSE_PRESSED_DOWN event.
+	//! This event is generated after the second EMIE_LMOUSE_PRESSED_DOWN event.
-		EMIE_LMOUSE_DOUBLE_CLICK,
+	EMIE_LMOUSE_DOUBLE_CLICK,
-
+
-		//! Right mouse button double click.
+	//! Right mouse button double click.
-		//! This event is generated after the second EMIE_RMOUSE_PRESSED_DOWN event.
+	//! This event is generated after the second EMIE_RMOUSE_PRESSED_DOWN event.
-		EMIE_RMOUSE_DOUBLE_CLICK,
+	EMIE_RMOUSE_DOUBLE_CLICK,
 
-		//! Middle mouse button double click.
+	//! Middle mouse button double click.
-		//! This event is generated after the second EMIE_MMOUSE_PRESSED_DOWN event.
+	//! This event is generated after the second EMIE_MMOUSE_PRESSED_DOWN event.
-		EMIE_MMOUSE_DOUBLE_CLICK,
+	EMIE_MMOUSE_DOUBLE_CLICK,
 
-		//! Left mouse button triple click.
+	//! Left mouse button triple click.
-		//! This event is generated after the third EMIE_LMOUSE_PRESSED_DOWN event.
+	//! This event is generated after the third EMIE_LMOUSE_PRESSED_DOWN event.
-		EMIE_LMOUSE_TRIPLE_CLICK,
+	EMIE_LMOUSE_TRIPLE_CLICK,
-
+
-		//! Right mouse button triple click.
+	//! Right mouse button triple click.
-		//! This event is generated after the third EMIE_RMOUSE_PRESSED_DOWN event.
+	//! This event is generated after the third EMIE_RMOUSE_PRESSED_DOWN event.
-		EMIE_RMOUSE_TRIPLE_CLICK,
+	EMIE_RMOUSE_TRIPLE_CLICK,
-
+
-		//! Middle mouse button triple click.
+	//! Middle mouse button triple click.
-		//! This event is generated after the third EMIE_MMOUSE_PRESSED_DOWN event.
+	//! This event is generated after the third EMIE_MMOUSE_PRESSED_DOWN event.
-		EMIE_MMOUSE_TRIPLE_CLICK,
+	EMIE_MMOUSE_TRIPLE_CLICK,
-
+
-		//! Mouse enters canvas used for rendering.
+	//! Mouse enters canvas used for rendering.
-		//! Only generated on emscripten
+	//! Only generated on emscripten
-		EMIE_MOUSE_ENTER_CANVAS,
+	EMIE_MOUSE_ENTER_CANVAS,
-
+
-		//! Mouse leaves canvas used for rendering.
+	//! Mouse leaves canvas used for rendering.
-		//! Only generated on emscripten
+	//! Only generated on emscripten
-		EMIE_MOUSE_LEAVE_CANVAS,
+	EMIE_MOUSE_LEAVE_CANVAS,
-
+
-		//! No real event. Just for convenience to get number of events
+	//! No real event. Just for convenience to get number of events
-		EMIE_COUNT
+	EMIE_COUNT
-	};
+};
-
+
-	//! Masks for mouse button states
+//! Masks for mouse button states
-	enum E_MOUSE_BUTTON_STATE_MASK
+enum E_MOUSE_BUTTON_STATE_MASK
-	{
+{
-		EMBSM_LEFT    = 0x01,
+	EMBSM_LEFT = 0x01,
-		EMBSM_RIGHT   = 0x02,
+	EMBSM_RIGHT = 0x02,
-		EMBSM_MIDDLE  = 0x04,
+	EMBSM_MIDDLE = 0x04,
 
-		//! currently only on windows
+	//! currently only on windows
-		EMBSM_EXTRA1  = 0x08,
+	EMBSM_EXTRA1 = 0x08,
 
-		//! currently only on windows
+	//! currently only on windows
-		EMBSM_EXTRA2  = 0x10,
+	EMBSM_EXTRA2 = 0x10,
 
-		EMBSM_FORCE_32_BIT = 0x7fffffff
+	EMBSM_FORCE_32_BIT = 0x7fffffff
-	};
+};
 
-    //! Enumeration for all touch input events
+//! Enumeration for all touch input events
-	enum ETOUCH_INPUT_EVENT
+enum ETOUCH_INPUT_EVENT
-	{
+{
-		//! Touch was pressed down.
+	//! Touch was pressed down.
-		ETIE_PRESSED_DOWN = 0,
+	ETIE_PRESSED_DOWN = 0,
 
-		//! Touch was left up.
+	//! Touch was left up.
-		ETIE_LEFT_UP,
+	ETIE_LEFT_UP,
 
-		//! The touch changed its position.
+	//! The touch changed its position.
-		ETIE_MOVED,
+	ETIE_MOVED,
 
-		//! No real event. Just for convenience to get number of events
+	//! No real event. Just for convenience to get number of events
-		ETIE_COUNT
+	ETIE_COUNT
-	};
+};
 
-	enum ESYSTEM_EVENT_TYPE
+enum ESYSTEM_EVENT_TYPE
-	{
+{
-		//! From Android command handler for native activity messages
+	//! From Android command handler for native activity messages
-		ESET_ANDROID_CMD = 0,
+	ESET_ANDROID_CMD = 0,
 
-		// TODO: for example ESET_WINDOWS_MESSAGE for win32 message loop events
+	// TODO: for example ESET_WINDOWS_MESSAGE for win32 message loop events
 
-		//! No real event, but to get number of event types
+	//! No real event, but to get number of event types
-		ESET_COUNT
+	ESET_COUNT
-	};
+};
 
-	//! Enumeration for a commonly used application state events (it's useful mainly for mobile devices)
+//! Enumeration for a commonly used application state events (it's useful mainly for mobile devices)
-	enum EAPPLICATION_EVENT_TYPE
+enum EAPPLICATION_EVENT_TYPE
-	{
+{
-		//! The application will be resumed.
+	//! The application will be resumed.
-		EAET_WILL_RESUME = 0,
+	EAET_WILL_RESUME = 0,
 
-		//! The application has been resumed.
+	//! The application has been resumed.
-		EAET_DID_RESUME,
+	EAET_DID_RESUME,
 
-		//! The application will be paused.
+	//! The application will be paused.
-		EAET_WILL_PAUSE,
+	EAET_WILL_PAUSE,
 
-		//! The application has been paused.
+	//! The application has been paused.
-		EAET_DID_PAUSE,
+	EAET_DID_PAUSE,
 
-		//! The application will be terminated.
+	//! The application will be terminated.
-		EAET_WILL_TERMINATE,
+	EAET_WILL_TERMINATE,
 
-		//! The application received a memory warning.
+	//! The application received a memory warning.
-		EAET_MEMORY_WARNING,
+	EAET_MEMORY_WARNING,
 
-		//! No real event, but to get number of event types.
+	//! No real event, but to get number of event types.
-		EAET_COUNT
+	EAET_COUNT
-	};
+};
 
-	namespace gui
+namespace gui
-	{
+{
 
-		class IGUIElement;
+class IGUIElement;
 
-		//! Enumeration for all events which are sendable by the gui system
+//! Enumeration for all events which are sendable by the gui system
-		enum EGUI_EVENT_TYPE
+enum EGUI_EVENT_TYPE
-		{
+{
-			//! A gui element has lost its focus.
+	//! A gui element has lost its focus.
-			/** GUIEvent.Caller is losing the focus to GUIEvent.Element.
+	/** GUIEvent.Caller is losing the focus to GUIEvent.Element.
-			If the event is absorbed then the focus will not be changed. */
+	If the event is absorbed then the focus will not be changed. */
-			EGET_ELEMENT_FOCUS_LOST = 0,
+	EGET_ELEMENT_FOCUS_LOST = 0,
 
-			//! A gui element has got the focus.
+	//! A gui element has got the focus.
-			/** If the event is absorbed then the focus will not be changed. */
+	/** If the event is absorbed then the focus will not be changed. */
-			EGET_ELEMENT_FOCUSED,
+	EGET_ELEMENT_FOCUSED,
 
-			//! The mouse cursor hovered over a gui element.
+	//! The mouse cursor hovered over a gui element.
-			/** If an element has sub-elements you also get this message for the subelements */
+	/** If an element has sub-elements you also get this message for the subelements */
-			EGET_ELEMENT_HOVERED,
+	EGET_ELEMENT_HOVERED,
 
-			//! The mouse cursor left the hovered element.
+	//! The mouse cursor left the hovered element.
-			/** If an element has sub-elements you also get this message for the subelements */
+	/** If an element has sub-elements you also get this message for the subelements */
-			EGET_ELEMENT_LEFT,
+	EGET_ELEMENT_LEFT,
 
-			//! An element would like to close.
+	//! An element would like to close.
-			/** Windows and context menus use this event when they would like to close,
+	/** Windows and context menus use this event when they would like to close,
-			this can be canceled by absorbing the event. */
+	this can be canceled by absorbing the event. */
-			EGET_ELEMENT_CLOSED,
+	EGET_ELEMENT_CLOSED,
 
-			//! A button was clicked.
+	//! A button was clicked.
-			EGET_BUTTON_CLICKED,
+	EGET_BUTTON_CLICKED,
 
-			//! A scrollbar has changed its position.
+	//! A scrollbar has changed its position.
-			EGET_SCROLL_BAR_CHANGED,
+	EGET_SCROLL_BAR_CHANGED,
 
-			//! A checkbox has changed its check state.
+	//! A checkbox has changed its check state.
-			EGET_CHECKBOX_CHANGED,
+	EGET_CHECKBOX_CHANGED,
 
-			//! A new item in a listbox was selected.
+	//! A listbox would like to open.
-			/** NOTE: You also get this event currently when the same item was clicked again after more than 500 ms. */
+	/** You can prevent the listbox from opening by absorbing the event. */
-			EGET_LISTBOX_CHANGED,
+	EGET_LISTBOX_OPENED,
 
-			//! An item in the listbox was selected, which was already selected.
+	//! A new item in a listbox was selected.
-			/** NOTE: You get the event currently only if the item was clicked again within 500 ms or selected by "enter" or "space". */
+	/** NOTE: You also get this event currently when the same item was clicked again after more than 500 ms. */
-			EGET_LISTBOX_SELECTED_AGAIN,
+	EGET_LISTBOX_CHANGED,
 
-			//! A file has been selected in the file dialog
+	//! An item in the listbox was selected, which was already selected.
-			EGET_FILE_SELECTED,
+	/** NOTE: You get the event currently only if the item was clicked again within 500 ms or selected by "enter" or "space". */
+	EGET_LISTBOX_SELECTED_AGAIN,
 
-			//! A directory has been selected in the file dialog
+	//! A file has been selected in the file dialog
-			EGET_DIRECTORY_SELECTED,
+	EGET_FILE_SELECTED,
 
-			//! A file open dialog has been closed without choosing a file
+	//! A directory has been selected in the file dialog
-			EGET_FILE_CHOOSE_DIALOG_CANCELLED,
+	EGET_DIRECTORY_SELECTED,
 
-			//! In an editbox 'ENTER' was pressed
+	//! A file open dialog has been closed without choosing a file
-			EGET_EDITBOX_ENTER,
+	EGET_FILE_CHOOSE_DIALOG_CANCELLED,
 
-			//! The text in an editbox was changed. This does not include automatic changes in text-breaking.
+	//! In an editbox 'ENTER' was pressed
-			EGET_EDITBOX_CHANGED,
+	EGET_EDITBOX_ENTER,
 
-			//! The marked area in an editbox was changed.
+	//! The text in an editbox was changed. This does not include automatic changes in text-breaking.
-			EGET_EDITBOX_MARKING_CHANGED,
+	EGET_EDITBOX_CHANGED,
 
-			//! The tab was changed in an tab control
+	//! The marked area in an editbox was changed.
-			EGET_TAB_CHANGED,
+	EGET_EDITBOX_MARKING_CHANGED,
 
-			//! The selection in a combo box has been changed
+	//! The tab was changed in an tab control
-			EGET_COMBO_BOX_CHANGED,
+	EGET_TAB_CHANGED,
 
-			//! A table has changed
+	//! The selection in a combo box has been changed
-			EGET_TABLE_CHANGED,
+	EGET_COMBO_BOX_CHANGED,
-			EGET_TABLE_HEADER_CHANGED,
-			EGET_TABLE_SELECTED_AGAIN,
 
-			//! No real event. Just for convenience to get number of events
+	//! A table has changed
-			EGET_COUNT
+	EGET_TABLE_CHANGED,
-		};
+	EGET_TABLE_HEADER_CHANGED,
-	} // end namespace gui
+	EGET_TABLE_SELECTED_AGAIN,
 
+	//! No real event. Just for convenience to get number of events
+	EGET_COUNT
+};
+} // end namespace gui
 
 //! SEvents hold information about an event. See irr::IEventReceiver for details on event handling.
 struct SEvent
@@ -313,14 +315,13 @@ struct SEvent
 	struct SGUIEvent
 	{
 		//! IGUIElement who called the event
-		gui::IGUIElement* Caller;
+		gui::IGUIElement *Caller;
 
 		//! If the event has something to do with another element, it will be held here.
-		gui::IGUIElement* Element;
+		gui::IGUIElement *Element;
 
 		//! Type of GUI Event
 		gui::EGUI_EVENT_TYPE EventType;
-
 	};
 
 	//! Any kind of mouse event.
@@ -337,10 +338,10 @@ struct SEvent
 		f32 Wheel;
 
 		//! True if shift was also pressed
-		bool Shift:1;
+		bool Shift : 1;
 
 		//! True if ctrl was also pressed
-		bool Control:1;
+		bool Control : 1;
 
 		//! A bitmap of button states. You can use isButtonPressed() to determine
 		//! if a button is pressed or not.
@@ -348,13 +349,13 @@ struct SEvent
 		u32 ButtonStates;
 
 		//! Is the left button pressed down?
-		bool isLeftPressed() const { return 0 != ( ButtonStates & EMBSM_LEFT ); }
+		bool isLeftPressed() const { return 0 != (ButtonStates & EMBSM_LEFT); }
 
 		//! Is the right button pressed down?
-		bool isRightPressed() const { return 0 != ( ButtonStates & EMBSM_RIGHT ); }
+		bool isRightPressed() const { return 0 != (ButtonStates & EMBSM_RIGHT); }
 
 		//! Is the middle button pressed down?
-		bool isMiddlePressed() const { return 0 != ( ButtonStates & EMBSM_MIDDLE ); }
+		bool isMiddlePressed() const { return 0 != (ButtonStates & EMBSM_MIDDLE); }
 
 		//! Type of mouse event
 		EMOUSE_INPUT_EVENT Event;
@@ -374,13 +375,13 @@ struct SEvent
 		u32 SystemKeyCode;
 
 		//! If not true, then the key was left up
-		bool PressedDown:1;
+		bool PressedDown : 1;
 
 		//! True if shift was also pressed
-		bool Shift:1;
+		bool Shift : 1;
 
 		//! True if ctrl was also pressed
-		bool Control:1;
+		bool Control : 1;
 	};
 
 	//! String input event.
@@ -422,7 +423,7 @@ struct SEvent
 		f64 Z;
 	};
 
-    //! Any kind of gyroscope event.
+	//! Any kind of gyroscope event.
 	struct SGyroscopeEvent
 	{
 		// X rotation.
@@ -462,13 +463,13 @@ struct SEvent
 		{
 			NUMBER_OF_BUTTONS = 32,
 
-			AXIS_X = 0,	// e.g. analog stick 1 left to right
+			AXIS_X = 0, // e.g. analog stick 1 left to right
-			AXIS_Y,		// e.g. analog stick 1 top to bottom
+			AXIS_Y,     // e.g. analog stick 1 top to bottom
-			AXIS_Z,		// e.g. throttle, or analog 2 stick 2 left to right
+			AXIS_Z,     // e.g. throttle, or analog 2 stick 2 left to right
-			AXIS_R,		// e.g. rudder, or analog 2 stick 2 top to bottom
+			AXIS_R,     // e.g. rudder, or analog 2 stick 2 top to bottom
 			AXIS_U,
 			AXIS_V,
-			NUMBER_OF_AXES=18	// (please tell Irrlicht maintainers if you absolutely need more axes)
+			NUMBER_OF_AXES = 18 // (please tell Irrlicht maintainers if you absolutely need more axes)
 		};
 
 		/** A bitmap of button states.  You can use IsButtonPressed() to
@@ -500,7 +501,7 @@ struct SEvent
 		//! A helper function to check if a button is pressed.
 		bool IsButtonPressed(u32 button) const
 		{
-			if(button >= (u32)NUMBER_OF_BUTTONS)
+			if (button >= (u32)NUMBER_OF_BUTTONS)
 				return false;
 
 			return (ButtonStates & (1 << button)) ? true : false;
@@ -511,7 +512,7 @@ struct SEvent
 	struct SLogEvent
 	{
 		//! Pointer to text which has been logged
-		const c8* Text;
+		const c8 *Text;
 
 		//! Log level in which the text has been logged
 		ELOG_LEVEL Level;
@@ -569,7 +570,6 @@ struct SEvent
 		struct SSystemEvent SystemEvent;
 		struct SApplicationEvent ApplicationEvent;
 	};
-
 };
 
 //! Interface of an object which can receive events.
@@ -581,7 +581,6 @@ path it takes through the system. */
 class IEventReceiver
 {
 public:
-
 	//! Destructor
 	virtual ~IEventReceiver() {}
 
@@ -591,10 +590,9 @@ public:
 	* Therefore your return value for all unprocessed events should be 'false'.
 	\return True if the event was processed.
 	*/
-	virtual bool OnEvent(const SEvent& event) = 0;
+	virtual bool OnEvent(const SEvent &event) = 0;
 };
 
-
 //! Information on a joystick, returned from @ref irr::IrrlichtDevice::activateJoysticks()
 struct SJoystickInfo
 {
@@ -631,8 +629,4 @@ struct SJoystickInfo
 	} PovHat;
 }; // struct SJoystickInfo
 
-
 } // end namespace irr
-
-#endif
-

include/IFileArchive.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_FILE_ARCHIVE_H_INCLUDED__
+#pragma once
-#define __I_FILE_ARCHIVE_H_INCLUDED__
 
 #include "IReadFile.h"
 #include "IFileList.h"
@@ -17,69 +16,53 @@ namespace io
 //! FileSystemType: which filesystem should be used for e.g. browsing
 enum EFileSystemType
 {
-	FILESYSTEM_NATIVE = 0,	// Native OS FileSystem
+	FILESYSTEM_NATIVE = 0, // Native OS FileSystem
-	FILESYSTEM_VIRTUAL	// Virtual FileSystem
+	FILESYSTEM_VIRTUAL     // Virtual FileSystem
 };
 
 //! Contains the different types of archives
 enum E_FILE_ARCHIVE_TYPE
 {
 	//! A PKZIP archive
-	EFAT_ZIP     = MAKE_IRR_ID('Z','I','P', 0),
+	EFAT_ZIP = MAKE_IRR_ID('Z', 'I', 'P', 0),
 
 	//! A gzip archive
-	EFAT_GZIP    = MAKE_IRR_ID('g','z','i','p'),
+	EFAT_GZIP = MAKE_IRR_ID('g', 'z', 'i', 'p'),
 
-	//! A virtual directory
+	//! An Android asset file archive
-	EFAT_FOLDER  = MAKE_IRR_ID('f','l','d','r'),
+	EFAT_ANDROID_ASSET = MAKE_IRR_ID('A', 'S', 'S', 'E'),
-
-	//! An ID Software PAK archive
-	EFAT_PAK     = MAKE_IRR_ID('P','A','K', 0),
-
-	//! A Nebula Device archive
-	EFAT_NPK     = MAKE_IRR_ID('N','P','K', 0),
-
-	//! A Tape ARchive
-	EFAT_TAR     = MAKE_IRR_ID('T','A','R', 0),
-
-	//! A wad Archive, Quake2, Halflife
-	EFAT_WAD     = MAKE_IRR_ID('W','A','D', 0),
-
-    //! An Android asset file archive
-    EFAT_ANDROID_ASSET = MAKE_IRR_ID('A','S','S','E'),
 
 	//! The type of this archive is unknown
-	EFAT_UNKNOWN = MAKE_IRR_ID('u','n','k','n')
+	EFAT_UNKNOWN = MAKE_IRR_ID('u', 'n', 'k', 'n')
 };
 
 //! The FileArchive manages archives and provides access to files inside them.
 class IFileArchive : public virtual IReferenceCounted
 {
 public:
-
 	//! Opens a file based on its name
 	/** Creates and returns a new IReadFile for a file in the archive.
 	\param filename The file to open
 	\return Returns A pointer to the created file on success,
 	or 0 on failure. */
-	virtual IReadFile* createAndOpenFile(const path& filename) =0;
+	virtual IReadFile *createAndOpenFile(const path &filename) = 0;
 
 	//! Opens a file based on its position in the file list.
 	/** Creates and returns
 	\param index The zero based index of the file.
 	\return Returns a pointer to the created file on success, or 0 on failure. */
-	virtual IReadFile* createAndOpenFile(u32 index) =0;
+	virtual IReadFile *createAndOpenFile(u32 index) = 0;
 
 	//! Returns the complete file tree
 	/** \return Returns the complete directory tree for the archive,
 	including all files and folders */
-	virtual const IFileList* getFileList() const =0;
+	virtual const IFileList *getFileList() const = 0;
 
 	//! get the archive type
 	virtual E_FILE_ARCHIVE_TYPE getType() const { return EFAT_UNKNOWN; }
 
 	//! return the name (id) of the file Archive
-	virtual const io::path& getArchiveName() const =0;
+	virtual const io::path &getArchiveName() const = 0;
 
 	//! Add a directory in the archive and all it's files to the FileList
 	/** Only needed for file-archives which have no information about their own
@@ -111,38 +94,34 @@ public:
 	/** Check based on the file extension (e.g. ".zip")
 	\param filename Name of file to check.
 	\return True if file seems to be loadable. */
-	virtual bool isALoadableFileFormat(const path& filename) const =0;
+	virtual bool isALoadableFileFormat(const path &filename) const = 0;
 
 	//! Check if the file might be loaded by this class
 	/** This check may look into the file.
 	\param file File handle to check.
 	\return True if file seems to be loadable. */
-	virtual bool isALoadableFileFormat(io::IReadFile* file) const =0;
+	virtual bool isALoadableFileFormat(io::IReadFile *file) const = 0;
 
 	//! Check to see if the loader can create archives of this type.
 	/** Check based on the archive type.
 	\param fileType The archive type to check.
 	\return True if the archive loader supports this type, false if not */
-	virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const =0;
+	virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const = 0;
 
 	//! Creates an archive from the filename
 	/** \param filename File to use.
 	\param ignoreCase Searching is performed without regarding the case
 	\param ignorePaths Files are searched for without checking for the directories
 	\return Pointer to newly created archive, or 0 upon error. */
-	virtual IFileArchive* createArchive(const path& filename, bool ignoreCase, bool ignorePaths) const =0;
+	virtual IFileArchive *createArchive(const path &filename, bool ignoreCase, bool ignorePaths) const = 0;
 
 	//! Creates an archive from the file
 	/** \param file File handle to use.
 	\param ignoreCase Searching is performed without regarding the case
 	\param ignorePaths Files are searched for without checking for the directories
 	\return Pointer to newly created archive, or 0 upon error. */
-	virtual IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const =0;
+	virtual IFileArchive *createArchive(io::IReadFile *file, bool ignoreCase, bool ignorePaths) const = 0;
 };
 
-
 } // end namespace io
 } // end namespace irr
-
-#endif
-

include/IFileList.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_FILE_LIST_H_INCLUDED__
+#pragma once
-#define __I_FILE_LIST_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "path.h"
@@ -28,13 +27,13 @@ public:
 	\param index is the zero based index of the file which name should
 	be returned. The index must be less than the amount getFileCount() returns.
 	\return File name of the file. Returns 0, if an error occurred. */
-	virtual const io::path& getFileName(u32 index) const = 0;
+	virtual const io::path &getFileName(u32 index) const = 0;
 
 	//! Gets the full name of a file in the list including the path, based on an index.
 	/** \param index is the zero based index of the file which name should
 	be returned. The index must be less than the amount getFileCount() returns.
 	\return File name of the file. Returns 0 if an error occurred. */
-	virtual const io::path& getFullFileName(u32 index) const = 0;
+	virtual const io::path &getFullFileName(u32 index) const = 0;
 
 	//! Returns the size of a file in the file list, based on an index.
 	/** \param index is the zero based index of the file which should be returned.
@@ -69,10 +68,10 @@ public:
 	\param isFolder True if you are searching for a directory path, false if you are searching for a file
 	\return Returns the index of the file in the file list, or -1 if
 	no matching name name was found. */
-	virtual s32 findFile(const io::path& filename, bool isFolder=false) const = 0;
+	virtual s32 findFile(const io::path &filename, bool isFolder = false) const = 0;
 
 	//! Returns the base path of the file list
-	virtual const io::path& getPath() const = 0;
+	virtual const io::path &getPath() const = 0;
 
 	//! Add as a file or folder to the list
 	/** \param fullPath The file name including path, from the root of the file list.
@@ -80,7 +79,7 @@ public:
 	\param offset The file offset inside an archive
 	\param size The size of the file in bytes.
 	\param id The ID of the file in the archive which owns it */
-	virtual u32 addItem(const io::path& fullPath, u32 offset, u32 size, bool isDirectory, u32 id=0) = 0;
+	virtual u32 addItem(const io::path &fullPath, u32 offset, u32 size, bool isDirectory, u32 id = 0) = 0;
 
 	//! Sorts the file list. You should call this after adding any items to the file list
 	virtual void sort() = 0;
@@ -88,7 +87,3 @@ public:
 
 } // end namespace irr
 } // end namespace io
-
-
-#endif
-

include/IFileSystem.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_FILE_SYSTEM_H_INCLUDED__
+#pragma once
-#define __I_FILE_SYSTEM_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "IFileArchive.h"
@@ -12,7 +11,7 @@ namespace irr
 {
 namespace video
 {
-	class IVideoDriver;
+class IVideoDriver;
 } // end namespace video
 namespace io
 {
@@ -22,7 +21,6 @@ class IWriteFile;
 class IFileList;
 class IAttributes;
 
-
 //! The FileSystem manages files and archives and provides access to them.
 /** It manages where files are, so that modules which use the the IO do not
 need to know where every file is located. A file could be in a .zip-Archive or
@@ -30,13 +28,12 @@ as file on disk, using the IFileSystem makes no difference to this. */
 class IFileSystem : public virtual IReferenceCounted
 {
 public:
-
 	//! Opens a file for read access.
 	/** \param filename: Name of file to open.
 	\return Pointer to the created file interface.
 	The returned pointer should be dropped when no longer needed.
 	See IReferenceCounted::drop() for more information. */
-	virtual IReadFile* createAndOpenFile(const path& filename) =0;
+	virtual IReadFile *createAndOpenFile(const path &filename) = 0;
 
 	//! Creates an IReadFile interface for accessing memory like a file.
 	/** This allows you to use a pointer to memory where an IReadFile is requested.
@@ -49,7 +46,7 @@ public:
 	The returned pointer should be dropped when no longer needed.
 	See IReferenceCounted::drop() for more information.
 	*/
-	virtual IReadFile* createMemoryReadFile(const void* memory, s32 len, const path& fileName, bool deleteMemoryWhenDropped=false) =0;
+	virtual IReadFile *createMemoryReadFile(const void *memory, s32 len, const path &fileName, bool deleteMemoryWhenDropped = false) = 0;
 
 	//! Creates an IReadFile interface for accessing files inside files.
 	/** This is useful e.g. for archives.
@@ -61,8 +58,8 @@ public:
 	The returned pointer should be dropped when no longer needed.
 	See IReferenceCounted::drop() for more information.
 	*/
-	virtual IReadFile* createLimitReadFile(const path& fileName,
+	virtual IReadFile *createLimitReadFile(const path &fileName,
-			IReadFile* alreadyOpenedFile, long pos, long areaSize) =0;
+			IReadFile *alreadyOpenedFile, long pos, long areaSize) = 0;
 
 	//! Creates an IWriteFile interface for accessing memory like a file.
 	/** This allows you to use a pointer to memory where an IWriteFile is requested.
@@ -76,8 +73,7 @@ public:
 	The returned pointer should be dropped when no longer needed.
 	See IReferenceCounted::drop() for more information.
 	*/
-	virtual IWriteFile* createMemoryWriteFile(void* memory, s32 len, const path& fileName, bool deleteMemoryWhenDropped=false) =0;
+	virtual IWriteFile *createMemoryWriteFile(void *memory, s32 len, const path &fileName, bool deleteMemoryWhenDropped = false) = 0;
-
 
 	//! Opens a file for write access.
 	/** \param filename: Name of file to open.
@@ -87,7 +83,7 @@ public:
 	file could not created or opened for writing.
 	The returned pointer should be dropped when no longer needed.
 	See IReferenceCounted::drop() for more information. */
-	virtual IWriteFile* createAndWriteFile(const path& filename, bool append=false) =0;
+	virtual IWriteFile *createAndWriteFile(const path &filename, bool append = false) = 0;
 
 	//! Adds an archive to the file system.
 	/** After calling this, the Irrlicht Engine will also search and open
@@ -111,11 +107,11 @@ public:
 	\param password An optional password, which is used in case of encrypted archives.
 	\param retArchive A pointer that will be set to the archive that is added.
 	\return True if the archive was added successfully, false if not. */
-	virtual bool addFileArchive(const path& filename, bool ignoreCase=true,
+	virtual bool addFileArchive(const path &filename, bool ignoreCase = true,
-			bool ignorePaths=true,
+			bool ignorePaths = true,
-			E_FILE_ARCHIVE_TYPE archiveType=EFAT_UNKNOWN,
+			E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN,
-			const core::stringc& password="",
+			const core::stringc &password = "",
-			IFileArchive** retArchive=0) =0;
+			IFileArchive **retArchive = 0) = 0;
 
 	//! Adds an archive to the file system.
 	/** After calling this, the Irrlicht Engine will also search and open
@@ -143,19 +139,19 @@ public:
 	\param password An optional password, which is used in case of encrypted archives.
 	\param retArchive A pointer that will be set to the archive that is added.
 	\return True if the archive was added successfully, false if not. */
-	virtual bool addFileArchive(IReadFile* file, bool ignoreCase=true,
+	virtual bool addFileArchive(IReadFile *file, bool ignoreCase = true,
-			bool ignorePaths=true,
+			bool ignorePaths = true,
-			E_FILE_ARCHIVE_TYPE archiveType=EFAT_UNKNOWN,
+			E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN,
-			const core::stringc& password="",
+			const core::stringc &password = "",
-			IFileArchive** retArchive=0) =0;
+			IFileArchive **retArchive = 0) = 0;
 
 	//! Adds an archive to the file system.
 	/** \param archive: The archive to add to the file system.
 	\return True if the archive was added successfully, false if not. */
-	virtual bool addFileArchive(IFileArchive* archive) =0;
+	virtual bool addFileArchive(IFileArchive *archive) = 0;
 
 	//! Get the number of archives currently attached to the file system
-	virtual u32 getFileArchiveCount() const =0;
+	virtual u32 getFileArchiveCount() const = 0;
 
 	//! Removes an archive from the file system.
 	/** This will close the archive and free any file handles, but will not
@@ -163,7 +159,7 @@ public:
 	example textures and meshes.
 	\param index: The index of the archive to remove
 	\return True on success, false on failure */
-	virtual bool removeFileArchive(u32 index) =0;
+	virtual bool removeFileArchive(u32 index) = 0;
 
 	//! Removes an archive from the file system.
 	/** This will close the archive and free any file handles, but will not
@@ -177,7 +173,7 @@ public:
 	locating the archive to work with.
 	\param filename The archive pointed to by the name will be removed
 	\return True on success, false on failure */
-	virtual bool removeFileArchive(const path& filename) =0;
+	virtual bool removeFileArchive(const path &filename) = 0;
 
 	//! Removes an archive from the file system.
 	/** This will close the archive and free any file handles, but will not
@@ -185,21 +181,21 @@ public:
 	example textures and meshes.
 	\param archive The archive to remove.
 	\return True on success, false on failure */
-	virtual bool removeFileArchive(const IFileArchive* archive) =0;
+	virtual bool removeFileArchive(const IFileArchive *archive) = 0;
 
 	//! Changes the search order of attached archives.
 	/**
 	\param sourceIndex: The index of the archive to change
 	\param relative: The relative change in position, archives with a lower index are searched first */
-	virtual bool moveFileArchive(u32 sourceIndex, s32 relative) =0;
+	virtual bool moveFileArchive(u32 sourceIndex, s32 relative) = 0;
 
 	//! Get the archive at a given index.
-	virtual IFileArchive* getFileArchive(u32 index) =0;
+	virtual IFileArchive *getFileArchive(u32 index) = 0;
 
 	//! Adds an external archive loader to the engine.
 	/** Use this function to add support for new archive types to the
 	engine, for example proprietary or encrypted file storage. */
-	virtual void addArchiveLoader(IArchiveLoader* loader) =0;
+	virtual void addArchiveLoader(IArchiveLoader *loader) = 0;
 
 	//! Gets the number of archive loaders currently added
 	virtual u32 getArchiveLoaderCount() const = 0;
@@ -208,118 +204,62 @@ public:
 	/** \param index The index of the loader to retrieve. This parameter is an 0-based
 	array index.
 	\return A pointer to the specified loader, 0 if the index is incorrect. */
-	virtual IArchiveLoader* getArchiveLoader(u32 index) const = 0;
+	virtual IArchiveLoader *getArchiveLoader(u32 index) const = 0;
-
-	//! Adds a zip archive to the file system.
-	/** \deprecated This function is provided for compatibility
-	with older versions of Irrlicht and may be removed in Irrlicht 1.9,
-	you should use addFileArchive instead.
-	After calling this, the Irrlicht Engine will search and open files directly from this archive too.
-	This is useful for hiding data from the end user, speeding up file access and making it possible to
-	access for example Quake3 .pk3 files, which are no different than .zip files.
-	\param filename: Filename of the zip archive to add to the file system.
-	\param ignoreCase: If set to true, files in the archive can be accessed without
-	writing all letters in the right case.
-	\param ignorePaths: If set to true, files in the added archive can be accessed
-	without its complete path.
-	\return True if the archive was added successfully, false if not. */
-	_IRR_DEPRECATED_ virtual bool addZipFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
-	{
-		return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_ZIP);
-	}
-
-	//! Adds an unzipped archive (or basedirectory with subdirectories..) to the file system.
-	/** \deprecated This function is provided for compatibility
-	with older versions of Irrlicht and may be removed in Irrlicht 1.9,
-	you should use addFileArchive instead.
-	Useful for handling data which will be in a zip file
-	\param filename: Filename of the unzipped zip archive base directory to add to the file system.
-	\param ignoreCase: If set to true, files in the archive can be accessed without
-	writing all letters in the right case.
-	\param ignorePaths: If set to true, files in the added archive can be accessed
-	without its complete path.
-	\return True if the archive was added successful, false if not. */
-	_IRR_DEPRECATED_ virtual bool addFolderFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
-	{
-		return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_FOLDER);
-	}
-
-	//! Adds a pak archive to the file system.
-	/** \deprecated This function is provided for compatibility
-	with older versions of Irrlicht and may be removed in Irrlicht 1.9,
-	you should use addFileArchive instead.
-	After calling this, the Irrlicht Engine will search and open files directly from this archive too.
-	This is useful for hiding data from the end user, speeding up file access and making it possible to
-	access for example Quake2/KingPin/Hexen2 .pak files
-	\param filename: Filename of the pak archive to add to the file system.
-	\param ignoreCase: If set to true, files in the archive can be accessed without
-	writing all letters in the right case.
-	\param ignorePaths: If set to true, files in the added archive can be accessed
-	without its complete path.(should not use with Quake2 paks
-	\return True if the archive was added successful, false if not. */
-	_IRR_DEPRECATED_ virtual bool addPakFileArchive(const c8* filename, bool ignoreCase=true, bool ignorePaths=true)
-	{
-		return addFileArchive(filename, ignoreCase, ignorePaths, EFAT_PAK);
-	}
 
 	//! Get the current working directory.
 	/** \return Current working directory as a string. */
-	virtual const path& getWorkingDirectory() =0;
+	virtual const path &getWorkingDirectory() = 0;
 
 	//! Changes the current working directory.
 	/** \param newDirectory: A string specifying the new working directory.
 	The string is operating system dependent. Under Windows it has
 	the form "<drive>:\<directory>\<sudirectory>\<..>". An example would be: "C:\Windows\"
 	\return True if successful, otherwise false. */
-	virtual bool changeWorkingDirectoryTo(const path& newDirectory) =0;
+	virtual bool changeWorkingDirectoryTo(const path &newDirectory) = 0;
 
 	//! Converts a relative path to an absolute (unique) path, resolving symbolic links if required
 	/** \param filename Possibly relative file or directory name to query.
 	\result Absolute filename which points to the same file. */
-	virtual path getAbsolutePath(const path& filename) const =0;
+	virtual path getAbsolutePath(const path &filename) const = 0;
 
 	//! Get the directory a file is located in.
 	/** \param filename: The file to get the directory from.
 	\return String containing the directory of the file. */
-	virtual path getFileDir(const path& filename) const =0;
+	virtual path getFileDir(const path &filename) const = 0;
 
 	//! Get the base part of a filename, i.e. the name without the directory part.
 	/** If no directory is prefixed, the full name is returned.
 	\param filename: The file to get the basename from
 	\param keepExtension True if filename with extension is returned otherwise everything
 	after the final '.' is removed as well. */
-	virtual path getFileBasename(const path& filename, bool keepExtension=true) const =0;
+	virtual path getFileBasename(const path &filename, bool keepExtension = true) const = 0;
 
 	//! flatten a path and file name for example: "/you/me/../." becomes "/you"
-	virtual path& flattenFilename(path& directory, const path& root="/") const =0;
+	virtual path &flattenFilename(path &directory, const path &root = "/") const = 0;
 
 	//! Get the relative filename, relative to the given directory
-	virtual path getRelativeFilename(const path& filename, const path& directory) const =0;
+	virtual path getRelativeFilename(const path &filename, const path &directory) const = 0;
 
 	//! Creates a list of files and directories in the current working directory and returns it.
 	/** \return a Pointer to the created IFileList is returned. After the list has been used
 	it has to be deleted using its IFileList::drop() method.
 	See IReferenceCounted::drop() for more information. */
-	virtual IFileList* createFileList() =0;
+	virtual IFileList *createFileList() = 0;
 
 	//! Creates an empty filelist
 	/** \return a Pointer to the created IFileList is returned. After the list has been used
 	it has to be deleted using its IFileList::drop() method.
 	See IReferenceCounted::drop() for more information. */
-	virtual IFileList* createEmptyFileList(const io::path& path, bool ignoreCase, bool ignorePaths) =0;
+	virtual IFileList *createEmptyFileList(const io::path &path, bool ignoreCase, bool ignorePaths) = 0;
 
 	//! Set the active type of file system.
-	virtual EFileSystemType setFileListSystem(EFileSystemType listType) =0;
+	virtual EFileSystemType setFileListSystem(EFileSystemType listType) = 0;
 
 	//! Determines if a file exists and could be opened.
 	/** \param filename is the string identifying the file which should be tested for existence.
 	\return True if file exists, and false if it does not exist or an error occurred. */
-	virtual bool existFile(const path& filename) const =0;
+	virtual bool existFile(const path &filename) const = 0;
 };
 
-
 } // end namespace io
 } // end namespace irr
-
-#endif
-

include/IGPUProgrammingServices.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
+#pragma once
-#define __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
 
 #include "EShaderTypes.h"
 #include "EMaterialTypes.h"
@@ -15,7 +14,7 @@ namespace irr
 
 namespace io
 {
-	class IReadFile;
+class IReadFile;
 } // end namespace io
 
 namespace video
@@ -28,7 +27,6 @@ class IShaderConstantSetCallBack;
 class IGPUProgrammingServices
 {
 public:
-
 	//! Destructor
 	virtual ~IGPUProgrammingServices() {}
 
@@ -74,41 +72,41 @@ public:
 	target is not reachable. The error strings are then printed to the
 	error log and can be caught with a custom event receiver. */
 	virtual s32 addHighLevelShaderMaterial(
-		const c8* vertexShaderProgram,
+			const c8 *vertexShaderProgram,
-		const c8* vertexShaderEntryPointName,
+			const c8 *vertexShaderEntryPointName,
-		E_VERTEX_SHADER_TYPE vsCompileTarget,
+			E_VERTEX_SHADER_TYPE vsCompileTarget,
-		const c8* pixelShaderProgram,
+			const c8 *pixelShaderProgram,
-		const c8* pixelShaderEntryPointName,
+			const c8 *pixelShaderEntryPointName,
-		E_PIXEL_SHADER_TYPE psCompileTarget,
+			E_PIXEL_SHADER_TYPE psCompileTarget,
-		const c8* geometryShaderProgram,
+			const c8 *geometryShaderProgram,
-		const c8* geometryShaderEntryPointName = "main",
+			const c8 *geometryShaderEntryPointName = "main",
-		E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 verticesOut = 0,
+			u32 verticesOut = 0,
-		IShaderConstantSetCallBack* callback = 0,
+			IShaderConstantSetCallBack *callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0;
+			s32 userData = 0) = 0;
 
 	//! convenience function for use without geometry shaders
 	s32 addHighLevelShaderMaterial(
-		const c8* vertexShaderProgram,
+			const c8 *vertexShaderProgram,
-		const c8* vertexShaderEntryPointName="main",
+			const c8 *vertexShaderEntryPointName = "main",
-		E_VERTEX_SHADER_TYPE vsCompileTarget=EVST_VS_1_1,
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-		const c8* pixelShaderProgram=0,
+			const c8 *pixelShaderProgram = 0,
-		const c8* pixelShaderEntryPointName="main",
+			const c8 *pixelShaderEntryPointName = "main",
-		E_PIXEL_SHADER_TYPE psCompileTarget=EPST_PS_1_1,
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
-		IShaderConstantSetCallBack* callback=0,
+			IShaderConstantSetCallBack *callback = 0,
-		E_MATERIAL_TYPE baseMaterial=video::EMT_SOLID,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData=0)
+			s32 userData = 0)
 	{
 		return addHighLevelShaderMaterial(
-			vertexShaderProgram, vertexShaderEntryPointName,
+				vertexShaderProgram, vertexShaderEntryPointName,
-			vsCompileTarget, pixelShaderProgram,
+				vsCompileTarget, pixelShaderProgram,
-			pixelShaderEntryPointName, psCompileTarget,
+				pixelShaderEntryPointName, psCompileTarget,
-			0, "main", EGST_GS_4_0,
+				0, "main", EGST_GS_4_0,
-			scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
-			callback, baseMaterial, userData);
+				callback, baseMaterial, userData);
 	}
 
 	//! convenience function for use with many defaults, without geometry shader
@@ -116,19 +114,19 @@ public:
 	type 1.1.
 	*/
 	s32 addHighLevelShaderMaterial(
-		const c8* vertexShaderProgram,
+			const c8 *vertexShaderProgram,
-		const c8* pixelShaderProgram=0,
+			const c8 *pixelShaderProgram = 0,
-		IShaderConstantSetCallBack* callback=0,
+			IShaderConstantSetCallBack *callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData=0)
+			s32 userData = 0)
 	{
 		return addHighLevelShaderMaterial(
-			vertexShaderProgram, "main",
+				vertexShaderProgram, "main",
-			EVST_VS_1_1, pixelShaderProgram,
+				EVST_VS_1_1, pixelShaderProgram,
-			"main", EPST_PS_1_1,
+				"main", EPST_PS_1_1,
-			0, "main", EGST_GS_4_0,
+				0, "main", EGST_GS_4_0,
-			scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
-			callback, baseMaterial, userData);
+				callback, baseMaterial, userData);
 	}
 
 	//! convenience function for use with many defaults, with geometry shader
@@ -136,26 +134,26 @@ public:
 	type 1.1 and geometry shader 4.0.
 	*/
 	s32 addHighLevelShaderMaterial(
-		const c8* vertexShaderProgram,
+			const c8 *vertexShaderProgram,
-		const c8* pixelShaderProgram = 0,
+			const c8 *pixelShaderProgram = 0,
-		const c8* geometryShaderProgram = 0,
+			const c8 *geometryShaderProgram = 0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 verticesOut = 0,
+			u32 verticesOut = 0,
-		IShaderConstantSetCallBack* callback = 0,
+			IShaderConstantSetCallBack *callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0 )
+			s32 userData = 0)
 	{
 		return addHighLevelShaderMaterial(
-			vertexShaderProgram, "main",
+				vertexShaderProgram, "main",
-			EVST_VS_1_1, pixelShaderProgram,
+				EVST_VS_1_1, pixelShaderProgram,
-			"main", EPST_PS_1_1,
+				"main", EPST_PS_1_1,
-			geometryShaderProgram, "main", EGST_GS_4_0,
+				geometryShaderProgram, "main", EGST_GS_4_0,
-			inType, outType, verticesOut,
+				inType, outType, verticesOut,
-			callback, baseMaterial, userData);
+				callback, baseMaterial, userData);
 	}
 
-	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
+	//! Like addHighLevelShaderMaterial(), but loads from files.
 	/** \param vertexShaderProgramFileName Text file containing the source
 	of the vertex shader program. Set to empty string if no vertex shader
 	shall be created.
@@ -198,41 +196,41 @@ public:
 	target is not reachable. The error strings are then printed to the
 	error log and can be caught with a custom event receiver. */
 	virtual s32 addHighLevelShaderMaterialFromFiles(
-		const io::path& vertexShaderProgramFileName,
+			const io::path &vertexShaderProgramFileName,
-		const c8* vertexShaderEntryPointName,
+			const c8 *vertexShaderEntryPointName,
-		E_VERTEX_SHADER_TYPE vsCompileTarget,
+			E_VERTEX_SHADER_TYPE vsCompileTarget,
-		const io::path& pixelShaderProgramFileName,
+			const io::path &pixelShaderProgramFileName,
-		const c8* pixelShaderEntryPointName,
+			const c8 *pixelShaderEntryPointName,
-		E_PIXEL_SHADER_TYPE psCompileTarget,
+			E_PIXEL_SHADER_TYPE psCompileTarget,
-		const io::path& geometryShaderProgramFileName,
+			const io::path &geometryShaderProgramFileName,
-		const c8* geometryShaderEntryPointName = "main",
+			const c8 *geometryShaderEntryPointName = "main",
-		E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 verticesOut = 0,
+			u32 verticesOut = 0,
-		IShaderConstantSetCallBack* callback = 0,
+			IShaderConstantSetCallBack *callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0;
+			s32 userData = 0) = 0;
 
 	//! convenience function for use without geometry shaders
 	s32 addHighLevelShaderMaterialFromFiles(
-		const io::path& vertexShaderProgramFileName,
+			const io::path &vertexShaderProgramFileName,
-		const c8* vertexShaderEntryPointName = "main",
+			const c8 *vertexShaderEntryPointName = "main",
-		E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-		const io::path& pixelShaderProgramFileName = "",
+			const io::path &pixelShaderProgramFileName = "",
-		const c8* pixelShaderEntryPointName = "main",
+			const c8 *pixelShaderEntryPointName = "main",
-		E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
-		IShaderConstantSetCallBack* callback = 0,
+			IShaderConstantSetCallBack *callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0)
+			s32 userData = 0)
 	{
 		return addHighLevelShaderMaterialFromFiles(
-			vertexShaderProgramFileName, vertexShaderEntryPointName,
+				vertexShaderProgramFileName, vertexShaderEntryPointName,
-			vsCompileTarget, pixelShaderProgramFileName,
+				vsCompileTarget, pixelShaderProgramFileName,
-			pixelShaderEntryPointName, psCompileTarget,
+				pixelShaderEntryPointName, psCompileTarget,
-			"", "main", EGST_GS_4_0,
+				"", "main", EGST_GS_4_0,
-			scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
-			callback, baseMaterial, userData);
+				callback, baseMaterial, userData);
 	}
 
 	//! convenience function for use with many defaults, without geometry shader
@@ -240,19 +238,19 @@ public:
 	type 1.1.
 	*/
 	s32 addHighLevelShaderMaterialFromFiles(
-		const io::path& vertexShaderProgramFileName,
+			const io::path &vertexShaderProgramFileName,
-		const io::path& pixelShaderProgramFileName = "",
+			const io::path &pixelShaderProgramFileName = "",
-		IShaderConstantSetCallBack* callback = 0,
+			IShaderConstantSetCallBack *callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0 )
+			s32 userData = 0)
 	{
 		return addHighLevelShaderMaterialFromFiles(
-			vertexShaderProgramFileName, "main",
+				vertexShaderProgramFileName, "main",
-			EVST_VS_1_1, pixelShaderProgramFileName,
+				EVST_VS_1_1, pixelShaderProgramFileName,
-			"main", EPST_PS_1_1,
+				"main", EPST_PS_1_1,
-			"", "main", EGST_GS_4_0,
+				"", "main", EGST_GS_4_0,
-			scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
-			callback, baseMaterial, userData);
+				callback, baseMaterial, userData);
 	}
 
 	//! convenience function for use with many defaults, with geometry shader
@@ -260,26 +258,26 @@ public:
 	type 1.1 and geometry shader 4.0.
 	*/
 	s32 addHighLevelShaderMaterialFromFiles(
-		const io::path& vertexShaderProgramFileName,
+			const io::path &vertexShaderProgramFileName,
-		const io::path& pixelShaderProgramFileName = "",
+			const io::path &pixelShaderProgramFileName = "",
-		const io::path& geometryShaderProgramFileName = "",
+			const io::path &geometryShaderProgramFileName = "",
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 verticesOut = 0,
+			u32 verticesOut = 0,
-		IShaderConstantSetCallBack* callback = 0,
+			IShaderConstantSetCallBack *callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0 )
+			s32 userData = 0)
 	{
 		return addHighLevelShaderMaterialFromFiles(
-			vertexShaderProgramFileName, "main",
+				vertexShaderProgramFileName, "main",
-			EVST_VS_1_1, pixelShaderProgramFileName,
+				EVST_VS_1_1, pixelShaderProgramFileName,
-			"main", EPST_PS_1_1,
+				"main", EPST_PS_1_1,
-			geometryShaderProgramFileName, "main", EGST_GS_4_0,
+				geometryShaderProgramFileName, "main", EGST_GS_4_0,
-			inType, outType, verticesOut,
+				inType, outType, verticesOut,
-			callback, baseMaterial, userData);
+				callback, baseMaterial, userData);
 	}
 
-	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
+	//! Like addHighLevelShaderMaterial(), but loads from files.
 	/** \param vertexShaderProgram Text file handle containing the source
 	of the vertex shader program. Set to 0 if no vertex shader shall be
 	created.
@@ -320,136 +318,52 @@ public:
 	compile target is not reachable. The error strings are then printed to
 	the error log and can be caught with a custom event receiver. */
 	virtual s32 addHighLevelShaderMaterialFromFiles(
-		io::IReadFile* vertexShaderProgram,
+			io::IReadFile *vertexShaderProgram,
-		const c8* vertexShaderEntryPointName,
+			const c8 *vertexShaderEntryPointName,
-		E_VERTEX_SHADER_TYPE vsCompileTarget,
+			E_VERTEX_SHADER_TYPE vsCompileTarget,
-		io::IReadFile* pixelShaderProgram,
+			io::IReadFile *pixelShaderProgram,
-		const c8* pixelShaderEntryPointName,
+			const c8 *pixelShaderEntryPointName,
-		E_PIXEL_SHADER_TYPE psCompileTarget,
+			E_PIXEL_SHADER_TYPE psCompileTarget,
-		io::IReadFile* geometryShaderProgram,
+			io::IReadFile *geometryShaderProgram,
-		const c8* geometryShaderEntryPointName = "main",
+			const c8 *geometryShaderEntryPointName = "main",
-		E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 verticesOut = 0,
+			u32 verticesOut = 0,
-		IShaderConstantSetCallBack* callback = 0,
+			IShaderConstantSetCallBack *callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0;
+			s32 userData = 0) = 0;
 
 	//! convenience function for use without geometry shaders
 	s32 addHighLevelShaderMaterialFromFiles(
-		io::IReadFile* vertexShaderProgram,
+			io::IReadFile *vertexShaderProgram,
-		const c8* vertexShaderEntryPointName = "main",
+			const c8 *vertexShaderEntryPointName = "main",
-		E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-		io::IReadFile* pixelShaderProgram = 0,
+			io::IReadFile *pixelShaderProgram = 0,
-		const c8* pixelShaderEntryPointName = "main",
+			const c8 *pixelShaderEntryPointName = "main",
-		E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
-		IShaderConstantSetCallBack* callback = 0,
+			IShaderConstantSetCallBack *callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0)
+			s32 userData = 0)
 	{
 		return addHighLevelShaderMaterialFromFiles(
-			vertexShaderProgram, vertexShaderEntryPointName,
+				vertexShaderProgram, vertexShaderEntryPointName,
-			vsCompileTarget, pixelShaderProgram,
+				vsCompileTarget, pixelShaderProgram,
-			pixelShaderEntryPointName, psCompileTarget,
+				pixelShaderEntryPointName, psCompileTarget,
-			0, "main", EGST_GS_4_0,
+				0, "main", EGST_GS_4_0,
-			scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
-			callback, baseMaterial, userData);
+				callback, baseMaterial, userData);
 	}
 
-	//! Adds a new ASM shader material renderer to the VideoDriver
+	//! Delete a shader material and associated data.
-	/** Note that it is a good idea to call IVideoDriver::queryFeature() in
+	/**
-	advance to check if the IVideoDriver supports the vertex and/or pixel
+	After you have deleted a material it is invalid to still use and doing
-	shader version your are using.
+	so might result in a crash. The ID may be reused in the future when new
-
+	materials are added.
-	The material is added to the VideoDriver like with
+	\param material Number of the material type. Must not be a built-in
-	IVideoDriver::addMaterialRenderer() and can be used like it had been
+	material. */
-	added with that method.
+	virtual void deleteShaderMaterial(s32 material) = 0;
-	\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,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_BUTTON_H_INCLUDED__
+#pragma once
-#define __I_GUI_BUTTON_H_INCLUDED__
 
 #include "IGUIElement.h"
 
@@ -12,42 +11,41 @@ namespace irr
 
 namespace video
 {
-	class ITexture;
+class ITexture;
 } // end namespace video
 
 namespace gui
 {
-	class IGUIFont;
+class IGUIFont;
-	class IGUISpriteBank;
+class IGUISpriteBank;
 
-	//! Current state of buttons used for drawing sprites.
+//! Current state of buttons used for drawing sprites.
-	//! Note that up to 3 states can be active at the same time:
+//! Note that up to 3 states can be active at the same time:
-	//! EGBS_BUTTON_UP or EGBS_BUTTON_DOWN
+//! EGBS_BUTTON_UP or EGBS_BUTTON_DOWN
-	//! EGBS_BUTTON_MOUSE_OVER or EGBS_BUTTON_MOUSE_OFF
+//! EGBS_BUTTON_MOUSE_OVER or EGBS_BUTTON_MOUSE_OFF
-	//! EGBS_BUTTON_FOCUSED or EGBS_BUTTON_NOT_FOCUSED
+//! EGBS_BUTTON_FOCUSED or EGBS_BUTTON_NOT_FOCUSED
-	enum EGUI_BUTTON_STATE
+enum EGUI_BUTTON_STATE
-	{
+{
-		//! The button is not pressed.
+	//! The button is not pressed.
-		EGBS_BUTTON_UP=0,
+	EGBS_BUTTON_UP = 0,
-		//! The button is currently pressed down.
+	//! The button is currently pressed down.
-		EGBS_BUTTON_DOWN,
+	EGBS_BUTTON_DOWN,
-		//! The mouse cursor is over the button
+	//! The mouse cursor is over the button
-		EGBS_BUTTON_MOUSE_OVER,
+	EGBS_BUTTON_MOUSE_OVER,
-		//! The mouse cursor is not over the button
+	//! The mouse cursor is not over the button
-		EGBS_BUTTON_MOUSE_OFF,
+	EGBS_BUTTON_MOUSE_OFF,
-		//! The button has the focus
+	//! The button has the focus
-		EGBS_BUTTON_FOCUSED,
+	EGBS_BUTTON_FOCUSED,
-		//! The button doesn't have the focus
+	//! The button doesn't have the focus
-		EGBS_BUTTON_NOT_FOCUSED,
+	EGBS_BUTTON_NOT_FOCUSED,
-		//! The button is disabled All other states are ignored in that case.
+	//! The button is disabled All other states are ignored in that case.
-		EGBS_BUTTON_DISABLED,
+	EGBS_BUTTON_DISABLED,
-		//! not used, counts the number of enumerated items
+	//! not used, counts the number of enumerated items
-		EGBS_COUNT
+	EGBS_COUNT
-	};
+};
 
-	//! Names for gui button state icons
+//! Names for gui button state icons
-	const c8* const GUIButtonStateNames[EGBS_COUNT+1] =
+const c8 *const GUIButtonStateNames[EGBS_COUNT + 1] = {
-	{
 		"buttonUp",
 		"buttonDown",
 		"buttonMouseOver",
@@ -55,214 +53,207 @@ namespace gui
 		"buttonFocused",
 		"buttonNotFocused",
 		"buttonDisabled",
-		0	// count
+		0, // count
 	};
 
-	//! State of buttons used for drawing texture images.
+//! State of buttons used for drawing texture images.
-	//! Note that only a single state is active at a time
+//! Note that only a single state is active at a time
-	//! Also when no image is defined for a state it will use images from another state
+//! Also when no image is defined for a state it will use images from another state
-	//! and if that state is not set from the replacement for that,etc.
+//! and if that state is not set from the replacement for that,etc.
-	//! So in many cases setting EGBIS_IMAGE_UP and EGBIS_IMAGE_DOWN is sufficient.
+//! So in many cases setting EGBIS_IMAGE_UP and EGBIS_IMAGE_DOWN is sufficient.
-	enum EGUI_BUTTON_IMAGE_STATE
+enum EGUI_BUTTON_IMAGE_STATE
-	{
+{
-		//! When no other states have images they will all use this one.
+	//! When no other states have images they will all use this one.
-		EGBIS_IMAGE_UP,
+	EGBIS_IMAGE_UP,
-		//! When not set EGBIS_IMAGE_UP is used.
+	//! When not set EGBIS_IMAGE_UP is used.
-		EGBIS_IMAGE_UP_MOUSEOVER,
+	EGBIS_IMAGE_UP_MOUSEOVER,
-		//! When not set EGBIS_IMAGE_UP_MOUSEOVER is used.
+	//! When not set EGBIS_IMAGE_UP_MOUSEOVER is used.
-		EGBIS_IMAGE_UP_FOCUSED,
+	EGBIS_IMAGE_UP_FOCUSED,
-		//! When not set EGBIS_IMAGE_UP_FOCUSED is used.
+	//! When not set EGBIS_IMAGE_UP_FOCUSED is used.
-		EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER,
+	EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER,
-		//! When not set EGBIS_IMAGE_UP is used.
+	//! When not set EGBIS_IMAGE_UP is used.
-		EGBIS_IMAGE_DOWN,
+	EGBIS_IMAGE_DOWN,
-		//! When not set EGBIS_IMAGE_DOWN is used.
+	//! When not set EGBIS_IMAGE_DOWN is used.
-		EGBIS_IMAGE_DOWN_MOUSEOVER,
+	EGBIS_IMAGE_DOWN_MOUSEOVER,
-		//! When not set EGBIS_IMAGE_DOWN_MOUSEOVER is used.
+	//! When not set EGBIS_IMAGE_DOWN_MOUSEOVER is used.
-		EGBIS_IMAGE_DOWN_FOCUSED,
+	EGBIS_IMAGE_DOWN_FOCUSED,
-		//! When not set EGBIS_IMAGE_DOWN_FOCUSED is used.
+	//! When not set EGBIS_IMAGE_DOWN_FOCUSED is used.
-		EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER,
+	EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER,
-		//! When not set EGBIS_IMAGE_UP or EGBIS_IMAGE_DOWN are used (depending on button state).
+	//! When not set EGBIS_IMAGE_UP or EGBIS_IMAGE_DOWN are used (depending on button state).
-		EGBIS_IMAGE_DISABLED,
+	EGBIS_IMAGE_DISABLED,
-		//! not used, counts the number of enumerated items
+	//! not used, counts the number of enumerated items
-		EGBIS_COUNT
+	EGBIS_COUNT
-	};
+};
 
-	//! Names for gui button image states
+//! Names for gui button image states
-	const c8* const GUIButtonImageStateNames[EGBIS_COUNT+1] =
+const c8 *const GUIButtonImageStateNames[EGBIS_COUNT + 1] = {
-	{
+		"Image", // not "ImageUp" as it otherwise breaks serialization of old files
-		"Image",	// not "ImageUp" as it otherwise breaks serialization of old files
 		"ImageUpOver",
 		"ImageUpFocused",
 		"ImageUpFocusedOver",
-		"PressedImage",	// not "ImageDown" as it otherwise breaks serialization of old files
+		"PressedImage", // not "ImageDown" as it otherwise breaks serialization of old files
 		"ImageDownOver",
 		"ImageDownFocused",
 		"ImageDownFocusedOver",
 		"ImageDisabled",
-		0	// count
+		0, // count
 	};
 
-	//! GUI Button interface.
+//! GUI Button interface.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_BUTTON_CLICKED
+\li EGET_BUTTON_CLICKED
-	*/
+*/
-	class IGUIButton : public IGUIElement
+class IGUIButton : public IGUIElement
-	{
+{
-	public:
+public:
+	//! constructor
+	IGUIButton(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_BUTTON, environment, parent, id, rectangle) {}
 
-		//! constructor
+	//! Sets another skin independent font.
-		IGUIButton(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+	/** If this is set to zero, the button uses the font of the skin.
-			: IGUIElement(EGUIET_BUTTON, environment, parent, id, rectangle) {}
+	\param font: New font to set. */
+	virtual void setOverrideFont(IGUIFont *font = 0) = 0;
 
-		//! Sets another skin independent font.
+	//! Gets the override font (if any)
-		/** If this is set to zero, the button uses the font of the skin.
+	/** \return The override font (may be 0) */
-		\param font: New font to set. */
+	virtual IGUIFont *getOverrideFont(void) const = 0;
-		virtual void setOverrideFont(IGUIFont* font=0) = 0;
 
-		//! Gets the override font (if any)
+	//! Get the font which is used right now for drawing
-		/** \return The override font (may be 0) */
+	/** Currently this is the override font when one is set and the
-		virtual IGUIFont* getOverrideFont(void) const = 0;
+	font of the active skin otherwise */
+	virtual IGUIFont *getActiveFont() const = 0;
 
-		//! Get the font which is used right now for drawing
+	//! Sets another color for the button text.
-		/** Currently this is the override font when one is set and the
+	/** When set, this color is used instead of EGDC_BUTTON_TEXT/EGDC_GRAY_TEXT.
-		font of the active skin otherwise */
+	You don't need to call enableOverrideColor(true), that's done by this function.
-		virtual IGUIFont* getActiveFont() const = 0;
+	If you want the the color of the skin back, call enableOverrideColor(false);
+	\param color: New color of the text. */
+	virtual void setOverrideColor(video::SColor color) = 0;
 
-		//! Sets another color for the button text.
+	//! Gets the override color
-		/** When set, this color is used instead of EGDC_BUTTON_TEXT/EGDC_GRAY_TEXT.
+	/** \return: The override color */
-		You don't need to call enableOverrideColor(true), that's done by this function.
+	virtual video::SColor getOverrideColor(void) const = 0;
-		If you want the the color of the skin back, call enableOverrideColor(false);
-		\param color: New color of the text. */
-		virtual void setOverrideColor(video::SColor color) = 0;
 
-		//! Gets the override color
+	//! Gets the currently used text color
-		/** \return: The override color */
+	/** Either a skin-color for the current state or the override color */
-		virtual video::SColor getOverrideColor(void) const = 0;
+	virtual video::SColor getActiveColor() const = 0;
 
-		//! Gets the currently used text color
+	//! Sets if the button text should use the override color or the color in the gui skin.
-		/** Either a skin-color for the current state or the override color */
+	/** \param enable: If set to true, the override color, which can be set
-		virtual video::SColor getActiveColor() const = 0;
+	with IGUIStaticText::setOverrideColor is used, otherwise the
+	EGDC_BUTTON_TEXT or EGDC_GRAY_TEXT color of the skin. */
+	virtual void enableOverrideColor(bool enable) = 0;
 
-		//! Sets if the button text should use the override color or the color in the gui skin.
+	//! Checks if an override color is enabled
-		/** \param enable: If set to true, the override color, which can be set
+	/** \return true if the override color is enabled, false otherwise */
-		with IGUIStaticText::setOverrideColor is used, otherwise the
+	virtual bool isOverrideColorEnabled(void) const = 0;
-		EGDC_BUTTON_TEXT or EGDC_GRAY_TEXT color of the skin. */
-		virtual void enableOverrideColor(bool enable) = 0;
 
-		//! Checks if an override color is enabled
+	//! Sets an image which should be displayed on the button when it is in the given state.
-		/** \return true if the override color is enabled, false otherwise */
+	/** Only one image-state can be active at a time. Images are drawn below sprites.
-		virtual bool isOverrideColorEnabled(void) const = 0;
+	If a state is without image it will try to use images from other states as described
+	in ::EGUI_BUTTON_IMAGE_STATE.
+	Images are a little less flexible than sprites, but easier to use.
+	\param state: One of ::EGUI_BUTTON_IMAGE_STATE
+	\param image: Image to be displayed or NULL to remove the image
+	\param sourceRect: Source rectangle on the image texture. When width or height are 0 then the full texture-size is used (default). */
+	virtual void setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture *image = 0, const core::rect<s32> &sourceRect = core::rect<s32>(0, 0, 0, 0)) = 0;
 
-		//! Sets an image which should be displayed on the button when it is in the given state.
+	//! Sets an image which should be displayed on the button when it is in normal state.
-		/** Only one image-state can be active at a time. Images are drawn below sprites.
+	/** This is identical to calling setImage(EGBIS_IMAGE_UP, image); and might be deprecated in future revisions.
-		If a state is without image it will try to use images from other states as described
+	\param image: Image to be displayed */
-		in ::EGUI_BUTTON_IMAGE_STATE.
+	virtual void setImage(video::ITexture *image = 0) = 0;
-		Images are a little less flexible than sprites, but easier to use.
-		\param state: One of ::EGUI_BUTTON_IMAGE_STATE
-		\param image: Image to be displayed or NULL to remove the image
-		\param sourceRect: Source rectangle on the image texture. When width or height are 0 then the full texture-size is used (default). */
-		virtual void setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture* image=0, const core::rect<s32>& sourceRect=core::rect<s32>(0,0,0,0)) = 0;
 
-		//! Sets an image which should be displayed on the button when it is in normal state.
+	//! Sets a background image for the button when it is in normal state.
-		/** This is identical to calling setImage(EGBIS_IMAGE_UP, image); and might be deprecated in future revisions.
+	/** This is identical to calling setImage(EGBIS_IMAGE_UP, image, sourceRect); and might be deprecated in future revisions.
-		\param image: Image to be displayed */
+	\param image: Texture containing the image to be displayed
-		virtual void setImage(video::ITexture* image=0) = 0;
+	\param sourceRect: Position in the texture, where the image is located.
+	When width or height are 0 then the full texture-size is used */
+	virtual void setImage(video::ITexture *image, const core::rect<s32> &sourceRect) = 0;
 
-		//! Sets a background image for the button when it is in normal state.
+	//! Sets a background image for the button when it is in pressed state.
-		/** This is identical to calling setImage(EGBIS_IMAGE_UP, image, sourceRect); and might be deprecated in future revisions.
+	/** This is identical to calling setImage(EGBIS_IMAGE_DOWN, image); and might be deprecated in future revisions.
-		\param image: Texture containing the image to be displayed
+	If no images is specified for the pressed state via
-		\param sourceRect: Position in the texture, where the image is located.
+	setPressedImage(), this image is also drawn in pressed state.
-		When width or height are 0 then the full texture-size is used */
+	\param image: Image to be displayed */
-		virtual void setImage(video::ITexture* image, const core::rect<s32>& sourceRect) = 0;
+	virtual void setPressedImage(video::ITexture *image = 0) = 0;
 
-		//! Sets a background image for the button when it is in pressed state.
+	//! Sets an image which should be displayed on the button when it is in pressed state.
-		/** This is identical to calling setImage(EGBIS_IMAGE_DOWN, image); and might be deprecated in future revisions.
+	/** This is identical to calling setImage(EGBIS_IMAGE_DOWN, image, sourceRect); and might be deprecated in future revisions.
-		If no images is specified for the pressed state via
+	\param image: Texture containing the image to be displayed
-		setPressedImage(), this image is also drawn in pressed state.
+	\param sourceRect: Position in the texture, where the image is located */
-		\param image: Image to be displayed */
+	virtual void setPressedImage(video::ITexture *image, const core::rect<s32> &sourceRect) = 0;
-		virtual void setPressedImage(video::ITexture* image=0) = 0;
 
-		//! Sets an image which should be displayed on the button when it is in pressed state.
+	//! Sets the sprite bank used by the button
-		/** This is identical to calling setImage(EGBIS_IMAGE_DOWN, image, sourceRect); and might be deprecated in future revisions.
+	/** NOTE: The spritebank itself is _not_ serialized so far. The sprites are serialized.
-		\param image: Texture containing the image to be displayed
+	Which means after loading the gui you still have to set the spritebank manually. */
-		\param sourceRect: Position in the texture, where the image is located */
+	virtual void setSpriteBank(IGUISpriteBank *bank = 0) = 0;
-		virtual void setPressedImage(video::ITexture* image, const core::rect<s32>& sourceRect) = 0;
 
+	//! Sets the animated sprite for a specific button state
+	/** Several sprites can be drawn at the same time.
+	Sprites can be animated.
+	Sprites are drawn above the images.
+	\param index: Number of the sprite within the sprite bank, use -1 for no sprite
+	\param state: State of the button to set the sprite for
+	\param index: The sprite number from the current sprite bank
+	\param color: The color of the sprite
+	\param loop: True if the animation should loop, false if not
+	\param scale: True if the sprite should scale to button size, false if not	*/
+	virtual void setSprite(EGUI_BUTTON_STATE state, s32 index,
+			video::SColor color = video::SColor(255, 255, 255, 255), bool loop = false, bool scale = false) = 0;
 
-		//! Sets the sprite bank used by the button
+	//! Get the sprite-index for the given state or -1 when no sprite is set
-		/** NOTE: The spritebank itself is _not_ serialized so far. The sprites are serialized.
+	virtual s32 getSpriteIndex(EGUI_BUTTON_STATE state) const = 0;
-		Which means after loading the gui you still have to set the spritebank manually. */
-		virtual void setSpriteBank(IGUISpriteBank* bank=0) = 0;
 
-		//! Sets the animated sprite for a specific button state
+	//! Get the sprite color for the given state. Color is only used when a sprite is set.
-		/** Several sprites can be drawn at the same time.
+	virtual video::SColor getSpriteColor(EGUI_BUTTON_STATE state) const = 0;
-		Sprites can be animated.
-		Sprites are drawn above the images.
-		\param index: Number of the sprite within the sprite bank, use -1 for no sprite
-		\param state: State of the button to set the sprite for
-		\param index: The sprite number from the current sprite bank
-		\param color: The color of the sprite
-		\param loop: True if the animation should loop, false if not
-		\param scale: True if the sprite should scale to button size, false if not	*/
-		virtual void setSprite(EGUI_BUTTON_STATE state, s32 index,
-				video::SColor color=video::SColor(255,255,255,255), bool loop=false, bool scale=false) = 0;
 
-		//! Get the sprite-index for the given state or -1 when no sprite is set
+	//! Returns if the sprite in the given state does loop
-		virtual s32 getSpriteIndex(EGUI_BUTTON_STATE state) const = 0;
+	virtual bool getSpriteLoop(EGUI_BUTTON_STATE state) const = 0;
 
-		//! Get the sprite color for the given state. Color is only used when a sprite is set.
+	//! Returns if the sprite in the given state is scaled
-		virtual video::SColor getSpriteColor(EGUI_BUTTON_STATE state) const = 0;
+	virtual bool getSpriteScale(EGUI_BUTTON_STATE state) const = 0;
 
-		//! Returns if the sprite in the given state does loop
+	//! Sets if the button should behave like a push button.
-		virtual bool getSpriteLoop(EGUI_BUTTON_STATE state) const = 0;
+	/** Which means it can be in two states: Normal or Pressed. With a click on the button,
+	the user can change the state of the button. */
+	virtual void setIsPushButton(bool isPushButton = true) = 0;
 
-		//! Returns if the sprite in the given state is scaled
+	//! Sets the pressed state of the button if this is a pushbutton
-		virtual bool getSpriteScale(EGUI_BUTTON_STATE state) const = 0;
+	virtual void setPressed(bool pressed = true) = 0;
 
-		//! Sets if the button should behave like a push button.
+	//! Returns if the button is currently pressed
-		/** Which means it can be in two states: Normal or Pressed. With a click on the button,
+	virtual bool isPressed() const = 0;
-		the user can change the state of the button. */
-		virtual void setIsPushButton(bool isPushButton=true) = 0;
 
-		//! Sets the pressed state of the button if this is a pushbutton
+	//! Sets if the alpha channel should be used for drawing background images on the button (default is false)
-		virtual void setPressed(bool pressed=true) = 0;
+	virtual void setUseAlphaChannel(bool useAlphaChannel = true) = 0;
 
-		//! Returns if the button is currently pressed
+	//! Returns if the alpha channel should be used for drawing background images on the button
-		virtual bool isPressed() const = 0;
+	virtual bool isAlphaChannelUsed() const = 0;
 
-		//! Sets if the alpha channel should be used for drawing background images on the button (default is false)
+	//! Returns whether the button is a push button
-		virtual void setUseAlphaChannel(bool useAlphaChannel=true) = 0;
+	virtual bool isPushButton() const = 0;
 
-		//! Returns if the alpha channel should be used for drawing background images on the button
+	//! Sets if the button should use the skin to draw its border and button face (default is true)
-		virtual bool isAlphaChannelUsed() const = 0;
+	virtual void setDrawBorder(bool border = true) = 0;
 
-		//! Returns whether the button is a push button
+	//! Returns if the border and button face are being drawn using the skin
-		virtual bool isPushButton() const = 0;
+	virtual bool isDrawingBorder() const = 0;
 
-		//! Sets if the button should use the skin to draw its border and button face (default is true)
+	//! Sets if the button should scale the button images to fit
-		virtual void setDrawBorder(bool border=true) = 0;
+	virtual void setScaleImage(bool scaleImage = true) = 0;
 
-		//! Returns if the border and button face are being drawn using the skin
+	//! Checks whether the button scales the used images
-		virtual bool isDrawingBorder() const = 0;
+	virtual bool isScalingImage() const = 0;
 
-		//! Sets if the button should scale the button images to fit
+	//! Get if the shift key was pressed in last EGET_BUTTON_CLICKED event
-		virtual void setScaleImage(bool scaleImage=true) = 0;
+	/** Generated together with event, so info is available in the event-receiver.	*/
-
+	virtual bool getClickShiftState() const = 0;
-		//! Checks whether the button scales the used images
-		virtual bool isScalingImage() const = 0;
-
-		//! Get if the shift key was pressed in last EGET_BUTTON_CLICKED event
-		/** Generated together with event, so info is available in the event-receiver.	*/
-		virtual bool getClickShiftState() const	= 0;
-
-		//! Get if the control key was pressed in last EGET_BUTTON_CLICKED event
-		/** Generated together with event, so info is available in the event-receiver.	*/
-		virtual bool getClickControlState() const = 0;
-	};
 
+	//! Get if the control key was pressed in last EGET_BUTTON_CLICKED event
+	/** Generated together with event, so info is available in the event-receiver.	*/
+	virtual bool getClickControlState() const = 0;
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUICheckBox.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_CHECKBOX_H_INCLUDED__
+#pragma once
-#define __I_GUI_CHECKBOX_H_INCLUDED__
 
 #include "IGUIElement.h"
 
@@ -12,42 +11,37 @@ namespace irr
 namespace gui
 {
 
-	//! GUI Check box interface.
+//! GUI Check box interface.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_CHECKBOX_CHANGED
+\li EGET_CHECKBOX_CHANGED
-	*/
+*/
-	class IGUICheckBox : public IGUIElement
+class IGUICheckBox : public IGUIElement
-	{
+{
-	public:
+public:
+	//! constructor
+	IGUICheckBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_CHECK_BOX, environment, parent, id, rectangle) {}
 
-		//! constructor
+	//! Set if box is checked.
-		IGUICheckBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+	virtual void setChecked(bool checked) = 0;
-			: IGUIElement(EGUIET_CHECK_BOX, environment, parent, id, rectangle) {}
 
-		//! Set if box is checked.
+	//! Returns true if box is checked.
-		virtual void setChecked(bool checked) = 0;
+	virtual bool isChecked() const = 0;
 
-		//! Returns true if box is checked.
+	//! Sets whether to draw the background
-		virtual bool isChecked() const = 0;
+	virtual void setDrawBackground(bool draw) = 0;
 
-		//! Sets whether to draw the background
+	//! Checks if background drawing is enabled
-		virtual void setDrawBackground(bool draw) = 0;
+	/** \return true if background drawing is enabled, false otherwise */
+	virtual bool isDrawBackgroundEnabled() const = 0;
 
-		//! Checks if background drawing is enabled
+	//! Sets whether to draw the border
-		/** \return true if background drawing is enabled, false otherwise */
+	virtual void setDrawBorder(bool draw) = 0;
-		virtual bool isDrawBackgroundEnabled() const = 0;
 
-		//! Sets whether to draw the border
+	//! Checks if border drawing is enabled
-		virtual void setDrawBorder(bool draw) = 0;
+	/** \return true if border drawing is enabled, false otherwise */
-
+	virtual bool isDrawBorderEnabled() const = 0;
-		//! Checks if border drawing is enabled
+};
-		/** \return true if border drawing is enabled, false otherwise */
-		virtual bool isDrawBorderEnabled() const = 0;
-
-	};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIComboBox.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_COMBO_BOX_H_INCLUDED__
+#pragma once
-#define __I_GUI_COMBO_BOX_H_INCLUDED__
 
 #include "IGUIElement.h"
 
@@ -12,63 +11,62 @@ namespace irr
 namespace gui
 {
 
-	//! Combobox widget
+//! Combobox widget
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_COMBO_BOX_CHANGED
+\li EGET_COMBO_BOX_CHANGED
-	*/
+*/
-	class IGUIComboBox : public IGUIElement
+class IGUIComboBox : public IGUIElement
-	{
+{
-	public:
+public:
+	//! constructor
+	IGUIComboBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_COMBO_BOX, environment, parent, id, rectangle) {}
 
-		//! constructor
+	//! Returns amount of items in box
-		IGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+	virtual u32 getItemCount() const = 0;
-			: IGUIElement(EGUIET_COMBO_BOX, environment, parent, id, rectangle) {}
 
-		//! Returns amount of items in box
+	//! Returns string of an item. the idx may be a value from 0 to itemCount-1
-		virtual u32 getItemCount() const = 0;
+	virtual const wchar_t *getItem(u32 idx) const = 0;
 
-		//! Returns string of an item. the idx may be a value from 0 to itemCount-1
+	//! Returns item data of an item. the idx may be a value from 0 to itemCount-1
-		virtual const wchar_t* getItem(u32 idx) const = 0;
+	virtual u32 getItemData(u32 idx) const = 0;
 
-		//! Returns item data of an item. the idx may be a value from 0 to itemCount-1
+	//! Returns index based on item data
-		virtual u32 getItemData(u32 idx) const = 0;
+	virtual s32 getIndexForItemData(u32 data) const = 0;
 
-		//! Returns index based on item data
+	//! Adds an item and returns the index of it
-		virtual s32 getIndexForItemData(u32 data ) const = 0;
+	virtual u32 addItem(const wchar_t *text, u32 data = 0) = 0;
 
-		//! Adds an item and returns the index of it
+	//! Removes an item from the combo box.
-		virtual u32 addItem(const wchar_t* text, u32 data = 0) = 0;
+	/** Warning. This will change the index of all following items */
+	virtual void removeItem(u32 idx) = 0;
 
-		//! Removes an item from the combo box.
+	//! Deletes all items in the combo box
-		/** Warning. This will change the index of all following items */
+	virtual void clear() = 0;
-		virtual void removeItem(u32 idx) = 0;
 
-		//! Deletes all items in the combo box
+	//! Returns id of selected item. returns -1 if no item is selected.
-		virtual void clear() = 0;
+	virtual s32 getSelected() const = 0;
 
-		//! Returns id of selected item. returns -1 if no item is selected.
+	//! Sets the selected item. Set this to -1 if no item should be selected
-		virtual s32 getSelected() const = 0;
+	virtual void setSelected(s32 idx) = 0;
 
-		//! Sets the selected item. Set this to -1 if no item should be selected
+	//! Sets the selected item and emits a change event.
-		virtual void setSelected(s32 idx) = 0;
+	/** Set this to -1 if no item should be selected */
+	virtual void setAndSendSelected(s32 idx) = 0;
 
-		//! Sets text justification of the text area
+	//! Sets text justification of the text area
-		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
+	/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
-		EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
+	EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
-		\param vertical: EGUIA_UPPERLEFT to align with top edge,
+	\param vertical: EGUIA_UPPERLEFT to align with top edge,
-		EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
+	EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
-		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
+	virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
 
-		//! Set the maximal number of rows for the selection listbox
+	//! Set the maximal number of rows for the selection listbox
-		virtual void setMaxSelectionRows(u32 max) = 0;
+	virtual void setMaxSelectionRows(u32 max) = 0;
-
-		//! Get the maximal number of rows for the selection listbox
-		virtual u32 getMaxSelectionRows() const = 0;
-	};
 
+	//! Get the maximal number of rows for the selection listbox
+	virtual u32 getMaxSelectionRows() const = 0;
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIEditBox.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_EDIT_BOX_H_INCLUDED__
+#pragma once
-#define __I_GUI_EDIT_BOX_H_INCLUDED__
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -12,146 +11,141 @@ namespace irr
 {
 namespace gui
 {
-	class IGUIFont;
+class IGUIFont;
 
-	//! Single line edit box for editing simple text.
+//! Single line edit box for editing simple text.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_EDITBOX_ENTER
+\li EGET_EDITBOX_ENTER
-	\li EGET_EDITBOX_CHANGED
+\li EGET_EDITBOX_CHANGED
-	\li EGET_EDITBOX_MARKING_CHANGED
+\li EGET_EDITBOX_MARKING_CHANGED
-	*/
+*/
-	class IGUIEditBox : public IGUIElement
+class IGUIEditBox : public IGUIElement
-	{
+{
-	public:
+public:
+	//! constructor
+	IGUIEditBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_EDIT_BOX, environment, parent, id, rectangle) {}
 
-		//! constructor
+	//! Sets another skin independent font.
-		IGUIEditBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+	/** If this is set to zero, the button uses the font of the skin.
-			: IGUIElement(EGUIET_EDIT_BOX, environment, parent, id, rectangle) {}
+	\param font: New font to set. */
+	virtual void setOverrideFont(IGUIFont *font = 0) = 0;
 
-		//! Sets another skin independent font.
+	//! Gets the override font (if any)
-		/** If this is set to zero, the button uses the font of the skin.
+	/** \return The override font (may be 0) */
-		\param font: New font to set. */
+	virtual IGUIFont *getOverrideFont() const = 0;
-		virtual void setOverrideFont(IGUIFont* font=0) = 0;
 
-		//! Gets the override font (if any)
+	//! Get the font which is used right now for drawing
-		/** \return The override font (may be 0) */
+	/** Currently this is the override font when one is set and the
-		virtual IGUIFont* getOverrideFont() const = 0;
+	font of the active skin otherwise */
+	virtual IGUIFont *getActiveFont() const = 0;
 
-		//! Get the font which is used right now for drawing
+	//! Sets another color for the text.
-		/** Currently this is the override font when one is set and the
+	/** If set, the edit box does not use the EGDC_BUTTON_TEXT color defined
-		font of the active skin otherwise */
+	in the skin, but the set color instead. You don't need to call
-		virtual IGUIFont* getActiveFont() const = 0;
+	IGUIEditBox::enableOverrrideColor(true) after this, this is done
+	by this function.
+	If you set a color, and you want the text displayed with the color
+	of the skin again, call IGUIEditBox::enableOverrideColor(false);
+	\param color: New color of the text. */
+	virtual void setOverrideColor(video::SColor color) = 0;
 
-		//! Sets another color for the text.
+	//! Gets the override color
-		/** If set, the edit box does not use the EGDC_BUTTON_TEXT color defined
+	virtual video::SColor getOverrideColor() const = 0;
-		in the skin, but the set color instead. You don't need to call
-		IGUIEditBox::enableOverrrideColor(true) after this, this is done
-		by this function.
-		If you set a color, and you want the text displayed with the color
-		of the skin again, call IGUIEditBox::enableOverrideColor(false);
-		\param color: New color of the text. */
-		virtual void setOverrideColor(video::SColor color) = 0;
 
-		//! Gets the override color
+	//! Sets if the text should use the override color or the color in the gui skin.
-		virtual video::SColor getOverrideColor() const = 0;
+	/** \param enable: If set to true, the override color, which can be set
+	with IGUIEditBox::setOverrideColor is used, otherwise the
+	EGDC_BUTTON_TEXT color of the skin. */
+	virtual void enableOverrideColor(bool enable) = 0;
 
-		//! Sets if the text should use the override color or the color in the gui skin.
+	//! Checks if an override color is enabled
-		/** \param enable: If set to true, the override color, which can be set
+	/** \return true if the override color is enabled, false otherwise */
-		with IGUIEditBox::setOverrideColor is used, otherwise the
+	virtual bool isOverrideColorEnabled(void) const = 0;
-		EGDC_BUTTON_TEXT color of the skin. */
-		virtual void enableOverrideColor(bool enable) = 0;
 
-		//! Checks if an override color is enabled
+	//! Sets whether to draw the background
-		/** \return true if the override color is enabled, false otherwise */
+	virtual void setDrawBackground(bool draw) = 0;
-		virtual bool isOverrideColorEnabled(void) const = 0;
 
-		//! Sets whether to draw the background
+	//! Checks if background drawing is enabled
-		virtual void setDrawBackground(bool draw) = 0;
+	/** \return true if background drawing is enabled, false otherwise */
+	virtual bool isDrawBackgroundEnabled() const = 0;
 
-		//! Checks if background drawing is enabled
+	//! Turns the border on or off
-		/** \return true if background drawing is enabled, false otherwise */
+	/** \param border: true if you want the border to be drawn, false if not */
-		virtual bool isDrawBackgroundEnabled() const = 0;
+	virtual void setDrawBorder(bool border) = 0;
 
-		//! Turns the border on or off
+	//! Checks if border drawing is enabled
-		/** \param border: true if you want the border to be drawn, false if not */
+	/** \return true if border drawing is enabled, false otherwise */
-		virtual void setDrawBorder(bool border) = 0;
+	virtual bool isDrawBorderEnabled() const = 0;
 
-		//! Checks if border drawing is enabled
+	//! Sets text justification mode
-		/** \return true if border drawing is enabled, false otherwise */
+	/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
-		virtual bool isDrawBorderEnabled() const = 0;
+	EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
+	\param vertical: EGUIA_UPPERLEFT to align with top edge,
+	EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
+	virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
 
-		//! Sets text justification mode
+	//! Enables or disables word wrap.
-		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
+	/** \param enable: If set to true, words going over one line are
-		EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
+	broken to the next line. */
-		\param vertical: EGUIA_UPPERLEFT to align with top edge,
+	virtual void setWordWrap(bool enable) = 0;
-		EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
-		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
 
-		//! Enables or disables word wrap.
+	//! Checks if word wrap is enabled
-		/** \param enable: If set to true, words going over one line are
+	/** \return true if word wrap is enabled, false otherwise */
-		broken to the next line. */
+	virtual bool isWordWrapEnabled() const = 0;
-		virtual void setWordWrap(bool enable) = 0;
 
-		//! Checks if word wrap is enabled
+	//! Enables or disables newlines.
-		/** \return true if word wrap is enabled, false otherwise */
+	/** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired,
-		virtual bool isWordWrapEnabled() const = 0;
+	instead a newline character will be inserted. */
+	virtual void setMultiLine(bool enable) = 0;
 
-		//! Enables or disables newlines.
+	//! Checks if multi line editing is enabled
-		/** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired,
+	/** \return true if multi-line is enabled, false otherwise */
-		instead a newline character will be inserted. */
+	virtual bool isMultiLineEnabled() const = 0;
-		virtual void setMultiLine(bool enable) = 0;
 
-		//! Checks if multi line editing is enabled
+	//! Enables or disables automatic scrolling with cursor position
-		/** \return true if multi-line is enabled, false otherwise */
+	/** \param enable: If set to true, the text will move around with the cursor position */
-		virtual bool isMultiLineEnabled() const = 0;
+	virtual void setAutoScroll(bool enable) = 0;
 
-		//! Enables or disables automatic scrolling with cursor position
+	//! Checks to see if automatic scrolling is enabled
-		/** \param enable: If set to true, the text will move around with the cursor position */
+	/** \return true if automatic scrolling is enabled, false if not */
-		virtual void setAutoScroll(bool enable) = 0;
+	virtual bool isAutoScrollEnabled() const = 0;
 
-		//! Checks to see if automatic scrolling is enabled
+	//! Sets whether the edit box is a password box. Setting this to true will
-		/** \return true if automatic scrolling is enabled, false if not */
+	/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
-		virtual bool isAutoScrollEnabled() const = 0;
+	\param passwordBox: true to enable password, false to disable
+	\param passwordChar: the character that is displayed instead of letters */
+	virtual void setPasswordBox(bool passwordBox, wchar_t passwordChar = L'*') = 0;
 
-		//! Sets whether the edit box is a password box. Setting this to true will
+	//! Returns true if the edit box is currently a password box.
-		/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
+	virtual bool isPasswordBox() const = 0;
-		\param passwordBox: true to enable password, false to disable
-		\param passwordChar: the character that is displayed instead of letters */
-		virtual void setPasswordBox(bool passwordBox, wchar_t passwordChar = L'*') = 0;
 
-		//! Returns true if the edit box is currently a password box.
+	//! Gets the size area of the text in the edit box
-		virtual bool isPasswordBox() const = 0;
+	/** \return The size in pixels of the text */
+	virtual core::dimension2du getTextDimension() = 0;
 
-		//! Gets the size area of the text in the edit box
+	//! Sets the maximum amount of characters which may be entered in the box.
-		/** \return The size in pixels of the text */
+	/** \param max: Maximum amount of characters. If 0, the character amount is
-		virtual core::dimension2du getTextDimension() = 0;
+	infinity. */
+	virtual void setMax(u32 max) = 0;
 
-		//! Sets the maximum amount of characters which may be entered in the box.
+	//! Returns maximum amount of characters, previously set by setMax();
-		/** \param max: Maximum amount of characters. If 0, the character amount is
+	virtual u32 getMax() const = 0;
-		infinity. */
-		virtual void setMax(u32 max) = 0;
 
-		//! Returns maximum amount of characters, previously set by setMax();
+	//! Set the character used for the cursor.
-		virtual u32 getMax() const = 0;
+	/** By default it's "_" */
+	virtual void setCursorChar(const wchar_t cursorChar) = 0;
 
-		//! Set the character used for the cursor.
+	//! Get the character used for the cursor.
-		/** By default it's "_" */
+	virtual wchar_t getCursorChar() const = 0;
-		virtual void setCursorChar(const wchar_t cursorChar) = 0;
 
-		//! Get the character used for the cursor.
+	//! Set the blinktime for the cursor. 2x blinktime is one full cycle.
-		virtual wchar_t getCursorChar() const = 0;
+	//** \param timeMs Blinktime in milliseconds. When set to 0 the cursor is constantly on without blinking */
-
+	virtual void setCursorBlinkTime(irr::u32 timeMs) = 0;
-		//! Set the blinktime for the cursor. 2x blinktime is one full cycle.
-		//** \param timeMs Blinktime in milliseconds. When set to 0 the cursor is constantly on without blinking */
-		virtual void setCursorBlinkTime(irr::u32 timeMs) = 0;
-
-		//! Get the cursor blinktime
-		virtual irr::u32 getCursorBlinkTime() const = 0;
-	};
 
+	//! Get the cursor blinktime
+	virtual irr::u32 getCursorBlinkTime() const = 0;
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIElement.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_ELEMENT_H_INCLUDED__
+#pragma once
-#define __I_GUI_ELEMENT_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "rect.h"
@@ -26,30 +25,28 @@ namespace gui
 class IGUIElement : virtual public IReferenceCounted, public IEventReceiver
 {
 public:
-
 	//! Constructor
-	IGUIElement(EGUI_ELEMENT_TYPE type, IGUIEnvironment* environment, IGUIElement* parent,
+	IGUIElement(EGUI_ELEMENT_TYPE type, IGUIEnvironment *environment, IGUIElement *parent,
-		s32 id, const core::rect<s32>& rectangle)
+			s32 id, const core::rect<s32> &rectangle) :
-		: Parent(0), RelativeRect(rectangle), AbsoluteRect(rectangle),
+			Parent(0),
-		AbsoluteClippingRect(rectangle), DesiredRect(rectangle),
+			RelativeRect(rectangle), AbsoluteRect(rectangle),
-		MaxSize(0,0), MinSize(1,1), IsVisible(true), IsEnabled(true),
+			AbsoluteClippingRect(rectangle), DesiredRect(rectangle),
-		IsSubElement(false), NoClip(false), ID(id), IsTabStop(false), TabOrder(-1), IsTabGroup(false),
+			MaxSize(0, 0), MinSize(1, 1), IsVisible(true), IsEnabled(true),
-		AlignLeft(EGUIA_UPPERLEFT), AlignRight(EGUIA_UPPERLEFT), AlignTop(EGUIA_UPPERLEFT), AlignBottom(EGUIA_UPPERLEFT),
+			IsSubElement(false), NoClip(false), ID(id), IsTabStop(false), TabOrder(-1), IsTabGroup(false),
-		Environment(environment), Type(type)
+			AlignLeft(EGUIA_UPPERLEFT), AlignRight(EGUIA_UPPERLEFT), AlignTop(EGUIA_UPPERLEFT), AlignBottom(EGUIA_UPPERLEFT),
+			Environment(environment), Type(type)
 	{
-		#ifdef _DEBUG
+#ifdef _DEBUG
 		setDebugName("IGUIElement");
-		#endif
+#endif
 
 		// if we were given a parent to attach to
-		if (parent)
+		if (parent) {
-		{
 			parent->addChildToEnd(this);
 			recalculateAbsolutePosition(true);
 		}
 	}
 
-
 	//! Destructor
 	virtual ~IGUIElement()
 	{
@@ -59,9 +56,8 @@ public:
 		}
 	}
 
-
 	//! Returns parent of this element.
-	IGUIElement* getParent() const
+	IGUIElement *getParent() const
 	{
 		return Parent;
 	}
@@ -72,22 +68,20 @@ public:
 		return RelativeRect;
 	}
 
-
 	//! Sets the relative rectangle of this element.
 	/** \param r The absolute position to set */
-	void setRelativePosition(const core::rect<s32>& r)
+	void setRelativePosition(const core::rect<s32> &r)
 	{
-		if (Parent)
+		if (Parent) {
-		{
+			const core::rect<s32> &r2 = Parent->getAbsolutePosition();
-			const core::rect<s32>& r2 = Parent->getAbsolutePosition();
 
 			core::dimension2df d((f32)(r2.getSize().Width), (f32)(r2.getSize().Height));
 
-			if (AlignLeft   == EGUIA_SCALE)
+			if (AlignLeft == EGUIA_SCALE)
 				ScaleRect.UpperLeftCorner.X = (f32)r.UpperLeftCorner.X / d.Width;
-			if (AlignRight  == EGUIA_SCALE)
+			if (AlignRight == EGUIA_SCALE)
 				ScaleRect.LowerRightCorner.X = (f32)r.LowerRightCorner.X / d.Width;
-			if (AlignTop    == EGUIA_SCALE)
+			if (AlignTop == EGUIA_SCALE)
 				ScaleRect.UpperLeftCorner.Y = (f32)r.UpperLeftCorner.Y / d.Height;
 			if (AlignBottom == EGUIA_SCALE)
 				ScaleRect.LowerRightCorner.Y = (f32)r.LowerRightCorner.Y / d.Height;
@@ -99,53 +93,49 @@ public:
 
 	//! Sets the relative rectangle of this element, maintaining its current width and height
 	/** \param position The new relative position to set. Width and height will not be changed. */
-	void setRelativePosition(const core::position2di & position)
+	void setRelativePosition(const core::position2di &position)
 	{
 		const core::dimension2di mySize = RelativeRect.getSize();
 		const core::rect<s32> rectangle(position.X, position.Y,
-						position.X + mySize.Width, position.Y + mySize.Height);
+				position.X + mySize.Width, position.Y + mySize.Height);
 		setRelativePosition(rectangle);
 	}
 
-
 	//! Sets the relative rectangle of this element as a proportion of its parent's area.
 	/** \note This method used to be 'void setRelativePosition(const core::rect<f32>& r)'
 	\param r  The rectangle to set, interpreted as a proportion of the parent's area.
 	Meaningful values are in the range [0...1], unless you intend this element to spill
 	outside its parent. */
-	void setRelativePositionProportional(const core::rect<f32>& r)
+	void setRelativePositionProportional(const core::rect<f32> &r)
 	{
 		if (!Parent)
 			return;
 
-		const core::dimension2di& d = Parent->getAbsolutePosition().getSize();
+		const core::dimension2di &d = Parent->getAbsolutePosition().getSize();
 
 		DesiredRect = core::rect<s32>(
-					core::floor32((f32)d.Width * r.UpperLeftCorner.X),
+				core::floor32((f32)d.Width * r.UpperLeftCorner.X),
-					core::floor32((f32)d.Height * r.UpperLeftCorner.Y),
+				core::floor32((f32)d.Height * r.UpperLeftCorner.Y),
-					core::floor32((f32)d.Width * r.LowerRightCorner.X),
+				core::floor32((f32)d.Width * r.LowerRightCorner.X),
-					core::floor32((f32)d.Height * r.LowerRightCorner.Y));
+				core::floor32((f32)d.Height * r.LowerRightCorner.Y));
 
 		ScaleRect = r;
 
 		updateAbsolutePosition();
 	}
 
-
 	//! Gets the absolute rectangle of this element
 	core::rect<s32> getAbsolutePosition() const
 	{
 		return AbsoluteRect;
 	}
 
-
 	//! Returns the visible area of the element.
 	core::rect<s32> getAbsoluteClippingRect() const
 	{
 		return AbsoluteClippingRect;
 	}
 
-
 	//! Sets whether the element will ignore its parent's clipping rectangle
 	/** \param noClip If true, the element will not be clipped by its parent's clipping rectangle. */
 	void setNotClipped(bool noClip)
@@ -154,7 +144,6 @@ public:
 		updateAbsolutePosition();
 	}
 
-
 	//! Gets whether the element will ignore its parent's clipping rectangle
 	/** \return true if the element is not clipped by its parent's clipping rectangle. */
 	bool isNotClipped() const
@@ -162,7 +151,6 @@ public:
 		return NoClip;
 	}
 
-
 	//! Sets the maximum size allowed for this element
 	/** If set to 0,0, there is no maximum size */
 	void setMaxSize(core::dimension2du size)
@@ -171,7 +159,6 @@ public:
 		updateAbsolutePosition();
 	}
 
-
 	//! Sets the minimum size allowed for this element
 	void setMinSize(core::dimension2du size)
 	{
@@ -183,7 +170,6 @@ public:
 		updateAbsolutePosition();
 	}
 
-
 	//! The alignment defines how the borders of this element will be positioned when the parent element is resized.
 	void setAlignment(EGUI_ALIGNMENT left, EGUI_ALIGNMENT right, EGUI_ALIGNMENT top, EGUI_ALIGNMENT bottom)
 	{
@@ -192,17 +178,16 @@ public:
 		AlignTop = top;
 		AlignBottom = bottom;
 
-		if (Parent)
+		if (Parent) {
-		{
 			core::rect<s32> r(Parent->getAbsolutePosition());
 
 			core::dimension2df d((f32)r.getSize().Width, (f32)r.getSize().Height);
 
-			if (AlignLeft   == EGUIA_SCALE)
+			if (AlignLeft == EGUIA_SCALE)
 				ScaleRect.UpperLeftCorner.X = (f32)DesiredRect.UpperLeftCorner.X / d.Width;
-			if (AlignRight  == EGUIA_SCALE)
+			if (AlignRight == EGUIA_SCALE)
 				ScaleRect.LowerRightCorner.X = (f32)DesiredRect.LowerRightCorner.X / d.Width;
-			if (AlignTop    == EGUIA_SCALE)
+			if (AlignTop == EGUIA_SCALE)
 				ScaleRect.UpperLeftCorner.Y = (f32)DesiredRect.UpperLeftCorner.Y / d.Height;
 			if (AlignBottom == EGUIA_SCALE)
 				ScaleRect.LowerRightCorner.Y = (f32)DesiredRect.LowerRightCorner.Y / d.Height;
@@ -239,13 +224,11 @@ public:
 		recalculateAbsolutePosition(false);
 
 		// update all children
-		for (auto child : Children)
+		for (auto child : Children) {
-		{
 			child->updateAbsolutePosition();
 		}
 	}
 
-
 	//! Returns the topmost GUI element at the specific position.
 	/**
 	This will check this GUI element and all of its descendants, so it
@@ -258,18 +241,16 @@ public:
 	\return The topmost GUI element at that point, or 0 if there are
 	no candidate elements at this point.
 	*/
-	virtual IGUIElement* getElementFromPoint(const core::position2d<s32>& point)
+	virtual IGUIElement *getElementFromPoint(const core::position2d<s32> &point)
 	{
-		IGUIElement* target = 0;
+		IGUIElement *target = 0;
 
-		if (isVisible())
+		if (isVisible()) {
-		{
 			// we have to search from back to front, because later children
 			// might be drawn over the top of earlier ones.
 			auto it = Children.rbegin();
 			auto ie = Children.rend();
-			while (it != ie)
+			while (it != ie) {
-			{
 				target = (*it)->getElementFromPoint(point);
 				if (target)
 					return target;
@@ -284,27 +265,24 @@ public:
 		return target;
 	}
 
-
 	//! Returns true if a point is within this element.
 	/** Elements with a shape other than a rectangle should override this method */
-	virtual bool isPointInside(const core::position2d<s32>& point) const
+	virtual bool isPointInside(const core::position2d<s32> &point) const
 	{
 		return AbsoluteClippingRect.isPointInside(point);
 	}
 
-
 	//! Adds a GUI element as new child of this element.
-	virtual void addChild(IGUIElement* child)
+	virtual void addChild(IGUIElement *child)
 	{
-		if ( child && child != this )
+		if (child && child != this) {
-		{
 			addChildToEnd(child);
 			child->updateAbsolutePosition();
 		}
 	}
 
 	//! Removes a child.
-	virtual void removeChild(IGUIElement* child)
+	virtual void removeChild(IGUIElement *child)
 	{
 		assert(child->Parent == this);
 		Children.erase(child->ParentPos);
@@ -313,7 +291,8 @@ public:
 	}
 
 	//! Removes all children.
-	virtual void removeAllChildren() {
+	virtual void removeAllChildren()
+	{
 		while (!Children.empty()) {
 			auto child = Children.back();
 			child->remove();
@@ -327,36 +306,30 @@ public:
 			Parent->removeChild(this);
 	}
 
-
 	//! Draws the element and its children.
 	virtual void draw()
 	{
-		if ( isVisible() )
+		if (isVisible()) {
-		{
 			for (auto child : Children)
 				child->draw();
 		}
 	}
 
-
 	//! animate the element and its children.
 	virtual void OnPostRender(u32 timeMs)
 	{
-		if ( isVisible() )
+		if (isVisible()) {
-		{
 			for (auto child : Children)
-				child->OnPostRender( timeMs );
+				child->OnPostRender(timeMs);
 		}
 	}
 
-
 	//! Moves this element.
 	virtual void move(core::position2d<s32> absoluteMovement)
 	{
 		setRelativePosition(DesiredRect + absoluteMovement);
 	}
 
-
 	//! Returns true if element is visible.
 	virtual bool isVisible() const
 	{
@@ -368,10 +341,10 @@ public:
 	false if this or any parent element is invisible. */
 	virtual bool isTrulyVisible() const
 	{
-		if(!IsVisible)
+		if (!IsVisible)
 			return false;
 
-		if(!Parent)
+		if (!Parent)
 			return true;
 
 		return Parent->isTrulyVisible();
@@ -383,14 +356,12 @@ public:
 		IsVisible = visible;
 	}
 
-
 	//! Returns true if this element was created as part of its parent control
 	virtual bool isSubElement() const
 	{
 		return IsSubElement;
 	}
 
-
 	//! Sets whether this control was created as part of its parent.
 	/** For example, it is true when a scrollbar is part of a listbox.
 	SubElements are not saved to disk when calling guiEnvironment->saveGUI() */
@@ -399,7 +370,6 @@ public:
 		IsSubElement = subElement;
 	}
 
-
 	//! If set to true, the focus will visit this element when using the tab key to cycle through elements.
 	/** If this element is a tab group (see isTabGroup/setTabGroup) then
 	ctrl+tab will be used instead. */
@@ -408,51 +378,43 @@ public:
 		IsTabStop = enable;
 	}
 
-
 	//! Returns true if this element can be focused by navigating with the tab key
 	bool isTabStop() const
 	{
 		return IsTabStop;
 	}
 
-
 	//! Sets the priority of focus when using the tab key to navigate between a group of elements.
 	/** See setTabGroup, isTabGroup and getTabGroup for information on tab groups.
 	Elements with a lower number are focused first */
 	void setTabOrder(s32 index)
 	{
 		// negative = autonumber
-		if (index < 0)
+		if (index < 0) {
-		{
 			TabOrder = 0;
 			IGUIElement *el = getTabGroup();
 			while (IsTabGroup && el && el->Parent)
 				el = el->Parent;
 
-			IGUIElement *first=0, *closest=0;
+			IGUIElement *first = 0, *closest = 0;
-			if (el)
+			if (el) {
-			{
 				// find the highest element number
 				el->getNextElement(-1, true, IsTabGroup, first, closest, true, true);
-				if (first)
+				if (first) {
-				{
 					TabOrder = first->getTabOrder() + 1;
 				}
 			}
 
-		}
+		} else
-		else
 			TabOrder = index;
 	}
 
-
 	//! Returns the number in the tab order sequence
 	s32 getTabOrder() const
 	{
 		return TabOrder;
 	}
 
-
 	//! Sets whether this element is a container for a group of elements which can be navigated using the tab key.
 	/** For example, windows are tab groups.
 	Groups can be navigated using ctrl+tab, providing isTabStop is true. */
@@ -461,18 +423,16 @@ public:
 		IsTabGroup = isGroup;
 	}
 
-
 	//! Returns true if this element is a tab group.
 	bool isTabGroup() const
 	{
 		return IsTabGroup;
 	}
 
-
 	//! Returns the container element which holds all elements in this element's tab group.
-	IGUIElement* getTabGroup()
+	IGUIElement *getTabGroup()
 	{
-		IGUIElement *ret=this;
+		IGUIElement *ret = this;
 
 		while (ret && !ret->isTabGroup())
 			ret = ret->getParent();
@@ -480,7 +440,6 @@ public:
 		return ret;
 	}
 
-
 	//! Returns true if element is enabled
 	/** Currently elements do _not_ care about parent-states.
 		So if you want to affect children you have to enable/disable them all.
@@ -488,72 +447,63 @@ public:
 	*/
 	virtual bool isEnabled() const
 	{
-		if ( isSubElement() && IsEnabled && getParent() )
+		if (isSubElement() && IsEnabled && getParent())
 			return getParent()->isEnabled();
 
 		return IsEnabled;
 	}
 
-
 	//! Sets the enabled state of this element.
 	virtual void setEnabled(bool enabled)
 	{
 		IsEnabled = enabled;
 	}
 
-
 	//! Sets the new caption of this element.
-	virtual void setText(const wchar_t* text)
+	virtual void setText(const wchar_t *text)
 	{
 		Text = text;
 	}
 
-
 	//! Returns caption of this element.
-	virtual const wchar_t* getText() const
+	virtual const wchar_t *getText() const
 	{
 		return Text.c_str();
 	}
 
-
 	//! Sets the new caption of this element.
-	virtual void setToolTipText(const wchar_t* text)
+	virtual void setToolTipText(const wchar_t *text)
 	{
 		ToolTipText = text;
 	}
 
-
 	//! Returns caption of this element.
-	virtual const core::stringw& getToolTipText() const
+	virtual const core::stringw &getToolTipText() const
 	{
 		return ToolTipText;
 	}
 
-
 	//! Returns id. Can be used to identify the element.
 	virtual s32 getID() const
 	{
 		return ID;
 	}
 
-
 	//! Sets the id of this element
 	virtual void setID(s32 id)
 	{
 		ID = id;
 	}
 
-
 	//! Called if an event happened.
-	bool OnEvent(const SEvent& event) override
+	bool OnEvent(const SEvent &event) override
 	{
 		return Parent ? Parent->OnEvent(event) : false;
 	}
 
-
 	//! Brings a child to front
 	/** \return True if successful, false if not. */
-	virtual bool bringToFront(IGUIElement* child)
+	virtual bool bringToFront(IGUIElement *child)
 	{
 		if (child->Parent != this)
 			return false;
@@ -564,10 +514,9 @@ public:
 		return true;
 	}
 
-
 	//! Moves a child to the back, so it's siblings are drawn on top of it
 	/** \return True if successful, false if not. */
-	virtual bool sendToBack(IGUIElement* child)
+	virtual bool sendToBack(IGUIElement *child)
 	{
 		if (child->Parent != this)
 			return false;
@@ -579,12 +528,11 @@ public:
 	}
 
 	//! Returns list with children of this element
-	virtual const std::list<IGUIElement*>& getChildren() const
+	virtual const std::list<IGUIElement *> &getChildren() const
 	{
 		return Children;
 	}
 
-
 	//! Finds the first element with the given id.
 	/** \param id: Id to search for.
 	\param searchchildren: Set this to true, if also children of this
@@ -592,12 +540,11 @@ public:
 	should be searched too.
 	\return Returns the first element with the given id. If no element
 	with this id was found, 0 is returned. */
-	virtual IGUIElement* getElementFromId(s32 id, bool searchchildren=false) const
+	virtual IGUIElement *getElementFromId(s32 id, bool searchchildren = false) const
 	{
-		IGUIElement* e = 0;
+		IGUIElement *e = 0;
 
-		for (auto child : Children)
+		for (auto child : Children) {
-		{
 			if (child->getID() == id)
 				return child;
 
@@ -611,25 +558,21 @@ public:
 		return e;
 	}
 
-
 	//! returns true if the given element is a child of this one.
 	//! \param child: The child element to check
-	bool isMyChild(IGUIElement* child) const
+	bool isMyChild(IGUIElement *child) const
 	{
 		if (!child)
 			return false;
-		do
+		do {
-		{
 			if (child->Parent)
 				child = child->Parent;
 
 		} while (child->Parent && child != this);
 
-
 		return child == this;
 	}
 
-
 	//! searches elements to find the closest next element to tab to
 	/** \param startOrder: The TabOrder of the current element, -1 if none
 	\param reverse: true if searching for a lower number
@@ -640,74 +583,58 @@ public:
 	\param includeDisabled: includes disabled elements in the search (default=false)
 	\return true if successfully found an element, false to continue searching/fail */
 	bool getNextElement(s32 startOrder, bool reverse, bool group,
-		IGUIElement*& first, IGUIElement*& closest, bool includeInvisible=false,
+			IGUIElement *&first, IGUIElement *&closest, bool includeInvisible = false,
-		bool includeDisabled=false) const
+			bool includeDisabled = false) const
 	{
 		// we'll stop searching if we find this number
-		s32 wanted = startOrder + ( reverse ? -1 : 1 );
+		s32 wanted = startOrder + (reverse ? -1 : 1);
-		if (wanted==-2)
+		if (wanted == -2)
 			wanted = 1073741824; // maximum s32
 
 		auto it = Children.begin();
 
 		s32 closestOrder, currentOrder;
 
-		while(it != Children.end())
+		while (it != Children.end()) {
-		{
 			// ignore invisible elements and their children
-			if ( ( (*it)->isVisible() || includeInvisible ) &&
+			if (((*it)->isVisible() || includeInvisible) &&
-				(group == true || (*it)->isTabGroup() == false) )
+					(group == true || (*it)->isTabGroup() == false)) {
-			{
 				// ignore disabled, but children are checked (disabled is currently per element ignoring parent states)
-				if ( (*it)->isEnabled() || includeDisabled )
+				if ((*it)->isEnabled() || includeDisabled) {
-				{
 					// only check tab stops and those with the same group status
-					if ((*it)->isTabStop() && ((*it)->isTabGroup() == group))
+					if ((*it)->isTabStop() && ((*it)->isTabGroup() == group)) {
-					{
 						currentOrder = (*it)->getTabOrder();
 
 						// is this what we're looking for?
-						if (currentOrder == wanted)
+						if (currentOrder == wanted) {
-						{
 							closest = *it;
 							return true;
 						}
 
 						// is it closer than the current closest?
-						if (closest)
+						if (closest) {
-						{
 							closestOrder = closest->getTabOrder();
-							if ( ( reverse && currentOrder > closestOrder && currentOrder < startOrder)
+							if ((reverse && currentOrder > closestOrder && currentOrder < startOrder) || (!reverse && currentOrder < closestOrder && currentOrder > startOrder)) {
-								||(!reverse && currentOrder < closestOrder && currentOrder > startOrder))
-							{
 								closest = *it;
 							}
-						}
+						} else if ((reverse && currentOrder < startOrder) || (!reverse && currentOrder > startOrder)) {
-						else
-						if ( (reverse && currentOrder < startOrder) || (!reverse && currentOrder > startOrder) )
-						{
 							closest = *it;
 						}
 
 						// is it before the current first?
-						if (first)
+						if (first) {
-						{
 							closestOrder = first->getTabOrder();
 
-							if ( (reverse && closestOrder < currentOrder) || (!reverse && closestOrder > currentOrder) )
+							if ((reverse && closestOrder < currentOrder) || (!reverse && closestOrder > currentOrder)) {
-							{
 								first = *it;
 							}
-						}
+						} else {
-						else
-						{
 							first = *it;
 						}
 					}
 				}
 				// search within children
-				if ((*it)->getNextElement(startOrder, reverse, group, first, closest, includeInvisible, includeDisabled))
+				if ((*it)->getNextElement(startOrder, reverse, group, first, closest, includeInvisible, includeDisabled)) {
-				{
 					return true;
 				}
 			}
@@ -716,7 +643,6 @@ public:
 		return false;
 	}
 
-
 	//! Returns the type of the gui element.
 	/** This is needed for the .NET wrapper but will be used
 	later for serializing and deserializing.
@@ -741,52 +667,46 @@ public:
 		return type == Type;
 	}
 
-
 	//! Returns the type name of the gui element.
 	/** This is needed serializing elements. */
-	virtual const c8* getTypeName() const
+	virtual const c8 *getTypeName() const
 	{
 		return GUIElementTypeNames[Type];
 	}
 
 	//! Returns the name of the element.
 	/** \return Name as character string. */
-	virtual const c8* getName() const
+	virtual const c8 *getName() const
 	{
 		return Name.c_str();
 	}
 
-
 	//! Sets the name of the element.
 	/** \param name New name of the gui element. */
-	virtual void setName(const c8* name)
+	virtual void setName(const c8 *name)
 	{
 		Name = name;
 	}
 
-
 	//! Sets the name of the element.
 	/** \param name New name of the gui element. */
-	virtual void setName(const core::stringc& name)
+	virtual void setName(const core::stringc &name)
 	{
 		Name = name;
 	}
 
-
 	//! Returns whether the element takes input from the IME
 	virtual bool acceptsIME()
 	{
 		return false;
 	}
 
-
 protected:
 	// not virtual because needed in constructor
-	void addChildToEnd(IGUIElement* child)
+	void addChildToEnd(IGUIElement *child)
 	{
-		if (child)
+		if (child) {
-		{
+			child->grab();   // prevent destruction when removed
-			child->grab(); // prevent destruction when removed
 			child->remove(); // remove from old parent
 			child->LastParentRect = getAbsolutePosition();
 			child->Parent = this;
@@ -795,8 +715,9 @@ protected:
 	}
 
 #ifndef NDEBUG
-	template<typename Iterator>
+	template <typename Iterator>
-	static size_t _fastSetChecksum(Iterator begin, Iterator end) {
+	static size_t _fastSetChecksum(Iterator begin, Iterator end)
+	{
 		std::hash<typename Iterator::value_type> hasher;
 		size_t checksum = 0;
 		for (Iterator it = begin; it != end; ++it) {
@@ -809,13 +730,12 @@ protected:
 
 	// Reorder children [from, to) to the order given by `neworder`
 	void reorderChildren(
-		std::list<IGUIElement*>::iterator from,
+			std::list<IGUIElement *>::iterator from,
-		std::list<IGUIElement*>::iterator to,
+			std::list<IGUIElement *>::iterator to,
-		const std::vector<IGUIElement*> &neworder)
+			const std::vector<IGUIElement *> &neworder)
 	{
 		assert(_fastSetChecksum(from, to) == _fastSetChecksum(neworder.begin(), neworder.end()));
-		for (auto e : neworder)
+		for (auto e : neworder) {
-		{
 			*from = e;
 			e->ParentPos = from;
 			++from;
@@ -823,26 +743,22 @@ protected:
 		assert(from == to);
 	}
 
-
 	// not virtual because needed in constructor
 	void recalculateAbsolutePosition(bool recursive)
 	{
-		core::rect<s32> parentAbsolute(0,0,0,0);
+		core::rect<s32> parentAbsolute(0, 0, 0, 0);
 		core::rect<s32> parentAbsoluteClip;
-		f32 fw=0.f, fh=0.f;
+		f32 fw = 0.f, fh = 0.f;
 
-		if (Parent)
+		if (Parent) {
-		{
 			parentAbsolute = Parent->AbsoluteRect;
 
-			if (NoClip)
+			if (NoClip) {
-			{
+				IGUIElement *p = this;
-				IGUIElement* p=this;
 				while (p->Parent)
 					p = p->Parent;
 				parentAbsoluteClip = p->AbsoluteClippingRect;
-			}
+			} else
-			else
 				parentAbsoluteClip = Parent->AbsoluteClippingRect;
 		}
 
@@ -855,64 +771,60 @@ protected:
 		if (AlignTop == EGUIA_SCALE || AlignBottom == EGUIA_SCALE)
 			fh = (f32)parentAbsolute.getHeight();
 
-		switch (AlignLeft)
+		switch (AlignLeft) {
-		{
+		case EGUIA_UPPERLEFT:
-			case EGUIA_UPPERLEFT:
+			break;
-				break;
+		case EGUIA_LOWERRIGHT:
-			case EGUIA_LOWERRIGHT:
+			DesiredRect.UpperLeftCorner.X += diffx;
-				DesiredRect.UpperLeftCorner.X += diffx;
+			break;
-				break;
+		case EGUIA_CENTER:
-			case EGUIA_CENTER:
+			DesiredRect.UpperLeftCorner.X += diffx / 2;
-				DesiredRect.UpperLeftCorner.X += diffx/2;
+			break;
-				break;
+		case EGUIA_SCALE:
-			case EGUIA_SCALE:
+			DesiredRect.UpperLeftCorner.X = core::round32(ScaleRect.UpperLeftCorner.X * fw);
-				DesiredRect.UpperLeftCorner.X = core::round32(ScaleRect.UpperLeftCorner.X * fw);
+			break;
-				break;
 		}
 
-		switch (AlignRight)
+		switch (AlignRight) {
-		{
+		case EGUIA_UPPERLEFT:
-			case EGUIA_UPPERLEFT:
+			break;
-				break;
+		case EGUIA_LOWERRIGHT:
-			case EGUIA_LOWERRIGHT:
+			DesiredRect.LowerRightCorner.X += diffx;
-				DesiredRect.LowerRightCorner.X += diffx;
+			break;
-				break;
+		case EGUIA_CENTER:
-			case EGUIA_CENTER:
+			DesiredRect.LowerRightCorner.X += diffx / 2;
-				DesiredRect.LowerRightCorner.X += diffx/2;
+			break;
-				break;
+		case EGUIA_SCALE:
-			case EGUIA_SCALE:
+			DesiredRect.LowerRightCorner.X = core::round32(ScaleRect.LowerRightCorner.X * fw);
-				DesiredRect.LowerRightCorner.X = core::round32(ScaleRect.LowerRightCorner.X * fw);
+			break;
-				break;
 		}
 
-		switch (AlignTop)
+		switch (AlignTop) {
-		{
+		case EGUIA_UPPERLEFT:
-			case EGUIA_UPPERLEFT:
+			break;
-				break;
+		case EGUIA_LOWERRIGHT:
-			case EGUIA_LOWERRIGHT:
+			DesiredRect.UpperLeftCorner.Y += diffy;
-				DesiredRect.UpperLeftCorner.Y += diffy;
+			break;
-				break;
+		case EGUIA_CENTER:
-			case EGUIA_CENTER:
+			DesiredRect.UpperLeftCorner.Y += diffy / 2;
-				DesiredRect.UpperLeftCorner.Y += diffy/2;
+			break;
-				break;
+		case EGUIA_SCALE:
-			case EGUIA_SCALE:
+			DesiredRect.UpperLeftCorner.Y = core::round32(ScaleRect.UpperLeftCorner.Y * fh);
-				DesiredRect.UpperLeftCorner.Y = core::round32(ScaleRect.UpperLeftCorner.Y * fh);
+			break;
-				break;
 		}
 
-		switch (AlignBottom)
+		switch (AlignBottom) {
-		{
+		case EGUIA_UPPERLEFT:
-			case EGUIA_UPPERLEFT:
+			break;
-				break;
+		case EGUIA_LOWERRIGHT:
-			case EGUIA_LOWERRIGHT:
+			DesiredRect.LowerRightCorner.Y += diffy;
-				DesiredRect.LowerRightCorner.Y += diffy;
+			break;
-				break;
+		case EGUIA_CENTER:
-			case EGUIA_CENTER:
+			DesiredRect.LowerRightCorner.Y += diffy / 2;
-				DesiredRect.LowerRightCorner.Y += diffy/2;
+			break;
-				break;
+		case EGUIA_SCALE:
-			case EGUIA_SCALE:
+			DesiredRect.LowerRightCorner.Y = core::round32(ScaleRect.LowerRightCorner.Y * fh);
-				DesiredRect.LowerRightCorner.Y = core::round32(ScaleRect.LowerRightCorner.Y * fh);
+			break;
-				break;
 		}
 
 		RelativeRect = DesiredRect;
@@ -942,26 +854,23 @@ protected:
 
 		LastParentRect = parentAbsolute;
 
-		if ( recursive )
+		if (recursive) {
-		{
 			// update all children
-			for (auto child : Children)
+			for (auto child : Children) {
-			{
 				child->recalculateAbsolutePosition(recursive);
 			}
 		}
 	}
 
 protected:
-
 	//! List of all children of this element
-	std::list<IGUIElement*> Children;
+	std::list<IGUIElement *> Children;
 
 	//! Pointer to the parent
-	IGUIElement* Parent;
+	IGUIElement *Parent;
 
 	//! Our position in the parent list. Only valid when Parent != nullptr
-	std::list<IGUIElement*>::iterator ParentPos;
+	std::list<IGUIElement *>::iterator ParentPos;
 
 	//! relative rect of element
 	core::rect<s32> RelativeRect;
@@ -1022,15 +931,11 @@ protected:
 	EGUI_ALIGNMENT AlignLeft, AlignRight, AlignTop, AlignBottom;
 
 	//! GUI Environment
-	IGUIEnvironment* Environment;
+	IGUIEnvironment *Environment;
 
 	//! type of element
 	EGUI_ELEMENT_TYPE Type;
 };
 
-
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIEnvironment.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_ENVIRONMENT_H_INCLUDED__
+#pragma once
-#define __I_GUI_ENVIRONMENT_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "IGUISkin.h"
@@ -14,20 +13,20 @@
 
 namespace irr
 {
-	class IOSOperator;
+class IOSOperator;
-	class IEventReceiver;
+class IEventReceiver;
 
-	namespace io
+namespace io
-	{
+{
-		class IReadFile;
+class IReadFile;
-		class IWriteFile;
+class IWriteFile;
-		class IFileSystem;
+class IFileSystem;
-	} // end namespace io
+} // end namespace io
-	namespace video
+namespace video
-	{
+{
-		class IVideoDriver;
+class IVideoDriver;
-		class ITexture;
+class ITexture;
-	} // end namespace video
+} // end namespace video
 
 namespace gui
 {
@@ -59,11 +58,10 @@ class IGUIWindow;
 class IGUIEnvironment : public virtual IReferenceCounted
 {
 public:
-
 	//! Draws all gui elements by traversing the GUI environment starting at the root node.
 	/** \param  When true ensure the GuiEnvironment (aka the RootGUIElement) has the same size as the current driver screensize.
-	            Can be set to false to control that size yourself, p.E when not the full size should be used for UI. */
+				Can be set to false to control that size yourself, p.E when not the full size should be used for UI. */
-	virtual void drawAll(bool useScreenSize=true) = 0;
+	virtual void drawAll(bool useScreenSize = true) = 0;
 
 	//! Sets the focus to an element.
 	/** Causes a EGET_ELEMENT_FOCUS_LOST event followed by a
@@ -71,11 +69,11 @@ public:
 	then the focus will not be changed.
 	\param element Pointer to the element which shall get the focus.
 	\return True on success, false on failure */
-	virtual bool setFocus(IGUIElement* element) = 0;
+	virtual bool setFocus(IGUIElement *element) = 0;
 
 	//! Returns the element which holds the focus.
 	/** \return Pointer to the element with focus. */
-	virtual IGUIElement* getFocus() const = 0;
+	virtual IGUIElement *getFocus() const = 0;
 
 	//! Returns the element which was last under the mouse cursor
 	/** NOTE: This information is updated _after_ the user-eventreceiver
@@ -83,32 +81,32 @@ public:
 	mouse events you have to use instead:
 	IGUIEnvironment::getRootGUIElement()->getElementFromPoint(mousePos);
 	\return Pointer to the element under the mouse. */
-	virtual IGUIElement* getHovered() const = 0;
+	virtual IGUIElement *getHovered() const = 0;
 
 	//! Removes the focus from an element.
 	/** Causes a EGET_ELEMENT_FOCUS_LOST event. If the event is absorbed
 	then the focus will not be changed.
 	\param element Pointer to the element which shall lose the focus.
 	\return True on success, false on failure */
-	virtual bool removeFocus(IGUIElement* element) = 0;
+	virtual bool removeFocus(IGUIElement *element) = 0;
 
 	//! Returns whether the element has focus
 	/** \param element Pointer to the element which is tested.
 	\param checkSubElements When true and focus is on a sub-element of element then it will still count as focused and return true
 	\return True if the element has focus, else false. */
-	virtual bool hasFocus(const IGUIElement* element, bool checkSubElements=false) const = 0;
+	virtual bool hasFocus(const IGUIElement *element, bool checkSubElements = false) const = 0;
 
 	//! Returns the current video driver.
 	/** \return Pointer to the video driver. */
-	virtual video::IVideoDriver* getVideoDriver() const = 0;
+	virtual video::IVideoDriver *getVideoDriver() const = 0;
 
 	//! Returns the file system.
 	/** \return Pointer to the file system. */
-	virtual io::IFileSystem* getFileSystem() const = 0;
+	virtual io::IFileSystem *getFileSystem() const = 0;
 
 	//! returns a pointer to the OS operator
 	/** \return Pointer to the OS operator. */
-	virtual IOSOperator* getOSOperator() const = 0;
+	virtual IOSOperator *getOSOperator() const = 0;
 
 	//! Removes all elements from the environment.
 	virtual void clear() = 0;
@@ -118,17 +116,17 @@ public:
 	use this method, it is used by the engine internally.
 	\param event The event to post.
 	\return True if succeeded, else false. */
-	virtual bool postEventFromUser(const SEvent& event) = 0;
+	virtual bool postEventFromUser(const SEvent &event) = 0;
 
 	//! This sets a new event receiver for gui events.
 	/** Usually you do not have to
 	use this method, it is used by the engine internally.
 	\param evr Pointer to the new receiver. */
-	virtual void setUserEventReceiver(IEventReceiver* evr) = 0;
+	virtual void setUserEventReceiver(IEventReceiver *evr) = 0;
 
 	//! Returns pointer to the current gui skin.
 	/** \return Pointer to the GUI skin. */
-	virtual IGUISkin* getSkin() const = 0;
+	virtual IGUISkin *getSkin() const = 0;
 
 	//! Sets a new GUI Skin
 	/** You can use this to change the appearance of the whole GUI
@@ -143,7 +141,7 @@ public:
 	\endcode
 	\param skin New skin to use.
 	*/
-	virtual void setSkin(IGUISkin* skin) = 0;
+	virtual void setSkin(IGUISkin *skin) = 0;
 
 	//! Creates a new GUI Skin based on a template.
 	/** Use setSkin() to set the created skin.
@@ -151,8 +149,7 @@ public:
 	\return Pointer to the created skin.
 	If you no longer need it, you should call IGUISkin::drop().
 	See IReferenceCounted::drop() for more information. */
-	virtual IGUISkin* createSkin(EGUI_SKIN_TYPE type) = 0;
+	virtual IGUISkin *createSkin(EGUI_SKIN_TYPE type) = 0;
-
 
 	//! Creates the image list from the given texture.
 	/** \param texture Texture to split into images
@@ -161,9 +158,9 @@ public:
 	\return Pointer to the font. Returns 0 if the font could not be loaded.
 	This pointer should not be dropped. See IReferenceCounted::drop() for
 	more information. */
-	virtual IGUIImageList* createImageList( video::ITexture* texture,
+	virtual IGUIImageList *createImageList(video::ITexture *texture,
-					core::dimension2d<s32> imageSize,
+			core::dimension2d<s32> imageSize,
-					bool useAlphaChannel ) = 0;
+			bool useAlphaChannel) = 0;
 
 	//! Returns pointer to the font with the specified filename.
 	/** Loads the font if it was not loaded before.
@@ -171,7 +168,7 @@ public:
 	\return Pointer to the font. Returns 0 if the font could not be loaded.
 	This pointer should not be dropped. See IReferenceCounted::drop() for
 	more information. */
-	virtual IGUIFont* getFont(const io::path& filename) = 0;
+	virtual IGUIFont *getFont(const io::path &filename) = 0;
 
 	//! Adds an externally loaded font to the font list.
 	/** This method allows to attach an already loaded font to the list of
@@ -179,29 +176,29 @@ public:
 	\param name Name the font should be stored as.
 	\param font Pointer to font to add.
 	\return Pointer to the font stored. This can differ from given parameter if the name previously existed. */
-	virtual IGUIFont* addFont(const io::path& name, IGUIFont* font) = 0;
+	virtual IGUIFont *addFont(const io::path &name, IGUIFont *font) = 0;
 
 	//! remove loaded font
-	virtual void removeFont(IGUIFont* font) = 0;
+	virtual void removeFont(IGUIFont *font) = 0;
 
 	//! Returns the default built-in font.
 	/** \return Pointer to the default built-in font.
 	This pointer should not be dropped. See IReferenceCounted::drop() for
 	more information. */
-	virtual IGUIFont* getBuiltInFont() const = 0;
+	virtual IGUIFont *getBuiltInFont() const = 0;
 
 	//! Returns pointer to the sprite bank which was added with addEmptySpriteBank
 	/** TODO: This should load files in the future, but not implemented so far.
 	\param filename Name of a spritebank added with addEmptySpriteBank
 	\return Pointer to the sprite bank. Returns 0 if it could not be loaded.
 	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-	virtual IGUISpriteBank* getSpriteBank(const io::path& filename) = 0;
+	virtual IGUISpriteBank *getSpriteBank(const io::path &filename) = 0;
 
 	//! Adds an empty sprite bank to the manager
 	/** \param name Name of the new sprite bank.
 	\return Pointer to the sprite bank.
 	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
-	virtual IGUISpriteBank* addEmptySpriteBank(const io::path& name) = 0;
+	virtual IGUISpriteBank *addEmptySpriteBank(const io::path &name) = 0;
 
 	//! Returns the root gui element.
 	/** This is the first gui element, the (direct or indirect) parent of all
@@ -210,7 +207,7 @@ public:
 	\return Pointer to the root element of the GUI. The returned pointer
 	should not be dropped. See IReferenceCounted::drop() for more
 	information. */
-	virtual IGUIElement* getRootGUIElement() = 0;
+	virtual IGUIElement *getRootGUIElement() = 0;
 
 	//! Adds a button element.
 	/** \param rectangle Rectangle specifying the borders of the button.
@@ -221,8 +218,8 @@ public:
 	\return Pointer to the created button. Returns 0 if an error occurred.
 	This pointer should not be dropped. See IReferenceCounted::drop() for
 	more information. */
-	virtual IGUIButton* addButton(const core::rect<s32>& rectangle,
+	virtual IGUIButton *addButton(const core::rect<s32> &rectangle,
-		IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0, const wchar_t* tooltiptext = 0) = 0;
+			IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0, const wchar_t *tooltiptext = 0) = 0;
 
 	//! Adds a scrollbar.
 	/** \param horizontal Specifies if the scroll bar is drawn horizontal
@@ -233,8 +230,8 @@ public:
 	\return Pointer to the created scrollbar. Returns 0 if an error
 	occurred. This pointer should not be dropped. See
 	IReferenceCounted::drop() for more information. */
-	virtual IGUIScrollBar* addScrollBar(bool horizontal, const core::rect<s32>& rectangle,
+	virtual IGUIScrollBar *addScrollBar(bool horizontal, const core::rect<s32> &rectangle,
-		IGUIElement* parent=0, s32 id=-1) = 0;
+			IGUIElement *parent = 0, s32 id = -1) = 0;
 
 	//! Adds an image element.
 	/** \param image Image to be displayed.
@@ -248,8 +245,8 @@ public:
 	\return Pointer to the created image element. Returns 0 if an error
 	occurred. This pointer should not be dropped. See
 	IReferenceCounted::drop() for more information. */
-	virtual IGUIImage* addImage(video::ITexture* image, core::position2d<s32> pos,
+	virtual IGUIImage *addImage(video::ITexture *image, core::position2d<s32> pos,
-		bool useAlphaChannel=true, IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0;
+			bool useAlphaChannel = true, IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0) = 0;
 
 	//! Adds an image element.
 	/** Use IGUIImage::setImage later to set the image to be displayed.
@@ -262,8 +259,8 @@ public:
 	\return Pointer to the created image element. Returns 0 if an error
 	occurred. This pointer should not be dropped. See
 	IReferenceCounted::drop() for more information. */
-	virtual IGUIImage* addImage(const core::rect<s32>& rectangle,
+	virtual IGUIImage *addImage(const core::rect<s32> &rectangle,
-		IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0, bool useAlphaChannel=true) = 0;
+			IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0, bool useAlphaChannel = true) = 0;
 
 	//! Adds a checkbox element.
 	/** \param checked Define the initial state of the check box.
@@ -274,8 +271,8 @@ public:
 	\return Pointer to the created check box. Returns 0 if an error
 	occurred. This pointer should not be dropped. See
 	IReferenceCounted::drop() for more information. */
-	virtual IGUICheckBox* addCheckBox(bool checked, const core::rect<s32>& rectangle,
+	virtual IGUICheckBox *addCheckBox(bool checked, const core::rect<s32> &rectangle,
-		IGUIElement* parent=0, s32 id=-1, const wchar_t* text=0) = 0;
+			IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0) = 0;
 
 	//! Adds a list box element.
 	/** \param rectangle Rectangle specifying the borders of the list box.
@@ -285,8 +282,8 @@ public:
 	\return Pointer to the created list box. Returns 0 if an error occurred.
 	This pointer should not be dropped. See IReferenceCounted::drop() for
 	more information. */
-	virtual IGUIListBox* addListBox(const core::rect<s32>& rectangle,
+	virtual IGUIListBox *addListBox(const core::rect<s32> &rectangle,
-		IGUIElement* parent=0, s32 id=-1, bool drawBackground=false) = 0;
+			IGUIElement *parent = 0, s32 id = -1, bool drawBackground = false) = 0;
 
 	//! Adds a file open dialog.
 	/** \param title Text to be displayed as the title of the dialog.
@@ -302,9 +299,9 @@ public:
 	\return Pointer to the created file open dialog. Returns 0 if an error
 	occurred. This pointer should not be dropped. See
 	IReferenceCounted::drop() for more information. */
-	virtual IGUIFileOpenDialog* addFileOpenDialog(const wchar_t* title=0,
+	virtual IGUIFileOpenDialog *addFileOpenDialog(const wchar_t *title = 0,
-		bool modal=true, IGUIElement* parent=0, s32 id=-1,
+			bool modal = true, IGUIElement *parent = 0, s32 id = -1,
-		bool restoreCWD=false, io::path::char_type* startDir=0) = 0;
+			bool restoreCWD = false, io::path::char_type *startDir = 0) = 0;
 
 	//! Adds a static text.
 	/** \param text Text to be displayed. Can be altered after creation by SetText().
@@ -318,9 +315,9 @@ public:
 	\return Pointer to the created static text. Returns 0 if an error
 	occurred. This pointer should not be dropped. See
 	IReferenceCounted::drop() for more information. */
-	virtual IGUIStaticText* addStaticText(const wchar_t* text, const core::rect<s32>& rectangle,
+	virtual IGUIStaticText *addStaticText(const wchar_t *text, const core::rect<s32> &rectangle,
-		bool border=false, bool wordWrap=true, IGUIElement* parent=0, s32 id=-1,
+			bool border = false, bool wordWrap = true, IGUIElement *parent = 0, s32 id = -1,
-		bool fillBackground = false) = 0;
+			bool fillBackground = false) = 0;
 
 	//! Adds an edit box.
 	/** Supports Unicode input from every keyboard around the world,
@@ -337,8 +334,8 @@ public:
 	\return Pointer to the created edit box. Returns 0 if an error occurred.
 	This pointer should not be dropped. See IReferenceCounted::drop() for
 	more information. */
-	virtual IGUIEditBox* addEditBox(const wchar_t* text, const core::rect<s32>& rectangle,
+	virtual IGUIEditBox *addEditBox(const wchar_t *text, const core::rect<s32> &rectangle,
-		bool border=true, IGUIElement* parent=0, s32 id=-1) = 0;
+			bool border = true, IGUIElement *parent = 0, s32 id = -1) = 0;
 
 	//! Adds a tab control to the environment.
 	/** \param rectangle Rectangle specifying the borders of the tab control.
@@ -353,9 +350,9 @@ public:
 	\return Pointer to the created tab control element. Returns 0 if an
 	error occurred. This pointer should not be dropped. See
 	IReferenceCounted::drop() for more information. */
-	virtual IGUITabControl* addTabControl(const core::rect<s32>& rectangle,
+	virtual IGUITabControl *addTabControl(const core::rect<s32> &rectangle,
-		IGUIElement* parent=0, bool fillbackground=false,
+			IGUIElement *parent = 0, bool fillbackground = false,
-		bool border=true, s32 id=-1) = 0;
+			bool border = true, s32 id = -1) = 0;
 
 	//! Adds tab to the environment.
 	/** You can use this element to group other elements. This is not used
@@ -368,8 +365,8 @@ public:
 	\return Pointer to the created tab. Returns 0 if an
 	error occurred. This pointer should not be dropped. See
 	IReferenceCounted::drop() for more information. */
-	virtual IGUITab* addTab(const core::rect<s32>& rectangle,
+	virtual IGUITab *addTab(const core::rect<s32> &rectangle,
-		IGUIElement* parent=0, s32 id=-1) = 0;
+			IGUIElement *parent = 0, s32 id = -1) = 0;
 
 	//! Adds a combo box to the environment.
 	/** \param rectangle Rectangle specifying the borders of the combo box.
@@ -379,8 +376,8 @@ public:
 	\return Pointer to the created combo box. Returns 0 if an
 	error occurred. This pointer should not be dropped. See
 	IReferenceCounted::drop() for more information. */
-	virtual IGUIComboBox* addComboBox(const core::rect<s32>& rectangle,
+	virtual IGUIComboBox *addComboBox(const core::rect<s32> &rectangle,
-		IGUIElement* parent=0, s32 id=-1) = 0;
+			IGUIElement *parent = 0, s32 id = -1) = 0;
 
 	//! Find the next element which would be selected when pressing the tab-key
 	/** If you set the focus for the result you can manually force focus-changes like they
@@ -388,7 +385,7 @@ public:
 	\param reverse When true it will search backward (toward lower TabOrder numbers, like shift+tab)
 	\param group When true it will search for the next tab-group (like ctrl+tab)
 	*/
-	virtual IGUIElement* getNextElement(bool reverse=false, bool group=false) = 0;
+	virtual IGUIElement *getNextElement(bool reverse = false, bool group = false) = 0;
 
 	//! Set the way the gui will handle automatic focus changes
 	/** The default is (EFF_SET_ON_LMOUSE_DOWN | EFF_SET_ON_TAB).
@@ -410,12 +407,8 @@ public:
 	Note that in general just calling IGUIElement::remove() is enough.
 	Unless you create your own GUI elements removing themselves you won't need it.
 	\param element: Element to remove */
-	virtual void addToDeletionQueue(IGUIElement* element) = 0;
+	virtual void addToDeletionQueue(IGUIElement *element) = 0;
 };
 
-
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIFileOpenDialog.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
+#pragma once
-#define __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
 
 #include "IGUIElement.h"
 #include "path.h"
@@ -13,38 +12,33 @@ namespace irr
 namespace gui
 {
 
-	//! Standard file chooser dialog.
+//! Standard file chooser dialog.
-	/** \warning When the user selects a folder this does change the current working directory
+/** \warning When the user selects a folder this does change the current working directory
 
-	\par This element can create the following events of type EGUI_EVENT_TYPE:
+\par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_DIRECTORY_SELECTED
+\li EGET_DIRECTORY_SELECTED
-	\li EGET_FILE_SELECTED
+\li EGET_FILE_SELECTED
-	\li EGET_FILE_CHOOSE_DIALOG_CANCELLED
+\li EGET_FILE_CHOOSE_DIALOG_CANCELLED
-	*/
+*/
-	class IGUIFileOpenDialog : public IGUIElement
+class IGUIFileOpenDialog : public IGUIElement
-	{
+{
-	public:
+public:
+	//! constructor
+	IGUIFileOpenDialog(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_FILE_OPEN_DIALOG, environment, parent, id, rectangle) {}
 
-		//! constructor
+	//! Returns the filename of the selected file converted to wide characters. Returns NULL if no file was selected.
-		IGUIFileOpenDialog(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+	virtual const wchar_t *getFileName() const = 0;
-			: IGUIElement(EGUIET_FILE_OPEN_DIALOG, environment, parent, id, rectangle) {}
 
-		//! Returns the filename of the selected file converted to wide characters. Returns NULL if no file was selected.
+	//! Returns the filename of the selected file. Is empty if no file was selected.
-		virtual const wchar_t* getFileName() const = 0;
+	virtual const io::path &getFileNameP() const = 0;
 
-		//! Returns the filename of the selected file. Is empty if no file was selected.
+	//! Returns the directory of the selected file. Empty if no directory was selected.
-		virtual const io::path& getFileNameP() const = 0;
+	virtual const io::path &getDirectoryName() const = 0;
-
-		//! Returns the directory of the selected file. Empty if no directory was selected.
-		virtual const io::path& getDirectoryName() const = 0;
-
-		//! Returns the directory of the selected file converted to wide characters. Returns NULL if no directory was selected.
-		virtual const wchar_t* getDirectoryNameW() const = 0;
-	};
 
+	//! Returns the directory of the selected file converted to wide characters. Returns NULL if no directory was selected.
+	virtual const wchar_t *getDirectoryNameW() const = 0;
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIFont.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_FONT_H_INCLUDED__
+#pragma once
-#define __I_GUI_FONT_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "SColor.h"
@@ -39,7 +38,6 @@ enum EGUI_FONT_TYPE
 class IGUIFont : public virtual IReferenceCounted
 {
 public:
-
 	//! Draws some text and clips it to the specified rectangle if wanted.
 	/** \param text: Text to draw
 	\param position: Rectangle specifying position where to draw the text.
@@ -48,30 +46,30 @@ public:
 	\param vcenter: Specifies if the text should be centered vertically into the rectangle.
 	\param clip: Optional pointer to a rectangle against which the text will be clipped.
 	If the pointer is null, no clipping will be done. */
-	virtual void draw(const core::stringw& text, const core::rect<s32>& position,
+	virtual void draw(const core::stringw &text, const core::rect<s32> &position,
-		video::SColor color, bool hcenter=false, bool vcenter=false,
+			video::SColor color, bool hcenter = false, bool vcenter = false,
-		const core::rect<s32>* clip=0) = 0;
+			const core::rect<s32> *clip = 0) = 0;
 
 	//! Calculates the width and height of a given string of text.
 	/** \return Returns width and height of the area covered by the text if
 	it would be drawn. */
-	virtual core::dimension2d<u32> getDimension(const wchar_t* text) const = 0;
+	virtual core::dimension2d<u32> getDimension(const wchar_t *text) const = 0;
 
 	//! Calculates the index of the character in the text which is on a specific position.
 	/** \param text: Text string.
 	\param pixel_x: X pixel position of which the index of the character will be returned.
 	\return Returns zero based index of the character in the text, and -1 if no no character
 	is on this position. (=the text is too short). */
-	virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const = 0;
+	virtual s32 getCharacterFromPos(const wchar_t *text, s32 pixel_x) const = 0;
 
 	//! Returns the type of this font
 	virtual EGUI_FONT_TYPE getType() const { return EGFT_CUSTOM; }
 
 	//! Sets global kerning width for the font.
-	virtual void setKerningWidth (s32 kerning) = 0;
+	virtual void setKerningWidth(s32 kerning) = 0;
 
 	//! Sets global kerning height for the font.
-	virtual void setKerningHeight (s32 kerning) = 0;
+	virtual void setKerningHeight(s32 kerning) = 0;
 
 	//! Gets kerning values (distance between letters) for the font. If no parameters are provided,
 	/** the global kerning distance is returned.
@@ -84,7 +82,7 @@ public:
 	which supports kerning pairs a string such as 'Wo' may have the 'o'
 	tucked neatly under the 'W'.
 	*/
-	virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const = 0;
+	virtual s32 getKerningWidth(const wchar_t *thisLetter = 0, const wchar_t *previousLetter = 0) const = 0;
 
 	//! Returns the distance between letters
 	virtual s32 getKerningHeight() const = 0;
@@ -94,11 +92,8 @@ public:
 	most fonts.
 	\param s String of symbols which are not send down to the videodriver
 	*/
-	virtual void setInvisibleCharacters( const wchar_t *s ) = 0;
+	virtual void setInvisibleCharacters(const wchar_t *s) = 0;
 };
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIFontBitmap.h

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

include/IGUIImage.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_IMAGE_H_INCLUDED__
+#pragma once
-#define __I_GUI_IMAGE_H_INCLUDED__
 
 #include "IGUIElement.h"
 
@@ -11,77 +10,73 @@ namespace irr
 {
 namespace video
 {
-	class ITexture;
+class ITexture;
 }
 namespace gui
 {
-	//! GUI element displaying an image.
+//! GUI element displaying an image.
-	class IGUIImage : public IGUIElement
+class IGUIImage : public IGUIElement
-	{
+{
-	public:
+public:
+	//! constructor
+	IGUIImage(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_IMAGE, environment, parent, id, rectangle) {}
 
-		//! constructor
+	//! Sets an image texture
-		IGUIImage(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+	virtual void setImage(video::ITexture *image) = 0;
-			: IGUIElement(EGUIET_IMAGE, environment, parent, id, rectangle) {}
 
-		//! Sets an image texture
+	//! Gets the image texture
-		virtual void setImage(video::ITexture* image) = 0;
+	virtual video::ITexture *getImage() const = 0;
 
-		//! Gets the image texture
+	//! Sets the color of the image
-		virtual video::ITexture* getImage() const = 0;
+	/** \param color Color with which the image is drawn. If the color
+	equals Color(255,255,255,255) it is ignored. */
+	virtual void setColor(video::SColor color) = 0;
 
-		//! Sets the color of the image
+	//! Sets if the image should scale to fit the element
-		/** \param color Color with which the image is drawn. If the color
+	virtual void setScaleImage(bool scale) = 0;
-		equals Color(255,255,255,255) it is ignored. */
-		virtual void setColor(video::SColor color) = 0;
 
-		//! Sets if the image should scale to fit the element
+	//! Sets if the image should use its alpha channel to draw itself
-		virtual void setScaleImage(bool scale) = 0;
+	virtual void setUseAlphaChannel(bool use) = 0;
 
-		//! Sets if the image should use its alpha channel to draw itself
+	//! Gets the color of the image
-		virtual void setUseAlphaChannel(bool use) = 0;
+	virtual video::SColor getColor() const = 0;
 
-		//! Gets the color of the image
+	//! Returns true if the image is scaled to fit, false if not
-		virtual video::SColor getColor() const = 0;
+	virtual bool isImageScaled() const = 0;
 
-		//! Returns true if the image is scaled to fit, false if not
+	//! Returns true if the image is using the alpha channel, false if not
-		virtual bool isImageScaled() const = 0;
+	virtual bool isAlphaChannelUsed() const = 0;
 
-		//! Returns true if the image is using the alpha channel, false if not
+	//! Sets the source rectangle of the image. By default the full image is used.
-		virtual bool isAlphaChannelUsed() const = 0;
+	/** \param sourceRect coordinates inside the image or an area with size 0 for using the full image (default). */
+	virtual void setSourceRect(const core::rect<s32> &sourceRect) = 0;
 
-		//! Sets the source rectangle of the image. By default the full image is used.
+	//! Returns the customized source rectangle of the image to be used.
-		/** \param sourceRect coordinates inside the image or an area with size 0 for using the full image (default). */
+	/** By default an empty rectangle of width and height 0 is returned which means the full image is used. */
-		virtual void setSourceRect(const core::rect<s32>& sourceRect) = 0;
+	virtual core::rect<s32> getSourceRect() const = 0;
 
-		//! Returns the customized source rectangle of the image to be used.
+	//! Restrict drawing-area.
-		/** By default an empty rectangle of width and height 0 is returned which means the full image is used. */
+	/** This allows for example to use the image as a progress bar.
-		virtual core::rect<s32> getSourceRect() const = 0;
+		Base for area is the image, which means:
+		-  The original clipping area when the texture is scaled or there is no texture.
+		-  The source-rect for an unscaled texture (but still restricted afterward by the clipping area)
+		Unlike normal clipping this does not affect the gui-children.
+		\param drawBoundUVs: Coordinates between 0 and 1 where 0 are for left+top and 1 for right+bottom
+	*/
+	virtual void setDrawBounds(const core::rect<f32> &drawBoundUVs = core::rect<f32>(0.f, 0.f, 1.f, 1.f)) = 0;
 
-		//! Restrict drawing-area.
+	//! Get drawing-area restrictions.
-		/** This allows for example to use the image as a progress bar.
+	virtual core::rect<f32> getDrawBounds() const = 0;
-			Base for area is the image, which means:
-			-  The original clipping area when the texture is scaled or there is no texture.
-			-  The source-rect for an unscaled texture (but still restricted afterward by the clipping area)
-			Unlike normal clipping this does not affect the gui-children.
-			\param drawBoundUVs: Coordinates between 0 and 1 where 0 are for left+top and 1 for right+bottom
-		*/
-		virtual void setDrawBounds(const core::rect<f32>& drawBoundUVs = core::rect<f32>(0.f, 0.f, 1.f, 1.f)) = 0;
 
-		//! Get drawing-area restrictions.
+	//! Sets whether to draw a background color (EGDC_3D_DARK_SHADOW) when no texture is set
-		virtual core::rect<f32> getDrawBounds() const = 0;
+	/** By default it's enabled */
-
+	virtual void setDrawBackground(bool draw) = 0;
-		//! Sets whether to draw a background color (EGDC_3D_DARK_SHADOW) when no texture is set
-		/** By default it's enabled */
-		virtual void setDrawBackground(bool draw) = 0;
-
-		//! Checks if a background is drawn when no texture is set
-		/** \return true if background drawing is enabled, false otherwise */
-		virtual bool isDrawBackgroundEnabled() const = 0;
-	};
 
+	//! Checks if a background is drawn when no texture is set
+	/** \return true if background drawing is enabled, false otherwise */
+	virtual bool isDrawBackgroundEnabled() const = 0;
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif

include/IGUIImageList.h

@@ -1,8 +1,7 @@
 // This file is part of the "Irrlicht Engine".
 // written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
 
-#ifndef __I_GUI_IMAGE_LIST_H_INCLUDED__
+#pragma once
-#define __I_GUI_IMAGE_LIST_H_INCLUDED__
 
 #include "IGUIElement.h"
 #include "rect.h"
@@ -17,17 +16,16 @@ namespace gui
 class IGUIImageList : public virtual IReferenceCounted
 {
 public:
-
 	//! Destructor
-	virtual ~IGUIImageList() {};
+	virtual ~IGUIImageList(){};
 
 	//! Draws an image and clips it to the specified rectangle if wanted
 	//! \param index: Index of the image
 	//! \param destPos: Position of the image to draw
 	//! \param clip: Optional pointer to a rectangle against which the text will be clipped.
 	//! If the pointer is null, no clipping will be done.
-	virtual void draw(s32 index, const core::position2d<s32>& destPos,
+	virtual void draw(s32 index, const core::position2d<s32> &destPos,
-		const core::rect<s32>* clip = 0) = 0;
+			const core::rect<s32> *clip = 0) = 0;
 
 	//! Returns the count of Images in the list.
 	//! \return Returns the count of Images in the list.
@@ -40,6 +38,3 @@ public:
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIListBox.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_LIST_BOX_H_INCLUDED__
+#pragma once
-#define __I_GUI_LIST_BOX_H_INCLUDED__
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -12,131 +11,126 @@ namespace irr
 {
 namespace gui
 {
-	class IGUISpriteBank;
+class IGUISpriteBank;
-	class IGUIScrollBar;
+class IGUIScrollBar;
 
-	//! Enumeration for listbox colors
+//! Enumeration for listbox colors
-	enum EGUI_LISTBOX_COLOR
+enum EGUI_LISTBOX_COLOR
-	{
+{
-		//! Color of text
+	//! Color of text
-		EGUI_LBC_TEXT=0,
+	EGUI_LBC_TEXT = 0,
-		//! Color of selected text
+	//! Color of selected text
-		EGUI_LBC_TEXT_HIGHLIGHT,
+	EGUI_LBC_TEXT_HIGHLIGHT,
-		//! Color of icon
+	//! Color of icon
-		EGUI_LBC_ICON,
+	EGUI_LBC_ICON,
-		//! Color of selected icon
+	//! Color of selected icon
-		EGUI_LBC_ICON_HIGHLIGHT,
+	EGUI_LBC_ICON_HIGHLIGHT,
-		//! Not used, just counts the number of available colors
+	//! Not used, just counts the number of available colors
-		EGUI_LBC_COUNT
+	EGUI_LBC_COUNT
-	};
-
-
-	//! Default list box GUI element.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_LISTBOX_CHANGED
-	\li EGET_LISTBOX_SELECTED_AGAIN
-	*/
-	class IGUIListBox : public IGUIElement
-	{
-	public:
-		//! constructor
-		IGUIListBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_LIST_BOX, environment, parent, id, rectangle) {}
-
-		//! returns amount of list items
-		virtual u32 getItemCount() const = 0;
-
-		//! returns string of a list item. the may id be a value from 0 to itemCount-1
-		virtual const wchar_t* getListItem(u32 id) const = 0;
-
-		//! adds an list item, returns id of item
-		virtual u32 addItem(const wchar_t* text) = 0;
-
-		//! adds an list item with an icon
-		/** \param text Text of list entry
-		\param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon
-		\return The id of the new created item */
-		virtual u32 addItem(const wchar_t* text, s32 icon) = 0;
-
-		//! Removes an item from the list
-		virtual void removeItem(u32 index) = 0;
-
-		//! get the the id of the item at the given absolute coordinates
-		/** \return The id of the list item or -1 when no item is at those coordinates*/
-		virtual s32 getItemAt(s32 xpos, s32 ypos) const = 0;
-
-		//! Returns the icon of an item
-		virtual s32 getIcon(u32 index) const = 0;
-
-		//! Sets the sprite bank which should be used to draw list icons.
-		/** This font is set to the sprite bank of the built-in-font by
-		default. A sprite can be displayed in front of every list item.
-		An icon is an index within the icon sprite bank. Several
-		default icons are available in the skin through getIcon. */
-		virtual void setSpriteBank(IGUISpriteBank* bank) = 0;
-
-		//! clears the list, deletes all items in the listbox
-		virtual void clear() = 0;
-
-		//! returns id of selected item. returns -1 if no item is selected.
-		virtual s32 getSelected() const = 0;
-
-		//! sets the selected item. Set this to -1 if no item should be selected
-		virtual void setSelected(s32 index) = 0;
-
-		//! sets the selected item. Set this to 0 if no item should be selected
-		virtual void setSelected(const wchar_t *item) = 0;
-
-		//! set whether the listbox should scroll to newly selected items
-		virtual void setAutoScrollEnabled(bool scroll) = 0;
-
-		//! returns true if automatic scrolling is enabled, false if not.
-		virtual bool isAutoScrollEnabled() const = 0;
-
-		//! set all item colors at given index to color
-		virtual void setItemOverrideColor(u32 index, video::SColor color) = 0;
-
-		//! set all item colors of specified type at given index to color
-		virtual void setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color) = 0;
-
-		//! clear all item colors at index
-		virtual void clearItemOverrideColor(u32 index) = 0;
-
-		//! clear item color at index for given colortype
-		virtual void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) = 0;
-
-		//! has the item at index its color overwritten?
-		virtual bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const = 0;
-
-		//! return the overwrite color at given item index.
-		virtual video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const = 0;
-
-		//! return the default color which is used for the given colorType
-		virtual video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const = 0;
-
-		//! set the item at the given index
-		virtual void setItem(u32 index, const wchar_t* text, s32 icon) = 0;
-
-		//! Insert the item at the given index
-		/** \return The index on success or -1 on failure. */
-		virtual s32 insertItem(u32 index, const wchar_t* text, s32 icon) = 0;
-
-		//! Swap the items at the given indices
-		virtual void swapItems(u32 index1, u32 index2) = 0;
-
-		//! set global itemHeight
-		virtual void setItemHeight( s32 height ) = 0;
-
-		//! Sets whether to draw the background
-		virtual void setDrawBackground(bool draw) = 0;
-
-		//! Access the vertical scrollbar
-		virtual IGUIScrollBar* getVerticalScrollBar() const = 0;
 };
 
+//! Default list box GUI element.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_LISTBOX_CHANGED
+\li EGET_LISTBOX_SELECTED_AGAIN
+*/
+class IGUIListBox : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIListBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_LIST_BOX, environment, parent, id, rectangle) {}
+
+	//! returns amount of list items
+	virtual u32 getItemCount() const = 0;
+
+	//! returns string of a list item. the may id be a value from 0 to itemCount-1
+	virtual const wchar_t *getListItem(u32 id) const = 0;
+
+	//! adds an list item, returns id of item
+	virtual u32 addItem(const wchar_t *text) = 0;
+
+	//! adds an list item with an icon
+	/** \param text Text of list entry
+	\param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon
+	\return The id of the new created item */
+	virtual u32 addItem(const wchar_t *text, s32 icon) = 0;
+
+	//! Removes an item from the list
+	virtual void removeItem(u32 index) = 0;
+
+	//! get the the id of the item at the given absolute coordinates
+	/** \return The id of the list item or -1 when no item is at those coordinates*/
+	virtual s32 getItemAt(s32 xpos, s32 ypos) const = 0;
+
+	//! Returns the icon of an item
+	virtual s32 getIcon(u32 index) const = 0;
+
+	//! Sets the sprite bank which should be used to draw list icons.
+	/** This font is set to the sprite bank of the built-in-font by
+	default. A sprite can be displayed in front of every list item.
+	An icon is an index within the icon sprite bank. Several
+	default icons are available in the skin through getIcon. */
+	virtual void setSpriteBank(IGUISpriteBank *bank) = 0;
+
+	//! clears the list, deletes all items in the listbox
+	virtual void clear() = 0;
+
+	//! returns id of selected item. returns -1 if no item is selected.
+	virtual s32 getSelected() const = 0;
+
+	//! sets the selected item. Set this to -1 if no item should be selected
+	virtual void setSelected(s32 index) = 0;
+
+	//! sets the selected item. Set this to 0 if no item should be selected
+	virtual void setSelected(const wchar_t *item) = 0;
+
+	//! set whether the listbox should scroll to newly selected items
+	virtual void setAutoScrollEnabled(bool scroll) = 0;
+
+	//! returns true if automatic scrolling is enabled, false if not.
+	virtual bool isAutoScrollEnabled() const = 0;
+
+	//! set all item colors at given index to color
+	virtual void setItemOverrideColor(u32 index, video::SColor color) = 0;
+
+	//! set all item colors of specified type at given index to color
+	virtual void setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color) = 0;
+
+	//! clear all item colors at index
+	virtual void clearItemOverrideColor(u32 index) = 0;
+
+	//! clear item color at index for given colortype
+	virtual void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) = 0;
+
+	//! has the item at index its color overwritten?
+	virtual bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const = 0;
+
+	//! return the overwrite color at given item index.
+	virtual video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const = 0;
+
+	//! return the default color which is used for the given colorType
+	virtual video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const = 0;
+
+	//! set the item at the given index
+	virtual void setItem(u32 index, const wchar_t *text, s32 icon) = 0;
+
+	//! Insert the item at the given index
+	/** \return The index on success or -1 on failure. */
+	virtual s32 insertItem(u32 index, const wchar_t *text, s32 icon) = 0;
+
+	//! Swap the items at the given indices
+	virtual void swapItems(u32 index1, u32 index2) = 0;
+
+	//! set global itemHeight
+	virtual void setItemHeight(s32 height) = 0;
+
+	//! Sets whether to draw the background
+	virtual void setDrawBackground(bool draw) = 0;
+
+	//! Access the vertical scrollbar
+	virtual IGUIScrollBar *getVerticalScrollBar() const = 0;
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIScrollBar.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_SCROLL_BAR_H_INCLUDED__
+#pragma once
-#define __I_GUI_SCROLL_BAR_H_INCLUDED__
 
 #include "IGUIElement.h"
 
@@ -12,54 +11,49 @@ namespace irr
 namespace gui
 {
 
-	//! Default scroll bar GUI element.
+//! Default scroll bar GUI element.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_SCROLL_BAR_CHANGED
+\li EGET_SCROLL_BAR_CHANGED
-	*/
+*/
-	class IGUIScrollBar : public IGUIElement
+class IGUIScrollBar : public IGUIElement
-	{
+{
-	public:
+public:
+	//! constructor
+	IGUIScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_SCROLL_BAR, environment, parent, id, rectangle) {}
 
-		//! constructor
+	//! sets the maximum value of the scrollbar.
-		IGUIScrollBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+	virtual void setMax(s32 max) = 0;
-			: IGUIElement(EGUIET_SCROLL_BAR, environment, parent, id, rectangle) {}
+	//! gets the maximum value of the scrollbar.
+	virtual s32 getMax() const = 0;
 
-		//! sets the maximum value of the scrollbar.
+	//! sets the minimum value of the scrollbar.
-		virtual void setMax(s32 max) = 0;
+	virtual void setMin(s32 min) = 0;
-		//! gets the maximum value of the scrollbar.
+	//! gets the minimum value of the scrollbar.
-		virtual s32 getMax() const = 0;
+	virtual s32 getMin() const = 0;
 
-		//! sets the minimum value of the scrollbar.
+	//! gets the small step value
-		virtual void setMin(s32 min) = 0;
+	virtual s32 getSmallStep() const = 0;
-		//! gets the minimum value of the scrollbar.
-		virtual s32 getMin() const = 0;
 
-		//! gets the small step value
+	//! Sets the small step
-		virtual s32 getSmallStep() const = 0;
+	/** That is the amount that the value changes by when clicking
+	on the buttons or using the cursor keys. */
+	virtual void setSmallStep(s32 step) = 0;
 
-		//! Sets the small step
+	//! gets the large step value
-		/** That is the amount that the value changes by when clicking
+	virtual s32 getLargeStep() const = 0;
-		on the buttons or using the cursor keys. */
-		virtual void setSmallStep(s32 step) = 0;
 
-		//! gets the large step value
+	//! Sets the large step
-		virtual s32 getLargeStep() const = 0;
+	/** That is the amount that the value changes by when clicking
+	in the tray, or using the page up and page down keys. */
+	virtual void setLargeStep(s32 step) = 0;
 
-		//! Sets the large step
+	//! gets the current position of the scrollbar
-		/** That is the amount that the value changes by when clicking
+	virtual s32 getPos() const = 0;
-		in the tray, or using the page up and page down keys. */
-		virtual void setLargeStep(s32 step) = 0;
-
-		//! gets the current position of the scrollbar
-		virtual s32 getPos() const = 0;
-
-		//! sets the current position of the scrollbar
-		virtual void setPos(s32 pos) = 0;
-	};
 
+	//! sets the current position of the scrollbar
+	virtual void setPos(s32 pos) = 0;
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUISkin.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_SKIN_H_INCLUDED__
+#pragma once
-#define __I_GUI_SKIN_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "EGUIAlignment.h"
@@ -14,40 +13,39 @@ namespace irr
 {
 namespace gui
 {
-	class IGUIFont;
+class IGUIFont;
-	class IGUISpriteBank;
+class IGUISpriteBank;
-	class IGUIElement;
+class IGUIElement;
 
-	//! Enumeration of available default skins.
+//! Enumeration of available default skins.
-	/** To set one of the skins, use the following code, for example to set
+/** To set one of the skins, use the following code, for example to set
-	the Windows classic skin:
+the Windows classic skin:
-	\code
+\code
-	gui::IGUISkin* newskin = environment->createSkin(gui::EGST_WINDOWS_CLASSIC);
+gui::IGUISkin* newskin = environment->createSkin(gui::EGST_WINDOWS_CLASSIC);
-	environment->setSkin(newskin);
+environment->setSkin(newskin);
-	newskin->drop();
+newskin->drop();
-	\endcode
+\endcode
-	*/
+*/
-	enum EGUI_SKIN_TYPE
+enum EGUI_SKIN_TYPE
-	{
+{
-		//! Default windows look and feel
+	//! Default windows look and feel
-		EGST_WINDOWS_CLASSIC=0,
+	EGST_WINDOWS_CLASSIC = 0,
 
-		//! Like EGST_WINDOWS_CLASSIC, but with metallic shaded windows and buttons
+	//! Like EGST_WINDOWS_CLASSIC, but with metallic shaded windows and buttons
-		EGST_WINDOWS_METALLIC,
+	EGST_WINDOWS_METALLIC,
 
-		//! Burning's skin
+	//! Burning's skin
-		EGST_BURNING_SKIN,
+	EGST_BURNING_SKIN,
 
-		//! An unknown skin, not serializable at present
+	//! An unknown skin, not serializable at present
-		EGST_UNKNOWN,
+	EGST_UNKNOWN,
 
-		//! this value is not used, it only specifies the number of skin types
+	//! this value is not used, it only specifies the number of skin types
-		EGST_COUNT
+	EGST_COUNT
-	};
+};
 
-	//! Names for gui element types
+//! Names for gui element types
-	const c8* const GUISkinTypeNames[EGST_COUNT+1] =
+const c8 *const GUISkinTypeNames[EGST_COUNT + 1] = {
-	{
 		"windowsClassic",
 		"windowsMetallic",
 		"burning",
@@ -55,69 +53,67 @@ namespace gui
 		0,
 	};
 
+//! Enumeration for skin colors
+enum EGUI_DEFAULT_COLOR
+{
+	//! Dark shadow for three-dimensional display elements.
+	EGDC_3D_DARK_SHADOW = 0,
+	//! Shadow color for three-dimensional display elements (for edges facing away from the light source).
+	EGDC_3D_SHADOW,
+	//! Face color for three-dimensional display elements and for dialog box backgrounds.
+	EGDC_3D_FACE,
+	//! Highlight color for three-dimensional display elements (for edges facing the light source.)
+	EGDC_3D_HIGH_LIGHT,
+	//! Light color for three-dimensional display elements (for edges facing the light source.)
+	EGDC_3D_LIGHT,
+	//! Active window border.
+	EGDC_ACTIVE_BORDER,
+	//! Active window title bar text.
+	EGDC_ACTIVE_CAPTION,
+	//! Background color of multiple document interface (MDI) applications.
+	EGDC_APP_WORKSPACE,
+	//! Text on a button
+	EGDC_BUTTON_TEXT,
+	//! Grayed (disabled) text.
+	EGDC_GRAY_TEXT,
+	//! Item(s) selected in a control.
+	EGDC_HIGH_LIGHT,
+	//! Text of item(s) selected in a control.
+	EGDC_HIGH_LIGHT_TEXT,
+	//! Inactive window border.
+	EGDC_INACTIVE_BORDER,
+	//! Inactive window caption.
+	EGDC_INACTIVE_CAPTION,
+	//! Tool tip text color
+	EGDC_TOOLTIP,
+	//! Tool tip background color
+	EGDC_TOOLTIP_BACKGROUND,
+	//! Scrollbar gray area
+	EGDC_SCROLLBAR,
+	//! Window background
+	EGDC_WINDOW,
+	//! Window symbols like on close buttons, scroll bars and check boxes
+	EGDC_WINDOW_SYMBOL,
+	//! Icons in a list or tree
+	EGDC_ICON,
+	//! Selected icons in a list or tree
+	EGDC_ICON_HIGH_LIGHT,
+	//! Grayed (disabled) window symbols like on close buttons, scroll bars and check boxes
+	EGDC_GRAY_WINDOW_SYMBOL,
+	//! Window background for editable field (editbox, checkbox-field)
+	EGDC_EDITABLE,
+	//! Grayed (disabled) window background for editable field (editbox, checkbox-field)
+	EGDC_GRAY_EDITABLE,
+	//! Show focus of window background for editable field (editbox or when checkbox-field is pressed)
+	EGDC_FOCUSED_EDITABLE,
 
-	//! Enumeration for skin colors
+	//! this value is not used, it only specifies the amount of default colors
-	enum EGUI_DEFAULT_COLOR
+	//! available.
-	{
+	EGDC_COUNT
-		//! Dark shadow for three-dimensional display elements.
+};
-		EGDC_3D_DARK_SHADOW = 0,
-		//! Shadow color for three-dimensional display elements (for edges facing away from the light source).
-		EGDC_3D_SHADOW,
-		//! Face color for three-dimensional display elements and for dialog box backgrounds.
-		EGDC_3D_FACE,
-		//! Highlight color for three-dimensional display elements (for edges facing the light source.)
-		EGDC_3D_HIGH_LIGHT,
-		//! Light color for three-dimensional display elements (for edges facing the light source.)
-		EGDC_3D_LIGHT,
-		//! Active window border.
-		EGDC_ACTIVE_BORDER,
-		//! Active window title bar text.
-		EGDC_ACTIVE_CAPTION,
-		//! Background color of multiple document interface (MDI) applications.
-		EGDC_APP_WORKSPACE,
-		//! Text on a button
-		EGDC_BUTTON_TEXT,
-		//! Grayed (disabled) text.
-		EGDC_GRAY_TEXT,
-		//! Item(s) selected in a control.
-		EGDC_HIGH_LIGHT,
-		//! Text of item(s) selected in a control.
-		EGDC_HIGH_LIGHT_TEXT,
-		//! Inactive window border.
-		EGDC_INACTIVE_BORDER,
-		//! Inactive window caption.
-		EGDC_INACTIVE_CAPTION,
-		//! Tool tip text color
-		EGDC_TOOLTIP,
-		//! Tool tip background color
-		EGDC_TOOLTIP_BACKGROUND,
-		//! Scrollbar gray area
-		EGDC_SCROLLBAR,
-		//! Window background
-		EGDC_WINDOW,
-		//! Window symbols like on close buttons, scroll bars and check boxes
-		EGDC_WINDOW_SYMBOL,
-		//! Icons in a list or tree
-		EGDC_ICON,
-		//! Selected icons in a list or tree
-		EGDC_ICON_HIGH_LIGHT,
-		//! Grayed (disabled) window symbols like on close buttons, scroll bars and check boxes
-		EGDC_GRAY_WINDOW_SYMBOL,
-		//! Window background for editable field (editbox, checkbox-field)
-		EGDC_EDITABLE,
-		//! Grayed (disabled) window background for editable field (editbox, checkbox-field)
-		EGDC_GRAY_EDITABLE,
-		//! Show focus of window background for editable field (editbox or when checkbox-field is pressed)
-		EGDC_FOCUSED_EDITABLE,
 
-		//! this value is not used, it only specifies the amount of default colors
+//! Names for default skin colors
-		//! available.
+const c8 *const GUISkinColorNames[EGDC_COUNT + 1] = {
-		EGDC_COUNT
-	};
-
-	//! Names for default skin colors
-	const c8* const GUISkinColorNames[EGDC_COUNT+1] =
-	{
 		"3DDarkShadow",
 		"3DShadow",
 		"3DFace",
@@ -146,65 +142,63 @@ namespace gui
 		0,
 	};
 
-	//! Enumeration for default sizes.
+//! Enumeration for default sizes.
-	enum EGUI_DEFAULT_SIZE
+enum EGUI_DEFAULT_SIZE
-	{
+{
-		//! default with / height of scrollbar. Also width of drop-down button in comboboxes.
+	//! default with / height of scrollbar. Also width of drop-down button in comboboxes.
-		EGDS_SCROLLBAR_SIZE = 0,
+	EGDS_SCROLLBAR_SIZE = 0,
-		//! height of menu
+	//! height of menu
-		EGDS_MENU_HEIGHT,
+	EGDS_MENU_HEIGHT,
-		//! width and height of a window titlebar button (like minimize/maximize/close buttons). The titlebar height is also calculated from that.
+	//! width and height of a window titlebar button (like minimize/maximize/close buttons). The titlebar height is also calculated from that.
-		EGDS_WINDOW_BUTTON_WIDTH,
+	EGDS_WINDOW_BUTTON_WIDTH,
-		//! width of a checkbox check
+	//! width of a checkbox check
-		EGDS_CHECK_BOX_WIDTH,
+	EGDS_CHECK_BOX_WIDTH,
-		//! \deprecated This may be removed by Irrlicht 1.9
+	//! \deprecated This may be removed by Irrlicht 1.9
-		EGDS_MESSAGE_BOX_WIDTH,
+	EGDS_MESSAGE_BOX_WIDTH,
-		//! \deprecated This may be removed by Irrlicht 1.9
+	//! \deprecated This may be removed by Irrlicht 1.9
-		EGDS_MESSAGE_BOX_HEIGHT,
+	EGDS_MESSAGE_BOX_HEIGHT,
-		//! width of a default button
+	//! width of a default button
-		EGDS_BUTTON_WIDTH,
+	EGDS_BUTTON_WIDTH,
-		//! height of a default button (OK and cancel buttons)
+	//! height of a default button (OK and cancel buttons)
-		EGDS_BUTTON_HEIGHT,
+	EGDS_BUTTON_HEIGHT,
-		//! distance for text from background
+	//! distance for text from background
-		EGDS_TEXT_DISTANCE_X,
+	EGDS_TEXT_DISTANCE_X,
-		//! distance for text from background
+	//! distance for text from background
-		EGDS_TEXT_DISTANCE_Y,
+	EGDS_TEXT_DISTANCE_Y,
-		//! distance for text in the title bar, from the left of the window rect
+	//! distance for text in the title bar, from the left of the window rect
-		EGDS_TITLEBARTEXT_DISTANCE_X,
+	EGDS_TITLEBARTEXT_DISTANCE_X,
-		//! distance for text in the title bar, from the top of the window rect
+	//! distance for text in the title bar, from the top of the window rect
-		EGDS_TITLEBARTEXT_DISTANCE_Y,
+	EGDS_TITLEBARTEXT_DISTANCE_Y,
-		//! free space in a messagebox between borders and contents on all sides
+	//! free space in a messagebox between borders and contents on all sides
-		EGDS_MESSAGE_BOX_GAP_SPACE,
+	EGDS_MESSAGE_BOX_GAP_SPACE,
-		//! minimal space to reserve for messagebox text-width
+	//! minimal space to reserve for messagebox text-width
-		EGDS_MESSAGE_BOX_MIN_TEXT_WIDTH,
+	EGDS_MESSAGE_BOX_MIN_TEXT_WIDTH,
-		//! maximal space to reserve for messagebox text-width
+	//! maximal space to reserve for messagebox text-width
-		EGDS_MESSAGE_BOX_MAX_TEXT_WIDTH,
+	EGDS_MESSAGE_BOX_MAX_TEXT_WIDTH,
-		//! minimal space to reserve for messagebox text-height
+	//! minimal space to reserve for messagebox text-height
-		EGDS_MESSAGE_BOX_MIN_TEXT_HEIGHT,
+	EGDS_MESSAGE_BOX_MIN_TEXT_HEIGHT,
-		//! maximal space to reserve for messagebox text-height
+	//! maximal space to reserve for messagebox text-height
-		EGDS_MESSAGE_BOX_MAX_TEXT_HEIGHT,
+	EGDS_MESSAGE_BOX_MAX_TEXT_HEIGHT,
-		//! pixels to move an unscaled button image to the right when a button is pressed and the unpressed image looks identical
+	//! pixels to move an unscaled button image to the right when a button is pressed and the unpressed image looks identical
-		EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X,
+	EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X,
-		//! pixels to move an unscaled button image down when a button is pressed  and the unpressed image looks identical
+	//! pixels to move an unscaled button image down when a button is pressed  and the unpressed image looks identical
-		EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y,
+	EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y,
-		//! pixels to move the button text to the right when a button is pressed
+	//! pixels to move the button text to the right when a button is pressed
-		EGDS_BUTTON_PRESSED_TEXT_OFFSET_X,
+	EGDS_BUTTON_PRESSED_TEXT_OFFSET_X,
-		//! pixels to move the button text down when a button is pressed
+	//! pixels to move the button text down when a button is pressed
-		EGDS_BUTTON_PRESSED_TEXT_OFFSET_Y,
+	EGDS_BUTTON_PRESSED_TEXT_OFFSET_Y,
-		//! pixels to move an unscaled button sprite to the right when a button is pressed
+	//! pixels to move an unscaled button sprite to the right when a button is pressed
-		EGDS_BUTTON_PRESSED_SPRITE_OFFSET_X,
+	EGDS_BUTTON_PRESSED_SPRITE_OFFSET_X,
-		//! pixels to move an unscaled button sprite down when a button is pressed
+	//! pixels to move an unscaled button sprite down when a button is pressed
-		EGDS_BUTTON_PRESSED_SPRITE_OFFSET_Y,
+	EGDS_BUTTON_PRESSED_SPRITE_OFFSET_Y,
 
-		//! this value is not used, it only specifies the amount of default sizes
+	//! this value is not used, it only specifies the amount of default sizes
-		//! available.
+	//! available.
-		EGDS_COUNT
+	EGDS_COUNT
-	};
+};
 
-
+//! Names for default skin sizes
-	//! Names for default skin sizes
+const c8 *const GUISkinSizeNames[EGDS_COUNT + 1] = {
-	const c8* const GUISkinSizeNames[EGDS_COUNT+1] =
-	{
 		"ScrollBarSize",
 		"MenuHeight",
 		"WindowButtonWidth",
@@ -228,36 +222,34 @@ namespace gui
 		"ButtonPressedTextOffsetY",
 		"ButtonPressedSpriteOffsetX",
 		"ButtonPressedSpriteOffsetY",
-		0
+		0,
 	};
 
+enum EGUI_DEFAULT_TEXT
+{
+	//! Text for the OK button on a message box
+	EGDT_MSG_BOX_OK = 0,
+	//! Text for the Cancel button on a message box
+	EGDT_MSG_BOX_CANCEL,
+	//! Text for the Yes button on a message box
+	EGDT_MSG_BOX_YES,
+	//! Text for the No button on a message box
+	EGDT_MSG_BOX_NO,
+	//! Tooltip text for window close button
+	EGDT_WINDOW_CLOSE,
+	//! Tooltip text for window maximize button
+	EGDT_WINDOW_MAXIMIZE,
+	//! Tooltip text for window minimize button
+	EGDT_WINDOW_MINIMIZE,
+	//! Tooltip text for window restore button
+	EGDT_WINDOW_RESTORE,
 
-	enum EGUI_DEFAULT_TEXT
+	//! this value is not used, it only specifies the number of default texts
-	{
+	EGDT_COUNT
-		//! Text for the OK button on a message box
+};
-		EGDT_MSG_BOX_OK = 0,
-		//! Text for the Cancel button on a message box
-		EGDT_MSG_BOX_CANCEL,
-		//! Text for the Yes button on a message box
-		EGDT_MSG_BOX_YES,
-		//! Text for the No button on a message box
-		EGDT_MSG_BOX_NO,
-		//! Tooltip text for window close button
-		EGDT_WINDOW_CLOSE,
-		//! Tooltip text for window maximize button
-		EGDT_WINDOW_MAXIMIZE,
-		//! Tooltip text for window minimize button
-		EGDT_WINDOW_MINIMIZE,
-		//! Tooltip text for window restore button
-		EGDT_WINDOW_RESTORE,
 
-		//! this value is not used, it only specifies the number of default texts
+//! Names for default skin sizes
-		EGDT_COUNT
+const c8 *const GUISkinTextNames[EGDT_COUNT + 1] = {
-	};
-
-	//! Names for default skin sizes
-	const c8* const GUISkinTextNames[EGDT_COUNT+1] =
-	{
 		"MessageBoxOkay",
 		"MessageBoxCancel",
 		"MessageBoxYes",
@@ -266,66 +258,65 @@ namespace gui
 		"WindowButtonMaximize",
 		"WindowButtonMinimize",
 		"WindowButtonRestore",
-		0
+		0,
 	};
 
-	//! Customizable symbols for GUI
+//! Customizable symbols for GUI
-	enum EGUI_DEFAULT_ICON
+enum EGUI_DEFAULT_ICON
-	{
+{
-		//! maximize window button
+	//! maximize window button
-		EGDI_WINDOW_MAXIMIZE = 0,
+	EGDI_WINDOW_MAXIMIZE = 0,
-		//! restore window button
+	//! restore window button
-		EGDI_WINDOW_RESTORE,
+	EGDI_WINDOW_RESTORE,
-		//! close window button
+	//! close window button
-		EGDI_WINDOW_CLOSE,
+	EGDI_WINDOW_CLOSE,
-		//! minimize window button
+	//! minimize window button
-		EGDI_WINDOW_MINIMIZE,
+	EGDI_WINDOW_MINIMIZE,
-		//! resize icon for bottom right corner of a window
+	//! resize icon for bottom right corner of a window
-		EGDI_WINDOW_RESIZE,
+	EGDI_WINDOW_RESIZE,
-		//! scroll bar up button
+	//! scroll bar up button
-		EGDI_CURSOR_UP,
+	EGDI_CURSOR_UP,
-		//! scroll bar down button
+	//! scroll bar down button
-		EGDI_CURSOR_DOWN,
+	EGDI_CURSOR_DOWN,
-		//! scroll bar left button
+	//! scroll bar left button
-		EGDI_CURSOR_LEFT,
+	EGDI_CURSOR_LEFT,
-		//! scroll bar right button
+	//! scroll bar right button
-		EGDI_CURSOR_RIGHT,
+	EGDI_CURSOR_RIGHT,
-		//! icon for menu children
+	//! icon for menu children
-		EGDI_MENU_MORE,
+	EGDI_MENU_MORE,
-		//! tick for checkbox
+	//! tick for checkbox
-		EGDI_CHECK_BOX_CHECKED,
+	EGDI_CHECK_BOX_CHECKED,
-		//! down arrow for dropdown menus
+	//! down arrow for dropdown menus
-		EGDI_DROP_DOWN,
+	EGDI_DROP_DOWN,
-		//! smaller up arrow
+	//! smaller up arrow
-		EGDI_SMALL_CURSOR_UP,
+	EGDI_SMALL_CURSOR_UP,
-		//! smaller down arrow
+	//! smaller down arrow
-		EGDI_SMALL_CURSOR_DOWN,
+	EGDI_SMALL_CURSOR_DOWN,
-		//! selection dot in a radio button
+	//! selection dot in a radio button
-		EGDI_RADIO_BUTTON_CHECKED,
+	EGDI_RADIO_BUTTON_CHECKED,
-		//! << icon indicating there is more content to the left
+	//! << icon indicating there is more content to the left
-		EGDI_MORE_LEFT,
+	EGDI_MORE_LEFT,
-		//! >> icon indicating that there is more content to the right
+	//! >> icon indicating that there is more content to the right
-		EGDI_MORE_RIGHT,
+	EGDI_MORE_RIGHT,
-		//! icon indicating that there is more content above
+	//! icon indicating that there is more content above
-		EGDI_MORE_UP,
+	EGDI_MORE_UP,
-		//! icon indicating that there is more content below
+	//! icon indicating that there is more content below
-		EGDI_MORE_DOWN,
+	EGDI_MORE_DOWN,
-		//! plus icon for trees
+	//! plus icon for trees
-		EGDI_EXPAND,
+	EGDI_EXPAND,
 
-		//! minus icon for trees
+	//! minus icon for trees
-		EGDI_COLLAPSE,
+	EGDI_COLLAPSE,
-		//! file icon for file selection
+	//! file icon for file selection
-		EGDI_FILE,
+	EGDI_FILE,
-		//! folder icon for file selection
+	//! folder icon for file selection
-		EGDI_DIRECTORY,
+	EGDI_DIRECTORY,
 
-		//! value not used, it only specifies the number of icons
+	//! value not used, it only specifies the number of icons
-		EGDI_COUNT
+	EGDI_COUNT
-	};
+};
 
-	const c8* const GUISkinIconNames[EGDI_COUNT+1] =
+const c8 *const GUISkinIconNames[EGDI_COUNT + 1] = {
-	{
 		"windowMaximize",
 		"windowRestore",
 		"windowClose",
@@ -349,232 +340,226 @@ namespace gui
 		"collapse",
 		"file",
 		"directory",
-		0
+		0,
 	};
 
-	// Customizable fonts
+// Customizable fonts
-	enum EGUI_DEFAULT_FONT
+enum EGUI_DEFAULT_FONT
-	{
+{
-		//! For static text, edit boxes, lists and most other places
+	//! For static text, edit boxes, lists and most other places
-		EGDF_DEFAULT=0,
+	EGDF_DEFAULT = 0,
-		//! Font for buttons
+	//! Font for buttons
-		EGDF_BUTTON,
+	EGDF_BUTTON,
-		//! Font for window title bars
+	//! Font for window title bars
-		EGDF_WINDOW,
+	EGDF_WINDOW,
-		//! Font for menu items
+	//! Font for menu items
-		EGDF_MENU,
+	EGDF_MENU,
-		//! Font for tooltips
+	//! Font for tooltips
-		EGDF_TOOLTIP,
+	EGDF_TOOLTIP,
-		//! this value is not used, it only specifies the amount of default fonts
+	//! this value is not used, it only specifies the amount of default fonts
-		//! available.
+	//! available.
-		EGDF_COUNT
+	EGDF_COUNT
-	};
+};
 
-	const c8* const GUISkinFontNames[EGDF_COUNT+1] =
+const c8 *const GUISkinFontNames[EGDF_COUNT + 1] = {
-	{
 		"defaultFont",
 		"buttonFont",
 		"windowFont",
 		"menuFont",
 		"tooltipFont",
-		0
+		0,
 	};
 
-	//! A skin modifies the look of the GUI elements.
+//! A skin modifies the look of the GUI elements.
-	class IGUISkin : virtual public IReferenceCounted
+class IGUISkin : virtual public IReferenceCounted
-	{
+{
-	public:
+public:
+	//! returns default color
+	virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const = 0;
 
-		//! returns default color
+	//! sets a default color
-		virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const = 0;
+	virtual void setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor) = 0;
 
-		//! sets a default color
+	//! returns size for the given size type
-		virtual void setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor) = 0;
+	virtual s32 getSize(EGUI_DEFAULT_SIZE size) const = 0;
 
-		//! returns size for the given size type
+	//! Returns a default text.
-		virtual s32 getSize(EGUI_DEFAULT_SIZE size) const = 0;
+	/** For example for Message box button captions:
+	"OK", "Cancel", "Yes", "No" and so on. */
+	virtual const wchar_t *getDefaultText(EGUI_DEFAULT_TEXT text) const = 0;
 
-		//! Returns a default text.
+	//! Sets a default text.
-		/** For example for Message box button captions:
+	/** For example for Message box button captions:
-		"OK", "Cancel", "Yes", "No" and so on. */
+	"OK", "Cancel", "Yes", "No" and so on. */
-		virtual const wchar_t* getDefaultText(EGUI_DEFAULT_TEXT text) const = 0;
+	virtual void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t *newText) = 0;
 
-		//! Sets a default text.
+	//! sets a default size
-		/** For example for Message box button captions:
+	virtual void setSize(EGUI_DEFAULT_SIZE which, s32 size) = 0;
-		"OK", "Cancel", "Yes", "No" and so on. */
-		virtual void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText) = 0;
 
-		//! sets a default size
+	//! returns the default font
-		virtual void setSize(EGUI_DEFAULT_SIZE which, s32 size) = 0;
+	virtual IGUIFont *getFont(EGUI_DEFAULT_FONT which = EGDF_DEFAULT) const = 0;
 
-		//! returns the default font
+	//! sets a default font
-		virtual IGUIFont* getFont(EGUI_DEFAULT_FONT which=EGDF_DEFAULT) const = 0;
+	virtual void setFont(IGUIFont *font, EGUI_DEFAULT_FONT which = EGDF_DEFAULT) = 0;
 
-		//! sets a default font
+	//! returns the sprite bank
-		virtual void setFont(IGUIFont* font, EGUI_DEFAULT_FONT which=EGDF_DEFAULT) = 0;
+	virtual IGUISpriteBank *getSpriteBank() const = 0;
 
-		//! returns the sprite bank
+	//! sets the sprite bank
-		virtual IGUISpriteBank* getSpriteBank() const = 0;
+	virtual void setSpriteBank(IGUISpriteBank *bank) = 0;
 
-		//! sets the sprite bank
+	//! Returns a default icon
-		virtual void setSpriteBank(IGUISpriteBank* bank) = 0;
+	/** Returns the sprite index within the sprite bank */
+	virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const = 0;
 
-		//! Returns a default icon
+	//! Sets a default icon
-		/** Returns the sprite index within the sprite bank */
+	/** Sets the sprite index used for drawing icons like arrows,
-		virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const = 0;
+	close buttons and ticks in checkboxes
+	\param icon: Enum specifying which icon to change
+	\param index: The sprite index used to draw this icon */
+	virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index) = 0;
 
-		//! Sets a default icon
+	//! draws a standard 3d button pane
-		/** Sets the sprite index used for drawing icons like arrows,
+	/** Used for drawing for example buttons in normal state.
-		close buttons and ticks in checkboxes
+	It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		\param icon: Enum specifying which icon to change
+	EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
-		\param index: The sprite index used to draw this icon */
+	\param element: Pointer to the element which wishes to draw this. This parameter
-		virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index) = 0;
+	is usually not used by IGUISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area. */
+	virtual void draw3DButtonPaneStandard(IGUIElement *element,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) = 0;
 
-		//! draws a standard 3d button pane
+	//! draws a pressed 3d button pane
-		/** Used for drawing for example buttons in normal state.
+	/** Used for drawing for example buttons in pressed state.
-		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+	It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+	EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
-		\param element: Pointer to the element which wishes to draw this. This parameter
+	\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex
+	is usually not used by IGUISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
+	implementations to find out how to draw the part exactly.
-		\param rect: Defining area where to draw.
+	\param rect: Defining area where to draw.
-		\param clip: Clip area. */
+	\param clip: Clip area. */
-		virtual void draw3DButtonPaneStandard(IGUIElement* element,
+	virtual void draw3DButtonPanePressed(IGUIElement *element,
-			const core::rect<s32>& rect,
+			const core::rect<s32> &rect,
-			const core::rect<s32>* clip=0) = 0;
+			const core::rect<s32> *clip = 0) = 0;
 
-		//! draws a pressed 3d button pane
+	//! draws a sunken 3d pane
-		/** Used for drawing for example buttons in pressed state.
+	/** Used for drawing the background of edit, combo or check boxes.
-		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+	\param element: Pointer to the element which wishes to draw this. This parameter
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+	is usually not used by IGUISkin, but can be used for example by more complex
-		\param element: Pointer to the element which wishes to draw this. This parameter
+	implementations to find out how to draw the part exactly.
-		is usually not used by IGUISkin, but can be used for example by more complex
+	\param bgcolor: Background color.
-		implementations to find out how to draw the part exactly.
+	\param flat: Specifies if the sunken pane should be flat or displayed as sunken
-		\param rect: Defining area where to draw.
+	deep into the ground.
-		\param clip: Clip area. */
+	\param fillBackGround: Specifies if the background should be filled with the background
-		virtual void draw3DButtonPanePressed(IGUIElement* element,
+	color or not be drawn at all.
-			const core::rect<s32>& rect,
+	\param rect: Defining area where to draw.
-			const core::rect<s32>* clip=0) = 0;
+	\param clip: Clip area. */
-
+	virtual void draw3DSunkenPane(IGUIElement *element,
-		//! draws a sunken 3d pane
-		/** Used for drawing the background of edit, combo or check boxes.
-		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
-		\param bgcolor: Background color.
-		\param flat: Specifies if the sunken pane should be flat or displayed as sunken
-		deep into the ground.
-		\param fillBackGround: Specifies if the background should be filled with the background
-		color or not be drawn at all.
-		\param rect: Defining area where to draw.
-		\param clip: Clip area. */
-		virtual void draw3DSunkenPane(IGUIElement* element,
 			video::SColor bgcolor, bool flat, bool fillBackGround,
-			const core::rect<s32>& rect,
+			const core::rect<s32> &rect,
-			const core::rect<s32>* clip=0) = 0;
+			const core::rect<s32> *clip = 0) = 0;
 
-		//! draws a window background
+	//! draws a window background
-		/** Used for drawing the background of dialogs and windows.
+	/** Used for drawing the background of dialogs and windows.
-		\param element: Pointer to the element which wishes to draw this. This parameter
+	\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex
+	is usually not used by IGUISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
+	implementations to find out how to draw the part exactly.
-		\param titleBarColor: Title color.
+	\param titleBarColor: Title color.
-		\param drawTitleBar: True to enable title drawing.
+	\param drawTitleBar: True to enable title drawing.
-		\param rect: Defining area where to draw.
+	\param rect: Defining area where to draw.
-		\param clip: Clip area.
+	\param clip: Clip area.
-		\param checkClientArea: When set to non-null the function will not draw anything,
+	\param checkClientArea: When set to non-null the function will not draw anything,
-		but will instead return the clientArea which can be used for drawing by the calling window.
+	but will instead return the clientArea which can be used for drawing by the calling window.
-		That is the area without borders and without titlebar.
+	That is the area without borders and without titlebar.
-		\return Returns rect where it would be good to draw title bar text. This will
+	\return Returns rect where it would be good to draw title bar text. This will
-		work even when checkClientArea is set to a non-null value.*/
+	work even when checkClientArea is set to a non-null value.*/
-		virtual core::rect<s32> draw3DWindowBackground(IGUIElement* element,
+	virtual core::rect<s32> draw3DWindowBackground(IGUIElement *element,
 			bool drawTitleBar, video::SColor titleBarColor,
-			const core::rect<s32>& rect,
+			const core::rect<s32> &rect,
-			const core::rect<s32>* clip=0,
+			const core::rect<s32> *clip = 0,
-			core::rect<s32>* checkClientArea=0) = 0;
+			core::rect<s32> *checkClientArea = 0) = 0;
 
-		//! draws a standard 3d menu pane
+	//! draws a standard 3d menu pane
-		/** Used for drawing for menus and context menus.
+	/** Used for drawing for menus and context menus.
-		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+	It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+	EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
-		\param element: Pointer to the element which wishes to draw this. This parameter
+	\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex
+	is usually not used by IGUISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
+	implementations to find out how to draw the part exactly.
-		\param rect: Defining area where to draw.
+	\param rect: Defining area where to draw.
-		\param clip: Clip area. */
+	\param clip: Clip area. */
-		virtual void draw3DMenuPane(IGUIElement* element,
+	virtual void draw3DMenuPane(IGUIElement *element,
-			const core::rect<s32>& rect,
+			const core::rect<s32> &rect,
-			const core::rect<s32>* clip=0) = 0;
+			const core::rect<s32> *clip = 0) = 0;
 
-		//! draws a standard 3d tool bar
+	//! draws a standard 3d tool bar
-		/** Used for drawing for toolbars and menus.
+	/** Used for drawing for toolbars and menus.
-		\param element: Pointer to the element which wishes to draw this. This parameter
+	\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex
+	is usually not used by IGUISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
+	implementations to find out how to draw the part exactly.
-		\param rect: Defining area where to draw.
+	\param rect: Defining area where to draw.
-		\param clip: Clip area. */
+	\param clip: Clip area. */
-		virtual void draw3DToolBar(IGUIElement* element,
+	virtual void draw3DToolBar(IGUIElement *element,
-			const core::rect<s32>& rect,
+			const core::rect<s32> &rect,
-			const core::rect<s32>* clip=0) = 0;
+			const core::rect<s32> *clip = 0) = 0;
 
-		//! draws a tab button
+	//! draws a tab button
-		/** Used for drawing for tab buttons on top of tabs.
+	/** Used for drawing for tab buttons on top of tabs.
-		\param element: Pointer to the element which wishes to draw this. This parameter
+	\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex
+	is usually not used by IGUISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
+	implementations to find out how to draw the part exactly.
-		\param active: Specifies if the tab is currently active.
+	\param active: Specifies if the tab is currently active.
-		\param rect: Defining area where to draw.
+	\param rect: Defining area where to draw.
-		\param clip: Clip area.
+	\param clip: Clip area.
-		\param alignment Alignment of GUI element. */
+	\param alignment Alignment of GUI element. */
-		virtual void draw3DTabButton(IGUIElement* element, bool active,
+	virtual void draw3DTabButton(IGUIElement *element, bool active,
-			const core::rect<s32>& rect, const core::rect<s32>* clip=0, gui::EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT) = 0;
+			const core::rect<s32> &rect, const core::rect<s32> *clip = 0, gui::EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT) = 0;
 
-		//! draws a tab control body
+	//! draws a tab control body
-		/** \param element: Pointer to the element which wishes to draw this. This parameter
+	/** \param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by IGUISkin, but can be used for example by more complex
+	is usually not used by IGUISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
+	implementations to find out how to draw the part exactly.
-		\param border: Specifies if the border should be drawn.
+	\param border: Specifies if the border should be drawn.
-		\param background: Specifies if the background should be drawn.
+	\param background: Specifies if the background should be drawn.
-		\param rect: Defining area where to draw.
+	\param rect: Defining area where to draw.
-		\param clip: Clip area.
+	\param clip: Clip area.
-		\param tabHeight Height of tab.
+	\param tabHeight Height of tab.
-		\param alignment Alignment of GUI element. */
+	\param alignment Alignment of GUI element. */
-		virtual void draw3DTabBody(IGUIElement* element, bool border, bool background,
+	virtual void draw3DTabBody(IGUIElement *element, bool border, bool background,
-			const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1, gui::EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT ) = 0;
+			const core::rect<s32> &rect, const core::rect<s32> *clip = 0, s32 tabHeight = -1, gui::EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT) = 0;
 
-		//! draws an icon, usually from the skin's sprite bank
+	//! draws an icon, usually from the skin's sprite bank
-		/** \param element: Pointer to the element which wishes to draw this icon.
+	/** \param element: Pointer to the element which wishes to draw this icon.
-		This parameter is usually not used by IGUISkin, but can be used for example
+	This parameter is usually not used by IGUISkin, but can be used for example
-		by more complex implementations to find out how to draw the part exactly.
+	by more complex implementations to find out how to draw the part exactly.
-		\param icon: Specifies the icon to be drawn.
+	\param icon: Specifies the icon to be drawn.
-		\param position: The position to draw the icon
+	\param position: The position to draw the icon
-		\param starttime: The time at the start of the animation
+	\param starttime: The time at the start of the animation
-		\param currenttime: The present time, used to calculate the frame number
+	\param currenttime: The present time, used to calculate the frame number
-		\param loop: Whether the animation should loop or not
+	\param loop: Whether the animation should loop or not
-		\param clip: Clip area. */
+	\param clip: Clip area. */
-		virtual void drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
+	virtual void drawIcon(IGUIElement *element, EGUI_DEFAULT_ICON icon,
-			const core::position2di position, u32 starttime=0, u32 currenttime=0,
+			const core::position2di position, u32 starttime = 0, u32 currenttime = 0,
-			bool loop=false, const core::rect<s32>* clip=0) = 0;
+			bool loop = false, const core::rect<s32> *clip = 0) = 0;
 
-		//! draws a 2d rectangle.
+	//! draws a 2d rectangle.
-		/** \param element: Pointer to the element which wishes to draw this icon.
+	/** \param element: Pointer to the element which wishes to draw this icon.
-		This parameter is usually not used by IGUISkin, but can be used for example
+	This parameter is usually not used by IGUISkin, but can be used for example
-		by more complex implementations to find out how to draw the part exactly.
+	by more complex implementations to find out how to draw the part exactly.
-		\param color: Color of the rectangle to draw. The alpha component specifies how
+	\param color: Color of the rectangle to draw. The alpha component specifies how
-		transparent the rectangle will be.
+	transparent the rectangle will be.
-		\param pos: Position of the rectangle.
+	\param pos: Position of the rectangle.
-		\param clip: Pointer to rectangle against which the rectangle will be clipped.
+	\param clip: Pointer to rectangle against which the rectangle will be clipped.
-		If the pointer is null, no clipping will be performed. */
+	If the pointer is null, no clipping will be performed. */
-		virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color,
+	virtual void draw2DRectangle(IGUIElement *element, const video::SColor &color,
-			const core::rect<s32>& pos, const core::rect<s32>* clip = 0) = 0;
+			const core::rect<s32> &pos, const core::rect<s32> *clip = 0) = 0;
-
-		//! get the type of this skin
-		virtual EGUI_SKIN_TYPE getType() const { return EGST_UNKNOWN; }
-	};
 
+	//! get the type of this skin
+	virtual EGUI_SKIN_TYPE getType() const { return EGST_UNKNOWN; }
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUISpriteBank.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_SPRITE_BANK_H_INCLUDED__
+#pragma once
-#define __I_GUI_SPRITE_BANK_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
@@ -15,7 +14,7 @@ namespace irr
 
 namespace video
 {
-	class ITexture;
+class ITexture;
 } // end namespace video
 
 namespace gui
@@ -25,12 +24,13 @@ namespace gui
 // Note for implementer: Can't fix variable names to uppercase as this is a public interface used since a while
 struct SGUISpriteFrame
 {
-	SGUISpriteFrame() : textureNumber(0), rectNumber(0)
+	SGUISpriteFrame() :
+			textureNumber(0), rectNumber(0)
 	{
 	}
 
-	SGUISpriteFrame(u32 textureIndex, u32 positionIndex)
+	SGUISpriteFrame(u32 textureIndex, u32 positionIndex) :
-	: textureNumber(textureIndex), rectNumber(positionIndex)
+			textureNumber(textureIndex), rectNumber(positionIndex)
 	{
 	}
 
@@ -45,8 +45,10 @@ struct SGUISpriteFrame
 // Note for implementer: Can't fix variable names to uppercase as this is a public interface used since a while
 struct SGUISprite
 {
-	SGUISprite() : frameTime(0) {}
+	SGUISprite() :
-	SGUISprite(const SGUISpriteFrame& firstFrame) : frameTime(0)
+			frameTime(0) {}
+	SGUISprite(const SGUISpriteFrame &firstFrame) :
+			frameTime(0)
 	{
 		Frames.push_back(firstFrame);
 	}
@@ -55,37 +57,35 @@ struct SGUISprite
 	u32 frameTime;
 };
 
-
 //! Sprite bank interface.
 /** See http://http://irrlicht.sourceforge.net/forum//viewtopic.php?f=9&t=25742
-* for more information how to use the spritebank.
+ * for more information how to use the spritebank.
-*/
+ */
 class IGUISpriteBank : public virtual IReferenceCounted
 {
 public:
-
 	//! Returns the list of rectangles held by the sprite bank
-	virtual core::array< core::rect<s32> >& getPositions() = 0;
+	virtual core::array<core::rect<s32>> &getPositions() = 0;
 
 	//! Returns the array of animated sprites within the sprite bank
-	virtual core::array< SGUISprite >& getSprites() = 0;
+	virtual core::array<SGUISprite> &getSprites() = 0;
 
 	//! Returns the number of textures held by the sprite bank
 	virtual u32 getTextureCount() const = 0;
 
 	//! Gets the texture with the specified index
-	virtual video::ITexture* getTexture(u32 index) const = 0;
+	virtual video::ITexture *getTexture(u32 index) const = 0;
 
 	//! Adds a texture to the sprite bank
-	virtual void addTexture(video::ITexture* texture) = 0;
+	virtual void addTexture(video::ITexture *texture) = 0;
 
 	//! Changes one of the textures in the sprite bank
-	virtual void setTexture(u32 index, video::ITexture* texture) = 0;
+	virtual void setTexture(u32 index, video::ITexture *texture) = 0;
 
 	//! Add the texture and use it for a single non-animated sprite.
 	/** The texture and the corresponding rectangle and sprite will all be added to the end of each array.
 	 \returns The index of the sprite or -1 on failure */
-	virtual s32 addTextureAsSprite(video::ITexture* texture) = 0;
+	virtual s32 addTextureAsSprite(video::ITexture *texture) = 0;
 
 	//! Clears sprites, rectangles and textures
 	virtual void clear() = 0;
@@ -103,11 +103,11 @@ public:
 	\param loop When true animations are looped
 	\param center When true pivot is set to the sprite-center. So it affects pos.
 	*/
-	virtual void draw2DSprite(u32 index, const core::position2di& pos,
+	virtual void draw2DSprite(u32 index, const core::position2di &pos,
-			const core::rect<s32>* clip=0,
+			const core::rect<s32> *clip = 0,
-			const video::SColor& color= video::SColor(255,255,255,255),
+			const video::SColor &color = video::SColor(255, 255, 255, 255),
-			u32 starttime=0, u32 currenttime=0,
+			u32 starttime = 0, u32 currenttime = 0,
-			bool loop=true, bool center=false) = 0;
+			bool loop = true, bool center = false) = 0;
 
 	//! Draws a sprite in 2d with destination rectangle and colors
 	/**
@@ -120,23 +120,19 @@ public:
 		(same as currenttime-starttime in other draw2DSprite function)
 		\param loop When true animations are looped
 	*/
-	virtual void draw2DSprite(u32 index, const core::rect<s32>& destRect,
+	virtual void draw2DSprite(u32 index, const core::rect<s32> &destRect,
-			const core::rect<s32>* clip=0,
+			const core::rect<s32> *clip = 0,
-			const video::SColor * const colors=0,
+			const video::SColor *const colors = 0,
 			u32 timeTicks = 0,
-			bool loop=true) = 0;
+			bool loop = true) = 0;
 
 	//! Draws a sprite batch in 2d using an array of positions and a color
-	virtual void draw2DSpriteBatch(const core::array<u32>& indices, const core::array<core::position2di>& pos,
+	virtual void draw2DSpriteBatch(const core::array<u32> &indices, const core::array<core::position2di> &pos,
-			const core::rect<s32>* clip=0,
+			const core::rect<s32> *clip = 0,
-			const video::SColor& color= video::SColor(255,255,255,255),
+			const video::SColor &color = video::SColor(255, 255, 255, 255),
-			u32 starttime=0, u32 currenttime=0,
+			u32 starttime = 0, u32 currenttime = 0,
-			bool loop=true, bool center=false) = 0;
+			bool loop = true, bool center = false) = 0;
 };
 
-
 } // end namespace gui
 } // end namespace irr
-
-#endif // __I_GUI_SPRITE_BANK_H_INCLUDED__
-

include/IGUIStaticText.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_STATIC_TEXT_H_INCLUDED__
+#pragma once
-#define __I_GUI_STATIC_TEXT_H_INCLUDED__
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -12,128 +11,123 @@ namespace irr
 {
 namespace gui
 {
-	class IGUIFont;
+class IGUIFont;
 
-	//! Multi or single line text label.
+//! Multi or single line text label.
-	class IGUIStaticText : public IGUIElement
+class IGUIStaticText : public IGUIElement
-	{
+{
-	public:
+public:
+	//! constructor
+	IGUIStaticText(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_STATIC_TEXT, environment, parent, id, rectangle) {}
 
-		//! constructor
+	//! Sets another skin independent font.
-		IGUIStaticText(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+	/** If this is set to zero, the button uses the font of the skin.
-			: IGUIElement(EGUIET_STATIC_TEXT, environment, parent, id, rectangle) {}
+	\param font: New font to set. */
+	virtual void setOverrideFont(IGUIFont *font = 0) = 0;
 
-		//! Sets another skin independent font.
+	//! Gets the override font (if any)
-		/** If this is set to zero, the button uses the font of the skin.
+	/** \return The override font (may be 0) */
-		\param font: New font to set. */
+	virtual IGUIFont *getOverrideFont(void) const = 0;
-		virtual void setOverrideFont(IGUIFont* font=0) = 0;
 
-		//! Gets the override font (if any)
+	//! Get the font which is used right now for drawing
-		/** \return The override font (may be 0) */
+	/** Currently this is the override font when one is set and the
-		virtual IGUIFont* getOverrideFont(void) const = 0;
+	font of the active skin otherwise */
+	virtual IGUIFont *getActiveFont() const = 0;
 
-		//! Get the font which is used right now for drawing
+	//! Sets another color for the text.
-		/** Currently this is the override font when one is set and the
+	/** If set, the static text does not use the EGDC_BUTTON_TEXT color defined
-		font of the active skin otherwise */
+	in the skin, but the set color instead. You don't need to call
-		virtual IGUIFont* getActiveFont() const = 0;
+	IGUIStaticText::enableOverrrideColor(true) after this, this is done
+	by this function.
+	If you set a color, and you want the text displayed with the color
+	of the skin again, call IGUIStaticText::enableOverrideColor(false);
+	\param color: New color of the text. */
+	virtual void setOverrideColor(video::SColor color) = 0;
 
-		//! Sets another color for the text.
+	//! Gets the override color
-		/** If set, the static text does not use the EGDC_BUTTON_TEXT color defined
+	/** \return: The override color */
-		in the skin, but the set color instead. You don't need to call
+	virtual video::SColor getOverrideColor(void) const = 0;
-		IGUIStaticText::enableOverrrideColor(true) after this, this is done
-		by this function.
-		If you set a color, and you want the text displayed with the color
-		of the skin again, call IGUIStaticText::enableOverrideColor(false);
-		\param color: New color of the text. */
-		virtual void setOverrideColor(video::SColor color) = 0;
 
-		//! Gets the override color
+	//! Gets the currently used text color
-		/** \return: The override color */
+	/** Either a skin-color for the current state or the override color */
-		virtual video::SColor getOverrideColor(void) const = 0;
+	virtual video::SColor getActiveColor() const = 0;
 
-		//! Gets the currently used text color
+	//! Sets if the static text should use the override color or the color in the gui skin.
-		/** Either a skin-color for the current state or the override color */
+	/** \param enable: If set to true, the override color, which can be set
-		virtual video::SColor getActiveColor() const = 0;
+	with IGUIStaticText::setOverrideColor is used, otherwise the
+	EGDC_BUTTON_TEXT color of the skin. */
+	virtual void enableOverrideColor(bool enable) = 0;
 
-		//! Sets if the static text should use the override color or the color in the gui skin.
+	//! Checks if an override color is enabled
-		/** \param enable: If set to true, the override color, which can be set
+	/** \return true if the override color is enabled, false otherwise */
-		with IGUIStaticText::setOverrideColor is used, otherwise the
+	virtual bool isOverrideColorEnabled(void) const = 0;
-		EGDC_BUTTON_TEXT color of the skin. */
-		virtual void enableOverrideColor(bool enable) = 0;
 
-		//! Checks if an override color is enabled
+	//! Sets another color for the background.
-		/** \return true if the override color is enabled, false otherwise */
+	virtual void setBackgroundColor(video::SColor color) = 0;
-		virtual bool isOverrideColorEnabled(void) const = 0;
 
-		//! Sets another color for the background.
+	//! Sets whether to draw the background
-		virtual void setBackgroundColor(video::SColor color) = 0;
+	virtual void setDrawBackground(bool draw) = 0;
 
-		//! Sets whether to draw the background
+	//! Checks if background drawing is enabled
-		virtual void setDrawBackground(bool draw) = 0;
+	/** \return true if background drawing is enabled, false otherwise */
+	virtual bool isDrawBackgroundEnabled() const = 0;
 
-		//! Checks if background drawing is enabled
+	//! Gets the background color
-		/** \return true if background drawing is enabled, false otherwise */
+	/** \return: The background color */
-		virtual bool isDrawBackgroundEnabled() const = 0;
+	virtual video::SColor getBackgroundColor() const = 0;
 
-		//! Gets the background color
+	//! Sets whether to draw the border
-		/** \return: The background color */
+	virtual void setDrawBorder(bool draw) = 0;
-		virtual video::SColor getBackgroundColor() const = 0;
 
-		//! Sets whether to draw the border
+	//! Checks if border drawing is enabled
-		virtual void setDrawBorder(bool draw) = 0;
+	/** \return true if border drawing is enabled, false otherwise */
+	virtual bool isDrawBorderEnabled() const = 0;
 
-		//! Checks if border drawing is enabled
+	//! Sets text justification mode
-		/** \return true if border drawing is enabled, false otherwise */
+	/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
-		virtual bool isDrawBorderEnabled() const = 0;
+	EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
+	\param vertical: EGUIA_UPPERLEFT to align with top edge (default),
+	EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text. */
+	virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
 
-		//! Sets text justification mode
+	//! Enables or disables word wrap for using the static text as multiline text control.
-		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
+	/** \param enable: If set to true, words going over one line are
-		EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
+	broken on to the next line. */
-		\param vertical: EGUIA_UPPERLEFT to align with top edge (default),
+	virtual void setWordWrap(bool enable) = 0;
-		EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text. */
-		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
 
-		//! Enables or disables word wrap for using the static text as multiline text control.
+	//! Checks if word wrap is enabled
-		/** \param enable: If set to true, words going over one line are
+	/** \return true if word wrap is enabled, false otherwise */
-		broken on to the next line. */
+	virtual bool isWordWrapEnabled(void) const = 0;
-		virtual void setWordWrap(bool enable) = 0;
 
-		//! Checks if word wrap is enabled
+	//! Returns the height of the text in pixels when it is drawn.
-		/** \return true if word wrap is enabled, false otherwise */
+	/** This is useful for adjusting the layout of gui elements based on the height
-		virtual bool isWordWrapEnabled(void) const = 0;
+	of the multiline text in this element.
+	\return Height of text in pixels. */
+	virtual s32 getTextHeight() const = 0;
 
-		//! Returns the height of the text in pixels when it is drawn.
+	//! Returns the width of the current text, in the current font
-		/** This is useful for adjusting the layout of gui elements based on the height
+	/** If the text is broken, this returns the width of the widest line
-		of the multiline text in this element.
+	\return The width of the text, or the widest broken line. */
-		\return Height of text in pixels. */
+	virtual s32 getTextWidth(void) const = 0;
-		virtual s32 getTextHeight() const = 0;
 
-		//! Returns the width of the current text, in the current font
+	//! Set whether the text in this label should be clipped if it goes outside bounds
-		/** If the text is broken, this returns the width of the widest line
+	virtual void setTextRestrainedInside(bool restrainedInside) = 0;
-		\return The width of the text, or the widest broken line. */
-		virtual s32 getTextWidth(void) const = 0;
 
-		//! Set whether the text in this label should be clipped if it goes outside bounds
+	//! Checks if the text in this label should be clipped if it goes outside bounds
-		virtual void setTextRestrainedInside(bool restrainedInside) = 0;
+	virtual bool isTextRestrainedInside() const = 0;
 
-		//! Checks if the text in this label should be clipped if it goes outside bounds
+	//! Set whether the string should be interpreted as right-to-left (RTL) text
-		virtual bool isTextRestrainedInside() const = 0;
+	/** \note This component does not implement the Unicode bidi standard, the
-
+	text of the component should be already RTL if you call this. The
-		//! Set whether the string should be interpreted as right-to-left (RTL) text
+	main difference when RTL is enabled is that the linebreaks for multiline
-		/** \note This component does not implement the Unicode bidi standard, the
+	elements are performed starting from the end.
-		text of the component should be already RTL if you call this. The
+	*/
-		main difference when RTL is enabled is that the linebreaks for multiline
+	virtual void setRightToLeft(bool rtl) = 0;
-		elements are performed starting from the end.
-		*/
-		virtual void setRightToLeft(bool rtl) = 0;
-
-		//! Checks whether the text in this element should be interpreted as right-to-left
-		virtual bool isRightToLeft() const = 0;
-	};
 
+	//! Checks whether the text in this element should be interpreted as right-to-left
+	virtual bool isRightToLeft() const = 0;
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUITabControl.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_TAB_CONTROL_H_INCLUDED__
+#pragma once
-#define __I_GUI_TAB_CONTROL_H_INCLUDED__
 
 #include "IGUIElement.h"
 #include "SColor.h"
@@ -13,152 +12,138 @@ namespace irr
 {
 namespace gui
 {
-	class IGUITab;
+class IGUITab;
 
-	//! A standard tab control
+//! A standard tab control
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_TAB_CHANGED
+\li EGET_TAB_CHANGED
-	*/
+*/
-	class IGUITabControl : public IGUIElement
+class IGUITabControl : public IGUIElement
-	{
+{
-	public:
+public:
+	//! constructor
+	IGUITabControl(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TAB_CONTROL, environment, parent, id, rectangle) {}
 
-		//! constructor
+	//! Adds a tab
-		IGUITabControl(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+	virtual IGUITab *addTab(const wchar_t *caption, s32 id = -1) = 0;
-			: IGUIElement(EGUIET_TAB_CONTROL, environment, parent, id, rectangle) {}
 
-		//! Adds a tab
+	//! Adds an existing tab
-		virtual IGUITab* addTab(const wchar_t* caption, s32 id=-1) = 0;
+	/** Note that it will also add the tab as a child of this TabControl.
+	\return Index of added tab or -1 for failure*/
+	virtual s32 addTab(IGUITab *tab) = 0;
 
-		//! Adds an existing tab
+	//! Insert the tab at the given index
-		/** Note that it will also add the tab as a child of this TabControl.
+	/** \return The tab on success or NULL on failure. */
-		\return Index of added tab or -1 for failure*/
+	virtual IGUITab *insertTab(s32 idx, const wchar_t *caption, s32 id = -1) = 0;
-		virtual s32 addTab(IGUITab* tab) = 0;
 
-		//! Insert the tab at the given index
+	//! Insert an existing tab
-		/** \return The tab on success or NULL on failure. */
+	/** Note that it will also add the tab as a child of this TabControl.
-		virtual IGUITab* insertTab(s32 idx, const wchar_t* caption, s32 id=-1) = 0;
+	\param idx Index at which tab will be inserted. Later tabs will be moved.
+			   Previous active tab will stay active unless this is the first
+			   element to be inserted in which case it becomes active.
+	\param tab New tab to insert.
+	\param serializationMode Internally used for serialization. You should not need this.
+		   When true it reserves space for the index, doesn't move but replaces tabs
+		   and it doesn't change the active tab.
+	\return Index of added tab (should be same as the one passed) or -1 for failure*/
+	virtual s32 insertTab(s32 idx, IGUITab *tab, bool serializationMode = false) = 0;
 
-		//! Insert an existing tab
+	//! Removes a tab from the tabcontrol
-		/** Note that it will also add the tab as a child of this TabControl.
+	virtual void removeTab(s32 idx) = 0;
-		\param idx Index at which tab will be inserted. Later tabs will be moved. 
-		           Previous active tab will stay active unless this is the first 
-				   element to be inserted in which case it becomes active.
-		\param tab New tab to insert.
-		\param serializationMode Internally used for serialization. You should not need this.
-		       When true it reserves space for the index, doesn't move but replaces tabs 
-			   and it doesn't change the active tab.
-		\return Index of added tab (should be same as the one passed) or -1 for failure*/
-		virtual s32 insertTab(s32 idx, IGUITab* tab, bool serializationMode=false) = 0;
 
-		//! Removes a tab from the tabcontrol
+	//! Clears the tabcontrol removing all tabs
-		virtual void removeTab(s32 idx) = 0;
+	virtual void clear() = 0;
 
-		//! Clears the tabcontrol removing all tabs
+	//! Returns amount of tabs in the tabcontrol
-		virtual void clear() = 0;
+	virtual s32 getTabCount() const = 0;
 
-		//! Returns amount of tabs in the tabcontrol
+	//! Returns a tab based on zero based index
-		virtual s32 getTabCount() const = 0;
+	/** \param idx: zero based index of tab. Is a value between 0 and getTabcount()-1;
+	\return Returns pointer to the Tab. Returns 0 if no tab
+	is corresponding to this tab. */
+	virtual IGUITab *getTab(s32 idx) const = 0;
 
-		//! Returns a tab based on zero based index
+	//! For given element find if it's a tab and return it's zero-based index (or -1 for not found)
-		/** \param idx: zero based index of tab. Is a value between 0 and getTabcount()-1;
+	/** \param tab Tab for which we are looking (usually you will look for an IGUITab* type as only
-		\return Returns pointer to the Tab. Returns 0 if no tab
+				  those can be tabs, but we allow looking for any kind of IGUIElement* as there are some
-		is corresponding to this tab. */
+				  use-cases for that even if it just returns 0. For example this way you can check for
-		virtual IGUITab* getTab(s32 idx) const = 0;
+				  all children of this gui-element if they are tabs or some non-tab children.*/
+	virtual s32 getTabIndex(const IGUIElement *tab) const = 0;
 
-		//! For given element find if it's a tab and return it's zero-based index (or -1 for not found)
+	//! Brings a tab to front.
-		/** \param tab Tab for which we are looking (usually you will look for an IGUITab* type as only  
+	/** \param idx: number of the tab.
-		              those can be tabs, but we allow looking for any kind of IGUIElement* as there are some 
+	\return Returns true if successful. */
-					  use-cases for that even if it just returns 0. For example this way you can check for
+	virtual bool setActiveTab(s32 idx) = 0;
-					  all children of this gui-element if they are tabs or some non-tab children.*/
-		virtual s32 getTabIndex(const IGUIElement *tab) const = 0;
 
-		//! Brings a tab to front.
+	//! Brings a tab to front.
-		/** \param idx: number of the tab.
+	/** \param tab: pointer to the tab.
-		\return Returns true if successful. */
+	\return Returns true if successful. */
-		virtual bool setActiveTab(s32 idx) = 0;
+	virtual bool setActiveTab(IGUITab *tab) = 0;
 
-		//! Brings a tab to front.
+	//! Returns which tab is currently active
-		/** \param tab: pointer to the tab.
+	virtual s32 getActiveTab() const = 0;
-		\return Returns true if successful. */
-		virtual bool setActiveTab(IGUITab *tab) = 0;
 
-		//! Returns which tab is currently active
+	//! get the the id of the tab at the given absolute coordinates
-		virtual s32 getActiveTab() const = 0;
+	/** \return The id of the tab or -1 when no tab is at those coordinates*/
+	virtual s32 getTabAt(s32 xpos, s32 ypos) const = 0;
 
-		//! get the the id of the tab at the given absolute coordinates
+	//! Set the height of the tabs
-		/** \return The id of the tab or -1 when no tab is at those coordinates*/
+	virtual void setTabHeight(s32 height) = 0;
-		virtual s32 getTabAt(s32 xpos, s32 ypos) const = 0;
 
-		//! Set the height of the tabs
+	//! Get the height of the tabs
-		virtual void setTabHeight( s32 height ) = 0;
+	/** return Returns the height of the tabs */
+	virtual s32 getTabHeight() const = 0;
 
-		//! Get the height of the tabs
+	//! set the maximal width of a tab. Per default width is 0 which means "no width restriction".
-		/** return Returns the height of the tabs */
+	virtual void setTabMaxWidth(s32 width) = 0;
-		virtual s32 getTabHeight() const = 0;
 
-		//! set the maximal width of a tab. Per default width is 0 which means "no width restriction".
+	//! get the maximal width of a tab
-		virtual void setTabMaxWidth(s32 width ) = 0;
+	virtual s32 getTabMaxWidth() const = 0;
 
-		//! get the maximal width of a tab
+	//! Set the alignment of the tabs
-		virtual s32 getTabMaxWidth() const = 0;
+	/** Use EGUIA_UPPERLEFT or EGUIA_LOWERRIGHT */
+	virtual void setTabVerticalAlignment(gui::EGUI_ALIGNMENT alignment) = 0;
 
-		//! Set the alignment of the tabs
+	//! Get the alignment of the tabs
-		/** Use EGUIA_UPPERLEFT or EGUIA_LOWERRIGHT */
+	/** return Returns the alignment of the tabs */
-		virtual void setTabVerticalAlignment( gui::EGUI_ALIGNMENT alignment ) = 0;
+	virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const = 0;
 
-		//! Get the alignment of the tabs
+	//! Set the extra width added to tabs on each side of the text
-		/** return Returns the alignment of the tabs */
+	virtual void setTabExtraWidth(s32 extraWidth) = 0;
-		virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const = 0;
 
-		//! Set the extra width added to tabs on each side of the text
+	//! Get the extra width added to tabs on each side of the text
-		virtual void setTabExtraWidth( s32 extraWidth ) = 0;
+	/** return Returns the extra width of the tabs */
+	virtual s32 getTabExtraWidth() const = 0;
+};
 
-		//! Get the extra width added to tabs on each side of the text
+//! A tab-page, onto which other gui elements could be added.
-		/** return Returns the extra width of the tabs */
+/** IGUITab refers mostly to the page itself, but also carries some data about the tab in the tabbar of an IGUITabControl. */
-		virtual s32 getTabExtraWidth() const = 0;
+class IGUITab : public IGUIElement
-	};
+{
+public:
+	//! constructor
+	IGUITab(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TAB, environment, parent, id, rectangle) {}
 
-	//! A tab-page, onto which other gui elements could be added.
+	//! sets if the tab should draw its background
-	/** IGUITab refers mostly to the page itself, but also carries some data about the tab in the tabbar of an IGUITabControl. */
+	virtual void setDrawBackground(bool draw = true) = 0;
-	class IGUITab : public IGUIElement
-	{
-	public:
 
-		//! constructor
+	//! sets the color of the background, if it should be drawn.
-		IGUITab(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+	virtual void setBackgroundColor(video::SColor c) = 0;
-			: IGUIElement(EGUIET_TAB, environment, parent, id, rectangle) {}
 
-		//! Returns zero based index of tab if in tabcontrol.
+	//! returns true if the tab is drawing its background, false if not
-		/** \deprecated Deprecated in 1.9, use IGUITabControl::getTabIndex instead*/
+	virtual bool isDrawingBackground() const = 0;
-		_IRR_DEPRECATED_ virtual s32 getNumber() const
-		{
-			if (Parent && Parent->getType() == EGUIET_TAB_CONTROL)
-				return static_cast<IGUITabControl*>(Parent)->getTabIndex(this);
-			return -1;
-		}
 
-		//! sets if the tab should draw its background
+	//! returns the color of the background
-		virtual void setDrawBackground(bool draw=true) = 0;
+	virtual video::SColor getBackgroundColor() const = 0;
 
-		//! sets the color of the background, if it should be drawn.
+	//! sets the color of it's text in  the tab-bar
-		virtual void setBackgroundColor(video::SColor c) = 0;
+	virtual void setTextColor(video::SColor c) = 0;
 
-		//! returns true if the tab is drawing its background, false if not
+	//! gets the color of the text
-		virtual bool isDrawingBackground() const = 0;
+	virtual video::SColor getTextColor() const = 0;
-
+};
-		//! returns the color of the background
-		virtual video::SColor getBackgroundColor() const = 0;
-
-		//! sets the color of it's text in  the tab-bar
-		virtual void setTextColor(video::SColor c) = 0;
-
-		//! gets the color of the text
-		virtual video::SColor getTextColor() const = 0;
-	};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IGUIToolbar.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_GUI_TOOL_BAR_H_INCLUDED__
+#pragma once
-#define __I_GUI_TOOL_BAR_H_INCLUDED__
 
 #include "IGUIElement.h"
 
@@ -11,30 +10,25 @@ namespace irr
 {
 namespace video
 {
-	class ITexture;
+class ITexture;
 } // end namespace video
 namespace gui
 {
-	class IGUIButton;
+class IGUIButton;
 
-	//! Stays at the top of its parent like the menu bar and contains tool buttons
+//! Stays at the top of its parent like the menu bar and contains tool buttons
-	class IGUIToolBar : public IGUIElement
+class IGUIToolBar : public IGUIElement
-	{
+{
-	public:
+public:
-
+	//! constructor
-		//! constructor
+	IGUIToolBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
-		IGUIToolBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
+			IGUIElement(EGUIET_TOOL_BAR, environment, parent, id, rectangle) {}
-			: IGUIElement(EGUIET_TOOL_BAR, environment, parent, id, rectangle) {}
-
-		//! Adds a button to the tool bar
-		virtual IGUIButton* addButton(s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext=0,
-			video::ITexture* img=0, video::ITexture* pressedimg=0,
-			bool isPushButton=false, bool useAlphaChannel=false) = 0;
-	};
 
+	//! Adds a button to the tool bar
+	virtual IGUIButton *addButton(s32 id = -1, const wchar_t *text = 0, const wchar_t *tooltiptext = 0,
+			video::ITexture *img = 0, video::ITexture *pressedimg = 0,
+			bool isPushButton = false, bool useAlphaChannel = false) = 0;
+};
 
 } // end namespace gui
 } // end namespace irr
-
-#endif
-

include/IImage.h

@@ -2,14 +2,13 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_IMAGE_H_INCLUDED__
+#pragma once
-#define __I_IMAGE_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
 #include "rect.h"
 #include "SColor.h"
-#include <string.h>
+#include <cstring>
 
 namespace irr
 {
@@ -24,13 +23,9 @@ NOTE: Floating point formats are not well supported yet. Basically only getData(
 class IImage : public virtual IReferenceCounted
 {
 public:
-
 	//! constructor
-	IImage(ECOLOR_FORMAT format, const core::dimension2d<u32>& size, bool deleteMemory) :
+	IImage(ECOLOR_FORMAT format, const core::dimension2d<u32> &size, bool deleteMemory) :
-		Format(format), Size(size), Data(0), MipMapsData(0), BytesPerPixel(0), Pitch(0), DeleteMemory(deleteMemory), DeleteMipMapsMemory(false)
+			Format(format), Size(size), Data(0), MipMapsData(0), BytesPerPixel(0), Pitch(0), DeleteMemory(deleteMemory), DeleteMipMapsMemory(false)
-#if defined(IRRLICHT_sRGB)
-		,Format_sRGB(1)
-#endif
 	{
 		BytesPerPixel = getBitsPerPixelFromFormat(Format) / 8;
 		Pitch = BytesPerPixel * Size.Width;
@@ -52,20 +47,8 @@ public:
 		return Format;
 	}
 
-#if defined(IRRLICHT_sRGB)
-	//! Texture is linear/sRGB (should be part of ColorFormat: default yes)
-	int get_sRGB() const
-	{
-		return Format_sRGB;
-	}
-	void set_sRGB(int val)
-	{
-		Format_sRGB = val;
-	}
-#endif
-
 	//! Returns width and height of image data.
-	const core::dimension2d<u32>& getDimension() const
+	const core::dimension2d<u32> &getDimension() const
 	{
 		return Size;
 	}
@@ -104,8 +87,7 @@ public:
 	//! Returns mask for red value of a pixel
 	u32 getRedMask() const
 	{
-		switch (Format)
+		switch (Format) {
-		{
 		case ECF_A1R5G5B5:
 			return 0x1F << 10;
 		case ECF_R5G6B5:
@@ -122,8 +104,7 @@ public:
 	//! Returns mask for green value of a pixel
 	u32 getGreenMask() const
 	{
-		switch (Format)
+		switch (Format) {
-		{
 		case ECF_A1R5G5B5:
 			return 0x1F << 5;
 		case ECF_R5G6B5:
@@ -140,8 +121,7 @@ public:
 	//! Returns mask for blue value of a pixel
 	u32 getBlueMask() const
 	{
-		switch (Format)
+		switch (Format) {
-		{
 		case ECF_A1R5G5B5:
 			return 0x1F;
 		case ECF_R5G6B5:
@@ -158,8 +138,7 @@ public:
 	//! Returns mask for alpha value of a pixel
 	u32 getAlphaMask() const
 	{
-		switch (Format)
+		switch (Format) {
-		{
 		case ECF_A1R5G5B5:
 			return 0x1 << 15;
 		case ECF_R5G6B5:
@@ -178,29 +157,11 @@ public:
 	\return Pointer to the image data. What type of data is pointed to
 	depends on the color format of the image. For example if the color
 	format is ECF_A8R8G8B8, it is of u32. */
-	void* getData() const
+	void *getData() const
 	{
 		return Data;
 	}
 
-	//! Lock function. Use this to get a pointer to the image data.
-	/** Use getData instead.
-	\return Pointer to the image data. What type of data is pointed to
-	depends on the color format of the image. For example if the color
-	format is ECF_A8R8G8B8, it is of u32. Be sure to call unlock() after
-	you don't need the pointer any more. */
-	_IRR_DEPRECATED_ void* lock()
-	{
-		return getData();
-	}
-
-	//! Unlock function.
-	/** Should be called after the pointer received by lock() is not
-	needed anymore. */
-	_IRR_DEPRECATED_ void unlock()
-	{
-	}
-
 	//! Get the mipmap size for this image for a certain mipmap level
 	/** level 0 will be full image size. Every further level is half the size.
 		Doesn't care if the image actually has mipmaps, just which size would be needed. */
@@ -209,43 +170,38 @@ public:
 		return getMipMapsSize(Size, mipmapLevel);
 	}
 
-
 	//! Calculate mipmap size for a certain level
 	/** level 0 will be full image size. Every further level is half the size.	*/
-	static core::dimension2du getMipMapsSize(const core::dimension2du& sizeLevel0, u32 mipmapLevel)
+	static core::dimension2du getMipMapsSize(const core::dimension2du &sizeLevel0, u32 mipmapLevel)
 	{
 		core::dimension2du result(sizeLevel0);
-		u32 i=0;
+		u32 i = 0;
-		while (i != mipmapLevel)
+		while (i != mipmapLevel) {
-		{
+			if (result.Width > 1)
-			if (result.Width>1)
 				result.Width >>= 1;
-			if (result.Height>1)
+			if (result.Height > 1)
-				result.Height>>=1;
+				result.Height >>= 1;
 			++i;
 
-			if ( result.Width == 1 && result.Height == 1 && i < mipmapLevel )
+			if (result.Width == 1 && result.Height == 1 && i < mipmapLevel)
-				return core::dimension2du(0,0);
+				return core::dimension2du(0, 0);
 		}
 		return result;
 	}
 
-
 	//! Get mipmaps data.
 	/** Note that different mip levels are just behind each other in memory block.
 		So if you just get level 1 you also have the data for all other levels.
 		There is no level 0 - use getData to get the original image data.
 	*/
-	void* getMipMapsData(irr::u32 mipLevel=1) const
+	void *getMipMapsData(irr::u32 mipLevel = 1) const
 	{
-		if ( MipMapsData && mipLevel > 0)
+		if (MipMapsData && mipLevel > 0) {
-		{
 			size_t dataSize = 0;
 			core::dimension2du mipSize(Size);
-			u32 i = 1;	// We want the start of data for this level, not end.
+			u32 i = 1; // We want the start of data for this level, not end.
 
-			while (i != mipLevel)
+			while (i != mipLevel) {
-			{
 				if (mipSize.Width > 1)
 					mipSize.Width >>= 1;
 
@@ -255,7 +211,7 @@ public:
 				dataSize += getDataSizeFromFormat(Format, mipSize.Width, mipSize.Height);
 
 				++i;
-				if ( mipSize.Width == 1 && mipSize.Height == 1 && i < mipLevel)
+				if (mipSize.Width == 1 && mipSize.Height == 1 && i < mipLevel)
 					return 0;
 			}
 
@@ -274,33 +230,26 @@ public:
 	will by copied internally.
 	\param deleteMemory Whether the memory is deallocated upon
 	destruction. */
-	void setMipMapsData(void* data, bool ownForeignMemory)
+	void setMipMapsData(void *data, bool ownForeignMemory)
 	{
-		if (data != MipMapsData)
+		if (data != MipMapsData) {
-		{
+			if (DeleteMipMapsMemory) {
-			if (DeleteMipMapsMemory)
-			{
 				delete[] MipMapsData;
 
 				DeleteMipMapsMemory = false;
 			}
 
-			if (data)
+			if (data) {
-			{
+				if (ownForeignMemory) {
-				if (ownForeignMemory)
+					MipMapsData = static_cast<u8 *>(data);
-				{
-					MipMapsData = static_cast<u8*>(data);
 
 					DeleteMipMapsMemory = false;
-				}
+				} else {
-				else
-				{
 					u32 dataSize = 0;
 					u32 width = Size.Width;
 					u32 height = Size.Height;
 
-					do
+					do {
-					{
 						if (width > 1)
 							width >>= 1;
 
@@ -315,9 +264,7 @@ public:
 
 					DeleteMipMapsMemory = true;
 				}
-			}
+			} else {
-			else
-			{
 				MipMapsData = 0;
 			}
 		}
@@ -327,64 +274,50 @@ public:
 	virtual SColor getPixel(u32 x, u32 y) const = 0;
 
 	//! Sets a pixel
-	virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false ) = 0;
+	virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false) = 0;
 
 	//! Copies this surface into another, if it has the exact same size and format.
 	/**	NOTE: mipmaps are ignored
 	\return True if it was copied, false otherwise.
 	*/
-	virtual bool copyToNoScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format=ECF_A8R8G8B8, u32 pitch=0) const = 0;
+	virtual bool copyToNoScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format = ECF_A8R8G8B8, u32 pitch = 0) const = 0;
 
 	//! Copies the image into the target, scaling the image to fit
 	/**	NOTE: mipmaps are ignored */
-	virtual void copyToScaling(void* target, u32 width, u32 height, ECOLOR_FORMAT format=ECF_A8R8G8B8, u32 pitch=0) =0;
+	virtual void copyToScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format = ECF_A8R8G8B8, u32 pitch = 0) = 0;
 
 	//! Copies the image into the target, scaling the image to fit
 	/**	NOTE: mipmaps are ignored */
-	virtual void copyToScaling(IImage* target) =0;
+	virtual void copyToScaling(IImage *target) = 0;
 
 	//! copies this surface into another
 	/**	NOTE: mipmaps are ignored */
-	virtual void copyTo(IImage* target, const core::position2d<s32>& pos=core::position2d<s32>(0,0)) =0;
+	virtual void copyTo(IImage *target, const core::position2d<s32> &pos = core::position2d<s32>(0, 0)) = 0;
 
 	//! copies this surface into another
 	/**	NOTE: mipmaps are ignored */
-	virtual void copyTo(IImage* target, const core::position2d<s32>& pos, const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect=0) =0;
+	virtual void copyTo(IImage *target, const core::position2d<s32> &pos, const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0) = 0;
 
 	//! copies this surface into another, using the alpha mask and cliprect and a color to add with
 	/**	NOTE: mipmaps are ignored
 	\param combineAlpha - When true then combine alpha channels. When false replace target image alpha with source image alpha.
 	*/
-	virtual void copyToWithAlpha(IImage* target, const core::position2d<s32>& pos,
+	virtual void copyToWithAlpha(IImage *target, const core::position2d<s32> &pos,
-			const core::rect<s32>& sourceRect, const SColor &color,
+			const core::rect<s32> &sourceRect, const SColor &color,
-			const core::rect<s32>* clipRect = 0,
+			const core::rect<s32> *clipRect = 0,
-			bool combineAlpha=false) =0;
+			bool combineAlpha = false) = 0;
 
 	//! copies this surface into another, scaling it to fit, applying a box filter
 	/**	NOTE: mipmaps are ignored */
-	virtual void copyToScalingBoxFilter(IImage* target, s32 bias = 0, bool blend = false) = 0;
+	virtual void copyToScalingBoxFilter(IImage *target, s32 bias = 0, bool blend = false) = 0;
 
 	//! fills the surface with given color
-	virtual void fill(const SColor &color) =0;
+	virtual void fill(const SColor &color) = 0;
-
-	//! Inform whether the image is compressed
-	_IRR_DEPRECATED_ bool isCompressed() const
-	{
-		return IImage::isCompressedFormat(Format);
-	}
-
-	//! Check whether the image has MipMaps
-	/** \return True if image has MipMaps, else false. */
-	_IRR_DEPRECATED_ bool hasMipMaps() const
-	{
-		return (getMipMapsData() != 0);
-	}
 
 	//! get the amount of Bits per Pixel of the given color format
 	static u32 getBitsPerPixelFromFormat(const ECOLOR_FORMAT format)
 	{
-		switch(format)
+		switch (format) {
-		{
 		case ECF_A1R5G5B5:
 			return 16;
 		case ECF_R5G6B5:
@@ -393,28 +326,6 @@ public:
 			return 24;
 		case ECF_A8R8G8B8:
 			return 32;
-		case ECF_DXT1:
-			return 16;
-		case ECF_DXT2:
-		case ECF_DXT3:
-		case ECF_DXT4:
-		case ECF_DXT5:
-			return 32;
-		case ECF_PVRTC_RGB2:
-			return 12;
-		case ECF_PVRTC_ARGB2:
-		case ECF_PVRTC2_ARGB2:
-			return 16;
-		case ECF_PVRTC_RGB4:
-			return 24;
-		case ECF_PVRTC_ARGB4:
-		case ECF_PVRTC2_ARGB4:
-			return 32;
-		case ECF_ETC1:
-		case ECF_ETC2_RGB:
-			return 24;
-		case ECF_ETC2_ARGB:
-			return 32;
 		case ECF_D16:
 			return 16;
 		case ECF_D32:
@@ -449,87 +360,29 @@ public:
 	//! calculate image data size in bytes for selected format, width and height.
 	static u32 getDataSizeFromFormat(ECOLOR_FORMAT format, u32 width, u32 height)
 	{
-		u32 imageSize = 0;
+		// non-compressed formats
-
+		u32 imageSize = getBitsPerPixelFromFormat(format) / 8 * width;
-		switch (format)
+		imageSize *= height;
-		{
-		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)
+		return false;
-		{
-			IRR_CASE_IIMAGE_COMPRESSED_FORMAT
-				return true;
-			default:
-				return false;
-		}
 	}
 
 	//! check if the color format is only viable for depth/stencil textures
 	static bool isDepthFormat(const ECOLOR_FORMAT format)
 	{
-		switch(format)
+		switch (format) {
-		{
+		case ECF_D16:
-			case ECF_D16:
+		case ECF_D32:
-			case ECF_D32:
+		case ECF_D24S8:
-			case ECF_D24S8:
+			return true;
-				return true;
+		default:
-			default:
+			return false;
-				return false;
 		}
 	}
 
@@ -539,8 +392,7 @@ public:
 		if (isCompressedFormat(format))
 			return false;
 
-		switch(format)
+		switch (format) {
-		{
 		case ECF_R16F:
 		case ECF_G16R16F:
 		case ECF_A16B16G16R16F:
@@ -554,43 +406,19 @@ 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;
 
-	u8* Data;
+	u8 *Data;
-	u8* MipMapsData;
+	u8 *MipMapsData;
 
 	u32 BytesPerPixel;
 	u32 Pitch;
 
 	bool DeleteMemory;
 	bool DeleteMipMapsMemory;
-
-#if defined(IRRLICHT_sRGB)
-	int Format_sRGB;
-#endif
 };
 
-
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/IImageLoader.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_SURFACE_LOADER_H_INCLUDED__
+#pragma once
-#define __I_SURFACE_LOADER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "IImage.h"
@@ -15,7 +14,7 @@ namespace irr
 {
 namespace io
 {
-	class IReadFile;
+class IReadFile;
 } // end namespace io
 namespace video
 {
@@ -28,28 +27,23 @@ IVideoDriver::addExternalImageLoader() to the engine. */
 class IImageLoader : public virtual IReferenceCounted
 {
 public:
-
 	//! Check if the file might be loaded by this class
 	/** Check is based on the file extension (e.g. ".tga")
 	\param filename Name of file to check.
 	\return True if file seems to be loadable. */
-	virtual bool isALoadableFileExtension(const io::path& filename) const = 0;
+	virtual bool isALoadableFileExtension(const io::path &filename) const = 0;
 
 	//! Check if the file might be loaded by this class
 	/** Check might look into the file.
 	\param file File handle to check.
 	\return True if file seems to be loadable. */
-	virtual bool isALoadableFileFormat(io::IReadFile* file) const = 0;
+	virtual bool isALoadableFileFormat(io::IReadFile *file) const = 0;
 
 	//! Creates a surface from the file
 	/** \param file File handle to check.
 	\return Pointer to newly created image, or 0 upon error. */
-	virtual IImage* loadImage(io::IReadFile* file) const = 0;
+	virtual IImage *loadImage(io::IReadFile *file) const = 0;
 };
 
-
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/IImageWriter.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef _I_IMAGE_WRITER_H_INCLUDED__
+#pragma once
-#define _I_IMAGE_WRITER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "irrString.h"
@@ -13,13 +12,12 @@ namespace irr
 {
 namespace io
 {
-	class IWriteFile;
+class IWriteFile;
 } // end namespace io
 
 namespace video
 {
-	class IImage;
+class IImage;
-
 
 //! Interface for writing software image data.
 class IImageWriter : public IReferenceCounted
@@ -28,7 +26,7 @@ public:
 	//! Check if this writer can write a file with the given extension
 	/** \param filename Name of the file to check.
 	\return True if file extension specifies a writable type. */
-	virtual bool isAWriteableFileExtension(const io::path& filename) const = 0;
+	virtual bool isAWriteableFileExtension(const io::path &filename) const = 0;
 
 	//! Write image to file
 	/** \param file File handle to write to.
@@ -40,6 +38,3 @@ public:
 
 } // namespace video
 } // namespace irr
-
-#endif // _I_IMAGE_WRITER_H_INCLUDED__
-

include/IIndexBuffer.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_INDEX_BUFFER_H_INCLUDED__
+#pragma once
-#define __I_INDEX_BUFFER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
@@ -21,45 +20,40 @@ namespace video
 namespace scene
 {
 
-	class IIndexBuffer : public virtual IReferenceCounted
+class IIndexBuffer : public virtual IReferenceCounted
-	{
+{
-	public:
+public:
+	virtual void *getData() = 0;
 
-		virtual void* getData() =0;
+	virtual video::E_INDEX_TYPE getType() const = 0;
+	virtual void setType(video::E_INDEX_TYPE IndexType) = 0;
 
-		virtual video::E_INDEX_TYPE getType() const =0;
+	virtual u32 stride() const = 0;
-		virtual void setType(video::E_INDEX_TYPE IndexType) =0;
 
-		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 u32 size() const =0;
+	virtual void *pointer() = 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;
+	//! get the current hardware mapping hint
+	virtual E_HARDWARE_MAPPING getHardwareMappingHint() const = 0;
 
-		//! get the current hardware mapping hint
+	//! set the hardware mapping hint, for driver
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint() const =0;
+	virtual void setHardwareMappingHint(E_HARDWARE_MAPPING NewMappingHint) = 0;
 
-		//! set the hardware mapping hint, for driver
+	//! flags the meshbuffer as changed, reloads hardware buffers
-		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) =0;
+	virtual void setDirty() = 0;
-
-		//! flags the meshbuffer as changed, reloads hardware buffers
-		virtual void setDirty() = 0;
-
-		//! Get the currently used ID for identification of changes.
-		/** This shouldn't be used for anything outside the VideoDriver. */
-		virtual u32 getChangedID() const = 0;
-	};
 
+	//! Get the currently used ID for identification of changes.
+	/** This shouldn't be used for anything outside the VideoDriver. */
+	virtual u32 getChangedID() const = 0;
+};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/ILogger.h

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

include/IMaterialRenderer.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MATERIAL_RENDERER_H_INCLUDED__
+#pragma once
-#define __I_MATERIAL_RENDERER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -25,7 +24,6 @@ engine with new materials. */
 class IMaterialRenderer : public virtual IReferenceCounted
 {
 public:
-
 	//! Called by the IVideoDriver implementation the let the renderer set its needed render states.
 	/** This is called during the IVideoDriver::setMaterial() call.
 	When overriding this, you can set some renderstates or for example a
@@ -48,8 +46,8 @@ public:
 	fogenable.
 	\param services: Interface providing some methods for changing
 	advanced, internal states of a IVideoDriver. */
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
-		bool resetAllRenderstates, IMaterialRendererServices* services) {}
+			bool resetAllRenderstates, IMaterialRendererServices *services) {}
 
 	//! Called every time before a new bunch of geometry is being drawn using this material with for example drawIndexedTriangleList() call.
 	/** OnSetMaterial should normally only be called if the renderer decides
@@ -69,7 +67,7 @@ public:
 	example if he doesn't support the specified vertex type. This is
 	actually done in D3D9 when using a normal mapped material with
 	a vertex type other than EVT_TANGENTS. */
-	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) { return true; }
+	virtual bool OnRender(IMaterialRendererServices *service, E_VERTEX_TYPE vtxtype) { return true; }
 
 	//! Called by the IVideoDriver to unset this material.
 	/** Called during the IVideoDriver::setMaterial() call before the new
@@ -96,12 +94,8 @@ public:
 	//! Access the callback provided by the users when creating shader materials
 	/** \returns Returns either the users provided callback or 0 when no such
 	callback exists. Non-shader materials will always return 0.	*/
-	virtual IShaderConstantSetCallBack* getShaderConstantSetCallBack() const { return 0; }
+	virtual IShaderConstantSetCallBack *getShaderConstantSetCallBack() const { return 0; }
 };
 
-
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/IMaterialRendererServices.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
+#pragma once
-#define __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
 
 #include "SMaterial.h"
 #include "S3DVertex.h"
@@ -15,12 +14,10 @@ namespace video
 
 class IVideoDriver;
 
-
 //! Interface providing some methods for changing advanced, internal states of a IVideoDriver.
 class IMaterialRendererServices
 {
 public:
-
 	//! Destructor
 	virtual ~IMaterialRendererServices() {}
 
@@ -34,118 +31,50 @@ public:
 	\param lastMaterial The material used until now.
 	\param resetAllRenderstates Set to true if all renderstates should be
 	set, regardless of their current state. */
-	virtual void setBasicRenderStates(const SMaterial& material,
+	virtual void setBasicRenderStates(const SMaterial &material,
-		const SMaterial& lastMaterial,
+			const SMaterial &lastMaterial,
-		bool resetAllRenderstates) = 0;
+			bool resetAllRenderstates) = 0;
 
-	//! Return an index constant for the vertex shader based on a name.
+	//! Return an index constant for the vertex shader based on a uniform variable name.
-	virtual s32 getVertexShaderConstantID(const c8* name) = 0;
+	virtual s32 getVertexShaderConstantID(const c8 *name) = 0;
 
-	//! Sets a constant for the vertex shader based on a name.
+	//! Sets a value for a vertex shader uniform variable.
-	/** This can be used if you used a high level shader language like GLSL
+	/** \param index Index of the variable (as received from getVertexShaderConstantID)
-	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.
 	*/
-	virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count) = 0;
+	virtual bool setVertexShaderConstant(s32 index, const f32 *floats, int count) = 0;
 
 	//! Int interface for the above.
-	virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) = 0;
+	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.
+	virtual bool setVertexShaderConstant(s32 index, const u32 *ints, int count) = 0;
-	         Also GLES drivers in Irrlicht do not support it as this needs at least GLES 3.0.
-	*/
-	virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) = 0;
 
-	//! Sets a vertex shader constant.
+	//! Return an index constant for the pixel shader for the given uniform variable name
-	/** Can be used if you created a shader using pixel/vertex shader
+	virtual s32 getPixelShaderConstantID(const c8 *name) = 0;
-	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.
+	//! Sets a value for the given pixel shader uniform variable
-	virtual s32 getPixelShaderConstantID(const c8* name) = 0;
-
-	//! 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
+	\param index Index of the variable (as received from getPixelShaderConstantID)
 	\param floats Pointer to array of floats
 	\param count Amount of floats in array.
 	\return True if successful. */
-	virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count) = 0;
+	virtual bool setPixelShaderConstant(s32 index, const f32 *floats, int count) = 0;
 
 	//! Int interface for the above.
-	virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) = 0;
+	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.
+	virtual bool setPixelShaderConstant(s32 index, const u32 *ints, int count) = 0;
-	         Also GLES drivers in Irrlicht do not support it as this needs at least GLES 3.0.
-	*/
-	virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) = 0;
-
-	//! Sets a pixel shader constant.
-	/** Can be used if you created a shader using pixel/vertex shader
-	assembler or ARB_fragment_program or ARB_vertex_program.
-	\param data Data to be set in the constants
-	\param startRegister First register to be set.
-	\param constantAmount Amount of registers to be set. One register consists of 4 floats. */
-	virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) = 0;
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setVertexShaderConstant(const c8* name, const f32* floats, int count)
-	{
-		return setVertexShaderConstant(getVertexShaderConstantID(name), floats, count);
-	}
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setVertexShaderConstant(const c8* name, const s32* ints, int count)
-	{
-		return setVertexShaderConstant(getVertexShaderConstantID(name), ints, count);
-	}
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setPixelShaderConstant(const c8* name, const f32* floats, int count)
-	{
-		return setPixelShaderConstant(getPixelShaderConstantID(name), floats, count);
-	}
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setPixelShaderConstant(const c8* name, const s32* ints, int count)
-	{
-		return setPixelShaderConstant(getPixelShaderConstantID(name), ints, count);
-	}
 
 	//! Get pointer to the IVideoDriver interface
 	/** \return Pointer to the IVideoDriver interface */
-	virtual IVideoDriver* getVideoDriver() = 0;
+	virtual IVideoDriver *getVideoDriver() = 0;
 };
 
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/IMemoryReadFile.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MEMORY_READ_FILE_H_INCLUDED__
+#pragma once
-#define __I_MEMORY_READ_FILE_H_INCLUDED__
 
 #include "IReadFile.h"
 
@@ -12,20 +11,17 @@ namespace irr
 namespace io
 {
 
-	//! Interface providing read access to a memory read file.
+//! Interface providing read access to a memory read file.
-	class IMemoryReadFile : public IReadFile
+class IMemoryReadFile : public IReadFile
-	{
+{
-	public:
+public:
-		//! Get direct access to internal buffer of memory block used as file.
+	//! Get direct access to internal buffer of memory block used as file.
-		/** It's usually better to use the IReadFile functions to access
+	/** It's usually better to use the IReadFile functions to access
-		the file content. But as that buffer exist over the full life-time
+	the file content. But as that buffer exist over the full life-time
-		of a CMemoryReadFile, it's sometimes nice to avoid the additional
+	of a CMemoryReadFile, it's sometimes nice to avoid the additional
-		data-copy which read() needs.
+	data-copy which read() needs.
-		*/
+	*/
-		virtual const void *getBuffer() const = 0;
+	virtual const void *getBuffer() const = 0;
-	};
+};
 } // end namespace io
 } // end namespace irr
-
-#endif
-

include/IMesh.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_H_INCLUDED__
+#pragma once
-#define __I_MESH_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -13,122 +12,112 @@ namespace irr
 {
 namespace scene
 {
-	//! Possible types of meshes.
+//! Possible types of meshes.
-	// Note: Was previously only used in IAnimatedMesh so it still has the "animated" in the name.
+// Note: Was previously only used in IAnimatedMesh so it still has the "animated" in the name.
-	// 		 But can now be used for all mesh-types as we need those casts as well.
+// 		 But can now be used for all mesh-types as we need those casts as well.
-	enum E_ANIMATED_MESH_TYPE
+enum E_ANIMATED_MESH_TYPE
+{
+	//! Unknown animated mesh type.
+	EAMT_UNKNOWN = 0,
+
+	//! Quake 2 MD2 model file
+	EAMT_MD2,
+
+	//! Quake 3 MD3 model file
+	EAMT_MD3,
+
+	//! Maya .obj static model
+	EAMT_OBJ,
+
+	//! Quake 3 .bsp static Map
+	EAMT_BSP,
+
+	//! 3D Studio .3ds file
+	EAMT_3DS,
+
+	//! My3D Mesh, the file format by Zhuck Dimitry
+	EAMT_MY3D,
+
+	//! Pulsar LMTools .lmts file. This Irrlicht loader was written by Jonas Petersen
+	EAMT_LMTS,
+
+	//! Cartography Shop .csm file. This loader was created by Saurav Mohapatra.
+	EAMT_CSM,
+
+	//! .oct file for Paul Nette's FSRad or from Murphy McCauley's Blender .oct exporter.
+	/** The oct file format contains 3D geometry and lightmaps and
+	can be loaded directly by Irrlicht */
+	EAMT_OCT,
+
+	//! Halflife MDL model file
+	EAMT_MDL_HALFLIFE,
+
+	//! generic skinned mesh
+	EAMT_SKINNED,
+
+	//! generic non-animated mesh
+	EAMT_STATIC
+};
+
+class IMeshBuffer;
+
+//! Class which holds the geometry of an object.
+/** An IMesh is nothing more than a collection of some mesh buffers
+(IMeshBuffer). SMesh is a simple implementation of an IMesh.
+A mesh is usually added to an IMeshSceneNode in order to be rendered.
+*/
+class IMesh : public virtual IReferenceCounted
+{
+public:
+	//! Get the amount of mesh buffers.
+	/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
+	virtual u32 getMeshBufferCount() const = 0;
+
+	//! Get pointer to a mesh buffer.
+	/** \param nr: Zero based index of the mesh buffer. The maximum value is
+	getMeshBufferCount() - 1;
+	\return Pointer to the mesh buffer or 0 if there is no such
+	mesh buffer. */
+	virtual IMeshBuffer *getMeshBuffer(u32 nr) const = 0;
+
+	//! Get pointer to a mesh buffer which fits a material
+	/** \param material: material to search for
+	\return Pointer to the mesh buffer or 0 if there is no such
+	mesh buffer. */
+	virtual IMeshBuffer *getMeshBuffer(const video::SMaterial &material) const = 0;
+
+	//! Get an axis aligned bounding box of the mesh.
+	/** \return Bounding box of this mesh. */
+	virtual const core::aabbox3d<f32> &getBoundingBox() const = 0;
+
+	//! Set user-defined axis aligned bounding box
+	/** \param box New bounding box to use for the mesh. */
+	virtual void setBoundingBox(const core::aabbox3df &box) = 0;
+
+	//! Set the hardware mapping hint
+	/** This methods allows to define optimization hints for the
+	hardware. This enables, e.g., the use of hardware buffers on
+	platforms that support this feature. This can lead to noticeable
+	performance gains. */
+	virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) = 0;
+
+	//! Flag the meshbuffer as changed, reloads hardware buffers
+	/** This method has to be called every time the vertices or
+	indices have changed. Otherwise, changes won't be updated
+	on the GPU in the next render cycle. */
+	virtual void setDirty(E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) = 0;
+
+	//! Returns the type of the meshes.
+	/** This is useful for making a safe downcast. For example,
+	if getMeshType() returns EAMT_MD2 it's safe to cast the
+	IMesh to IAnimatedMeshMD2.
+	Note: It's no longer just about animated meshes, that name has just historical reasons.
+	\returns Type of the mesh  */
+	virtual E_ANIMATED_MESH_TYPE getMeshType() const
 	{
-		//! Unknown animated mesh type.
+		return EAMT_STATIC;
-		EAMT_UNKNOWN = 0,
+	}
-
+};
-		//! Quake 2 MD2 model file
-		EAMT_MD2,
-
-		//! Quake 3 MD3 model file
-		EAMT_MD3,
-
-		//! Maya .obj static model
-		EAMT_OBJ,
-
-		//! Quake 3 .bsp static Map
-		EAMT_BSP,
-
-		//! 3D Studio .3ds file
-		EAMT_3DS,
-
-		//! My3D Mesh, the file format by Zhuck Dimitry
-		EAMT_MY3D,
-
-		//! Pulsar LMTools .lmts file. This Irrlicht loader was written by Jonas Petersen
-		EAMT_LMTS,
-
-		//! Cartography Shop .csm file. This loader was created by Saurav Mohapatra.
-		EAMT_CSM,
-
-		//! .oct file for Paul Nette's FSRad or from Murphy McCauley's Blender .oct exporter.
-		/** The oct file format contains 3D geometry and lightmaps and
-		can be loaded directly by Irrlicht */
-		EAMT_OCT,
-
-		//! Halflife MDL model file
-		EAMT_MDL_HALFLIFE,
-
-		//! generic skinned mesh
-		EAMT_SKINNED,
-
-		//! generic non-animated mesh
-		EAMT_STATIC
-	};
-
-
-	class IMeshBuffer;
-
-	//! Class which holds the geometry of an object.
-	/** An IMesh is nothing more than a collection of some mesh buffers
-	(IMeshBuffer). SMesh is a simple implementation of an IMesh.
-	A mesh is usually added to an IMeshSceneNode in order to be rendered.
-	*/
-	class IMesh : public virtual IReferenceCounted
-	{
-	public:
-
-		//! Get the amount of mesh buffers.
-		/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
-		virtual u32 getMeshBufferCount() const = 0;
-
-		//! Get pointer to a mesh buffer.
-		/** \param nr: Zero based index of the mesh buffer. The maximum value is
-		getMeshBufferCount() - 1;
-		\return Pointer to the mesh buffer or 0 if there is no such
-		mesh buffer. */
-		virtual IMeshBuffer* getMeshBuffer(u32 nr) const = 0;
-
-		//! Get pointer to a mesh buffer which fits a material
-		/** \param material: material to search for
-		\return Pointer to the mesh buffer or 0 if there is no such
-		mesh buffer. */
-		virtual IMeshBuffer* getMeshBuffer( const video::SMaterial &material) const = 0;
-
-		//! Get an axis aligned bounding box of the mesh.
-		/** \return Bounding box of this mesh. */
-		virtual const core::aabbox3d<f32>& getBoundingBox() const = 0;
-
-		//! Set user-defined axis aligned bounding box
-		/** \param box New bounding box to use for the mesh. */
-		virtual void setBoundingBox( const core::aabbox3df& box) = 0;
-
-		//! Sets a flag of all contained materials to a new value.
-		/** \param flag: Flag to set in all materials.
-		\param newvalue: New value to set in all materials. */
-		virtual void setMaterialFlag(video::E_MATERIAL_FLAG flag, bool newvalue) = 0;
-
-		//! Set the hardware mapping hint
-		/** This methods allows to define optimization hints for the
-		hardware. This enables, e.g., the use of hardware buffers on
-		platforms that support this feature. This can lead to noticeable
-		performance gains. */
-		virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) = 0;
-
-		//! Flag the meshbuffer as changed, reloads hardware buffers
-		/** This method has to be called every time the vertices or
-		indices have changed. Otherwise, changes won't be updated
-		on the GPU in the next render cycle. */
-		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) = 0;
-
-		//! Returns the type of the meshes.
-		/** This is useful for making a safe downcast. For example,
-		if getMeshType() returns EAMT_MD2 it's safe to cast the
-		IMesh to IAnimatedMeshMD2.
-		Note: It's no longer just about animated meshes, that name has just historical reasons.
-		\returns Type of the mesh  */
-		virtual E_ANIMATED_MESH_TYPE getMeshType() const
-		{
-			return EAMT_STATIC;
-		}
-	};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IMeshBuffer.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_BUFFER_H_INCLUDED__
+#pragma once
-#define __I_MESH_BUFFER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "SMaterial.h"
@@ -17,172 +16,167 @@ namespace irr
 {
 namespace scene
 {
-	//! Struct for holding a mesh with a single material.
+//! Struct for holding a mesh with a single material.
-	/** A part of an IMesh which has the same material on each face of that
+/** A part of an IMesh which has the same material on each face of that
-	group. Logical groups of an IMesh need not be put into separate mesh
+group. Logical groups of an IMesh need not be put into separate mesh
-	buffers, but can be. Separately animated parts of the mesh must be put
+buffers, but can be. Separately animated parts of the mesh must be put
-	into separate mesh buffers.
+into separate mesh buffers.
-	Some mesh buffer implementations have limitations on the number of
+Some mesh buffer implementations have limitations on the number of
-	vertices the buffer can hold. In that case, logical grouping can help.
+vertices the buffer can hold. In that case, logical grouping can help.
-	Moreover, the number of vertices should be optimized for the GPU upload,
+Moreover, the number of vertices should be optimized for the GPU upload,
-	which often depends on the type of gfx card. Typical figures are
+which often depends on the type of gfx card. Typical figures are
-	1000-10000 vertices per buffer.
+1000-10000 vertices per buffer.
-	SMeshBuffer is a simple implementation of a MeshBuffer, which supports
+SMeshBuffer is a simple implementation of a MeshBuffer, which supports
-	up to 65535 vertices.
+up to 65535 vertices.
 
-	Since meshbuffers are used for drawing, and hence will be exposed
+Since meshbuffers are used for drawing, and hence will be exposed
-	to the driver, chances are high that they are grab()'ed from somewhere.
+to the driver, chances are high that they are grab()'ed from somewhere.
-	It's therefore required to dynamically allocate meshbuffers which are
+It's therefore required to dynamically allocate meshbuffers which are
-	passed to a video driver and only drop the buffer once it's not used in
+passed to a video driver and only drop the buffer once it's not used in
-	the current code block anymore.
+the current code block anymore.
-	*/
+*/
-	class IMeshBuffer : public virtual IReferenceCounted
+class IMeshBuffer : public virtual IReferenceCounted
+{
+public:
+	//! Get the material of this meshbuffer
+	/** \return Material of this buffer. */
+	virtual video::SMaterial &getMaterial() = 0;
+
+	//! Get the material of this meshbuffer
+	/** \return Material of this buffer. */
+	virtual const video::SMaterial &getMaterial() const = 0;
+
+	//! Get type of vertex data which is stored in this meshbuffer.
+	/** \return Vertex type of this buffer. */
+	virtual video::E_VERTEX_TYPE getVertexType() const = 0;
+
+	//! Get access to vertex data. The data is an array of vertices.
+	/** Which vertex type is used can be determined by getVertexType().
+	\return Pointer to array of vertices. */
+	virtual const void *getVertices() const = 0;
+
+	//! Get access to vertex data. The data is an array of vertices.
+	/** Which vertex type is used can be determined by getVertexType().
+	\return Pointer to array of vertices. */
+	virtual void *getVertices() = 0;
+
+	//! Get amount of vertices in meshbuffer.
+	/** \return Number of vertices in this buffer. */
+	virtual u32 getVertexCount() const = 0;
+
+	//! Get type of index data which is stored in this meshbuffer.
+	/** \return Index type of this buffer. */
+	virtual video::E_INDEX_TYPE getIndexType() const = 0;
+
+	//! Get access to indices.
+	/** \return Pointer to indices array. */
+	virtual const u16 *getIndices() const = 0;
+
+	//! Get access to indices.
+	/** \return Pointer to indices array. */
+	virtual u16 *getIndices() = 0;
+
+	//! Get amount of indices in this meshbuffer.
+	/** \return Number of indices in this buffer. */
+	virtual u32 getIndexCount() const = 0;
+
+	//! Get the axis aligned bounding box of this meshbuffer.
+	/** \return Axis aligned bounding box of this buffer. */
+	virtual const core::aabbox3df &getBoundingBox() const = 0;
+
+	//! Set axis aligned bounding box
+	/** \param box User defined axis aligned bounding box to use
+	for this buffer. */
+	virtual void setBoundingBox(const core::aabbox3df &box) = 0;
+
+	//! Recalculates the bounding box. Should be called if the mesh changed.
+	virtual void recalculateBoundingBox() = 0;
+
+	//! returns position of vertex i
+	virtual const core::vector3df &getPosition(u32 i) const = 0;
+
+	//! returns position of vertex i
+	virtual core::vector3df &getPosition(u32 i) = 0;
+
+	//! returns normal of vertex i
+	virtual const core::vector3df &getNormal(u32 i) const = 0;
+
+	//! returns normal of vertex i
+	virtual core::vector3df &getNormal(u32 i) = 0;
+
+	//! returns texture coord of vertex i
+	virtual const core::vector2df &getTCoords(u32 i) const = 0;
+
+	//! returns texture coord of vertex i
+	virtual core::vector2df &getTCoords(u32 i) = 0;
+
+	//! Append the vertices and indices to the current buffer
+	/** Only works for compatible vertex types.
+	\param vertices Pointer to a vertex array.
+	\param numVertices Number of vertices in the array.
+	\param indices Pointer to index array.
+	\param numIndices Number of indices in array. */
+	virtual void append(const void *const vertices, u32 numVertices, const u16 *const indices, u32 numIndices) = 0;
+
+	//! get the current hardware mapping hint
+	virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const = 0;
+
+	//! get the current hardware mapping hint
+	virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const = 0;
+
+	//! set the hardware mapping hint, for driver
+	virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) = 0;
+
+	//! flags the meshbuffer as changed, reloads hardware buffers
+	virtual void setDirty(E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) = 0;
+
+	//! Get the currently used ID for identification of changes.
+	/** This shouldn't be used for anything outside the VideoDriver. */
+	virtual u32 getChangedID_Vertex() const = 0;
+
+	//! Get the currently used ID for identification of changes.
+	/** This shouldn't be used for anything outside the VideoDriver. */
+	virtual u32 getChangedID_Index() const = 0;
+
+	//! Used by the VideoDriver to remember the buffer link.
+	virtual void setHWBuffer(void *ptr) const = 0;
+	virtual void *getHWBuffer() const = 0;
+
+	//! Describe what kind of primitive geometry is used by the meshbuffer
+	/** Note: Default is EPT_TRIANGLES. Using other types is fine for rendering.
+	But meshbuffer manipulation functions might expect type EPT_TRIANGLES
+	to work correctly. Also mesh writers will generally fail (badly!) with other
+	types than EPT_TRIANGLES. */
+	virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) = 0;
+
+	//! Get the kind of primitive geometry which is used by the meshbuffer
+	virtual E_PRIMITIVE_TYPE getPrimitiveType() const = 0;
+
+	//! Calculate how many geometric primitives are used by this meshbuffer
+	virtual u32 getPrimitiveCount() const
 	{
-	public:
+		const u32 indexCount = getIndexCount();
-
+		switch (getPrimitiveType()) {
-		//! Get the material of this meshbuffer
+		case scene::EPT_POINTS:
-		/** \return Material of this buffer. */
+			return indexCount;
-		virtual video::SMaterial& getMaterial() = 0;
+		case scene::EPT_LINE_STRIP:
-
+			return indexCount - 1;
-		//! Get the material of this meshbuffer
+		case scene::EPT_LINE_LOOP:
-		/** \return Material of this buffer. */
+			return indexCount;
-		virtual const video::SMaterial& getMaterial() const = 0;
+		case scene::EPT_LINES:
-
+			return indexCount / 2;
-		//! Get type of vertex data which is stored in this meshbuffer.
+		case scene::EPT_TRIANGLE_STRIP:
-		/** \return Vertex type of this buffer. */
+			return (indexCount - 2);
-		virtual video::E_VERTEX_TYPE getVertexType() const = 0;
+		case scene::EPT_TRIANGLE_FAN:
-
+			return (indexCount - 2);
-		//! Get access to vertex data. The data is an array of vertices.
+		case scene::EPT_TRIANGLES:
-		/** Which vertex type is used can be determined by getVertexType().
+			return indexCount / 3;
-		\return Pointer to array of vertices. */
+		case scene::EPT_POINT_SPRITES:
-		virtual const void* getVertices() const = 0;
+			return indexCount;
-
-		//! Get access to vertex data. The data is an array of vertices.
-		/** Which vertex type is used can be determined by getVertexType().
-		\return Pointer to array of vertices. */
-		virtual void* getVertices() = 0;
-
-		//! Get amount of vertices in meshbuffer.
-		/** \return Number of vertices in this buffer. */
-		virtual u32 getVertexCount() const = 0;
-
-		//! Get type of index data which is stored in this meshbuffer.
-		/** \return Index type of this buffer. */
-		virtual video::E_INDEX_TYPE getIndexType() const =0;
-
-		//! Get access to indices.
-		/** \return Pointer to indices array. */
-		virtual const u16* getIndices() const = 0;
-
-		//! Get access to indices.
-		/** \return Pointer to indices array. */
-		virtual u16* getIndices() = 0;
-
-		//! Get amount of indices in this meshbuffer.
-		/** \return Number of indices in this buffer. */
-		virtual u32 getIndexCount() const = 0;
-
-		//! Get the axis aligned bounding box of this meshbuffer.
-		/** \return Axis aligned bounding box of this buffer. */
-		virtual const core::aabbox3df& getBoundingBox() const = 0;
-
-		//! Set axis aligned bounding box
-		/** \param box User defined axis aligned bounding box to use
-		for this buffer. */
-		virtual void setBoundingBox(const core::aabbox3df& box) = 0;
-
-		//! Recalculates the bounding box. Should be called if the mesh changed.
-		virtual void recalculateBoundingBox() = 0;
-
-		//! returns position of vertex i
-		virtual const core::vector3df& getPosition(u32 i) const = 0;
-
-		//! returns position of vertex i
-		virtual core::vector3df& getPosition(u32 i) = 0;
-
-		//! returns normal of vertex i
-		virtual const core::vector3df& getNormal(u32 i) const = 0;
-
-		//! returns normal of vertex i
-		virtual core::vector3df& getNormal(u32 i) = 0;
-
-		//! returns texture coord of vertex i
-		virtual const core::vector2df& getTCoords(u32 i) const = 0;
-
-		//! returns texture coord of vertex i
-		virtual core::vector2df& getTCoords(u32 i) = 0;
-
-		//! Append the vertices and indices to the current buffer
-		/** Only works for compatible vertex types.
-		\param vertices Pointer to a vertex array.
-		\param numVertices Number of vertices in the array.
-		\param indices Pointer to index array.
-		\param numIndices Number of indices in array. */
-		virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) = 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;
-
-		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const = 0;
-
-		//! set the hardware mapping hint, for driver
-		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX ) = 0;
-
-		//! flags the meshbuffer as changed, reloads hardware buffers
-		virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) = 0;
-
-		//! Get the currently used ID for identification of changes.
-		/** This shouldn't be used for anything outside the VideoDriver. */
-		virtual u32 getChangedID_Vertex() const = 0;
-
-		//! Get the currently used ID for identification of changes.
-		/** This shouldn't be used for anything outside the VideoDriver. */
-		virtual u32 getChangedID_Index() const = 0;
-
-		//! Used by the VideoDriver to remember the buffer link.
-		virtual void setHWBuffer(void *ptr) const = 0;
-		virtual void *getHWBuffer() const = 0;
-
-		//! Describe what kind of primitive geometry is used by the meshbuffer
-		/** Note: Default is EPT_TRIANGLES. Using other types is fine for rendering.
-		But meshbuffer manipulation functions might expect type EPT_TRIANGLES
-		to work correctly. Also mesh writers will generally fail (badly!) with other
-		types than EPT_TRIANGLES. */
-		virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) = 0;
-
-		//! Get the kind of primitive geometry which is used by the meshbuffer
-		virtual E_PRIMITIVE_TYPE getPrimitiveType() const = 0;
-
-		//! Calculate how many geometric primitives are used by this meshbuffer
-		virtual u32 getPrimitiveCount() const
-		{
-			const u32 indexCount = getIndexCount();
-			switch (getPrimitiveType())
-			{
-                case scene::EPT_POINTS:	        return indexCount;
-                case scene::EPT_LINE_STRIP:     return indexCount-1;
-                case scene::EPT_LINE_LOOP:      return indexCount;
-                case scene::EPT_LINES:          return indexCount/2;
-                case scene::EPT_TRIANGLE_STRIP: return (indexCount-2);
-                case scene::EPT_TRIANGLE_FAN:   return (indexCount-2);
-                case scene::EPT_TRIANGLES:      return indexCount/3;
-                case scene::EPT_QUAD_STRIP:     return (indexCount-2)/2;
-                case scene::EPT_QUADS:          return indexCount/4;
-                case scene::EPT_POLYGON:        return indexCount; // (not really primitives, that would be 1, works like line_strip)
-                case scene::EPT_POINT_SPRITES:  return indexCount;
-			}
-			return 0;
 		}
-
+		return 0;
-	};
+	}
+};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif

include/IMeshCache.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_CACHE_H_INCLUDED__
+#pragma once
-#define __I_MESH_CACHE_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "path.h"
@@ -13,165 +12,120 @@ namespace irr
 
 namespace scene
 {
-	class IMesh;
+class IMesh;
-	class IAnimatedMesh;
+class IAnimatedMesh;
-	class IAnimatedMeshSceneNode;
+class IAnimatedMeshSceneNode;
-	class IMeshLoader;
+class IMeshLoader;
 
-	//! The mesh cache stores already loaded meshes and provides an interface to them.
+//! The mesh cache stores already loaded meshes and provides an interface to them.
-	/** You can access it using ISceneManager::getMeshCache(). All existing
+/** You can access it using ISceneManager::getMeshCache(). All existing
-	scene managers will return a pointer to the same mesh cache, because it
+scene managers will return a pointer to the same mesh cache, because it
-	is shared between them. With this interface, it is possible to manually
+is shared between them. With this interface, it is possible to manually
-	add new loaded meshes (if ISceneManager::getMesh() is not sufficient),
+add new loaded meshes (if ISceneManager::getMesh() is not sufficient),
-	to remove them and to iterate through already loaded meshes. */
+to remove them and to iterate through already loaded meshes. */
-	class IMeshCache : public virtual IReferenceCounted
+class IMeshCache : public virtual IReferenceCounted
-	{
+{
-	public:
+public:
+	//! Destructor
+	virtual ~IMeshCache() {}
 
-		//! Destructor
+	//! Adds a mesh to the internal list of loaded meshes.
-		virtual ~IMeshCache() {}
+	/** Usually, ISceneManager::getMesh() is called to load a mesh
+	from a file. That method searches the list of loaded meshes if
+	a mesh has already been loaded and returns a pointer to if it
+	is in that list and already in memory. Otherwise it loads the
+	mesh. With IMeshCache::addMesh(), it is possible to pretend
+	that a mesh already has been loaded. This method can be used
+	for example by mesh loaders who need to load more than one mesh
+	with one call. They can add additional meshes with this method
+	to the scene manager. The COLLADA loader for example uses this
+	method.
+	\param name Name of the mesh. When calling
+	ISceneManager::getMesh() with this name it will return the mesh
+	set by this method.
+	\param mesh Pointer to a mesh which will now be referenced by
+	this name. */
+	virtual void addMesh(const io::path &name, IAnimatedMesh *mesh) = 0;
 
-		//! Adds a mesh to the internal list of loaded meshes.
+	//! Removes the mesh from the cache.
-		/** Usually, ISceneManager::getMesh() is called to load a mesh
+	/** After loading a mesh with getMesh(), the mesh can be
-		from a file. That method searches the list of loaded meshes if
+	removed from the cache using this method, freeing a lot of
-		a mesh has already been loaded and returns a pointer to if it
+	memory.
-		is in that list and already in memory. Otherwise it loads the
+	\param mesh Pointer to the mesh which shall be removed. */
-		mesh. With IMeshCache::addMesh(), it is possible to pretend
+	virtual void removeMesh(const IMesh *const mesh) = 0;
-		that a mesh already has been loaded. This method can be used
-		for example by mesh loaders who need to load more than one mesh
-		with one call. They can add additional meshes with this method
-		to the scene manager. The COLLADA loader for example uses this
-		method.
-		\param name Name of the mesh. When calling
-		ISceneManager::getMesh() with this name it will return the mesh
-		set by this method.
-		\param mesh Pointer to a mesh which will now be referenced by
-		this name. */
-		virtual void addMesh(const io::path& name, IAnimatedMesh* mesh) = 0;
 
-		//! Removes the mesh from the cache.
+	//! Returns amount of loaded meshes in the cache.
-		/** After loading a mesh with getMesh(), the mesh can be
+	/** You can load new meshes into the cache using getMesh() and
-		removed from the cache using this method, freeing a lot of
+	addMesh(). If you ever need to access the internal mesh cache,
-		memory.
+	you can do this using removeMesh(), getMeshNumber(),
-		\param mesh Pointer to the mesh which shall be removed. */
+	getMeshByIndex() and getMeshName().
-		virtual void removeMesh(const IMesh* const mesh) = 0;
+	\return Number of meshes in cache. */
+	virtual u32 getMeshCount() const = 0;
 
-		//! Returns amount of loaded meshes in the cache.
+	//! Returns current index number of the mesh or -1 when not found.
-		/** You can load new meshes into the cache using getMesh() and
+	/** \param mesh Pointer to the mesh to search for.
-		addMesh(). If you ever need to access the internal mesh cache,
+	\return Index of the mesh in the cache, or -1 if not found. */
-		you can do this using removeMesh(), getMeshNumber(),
+	virtual s32 getMeshIndex(const IMesh *const mesh) const = 0;
-		getMeshByIndex() and getMeshName().
-		\return Number of meshes in cache. */
-		virtual u32 getMeshCount() const = 0;
 
-		//! Returns current index number of the mesh or -1 when not found.
+	//! Returns a mesh based on its index number.
-		/** \param mesh Pointer to the mesh to search for.
+	/** \param index: Index of the mesh, number between 0 and
-		\return Index of the mesh in the cache, or -1 if not found. */
+	getMeshCount()-1.
-		virtual s32 getMeshIndex(const IMesh* const mesh) const = 0;
+	Note that this number is only valid until a new mesh is loaded
+	or removed.
+	\return Pointer to the mesh or 0 if there is none with this
+	number. */
+	virtual IAnimatedMesh *getMeshByIndex(u32 index) = 0;
 
-		//! Returns a mesh based on its index number.
+	//! Returns a mesh based on its name.
-		/** \param index: Index of the mesh, number between 0 and
+	/** \param name Name of the mesh. Usually a filename.
-		getMeshCount()-1.
+	\return Pointer to the mesh or 0 if there is none with this number. */
-		Note that this number is only valid until a new mesh is loaded
+	virtual IAnimatedMesh *getMeshByName(const io::path &name) = 0;
-		or removed.
-		\return Pointer to the mesh or 0 if there is none with this
-		number. */
-		virtual IAnimatedMesh* getMeshByIndex(u32 index) = 0;
 
-		//! Returns a mesh based on its name (often a filename).
+	//! Get the name of a loaded mesh, based on its index.
-		/** \deprecated Use getMeshByName() instead. This method may be removed by
+	/** \param index: Index of the mesh, number between 0 and getMeshCount()-1.
-		Irrlicht 1.9 */
+	\return The name if mesh was found and has a name, else the path is empty. */
-		_IRR_DEPRECATED_ IAnimatedMesh* getMeshByFilename(const io::path& filename)
+	virtual const io::SNamedPath &getMeshName(u32 index) const = 0;
-		{
-			return getMeshByName(filename);
-		}
 
-		//! Get the name of a loaded mesh, based on its index. (Name is often identical to the filename).
+	//! Get the name of the loaded mesh if there is any.
-		/** \deprecated Use getMeshName() instead. This method may be removed by
+	/** \param mesh Pointer to mesh to query.
-		Irrlicht 1.9 */
+	\return The name if mesh was found and has a name, else the path is empty. */
-		_IRR_DEPRECATED_ const io::path& getMeshFilename(u32 index) const
+	virtual const io::SNamedPath &getMeshName(const IMesh *const mesh) const = 0;
-		{
-			return getMeshName(index).getInternalName();
-		}
 
-		//! Get the name of a loaded mesh, if there is any. (Name is often identical to the filename).
+	//! Renames a loaded mesh.
-		/** \deprecated Use getMeshName() instead. This method may be removed by
+	/** Note that renaming meshes might change the ordering of the
-		Irrlicht 1.9 */
+	meshes, and so the index of the meshes as returned by
-		_IRR_DEPRECATED_ const io::path& getMeshFilename(const IMesh* const mesh) const
+	getMeshIndex() or taken by some methods will change.
-		{
+	\param index The index of the mesh in the cache.
-			return getMeshName(mesh).getInternalName();
+	\param name New name for the mesh.
-		}
+	\return True if mesh was renamed. */
+	virtual bool renameMesh(u32 index, const io::path &name) = 0;
 
-		//! Renames a loaded mesh.
+	//! Renames the loaded mesh
-		/** \deprecated Use renameMesh() instead. This method may be removed by
+	/** Note that renaming meshes might change the ordering of the
-		Irrlicht 1.9 */
+	meshes, and so the index of the meshes as returned by
-		_IRR_DEPRECATED_ bool setMeshFilename(u32 index, const io::path& filename)
+	getMeshIndex() or taken by some methods will change.
-		{
+	\param mesh Mesh to be renamed.
-			return renameMesh(index, filename);
+	\param name New name for the mesh.
-		}
+	\return True if mesh was renamed. */
+	virtual bool renameMesh(const IMesh *const mesh, const io::path &name) = 0;
 
-		//! Renames a loaded mesh.
+	//! Check if a mesh was already loaded.
-		/** \deprecated Use renameMesh() instead. This method may be removed by
+	/** \param name Name of the mesh. Usually a filename.
-		Irrlicht 1.9 */
+	\return True if the mesh has been loaded, else false. */
-		_IRR_DEPRECATED_ bool setMeshFilename(const IMesh* const mesh, const io::path& filename)
+	virtual bool isMeshLoaded(const io::path &name) = 0;
-		{
-			return renameMesh(mesh, filename);
-		}
 
-		//! Returns a mesh based on its name.
+	//! Clears the whole mesh cache, removing all meshes.
-		/** \param name Name of the mesh. Usually a filename.
+	/** All meshes will be reloaded completely when using ISceneManager::getMesh()
-		\return Pointer to the mesh or 0 if there is none with this number. */
+	after calling this method.
-		virtual IAnimatedMesh* getMeshByName(const io::path& name) = 0;
+	Warning: If you have pointers to meshes that were loaded with ISceneManager::getMesh()
-
+	and you did not grab them, then they may become invalid. */
-		//! Get the name of a loaded mesh, based on its index.
+	virtual void clear() = 0;
-		/** \param index: Index of the mesh, number between 0 and getMeshCount()-1.
-		\return The name if mesh was found and has a name, else the path is empty. */
-		virtual const io::SNamedPath& getMeshName(u32 index) const = 0;
-
-		//! Get the name of the loaded mesh if there is any.
-		/** \param mesh Pointer to mesh to query.
-		\return The name if mesh was found and has a name, else the path is empty. */
-		virtual const io::SNamedPath& getMeshName(const IMesh* const mesh) const = 0;
-
-		//! Renames a loaded mesh.
-		/** Note that renaming meshes might change the ordering of the
-		meshes, and so the index of the meshes as returned by
-		getMeshIndex() or taken by some methods will change.
-		\param index The index of the mesh in the cache.
-		\param name New name for the mesh.
-		\return True if mesh was renamed. */
-		virtual bool renameMesh(u32 index, const io::path& name) = 0;
-
-		//! Renames the loaded mesh
-		/** Note that renaming meshes might change the ordering of the
-		meshes, and so the index of the meshes as returned by
-		getMeshIndex() or taken by some methods will change.
-		\param mesh Mesh to be renamed.
-		\param name New name for the mesh.
-		\return True if mesh was renamed. */
-		virtual bool renameMesh(const IMesh* const mesh, const io::path& name) = 0;
-
-		//! Check if a mesh was already loaded.
-		/** \param name Name of the mesh. Usually a filename.
-		\return True if the mesh has been loaded, else false. */
-		virtual bool isMeshLoaded(const io::path& name) = 0;
-
-		//! Clears the whole mesh cache, removing all meshes.
-		/** All meshes will be reloaded completely when using ISceneManager::getMesh()
-		after calling this method.
-		Warning: If you have pointers to meshes that were loaded with ISceneManager::getMesh()
-		and you did not grab them, then they may become invalid. */
-		virtual void clear() = 0;
-
-		//! Clears all meshes that are held in the mesh cache but not used anywhere else.
-		/** Warning: If you have pointers to meshes that were loaded with ISceneManager::getMesh()
-		and you did not grab them, then they may become invalid. */
-		virtual void clearUnusedMeshes() = 0;
-	};
 
+	//! Clears all meshes that are held in the mesh cache but not used anywhere else.
+	/** Warning: If you have pointers to meshes that were loaded with ISceneManager::getMesh()
+	and you did not grab them, then they may become invalid. */
+	virtual void clearUnusedMeshes() = 0;
+};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif
-

include/IMeshLoader.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_LOADER_H_INCLUDED__
+#pragma once
-#define __I_MESH_LOADER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "path.h"
@@ -12,11 +11,11 @@ namespace irr
 {
 namespace io
 {
-	class IReadFile;
+class IReadFile;
 } // end namespace io
 namespace scene
 {
-	class IAnimatedMesh;
+class IAnimatedMesh;
 
 //! Class which is able to load an animated mesh from a file.
 /** If you want Irrlicht be able to load meshes of
@@ -26,7 +25,6 @@ ISceneManager::addExternalMeshLoader() to the engine. */
 class IMeshLoader : public virtual IReferenceCounted
 {
 public:
-
 	//! Constructor
 	IMeshLoader() {}
 
@@ -38,18 +36,15 @@ public:
 	only.
 	\param filename Name of the file to test.
 	\return True if the file might be loaded by this class. */
-	virtual bool isALoadableFileExtension(const io::path& filename) const = 0;
+	virtual bool isALoadableFileExtension(const io::path &filename) const = 0;
 
 	//! Creates/loads an animated mesh from the file.
 	/** \param file File handler to load the file from.
 	\return Pointer to the created mesh. Returns 0 if loading failed.
 	If you no longer need the mesh, you should call IAnimatedMesh::drop().
 	See IReferenceCounted::drop() for more information. */
-	virtual IAnimatedMesh* createMesh(io::IReadFile* file) = 0;
+	virtual IAnimatedMesh *createMesh(io::IReadFile *file) = 0;
 };
 
-
 } // end namespace scene
 } // end namespace irr
-
-#endif

include/IMeshManipulator.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_MANIPULATOR_H_INCLUDED__
+#pragma once
-#define __I_MESH_MANIPULATOR_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "vector3d.h"
@@ -18,170 +17,154 @@ namespace irr
 namespace scene
 {
 
-	struct SMesh;
+struct SMesh;
 
-	//! An interface for easy manipulation of meshes.
+//! An interface for easy manipulation of meshes.
-	/** Scale, set alpha value, flip surfaces, and so on. This exists for
+/** Scale, set alpha value, flip surfaces, and so on. This exists for
-	fixing problems with wrong imported or exported meshes quickly after
+fixing problems with wrong imported or exported meshes quickly after
-	loading. It is not intended for doing mesh modifications and/or
+loading. It is not intended for doing mesh modifications and/or
-	animations during runtime.
+animations during runtime.
-	*/
+*/
-	class IMeshManipulator : public virtual IReferenceCounted
+class IMeshManipulator : public virtual IReferenceCounted
+{
+public:
+	//! Recalculates all normals of the mesh.
+	/** \param mesh: Mesh on which the operation is performed.
+	\param smooth: If the normals shall be smoothed.
+	\param angleWeighted: If the normals shall be smoothed in relation to their angles. More expensive, but also higher precision. */
+	virtual void recalculateNormals(IMesh *mesh, bool smooth = false,
+			bool angleWeighted = false) const = 0;
+
+	//! Recalculates all normals of the mesh buffer.
+	/** \param buffer: Mesh buffer on which the operation is performed.
+	\param smooth: If the normals shall be smoothed.
+	\param angleWeighted: If the normals shall be smoothed in relation to their angles. More expensive, but also higher precision. */
+	virtual void recalculateNormals(IMeshBuffer *buffer,
+			bool smooth = false, bool angleWeighted = false) const = 0;
+
+	//! Scales the actual mesh, not a scene node.
+	/** \param mesh Mesh on which the operation is performed.
+	\param factor Scale factor for each axis. */
+	void scale(IMesh *mesh, const core::vector3df &factor) const
 	{
-	public:
+		apply(SVertexPositionScaleManipulator(factor), mesh, true);
+	}
 
-		//! Recalculates all normals of the mesh.
+	//! Scales the actual meshbuffer, not a scene node.
-		/** \param mesh: Mesh on which the operation is performed.
+	/** \param buffer Meshbuffer on which the operation is performed.
-		\param smooth: If the normals shall be smoothed.
+	\param factor Scale factor for each axis. */
-		\param angleWeighted: If the normals shall be smoothed in relation to their angles. More expensive, but also higher precision. */
+	void scale(IMeshBuffer *buffer, const core::vector3df &factor) const
-		virtual void recalculateNormals(IMesh* mesh, bool smooth = false,
+	{
-				bool angleWeighted = false) const=0;
+		apply(SVertexPositionScaleManipulator(factor), buffer, true);
+	}
 
-		//! Recalculates all normals of the mesh buffer.
+	//! Clones a static IMesh into a modifiable SMesh.
-		/** \param buffer: Mesh buffer on which the operation is performed.
+	/** All meshbuffers in the returned SMesh
-		\param smooth: If the normals shall be smoothed.
+	are of type SMeshBuffer or SMeshBufferLightMap.
-		\param angleWeighted: If the normals shall be smoothed in relation to their angles. More expensive, but also higher precision. */
+	\param mesh Mesh to copy.
-		virtual void recalculateNormals(IMeshBuffer* buffer,
+	\return Cloned mesh. If you no longer need the
-				bool smooth = false, bool angleWeighted = false) const=0;
+	cloned mesh, you should call SMesh::drop(). See
+	IReferenceCounted::drop() for more information. */
+	virtual SMesh *createMeshCopy(IMesh *mesh) const = 0;
 
-		//! Scales the actual mesh, not a scene node.
+	//! Get amount of polygons in mesh.
-		/** \param mesh Mesh on which the operation is performed.
+	/** \param mesh Input mesh
-		\param factor Scale factor for each axis. */
+	\return Number of polygons in mesh. */
-		void scale(IMesh* mesh, const core::vector3df& factor) const
+	virtual s32 getPolyCount(IMesh *mesh) const = 0;
-		{
-			apply(SVertexPositionScaleManipulator(factor), mesh, true);
-		}
 
-		//! Scales the actual meshbuffer, not a scene node.
+	//! Get amount of polygons in mesh.
-		/** \param buffer Meshbuffer on which the operation is performed.
+	/** \param mesh Input mesh
-		\param factor Scale factor for each axis. */
+	\return Number of polygons in mesh. */
-		void scale(IMeshBuffer* buffer, const core::vector3df& factor) const
+	virtual s32 getPolyCount(IAnimatedMesh *mesh) const = 0;
-		{
-			apply(SVertexPositionScaleManipulator(factor), buffer, true);
-		}
 
-		//! Clones a static IMesh into a modifiable SMesh.
+	//! Create a new AnimatedMesh and adds the mesh to it
-		/** All meshbuffers in the returned SMesh
+	/** \param mesh Input mesh
-		are of type SMeshBuffer or SMeshBufferLightMap.
+	\param type The type of the animated mesh to create.
-		\param mesh Mesh to copy.
+	\return Newly created animated mesh with mesh as its only
-		\return Cloned mesh. If you no longer need the
+	content. When you don't need the animated mesh anymore, you
-		cloned mesh, you should call SMesh::drop(). See
+	should call IAnimatedMesh::drop(). See
-		IReferenceCounted::drop() for more information. */
+	IReferenceCounted::drop() for more information. */
-		virtual SMesh* createMeshCopy(IMesh* mesh) const = 0;
+	virtual IAnimatedMesh *createAnimatedMesh(IMesh *mesh,
-
-		//! Get amount of polygons in mesh.
-		/** \param mesh Input mesh
-		\return Number of polygons in mesh. */
-		virtual s32 getPolyCount(IMesh* mesh) const = 0;
-
-		//! Get amount of polygons in mesh.
-		/** \param mesh Input mesh
-		\return Number of polygons in mesh. */
-		virtual s32 getPolyCount(IAnimatedMesh* mesh) const = 0;
-
-		//! Create a new AnimatedMesh and adds the mesh to it
-		/** \param mesh Input mesh
-		\param type The type of the animated mesh to create.
-		\return Newly created animated mesh with mesh as its only
-		content. When you don't need the animated mesh anymore, you
-		should call IAnimatedMesh::drop(). See
-		IReferenceCounted::drop() for more information. */
-		virtual IAnimatedMesh * createAnimatedMesh(IMesh* mesh,
 			scene::E_ANIMATED_MESH_TYPE type = scene::EAMT_UNKNOWN) const = 0;
 
-		//! Apply a manipulator on the Meshbuffer
+	//! Apply a manipulator on the Meshbuffer
-		/** \param func A functor defining the mesh manipulation.
+	/** \param func A functor defining the mesh manipulation.
-		\param buffer The Meshbuffer to apply the manipulator to.
+	\param buffer The Meshbuffer to apply the manipulator to.
-		\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
+	\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
-		\return True if the functor was successfully applied, else false. */
+	\return True if the functor was successfully applied, else false. */
-		template <typename Functor>
+	template <typename Functor>
-		bool apply(const Functor& func, IMeshBuffer* buffer, bool boundingBoxUpdate=false) const
+	bool apply(const Functor &func, IMeshBuffer *buffer, bool boundingBoxUpdate = false) const
-		{
+	{
-			return apply_(func, buffer, boundingBoxUpdate, func);
+		return apply_(func, buffer, boundingBoxUpdate, func);
-		}
+	}
 
-
+	//! Apply a manipulator on the Mesh
-		//! Apply a manipulator on the Mesh
+	/** \param func A functor defining the mesh manipulation.
-		/** \param func A functor defining the mesh manipulation.
+	\param mesh The Mesh to apply the manipulator to.
-		\param mesh The Mesh to apply the manipulator to.
+	\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
-		\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
+	\return True if the functor was successfully applied, else false. */
-		\return True if the functor was successfully applied, else false. */
+	template <typename Functor>
-		template <typename Functor>
+	bool apply(const Functor &func, IMesh *mesh, bool boundingBoxUpdate = false) const
-		bool apply(const Functor& func, IMesh* mesh, bool boundingBoxUpdate=false) const
+	{
-		{
+		if (!mesh)
-			if (!mesh)
+			return true;
-				return true;
+		bool result = true;
-			bool result = true;
+		core::aabbox3df bufferbox;
-			core::aabbox3df bufferbox;
+		for (u32 i = 0; i < mesh->getMeshBufferCount(); ++i) {
-			for (u32 i=0; i<mesh->getMeshBufferCount(); ++i)
+			result &= apply(func, mesh->getMeshBuffer(i), boundingBoxUpdate);
-			{
+			if (boundingBoxUpdate) {
-				result &= apply(func, mesh->getMeshBuffer(i), boundingBoxUpdate);
+				if (0 == i)
-				if (boundingBoxUpdate)
+					bufferbox.reset(mesh->getMeshBuffer(i)->getBoundingBox());
-				{
+				else
-					if (0==i)
+					bufferbox.addInternalBox(mesh->getMeshBuffer(i)->getBoundingBox());
-						bufferbox.reset(mesh->getMeshBuffer(i)->getBoundingBox());
-					else
-						bufferbox.addInternalBox(mesh->getMeshBuffer(i)->getBoundingBox());
-				}
 			}
-			if (boundingBoxUpdate)
-				mesh->setBoundingBox(bufferbox);
-			return result;
 		}
+		if (boundingBoxUpdate)
+			mesh->setBoundingBox(bufferbox);
+		return result;
+	}
 
 protected:
-		//! Apply a manipulator based on the type of the functor
+	//! Apply a manipulator based on the type of the functor
-		/** \param func A functor defining the mesh manipulation.
+	/** \param func A functor defining the mesh manipulation.
-		\param buffer The Meshbuffer to apply the manipulator to.
+	\param buffer The Meshbuffer to apply the manipulator to.
-		\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
+	\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
-		\param typeTest Unused parameter, which handles the proper call selection based on the type of the Functor which is passed in two times.
+	\param typeTest Unused parameter, which handles the proper call selection based on the type of the Functor which is passed in two times.
-		\return True if the functor was successfully applied, else false. */
+	\return True if the functor was successfully applied, else false. */
-		template <typename Functor>
+	template <typename Functor>
-		bool apply_(const Functor& func, IMeshBuffer* buffer, bool boundingBoxUpdate, const IVertexManipulator& typeTest) const
+	bool apply_(const Functor &func, IMeshBuffer *buffer, bool boundingBoxUpdate, const IVertexManipulator &typeTest) const
-		{
+	{
-			if (!buffer)
+		if (!buffer)
-				return true;
-
-			core::aabbox3df bufferbox;
-			for (u32 i=0; i<buffer->getVertexCount(); ++i)
-			{
-				switch (buffer->getVertexType())
-				{
-				case video::EVT_STANDARD:
-					{
-						video::S3DVertex* verts = (video::S3DVertex*)buffer->getVertices();
-						func(verts[i]);
-					}
-					break;
-				case video::EVT_2TCOORDS:
-					{
-						video::S3DVertex2TCoords* verts = (video::S3DVertex2TCoords*)buffer->getVertices();
-						func(verts[i]);
-					}
-					break;
-				case video::EVT_TANGENTS:
-					{
-						video::S3DVertexTangents* verts = (video::S3DVertexTangents*)buffer->getVertices();
-						func(verts[i]);
-					}
-					break;
-				}
-				if (boundingBoxUpdate)
-				{
-					if (0==i)
-						bufferbox.reset(buffer->getPosition(0));
-					else
-						bufferbox.addInternalPoint(buffer->getPosition(i));
-				}
-			}
-			if (boundingBoxUpdate)
-				buffer->setBoundingBox(bufferbox);
 			return true;
+
+		core::aabbox3df bufferbox;
+		for (u32 i = 0; i < buffer->getVertexCount(); ++i) {
+			switch (buffer->getVertexType()) {
+			case video::EVT_STANDARD: {
+				video::S3DVertex *verts = (video::S3DVertex *)buffer->getVertices();
+				func(verts[i]);
+			} break;
+			case video::EVT_2TCOORDS: {
+				video::S3DVertex2TCoords *verts = (video::S3DVertex2TCoords *)buffer->getVertices();
+				func(verts[i]);
+			} break;
+			case video::EVT_TANGENTS: {
+				video::S3DVertexTangents *verts = (video::S3DVertexTangents *)buffer->getVertices();
+				func(verts[i]);
+			} break;
+			}
+			if (boundingBoxUpdate) {
+				if (0 == i)
+					bufferbox.reset(buffer->getPosition(0));
+				else
+					bufferbox.addInternalPoint(buffer->getPosition(i));
+			}
 		}
+		if (boundingBoxUpdate)
+			buffer->setBoundingBox(bufferbox);
+		return true;
+	}
 };
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif

include/IMeshSceneNode.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_MESH_SCENE_NODE_H_INCLUDED__
+#pragma once
-#define __I_MESH_SCENE_NODE_H_INCLUDED__
 
 #include "ISceneNode.h"
 
@@ -14,28 +13,26 @@ namespace scene
 
 class IMesh;
 
-
 //! A scene node displaying a static mesh
 class IMeshSceneNode : public ISceneNode
 {
 public:
-
 	//! Constructor
 	/** Use setMesh() to set the mesh to display.
-	*/
+	 */
-	IMeshSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
+	IMeshSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
-			const core::vector3df& position = core::vector3df(0,0,0),
+			const core::vector3df &position = core::vector3df(0, 0, 0),
-			const core::vector3df& rotation = core::vector3df(0,0,0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
-			const core::vector3df& scale = core::vector3df(1,1,1))
+			const core::vector3df &scale = core::vector3df(1, 1, 1)) :
-		: ISceneNode(parent, mgr, id, position, rotation, scale) {}
+			ISceneNode(parent, mgr, id, position, rotation, scale) {}
 
 	//! Sets a new mesh to display
 	/** \param mesh Mesh to display. */
-	virtual void setMesh(IMesh* mesh) = 0;
+	virtual void setMesh(IMesh *mesh) = 0;
 
 	//! Get the currently defined mesh for display.
 	/** \return Pointer to mesh which is displayed by this node. */
-	virtual IMesh* getMesh(void) = 0;
+	virtual IMesh *getMesh(void) = 0;
 
 	//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
 	/** In this way it is possible to change the materials of a mesh
@@ -51,7 +48,3 @@ public:
 
 } // end namespace scene
 } // end namespace irr
-
-
-#endif
-

include/IMeshWriter.h

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

include/IOSOperator.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_OS_OPERATOR_H_INCLUDED__
+#pragma once
-#define __I_OS_OPERATOR_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "irrString.h"
@@ -11,46 +10,36 @@
 namespace irr
 {
 
-//! The Operating system operator provides operation system specific methods and information.
+//! The OSOperator provides OS-specific methods and information.
 class IOSOperator : public virtual IReferenceCounted
 {
 public:
-	//! Get the current operation system version as string.
+	//! Get the current OS version as string.
-	virtual const core::stringc& getOperatingSystemVersion() const = 0;
+	virtual const core::stringc &getOperatingSystemVersion() const = 0;
-
-	//! Get the current operation system version as string.
-	/** \deprecated Use getOperatingSystemVersion instead. This method will be removed in Irrlicht 1.9. */
-	_IRR_DEPRECATED_ const wchar_t* getOperationSystemVersion() const
-	{
-		return core::stringw(getOperatingSystemVersion()).c_str();
-	}
 
 	//! Copies text to the clipboard
 	//! \param text: text in utf-8
-	virtual void copyToClipboard(const c8* text) const = 0;
+	virtual void copyToClipboard(const c8 *text) const = 0;
 
 	//! Copies text to the primary selection
 	//! This is a no-op on some platforms.
 	//! \param text: text in utf-8
-	virtual void copyToPrimarySelection(const c8* text) const = 0;
+	virtual void copyToPrimarySelection(const c8 *text) const = 0;
 
 	//! Get text from the clipboard
 	//! \return Returns 0 if no string is in there, otherwise an utf-8 string.
-	virtual const c8* getTextFromClipboard() const = 0;
+	virtual const c8 *getTextFromClipboard() const = 0;
 
 	//! Get text from the primary selection
 	//! This is a no-op on some platforms.
 	//! \return Returns 0 if no string is in there, otherwise an utf-8 string.
-	virtual const c8* getTextFromPrimarySelection() const = 0;
+	virtual const c8 *getTextFromPrimarySelection() const = 0;
 
 	//! Get the total and available system RAM
 	/** \param totalBytes: will contain the total system memory in Kilobytes (1024 B)
 	\param availableBytes: will contain the available memory in Kilobytes (1024 B)
 	\return True if successful, false if not */
-	virtual bool getSystemMemory(u32* totalBytes, u32* availableBytes) const = 0;
+	virtual bool getSystemMemory(u32 *totalBytes, u32 *availableBytes) const = 0;
-
 };
 
 } // end namespace
-
-#endif

include/IReadFile.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_READ_FILE_H_INCLUDED__
+#pragma once
-#define __I_READ_FILE_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "coreutil.h"
@@ -14,48 +13,45 @@ namespace irr
 namespace io
 {
 
-	//! Interface providing read access to a file.
+//! Interface providing read access to a file.
-	class IReadFile : public virtual IReferenceCounted
+class IReadFile : public virtual IReferenceCounted
+{
+public:
+	//! Reads an amount of bytes from the file.
+	/** \param buffer Pointer to buffer where read bytes are written to.
+	\param sizeToRead Amount of bytes to read from the file.
+	\return How many bytes were read. */
+	virtual size_t read(void *buffer, size_t sizeToRead) = 0;
+
+	//! Changes position in file
+	/** \param finalPos Destination position in the file.
+	\param relativeMovement If set to true, the position in the file is
+	changed relative to current position. Otherwise the position is changed
+	from beginning of file.
+	\return True if successful, otherwise false. */
+	virtual bool seek(long finalPos, bool relativeMovement = false) = 0;
+
+	//! Get size of file.
+	/** \return Size of the file in bytes. */
+	virtual long getSize() const = 0;
+
+	//! Get the current position in the file.
+	/** \return Current position in the file in bytes on success or -1L on failure. */
+	virtual long getPos() const = 0;
+
+	//! Get name of file.
+	/** \return File name as zero terminated character string. */
+	virtual const io::path &getFileName() const = 0;
+
+	//! Get the type of the class implementing this interface
+	virtual EREAD_FILE_TYPE getType() const
 	{
-	public:
+		return EFIT_UNKNOWN;
-		//! Reads an amount of bytes from the file.
+	}
-		/** \param buffer Pointer to buffer where read bytes are written to.
+};
-		\param sizeToRead Amount of bytes to read from the file.
-		\return How many bytes were read. */
-		virtual size_t read(void* buffer, size_t sizeToRead) = 0;
 
-		//! Changes position in file
+//! Internal function, please do not use.
-		/** \param finalPos Destination position in the file.
+IReadFile *createLimitReadFile(const io::path &fileName, IReadFile *alreadyOpenedFile, long pos, long areaSize);
-		\param relativeMovement If set to true, the position in the file is
-		changed relative to current position. Otherwise the position is changed
-		from beginning of file.
-		\return True if successful, otherwise false. */
-		virtual bool seek(long finalPos, bool relativeMovement = false) = 0;
-
-		//! Get size of file.
-		/** \return Size of the file in bytes. */
-		virtual long getSize() const = 0;
-
-		//! Get the current position in the file.
-		/** \return Current position in the file in bytes on success or -1L on failure. */
-		virtual long getPos() const = 0;
-
-		//! Get name of file.
-		/** \return File name as zero terminated character string. */
-		virtual const io::path& getFileName() const = 0;
-
-		//! Get the type of the class implementing this interface
-		virtual EREAD_FILE_TYPE getType() const
-		{
-			return EFIT_UNKNOWN;
-		}
-	};
-
-	//! Internal function, please do not use.
-	IReadFile* createLimitReadFile(const io::path& fileName, IReadFile* alreadyOpenedFile, long pos, long areaSize);
 
 } // end namespace io
 } // end namespace irr
-
-#endif
-

include/IReferenceCounted.h

@@ -2,169 +2,161 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_IREFERENCE_COUNTED_H_INCLUDED__
+#pragma once
-#define __I_IREFERENCE_COUNTED_H_INCLUDED__
 
 #include "irrTypes.h"
 
 namespace irr
 {
 
-	//! Base class of most objects of the Irrlicht Engine.
+//! Base class of most objects of the Irrlicht Engine.
-	/** This class provides reference counting through the methods grab() and drop().
+/** This class provides reference counting through the methods grab() and drop().
-	It also is able to store a debug string for every instance of an object.
+It also is able to store a debug string for every instance of an object.
-	Most objects of the Irrlicht
+Most objects of the Irrlicht
-	Engine are derived from IReferenceCounted, and so they are reference counted.
+Engine are derived from IReferenceCounted, and so they are reference counted.
 
-	When you create an object in the Irrlicht engine, calling a method
+When you create an object in the Irrlicht engine, calling a method
-	which starts with 'create', an object is created, and you get a pointer
+which starts with 'create', an object is created, and you get a pointer
-	to the new object. If you no longer need the object, you have
+to the new object. If you no longer need the object, you have
-	to call drop(). This will destroy the object, if grab() was not called
+to call drop(). This will destroy the object, if grab() was not called
-	in another part of you program, because this part still needs the object.
+in another part of you program, because this part still needs the object.
-	Note, that you only need to call drop() to the object, if you created it,
+Note, that you only need to call drop() to the object, if you created it,
-	and the method had a 'create' in it.
+and the method had a 'create' in it.
+
+A simple example:
+
+If you want to create a texture, you may want to call an imaginable method
+IDriver::createTexture. You call
+ITexture* texture = driver->createTexture(dimension2d<u32>(128, 128));
+If you no longer need the texture, call texture->drop().
+
+If you want to load a texture, you may want to call imaginable method
+IDriver::loadTexture. You do this like
+ITexture* texture = driver->loadTexture("example.jpg");
+You will not have to drop the pointer to the loaded texture, because
+the name of the method does not start with 'create'. The texture
+is stored somewhere by the driver.
+*/
+class IReferenceCounted
+{
+public:
+	//! Constructor.
+	IReferenceCounted() :
+			DebugName(0), ReferenceCounter(1)
+	{
+	}
+
+	//! Destructor.
+	virtual ~IReferenceCounted()
+	{
+	}
+
+	//! Grabs the object. Increments the reference counter by one.
+	/** Someone who calls grab() to an object, should later also
+	call drop() to it. If an object never gets as much drop() as
+	grab() calls, it will never be destroyed. The
+	IReferenceCounted class provides a basic reference counting
+	mechanism with its methods grab() and drop(). Most objects of
+	the Irrlicht Engine are derived from IReferenceCounted, and so
+	they are reference counted.
+
+	When you create an object in the Irrlicht engine, calling a
+	method which starts with 'create', an object is created, and
+	you get a pointer to the new object. If you no longer need the
+	object, you have to call drop(). This will destroy the object,
+	if grab() was not called in another part of you program,
+	because this part still needs the object. Note, that you only
+	need to call drop() to the object, if you created it, and the
+	method had a 'create' in it.
 
 	A simple example:
 
-	If you want to create a texture, you may want to call an imaginable method
+	If you want to create a texture, you may want to call an
-	IDriver::createTexture. You call
+	imaginable method IDriver::createTexture. You call
 	ITexture* texture = driver->createTexture(dimension2d<u32>(128, 128));
 	If you no longer need the texture, call texture->drop().
-
+	If you want to load a texture, you may want to call imaginable
-	If you want to load a texture, you may want to call imaginable method
+	method IDriver::loadTexture. You do this like
-	IDriver::loadTexture. You do this like
 	ITexture* texture = driver->loadTexture("example.jpg");
-	You will not have to drop the pointer to the loaded texture, because
+	You will not have to drop the pointer to the loaded texture,
-	the name of the method does not start with 'create'. The texture
+	because the name of the method does not start with 'create'.
-	is stored somewhere by the driver.
+	The texture is stored somewhere by the driver. */
-	*/
+	void grab() const { ++ReferenceCounter; }
-	class IReferenceCounted
+
+	//! Drops the object. Decrements the reference counter by one.
+	/** The IReferenceCounted class provides a basic reference
+	counting mechanism with its methods grab() and drop(). Most
+	objects of the Irrlicht Engine are derived from
+	IReferenceCounted, and so they are reference counted.
+
+	When you create an object in the Irrlicht engine, calling a
+	method which starts with 'create', an object is created, and
+	you get a pointer to the new object. If you no longer need the
+	object, you have to call drop(). This will destroy the object,
+	if grab() was not called in another part of you program,
+	because this part still needs the object. Note, that you only
+	need to call drop() to the object, if you created it, and the
+	method had a 'create' in it.
+
+	A simple example:
+
+	If you want to create a texture, you may want to call an
+	imaginable method IDriver::createTexture. You call
+	ITexture* texture = driver->createTexture(dimension2d<u32>(128, 128));
+	If you no longer need the texture, call texture->drop().
+	If you want to load a texture, you may want to call imaginable
+	method IDriver::loadTexture. You do this like
+	ITexture* texture = driver->loadTexture("example.jpg");
+	You will not have to drop the pointer to the loaded texture,
+	because the name of the method does not start with 'create'.
+	The texture is stored somewhere by the driver.
+	\return True, if the object was deleted. */
+	bool drop() const
 	{
-	public:
+		// someone is doing bad reference counting.
+		_IRR_DEBUG_BREAK_IF(ReferenceCounter <= 0)
 
-		//! Constructor.
+		--ReferenceCounter;
-		IReferenceCounted()
+		if (!ReferenceCounter) {
-			: DebugName(0), ReferenceCounter(1)
+			delete this;
-		{
+			return true;
 		}
 
-		//! Destructor.
+		return false;
-		virtual ~IReferenceCounted()
+	}
-		{
-		}
 
-		//! Grabs the object. Increments the reference counter by one.
+	//! Get the reference count.
-		/** Someone who calls grab() to an object, should later also
+	/** \return Current value of the reference counter. */
-		call drop() to it. If an object never gets as much drop() as
+	s32 getReferenceCount() const
-		grab() calls, it will never be destroyed. The
+	{
-		IReferenceCounted class provides a basic reference counting
+		return ReferenceCounter;
-		mechanism with its methods grab() and drop(). Most objects of
+	}
-		the Irrlicht Engine are derived from IReferenceCounted, and so
-		they are reference counted.
 
-		When you create an object in the Irrlicht engine, calling a
+	//! Returns the debug name of the object.
-		method which starts with 'create', an object is created, and
+	/** The Debugname may only be set and changed by the object
-		you get a pointer to the new object. If you no longer need the
+	itself. This method should only be used in Debug mode.
-		object, you have to call drop(). This will destroy the object,
+	\return Returns a string, previously set by setDebugName(); */
-		if grab() was not called in another part of you program,
+	const c8 *getDebugName() const
-		because this part still needs the object. Note, that you only
+	{
-		need to call drop() to the object, if you created it, and the
+		return DebugName;
-		method had a 'create' in it.
+	}
 
-		A simple example:
+protected:
+	//! Sets the debug name of the object.
+	/** The Debugname may only be set and changed by the object
+	itself. This method should only be used in Debug mode.
+	\param newName: New debug name to set. */
+	void setDebugName(const c8 *newName)
+	{
+		DebugName = newName;
+	}
 
-		If you want to create a texture, you may want to call an
+private:
-		imaginable method IDriver::createTexture. You call
+	//! The debug name.
-		ITexture* texture = driver->createTexture(dimension2d<u32>(128, 128));
+	const c8 *DebugName;
-		If you no longer need the texture, call texture->drop().
-		If you want to load a texture, you may want to call imaginable
-		method IDriver::loadTexture. You do this like
-		ITexture* texture = driver->loadTexture("example.jpg");
-		You will not have to drop the pointer to the loaded texture,
-		because the name of the method does not start with 'create'.
-		The texture is stored somewhere by the driver. */
-		void grab() const { ++ReferenceCounter; }
 
-		//! Drops the object. Decrements the reference counter by one.
+	//! The reference counter. Mutable to do reference counting on const objects.
-		/** The IReferenceCounted class provides a basic reference
+	mutable s32 ReferenceCounter;
-		counting mechanism with its methods grab() and drop(). Most
+};
-		objects of the Irrlicht Engine are derived from
-		IReferenceCounted, and so they are reference counted.
-
-		When you create an object in the Irrlicht engine, calling a
-		method which starts with 'create', an object is created, and
-		you get a pointer to the new object. If you no longer need the
-		object, you have to call drop(). This will destroy the object,
-		if grab() was not called in another part of you program,
-		because this part still needs the object. Note, that you only
-		need to call drop() to the object, if you created it, and the
-		method had a 'create' in it.
-
-		A simple example:
-
-		If you want to create a texture, you may want to call an
-		imaginable method IDriver::createTexture. You call
-		ITexture* texture = driver->createTexture(dimension2d<u32>(128, 128));
-		If you no longer need the texture, call texture->drop().
-		If you want to load a texture, you may want to call imaginable
-		method IDriver::loadTexture. You do this like
-		ITexture* texture = driver->loadTexture("example.jpg");
-		You will not have to drop the pointer to the loaded texture,
-		because the name of the method does not start with 'create'.
-		The texture is stored somewhere by the driver.
-		\return True, if the object was deleted. */
-		bool drop() const
-		{
-			// someone is doing bad reference counting.
-			_IRR_DEBUG_BREAK_IF(ReferenceCounter <= 0)
-
-			--ReferenceCounter;
-			if (!ReferenceCounter)
-			{
-				delete this;
-				return true;
-			}
-
-			return false;
-		}
-
-		//! Get the reference count.
-		/** \return Current value of the reference counter. */
-		s32 getReferenceCount() const
-		{
-			return ReferenceCounter;
-		}
-
-		//! Returns the debug name of the object.
-		/** The Debugname may only be set and changed by the object
-		itself. This method should only be used in Debug mode.
-		\return Returns a string, previously set by setDebugName(); */
-		const c8* getDebugName() const
-		{
-			return DebugName;
-		}
-
-	protected:
-
-		//! Sets the debug name of the object.
-		/** The Debugname may only be set and changed by the object
-		itself. This method should only be used in Debug mode.
-		\param newName: New debug name to set. */
-		void setDebugName(const c8* newName)
-		{
-			DebugName = newName;
-		}
-
-	private:
-
-		//! The debug name.
-		const c8* DebugName;
-
-		//! The reference counter. Mutable to do reference counting on const objects.
-		mutable s32 ReferenceCounter;
-	};
 
 } // end namespace irr
-
-#endif
-

include/IRenderTarget.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_RENDER_TARGET_H_INCLUDED__
+#pragma once
-#define __I_RENDER_TARGET_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "EDriverTypes.h"
@@ -13,117 +12,108 @@ namespace irr
 {
 namespace video
 {
-	class ITexture;
+class ITexture;
 
-	//! Enumeration of cube texture surfaces
+//! Enumeration of cube texture surfaces
-	enum E_CUBE_SURFACE
+enum E_CUBE_SURFACE
+{
+	ECS_POSX = 0,
+	ECS_NEGX,
+	ECS_POSY,
+	ECS_NEGY,
+	ECS_POSZ,
+	ECS_NEGZ
+};
+
+//! Interface of a Render Target.
+class IRenderTarget : public virtual IReferenceCounted
+{
+public:
+	//! constructor
+	IRenderTarget() :
+			DepthStencil(0), DriverType(EDT_NULL)
 	{
-		ECS_POSX  = 0,
+	}
-		ECS_NEGX,
-		ECS_POSY,
-		ECS_NEGY,
-		ECS_POSZ, 
-		ECS_NEGZ
-	};
 
-	//! Interface of a Render Target.
+	//! Returns an array of previously set textures.
-	class IRenderTarget : public virtual IReferenceCounted
+	const core::array<ITexture *> &getTexture() const
 	{
-	public:
+		return Textures;
+	}
 
-		//! constructor
+	//! Returns a of previously set depth / depth-stencil texture.
-		IRenderTarget() : DepthStencil(0), DriverType(EDT_NULL)
+	ITexture *getDepthStencil() const
-		{
+	{
+		return DepthStencil;
+	}
+
+	//! Returns an array of active surface for cube textures
+	const core::array<E_CUBE_SURFACE> &getCubeSurfaces() const
+	{
+		return CubeSurfaces;
+	}
+
+	//! Set multiple textures.
+	/** Set multiple textures for the render target.
+	\param texture Array of texture objects. These textures are used for a color outputs.
+	\param depthStencil Depth or packed depth-stencil texture. This texture is used as depth
+	or depth-stencil buffer. You can pass getDepthStencil() if you don't want to change it.
+	\param cubeSurfaces When rendering to cube textures, set the surface to be used for each texture. Can be empty otherwise.
+	*/
+	void setTexture(const core::array<ITexture *> &texture, ITexture *depthStencil, const core::array<E_CUBE_SURFACE> &cubeSurfaces = core::array<E_CUBE_SURFACE>())
+	{
+		setTextures(texture.const_pointer(), texture.size(), depthStencil, cubeSurfaces.const_pointer(), cubeSurfaces.size());
+	}
+
+	//! Sets one texture + depthStencil
+	//! You can pass getDepthStencil() for depthStencil if you don't want to change that one
+	void setTexture(ITexture *texture, ITexture *depthStencil)
+	{
+		if (texture) {
+			setTextures(&texture, 1, depthStencil);
+		} else {
+			setTextures(0, 0, depthStencil);
 		}
+	}
 
-		//! Returns an array of previously set textures.
+	//! Set one cube surface texture.
-		const core::array<ITexture*>& getTexture() const
+	void setTexture(ITexture *texture, ITexture *depthStencil, E_CUBE_SURFACE cubeSurface)
-		{
+	{
-			return Textures;
+		if (texture) {
+			setTextures(&texture, 1, depthStencil, &cubeSurface, 1);
+		} else {
+			setTextures(0, 0, depthStencil, &cubeSurface, 1);
 		}
+	}
 
-		//! Returns a of previously set depth / depth-stencil texture.
+	//! Get driver type of render target.
-		ITexture* getDepthStencil() const
+	E_DRIVER_TYPE getDriverType() const
-		{
+	{
-			return DepthStencil;
+		return DriverType;
-		}
+	}
 
-		//! Returns an array of active surface for cube textures
+protected:
-		const core::array<E_CUBE_SURFACE>& getCubeSurfaces() const
+	//! Set multiple textures.
-		{
+	// NOTE: working with pointers instead of arrays to avoid unnecessary memory allocations for the single textures case
-			return CubeSurfaces;
+	virtual void setTextures(ITexture *const *textures, u32 numTextures, ITexture *depthStencil, const E_CUBE_SURFACE *cubeSurfaces = 0, u32 numCubeSurfaces = 0) = 0;
-		}
 
-		//! Set multiple textures.
+	//! Textures assigned to render target.
-		/** Set multiple textures for the render target.
+	core::array<ITexture *> Textures;
-		\param texture Array of texture objects. These textures are used for a color outputs.
-		\param depthStencil Depth or packed depth-stencil texture. This texture is used as depth
-		or depth-stencil buffer. You can pass getDepthStencil() if you don't want to change it.
-		\param cubeSurfaces When rendering to cube textures, set the surface to be used for each texture. Can be empty otherwise.
-		*/
-		void setTexture(const core::array<ITexture*>& texture, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces = core::array<E_CUBE_SURFACE>())
-		{
-			setTextures(texture.const_pointer(), texture.size(), depthStencil, cubeSurfaces.const_pointer(), cubeSurfaces.size());
-		}
 
-		//! Sets one texture + depthStencil
+	//! Depth or packed depth-stencil texture assigned to render target.
-		//! You can pass getDepthStencil() for depthStencil if you don't want to change that one
+	ITexture *DepthStencil;
-		void setTexture(ITexture* texture, ITexture* depthStencil)
-		{
-			if ( texture )
-			{
-				setTextures(&texture, 1, depthStencil);
-			}
-			else
-			{
-				setTextures(0, 0, depthStencil);
-			}
-		}
 
-		//! Set one cube surface texture.
+	//! Active surface of cube textures
-		void setTexture(ITexture* texture, ITexture* depthStencil, E_CUBE_SURFACE cubeSurface)
+	core::array<E_CUBE_SURFACE> CubeSurfaces;
-		{
-			if ( texture )
-			{
-				setTextures(&texture, 1, depthStencil, &cubeSurface, 1);
-			}
-			else
-			{
-				setTextures(0, 0, depthStencil, &cubeSurface, 1);
-			}
-		}
 
-		//! Get driver type of render target.
+	//! Driver type of render target.
-		E_DRIVER_TYPE getDriverType() const
+	E_DRIVER_TYPE DriverType;
-		{
-			return DriverType;
-		}
 
-	protected:
+private:
-
+	// no copying (IReferenceCounted still allows that for reasons which take some time to work around)
-		//! Set multiple textures.
+	IRenderTarget(const IRenderTarget &);
-		// NOTE: working with pointers instead of arrays to avoid unnecessary memory allocations for the single textures case
+	IRenderTarget &operator=(const IRenderTarget &);
-		virtual void setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces=0, u32 numCubeSurfaces=0) = 0;
+};
-
-		//! Textures assigned to render target.
-		core::array<ITexture*> Textures;
-
-		//! Depth or packed depth-stencil texture assigned to render target.
-		ITexture* DepthStencil;
-
-		//! Active surface of cube textures
-		core::array<E_CUBE_SURFACE> CubeSurfaces;
-
-		//! Driver type of render target.
-		E_DRIVER_TYPE DriverType;
-
-	private:
-		// no copying (IReferenceCounted still allows that for reasons which take some time to work around)
-		IRenderTarget(const IRenderTarget&);
-		IRenderTarget& operator=(const IRenderTarget&);
-	};
 
 }
 }
-
-#endif

include/ISceneCollisionManager.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_SCENE_COLLISION_MANAGER_H_INCLUDED__
+#pragma once
-#define __I_SCENE_COLLISION_MANAGER_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 #include "position2d.h"
@@ -14,25 +13,21 @@ namespace irr
 
 namespace scene
 {
-	class ICameraSceneNode;
+class ICameraSceneNode;
 
-	class ISceneCollisionManager : public virtual IReferenceCounted
+class ISceneCollisionManager : public virtual IReferenceCounted
-	{
+{
-	public:
+public:
-
+	//! Returns a 3d ray which would go through the 2d screen coordinates.
-		//! Returns a 3d ray which would go through the 2d screen coordinates.
+	/** \param pos: Screen coordinates in pixels.
-		/** \param pos: Screen coordinates in pixels.
+	\param camera: Camera from which the ray starts. If null, the
-		\param camera: Camera from which the ray starts. If null, the
+	active camera is used.
-		active camera is used.
+	\return Ray starting from the position of the camera and ending
-		\return Ray starting from the position of the camera and ending
+	at a length of the far value of the camera at a position which
-		at a length of the far value of the camera at a position which
+	would be behind the 2d screen coordinates. */
-		would be behind the 2d screen coordinates. */
+	virtual core::line3d<f32> getRayFromScreenCoordinates(
-		virtual core::line3d<f32> getRayFromScreenCoordinates(
+			const core::position2d<s32> &pos, const ICameraSceneNode *camera = 0) = 0;
-			const core::position2d<s32>& pos, const ICameraSceneNode* camera = 0) = 0;
+};
-
-	};
 
 } // end namespace scene
 } // end namespace irr
-
-#endif

include/IShaderConstantSetCallBack.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__
+#pragma once
-#define __I_SHADER_CONSTANT_SET_CALLBACT_H_INCLUDED__
 
 #include "IReferenceCounted.h"
 
@@ -11,8 +10,8 @@ namespace irr
 {
 namespace video
 {
-	class IMaterialRendererServices;
+class IMaterialRendererServices;
-	class SMaterial;
+class SMaterial;
 
 //! Interface making it possible to set constants for gpu programs every frame.
 /** Implement this interface in an own class and pass a pointer to it to one of
@@ -21,7 +20,6 @@ OnSetConstants method will be called every frame now. */
 class IShaderConstantSetCallBack : public virtual IReferenceCounted
 {
 public:
-
 	//! Called to let the callBack know the used material (optional method)
 	/**
 	 \code
@@ -41,7 +39,7 @@ public:
 	}
 	\endcode
 	*/
-	virtual void OnSetMaterial(const SMaterial& material) { }
+	virtual void OnSetMaterial(const SMaterial &material) {}
 
 	//! Called by the engine when the vertex and/or pixel shader constants for an material renderer should be set.
 	/**
@@ -74,12 +72,8 @@ public:
 	\param services: Pointer to an interface providing methods to set the constants for the shader.
 	\param userData: Userdata int which can be specified when creating the shader.
 	*/
-	virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) = 0;
+	virtual void OnSetConstants(IMaterialRendererServices *services, s32 userData) = 0;
 };
 
-
 } // end namespace video
 } // end namespace irr
-
-#endif
-

include/ISkinnedMesh.h

@@ -2,224 +2,219 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __I_SKINNED_MESH_H_INCLUDED__
+#pragma once
-#define __I_SKINNED_MESH_H_INCLUDED__
 
 #include "irrArray.h"
 #include "IBoneSceneNode.h"
 #include "IAnimatedMesh.h"
 #include "SSkinMeshBuffer.h"
 
+#include <optional>
+
 namespace irr
 {
 namespace scene
 {
 
-	enum E_INTERPOLATION_MODE
+enum E_INTERPOLATION_MODE
+{
+	// constant does use the current key-values without interpolation
+	EIM_CONSTANT = 0,
+
+	// linear interpolation
+	EIM_LINEAR,
+
+	//! count of all available interpolation modes
+	EIM_COUNT
+};
+
+//! Interface for using some special functions of Skinned meshes
+class ISkinnedMesh : public IAnimatedMesh
+{
+public:
+	//! Gets joint count.
+	/** \return Amount of joints in the skeletal animated mesh. */
+	virtual u32 getJointCount() const = 0;
+
+	//! Gets the name of a joint.
+	/** \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;
+
+	//! 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;
+
+	//! Use animation from another mesh
+	/** The animation is linked (not copied) based on joint names
+	so make sure they are unique.
+	\return True if all joints in this mesh were
+	matched up (empty names will not be matched, and it's case
+	sensitive). Unmatched joints will not be animated. */
+	virtual bool useAnimationFrom(const ISkinnedMesh *mesh) = 0;
+
+	//! Update Normals when Animating
+	/** \param on If false don't animate, which is faster.
+	Else update normals, which allows for proper lighting of
+	animated meshes. */
+	virtual void updateNormalsWhenAnimating(bool on) = 0;
+
+	//! Sets Interpolation Mode
+	virtual void setInterpolationMode(E_INTERPOLATION_MODE mode) = 0;
+
+	//! Animates this mesh's joints based on frame input
+	virtual void animateMesh(f32 frame, f32 blend) = 0;
+
+	//! Preforms a software skin on this mesh based of joint positions
+	virtual void skinMesh() = 0;
+
+	//! converts the vertex type of all meshbuffers to tangents.
+	/** E.g. used for bump mapping. */
+	virtual void convertMeshToTangents() = 0;
+
+	//! Allows to enable hardware skinning.
+	/* This feature is not implemented in Irrlicht yet */
+	virtual bool setHardwareSkinning(bool on) = 0;
+
+	//! Refreshes vertex data cached in joints such as positions and normals
+	virtual void refreshJointCache() = 0;
+
+	//! Moves the mesh into static position.
+	virtual void resetAnimation() = 0;
+
+	//! A vertex weight
+	struct SWeight
 	{
-		// constant does use the current key-values without interpolation
+		//! Index of the mesh buffer
-		EIM_CONSTANT = 0,
+		u16 buffer_id; // I doubt 32bits is needed
 
-		// linear interpolation
+		//! Index of the vertex
-		EIM_LINEAR,
+		u32 vertex_id; // Store global ID here
 
-		//! count of all available interpolation modes
+		//! Weight Strength/Percentage (0-1)
-		EIM_COUNT
+		f32 strength;
+
+	private:
+		//! Internal members used by CSkinnedMesh
+		friend class CSkinnedMesh;
+		char *Moved;
+		core::vector3df StaticPos;
+		core::vector3df StaticNormal;
 	};
 
-
+	//! Animation keyframe which describes a new position
-	//! Interface for using some special functions of Skinned meshes
+	struct SPositionKey
-	class ISkinnedMesh : public IAnimatedMesh
 	{
-	public:
+		f32 frame;
-
+		core::vector3df position;
-		//! Gets joint count.
-		/** \return Amount of joints in the skeletal animated mesh. */
-		virtual u32 getJointCount() const = 0;
-
-		//! Gets the name of a joint.
-		/** \param number: Zero based index of joint. The last joint
-		has the number getJointCount()-1;
-		\return Name of joint and null if an error happened. */
-		virtual const c8* getJointName(u32 number) const = 0;
-
-		//! Gets a joint number from its name
-		/** \param name: Name of the joint.
-		\return Number of the joint or -1 if not found. */
-		virtual s32 getJointNumber(const c8* name) const = 0;
-
-		//! Use animation from another mesh
-		/** The animation is linked (not copied) based on joint names
-		so make sure they are unique.
-		\return True if all joints in this mesh were
-		matched up (empty names will not be matched, and it's case
-		sensitive). Unmatched joints will not be animated. */
-		virtual bool useAnimationFrom(const ISkinnedMesh *mesh) = 0;
-
-		//! Update Normals when Animating
-		/** \param on If false don't animate, which is faster.
-		Else update normals, which allows for proper lighting of
-		animated meshes. */
-		virtual void updateNormalsWhenAnimating(bool on) = 0;
-
-		//! Sets Interpolation Mode
-		virtual void setInterpolationMode(E_INTERPOLATION_MODE mode) = 0;
-
-		//! Animates this mesh's joints based on frame input
-		virtual void animateMesh(f32 frame, f32 blend)=0;
-
-		//! Preforms a software skin on this mesh based of joint positions
-		virtual void skinMesh() = 0;
-
-		//! converts the vertex type of all meshbuffers to tangents.
-		/** E.g. used for bump mapping. */
-		virtual void convertMeshToTangents() = 0;
-
-		//! Allows to enable hardware skinning.
-		/* This feature is not implemented in Irrlicht yet */
-		virtual bool setHardwareSkinning(bool on) = 0;
-
-		//! Refreshes vertex data cached in joints such as positions and normals
-		virtual void refreshJointCache() = 0;
-
-		//! Moves the mesh into static position.
-		virtual void resetAnimation() = 0;
-
-		//! A vertex weight
-		struct SWeight
-		{
-			//! Index of the mesh buffer
-			u16 buffer_id; //I doubt 32bits is needed
-
-			//! Index of the vertex
-			u32 vertex_id; //Store global ID here
-
-			//! Weight Strength/Percentage (0-1)
-			f32 strength;
-
-		private:
-			//! Internal members used by CSkinnedMesh
-			friend class CSkinnedMesh;
-			char *Moved;
-			core::vector3df StaticPos;
-			core::vector3df StaticNormal;
-		};
-
-
-		//! Animation keyframe which describes a new position
-		struct SPositionKey
-		{
-			f32 frame;
-			core::vector3df position;
-		};
-
-		//! Animation keyframe which describes a new scale
-		struct SScaleKey
-		{
-			f32 frame;
-			core::vector3df scale;
-		};
-
-		//! Animation keyframe which describes a new rotation
-		struct SRotationKey
-		{
-			f32 frame;
-			core::quaternion rotation;
-		};
-
-		//! Joints
-		struct SJoint
-		{
-			SJoint() : UseAnimationFrom(0), GlobalSkinningSpace(false),
-				positionHint(-1),scaleHint(-1),rotationHint(-1)
-			{
-			}
-
-			//! The name of this joint
-			core::stringc Name;
-
-			//! Local matrix of this joint
-			core::matrix4 LocalMatrix;
-
-			//! List of child joints
-			core::array<SJoint*> Children;
-
-			//! List of attached meshes
-			core::array<u32> AttachedMeshes;
-
-			//! Animation keys causing translation change
-			core::array<SPositionKey> PositionKeys;
-
-			//! Animation keys causing scale change
-			core::array<SScaleKey> ScaleKeys;
-
-			//! Animation keys causing rotation change
-			core::array<SRotationKey> RotationKeys;
-
-			//! Skin weights
-			core::array<SWeight> Weights;
-
-			//! Unnecessary for loaders, will be overwritten on finalize
-			core::matrix4 GlobalMatrix;
-			core::matrix4 GlobalAnimatedMatrix;
-			core::matrix4 LocalAnimatedMatrix;
-			core::vector3df Animatedposition;
-			core::vector3df Animatedscale;
-			core::quaternion Animatedrotation;
-
-			core::matrix4 GlobalInversedMatrix; //the x format pre-calculates this
-
-		private:
-			//! Internal members used by CSkinnedMesh
-			friend class CSkinnedMesh;
-
-			SJoint *UseAnimationFrom;
-			bool GlobalSkinningSpace;
-
-			s32 positionHint;
-			s32 scaleHint;
-			s32 rotationHint;
-		};
-
-
-		//Interface for the mesh loaders (finalize should lock these functions, and they should have some prefix like loader_
-
-		//these functions will use the needed arrays, set values, etc to help the loaders
-
-		//! exposed for loaders: to add mesh buffers
-		virtual core::array<SSkinMeshBuffer*>& getMeshBuffers() = 0;
-
-		//! exposed for loaders: joints list
-		virtual core::array<SJoint*>& getAllJoints() = 0;
-
-		//! exposed for loaders: joints list
-		virtual const core::array<SJoint*>& getAllJoints() const = 0;
-
-		//! loaders should call this after populating the mesh
-		virtual void finalize() = 0;
-
-		//! Adds a new meshbuffer to the mesh, access it as last one
-		virtual SSkinMeshBuffer* addMeshBuffer() = 0;
-
-		//! Adds a new joint to the mesh, access it as last one
-		virtual SJoint* addJoint(SJoint *parent=0) = 0;
-
-		//! Adds a new weight to the mesh, access it as last one
-		virtual SWeight* addWeight(SJoint *joint) = 0;
-
-		//! Adds a new position key to the mesh, access it as last one
-		virtual SPositionKey* addPositionKey(SJoint *joint) = 0;
-		//! Adds a new scale key to the mesh, access it as last one
-		virtual SScaleKey* addScaleKey(SJoint *joint) = 0;
-		//! Adds a new rotation key to the mesh, access it as last one
-		virtual SRotationKey* addRotationKey(SJoint *joint) = 0;
-
-		//! Check if the mesh is non-animated
-		virtual bool isStatic()=0;
 	};
 
+	//! Animation keyframe which describes a new scale
+	struct SScaleKey
+	{
+		f32 frame;
+		core::vector3df scale;
+	};
+
+	//! Animation keyframe which describes a new rotation
+	struct SRotationKey
+	{
+		f32 frame;
+		core::quaternion rotation;
+	};
+
+	//! Joints
+	struct SJoint
+	{
+		SJoint() :
+				UseAnimationFrom(0), GlobalSkinningSpace(false),
+				positionHint(-1), scaleHint(-1), rotationHint(-1)
+		{
+		}
+
+		//! The name of this joint
+		std::optional<std::string> Name;
+
+		//! Local matrix of this joint
+		core::matrix4 LocalMatrix;
+
+		//! List of child joints
+		core::array<SJoint *> Children;
+
+		//! List of attached meshes
+		core::array<u32> AttachedMeshes;
+
+		//! Animation keys causing translation change
+		core::array<SPositionKey> PositionKeys;
+
+		//! Animation keys causing scale change
+		core::array<SScaleKey> ScaleKeys;
+
+		//! Animation keys causing rotation change
+		core::array<SRotationKey> RotationKeys;
+
+		//! Skin weights
+		core::array<SWeight> Weights;
+
+		//! Unnecessary for loaders, will be overwritten on finalize
+		core::matrix4 GlobalMatrix;
+		core::matrix4 GlobalAnimatedMatrix;
+		core::matrix4 LocalAnimatedMatrix;
+		core::vector3df Animatedposition;
+		core::vector3df Animatedscale;
+		core::quaternion Animatedrotation;
+
+		core::matrix4 GlobalInversedMatrix; // the x format pre-calculates this
+
+	private:
+		//! Internal members used by CSkinnedMesh
+		friend class CSkinnedMesh;
+
+		SJoint *UseAnimationFrom;
+		bool GlobalSkinningSpace;
+
+		s32 positionHint;
+		s32 scaleHint;
+		s32 rotationHint;
+	};
+
+	// Interface for the mesh loaders (finalize should lock these functions, and they should have some prefix like loader_
+
+	// these functions will use the needed arrays, set values, etc to help the loaders
+
+	//! exposed for loaders: to add mesh buffers
+	virtual core::array<SSkinMeshBuffer *> &getMeshBuffers() = 0;
+
+	//! exposed for loaders: joints list
+	virtual core::array<SJoint *> &getAllJoints() = 0;
+
+	//! exposed for loaders: joints list
+	virtual const core::array<SJoint *> &getAllJoints() const = 0;
+
+	//! loaders should call this after populating the mesh
+	virtual void finalize() = 0;
+
+	//! Adds a new meshbuffer to the mesh, access it as last one
+	virtual SSkinMeshBuffer *addMeshBuffer() = 0;
+
+	//! Adds a new joint to the mesh, access it as last one
+	virtual SJoint *addJoint(SJoint *parent = 0) = 0;
+
+	//! Adds a new weight to the mesh, access it as last one
+	virtual SWeight *addWeight(SJoint *joint) = 0;
+
+	//! Adds a new position key to the mesh, access it as last one
+	virtual SPositionKey *addPositionKey(SJoint *joint) = 0;
+	//! Adds a new scale key to the mesh, access it as last one
+	virtual SScaleKey *addScaleKey(SJoint *joint) = 0;
+	//! Adds a new rotation key to the mesh, access it as last one
+	virtual SRotationKey *addRotationKey(SJoint *joint) = 0;
+
+	//! Check if the mesh is non-animated
+	virtual bool isStatic() = 0;
+};
+
 } // end namespace scene
 } // end namespace irr
-
-#endif
-