Fix includes so that include sorting in clangformat doesn't break anything

src/Core/Debug/OODebuggerInterface.h

@@ -30,6 +30,10 @@ SOFTWARE.
 */
 
 
+#pragma once
+
+#import "OOFoundation.h"
+
 @class OODebugMonitor;
 
 // Interface for debugger.

src/Core/Entities/DockEntity.h

@@ -24,6 +24,8 @@ MA 02110-1301, USA.
 
 */
 
+#pragma once
+
 #import "ShipEntity.h"
 #import "StationEntity.h"	// For MAX_DOCKING_STAGES
 

src/Core/Entities/Entity.h

@@ -24,6 +24,7 @@ MA 02110-1301, USA.
 
 */
 
+#pragma once
 
 #import "OOFoundation.h"
 #import "OOMaths.h"

src/Core/Entities/OOVisualEffectEntity.h

@@ -24,6 +24,8 @@
 
  */
 
+#pragma once
+
 #import "OOEntityWithDrawable.h"
 #import "OOPlanetEntity.h"
 #import "OOJSPropID.h"

src/Core/Entities/OOWaypointEntity.h

@@ -25,6 +25,8 @@ MA 02110-1301, USA.
 
 */
 
+#pragma once
+
 #import "Entity.h"
 
 @interface OOWaypointEntity: Entity <OOBeaconEntity>

src/Core/Entities/PlanetEntity.h

@@ -24,6 +24,8 @@ MA 02110-1301, USA.
 
 */
 
+#pragma once
+
 #import "OOStellarBody.h"
 
 #if !NEW_PLANETS

src/Core/Entities/PlayerEntity.h

@@ -26,6 +26,8 @@ MA 02110-1301, USA.
 
 */
 
+#pragma once
+
 #import <Foundation/Foundation.h>
 #import "WormholeEntity.h"
 #import "ShipEntity.h"

src/Core/Entities/ShipEntity.h

@@ -25,6 +25,8 @@
 
  */
 
+#pragma once
+
 #import "OOEntityWithDrawable.h"
 #import "OOPlanetEntity.h"
 #import "OOJSPropID.h"

src/Core/Entities/StationEntity.h

@@ -24,6 +24,8 @@ MA 02110-1301, USA.
 
 */
 
+#pragma once
+
 #import "ShipEntity.h"
 #import "OOJSInterfaceDefinition.h"
 #import "Universe.h"

src/Core/Entities/WormholeEntity.h

@@ -26,6 +26,8 @@ MA 02110-1301, USA.
 
 */
 
+#pragma once
+
 #import "Entity.h"
 
 #define WORMHOLE_EXPIRES_TIMEINTERVAL	900.0

src/Core/Materials/OOConcreteTexture.h

@@ -28,6 +28,9 @@ SOFTWARE.
 
 */
 
+#pragma once
+
+#import "OOOpenGLExtensionManager.h"
 #import "OOTexture.h"
 
 

src/Core/Materials/OOConcreteTexture.m

@@ -26,9 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "OOTextureInternal.h"
 #import "OOConcreteTexture.h"
-
 #import "OOTextureLoader.h"
-
 #import "OOCollectionExtractors.h"
 #import "Universe.h"
 #import "ResourceManager.h"

src/Core/Materials/OOShaderUniformMethodType.h

@@ -33,7 +33,6 @@ SOFTWARE.
 #if OO_SHADERS || !defined(NDEBUG)
 
 #import "OOMaths.h"
-#import "OOHPVector.h"
 
 
 typedef enum

src/Core/Materials/OOTexture.h

@@ -31,6 +31,8 @@ SOFTWARE.
 
 */
 
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 #import "OOOpenGL.h"

src/Core/Materials/OOTextureInternal.h

@@ -27,6 +27,8 @@ SOFTWARE.
 
 */
 
+#pragma once
+
 #import "OOTexture.h"
 #import "OOOpenGLExtensionManager.h"
 

src/Core/NSFileManagerOOExtensions.h

@@ -26,7 +26,9 @@ MA 02110-1301, USA.
 
 */
 
-#import <Foundation/Foundation.h>
+#pragma once
+
+#import "OOFoundation.h"
 
 #define SAVEDIR "oolite-saves"
 

src/Core/OOALSoundChannel.h

@@ -30,7 +30,8 @@ SOFTWARE.
 
 */
 
-#import <Foundation/Foundation.h>
+#pragma once
+
 #import "OOOpenALController.h"
 #import "OOMaths.h"
 

src/Core/OOBoundingBox.h

@@ -24,11 +24,9 @@ MA 02110-1301, USA.
 
 */
 
+#pragma once
 
-#ifndef INCLUDED_OOMATHS_h
-	#error Do not include OOBoundingBox.h directly; include OOMaths.h.
-#else
-
+#include "OOHPVector.h"
 
 typedef struct
 {
@@ -112,5 +110,3 @@ OOINLINE Vector OOBoundingBoxCenter(BoundingBox bb)
 {
 	return vector_multiply_scalar(vector_add(bb.min, bb.max), 0.5f);
 }
-
-#endif

src/Core/OOEquipmentType.h

@@ -28,6 +28,8 @@ SOFTWARE.
 
 */
 
+#pragma once
+
 #import "OOFoundation.h"
 #import "OOTypes.h"
 #import "OOScript.h"

src/Core/OOFastArithmetic.h

@@ -24,11 +24,7 @@ MA 02110-1301, USA.
 
 */
 
-
-#ifndef INCLUDED_OOMATHS_h
-	#error Do not include OOFastArithmetic.h directly; include OOMaths.h.
-#else
-
+#pragma once
 
 /* Clamp to range. */
 OOINLINE float OOClamp_0_1_f(float value) INLINE_CONST_FUNC;
@@ -107,7 +103,3 @@ OOINLINE double OOLerpd(double v0, double v1, double fraction)
 	// Linear interpolation - equivalent to v0 * (1.0 - fraction) + v1 * fraction.
 	return v0 + fraction * (v1 - v0);
 }
-
-
-
-#endif	/* INCLUDED_OOMATHS_h */

src/Core/OOFoundation.h

@@ -30,6 +30,9 @@ MA 02110-1301, USA.
  causing a warning in Clang. This lets us write #define FOO (1 && OOLITE_DEBUG)
  instead.
  */
+
+#pragma once
+
 #ifdef NDEBUG
 #define OOLITE_DEBUG 0
 #else

src/Core/OOHPVector.h

@@ -26,10 +26,10 @@ MA 02110-1301, USA.
 */
 
 
-#ifndef INCLUDED_OOMATHS_h
-	#error Do not include OOHPVector.h directly; include OOMaths.h.
-#else
+#pragma once
 
+#include "OOFastArithmetic.h"
+#include "OOVector.h"
 
 #ifndef OOMATHS_EXTERNAL_VECTOR_TYPES
 
@@ -68,7 +68,6 @@ OOINLINE HPVector2D MakeHPVector2D(OOHPScalar vx, OOHPScalar vy) INLINE_CONST_FU
 OOINLINE HPVector vectorToHPVector(Vector v) INLINE_CONST_FUNC;
 OOINLINE Vector HPVectorToVector(HPVector v) INLINE_CONST_FUNC;
 
-#if !OOMATHS_STANDALONE
 /* Generate random vectors. */
 HPVector OORandomUnitHPVector(void);
 HPVector OOHPVectorRandomSpatial(OOHPScalar maxLength);	// Random vector uniformly distributed in radius-maxLength sphere. (Longer vectors are more common.)
@@ -78,8 +77,6 @@ HPVector OORandomPositionInShell(HPVector centre, OOHPScalar inner, OOHPScalar o
 /* returns the projection of 'point' to the plane defined by the point
 	 'plane' and the normal vector 'normal' */
 HPVector OOProjectHPVectorToPlane(HPVector point, HPVector plane, HPVector normal);
-#endif
-
 
 /* Multiply vector by scalar (in place) */
 OOINLINE void HPscale_vector(HPVector *outHPVector, OOHPScalar factor) ALWAYS_INLINE_FUNC NONNULL_FUNC;
@@ -142,11 +139,9 @@ NSArray *ArrayFromHPVector(HPVector vector);
 
 #endif
 
-#if OOMATHS_OPENGL_INTEGRATION
 /*	OpenGL conveniences. Need to be macros to work with OOMacroOpenGL. */
 #define GLVertexOOHPVector(v) do { HPVector v_ = v; glVertex3f(v_.x, v_.y, v_.z); } while (0)
 #define GLTranslateOOHPVector(v) do { HPVector v_ = v; OOGL(glTranslatef(v_.x, v_.y, v_.z)); } while (0)
-#endif
 
 
 /*** Only inline definitions beyond this point ***/
@@ -355,6 +350,3 @@ OOINLINE HPVector HPnormal_to_surface(HPVector v1, HPVector v2, HPVector v3)
 	d1 = HPvector_subtract(v3, v2);
 	return HPcross_product(d0, d1);
 }
-
-
-#endif	/* INCLUDED_OOMATHS_h */

src/Core/OOHPVector.m

@@ -52,7 +52,6 @@
 #endif
 
 
-#if !OOMATHS_STANDALONE
 /*	This generates random vectors distrubuted evenly over the surface of the
 	unit sphere. It does this the simple way, by generating vectors in the
 	half-unit cube and rejecting those outside the half-unit sphere (and the
@@ -142,5 +141,3 @@ HPVector OOProjectHPVectorToPlane(HPVector point, HPVector plane, HPVector norma
 {
 	return HPvector_subtract(point,HPvector_multiply_scalar(normal,HPdot_product(HPvector_subtract(point, plane), normal)));
 }
-
-#endif

src/Core/OOJoystickManager.h

@@ -35,6 +35,8 @@ MA 02110-1301, USA.
 
 */
 
+#pragma once
+
 #import "OOFoundation.h"
 
 

src/Core/OOJoystickProfile.h

@@ -32,6 +32,10 @@ MA 02110-1301, USA.
 
 */
 
+#pragma once
+
+#import "OOFoundation.h"
+
 #define STICKPROFILE_TYPE_STANDARD	1
 #define STICKPROFILE_TYPE_SPLINE	2
 #define STICKPROFILE_MAX_POWER		10.0

src/Core/OOMaths.h

@@ -28,21 +28,12 @@ MA 02110-1301, USA.
 */
 
 
-#ifndef INCLUDED_OOMATHS_h
-#define INCLUDED_OOMATHS_h
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef OOMATHS_STANDALONE
-#define OOMATHS_STANDALONE 0
-#endif
-
-#ifndef OOMATHS_OPENGL_INTEGRATION
-#define OOMATHS_OPENGL_INTEGRATION !OOMATHS_STANDALONE
-#endif
-
 #ifdef __OBJC__
 #import <Foundation/Foundation.h>
 #endif
@@ -54,17 +45,9 @@ extern "C" {
 #include <stdint.h>
 #include <limits.h>
 #include <assert.h>
-
-#if OOMATHS_OPENGL_INTEGRATION
 #include "OOOpenGL.h"
-#endif
-
 
-#if OOMATHS_OPENGL_INTEGRATION
 typedef GLfloat OOScalar;
-#else
-typedef float OOScalar;
-#endif
 
 typedef double OOHPScalar;
 
@@ -119,23 +102,14 @@ typedef double OOHPScalar;
 #endif
 
 
-#include "OOFastArithmetic.h"
-#include "OOVector.h"
 #include "OOHPVector.h"
-#include "OOQuaternion.h"
 #include "OOMatrix.h"
-
-#if !OOMATHS_STANDALONE
 #include "OOVoxel.h"
 #include "OOTriangle.h"
 #include "OOBoundingBox.h"
-
 #include "legacy_random.h"
-#endif
 
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif	/* INCLUDED_OOMATHS_h */