Bump revision

it's enabled inconditionally on android

also remove some _IRR_COMPILE_WITH_ANDROID_DEVICE_ which are useless because cmake is already properly configured

CMakeLists.txt

@@ -7,7 +7,7 @@ else()
 	cmake_policy(VERSION 3.11)
 endif()
 
-set(IRRLICHTMT_REVISION 12)
+set(IRRLICHTMT_REVISION 13)
 
 project(Irrlicht
 	VERSION 1.9.0.${IRRLICHTMT_REVISION}

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,8 @@
 IrrlichtMt version 1.9
 ======================
 
-The Irrlicht Engine is an open source realtime 3D engine written in C++.
-
-This is a fork by the [Minetest](https://github.com/minetest) developers that was stripped-down and customized specifically for use in Minetest.
+IrrlichtMt is the 3D engine of [Minetest](https://github.com/minetest).
+It is based on the [Irrlicht Engine](https://irrlicht.sourceforge.io/) but is now developed independently.
 It is intentionally not compatible to upstream and is planned to be eventually absorbed into Minetest.
 
 Build

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.

build.sh

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

doc/irrlicht-license.txt

@@ -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/test_string.cpp

@@ -168,22 +168,32 @@ static void test_methods()
 
 static void test_conv()
 {
-	// assumes Unicode and UTF-8 locale
-	setlocale(LC_CTYPE, "");
+	// locale-independent
 
 	stringw out;
-	multibyteToWString(out, "†††");
+	utf8ToWString(out, "†††");
 	UASSERTEQ(out.size(), 3);
 	for (int i = 0; i < 3; i++)
 		UASSERTEQ(static_cast<u16>(out[i]), 0x2020);
+
 	stringc out2;
-	wStringToMultibyte(out2, L"†††");
+	wStringToUTF8(out2, L"†††");
 	UASSERTEQ(out2.size(), 9);
 	for (int i = 0; i < 3; i++) {
 		UASSERTEQ(static_cast<u8>(out2[3*i]), 0xe2);
 		UASSERTEQ(static_cast<u8>(out2[3*i+1]), 0x80);
 		UASSERTEQ(static_cast<u8>(out2[3*i+2]), 0xa0);
 	}
+
+	// locale-dependent
+	if (!setlocale(LC_CTYPE, "C.UTF-8"))
+		setlocale(LC_CTYPE, "UTF-8"); // macOS
+
+	stringw out3;
+	multibyteToWString(out3, "†††");
+	UASSERTEQ(out3.size(), 3);
+	for (int i = 0; i < 3; i++)
+		UASSERTEQ(static_cast<u16>(out3[i]), 0x2020);
 }
 
 void test_irr_string()

examples/CMakeLists.txt

@@ -2,10 +2,9 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(IRREXAMPLES
-	LoadTexture
-	LoadMesh
+	# removed
 )
-if(FALSE)
+if(UNIX)
 	list(APPEND IRREXAMPLES AutomatedTest)
 endif()
 

examples/LoadMesh/main.cpp

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

examples/LoadTexture/main.cpp

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

include/CIndexBuffer.h

@@ -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/CVertexBuffer.h

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

include/IContextManager.h

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

include/ICursorControl.h

@@ -26,7 +26,7 @@ namespace gui
 		ECI_HELP,	// Arrow and question mark
 		ECI_IBEAM,	// typical text-selection cursor
 		ECI_NO,		// should not click icon
-		ECI_WAIT,	// hourclass
+		ECI_WAIT,	// hourglass
 		ECI_SIZEALL,	// arrow in all directions
 		ECI_SIZENESW,	// resizes in direction north-east or south-west
 		ECI_SIZENWSE,	// resizes in direction north-west or south-east

include/IEventReceiver.h

@@ -263,6 +263,10 @@ namespace irr
 			//! A checkbox has changed its check state.
 			EGET_CHECKBOX_CHANGED,
 
+			//! A listbox would like to open.
+			/** You can prevent the listbox from opening by absorbing the event. */
+			EGET_LISTBOX_OPENED,
+
 			//! A new item in a listbox was selected.
 			/** NOTE: You also get this event currently when the same item was clicked again after more than 500 ms. */
 			EGET_LISTBOX_CHANGED,

include/IGUIComboBox.h

@@ -52,6 +52,10 @@ namespace gui
 		//! Sets the selected item. Set this to -1 if no item should be selected
 		virtual void setSelected(s32 idx) = 0;
 
+		//! Sets the selected item and emits a change event.
+		/** Set this to -1 if no item should be selected */
+		virtual void setAndSendSelected(s32 idx) = 0;
+
 		//! Sets text justification of the text area
 		/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
 		EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.

include/ILogger.h

@@ -19,7 +19,7 @@ enum ELOG_LEVEL
 	//! Used for printing information helpful in debugging
 	ELL_DEBUG,
 
-	//! Useful information to print. For example hardware infos or something started/stopped.
+	//! Useful information to print. For example hardware info or something started/stopped.
 	ELL_INFORMATION,
 
 	//! Warnings that something isn't as expected and can cause oddities

include/IMaterialRendererServices.h

@@ -38,30 +38,11 @@ public:
 		const SMaterial& lastMaterial,
 		bool resetAllRenderstates) = 0;
 
-	//! Return an index constant for the vertex shader based on a name.
+	//! Return an index constant for the vertex shader based on a uniform variable name.
 	virtual s32 getVertexShaderConstantID(const c8* name) = 0;
 
-	//! Sets a constant for the vertex shader based on a name.
-	/** This can be used if you used a high level shader language like GLSL
-	or HLSL to create a shader. Example: If you created a shader which has
-	variables named 'mWorldViewProj' (containing the WorldViewProjection
-	matrix) and another one named 'fTime' containing one float, you can set
-	them in your IShaderConstantSetCallBack derived class like this:
-	\code
-	virtual void OnSetConstants(video::IMaterialRendererServices* services, s32 userData)
-	{
-		video::IVideoDriver* driver = services->getVideoDriver();
-
-		f32 time = (f32)os::Timer::getTime()/100000.0f;
-		services->setVertexShaderConstant("fTime", &time, 1);
-
-		core::matrix4 worldViewProj(driver->getTransform(video::ETS_PROJECTION));
-		worldViewProj *= driver->getTransform(video::ETS_VIEW);
-		worldViewProj *= driver->getTransform(video::ETS_WORLD);
-		services->setVertexShaderConstant("mWorldViewProj", worldViewProj.M, 16);
-	}
-	\endcode
-	\param index Index of the variable
+	//! Sets a value for a vertex shader uniform variable.
+	/** \param index Index of the variable (as received from getVertexShaderConstantID)
 	\param floats Pointer to array of floats
 	\param count Amount of floats in array.
 	\return True if successful.
@@ -85,14 +66,14 @@ public:
 	\param constantAmount: Amount of registers to be set. One register consists of 4 floats. */
 	virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1) = 0;
 
-	//! Return an index constant for the pixel shader based on a name.
+	//! Return an index constant for the pixel shader for the given uniform variable name
 	virtual s32 getPixelShaderConstantID(const c8* name) = 0;
 
-	//! Sets a constant for the pixel shader based on a name.
+	//! Sets a value for the given pixel shader uniform variable
 	/** This can be used if you used a high level shader language like GLSL
 	or HLSL to create a shader. See setVertexShaderConstant() for an
 	example on how to use this.
-	\param index Index of the variable
+	\param index Index of the variable (as received from getPixelShaderConstantID)
 	\param floats Pointer to array of floats
 	\param count Amount of floats in array.
 	\return True if successful. */

include/IMeshWriter.h

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

include/IOSOperator.h

@@ -11,11 +11,11 @@
 namespace irr
 {
 
-//! The Operating system operator provides operation system specific methods and information.
+//! The OSOperator provides OS-specific methods and information.
 class IOSOperator : public virtual IReferenceCounted
 {
 public:
-	//! Get the current operation system version as string.
+	//! Get the current OS version as string.
 	virtual const core::stringc& getOperatingSystemVersion() const = 0;
 
 	//! Copies text to the clipboard

include/ISceneManager.h

@@ -130,7 +130,7 @@ namespace scene
 	{
 	public:
 
-		//! Get pointer to an animateable mesh. Loads the file if not loaded already.
+		//! Get pointer to an animatable mesh. Loads the file if not loaded already.
 		/**
 		 * If you want to remove a loaded mesh from the cache again, use removeMesh().
 		 *  Currently there are the following mesh formats supported:
@@ -509,7 +509,7 @@ namespace scene
 
 		//! Clear all nodes which are currently registered for rendering
 		/** Usually you don't have to care about this as drawAll will clear nodes
-		after rendering them. But sometimes you might have to manully reset this.
+		after rendering them. But sometimes you might have to manually reset this.
 		For example when you deleted nodes between registering and rendering. */
 		virtual void clearAllRegisteredNodesForRendering() = 0;
 

include/ISceneNode.h

@@ -65,7 +65,7 @@ namespace scene
 
 		//! This method is called just before the rendering process of the whole scene.
 		/** Nodes may register themselves in the render pipeline during this call,
-		precalculate the geometry which should be renderered, and prevent their
+		precalculate the geometry which should be rendered, and prevent their
 		children from being able to register themselves if they are clipped by simply
 		not calling their OnRegisterSceneNode method.
 		If you are implementing your own scene node, you should overwrite this method

include/IVideoDriver.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_I_VIDEO_DRIVER_H_INCLUDED__
-#define __IRR_I_VIDEO_DRIVER_H_INCLUDED__
+#pragma once
 
 #include "rect.h"
 #include "SColor.h"
@@ -1047,7 +1046,7 @@ namespace video
 		E_MATERIAL_TYPE enum or a value which was returned by
 		addMaterialRenderer().
 		\return String with the name of the renderer, or 0 if not
-		exisiting */
+		existing */
 		virtual const c8* getMaterialRendererName(u32 idx) const =0;
 
 		//! Sets the name of a material renderer.
@@ -1211,4 +1210,3 @@ namespace video
 } // end namespace irr
 
 
-#endif

include/IrrCompileConfig.h

@@ -2,12 +2,11 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_COMPILE_CONFIG_H_INCLUDED__
-#define __IRR_COMPILE_CONFIG_H_INCLUDED__
+#pragma once
 
 //! Identifies the IrrlichtMt fork customized for the Minetest engine
-#define IRRLICHT_VERSION_MT_REVISION 12
-#define IRRLICHT_VERSION_MT "mt12"
+#define IRRLICHT_VERSION_MT_REVISION 13
+#define IRRLICHT_VERSION_MT "mt13"
 
 //! Irrlicht SDK Version
 #define IRRLICHT_VERSION_MAJOR 1
@@ -29,5 +28,3 @@
 #ifndef IRRLICHT_API
 #define IRRLICHT_API
 #endif
-
-#endif // __IRR_COMPILE_CONFIG_H_INCLUDED__

include/IrrlichtDevice.h

@@ -76,13 +76,17 @@ namespace irr
 		virtual bool run() = 0;
 
 		//! Cause the device to temporarily pause execution and let other processes run.
-		/** This should bring down processor usage without major
-		performance loss for Irrlicht */
+		/** This should bring down processor usage without major performance loss for Irrlicht.
+		But this is system dependent, so there's a chance your thread won't get control back quickly.
+		*/
 		virtual void yield() = 0;
 
 		//! Pause execution and let other processes to run for a specified amount of time.
-		/** It may not wait the full given time, as sleep may be interrupted
-		\param timeMs: Time to sleep for in milliseconds.
+		/** It may not wait the full given time, as sleep may be interrupted and also may wait longer on some OS.
+		\param timeMs: Time to sleep for in milliseconds. Note that the OS can round up this number.
+                       On Windows you usually get at least 15ms sleep time minium for any value > 0. 
+					   So if you call this in your main loop you can't get more than 65 FPS anymore in your game.
+					   On most Linux systems it's relatively exact, but also no guarantee.
 		\param pauseTimer: If true, pauses the device timer while sleeping
 		*/
 		virtual void sleep(u32 timeMs, bool pauseTimer=false) = 0;

include/Keycodes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_KEY_CODES_H_INCLUDED__
-#define __IRR_KEY_CODES_H_INCLUDED__
+#pragma once
 
 namespace irr
 {
@@ -90,7 +89,7 @@ namespace irr
 		KEY_KEY_X            = 0x58,  // X key
 		KEY_KEY_Y            = 0x59,  // Y key
 		KEY_KEY_Z            = 0x5A,  // Z key
-		KEY_LWIN             = 0x5B,  // Left Windows key (Microsoft<EFBFBD> Natural<EFBFBD> keyboard)
+		KEY_LWIN             = 0x5B,  // Left Windows key (Microsoft Natural keyboard)
 		KEY_RWIN             = 0x5C,  // Right Windows key (Natural keyboard)
 		KEY_APPS             = 0x5D,  // Applications key (Natural keyboard)
 		KEY_SLEEP            = 0x5F,  // Computer Sleep key
@@ -185,5 +184,4 @@ namespace irr
 
 } // end namespace irr
 
-#endif
 

include/aabbox3d.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_AABBOX_3D_H_INCLUDED__
-#define __IRR_AABBOX_3D_H_INCLUDED__
+#pragma once
 
 #include "irrMath.h"
 #include "plane3d.h"
@@ -364,6 +363,3 @@ class aabbox3d
 
 } // end namespace core
 } // end namespace irr
-
-#endif
-

include/coreutil.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_CORE_UTIL_H_INCLUDED__
-#define __IRR_CORE_UTIL_H_INCLUDED__
+#pragma once
 
 #include "irrString.h"
 #include "path.h"
@@ -202,4 +201,3 @@ inline bool isupper(s32 c) { return c >= 'A' && c <= 'Z'; }
 } // end namespace core
 } // end namespace irr
 
-#endif

include/dimension2d.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_DIMENSION2D_H_INCLUDED__
-#define __IRR_DIMENSION2D_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 #include "irrMath.h" // for irr::core::equals()
@@ -220,5 +219,4 @@ namespace core
 } // end namespace core
 } // end namespace irr
 
-#endif
 

include/irrArray.h

@@ -2,9 +2,7 @@
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
 
-#ifndef __IRR_ARRAY_H_INCLUDED__
-#define __IRR_ARRAY_H_INCLUDED__
-
+#pragma once
 #include <algorithm>
 #include <iterator>
 #include <vector>
@@ -438,5 +436,4 @@ private:
 } // end namespace core
 } // end namespace irr
 
-#endif
 

include/irrMath.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_MATH_H_INCLUDED__
-#define __IRR_MATH_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 #include <math.h>
@@ -479,4 +478,3 @@ namespace core
 using irr::core::IR;
 using irr::core::FR;
 
-#endif

include/irrString.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
 
-#ifndef __IRR_STRING_H_INCLUDED__
-#define __IRR_STRING_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 #include <string>
@@ -11,6 +10,8 @@
 #include <cstdio>
 #include <cstring>
 #include <cwchar>
+#include <codecvt>
+#include <locale>
 
 namespace irr
 {
@@ -35,8 +36,13 @@ outside the string class for explicit use.
 // forward declarations
 template <typename T>
 class string;
-static size_t multibyteToWString(string<wchar_t>& destination, const char* source, u32 sourceSize);
-static size_t wStringToMultibyte(string<c8>& destination, const wchar_t* source, u32 sourceSize);
+
+//! Typedef for character strings
+typedef string<c8> stringc;
+
+//! Typedef for wide character strings
+typedef string<wchar_t> stringw;
+
 
 //! Returns a character converted to lower case
 static inline u32 locale_lower ( u32 x )
@@ -859,8 +865,11 @@ public:
 		return ret.size()-oldSize;
 	}
 
-	friend size_t multibyteToWString(string<wchar_t>& destination, const char* source, u32 sourceSize);
-	friend size_t wStringToMultibyte(string<c8>& destination, const wchar_t* source, u32 sourceSize);
+	// This function should not be used and is only kept for "CGUIFileOpenDialog::pathToStringW".
+	friend size_t multibyteToWString(stringw& destination, const stringc &source);
+
+	friend size_t utf8ToWString(stringw &destination, const char *source);
+	friend size_t wStringToUTF8(stringc &destination, const wchar_t *source);
 
 private:
 
@@ -913,38 +922,18 @@ private:
 };
 
 
-//! Typedef for character strings
-typedef string<c8> stringc;
-
-//! Typedef for wide character strings
-typedef string<wchar_t> stringw;
-
 //! Convert multibyte string to wide-character string
 /** Wrapper around mbstowcs from standard library, but directly using Irrlicht string class.
 What the function does exactly depends on the LC_CTYPE of the current c locale.
 \param destination Wide-character string receiving the converted source
 \param source multibyte string
-\return The number of wide characters written to destination, not including the eventual terminating null character or -1 when conversion failed */
-static inline size_t multibyteToWString(string<wchar_t>& destination, const core::string<c8>& source)
-{
-	return multibyteToWString(destination, source.c_str(), (u32)source.size());
-}
+\return The number of wide characters written to destination, not including the eventual terminating null character or -1 when conversion failed
 
-//! Convert multibyte string to wide-character string
-/** Wrapper around mbstowcs from standard library, but directly writing to Irrlicht string class.
-What the function does exactly depends on the LC_CTYPE of the current c locale.
-\param destination Wide-character string receiving the converted source
-\param source multibyte string
-\return The number of wide characters written to destination, not including the eventual terminating null character  or -1 when conversion failed. */
-static inline size_t multibyteToWString(string<wchar_t>& destination, const char* source)
+This function should not be used and is only kept for "CGUIFileOpenDialog::pathToStringW". */
+inline size_t multibyteToWString(stringw& destination, const core::stringc& source)
 {
-	const u32 s = source ? (u32)strlen(source) : 0;
-	return multibyteToWString(destination, source, s);
-}
+	u32 sourceSize = source.size();
 
-//! Internally used by the other multibyteToWString functions
-static size_t multibyteToWString(string<wchar_t>& destination, const char* source, u32 sourceSize)
-{
 	if ( sourceSize )
 	{
 		destination.str.resize(sourceSize+1);
@@ -952,7 +941,7 @@ static size_t multibyteToWString(string<wchar_t>& destination, const char* sourc
 #pragma warning(push)
 #pragma warning(disable: 4996)	// 'mbstowcs': This function or variable may be unsafe. Consider using mbstowcs_s instead.
 #endif
-		const size_t written = mbstowcs(&destination[0], source, (size_t)sourceSize);
+		const size_t written = mbstowcs(&destination[0], source.c_str(), (size_t)sourceSize);
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif
@@ -975,55 +964,33 @@ static size_t multibyteToWString(string<wchar_t>& destination, const char* sourc
 	}
 }
 
-//! Same as multibyteToWString, but the other way around
-static inline size_t wStringToMultibyte(string<c8>& destination, const core::string<wchar_t>& source)
+
+inline size_t utf8ToWString(stringw &destination, const char *source)
 {
-	return wStringToMultibyte(destination, source.c_str(), (u32)source.size());
+	std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
+	destination = conv.from_bytes(source);
+	return destination.size();
 }
 
-//! Same as multibyteToWString, but the other way around
-static inline size_t wStringToMultibyte(string<c8>& destination, const wchar_t* source)
+inline size_t utf8ToWString(stringw &destination, const stringc &source)
 {
-	const u32 s = source ? (u32)wcslen(source) : 0;
-	return wStringToMultibyte(destination, source, s);
+	return utf8ToWString(destination, source.c_str());
 }
 
-//! Same as multibyteToWString, but the other way around
-static size_t wStringToMultibyte(string<c8>& destination, const wchar_t* source, u32 sourceSize)
+inline size_t wStringToUTF8(stringc &destination, const wchar_t *source)
 {
-	if ( sourceSize )
-	{
-		destination.str.resize(sizeof(wchar_t)*sourceSize+1);
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable: 4996)	// 'wcstombs': This function or variable may be unsafe. Consider using wcstombs_s instead.
-#endif
-		const size_t written = wcstombs(&destination[0], source, destination.size());
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-		if ( written != (size_t)-1 )
-		{
-			destination.str.resize(written);
-		}
-		else
-		{
-			// Likely character which got converted until the invalid character was encountered are in destination now.
-			// And it seems even 0-terminated, but I found no documentation anywhere that this (the 0-termination) is guaranteed :-(
-			destination.clear();
-		}
-		return written;
-	}
-	else
-	{
-		destination.clear();
-		return 0;
-	}
+	std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
+	destination = conv.to_bytes(source);
+	return destination.size();
+}
+
+inline size_t wStringToUTF8(stringc &destination, const stringw &source)
+{
+	return wStringToUTF8(destination, source.c_str());
 }
 
 
 } // end namespace core
 } // end namespace irr
 
-#endif
 

include/irrTypes.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_TYPES_H_INCLUDED__
-#define __IRR_TYPES_H_INCLUDED__
+#pragma once
 
 #include <stdint.h>
 
@@ -120,4 +119,3 @@ code like 'code', but some generate warnings so we use this macro here */
 		((irr::u32)(irr::u8)(c0) | ((irr::u32)(irr::u8)(c1) << 8) | \
 		((irr::u32)(irr::u8)(c2) << 16) | ((irr::u32)(irr::u8)(c3) << 24 ))
 
-#endif // __IRR_TYPES_H_INCLUDED__

include/irrlicht.h

@@ -30,10 +30,8 @@
 #define __IRRLICHT_H_INCLUDED__
 
 #include "aabbox3d.h"
-#include "CIndexBuffer.h"
 #include "CMeshBuffer.h"
 #include "coreutil.h"
-#include "CVertexBuffer.h"
 #include "dimension2d.h"
 #include "ECullingTypes.h"
 #include "EDebugSceneTypes.h"

include/line2d.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_LINE_2D_H_INCLUDED__
-#define __IRR_LINE_2D_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 #include "vector2d.h"
@@ -66,7 +65,7 @@ class line2d
 		vector2d<T> getVector() const { return vector2d<T>( end.X - start.X, end.Y - start.Y); }
 
 		/*! Check if this segment intersects another segment,
-			or if segments are coincindent (colinear). */
+			or if segments are coincident (colinear). */
 		bool intersectAsSegments( const line2d<T>& other) const
 		{
 			// Taken from:
@@ -83,7 +82,7 @@ class line2d
 			if (o1 != o2 && o3 != o4)
 				return true;
 
-			// Special Cases to check if segments are coolinear
+			// Special Cases to check if segments are colinear
 			if (o1 == 0 && other.start.isBetweenPoints( start, end)) return true;
 			if (o2 == 0 && other.end.isBetweenPoints( start, end)) return true;
 			if (o3 == 0 && start.isBetweenPoints( other.start, other.end)) return true;
@@ -355,5 +354,4 @@ class line2d
 } // end namespace core
 } // end namespace irr
 
-#endif
 

include/line3d.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_LINE_3D_H_INCLUDED__
-#define __IRR_LINE_3D_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 #include "vector3d.h"
@@ -140,5 +139,4 @@ class line3d
 } // end namespace core
 } // end namespace irr
 
-#endif
 

include/matrix4.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_MATRIX_H_INCLUDED__
-#define __IRR_MATRIX_H_INCLUDED__
+#pragma once
 
 #include "irrMath.h"
 #include "vector3d.h"
@@ -2057,7 +2056,7 @@ namespace core
 		core::vector3df v(vs);
 		v.normalize();
 
-		// cosinus angle
+		// cosine angle
 		T ca = f.dotProduct(t);
 
 		core::vector3df vt(v * (1 - ca));
@@ -2118,7 +2117,7 @@ namespace core
 		// axis multiplication by sin
 		const core::vector3df vs = look.crossProduct(from);
 
-		// cosinus angle
+		// cosine angle
 		const f32 ca = from.dotProduct(look);
 
 		core::vector3df vt(up * (1.f - ca));
@@ -2363,5 +2362,4 @@ namespace core
 } // end namespace core
 } // end namespace irr
 
-#endif
 

include/path.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine" and the "irrXML" project.
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_PATH_H_INCLUDED__
-#define __IRR_PATH_H_INCLUDED__
+#pragma once
 
 #include "irrString.h"
 
@@ -87,4 +86,3 @@ private:
 } // io
 } // irr
 
-#endif // __IRR_PATH_H_INCLUDED__

include/plane3d.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_PLANE_3D_H_INCLUDED__
-#define __IRR_PLANE_3D_H_INCLUDED__
+#pragma once
 
 #include "irrMath.h"
 #include "vector3d.h"
@@ -241,5 +240,4 @@ typedef plane3d<s32> plane3di;
 } // end namespace core
 } // end namespace irr
 
-#endif
 

include/position2d.h

@@ -5,8 +5,7 @@
 //! As of Irrlicht 1.6, position2d is a synonym for vector2d.
 /** You should consider position2d to be deprecated, and use vector2d by preference. */
 
-#ifndef __IRR_POSITION_H_INCLUDED__
-#define __IRR_POSITION_H_INCLUDED__
+#pragma once
 
 #include "vector2d.h"
 
@@ -28,5 +27,4 @@ typedef vector2d<s32> position2di;
 // ...and use a #define to catch the rest, for (e.g.) position2d<f64>
 #define position2d vector2d
 
-#endif // __IRR_POSITION_H_INCLUDED__
 

include/quaternion.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_QUATERNION_H_INCLUDED__
-#define __IRR_QUATERNION_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 #include "irrMath.h"
@@ -720,6 +719,8 @@ inline core::quaternion& quaternion::makeIdentity()
 inline core::quaternion& quaternion::rotationFromTo(const vector3df& from, const vector3df& to)
 {
 	// Based on Stan Melax's article in Game Programming Gems
+	// Optimized by Robert Eisele: https://raw.org/proof/quaternion-from-two-vectors
+
 	// Copy, since cannot modify local
 	vector3df v0 = from;
 	vector3df v1 = to;
@@ -744,15 +745,12 @@ inline core::quaternion& quaternion::rotationFromTo(const vector3df& from, const
 		return set(axis.X, axis.Y, axis.Z, 0).normalize();
 	}
 
-	const f32 s = sqrtf( (1+d)*2 ); // optimize inv_sqrt
-	const f32 invs = 1.f / s;
-	const vector3df c = v0.crossProduct(v1)*invs;
-	return set(c.X, c.Y, c.Z, s * 0.5f).normalize();
+	const vector3df c = v0.crossProduct(v1);
+	return set(c.X, c.Y, c.Z, 1 + d).normalize();
 }
 
 
 } // end namespace core
 } // end namespace irr
 
-#endif
 

include/rect.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_RECT_H_INCLUDED__
-#define __IRR_RECT_H_INCLUDED__
+#pragma once
 
 #include "irrTypes.h"
 #include "dimension2d.h"
@@ -284,5 +283,4 @@ namespace core
 } // end namespace core
 } // end namespace irr
 
-#endif
 

include/triangle3d.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_TRIANGLE_3D_H_INCLUDED__
-#define __IRR_TRIANGLE_3D_H_INCLUDED__
+#pragma once
 
 #include "vector3d.h"
 #include "line3d.h"
@@ -274,5 +273,4 @@ namespace core
 } // end namespace core
 } // end namespace irr
 
-#endif
 

include/vector2d.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_POINT_2D_H_INCLUDED__
-#define __IRR_POINT_2D_H_INCLUDED__
+#pragma once
 
 #include "irrMath.h"
 #include "dimension2d.h"
@@ -143,7 +142,7 @@ public:
 	bool nearlyParallel( const vector2d<T> & other, const T factor = relativeErrorFactor<T>()) const
 	{
 		// https://eagergames.wordpress.com/2017/04/01/fast-parallel-lines-and-vectors-test/
-		// if a || b then  a.x/a.y = b.x/b.y (similiar triangles)
+		// if a || b then  a.x/a.y = b.x/b.y (similar triangles)
 		// if a || b then either both x are 0 or both y are 0.
 
 		return  equalsRelative( X*other.Y, other.X* Y, factor)
@@ -432,5 +431,4 @@ struct hash<irr::core::vector2d<T> >
 
 }
 
-#endif
 

include/vector3d.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __IRR_POINT_3D_H_INCLUDED__
-#define __IRR_POINT_3D_H_INCLUDED__
+#pragma once
 
 #include "irrMath.h"
 
@@ -155,7 +154,7 @@ namespace core
 
 		//! Calculates the cross product with another vector.
 		/** \param p Vector to multiply with.
-		\return Crossproduct of this vector with p. */
+		\return Cross product of this vector with p. */
 		vector3d<T> crossProduct(const vector3d<T>& p) const
 		{
 			return vector3d<T>(Y * p.Z - Z * p.Y, Z * p.X - X * p.Z, X * p.Y - Y * p.X);
@@ -207,7 +206,10 @@ namespace core
 		}
 
 		//! Rotates the vector by a specified number of degrees around the Y axis and the specified center.
-		/** \param degrees Number of degrees to rotate around the Y axis.
+		/** CAREFUL: For historical reasons rotateXZBy uses a right-handed rotation
+		(maybe to make it more similar to the 2D vector rotations which are counterclockwise).
+		To have this work the same way as rest of Irrlicht (nodes, matrices, other rotateBy functions) pass -1*degrees in here.
+		\param degrees Number of degrees to rotate around the Y axis.
 		\param center The center of the rotation. */
 		void rotateXZBy(f64 degrees, const vector3d<T>& center=vector3d<T>())
 		{
@@ -485,5 +487,4 @@ struct hash<irr::core::vector3d<T> >
 
 }
 
-#endif
 

irr-readme.txt

@@ -1,235 +0,0 @@
-==========================================================================
-The Irrlicht Engine SDK version 1.9
-==========================================================================
-
-  Welcome to the Irrlicht Engine SDK.
-
-  Content of this file:
-
-  1. Directory Structure Overview
-  2. How To Start
-  3. Requirements
-  4. Release Notes
-  5. License
-  6. Contact
-
-
-==========================================================================
-1. Directory Structure Overview
-==========================================================================
-
-  You will find some directories after uncompressing the archive of the
-  SDK. These are:
-
-  \bin         The compiled library Irrlicht.DLL and some compiled demo
-               and example applications, just start them to see the
-               Irrlicht Engine in action. Windows only.
-  \doc         Documentation of the Irrlicht Engine.
-  \examples    Examples and tutorials showing how to use the engine with
-               C++.
-  \include     Header files to include when programming with the engine.
-  \lib         Libs to link with your programs when using the engine.
-  \media       Graphics and sound resources for the demo applications and
-               examples.
-  \source      The source code of the Irrlicht Engine. This code is
-               not needed to develop applications with the engine,
-               but it is included to enable recompilation and
-               debugging, if necessary.
-  \tools       Useful tools (with sourcecode) for the engine.
-
-
-
-==========================================================================
-2. How to start
-==========================================================================
-
-  To see the engine in action in Windows, just go to the \bin\Win32-VisualStudio
-  directory, and start some applications. There should also be an
-  application named Demo.exe which should show the most
-  interesting features of Irrlicht.
-
-  To start developing own applications and games with the engine take
-  a look at the 01.HelloWorld example in the \examples directory.
-  There is also a .html file with a tutorial which should be
-  easily comprehensible.
-
-  The Irrlicht Engine is a static lib under linux. A precompiled version can be
-  generated from the sources using the Makefile in source/Irrlicht. Run 'make' in 
-  that subfolder. After this you should be able to 'make' all
-  example applications in /examples by calling the buildAllExamples script. You 
-  can run the examples then from the bin folder.
-
-  It is also possible to use Irrlicht as shared object
-  (libIrrlicht.so.versionNumber). Use the proper makefile target for this by
-  running 'make sharedlib' in the source folder. See the Makefile for details.
-
-  For OSX you can find an XCode project file in source/Irrlicht/MacOSX. This will
-  build the libIrrlicht.a library necessary to create the apps.
-
-==========================================================================
-3. Requirements
-==========================================================================
-
-  You can use one of the following compilers/IDEs to develop applications
-  with Irrlicht or recompile the engine. However, other compilers/IDEs may
-  work as well, we simply didn't test them.
-
-  * gcc 4.x
-  * Visual Studio 2010(10.0)-2013(12.0)
-  * Code::Blocks (& gcc or visual studio toolkit)
-  
-  If you ever want to (re)compile the engine yourself (which means you don't
-  want to use the precompiled version) you need the following:
-
-  * Windows:
-	* Needed: PlatformSDK (which usually comes with all IDEs, download
-			it separately for MSVC Express 2005)
-	* Optional: DirectX SDK, for D3D9 support
-	* Optional: DirectX SDK prior to May 2006, for D3D8 support
-
-  * Linux:
-	* Needed: XServer with include files
-	* Optional: OpenGL headers and libraries (libGL.so) for OpenGL support
-		GLX +
-		XF86VidMode [package x11proto-xf86vidmode-dev] or XRandr
-		(X11 support libraries, the latter two for fullscreen mode)
-
-  * OSX:
-	* Needed: XCode and Cocoa framework
-	* Needed: OpenGL headers and libraries
-
-==========================================================================
-4. Release Notes
-==========================================================================
-
-  Informations about changes in this new version of the engine can be
-  found in changes.txt.
-
-  Please note that the textures, 3D models and levels are copyright
-  by their authors and not covered by the Irrlicht engine license.
-
-==========================================================================
-5. License
-==========================================================================
-
-  The license of the Irrlicht Engine is based on the zlib/libpng license.
-  Even though this license does not require you to mention that you are
-  using the Irrlicht Engine in your product, an acknowledgement
-  would be highly appreciated.
-
-  Please note that the Irrlicht Engine is based in part on the work of
-  the Independent JPEG Group, the zlib, and libpng. This means that if you use
-  the Irrlicht Engine in your product, you must acknowledge somewhere
-  in your documentation that you've used the IJG code and libpng. It would
-  also be nice to mention that you use the Irrlicht Engine and the zlib.
-  See the README files in the jpeglib and the zlib for
-  further informations.
-
-
-  The Irrlicht Engine License
-  ===========================
-
-  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 acknowledgement in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be clearly 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.
-
-
-==========================================================================
-6. Contact
-==========================================================================
-
-  If you have problems, questions or suggestions, please visit the
-  official homepage of the Irrlicht Engine:
-
-  http://irrlicht.sourceforge.net
-
-  You will find forums, bugtrackers, patches, tutorials, and other stuff
-  which will help you out.
-
-  If want to contact the team of the engine, please send an email to
-  Nikolaus Gebhardt:
-
-  irrlicht@users.sourceforge.net
-
-  Please also not that parts of the engine have been written or contributed
-  by other people. Especially: (There are probably more people, sorry if I forgot one.
-  See http://irrlicht.sourceforge.net/author.html for more informations)
-
-  Christian Stehno (hybrid)   Contribution Coordinator/Developer
-  Michael Zeilfelder (cutealien) Developer
-  Patryk Nadrowski (Nadro)    Developer  
-  Yoran Bosman (Yoran)        Webserver administrator
-  Gareth Davidson (bitplane)  Developer/ Forum admin
-  Thomas Alten (burningwater) Wrote the burningsvideo software rasterizer
-  Luke P. Hoschke (luke)      Wrote the b3d loader, the new animation system, VBOs and other things
-  Colin MacDonald (rogerborg) All hands person
-  Ahmed Hilali (blindside)    The shader and advanced effects man
-  Dean Wadsworth (varmint)    OSX port maintainer and game developer
-  Alvaro F. Celis (afecelis)  Lots of work in the community, for example video tutorials about Irrlicht, forum admin
-  John Goewert (Saigumi)      Wrote some tutorials for the Irrlicht Engine and doing admin stuff
-  Jam                         Takes care of moderating the forums and keeps them clean from those evil spammers.
-
-  Many others (this list hasn't been updated in a while, but they are often mentioned in changes.txt)
-  Etienne Petitjean wrote the MacPort of the engine
-  Mark Jeacocke	Wrote lots of helpful comments and ideas in the forums and per email.
-  Julio Gorg<72>	Created the 'Unofficial DirectX 9.0 Driver for the Irrlicht Engine'
-  Andy Spurgeon	Wrote the Dev-Cpp tutorial.
-  Andr<64> Simon	Wrote the Codewarrior tutorial.
-  KnightToFlight	Created the unoffical terrain renderer addon for the Irrlicht Engine.
-  Jon Pry	Wrote the code to load compressed TGA files.
-  Matthew Couch	Wrote the tokamak integration tutorial.
-  Max Winkel	Wrote the splitscreen tutorial.
-  Gorgon Zola	Wrote the ODE integration tutorial.
-  Dean P. Macri	Sent in code for curved surfaces and PCX Loading.
-  Sirshane	Made several bug fixes, sent in code for making the mouse cursor invisible in Linux.
-  Matthias Gall	Sent in code for a spline scene node animator and reported lots of bugs.
-  Mario Gruber	Suggested triangle fan drawing and sent in code for this.
-  Ariaci	Spotted out a bug in the ATI driver.
-  Dr Andros C Bragianos	Improved texture mapping in cube scene node.
-  Philipp Dortmann	Sent in code for stencil buffer support for OpenGL.
-  Jerome Nichols	Created the Irrlicht/Ruby interface located at irr.rubyforge.org
-  Vash TheStampede	Sent code for missing Draw2DLine() implementations
-  MattyBoy	XBOX support suggestions
-  Oliver Klems	createImageFromData() method suggestion/implementation
-  Jox	really, really a lot of bug fixes, and the LMTS file loader
-  Zola	Quaternion method additions
-  Tomasz Nowakowski	various bug fixes
-  Nicholas Bray	stencil shadow bug fixes with OpenGL
-  REAPER	mouswheel events for scrollbar
-  Calimero	various bug fixes like vector2d operators
-  Haddock	bugfix in the linked list
-  G.o.D	XML parser fix
-  Erik Zilli	Translated some of the tutorials from my stuttering english into real english. :)
-  Martin Piskernig	Linux bugfixing and testing
-  Soconne	Wrote the original terrain renderer were Irrlichts terrain renderer of Irrlicht is based on it.
-  Spintz	GeoMipMap scene node, terrain renderer of Irrlicht is based on it.
-  Murphy McCauley	OCT file loader, MIM tools
-  Saurav Mohapatra	IrrCSM, and lots of addons, suggestions and bug reports
-  Zhuck Dimitry	My3D Tools
-  Terry Welsh	Allowed me to use the textures of his 'Parallax Mapping with Offset Limiting' paper for the parallax demo of Irrlicht
-  rt	Wrote the original .png loader for Irrlicht
-  Salvatore Russo	Wrote the original .dmf loader for Irrlicht
-  Vox	Various bug reports and fixes
-  atomice	Contributed code for a ms3d loader enhancement
-  William Finlayson	OpenGL RTT, GLSL support and the reflection 2 layer material for OpenGL.
-  Delight	Various code contributions for Irrlicht.NET (particle system, basic shader support and more)
-  Michael Zoech	Improved GLSL support
-  Jean-loup Gailly, Mark Adler	Created the zlib and libpng
-  Guy Eric Schalnat, Andreas Dilger, Glenn Randers-Pehrson and others	Created libpng
-  The Independent JPEG Group	Created JPEG lib
-  Dr Brian Gladman AES Created aesGladman
-  

lib/Linux/readme.txt

@@ -1,2 +0,0 @@
-You might have to recompile the engine to get library files in here.
-Check the readme.txt in the corresponding bin folders for more information.

lib/OSX/readme.txt

@@ -1,2 +0,0 @@
-You might have to recompile the engine to get library files in here.
-Check the readme.txt in the corresponding bin folders for more information.

lib/Win32-gcc/readme.txt

@@ -1,2 +0,0 @@
-You might have to recompile the engine to get library files in here.
-Check the readme.txt in the corresponding bin folders for more information.

lib/Win32-visualstudio/readme.txt

@@ -1,2 +0,0 @@
-You might have to recompile the engine to get library files in here.
-Check the readme.txt in the corresponding bin folders for more information.

ogles-readme.txt

@@ -1,6 +0,0 @@
-This branch is used for development of the OpenGL-ES drivers for Irrlicht.
-There will be drivers for ogl-es 1.x and 2.x at some time, but we'll start
-with 1.x first. Both drivers will be separate drivers, loosely based on the
-OpenGL driver.
-The branch is based on SVN/trunk and will be updated only very slowly. It's
-not intended for regular use besides when working with ogl-es development.

repro.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-aflout=out/default
-myout=out_rep
-exe=./bin/Linux/LoadMesh
-rm -rf "$myout" && mkdir -p "$myout"
-find $aflout/crashes -name 'id:*' -print | \
-while read file; do
-	echo "➤ Testing $file..."
-	short=${file##*/}
-	short=${short%%,*}
-	fout=$myout/$short.txt
-	$exe "$file" >"$fout" 2>&1
-	r=$?
-	if grep -Fq '==ERROR: AddressSanitizer: SEGV on unknown address' "$fout"; then
-		gdb -q --batch -iex 'set confirm off' -ex r -ex bt --args \
-			${exe}_noasan "$file" >"$fout" 2>&1
-		if grep -Eq '^(Thread|Program).*received signal' "$fout"; then
-			cp "$file" "$myout/$short.bin"
-			echo "✔ Reproduced (gdb)"
-		else
-			echo "✗ Not reproduced (gdb)"
-			rm -f "$fout"
-		fi
-		continue
-	fi
-	grep -Fq '==ABORTING' "$fout" && r=1
-	if [ $r -eq 0 ]; then
-		echo "✗ Not reproduced (asan)"
-		rm -f "$fout"
-		continue
-	fi
-	cp "$file" "$myout/$short.bin"
-	echo "✔ Reproduced (asan)"
-done

run.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-export AFL_SKIP_CPUFREQ=1
-export AFL_TMPDIR=/dev/shm
-exe=./bin/Linux/LoadMesh
-opts=(
-	-t 100
-	-i sample_u/
-	-o out/
-)
-if ! [ -d sample_u ]; then
-	mkdir sample_u
-	afl-cmin.bash -T 4 -i sample/ -o sample_u/ -- $exe @@
-	echo; echo
-fi
-exec afl-fuzz \
-	"${opts[@]}" "$@" \
-	-- $exe @@

source/Irrlicht/Android/CAndroidAssetFileArchive.cpp

@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 
-#ifdef   _IRR_COMPILE_ANDROID_ASSET_READER_
 
 #include "CAndroidAssetReader.h"
 
@@ -106,4 +105,3 @@ void CAndroidAssetFileArchive::addDirectoryToFileList(const io::path &dirname_)
 } // end namespace io
 } // end namespace irr
 
-#endif //  _IRR_COMPILE_ANDROID_ASSET_READER_

source/Irrlicht/Android/CAndroidAssetFileArchive.h

@@ -4,9 +4,6 @@
 
 #pragma once
 
-#ifdef  _IRR_COMPILE_ANDROID_ASSET_READER_
-
-
 #include "IReadFile.h"
 #include "IFileArchive.h"
 #include "CFileList.h"
@@ -61,4 +58,3 @@ namespace io
 } // end namespace io
 } // end namespace irr
 
-#endif //   _IRR_COMPILE_ANDROID_ASSET_READER_

source/Irrlicht/Android/CAndroidAssetReader.cpp

@@ -2,9 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-
-#ifdef   _IRR_COMPILE_ANDROID_ASSET_READER_
-
 #include "CAndroidAssetReader.h"
 
 #include "CReadFile.h"
@@ -69,4 +66,3 @@ const io::path& CAndroidAssetReader::getFileName() const
 } // end namespace io
 } // end namespace irr
 
-#endif //  _IRR_COMPILE_ANDROID_ASSET_READER_

source/Irrlicht/Android/CAndroidAssetReader.h

@@ -4,9 +4,6 @@
 
 #pragma once
 
-#ifdef  _IRR_COMPILE_ANDROID_ASSET_READER_
-
-
 #include "IReadFile.h"
 
 struct AAssetManager;
@@ -66,4 +63,3 @@ namespace io
 } // end namespace io
 } // end namespace irr
 
-#endif //   _IRR_COMPILE_ANDROID_ASSET_READER_

source/Irrlicht/Android/CIrrDeviceAndroid.cpp

@@ -5,8 +5,6 @@
 
 #include "CIrrDeviceAndroid.h"
 
-#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
-
 #include "os.h"
 #include "CFileSystem.h"
 #include "CAndroidAssetReader.h"
@@ -858,5 +856,3 @@ bool CIrrDeviceAndroid::isGyroscopeAvailable()
 }
 
 } // end namespace irr
-
-#endif

source/Irrlicht/Android/CIrrDeviceAndroid.h

@@ -5,7 +5,6 @@
 #pragma once
 
 
-#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
 
 #include "CIrrDeviceStub.h"
 #include "IrrlichtDevice.h"
@@ -98,4 +97,3 @@ namespace irr
 
 } // end namespace irr
 
-#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_

source/Irrlicht/Android/CKeyEventWrapper.cpp

@@ -3,8 +3,6 @@
 
 #include "CKeyEventWrapper.h"
 
-#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
-
 #include "os.h"
 
 namespace irr
@@ -58,6 +56,3 @@ int CKeyEventWrapper::getUnicodeChar(int metaState)
 
 } // namespace jni
 } // namespace irr
-
-
-#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_

source/Irrlicht/Android/CKeyEventWrapper.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
-
 #include <jni.h>
 
 struct android_app;
@@ -35,5 +33,3 @@ private:
 
 } // namespace jni
 } // namespace irr
-
-#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_

source/Irrlicht/CAnimatedMeshSceneNode.cpp

@@ -7,9 +7,7 @@
 #include "ISceneManager.h"
 #include "S3DVertex.h"
 #include "os.h"
-#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
 #include "CSkinnedMesh.h"
-#endif
 #include "IDummyTransformationSceneNode.h"
 #include "IBoneSceneNode.h"
 #include "IMaterialRenderer.h"
@@ -187,10 +185,6 @@ IMesh * CAnimatedMeshSceneNode::getMeshForCurrentFrame()
 	}
 	else
 	{
-#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-		return 0;
-#else
-
 		// As multiple scene nodes may be sharing the same skinned mesh, we have to
 		// re-animate it every frame to ensure that this node gets the mesh that it needs.
 
@@ -223,7 +217,6 @@ IMesh * CAnimatedMeshSceneNode::getMeshForCurrentFrame()
 		}
 
 		return skinnedMesh;
-#endif
 	}
 }
 
@@ -466,11 +459,6 @@ u32 CAnimatedMeshSceneNode::getMaterialCount() const
 //! the corresponding joint, if the mesh in this scene node is a skinned mesh.
 IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
 {
-#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-	os::Printer::log("Compiled without _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_", ELL_WARNING);
-	return 0;
-#else
-
 	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
 	{
 		os::Printer::log("No mesh, or mesh not of skinned mesh type", ELL_WARNING);
@@ -496,7 +484,6 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
 	}
 
 	return JointChildSceneNodes[number];
-#endif
 }
 
 
@@ -505,11 +492,6 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
 //! the corresponding joint, if the mesh in this scene node is a skinned mesh.
 IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(u32 jointID)
 {
-#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-	os::Printer::log("Compiled without _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_", ELL_WARNING);
-	return 0;
-#else
-
 	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
 	{
 		os::Printer::log("No mesh, or mesh not of skinned mesh type", ELL_WARNING);
@@ -525,23 +507,17 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(u32 jointID)
 	}
 
 	return JointChildSceneNodes[jointID];
-#endif
 }
 
 //! Gets joint count.
 u32 CAnimatedMeshSceneNode::getJointCount() const
 {
-#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-	return 0;
-#else
-
 	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
 		return 0;
 
 	ISkinnedMesh *skinnedMesh=(ISkinnedMesh*)Mesh;
 
 	return skinnedMesh->getJointCount();
-#endif
 }
 
 
@@ -702,9 +678,6 @@ void CAnimatedMeshSceneNode::setRenderFromIdentity(bool enable)
 //! updates the joint positions of this mesh
 void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions)
 {
-#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-	return;
-#else
 	if (Mesh && Mesh->getMeshType() == EAMT_SKINNED )
 	{
 		checkJoints();
@@ -776,17 +749,12 @@ void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions)
 			}
 		}
 	}
-#endif
 }
 
 /*!
 */
 void CAnimatedMeshSceneNode::checkJoints()
 {
-#ifndef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
-	return;
-#else
-
 	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
 		return;
 
@@ -803,7 +771,6 @@ void CAnimatedMeshSceneNode::checkJoints()
 		JointsUsed=true;
 		JointMode=EJUOR_READ;
 	}
-#endif
 }
 
 /*!

source/Irrlicht/CB3DMeshFileLoader.cpp

@@ -274,7 +274,14 @@ bool CB3DMeshFileLoader::readChunkMESH(CSkinnedMesh::SJoint *inJoint)
 		{
 			scene::SSkinMeshBuffer *meshBuffer = AnimatedMesh->addMeshBuffer();
 
-			if (brushID!=-1)
+			if (brushID == -1)
+			{ /* ok */ }
+			else if (brushID < 0 || (u32)brushID >= Materials.size())
+			{
+				os::Printer::log("Illegal brush ID found", B3DFile->getFileName(), ELL_ERROR);
+				return false;
+			}
+			else
 			{
 				meshBuffer->Material=Materials[brushID].Material;
 			}
@@ -354,7 +361,8 @@ bool CB3DMeshFileLoader::readChunkVRTS(CSkinnedMesh::SJoint *inJoint)
 	tex_coord_set_size = os::Byteswap::byteswap(tex_coord_set_size);
 #endif
 
-	if (tex_coord_sets >= max_tex_coords || tex_coord_set_size >= 4) // Something is wrong
+	if (tex_coord_sets < 0 || tex_coord_set_size < 0 ||
+		tex_coord_sets >= max_tex_coords || tex_coord_set_size >= 4) // Something is wrong
 	{
 		os::Printer::log("tex_coord_sets or tex_coord_set_size too big", B3DFile->getFileName(), ELL_ERROR);
 		return false;
@@ -458,13 +466,18 @@ bool CB3DMeshFileLoader::readChunkTRIS(scene::SSkinMeshBuffer *meshBuffer, u32 m
 
 	SB3dMaterial *B3dMaterial;
 
-	if (triangle_brush_id != -1)
+	if (triangle_brush_id == -1)
+		B3dMaterial = 0;
+	else if (triangle_brush_id < 0 || (u32)triangle_brush_id >= Materials.size())
+	{
+		os::Printer::log("Illegal material index found", B3DFile->getFileName(), ELL_ERROR);
+		return false;
+	}
+	else
 	{
 		B3dMaterial = &Materials[triangle_brush_id];
 		meshBuffer->Material = B3dMaterial->Material;
 	}
-	else
-		B3dMaterial = 0;
 
 	const s32 memoryNeeded = B3dStack.getLast().length / sizeof(s32);
 	meshBuffer->Indices.reallocate(memoryNeeded + meshBuffer->Indices.size() + 1);
@@ -583,6 +596,12 @@ bool CB3DMeshFileLoader::readChunkBONE(CSkinnedMesh::SJoint *inJoint)
 #endif
 			globalVertexID += VerticesStart;
 
+			if (globalVertexID >= AnimatedVertices_VertexID.size())
+			{
+				os::Printer::log("Illegal vertex index found", B3DFile->getFileName(), ELL_ERROR);
+				return false;
+			}
+
 			if (AnimatedVertices_VertexID[globalVertexID]==-1)
 			{
 				os::Printer::log("B3dMeshLoader: Weight has bad vertex id (no link to meshbuffer index found)");
@@ -1015,10 +1034,11 @@ bool CB3DMeshFileLoader::readChunkBRUS()
 void CB3DMeshFileLoader::readString(core::stringc& newstring)
 {
 	newstring="";
-	while (B3DFile->getPos() <= B3DFile->getSize())
+	while (true)
 	{
 		c8 character;
-		B3DFile->read(&character, sizeof(character));
+		if (B3DFile->read(&character, sizeof(character)) == 0)
+			return; // eof
 		if (character==0)
 			return;
 		newstring.append(character);

source/Irrlicht/CEGLManager.cpp

@@ -4,6 +4,8 @@
 
 #include "CEGLManager.h"
 
+#ifdef _IRR_COMPILE_WITH_EGL_MANAGER_
+
 #include "irrString.h"
 #include "irrArray.h"
 #include "os.h"
@@ -42,7 +44,7 @@ bool CEGLManager::initialize(const SIrrlichtCreationParameters& params, const SE
         return true;
 
 	// Window is depend on platform.
-#if defined(_IRR_WINDOWS_API_)
+#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
 	EglWindow = (NativeWindowType)Data.OpenGLWin32.HWnd;
 	Data.OpenGLWin32.HDc = GetDC((HWND)EglWindow);
 	EglDisplay = eglGetDisplay((NativeDisplayType)Data.OpenGLWin32.HDc);
@@ -97,7 +99,7 @@ void CEGLManager::terminate()
 		EglDisplay = EGL_NO_DISPLAY;
 	}
 
-#if defined(_IRR_WINDOWS_API_)
+#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
 	if (Data.OpenGLWin32.HDc)
     {
 		ReleaseDC((HWND)EglWindow, (HDC)Data.OpenGLWin32.HDc);
@@ -662,3 +664,4 @@ bool CEGLManager::testEGLError()
 }
 }
 
+#endif

source/Irrlicht/CEGLManager.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#ifdef _IRR_COMPILE_WITH_EGL_MANAGER_
+
 #include <EGL/egl.h>
 
 #include "SIrrCreationParameters.h"
@@ -109,3 +111,4 @@ namespace video
 	};
 }
 }
+#endif

source/Irrlicht/CGUIComboBox.cpp

@@ -22,9 +22,9 @@ namespace gui
 CGUIComboBox::CGUIComboBox(IGUIEnvironment* environment, IGUIElement* parent,
 	s32 id, core::rect<s32> rectangle)
 	: IGUIComboBox(environment, parent, id, rectangle),
-	ListButton(0), SelectedText(0), ListBox(0), LastFocus(0),
+	ListButton(nullptr), SelectedText(nullptr), ListBox(nullptr), LastFocus(nullptr),
 	Selected(-1), HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_CENTER), MaxSelectionRows(5), HasFocus(false),
-	ActiveFont(0)
+	ActiveFont(nullptr)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUIComboBox");
@@ -185,6 +185,15 @@ void CGUIComboBox::setSelected(s32 idx)
 }
 
 
+//! Sets the selected item and emits a change event.
+/** Set this to -1 if no item should be selected */
+void CGUIComboBox::setAndSendSelected(s32 idx)
+{
+	setSelected(idx);
+	sendSelectionChangedEvent();
+}
+
+
 //! called if an event happened.
 bool CGUIComboBox::OnEvent(const SEvent& event)
 {
@@ -208,7 +217,7 @@ bool CGUIComboBox::OnEvent(const SEvent& event)
 					openCloseMenu();
 				}
 
-				ListButton->setPressed(ListBox == 0);
+				ListButton->setPressed(ListBox == nullptr);
 
 				return true;
 			}
@@ -361,7 +370,7 @@ void CGUIComboBox::sendSelectionChangedEvent()
 
 		event.EventType = EET_GUI_EVENT;
 		event.GUIEvent.Caller = this;
-		event.GUIEvent.Element = 0;
+		event.GUIEvent.Element = nullptr;
 		event.GUIEvent.EventType = EGET_COMBO_BOX_CHANGED;
 		Parent->OnEvent(event);
 	}
@@ -447,12 +456,23 @@ void CGUIComboBox::openCloseMenu()
 		// close list box
 		Environment->setFocus(this);
 		ListBox->remove();
-		ListBox = 0;
+		ListBox = nullptr;
 	}
 	else
 	{
-		if (Parent)
+		if (Parent) {
+			SEvent event;
+			event.EventType = EET_GUI_EVENT;
+			event.GUIEvent.Caller = this;
+			event.GUIEvent.Element = nullptr;
+			event.GUIEvent.EventType = EGET_LISTBOX_OPENED;
+
+			// Allow to prevent the listbox from opening.
+			if (Parent->OnEvent(event))
+				return;
+
 			Parent->bringToFront(this);
+		}
 
 		IGUISkin* skin = Environment->getSkin();
 		u32 h = Items.size();

source/Irrlicht/CGUIComboBox.h

@@ -55,6 +55,10 @@ namespace gui
 		//! sets the selected item. Set this to -1 if no item should be selected
 		void setSelected(s32 idx) override;
 
+		//! Sets the selected item and emits a change event.
+		/** Set this to -1 if no item should be selected */
+		void setAndSendSelected(s32 idx) override;
+
 		//! sets the text alignment of the text part
 		void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) override;
 

source/Irrlicht/CGUIEditBox.cpp

@@ -299,7 +299,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
 				const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
 
 				core::stringc s;
-				wStringToMultibyte(s, Text.subString(realmbgn, realmend - realmbgn));
+				wStringToUTF8(s, Text.subString(realmbgn, realmend - realmbgn));
 				Operator->copyToClipboard(s.c_str());
 			}
 			break;
@@ -312,7 +312,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
 
 				// copy
 				core::stringc sc;
-				wStringToMultibyte(sc, Text.subString(realmbgn, realmend - realmbgn));
+				wStringToUTF8(sc, Text.subString(realmbgn, realmend - realmbgn));
 				Operator->copyToClipboard(sc.c_str());
 
 				if (isEnabled())
@@ -345,7 +345,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
 				if (p)
 				{
 					irr::core::stringw widep;
-					core::multibyteToWString(widep, p);
+					core::utf8ToWString(widep, p);
 
 					if (MarkBegin == MarkEnd)
 					{
@@ -1157,7 +1157,7 @@ bool CGUIEditBox::processMouse(const SEvent& event)
 			const c8 *inserted_text_utf8 = Operator->getTextFromPrimarySelection();
 			if (!inserted_text_utf8)
 				return inserted_text;
-			core::multibyteToWString(inserted_text, inserted_text_utf8);
+			core::utf8ToWString(inserted_text, inserted_text_utf8);
 			return inserted_text;
 		}());
 
@@ -1659,7 +1659,7 @@ void CGUIEditBox::setTextMarkers(s32 begin, s32 end)
 			const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
 
 			core::stringc s;
-			wStringToMultibyte(s, Text.subString(realmbgn, realmend - realmbgn));
+			wStringToUTF8(s, Text.subString(realmbgn, realmend - realmbgn));
 			Operator->copyToPrimarySelection(s.c_str());
 		}
 

source/Irrlicht/CGUIEnvironment.cpp

@@ -149,7 +149,7 @@ void CGUIEnvironment::loadBuiltInFont()
 	CGUIFont* font = new CGUIFont(this, DefaultFontName );
 	if (!font->load(file))
 	{
-		os::Printer::log("Error: Could not load built-in Font. Did you compile without the BMP loader?", ELL_ERROR);
+		os::Printer::log("Error: Could not load built-in Font.", ELL_ERROR);
 		font->drop();
 		file->drop();
 		return;

source/Irrlicht/CGUIListBox.cpp

@@ -623,7 +623,7 @@ void CGUIListBox::recalculateScrollPos()
 	if (!AutoScroll)
 		return;
 
-	const s32 selPos = (Selected == -1 ? TotalItemHeight : Selected * ItemHeight) - ScrollBar->getPos();
+	const s32 selPos = (getSelected() == -1 ? TotalItemHeight : getSelected() * ItemHeight) - ScrollBar->getPos();
 
 	if (selPos < 0)
 	{

source/Irrlicht/CImageLoaderBMP.cpp

@@ -45,20 +45,32 @@ bool CImageLoaderBMP::isALoadableFileFormat(io::IReadFile* file) const
 	return headerID == 0x4d42;
 }
 
+// UB-safe overflow check
+static inline bool overflowCheck(const void *base, size_t offset, const void *end)
+{
+	auto baseI = reinterpret_cast<uintptr_t>(base),
+		endI = reinterpret_cast<uintptr_t>(end);
+	return baseI > endI || offset >= (endI - baseI);
+}
+// check whether &p[0] to &p[_off - 1] can be accessed
+#define CHECKP(_off) if ((_off) < 0 || overflowCheck(p, _off, pEnd)) goto exit
+// same for d
+#define CHECKD(_off) if ((_off) < 0 || overflowCheck(d, _off, destEnd)) goto exit
 
 void CImageLoaderBMP::decompress8BitRLE(u8*& bmpData, s32 size, s32 width, s32 height, s32 pitch) const
 {
 	u8* p = bmpData;
+	const u8* pEnd = bmpData + size;
 	u8* newBmp = new u8[(width+pitch)*height];
 	u8* d = newBmp;
-	u8* destEnd = newBmp + (width+pitch)*height;
+	const u8* destEnd = newBmp + (width+pitch)*height;
 	s32 line = 0;
 
-	while (bmpData - p < size && d < destEnd)
+	while (p < pEnd && d < destEnd)
 	{
 		if (*p == 0)
 		{
-			++p;
+			++p; CHECKP(1);
 
 			switch(*p)
 			{
@@ -68,29 +80,28 @@ void CImageLoaderBMP::decompress8BitRLE(u8*& bmpData, s32 size, s32 width, s32 h
 				d = newBmp + (line*(width+pitch));
 				break;
 			case 1: // end of bmp
-				delete [] bmpData;
-				bmpData = newBmp;
-				return;
+				goto exit;
 			case 2:
-				++p; d +=(u8)*p;  // delta
-				++p; d += ((u8)*p)*(width+pitch);
-				++p;
+				++p; CHECKP(2);
+				d += (u8)*p; ++p; // delta
+				d += ((u8)*p)*(width+pitch); ++p;
 				break;
 			default:
 				{
 					// absolute mode
 					s32 count = (u8)*p; ++p;
 					s32 readAdditional = ((2-(count%2))%2);
-					s32 i;
 
-					for (i=0; i<count; ++i)
+					CHECKP(count); CHECKD(count);
+					for (s32 i=0; i<count; ++i)
 					{
 						*d = *p;
 						++p;
 						++d;
 					}
 
-					for (i=0; i<readAdditional; ++i)
+					CHECKP(readAdditional);
+					for (s32 i=0; i<readAdditional; ++i)
 						++p;
 				}
 			}
@@ -98,7 +109,9 @@ void CImageLoaderBMP::decompress8BitRLE(u8*& bmpData, s32 size, s32 width, s32 h
 		else
 		{
 			s32 count = (u8)*p; ++p;
+			CHECKP(1);
 			u8 color = *p; ++p;
+			CHECKD(count);
 			for (s32 i=0; i<count; ++i)
 			{
 				*d = color;
@@ -107,26 +120,37 @@ void CImageLoaderBMP::decompress8BitRLE(u8*& bmpData, s32 size, s32 width, s32 h
 		}
 	}
 
+exit:
 	delete [] bmpData;
 	bmpData = newBmp;
 }
 
+// how many bytes will be touched given the current state of decompress4BitRLE
+static inline u32 shiftedCount(s32 count, s32 shift)
+{
+	_IRR_DEBUG_BREAK_IF(count < 0)
+	u32 ret = count / 2;
+	if (shift == 0 || count % 2 == 1)
+		++ret;
+	return ret;
+}
 
 void CImageLoaderBMP::decompress4BitRLE(u8*& bmpData, s32 size, s32 width, s32 height, s32 pitch) const
 {
-	s32 lineWidth = (width+1)/2+pitch;
+	const s32 lineWidth = (width+1)/2+pitch;
 	u8* p = bmpData;
+	const u8* pEnd = bmpData + size;
 	u8* newBmp = new u8[lineWidth*height];
 	u8* d = newBmp;
-	u8* destEnd = newBmp + lineWidth*height;
+	const u8* destEnd = newBmp + lineWidth*height;
 	s32 line = 0;
 	s32 shift = 4;
 
-	while (bmpData - p < size && d < destEnd)
+	while (p < pEnd && d < destEnd)
 	{
 		if (*p == 0)
 		{
-			++p;
+			++p; CHECKP(1);
 
 			switch(*p)
 			{
@@ -137,12 +161,10 @@ void CImageLoaderBMP::decompress4BitRLE(u8*& bmpData, s32 size, s32 width, s32 h
 				shift = 4;
 				break;
 			case 1: // end of bmp
-				delete [] bmpData;
-				bmpData = newBmp;
-				return;
+				goto exit;
 			case 2:
 				{
-					++p;
+					++p; CHECKP(2);
 					s32 x = (u8)*p; ++p;
 					s32 y = (u8)*p; ++p;
 					d += x/2 + y*lineWidth;
@@ -155,15 +177,16 @@ void CImageLoaderBMP::decompress4BitRLE(u8*& bmpData, s32 size, s32 width, s32 h
 					s32 count = (u8)*p; ++p;
 					s32 readAdditional = ((2-((count)%2))%2);
 					s32 readShift = 4;
-					s32 i;
 
-					for (i=0; i<count; ++i)
+					CHECKP(shiftedCount(count, readShift));
+					CHECKD(shiftedCount(count, shift));
+					for (s32 i=0; i<count; ++i)
 					{
 						s32 color = (((u8)*p) >> readShift) & 0x0f;
 						readShift -= 4;
 						if (readShift < 0)
 						{
-							++*p;
+							++*p; // <- bug?
 							readShift = 4;
 						}
 
@@ -179,7 +202,8 @@ void CImageLoaderBMP::decompress4BitRLE(u8*& bmpData, s32 size, s32 width, s32 h
 
 					}
 
-					for (i=0; i<readAdditional; ++i)
+					CHECKP(readAdditional);
+					for (s32 i=0; i<readAdditional; ++i)
 						++p;
 				}
 			}
@@ -187,10 +211,12 @@ void CImageLoaderBMP::decompress4BitRLE(u8*& bmpData, s32 size, s32 width, s32 h
 		else
 		{
 			s32 count = (u8)*p; ++p;
+			CHECKP(1);
 			s32 color1 = (u8)*p; color1 = color1 & 0x0f;
 			s32 color2 = (u8)*p; color2 = (color2 >> 4) & 0x0f;
 			++p;
 
+			CHECKD(shiftedCount(count, shift));
 			for (s32 i=0; i<count; ++i)
 			{
 				u8 mask = 0x0f << shift;
@@ -207,11 +233,14 @@ void CImageLoaderBMP::decompress4BitRLE(u8*& bmpData, s32 size, s32 width, s32 h
 		}
 	}
 
+exit:
 	delete [] bmpData;
 	bmpData = newBmp;
 }
 
-
+#undef CHECKOFF
+#undef CHECKP
+#undef CHECKD
 
 //! creates a surface from the file
 IImage* CImageLoaderBMP::loadImage(io::IReadFile* file) const
@@ -262,12 +291,16 @@ IImage* CImageLoaderBMP::loadImage(io::IReadFile* file) const
 	// read palette
 
 	long pos = file->getPos();
+	constexpr s32 paletteAllocSize = 256;
 	s32 paletteSize = (header.BitmapDataOffset - pos) / 4;
+	paletteSize = core::clamp(paletteSize, 0, paletteAllocSize);
 
 	s32* paletteData = 0;
 	if (paletteSize)
 	{
-		paletteData = new s32[paletteSize];
+		// always allocate an 8-bit palette to ensure enough space
+		paletteData = new s32[paletteAllocSize];
+		memset(paletteData, 0, paletteAllocSize * sizeof(s32));
 		file->read(paletteData, paletteSize * sizeof(s32));
 #ifdef __BIG_ENDIAN__
 		for (s32 i=0; i<paletteSize; ++i)
@@ -286,14 +319,17 @@ IImage* CImageLoaderBMP::loadImage(io::IReadFile* file) const
 
 	file->seek(header.BitmapDataOffset);
 
-	f32 t = (header.Width) * (header.BPP / 8.0f);
-	s32 widthInBytes = (s32)t;
-	t -= widthInBytes;
-	if (t!=0.0f)
-		++widthInBytes;
+	s32 widthInBytes;
+	{
+		f32 t = (header.Width) * (header.BPP / 8.0f);
+		widthInBytes = (s32)t;
+		t -= widthInBytes;
+		if (t!=0.0f)
+			++widthInBytes;
+	}
 
-	s32 lineData = widthInBytes + ((4-(widthInBytes%4)))%4;
-	pitch = lineData - widthInBytes;
+	const s32 lineSize = widthInBytes + ((4-(widthInBytes%4)))%4;
+	pitch = lineSize - widthInBytes;
 
 	u8* bmpData = new u8[header.BitmapDataSize];
 	file->read(bmpData, header.BitmapDataSize);
@@ -303,15 +339,24 @@ IImage* CImageLoaderBMP::loadImage(io::IReadFile* file) const
 	{
 	case 1: // 8 bit rle
 		decompress8BitRLE(bmpData, header.BitmapDataSize, header.Width, header.Height, pitch);
+		header.BitmapDataSize = (header.Width + pitch) * header.Height;
 		break;
 	case 2: // 4 bit rle
 		decompress4BitRLE(bmpData, header.BitmapDataSize, header.Width, header.Height, pitch);
+		header.BitmapDataSize = ((header.Width+1)/2 + pitch) * header.Height;
 		break;
 	}
 
-	// create surface
+	if (header.BitmapDataSize < lineSize * header.Height)
+	{
+		os::Printer::log("Bitmap data is cut off.", ELL_ERROR);
 
-	// no default constructor from packed area! ARM problem!
+		delete [] paletteData;
+		delete [] bmpData;
+		return 0;
+	}
+
+	// create surface
 	core::dimension2d<u32> dim;
 	dim.Width = header.Width;
 	dim.Height = header.Height;

source/Irrlicht/CImageLoaderTGA.cpp

@@ -31,10 +31,10 @@ u8 *CImageLoaderTGA::loadCompressedImage(io::IReadFile *file, const STGAHeader&
 	// This was written and sent in by Jon Pry, thank you very much!
 	// I only changed the formatting a little bit.
 
-	s32 bytesPerPixel = header.PixelDepth/8;
-	s32 imageSize =  header.ImageHeight * header.ImageWidth * bytesPerPixel;
+	const u32 bytesPerPixel = header.PixelDepth/8;
+	const u32 imageSize =  header.ImageHeight * header.ImageWidth * bytesPerPixel;
 	u8* data = new u8[imageSize];
-	s32 currentByte = 0;
+	u32 currentByte = 0;
 
 	while(currentByte < imageSize)
 	{
@@ -45,8 +45,17 @@ u8 *CImageLoaderTGA::loadCompressedImage(io::IReadFile *file, const STGAHeader&
 		{
 			chunkheader++; // Add 1 To The Value To Get Total Number Of Raw Pixels
 
-			file->read(&data[currentByte], bytesPerPixel * chunkheader);
-			currentByte += bytesPerPixel * chunkheader;
+			const u32 bytesToRead = bytesPerPixel * chunkheader;
+			if ( currentByte+bytesToRead < imageSize )
+			{
+				file->read(&data[currentByte], bytesToRead);
+				currentByte += bytesToRead;
+			}
+			else
+			{
+				os::Printer::log("Compressed TGA file RAW chunk tries writing beyond buffer", file->getFileName(), ELL_WARNING);
+				break;
+			}
 		}
 		else
 		{
@@ -55,15 +64,27 @@ u8 *CImageLoaderTGA::loadCompressedImage(io::IReadFile *file, const STGAHeader&
 			// If It's An RLE Header
 			chunkheader -= 127; // Subtract 127 To Get Rid Of The ID Bit
 
-			s32 dataOffset = currentByte;
-			file->read(&data[dataOffset], bytesPerPixel);
-
-			currentByte += bytesPerPixel;
-
-			for(s32 counter = 1; counter < chunkheader; counter++)
+			u32 dataOffset = currentByte;
+			if ( dataOffset+bytesPerPixel < imageSize )
 			{
-				for(s32 elementCounter=0; elementCounter < bytesPerPixel; elementCounter++)
-					data[currentByte + elementCounter] = data[dataOffset + elementCounter];
+				file->read(&data[dataOffset], bytesPerPixel);
+				currentByte += bytesPerPixel;
+			}
+			else
+			{
+				os::Printer::log("Compressed TGA file RLE headertries writing beyond buffer", file->getFileName(), ELL_WARNING);
+				break;
+			}
+
+			for(u32 counter = 1; counter < chunkheader; counter++)
+			{
+				if ( currentByte + bytesPerPixel <= imageSize )
+				{
+					for(u32 elementCounter=0; elementCounter < bytesPerPixel; elementCounter++)
+					{
+						data[currentByte + elementCounter] = data[dataOffset + elementCounter];
+					}
+				}
 
 				currentByte += bytesPerPixel;
 			}
@@ -116,8 +137,17 @@ IImage* CImageLoaderTGA::loadImage(io::IReadFile* file) const
 
 	if (header.ColorMapType)
 	{
-		// create 32 bit palette
-		palette = new u32[ header.ColorMapLength];
+		// Create 32 bit palette
+		const irr::u16 paletteSize = core::max_((u16)256, header.ColorMapLength);	// ColorMapLength can lie, but so far we only use palette for 8-bit, so ensure it has 256 entries
+		palette = new u32[paletteSize];
+
+		if( paletteSize > header.ColorMapLength )
+		{
+			// To catch images using palette colors with invalid indices
+			const irr::u32 errorCol = irr::video::SColor(255,255, 0, 205).color; // bright magenta
+			for ( irr::u16 i = header.ColorMapLength; i< paletteSize; ++i )
+				palette[i] = errorCol;
+		}
 
 		// read color map
 		u8 * colorMap = new u8[header.ColorMapEntrySize/8 * header.ColorMapLength];
@@ -148,7 +178,7 @@ IImage* CImageLoaderTGA::loadImage(io::IReadFile* file) const
 			header.ImageType == 3 // Uncompressed, black and white images
 		)
 	{
-		const s32 imageSize = header.ImageHeight * header.ImageWidth * header.PixelDepth/8;
+		const s32 imageSize = header.ImageHeight * header.ImageWidth * (header.PixelDepth/8);
 		data = new u8[imageSize];
 	  	file->read(data, imageSize);
 	}
@@ -183,14 +213,28 @@ IImage* CImageLoaderTGA::loadImage(io::IReadFile* file) const
 			}
 			else
 			{
-				image = new CImage(ECF_A1R5G5B5,
-					core::dimension2d<u32>(header.ImageWidth, header.ImageHeight));
-				if (image)
-					CColorConverter::convert8BitTo16Bit((u8*)data,
-						(s16*)image->getData(),
-						header.ImageWidth,header.ImageHeight,
-						(s32*) palette, 0,
-						(header.ImageDescriptor&0x20)==0);
+				switch ( header.ColorMapEntrySize )
+				{
+					case 16:
+						image = new CImage(ECF_A1R5G5B5, core::dimension2d<u32>(header.ImageWidth, header.ImageHeight));
+						if ( image )
+							CColorConverter::convert8BitTo16Bit((u8*)data,
+							(s16*)image->getData(),
+							header.ImageWidth,header.ImageHeight,
+							(s32*) palette, 0,
+							(header.ImageDescriptor&0x20)==0);
+						break;
+					// Note: 24 bit with palette would need a 24 bit palette, too lazy doing that now (textures will prefer 32-bit later anyway)
+					default:
+						image = new CImage(ECF_A8R8G8B8, core::dimension2d<u32>(header.ImageWidth, header.ImageHeight));
+						if ( image )
+							CColorConverter::convert8BitTo32Bit((u8*)data,
+							(u8*)image->getData(),
+							header.ImageWidth,header.ImageHeight,
+							(u8*) palette, 0,
+							(header.ImageDescriptor&0x20)==0);
+						break;
+				}
 			}
 		}
 		break;

source/Irrlicht/CIrrDeviceLinux.cpp

@@ -982,7 +982,7 @@ bool CIrrDeviceLinux::run()
 								os::Printer::log("XLookupNone", ELL_INFORMATION);
 							else if ( status ==  XLookupKeySym )
 								// Getting this also when user did not set setlocale(LC_ALL, ""); and using an unknown locale
-								// XSupportsLocale doesn't seeem to catch that unfortunately - any other ideas to catch it are welcome.
+								// XSupportsLocale doesn't seem to catch that unfortunately - any other ideas to catch it are welcome.
 								os::Printer::log("XLookupKeySym", ELL_INFORMATION);
 							else if ( status ==  XBufferOverflow )
 								os::Printer::log("XBufferOverflow", ELL_INFORMATION);
@@ -2058,7 +2058,7 @@ Cursor CIrrDeviceLinux::TextureToMonochromeCursor(irr::video::ITexture * tex, co
 										ZPixmap,	// XYBitmap (depth=1), ZPixmap(depth=x)
 										0, 0, sourceRect.getWidth(), sourceRect.getHeight(),
 										32, // bitmap_pad,
-										0// bytes_per_line (0 means continuos in memory)
+										0// bytes_per_line (0 means continuous in memory)
 										);
 	sourceImage->data = new char[sourceImage->height * sourceImage->bytes_per_line];
 	XImage * maskImage = XCreateImage(XDisplay, VisualInfo->visual,
@@ -2251,7 +2251,7 @@ CIrrDeviceLinux::CCursorControl::CCursorControl(CIrrDeviceLinux* dev, bool null)
 CIrrDeviceLinux::CCursorControl::~CCursorControl()
 {
 	// Do not clearCursors here as the display is already closed
-	// TODO (cutealien): droping cursorcontrol earlier might work, not sure about reason why that's done in stub currently.
+	// TODO (cutealien): dropping cursorcontrol earlier might work, not sure about reason why that's done in stub currently.
 }
 
 #ifdef _IRR_COMPILE_WITH_X11_

source/Irrlicht/CIrrDeviceOSX.h

@@ -22,7 +22,7 @@ namespace irr
     class CIrrDeviceMacOSX;
 }
 
-@interface CIrrDelegateOSX : NSObject
+@interface CIrrDelegateOSX : NSObject <NSApplicationDelegate, NSWindowDelegate>
 
 - (id)initWithDevice:(irr::CIrrDeviceMacOSX*)device;
 - (void)terminate:(id)sender;

source/Irrlicht/CIrrDeviceOSX.mm

@@ -564,7 +564,7 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
 		{
 			[[NSAutoreleasePool alloc] init];
 			[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
-			[NSApp setDelegate:(id<NSApplicationDelegate>)[[[CIrrDelegateOSX alloc] initWithDevice:this] autorelease]];
+			[[NSApplication sharedApplication] setDelegate:[[[CIrrDelegateOSX alloc] initWithDevice:this] autorelease]];
 
             // Create menu
 
@@ -685,7 +685,7 @@ bool CIrrDeviceMacOSX::createWindow()
     {
         if (Window)
         {
-            [Window setDelegate:(id<NSWindowDelegate>)[NSApp delegate]];
+            [Window setDelegate:(CIrrDelegateOSX *)[NSApp delegate]];
             [Window setAcceptsMouseMovedEvents:TRUE];
             [Window setIsVisible:TRUE];
             [Window makeKeyAndOrderFront:nil];

source/Irrlicht/CIrrDeviceSDL.cpp

@@ -673,7 +673,7 @@ bool CIrrDeviceSDL::run()
 			{
 				irrevent.EventType = irr::EET_STRING_INPUT_EVENT;
 				irrevent.StringInput.Str = new core::stringw();
-				irr::core::multibyteToWString(*irrevent.StringInput.Str, SDL_event.text.text);
+				irr::core::utf8ToWString(*irrevent.StringInput.Str, SDL_event.text.text);
 				postEventFromUser(irrevent);
 				delete irrevent.StringInput.Str;
 				irrevent.StringInput.Str = NULL;
@@ -928,7 +928,7 @@ void CIrrDeviceSDL::sleep(u32 timeMs, bool pauseTimer)
 void CIrrDeviceSDL::setWindowCaption(const wchar_t* text)
 {
 	core::stringc textc;
-	core::wStringToMultibyte(textc, text);
+	core::wStringToUTF8(textc, text);
 	SDL_SetWindowTitle(Window, textc.c_str());
 }
 

source/Irrlicht/CIrrDeviceWin32.cpp

@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 
+#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
 
 #if defined (__STRICT_ANSI__)
     #error Compiling with __STRICT_ANSI__ not supported. g++ does set this when compiling with -std=c++11 or -std=c++0x. Use instead -std=gnu++11 or -std=gnu++0x. Or use -U__STRICT_ANSI__ to disable strict ansi.
@@ -814,9 +815,6 @@ CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params)
 		wcex.lpszClassName	= ClassName;
 		wcex.hIconSm		= 0;
 
-		// if there is an icon, load it
-		wcex.hIcon = (HICON)LoadImageW(hInstance, L"irrlicht.ico", IMAGE_ICON, 0,0, LR_LOADFROMFILE | LR_DEFAULTSIZE);
-
 		RegisterClassExW(&wcex);
 
 		// calculate client size
@@ -1026,7 +1024,7 @@ bool CIrrDeviceWin32::run()
 //! Pause the current process for the minimum time allowed only to allow other processes to execute
 void CIrrDeviceWin32::yield()
 {
-	Sleep(1);
+	Sleep(0);
 }
 
 //! Pause execution and let other processes to run for a specified amount of time.
@@ -1597,3 +1595,4 @@ core::dimension2di CIrrDeviceWin32::CCursorControl::getSupportedIconSize() const
 
 } // end namespace
 
+#endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_

source/Irrlicht/CIrrDeviceWin32.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
+
 #include "CIrrDeviceStub.h"
 #include "IrrlichtDevice.h"
 
@@ -423,3 +425,5 @@ namespace irr
 	};
 
 } // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_

source/Irrlicht/CMakeLists.txt

@@ -50,6 +50,8 @@ elseif(MSVC)
 	if(CMAKE_SIZEOF_VOID_P EQUAL 4)
 		add_compile_options(/arch:SSE)
 	endif()
+
+	add_compile_options(/D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
 endif()
 
 # Sanity-check version
@@ -69,7 +71,6 @@ endif()
 # Platform-independent configuration (hard-coded currently)
 add_definitions(
 	-DIRR_ENABLE_BUILTIN_FONT
-	-D_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
 )
 
 # Platform-specific configuration
@@ -78,10 +79,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 	set(SOLARIS TRUE)
 endif()
 
-# EGL
-
-set(ENABLE_EGL OFF)
-
 # Device
 
 if(WIN32)
@@ -91,16 +88,13 @@ elseif(APPLE)
 	add_definitions(-D_IRR_OSX_PLATFORM_)
 	set(DEVICE "OSX")
 elseif(ANDROID)
-	add_definitions(-D_IRR_ANDROID_PLATFORM_ -D_IRR_COMPILE_ANDROID_ASSET_READER_)
+	add_definitions(-D_IRR_ANDROID_PLATFORM_)
 	if(USE_SDL2)
 		message(FATAL_ERROR "SDL2 device is not (yet) supported on Android")
 	endif()
 	set(DEVICE "ANDROID")
-	# EGL is required for Android
-	set(ENABLE_EGL ON)
 elseif(EMSCRIPTEN)
-	add_definitions(-D_IRR_EMSCRIPTEN_PLATFORM_)
-	set(ENABLE_EGL ON)
+	add_definitions(-D_IRR_EMSCRIPTEN_PLATFORM_ -D_IRR_COMPILE_WITH_EGL_MANAGER_)
 	set(LINUX_PLATFORM TRUE)
 	set(DEVICE "SDL")
 elseif(SOLARIS)
@@ -148,7 +142,11 @@ endif()
 
 # OpenGL
 
-option(ENABLE_OPENGL3 "Enable OpenGL 3+" FALSE)
+if(USE_SDL2)
+	option(ENABLE_OPENGL3 "Enable OpenGL 3+" TRUE)
+else()
+	set(ENABLE_OPENGL3 FALSE)
+endif()
 
 if(ANDROID OR EMSCRIPTEN)
 	set(ENABLE_OPENGL FALSE)
@@ -185,7 +183,7 @@ endif()
 if(ENABLE_OPENGL)
 	add_definitions(-D_IRR_COMPILE_WITH_OPENGL_)
 	if(DEVICE STREQUAL "WINDOWS")
-		add_definitions(-D_IRR_OPENGL_USE_EXTPOINTER_)
+		add_definitions(-D_IRR_COMPILE_WITH_WGL_MANAGER_ -D_IRR_OPENGL_USE_EXTPOINTER_)
 	elseif(DEVICE STREQUAL "X11")
 		add_definitions(-D_IRR_COMPILE_WITH_GLX_MANAGER_ -D_IRR_OPENGL_USE_EXTPOINTER_)
 	elseif(DEVICE STREQUAL "OSX")
@@ -209,22 +207,18 @@ if(ENABLE_GLES1)
 	endif()
 	add_definitions(-D_IRR_COMPILE_WITH_OGLES1_)
 	if(DEVICE MATCHES "^(WINDOWS|X11|ANDROID)$")
-		add_definitions(-D_IRR_OGLES1_USE_EXTPOINTER_)
+		add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_ -D_IRR_OGLES1_USE_EXTPOINTER_)
 	endif()
-	# We need EGL for GLES1
-	set(ENABLE_EGL ON)
 endif()
 
 if(ENABLE_GLES2)
 	add_definitions(-D_IRR_COMPILE_WITH_OGLES2_)
 	if(DEVICE MATCHES "^(WINDOWS|X11|ANDROID)$" OR EMSCRIPTEN)
-		add_definitions(-D_IRR_OGLES2_USE_EXTPOINTER_)
+		add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_ -D_IRR_OGLES2_USE_EXTPOINTER_)
 	elseif(DEVICE STREQUAL "SDL")
 		set(USE_SDLGL ON)
 		set(USE_SDLGLES2 ON)
 	endif()
-	# We need EGL for GLES2
-	set(ENABLE_EGL ON)
 endif()
 
 if(ENABLE_WEBGL1)
@@ -252,7 +246,6 @@ elseif (ENABLE_GLES2)
 else()
 	message(STATUS "OpenGL ES 2: OFF")
 endif()
-message(STATUS "EGL: ${ENABLE_EGL}")
 message(STATUS "WebGL: ${ENABLE_WEBGL1}")
 
 # Required libs
@@ -364,21 +357,12 @@ add_library(IRROBJ OBJECT
 set(IRRDRVROBJ
 	CNullDriver.cpp
 	CGLXManager.cpp
+	CWGLManager.cpp
+	CEGLManager.cpp
 	CSDLManager.cpp
 	mt_opengl_loader.cpp
 )
 
-if(WIN32)
-	set(IRRDRVROBJ ${IRRDRVROBJ}
-		CIrrDeviceWin32.cpp
-	)
-	if(ENABLE_OPENGL)
-		set(IRRDRVROBJ ${IRRDRVROBJ}
-			CWGLManager.cpp
-		)
-	endif()
-endif()
-
 if(ENABLE_OPENGL)
 	set(IRRDRVROBJ
 		${IRRDRVROBJ}
@@ -398,14 +382,6 @@ if(ENABLE_GLES1)
 	)
 endif()
 
-
-if(ENABLE_EGL)
-	set(IRRDRVROBJ
-		${IRRDRVROBJ}
-		CEGLManager.cpp
-	)
-endif()
-
 set(IRRIMAGEOBJ
 	CColorConverter.cpp
 	CImage.cpp
@@ -469,6 +445,7 @@ add_library(IRROTHEROBJ OBJECT
 	CIrrDeviceSDL.cpp
 	CIrrDeviceLinux.cpp
 	CIrrDeviceStub.cpp
+	CIrrDeviceWin32.cpp
 	CLogger.cpp
 	COSOperator.cpp
 	Irrlicht.cpp

source/Irrlicht/COBJMeshFileLoader.cpp

@@ -72,8 +72,8 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 
 	const io::path fullName = file->getFileName();
 
-	c8* buf = new c8[filesize];
-	memset(buf, 0, filesize);
+	c8* buf = new c8[filesize+1]; // plus null-terminator
+	memset(buf, 0, filesize+1);
 	file->read((void*)buf, filesize);
 	const c8* const bufEnd = buf+filesize;
 
@@ -100,7 +100,7 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 				c8 name[WORD_BUFFER_LENGTH];
 				bufPtr = goAndCopyNextWord(name, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
 #ifdef _IRR_DEBUG_OBJ_LOADER_
-				os::Printer::log("Reading material file",name);
+				os::Printer::log("Ignoring material file",name);
 #endif
 			}
 		}
@@ -220,19 +220,20 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 				u32 wlength = copyWord(vertexWord, linePtr, WORD_BUFFER_LENGTH, endPtr);
 				// this function will also convert obj's 1-based index to c++'s 0-based index
 				retrieveVertexIndices(vertexWord, Idx, vertexWord+wlength+1, vertexBuffer.size(), textureCoordBuffer.size(), normalsBuffer.size());
-				if ( -1 != Idx[0] && Idx[0] < (irr::s32)vertexBuffer.size() )
+				if ( Idx[0] >= 0 && Idx[0] < (irr::s32)vertexBuffer.size() )
 					v.Pos = vertexBuffer[Idx[0]];
 				else
 				{
 					os::Printer::log("Invalid vertex index in this line", wordBuffer.c_str(), ELL_ERROR);
 					delete [] buf;
+					cleanUp();
 					return 0;
 				}
-				if ( -1 != Idx[1] && Idx[1] < (irr::s32)textureCoordBuffer.size() )
+				if ( Idx[1] >= 0 && Idx[1] < (irr::s32)textureCoordBuffer.size() )
 					v.TCoords = textureCoordBuffer[Idx[1]];
 				else
 					v.TCoords.set(0.0f,0.0f);
-				if ( -1 != Idx[2] && Idx[2] < (irr::s32)normalsBuffer.size() )
+				if ( Idx[2] >= 0 && Idx[2] < (irr::s32)normalsBuffer.size() )
 					v.Normal = normalsBuffer[Idx[2]];
 				else
 				{
@@ -259,6 +260,14 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 				linePtr = goNextWord(linePtr, endPtr);
 			}
 
+			if (faceCorners.size() < 3)
+			{
+				os::Printer::log("Too few vertices in this line", wordBuffer.c_str(), ELL_ERROR);
+				delete [] buf;
+				cleanUp();
+				return 0;
+			}
+
 			// triangulate the face
 			const int c = faceCorners[0];
 			for ( u32 i = 1; i < faceCorners.size() - 1; ++i )
@@ -411,7 +420,7 @@ COBJMeshFileLoader::SObjMtl* COBJMeshFileLoader::findMtl(const core::stringc& mt
 		Materials.getLast()->Group = grpName;
 		return Materials.getLast();
 	}
-	// we found a new group for a non-existant material
+	// we found a new group for a non-existent material
 	else if (grpName.size())
 	{
 		Materials.push_back(new SObjMtl(*Materials[0]));

source/Irrlicht/COGLESDriver.cpp

@@ -775,10 +775,6 @@ void COGLES1Driver::drawVertexPrimitiveList2d3d(const void* vertices, u32 vertex
 		case scene::EPT_TRIANGLES:
 			glDrawElements((LastMaterial.Wireframe)?GL_LINES:(LastMaterial.PointCloud)?GL_POINTS:GL_TRIANGLES, primitiveCount*3, indexSize, indexList);
 			break;
-		case scene::EPT_QUAD_STRIP:
-		case scene::EPT_QUADS:
-		case scene::EPT_POLYGON:
-			break;
 	}
 
 	if (Feature.MaxTextureUnits > 0)

source/Irrlicht/COGLESExtensionHandler.cpp

@@ -13,7 +13,7 @@
 #include "fast_atof.h"
 
 #if defined(_IRR_OGLES1_USE_EXTPOINTER_)
-#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) || defined(_IRR_WINDOWS_API_)
+#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) || defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
 #include <EGL/egl.h>
 #else
 #include <GLES/egl.h>

source/Irrlicht/COSOperator.cpp

@@ -94,7 +94,7 @@ void COSOperator::copyToClipboard(const c8 *text) const
 	EmptyClipboard();
 
 	core::stringw tempbuffer;
-	core::multibyteToWString(tempbuffer, text);
+	core::utf8ToWString(tempbuffer, text);
 	const u32 size = (tempbuffer.size() + 1) * sizeof(wchar_t);
 
 	HGLOBAL clipbuffer;
@@ -164,7 +164,7 @@ const c8* COSOperator::getTextFromClipboard() const
 	HANDLE hData = GetClipboardData( CF_UNICODETEXT );
 	buffer = (wchar_t*) GlobalLock( hData );
 
-	core::wStringToMultibyte(ClipboardBuf, buffer);
+	core::wStringToUTF8(ClipboardBuf, buffer);
 
 	GlobalUnlock( hData );
 	CloseClipboard();

source/Irrlicht/COSOperator.h

@@ -11,7 +11,7 @@ namespace irr
 
 class CIrrDeviceLinux;
 
-//! The Operating system operator provides operation system specific methods and information.
+//! The OSOperator provides OS-specific methods and information.
 class COSOperator : public IOSOperator
 {
 public:
@@ -27,25 +27,31 @@ public:
 	COSOperator(const COSOperator &) = delete;
 	COSOperator &operator=(const COSOperator &) = delete;
 
-	//! returns the current operation system version as string.
+	//! Get the current OS version as string.
 	const core::stringc& getOperatingSystemVersion() const override;
 
-	//! copies text to the clipboard
+	//! Copies text to the clipboard
+	//! \param text: text in utf-8
 	void copyToClipboard(const c8 *text) const override;
 
-	//! copies text to the primary selection
+	//! Copies text to the primary selection
+	//! This is a no-op on some platforms.
+	//! \param text: text in utf-8
 	void copyToPrimarySelection(const c8 *text) const override;
 
-	//! gets text from the clipboard
+	//! Get text from the clipboard
+	//! \return Returns 0 if no string is in there, otherwise an utf-8 string.
 	const c8* getTextFromClipboard() const override;
 
-	//! gets text from the primary selection
+	//! 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.
 	const c8* getTextFromPrimarySelection() const override;
 
-	//! gets the total and available system RAM in kB
-	//! \param Total: will contain the total system memory
-	//! \param Avail: will contain the available memory
-	//! \return Returns true if successful, false if not
+	//! 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 */
 	bool getSystemMemory(u32* Total, u32* Avail) const override;
 
 private:

source/Irrlicht/COpenGLDriver.cpp

@@ -48,7 +48,7 @@ bool COpenGLDriver::initDriver()
 
 	genericDriverInit();
 
-#if defined(_IRR_WINDOWS_API_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_)
 	extGlSwapInterval(Params.Vsync ? 1 : 0);
 #endif
 
@@ -725,7 +725,7 @@ IRenderTarget* COpenGLDriver::addRenderTarget()
 
 
 // small helper function to create vertex buffer object address offsets
-static inline const GLvoid * buffer_offset(const long offset)
+static inline const GLvoid * buffer_offset(const size_t offset)
 {
 	return (const GLvoid *)offset;
 }

source/Irrlicht/COpenGLDriver.h

@@ -443,7 +443,7 @@ namespace video
 		core::matrix4 Matrices[ETS_COUNT];
 		core::array<u8> ColorBuffer;
 
-		//! enumeration for rendering modes such as 2d and 3d for minizing the switching of renderStates.
+		//! enumeration for rendering modes such as 2d and 3d for minimizing the switching of renderStates.
 		enum E_RENDER_MODE
 		{
 			ERM_NONE = 0,	// no render state has been set yet.

source/Irrlicht/COpenGLExtensionHandler.h

@@ -3391,7 +3391,7 @@ inline void COpenGLExtensionHandler::extGlGenerateTextureMipmap(GLuint texture,
 inline void COpenGLExtensionHandler::extGlSwapInterval(int interval)
 {
 	// we have wglext, so try to use that
-#if defined(_IRR_WINDOWS_API_)
+#if defined(_IRR_WINDOWS_API_) && defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
 #ifdef WGL_EXT_swap_control
 	if (pWglSwapIntervalEXT)
 		pWglSwapIntervalEXT(interval);

source/Irrlicht/CSceneManager.cpp

@@ -119,7 +119,7 @@ CSceneManager::~CSceneManager()
 }
 
 
-//! gets an animateable mesh. loads it if needed. returned pointer must not be dropped.
+//! gets an animatable mesh. loads it if needed. returned pointer must not be dropped.
 IAnimatedMesh* CSceneManager::getMesh(io::IReadFile* file)
 {
 	if (!file)

source/Irrlicht/CWGLManager.cpp

@@ -4,6 +4,8 @@
 
 #include "CWGLManager.h"
 
+#ifdef _IRR_COMPILE_WITH_WGL_MANAGER_
+
 #include "os.h"
 
 #include <GL/gl.h>
@@ -505,3 +507,5 @@ bool CWGLManager::swapBuffers()
 
 }
 }
+
+#endif

source/Irrlicht/CWGLManager.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#ifdef _IRR_COMPILE_WITH_WGL_MANAGER_
+
 #include "SIrrCreationParameters.h"
 #include "SExposedVideoData.h"
 #include "IContextManager.h"
@@ -70,3 +72,5 @@ namespace video
 	};
 }
 }
+
+#endif