Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Switch to pragma & add some things on .gitignore #224

Merged
merged 2 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ scripts/glext.h
*.dir/
*.sln
*visualstudio/

# vscode cmake plugin
build/*
9 changes: 2 additions & 7 deletions source/Irrlicht/Android/CAndroidAssetFileArchive.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_

Expand Down Expand Up @@ -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);
Expand All @@ -65,5 +62,3 @@ namespace io
} // end namespace irr

#endif // _IRR_COMPILE_ANDROID_ASSET_READER_
#endif // __C_ANDROID_ASSET_READER_H_INCLUDED__

7 changes: 1 addition & 6 deletions source/Irrlicht/Android/CAndroidAssetReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_

Expand Down Expand Up @@ -70,5 +67,3 @@ namespace io
} // end namespace irr

#endif // _IRR_COMPILE_ANDROID_ASSET_READER_
#endif // __C_ANDROID_ASSET_READER_H_INCLUDED__

4 changes: 1 addition & 3 deletions source/Irrlicht/Android/CIrrDeviceAndroid.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_
Expand Down Expand Up @@ -100,4 +99,3 @@ namespace irr
} // end namespace irr

#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_
#endif // __C_IRR_DEVICE_ANDROID_H_INCLUDED__
7 changes: 2 additions & 5 deletions source/Irrlicht/Android/CKeyEventWrapper.h
Original file line number Diff line number Diff line change
@@ -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_

Expand All @@ -28,7 +26,7 @@ class CKeyEventWrapper
int getUnicodeChar(int metaState);

private:
static jclass Class_KeyEvent;
static jclass Class_KeyEvent;
static jmethodID Method_getUnicodeChar;
static jmethodID Method_constructor;
JNIEnv* JniEnv;
Expand All @@ -39,4 +37,3 @@ class CKeyEventWrapper
} // namespace irr

#endif // _IRR_COMPILE_WITH_ANDROID_DEVICE_
#endif // __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__
6 changes: 1 addition & 5 deletions source/Irrlicht/BuiltInFont.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -1055,5 +1053,3 @@ const u8 BuiltInFontData[] =
const u32 BuiltInFontDataSize = sizeof(BuiltInFontData);
} // end namespace gui
} // end namespace irr

#endif
6 changes: 1 addition & 5 deletions source/Irrlicht/CAnimatedMeshSceneNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -180,6 +179,3 @@ namespace scene

} // end namespace scene
} // end namespace irr

#endif

6 changes: 1 addition & 5 deletions source/Irrlicht/CAttributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -148,5 +146,3 @@ class CAttributes : public IAttributes
} // end namespace io
} // end namespace irr

#endif

6 changes: 1 addition & 5 deletions source/Irrlicht/CB3DMeshFileLoader.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -82,6 +81,3 @@ class CB3DMeshFileLoader : public IMeshLoader

} // end namespace scene
} // end namespace irr

#endif // __C_B3D_MESH_LOADER_H_INCLUDED__

4 changes: 1 addition & 3 deletions source/Irrlicht/CB3DMeshWriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -50,4 +49,3 @@ class CB3DMeshWriter : public IMeshWriter
} // end namespace
} // end namespace

#endif
5 changes: 1 addition & 4 deletions source/Irrlicht/CBillboardSceneNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -116,5 +115,3 @@ class CBillboardSceneNode : virtual public IBillboardSceneNode
} // end namespace scene
} // end namespace irr

#endif

6 changes: 1 addition & 5 deletions source/Irrlicht/CBlit.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -1058,6 +1057,3 @@ static s32 Blit(eBlitter operation,
}

}

#endif

5 changes: 1 addition & 4 deletions source/Irrlicht/CBoneSceneNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -69,5 +68,3 @@ namespace scene
} // end namespace scene
} // end namespace irr

#endif

6 changes: 1 addition & 5 deletions source/Irrlicht/CCameraSceneNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -168,6 +167,3 @@ namespace scene

} // end namespace
} // end namespace

#endif

5 changes: 1 addition & 4 deletions source/Irrlicht/CColorConverter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -97,5 +96,3 @@ class CColorConverter
} // end namespace video
} // end namespace irr

#endif

5 changes: 1 addition & 4 deletions source/Irrlicht/CDummyTransformationSceneNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -58,5 +57,3 @@ namespace scene
} // end namespace scene
} // end namespace irr

#endif

5 changes: 1 addition & 4 deletions source/Irrlicht/CEGLManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_

Expand Down Expand Up @@ -114,4 +112,3 @@ namespace video
}
}
#endif
#endif
6 changes: 1 addition & 5 deletions source/Irrlicht/CEmptySceneNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -41,6 +40,3 @@ namespace scene

} // end namespace scene
} // end namespace irr

#endif

7 changes: 1 addition & 6 deletions source/Irrlicht/CFPSCounter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -48,7 +47,3 @@ class CFPSCounter

} // end namespace video
} // end namespace irr


#endif

7 changes: 1 addition & 6 deletions source/Irrlicht/CFileList.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -132,7 +131,3 @@ class CFileList : public IFileList

} // end namespace irr
} // end namespace io


#endif

6 changes: 1 addition & 5 deletions source/Irrlicht/CFileSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -140,6 +139,3 @@ class CFileSystem : public IFileSystem

} // end namespace irr
} // end namespace io

#endif

7 changes: 1 addition & 6 deletions source/Irrlicht/CGLXManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_

Expand Down Expand Up @@ -76,6 +74,3 @@ namespace video
}

#endif

#endif

5 changes: 1 addition & 4 deletions source/Irrlicht/CGUIButton.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -240,5 +239,3 @@ namespace gui

} // end namespace gui
} // end namespace irr

#endif // __C_GUI_BUTTON_H_INCLUDED__