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

.editorconfig

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

.github/workflows/build.yml

@@ -8,49 +8,46 @@ on:
 jobs:
 
   linux-gl:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:bionic
-      env: { LANG: "C.UTF-8" }
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
-          apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+          sudo apt-get update
+          sudo apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
 
       - name: Build
         run: |
-          cmake .
+          cmake . -DUSE_SDL2=OFF
           make VERBOSE=1 -j2
 
+      - name: Test
+        run: |
+          ctest --output-on-failure
+
       - name: Package
         run: |
           make DESTDIR=$PWD/_install install
           tar -c -I "gzip -9" -f irrlicht-linux.tar.gz -C ./_install/usr/local .
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: irrlicht-linux
           path: ./irrlicht-linux.tar.gz
 
   linux-gles:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:bionic
-      env: { LANG: "C.UTF-8" }
+    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
-          apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+          sudo apt-get update
+          sudo apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
 
       - name: Build
         run: |
-          sed '/#define _IRR_COMPILE_WITH_OGLES2_/ s|^//||g' -i include/IrrCompileConfig.h
-          sed '/#define _IRR_COMPILE_WITH_OPENGL_/ s|^|//|g' -i include/IrrCompileConfig.h
-          cmake . -DBUILD_EXAMPLES=1
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=OFF -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
           make -j2
 
       - name: Test (headless)
@@ -61,24 +58,20 @@ jobs:
       - name: Test (Xvfb)
         run: |
           cd bin/Linux
-          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
 
   linux-sdl:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:jammy
-      env: { LANG: "C.UTF-8" }
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          apt-get update
-          apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+          sudo apt-get update
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
 
       - name: Build
         run: |
-          sed '/#define _IRR_COMPILE_WITH_SDL_DEVICE_/ s|^//||g' -i include/IrrCompileConfig.h
-          cmake . -DBUILD_EXAMPLES=1
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DCMAKE_BUILD_TYPE=Debug
           make -j2
 
       - name: Test (headless)
@@ -86,58 +79,97 @@ jobs:
           cd bin/Linux
           ./AutomatedTest null
 
-  win32:
+  linux-sdl-gl3:
+    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+
+      - name: Build
+        run: |
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_OPENGL3=ON
+          make -j2
+
+      - name: Test (headless)
+        run: |
+          cd bin/Linux
+          ./AutomatedTest null
+
+      - name: Test (Xvfb)
+        run: |
+          cd bin/Linux
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest opengl3
+
+  linux-sdl-gles2:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+
+      - name: Build
+        run: |
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
+          make -j2
+
+      - name: Test (headless)
+        run: |
+          cd bin/Linux
+          ./AutomatedTest null
+
+      - name: Test (Xvfb)
+        run: |
+          cd bin/Linux
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
+
+  mingw:
+    name: "MinGW ${{matrix.config.variant}}${{matrix.config.extras}}"
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {variant: win32, arch: i686}
+          - {variant: win64, arch: x86_64}
+          - {variant: win32, arch: i686, extras: "-sdl"}
+          - {variant: win64, arch: x86_64, extras: "-sdl"}
+    steps:
+      - uses: actions/checkout@v4
       - name: Install compiler
         run: |
           sudo apt-get update && sudo apt-get install cmake -qyy
-          wget http://minetest.kitsunemimi.pw/mingw-w64-i686_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz
-          sudo tar -xaf mingw.tar.xz -C /usr
+          ./scripts/ci-get-mingw.sh
 
       - name: Build
         run: |
           ./scripts/ci-build-mingw.sh package
         env:
-          CC: i686-w64-mingw32-gcc
-          CXX: i686-w64-mingw32-g++
+          CC: ${{matrix.config.arch}}-w64-mingw32-clang
+          CXX: ${{matrix.config.arch}}-w64-mingw32-clang++
+          extras: ${{matrix.config.extras}}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: irrlicht-win32
-          path: ./irrlicht-win32.zip
-
-  win64:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install compiler
-        run: |
-          sudo apt-get update && sudo apt-get install cmake -qyy
-          wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz
-          sudo tar -xaf mingw.tar.xz -C /usr
-
-      - name: Build
-        run: |
-          ./scripts/ci-build-mingw.sh package
-        env:
-          CC: x86_64-w64-mingw32-gcc
-          CXX: x86_64-w64-mingw32-g++
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: irrlicht-win64
-          path: ./irrlicht-win64.zip
+          name: irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}
+          path: ./irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}.zip
 
   macos:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps
         run: |
-          brew update
+          brew update --auto-update
           brew install cmake libpng jpeg
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
 
       - name: Build
         run: |
@@ -148,13 +180,30 @@ jobs:
         run: |
           ./bin/OSX/AutomatedTest null
 
+  macos-sdl:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          brew update --auto-update
+          brew install cmake libpng jpeg sdl2
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+
+      - name: Build
+        run: |
+          cmake . -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_EXAMPLES=1 -DUSE_SDL2=1
+          make -j3
+
   msvc:
-    name: VS 2019 ${{ matrix.config.arch }}
+    name: VS 2019 ${{ matrix.config.arch }} ${{ matrix.sdl.label }}
     runs-on: windows-2019
     env:
-      VCPKG_VERSION: 14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44
-        # 2022.05.10
-      vcpkg_packages: zlib libpng libjpeg-turbo opengl-registry
+      VCPKG_VERSION: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
+      # 2023.10.19
+      vcpkg_packages: zlib libpng libjpeg-turbo
     strategy:
       fail-fast: false
       matrix:
@@ -167,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 }}
@@ -184,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 .
 
@@ -202,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)
 
-# Set policies up to 3.9 since we want to enable the IPO option
-if(${CMAKE_VERSION} VERSION_LESS 3.9)
-	cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
-	cmake_policy(VERSION 3.9)
-endif()
-
-set(IRRLICHTMT_REVISION 10)
+set(IRRLICHTMT_REVISION 15)
 
 project(Irrlicht
 	VERSION 1.9.0.${IRRLICHTMT_REVISION}
@@ -16,6 +9,9 @@ project(Irrlicht
 
 message(STATUS "*** Building IrrlichtMt ${PROJECT_VERSION} ***")
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 include(GNUInstallDirs)
 
 if(ANDROID)
@@ -38,7 +34,9 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-add_subdirectory(source/Irrlicht)
+enable_testing()
+add_subdirectory(src)
+add_subdirectory(test)
 
 option(BUILD_EXAMPLES "Build example applications" FALSE)
 if(BUILD_EXAMPLES)

Config.cmake.in

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

LICENSE

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

LICENSE

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

README.md

@@ -1,9 +1,16 @@
 IrrlichtMt version 1.9
 ======================
 
-The Irrlicht Engine is an open source realtime 3D engine written in C++.
+Notice
+------
 
-This is a fork by the [Minetest](https://github.com/minetest) developers that was stripped-down and customized specifically for use in Minetest.
+IrrlichtMt has been moved into the [main Minetest repository](https://github.com/minetest) during Minetest 5.9 development. This repository is an archive useful for building older versions of Minetest.
+
+About
+-----
+
+IrrlichtMt is the 3D engine of [Minetest](https://github.com/minetest).
+It is based on the [Irrlicht Engine](https://irrlicht.sourceforge.io/) but is now developed independently.
 It is intentionally not compatible to upstream and is planned to be eventually absorbed into Minetest.
 
 Build
@@ -16,10 +23,16 @@ The following libraries are required to be installed:
 * OpenGL
   * or on mobile: OpenGL ES (can be optionally enabled on desktop too)
 * on Unix: X11
+* SDL2 (see below)
 
 Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the following options are available:
 * `BUILD_SHARED_LIBS` (default: `ON`) - Build IrrlichtMt as a shared library
 * `BUILD_EXAMPLES` (default: `OFF`) - Build example applications
+* `ENABLE_OPENGL` - Enable OpenGL driver
+* `ENABLE_OPENGL3` (default: `OFF`) - Enable OpenGL 3+ driver
+* `ENABLE_GLES1` - Enable OpenGL ES driver, legacy
+* `ENABLE_GLES2` - Enable OpenGL ES 2+ driver
+* `USE_SDL2` (default: platform-dependent, usually `ON`) - Use SDL2 instead of older native device code
 
 e.g. on a Linux system you might want to build for local use like this:
 
@@ -36,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

@@ -1,152 +1,154 @@
-#include <iostream>
-#include <irrlicht.h>
-#include "exampleHelper.h"
-
-using namespace irr;
-
-static IrrlichtDevice *device = nullptr;
-static int test_fail = 0;
-
-void test_irr_array();
-void test_irr_string();
-
-static video::E_DRIVER_TYPE chooseDriver(const char *arg_)
-{
-	if (core::stringc(arg_) == "null")
-		return video::EDT_NULL;
-
-	if (IrrlichtDevice::isDriverSupported(video::EDT_OGLES1))
-		return video::EDT_OGLES1;
-	if (IrrlichtDevice::isDriverSupported(video::EDT_OGLES2))
-		return video::EDT_OGLES2;
-	return video::EDT_OPENGL;
-}
-
-static inline void check(bool ok, const char *msg)
-{
-	if (!ok)
-	{
-		test_fail++;
-		device->getLogger()->log((core::stringc("FAILED TEST: ") + msg).c_str(), ELL_ERROR);
-	}
-}
-
-void run_unit_tests() {
-	std::cout << "Running unit tests:" << std::endl;
-	try {
-		test_irr_array();
-		test_irr_string();
-	} catch (const std::exception &e) {
-		std::cerr << e.what() << std::endl;
-		test_fail++;
-	}
-	std::cout << std::endl;
-}
-
-int main(int argc, char *argv[])
-{
-	run_unit_tests();
-
-	SIrrlichtCreationParameters p;
-	p.DriverType = chooseDriver(argc > 1 ? argv[1] : "");
-	p.WindowSize = core::dimension2du(640, 480);
-	p.Vsync = true;
-	p.LoggingLevel = ELL_DEBUG;
-
-	device = createDeviceEx(p);
-	if (!device)
-		return 1;
-
-	{
-		u32 total = 0;
-		device->getOSOperator()->getSystemMemory(&total, nullptr);
-		core::stringc message = core::stringc("Total RAM in MiB: ") + core::stringc(total >> 10);
-		device->getLogger()->log(message.c_str(), ELL_INFORMATION);
-		check(total > 130 * 1024, "RAM amount");
-	}
-
-	device->setWindowCaption(L"Hello World!");
-	device->setResizable(true);
-
-	video::IVideoDriver* driver = device->getVideoDriver();
-	scene::ISceneManager* smgr = device->getSceneManager();
-	gui::IGUIEnvironment* guienv = device->getGUIEnvironment();
-
-	guienv->addStaticText(L"sample text", core::rect<s32>(10,10,110,22), false);
-
-	gui::IGUIButton* button = guienv->addButton(
-		core::rect<s32>(10,30,110,30 + 32), 0, -1, L"sample button",
-		L"sample tooltip");
-
-	gui::IGUIEditBox* editbox = guienv->addEditBox(L"",
-		core::rect<s32>(10,70,60,70 + 16));
-
-	const io::path mediaPath = getExampleMediaPath();
-
-	scene::IAnimatedMesh* mesh = smgr->getMesh(mediaPath + "coolguy_opt.x");
-	check(mesh, "mesh loading");
-	if (mesh)
-	{
-		video::ITexture* tex = driver->getTexture(mediaPath + "cooltexture.png");
-		check(tex, "texture loading");
-		scene::IAnimatedMeshSceneNode* node = smgr->addAnimatedMeshSceneNode(mesh);
-		if (node)
-		{
-			node->setMaterialFlag(video::EMF_LIGHTING, false);
-			node->setFrameLoop(0, 29);
-			node->setAnimationSpeed(30);
-			node->setMaterialTexture(0, tex);
-		}
-	}
-
-	smgr->addCameraSceneNode(0, core::vector3df(0,4,5), core::vector3df(0,2,0));
-
-	s32 n = 0;
-	SEvent event;
-	device->getTimer()->start();
-
-	while (device->run())
-	{
-		if (device->getTimer()->getTime() >= 1000)
-		{
-			device->getTimer()->setTime(0);
-			++n;
-			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
-				guienv->setFocus(editbox);
-			else if (n == 3) // Keypress for Text input
-			{
-				bzero(&event, sizeof(SEvent));
-				event.EventType = irr::EET_KEY_INPUT_EVENT;
-				event.KeyInput.Char = L'a';
-				event.KeyInput.Key = KEY_KEY_A;
-				event.KeyInput.PressedDown = true;
-				device->postEventFromUser(event);
-				event.KeyInput.PressedDown = false;
-				device->postEventFromUser(event);
-			}
-			else
-				device->closeDevice();
-		}
-
-		driver->beginScene(video::ECBF_COLOR | video::ECBF_DEPTH,
-			video::SColor(255,100,100,150));
-		smgr->drawAll();
-		guienv->drawAll();
-		driver->endScene();
-	}
-
-	check(core::stringw(L"a") == editbox->getText(), "EditBox text");
-
-	device->getLogger()->log("Done.", ELL_INFORMATION);
-	device->drop();
-	return test_fail > 0 ? 1 : 0;
-}
+#include <iostream>
+#include <irrlicht.h>
+#include "exampleHelper.h"
+
+using namespace irr;
+
+static IrrlichtDevice *device = nullptr;
+static int test_fail = 0;
+
+void test_irr_array();
+void test_irr_string();
+
+static video::E_DRIVER_TYPE chooseDriver(core::stringc arg_)
+{
+	if (arg_ == "null")
+		return video::EDT_NULL;
+	if (arg_ == "ogles1")
+		return video::EDT_OGLES1;
+	if (arg_ == "ogles2")
+		return video::EDT_OGLES2;
+	if (arg_ == "opengl")
+		return video::EDT_OPENGL;
+	if (arg_ == "opengl3")
+		return video::EDT_OPENGL3;
+	std::cerr << "Unknown driver type: " << arg_.c_str() << ". Trying OpenGL." << std::endl;
+	return video::EDT_OPENGL;
+}
+
+static inline void check(bool ok, const char *msg)
+{
+	if (!ok) {
+		test_fail++;
+		device->getLogger()->log((core::stringc("FAILED TEST: ") + msg).c_str(), ELL_ERROR);
+	}
+}
+
+void run_unit_tests()
+{
+	std::cout << "Running unit tests:" << std::endl;
+	try {
+		test_irr_array();
+		test_irr_string();
+	} catch (const std::exception &e) {
+		std::cerr << e.what() << std::endl;
+		test_fail++;
+	}
+	std::cout << std::endl;
+}
+
+int main(int argc, char *argv[])
+{
+	run_unit_tests();
+
+	SIrrlichtCreationParameters p;
+	p.DriverType = chooseDriver(argc > 1 ? argv[1] : "");
+	p.WindowSize = core::dimension2du(640, 480);
+	p.Vsync = true;
+	p.LoggingLevel = ELL_DEBUG;
+
+	device = createDeviceEx(p);
+	if (!device)
+		return 1;
+
+	{
+		u32 total = 0;
+		device->getOSOperator()->getSystemMemory(&total, nullptr);
+		core::stringc message = core::stringc("Total RAM in MiB: ") + core::stringc(total >> 10);
+		device->getLogger()->log(message.c_str(), ELL_INFORMATION);
+		check(total > 130 * 1024, "RAM amount");
+	}
+
+	device->setWindowCaption(L"Hello World!");
+	device->setResizable(true);
+
+	video::IVideoDriver *driver = device->getVideoDriver();
+	scene::ISceneManager *smgr = device->getSceneManager();
+	gui::IGUIEnvironment *guienv = device->getGUIEnvironment();
+
+	guienv->addStaticText(L"sample text", core::rect<s32>(10, 10, 110, 22), false);
+
+	gui::IGUIButton *button = guienv->addButton(
+			core::rect<s32>(10, 30, 110, 30 + 32), 0, -1, L"sample button",
+			L"sample tooltip");
+
+	gui::IGUIEditBox *editbox = guienv->addEditBox(L"",
+			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);
+	check(mesh, "mesh loading");
+	if (mesh_file)
+		mesh_file->drop();
+	if (mesh) {
+		video::ITexture *tex = driver->getTexture(mediaPath + "cooltexture.png");
+		check(tex, "texture loading");
+		scene::IAnimatedMeshSceneNode *node = smgr->addAnimatedMeshSceneNode(mesh);
+		if (node) {
+			node->forEachMaterial([tex](video::SMaterial &mat) {
+				mat.Lighting = false;
+				mat.setTexture(0, tex);
+			});
+			node->setFrameLoop(0, 29);
+			node->setAnimationSpeed(30);
+		}
+	}
+
+	smgr->addCameraSceneNode(0, core::vector3df(0, 4, 5), core::vector3df(0, 2, 0));
+
+	s32 n = 0;
+	SEvent event;
+	device->getTimer()->start();
+
+	while (device->run()) {
+		if (device->getTimer()->getTime() >= 1000) {
+			device->getTimer()->setTime(0);
+			++n;
+			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
+				guienv->setFocus(editbox);
+			else if (n == 3) { // Keypress for Text input
+				bzero(&event, sizeof(SEvent));
+				event.EventType = irr::EET_KEY_INPUT_EVENT;
+				event.KeyInput.Char = L'a';
+				event.KeyInput.Key = KEY_KEY_A;
+				event.KeyInput.PressedDown = true;
+				device->postEventFromUser(event);
+				event.KeyInput.PressedDown = false;
+				device->postEventFromUser(event);
+			} else
+				device->closeDevice();
+		}
+
+		driver->beginScene(video::ECBF_COLOR | video::ECBF_DEPTH,
+				video::SColor(255, 100, 100, 150));
+		smgr->drawAll();
+		guienv->drawAll();
+		driver->endScene();
+	}
+
+	check(core::stringw(L"a") == editbox->getText(), "EditBox text");
+
+	device->getLogger()->log("Done.", ELL_INFORMATION);
+	device->drop();
+	return test_fail > 0 ? 1 : 0;
+}

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() {
-	const auto& values = { 3, 5, 1, 2, 5, 10, 19, 9, 7, 1, 2, 5, 8, 15 };
+static void test_binary_searches()
+{
+	const auto &values = {3, 5, 1, 2, 5, 10, 19, 9, 7, 1, 2, 5, 8, 15};
 	array<int> arr;
 	for (int value : values) {
 		arr.push_back(value);
 	}
 	// Test the const form first, it uses a linear search without sorting
-	const array<int> & carr = arr;
+	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 {                                        \
-	const auto &a = (actual);                                                     \
-	const auto &e = (expected);                                                   \
-	if (!CMP(a, e)) {                                                             \
-		std::cout                                                             \
-			<< "Test assertion failed: " << #actual << " " << #CMP << " " \
-			<< #expected << std::endl                                     \
-			<< "    at " << __FILE__ << ":" << __LINE__ << std::endl      \
-			<< "    actual:   " << a << std::endl << "    expected: "     \
-			<< e << std::endl;                                            \
-		throw TestFailedException();                                          \
-	}                                                                             \
-} while (0)
+#define UASSERTCMP(CMP, actual, expected)                                         \
+	do {                                                                          \
+		const auto &a = (actual);                                                 \
+		const auto &e = (expected);                                               \
+		if (!CMP(a, e)) {                                                         \
+			std::cout                                                             \
+					<< "Test assertion failed: " << #actual << " " << #CMP << " " \
+					<< #expected << std::endl                                     \
+					<< "    at " << __FILE__ << ":" << __LINE__ << std::endl      \
+					<< "    actual:   " << a << std::endl                         \
+					<< "    expected: "                                           \
+					<< e << std::endl;                                            \
+			throw TestFailedException();                                          \
+		}                                                                         \
+	} while (0)
 
-#define CMPEQ(a, e)    (a == e)
-#define CMPTRUE(a, e)  (a)
-#define CMPNE(a, e)    (a != e)
+#define CMPEQ(a, e) (a == e)
+#define CMPTRUE(a, e) (a)
+#define CMPNE(a, e) (a != e)
 
-#define UASSERTEQ(actual, expected)  UASSERTCMP(CMPEQ, actual, expected)
+#define 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
-	setlocale(LC_CTYPE, "");
+	// locale-independent
 
 	stringw out;
-	multibyteToWString(out, "†††");
+	utf8ToWString(out, "†††");
 	UASSERTEQ(out.size(), 3);
 	for (int i = 0; i < 3; i++)
 		UASSERTEQ(static_cast<u16>(out[i]), 0x2020);
+
 	stringc out2;
-	wStringToMultibyte(out2, L"†††");
+	wStringToUTF8(out2, L"†††");
 	UASSERTEQ(out2.size(), 9);
 	for (int i = 0; i < 3; i++) {
-		UASSERTEQ(static_cast<u8>(out2[3*i]), 0xe2);
-		UASSERTEQ(static_cast<u8>(out2[3*i+1]), 0x80);
-		UASSERTEQ(static_cast<u8>(out2[3*i+2]), 0xa0);
+		UASSERTEQ(static_cast<u8>(out2[3 * i]), 0xe2);
+		UASSERTEQ(static_cast<u8>(out2[3 * i + 1]), 0x80);
+		UASSERTEQ(static_cast<u8>(out2[3 * i + 2]), 0xa0);
 	}
+
+	// locale-dependent
+	if (!setlocale(LC_CTYPE, "C.UTF-8"))
+		setlocale(LC_CTYPE, "UTF-8"); // macOS
+
+	stringw out3;
+	multibyteToWString(out3, "†††");
+	UASSERTEQ(out3.size(), 3);
+	for (int i = 0; i < 3; i++)
+		UASSERTEQ(static_cast<u16>(out3[i]), 0x2020);
 }
 
 void test_irr_string()

examples/CMakeLists.txt

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

include/CIndexBuffer.h

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

include/CMeshBuffer.h

@@ -1,330 +1,274 @@
-// 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 __T_MESH_BUFFER_H_INCLUDED__
-#define __T_MESH_BUFFER_H_INCLUDED__
-
-#include "irrArray.h"
-#include "IMeshBuffer.h"
-
-namespace irr
-{
-namespace scene
-{
-	//! Template implementation of the IMeshBuffer interface
-	template <class T>
-	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)
-		{
-			#ifdef _DEBUG
-			setDebugName("CMeshBuffer");
-			#endif
-		}
-
-
-		//! Get material of this meshbuffer
-		/** \return Material of this buffer */
-		const video::SMaterial& getMaterial() const override
-		{
-			return Material;
-		}
-
-
-		//! 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);
-			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
-
-
+// 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
+
+#include "irrArray.h"
+#include "IMeshBuffer.h"
+
+namespace irr
+{
+namespace scene
+{
+//! Template implementation of the IMeshBuffer interface
+template <class T>
+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)
+	{
+#ifdef _DEBUG
+		setDebugName("CMeshBuffer");
+#endif
+	}
+
+	//! Get material of this meshbuffer
+	/** \return Material of this buffer */
+	const video::SMaterial &getMaterial() const override
+	{
+		return Material;
+	}
+
+	//! 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);
+		for (i = 0; i < numIndices; ++i) {
+			Indices.push_back(indices[i] + vertexCount);
+		}
+	}
+
+	//! 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

include/CVertexBuffer.h

@@ -1,210 +0,0 @@
-// Copyright (C) 2008-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_VERTEX_BUFFER_H_INCLUDED__
-#define __C_VERTEX_BUFFER_H_INCLUDED__
-
-#include "IVertexBuffer.h"
-
-
-namespace irr
-{
-namespace scene
-{
-
-	class CVertexBuffer : public IVertexBuffer
-	{
-		class IVertexList
-		{
-		public:
-			virtual ~IVertexList(){};
-
-			virtual u32 stride() const =0;
-
-			virtual u32 size() const =0;
-
-			virtual void push_back (const video::S3DVertex &element) =0;
-			virtual video::S3DVertex& operator [](const u32 index) const =0;
-			virtual video::S3DVertex& getLast() =0;
-			virtual void set_used(u32 usedNow) =0;
-			virtual void reallocate(u32 new_size) =0;
-			virtual u32 allocated_size() const =0;
-			virtual video::S3DVertex* pointer() =0;
-			virtual video::E_VERTEX_TYPE getType() const =0;
-		};
-
-		template <class T>
-		class CSpecificVertexList : public IVertexList
-		{
-		public:
-			core::array<T> Vertices;
-
-			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)
-		{
-			setType(vertexType);
-		}
-
-		CVertexBuffer(const IVertexBuffer &VertexBufferCopy) :
-				Vertices(0), MappingHint(EHM_NEVER),
-				ChangedID(1)
-		{
-			setType(VertexBufferCopy.getType());
-			reallocate(VertexBufferCopy.size());
-
-			for (u32 n=0;n<VertexBufferCopy.size();++n)
-				push_back(VertexBufferCopy[n]);
-		}
-
-		virtual ~CVertexBuffer()
-		{
-			delete Vertices;
-		}
-
-
-		void setType(video::E_VERTEX_TYPE vertexType) override
-		{
-			IVertexList *NewVertices=0;
-
-			switch (vertexType)
-			{
-				case video::EVT_STANDARD:
-				{
-					NewVertices=new CSpecificVertexList<video::S3DVertex>;
-					break;
-				}
-				case video::EVT_2TCOORDS:
-				{
-					NewVertices=new CSpecificVertexList<video::S3DVertex2TCoords>;
-					break;
-				}
-				case video::EVT_TANGENTS:
-				{
-					NewVertices=new CSpecificVertexList<video::S3DVertexTangents>;
-					break;
-				}
-			}
-			if (Vertices)
-			{
-				NewVertices->reallocate( Vertices->size() );
-
-				for(u32 n=0;n<Vertices->size();++n)
-					NewVertices->push_back((*Vertices)[n]);
-
-				delete Vertices;
-			}
-
-			Vertices=NewVertices;
-		}
-
-		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

@@ -1,101 +1,32 @@
-// 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_ATTRIBUTES_H_INCLUDED__
-#define __E_ATTRIBUTES_H_INCLUDED__
-
-namespace irr
-{
-namespace io
-{
-
-//! Types of attributes available for IAttributes
-enum E_ATTRIBUTE_TYPE
-{
-	// integer attribute
-	EAT_INT = 0,
-
-	// 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,
-
-	// unknown attribute
-	EAT_UNKNOWN
-};
-
-} // end namespace io
-} // end namespace irr
-
-#endif
+// 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 io
+{
+
+//! Types of attributes available for IAttributes
+enum E_ATTRIBUTE_TYPE
+{
+	// integer attribute
+	EAT_INT = 0,
+
+	// float attribute
+	EAT_FLOAT,
+
+	// boolean attribute
+	EAT_BOOL,
+
+	// known attribute type count
+	EAT_COUNT,
+
+	// unknown attribute
+	EAT_UNKNOWN
+};
+
+} // end namespace io
+} // end namespace irr

include/ECullingTypes.h

@@ -1,41 +1,35 @@
-// 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_CULLING_TYPES_H_INCLUDED__
-#define __E_CULLING_TYPES_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace scene
-{
-
-	//! An enumeration for all types of automatic culling for built-in scene nodes
-	enum E_CULLING_TYPE
-	{
-		EAC_OFF = 0,
-		EAC_BOX = 1,
-		EAC_FRUSTUM_BOX = 2,
-		EAC_FRUSTUM_SPHERE = 4,
-		EAC_OCC_QUERY = 8
-	};
-
-	//! Names for culling type
-	const c8* const AutomaticCullingNames[] =
-	{
-		"false",
-		"box",			// camera box against node box
-		"frustum_box",		// camera frustum against node box
-		"frustum_sphere",	// camera frustum against node sphere
-		"occ_query",		// occlusion query
-		0
-	};
-
-} // end namespace scene
-} // end namespace irr
-
-
-#endif // __E_CULLING_TYPES_H_INCLUDED__
-
+// 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
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! An enumeration for all types of automatic culling for built-in scene nodes
+enum E_CULLING_TYPE
+{
+	EAC_OFF = 0,
+	EAC_BOX = 1,
+	EAC_FRUSTUM_BOX = 2,
+	EAC_FRUSTUM_SPHERE = 4,
+	EAC_OCC_QUERY = 8
+};
+
+//! Names for culling type
+const c8 *const AutomaticCullingNames[] = {
+		"false",
+		"box",            // camera box against node box
+		"frustum_box",    // camera frustum against node box
+		"frustum_sphere", // camera frustum against node sphere
+		"occ_query",      // occlusion query
+		0,
+	};
+
+} // end namespace scene
+} // end namespace irr

include/EDebugSceneTypes.h

@@ -1,50 +1,41 @@
-// 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_DEBUG_SCENE_TYPES_H_INCLUDED__
-#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)
-	enum E_DEBUG_SCENE_TYPE
-	{
-		//! No Debug Data ( Default )
-		EDS_OFF = 0,
-
-		//! Show Bounding Boxes of SceneNode
-		EDS_BBOX = 1,
-
-		//! Show Vertex Normals
-		EDS_NORMALS = 2,
-
-		//! Shows Skeleton/Tags
-		EDS_SKELETON = 4,
-
-		//! Overlays Mesh Wireframe
-		EDS_MESH_WIRE_OVERLAY = 8,
-
-		//! Temporary use transparency Material Type
-		EDS_HALF_TRANSPARENCY = 16,
-
-		//! Show Bounding Boxes of all MeshBuffers
-		EDS_BBOX_BUFFERS = 32,
-
-		//! EDS_BBOX | EDS_BBOX_BUFFERS
-		EDS_BBOX_ALL = EDS_BBOX | EDS_BBOX_BUFFERS,
-
-		//! Show all debug infos
-		EDS_FULL = 0xffffffff
-	};
-
-
-} // end namespace scene
-} // end namespace irr
-
-
-#endif // __E_DEBUG_SCENE_TYPES_H_INCLUDED__
-
+// 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 scene
+{
+
+//! An enumeration for all types of debug data for built-in scene nodes (flags)
+enum E_DEBUG_SCENE_TYPE
+{
+	//! No Debug Data ( Default )
+	EDS_OFF = 0,
+
+	//! Show Bounding Boxes of SceneNode
+	EDS_BBOX = 1,
+
+	//! Show Vertex Normals
+	EDS_NORMALS = 2,
+
+	//! Shows Skeleton/Tags
+	EDS_SKELETON = 4,
+
+	//! Overlays Mesh Wireframe
+	EDS_MESH_WIRE_OVERLAY = 8,
+
+	//! Show Bounding Boxes of all MeshBuffers
+	EDS_BBOX_BUFFERS = 32,
+
+	//! EDS_BBOX | EDS_BBOX_BUFFERS
+	EDS_BBOX_ALL = EDS_BBOX | EDS_BBOX_BUFFERS,
+
+	//! Show all debug infos
+	EDS_FULL = 0xffffffff
+};
+
+} // end namespace scene
+} // end namespace irr

include/EDeviceTypes.h

@@ -1,54 +1,46 @@
-// 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_DEVICE_TYPES_H_INCLUDED__
-#define __E_DEVICE_TYPES_H_INCLUDED__
-
-namespace irr
-{
-
-	//! An enum for the different device types supported by the Irrlicht Engine.
-	enum E_DEVICE_TYPE
-	{
-
-		//! A device native to Microsoft Windows
-		/** This device uses the Win32 API and works in all versions of Windows. */
-		EIDT_WIN32,
-
-		//! A device native to Unix style operating systems.
-		/** This device uses the X11 windowing system and works in Linux, Solaris, FreeBSD, OSX and
-		other operating systems which support X11. */
-		EIDT_X11,
-
-		//! A device native to Mac OSX
-		/** This device uses Apple's Cocoa API and works in Mac OSX 10.2 and above. */
-		EIDT_OSX,
-        
-        //! A device native to the iOS
-		/** This device should be used with the OpenGL-ES driver. */
-		EIDT_IOS,
-
-		//! A device which uses Simple DirectMedia Layer
-		/** The SDL device works under all platforms supported by SDL but first must be compiled
-		in by defining the _IRR_COMPILE_WITH_SDL_DEVICE_ macro in IrrCompileConfig.h */
-		EIDT_SDL,
-
-		//! This selection allows Irrlicht to choose the best device from the ones available.
-		/** If this selection is chosen then Irrlicht will try to use the IrrlichtDevice native
-		to your operating system. If this is unavailable then the X11, SDL and then console device
-		will be tried. This ensures that Irrlicht will run even if your platform is unsupported,
-		although it may not be able to render anything. */
-		EIDT_BEST,
-		
-		//! A device for Android platforms
-		/** Best used with embedded devices and mobile systems.
-		Does not need X11 or other graphical subsystems.
-		May support hw-acceleration via OpenGL-ES */
-		EIDT_ANDROID,		
-	};
-
-} // end namespace irr
-
-#endif // __E_DEVICE_TYPES_H_INCLUDED__
-
+// 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
+{
+
+//! An enum for the different device types supported by the Irrlicht Engine.
+enum E_DEVICE_TYPE
+{
+
+	//! A device native to Microsoft Windows
+	/** This device uses the Win32 API and works in all versions of Windows. */
+	EIDT_WIN32,
+
+	//! A device native to Unix style operating systems.
+	/** This device uses the X11 windowing system and works in Linux, Solaris, FreeBSD, OSX and
+	other operating systems which support X11. */
+	EIDT_X11,
+
+	//! A device native to Mac OSX
+	/** This device uses Apple's Cocoa API and works in Mac OSX 10.2 and above. */
+	EIDT_OSX,
+
+	//! A device which uses Simple DirectMedia Layer
+	/** 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 */
+	EIDT_SDL,
+
+	//! This selection allows Irrlicht to choose the best device from the ones available.
+	/** If this selection is chosen then Irrlicht will try to use the IrrlichtDevice native
+	to your operating system. If this is unavailable then the X11, SDL and then console device
+	will be tried. This ensures that Irrlicht will run even if your platform is unsupported,
+	although it may not be able to render anything. */
+	EIDT_BEST,
+
+	//! A device for Android platforms
+	/** Best used with embedded devices and mobile systems.
+	Does not need X11 or other graphical subsystems.
+	May support hw-acceleration via OpenGL-ES */
+	EIDT_ANDROID,
+};
+
+} // end namespace irr

include/EDriverFeatures.h

@@ -1,157 +1,137 @@
-// 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_DRIVER_FEATURES_H_INCLUDED__
-#define __E_DRIVER_FEATURES_H_INCLUDED__
-
-namespace irr
-{
-namespace video
-{
-
-	//! enumeration for querying features of the video driver.
-	enum E_VIDEO_DRIVER_FEATURE
-	{
-		//! Is driver able to render to a surface?
-		EVDF_RENDER_TO_TARGET = 0,
-
-		//! Is hardware transform and lighting supported?
-		EVDF_HARDWARE_TL,
-
-		//! Are multiple textures per material possible?
-		EVDF_MULTITEXTURE,
-
-		//! Is driver able to render with a bilinear filter applied?
-		EVDF_BILINEAR_FILTER,
-
-		//! Can the driver handle mip maps?
-		EVDF_MIP_MAP,
-
-		//! Can the driver update mip maps automatically?
-		EVDF_MIP_MAP_AUTO_UPDATE,
-
-		//! Are stencilbuffers switched on and does the device support stencil buffers?
-		EVDF_STENCIL_BUFFER,
-
-		//! Is Vertex Shader 1.1 supported?
-		EVDF_VERTEX_SHADER_1_1,
-
-		//! Is Vertex Shader 2.0 supported?
-		EVDF_VERTEX_SHADER_2_0,
-
-		//! Is Vertex Shader 3.0 supported?
-		EVDF_VERTEX_SHADER_3_0,
-
-		//! Is Pixel Shader 1.1 supported?
-		EVDF_PIXEL_SHADER_1_1,
-
-		//! Is Pixel Shader 1.2 supported?
-		EVDF_PIXEL_SHADER_1_2,
-
-		//! Is Pixel Shader 1.3 supported?
-		EVDF_PIXEL_SHADER_1_3,
-
-		//! Is Pixel Shader 1.4 supported?
-		EVDF_PIXEL_SHADER_1_4,
-
-		//! Is Pixel Shader 2.0 supported?
-		EVDF_PIXEL_SHADER_2_0,
-
-		//! Is Pixel Shader 3.0 supported?
-		EVDF_PIXEL_SHADER_3_0,
-
-		//! Are ARB vertex programs v1.0 supported?
-		EVDF_ARB_VERTEX_PROGRAM_1,
-
-		//! Are ARB fragment programs v1.0 supported?
-		EVDF_ARB_FRAGMENT_PROGRAM_1,
-
-		//! Is GLSL supported?
-		EVDF_ARB_GLSL,
-
-		//! Is HLSL supported?
-		EVDF_HLSL,
-
-		//! Are non-square textures supported?
-		EVDF_TEXTURE_NSQUARE,
-
-		//! Are non-power-of-two textures supported?
-		EVDF_TEXTURE_NPOT,
-
-		//! Are framebuffer objects supported?
-		EVDF_FRAMEBUFFER_OBJECT,
-
-		//! Are vertex buffer objects supported?
-		EVDF_VERTEX_BUFFER_OBJECT,
-
-		//! Supports Alpha To Coverage
-		EVDF_ALPHA_TO_COVERAGE,
-
-		//! Supports Color masks (disabling color planes in output)
-		EVDF_COLOR_MASK,
-
-		//! Supports multiple render targets at once
-		EVDF_MULTIPLE_RENDER_TARGETS,
-
-		//! Supports separate blend settings for multiple render targets
-		EVDF_MRT_BLEND,
-
-		//! Supports separate color masks for multiple render targets
-		EVDF_MRT_COLOR_MASK,
-
-		//! Supports separate blend functions for multiple render targets
-		EVDF_MRT_BLEND_FUNC,
-
-		//! Supports geometry shaders
-		EVDF_GEOMETRY_SHADER,
-
-		//! Supports occlusion queries
-		EVDF_OCCLUSION_QUERY,
-
-		//! Supports polygon offset/depth bias for avoiding z-fighting
-		EVDF_POLYGON_OFFSET,
-
-		//! Support for different blend functions. Without, only ADD is available
-		EVDF_BLEND_OPERATIONS,
-
-		//! Support for separate blending for RGB and Alpha.
-		EVDF_BLEND_SEPARATE,
-
-		//! Support for texture coord transformation via texture matrix
-		EVDF_TEXTURE_MATRIX,
-
-		//! Support for DXTn compressed textures.
-		EVDF_TEXTURE_COMPRESSED_DXT,
-
-		//! Support for PVRTC compressed textures.
-		EVDF_TEXTURE_COMPRESSED_PVRTC,
-
-		//! Support for PVRTC2 compressed textures.
-		EVDF_TEXTURE_COMPRESSED_PVRTC2,
-
-		//! Support for ETC1 compressed textures.
-		EVDF_TEXTURE_COMPRESSED_ETC1,
-
-		//! Support for ETC2 compressed textures.
-		EVDF_TEXTURE_COMPRESSED_ETC2,
-
-		//! Support for cube map textures.
-		EVDF_TEXTURE_CUBEMAP,
-
-		//! 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
-
+// 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
+{
+
+//! enumeration for querying features of the video driver.
+enum E_VIDEO_DRIVER_FEATURE
+{
+	//! Is driver able to render to a surface?
+	EVDF_RENDER_TO_TARGET = 0,
+
+	//! Is hardware transform and lighting supported?
+	EVDF_HARDWARE_TL,
+
+	//! Are multiple textures per material possible?
+	EVDF_MULTITEXTURE,
+
+	//! Is driver able to render with a bilinear filter applied?
+	EVDF_BILINEAR_FILTER,
+
+	//! Can the driver handle mip maps?
+	EVDF_MIP_MAP,
+
+	//! Can the driver update mip maps automatically?
+	EVDF_MIP_MAP_AUTO_UPDATE,
+
+	//! Are stencilbuffers switched on and does the device support stencil buffers?
+	EVDF_STENCIL_BUFFER,
+
+	//! Is Vertex Shader 1.1 supported?
+	EVDF_VERTEX_SHADER_1_1,
+
+	//! Is Vertex Shader 2.0 supported?
+	EVDF_VERTEX_SHADER_2_0,
+
+	//! Is Vertex Shader 3.0 supported?
+	EVDF_VERTEX_SHADER_3_0,
+
+	//! Is Pixel Shader 1.1 supported?
+	EVDF_PIXEL_SHADER_1_1,
+
+	//! Is Pixel Shader 1.2 supported?
+	EVDF_PIXEL_SHADER_1_2,
+
+	//! Is Pixel Shader 1.3 supported?
+	EVDF_PIXEL_SHADER_1_3,
+
+	//! Is Pixel Shader 1.4 supported?
+	EVDF_PIXEL_SHADER_1_4,
+
+	//! Is Pixel Shader 2.0 supported?
+	EVDF_PIXEL_SHADER_2_0,
+
+	//! Is Pixel Shader 3.0 supported?
+	EVDF_PIXEL_SHADER_3_0,
+
+	//! Are ARB vertex programs v1.0 supported?
+	EVDF_ARB_VERTEX_PROGRAM_1,
+
+	//! Are ARB fragment programs v1.0 supported?
+	EVDF_ARB_FRAGMENT_PROGRAM_1,
+
+	//! Is GLSL supported?
+	EVDF_ARB_GLSL,
+
+	//! Is HLSL supported?
+	EVDF_HLSL,
+
+	//! Are non-square textures supported?
+	EVDF_TEXTURE_NSQUARE,
+
+	//! Are non-power-of-two textures supported?
+	EVDF_TEXTURE_NPOT,
+
+	//! Are framebuffer objects supported?
+	EVDF_FRAMEBUFFER_OBJECT,
+
+	//! Are vertex buffer objects supported?
+	EVDF_VERTEX_BUFFER_OBJECT,
+
+	//! Supports Alpha To Coverage
+	EVDF_ALPHA_TO_COVERAGE,
+
+	//! Supports Color masks (disabling color planes in output)
+	EVDF_COLOR_MASK,
+
+	//! Supports multiple render targets at once
+	EVDF_MULTIPLE_RENDER_TARGETS,
+
+	//! Supports separate blend settings for multiple render targets
+	EVDF_MRT_BLEND,
+
+	//! Supports separate color masks for multiple render targets
+	EVDF_MRT_COLOR_MASK,
+
+	//! Supports separate blend functions for multiple render targets
+	EVDF_MRT_BLEND_FUNC,
+
+	//! Supports geometry shaders
+	EVDF_GEOMETRY_SHADER,
+
+	//! Supports occlusion queries
+	EVDF_OCCLUSION_QUERY,
+
+	//! Supports polygon offset/depth bias for avoiding z-fighting
+	EVDF_POLYGON_OFFSET,
+
+	//! Support for different blend functions. Without, only ADD is available
+	EVDF_BLEND_OPERATIONS,
+
+	//! Support for separate blending for RGB and Alpha.
+	EVDF_BLEND_SEPARATE,
+
+	//! Support for texture coord transformation via texture matrix
+	EVDF_TEXTURE_MATRIX,
+
+	//! 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

include/EDriverTypes.h

@@ -1,101 +1,44 @@
-// 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_DRIVER_TYPES_H_INCLUDED__
-#define __E_DRIVER_TYPES_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace video
-{
-
-	//! An enum for all types of drivers the Irrlicht Engine supports.
-	enum E_DRIVER_TYPE
-	{
-		//! Null driver, useful for applications to run the engine without visualization.
-		/** The null device is able to load textures, but does not
-		render and display any graphics. */
-		EDT_NULL,
-
-		//! The Irrlicht Engine Software renderer.
-		/** Runs on all platforms, with every hardware. It should only
-		be used for 2d graphics, but it can also perform some primitive
-		3d functions. These 3d drawing functions are quite fast, but
-		very inaccurate, and don't even support clipping in 3D mode. */
-		EDT_SOFTWARE,
-
-		//! The Burning's Software Renderer, an alternative software renderer
-		/** Basically it can be described as the Irrlicht Software
-		renderer on steroids. It rasterizes 3D geometry perfectly: It
-		is able to perform correct 3d clipping, perspective correct
-		texture mapping, perspective correct color mapping, and renders
-		sub pixel correct, sub texel correct primitives. In addition,
-		it does bilinear texel filtering and supports more materials
-		than the EDT_SOFTWARE driver. This renderer has been written
-		entirely by Thomas Alten, thanks a lot for this huge
-		contribution. */
-		EDT_BURNINGSVIDEO,
-
-		//! Direct3D8 device is longer supported in Irrlicht. You have to go back to Irrlicht 1.8 if you still need that.
-		DEPRECATED_EDT_DIRECT3D8_NO_LONGER_EXISTS, // keep enum to avoid breaking enumeration order (might be used in ini-files, serialization, etc)
-
-		//! Direct3D 9 device, only available on Win32 platforms.
-		/** Performs hardware accelerated rendering of 3D and 2D
-		primitives. */
-		EDT_DIRECT3D9,
-
-		//! OpenGL device, available on most platforms.
-		/** Performs hardware accelerated rendering of 3D and 2D
-		primitives. */
-		EDT_OPENGL,
-
-        //! OpenGL-ES 1.x driver, for embedded and mobile systems
-		EDT_OGLES1,
-
-		//! OpenGL-ES 2.x driver, for embedded and mobile systems
-		/** Supports shaders etc. */
-		EDT_OGLES2,
-
-		//! WebGL1 friendly subset of OpenGL-ES 2.x driver for Emscripten
-		EDT_WEBGL1,
-
-		//! No driver, just for counting the elements
-		EDT_COUNT
-	};
-
-	const c8* const DRIVER_TYPE_NAMES[] =
-	{
-		"NullDriver",
-		"Software Renderer",
-		"Burning's Video",
-		"Direct3D 8.1",
-		"Direct3D 9.0c",
-		"OpenGL 1.x/2.x/3.x",
-		"OpenGL ES1",
-		"OpenGL ES2",
-		"WebGL 1",
-		0
-	};
-
-	const c8* const DRIVER_TYPE_NAMES_SHORT[] =
-	{
-		"null",
-		"software",
-		"burning",
-		"d3d8",
-		"d3d9",
-		"opengl",
-		"ogles1",
-		"ogles2",
-		"webgl1",
-		0
-	};
-
-} // end namespace video
-} // end namespace irr
-
-
-#endif
+// 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
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! An enum for all types of drivers the Irrlicht Engine supports.
+enum E_DRIVER_TYPE
+{
+	//! Null driver, useful for applications to run the engine without visualization.
+	/** The null device is able to load textures, but does not
+	render and display any graphics. */
+	EDT_NULL,
+
+	//! OpenGL device, available on most platforms.
+	/** Performs hardware accelerated rendering of 3D and 2D
+	primitives. */
+	EDT_OPENGL,
+
+	//! OpenGL-ES 1.x driver, for embedded and mobile systems
+	EDT_OGLES1,
+
+	//! OpenGL-ES 2.x driver, for embedded and mobile systems
+	/** Supports shaders etc. */
+	EDT_OGLES2,
+
+	//! WebGL1 friendly subset of OpenGL-ES 2.x driver for Emscripten
+	EDT_WEBGL1,
+
+	EDT_OPENGL3,
+
+	//! No driver, just for counting the elements
+	EDT_COUNT
+};
+
+} // end namespace video
+} // end namespace irr

include/EFocusFlags.h

@@ -1,38 +1,34 @@
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef E_FOCUS_FLAGS_H_INCLUDED__
-#define E_FOCUS_FLAGS_H_INCLUDED__
-
-namespace irr
-{
-namespace gui
-{
-
-//! Bitflags for defining the the focus behavior of the gui
-// (all names start with SET as we might add REMOVE flags later to control that behavior as well)
-enum EFOCUS_FLAG
-{
-	//! When set the focus changes when the left mouse-button got clicked while over an element
-	EFF_SET_ON_LMOUSE_DOWN = 0x1,
-
-	//! When set the focus changes when the right mouse-button got clicked while over an element
-	//! Note that elements usually don't care about right-click and that won't change with this flag
-	//! This is mostly to allow taking away focus from elements with right-mouse additionally.
-	EFF_SET_ON_RMOUSE_DOWN = 0x2,
-
-	//! When set the focus changes when the mouse-cursor is over an element
-	EFF_SET_ON_MOUSE_OVER = 0x4,
-
-	//! When set the focus can be changed with TAB-key combinations.
-	EFF_SET_ON_TAB = 0x8,
-
-	//! When set it's possible to set the focus to disabled elements.
-	EFF_CAN_FOCUS_DISABLED = 0x16
-};
-
-} // namespace gui
-} // namespace irr
-
-#endif
-
+// 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 gui
+{
+
+//! Bitflags for defining the the focus behavior of the gui
+// (all names start with SET as we might add REMOVE flags later to control that behavior as well)
+enum EFOCUS_FLAG
+{
+	//! When set the focus changes when the left mouse-button got clicked while over an element
+	EFF_SET_ON_LMOUSE_DOWN = 0x1,
+
+	//! When set the focus changes when the right mouse-button got clicked while over an element
+	//! Note that elements usually don't care about right-click and that won't change with this flag
+	//! This is mostly to allow taking away focus from elements with right-mouse additionally.
+	EFF_SET_ON_RMOUSE_DOWN = 0x2,
+
+	//! When set the focus changes when the mouse-cursor is over an element
+	EFF_SET_ON_MOUSE_OVER = 0x4,
+
+	//! When set the focus can be changed with TAB-key combinations.
+	EFF_SET_ON_TAB = 0x8,
+
+	//! When set it's possible to set the focus to disabled elements.
+	EFF_CAN_FOCUS_DISABLED = 0x16
+};
+
+} // namespace gui
+} // namespace irr

include/EGUIAlignment.h

@@ -1,39 +1,35 @@
-// 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_GUI_ALIGNMENT_H_INCLUDED__
-#define __E_GUI_ALIGNMENT_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace gui
-{
-enum EGUI_ALIGNMENT
-{
-	//! Aligned to parent's top or left side (default)
-	EGUIA_UPPERLEFT=0,
-	//! Aligned to parent's bottom or right side
-	EGUIA_LOWERRIGHT,
-	//! Aligned to the center of parent
-	EGUIA_CENTER,
-	//! Stretched to fit parent
-	EGUIA_SCALE
-};
-
-//! Names for alignments
-const c8* const GUIAlignmentNames[] =
-{
-	"upperLeft",
-	"lowerRight",
-	"center",
-	"scale",
-	0
-};
-
-} // namespace gui
-} // namespace irr
-
-#endif // __E_GUI_ALIGNMENT_H_INCLUDED__
+// 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
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace gui
+{
+enum EGUI_ALIGNMENT
+{
+	//! Aligned to parent's top or left side (default)
+	EGUIA_UPPERLEFT = 0,
+	//! Aligned to parent's bottom or right side
+	EGUIA_LOWERRIGHT,
+	//! Aligned to the center of parent
+	EGUIA_CENTER,
+	//! Stretched to fit parent
+	EGUIA_SCALE
+};
+
+//! Names for alignments
+const c8 *const GUIAlignmentNames[] = {
+		"upperLeft",
+		"lowerRight",
+		"center",
+		"scale",
+		0,
+	};
+
+} // namespace gui
+} // namespace irr

include/EGUIElementTypes.h

@@ -1,141 +1,133 @@
-// 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_GUI_ELEMENT_TYPES_H_INCLUDED__
-#define __E_GUI_ELEMENT_TYPES_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace gui
-{
-
-//! List of all basic Irrlicht GUI elements.
-/** An IGUIElement returns this when calling IGUIElement::getType(); */
-enum EGUI_ELEMENT_TYPE
-{
-	//! A button (IGUIButton)
-	EGUIET_BUTTON = 0,
-
-	//! A check box (IGUICheckBox)
-	EGUIET_CHECK_BOX,
-
-	//! A combo box (IGUIComboBox)
-	EGUIET_COMBO_BOX,
-
-	//! A context menu (IGUIContextMenu)
-	EGUIET_CONTEXT_MENU,
-
-	//! A menu (IGUIMenu)
-	EGUIET_MENU,
-
-	//! An edit box (IGUIEditBox)
-	EGUIET_EDIT_BOX,
-
-	//! A file open dialog (IGUIFileOpenDialog)
-	EGUIET_FILE_OPEN_DIALOG,
-
-	//! A color select open dialog (IGUIColorSelectDialog)
-	EGUIET_COLOR_SELECT_DIALOG,
-
-	//! A in/out fader (IGUIInOutFader)
-	EGUIET_IN_OUT_FADER,
-
-	//! An image (IGUIImage)
-	EGUIET_IMAGE,
-
-	//! A list box (IGUIListBox)
-	EGUIET_LIST_BOX,
-
-	//! A mesh viewer (IGUIMeshViewer)
-	EGUIET_MESH_VIEWER,
-
-	//! A message box (IGUIWindow)
-	EGUIET_MESSAGE_BOX,
-
-	//! A modal screen
-	EGUIET_MODAL_SCREEN,
-
-	//! A scroll bar (IGUIScrollBar)
-	EGUIET_SCROLL_BAR,
-
-	//! A spin box (IGUISpinBox)
-	EGUIET_SPIN_BOX,
-
-	//! A static text (IGUIStaticText)
-	EGUIET_STATIC_TEXT,
-
-	//! A tab (IGUITab)
-	EGUIET_TAB,
-
-	//! A tab control
-	EGUIET_TAB_CONTROL,
-
-	//! A Table
-	EGUIET_TABLE,
-
-	//! A tool bar (IGUIToolBar)
-	EGUIET_TOOL_BAR,
-
-	//! A Tree View
-	EGUIET_TREE_VIEW,
-
-	//! A window
-	EGUIET_WINDOW,
-
-	//! Unknown type.
-	EGUIET_ELEMENT,
-
-	//! The root of the GUI
-	EGUIET_ROOT,
-
-	//! Not an element, amount of elements in there
-	EGUIET_COUNT,
-
-	//! This enum is never used, it only forces the compiler to compile this enumeration to 32 bit.
-	EGUIET_FORCE_32_BIT = 0x7fffffff
-
-};
-
-//! Names for built-in element types
-const c8* const GUIElementTypeNames[] =
-{
-	"button",
-	"checkBox",
-	"comboBox",
-	"contextMenu",
-	"menu",
-	"editBox",
-	"fileOpenDialog",
-	"colorSelectDialog",
-	"inOutFader",
-	"image",
-	"listBox",
-	"meshViewer",
-	"messageBox",
-	"modalScreen",
-	"scrollBar",
-	"spinBox",
-	"staticText",
-	"tab",
-	"tabControl",
-	"table",
-	"toolBar",
-	"treeview",
-	"window",
-	"element",
-	"root",
-	"profiler",
-	0
-};
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-
-
-
-
+// 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
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! List of all basic Irrlicht GUI elements.
+/** An IGUIElement returns this when calling IGUIElement::getType(); */
+enum EGUI_ELEMENT_TYPE
+{
+	//! A button (IGUIButton)
+	EGUIET_BUTTON = 0,
+
+	//! A check box (IGUICheckBox)
+	EGUIET_CHECK_BOX,
+
+	//! A combo box (IGUIComboBox)
+	EGUIET_COMBO_BOX,
+
+	//! A context menu (IGUIContextMenu)
+	EGUIET_CONTEXT_MENU,
+
+	//! A menu (IGUIMenu)
+	EGUIET_MENU,
+
+	//! An edit box (IGUIEditBox)
+	EGUIET_EDIT_BOX,
+
+	//! A file open dialog (IGUIFileOpenDialog)
+	EGUIET_FILE_OPEN_DIALOG,
+
+	//! A color select open dialog (IGUIColorSelectDialog)
+	EGUIET_COLOR_SELECT_DIALOG,
+
+	//! A in/out fader (IGUIInOutFader)
+	EGUIET_IN_OUT_FADER,
+
+	//! An image (IGUIImage)
+	EGUIET_IMAGE,
+
+	//! A list box (IGUIListBox)
+	EGUIET_LIST_BOX,
+
+	//! A mesh viewer (IGUIMeshViewer)
+	EGUIET_MESH_VIEWER,
+
+	//! A message box (IGUIWindow)
+	EGUIET_MESSAGE_BOX,
+
+	//! A modal screen
+	EGUIET_MODAL_SCREEN,
+
+	//! A scroll bar (IGUIScrollBar)
+	EGUIET_SCROLL_BAR,
+
+	//! A spin box (IGUISpinBox)
+	EGUIET_SPIN_BOX,
+
+	//! A static text (IGUIStaticText)
+	EGUIET_STATIC_TEXT,
+
+	//! A tab (IGUITab)
+	EGUIET_TAB,
+
+	//! A tab control
+	EGUIET_TAB_CONTROL,
+
+	//! A Table
+	EGUIET_TABLE,
+
+	//! A tool bar (IGUIToolBar)
+	EGUIET_TOOL_BAR,
+
+	//! A Tree View
+	EGUIET_TREE_VIEW,
+
+	//! A window
+	EGUIET_WINDOW,
+
+	//! Unknown type.
+	EGUIET_ELEMENT,
+
+	//! The root of the GUI
+	EGUIET_ROOT,
+
+	//! Not an element, amount of elements in there
+	EGUIET_COUNT,
+
+	//! This enum is never used, it only forces the compiler to compile this enumeration to 32 bit.
+	EGUIET_FORCE_32_BIT = 0x7fffffff
+
+};
+
+//! Names for built-in element types
+const c8 *const GUIElementTypeNames[] = {
+		"button",
+		"checkBox",
+		"comboBox",
+		"contextMenu",
+		"menu",
+		"editBox",
+		"fileOpenDialog",
+		"colorSelectDialog",
+		"inOutFader",
+		"image",
+		"listBox",
+		"meshViewer",
+		"messageBox",
+		"modalScreen",
+		"scrollBar",
+		"spinBox",
+		"staticText",
+		"tab",
+		"tabControl",
+		"table",
+		"toolBar",
+		"treeview",
+		"window",
+		"element",
+		"root",
+		"profiler",
+		0,
+	};
+
+} // end namespace gui
+} // end namespace irr

include/EHardwareBufferFlags.h

@@ -1,44 +1,40 @@
-// 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_HARDWARE_BUFFER_FLAGS_INCLUDED__
-#define __E_HARDWARE_BUFFER_FLAGS_INCLUDED__
-
-namespace irr
-{
-namespace scene
-{
-
-	enum E_HARDWARE_MAPPING
-	{
-		//! Don't store on the hardware
-		EHM_NEVER=0,
-
-		//! Rarely changed, usually stored completely on the hardware
-		EHM_STATIC,
-
-		//! Sometimes changed, driver optimized placement
-		EHM_DYNAMIC,
-
-		//! Always changed, cache optimizing on the GPU
-		EHM_STREAM
-	};
-
-	enum E_BUFFER_TYPE
-	{
-		//! Does not change anything
-		EBT_NONE=0,
-		//! Change the vertex mapping
-		EBT_VERTEX,
-		//! Change the index mapping
-		EBT_INDEX,
-		//! Change both vertex and index mapping to the same value
-		EBT_VERTEX_AND_INDEX
-	};
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-
+// 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 scene
+{
+
+enum E_HARDWARE_MAPPING
+{
+	//! Don't store on the hardware
+	EHM_NEVER = 0,
+
+	//! Rarely changed, usually stored completely on the hardware
+	EHM_STATIC,
+
+	//! Sometimes changed, driver optimized placement
+	EHM_DYNAMIC,
+
+	//! Always changed, cache optimizing on the GPU
+	EHM_STREAM
+};
+
+enum E_BUFFER_TYPE
+{
+	//! Does not change anything
+	EBT_NONE = 0,
+	//! Change the vertex mapping
+	EBT_VERTEX,
+	//! Change the index mapping
+	EBT_INDEX,
+	//! Change both vertex and index mapping to the same value
+	EBT_VERTEX_AND_INDEX
+};
+
+} // end namespace scene
+} // end namespace irr

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

@@ -1,163 +1,74 @@
-// 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_TYPES_H_INCLUDED__
-#define __E_MATERIAL_TYPES_H_INCLUDED__
-
-namespace irr
-{
-namespace video
-{
-
-	//! Abstracted and easy to use fixed function/programmable pipeline material modes.
-	enum E_MATERIAL_TYPE
-	{
-		//! Standard solid material.
-		/** Only first texture is used, which is supposed to be the
-		diffuse material. */
-		EMT_SOLID = 0,
-
-		//! Solid material with 2 texture layers.
-		/** The second is blended onto the first using the alpha value
-		of the vertex colors. This material is currently not implemented in OpenGL.
-		*/
-		EMT_SOLID_2_LAYER,
-
-		//! Material type with standard lightmap technique
-		/** There should be 2 textures: The first texture layer is a
-		diffuse map, the second is a light map. Dynamic light is
-		ignored. */
-		EMT_LIGHTMAP,
-
-		//! Material type with lightmap technique like EMT_LIGHTMAP.
-		/** But lightmap and diffuse texture are added instead of modulated. */
-		EMT_LIGHTMAP_ADD,
-
-		//! Material type with standard lightmap technique
-		/** There should be 2 textures: The first texture layer is a
-		diffuse map, the second is a light map. Dynamic light is
-		ignored. The texture colors are effectively multiplied by 2
-		for brightening. Like known in DirectX as D3DTOP_MODULATE2X. */
-		EMT_LIGHTMAP_M2,
-
-		//! Material type with standard lightmap technique
-		/** There should be 2 textures: The first texture layer is a
-		diffuse map, the second is a light map. Dynamic light is
-		ignored. The texture colors are effectively multiplied by 4
-		for brightening. Like known in DirectX as D3DTOP_MODULATE4X. */
-		EMT_LIGHTMAP_M4,
-
-		//! Like EMT_LIGHTMAP, but also supports dynamic lighting.
-		EMT_LIGHTMAP_LIGHTING,
-
-		//! Like EMT_LIGHTMAP_M2, but also supports dynamic lighting.
-		EMT_LIGHTMAP_LIGHTING_M2,
-
-		//! Like EMT_LIGHTMAP_M4, but also supports dynamic lighting.
-		EMT_LIGHTMAP_LIGHTING_M4,
-
-		//! Detail mapped material.
-		/** The first texture is diffuse color map, the second is added
-		to this and usually displayed with a bigger scale value so that
-		it adds more detail. The detail map is added to the diffuse map
-		using ADD_SIGNED, so that it is possible to add and subtract
-		color from the diffuse map. For example a value of
-		(127,127,127) will not change the appearance of the diffuse map
-		at all. Often used for terrain rendering. */
-		EMT_DETAIL_MAP,
-
-		//! Look like a reflection of the environment around it.
-		/** To make this possible, a texture called 'sphere map' is
-		used, which must be set as the first texture. */
-		EMT_SPHERE_MAP,
-
-		//! A reflecting material with an optional non reflecting texture layer.
-		/** The reflection map should be set as first texture. */
-		EMT_REFLECTION_2_LAYER,
-
-		//! A transparent material.
-		/** Only the first texture is used. The new color is calculated
-		by simply adding the source color and the dest color. This
-		means if for example a billboard using a texture with black
-		background and a red circle on it is drawn with this material,
-		the result is that only the red circle will be drawn a little
-		bit transparent, and everything which was black is 100%
-		transparent and not visible. This material type is useful for
-		particle effects. */
-		EMT_TRANSPARENT_ADD_COLOR,
-
-		//! Makes the material transparent based on the texture alpha channel.
-		/** The final color is blended together from the destination
-		color and the texture color, using the alpha channel value as
-		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
-	};
-
-} // end namespace video
-} // end namespace irr
-
-
-#endif // __E_MATERIAL_TYPES_H_INCLUDED__
-
+// 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
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! Abstracted and easy to use fixed function/programmable pipeline material modes.
+enum E_MATERIAL_TYPE
+{
+	//! Standard solid material.
+	/** Only first texture is used, which is supposed to be the
+	diffuse material. */
+	EMT_SOLID = 0,
+
+	//! 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,
+
+	//! 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",
+		"trans_alphach",
+		"trans_alphach_ref",
+		"trans_vertex_alpha",
+		"onetexture_blend",
+		0,
+	};
+
+constexpr u32 numBuiltInMaterials =
+		sizeof(sBuiltInMaterialTypeNames) / sizeof(char *) - 1;
+
+} // end namespace video
+} // end namespace irr

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

@@ -1,61 +1,43 @@
-// 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_PRIMITIVE_TYPES_H_INCLUDED__
-#define __E_PRIMITIVE_TYPES_H_INCLUDED__
-
-namespace irr
-{
-namespace scene
-{
-
-	//! Enumeration for all primitive types there are.
-	enum E_PRIMITIVE_TYPE
-	{
-		//! All vertices are non-connected points.
-		EPT_POINTS=0,
-
-		//! All vertices form a single connected line.
-		EPT_LINE_STRIP,
-
-		//! Just as LINE_STRIP, but the last and the first vertex is also connected.
-		EPT_LINE_LOOP,
-
-		//! Every two vertices are connected creating n/2 lines.
-		EPT_LINES,
-
-		//! After the first two vertices each vertex defines a new triangle.
-		//! Always the two last and the new one form a new triangle.
-		EPT_TRIANGLE_STRIP,
-
-		//! After the first two vertices each vertex defines a new triangle.
-		//! All around the common first vertex.
-		EPT_TRIANGLE_FAN,
-
-		//! Explicitly set all vertices for each triangle.
-		EPT_TRIANGLES,
-
-		//! After the first two vertices each further two vertices create a quad with the preceding two.
-		//! Not supported by Direct3D
-		EPT_QUAD_STRIP,
-
-		//! Every four vertices create a quad.
-		//! Not supported by Direct3D
-		//! Deprecated with newer OpenGL drivers
-		EPT_QUADS,
-
-		//! Just as LINE_LOOP, but filled.
-		//! Not supported by Direct3D
-		//! Deprecated with newer OpenGL drivers
-		EPT_POLYGON,
-
-		//! The single vertices are expanded to quad billboards on the GPU.
-		EPT_POINT_SPRITES
-	};
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-
+// 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 scene
+{
+
+//! Enumeration for all primitive types there are.
+enum E_PRIMITIVE_TYPE
+{
+	//! All vertices are non-connected points.
+	EPT_POINTS = 0,
+
+	//! All vertices form a single connected line.
+	EPT_LINE_STRIP,
+
+	//! Just as LINE_STRIP, but the last and the first vertex is also connected.
+	EPT_LINE_LOOP,
+
+	//! Every two vertices are connected creating n/2 lines.
+	EPT_LINES,
+
+	//! After the first two vertices each vertex defines a new triangle.
+	//! Always the two last and the new one form a new triangle.
+	EPT_TRIANGLE_STRIP,
+
+	//! After the first two vertices each vertex defines a new triangle.
+	//! All around the common first vertex.
+	EPT_TRIANGLE_FAN,
+
+	//! Explicitly set all vertices for each triangle.
+	EPT_TRIANGLES,
+
+	//! The single vertices are expanded to quad billboards on the GPU.
+	EPT_POINT_SPRITES
+};
+
+} // end namespace scene
+} // end namespace irr

include/EReadFileType.h

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

include/ESceneNodeTypes.h

@@ -1,56 +1,49 @@
-// 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_SCENE_NODE_TYPES_H_INCLUDED__
-#define __E_SCENE_NODE_TYPES_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace scene
-{
-
-	//! An enumeration for all types of built-in scene nodes
-	/** A scene node type is represented by a four character code
-	such as 'cube' or 'mesh' instead of simple numbers, to avoid
-	name clashes with external scene nodes.*/
-	enum ESCENE_NODE_TYPE
-	{
-		//! of type CSceneManager (note that ISceneManager is not(!) an ISceneNode)
-		ESNT_SCENE_MANAGER  = MAKE_IRR_ID('s','m','n','g'),
-
-		//! Mesh Scene Node
-		ESNT_MESH           = MAKE_IRR_ID('m','e','s','h'),
-
-		//! Empty Scene Node
-		ESNT_EMPTY          = MAKE_IRR_ID('e','m','t','y'),
-
-		//! Dummy Transformation Scene Node
-		ESNT_DUMMY_TRANSFORMATION = MAKE_IRR_ID('d','m','m','y'),
-
-		//! Camera Scene Node
-		ESNT_CAMERA         = MAKE_IRR_ID('c','a','m','_'),
-
-		//! Billboard Scene Node
-		ESNT_BILLBOARD      = MAKE_IRR_ID('b','i','l','l'),
-
-		//! Animated Mesh Scene Node
-		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','_')
-	};
-
-
-
-} // end namespace scene
-} // end namespace irr
-
-
-#endif
-
+// 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
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! An enumeration for all types of built-in scene nodes
+/** A scene node type is represented by a four character code
+such as 'cube' or 'mesh' instead of simple numbers, to avoid
+name clashes with external scene nodes.*/
+enum ESCENE_NODE_TYPE
+{
+	//! of type CSceneManager (note that ISceneManager is not(!) an ISceneNode)
+	ESNT_SCENE_MANAGER = MAKE_IRR_ID('s', 'm', 'n', 'g'),
+
+	//! Mesh Scene Node
+	ESNT_MESH = MAKE_IRR_ID('m', 'e', 's', 'h'),
+
+	//! Empty Scene Node
+	ESNT_EMPTY = MAKE_IRR_ID('e', 'm', 't', 'y'),
+
+	//! Dummy Transformation Scene Node
+	ESNT_DUMMY_TRANSFORMATION = MAKE_IRR_ID('d', 'm', 'm', 'y'),
+
+	//! Camera Scene Node
+	ESNT_CAMERA = MAKE_IRR_ID('c', 'a', 'm', '_'),
+
+	//! Billboard Scene Node
+	ESNT_BILLBOARD = MAKE_IRR_ID('b', 'i', 'l', 'l'),
+
+	//! Animated Mesh Scene Node
+	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', '_')
+};
+
+} // end namespace scene
+} // end namespace irr

include/EShaderTypes.h

@@ -1,90 +1,85 @@
-#ifndef __E_SHADER_TYPES_H_INCLUDED__
-#define __E_SHADER_TYPES_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace video
-{
-
-//! Compile target enumeration for the addHighLevelShaderMaterial() method.
-enum E_VERTEX_SHADER_TYPE
-{
-	EVST_VS_1_1 = 0,
-	EVST_VS_2_0,
-	EVST_VS_2_a,
-	EVST_VS_3_0,
-	EVST_VS_4_0,
-	EVST_VS_4_1,
-	EVST_VS_5_0,
-
-	//! This is not a type, but a value indicating how much types there are.
-	EVST_COUNT
-};
-
-//! Names for all vertex shader types, each entry corresponds to a E_VERTEX_SHADER_TYPE entry.
-const c8* const VERTEX_SHADER_TYPE_NAMES[] = {
-	"vs_1_1",
-	"vs_2_0",
-	"vs_2_a",
-	"vs_3_0",
-	"vs_4_0",
-	"vs_4_1",
-	"vs_5_0",
-	0 };
-
-//! Compile target enumeration for the addHighLevelShaderMaterial() method.
-enum E_PIXEL_SHADER_TYPE
-{
-	EPST_PS_1_1 = 0,
-	EPST_PS_1_2,
-	EPST_PS_1_3,
-	EPST_PS_1_4,
-	EPST_PS_2_0,
-	EPST_PS_2_a,
-	EPST_PS_2_b,
-	EPST_PS_3_0,
-	EPST_PS_4_0,
-	EPST_PS_4_1,
-	EPST_PS_5_0,
-
-	//! This is not a type, but a value indicating how much types there are.
-	EPST_COUNT
-};
-
-//! Names for all pixel shader types, each entry corresponds to a E_PIXEL_SHADER_TYPE entry.
-const c8* const PIXEL_SHADER_TYPE_NAMES[] = {
-	"ps_1_1",
-	"ps_1_2",
-	"ps_1_3",
-	"ps_1_4",
-	"ps_2_0",
-	"ps_2_a",
-	"ps_2_b",
-	"ps_3_0",
-	"ps_4_0",
-	"ps_4_1",
-	"ps_5_0",
-	0 };
-
-//! Enum for supported geometry shader types
-enum E_GEOMETRY_SHADER_TYPE
-{
-	EGST_GS_4_0 = 0,
-
-	//! This is not a type, but a value indicating how much types there are.
-	EGST_COUNT
-};
-
-//! String names for supported geometry shader types
-const c8* const GEOMETRY_SHADER_TYPE_NAMES[] = {
-	"gs_4_0",
-	0 };
-
-
-} // end namespace video
-} // end namespace irr
-
-#endif // __E_SHADER_TYPES_H_INCLUDED__
-
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! Compile target enumeration for the addHighLevelShaderMaterial() method.
+enum E_VERTEX_SHADER_TYPE
+{
+	EVST_VS_1_1 = 0,
+	EVST_VS_2_0,
+	EVST_VS_2_a,
+	EVST_VS_3_0,
+	EVST_VS_4_0,
+	EVST_VS_4_1,
+	EVST_VS_5_0,
+
+	//! This is not a type, but a value indicating how much types there are.
+	EVST_COUNT
+};
+
+//! Names for all vertex shader types, each entry corresponds to a E_VERTEX_SHADER_TYPE entry.
+const c8 *const VERTEX_SHADER_TYPE_NAMES[] = {
+		"vs_1_1",
+		"vs_2_0",
+		"vs_2_a",
+		"vs_3_0",
+		"vs_4_0",
+		"vs_4_1",
+		"vs_5_0",
+		0};
+
+//! Compile target enumeration for the addHighLevelShaderMaterial() method.
+enum E_PIXEL_SHADER_TYPE
+{
+	EPST_PS_1_1 = 0,
+	EPST_PS_1_2,
+	EPST_PS_1_3,
+	EPST_PS_1_4,
+	EPST_PS_2_0,
+	EPST_PS_2_a,
+	EPST_PS_2_b,
+	EPST_PS_3_0,
+	EPST_PS_4_0,
+	EPST_PS_4_1,
+	EPST_PS_5_0,
+
+	//! This is not a type, but a value indicating how much types there are.
+	EPST_COUNT
+};
+
+//! Names for all pixel shader types, each entry corresponds to a E_PIXEL_SHADER_TYPE entry.
+const c8 *const PIXEL_SHADER_TYPE_NAMES[] = {
+		"ps_1_1",
+		"ps_1_2",
+		"ps_1_3",
+		"ps_1_4",
+		"ps_2_0",
+		"ps_2_a",
+		"ps_2_b",
+		"ps_3_0",
+		"ps_4_0",
+		"ps_4_1",
+		"ps_5_0",
+		0};
+
+//! Enum for supported geometry shader types
+enum E_GEOMETRY_SHADER_TYPE
+{
+	EGST_GS_4_0 = 0,
+
+	//! This is not a type, but a value indicating how much types there are.
+	EGST_COUNT
+};
+
+//! String names for supported geometry shader types
+const c8 *const GEOMETRY_SHADER_TYPE_NAMES[] = {
+		"gs_4_0",
+		0};
+
+} // end namespace video
+} // end namespace irr

include/EVertexAttributes.h

@@ -1,38 +1,34 @@
-#ifndef __E_VERTEX_ATTRIBUTES_H_INCLUDED__
-#define __E_VERTEX_ATTRIBUTES_H_INCLUDED__
-
-namespace irr
-{
-namespace video
-{
-
-//! Enumeration for all vertex attributes there are.
-enum E_VERTEX_ATTRIBUTES
-{
-	EVA_POSITION = 0,
-	EVA_NORMAL,
-	EVA_COLOR,
-	EVA_TCOORD0,
-	EVA_TCOORD1,
-	EVA_TANGENT,
-	EVA_BINORMAL,
-	EVA_COUNT
-};
-
-//! Array holding the built in vertex attribute names
-const char* const sBuiltInVertexAttributeNames[] =
-{
-	"inVertexPosition",
-	"inVertexNormal",
-	"inVertexColor",
-	"inTexCoord0",
-	"inTexCoord1",
-	"inVertexTangent",
-	"inVertexBinormal",
-	0
-};
-
-} // end namespace video
-} // end namespace irr
-
-#endif //__E_VERTEX_ATTRIBUTES_H_INCLUDED__
+#pragma once
+
+namespace irr
+{
+namespace video
+{
+
+//! Enumeration for all vertex attributes there are.
+enum E_VERTEX_ATTRIBUTES
+{
+	EVA_POSITION = 0,
+	EVA_NORMAL,
+	EVA_COLOR,
+	EVA_TCOORD0,
+	EVA_TCOORD1,
+	EVA_TANGENT,
+	EVA_BINORMAL,
+	EVA_COUNT
+};
+
+//! Array holding the built in vertex attribute names
+const char *const sBuiltInVertexAttributeNames[] = {
+		"inVertexPosition",
+		"inVertexNormal",
+		"inVertexColor",
+		"inTexCoord0",
+		"inTexCoord1",
+		"inVertexTangent",
+		"inVertexBinormal",
+		0,
+	};
+
+} // end namespace video
+} // end namespace irr

include/IAnimatedMesh.h

@@ -1,74 +1,69 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_ANIMATED_MESH_H_INCLUDED__
-#define __I_ANIMATED_MESH_H_INCLUDED__
-
-#include "aabbox3d.h"
-#include "IMesh.h"
-
-namespace irr
-{
-namespace scene
-{
-	//! Interface for an animated mesh.
-	/** 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 might want to use irr::scene::SAnimatedMesh, irr::scene::SMesh,
-	irr::scene::SMeshBuffer etc. */
-	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
-		{
-			return EAMT_UNKNOWN;
-		}
-	};
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "aabbox3d.h"
+#include "IMesh.h"
+
+namespace irr
+{
+namespace scene
+{
+//! Interface for an animated mesh.
+/** 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 might want to use irr::scene::SAnimatedMesh, irr::scene::SMesh,
+irr::scene::SMeshBuffer etc. */
+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
+	{
+		return EAMT_UNKNOWN;
+	}
+};
+
+} // end namespace scene
+} // end namespace irr

include/IAnimatedMeshSceneNode.h

@@ -1,177 +1,169 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
-#define __I_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
-
-#include "ISceneNode.h"
-#include "IBoneSceneNode.h"
-#include "IAnimatedMesh.h"
-
-namespace irr
-{
-namespace scene
-{
-	enum E_JOINT_UPDATE_ON_RENDER
-	{
-		//! do nothing
-		EJUOR_NONE = 0,
-
-		//! get joints positions from the mesh (for attached nodes, etc)
-		EJUOR_READ,
-
-		//! control joint positions in the mesh (eg. ragdolls, or set the animation from animateJoints() )
-		EJUOR_CONTROL
-	};
-
-
-	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;
-	};
-
-	//! Scene node capable of displaying an animated mesh.
-	class IAnimatedMeshSceneNode : public ISceneNode
-	{
-	public:
-
-		//! Constructor
-		IAnimatedMeshSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
-			const core::vector3df& position = core::vector3df(0,0,0),
-			const core::vector3df& rotation = core::vector3df(0,0,0),
-			const core::vector3df& scale = core::vector3df(1.0f, 1.0f, 1.0f))
-			: ISceneNode(parent, mgr, id, position, rotation, scale) {}
-
-		//! Destructor
-		virtual ~IAnimatedMeshSceneNode() {}
-
-		//! Sets the current frame number.
-		/** From now on the animation is played from this frame.
-		\param frame: Number of the frame to let the animation be started from.
-		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.
-		/** The default is 0 to getFrameCount()-1 of the mesh.
-		Number of played frames is end-start.
-		It interpolates toward the last frame but stops when it is reached.
-		It does not interpolate back to start even when looping.
-		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;
-
-		//! Sets the speed with which the animation is played.
-		/** \param framesPerSecond: Frames per second played. */
-		virtual void setAnimationSpeed(f32 framesPerSecond) = 0;
-
-		//! Gets the speed with which the animation is played.
-		/** \return Frames per second played. */
-		virtual f32 getAnimationSpeed() const =0;
-
-		//! Get a pointer to a joint in the mesh (if the mesh is a bone based mesh).
-		/** With this method it is possible to attach scene nodes to
-		joints for example possible to attach a weapon to the left hand
-		of an animated model. This example shows how:
-		\code
-		ISceneNode* hand =
-			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
-		virtual IBoneSceneNode* getJointNode(u32 jointID) = 0;
-
-		//! Gets joint count.
-		/** \return Amount of joints in the mesh. */
-		virtual u32 getJointCount() const = 0;
-
-		//! Returns the currently displayed frame number.
-		virtual f32 getFrameNr() const = 0;
-		//! Returns the current start frame number.
-		virtual s32 getStartFrame() const = 0;
-		//! Returns the current end frame number.
-		virtual s32 getEndFrame() const = 0;
-
-		//! Sets looping mode which is on by default.
-		/** If set to false, animations will not be played looped. */
-		virtual void setLoopMode(bool playAnimationLooped) = 0;
-
-		//! returns the current loop mode
-		/** When true the animations are played looped */
-		virtual bool getLoopMode() const = 0;
-
-		//! Sets a callback interface which will be called if an animation playback has ended.
-		/** Set this to 0 to disable the callback again.
-		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.
-		/** In this way it is possible to change the materials a mesh
-		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
-		virtual bool isReadOnlyMaterials() const = 0;
-
-		//! Sets a new mesh
-		virtual void setMesh(IAnimatedMesh* mesh) = 0;
-
-		//! Returns the current mesh
-		virtual IAnimatedMesh* getMesh(void) = 0;
-
-		//! Set how the joints should be updated on render
-		virtual void setJointMode(E_JOINT_UPDATE_ON_RENDER mode)=0;
-
-		//! Sets the transition time in seconds
-		/** 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;
-
-		//! 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
-
+// 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
+
+#include "ISceneNode.h"
+#include "IBoneSceneNode.h"
+#include "IAnimatedMesh.h"
+
+namespace irr
+{
+namespace scene
+{
+enum E_JOINT_UPDATE_ON_RENDER
+{
+	//! do nothing
+	EJUOR_NONE = 0,
+
+	//! get joints positions from the mesh (for attached nodes, etc)
+	EJUOR_READ,
+
+	//! control joint positions in the mesh (eg. ragdolls, or set the animation from animateJoints() )
+	EJUOR_CONTROL
+};
+
+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;
+};
+
+//! Scene node capable of displaying an animated mesh.
+class IAnimatedMeshSceneNode : public ISceneNode
+{
+public:
+	//! Constructor
+	IAnimatedMeshSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f)) :
+			ISceneNode(parent, mgr, id, position, rotation, scale) {}
+
+	//! Destructor
+	virtual ~IAnimatedMeshSceneNode() {}
+
+	//! Sets the current frame number.
+	/** From now on the animation is played from this frame.
+	\param frame: Number of the frame to let the animation be started from.
+	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.
+	/** The default is 0 to getFrameCount()-1 of the mesh.
+	Number of played frames is end-start.
+	It interpolates toward the last frame but stops when it is reached.
+	It does not interpolate back to start even when looping.
+	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;
+
+	//! Sets the speed with which the animation is played.
+	/** \param framesPerSecond: Frames per second played. */
+	virtual void setAnimationSpeed(f32 framesPerSecond) = 0;
+
+	//! Gets the speed with which the animation is played.
+	/** \return Frames per second played. */
+	virtual f32 getAnimationSpeed() const = 0;
+
+	//! Get a pointer to a joint in the mesh (if the mesh is a bone based mesh).
+	/** With this method it is possible to attach scene nodes to
+	joints for example possible to attach a weapon to the left hand
+	of an animated model. This example shows how:
+	\code
+	ISceneNode* hand =
+		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
+	virtual IBoneSceneNode *getJointNode(u32 jointID) = 0;
+
+	//! Gets joint count.
+	/** \return Amount of joints in the mesh. */
+	virtual u32 getJointCount() const = 0;
+
+	//! Returns the currently displayed frame number.
+	virtual f32 getFrameNr() const = 0;
+	//! Returns the current start frame number.
+	virtual s32 getStartFrame() const = 0;
+	//! Returns the current end frame number.
+	virtual s32 getEndFrame() const = 0;
+
+	//! Sets looping mode which is on by default.
+	/** If set to false, animations will not be played looped. */
+	virtual void setLoopMode(bool playAnimationLooped) = 0;
+
+	//! returns the current loop mode
+	/** When true the animations are played looped */
+	virtual bool getLoopMode() const = 0;
+
+	//! Sets a callback interface which will be called if an animation playback has ended.
+	/** Set this to 0 to disable the callback again.
+	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.
+	/** In this way it is possible to change the materials a mesh
+	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
+	virtual bool isReadOnlyMaterials() const = 0;
+
+	//! Sets a new mesh
+	virtual void setMesh(IAnimatedMesh *mesh) = 0;
+
+	//! Returns the current mesh
+	virtual IAnimatedMesh *getMesh(void) = 0;
+
+	//! Set how the joints should be updated on render
+	virtual void setJointMode(E_JOINT_UPDATE_ON_RENDER mode) = 0;
+
+	//! Sets the transition time in seconds
+	/** 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;
+
+	//! 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

include/IAttributes.h

@@ -1,157 +1,125 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_ATTRIBUTES_H_INCLUDED__
-#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"
-
-namespace irr
-{
-namespace video
-{
-	class ITexture;
-} // end namespace video
-namespace io
-{
-
-//! Provides a generic interface for attributes and their values and the possibility to serialize them
-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;
-
-	//! Returns the type of an attribute
-	//! \param attributeName: Name for the attribute
-	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;
-
-	//! Returns attribute index from name, -1 if not found
-	virtual s32 findAttribute(const c8* attributeName) const = 0;
-
-	//! Removes all attributes
-	virtual void clear() = 0;
-
-
-	/*
-
-		Integer Attribute
-
-	*/
-
-	//! Adds an attribute as integer
-	virtual void addInt(const c8* attributeName, s32 value) = 0;
-
-	//! Sets an attribute as integer value
-	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;
-
-	//! Gets an attribute as integer value
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual s32 getAttributeAsInt(s32 index) const = 0;
-
-	//! Sets an attribute as integer value
-	virtual void setAttribute(s32 index, s32 value) = 0;
-
-	/*
-
-		Float Attribute
-
-	*/
-
-	//! Adds an attribute as float
-	virtual void addFloat(const c8* attributeName, f32 value) = 0;
-
-	//! Sets a attribute as float value
-	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;
-
-	//! Gets an attribute as float value
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual f32 getAttributeAsFloat(s32 index) const = 0;
-
-	//! 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;
-
-	//! Sets an attribute as boolean value
-	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;
-
-	//! Gets an attribute as boolean value
-	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual bool getAttributeAsBool(s32 index) const = 0;
-
-	//! Sets an attribute as boolean value
-	virtual void setAttribute(s32 index, bool value) = 0;
-
-};
-
-} // end namespace io
-} // end namespace irr
-
-#endif
+// 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
+
+#include "IReferenceCounted.h"
+#include "EAttributes.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;
+} // end namespace video
+namespace io
+{
+
+//! Provides a generic interface for attributes and their values and the possibility to serialize them
+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;
+
+	//! Returns the type of an attribute
+	//! \param attributeName: Name for the attribute
+	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 if an attribute with a name exists
+	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;
+
+	//! Removes all attributes
+	virtual void clear() = 0;
+
+	/*
+
+		Integer Attribute
+
+	*/
+
+	//! Adds an attribute as integer
+	virtual void addInt(const c8 *attributeName, s32 value) = 0;
+
+	//! Sets an attribute as integer value
+	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;
+
+	//! Gets an attribute as integer value
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	virtual s32 getAttributeAsInt(s32 index) const = 0;
+
+	//! Sets an attribute as integer value
+	virtual void setAttribute(s32 index, s32 value) = 0;
+
+	/*
+
+		Float Attribute
+
+	*/
+
+	//! Adds an attribute as float
+	virtual void addFloat(const c8 *attributeName, f32 value) = 0;
+
+	//! Sets a attribute as float value
+	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;
+
+	//! Gets an attribute as float value
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	virtual f32 getAttributeAsFloat(s32 index) const = 0;
+
+	//! 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;
+
+	//! Sets an attribute as boolean value
+	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;
+
+	//! Gets an attribute as boolean value
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	virtual bool getAttributeAsBool(s32 index) const = 0;
+
+	//! Sets an attribute as boolean value
+	virtual void setAttribute(s32 index, bool value) = 0;
+};
+
+} // end namespace io
+} // end namespace irr

include/IBillboardSceneNode.h

@@ -1,96 +1,90 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_BILLBOARD_SCENE_NODE_H_INCLUDED__
-#define __I_BILLBOARD_SCENE_NODE_H_INCLUDED__
-
-#include "ISceneNode.h"
-
-namespace irr
-{
-namespace scene
-{
-	class ICameraSceneNode;
-	class IMeshBuffer;
-
-//! A billboard scene node.
-/** A billboard is like a 3d sprite: A 2d element,
-which always looks to the camera. It is usually used for explosions, fire,
-lensflares, particles and things like that.
-*/
-class IBillboardSceneNode : public ISceneNode
-{
-public:
-
-	//! Constructor
-	IBillboardSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
-		const core::vector3df& position = core::vector3df(0,0,0))
-		: ISceneNode(parent, mgr, id, position) {}
-
-	//! Sets the size of the billboard, making it rectangular.
-	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.
-	\param[in] bottomEdgeWidth The width of the bottom edge of the billboard.
-	\param[in] topEdgeWidth The width of the top edge of the billboard.
-	*/
-	virtual void setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth) = 0;
-
-	//! Returns the size of the billboard.
-	/** This will return the width of the bottom edge of the billboard.
-	Use getWidths() to retrieve the bottom and top edges independently.
-	\return Size of the billboard.
-	*/
-	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;
-
-	//! Set the color of all vertices of the billboard
-	/** \param[in] overallColor Color to set */
-	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,
-			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,
-			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.
-	    That is why the usual getBoundingBox will return a "safe" boundingbox which is guaranteed
-	    to contain the billboard. While this function can return the real one. */
-	virtual const core::aabbox3d<f32>& getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode* camera) = 0;
-
-	//! Get the amount of mesh buffers.
-	/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
-	virtual u32 getMeshBufferCount() const = 0;
-
-	//! Get pointer to a mesh buffer.
-	/** NOTE: Positions and normals of this meshbuffers are re-calculated before rendering.
-	So this is mainly useful to access/modify the uv-coordinates.
-	\param nr: Zero based index of the mesh buffer.
-	\return Pointer to the mesh buffer or 0 if there is no such	mesh buffer. */
-	virtual IMeshBuffer* getMeshBuffer(u32 nr) const = 0;
-};
-
-} // end namespace scene
-} // end namespace irr
-
-
-#endif
-
+// 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
+
+#include "ISceneNode.h"
+
+namespace irr
+{
+namespace scene
+{
+class ICameraSceneNode;
+class IMeshBuffer;
+
+//! A billboard scene node.
+/** A billboard is like a 3d sprite: A 2d element,
+which always looks to the camera. It is usually used for explosions, fire,
+lensflares, particles and things like that.
+*/
+class IBillboardSceneNode : public ISceneNode
+{
+public:
+	//! Constructor
+	IBillboardSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0)) :
+			ISceneNode(parent, mgr, id, position) {}
+
+	//! Sets the size of the billboard, making it rectangular.
+	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.
+	\param[in] bottomEdgeWidth The width of the bottom edge of the billboard.
+	\param[in] topEdgeWidth The width of the top edge of the billboard.
+	*/
+	virtual void setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth) = 0;
+
+	//! Returns the size of the billboard.
+	/** This will return the width of the bottom edge of the billboard.
+	Use getWidths() to retrieve the bottom and top edges independently.
+	\return Size of the billboard.
+	*/
+	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;
+
+	//! Set the color of all vertices of the billboard
+	/** \param[in] overallColor Color to set */
+	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,
+			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,
+			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.
+		That is why the usual getBoundingBox will return a "safe" boundingbox which is guaranteed
+		to contain the billboard. While this function can return the real one. */
+	virtual const core::aabbox3d<f32> &getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode *camera) = 0;
+
+	//! Get the amount of mesh buffers.
+	/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
+	virtual u32 getMeshBufferCount() const = 0;
+
+	//! Get pointer to a mesh buffer.
+	/** NOTE: Positions and normals of this meshbuffers are re-calculated before rendering.
+	So this is mainly useful to access/modify the uv-coordinates.
+	\param nr: Zero based index of the mesh buffer.
+	\return Pointer to the mesh buffer or 0 if there is no such	mesh buffer. */
+	virtual IMeshBuffer *getMeshBuffer(u32 nr) const = 0;
+};
+
+} // end namespace scene
+} // end namespace irr

include/IBoneSceneNode.h

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

include/ICameraSceneNode.h

@@ -1,189 +1,184 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_CAMERA_SCENE_NODE_H_INCLUDED__
-#define __I_CAMERA_SCENE_NODE_H_INCLUDED__
-
-#include "ISceneNode.h"
-#include "IEventReceiver.h"
-
-namespace irr
-{
-namespace scene
-{
-	struct SViewFrustum;
-
-	//! Scene Node which is a (controllable) camera.
-	/** The whole scene will be rendered from the cameras point of view.
-	Because the ICameraSceneNode is a SceneNode, it can be attached to any
-	other scene node, and will follow its parents movement, rotation and so
-	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).
-		*/
-		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
-		{
-			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
-
+// 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
+
+#include "ISceneNode.h"
+#include "IEventReceiver.h"
+
+namespace irr
+{
+namespace scene
+{
+struct SViewFrustum;
+
+//! Scene Node which is a (controllable) camera.
+/** The whole scene will be rendered from the cameras point of view.
+Because the ICameraSceneNode is a SceneNode, it can be attached to any
+other scene node, and will follow its parents movement, rotation and so
+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).
+	*/
+	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
+	{
+		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

include/IContextManager.h

@@ -1,63 +1,59 @@
-// Copyright (C) 2013-2015 Patryk Nadrowski
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
-#define __IRR_I_CONTEXT_MANAGER_H_INCLUDED__
-
-#include "SExposedVideoData.h"
-#include "SIrrCreationParameters.h"
-#include <string>
-
-namespace irr
-{
-namespace video
-{
-	// For system specific window contexts (used for OpenGL)
-	class IContextManager : public virtual IReferenceCounted
-	{
-	public:
-        //! Initialize manager with device creation parameters and device window (passed as exposed video data)
-        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
-        virtual void terminate() =0;
-
-        //! Create surface based on current window set
-        virtual bool generateSurface() =0;
-
-        //! Destroy current surface
-        virtual void destroySurface() =0;
-
-        //! Create context based on current surface
-        virtual bool generateContext() =0;
-
-        //! Destroy current context
-        virtual void destroyContext() =0;
-
-		//! Get current context
-		virtual const SExposedVideoData& getContext() const =0;
-
-		//! 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.
-		//                            When false: resets the context when videoData is set to 0 values.
-		/** This is mostly used internally by IVideoDriver::beginScene().
-			But if you want to switch threads which access your OpenGL driver you will have to
-			call this function as follows:
-			Old thread gives up context with: activateContext(irr::video::SExposedVideoData());
-			New thread takes over context with: activateContext(videoDriver->getExposedVideoData());
-			Note that only 1 thread at a time may access an OpenGL context.	*/
-		virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero=false) =0;
-
-		//! Get the address of any OpenGL procedure (including core procedures).
-		virtual void* getProcAddress(const std::string &procName) =0;
-
-        //! Swap buffers.
-        virtual bool swapBuffers() =0;
-	};
-
-} // end namespace video
-} // end namespace irr
-
-
-#endif
+// Copyright (C) 2013-2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "SExposedVideoData.h"
+#include "SIrrCreationParameters.h"
+#include <string>
+
+namespace irr
+{
+namespace video
+{
+// For system specific window contexts (used for OpenGL)
+class IContextManager : public virtual IReferenceCounted
+{
+public:
+	//! Initialize manager with device creation parameters and device window (passed as exposed video data)
+	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
+	virtual void terminate() = 0;
+
+	//! Create surface based on current window set
+	virtual bool generateSurface() = 0;
+
+	//! Destroy current surface
+	virtual void destroySurface() = 0;
+
+	//! Create context based on current surface
+	virtual bool generateContext() = 0;
+
+	//! Destroy current context
+	virtual void destroyContext() = 0;
+
+	//! Get current context
+	virtual const SExposedVideoData &getContext() const = 0;
+
+	//! 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.
+	//                            When false: resets the context when videoData is set to 0 values.
+	/** This is mostly used internally by IVideoDriver::beginScene().
+		But if you want to switch threads which access your OpenGL driver you will have to
+		call this function as follows:
+		Old thread gives up context with: activateContext(irr::video::SExposedVideoData());
+		New thread takes over context with: activateContext(videoDriver->getExposedVideoData());
+		Note that only 1 thread at a time may access an OpenGL context.	*/
+	virtual bool activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero = false) = 0;
+
+	//! Get the address of any OpenGL procedure (including core procedures).
+	virtual void *getProcAddress(const std::string &procName) = 0;
+
+	//! Swap buffers.
+	virtual bool swapBuffers() = 0;
+};
+
+} // end namespace video
+} // end namespace irr

include/ICursorControl.h

@@ -1,202 +1,195 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_CURSOR_CONTROL_H_INCLUDED__
-#define __I_CURSOR_CONTROL_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "position2d.h"
-#include "rect.h"
-
-namespace irr
-{
-namespace gui
-{
-
-	class IGUISpriteBank;
-
-	//! Default icons for cursors
-	enum ECURSOR_ICON
-	{
-		// Following cursors might be system specific, or might use an Irrlicht icon-set. No guarantees so far.
-		ECI_NORMAL,	// arrow
-		ECI_CROSS,	// Crosshair
-		ECI_HAND,	// Hand
-		ECI_HELP,	// Arrow and question mark
-		ECI_IBEAM,	// typical text-selection cursor
-		ECI_NO,		// should not click icon
-		ECI_WAIT,	// hourclass
-		ECI_SIZEALL,	// arrow in all directions
-		ECI_SIZENESW,	// resizes in direction north-east or south-west
-		ECI_SIZENWSE,	// resizes in direction north-west or south-east
-		ECI_SIZENS,	// resizes in direction north or south
-		ECI_SIZEWE,	// resizes in direction west or east
-		ECI_UP,		// up-arrow
-
-		// 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
-		// additionally.
-
-		ECI_COUNT		// maximal of defined cursors. Note that higher values can be created at runtime
-	};
-
-	//! Names for ECURSOR_ICON
-	const c8* const GUICursorIconNames[ECI_COUNT+1] =
-	{
-		"normal",
-		"cross",
-		"hand",
-		"help",
-		"ibeam",
-		"no",
-		"wait",
-		"sizeall",
-		"sizenesw",
-		"sizenwse",
-		"sizens",
-		"sizewe",
-		"sizeup",
-		0
-	};
-
-	//! structure used to set sprites as cursors.
-	struct SCursorSprite
-	{
-		SCursorSprite()
-		: SpriteBank(0), SpriteId(-1)
-		{
-		}
-
-		SCursorSprite( gui::IGUISpriteBank * spriteBank, s32 spriteId, const core::position2d<s32> &hotspot=(core::position2d<s32>(0,0)) )
-		: SpriteBank(spriteBank), SpriteId(spriteId), HotSpot(hotspot)
-		{
-		}
-
-		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.
-		/** Update cursor positions only when the irrlicht timer has been updated or the timer is stopped.
-			This means you usually get one cursor update per device->run() which will be fine in most cases.
-			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.
-	class ICursorControl : public virtual IReferenceCounted
-	{
-	public:
-
-		//! Changes the visible state of the mouse cursor.
-		/** \param visible: The new visible state. If true, the cursor will be visible,
-		if false, it will be invisible. */
-		virtual void setVisible(bool visible) = 0;
-
-		//! Returns if the cursor is currently visible.
-		/** \return True if the cursor flag is set to visible, false if not. */
-		virtual bool isVisible() const = 0;
-
-		//! Sets the new position of the cursor.
-		/** The position must be
-		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 pos New position of the cursor. */
-		virtual void setPosition(const core::position2d<f32> &pos) = 0;
-
-		//! Sets the new position of the cursor.
-		/** The position must be
-		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.
-		/** \param pos: New position of the cursor. The coordinates are pixel units. */
-		virtual void setPosition(const core::position2d<s32> &pos) = 0;
-
-		//! Sets the new position of the cursor.
-		/** \param x New x-coord of the cursor. The coordinates are pixel units.
-		\param y New y-coord of the cursor. The coordinates are pixel units. */
-		virtual void setPosition(s32 x, s32 y) = 0;
-
-		//! Returns the current position of the mouse cursor.
-		/** \param updateCursor When true ask system/OS for current cursor position. 
-			When false return the last known (buffered) position ( this is useful to 
-			check what has become of a setPosition call with float numbers).
-		\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.
-		/** \param updateCursor When true ask system/OS for current cursor position. 
-			When false return the last known (buffered) position (this is 
-			useful to 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
-		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;
-
-		//! Sets an absolute reference rect for setting and retrieving the cursor position.
-		/** If this rect is set, the cursor position is not being calculated relative to
-		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;
-
-		//! Internally fixes the mouse position, and reports relative mouse movement compared to the old position 
-		/** Specific to SDL */
-		virtual void setRelativeMode(bool relative) {};
-
-		//! Sets the active cursor icon
-		/** Setting cursor icons is so far only supported on Win32 and Linux */
-		virtual void setActiveIcon(ECURSOR_ICON iconId) {}
-
-		//! Gets the currently active icon
-		virtual ECURSOR_ICON getActiveIcon() const { return gui::ECI_NORMAL; }
-
-		//! Add a custom sprite as cursor icon.
-		/** \return Identification for the icon */
-		virtual ECURSOR_ICON addIcon(const gui::SCursorSprite& icon) { return gui::ECI_NORMAL; }
-
-		//! replace a cursor icon.
-		/** 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) {}
-
-		//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
-		virtual core::dimension2di getSupportedIconSize() const { return core::dimension2di(0,0); }
-
-		//! Set platform specific behavior flags.
-		virtual void setPlatformBehavior(ECURSOR_PLATFORM_BEHAVIOR behavior) {}
-
-		//! 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
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "position2d.h"
+#include "rect.h"
+
+namespace irr
+{
+namespace gui
+{
+
+class IGUISpriteBank;
+
+//! Default icons for cursors
+enum ECURSOR_ICON
+{
+	// Following cursors might be system specific, or might use an Irrlicht icon-set. No guarantees so far.
+	ECI_NORMAL,   // arrow
+	ECI_CROSS,    // Crosshair
+	ECI_HAND,     // Hand
+	ECI_HELP,     // Arrow and question mark
+	ECI_IBEAM,    // typical text-selection cursor
+	ECI_NO,       // should not click icon
+	ECI_WAIT,     // hourglass
+	ECI_SIZEALL,  // arrow in all directions
+	ECI_SIZENESW, // resizes in direction north-east or south-west
+	ECI_SIZENWSE, // resizes in direction north-west or south-east
+	ECI_SIZENS,   // resizes in direction north or south
+	ECI_SIZEWE,   // resizes in direction west or east
+	ECI_UP,       // up-arrow
+
+	// 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
+	// additionally.
+
+	ECI_COUNT // maximal of defined cursors. Note that higher values can be created at runtime
+};
+
+//! Names for ECURSOR_ICON
+const c8 *const GUICursorIconNames[ECI_COUNT + 1] = {
+		"normal",
+		"cross",
+		"hand",
+		"help",
+		"ibeam",
+		"no",
+		"wait",
+		"sizeall",
+		"sizenesw",
+		"sizenwse",
+		"sizens",
+		"sizewe",
+		"sizeup",
+		0,
+	};
+
+//! structure used to set sprites as cursors.
+struct SCursorSprite
+{
+	SCursorSprite() :
+			SpriteBank(0), SpriteId(-1)
+	{
+	}
+
+	SCursorSprite(gui::IGUISpriteBank *spriteBank, s32 spriteId, const core::position2d<s32> &hotspot = (core::position2d<s32>(0, 0))) :
+			SpriteBank(spriteBank), SpriteId(spriteId), HotSpot(hotspot)
+	{
+	}
+
+	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.
+	/** Update cursor positions only when the irrlicht timer has been updated or the timer is stopped.
+		This means you usually get one cursor update per device->run() which will be fine in most cases.
+		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.
+class ICursorControl : public virtual IReferenceCounted
+{
+public:
+	//! Changes the visible state of the mouse cursor.
+	/** \param visible: The new visible state. If true, the cursor will be visible,
+	if false, it will be invisible. */
+	virtual void setVisible(bool visible) = 0;
+
+	//! Returns if the cursor is currently visible.
+	/** \return True if the cursor flag is set to visible, false if not. */
+	virtual bool isVisible() const = 0;
+
+	//! Sets the new position of the cursor.
+	/** The position must be
+	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 pos New position of the cursor. */
+	virtual void setPosition(const core::position2d<f32> &pos) = 0;
+
+	//! Sets the new position of the cursor.
+	/** The position must be
+	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.
+	/** \param pos: New position of the cursor. The coordinates are pixel units. */
+	virtual void setPosition(const core::position2d<s32> &pos) = 0;
+
+	//! Sets the new position of the cursor.
+	/** \param x New x-coord of the cursor. The coordinates are pixel units.
+	\param y New y-coord of the cursor. The coordinates are pixel units. */
+	virtual void setPosition(s32 x, s32 y) = 0;
+
+	//! Returns the current position of the mouse cursor.
+	/** \param updateCursor When true ask system/OS for current cursor position.
+		When false return the last known (buffered) position ( this is useful to
+		check what has become of a setPosition call with float numbers).
+	\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.
+	/** \param updateCursor When true ask system/OS for current cursor position.
+		When false return the last known (buffered) position (this is
+		useful to 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
+	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;
+
+	//! Sets an absolute reference rect for setting and retrieving the cursor position.
+	/** If this rect is set, the cursor position is not being calculated relative to
+	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;
+
+	//! Internally fixes the mouse position, and reports relative mouse movement compared to the old position
+	/** Specific to SDL */
+	virtual void setRelativeMode(bool relative){};
+
+	//! Sets the active cursor icon
+	/** Setting cursor icons is so far only supported on Win32 and Linux */
+	virtual void setActiveIcon(ECURSOR_ICON iconId) {}
+
+	//! Gets the currently active icon
+	virtual ECURSOR_ICON getActiveIcon() const { return gui::ECI_NORMAL; }
+
+	//! Add a custom sprite as cursor icon.
+	/** \return Identification for the icon */
+	virtual ECURSOR_ICON addIcon(const gui::SCursorSprite &icon) { return gui::ECI_NORMAL; }
+
+	//! replace a cursor icon.
+	/** 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) {}
+
+	//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
+	virtual core::dimension2di getSupportedIconSize() const { return core::dimension2di(0, 0); }
+
+	//! Set platform specific behavior flags.
+	virtual void setPlatformBehavior(ECURSOR_PLATFORM_BEHAVIOR behavior) {}
+
+	//! 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

include/IDummyTransformationSceneNode.h

@@ -1,42 +1,36 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
-#define __I_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
-
-#include "ISceneNode.h"
-
-namespace irr
-{
-namespace scene
-{
-
-//! Dummy scene node for adding additional transformations to the scene graph.
-/** This scene node does not render itself, and does not respond to set/getPosition,
-set/getRotation and set/getScale. Its just a simple scene node that takes a
-matrix as relative transformation, making it possible to insert any transformation
-anywhere into the scene graph.
-This scene node is for example used by the IAnimatedMeshSceneNode for emulating
-joint scene nodes when playing skeletal animations.
-*/
-class IDummyTransformationSceneNode : public ISceneNode
-{
-public:
-
-	//! Constructor
-	IDummyTransformationSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id)
-		: ISceneNode(parent, mgr, id) {}
-
-	//! Returns a reference to the current relative transformation matrix.
-	/** This is the matrix, this scene node uses instead of scale, translation
-	and rotation. */
-	virtual core::matrix4& getRelativeTransformationMatrix() = 0;
-};
-
-} // end namespace scene
-} // end namespace irr
-
-
-#endif
-
+// 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
+
+#include "ISceneNode.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! Dummy scene node for adding additional transformations to the scene graph.
+/** This scene node does not render itself, and does not respond to set/getPosition,
+set/getRotation and set/getScale. Its just a simple scene node that takes a
+matrix as relative transformation, making it possible to insert any transformation
+anywhere into the scene graph.
+This scene node is for example used by the IAnimatedMeshSceneNode for emulating
+joint scene nodes when playing skeletal animations.
+*/
+class IDummyTransformationSceneNode : public ISceneNode
+{
+public:
+	//! Constructor
+	IDummyTransformationSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id) :
+			ISceneNode(parent, mgr, id) {}
+
+	//! Returns a reference to the current relative transformation matrix.
+	/** This is the matrix, this scene node uses instead of scale, translation
+	and rotation. */
+	virtual core::matrix4 &getRelativeTransformationMatrix() = 0;
+};
+
+} // end namespace scene
+} // end namespace irr

include/IFileArchive.h

@@ -1,148 +1,127 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt/ Thomas Alten
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_FILE_ARCHIVE_H_INCLUDED__
-#define __I_FILE_ARCHIVE_H_INCLUDED__
-
-#include "IReadFile.h"
-#include "IFileList.h"
-
-namespace irr
-{
-
-namespace io
-{
-
-//! FileSystemType: which filesystem should be used for e.g. browsing
-enum EFileSystemType
-{
-	FILESYSTEM_NATIVE = 0,	// Native OS 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),
-
-	//! A gzip archive
-	EFAT_GZIP    = MAKE_IRR_ID('g','z','i','p'),
-
-	//! A virtual directory
-	EFAT_FOLDER  = MAKE_IRR_ID('f','l','d','r'),
-
-	//! An ID Software PAK archive
-	EFAT_PAK     = MAKE_IRR_ID('P','A','K', 0),
-
-	//! A Nebula Device archive
-	EFAT_NPK     = MAKE_IRR_ID('N','P','K', 0),
-
-	//! A Tape ARchive
-	EFAT_TAR     = MAKE_IRR_ID('T','A','R', 0),
-
-	//! A wad Archive, Quake2, Halflife
-	EFAT_WAD     = MAKE_IRR_ID('W','A','D', 0),
-
-    //! An Android asset file archive
-    EFAT_ANDROID_ASSET = MAKE_IRR_ID('A','S','S','E'),
-
-	//! The type of this archive is unknown
-	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;
-
-	//! 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;
-
-	//! 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;
-
-	//! 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;
-	
-	//! 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 
-	directory structure. In that case the user must add directories manually.
-	Currently this is necessary for archives of type EFAT_ANDROID_ASSET.
-	The root-path itself is already set by the engine.
-	If directories are not added manually opening files might still work,
-	but checks if file exists will fail.
-	*/
-	virtual void addDirectoryToFileList(const io::path &filename) {}
-
-	//! An optionally used password string
-	/** This variable is publicly accessible from the interface in order to
-	avoid single access patterns to this place, and hence allow some more
-	obscurity.
-	*/
-	core::stringc Password;
-};
-
-//! Class which is able to create an archive from a file.
-/** If you want the Irrlicht Engine be able to load archives of
-currently unsupported file formats (e.g .wad), then implement
-this and add your new Archive loader with
-IFileSystem::addArchiveLoader() to the engine. */
-class IArchiveLoader : public virtual IReferenceCounted
-{
-public:
-	//! Check if the file might be loaded by this class
-	/** 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;
-
-	//! 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;
-
-	//! 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;
-
-	//! 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;
-
-	//! 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;
-};
-
-
-} // end namespace io
-} // end namespace irr
-
-#endif
-
+// Copyright (C) 2002-2012 Nikolaus Gebhardt/ Thomas Alten
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReadFile.h"
+#include "IFileList.h"
+
+namespace irr
+{
+
+namespace io
+{
+
+//! FileSystemType: which filesystem should be used for e.g. browsing
+enum EFileSystemType
+{
+	FILESYSTEM_NATIVE = 0, // Native OS 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),
+
+	//! A gzip archive
+	EFAT_GZIP = MAKE_IRR_ID('g', 'z', 'i', 'p'),
+
+	//! 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')
+};
+
+//! 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;
+
+	//! 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;
+
+	//! 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;
+
+	//! 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;
+
+	//! 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
+	directory structure. In that case the user must add directories manually.
+	Currently this is necessary for archives of type EFAT_ANDROID_ASSET.
+	The root-path itself is already set by the engine.
+	If directories are not added manually opening files might still work,
+	but checks if file exists will fail.
+	*/
+	virtual void addDirectoryToFileList(const io::path &filename) {}
+
+	//! An optionally used password string
+	/** This variable is publicly accessible from the interface in order to
+	avoid single access patterns to this place, and hence allow some more
+	obscurity.
+	*/
+	core::stringc Password;
+};
+
+//! Class which is able to create an archive from a file.
+/** If you want the Irrlicht Engine be able to load archives of
+currently unsupported file formats (e.g .wad), then implement
+this and add your new Archive loader with
+IFileSystem::addArchiveLoader() to the engine. */
+class IArchiveLoader : public virtual IReferenceCounted
+{
+public:
+	//! Check if the file might be loaded by this class
+	/** 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;
+
+	//! 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;
+
+	//! 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;
+
+	//! 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;
+
+	//! 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;
+};
+
+} // end namespace io
+} // end namespace irr

include/IFileList.h

@@ -1,94 +1,89 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_FILE_LIST_H_INCLUDED__
-#define __I_FILE_LIST_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "path.h"
-
-namespace irr
-{
-namespace io
-{
-
-//! Provides a list of files and folders.
-/** File lists usually contain a list of all files in a given folder,
-but can also contain a complete directory structure. */
-class IFileList : public virtual IReferenceCounted
-{
-public:
-	//! Get the number of files in the filelist.
-	/** \return Amount of files and directories in the file list. */
-	virtual u32 getFileCount() const = 0;
-
-	//! Gets the name of a file in the list, based on an index.
-	/** The path is not included in this name. Use getFullFileName for this.
-	\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;
-
-	//! 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;
-
-	//! 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.
-	The index must be less than the amount getFileCount() returns.
-	\return The size of the file in bytes. */
-	virtual u32 getFileSize(u32 index) const = 0;
-
-	//! Returns the file offset 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.
-	The index must be less than the amount getFileCount() returns.
-	\return The offset of the file in bytes. */
-	virtual u32 getFileOffset(u32 index) const = 0;
-
-	//! Returns the ID of a file in the file list, based on an index.
-	/** This optional ID can be used to link the file list entry to information held
-	elsewhere. For example this could be an index in an IFileArchive, linking the entry
-	to its data offset, uncompressed size and CRC.
-	\param index is the zero based index of the file which should be returned.
-	The index must be less than the amount getFileCount() returns.
-	\return The ID of the file. */
-	virtual u32 getID(u32 index) const = 0;
-
-	//! Check if the file is a directory
-	/** \param index The zero based index which will be checked. The index
-	must be less than the amount getFileCount() returns.
-	\return True if the file is a directory, else false. */
-	virtual bool isDirectory(u32 index) const = 0;
-
-	//! Searches for a file or folder in the list
-	/** Searches for a file by name
-	\param filename The name of the file to search for.
-	\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;
-
-	//! Returns the base path of the file list
-	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.
-	\param isDirectory True if this is a directory rather than a file.
-	\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;
-
-	//! Sorts the file list. You should call this after adding any items to the file list
-	virtual void sort() = 0;
-};
-
-} // end namespace irr
-} // end namespace io
-
-
-#endif
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "path.h"
+
+namespace irr
+{
+namespace io
+{
+
+//! Provides a list of files and folders.
+/** File lists usually contain a list of all files in a given folder,
+but can also contain a complete directory structure. */
+class IFileList : public virtual IReferenceCounted
+{
+public:
+	//! Get the number of files in the filelist.
+	/** \return Amount of files and directories in the file list. */
+	virtual u32 getFileCount() const = 0;
+
+	//! Gets the name of a file in the list, based on an index.
+	/** The path is not included in this name. Use getFullFileName for this.
+	\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;
+
+	//! 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;
+
+	//! 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.
+	The index must be less than the amount getFileCount() returns.
+	\return The size of the file in bytes. */
+	virtual u32 getFileSize(u32 index) const = 0;
+
+	//! Returns the file offset 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.
+	The index must be less than the amount getFileCount() returns.
+	\return The offset of the file in bytes. */
+	virtual u32 getFileOffset(u32 index) const = 0;
+
+	//! Returns the ID of a file in the file list, based on an index.
+	/** This optional ID can be used to link the file list entry to information held
+	elsewhere. For example this could be an index in an IFileArchive, linking the entry
+	to its data offset, uncompressed size and CRC.
+	\param index is the zero based index of the file which should be returned.
+	The index must be less than the amount getFileCount() returns.
+	\return The ID of the file. */
+	virtual u32 getID(u32 index) const = 0;
+
+	//! Check if the file is a directory
+	/** \param index The zero based index which will be checked. The index
+	must be less than the amount getFileCount() returns.
+	\return True if the file is a directory, else false. */
+	virtual bool isDirectory(u32 index) const = 0;
+
+	//! Searches for a file or folder in the list
+	/** Searches for a file by name
+	\param filename The name of the file to search for.
+	\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;
+
+	//! Returns the base path of the file list
+	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.
+	\param isDirectory True if this is a directory rather than a file.
+	\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;
+
+	//! Sorts the file list. You should call this after adding any items to the file list
+	virtual void sort() = 0;
+};
+
+} // end namespace irr
+} // end namespace io

include/IFileSystem.h

@@ -1,325 +1,265 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_FILE_SYSTEM_H_INCLUDED__
-#define __I_FILE_SYSTEM_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "IFileArchive.h"
-
-namespace irr
-{
-namespace video
-{
-	class IVideoDriver;
-} // end namespace video
-namespace io
-{
-
-class IReadFile;
-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
-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;
-
-	//! Creates an IReadFile interface for accessing memory like a file.
-	/** This allows you to use a pointer to memory where an IReadFile is requested.
-	\param memory: A pointer to the start of the file in memory
-	\param len: The length of the memory in bytes
-	\param fileName: The name given to this file
-	\param deleteMemoryWhenDropped: True if the memory should be deleted
-	along with the IReadFile when it is dropped.
-	\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* 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.
-	\param fileName: The name given to this file
-	\param alreadyOpenedFile: Pointer to the enclosing file
-	\param pos: Start of the file inside alreadyOpenedFile
-	\param areaSize: The length of the file
-	\return A pointer to the created file interface.
-	The returned pointer should be dropped when no longer needed.
-	See IReferenceCounted::drop() for more information.
-	*/
-	virtual IReadFile* createLimitReadFile(const path& fileName,
-			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.
-		You are responsible for allocating enough memory.
-	\param memory: A pointer to the start of the file in memory (allocated by you)
-	\param len: The length of the memory in bytes
-	\param fileName: The name given to this file
-	\param deleteMemoryWhenDropped: True if the memory should be deleted
-	along with the IWriteFile when it is dropped.
-	\return Pointer to the created file interface.
-	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;
-
-
-	//! Opens a file for write access.
-	/** \param filename: Name of file to open.
-	\param append: If the file already exist, all write operations are
-	appended to the file.
-	\return Pointer to the created file interface. 0 is returned, if the
-	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;
-
-	//! Adds an archive to the file system.
-	/** After calling this, the Irrlicht Engine will also search and open
-	files directly from this archive. 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 just renamed .zip files. By
-	default Irrlicht supports ZIP, PAK, TAR, PNK, and directories as
-	archives. You can provide your own archive types by implementing
-	IArchiveLoader and passing an instance to addArchiveLoader.
-	Irrlicht supports AES-encrypted zip files, and the advanced compression
-	techniques lzma and bzip2.
-	\param filename: Filename of the 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.
-	\param archiveType: If no specific E_FILE_ARCHIVE_TYPE is selected then
-	the type of archive will depend on the extension of the file name. If
-	you use a different extension then you can use this parameter to force
-	a specific type of archive.
-	\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,
-			bool ignorePaths=true,
-			E_FILE_ARCHIVE_TYPE archiveType=EFAT_UNKNOWN,
-			const core::stringc& password="",
-			IFileArchive** retArchive=0) =0;
-
-	//! Adds an archive to the file system.
-	/** After calling this, the Irrlicht Engine will also search and open
-	files directly from this archive. 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 just renamed .zip files. By
-	default Irrlicht supports ZIP, PAK, TAR, PNK, and directories as
-	archives. You can provide your own archive types by implementing
-	IArchiveLoader and passing an instance to addArchiveLoader.
-	Irrlicht supports AES-encrypted zip files, and the advanced compression
-	techniques lzma and bzip2.
-	If you want to add a directory as an archive, prefix its name with a
-	slash in order to let Irrlicht recognize it as a folder mount (mypath/).
-	Using this technique one can build up a search order, because archives
-	are read first, and can be used more easily with relative filenames.
-	\param file: 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.
-	\param archiveType: If no specific E_FILE_ARCHIVE_TYPE is selected then
-	the type of archive will depend on the extension of the file name. If
-	you use a different extension then you can use this parameter to force
-	a specific type of archive.
-	\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,
-			bool ignorePaths=true,
-			E_FILE_ARCHIVE_TYPE archiveType=EFAT_UNKNOWN,
-			const core::stringc& password="",
-			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;
-
-	//! Get the number of archives currently attached to the file system
-	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
-	close resources which have already been loaded and are now cached, for
-	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;
-
-	//! Removes an archive from the file system.
-	/** This will close the archive and free any file handles, but will not
-	close resources which have already been loaded and are now cached, for
-	example textures and meshes. Note that a relative filename might be
-	interpreted differently on each call, depending on the current working
-	directory. In case you want to remove an archive that was added using
-	a relative path name, you have to change to the same working directory
-	again. This means, that the filename given on creation is not an
-	identifier for the archive, but just a usual filename that is used for
-	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;
-
-	//! Removes an archive from the file system.
-	/** This will close the archive and free any file handles, but will not
-	close resources which have already been loaded and are now cached, for
-	example textures and meshes.
-	\param archive The archive to remove.
-	\return True on success, false on failure */
-	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;
-
-	//! Get the archive at a given index.
-	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;
-
-	//! Gets the number of archive loaders currently added
-	virtual u32 getArchiveLoaderCount() const = 0;
-
-	//! Retrieve the given archive loader
-	/** \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;
-
-	//! 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;
-
-	//! 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;
-
-	//! 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;
-
-	//! 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;
-
-	//! 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;
-
-	//! flatten a path and file name for example: "/you/me/../." becomes "/you"
-	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;
-
-	//! 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;
-
-	//! 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;
-
-	//! Set the active type of file system.
-	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;
-};
-
-
-} // end namespace io
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "IFileArchive.h"
+
+namespace irr
+{
+namespace video
+{
+class IVideoDriver;
+} // end namespace video
+namespace io
+{
+
+class IReadFile;
+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
+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;
+
+	//! Creates an IReadFile interface for accessing memory like a file.
+	/** This allows you to use a pointer to memory where an IReadFile is requested.
+	\param memory: A pointer to the start of the file in memory
+	\param len: The length of the memory in bytes
+	\param fileName: The name given to this file
+	\param deleteMemoryWhenDropped: True if the memory should be deleted
+	along with the IReadFile when it is dropped.
+	\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 *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.
+	\param fileName: The name given to this file
+	\param alreadyOpenedFile: Pointer to the enclosing file
+	\param pos: Start of the file inside alreadyOpenedFile
+	\param areaSize: The length of the file
+	\return A pointer to the created file interface.
+	The returned pointer should be dropped when no longer needed.
+	See IReferenceCounted::drop() for more information.
+	*/
+	virtual IReadFile *createLimitReadFile(const path &fileName,
+			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.
+		You are responsible for allocating enough memory.
+	\param memory: A pointer to the start of the file in memory (allocated by you)
+	\param len: The length of the memory in bytes
+	\param fileName: The name given to this file
+	\param deleteMemoryWhenDropped: True if the memory should be deleted
+	along with the IWriteFile when it is dropped.
+	\return Pointer to the created file interface.
+	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;
+
+	//! Opens a file for write access.
+	/** \param filename: Name of file to open.
+	\param append: If the file already exist, all write operations are
+	appended to the file.
+	\return Pointer to the created file interface. 0 is returned, if the
+	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;
+
+	//! Adds an archive to the file system.
+	/** After calling this, the Irrlicht Engine will also search and open
+	files directly from this archive. 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 just renamed .zip files. By
+	default Irrlicht supports ZIP, PAK, TAR, PNK, and directories as
+	archives. You can provide your own archive types by implementing
+	IArchiveLoader and passing an instance to addArchiveLoader.
+	Irrlicht supports AES-encrypted zip files, and the advanced compression
+	techniques lzma and bzip2.
+	\param filename: Filename of the 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.
+	\param archiveType: If no specific E_FILE_ARCHIVE_TYPE is selected then
+	the type of archive will depend on the extension of the file name. If
+	you use a different extension then you can use this parameter to force
+	a specific type of archive.
+	\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,
+			bool ignorePaths = true,
+			E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN,
+			const core::stringc &password = "",
+			IFileArchive **retArchive = 0) = 0;
+
+	//! Adds an archive to the file system.
+	/** After calling this, the Irrlicht Engine will also search and open
+	files directly from this archive. 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 just renamed .zip files. By
+	default Irrlicht supports ZIP, PAK, TAR, PNK, and directories as
+	archives. You can provide your own archive types by implementing
+	IArchiveLoader and passing an instance to addArchiveLoader.
+	Irrlicht supports AES-encrypted zip files, and the advanced compression
+	techniques lzma and bzip2.
+	If you want to add a directory as an archive, prefix its name with a
+	slash in order to let Irrlicht recognize it as a folder mount (mypath/).
+	Using this technique one can build up a search order, because archives
+	are read first, and can be used more easily with relative filenames.
+	\param file: 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.
+	\param archiveType: If no specific E_FILE_ARCHIVE_TYPE is selected then
+	the type of archive will depend on the extension of the file name. If
+	you use a different extension then you can use this parameter to force
+	a specific type of archive.
+	\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,
+			bool ignorePaths = true,
+			E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN,
+			const core::stringc &password = "",
+			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;
+
+	//! Get the number of archives currently attached to the file system
+	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
+	close resources which have already been loaded and are now cached, for
+	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;
+
+	//! Removes an archive from the file system.
+	/** This will close the archive and free any file handles, but will not
+	close resources which have already been loaded and are now cached, for
+	example textures and meshes. Note that a relative filename might be
+	interpreted differently on each call, depending on the current working
+	directory. In case you want to remove an archive that was added using
+	a relative path name, you have to change to the same working directory
+	again. This means, that the filename given on creation is not an
+	identifier for the archive, but just a usual filename that is used for
+	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;
+
+	//! Removes an archive from the file system.
+	/** This will close the archive and free any file handles, but will not
+	close resources which have already been loaded and are now cached, for
+	example textures and meshes.
+	\param archive The archive to remove.
+	\return True on success, false on failure */
+	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;
+
+	//! Get the archive at a given index.
+	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;
+
+	//! Gets the number of archive loaders currently added
+	virtual u32 getArchiveLoaderCount() const = 0;
+
+	//! Retrieve the given archive loader
+	/** \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;
+
+	//! Get the current working directory.
+	/** \return Current working directory as a string. */
+	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;
+
+	//! 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;
+
+	//! 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;
+
+	//! 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;
+
+	//! flatten a path and file name for example: "/you/me/../." becomes "/you"
+	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;
+
+	//! 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;
+
+	//! 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;
+
+	//! Set the active type of file system.
+	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;
+};
+
+} // end namespace io
+} // end namespace irr

include/IGPUProgrammingServices.h

@@ -1,455 +1,369 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
-#define __I_GPU_PROGRAMMING_SERVICES_H_INCLUDED__
-
-#include "EShaderTypes.h"
-#include "EMaterialTypes.h"
-#include "EPrimitiveTypes.h"
-#include "path.h"
-
-namespace irr
-{
-
-namespace io
-{
-	class IReadFile;
-} // end namespace io
-
-namespace video
-{
-
-class IVideoDriver;
-class IShaderConstantSetCallBack;
-
-//! Interface making it possible to create and use programs running on the GPU.
-class IGPUProgrammingServices
-{
-public:
-
-	//! Destructor
-	virtual ~IGPUProgrammingServices() {}
-
-	//! Adds a new high-level shading material renderer to the VideoDriver.
-	/** Currently only HLSL/D3D9 and GLSL/OpenGL are supported.
-	\param vertexShaderProgram String containing the source of the vertex
-	shader program. This can be 0 if no vertex program shall be used.
-	\param vertexShaderEntryPointName Name of the entry function of the
-	vertexShaderProgram (p.e. "main")
-	\param vsCompileTarget Vertex shader version the high level shader
-	shall be compiled to.
-	\param pixelShaderProgram String containing the source of the pixel
-	shader program. This can be 0 if no pixel shader shall be used.
-	\param pixelShaderEntryPointName Entry name of the function of the
-	pixelShaderProgram (p.e. "main")
-	\param psCompileTarget Pixel shader version the high level shader
-	shall be compiled to.
-	\param geometryShaderProgram String containing the source of the
-	geometry shader program. This can be 0 if no geometry shader shall be
-	used.
-	\param geometryShaderEntryPointName Entry name of the function of the
-	geometryShaderProgram (p.e. "main")
-	\param gsCompileTarget Geometry shader version the high level shader
-	shall be compiled to.
-	\param inType Type of vertices passed to geometry shader
-	\param outType Type of vertices created by geometry shader
-	\param verticesOut Maximal number of vertices created by geometry
-	shader. If 0, maximal number supported is assumed.
-	\param callback Pointer to an implementation of
-	IShaderConstantSetCallBack in which you can set the needed vertex,
-	pixel, and geometry 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 Number of the material type which can be set in
-	SMaterial::MaterialType to use the renderer. -1 is returned if an error
-	occurred, e.g. if a shader program could not be compiled or a 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 addHighLevelShaderMaterial(
-		const c8* vertexShaderProgram,
-		const c8* vertexShaderEntryPointName,
-		E_VERTEX_SHADER_TYPE vsCompileTarget,
-		const c8* pixelShaderProgram,
-		const c8* pixelShaderEntryPointName,
-		E_PIXEL_SHADER_TYPE psCompileTarget,
-		const c8* geometryShaderProgram,
-		const c8* geometryShaderEntryPointName = "main",
-		E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 verticesOut = 0,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0;
-
-	//! convenience function for use without geometry shaders
-	s32 addHighLevelShaderMaterial(
-		const c8* vertexShaderProgram,
-		const c8* vertexShaderEntryPointName="main",
-		E_VERTEX_SHADER_TYPE vsCompileTarget=EVST_VS_1_1,
-		const c8* pixelShaderProgram=0,
-		const c8* pixelShaderEntryPointName="main",
-		E_PIXEL_SHADER_TYPE psCompileTarget=EPST_PS_1_1,
-		IShaderConstantSetCallBack* callback=0,
-		E_MATERIAL_TYPE baseMaterial=video::EMT_SOLID,
-		s32 userData=0)
-	{
-		return addHighLevelShaderMaterial(
-			vertexShaderProgram, vertexShaderEntryPointName,
-			vsCompileTarget, pixelShaderProgram,
-			pixelShaderEntryPointName, psCompileTarget,
-			0, "main", EGST_GS_4_0,
-			scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
-			callback, baseMaterial, userData);
-	}
-
-	//! convenience function for use with many defaults, without geometry shader
-	/** All shader names are set to "main" and compile targets are shader
-	type 1.1.
-	*/
-	s32 addHighLevelShaderMaterial(
-		const c8* vertexShaderProgram,
-		const c8* pixelShaderProgram=0,
-		IShaderConstantSetCallBack* callback=0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData=0)
-	{
-		return addHighLevelShaderMaterial(
-			vertexShaderProgram, "main",
-			EVST_VS_1_1, pixelShaderProgram,
-			"main", EPST_PS_1_1,
-			0, "main", EGST_GS_4_0,
-			scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
-			callback, baseMaterial, userData);
-	}
-
-	//! convenience function for use with many defaults, with geometry shader
-	/** All shader names are set to "main" and compile targets are shader
-	type 1.1 and geometry shader 4.0.
-	*/
-	s32 addHighLevelShaderMaterial(
-		const c8* vertexShaderProgram,
-		const c8* pixelShaderProgram = 0,
-		const c8* geometryShaderProgram = 0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 verticesOut = 0,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0 )
-	{
-		return addHighLevelShaderMaterial(
-			vertexShaderProgram, "main",
-			EVST_VS_1_1, pixelShaderProgram,
-			"main", EPST_PS_1_1,
-			geometryShaderProgram, "main", EGST_GS_4_0,
-			inType, outType, verticesOut,
-			callback, baseMaterial, userData);
-	}
-
-	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
-	/** \param vertexShaderProgramFileName Text file containing the source
-	of the vertex shader program. Set to empty string if no vertex shader
-	shall be created.
-	\param vertexShaderEntryPointName Name of the entry function of the
-	vertexShaderProgram  (p.e. "main")
-	\param vsCompileTarget Vertex shader version the high level shader
-	shall be compiled to.
-	\param pixelShaderProgramFileName Text file containing the source of
-	the pixel shader program. Set to empty string if no pixel shader shall
-	be created.
-	\param pixelShaderEntryPointName Entry name of the function of the
-	pixelShaderProgram (p.e. "main")
-	\param psCompileTarget Pixel shader version the high level shader
-	shall be compiled to.
-	\param geometryShaderProgramFileName Name of the source of
-	the geometry shader program. Set to empty string if no geometry shader
-	shall be created.
-	\param geometryShaderEntryPointName Entry name of the function of the
-	geometryShaderProgram (p.e. "main")
-	\param gsCompileTarget Geometry shader version the high level shader
-	shall be compiled to.
-	\param inType Type of vertices passed to geometry shader
-	\param outType Type of vertices created by geometry shader
-	\param verticesOut Maximal number of vertices created by geometry
-	shader. If 0, maximal number supported is assumed.
-	\param callback Pointer to an implementation of
-	IShaderConstantSetCallBack in which you can set the needed vertex,
-	pixel, and geometry 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 Number of the material type which can be set in
-	SMaterial::MaterialType to use the renderer. -1 is returned if an error
-	occurred, e.g. if a shader program could not be compiled or a 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(
-		const io::path& vertexShaderProgramFileName,
-		const c8* vertexShaderEntryPointName,
-		E_VERTEX_SHADER_TYPE vsCompileTarget,
-		const io::path& pixelShaderProgramFileName,
-		const c8* pixelShaderEntryPointName,
-		E_PIXEL_SHADER_TYPE psCompileTarget,
-		const io::path& geometryShaderProgramFileName,
-		const c8* geometryShaderEntryPointName = "main",
-		E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 verticesOut = 0,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0;
-
-	//! convenience function for use without geometry shaders
-	s32 addHighLevelShaderMaterialFromFiles(
-		const io::path& vertexShaderProgramFileName,
-		const c8* vertexShaderEntryPointName = "main",
-		E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-		const io::path& pixelShaderProgramFileName = "",
-		const c8* pixelShaderEntryPointName = "main",
-		E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0)
-	{
-		return addHighLevelShaderMaterialFromFiles(
-			vertexShaderProgramFileName, vertexShaderEntryPointName,
-			vsCompileTarget, pixelShaderProgramFileName,
-			pixelShaderEntryPointName, psCompileTarget,
-			"", "main", EGST_GS_4_0,
-			scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
-			callback, baseMaterial, userData);
-	}
-
-	//! convenience function for use with many defaults, without geometry shader
-	/** All shader names are set to "main" and compile targets are shader
-	type 1.1.
-	*/
-	s32 addHighLevelShaderMaterialFromFiles(
-		const io::path& vertexShaderProgramFileName,
-		const io::path& pixelShaderProgramFileName = "",
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0 )
-	{
-		return addHighLevelShaderMaterialFromFiles(
-			vertexShaderProgramFileName, "main",
-			EVST_VS_1_1, pixelShaderProgramFileName,
-			"main", EPST_PS_1_1,
-			"", "main", EGST_GS_4_0,
-			scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
-			callback, baseMaterial, userData);
-	}
-
-	//! convenience function for use with many defaults, with geometry shader
-	/** All shader names are set to "main" and compile targets are shader
-	type 1.1 and geometry shader 4.0.
-	*/
-	s32 addHighLevelShaderMaterialFromFiles(
-		const io::path& vertexShaderProgramFileName,
-		const io::path& pixelShaderProgramFileName = "",
-		const io::path& geometryShaderProgramFileName = "",
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 verticesOut = 0,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0 )
-	{
-		return addHighLevelShaderMaterialFromFiles(
-			vertexShaderProgramFileName, "main",
-			EVST_VS_1_1, pixelShaderProgramFileName,
-			"main", EPST_PS_1_1,
-			geometryShaderProgramFileName, "main", EGST_GS_4_0,
-			inType, outType, verticesOut,
-			callback, baseMaterial, userData);
-	}
-
-	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
-	/** \param vertexShaderProgram Text file handle containing the source
-	of the vertex shader program. Set to 0 if no vertex shader shall be
-	created.
-	\param vertexShaderEntryPointName Name of the entry function of the
-	vertexShaderProgram
-	\param vsCompileTarget Vertex shader version the high level shader
-	shall be compiled to.
-	\param pixelShaderProgram Text file handle containing the source of
-	the pixel shader program. Set to 0 if no pixel shader shall be created.
-	\param pixelShaderEntryPointName Entry name of the function of the
-	pixelShaderProgram (p.e. "main")
-	\param psCompileTarget Pixel shader version the high level shader
-	shall be compiled to.
-	\param geometryShaderProgram Text file handle containing the source of
-	the geometry shader program. Set to 0 if no geometry shader shall be
-	created.
-	\param geometryShaderEntryPointName Entry name of the function of the
-	geometryShaderProgram (p.e. "main")
-	\param gsCompileTarget Geometry shader version the high level shader
-	shall be compiled to.
-	\param inType Type of vertices passed to geometry shader
-	\param outType Type of vertices created by geometry shader
-	\param verticesOut Maximal number of vertices created by geometry
-	shader. If 0, maximal number supported is assumed.
-	\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 Number of the material type which can be set in
-	SMaterial::MaterialType to use the renderer. -1 is returned if an
-	error occurred, e.g. if a shader program could not be compiled or a
-	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,
-		const c8* vertexShaderEntryPointName,
-		E_VERTEX_SHADER_TYPE vsCompileTarget,
-		io::IReadFile* pixelShaderProgram,
-		const c8* pixelShaderEntryPointName,
-		E_PIXEL_SHADER_TYPE psCompileTarget,
-		io::IReadFile* geometryShaderProgram,
-		const c8* geometryShaderEntryPointName = "main",
-		E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
-		scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
-		scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
-		u32 verticesOut = 0,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0;
-
-	//! convenience function for use without geometry shaders
-	s32 addHighLevelShaderMaterialFromFiles(
-		io::IReadFile* vertexShaderProgram,
-		const c8* vertexShaderEntryPointName = "main",
-		E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
-		io::IReadFile* pixelShaderProgram = 0,
-		const c8* pixelShaderEntryPointName = "main",
-		E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0)
-	{
-		return addHighLevelShaderMaterialFromFiles(
-			vertexShaderProgram, vertexShaderEntryPointName,
-			vsCompileTarget, pixelShaderProgram,
-			pixelShaderEntryPointName, psCompileTarget,
-			0, "main", EGST_GS_4_0,
-			scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
-			callback, baseMaterial, userData);
-	}
-
-	//! Adds a new ASM shader material renderer to the VideoDriver
-	/** Note that it is a good idea to call IVideoDriver::queryFeature() in
-	advance to check if the IVideoDriver supports the vertex and/or pixel
-	shader version your are using.
-
-	The material is added to the VideoDriver like with
-	IVideoDriver::addMaterialRenderer() and can be used like it had been
-	added with that method.
-	\param vertexShaderProgram String containing the source of the vertex
-	shader program. This can be 0 if no vertex program shall be used.
-
-	For DX8 programs, the will always input registers look like this: v0:
-	position, v1: normal, v2: color, v3: texture coordinates, v4: texture
-	coordinates 2 if available.
-
-	For DX9 programs, you can manually set the registers using the dcl_
-	statements.
-	\param pixelShaderProgram String containing the source of the pixel
-	shader program. This can be 0 if you don't want to use a pixel shader.
-	\param callback Pointer to an implementation of
-	IShaderConstantSetCallBack in which you can set the needed vertex and
-	pixel shader program constants. Set this to 0 if you don't need this.
-	\param baseMaterial Base material which renderstates will be used to
-	shade the material.
-	\param userData a user data int. This int can be set to any value and
-	will be set as parameter in the callback method when calling
-	OnSetConstants(). In this way it is easily possible to use the same
-	callback method for multiple materials and distinguish between them
-	during the call.
-	\return Returns the number of the material type which can be set in
-	SMaterial::MaterialType to use the renderer. -1 is returned if an
-	error occurred. -1 is returned for example if a vertex or pixel shader
-	program could not be compiled, the error strings are then printed out
-	into the error log, and can be caught with a custom event receiver. */
-	virtual s32 addShaderMaterial(const c8* vertexShaderProgram = 0,
-		const c8* pixelShaderProgram = 0,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0;
-
-	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
-	/** \param vertexShaderProgram Text file containing the source of the
-	vertex shader program. Set to 0 if no shader shall be created.
-	\param pixelShaderProgram Text file containing the source of the pixel
-	shader program. Set to 0 if no shader shall be created.
-	\param callback Pointer to an IShaderConstantSetCallback object to
-	which the OnSetConstants function is called.
-	\param baseMaterial baseMaterial
-	\param userData a user data int. This int can be set to any value and
-	will be set as parameter in the callback method when calling
-	OnSetConstants(). In this way it is easily possible to use the same
-	callback method for multiple materials and distinguish between them
-	during the call.
-	\return Returns the number of the material type which can be set in
-	SMaterial::MaterialType to use the renderer. -1 is returned if an
-	error occurred. -1 is returned for example if a vertex or pixel shader
-	program could not be compiled, the error strings are then printed out
-	into the error log, and can be caught with a custom event receiver. */
-	virtual s32 addShaderMaterialFromFiles(io::IReadFile* vertexShaderProgram,
-		io::IReadFile* pixelShaderProgram,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0;
-
-	//! Like IGPUProgrammingServices::addShaderMaterial(), but loads from files.
-	/** \param vertexShaderProgramFileName Text file name containing the
-	source of the vertex shader program. Set to 0 if no shader shall be
-	created.
-	\param pixelShaderProgramFileName Text file name containing the source
-	of the pixel shader program. Set to 0 if no shader shall be created.
-	\param callback Pointer to an IShaderConstantSetCallback object on
-	which the OnSetConstants function is called.
-	\param baseMaterial baseMaterial
-	\param userData a user data int. This int can be set to any value and
-	will be set as parameter in the callback method when calling
-	OnSetConstants(). In this way it is easily possible to use the same
-	callback method for multiple materials and distinguish between them
-	during the call.
-	\return Returns the number of the material type which can be set in
-	SMaterial::MaterialType to use the renderer. -1 is returned if an
-	error occurred. -1 is returned for example if a vertex or pixel shader
-	program could not be compiled, the error strings are then printed out
-	into the error log, and can be caught with a custom event receiver. */
-	virtual s32 addShaderMaterialFromFiles(const io::path& vertexShaderProgramFileName,
-		const io::path& pixelShaderProgramFileName,
-		IShaderConstantSetCallBack* callback = 0,
-		E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
-		s32 userData = 0) = 0;
-};
-
-
-} // end namespace video
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "EShaderTypes.h"
+#include "EMaterialTypes.h"
+#include "EPrimitiveTypes.h"
+#include "path.h"
+
+namespace irr
+{
+
+namespace io
+{
+class IReadFile;
+} // end namespace io
+
+namespace video
+{
+
+class IVideoDriver;
+class IShaderConstantSetCallBack;
+
+//! Interface making it possible to create and use programs running on the GPU.
+class IGPUProgrammingServices
+{
+public:
+	//! Destructor
+	virtual ~IGPUProgrammingServices() {}
+
+	//! Adds a new high-level shading material renderer to the VideoDriver.
+	/** Currently only HLSL/D3D9 and GLSL/OpenGL are supported.
+	\param vertexShaderProgram String containing the source of the vertex
+	shader program. This can be 0 if no vertex program shall be used.
+	\param vertexShaderEntryPointName Name of the entry function of the
+	vertexShaderProgram (p.e. "main")
+	\param vsCompileTarget Vertex shader version the high level shader
+	shall be compiled to.
+	\param pixelShaderProgram String containing the source of the pixel
+	shader program. This can be 0 if no pixel shader shall be used.
+	\param pixelShaderEntryPointName Entry name of the function of the
+	pixelShaderProgram (p.e. "main")
+	\param psCompileTarget Pixel shader version the high level shader
+	shall be compiled to.
+	\param geometryShaderProgram String containing the source of the
+	geometry shader program. This can be 0 if no geometry shader shall be
+	used.
+	\param geometryShaderEntryPointName Entry name of the function of the
+	geometryShaderProgram (p.e. "main")
+	\param gsCompileTarget Geometry shader version the high level shader
+	shall be compiled to.
+	\param inType Type of vertices passed to geometry shader
+	\param outType Type of vertices created by geometry shader
+	\param verticesOut Maximal number of vertices created by geometry
+	shader. If 0, maximal number supported is assumed.
+	\param callback Pointer to an implementation of
+	IShaderConstantSetCallBack in which you can set the needed vertex,
+	pixel, and geometry 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 Number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an error
+	occurred, e.g. if a shader program could not be compiled or a 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 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName,
+			E_VERTEX_SHADER_TYPE vsCompileTarget,
+			const c8 *pixelShaderProgram,
+			const c8 *pixelShaderEntryPointName,
+			E_PIXEL_SHADER_TYPE psCompileTarget,
+			const c8 *geometryShaderProgram,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) = 0;
+
+	//! convenience function for use without geometry shaders
+	s32 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName = "main",
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			const c8 *pixelShaderProgram = 0,
+			const c8 *pixelShaderEntryPointName = "main",
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterial(
+				vertexShaderProgram, vertexShaderEntryPointName,
+				vsCompileTarget, pixelShaderProgram,
+				pixelShaderEntryPointName, psCompileTarget,
+				0, "main", EGST_GS_4_0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				callback, baseMaterial, userData);
+	}
+
+	//! convenience function for use with many defaults, without geometry shader
+	/** All shader names are set to "main" and compile targets are shader
+	type 1.1.
+	*/
+	s32 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *pixelShaderProgram = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterial(
+				vertexShaderProgram, "main",
+				EVST_VS_1_1, pixelShaderProgram,
+				"main", EPST_PS_1_1,
+				0, "main", EGST_GS_4_0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				callback, baseMaterial, userData);
+	}
+
+	//! convenience function for use with many defaults, with geometry shader
+	/** All shader names are set to "main" and compile targets are shader
+	type 1.1 and geometry shader 4.0.
+	*/
+	s32 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *pixelShaderProgram = 0,
+			const c8 *geometryShaderProgram = 0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterial(
+				vertexShaderProgram, "main",
+				EVST_VS_1_1, pixelShaderProgram,
+				"main", EPST_PS_1_1,
+				geometryShaderProgram, "main", EGST_GS_4_0,
+				inType, outType, verticesOut,
+				callback, baseMaterial, userData);
+	}
+
+	//! 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.
+	\param vertexShaderEntryPointName Name of the entry function of the
+	vertexShaderProgram  (p.e. "main")
+	\param vsCompileTarget Vertex shader version the high level shader
+	shall be compiled to.
+	\param pixelShaderProgramFileName Text file containing the source of
+	the pixel shader program. Set to empty string if no pixel shader shall
+	be created.
+	\param pixelShaderEntryPointName Entry name of the function of the
+	pixelShaderProgram (p.e. "main")
+	\param psCompileTarget Pixel shader version the high level shader
+	shall be compiled to.
+	\param geometryShaderProgramFileName Name of the source of
+	the geometry shader program. Set to empty string if no geometry shader
+	shall be created.
+	\param geometryShaderEntryPointName Entry name of the function of the
+	geometryShaderProgram (p.e. "main")
+	\param gsCompileTarget Geometry shader version the high level shader
+	shall be compiled to.
+	\param inType Type of vertices passed to geometry shader
+	\param outType Type of vertices created by geometry shader
+	\param verticesOut Maximal number of vertices created by geometry
+	shader. If 0, maximal number supported is assumed.
+	\param callback Pointer to an implementation of
+	IShaderConstantSetCallBack in which you can set the needed vertex,
+	pixel, and geometry 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 Number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an error
+	occurred, e.g. if a shader program could not be compiled or a 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(
+			const io::path &vertexShaderProgramFileName,
+			const c8 *vertexShaderEntryPointName,
+			E_VERTEX_SHADER_TYPE vsCompileTarget,
+			const io::path &pixelShaderProgramFileName,
+			const c8 *pixelShaderEntryPointName,
+			E_PIXEL_SHADER_TYPE psCompileTarget,
+			const io::path &geometryShaderProgramFileName,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) = 0;
+
+	//! convenience function for use without geometry shaders
+	s32 addHighLevelShaderMaterialFromFiles(
+			const io::path &vertexShaderProgramFileName,
+			const c8 *vertexShaderEntryPointName = "main",
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			const io::path &pixelShaderProgramFileName = "",
+			const c8 *pixelShaderEntryPointName = "main",
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterialFromFiles(
+				vertexShaderProgramFileName, vertexShaderEntryPointName,
+				vsCompileTarget, pixelShaderProgramFileName,
+				pixelShaderEntryPointName, psCompileTarget,
+				"", "main", EGST_GS_4_0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				callback, baseMaterial, userData);
+	}
+
+	//! convenience function for use with many defaults, without geometry shader
+	/** All shader names are set to "main" and compile targets are shader
+	type 1.1.
+	*/
+	s32 addHighLevelShaderMaterialFromFiles(
+			const io::path &vertexShaderProgramFileName,
+			const io::path &pixelShaderProgramFileName = "",
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterialFromFiles(
+				vertexShaderProgramFileName, "main",
+				EVST_VS_1_1, pixelShaderProgramFileName,
+				"main", EPST_PS_1_1,
+				"", "main", EGST_GS_4_0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				callback, baseMaterial, userData);
+	}
+
+	//! convenience function for use with many defaults, with geometry shader
+	/** All shader names are set to "main" and compile targets are shader
+	type 1.1 and geometry shader 4.0.
+	*/
+	s32 addHighLevelShaderMaterialFromFiles(
+			const io::path &vertexShaderProgramFileName,
+			const io::path &pixelShaderProgramFileName = "",
+			const io::path &geometryShaderProgramFileName = "",
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterialFromFiles(
+				vertexShaderProgramFileName, "main",
+				EVST_VS_1_1, pixelShaderProgramFileName,
+				"main", EPST_PS_1_1,
+				geometryShaderProgramFileName, "main", EGST_GS_4_0,
+				inType, outType, verticesOut,
+				callback, baseMaterial, userData);
+	}
+
+	//! 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.
+	\param vertexShaderEntryPointName Name of the entry function of the
+	vertexShaderProgram
+	\param vsCompileTarget Vertex shader version the high level shader
+	shall be compiled to.
+	\param pixelShaderProgram Text file handle containing the source of
+	the pixel shader program. Set to 0 if no pixel shader shall be created.
+	\param pixelShaderEntryPointName Entry name of the function of the
+	pixelShaderProgram (p.e. "main")
+	\param psCompileTarget Pixel shader version the high level shader
+	shall be compiled to.
+	\param geometryShaderProgram Text file handle containing the source of
+	the geometry shader program. Set to 0 if no geometry shader shall be
+	created.
+	\param geometryShaderEntryPointName Entry name of the function of the
+	geometryShaderProgram (p.e. "main")
+	\param gsCompileTarget Geometry shader version the high level shader
+	shall be compiled to.
+	\param inType Type of vertices passed to geometry shader
+	\param outType Type of vertices created by geometry shader
+	\param verticesOut Maximal number of vertices created by geometry
+	shader. If 0, maximal number supported is assumed.
+	\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 Number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an
+	error occurred, e.g. if a shader program could not be compiled or a
+	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,
+			const c8 *vertexShaderEntryPointName,
+			E_VERTEX_SHADER_TYPE vsCompileTarget,
+			io::IReadFile *pixelShaderProgram,
+			const c8 *pixelShaderEntryPointName,
+			E_PIXEL_SHADER_TYPE psCompileTarget,
+			io::IReadFile *geometryShaderProgram,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) = 0;
+
+	//! convenience function for use without geometry shaders
+	s32 addHighLevelShaderMaterialFromFiles(
+			io::IReadFile *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName = "main",
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			io::IReadFile *pixelShaderProgram = 0,
+			const c8 *pixelShaderEntryPointName = "main",
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterialFromFiles(
+				vertexShaderProgram, vertexShaderEntryPointName,
+				vsCompileTarget, pixelShaderProgram,
+				pixelShaderEntryPointName, psCompileTarget,
+				0, "main", EGST_GS_4_0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				callback, baseMaterial, userData);
+	}
+
+	//! Delete a shader material and associated data.
+	/**
+	After you have deleted a material it is invalid to still use and doing
+	so might result in a crash. The ID may be reused in the future when new
+	materials are added.
+	\param material Number of the material type. Must not be a built-in
+	material. */
+	virtual void deleteShaderMaterial(s32 material) = 0;
+};
+
+} // end namespace video
+} // end namespace irr

include/IGUIButton.h

@@ -1,268 +1,259 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_BUTTON_H_INCLUDED__
-#define __I_GUI_BUTTON_H_INCLUDED__
-
-#include "IGUIElement.h"
-
-namespace irr
-{
-
-namespace video
-{
-	class ITexture;
-} // end namespace video
-
-namespace gui
-{
-	class IGUIFont;
-	class IGUISpriteBank;
-
-	//! Current state of buttons used for drawing sprites.
-	//! Note that up to 3 states can be active at the same time:
-	//! EGBS_BUTTON_UP or EGBS_BUTTON_DOWN
-	//! EGBS_BUTTON_MOUSE_OVER or EGBS_BUTTON_MOUSE_OFF
-	//! EGBS_BUTTON_FOCUSED or EGBS_BUTTON_NOT_FOCUSED
-	enum EGUI_BUTTON_STATE
-	{
-		//! The button is not pressed.
-		EGBS_BUTTON_UP=0,
-		//! The button is currently pressed down.
-		EGBS_BUTTON_DOWN,
-		//! The mouse cursor is over the button
-		EGBS_BUTTON_MOUSE_OVER,
-		//! The mouse cursor is not over the button
-		EGBS_BUTTON_MOUSE_OFF,
-		//! The button has the focus
-		EGBS_BUTTON_FOCUSED,
-		//! The button doesn't have the focus
-		EGBS_BUTTON_NOT_FOCUSED,
-		//! The button is disabled All other states are ignored in that case.
-		EGBS_BUTTON_DISABLED,
-		//! not used, counts the number of enumerated items
-		EGBS_COUNT
-	};
-
-	//! Names for gui button state icons
-	const c8* const GUIButtonStateNames[EGBS_COUNT+1] =
-	{
-		"buttonUp",
-		"buttonDown",
-		"buttonMouseOver",
-		"buttonMouseOff",
-		"buttonFocused",
-		"buttonNotFocused",
-		"buttonDisabled",
-		0	// count
-	};
-
-	//! State of buttons used for drawing texture images.
-	//! 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
-	//! 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.
-	enum EGUI_BUTTON_IMAGE_STATE
-	{
-		//! When no other states have images they will all use this one.
-		EGBIS_IMAGE_UP,
-		//! When not set EGBIS_IMAGE_UP is used.
-		EGBIS_IMAGE_UP_MOUSEOVER,
-		//! When not set EGBIS_IMAGE_UP_MOUSEOVER is used.
-		EGBIS_IMAGE_UP_FOCUSED,
-		//! When not set EGBIS_IMAGE_UP_FOCUSED is used.
-		EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER,
-		//! When not set EGBIS_IMAGE_UP is used.
-		EGBIS_IMAGE_DOWN,
-		//! When not set EGBIS_IMAGE_DOWN is used.
-		EGBIS_IMAGE_DOWN_MOUSEOVER,
-		//! When not set EGBIS_IMAGE_DOWN_MOUSEOVER is used.
-		EGBIS_IMAGE_DOWN_FOCUSED,
-		//! When not set EGBIS_IMAGE_DOWN_FOCUSED is used.
-		EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER,
-		//! When not set EGBIS_IMAGE_UP or EGBIS_IMAGE_DOWN are used (depending on button state).
-		EGBIS_IMAGE_DISABLED,
-		//! not used, counts the number of enumerated items
-		EGBIS_COUNT
-	};
-
-	//! Names for gui button image states
-	const c8* const GUIButtonImageStateNames[EGBIS_COUNT+1] =
-	{
-		"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
-		"ImageDownOver",
-		"ImageDownFocused",
-		"ImageDownFocusedOver",
-		"ImageDisabled",
-		0	// count
-	};
-
-	//! GUI Button interface.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_BUTTON_CLICKED
-	*/
-	class IGUIButton : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIButton(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_BUTTON, environment, parent, id, rectangle) {}
-
-		//! Sets another skin independent font.
-		/** If this is set to zero, the button uses the font of the skin.
-		\param font: New font to set. */
-		virtual void setOverrideFont(IGUIFont* font=0) = 0;
-
-		//! Gets the override font (if any)
-		/** \return The override font (may be 0) */
-		virtual IGUIFont* getOverrideFont(void) const = 0;
-
-		//! Get the font which is used right now for drawing
-		/** Currently this is the override font when one is set and the
-		font of the active skin otherwise */
-		virtual IGUIFont* getActiveFont() const = 0;
-
-		//! Sets another color for the button text.
-		/** When set, this color is used instead of EGDC_BUTTON_TEXT/EGDC_GRAY_TEXT.
-		You don't need to call enableOverrideColor(true), that's done by this function.
-		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
-		/** \return: The override color */
-		virtual video::SColor getOverrideColor(void) const = 0;
-
-		//! Gets the currently used text color
-		/** Either a skin-color for the current state or the override color */
-		virtual video::SColor getActiveColor() const = 0;
-
-		//! Sets if the button text should use the override color or the color in the gui skin.
-		/** \param enable: If set to true, the override color, which can be set
-		with IGUIStaticText::setOverrideColor is used, otherwise the
-		EGDC_BUTTON_TEXT or EGDC_GRAY_TEXT color of the skin. */
-		virtual void enableOverrideColor(bool enable) = 0;
-
-		//! Checks if an override color is enabled
-		/** \return true if the override color is enabled, false otherwise */
-		virtual bool isOverrideColorEnabled(void) const = 0;
-
-		//! Sets an image which should be displayed on the button when it is in the given state.
-		/** Only one image-state can be active at a time. Images are drawn below sprites.
-		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 normal state.
-		/** This is identical to calling setImage(EGBIS_IMAGE_UP, image); and might be deprecated in future revisions.
-		\param image: Image to be displayed */
-		virtual void setImage(video::ITexture* image=0) = 0;
-
-		//! Sets a background image for the button when it is in normal state.
-		/** This is identical to calling setImage(EGBIS_IMAGE_UP, image, sourceRect); and might be deprecated in future revisions.
-		\param image: Texture containing the image to be displayed
-		\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 pressed state.
-		/** This is identical to calling setImage(EGBIS_IMAGE_DOWN, image); and might be deprecated in future revisions.
-		If no images is specified for the pressed state via
-		setPressedImage(), this image is also drawn in pressed state.
-		\param image: Image to be displayed */
-		virtual void setPressedImage(video::ITexture* image=0) = 0;
-
-		//! 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, sourceRect); and might be deprecated in future revisions.
-		\param image: Texture containing the image to be displayed
-		\param sourceRect: Position in the texture, where the image is located */
-		virtual void setPressedImage(video::ITexture* image, const core::rect<s32>& sourceRect) = 0;
-
-
-		//! Sets the sprite bank used by the button
-		/** NOTE: The spritebank itself is _not_ serialized so far. The sprites are serialized.
-		Which means after loading the gui you still have to set the spritebank manually. */
-		virtual void setSpriteBank(IGUISpriteBank* bank=0) = 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;
-
-		//! Get the sprite-index for the given state or -1 when no sprite is set
-		virtual s32 getSpriteIndex(EGUI_BUTTON_STATE state) const = 0;
-
-		//! Get the sprite color for the given state. Color is only used when a sprite is set.
-		virtual video::SColor getSpriteColor(EGUI_BUTTON_STATE state) const = 0;
-
-		//! Returns if the sprite in the given state does loop
-		virtual bool getSpriteLoop(EGUI_BUTTON_STATE state) const = 0;
-
-		//! Returns if the sprite in the given state is scaled
-		virtual bool getSpriteScale(EGUI_BUTTON_STATE state) const = 0;
-
-		//! Sets if the button should behave like a push button.
-		/** 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;
-
-		//! Sets the pressed state of the button if this is a pushbutton
-		virtual void setPressed(bool pressed=true) = 0;
-
-		//! Returns if the button is currently pressed
-		virtual bool isPressed() const = 0;
-
-		//! Sets if the alpha channel should be used for drawing background images on the button (default is false)
-		virtual void setUseAlphaChannel(bool useAlphaChannel=true) = 0;
-
-		//! Returns if the alpha channel should be used for drawing background images on the button
-		virtual bool isAlphaChannelUsed() const = 0;
-
-		//! Returns whether the button is a push button
-		virtual bool isPushButton() const = 0;
-
-		//! Sets if the button should use the skin to draw its border and button face (default is true)
-		virtual void setDrawBorder(bool border=true) = 0;
-
-		//! Returns if the border and button face are being drawn using the skin
-		virtual bool isDrawingBorder() const = 0;
-
-		//! Sets if the button should scale the button images to fit
-		virtual void setScaleImage(bool scaleImage=true) = 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;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IGUIElement.h"
+
+namespace irr
+{
+
+namespace video
+{
+class ITexture;
+} // end namespace video
+
+namespace gui
+{
+class IGUIFont;
+class IGUISpriteBank;
+
+//! Current state of buttons used for drawing sprites.
+//! Note that up to 3 states can be active at the same time:
+//! EGBS_BUTTON_UP or EGBS_BUTTON_DOWN
+//! EGBS_BUTTON_MOUSE_OVER or EGBS_BUTTON_MOUSE_OFF
+//! EGBS_BUTTON_FOCUSED or EGBS_BUTTON_NOT_FOCUSED
+enum EGUI_BUTTON_STATE
+{
+	//! The button is not pressed.
+	EGBS_BUTTON_UP = 0,
+	//! The button is currently pressed down.
+	EGBS_BUTTON_DOWN,
+	//! The mouse cursor is over the button
+	EGBS_BUTTON_MOUSE_OVER,
+	//! The mouse cursor is not over the button
+	EGBS_BUTTON_MOUSE_OFF,
+	//! The button has the focus
+	EGBS_BUTTON_FOCUSED,
+	//! The button doesn't have the focus
+	EGBS_BUTTON_NOT_FOCUSED,
+	//! The button is disabled All other states are ignored in that case.
+	EGBS_BUTTON_DISABLED,
+	//! not used, counts the number of enumerated items
+	EGBS_COUNT
+};
+
+//! Names for gui button state icons
+const c8 *const GUIButtonStateNames[EGBS_COUNT + 1] = {
+		"buttonUp",
+		"buttonDown",
+		"buttonMouseOver",
+		"buttonMouseOff",
+		"buttonFocused",
+		"buttonNotFocused",
+		"buttonDisabled",
+		0, // count
+	};
+
+//! State of buttons used for drawing texture images.
+//! 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
+//! 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.
+enum EGUI_BUTTON_IMAGE_STATE
+{
+	//! When no other states have images they will all use this one.
+	EGBIS_IMAGE_UP,
+	//! When not set EGBIS_IMAGE_UP is used.
+	EGBIS_IMAGE_UP_MOUSEOVER,
+	//! When not set EGBIS_IMAGE_UP_MOUSEOVER is used.
+	EGBIS_IMAGE_UP_FOCUSED,
+	//! When not set EGBIS_IMAGE_UP_FOCUSED is used.
+	EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER,
+	//! When not set EGBIS_IMAGE_UP is used.
+	EGBIS_IMAGE_DOWN,
+	//! When not set EGBIS_IMAGE_DOWN is used.
+	EGBIS_IMAGE_DOWN_MOUSEOVER,
+	//! When not set EGBIS_IMAGE_DOWN_MOUSEOVER is used.
+	EGBIS_IMAGE_DOWN_FOCUSED,
+	//! When not set EGBIS_IMAGE_DOWN_FOCUSED is used.
+	EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER,
+	//! When not set EGBIS_IMAGE_UP or EGBIS_IMAGE_DOWN are used (depending on button state).
+	EGBIS_IMAGE_DISABLED,
+	//! not used, counts the number of enumerated items
+	EGBIS_COUNT
+};
+
+//! Names for gui button image states
+const c8 *const GUIButtonImageStateNames[EGBIS_COUNT + 1] = {
+		"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
+		"ImageDownOver",
+		"ImageDownFocused",
+		"ImageDownFocusedOver",
+		"ImageDisabled",
+		0, // count
+	};
+
+//! GUI Button interface.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_BUTTON_CLICKED
+*/
+class IGUIButton : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIButton(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_BUTTON, environment, parent, id, rectangle) {}
+
+	//! Sets another skin independent font.
+	/** If this is set to zero, the button uses the font of the skin.
+	\param font: New font to set. */
+	virtual void setOverrideFont(IGUIFont *font = 0) = 0;
+
+	//! Gets the override font (if any)
+	/** \return The override font (may be 0) */
+	virtual IGUIFont *getOverrideFont(void) const = 0;
+
+	//! Get the font which is used right now for drawing
+	/** Currently this is the override font when one is set and the
+	font of the active skin otherwise */
+	virtual IGUIFont *getActiveFont() const = 0;
+
+	//! Sets another color for the button text.
+	/** When set, this color is used instead of EGDC_BUTTON_TEXT/EGDC_GRAY_TEXT.
+	You don't need to call enableOverrideColor(true), that's done by this function.
+	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
+	/** \return: The override color */
+	virtual video::SColor getOverrideColor(void) const = 0;
+
+	//! Gets the currently used text color
+	/** Either a skin-color for the current state or the override color */
+	virtual video::SColor getActiveColor() const = 0;
+
+	//! Sets if the button text should use the override color or the color in the gui skin.
+	/** \param enable: If set to true, the override color, which can be set
+	with IGUIStaticText::setOverrideColor is used, otherwise the
+	EGDC_BUTTON_TEXT or EGDC_GRAY_TEXT color of the skin. */
+	virtual void enableOverrideColor(bool enable) = 0;
+
+	//! Checks if an override color is enabled
+	/** \return true if the override color is enabled, false otherwise */
+	virtual bool isOverrideColorEnabled(void) const = 0;
+
+	//! Sets an image which should be displayed on the button when it is in the given state.
+	/** Only one image-state can be active at a time. Images are drawn below sprites.
+	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 normal state.
+	/** This is identical to calling setImage(EGBIS_IMAGE_UP, image); and might be deprecated in future revisions.
+	\param image: Image to be displayed */
+	virtual void setImage(video::ITexture *image = 0) = 0;
+
+	//! Sets a background image for the button when it is in normal state.
+	/** This is identical to calling setImage(EGBIS_IMAGE_UP, image, sourceRect); and might be deprecated in future revisions.
+	\param image: Texture containing the image to be displayed
+	\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 pressed state.
+	/** This is identical to calling setImage(EGBIS_IMAGE_DOWN, image); and might be deprecated in future revisions.
+	If no images is specified for the pressed state via
+	setPressedImage(), this image is also drawn in pressed state.
+	\param image: Image to be displayed */
+	virtual void setPressedImage(video::ITexture *image = 0) = 0;
+
+	//! 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, sourceRect); and might be deprecated in future revisions.
+	\param image: Texture containing the image to be displayed
+	\param sourceRect: Position in the texture, where the image is located */
+	virtual void setPressedImage(video::ITexture *image, const core::rect<s32> &sourceRect) = 0;
+
+	//! Sets the sprite bank used by the button
+	/** NOTE: The spritebank itself is _not_ serialized so far. The sprites are serialized.
+	Which means after loading the gui you still have to set the spritebank manually. */
+	virtual void setSpriteBank(IGUISpriteBank *bank = 0) = 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;
+
+	//! Get the sprite-index for the given state or -1 when no sprite is set
+	virtual s32 getSpriteIndex(EGUI_BUTTON_STATE state) const = 0;
+
+	//! Get the sprite color for the given state. Color is only used when a sprite is set.
+	virtual video::SColor getSpriteColor(EGUI_BUTTON_STATE state) const = 0;
+
+	//! Returns if the sprite in the given state does loop
+	virtual bool getSpriteLoop(EGUI_BUTTON_STATE state) const = 0;
+
+	//! Returns if the sprite in the given state is scaled
+	virtual bool getSpriteScale(EGUI_BUTTON_STATE state) const = 0;
+
+	//! Sets if the button should behave like a push button.
+	/** 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;
+
+	//! Sets the pressed state of the button if this is a pushbutton
+	virtual void setPressed(bool pressed = true) = 0;
+
+	//! Returns if the button is currently pressed
+	virtual bool isPressed() const = 0;
+
+	//! Sets if the alpha channel should be used for drawing background images on the button (default is false)
+	virtual void setUseAlphaChannel(bool useAlphaChannel = true) = 0;
+
+	//! Returns if the alpha channel should be used for drawing background images on the button
+	virtual bool isAlphaChannelUsed() const = 0;
+
+	//! Returns whether the button is a push button
+	virtual bool isPushButton() const = 0;
+
+	//! Sets if the button should use the skin to draw its border and button face (default is true)
+	virtual void setDrawBorder(bool border = true) = 0;
+
+	//! Returns if the border and button face are being drawn using the skin
+	virtual bool isDrawingBorder() const = 0;
+
+	//! Sets if the button should scale the button images to fit
+	virtual void setScaleImage(bool scaleImage = true) = 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;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUICheckBox.h

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

include/IGUIComboBox.h

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

include/IGUIEditBox.h

@@ -1,157 +1,151 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_EDIT_BOX_H_INCLUDED__
-#define __I_GUI_EDIT_BOX_H_INCLUDED__
-
-#include "IGUIElement.h"
-#include "SColor.h"
-
-namespace irr
-{
-namespace gui
-{
-	class IGUIFont;
-
-	//! Single line edit box for editing simple text.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_EDITBOX_ENTER
-	\li EGET_EDITBOX_CHANGED
-	\li EGET_EDITBOX_MARKING_CHANGED
-	*/
-	class IGUIEditBox : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIEditBox(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_EDIT_BOX, environment, parent, id, rectangle) {}
-
-		//! Sets another skin independent font.
-		/** If this is set to zero, the button uses the font of the skin.
-		\param font: New font to set. */
-		virtual void setOverrideFont(IGUIFont* font=0) = 0;
-
-		//! Gets the override font (if any)
-		/** \return The override font (may be 0) */
-		virtual IGUIFont* getOverrideFont() const = 0;
-
-		//! Get the font which is used right now for drawing
-		/** Currently this is the override font when one is set and the
-		font of the active skin otherwise */
-		virtual IGUIFont* getActiveFont() const = 0;
-
-		//! Sets another color for the text.
-		/** If set, the edit box does not use the EGDC_BUTTON_TEXT color defined
-		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
-		virtual video::SColor getOverrideColor() const = 0;
-
-		//! Sets if the text should use the override color or the color in the gui skin.
-		/** \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;
-
-		//! Checks if an override color is enabled
-		/** \return true if the override color is enabled, false otherwise */
-		virtual bool isOverrideColorEnabled(void) const = 0;
-
-		//! Sets whether to draw the background
-		virtual void setDrawBackground(bool draw) = 0;
-
-		//! Checks if background drawing is enabled
-		/** \return true if background drawing is enabled, false otherwise */
-		virtual bool isDrawBackgroundEnabled() const = 0;
-
-		//! Turns the border on or off
-		/** \param border: true if you want the border to be drawn, false if not */
-		virtual void setDrawBorder(bool border) = 0;
-
-		//! Checks if border drawing is enabled
-		/** \return true if border drawing is enabled, false otherwise */
-		virtual bool isDrawBorderEnabled() const = 0;
-
-		//! Sets text justification mode
-		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
-		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;
-
-		//! Enables or disables word wrap.
-		/** \param enable: If set to true, words going over one line are
-		broken to the next line. */
-		virtual void setWordWrap(bool enable) = 0;
-
-		//! Checks if word wrap is enabled
-		/** \return true if word wrap is enabled, false otherwise */
-		virtual bool isWordWrapEnabled() const = 0;
-
-		//! Enables or disables newlines.
-		/** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired,
-		instead a newline character will be inserted. */
-		virtual void setMultiLine(bool enable) = 0;
-
-		//! Checks if multi line editing is enabled
-		/** \return true if multi-line is enabled, false otherwise */
-		virtual bool isMultiLineEnabled() const = 0;
-
-		//! Enables or disables automatic scrolling with cursor position
-		/** \param enable: If set to true, the text will move around with the cursor position */
-		virtual void setAutoScroll(bool enable) = 0;
-
-		//! Checks to see if automatic scrolling is enabled
-		/** \return true if automatic scrolling is enabled, false if not */
-		virtual bool isAutoScrollEnabled() const = 0;
-
-		//! Sets whether the edit box is a password box. Setting this to true will
-		/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
-		\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.
-		virtual bool isPasswordBox() const = 0;
-
-		//! Gets the size area of the text in the edit box
-		/** \return The size in pixels of the text */
-		virtual core::dimension2du getTextDimension() = 0;
-
-		//! Sets the maximum amount of characters which may be entered in the box.
-		/** \param max: Maximum amount of characters. If 0, the character amount is
-		infinity. */
-		virtual void setMax(u32 max) = 0;
-
-		//! Returns maximum amount of characters, previously set by setMax();
-		virtual u32 getMax() const = 0;
-
-		//! Set the character used for the cursor.
-		/** By default it's "_" */
-		virtual void setCursorChar(const wchar_t cursorChar) = 0;
-
-		//! Get the character used for the cursor.
-		virtual wchar_t getCursorChar() const = 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;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IGUIElement.h"
+#include "SColor.h"
+
+namespace irr
+{
+namespace gui
+{
+class IGUIFont;
+
+//! Single line edit box for editing simple text.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_EDITBOX_ENTER
+\li EGET_EDITBOX_CHANGED
+\li EGET_EDITBOX_MARKING_CHANGED
+*/
+class IGUIEditBox : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIEditBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_EDIT_BOX, environment, parent, id, rectangle) {}
+
+	//! Sets another skin independent font.
+	/** If this is set to zero, the button uses the font of the skin.
+	\param font: New font to set. */
+	virtual void setOverrideFont(IGUIFont *font = 0) = 0;
+
+	//! Gets the override font (if any)
+	/** \return The override font (may be 0) */
+	virtual IGUIFont *getOverrideFont() const = 0;
+
+	//! Get the font which is used right now for drawing
+	/** Currently this is the override font when one is set and the
+	font of the active skin otherwise */
+	virtual IGUIFont *getActiveFont() const = 0;
+
+	//! Sets another color for the text.
+	/** If set, the edit box does not use the EGDC_BUTTON_TEXT color defined
+	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
+	virtual video::SColor getOverrideColor() const = 0;
+
+	//! Sets if the text should use the override color or the color in the gui skin.
+	/** \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;
+
+	//! Checks if an override color is enabled
+	/** \return true if the override color is enabled, false otherwise */
+	virtual bool isOverrideColorEnabled(void) const = 0;
+
+	//! Sets whether to draw the background
+	virtual void setDrawBackground(bool draw) = 0;
+
+	//! Checks if background drawing is enabled
+	/** \return true if background drawing is enabled, false otherwise */
+	virtual bool isDrawBackgroundEnabled() const = 0;
+
+	//! Turns the border on or off
+	/** \param border: true if you want the border to be drawn, false if not */
+	virtual void setDrawBorder(bool border) = 0;
+
+	//! Checks if border drawing is enabled
+	/** \return true if border drawing is enabled, false otherwise */
+	virtual bool isDrawBorderEnabled() const = 0;
+
+	//! Sets text justification mode
+	/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
+	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;
+
+	//! Enables or disables word wrap.
+	/** \param enable: If set to true, words going over one line are
+	broken to the next line. */
+	virtual void setWordWrap(bool enable) = 0;
+
+	//! Checks if word wrap is enabled
+	/** \return true if word wrap is enabled, false otherwise */
+	virtual bool isWordWrapEnabled() const = 0;
+
+	//! Enables or disables newlines.
+	/** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired,
+	instead a newline character will be inserted. */
+	virtual void setMultiLine(bool enable) = 0;
+
+	//! Checks if multi line editing is enabled
+	/** \return true if multi-line is enabled, false otherwise */
+	virtual bool isMultiLineEnabled() const = 0;
+
+	//! Enables or disables automatic scrolling with cursor position
+	/** \param enable: If set to true, the text will move around with the cursor position */
+	virtual void setAutoScroll(bool enable) = 0;
+
+	//! Checks to see if automatic scrolling is enabled
+	/** \return true if automatic scrolling is enabled, false if not */
+	virtual bool isAutoScrollEnabled() const = 0;
+
+	//! Sets whether the edit box is a password box. Setting this to true will
+	/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
+	\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.
+	virtual bool isPasswordBox() const = 0;
+
+	//! Gets the size area of the text in the edit box
+	/** \return The size in pixels of the text */
+	virtual core::dimension2du getTextDimension() = 0;
+
+	//! Sets the maximum amount of characters which may be entered in the box.
+	/** \param max: Maximum amount of characters. If 0, the character amount is
+	infinity. */
+	virtual void setMax(u32 max) = 0;
+
+	//! Returns maximum amount of characters, previously set by setMax();
+	virtual u32 getMax() const = 0;
+
+	//! Set the character used for the cursor.
+	/** By default it's "_" */
+	virtual void setCursorChar(const wchar_t cursorChar) = 0;
+
+	//! Get the character used for the cursor.
+	virtual wchar_t getCursorChar() const = 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;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUIEnvironment.h

@@ -1,421 +1,414 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_ENVIRONMENT_H_INCLUDED__
-#define __I_GUI_ENVIRONMENT_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "IGUISkin.h"
-#include "rect.h"
-#include "EFocusFlags.h"
-#include "IEventReceiver.h"
-#include "path.h"
-
-namespace irr
-{
-	class IOSOperator;
-	class IEventReceiver;
-
-	namespace io
-	{
-		class IReadFile;
-		class IWriteFile;
-		class IFileSystem;
-	} // end namespace io
-	namespace video
-	{
-		class IVideoDriver;
-		class ITexture;
-	} // end namespace video
-
-namespace gui
-{
-
-class IGUIElement;
-class IGUIFont;
-class IGUISpriteBank;
-class IGUIScrollBar;
-class IGUIImage;
-class IGUICheckBox;
-class IGUIListBox;
-class IGUIImageList;
-class IGUIFileOpenDialog;
-class IGUIStaticText;
-class IGUIEditBox;
-class IGUITabControl;
-class IGUITab;
-class IGUIComboBox;
-class IGUIButton;
-class IGUIWindow;
-
-//! GUI Environment. Used as factory and manager of all other GUI elements.
-/** \par This element can create the following events of type EGUI_EVENT_TYPE (which are passed on to focused sub-elements):
-\li EGET_ELEMENT_FOCUS_LOST
-\li EGET_ELEMENT_FOCUSED
-\li EGET_ELEMENT_LEFT
-\li EGET_ELEMENT_HOVERED
-*/
-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. */
-	virtual void drawAll(bool useScreenSize=true) = 0;
-
-	//! Sets the focus to an element.
-	/** Causes a EGET_ELEMENT_FOCUS_LOST event followed by a
-	EGET_ELEMENT_FOCUSED event. If someone absorbed either of the events,
-	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;
-
-	//! Returns the element which holds the focus.
-	/** \return Pointer to the element with focus. */
-	virtual IGUIElement* getFocus() const = 0;
-
-	//! Returns the element which was last under the mouse cursor
-	/** NOTE: This information is updated _after_ the user-eventreceiver
-	received it's mouse-events. To find the hovered element while catching
-	mouse events you have to use instead:
-	IGUIEnvironment::getRootGUIElement()->getElementFromPoint(mousePos);
-	\return Pointer to the element under the mouse. */
-	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;
-
-	//! 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;
-
-	//! Returns the current video driver.
-	/** \return Pointer to the video driver. */
-	virtual video::IVideoDriver* getVideoDriver() const = 0;
-
-	//! Returns the file system.
-	/** \return Pointer to the file system. */
-	virtual io::IFileSystem* getFileSystem() const = 0;
-
-	//! returns a pointer to the OS operator
-	/** \return Pointer to the OS operator. */
-	virtual IOSOperator* getOSOperator() const = 0;
-
-	//! Removes all elements from the environment.
-	virtual void clear() = 0;
-
-	//! Posts an input event to the environment.
-	/** Usually you do not have to
-	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;
-
-	//! 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;
-
-	//! Returns pointer to the current gui skin.
-	/** \return Pointer to the GUI skin. */
-	virtual IGUISkin* getSkin() const = 0;
-
-	//! Sets a new GUI Skin
-	/** You can use this to change the appearance of the whole GUI
-	Environment. You can set one of the built-in skins or implement your
-	own class derived from IGUISkin and enable it using this method.
-	To set for example the built-in Windows classic skin, use the following
-	code:
-	\code
-	gui::IGUISkin* newskin = environment->createSkin(gui::EGST_WINDOWS_CLASSIC);
-	environment->setSkin(newskin);
-	newskin->drop();
-	\endcode
-	\param skin New skin to use.
-	*/
-	virtual void setSkin(IGUISkin* skin) = 0;
-
-	//! Creates a new GUI Skin based on a template.
-	/** Use setSkin() to set the created skin.
-	\param type The type of the new skin.
-	\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;
-
-
-	//! Creates the image list from the given texture.
-	/** \param texture Texture to split into images
-	\param imageSize Dimension of each image
-	\param useAlphaChannel Flag whether alpha channel of the texture should be honored.
-	\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,
-					core::dimension2d<s32> imageSize,
-					bool useAlphaChannel ) = 0;
-
-	//! Returns pointer to the font with the specified filename.
-	/** Loads the font if it was not loaded before.
-	\param filename Filename of the Font.
-	\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;
-
-	//! Adds an externally loaded font to the font list.
-	/** This method allows to attach an already loaded font to the list of
-	existing fonts. The font is grabbed if non-null and adding was successful.
-	\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;
-
-	//! remove loaded font
-	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;
-
-	//! 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;
-
-	//! 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;
-
-	//! Returns the root gui element.
-	/** This is the first gui element, the (direct or indirect) parent of all
-	other gui elements. It is a valid IGUIElement, with dimensions the same
-	size as the screen.
-	\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;
-
-	//! Adds a button element.
-	/** \param rectangle Rectangle specifying the borders of the button.
-	\param parent Parent gui element of the button.
-	\param id Id with which the gui element can be identified.
-	\param text Text displayed on the button.
-	\param tooltiptext Text displayed in the tooltip.
-	\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,
-		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
-	or vertical.
-	\param rectangle Rectangle specifying the borders of the scrollbar.
-	\param parent Parent gui element of the scroll bar.
-	\param id Id to identify the gui element.
-	\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,
-		IGUIElement* parent=0, s32 id=-1) = 0;
-
-	//! Adds an image element.
-	/** \param image Image to be displayed.
-	\param pos Position of the image. The width and height of the image is
-	taken from the image.
-	\param useAlphaChannel Sets if the image should use the alpha channel
-	of the texture to draw itself.
-	\param parent Parent gui element of the image.
-	\param id Id to identify the gui element.
-	\param text Title text of the image (not displayed).
-	\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,
-		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.
-	\param rectangle Rectangle specifying the borders of the image.
-	\param parent Parent gui element of the image.
-	\param id Id to identify the gui element.
-	\param text Title text of the image (not displayed).
-	\param useAlphaChannel Sets if the image should use the alpha channel
-	of the texture to draw itself.
-	\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,
-		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.
-	\param rectangle Rectangle specifying the borders of the check box.
-	\param parent Parent gui element of the check box.
-	\param id Id to identify the gui element.
-	\param text Title text of the check box.
-	\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,
-		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.
-	\param parent Parent gui element of the list box.
-	\param id Id to identify the gui element.
-	\param drawBackground Flag whether the background should be drawn.
-	\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,
-		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.
-	\param modal Defines if the dialog is modal. This means, that all other
-	gui elements which were created before the message box cannot be used
-	until this messagebox is removed.
-	\param parent Parent gui element of the dialog.
-	\param id Id to identify the gui element.
-	\param restoreCWD If set to true, the current working directory will be
-	restored after the dialog is closed in some way. Otherwise the working
-	directory will be the one that the file dialog was last showing.
-	\param startDir Optional path for which the file dialog will be opened.
-	\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,
-		bool modal=true, IGUIElement* parent=0, s32 id=-1,
-		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().
-	\param rectangle Rectangle specifying the borders of the static text
-	\param border Set to true if the static text should have a 3d border.
-	\param wordWrap Enable if the text should wrap into multiple lines.
-	\param parent Parent item of the element, e.g. a window.
-	\param id The ID of the element.
-	\param fillBackground Enable if the background shall be filled.
-	Defaults to false.
-	\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,
-		bool border=false, bool wordWrap=true, IGUIElement* parent=0, s32 id=-1,
-		bool fillBackground = false) = 0;
-
-	//! Adds an edit box.
-	/** Supports Unicode input from every keyboard around the world,
-	scrolling, copying and pasting (exchanging data with the clipboard
-	directly), maximum character amount, marking, and all shortcuts like
-	ctrl+X, ctrl+V, ctrl+C, shift+Left, shift+Right, Home, End, and so on.
-	\param text Text to be displayed. Can be altered after creation
-	by setText().
-	\param rectangle Rectangle specifying the borders of the edit box.
-	\param border Set to true if the edit box should have a 3d border.
-	\param parent Parent item of the element, e.g. a window.
-	Set it to 0 to place the edit box directly in the environment.
-	\param id The ID of the element.
-	\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,
-		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.
-	\param parent Parent item of the element, e.g. a window.
-	Set it to 0 to place the tab control directly in the environment.
-	\param fillbackground Specifies if the background of the tab control
-	should be drawn.
-	\param border Specifies if a flat 3d border should be drawn. This is
-	usually not necessary unless you place the control directly into
-	the environment without a window as parent.
-	\param id An identifier for the tab control.
-	\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,
-		IGUIElement* parent=0, bool fillbackground=false,
-		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
-	for creating tabs on tab controls, please use IGUITabControl::addTab()
-	for this instead.
-	\param rectangle Rectangle specifying the borders of the tab.
-	\param parent Parent item of the element, e.g. a window.
-	Set it to 0 to place the tab directly in the environment.
-	\param id An identifier for the tab.
-	\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,
-		IGUIElement* parent=0, s32 id=-1) = 0;
-
-	//! Adds a combo box to the environment.
-	/** \param rectangle Rectangle specifying the borders of the combo box.
-	\param parent Parent item of the element, e.g. a window.
-	Set it to 0 to place the combo box directly in the environment.
-	\param id An identifier for the combo box.
-	\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,
-		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
-	would happen otherwise by the tab-keys.
-	\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;
-
-	//! Set the way the gui will handle automatic focus changes
-	/** The default is (EFF_SET_ON_LMOUSE_DOWN | EFF_SET_ON_TAB).
-	with the left mouse button.
-	This does not affect the setFocus function itself - users can still call that whenever they want on any element.
-	\param flags A bitmask which is a combination of ::EFOCUS_FLAG flags.*/
-	virtual void setFocusBehavior(u32 flags) = 0;
-
-	//! Get the way the gui does handle focus changes
-	/** \returns A bitmask which is a combination of ::EFOCUS_FLAG flags.*/
-	virtual u32 getFocusBehavior() const = 0;
-
-	//! Adds a IGUIElement to deletion queue.
-	/** Queued elements will be removed at the end of each drawAll call.
-	Or latest in the destructor of the GUIEnvironment.
-	This can be used to allow an element removing itself safely in a function 
-	iterating over gui elements, like an overloaded	IGUIElement::draw or 
-	IGUIElement::OnPostRender function.
-	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;
-};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "IGUISkin.h"
+#include "rect.h"
+#include "EFocusFlags.h"
+#include "IEventReceiver.h"
+#include "path.h"
+
+namespace irr
+{
+class IOSOperator;
+class IEventReceiver;
+
+namespace io
+{
+class IReadFile;
+class IWriteFile;
+class IFileSystem;
+} // end namespace io
+namespace video
+{
+class IVideoDriver;
+class ITexture;
+} // end namespace video
+
+namespace gui
+{
+
+class IGUIElement;
+class IGUIFont;
+class IGUISpriteBank;
+class IGUIScrollBar;
+class IGUIImage;
+class IGUICheckBox;
+class IGUIListBox;
+class IGUIImageList;
+class IGUIFileOpenDialog;
+class IGUIStaticText;
+class IGUIEditBox;
+class IGUITabControl;
+class IGUITab;
+class IGUIComboBox;
+class IGUIButton;
+class IGUIWindow;
+
+//! GUI Environment. Used as factory and manager of all other GUI elements.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE (which are passed on to focused sub-elements):
+\li EGET_ELEMENT_FOCUS_LOST
+\li EGET_ELEMENT_FOCUSED
+\li EGET_ELEMENT_LEFT
+\li EGET_ELEMENT_HOVERED
+*/
+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. */
+	virtual void drawAll(bool useScreenSize = true) = 0;
+
+	//! Sets the focus to an element.
+	/** Causes a EGET_ELEMENT_FOCUS_LOST event followed by a
+	EGET_ELEMENT_FOCUSED event. If someone absorbed either of the events,
+	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;
+
+	//! Returns the element which holds the focus.
+	/** \return Pointer to the element with focus. */
+	virtual IGUIElement *getFocus() const = 0;
+
+	//! Returns the element which was last under the mouse cursor
+	/** NOTE: This information is updated _after_ the user-eventreceiver
+	received it's mouse-events. To find the hovered element while catching
+	mouse events you have to use instead:
+	IGUIEnvironment::getRootGUIElement()->getElementFromPoint(mousePos);
+	\return Pointer to the element under the mouse. */
+	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;
+
+	//! 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;
+
+	//! Returns the current video driver.
+	/** \return Pointer to the video driver. */
+	virtual video::IVideoDriver *getVideoDriver() const = 0;
+
+	//! Returns the file system.
+	/** \return Pointer to the file system. */
+	virtual io::IFileSystem *getFileSystem() const = 0;
+
+	//! returns a pointer to the OS operator
+	/** \return Pointer to the OS operator. */
+	virtual IOSOperator *getOSOperator() const = 0;
+
+	//! Removes all elements from the environment.
+	virtual void clear() = 0;
+
+	//! Posts an input event to the environment.
+	/** Usually you do not have to
+	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;
+
+	//! 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;
+
+	//! Returns pointer to the current gui skin.
+	/** \return Pointer to the GUI skin. */
+	virtual IGUISkin *getSkin() const = 0;
+
+	//! Sets a new GUI Skin
+	/** You can use this to change the appearance of the whole GUI
+	Environment. You can set one of the built-in skins or implement your
+	own class derived from IGUISkin and enable it using this method.
+	To set for example the built-in Windows classic skin, use the following
+	code:
+	\code
+	gui::IGUISkin* newskin = environment->createSkin(gui::EGST_WINDOWS_CLASSIC);
+	environment->setSkin(newskin);
+	newskin->drop();
+	\endcode
+	\param skin New skin to use.
+	*/
+	virtual void setSkin(IGUISkin *skin) = 0;
+
+	//! Creates a new GUI Skin based on a template.
+	/** Use setSkin() to set the created skin.
+	\param type The type of the new skin.
+	\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;
+
+	//! Creates the image list from the given texture.
+	/** \param texture Texture to split into images
+	\param imageSize Dimension of each image
+	\param useAlphaChannel Flag whether alpha channel of the texture should be honored.
+	\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,
+			core::dimension2d<s32> imageSize,
+			bool useAlphaChannel) = 0;
+
+	//! Returns pointer to the font with the specified filename.
+	/** Loads the font if it was not loaded before.
+	\param filename Filename of the Font.
+	\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;
+
+	//! Adds an externally loaded font to the font list.
+	/** This method allows to attach an already loaded font to the list of
+	existing fonts. The font is grabbed if non-null and adding was successful.
+	\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;
+
+	//! remove loaded font
+	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;
+
+	//! 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;
+
+	//! 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;
+
+	//! Returns the root gui element.
+	/** This is the first gui element, the (direct or indirect) parent of all
+	other gui elements. It is a valid IGUIElement, with dimensions the same
+	size as the screen.
+	\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;
+
+	//! Adds a button element.
+	/** \param rectangle Rectangle specifying the borders of the button.
+	\param parent Parent gui element of the button.
+	\param id Id with which the gui element can be identified.
+	\param text Text displayed on the button.
+	\param tooltiptext Text displayed in the tooltip.
+	\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,
+			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
+	or vertical.
+	\param rectangle Rectangle specifying the borders of the scrollbar.
+	\param parent Parent gui element of the scroll bar.
+	\param id Id to identify the gui element.
+	\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,
+			IGUIElement *parent = 0, s32 id = -1) = 0;
+
+	//! Adds an image element.
+	/** \param image Image to be displayed.
+	\param pos Position of the image. The width and height of the image is
+	taken from the image.
+	\param useAlphaChannel Sets if the image should use the alpha channel
+	of the texture to draw itself.
+	\param parent Parent gui element of the image.
+	\param id Id to identify the gui element.
+	\param text Title text of the image (not displayed).
+	\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,
+			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.
+	\param rectangle Rectangle specifying the borders of the image.
+	\param parent Parent gui element of the image.
+	\param id Id to identify the gui element.
+	\param text Title text of the image (not displayed).
+	\param useAlphaChannel Sets if the image should use the alpha channel
+	of the texture to draw itself.
+	\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,
+			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.
+	\param rectangle Rectangle specifying the borders of the check box.
+	\param parent Parent gui element of the check box.
+	\param id Id to identify the gui element.
+	\param text Title text of the check box.
+	\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,
+			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.
+	\param parent Parent gui element of the list box.
+	\param id Id to identify the gui element.
+	\param drawBackground Flag whether the background should be drawn.
+	\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,
+			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.
+	\param modal Defines if the dialog is modal. This means, that all other
+	gui elements which were created before the message box cannot be used
+	until this messagebox is removed.
+	\param parent Parent gui element of the dialog.
+	\param id Id to identify the gui element.
+	\param restoreCWD If set to true, the current working directory will be
+	restored after the dialog is closed in some way. Otherwise the working
+	directory will be the one that the file dialog was last showing.
+	\param startDir Optional path for which the file dialog will be opened.
+	\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,
+			bool modal = true, IGUIElement *parent = 0, s32 id = -1,
+			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().
+	\param rectangle Rectangle specifying the borders of the static text
+	\param border Set to true if the static text should have a 3d border.
+	\param wordWrap Enable if the text should wrap into multiple lines.
+	\param parent Parent item of the element, e.g. a window.
+	\param id The ID of the element.
+	\param fillBackground Enable if the background shall be filled.
+	Defaults to false.
+	\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,
+			bool border = false, bool wordWrap = true, IGUIElement *parent = 0, s32 id = -1,
+			bool fillBackground = false) = 0;
+
+	//! Adds an edit box.
+	/** Supports Unicode input from every keyboard around the world,
+	scrolling, copying and pasting (exchanging data with the clipboard
+	directly), maximum character amount, marking, and all shortcuts like
+	ctrl+X, ctrl+V, ctrl+C, shift+Left, shift+Right, Home, End, and so on.
+	\param text Text to be displayed. Can be altered after creation
+	by setText().
+	\param rectangle Rectangle specifying the borders of the edit box.
+	\param border Set to true if the edit box should have a 3d border.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the edit box directly in the environment.
+	\param id The ID of the element.
+	\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,
+			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.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the tab control directly in the environment.
+	\param fillbackground Specifies if the background of the tab control
+	should be drawn.
+	\param border Specifies if a flat 3d border should be drawn. This is
+	usually not necessary unless you place the control directly into
+	the environment without a window as parent.
+	\param id An identifier for the tab control.
+	\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,
+			IGUIElement *parent = 0, bool fillbackground = false,
+			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
+	for creating tabs on tab controls, please use IGUITabControl::addTab()
+	for this instead.
+	\param rectangle Rectangle specifying the borders of the tab.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the tab directly in the environment.
+	\param id An identifier for the tab.
+	\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,
+			IGUIElement *parent = 0, s32 id = -1) = 0;
+
+	//! Adds a combo box to the environment.
+	/** \param rectangle Rectangle specifying the borders of the combo box.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the combo box directly in the environment.
+	\param id An identifier for the combo box.
+	\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,
+			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
+	would happen otherwise by the tab-keys.
+	\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;
+
+	//! Set the way the gui will handle automatic focus changes
+	/** The default is (EFF_SET_ON_LMOUSE_DOWN | EFF_SET_ON_TAB).
+	with the left mouse button.
+	This does not affect the setFocus function itself - users can still call that whenever they want on any element.
+	\param flags A bitmask which is a combination of ::EFOCUS_FLAG flags.*/
+	virtual void setFocusBehavior(u32 flags) = 0;
+
+	//! Get the way the gui does handle focus changes
+	/** \returns A bitmask which is a combination of ::EFOCUS_FLAG flags.*/
+	virtual u32 getFocusBehavior() const = 0;
+
+	//! Adds a IGUIElement to deletion queue.
+	/** Queued elements will be removed at the end of each drawAll call.
+	Or latest in the destructor of the GUIEnvironment.
+	This can be used to allow an element removing itself safely in a function
+	iterating over gui elements, like an overloaded	IGUIElement::draw or
+	IGUIElement::OnPostRender function.
+	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;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUIFileOpenDialog.h

@@ -1,50 +1,44 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
-#define __I_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
-
-#include "IGUIElement.h"
-#include "path.h"
-
-namespace irr
-{
-namespace gui
-{
-
-	//! Standard file chooser dialog.
-	/** \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:
-	\li EGET_DIRECTORY_SELECTED
-	\li EGET_FILE_SELECTED
-	\li EGET_FILE_CHOOSE_DIALOG_CANCELLED
-	*/
-	class IGUIFileOpenDialog : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIFileOpenDialog(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_FILE_OPEN_DIALOG, environment, parent, id, rectangle) {}
-
-		//! Returns the filename of the selected file converted to wide characters. Returns NULL if no file was selected.
-		virtual const wchar_t* getFileName() const = 0;
-
-		//! Returns the filename of the selected file. Is empty if no file was selected.
-		virtual const io::path& getFileNameP() 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;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IGUIElement.h"
+#include "path.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! Standard file chooser dialog.
+/** \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:
+\li EGET_DIRECTORY_SELECTED
+\li EGET_FILE_SELECTED
+\li EGET_FILE_CHOOSE_DIALOG_CANCELLED
+*/
+class IGUIFileOpenDialog : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIFileOpenDialog(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_FILE_OPEN_DIALOG, environment, parent, id, rectangle) {}
+
+	//! Returns the filename of the selected file converted to wide characters. Returns NULL if no file was selected.
+	virtual const wchar_t *getFileName() const = 0;
+
+	//! Returns the filename of the selected file. Is empty if no file was selected.
+	virtual const io::path &getFileNameP() 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;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUIFont.h

@@ -1,104 +1,99 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_FONT_H_INCLUDED__
-#define __I_GUI_FONT_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "SColor.h"
-#include "rect.h"
-#include "irrString.h"
-
-namespace irr
-{
-namespace gui
-{
-
-//! An enum for the different types of GUI font.
-enum EGUI_FONT_TYPE
-{
-	//! Bitmap fonts loaded from an XML file or a texture.
-	EGFT_BITMAP = 0,
-
-	//! Scalable vector fonts loaded from an XML file.
-	/** These fonts reside in system memory and use no video memory
-	until they are displayed. These are slower than bitmap fonts
-	but can be easily scaled and rotated. */
-	EGFT_VECTOR,
-
-	//! A font which uses a the native API provided by the operating system.
-	/** Currently not used. */
-	EGFT_OS,
-
-	//! An external font type provided by the user.
-	EGFT_CUSTOM
-};
-
-//! Font interface.
-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.
-	\param color: Color of the text
-	\param hcenter: Specifies if the text should be centered horizontally into the rectangle.
-	\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,
-		video::SColor color, bool hcenter=false, bool vcenter=false,
-		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;
-
-	//! 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;
-
-	//! 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;
-
-	//! Sets global kerning height for the font.
-	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.
-	\param thisLetter: If this parameter is provided, the left side kerning
-	for this letter is added to the global kerning value. For example, a
-	space might only be one pixel wide, but it may be displayed as several
-	pixels.
-	\param previousLetter: If provided, kerning is calculated for both
-	letters and added to the global kerning value. For example, in a font
-	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;
-
-	//! Returns the distance between letters
-	virtual s32 getKerningHeight() const = 0;
-
-	//! Define which characters should not be drawn by the font.
-	/** For example " " would not draw any space which is usually blank in
-	most fonts.
-	\param s String of symbols which are not send down to the videodriver
-	*/
-	virtual void setInvisibleCharacters( const wchar_t *s ) = 0;
-};
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "SColor.h"
+#include "rect.h"
+#include "irrString.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! An enum for the different types of GUI font.
+enum EGUI_FONT_TYPE
+{
+	//! Bitmap fonts loaded from an XML file or a texture.
+	EGFT_BITMAP = 0,
+
+	//! Scalable vector fonts loaded from an XML file.
+	/** These fonts reside in system memory and use no video memory
+	until they are displayed. These are slower than bitmap fonts
+	but can be easily scaled and rotated. */
+	EGFT_VECTOR,
+
+	//! A font which uses a the native API provided by the operating system.
+	/** Currently not used. */
+	EGFT_OS,
+
+	//! An external font type provided by the user.
+	EGFT_CUSTOM
+};
+
+//! Font interface.
+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.
+	\param color: Color of the text
+	\param hcenter: Specifies if the text should be centered horizontally into the rectangle.
+	\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,
+			video::SColor color, bool hcenter = false, bool vcenter = false,
+			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;
+
+	//! 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;
+
+	//! 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;
+
+	//! Sets global kerning height for the font.
+	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.
+	\param thisLetter: If this parameter is provided, the left side kerning
+	for this letter is added to the global kerning value. For example, a
+	space might only be one pixel wide, but it may be displayed as several
+	pixels.
+	\param previousLetter: If provided, kerning is calculated for both
+	letters and added to the global kerning value. For example, in a font
+	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;
+
+	//! Returns the distance between letters
+	virtual s32 getKerningHeight() const = 0;
+
+	//! Define which characters should not be drawn by the font.
+	/** For example " " would not draw any space which is usually blank in
+	most fonts.
+	\param s String of symbols which are not send down to the videodriver
+	*/
+	virtual void setInvisibleCharacters(const wchar_t *s) = 0;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUIFontBitmap.h

@@ -1,46 +1,41 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_FONT_BITMAP_H_INCLUDED__
-#define __I_GUI_FONT_BITMAP_H_INCLUDED__
-
-#include "IGUIFont.h"
-
-namespace irr
-{
-namespace gui
-{
-	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;
-
-	//! returns the sprite number from a given character
-	virtual u32 getSpriteNoFromChar(const wchar_t *c) const = 0;
-
-	//! Gets kerning values (distance between letters) for the font. If no parameters are provided,
-	/** the global kerning distance is returned.
-	\param thisLetter: If this parameter is provided, the left side kerning for this letter is added
-	to the global kerning value. For example, a space might only be one pixel wide, but it may
-	be displayed as several pixels.
-	\param previousLetter: If provided, kerning is calculated for both letters and added to the global
-	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;
-};
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IGUIFont.h"
+
+namespace irr
+{
+namespace gui
+{
+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;
+
+	//! returns the sprite number from a given character
+	virtual u32 getSpriteNoFromChar(const wchar_t *c) const = 0;
+
+	//! Gets kerning values (distance between letters) for the font. If no parameters are provided,
+	/** the global kerning distance is returned.
+	\param thisLetter: If this parameter is provided, the left side kerning for this letter is added
+	to the global kerning value. For example, a space might only be one pixel wide, but it may
+	be displayed as several pixels.
+	\param previousLetter: If provided, kerning is calculated for both letters and added to the global
+	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;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUIImage.h

@@ -1,87 +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
-
-#ifndef __I_GUI_IMAGE_H_INCLUDED__
-#define __I_GUI_IMAGE_H_INCLUDED__
-
-#include "IGUIElement.h"
-
-namespace irr
-{
-namespace video
-{
-	class ITexture;
-}
-namespace gui
-{
-	//! GUI element displaying an image.
-	class IGUIImage : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIImage(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_IMAGE, environment, parent, id, rectangle) {}
-
-		//! Sets an image texture
-		virtual void setImage(video::ITexture* image) = 0;
-
-		//! Gets the image texture
-		virtual video::ITexture* getImage() const = 0;
-
-		//! Sets the color of the image
-		/** \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 if the image should scale to fit the element
-		virtual void setScaleImage(bool scale) = 0;
-
-		//! Sets if the image should use its alpha channel to draw itself
-		virtual void setUseAlphaChannel(bool use) = 0;
-
-		//! Gets the color of the image
-		virtual video::SColor getColor() const = 0;
-
-		//! Returns true if the image is scaled to fit, false if not
-		virtual bool isImageScaled() const = 0;
-
-		//! Returns true if the image is using the alpha channel, false if not
-		virtual bool isAlphaChannelUsed() const = 0;
-
-		//! Sets the source rectangle of the image. By default the full image is used.
-		/** \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;
-
-		//! Returns the customized source rectangle of the image to be used.
-		/** By default an empty rectangle of width and height 0 is returned which means the full image is used. */
-		virtual core::rect<s32> getSourceRect() const = 0;
-
-		//! Restrict drawing-area.
-		/** This allows for example to use the image as a progress bar.
-			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.
-		virtual core::rect<f32> getDrawBounds() const = 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;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
+// 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
+
+#include "IGUIElement.h"
+
+namespace irr
+{
+namespace video
+{
+class ITexture;
+}
+namespace gui
+{
+//! GUI element displaying an image.
+class IGUIImage : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIImage(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_IMAGE, environment, parent, id, rectangle) {}
+
+	//! Sets an image texture
+	virtual void setImage(video::ITexture *image) = 0;
+
+	//! Gets the image texture
+	virtual video::ITexture *getImage() const = 0;
+
+	//! Sets the color of the image
+	/** \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 if the image should scale to fit the element
+	virtual void setScaleImage(bool scale) = 0;
+
+	//! Sets if the image should use its alpha channel to draw itself
+	virtual void setUseAlphaChannel(bool use) = 0;
+
+	//! Gets the color of the image
+	virtual video::SColor getColor() const = 0;
+
+	//! Returns true if the image is scaled to fit, false if not
+	virtual bool isImageScaled() const = 0;
+
+	//! Returns true if the image is using the alpha channel, false if not
+	virtual bool isAlphaChannelUsed() const = 0;
+
+	//! Sets the source rectangle of the image. By default the full image is used.
+	/** \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;
+
+	//! Returns the customized source rectangle of the image to be used.
+	/** By default an empty rectangle of width and height 0 is returned which means the full image is used. */
+	virtual core::rect<s32> getSourceRect() const = 0;
+
+	//! Restrict drawing-area.
+	/** This allows for example to use the image as a progress bar.
+		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.
+	virtual core::rect<f32> getDrawBounds() const = 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;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUIImageList.h

@@ -1,45 +1,40 @@
-// This file is part of the "Irrlicht Engine".
-// written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
-
-#ifndef __I_GUI_IMAGE_LIST_H_INCLUDED__
-#define __I_GUI_IMAGE_LIST_H_INCLUDED__
-
-#include "IGUIElement.h"
-#include "rect.h"
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace gui
-{
-
-//! Font interface.
-class IGUIImageList : public virtual IReferenceCounted
-{
-public:
-
-	//! Destructor
-	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,
-		const core::rect<s32>* clip = 0) = 0;
-
-	//! Returns the count of Images in the list.
-	//! \return Returns the count of Images in the list.
-	virtual s32 getImageCount() const = 0;
-
-	//! Returns the size of the images in the list.
-	//! \return Returns the size of the images in the list.
-	virtual core::dimension2d<s32> getImageSize() const = 0;
-};
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-
+// This file is part of the "Irrlicht Engine".
+// written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
+
+#pragma once
+
+#include "IGUIElement.h"
+#include "rect.h"
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! Font interface.
+class IGUIImageList : public virtual IReferenceCounted
+{
+public:
+	//! Destructor
+	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,
+			const core::rect<s32> *clip = 0) = 0;
+
+	//! Returns the count of Images in the list.
+	//! \return Returns the count of Images in the list.
+	virtual s32 getImageCount() const = 0;
+
+	//! Returns the size of the images in the list.
+	//! \return Returns the size of the images in the list.
+	virtual core::dimension2d<s32> getImageSize() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUIListBox.h

@@ -1,142 +1,136 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_LIST_BOX_H_INCLUDED__
-#define __I_GUI_LIST_BOX_H_INCLUDED__
-
-#include "IGUIElement.h"
-#include "SColor.h"
-
-namespace irr
-{
-namespace gui
-{
-	class IGUISpriteBank;
-	class IGUIScrollBar;
-
-	//! Enumeration for listbox colors
-	enum EGUI_LISTBOX_COLOR
-	{
-		//! Color of text
-		EGUI_LBC_TEXT=0,
-		//! Color of selected text
-		EGUI_LBC_TEXT_HIGHLIGHT,
-		//! Color of icon
-		EGUI_LBC_ICON,
-		//! Color of selected icon
-		EGUI_LBC_ICON_HIGHLIGHT,
-		//! Not used, just counts the number of available colors
-		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;
-};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IGUIElement.h"
+#include "SColor.h"
+
+namespace irr
+{
+namespace gui
+{
+class IGUISpriteBank;
+class IGUIScrollBar;
+
+//! Enumeration for listbox colors
+enum EGUI_LISTBOX_COLOR
+{
+	//! Color of text
+	EGUI_LBC_TEXT = 0,
+	//! Color of selected text
+	EGUI_LBC_TEXT_HIGHLIGHT,
+	//! Color of icon
+	EGUI_LBC_ICON,
+	//! Color of selected icon
+	EGUI_LBC_ICON_HIGHLIGHT,
+	//! Not used, just counts the number of available colors
+	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;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUIScrollBar.h

@@ -1,65 +1,59 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_SCROLL_BAR_H_INCLUDED__
-#define __I_GUI_SCROLL_BAR_H_INCLUDED__
-
-#include "IGUIElement.h"
-
-namespace irr
-{
-namespace gui
-{
-
-	//! Default scroll bar GUI element.
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_SCROLL_BAR_CHANGED
-	*/
-	class IGUIScrollBar : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIScrollBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_SCROLL_BAR, environment, parent, id, rectangle) {}
-
-		//! sets the maximum value of the scrollbar.
-		virtual void setMax(s32 max) = 0;
-		//! gets the maximum value of the scrollbar.
-		virtual s32 getMax() const = 0;
-
-		//! sets the minimum value of the scrollbar.
-		virtual void setMin(s32 min) = 0;
-		//! gets the minimum value of the scrollbar.
-		virtual s32 getMin() const = 0;
-
-		//! gets the small step value
-		virtual s32 getSmallStep() const = 0;
-
-		//! Sets the small step
-		/** 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;
-
-		//! gets the large step value
-		virtual s32 getLargeStep() const = 0;
-
-		//! Sets the large step
-		/** 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;
-
-		//! 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;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IGUIElement.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! Default scroll bar GUI element.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_SCROLL_BAR_CHANGED
+*/
+class IGUIScrollBar : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_SCROLL_BAR, environment, parent, id, rectangle) {}
+
+	//! sets the maximum value of the scrollbar.
+	virtual void setMax(s32 max) = 0;
+	//! gets the maximum value of the scrollbar.
+	virtual s32 getMax() const = 0;
+
+	//! sets the minimum value of the scrollbar.
+	virtual void setMin(s32 min) = 0;
+	//! gets the minimum value of the scrollbar.
+	virtual s32 getMin() const = 0;
+
+	//! gets the small step value
+	virtual s32 getSmallStep() const = 0;
+
+	//! Sets the small step
+	/** 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;
+
+	//! gets the large step value
+	virtual s32 getLargeStep() const = 0;
+
+	//! Sets the large step
+	/** 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;
+
+	//! 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;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUISpriteBank.h

@@ -1,142 +1,138 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_SPRITE_BANK_H_INCLUDED__
-#define __I_GUI_SPRITE_BANK_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "irrArray.h"
-#include "SColor.h"
-#include "rect.h"
-
-namespace irr
-{
-
-namespace video
-{
-	class ITexture;
-} // end namespace video
-
-namespace gui
-{
-
-//! A single sprite frame.
-// 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(u32 textureIndex, u32 positionIndex)
-	: textureNumber(textureIndex), rectNumber(positionIndex)
-	{
-	}
-
-	//! Texture index in IGUISpriteBank
-	u32 textureNumber;
-
-	//! Index in IGUISpriteBank::getPositions()
-	u32 rectNumber;
-};
-
-//! A sprite composed of several frames.
-// Note for implementer: Can't fix variable names to uppercase as this is a public interface used since a while
-struct SGUISprite
-{
-	SGUISprite() : frameTime(0) {}
-	SGUISprite(const SGUISpriteFrame& firstFrame) : frameTime(0)
-	{
-		Frames.push_back(firstFrame);
-	}
-
-	core::array<SGUISpriteFrame> Frames;
-	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.
-*/
-class IGUISpriteBank : public virtual IReferenceCounted
-{
-public:
-
-	//! Returns the list of rectangles held by the sprite bank
-	virtual core::array< core::rect<s32> >& getPositions() = 0;
-
-	//! Returns the array of animated sprites within the sprite bank
-	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;
-
-	//! Adds a texture to the sprite bank
-	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;
-
-	//! 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;
-
-	//! Clears sprites, rectangles and textures
-	virtual void clear() = 0;
-
-	//! Draws a sprite in 2d with position and color
-	/**
-	\param index Index of SGUISprite to draw
-	\param pos Target position - depending on center value either the left-top or the sprite center is used as pivot
-	\param clip Clipping rectangle, can be 0 when clipping is not wanted.
-	\param color Color with which the image is drawn.
-		Note that the alpha component is used. If alpha is other than
-		255, the image will be transparent.
-	\param starttime Tick when the first frame was drawn (only difference currenttime-starttime matters).
-	\param currenttime To calculate the frame of animated sprites
-	\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,
-			const core::rect<s32>* clip=0,
-			const video::SColor& color= video::SColor(255,255,255,255),
-			u32 starttime=0, u32 currenttime=0,
-			bool loop=true, bool center=false) = 0;
-
-	//! Draws a sprite in 2d with destination rectangle and colors
-	/**
-		\param index Index of SGUISprite to draw
-		\param destRect The sprite will be scaled to fit this target rectangle
-		\param clip Clipping rectangle, can be 0 when clipping is not wanted.
-		\param colors Array of 4 colors denoting the color values of
-		the corners of the destRect
-		\param timeTicks Current frame for animated sprites
-		(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,
-			const core::rect<s32>* clip=0,
-			const video::SColor * const colors=0,
-			u32 timeTicks = 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,
-			const core::rect<s32>* clip=0,
-			const video::SColor& color= video::SColor(255,255,255,255),
-			u32 starttime=0, u32 currenttime=0,
-			bool loop=true, bool center=false) = 0;
-};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif // __I_GUI_SPRITE_BANK_H_INCLUDED__
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "irrArray.h"
+#include "SColor.h"
+#include "rect.h"
+
+namespace irr
+{
+
+namespace video
+{
+class ITexture;
+} // end namespace video
+
+namespace gui
+{
+
+//! A single sprite frame.
+// 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(u32 textureIndex, u32 positionIndex) :
+			textureNumber(textureIndex), rectNumber(positionIndex)
+	{
+	}
+
+	//! Texture index in IGUISpriteBank
+	u32 textureNumber;
+
+	//! Index in IGUISpriteBank::getPositions()
+	u32 rectNumber;
+};
+
+//! A sprite composed of several frames.
+// Note for implementer: Can't fix variable names to uppercase as this is a public interface used since a while
+struct SGUISprite
+{
+	SGUISprite() :
+			frameTime(0) {}
+	SGUISprite(const SGUISpriteFrame &firstFrame) :
+			frameTime(0)
+	{
+		Frames.push_back(firstFrame);
+	}
+
+	core::array<SGUISpriteFrame> Frames;
+	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.
+ */
+class IGUISpriteBank : public virtual IReferenceCounted
+{
+public:
+	//! Returns the list of rectangles held by the sprite bank
+	virtual core::array<core::rect<s32>> &getPositions() = 0;
+
+	//! Returns the array of animated sprites within the sprite bank
+	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;
+
+	//! Adds a texture to the sprite bank
+	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;
+
+	//! 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;
+
+	//! Clears sprites, rectangles and textures
+	virtual void clear() = 0;
+
+	//! Draws a sprite in 2d with position and color
+	/**
+	\param index Index of SGUISprite to draw
+	\param pos Target position - depending on center value either the left-top or the sprite center is used as pivot
+	\param clip Clipping rectangle, can be 0 when clipping is not wanted.
+	\param color Color with which the image is drawn.
+		Note that the alpha component is used. If alpha is other than
+		255, the image will be transparent.
+	\param starttime Tick when the first frame was drawn (only difference currenttime-starttime matters).
+	\param currenttime To calculate the frame of animated sprites
+	\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,
+			const core::rect<s32> *clip = 0,
+			const video::SColor &color = video::SColor(255, 255, 255, 255),
+			u32 starttime = 0, u32 currenttime = 0,
+			bool loop = true, bool center = false) = 0;
+
+	//! Draws a sprite in 2d with destination rectangle and colors
+	/**
+		\param index Index of SGUISprite to draw
+		\param destRect The sprite will be scaled to fit this target rectangle
+		\param clip Clipping rectangle, can be 0 when clipping is not wanted.
+		\param colors Array of 4 colors denoting the color values of
+		the corners of the destRect
+		\param timeTicks Current frame for animated sprites
+		(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,
+			const core::rect<s32> *clip = 0,
+			const video::SColor *const colors = 0,
+			u32 timeTicks = 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,
+			const core::rect<s32> *clip = 0,
+			const video::SColor &color = video::SColor(255, 255, 255, 255),
+			u32 starttime = 0, u32 currenttime = 0,
+			bool loop = true, bool center = false) = 0;
+};
+
+} // end namespace gui
+} // end namespace irr

include/IGUIStaticText.h

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

include/IGUITabControl.h

@@ -1,164 +1,149 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_TAB_CONTROL_H_INCLUDED__
-#define __I_GUI_TAB_CONTROL_H_INCLUDED__
-
-#include "IGUIElement.h"
-#include "SColor.h"
-#include "IGUISkin.h"
-
-namespace irr
-{
-namespace gui
-{
-	class IGUITab;
-
-	//! A standard tab control
-	/** \par This element can create the following events of type EGUI_EVENT_TYPE:
-	\li EGET_TAB_CHANGED
-	*/
-	class IGUITabControl : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUITabControl(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_TAB_CONTROL, environment, parent, id, rectangle) {}
-
-		//! Adds a tab
-		virtual IGUITab* addTab(const wchar_t* caption, s32 id=-1) = 0;
-
-		//! Adds an existing tab
-		/** 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;
-
-		//! Insert the tab at the given index
-		/** \return The tab on success or NULL on failure. */
-		virtual IGUITab* insertTab(s32 idx, const wchar_t* caption, s32 id=-1) = 0;
-
-		//! Insert an existing tab
-		/** Note that it will also add the tab as a child of this TabControl.
-		\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
-		virtual void removeTab(s32 idx) = 0;
-
-		//! Clears the tabcontrol removing all tabs
-		virtual void clear() = 0;
-
-		//! Returns amount of tabs in the tabcontrol
-		virtual s32 getTabCount() const = 0;
-
-		//! Returns a tab based on zero based index
-		/** \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;
-
-		//! For given element find if it's a tab and return it's zero-based index (or -1 for not found)
-		/** \param tab Tab for which we are looking (usually you will look for an IGUITab* type as only  
-		              those can be tabs, but we allow looking for any kind of IGUIElement* as there are some 
-					  use-cases for that even if it just returns 0. For example this way you can check for
-					  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.
-		/** \param idx: number of the tab.
-		\return Returns true if successful. */
-		virtual bool setActiveTab(s32 idx) = 0;
-
-		//! Brings a tab to front.
-		/** \param tab: pointer to the tab.
-		\return Returns true if successful. */
-		virtual bool setActiveTab(IGUITab *tab) = 0;
-
-		//! Returns which tab is currently active
-		virtual s32 getActiveTab() const = 0;
-
-		//! get the the id of the tab at the given absolute coordinates
-		/** \return The id of the tab or -1 when no tab is at those coordinates*/
-		virtual s32 getTabAt(s32 xpos, s32 ypos) const = 0;
-
-		//! Set the height of the tabs
-		virtual void setTabHeight( s32 height ) = 0;
-
-		//! Get the height of the tabs
-		/** return Returns the height of the tabs */
-		virtual s32 getTabHeight() const = 0;
-
-		//! set the maximal width of a tab. Per default width is 0 which means "no width restriction".
-		virtual void setTabMaxWidth(s32 width ) = 0;
-
-		//! get the maximal width of a tab
-		virtual s32 getTabMaxWidth() const = 0;
-
-		//! Set the alignment of the tabs
-		/** Use EGUIA_UPPERLEFT or EGUIA_LOWERRIGHT */
-		virtual void setTabVerticalAlignment( gui::EGUI_ALIGNMENT alignment ) = 0;
-
-		//! Get the alignment of the tabs
-		/** return Returns the alignment of the tabs */
-		virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const = 0;
-
-		//! Set the extra width added to tabs on each side of the text
-		virtual void setTabExtraWidth( s32 extraWidth ) = 0;
-
-		//! Get the extra width added to tabs on each side of the text
-		/** return Returns the extra width of the tabs */
-		virtual s32 getTabExtraWidth() const = 0;
-	};
-
-	//! A tab-page, onto which other gui elements could be added.
-	/** IGUITab refers mostly to the page itself, but also carries some data about the tab in the tabbar of an IGUITabControl. */
-	class IGUITab : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUITab(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_TAB, environment, parent, id, rectangle) {}
-
-		//! Returns zero based index of tab if in tabcontrol.
-		/** \deprecated Deprecated in 1.9, use IGUITabControl::getTabIndex instead*/
-		_IRR_DEPRECATED_ virtual s32 getNumber() const
-		{
-			if (Parent && Parent->getType() == EGUIET_TAB_CONTROL)
-				return static_cast<IGUITabControl*>(Parent)->getTabIndex(this);
-			return -1;
-		}
-
-		//! sets if the tab should draw its background
-		virtual void setDrawBackground(bool draw=true) = 0;
-
-		//! sets the color of the background, if it should be drawn.
-		virtual void setBackgroundColor(video::SColor c) = 0;
-
-		//! returns true if the tab is drawing its background, false if not
-		virtual bool isDrawingBackground() 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
-
+// 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
+
+#include "IGUIElement.h"
+#include "SColor.h"
+#include "IGUISkin.h"
+
+namespace irr
+{
+namespace gui
+{
+class IGUITab;
+
+//! A standard tab control
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_TAB_CHANGED
+*/
+class IGUITabControl : public IGUIElement
+{
+public:
+	//! constructor
+	IGUITabControl(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TAB_CONTROL, environment, parent, id, rectangle) {}
+
+	//! Adds a tab
+	virtual IGUITab *addTab(const wchar_t *caption, s32 id = -1) = 0;
+
+	//! Adds an existing tab
+	/** 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;
+
+	//! Insert the tab at the given index
+	/** \return The tab on success or NULL on failure. */
+	virtual IGUITab *insertTab(s32 idx, const wchar_t *caption, s32 id = -1) = 0;
+
+	//! Insert an existing tab
+	/** Note that it will also add the tab as a child of this TabControl.
+	\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
+	virtual void removeTab(s32 idx) = 0;
+
+	//! Clears the tabcontrol removing all tabs
+	virtual void clear() = 0;
+
+	//! Returns amount of tabs in the tabcontrol
+	virtual s32 getTabCount() const = 0;
+
+	//! Returns a tab based on zero based index
+	/** \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;
+
+	//! For given element find if it's a tab and return it's zero-based index (or -1 for not found)
+	/** \param tab Tab for which we are looking (usually you will look for an IGUITab* type as only
+				  those can be tabs, but we allow looking for any kind of IGUIElement* as there are some
+				  use-cases for that even if it just returns 0. For example this way you can check for
+				  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.
+	/** \param idx: number of the tab.
+	\return Returns true if successful. */
+	virtual bool setActiveTab(s32 idx) = 0;
+
+	//! Brings a tab to front.
+	/** \param tab: pointer to the tab.
+	\return Returns true if successful. */
+	virtual bool setActiveTab(IGUITab *tab) = 0;
+
+	//! Returns which tab is currently active
+	virtual s32 getActiveTab() const = 0;
+
+	//! get the the id of the tab at the given absolute coordinates
+	/** \return The id of the tab or -1 when no tab is at those coordinates*/
+	virtual s32 getTabAt(s32 xpos, s32 ypos) const = 0;
+
+	//! Set the height of the tabs
+	virtual void setTabHeight(s32 height) = 0;
+
+	//! Get the height of the tabs
+	/** return Returns the height of the tabs */
+	virtual s32 getTabHeight() const = 0;
+
+	//! set the maximal width of a tab. Per default width is 0 which means "no width restriction".
+	virtual void setTabMaxWidth(s32 width) = 0;
+
+	//! get the maximal width of a tab
+	virtual s32 getTabMaxWidth() const = 0;
+
+	//! Set the alignment of the tabs
+	/** Use EGUIA_UPPERLEFT or EGUIA_LOWERRIGHT */
+	virtual void setTabVerticalAlignment(gui::EGUI_ALIGNMENT alignment) = 0;
+
+	//! Get the alignment of the tabs
+	/** return Returns the alignment of the tabs */
+	virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const = 0;
+
+	//! Set the extra width added to tabs on each side of the text
+	virtual void setTabExtraWidth(s32 extraWidth) = 0;
+
+	//! Get the extra width added to tabs on each side of the text
+	/** return Returns the extra width of the tabs */
+	virtual s32 getTabExtraWidth() const = 0;
+};
+
+//! A tab-page, onto which other gui elements could be added.
+/** IGUITab refers mostly to the page itself, but also carries some data about the tab in the tabbar of an IGUITabControl. */
+class IGUITab : public IGUIElement
+{
+public:
+	//! constructor
+	IGUITab(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TAB, environment, parent, id, rectangle) {}
+
+	//! sets if the tab should draw its background
+	virtual void setDrawBackground(bool draw = true) = 0;
+
+	//! sets the color of the background, if it should be drawn.
+	virtual void setBackgroundColor(video::SColor c) = 0;
+
+	//! returns true if the tab is drawing its background, false if not
+	virtual bool isDrawingBackground() 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

include/IGUIToolbar.h

@@ -1,40 +1,34 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_GUI_TOOL_BAR_H_INCLUDED__
-#define __I_GUI_TOOL_BAR_H_INCLUDED__
-
-#include "IGUIElement.h"
-
-namespace irr
-{
-namespace video
-{
-	class ITexture;
-} // end namespace video
-namespace gui
-{
-	class IGUIButton;
-
-	//! Stays at the top of its parent like the menu bar and contains tool buttons
-	class IGUIToolBar : public IGUIElement
-	{
-	public:
-
-		//! constructor
-		IGUIToolBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle)
-			: IGUIElement(EGUIET_TOOL_BAR, environment, parent, id, rectangle) {}
-
-		//! 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
-
+// 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
+
+#include "IGUIElement.h"
+
+namespace irr
+{
+namespace video
+{
+class ITexture;
+} // end namespace video
+namespace gui
+{
+class IGUIButton;
+
+//! Stays at the top of its parent like the menu bar and contains tool buttons
+class IGUIToolBar : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIToolBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TOOL_BAR, environment, parent, id, rectangle) {}
+
+	//! 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

include/IImageLoader.h

@@ -1,66 +1,49 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_SURFACE_LOADER_H_INCLUDED__
-#define __I_SURFACE_LOADER_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "IImage.h"
-#include "ITexture.h"
-#include "path.h"
-#include "irrArray.h"
-
-namespace irr
-{
-namespace io
-{
-	class IReadFile;
-} // end namespace io
-namespace video
-{
-
-//! Class which is able to create a image from a file.
-/** If you want the Irrlicht Engine be able to load textures of
-currently unsupported file formats (e.g .gif), then implement
-this and add your new Surface loader with
-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;
-
-	//! 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;
-
-	//! 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;
-
-	//! Creates a multiple surfaces from the file eg. whole cube map.
-	/** \param file File handle to check.
-	\param type Pointer to E_TEXTURE_TYPE where a recommended type of the texture will be stored.
-	\return Array of pointers to newly created images. */
-	virtual core::array<IImage*> loadImages(io::IReadFile* file, E_TEXTURE_TYPE* type) const
-	{
-		core::array<IImage*> image;
-
-		return image;
-	}
-};
-
-
-} // end namespace video
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "IImage.h"
+#include "ITexture.h"
+#include "path.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace io
+{
+class IReadFile;
+} // end namespace io
+namespace video
+{
+
+//! Class which is able to create a image from a file.
+/** If you want the Irrlicht Engine be able to load textures of
+currently unsupported file formats (e.g .gif), then implement
+this and add your new Surface loader with
+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;
+
+	//! 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;
+
+	//! 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;
+};
+
+} // end namespace video
+} // end namespace irr

include/IImageWriter.h

@@ -1,45 +1,40 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef _I_IMAGE_WRITER_H_INCLUDED__
-#define _I_IMAGE_WRITER_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "irrString.h"
-#include "coreutil.h"
-
-namespace irr
-{
-namespace io
-{
-	class IWriteFile;
-} // end namespace io
-
-namespace video
-{
-	class IImage;
-
-
-//! Interface for writing software image data.
-class IImageWriter : public IReferenceCounted
-{
-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;
-
-	//! Write image to file
-	/** \param file File handle to write to.
-	\param image Image to write into file.
-	\param param Writer specific parameter, influencing e.g. quality.
-	\return True if image was successfully written. */
-	virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param = 0) const = 0;
-};
-
-} // namespace video
-} // namespace irr
-
-#endif // _I_IMAGE_WRITER_H_INCLUDED__
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "irrString.h"
+#include "coreutil.h"
+
+namespace irr
+{
+namespace io
+{
+class IWriteFile;
+} // end namespace io
+
+namespace video
+{
+class IImage;
+
+//! Interface for writing software image data.
+class IImageWriter : public IReferenceCounted
+{
+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;
+
+	//! Write image to file
+	/** \param file File handle to write to.
+	\param image Image to write into file.
+	\param param Writer specific parameter, influencing e.g. quality.
+	\return True if image was successfully written. */
+	virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param = 0) const = 0;
+};
+
+} // namespace video
+} // namespace irr

include/IIndexBuffer.h

@@ -1,65 +1,59 @@
-// Copyright (C) 2008-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_INDEX_BUFFER_H_INCLUDED__
-#define __I_INDEX_BUFFER_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "irrArray.h"
-#include "EHardwareBufferFlags.h"
-#include "SVertexIndex.h"
-
-namespace irr
-{
-
-namespace video
-{
-
-}
-
-namespace scene
-{
-
-	class IIndexBuffer : public virtual IReferenceCounted
-	{
-	public:
-
-		virtual void* getData() =0;
-
-		virtual video::E_INDEX_TYPE getType() 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 void* pointer() =0;
-
-		//! get the current hardware mapping hint
-		virtual E_HARDWARE_MAPPING getHardwareMappingHint() const =0;
-
-		//! set the hardware mapping hint, for driver
-		virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint ) =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;
-	};
-
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-
+// 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
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "irrArray.h"
+#include "EHardwareBufferFlags.h"
+#include "SVertexIndex.h"
+
+namespace irr
+{
+
+namespace video
+{
+
+}
+
+namespace scene
+{
+
+class IIndexBuffer : public virtual IReferenceCounted
+{
+public:
+	virtual void *getData() = 0;
+
+	virtual video::E_INDEX_TYPE getType() 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 void *pointer() = 0;
+
+	//! get the current hardware mapping hint
+	virtual E_HARDWARE_MAPPING getHardwareMappingHint() const = 0;
+
+	//! set the hardware mapping hint, for driver
+	virtual void setHardwareMappingHint(E_HARDWARE_MAPPING NewMappingHint) = 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;
+};
+
+} // end namespace scene
+} // end namespace irr

include/ILogger.h

@@ -1,102 +1,75 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_LOGGER_H_INCLUDED__
-#define __I_LOGGER_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-
-namespace irr
-{
-
-//! Possible log levels.
-//! When used has filter ELL_DEBUG means => log everything and ELL_NONE means => log (nearly) nothing.
-//! When used to print logging information ELL_DEBUG will have lowest priority while ELL_NONE
-//! messages are never filtered and always printed.
-enum ELOG_LEVEL
-{
-	//! Used for printing information helpful in debugging
-	ELL_DEBUG,
-
-	//! Useful information to print. For example hardware infos or something started/stopped.
-	ELL_INFORMATION,
-
-	//! Warnings that something isn't as expected and can cause oddities
-	ELL_WARNING,
-
-	//! Something did go wrong.
-	ELL_ERROR,
-
-	//! Logs with ELL_NONE will never be filtered.
-	//! And used as filter it will remove all logging except ELL_NONE messages.
-	ELL_NONE
-};
-
-
-//! Interface for logging messages, warnings and errors
-class ILogger : public virtual IReferenceCounted
-{
-public:
-
-	//! Destructor
-	virtual ~ILogger() {}
-
-	//! Returns the current set log level.
-	virtual ELOG_LEVEL getLogLevel() const = 0;
-
-	//! Sets a new log level.
-	/** With this value, texts which are sent to the logger are filtered
-	out. For example setting this value to ELL_WARNING, only warnings and
-	errors are printed out. Setting it to ELL_INFORMATION, which is the
-	default setting, warnings, errors and informational texts are printed
-	out.
-	\param ll: new log level filter value. */
-	virtual void setLogLevel(ELOG_LEVEL ll) = 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 c8* text, 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 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
-
+// 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
+
+#include "IReferenceCounted.h"
+
+namespace irr
+{
+
+//! Possible log levels.
+//! When used has filter ELL_DEBUG means => log everything and ELL_NONE means => log (nearly) nothing.
+//! When used to print logging information ELL_DEBUG will have lowest priority while ELL_NONE
+//! messages are never filtered and always printed.
+enum ELOG_LEVEL
+{
+	//! Used for printing information helpful in debugging
+	ELL_DEBUG,
+
+	//! 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
+	ELL_WARNING,
+
+	//! Something did go wrong.
+	ELL_ERROR,
+
+	//! Logs with ELL_NONE will never be filtered.
+	//! And used as filter it will remove all logging except ELL_NONE messages.
+	ELL_NONE
+};
+
+//! Interface for logging messages, warnings and errors
+class ILogger : public virtual IReferenceCounted
+{
+public:
+	//! Destructor
+	virtual ~ILogger() {}
+
+	//! Returns the current set log level.
+	virtual ELOG_LEVEL getLogLevel() const = 0;
+
+	//! Sets a new log level.
+	/** With this value, texts which are sent to the logger are filtered
+	out. For example setting this value to ELL_WARNING, only warnings and
+	errors are printed out. Setting it to ELL_INFORMATION, which is the
+	default setting, warnings, errors and informational texts are printed
+	out.
+	\param ll: new log level filter value. */
+	virtual void setLogLevel(ELOG_LEVEL ll) = 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 c8 *text, 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 c8 *text, const c8 *hint, ELOG_LEVEL ll = ELL_INFORMATION) = 0;
+};
+
+} // end namespace

include/IMaterialRenderer.h

@@ -1,107 +1,101 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_MATERIAL_RENDERER_H_INCLUDED__
-#define __I_MATERIAL_RENDERER_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "SMaterial.h"
-#include "S3DVertex.h"
-
-namespace irr
-{
-namespace video
-{
-
-class IVideoDriver;
-class IMaterialRendererServices;
-class IShaderConstantSetCallBack;
-
-//! Interface for material rendering.
-/** Can be used to extend the engine with new materials. Refer to
-IVideoDriver::addMaterialRenderer() for more information on how to extend the
-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
-	vertex or pixel shader if you like.
-	\param material: The new material parameters to be set. The renderer
-	may change the material flags in this material. For example if this
-	material does not accept the zbuffer = true, it can set it to false.
-	This is useful, because in the next lastMaterial will be just the
-	material in this call.
-	\param lastMaterial: The material parameters which have been set before
-	this material.
-	\param resetAllRenderstates: True if all renderstates should really be
-	reset. This is usually true if the last rendering mode was not a usual
-	3d rendering mode, but for example a 2d rendering mode.
-	You should reset really all renderstates if this is true, no matter if
-	the lastMaterial had some similar settings. This is used because in
-	most cases, some common renderstates are not changed if they are
-	already there, for example bilinear filtering, wireframe,
-	gouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
-	fogenable.
-	\param services: Interface providing some methods for changing
-	advanced, internal states of a IVideoDriver. */
-	virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
-		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
-	that the renderstates should be changed, it won't be called if for
-	example two drawIndexedTriangleList() will be called with the same
-	material set. This method will be called every time. This is useful for
-	example for materials with shaders, which don't only set new
-	renderstates but also shader constants.
-	\param service: Pointer to interface providing methods for setting
-	constants and other things.
-	\param vtxtype: Vertex type with which the next rendering will be done.
-	This can be used by the material renderer to set some specific
-	optimized shaders or if this is an incompatible vertex type for this
-	renderer, to refuse rendering for example.
-	\return Returns true if everything is OK, and false if nothing should
-	be rendered. The material renderer can choose to return false for
-	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; }
-
-	//! Called by the IVideoDriver to unset this material.
-	/** Called during the IVideoDriver::setMaterial() call before the new
-	material will get the OnSetMaterial() call. */
-	virtual void OnUnsetMaterial() {}
-
-	//! Returns if the material is transparent.
-	/** The scene management needs to know this
-	for being able to sort the materials by opaque and transparent. */
-	virtual bool isTransparent() const { return false; }
-
-	//! Returns the render capability of the material.
-	/** Because some more complex materials
-	are implemented in multiple ways and need special hardware capabilities, it is possible
-	to query how the current material renderer is performing on the current hardware with this
-	function.
-	\return Returns 0 if everything is running fine. Any other value is material renderer
-	specific and means for example that the renderer switched back to a fall back material because
-	it cannot use the latest shaders. More specific examples:
-	Fixed function pipeline materials should return 0 in most cases, parallax mapped
-	material will only return 0 when at least pixel shader 1.4 is available on that machine. */
-	virtual s32 getRenderCapability() const { return 0; }
-
-	//! 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; }
-};
-
-
-} // end namespace video
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "SMaterial.h"
+#include "S3DVertex.h"
+
+namespace irr
+{
+namespace video
+{
+
+class IVideoDriver;
+class IMaterialRendererServices;
+class IShaderConstantSetCallBack;
+
+//! Interface for material rendering.
+/** Can be used to extend the engine with new materials. Refer to
+IVideoDriver::addMaterialRenderer() for more information on how to extend the
+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
+	vertex or pixel shader if you like.
+	\param material: The new material parameters to be set. The renderer
+	may change the material flags in this material. For example if this
+	material does not accept the zbuffer = true, it can set it to false.
+	This is useful, because in the next lastMaterial will be just the
+	material in this call.
+	\param lastMaterial: The material parameters which have been set before
+	this material.
+	\param resetAllRenderstates: True if all renderstates should really be
+	reset. This is usually true if the last rendering mode was not a usual
+	3d rendering mode, but for example a 2d rendering mode.
+	You should reset really all renderstates if this is true, no matter if
+	the lastMaterial had some similar settings. This is used because in
+	most cases, some common renderstates are not changed if they are
+	already there, for example bilinear filtering, wireframe,
+	gouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
+	fogenable.
+	\param services: Interface providing some methods for changing
+	advanced, internal states of a IVideoDriver. */
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			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
+	that the renderstates should be changed, it won't be called if for
+	example two drawIndexedTriangleList() will be called with the same
+	material set. This method will be called every time. This is useful for
+	example for materials with shaders, which don't only set new
+	renderstates but also shader constants.
+	\param service: Pointer to interface providing methods for setting
+	constants and other things.
+	\param vtxtype: Vertex type with which the next rendering will be done.
+	This can be used by the material renderer to set some specific
+	optimized shaders or if this is an incompatible vertex type for this
+	renderer, to refuse rendering for example.
+	\return Returns true if everything is OK, and false if nothing should
+	be rendered. The material renderer can choose to return false for
+	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; }
+
+	//! Called by the IVideoDriver to unset this material.
+	/** Called during the IVideoDriver::setMaterial() call before the new
+	material will get the OnSetMaterial() call. */
+	virtual void OnUnsetMaterial() {}
+
+	//! Returns if the material is transparent.
+	/** The scene management needs to know this
+	for being able to sort the materials by opaque and transparent. */
+	virtual bool isTransparent() const { return false; }
+
+	//! Returns the render capability of the material.
+	/** Because some more complex materials
+	are implemented in multiple ways and need special hardware capabilities, it is possible
+	to query how the current material renderer is performing on the current hardware with this
+	function.
+	\return Returns 0 if everything is running fine. Any other value is material renderer
+	specific and means for example that the renderer switched back to a fall back material because
+	it cannot use the latest shaders. More specific examples:
+	Fixed function pipeline materials should return 0 in most cases, parallax mapped
+	material will only return 0 when at least pixel shader 1.4 is available on that machine. */
+	virtual s32 getRenderCapability() const { return 0; }
+
+	//! 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; }
+};
+
+} // end namespace video
+} // end namespace irr

include/IMaterialRendererServices.h

@@ -1,151 +1,80 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
-#define __I_MATERIAL_RENDERER_SERVICES_H_INCLUDED__
-
-#include "SMaterial.h"
-#include "S3DVertex.h"
-
-namespace irr
-{
-namespace video
-{
-
-class IVideoDriver;
-
-
-//! Interface providing some methods for changing advanced, internal states of a IVideoDriver.
-class IMaterialRendererServices
-{
-public:
-
-	//! Destructor
-	virtual ~IMaterialRendererServices() {}
-
-	//! Can be called by an IMaterialRenderer to make its work easier.
-	/** Sets all basic renderstates if needed.
-	Basic render states are diffuse, ambient, specular, and emissive color,
-	specular power, bilinear and trilinear filtering, wireframe mode,
-	grouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
-	fog enabling.
-	\param material The new material to be used.
-	\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,
-		const SMaterial& lastMaterial,
-		bool resetAllRenderstates) = 0;
-
-	//! Return an index constant for the vertex shader based on a name.
-	virtual s32 getVertexShaderConstantID(const c8* name) = 0;
-
-	//! Sets a constant for the vertex shader based on a name.
-	/** This can be used if you used a high level shader language like GLSL
-	or HLSL to create a shader. Example: If you created a shader which has
-	variables named 'mWorldViewProj' (containing the WorldViewProjection
-	matrix) and another one named 'fTime' containing one float, you can set
-	them in your IShaderConstantSetCallBack derived class like this:
-	\code
-	virtual void OnSetConstants(video::IMaterialRendererServices* services, s32 userData)
-	{
-		video::IVideoDriver* driver = services->getVideoDriver();
-
-		f32 time = (f32)os::Timer::getTime()/100000.0f;
-		services->setVertexShaderConstant("fTime", &time, 1);
-
-		core::matrix4 worldViewProj(driver->getTransform(video::ETS_PROJECTION));
-		worldViewProj *= driver->getTransform(video::ETS_VIEW);
-		worldViewProj *= driver->getTransform(video::ETS_WORLD);
-		services->setVertexShaderConstant("mWorldViewProj", worldViewProj.M, 16);
-	}
-	\endcode
-	\param index Index of the variable
-	\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;
-
-	//! Int interface for the above.
-	virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count) = 0;
-
-	//! Uint interface for the above.
-	/* NOTE: UINT only works with GLSL, not supported for other shaders.
-	         Also GLES drivers in Irrlicht do not support it as this needs at least GLES 3.0.
-	*/
-	virtual bool setVertexShaderConstant(s32 index, const u32* ints, int count) = 0;
-
-	//! Sets a vertex shader constant.
-	/** Can be used if you created a shader using pixel/vertex shader
-	assembler or ARB_fragment_program or ARB_vertex_program.
-	\param data: Data to be set in the constants
-	\param startRegister: First register to be set
-	\param constantAmount: Amount of registers to be set. One register consists of 4 floats. */
-	virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) = 0;
-
-	//! Return an index constant for the pixel shader based on a name.
-	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 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;
-
-	//! Int interface for the above.
-	virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count) = 0;
-
-	//! Uint interface for the above.
-	/* NOTE: UINT only works with GLSL, not supported for other shaders.
-	         Also GLES drivers in Irrlicht do not support it as this needs at least GLES 3.0.
-	*/
-	virtual bool setPixelShaderConstant(s32 index, const u32* ints, int count) = 0;
-
-	//! Sets a pixel shader constant.
-	/** Can be used if you created a shader using pixel/vertex shader
-	assembler or ARB_fragment_program or ARB_vertex_program.
-	\param data Data to be set in the constants
-	\param startRegister First register to be set.
-	\param constantAmount Amount of registers to be set. One register consists of 4 floats. */
-	virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) = 0;
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setVertexShaderConstant(const c8* name, const f32* floats, int count)
-	{
-		return setVertexShaderConstant(getVertexShaderConstantID(name), floats, count);
-	}
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setVertexShaderConstant(const c8* name, const s32* ints, int count)
-	{
-		return setVertexShaderConstant(getVertexShaderConstantID(name), ints, count);
-	}
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setPixelShaderConstant(const c8* name, const f32* floats, int count)
-	{
-		return setPixelShaderConstant(getPixelShaderConstantID(name), floats, count);
-	}
-
-	//! \deprecated. This method may be removed by Irrlicht 2.0
-	_IRR_DEPRECATED_ bool setPixelShaderConstant(const c8* name, const s32* ints, int count)
-	{
-		return setPixelShaderConstant(getPixelShaderConstantID(name), ints, count);
-	}
-
-	//! Get pointer to the IVideoDriver interface
-	/** \return Pointer to the IVideoDriver interface */
-	virtual IVideoDriver* getVideoDriver() = 0;
-};
-
-} // end namespace video
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "SMaterial.h"
+#include "S3DVertex.h"
+
+namespace irr
+{
+namespace video
+{
+
+class IVideoDriver;
+
+//! Interface providing some methods for changing advanced, internal states of a IVideoDriver.
+class IMaterialRendererServices
+{
+public:
+	//! Destructor
+	virtual ~IMaterialRendererServices() {}
+
+	//! Can be called by an IMaterialRenderer to make its work easier.
+	/** Sets all basic renderstates if needed.
+	Basic render states are diffuse, ambient, specular, and emissive color,
+	specular power, bilinear and trilinear filtering, wireframe mode,
+	grouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
+	fog enabling.
+	\param material The new material to be used.
+	\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,
+			const SMaterial &lastMaterial,
+			bool resetAllRenderstates) = 0;
+
+	//! Return an index constant for the vertex shader based on a uniform variable name.
+	virtual s32 getVertexShaderConstantID(const c8 *name) = 0;
+
+	//! Sets a value for a vertex shader uniform variable.
+	/** \param index Index of the variable (as received from getVertexShaderConstantID)
+	\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;
+
+	//! Int interface for the above.
+	virtual bool setVertexShaderConstant(s32 index, const s32 *ints, int count) = 0;
+
+	//! Uint interface for the above.
+	virtual bool setVertexShaderConstant(s32 index, const u32 *ints, int count) = 0;
+
+	//! Return an index constant for the pixel shader for the given uniform variable name
+	virtual s32 getPixelShaderConstantID(const c8 *name) = 0;
+
+	//! Sets a value for the given pixel shader uniform variable
+	/** This can be used if you used a high level shader language like GLSL
+	or HLSL to create a shader. See setVertexShaderConstant() for an
+	example on how to use this.
+	\param index Index of the variable (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;
+
+	//! Int interface for the above.
+	virtual bool setPixelShaderConstant(s32 index, const s32 *ints, int count) = 0;
+
+	//! Uint interface for the above.
+	virtual bool setPixelShaderConstant(s32 index, const u32 *ints, int count) = 0;
+
+	//! Get pointer to the IVideoDriver interface
+	/** \return Pointer to the IVideoDriver interface */
+	virtual IVideoDriver *getVideoDriver() = 0;
+};
+
+} // end namespace video
+} // end namespace irr

include/IMemoryReadFile.h

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

include/IMesh.h

@@ -1,134 +1,123 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_MESH_H_INCLUDED__
-#define __I_MESH_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "SMaterial.h"
-#include "EHardwareBufferFlags.h"
-
-namespace irr
-{
-namespace scene
-{
-	//! Possible types of meshes.
-	// 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.
-	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;
-
-		//! 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
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "SMaterial.h"
+#include "EHardwareBufferFlags.h"
+
+namespace irr
+{
+namespace scene
+{
+//! Possible types of meshes.
+// 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.
+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
+	{
+		return EAMT_STATIC;
+	}
+};
+
+} // end namespace scene
+} // end namespace irr

include/IMeshBuffer.h

@@ -1,188 +1,182 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_MESH_BUFFER_H_INCLUDED__
-#define __I_MESH_BUFFER_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "SMaterial.h"
-#include "aabbox3d.h"
-#include "S3DVertex.h"
-#include "SVertexIndex.h"
-#include "EHardwareBufferFlags.h"
-#include "EPrimitiveTypes.h"
-
-namespace irr
-{
-namespace scene
-{
-	//! Struct for holding a mesh with a single material.
-	/** 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
-	buffers, but can be. Separately animated parts of the mesh must be put
-	into separate mesh buffers.
-	Some mesh buffer implementations have limitations on the number of
-	vertices the buffer can hold. In that case, logical grouping can help.
-	Moreover, the number of vertices should be optimized for the GPU upload,
-	which often depends on the type of gfx card. Typical figures are
-	1000-10000 vertices per buffer.
-	SMeshBuffer is a simple implementation of a MeshBuffer, which supports
-	up to 65535 vertices.
-
-	Since meshbuffers are used for drawing, and hence will be exposed
-	to the driver, chances are high that they are grab()'ed from somewhere.
-	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
-	the current code block anymore.
-	*/
-	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;
-
-		//! 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;
-		}
-
-	};
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
+// 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
+
+#include "IReferenceCounted.h"
+#include "SMaterial.h"
+#include "aabbox3d.h"
+#include "S3DVertex.h"
+#include "SVertexIndex.h"
+#include "EHardwareBufferFlags.h"
+#include "EPrimitiveTypes.h"
+
+namespace irr
+{
+namespace scene
+{
+//! Struct for holding a mesh with a single material.
+/** 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
+buffers, but can be. Separately animated parts of the mesh must be put
+into separate mesh buffers.
+Some mesh buffer implementations have limitations on the number of
+vertices the buffer can hold. In that case, logical grouping can help.
+Moreover, the number of vertices should be optimized for the GPU upload,
+which often depends on the type of gfx card. Typical figures are
+1000-10000 vertices per buffer.
+SMeshBuffer is a simple implementation of a MeshBuffer, which supports
+up to 65535 vertices.
+
+Since meshbuffers are used for drawing, and hence will be exposed
+to the driver, chances are high that they are grab()'ed from somewhere.
+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
+the current code block anymore.
+*/
+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
+	{
+		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_POINT_SPRITES:
+			return indexCount;
+		}
+		return 0;
+	}
+};
+
+} // end namespace scene
+} // end namespace irr

include/IMeshCache.h

@@ -1,177 +1,131 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_MESH_CACHE_H_INCLUDED__
-#define __I_MESH_CACHE_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "path.h"
-
-namespace irr
-{
-
-namespace scene
-{
-	class IMesh;
-	class IAnimatedMesh;
-	class IAnimatedMeshSceneNode;
-	class IMeshLoader;
-
-	//! The mesh cache stores already loaded meshes and provides an interface to them.
-	/** You can access it using ISceneManager::getMeshCache(). All existing
-	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
-	add new loaded meshes (if ISceneManager::getMesh() is not sufficient),
-	to remove them and to iterate through already loaded meshes. */
-	class IMeshCache : public virtual IReferenceCounted
-	{
-	public:
-
-		//! Destructor
-		virtual ~IMeshCache() {}
-
-		//! Adds a mesh to the internal list of loaded meshes.
-		/** 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;
-
-		//! Removes the mesh from the cache.
-		/** After loading a mesh with getMesh(), the mesh can be
-		removed from the cache using this method, freeing a lot of
-		memory.
-		\param mesh Pointer to the mesh which shall be removed. */
-		virtual void removeMesh(const IMesh* const mesh) = 0;
-
-		//! Returns amount of loaded meshes in the cache.
-		/** You can load new meshes into the cache using getMesh() and
-		addMesh(). If you ever need to access the internal mesh cache,
-		you can do this using removeMesh(), getMeshNumber(),
-		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.
-		/** \param mesh Pointer to the mesh to search for.
-		\return Index of the mesh in the cache, or -1 if not found. */
-		virtual s32 getMeshIndex(const IMesh* const mesh) const = 0;
-
-		//! Returns a mesh based on its index number.
-		/** \param index: Index of the mesh, number between 0 and
-		getMeshCount()-1.
-		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 name (often a filename).
-		/** \deprecated Use getMeshByName() instead. This method may be removed by
-		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ IAnimatedMesh* getMeshByFilename(const io::path& filename)
-		{
-			return getMeshByName(filename);
-		}
-
-		//! Get the name of a loaded mesh, based on its index. (Name is often identical to the filename).
-		/** \deprecated Use getMeshName() instead. This method may be removed by
-		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ const io::path& getMeshFilename(u32 index) const
-		{
-			return getMeshName(index).getInternalName();
-		}
-
-		//! Get the name of a loaded mesh, if there is any. (Name is often identical to the filename).
-		/** \deprecated Use getMeshName() instead. This method may be removed by
-		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ const io::path& getMeshFilename(const IMesh* const mesh) const
-		{
-			return getMeshName(mesh).getInternalName();
-		}
-
-		//! Renames a loaded mesh.
-		/** \deprecated Use renameMesh() instead. This method may be removed by
-		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ bool setMeshFilename(u32 index, const io::path& filename)
-		{
-			return renameMesh(index, filename);
-		}
-
-		//! Renames a loaded mesh.
-		/** \deprecated Use renameMesh() instead. This method may be removed by
-		Irrlicht 1.9 */
-		_IRR_DEPRECATED_ bool setMeshFilename(const IMesh* const mesh, const io::path& filename)
-		{
-			return renameMesh(mesh, filename);
-		}
-
-		//! Returns a mesh based on its name.
-		/** \param name Name of the mesh. Usually a filename.
-		\return Pointer to the mesh or 0 if there is none with this number. */
-		virtual IAnimatedMesh* getMeshByName(const io::path& name) = 0;
-
-		//! Get the name of a loaded mesh, based on its index.
-		/** \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;
-	};
-
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "path.h"
+
+namespace irr
+{
+
+namespace scene
+{
+class IMesh;
+class IAnimatedMesh;
+class IAnimatedMeshSceneNode;
+class IMeshLoader;
+
+//! The mesh cache stores already loaded meshes and provides an interface to them.
+/** You can access it using ISceneManager::getMeshCache(). All existing
+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
+add new loaded meshes (if ISceneManager::getMesh() is not sufficient),
+to remove them and to iterate through already loaded meshes. */
+class IMeshCache : public virtual IReferenceCounted
+{
+public:
+	//! Destructor
+	virtual ~IMeshCache() {}
+
+	//! Adds a mesh to the internal list of loaded meshes.
+	/** 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;
+
+	//! Removes the mesh from the cache.
+	/** After loading a mesh with getMesh(), the mesh can be
+	removed from the cache using this method, freeing a lot of
+	memory.
+	\param mesh Pointer to the mesh which shall be removed. */
+	virtual void removeMesh(const IMesh *const mesh) = 0;
+
+	//! Returns amount of loaded meshes in the cache.
+	/** You can load new meshes into the cache using getMesh() and
+	addMesh(). If you ever need to access the internal mesh cache,
+	you can do this using removeMesh(), getMeshNumber(),
+	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.
+	/** \param mesh Pointer to the mesh to search for.
+	\return Index of the mesh in the cache, or -1 if not found. */
+	virtual s32 getMeshIndex(const IMesh *const mesh) const = 0;
+
+	//! Returns a mesh based on its index number.
+	/** \param index: Index of the mesh, number between 0 and
+	getMeshCount()-1.
+	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 name.
+	/** \param name Name of the mesh. Usually a filename.
+	\return Pointer to the mesh or 0 if there is none with this number. */
+	virtual IAnimatedMesh *getMeshByName(const io::path &name) = 0;
+
+	//! Get the name of a loaded mesh, based on its index.
+	/** \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;
+};
+
+} // end namespace scene
+} // end namespace irr

include/IMeshLoader.h

@@ -1,55 +1,50 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_MESH_LOADER_H_INCLUDED__
-#define __I_MESH_LOADER_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "path.h"
-
-namespace irr
-{
-namespace io
-{
-	class IReadFile;
-} // end namespace io
-namespace scene
-{
-	class IAnimatedMesh;
-
-//! Class which is able to load an animated mesh from a file.
-/** If you want Irrlicht be able to load meshes of
-currently unsupported file formats (e.g. .cob), then implement
-this and add your new Meshloader with
-ISceneManager::addExternalMeshLoader() to the engine. */
-class IMeshLoader : public virtual IReferenceCounted
-{
-public:
-
-	//! Constructor
-	IMeshLoader() {}
-
-	//! Destructor
-	virtual ~IMeshLoader() {}
-
-	//! Returns true if the file might be loaded by this class.
-	/** This decision should be based on the file extension (e.g. ".cob")
-	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;
-
-	//! 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;
-};
-
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
+// 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
+
+#include "IReferenceCounted.h"
+#include "path.h"
+
+namespace irr
+{
+namespace io
+{
+class IReadFile;
+} // end namespace io
+namespace scene
+{
+class IAnimatedMesh;
+
+//! Class which is able to load an animated mesh from a file.
+/** If you want Irrlicht be able to load meshes of
+currently unsupported file formats (e.g. .cob), then implement
+this and add your new Meshloader with
+ISceneManager::addExternalMeshLoader() to the engine. */
+class IMeshLoader : public virtual IReferenceCounted
+{
+public:
+	//! Constructor
+	IMeshLoader() {}
+
+	//! Destructor
+	virtual ~IMeshLoader() {}
+
+	//! Returns true if the file might be loaded by this class.
+	/** This decision should be based on the file extension (e.g. ".cob")
+	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;
+
+	//! 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;
+};
+
+} // end namespace scene
+} // end namespace irr

include/IMeshManipulator.h

@@ -1,187 +1,170 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_MESH_MANIPULATOR_H_INCLUDED__
-#define __I_MESH_MANIPULATOR_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "vector3d.h"
-#include "aabbox3d.h"
-#include "matrix4.h"
-#include "IAnimatedMesh.h"
-#include "IMeshBuffer.h"
-#include "SVertexManipulator.h"
-
-namespace irr
-{
-namespace scene
-{
-
-	struct SMesh;
-
-	//! An interface for easy manipulation of meshes.
-	/** Scale, set alpha value, flip surfaces, and so on. This exists for
-	fixing problems with wrong imported or exported meshes quickly after
-	loading. It is not intended for doing mesh modifications and/or
-	animations during runtime.
-	*/
-	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
-		{
-			apply(SVertexPositionScaleManipulator(factor), mesh, true);
-		}
-
-		//! Scales the actual meshbuffer, not a scene node.
-		/** \param buffer Meshbuffer on which the operation is performed.
-		\param factor Scale factor for each axis. */
-		void scale(IMeshBuffer* buffer, const core::vector3df& factor) const
-		{
-			apply(SVertexPositionScaleManipulator(factor), buffer, true);
-		}
-
-		//! Clones a static IMesh into a modifiable SMesh.
-		/** All meshbuffers in the returned SMesh
-		are of type SMeshBuffer or SMeshBufferLightMap.
-		\param mesh Mesh to copy.
-		\return Cloned mesh. If you no longer need the
-		cloned mesh, you should call SMesh::drop(). See
-		IReferenceCounted::drop() for more information. */
-		virtual SMesh* createMeshCopy(IMesh* mesh) const = 0;
-
-		//! 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
-		/** \param func A functor defining the mesh manipulation.
-		\param buffer The Meshbuffer to apply the manipulator to.
-		\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
-		\return True if the functor was successfully applied, else false. */
-		template <typename Functor>
-		bool apply(const Functor& func, IMeshBuffer* buffer, bool boundingBoxUpdate=false) const
-		{
-			return apply_(func, buffer, boundingBoxUpdate, func);
-		}
-
-
-		//! Apply a manipulator on the Mesh
-		/** \param func A functor defining the mesh manipulation.
-		\param mesh The Mesh to apply the manipulator to.
-		\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
-		\return True if the functor was successfully applied, else false. */
-		template <typename Functor>
-		bool apply(const Functor& func, IMesh* mesh, bool boundingBoxUpdate=false) const
-		{
-			if (!mesh)
-				return true;
-			bool result = true;
-			core::aabbox3df bufferbox;
-			for (u32 i=0; i<mesh->getMeshBufferCount(); ++i)
-			{
-				result &= apply(func, mesh->getMeshBuffer(i), boundingBoxUpdate);
-				if (boundingBoxUpdate)
-				{
-					if (0==i)
-						bufferbox.reset(mesh->getMeshBuffer(i)->getBoundingBox());
-					else
-						bufferbox.addInternalBox(mesh->getMeshBuffer(i)->getBoundingBox());
-				}
-			}
-			if (boundingBoxUpdate)
-				mesh->setBoundingBox(bufferbox);
-			return result;
-		}
-
-protected:
-		//! Apply a manipulator based on the type of the functor
-		/** \param func A functor defining the mesh manipulation.
-		\param buffer The Meshbuffer to apply the manipulator to.
-		\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.
-		\return True if the functor was successfully applied, else false. */
-		template <typename Functor>
-		bool apply_(const Functor& func, IMeshBuffer* buffer, bool boundingBoxUpdate, const IVertexManipulator& typeTest) const
-		{
-			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;
-		}
-};
-
-} // end namespace scene
-} // end namespace irr
-
-
-#endif
+// 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
+
+#include "IReferenceCounted.h"
+#include "vector3d.h"
+#include "aabbox3d.h"
+#include "matrix4.h"
+#include "IAnimatedMesh.h"
+#include "IMeshBuffer.h"
+#include "SVertexManipulator.h"
+
+namespace irr
+{
+namespace scene
+{
+
+struct SMesh;
+
+//! An interface for easy manipulation of meshes.
+/** Scale, set alpha value, flip surfaces, and so on. This exists for
+fixing problems with wrong imported or exported meshes quickly after
+loading. It is not intended for doing mesh modifications and/or
+animations during runtime.
+*/
+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
+	{
+		apply(SVertexPositionScaleManipulator(factor), mesh, true);
+	}
+
+	//! Scales the actual meshbuffer, not a scene node.
+	/** \param buffer Meshbuffer on which the operation is performed.
+	\param factor Scale factor for each axis. */
+	void scale(IMeshBuffer *buffer, const core::vector3df &factor) const
+	{
+		apply(SVertexPositionScaleManipulator(factor), buffer, true);
+	}
+
+	//! Clones a static IMesh into a modifiable SMesh.
+	/** All meshbuffers in the returned SMesh
+	are of type SMeshBuffer or SMeshBufferLightMap.
+	\param mesh Mesh to copy.
+	\return Cloned mesh. If you no longer need the
+	cloned mesh, you should call SMesh::drop(). See
+	IReferenceCounted::drop() for more information. */
+	virtual SMesh *createMeshCopy(IMesh *mesh) const = 0;
+
+	//! 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
+	/** \param func A functor defining the mesh manipulation.
+	\param buffer The Meshbuffer to apply the manipulator to.
+	\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
+	\return True if the functor was successfully applied, else false. */
+	template <typename Functor>
+	bool apply(const Functor &func, IMeshBuffer *buffer, bool boundingBoxUpdate = false) const
+	{
+		return apply_(func, buffer, boundingBoxUpdate, func);
+	}
+
+	//! Apply a manipulator on the Mesh
+	/** \param func A functor defining the mesh manipulation.
+	\param mesh The Mesh to apply the manipulator to.
+	\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
+	\return True if the functor was successfully applied, else false. */
+	template <typename Functor>
+	bool apply(const Functor &func, IMesh *mesh, bool boundingBoxUpdate = false) const
+	{
+		if (!mesh)
+			return true;
+		bool result = true;
+		core::aabbox3df bufferbox;
+		for (u32 i = 0; i < mesh->getMeshBufferCount(); ++i) {
+			result &= apply(func, mesh->getMeshBuffer(i), boundingBoxUpdate);
+			if (boundingBoxUpdate) {
+				if (0 == i)
+					bufferbox.reset(mesh->getMeshBuffer(i)->getBoundingBox());
+				else
+					bufferbox.addInternalBox(mesh->getMeshBuffer(i)->getBoundingBox());
+			}
+		}
+		if (boundingBoxUpdate)
+			mesh->setBoundingBox(bufferbox);
+		return result;
+	}
+
+protected:
+	//! Apply a manipulator based on the type of the functor
+	/** \param func A functor defining the mesh manipulation.
+	\param buffer The Meshbuffer to apply the manipulator to.
+	\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.
+	\return True if the functor was successfully applied, else false. */
+	template <typename Functor>
+	bool apply_(const Functor &func, IMeshBuffer *buffer, bool boundingBoxUpdate, const IVertexManipulator &typeTest) const
+	{
+		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;
+	}
+};
+
+} // end namespace scene
+} // end namespace irr

include/IMeshSceneNode.h

@@ -1,57 +1,50 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_MESH_SCENE_NODE_H_INCLUDED__
-#define __I_MESH_SCENE_NODE_H_INCLUDED__
-
-#include "ISceneNode.h"
-
-namespace irr
-{
-namespace scene
-{
-
-class IMesh;
-
-
-//! A scene node displaying a static mesh
-class IMeshSceneNode : public ISceneNode
-{
-public:
-
-	//! Constructor
-	/** Use setMesh() to set the mesh to display.
-	*/
-	IMeshSceneNode(ISceneNode* parent, ISceneManager* mgr, s32 id,
-			const core::vector3df& position = core::vector3df(0,0,0),
-			const core::vector3df& rotation = core::vector3df(0,0,0),
-			const core::vector3df& scale = core::vector3df(1,1,1))
-		: ISceneNode(parent, mgr, id, position, rotation, scale) {}
-
-	//! Sets a new mesh to display
-	/** \param mesh Mesh to display. */
-	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;
-
-	//! 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
-	causing all mesh scene nodes referencing this mesh to change, too.
-	\param readonly Flag if the materials shall be read-only. */
-	virtual void setReadOnlyMaterials(bool readonly) = 0;
-
-	//! Check if the scene node should not copy the materials of the mesh but use them in a read only style
-	/** This flag can be set by setReadOnlyMaterials().
-	\return Whether the materials are read-only. */
-	virtual bool isReadOnlyMaterials() const = 0;
-};
-
-} // end namespace scene
-} // end namespace irr
-
-
-#endif
-
+// 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
+
+#include "ISceneNode.h"
+
+namespace irr
+{
+namespace scene
+{
+
+class IMesh;
+
+//! A scene node displaying a static mesh
+class IMeshSceneNode : public ISceneNode
+{
+public:
+	//! Constructor
+	/** Use setMesh() to set the mesh to display.
+	 */
+	IMeshSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1, 1, 1)) :
+			ISceneNode(parent, mgr, id, position, rotation, scale) {}
+
+	//! Sets a new mesh to display
+	/** \param mesh Mesh to display. */
+	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;
+
+	//! 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
+	causing all mesh scene nodes referencing this mesh to change, too.
+	\param readonly Flag if the materials shall be read-only. */
+	virtual void setReadOnlyMaterials(bool readonly) = 0;
+
+	//! Check if the scene node should not copy the materials of the mesh but use them in a read only style
+	/** This flag can be set by setReadOnlyMaterials().
+	\return Whether the materials are read-only. */
+	virtual bool isReadOnlyMaterials() const = 0;
+};
+
+} // end namespace scene
+} // end namespace irr

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

@@ -1,45 +1,45 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_OS_OPERATOR_H_INCLUDED__
-#define __I_OS_OPERATOR_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "irrString.h"
-
-namespace irr
-{
-
-//! The Operating system operator provides operation system specific methods and information.
-class IOSOperator : public virtual IReferenceCounted
-{
-public:
-	//! Get the current operation system version as string.
-	virtual const core::stringc& getOperatingSystemVersion() const = 0;
-
-	//! Get the current operation system version as string.
-	/** \deprecated Use getOperatingSystemVersion instead. This method will be removed in Irrlicht 1.9. */
-	_IRR_DEPRECATED_ const wchar_t* getOperationSystemVersion() const
-	{
-		return core::stringw(getOperatingSystemVersion()).c_str();
-	}
-
-	//! Copies text to the clipboard
-	virtual void copyToClipboard(const c8* text) const = 0;
-
-	//! Get text from the clipboard
-	/** \return Returns 0 if no string is in there. */
-	virtual const c8* getTextFromClipboard() 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;
-
-};
-
-} // end namespace
-
-#endif
+// 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
+
+#include "IReferenceCounted.h"
+#include "irrString.h"
+
+namespace irr
+{
+
+//! The OSOperator provides OS-specific methods and information.
+class IOSOperator : public virtual IReferenceCounted
+{
+public:
+	//! Get the current OS version as string.
+	virtual const core::stringc &getOperatingSystemVersion() const = 0;
+
+	//! Copies text to the clipboard
+	//! \param text: text in utf-8
+	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;
+
+	//! 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;
+
+	//! 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;
+
+	//! 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;
+};
+
+} // end namespace

include/IReadFile.h

@@ -1,61 +1,57 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_READ_FILE_H_INCLUDED__
-#define __I_READ_FILE_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "coreutil.h"
-#include "EReadFileType.h"
-
-namespace irr
-{
-namespace io
-{
-
-	//! Interface providing read access to a file.
-	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
-		{
-			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
-
+// 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
+
+#include "IReferenceCounted.h"
+#include "coreutil.h"
+#include "EReadFileType.h"
+
+namespace irr
+{
+namespace io
+{
+
+//! Interface providing read access to a file.
+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
+	{
+		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

include/IReferenceCounted.h

@@ -1,170 +1,162 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_IREFERENCE_COUNTED_H_INCLUDED__
-#define __I_IREFERENCE_COUNTED_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-
-	//! Base class of most objects of the Irrlicht Engine.
-	/** 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.
-	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.
-	*/
-	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 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. */
-		void grab() const { ++ReferenceCounter; }
-
-		//! 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
-		{
-			// 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
-
+// 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
+
+#include "irrTypes.h"
+
+namespace irr
+{
+
+//! Base class of most objects of the Irrlicht Engine.
+/** 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.
+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.
+*/
+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 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. */
+	void grab() const { ++ReferenceCounter; }
+
+	//! 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
+	{
+		// 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

include/IRenderTarget.h

@@ -1,129 +1,119 @@
-// Copyright (C) 2015 Patryk Nadrowski
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_RENDER_TARGET_H_INCLUDED__
-#define __I_RENDER_TARGET_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "EDriverTypes.h"
-#include "irrArray.h"
-
-namespace irr
-{
-namespace video
-{
-	class ITexture;
-
-	//! Enumeration of cube texture surfaces
-	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)
-		{
-		}
-
-		//! Returns an array of previously set textures.
-		const core::array<ITexture*>& getTexture() const
-		{
-			return Textures;
-		}
-
-		//! Returns a of previously set depth / depth-stencil texture.
-		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);
-			}
-		}
-
-		//! Set one cube surface texture.
-		void setTexture(ITexture* texture, ITexture* depthStencil, E_CUBE_SURFACE cubeSurface)
-		{
-			if ( texture )
-			{
-				setTextures(&texture, 1, depthStencil, &cubeSurface, 1);
-			}
-			else
-			{
-				setTextures(0, 0, depthStencil, &cubeSurface, 1);
-			}
-		}
-
-		//! Get driver type of render target.
-		E_DRIVER_TYPE getDriverType() const
-		{
-			return DriverType;
-		}
-
-	protected:
-
-		//! Set multiple textures.
-		// NOTE: working with pointers instead of arrays to avoid unnecessary memory allocations for the single textures case
-		virtual void setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces=0, u32 numCubeSurfaces=0) = 0;
-
-		//! 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
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "EDriverTypes.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace video
+{
+class ITexture;
+
+//! Enumeration of cube texture surfaces
+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)
+	{
+	}
+
+	//! Returns an array of previously set textures.
+	const core::array<ITexture *> &getTexture() const
+	{
+		return Textures;
+	}
+
+	//! Returns a of previously set depth / depth-stencil texture.
+	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);
+		}
+	}
+
+	//! Set one cube surface texture.
+	void setTexture(ITexture *texture, ITexture *depthStencil, E_CUBE_SURFACE cubeSurface)
+	{
+		if (texture) {
+			setTextures(&texture, 1, depthStencil, &cubeSurface, 1);
+		} else {
+			setTextures(0, 0, depthStencil, &cubeSurface, 1);
+		}
+	}
+
+	//! Get driver type of render target.
+	E_DRIVER_TYPE getDriverType() const
+	{
+		return DriverType;
+	}
+
+protected:
+	//! Set multiple textures.
+	// NOTE: working with pointers instead of arrays to avoid unnecessary memory allocations for the single textures case
+	virtual void setTextures(ITexture *const *textures, u32 numTextures, ITexture *depthStencil, const E_CUBE_SURFACE *cubeSurfaces = 0, u32 numCubeSurfaces = 0) = 0;
+
+	//! 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 &);
+};
+
+}
+}

include/ISceneCollisionManager.h

@@ -1,38 +1,33 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __I_SCENE_COLLISION_MANAGER_H_INCLUDED__
-#define __I_SCENE_COLLISION_MANAGER_H_INCLUDED__
-
-#include "IReferenceCounted.h"
-#include "position2d.h"
-#include "line3d.h"
-
-namespace irr
-{
-
-namespace scene
-{
-	class ICameraSceneNode;
-
-	class ISceneCollisionManager : public virtual IReferenceCounted
-	{
-	public:
-
-		//! Returns a 3d ray which would go through the 2d screen coordinates.
-		/** \param pos: Screen coordinates in pixels.
-		\param camera: Camera from which the ray starts. If null, the
-		active camera is used.
-		\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
-		would be behind the 2d screen coordinates. */
-		virtual core::line3d<f32> getRayFromScreenCoordinates(
-			const core::position2d<s32>& pos, const ICameraSceneNode* camera = 0) = 0;
-
-	};
-
-} // end namespace scene
-} // end namespace irr
-
-#endif
+// 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
+
+#include "IReferenceCounted.h"
+#include "position2d.h"
+#include "line3d.h"
+
+namespace irr
+{
+
+namespace scene
+{
+class ICameraSceneNode;
+
+class ISceneCollisionManager : public virtual IReferenceCounted
+{
+public:
+	//! Returns a 3d ray which would go through the 2d screen coordinates.
+	/** \param pos: Screen coordinates in pixels.
+	\param camera: Camera from which the ray starts. If null, the
+	active camera is used.
+	\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
+	would be behind the 2d screen coordinates. */
+	virtual core::line3d<f32> getRayFromScreenCoordinates(
+			const core::position2d<s32> &pos, const ICameraSceneNode *camera = 0) = 0;
+};
+
+} // end namespace scene
+} // end namespace irr