Cleanup headers in irr/include/ (#15181)

irr/include/EDriverTypes.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "irrTypes.h"
-
 namespace irr
 {
 namespace video

irr/include/IAnimatedMesh.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "aabbox3d.h"
 #include "IMesh.h"
 
 namespace irr

irr/include/IAttributes.h

@@ -7,9 +7,6 @@
 #include "IReferenceCounted.h"
 #include "EAttributes.h"
 
-// not needed here but I can't be bothered to clean the transitive includes up.
-#include "quaternion.h"
-
 namespace irr
 {
 namespace video

irr/include/IGUIElement.h

@@ -10,10 +10,8 @@
 #include "IEventReceiver.h"
 #include "EGUIElementTypes.h"
 #include "EGUIAlignment.h"
-#include "IAttributes.h"
 #include "IGUIEnvironment.h"
 #include <cassert>
-#include <algorithm>
 #include <list>
 #include <vector>
 

irr/include/IGUIEnvironment.h

@@ -7,7 +7,7 @@
 #include "IReferenceCounted.h"
 #include "IGUISkin.h"
 #include "rect.h"
-#include "EFocusFlags.h"
+#include "EFocusFlags.h" // IWYU pragma: export
 #include "IEventReceiver.h"
 #include "path.h"
 

irr/include/IGUIImageList.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "IGUIElement.h"
+#include "IReferenceCounted.h"
 #include "rect.h"
 #include "irrTypes.h"
 

irr/include/IGUITabControl.h

@@ -6,7 +6,6 @@
 
 #include "IGUIElement.h"
 #include "SColor.h"
-#include "IGUISkin.h"
 
 namespace irr
 {

irr/include/IImageLoader.h

@@ -6,9 +6,7 @@
 
 #include "IReferenceCounted.h"
 #include "IImage.h"
-#include "ITexture.h"
 #include "path.h"
-#include "irrArray.h"
 
 namespace irr
 {

irr/include/IImageWriter.h

@@ -5,8 +5,7 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "irrString.h"
-#include "coreutil.h"
+#include "path.h"
 
 namespace irr
 {

irr/include/IIndexBuffer.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "irrArray.h"
 #include "EHardwareBufferFlags.h"
 #include "EPrimitiveTypes.h"
 #include "SVertexIndex.h"

irr/include/IMaterialRendererServices.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include "SMaterial.h"
-#include "S3DVertex.h"
 
 namespace irr
 {

irr/include/IMeshManipulator.h

@@ -7,7 +7,6 @@
 #include "IReferenceCounted.h"
 #include "vector3d.h"
 #include "aabbox3d.h"
-#include "matrix4.h"
 #include "IAnimatedMesh.h"
 #include "IMeshBuffer.h"
 #include "SVertexManipulator.h"

irr/include/IReadFile.h

@@ -5,8 +5,8 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "coreutil.h"
 #include "EReadFileType.h"
+#include "path.h"
 
 namespace irr
 {

irr/include/ISceneManager.h

@@ -6,13 +6,11 @@
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
-#include "irrString.h"
-#include "path.h"
 #include "vector3d.h"
 #include "dimension2d.h"
 #include "SColor.h"
 #include "ESceneNodeTypes.h"
-#include "SceneParameters.h"
+#include "SceneParameters.h" // IWYU pragma: export
 #include "ISkinnedMesh.h"
 
 namespace irr

irr/include/ISceneNode.h

@@ -9,14 +9,13 @@
 #include "ECullingTypes.h"
 #include "EDebugSceneTypes.h"
 #include "SMaterial.h"
-#include "irrString.h"
 #include "irrArray.h"
 #include "aabbox3d.h"
 #include "matrix4.h"
-#include "IAttributes.h"
 
 #include <list>
 #include <optional>
+#include <string>
 
 namespace irr
 {

irr/include/ISkinnedMesh.h

@@ -5,11 +5,12 @@
 #pragma once
 
 #include "irrArray.h"
-#include "IBoneSceneNode.h"
 #include "IAnimatedMesh.h"
 #include "SSkinMeshBuffer.h"
+#include "quaternion.h"
 
 #include <optional>
+#include <string>
 
 namespace irr
 {

irr/include/ITexture.h

@@ -5,11 +5,10 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "IImage.h"
+#include "SColor.h"
 #include "dimension2d.h"
 #include "EDriverTypes.h"
 #include "path.h"
-#include "matrix4.h"
 
 namespace irr
 {

irr/include/IVertexBuffer.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include "IReferenceCounted.h"
-#include "irrArray.h"
 #include "EHardwareBufferFlags.h"
 #include "S3DVertex.h"
 

irr/include/IVideoDriver.h

@@ -6,6 +6,7 @@
 
 #include "rect.h"
 #include "SColor.h"
+#include "IImage.h"
 #include "ITexture.h"
 #include "irrArray.h"
 #include "matrix4.h"

irr/include/SMaterial.h

@@ -7,8 +7,8 @@
 #include "SColor.h"
 #include "matrix4.h"
 #include "irrMath.h"
-#include "EMaterialTypes.h"
-#include "EMaterialProps.h"
+#include "EMaterialTypes.h" // IWYU pragma: export
+#include "EMaterialProps.h" // IWYU pragma: export
 #include "SMaterialLayer.h"
 #include "IrrCompileConfig.h" // for IRRLICHT_API
 

irr/include/SMeshBuffer.h

@@ -3,4 +3,4 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 // replaced by template
-#include "CMeshBuffer.h"
+#include "CMeshBuffer.h" // IWYU pragma: export

irr/include/SSkinMeshBuffer.h

@@ -8,7 +8,6 @@
 #include "CVertexBuffer.h"
 #include "CIndexBuffer.h"
 #include "S3DVertex.h"
-#include "irrArray.h"
 
 namespace irr
 {

irr/include/SVertexIndex.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "irrTypes.h"
-
 namespace irr
 {
 namespace video

irr/include/SVertexManipulator.h

@@ -4,9 +4,7 @@
 
 #pragma once
 
-#include "matrix4.h"
-#include "S3DVertex.h"
-#include "SColor.h"
+#include "vector3d.h"
 
 namespace irr
 {

irr/include/coreutil.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "irrString.h"
 #include "path.h"
 
 namespace irr

irr/include/fast_atof.h

@@ -4,8 +4,10 @@
 
 #pragma once
 
-#include "irrMath.h"
-#include "irrString.h"
+#include "irrTypes.h"
+#include <cfloat>
+#include <climits>
+#include <cmath>
 
 namespace irr
 {
@@ -305,7 +307,7 @@ inline const char *fast_atof_move(const char *in, f32 &result)
 		if (numDecimals < IRR_ATOF_TABLE_SIZE) {
 			value += decimal * fast_atof_table[numDecimals];
 		} else {
-			value += decimal * (f32)pow(10.f, -(float)numDecimals);
+			value += decimal * std::pow(10.f, -(float)numDecimals);
 		}
 		in = afterDecimal;
 	}
@@ -316,7 +318,7 @@ inline const char *fast_atof_move(const char *in, f32 &result)
 		// strtol10() will deal with both + and - signs,
 		// but calculate as f32 to prevent overflow at FLT_MAX
 		// Using pow with float cast instead of powf as otherwise accuracy decreases.
-		value *= (f32)pow(10.f, (f32)strtol10(in, &in));
+		value *= std::pow(10.f, (f32)strtol10(in, &in));
 	}
 
 	result = negative ? -value : value;

irr/include/irrArray.h

@@ -155,7 +155,7 @@ public:
 	}
 
 	//! Assignment operator
-	const array<T> &operator=(const array<T> &other)
+	array<T> &operator=(const array<T> &other)
 	{
 		if (this == &other)
 			return *this;

irr/include/irrlicht.h

@@ -28,106 +28,12 @@
 
 #pragma once
 
-#include "aabbox3d.h"
-#include "CMeshBuffer.h"
-#include "coreutil.h"
-#include "dimension2d.h"
-#include "ECullingTypes.h"
-#include "EDebugSceneTypes.h"
-#include "EDriverFeatures.h"
-#include "EDriverTypes.h"
-#include "EGUIAlignment.h"
-#include "EGUIElementTypes.h"
-#include "EHardwareBufferFlags.h"
-#include "EMaterialProps.h"
-#include "EMaterialTypes.h"
-#include "ESceneNodeTypes.h"
-#include "fast_atof.h"
-#include "IAnimatedMesh.h"
-#include "IAnimatedMeshSceneNode.h"
-#include "IAttributes.h"
-#include "IBillboardSceneNode.h"
-#include "IBoneSceneNode.h"
-#include "ICameraSceneNode.h"
-#include "IContextManager.h"
-#include "ICursorControl.h"
-#include "IDummyTransformationSceneNode.h"
-#include "IEventReceiver.h"
-#include "IFileList.h"
-#include "IFileSystem.h"
-#include "IGPUProgrammingServices.h"
-#include "IGUIButton.h"
-#include "IGUICheckBox.h"
-#include "IGUIComboBox.h"
-#include "IGUIEditBox.h"
-#include "IGUIElement.h"
-#include "IGUIEnvironment.h"
-#include "IGUIFileOpenDialog.h"
-#include "IGUIFont.h"
-#include "IGUIFontBitmap.h"
-#include "IGUIImage.h"
-#include "IGUIListBox.h"
-#include "IGUIScrollBar.h"
-#include "IGUISkin.h"
-#include "IGUISpriteBank.h"
-#include "IGUIStaticText.h"
-#include "IGUITabControl.h"
-#include "IGUIToolbar.h"
-#include "IImage.h"
-#include "IImageLoader.h"
-#include "IImageWriter.h"
-#include "IIndexBuffer.h"
-#include "ILogger.h"
-#include "IMaterialRenderer.h"
-#include "IMaterialRendererServices.h"
-#include "IMesh.h"
-#include "IMeshBuffer.h"
-#include "IMeshCache.h"
-#include "IMeshLoader.h"
-#include "IMeshManipulator.h"
-#include "IMeshSceneNode.h"
-#include "IOSOperator.h"
-#include "IReadFile.h"
-#include "IReferenceCounted.h"
-#include "irrArray.h"
-#include "IRenderTarget.h"
 #include "IrrlichtDevice.h"
-#include "irrMath.h"
-#include "irrString.h"
+#include "dimension2d.h"
+#include "EDriverTypes.h"
+#include "IEventReceiver.h"
 #include "irrTypes.h"
-#include "path.h"
-#include "ISceneCollisionManager.h"
-#include "ISceneManager.h"
-#include "ISceneNode.h"
-#include "IShaderConstantSetCallBack.h"
-#include "ISkinnedMesh.h"
-#include "ITexture.h"
-#include "ITimer.h"
-#include "IVertexBuffer.h"
-#include "IVideoDriver.h"
-#include "IWriteFile.h"
-#include "Keycodes.h"
-#include "line2d.h"
-#include "line3d.h"
-#include "matrix4.h"
-#include "plane3d.h"
-#include "position2d.h"
-#include "quaternion.h"
-#include "rect.h"
-#include "S3DVertex.h"
-#include "SAnimatedMesh.h"
-#include "SceneParameters.h"
-#include "SColor.h"
-#include "SExposedVideoData.h"
 #include "SIrrCreationParameters.h"
-#include "SMaterial.h"
-#include "SMesh.h"
-#include "SMeshBuffer.h"
-#include "SSkinMeshBuffer.h"
-#include "SVertexIndex.h"
-#include "SViewFrustum.h"
-#include "vector2d.h"
-#include "vector3d.h"
 #include "IrrCompileConfig.h" // for IRRLICHT_API and IRRCALLCONV
 
 /*! \mainpage Irrlicht Engine 1.9 API documentation
@@ -166,6 +72,8 @@
  *
  * \code
  * #include <irrlicht.h>
+ * // include a bunch of other stuff...
+ *
  * using namespace irr;
  *
  * int main()
@@ -241,8 +149,6 @@
  * a look into the examples directory of the SDK.
  */
 
-#include "SIrrCreationParameters.h"
-
 //! Everything in the Irrlicht Engine can be found in this namespace.
 namespace irr
 {
@@ -314,5 +220,5 @@ namespace video
 }
 
 /*! \file irrlicht.h
-	\brief Main header file of the irrlicht, the only file needed to include.
+	\brief Main header file of the irrlicht, needed to create a device.
 */

irr/include/mt_opengl.h

@@ -6,7 +6,6 @@
 #include <string>
 #include <unordered_set>
 #include "IrrCompileConfig.h" // for IRRLICHT_API
-#include "irrTypes.h"
 #include "IContextManager.h"
 #include <KHR/khrplatform.h>
 

irr/include/quaternion.h

@@ -277,7 +277,8 @@ inline quaternion &quaternion::operator=(const matrix4 &m)
 		}
 	}
 
-	return normalize();
+	normalize();
+	return *this;
 }
 #endif