Remove irr namespace (#16309)

irr/include/CIndexBuffer.h

@@ -14,8 +14,6 @@
 #include "../src/os.h"
 #endif
 
-namespace irr
-{
 namespace scene
 {
 //! Template implementation of the IIndexBuffer interface
@@ -95,4 +93,3 @@ public:
 typedef CIndexBuffer<u16> SIndexBuffer;
 
 } // end namespace scene
-} // end namespace irr

irr/include/CMeshBuffer.h

@@ -9,8 +9,6 @@
 #include "CVertexBuffer.h"
 #include "CIndexBuffer.h"
 
-namespace irr
-{
 namespace scene
 {
 //! Template implementation of the IMeshBuffer interface
@@ -87,7 +85,7 @@ public:
 	{
 		if (Vertices->getCount()) {
 			BoundingBox.reset(Vertices->getPosition(0));
-			const irr::u32 vsize = Vertices->getCount();
+			const u32 vsize = Vertices->getCount();
 			for (u32 i = 1; i < vsize; ++i)
 				BoundingBox.addInternalPoint(Vertices->getPosition(i));
 		} else
@@ -146,4 +144,3 @@ typedef CMeshBuffer<video::S3DVertex2TCoords> SMeshBufferLightMap;
 //! Meshbuffer with vertices having tangents stored, e.g. for normal mapping
 typedef CMeshBuffer<video::S3DVertexTangents> SMeshBufferTangents;
 } // end namespace scene
-} // end namespace irr

irr/include/CVertexBuffer.h

@@ -14,8 +14,6 @@
 #include "../src/os.h"
 #endif
 
-namespace irr
-{
 namespace scene
 {
 //! Template implementation of the IVertexBuffer interface
@@ -128,4 +126,3 @@ typedef CVertexBuffer<video::S3DVertex2TCoords> SVertexBufferLightMap;
 typedef CVertexBuffer<video::S3DVertexTangents> SVertexBufferTangents;
 
 } // end namespace scene
-} // end namespace irr

irr/include/ECullingTypes.h

@@ -6,8 +6,6 @@
 
 #include "irrTypes.h"
 
-namespace irr
-{
 namespace scene
 {
 
@@ -32,4 +30,3 @@ const c8 *const AutomaticCullingNames[] = {
 	};
 
 } // end namespace scene
-} // end namespace irr

irr/include/EDebugSceneTypes.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-namespace irr
-{
 namespace scene
 {
 
@@ -38,4 +36,3 @@ enum E_DEBUG_SCENE_TYPE
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/EDeviceTypes.h

@@ -4,9 +4,6 @@
 
 #pragma once
 
-namespace irr
-{
-
 //! An enum for the different device types supported by the Irrlicht Engine.
 enum E_DEVICE_TYPE
 {
@@ -42,5 +39,3 @@ enum E_DEVICE_TYPE
 	May support hw-acceleration via OpenGL-ES */
 	EIDT_ANDROID,
 };
-
-} // end namespace irr

irr/include/EDriverFeatures.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-namespace irr
-{
 namespace video
 {
 
@@ -140,4 +138,3 @@ enum E_VIDEO_DRIVER_FEATURE
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/EDriverTypes.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-namespace irr
-{
 namespace video
 {
 
@@ -36,4 +34,3 @@ enum E_DRIVER_TYPE
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/EFocusFlags.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-namespace irr
-{
 namespace gui
 {
 
@@ -31,4 +29,3 @@ enum EFOCUS_FLAG
 };
 
 } // namespace gui
-} // namespace irr

irr/include/EGUIAlignment.h

@@ -6,8 +6,6 @@
 
 #include "irrTypes.h"
 
-namespace irr
-{
 namespace gui
 {
 enum EGUI_ALIGNMENT
@@ -32,4 +30,3 @@ const c8 *const GUIAlignmentNames[] = {
 	};
 
 } // namespace gui
-} // namespace irr

irr/include/EGUIElementTypes.h

@@ -6,8 +6,6 @@
 
 #include "irrTypes.h"
 
-namespace irr
-{
 namespace gui
 {
 
@@ -72,4 +70,3 @@ enum EGUI_ELEMENT_TYPE
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/EHardwareBufferFlags.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-namespace irr
-{
 namespace scene
 {
 
@@ -37,4 +35,3 @@ enum E_BUFFER_TYPE
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/EMaterialProps.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-namespace irr
-{
 namespace video
 {
 
@@ -67,4 +65,3 @@ enum E_MATERIAL_PROP
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/EMaterialTypes.h

@@ -6,8 +6,6 @@
 
 #include "irrTypes.h"
 
-namespace irr
-{
 namespace video
 {
 
@@ -71,4 +69,3 @@ constexpr u32 numBuiltInMaterials =
 		sizeof(sBuiltInMaterialTypeNames) / sizeof(char *) - 1;
 
 } // end namespace video
-} // end namespace irr

irr/include/EPrimitiveTypes.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-namespace irr
-{
 namespace scene
 {
 
@@ -40,4 +38,3 @@ enum E_PRIMITIVE_TYPE
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/EReadFileType.h

@@ -6,8 +6,6 @@
 
 #include "irrTypes.h"
 
-namespace irr
-{
 namespace io
 {
 
@@ -27,4 +25,3 @@ enum EREAD_FILE_TYPE
 	EFIT_UNKNOWN = MAKE_IRR_ID('u', 'n', 'k', 'n')
 };
 } // end namespace io
-} // end namespace irr

irr/include/ESceneNodeTypes.h

@@ -6,8 +6,6 @@
 
 #include "irrTypes.h"
 
-namespace irr
-{
 namespace scene
 {
 
@@ -46,4 +44,3 @@ enum ESCENE_NODE_TYPE
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/EVertexAttributes.h

@@ -1,7 +1,5 @@
 #pragma once
 
-namespace irr
-{
 namespace video
 {
 
@@ -31,4 +29,3 @@ const char *const sBuiltInVertexAttributeNames[] = {
 	};
 
 } // end namespace video
-} // end namespace irr

irr/include/EVideoTypes.h

@@ -6,7 +6,7 @@
 
 #include "SMaterial.h" // MATERIAL_MAX_TEXTURES
 
-namespace irr::video
+namespace video
 {
 
 //! enumeration for geometry transformation states
@@ -71,5 +71,5 @@ enum E_FOG_TYPE
 	EFT_FOG_EXP2
 };
 
-} // irr::video
+} // end namespace video
 

irr/include/IAnimatedMesh.h

@@ -6,14 +6,12 @@
 
 #include "IMesh.h"
 
-namespace irr
-{
 namespace scene
 {
 //! Interface for an animated mesh.
 /** There are already simple implementations of this interface available so
 you don't have to implement this interface on your own if you need to:
-You might want to use irr::scene::SMesh, irr::scene::SMeshBuffer etc.
+You might want to use scene::SMesh, scene::SMeshBuffer etc.
 */
 class IAnimatedMesh : public IMesh
 {
@@ -39,4 +37,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IAnimatedMeshSceneNode.h

@@ -8,8 +8,6 @@
 #include "IBoneSceneNode.h"
 #include "IAnimatedMesh.h"
 
-namespace irr
-{
 namespace scene
 {
 class IAnimatedMeshSceneNode;
@@ -133,4 +131,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IBillboardSceneNode.h

@@ -6,8 +6,6 @@
 
 #include "ISceneNode.h"
 
-namespace irr
-{
 namespace scene
 {
 class ICameraSceneNode;
@@ -72,7 +70,7 @@ public:
 		So we don't know the real boundingboxes before that. Which would be too late for culling.
 		That is why the usual getBoundingBox will return a "safe" boundingbox which is guaranteed
 		to contain the billboard. While this function can return the real one. */
-	virtual const core::aabbox3d<f32> &getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode *camera) = 0;
+	virtual const core::aabbox3d<f32> &getTransformedBillboardBoundingBox(const scene::ICameraSceneNode *camera) = 0;
 
 	//! Get the amount of mesh buffers.
 	/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
@@ -87,4 +85,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IBoneSceneNode.h

@@ -6,8 +6,6 @@
 
 #include "ISceneNode.h"
 
-namespace irr
-{
 namespace scene
 {
 
@@ -49,4 +47,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/ICameraSceneNode.h

@@ -7,8 +7,6 @@
 #include "ISceneNode.h"
 #include "IEventReceiver.h"
 
-namespace irr
-{
 namespace scene
 {
 struct SViewFrustum;
@@ -181,4 +179,3 @@ protected:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IContextManager.h

@@ -8,8 +8,6 @@
 #include "SIrrCreationParameters.h"
 #include <string>
 
-namespace irr
-{
 namespace video
 {
 // For system specific window contexts (used for OpenGL)
@@ -43,7 +41,7 @@ public:
 	/** This is mostly used internally by IVideoDriver::beginScene().
 		But if you want to switch threads which access your OpenGL driver you will have to
 		call this function as follows:
-		Old thread gives up context with: activateContext(irr::video::SExposedVideoData());
+		Old thread gives up context with: activateContext(video::SExposedVideoData());
 		New thread takes over context with: activateContext(videoDriver->getExposedVideoData());
 		Note that only 1 thread at a time may access an OpenGL context.	*/
 	virtual bool activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero = false) = 0;
@@ -56,4 +54,3 @@ public:
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/ICursorControl.h

@@ -8,8 +8,6 @@
 #include "position2d.h"
 #include "rect.h"
 
-namespace irr
-{
 namespace gui
 {
 
@@ -192,4 +190,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IDummyTransformationSceneNode.h

@@ -6,8 +6,6 @@
 
 #include "ISceneNode.h"
 
-namespace irr
-{
 namespace scene
 {
 
@@ -33,4 +31,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IEventReceiver.h

@@ -8,8 +8,6 @@
 #include "Keycodes.h"
 #include "irrString.h"
 
-namespace irr
-{
 //! Enumeration for all event types there are.
 enum EEVENT_TYPE
 {
@@ -297,7 +295,7 @@ enum EGUI_EVENT_TYPE
 };
 } // end namespace gui
 
-//! SEvents hold information about an event. See irr::IEventReceiver for details on event handling.
+//! SEvents hold information about an event. See IEventReceiver for details on event handling.
 struct SEvent
 {
 	//! Any kind of GUI event.
@@ -444,7 +442,7 @@ struct SEvent
 	/** Unlike other events, joystick events represent the result of polling
 	 * each connected joystick once per run() of the device. Joystick events will
 	 * not be generated by default.  If joystick support is available for the
-	 * active device, and @ref irr::IrrlichtDevice::activateJoysticks() has been
+	 * active device, and @ref IrrlichtDevice::activateJoysticks() has been
 	 * called, an event of this type will be generated once per joystick per
 	 * @ref IrrlichtDevice::run() regardless of whether the state of the joystick
 	 * has actually changed. */
@@ -553,7 +551,7 @@ struct SEvent
 /** Many of the engine's classes inherit IEventReceiver so they are able to
 process events. Events usually start at a postEventFromUser function and are
 passed down through a chain of event receivers until OnEvent returns true. See
-irr::EEVENT_TYPE for a description of where each type of event starts, and the
+EEVENT_TYPE for a description of where each type of event starts, and the
 path it takes through the system. */
 class IEventReceiver
 {
@@ -570,13 +568,13 @@ public:
 	virtual bool OnEvent(const SEvent &event) = 0;
 };
 
-//! Information on a joystick, returned from @ref irr::IrrlichtDevice::activateJoysticks()
+//! Information on a joystick, returned from @ref IrrlichtDevice::activateJoysticks()
 struct SJoystickInfo
 {
 	//! The ID of the joystick
 	/** This is an internal Irrlicht index; it does not map directly
 	 * to any particular hardware joystick. It corresponds to the
-	 * irr::SJoystickEvent Joystick ID. */
+	 * SJoystickEvent Joystick ID. */
 	u8 Joystick;
 
 	//! The name that the joystick uses to identify itself.
@@ -605,5 +603,3 @@ struct SJoystickInfo
 		POV_HAT_UNKNOWN
 	} PovHat;
 }; // struct SJoystickInfo
-
-} // end namespace irr

irr/include/IFileArchive.h

@@ -7,9 +7,6 @@
 #include "IReadFile.h"
 #include "IFileList.h"
 
-namespace irr
-{
-
 namespace io
 {
 
@@ -111,4 +108,3 @@ public:
 };
 
 } // end namespace io
-} // end namespace irr

irr/include/IFileList.h

@@ -7,8 +7,6 @@
 #include "IReferenceCounted.h"
 #include "path.h"
 
-namespace irr
-{
 namespace io
 {
 
@@ -85,5 +83,4 @@ public:
 	virtual void sort() = 0;
 };
 
-} // end namespace irr
 } // end namespace io

irr/include/IFileSystem.h

@@ -7,8 +7,6 @@
 #include "IReferenceCounted.h"
 #include "IFileArchive.h"
 
-namespace irr
-{
 namespace video
 {
 class IVideoDriver;
@@ -154,4 +152,3 @@ public:
 };
 
 } // end namespace io
-} // end namespace irr

irr/include/IGPUProgrammingServices.h

@@ -8,9 +8,6 @@
 #include "EPrimitiveTypes.h"
 #include "path.h"
 
-namespace irr
-{
-
 namespace io
 {
 class IReadFile;
@@ -141,4 +138,3 @@ public:
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/IGUIButton.h

@@ -7,9 +7,6 @@
 #include "IGUIElement.h"
 #include "SColor.h"
 
-namespace irr
-{
-
 namespace video
 {
 class ITexture;
@@ -254,4 +251,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUICheckBox.h

@@ -6,8 +6,6 @@
 
 #include "IGUIElement.h"
 
-namespace irr
-{
 namespace gui
 {
 
@@ -44,4 +42,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIComboBox.h

@@ -6,8 +6,6 @@
 
 #include "IGUIElement.h"
 
-namespace irr
-{
 namespace gui
 {
 
@@ -69,4 +67,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIEditBox.h

@@ -7,8 +7,6 @@
 #include "IGUIElement.h"
 #include "SColor.h"
 
-namespace irr
-{
 namespace gui
 {
 class IGUIFont;
@@ -141,11 +139,10 @@ public:
 
 	//! Set the blinktime for the cursor. 2x blinktime is one full cycle.
 	//** \param timeMs Blinktime in milliseconds. When set to 0 the cursor is constantly on without blinking */
-	virtual void setCursorBlinkTime(irr::u32 timeMs) = 0;
+	virtual void setCursorBlinkTime(u32 timeMs) = 0;
 
 	//! Get the cursor blinktime
-	virtual irr::u32 getCursorBlinkTime() const = 0;
+	virtual u32 getCursorBlinkTime() const = 0;
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIElement.h

@@ -14,8 +14,6 @@
 #include <list>
 #include <vector>
 
-namespace irr
-{
 namespace gui
 {
 class IGUIEnvironment;
@@ -926,4 +924,3 @@ protected:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIEnvironment.h

@@ -11,8 +11,6 @@
 #include "IEventReceiver.h"
 #include "path.h"
 
-namespace irr
-{
 class IOSOperator;
 class IEventReceiver;
 
@@ -403,4 +401,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIFileOpenDialog.h

@@ -7,8 +7,6 @@
 #include "IGUIElement.h"
 #include "path.h"
 
-namespace irr
-{
 namespace gui
 {
 
@@ -41,4 +39,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIFont.h

@@ -9,8 +9,6 @@
 #include "rect.h"
 #include "irrString.h"
 
-namespace irr
-{
 namespace gui
 {
 
@@ -93,4 +91,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIFontBitmap.h

@@ -6,8 +6,6 @@
 
 #include "IGUIFont.h"
 
-namespace irr
-{
 namespace gui
 {
 class IGUISpriteBank;
@@ -27,4 +25,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIImage.h

@@ -7,8 +7,6 @@
 #include "IGUIElement.h"
 #include "SColor.h"
 
-namespace irr
-{
 namespace video
 {
 class ITexture;
@@ -80,4 +78,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIImageList.h

@@ -7,8 +7,6 @@
 #include "rect.h"
 #include "irrTypes.h"
 
-namespace irr
-{
 namespace gui
 {
 
@@ -37,4 +35,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIListBox.h

@@ -7,8 +7,6 @@
 #include "IGUIElement.h"
 #include "SColor.h"
 
-namespace irr
-{
 namespace gui
 {
 class IGUISpriteBank;
@@ -133,4 +131,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIScrollBar.h

@@ -6,8 +6,6 @@
 
 #include "IGUIElement.h"
 
-namespace irr
-{
 namespace gui
 {
 
@@ -56,4 +54,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUISkin.h

@@ -9,8 +9,6 @@
 #include "SColor.h"
 #include "rect.h"
 
-namespace irr
-{
 namespace gui
 {
 class IGUIFont;
@@ -537,4 +535,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUISpriteBank.h

@@ -9,9 +9,6 @@
 #include "SColor.h"
 #include "rect.h"
 
-namespace irr
-{
-
 namespace video
 {
 class ITexture;
@@ -135,4 +132,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIStaticText.h

@@ -7,8 +7,6 @@
 #include "IGUIElement.h"
 #include "SColor.h"
 
-namespace irr
-{
 namespace gui
 {
 class IGUIFont;
@@ -130,4 +128,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUITabControl.h

@@ -7,8 +7,6 @@
 #include "IGUIElement.h"
 #include "SColor.h"
 
-namespace irr
-{
 namespace gui
 {
 class IGUITab;
@@ -145,4 +143,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IGUIToolbar.h

@@ -6,8 +6,6 @@
 
 #include "IGUIElement.h"
 
-namespace irr
-{
 namespace video
 {
 class ITexture;
@@ -31,4 +29,3 @@ public:
 };
 
 } // end namespace gui
-} // end namespace irr

irr/include/IImage.h

@@ -10,8 +10,6 @@
 #include "SColor.h"
 #include <cstring>
 
-namespace irr
-{
 namespace video
 {
 
@@ -332,4 +330,3 @@ protected:
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/IImageLoader.h

@@ -8,8 +8,6 @@
 #include "IImage.h"
 #include "path.h"
 
-namespace irr
-{
 namespace io
 {
 class IReadFile;
@@ -44,4 +42,3 @@ public:
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/IImageWriter.h

@@ -7,8 +7,6 @@
 #include "IReferenceCounted.h"
 #include "path.h"
 
-namespace irr
-{
 namespace io
 {
 class IWriteFile;
@@ -36,4 +34,3 @@ public:
 };
 
 } // namespace video
-} // namespace irr

irr/include/IIndexBuffer.h

@@ -9,9 +9,6 @@
 #include "EPrimitiveTypes.h"
 #include "SVertexIndex.h"
 
-namespace irr
-{
-
 namespace scene
 {
 
@@ -78,4 +75,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/ILogger.h

@@ -6,9 +6,6 @@
 
 #include "IReferenceCounted.h"
 
-namespace irr
-{
-
 //! Possible log levels.
 //! When used has filter ELL_DEBUG means => log everything and ELL_NONE means => log (nearly) nothing.
 //! When used to print logging information ELL_DEBUG will have lowest priority while ELL_NONE
@@ -71,5 +68,3 @@ public:
 	independent on what level filter is set, use ELL_NONE. */
 	virtual void log(const c8 *text, const c8 *hint, ELOG_LEVEL ll = ELL_INFORMATION) = 0;
 };
-
-} // end namespace

irr/include/IMaterialRenderer.h

@@ -8,8 +8,6 @@
 #include "SMaterial.h"
 #include "S3DVertex.h"
 
-namespace irr
-{
 namespace video
 {
 
@@ -98,4 +96,3 @@ public:
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/IMaterialRendererServices.h

@@ -6,8 +6,6 @@
 
 #include "SMaterial.h"
 
-namespace irr
-{
 namespace video
 {
 
@@ -76,4 +74,3 @@ public:
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/IMemoryReadFile.h

@@ -6,8 +6,6 @@
 
 #include "IReadFile.h"
 
-namespace irr
-{
 namespace io
 {
 
@@ -24,4 +22,3 @@ public:
 	virtual const void *getBuffer() const = 0;
 };
 } // end namespace io
-} // end namespace irr

irr/include/IMesh.h

@@ -8,8 +8,6 @@
 #include "SMaterial.h"
 #include "EHardwareBufferFlags.h"
 
-namespace irr
-{
 namespace scene
 {
 //! Possible types of meshes.
@@ -97,4 +95,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IMeshBuffer.h

@@ -13,8 +13,6 @@
 #include "EPrimitiveTypes.h"
 #include <cassert>
 
-namespace irr
-{
 namespace scene
 {
 //! Struct for holding a mesh with a single material.
@@ -241,4 +239,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IMeshCache.h

@@ -7,9 +7,6 @@
 #include "IReferenceCounted.h"
 #include "path.h"
 
-namespace irr
-{
-
 namespace scene
 {
 class IMesh;
@@ -128,4 +125,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IMeshLoader.h

@@ -7,8 +7,6 @@
 #include "IReferenceCounted.h"
 #include "path.h"
 
-namespace irr
-{
 namespace io
 {
 class IReadFile;
@@ -47,4 +45,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IMeshManipulator.h

@@ -11,8 +11,6 @@
 #include "IMeshBuffer.h"
 #include "SVertexManipulator.h"
 
-namespace irr
-{
 namespace scene
 {
 
@@ -146,4 +144,3 @@ protected:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IMeshSceneNode.h

@@ -6,8 +6,6 @@
 
 #include "ISceneNode.h"
 
-namespace irr
-{
 namespace scene
 {
 
@@ -47,4 +45,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IOSOperator.h

@@ -7,9 +7,6 @@
 #include "IReferenceCounted.h"
 #include "irrString.h"
 
-namespace irr
-{
-
 //! The OSOperator provides OS-specific methods and information.
 class IOSOperator : public virtual IReferenceCounted
 {
@@ -41,5 +38,3 @@ public:
 	\return True if successful, false if not */
 	virtual bool getSystemMemory(u32 *totalBytes, u32 *availableBytes) const = 0;
 };
-
-} // end namespace

irr/include/IReadFile.h

@@ -8,8 +8,6 @@
 #include "EReadFileType.h"
 #include "path.h"
 
-namespace irr
-{
 namespace io
 {
 
@@ -54,4 +52,3 @@ public:
 IReadFile *createLimitReadFile(const io::path &fileName, IReadFile *alreadyOpenedFile, long pos, long areaSize);
 
 } // end namespace io
-} // end namespace irr

irr/include/IReferenceCounted.h

@@ -7,9 +7,6 @@
 #include "irrTypes.h"
 #include <cassert>
 
-namespace irr
-{
-
 //! Base class of most objects of the Irrlicht Engine.
 /** This class provides reference counting through the methods grab() and drop().
 It also is able to store a debug string for every instance of an object.
@@ -142,5 +139,3 @@ private:
 	//! The reference counter. Mutable to do reference counting on const objects.
 	mutable s32 ReferenceCounter;
 };
-
-} // end namespace irr

irr/include/IRenderTarget.h

@@ -8,8 +8,6 @@
 #include "EDriverTypes.h"
 #include "irrArray.h"
 
-namespace irr
-{
 namespace video
 {
 class ITexture;
@@ -112,4 +110,3 @@ protected:
 };
 
 }
-}

irr/include/ISceneCollisionManager.h

@@ -8,9 +8,6 @@
 #include "position2d.h"
 #include "line3d.h"
 
-namespace irr
-{
-
 namespace scene
 {
 class ICameraSceneNode;
@@ -30,4 +27,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/ISceneManager.h

@@ -11,8 +11,6 @@
 #include "SColor.h"
 #include "ESceneNodeTypes.h"
 
-namespace irr
-{
 struct SKeyMap;
 struct SEvent;
 
@@ -433,4 +431,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/ISceneNode.h

@@ -18,8 +18,6 @@
 #include <string>
 #include <cassert>
 
-namespace irr
-{
 namespace scene
 {
 class ISceneNode;
@@ -417,7 +415,7 @@ public:
 	}
 
 	//! Sets if debug data like bounding boxes should be drawn.
-	/** A bitwise OR of the types from @ref irr::scene::E_DEBUG_SCENE_TYPE.
+	/** A bitwise OR of the types from @ref scene::E_DEBUG_SCENE_TYPE.
 	Please note that not all scene nodes support all debug data types.
 	\param state The debug data visibility state to be used. */
 	virtual void setDebugDataVisible(u16 state)
@@ -427,7 +425,7 @@ public:
 
 	//! Returns if debug data like bounding boxes are drawn.
 	/** \return A bitwise OR of the debug data values from
-	@ref irr::scene::E_DEBUG_SCENE_TYPE that are currently visible. */
+	@ref scene::E_DEBUG_SCENE_TYPE that are currently visible. */
 	u16 isDebugDataVisible() const
 	{
 		return DebugDataVisible;
@@ -595,4 +593,3 @@ protected:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IShaderConstantSetCallBack.h

@@ -6,8 +6,6 @@
 
 #include "IReferenceCounted.h"
 
-namespace irr
-{
 namespace video
 {
 class IMaterialRendererServices;
@@ -76,4 +74,3 @@ public:
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/ITexture.h

@@ -10,8 +10,6 @@
 #include "EDriverTypes.h"
 #include "path.h"
 
-namespace irr
-{
 namespace video
 {
 
@@ -292,4 +290,3 @@ protected:
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/ITimer.h

@@ -6,9 +6,6 @@
 
 #include "IReferenceCounted.h"
 
-namespace irr
-{
-
 //! Interface for getting and manipulating the virtual time
 class ITimer : public virtual IReferenceCounted
 {
@@ -61,5 +58,3 @@ public:
 	but you can call it manually if you don't use this method. */
 	virtual void tick() = 0;
 };
-
-} // end namespace irr

irr/include/IVertexBuffer.h

@@ -8,8 +8,6 @@
 #include "EHardwareBufferFlags.h"
 #include "S3DVertex.h"
 
-namespace irr
-{
 namespace scene
 {
 
@@ -71,4 +69,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/IVideoDriver.h

@@ -21,8 +21,6 @@
 #include "S3DVertex.h" // E_VERTEX_TYPE
 #include "SVertexIndex.h" // E_INDEX_TYPE
 
-namespace irr
-{
 namespace io
 {
 class IReadFile;
@@ -69,7 +67,7 @@ struct SFrameStats {
 the Irrlicht Engine: All rendering and texture manipulation is done with
 this interface. You are able to use the Irrlicht Engine by only
 invoking methods of this interface if you like to, although the
-irr::scene::ISceneManager interface provides a lot of powerful classes
+scene::ISceneManager interface provides a lot of powerful classes
 and methods to make the programmer's life easier.
 */
 class IVideoDriver : public virtual IReferenceCounted
@@ -245,7 +243,7 @@ public:
 	that the driver may choose to create the texture in another
 	color format.
 	\return Pointer to the newly created texture. 	*/
-	virtual ITexture *addTextureCubemap(const irr::u32 sideLen, const io::path &name, ECOLOR_FORMAT format = ECF_A8R8G8B8) = 0;
+	virtual ITexture *addTextureCubemap(const u32 sideLen, const io::path &name, ECOLOR_FORMAT format = ECF_A8R8G8B8) = 0;
 
 	//! Adds a new render target texture to the texture cache.
 	/** \param size Size of the texture, in pixels. Width and
@@ -279,7 +277,7 @@ public:
 	\return Pointer to the created texture or 0 if the texture
 	could not be created. This pointer should not be dropped. See
 	IReferenceCounted::drop() for more information. */
-	virtual ITexture *addRenderTargetTextureCubemap(const irr::u32 sideLen,
+	virtual ITexture *addRenderTargetTextureCubemap(const u32 sideLen,
 			const io::path &name = "rt", const ECOLOR_FORMAT format = ECF_UNKNOWN) = 0;
 
 	//! Removes a texture from the texture cache and deletes it.
@@ -1125,8 +1123,7 @@ public:
 	virtual bool queryTextureFormat(ECOLOR_FORMAT format) const = 0;
 
 	//! Used by some SceneNodes to check if a material should be rendered in the transparent render pass
-	virtual bool needsTransparentRenderPass(const irr::video::SMaterial &material) const = 0;
+	virtual bool needsTransparentRenderPass(const video::SMaterial &material) const = 0;
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/IWriteFile.h

@@ -7,8 +7,6 @@
 #include "IReferenceCounted.h"
 #include "path.h"
 
-namespace irr
-{
 namespace io
 {
 
@@ -44,4 +42,3 @@ public:
 };
 
 } // end namespace io
-} // end namespace irr

irr/include/IrrlichtDevice.h

@@ -18,8 +18,6 @@
 #include <string>
 #include <variant>
 
-namespace irr
-{
 class ILogger;
 class IEventReceiver;
 
@@ -78,7 +76,7 @@ public:
 	also simply use your own message loop using GetMessage,
 	DispatchMessage and whatever and simply don't use this method.
 	But note that Irrlicht will not be able to fetch user input
-	then. See irr::SIrrlichtCreationParameters::WindowId for more
+	then. See SIrrlichtCreationParameters::WindowId for more
 	information and example code.
 	*/
 	virtual bool run() = 0;
@@ -210,7 +208,7 @@ public:
 	//! Sets a new user event receiver which will receive events from the engine.
 	/** Return true in IEventReceiver::OnEvent to prevent the event from continuing along
 	the chain of event receivers. The path that an event takes through the system depends
-	on its type. See irr::EEVENT_TYPE for details.
+	on its type. See EEVENT_TYPE for details.
 	\param receiver New receiver to be used. */
 	virtual void setEventReceiver(IEventReceiver *receiver) = 0;
 
@@ -243,7 +241,7 @@ public:
 	It does set the drawing/clientDC size of the window, the window decorations are added to that.
 	You get the current window size with IVideoDriver::getScreenSize() (might be unified in future)
 	*/
-	virtual void setWindowSize(const irr::core::dimension2d<u32> &size) = 0;
+	virtual void setWindowSize(const core::dimension2d<u32> &size) = 0;
 
 	//! Minimizes the window if possible.
 	virtual void minimizeWindow() = 0;
@@ -260,7 +258,7 @@ public:
 	//! Activate any joysticks, and generate events for them.
 	/** Irrlicht contains support for joysticks, but does not generate joystick events by default,
 	as this would consume joystick info that 3rd party libraries might rely on. Call this method to
-	activate joystick support in Irrlicht and to receive irr::SJoystickEvent events.
+	activate joystick support in Irrlicht and to receive SJoystickEvent events.
 	\param joystickInfo On return, this will contain an array of each joystick that was found and activated.
 	\return true if joysticks are supported on this device, false if joysticks are not
 				 supported or support is compiled out.
@@ -371,5 +369,3 @@ public:
 		return Keycode(KEY_UNKNOWN, (wchar_t)scancode);
 	}
 };
-
-} // end namespace irr

irr/include/Keycodes.h

@@ -5,9 +5,6 @@
 #pragma once
 #include <variant>
 
-namespace irr
-{
-
 enum EKEY_CODE
 {
 	KEY_UNKNOWN = 0x0,
@@ -208,5 +205,3 @@ public:
 		return code > 0 && code < KEY_KEY_CODES_COUNT;
 	}
 };
-
-} // end namespace irr

irr/include/S3DVertex.h

@@ -8,8 +8,6 @@
 #include "vector2d.h"
 #include "SColor.h"
 
-namespace irr
-{
 namespace video
 {
 
@@ -285,4 +283,3 @@ inline u32 getVertexPitchFromType(E_VERTEX_TYPE vertexType)
 }
 
 } // end namespace video
-} // end namespace irr

irr/include/SColor.h

@@ -7,8 +7,6 @@
 #include "irrTypes.h"
 #include "irrMath.h"
 
-namespace irr
-{
 namespace video
 {
 //! An enum for the color format of textures used by the Irrlicht Engine.
@@ -655,4 +653,3 @@ inline f32 SColorHSL::toRGB1(f32 rm1, f32 rm2, f32 rh) const
 }
 
 } // end namespace video
-} // end namespace irr

irr/include/SExposedVideoData.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-namespace irr
-{
 namespace video
 {
 
@@ -79,4 +77,3 @@ struct SExposedVideoData
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/SIrrCreationParameters.h

@@ -11,8 +11,6 @@
 #include "position2d.h"
 #include "path.h"
 
-namespace irr
-{
 class IEventReceiver;
 
 //! Structure for holding Irrlicht Device creation parameters.
@@ -224,10 +222,8 @@ struct SIrrlichtCreationParameters
 	//! Set the path where default-shaders to simulate the fixed-function pipeline can be found.
 	/** This is about the shaders which can be found in media/Shaders by default. It's only necessary
 	to set when using OGL-ES 2.0 */
-	irr::io::path OGLES2ShaderPath;
+	io::path OGLES2ShaderPath;
 
 	//! Enable debug and error checks in video driver.
 	bool DriverDebug;
 };
-
-} // end namespace irr

irr/include/SMaterial.h

@@ -11,8 +11,6 @@
 #include "EMaterialProps.h" // IWYU pragma: export
 #include "SMaterialLayer.h"
 
-namespace irr
-{
 namespace video
 {
 class ITexture;
@@ -178,7 +176,7 @@ inline bool textureBlendFunc_hasAlpha(const E_BLEND_FACTOR factor)
 to coverage.
 Some drivers don't support a per-material setting of the anti-aliasing
 modes. In those cases, FSAA/multisampling is defined by the device mode
-chosen upon creation via irr::SIrrCreationParameters.
+chosen upon creation via SIrrCreationParameters.
 */
 enum E_ANTI_ALIASING_MODE : u8
 {
@@ -474,19 +472,18 @@ public:
 extern const SMaterial IdentityMaterial;
 
 } // end namespace video
-} // end namespace irr
 
 template<>
-struct std::hash<irr::video::SMaterial>
+struct std::hash<video::SMaterial>
 {
 	/// @brief std::hash specialization for video::SMaterial
-	std::size_t operator()(const irr::video::SMaterial &m) const noexcept
+	std::size_t operator()(const video::SMaterial &m) const noexcept
 	{
 		std::size_t ret = 0;
 		for (auto h : { // the three members most likely to differ
-			std::hash<irr::video::ITexture*>{}(m.getTexture(0)),
+			std::hash<video::ITexture*>{}(m.getTexture(0)),
 			std::hash<int>{}(m.MaterialType),
-			std::hash<irr::u32>{}(m.ColorParam.color)
+			std::hash<u32>{}(m.ColorParam.color)
 		}) {
 			ret += h;
 			ret ^= (ret << 6) + (ret >> 2); // distribute bits

irr/include/SMaterialLayer.h

@@ -6,8 +6,6 @@
 
 #include "matrix4.h"
 
-namespace irr
-{
 namespace video
 {
 class ITexture;
@@ -235,4 +233,3 @@ private:
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/SMesh.h

@@ -9,8 +9,6 @@
 #include "IMeshBuffer.h"
 #include "aabbox3d.h"
 
-namespace irr
-{
 namespace scene
 {
 //! Simple implementation of the IMesh interface.
@@ -146,4 +144,3 @@ struct SMesh final : public IAnimatedMesh
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/SOverrideMaterial.h

@@ -7,8 +7,6 @@
 #include <vector>
 #include "SMaterial.h"
 
-namespace irr
-{
 namespace video
 {
 
@@ -177,4 +175,3 @@ struct SOverrideMaterial
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/SSkinMeshBuffer.h

@@ -10,8 +10,6 @@
 #include "S3DVertex.h"
 #include <cassert>
 
-namespace irr
-{
 namespace scene
 {
 
@@ -238,4 +236,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/SVertexIndex.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-namespace irr
-{
 namespace video
 {
 enum E_INDEX_TYPE
@@ -15,4 +13,3 @@ enum E_INDEX_TYPE
 };
 
 } // end namespace video
-} // end namespace irr

irr/include/SVertexManipulator.h

@@ -6,8 +6,6 @@
 
 #include "vector3d.h"
 
-namespace irr
-{
 namespace scene
 {
 
@@ -39,4 +37,3 @@ private:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/SViewFrustum.h

@@ -11,8 +11,6 @@
 #include "matrix4.h"
 #include "EVideoTypes.h"
 
-namespace irr
-{
 namespace scene
 {
 
@@ -446,4 +444,3 @@ inline void SViewFrustum::recalculateBoundingSphere()
 }
 
 } // end namespace scene
-} // end namespace irr

irr/include/SkinnedMesh.h

@@ -21,8 +21,6 @@
 #include <variant>
 #include <vector>
 
-namespace irr
-{
 namespace scene
 {
 
@@ -447,4 +445,3 @@ public:
 };
 
 } // end namespace scene
-} // end namespace irr

irr/include/Transform.h

@@ -5,8 +5,6 @@
 #include <vector3d.h>
 #include <quaternion.h>
 
-namespace irr
-{
 namespace core
 {
 
@@ -39,4 +37,3 @@ struct Transform {
 };
 
 } // end namespace core
-} // end namespace irr

irr/include/aabbox3d.h

@@ -8,8 +8,6 @@
 #include "plane3d.h"
 #include "line3d.h"
 
-namespace irr
-{
 namespace core
 {
 
@@ -384,4 +382,3 @@ typedef aabbox3d<f32> aabbox3df;
 typedef aabbox3d<s32> aabbox3di;
 
 } // end namespace core
-} // end namespace irr

irr/include/coreutil.h

@@ -6,8 +6,6 @@
 
 #include "path.h"
 
-namespace irr
-{
 namespace core
 {
 
@@ -189,4 +187,3 @@ inline bool isupper(s32 c)
 }
 
 } // end namespace core
-} // end namespace irr

irr/include/dimension2d.h

@@ -5,10 +5,8 @@
 #pragma once
 
 #include "irrTypes.h"
-#include "irrMath.h" // for irr::core::equals()
+#include "irrMath.h" // for core::equals()
 
-namespace irr
-{
 namespace core
 {
 template <class T>
@@ -213,4 +211,3 @@ typedef dimension2d<u32> dimension2du;
 typedef dimension2d<s32> dimension2di;
 
 } // end namespace core
-} // end namespace irr

irr/include/fast_atof.h

@@ -9,8 +9,6 @@
 #include <climits>
 #include <cmath>
 
-namespace irr
-{
 namespace core
 {
 
@@ -342,4 +340,3 @@ inline float fast_atof(const char *floatAsString, const char **out = 0)
 }
 
 } // end namespace core
-} // end namespace irr

irr/include/irrArray.h

@@ -11,8 +11,6 @@
 #include "irrTypes.h"
 #include "irrMath.h"
 
-namespace irr
-{
 namespace core
 {
 
@@ -24,7 +22,7 @@ class array
 {
 public:
 	static_assert(!std::is_same<T, bool>::value,
-			"irr::core::array<T> with T = bool not supported. Use std::vector instead.");
+			"core::array<T> with T = bool not supported. Use std::vector instead.");
 
 	//! Default constructor for empty array.
 	array() :
@@ -407,4 +405,3 @@ private:
 };
 
 } // end namespace core
-} // end namespace irr

irr/include/irrMath.h

@@ -11,8 +11,6 @@
 #include <climits> // For INT_MAX / UINT_MAX
 #include <type_traits>
 
-namespace irr
-{
 namespace core
 {
 
@@ -199,8 +197,8 @@ union FloatIntUnion32
 	// Portable sign-extraction
 	bool sign() const { return (i >> 31) != 0; }
 
-	irr::s32 i;
-	irr::f32 f;
+	s32 i;
+	f32 f;
 };
 
 //! We compare the difference in ULP's (spacing between floating-point numbers, aka ULP=1 means there exists no float between).
@@ -460,7 +458,6 @@ inline f32 fract(f32 x)
 }
 
 } // end namespace core
-} // end namespace irr
 
-using irr::core::FR;
-using irr::core::IR;
+using core::FR;
+using core::IR;

irr/include/irrString.h

@@ -18,8 +18,6 @@ extern std::wstring utf8_to_wide(std::string_view input);
 extern std::string wide_to_utf8(std::wstring_view input);
 /* */
 
-namespace irr
-{
 namespace core
 {
 
@@ -940,4 +938,3 @@ inline size_t wStringToUTF8(stringc &destination, const stringw &source)
 }
 
 } // end namespace core
-} // end namespace irr