minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup: get rid of the legacy #ifndef #define craziness

This commit is contained in:
Loic Blot 2023-06-25 21:15:14 +02:00 committed by sfan5
parent fb7a0e4298
commit e0d4d7d8b4
96 changed files with 106 additions and 456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/Irrlicht/Android/CAndroidAssetFileArchive.h
View File

@ -2,10 +2,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_ANDROID_ASSET_FILE_ARCHIVE_H_INCLUDED__
#define __C_ANDROID_ASSET_FILE_ARCHIVE_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_ANDROID_ASSET_READER_
@ -47,7 +44,7 @@ namespace io
//! get the archive type
virtual E_FILE_ARCHIVE_TYPE getType() const;
//! Add a directory to read files from. Since the Android
//! Add a directory to read files from. Since the Android
//! API does not return names of directories, they need to
//! be added manually.
virtual void addDirectoryToFileList(const io::path &filename);
@ -65,5 +62,3 @@ namespace io
} // end namespace irr
#endif // _IRR_COMPILE_ANDROID_ASSET_READER_
#endif // __C_ANDROID_ASSET_READER_H_INCLUDED__

7
source/Irrlicht/Android/CAndroidAssetReader.h
View File

@ -2,10 +2,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_ANDROID_ASSET_READER_H_INCLUDED__
#define __C_ANDROID_ASSET_READER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_ANDROID_ASSET_READER_
@ -70,5 +67,3 @@ namespace io
} // end namespace irr
#endif // _IRR_COMPILE_ANDROID_ASSET_READER_
#endif // __C_ANDROID_ASSET_READER_H_INCLUDED__

4
source/Irrlicht/Android/CIrrDeviceAndroid.h
View File

@ -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 __C_IRR_DEVICE_ANDROID_H_INCLUDED__
#define __C_IRR_DEVICE_ANDROID_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
@ -100,4 +99,3 @@ namespace irr
} // end namespace irr
#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_
#endif // __C_IRR_DEVICE_ANDROID_H_INCLUDED__

7
source/Irrlicht/Android/CKeyEventWrapper.h
View File

@ -1,9 +1,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__
#define __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
@ -28,7 +26,7 @@ public:
int getUnicodeChar(int metaState);
private:
static jclass Class_KeyEvent;
static jclass Class_KeyEvent;
static jmethodID Method_getUnicodeChar;
static jmethodID Method_constructor;
JNIEnv* JniEnv;
@ -39,4 +37,3 @@ private:
} // namespace irr
#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_
#endif // __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__

6
source/Irrlicht/BuiltInFont.h
View File

@ -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 __BUILD_IN_FONT_H_INCLUDED__
#define __BUILD_IN_FONT_H_INCLUDED__
#pragma once
// header file generated by Bin2H, copyright 2002 by N.Gebhardt.
// Bin2H is Freeware. Download it freely from www.code3d.com.
@ -1055,5 +1053,3 @@ const u8 BuiltInFontData[] =
const u32 BuiltInFontDataSize = sizeof(BuiltInFontData);
} // end namespace gui
} // end namespace irr
#endif

6
source/Irrlicht/CAnimatedMeshSceneNode.h
View File

@ -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 __C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
#define __C_ANIMATED_MESH_SCENE_NODE_H_INCLUDED__
#pragma once
#include "IAnimatedMeshSceneNode.h"
#include "IAnimatedMesh.h"
@ -180,6 +179,3 @@ namespace scene
} // end namespace scene
} // end namespace irr
#endif

6
source/Irrlicht/CAttributes.h
View File

@ -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 __C_ATTRIBUTES_H_INCLUDED__
#define __C_ATTRIBUTES_H_INCLUDED__
#pragma once
#include "IAttributes.h"
#include "IAttribute.h"
@ -148,5 +146,3 @@ protected:
} // end namespace io
} // end namespace irr
#endif

6
source/Irrlicht/CB3DMeshFileLoader.h
View File

@ -7,8 +7,7 @@
// declared public domain
#ifndef __C_B3D_MESH_LOADER_H_INCLUDED__
#define __C_B3D_MESH_LOADER_H_INCLUDED__
#pragma once
#include "IMeshLoader.h"
#include "ISceneManager.h"
@ -82,6 +81,3 @@ private:
} // end namespace scene
} // end namespace irr
#endif // __C_B3D_MESH_LOADER_H_INCLUDED__

4
source/Irrlicht/CB3DMeshWriter.h
View File

@ -4,8 +4,7 @@
// Modified version with rigging/skinning support
#ifndef __IRR_B3D_MESH_WRITER_H_INCLUDED__
#define __IRR_B3D_MESH_WRITER_H_INCLUDED__
#pragma once
#include "IMeshWriter.h"
#include "IWriteFile.h"
@ -50,4 +49,3 @@ private:
} // end namespace
} // end namespace
#endif

5
source/Irrlicht/CBillboardSceneNode.h
View File

@ -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 __C_BILLBOARD_SCENE_NODE_H_INCLUDED__
#define __C_BILLBOARD_SCENE_NODE_H_INCLUDED__
#pragma once
#include "IBillboardSceneNode.h"
#include "SMeshBuffer.h"
@ -116,5 +115,3 @@ private:
} // end namespace scene
} // end namespace irr
#endif

6
source/Irrlicht/CBlit.h
View File

@ -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 _C_BLIT_H_INCLUDED_
#define _C_BLIT_H_INCLUDED_
#pragma once
#include "SoftwareDriver2_helper.h"
@ -1058,6 +1057,3 @@ static s32 Blit(eBlitter operation,
}
}
#endif

5
source/Irrlicht/CBoneSceneNode.h
View File

@ -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 __C_BONE_SCENE_NODE_H_INCLUDED__
#define __C_BONE_SCENE_NODE_H_INCLUDED__
#pragma once
// Used with SkinnedMesh and IAnimatedMeshSceneNode, for boned meshes
@ -69,5 +68,3 @@ namespace scene
} // end namespace scene
} // end namespace irr
#endif

6
source/Irrlicht/CCameraSceneNode.h
View File

@ -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 __C_CAMERA_SCENE_NODE_H_INCLUDED__
#define __C_CAMERA_SCENE_NODE_H_INCLUDED__
#pragma once
#include "ICameraSceneNode.h"
#include "SViewFrustum.h"
@ -168,6 +167,3 @@ namespace scene
} // end namespace
} // end namespace
#endif

5
source/Irrlicht/CColorConverter.h
View File

@ -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 __C_COLOR_CONVERTER_H_INCLUDED__
#define __C_COLOR_CONVERTER_H_INCLUDED__
#pragma once
#include "irrTypes.h"
#include "IImage.h"
@ -97,5 +96,3 @@ public:
} // end namespace video
} // end namespace irr
#endif

5
source/Irrlicht/CDummyTransformationSceneNode.h
View File

@ -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 __C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
#define __C_DUMMY_TRANSFORMATION_SCENE_NODE_H_INCLUDED__
#pragma once
#include "IDummyTransformationSceneNode.h"
@ -58,5 +57,3 @@ namespace scene
} // end namespace scene
} // end namespace irr
#endif

5
source/Irrlicht/CEGLManager.h
View File

@ -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 __C_EGL_MANAGER_H_INCLUDED__
#define __C_EGL_MANAGER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_EGL_MANAGER_
@ -114,4 +112,3 @@ namespace video
}
}
#endif
#endif

6
source/Irrlicht/CEmptySceneNode.h
View File

@ -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 __C_EMPTY_SCENE_NODE_H_INCLUDED__
#define __C_EMPTY_SCENE_NODE_H_INCLUDED__
#pragma once
#include "ISceneNode.h"
@ -41,6 +40,3 @@ namespace scene
} // end namespace scene
} // end namespace irr
#endif

7
source/Irrlicht/CFPSCounter.h
View File

@ -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 __C_FPSCOUNTER_H_INCLUDED__
#define __C_FPSCOUNTER_H_INCLUDED__
#pragma once
#include "irrTypes.h"
@ -48,7 +47,3 @@ private:
} // end namespace video
} // end namespace irr
#endif

7
source/Irrlicht/CFileList.h
View File

@ -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 __C_FILE_LIST_H_INCLUDED__
#define __C_FILE_LIST_H_INCLUDED__
#pragma once
#include "IFileList.h"
#include "irrString.h"
@ -132,7 +131,3 @@ protected:
} // end namespace irr
} // end namespace io
#endif

6
source/Irrlicht/CFileSystem.h
View File

@ -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 __C_FILE_SYSTEM_H_INCLUDED__
#define __C_FILE_SYSTEM_H_INCLUDED__
#pragma once
#include "IFileSystem.h"
#include "irrArray.h"
@ -140,6 +139,3 @@ private:
} // end namespace irr
} // end namespace io
#endif

7
source/Irrlicht/CGLXManager.h
View File

@ -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 __C_GLX_MANAGER_H_INCLUDED__
#define __C_GLX_MANAGER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_GLX_MANAGER_
@ -76,6 +74,3 @@ namespace video
}
#endif
#endif

5
source/Irrlicht/CGUIButton.h
View File

@ -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 __C_GUI_BUTTON_H_INCLUDED__
#define __C_GUI_BUTTON_H_INCLUDED__
#pragma once
#include "IGUIButton.h"
#include "IGUISpriteBank.h"
@ -240,5 +239,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif // __C_GUI_BUTTON_H_INCLUDED__

5
source/Irrlicht/CGUICheckBox.h
View File

@ -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 __C_GUI_CHECKBOX_H_INCLUDED__
#define __C_GUI_CHECKBOX_H_INCLUDED__
#pragma once
#include "IGUICheckBox.h"
@ -56,5 +55,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif // __C_GUI_CHECKBOX_H_INCLUDED__

5
source/Irrlicht/CGUIComboBox.h
View File

@ -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 __C_GUI_COMBO_BOX_H_INCLUDED__
#define __C_GUI_COMBO_BOX_H_INCLUDED__
#pragma once
#include "IGUIComboBox.h"
#include "IGUIStaticText.h"
@ -103,5 +102,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif // __C_GUI_COMBO_BOX_H_INCLUDED__

5
source/Irrlicht/CGUIEditBox.h
View File

@ -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 __C_GUI_EDIT_BOX_H_INCLUDED__
#define __C_GUI_EDIT_BOX_H_INCLUDED__
#pragma once
#include "IGUIEditBox.h"
#include "irrArray.h"
@ -197,5 +196,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif // __C_GUI_EDIT_BOX_H_INCLUDED__

5
source/Irrlicht/CGUIEnvironment.h
View File

@ -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 __C_GUI_ENVIRONMENT_H_INCLUDED__
#define __C_GUI_ENVIRONMENT_H_INCLUDED__
#pragma once
#include "IGUIEnvironment.h"
#include "IGUIElement.h"
@ -227,5 +226,3 @@ private:
} // end namespace gui
} // end namespace irr
#endif // __C_GUI_ENVIRONMENT_H_INCLUDED__

5
source/Irrlicht/CGUIFileOpenDialog.h
View File

@ -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 __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
#define __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
#pragma once
#include "IGUIFileOpenDialog.h"
#include "IGUIButton.h"
@ -86,5 +85,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif // __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__

5
source/Irrlicht/CGUIFont.h
View File

@ -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 __C_GUI_FONT_H_INCLUDED__
#define __C_GUI_FONT_H_INCLUDED__
#pragma once
#include "IGUIFontBitmap.h"
#include "irrString.h"
@ -107,5 +106,3 @@ private:
} // end namespace gui
} // end namespace irr
#endif // __C_GUI_FONT_H_INCLUDED__

5
source/Irrlicht/CGUIImage.h
View File

@ -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 __C_GUI_IMAGE_H_INCLUDED__
#define __C_GUI_IMAGE_H_INCLUDED__
#pragma once
#include "IGUIImage.h"
@ -98,5 +97,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif // __C_GUI_IMAGE_H_INCLUDED__

6
source/Irrlicht/CGUIImageList.h
View File

@ -1,8 +1,7 @@
// This file is part of the "Irrlicht Engine".
// written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
#ifndef __C_GUI_IMAGE_LIST_H_INCLUDED__
#define __C_GUI_IMAGE_LIST_H_INCLUDED__
#pragma once
#include "IGUIImageList.h"
#include "IVideoDriver.h"
@ -62,6 +61,3 @@ private:
} // end namespace gui
} // end namespace irr
#endif

5
source/Irrlicht/CGUIListBox.h
View File

@ -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 __C_GUI_LIST_BOX_H_INCLUDED__
#define __C_GUI_LIST_BOX_H_INCLUDED__
#pragma once
#include "IGUIListBox.h"
#include "irrArray.h"
@ -174,5 +173,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif

5
source/Irrlicht/CGUIScrollBar.h
View File

@ -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 __C_GUI_SCROLL_BAR_H_INCLUDED__
#define __C_GUI_SCROLL_BAR_H_INCLUDED__
#pragma once
#include "IGUIScrollBar.h"
#include "IGUIButton.h"
@ -97,5 +96,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif

5
source/Irrlicht/CGUISkin.h
View File

@ -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 __C_GUI_SKIN_H_INCLUDED__
#define __C_GUI_SKIN_H_INCLUDED__
#pragma once
#include "IGUISkin.h"
#include "irrString.h"
@ -230,5 +229,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif

5
source/Irrlicht/CGUISpriteBank.h
View File

@ -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 __C_GUI_SPRITE_BANK_H_INCLUDED__
#define __C_GUI_SPRITE_BANK_H_INCLUDED__
#pragma once
#include "IGUISpriteBank.h"
@ -83,5 +82,3 @@ protected:
} // end namespace gui
} // end namespace irr
#endif // __C_GUI_SPRITE_BANK_H_INCLUDED__

5
source/Irrlicht/CGUIStaticText.h
View File

@ -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 __C_GUI_STATIC_TEXT_H_INCLUDED__
#define __C_GUI_STATIC_TEXT_H_INCLUDED__
#pragma once
#include "IGUIStaticText.h"
#include "irrArray.h"
@ -132,5 +131,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif

5
source/Irrlicht/CGUITabControl.h
View File

@ -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 __C_GUI_TAB_CONTROL_H_INCLUDED__
#define __C_GUI_TAB_CONTROL_H_INCLUDED__
#pragma once
#include "IGUITabControl.h"
#include "irrArray.h"
@ -180,5 +179,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
#endif

7
source/Irrlicht/CImage.h
View File

@ -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 __C_IMAGE_H_INCLUDED__
#define __C_IMAGE_H_INCLUDED__
#pragma once
#include "IImage.h"
#include "rect.h"
@ -74,7 +73,3 @@ private:
} // end namespace video
} // end namespace irr
#endif

6
source/Irrlicht/CImageLoaderBMP.h
View File

@ -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 __C_IMAGE_LOADER_BMP_H_INCLUDED__
#define __C_IMAGE_LOADER_BMP_H_INCLUDED__
#pragma once
#include "IImageLoader.h"
@ -85,5 +83,3 @@ private:
} // end namespace video
} // end namespace irr
#endif

7
source/Irrlicht/CImageLoaderJPG.h
View File

@ -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 __C_IMAGE_LOADER_JPG_H_INCLUDED__
#define __C_IMAGE_LOADER_JPG_H_INCLUDED__
#pragma once
#include "IImageLoader.h"
@ -91,6 +89,3 @@ private:
} // end namespace video
} // end namespace irr
#endif

6
source/Irrlicht/CImageLoaderPNG.h
View File

@ -6,9 +6,7 @@
// i wanted to be able to read in PNG images with irrlicht :)
// why? lossless compression with 8-bit alpha channel!
#ifndef __C_IMAGE_LOADER_PNG_H_INCLUDED__
#define __C_IMAGE_LOADER_PNG_H_INCLUDED__
#pragma once
#include "IImageLoader.h"
@ -36,5 +34,3 @@ public:
} // end namespace video
} // end namespace irr
#endif

6
source/Irrlicht/CImageLoaderTGA.h
View File

@ -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 __C_IMAGE_LOADER_TGA_H_INCLUDED__
#define __C_IMAGE_LOADER_TGA_H_INCLUDED__
#pragma once
#include "IImageLoader.h"
@ -68,5 +66,3 @@ private:
} // end namespace video
} // end namespace irr
#endif

6
source/Irrlicht/CImageWriterJPG.h
View File

@ -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 _C_IMAGE_WRITER_JPG_H_INCLUDED__
#define _C_IMAGE_WRITER_JPG_H_INCLUDED__
#pragma once
#include "IImageWriter.h"
@ -28,5 +26,3 @@ public:
}
}
#endif // _C_IMAGE_WRITER_JPG_H_INCLUDED__

6
source/Irrlicht/CImageWriterPNG.h
View File

@ -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 _C_IMAGE_WRITER_PNG_H_INCLUDED__
#define _C_IMAGE_WRITER_PNG_H_INCLUDED__
#pragma once
#include "IImageWriter.h"
@ -28,5 +26,3 @@ public:
} // namespace video
} // namespace irr
#endif // _C_IMAGE_WRITER_PNG_H_INCLUDED__

6
source/Irrlicht/CIrrDeviceLinux.h
View File

@ -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 __C_IRR_DEVICE_LINUX_H_INCLUDED__
#define __C_IRR_DEVICE_LINUX_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_X11_DEVICE_
@ -483,5 +481,3 @@ namespace irr
} // end namespace irr
#endif // _IRR_COMPILE_WITH_X11_DEVICE_
#endif // __C_IRR_DEVICE_LINUX_H_INCLUDED__

6
source/Irrlicht/CIrrDeviceOSX.h
View File

@ -3,9 +3,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in Irrlicht.h
#ifndef __C_IRR_DEVICE_OSX_H_INCLUDED__
#define __C_IRR_DEVICE_OSX_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
@ -249,5 +247,3 @@ namespace irr
} // end namespace irr
#endif // _IRR_COMPILE_WITH_OSX_DEVICE_
#endif // __C_IRR_DEVICE_MACOSX_H_INCLUDED__

6
source/Irrlicht/CIrrDeviceSDL.h
View File

@ -4,9 +4,7 @@
// This device code is based on the original SDL device implementation
// contributed by Shane Parker (sirshane).
#ifndef __C_IRR_DEVICE_SDL_H_INCLUDED__
#define __C_IRR_DEVICE_SDL_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
@ -325,5 +323,3 @@ namespace irr
} // end namespace irr
#endif // _IRR_COMPILE_WITH_SDL_DEVICE_
#endif // __C_IRR_DEVICE_SDL_H_INCLUDED__

6
source/Irrlicht/CIrrDeviceStub.h
View File

@ -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 __C_IRR_DEVICE_STUB_H_INCLUDED__
#define __C_IRR_DEVICE_STUB_H_INCLUDED__
#pragma once
#include "IrrlichtDevice.h"
#include "SIrrCreationParameters.h"
@ -206,6 +205,3 @@ namespace irr
};
} // end namespace irr
#endif

4
source/Irrlicht/CIrrDeviceWin32.h
View File

@ -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 __C_IRR_DEVICE_WIN32_H_INCLUDED__
#define __C_IRR_DEVICE_WIN32_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
@ -428,4 +427,3 @@ namespace irr
} // end namespace irr
#endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_
#endif // __C_IRR_DEVICE_WIN32_H_INCLUDED__

6
source/Irrlicht/CLimitReadFile.h
View File

@ -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 __C_LIMIT_READ_FILE_H_INCLUDED__
#define __C_LIMIT_READ_FILE_H_INCLUDED__
#pragma once
#include "IReadFile.h"
#include "irrString.h"
@ -63,6 +62,3 @@ namespace io
} // end namespace io
} // end namespace irr
#endif

6
source/Irrlicht/CLogger.h
View File

@ -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 __C_LOGGER_H_INCLUDED__
#define __C_LOGGER_H_INCLUDED__
#pragma once
#include "ILogger.h"
#include "os.h"
@ -51,6 +50,3 @@ private:
};
} // end namespace
#endif

6
source/Irrlicht/CMemoryFile.h
View File

@ -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 __C_MEMORY_READ_FILE_H_INCLUDED__
#define __C_MEMORY_READ_FILE_H_INCLUDED__
#pragma once
#include "IMemoryReadFile.h"
#include "IWriteFile.h"
@ -102,6 +101,3 @@ namespace io
} // end namespace io
} // end namespace irr
#endif

6
source/Irrlicht/CMeshCache.h
View File

@ -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 __C_MESH_CACHE_H_INCLUDED__
#define __C_MESH_CACHE_H_INCLUDED__
#pragma once
#include "IMeshCache.h"
#include "irrArray.h"
@ -118,6 +117,3 @@ namespace scene
} // end namespace scene
} // end namespace irr
#endif

6
source/Irrlicht/CMeshManipulator.h
View File

@ -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 __C_MESH_MANIPULATOR_H_INCLUDED__
#define __C_MESH_MANIPULATOR_H_INCLUDED__
#pragma once
#include "IMeshManipulator.h"
@ -45,6 +44,3 @@ public:
} // end namespace scene
} // end namespace irr
#endif

6
source/Irrlicht/CMeshSceneNode.h
View File

@ -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 __C_MESH_SCENE_NODE_H_INCLUDED__
#define __C_MESH_SCENE_NODE_H_INCLUDED__
#pragma once
#include "IMeshSceneNode.h"
#include "IMesh.h"
@ -86,6 +85,3 @@ namespace scene
} // end namespace scene
} // end namespace irr
#endif

6
source/Irrlicht/CNSOGLManager.h
View File

@ -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 __C_NSOGL_MANAGER_H_INCLUDED__
#define __C_NSOGL_MANAGER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_NSOGL_MANAGER_
@ -70,5 +68,3 @@ namespace video
}
#endif
#endif

8
source/Irrlicht/CNullDriver.h
View File

@ -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 __C_VIDEO_NULL_H_INCLUDED__
#define __C_VIDEO_NULL_H_INCLUDED__
#pragma once
#include "IVideoDriver.h"
#include "IFileSystem.h"
@ -662,7 +661,7 @@ namespace video
//! adds a surface, not loaded or created by the Irrlicht Engine
void addTexture(ITexture* surface);
virtual ITexture* createDeviceDependentTexture(const io::path& name, IImage* image);
virtual ITexture* createDeviceDependentTextureCubemap(const io::path& name, const core::array<IImage*>& image);
@ -838,6 +837,3 @@ namespace video
} // end namespace video
} // end namespace irr
#endif

6
source/Irrlicht/COBJMeshFileLoader.h
View File

@ -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 __C_OBJ_MESH_FILE_LOADER_H_INCLUDED__
#define __C_OBJ_MESH_FILE_LOADER_H_INCLUDED__
#pragma once
#include <map>
#include "IMeshLoader.h"
@ -109,6 +108,3 @@ private:
} // end namespace scene
} // end namespace irr
#endif

5
source/Irrlicht/COGLES2Common.h
View File

@ -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 __C_OGLES2_COMMON_H_INCLUDED__
#define __C_OGLES2_COMMON_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OGLES2_
@ -72,4 +70,3 @@ namespace video
}
#endif
#endif

6
source/Irrlicht/COGLES2Driver.h
View File

@ -3,9 +3,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in Irrlicht.h
#ifndef __C_OGLES2_DRIVER_H_INCLUDED__
#define __C_OGLES2_DRIVER_H_INCLUDED__
#pragma once
#include "SIrrCreationParameters.h"
@ -405,5 +403,3 @@ private:
} // end namespace irr
#endif // _IRR_COMPILE_WITH_OGLES2_
#endif // __C_OGLES2_DRIVER_H_INCLUDED__

5
source/Irrlicht/COGLES2ExtensionHandler.h
View File

@ -3,9 +3,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in Irrlicht.h
#ifndef __C_OGLES2_EXTENSION_HANDLER_H_INCLUDED__
#define __C_OGLES2_EXTENSION_HANDLER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OGLES2_
@ -190,4 +188,3 @@ namespace video
}
#endif
#endif

6
source/Irrlicht/COGLES2FixedPipelineRenderer.h
View File

@ -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 __C_OGLES2_FIXED_PIPELINE_SHADER_H_INCLUDED__
#define __C_OGLES2_FIXED_PIPELINE_SHADER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OGLES2_
@ -111,5 +109,3 @@ protected:
}
#endif
#endif

6
source/Irrlicht/COGLES2MaterialRenderer.h
View File

@ -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 __C_OGLES2_SL_MATERIAL_RENDERER_H_INCLUDED__
#define __C_OGLES2_SL_MATERIAL_RENDERER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OGLES2_
@ -102,5 +100,3 @@ protected:
}
#endif
#endif

6
source/Irrlicht/COGLES2Renderer2D.h
View File

@ -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 __C_OGLES2_RENDERER_2D_H_INCLUDED__
#define __C_OGLES2_RENDERER_2D_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OGLES2_
@ -37,5 +35,3 @@ protected:
}
#endif
#endif

5
source/Irrlicht/COGLESCommon.h
View File

@ -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 __C_OGLES_COMMON_H_INCLUDED__
#define __C_OGLES_COMMON_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OGLES1_
@ -119,4 +117,3 @@ namespace video
}
#endif
#endif

6
source/Irrlicht/COGLESDriver.h
View File

@ -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 __C_OGLES1_DRIVER_H_INCLUDED__
#define __C_OGLES1_DRIVER_H_INCLUDED__
#pragma once
#include "SIrrCreationParameters.h"
@ -358,5 +356,3 @@ namespace video
} // end namespace irr
#endif // _IRR_COMPILE_WITH_OGLES1_
#endif

5
source/Irrlicht/COGLESExtensionHandler.h
View File

@ -3,9 +3,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in Irrlicht.h
#ifndef __C_OGLES_EXTENSION_HANDLER_H_INCLUDED__
#define __C_OGLES_EXTENSION_HANDLER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OGLES1_
@ -236,4 +234,3 @@ namespace video
}
#endif
#endif

4
source/Irrlicht/COGLESMaterialRenderer.h
View File

@ -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 __C_OGLES1_MATERIAL_RENDERER_H_INCLUDED__
#define __C_OGLES1_MATERIAL_RENDERER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OGLES1_
@ -286,4 +285,3 @@ public:
} // end namespace irr
#endif
#endif

6
source/Irrlicht/COSOperator.h
View File

@ -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 __C_OS_OPERATOR_H_INCLUDED__
#define __C_OS_OPERATOR_H_INCLUDED__
#pragma once
#include "IOSOperator.h"
@ -70,6 +69,3 @@ private:
};
} // end namespace
#endif

5
source/Irrlicht/COpenGLCacheHandler.h
View File

@ -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 __C_OPENGL_CACHE_HANDLER_H_INCLUDED__
#define __C_OPENGL_CACHE_HANDLER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OPENGL_
@ -62,4 +60,3 @@ namespace video
} // end namespace irr
#endif // _IRR_COMPILE_WITH_OPENGL_
#endif

5
source/Irrlicht/COpenGLCommon.h
View File

@ -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 __C_OPENGL_COMMON_H_INCLUDED__
#define __C_OPENGL_COMMON_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OPENGL_
@ -192,4 +190,3 @@ namespace video
}
#endif
#endif

6
source/Irrlicht/COpenGLCoreCacheHandler.h
View File

@ -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 __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__
#define __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__
#pragma once
#include "SMaterial.h"
#include "ITexture.h"
@ -639,5 +637,3 @@ protected:
}
}
#endif

8
source/Irrlicht/COpenGLCoreFeature.h
View File

@ -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 __C_OGLCORE_FEATURE_H_INCLUDED__
#define __C_OGLCORE_FEATURE_H_INCLUDED__
#pragma once
#include "irrTypes.h"
@ -25,7 +23,7 @@ public:
}
bool BlendOperation;
u8 ColorAttachment;
u8 MultipleRenderTarget;
u8 MaxTextureUnits;
@ -33,5 +31,3 @@ public:
}
}
#endif

8
source/Irrlicht/COpenGLCoreRenderTarget.h
View File

@ -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 __C_OGLCORE_RENDER_TARGET_H_INCLUDED__
#define __C_OGLCORE_RENDER_TARGET_H_INCLUDED__
#pragma once
#include "IRenderTarget.h"
@ -135,7 +133,7 @@ public:
TOpenGLTexture* currentTexture = (depthStencil && depthStencil->getDriverType() == DriverType) ? static_cast<TOpenGLTexture*>(depthStencil) : 0;
if (currentTexture)
{
{
if (currentTexture->getType() == ETT_2D)
{
GLuint textureID = currentTexture->getOpenGLTextureName();
@ -396,5 +394,3 @@ protected:
}
}
#endif

6
source/Irrlicht/COpenGLCoreTexture.h
View File

@ -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 __C_OGLCORE_TEXTURE_H_INCLUDED__
#define __C_OGLCORE_TEXTURE_H_INCLUDED__
#pragma once
#include "irrArray.h"
#include "SMaterialLayer.h"
@ -662,5 +660,3 @@ protected:
}
}
#endif

6
source/Irrlicht/COpenGLDriver.h
View File

@ -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 __C_VIDEO_OPEN_GL_H_INCLUDED__
#define __C_VIDEO_OPEN_GL_H_INCLUDED__
#pragma once
#include "SIrrCreationParameters.h"
@ -492,5 +490,3 @@ namespace video
#endif // _IRR_COMPILE_WITH_OPENGL_
#endif

7
source/Irrlicht/COpenGLExtensionHandler.h
View File

@ -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 __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__
#define __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OPENGL_
@ -3435,6 +3433,3 @@ inline void COpenGLExtensionHandler::extGlSwapInterval(int interval)
}
#endif
#endif

5
source/Irrlicht/COpenGLMaterialRenderer.h
View File

@ -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 __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__
#define __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OPENGL_
@ -355,5 +354,3 @@ protected:
} // end namespace irr
#endif
#endif

8
source/Irrlicht/COpenGLSLMaterialRenderer.h
View File

@ -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 __C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED__
#define __C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OPENGL_
@ -66,7 +64,7 @@ public:
//! Access the callback provided by the users when creating shader materials
IShaderConstantSetCallBack* getShaderConstantSetCallBack() const override
{
{
return CallBack;
}
@ -130,5 +128,3 @@ protected:
} // end namespace irr
#endif // compile with OpenGL
#endif // if included

12
source/Irrlicht/COpenGLShaderMaterialRenderer.h
View File

@ -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 __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__
#define __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OPENGL_
@ -45,7 +43,7 @@ public:
//! Access the callback provided by the users when creating shader materials
IShaderConstantSetCallBack* getShaderConstantSetCallBack() const override
{
{
return CallBack;
}
@ -69,10 +67,10 @@ protected:
IShaderConstantSetCallBack* CallBack;
// I didn't write this, but here's my understanding:
// Those flags seem to be exclusive so far (so could be an enum).
// Those flags seem to be exclusive so far (so could be an enum).
// Maybe the idea was to make them non-exclusive in future (basically having a shader-material)
// Actually currently there's not even any need to cache them (probably even slower than not doing so).
// They seem to be mostly for downward compatibility.
// They seem to be mostly for downward compatibility.
// I suppose the idea is to use SMaterial.BlendOperation + SMaterial.BlendFactor and a simple non-transparent type as base for more flexibility in the future.
// Note that SMaterial.BlendOperation + SMaterial.BlendFactor are in some drivers already evaluated before OnSetMaterial.
bool Alpha;
@ -91,5 +89,3 @@ protected:
} // end namespace irr
#endif
#endif

5
source/Irrlicht/CReadFile.h
View File

@ -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 __C_READ_FILE_H_INCLUDED__
#define __C_READ_FILE_H_INCLUDED__
#pragma once
#include <stdio.h>
#include "IReadFile.h"
@ -69,5 +68,3 @@ namespace io
} // end namespace io
} // end namespace irr
#endif

5
source/Irrlicht/CSDLManager.h
View File

@ -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 __C_SDL_MANAGER_H_INCLUDED__
#define __C_SDL_MANAGER_H_INCLUDED__
#pragma once
#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
@ -49,4 +47,3 @@ namespace video
}
#endif
#endif

5
source/Irrlicht/CSceneCollisionManager.h
View File

@ -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 __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
#define __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
#pragma once
#include "ISceneCollisionManager.h"
#include "ISceneManager.h"
@ -37,5 +36,3 @@ namespace scene
} // end namespace scene
} // end namespace irr
#endif

6
source/Irrlicht/CSceneManager.h
View File

@ -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 __C_SCENE_MANAGER_H_INCLUDED__
#define __C_SCENE_MANAGER_H_INCLUDED__
#pragma once
#include "ISceneManager.h"
#include "ISceneNode.h"
@ -307,6 +306,3 @@ namespace scene
} // end namespace video
} // end namespace scene
#endif

6
source/Irrlicht/CSkinnedMesh.h
View File

@ -4,8 +4,7 @@
//New skinned mesh
#ifndef __C_SKINNED_MESH_H_INCLUDED__
#define __C_SKINNED_MESH_H_INCLUDED__
#pragma once
#include "ISkinnedMesh.h"
#include "SMeshBuffer.h"
@ -215,6 +214,3 @@ private:
} // end namespace scene
} // end namespace irr
#endif

5
source/Irrlicht/CTimer.h
View File

@ -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 __C_IRR_C_TIMER_H_INCLUDED__
#define __C_IRR_C_TIMER_H_INCLUDED__
#pragma once
#include "ITimer.h"
#include "os.h"
@ -103,5 +102,3 @@ namespace irr
} // end namespace
#endif

6
source/Irrlicht/CWGLManager.h
View File

@ -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 __C_WGL_MANAGER_H_INCLUDED__
#define __C_WGL_MANAGER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_WGL_MANAGER_
@ -76,5 +74,3 @@ namespace video
}
#endif
#endif

6
source/Irrlicht/CWebGL1Driver.h
View File

@ -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 __C_WEBGL1_DRIVER_H_INCLUDED__
#define __C_WEBGL1_DRIVER_H_INCLUDED__
#pragma once
#include "SIrrCreationParameters.h"
@ -141,5 +139,3 @@ namespace video
} // end namespace irr
#endif // _IRR_COMPILE_WITH_WEBGL1_
#endif // __C_WEBGL1_DRIVER_H_INCLUDED__

5
source/Irrlicht/CWebGLExtensionHandler.h
View File

@ -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 __E_WEGL_EXTENSION_HANDLER_H_INCLUDED__
#define __E_WEGL_EXTENSION_HANDLER_H_INCLUDED__
#pragma once
#if defined(_IRR_COMPILE_WITH_WEBGL1_) // Note: should also work with WebGL2 once we add that to Irrlicht
@ -178,4 +176,3 @@ namespace video
}
#endif // defined(_IRR_COMPILE_WITH_WEBGL1_)
#endif // __E_WEGL1_EXTENSION_HANDLER_H_INCLUDED__

8
source/Irrlicht/CWriteFile.h
View File

@ -2,10 +2,9 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_WRITE_FILE_H_INCLUDED__
#define __C_WRITE_FILE_H_INCLUDED__
#pragma once
#include <stdio.h>
#include <cstdio>
#include "IWriteFile.h"
#include "irrString.h"
@ -59,6 +58,3 @@ namespace io
} // end namespace io
} // end namespace irr
#endif

5
source/Irrlicht/CXMeshFileLoader.h
View File

@ -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 __C_X_MESH_FILE_LOADER_H_INCLUDED__
#define __C_X_MESH_FILE_LOADER_H_INCLUDED__
#pragma once
#include "IMeshLoader.h"
#include "irrString.h"
@ -180,5 +179,3 @@ private:
} // end namespace scene
} // end namespace irr
#endif

6
source/Irrlicht/CZipReader.h
View File

@ -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 __C_ZIP_READER_H_INCLUDED__
#define __C_ZIP_READER_H_INCLUDED__
#pragma once
#include "IReadFile.h"
#include "irrArray.h"
@ -222,5 +220,3 @@ namespace io
} // end namespace io
} // end namespace irr
#endif // __C_ZIP_READER_H_INCLUDED__

5
source/Irrlicht/IAttribute.h
View File

@ -2,8 +2,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __I_ATTRIBUTE_H_INCLUDED__
#define __I_ATTRIBUTE_H_INCLUDED__
#pragma once
#include "IReferenceCounted.h"
#include "SColor.h"
@ -62,5 +61,3 @@ public:
} // end namespace io
} // end namespace irr
#endif

6
source/Irrlicht/S2DVertex.h
View File

@ -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 __S_K_2D_VERTEX_H_INCLUDED__
#define __S_K_2D_VERTEX_H_INCLUDED__
#pragma once
#include "vector2d.h"
@ -25,6 +24,3 @@ namespace video
} // end namespace video
} // end namespace irr
#endif

5
source/Irrlicht/SB3DStructs.h
View File

@ -7,8 +7,7 @@
// declared public domain
#ifndef SB3DSTRUCTS_H
#define SB3DSTRUCTS_H
#pragma once
#include "SMaterial.h"
@ -66,5 +65,3 @@ struct SB3dMaterial
} // end namespace scene
} // end namespace irr
#endif

6
source/Irrlicht/SoftwareDriver2_helper.h
View File

@ -7,8 +7,7 @@
- changed behavior for log2 textures ( replaced multiplies by shift )
*/
#ifndef __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__
#define __S_VIDEO_2_SOFTWARE_HELPER_H_INCLUDED__
#pragma once
#include "irrMath.h"
#include "SMaterial.h"
@ -300,6 +299,3 @@ inline bool intersect ( AbsRectangle &dest, const AbsRectangle& a, const AbsRect
} // end namespace irr
#endif

7
source/Irrlicht/os.h
View File

@ -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_OS_H_INCLUDED__
#define __IRR_OS_H_INCLUDED__
#pragma once
#include "irrTypes.h"
#include "irrString.h"
@ -95,7 +94,3 @@ namespace os
} // end namespace os
} // end namespace irr
#endif