From 0b5bce9117e6c8d41b9e3b292c21886d097ff91b Mon Sep 17 00:00:00 2001 From: mcarans Date: Mon, 21 Sep 2026 12:22:16 +1200 Subject: [PATCH] Fix includes so that include sorting in clangformat doesn't break anything --- src/Core/Debug/OODebuggerInterface.h | 4 +++ src/Core/Entities/DockEntity.h | 2 ++ src/Core/Entities/Entity.h | 1 + src/Core/Entities/OOVisualEffectEntity.h | 2 ++ src/Core/Entities/OOWaypointEntity.h | 2 ++ src/Core/Entities/PlanetEntity.h | 2 ++ src/Core/Entities/PlayerEntity.h | 2 ++ src/Core/Entities/ShipEntity.h | 2 ++ src/Core/Entities/StationEntity.h | 2 ++ src/Core/Entities/WormholeEntity.h | 2 ++ src/Core/Materials/OOConcreteTexture.h | 3 ++ src/Core/Materials/OOConcreteTexture.m | 2 -- .../Materials/OOShaderUniformMethodType.h | 1 - src/Core/Materials/OOTexture.h | 2 ++ src/Core/Materials/OOTextureInternal.h | 2 ++ src/Core/NSFileManagerOOExtensions.h | 4 ++- src/Core/OOALSoundChannel.h | 3 +- src/Core/OOBoundingBox.h | 8 ++---- src/Core/OOEquipmentType.h | 2 ++ src/Core/OOFastArithmetic.h | 10 +------ src/Core/OOFoundation.h | 3 ++ src/Core/OOHPVector.h | 14 ++-------- src/Core/OOHPVector.m | 3 -- src/Core/OOJoystickManager.h | 2 ++ src/Core/OOJoystickProfile.h | 4 +++ src/Core/OOMaths.h | 28 +------------------ src/Core/OOMatrix.h | 11 ++------ src/Core/OOMatrix.m | 7 ----- src/Core/OOOpenGLExtensionManager.h | 2 ++ src/Core/OOOpenGLOnly.h | 26 +---------------- src/Core/OOQuaternion.h | 11 -------- src/Core/OOQuaternion.m | 2 -- src/Core/OOSound.h | 2 ++ src/Core/OOTriangle.h | 8 ------ src/Core/OOVector.h | 14 +--------- src/Core/OOVector.m | 5 ---- src/Core/OOVoxel.h | 8 ------ .../Scripting/EntityOOJavaScriptExtensions.h | 1 + .../Scripting/EntityOOJavaScriptExtensions.m | 1 - src/Core/Scripting/OOJSDock.h | 3 ++ src/Core/Scripting/OOJSDock.m | 1 - src/Core/Scripting/OOJSEntity.h | 1 + src/Core/Scripting/OOJSEntity.m | 1 - src/Core/Scripting/OOJSEquipmentInfo.h | 3 ++ src/Core/Scripting/OOJSEquipmentInfo.m | 1 - src/Core/Scripting/OOJSFlasher.h | 2 ++ src/Core/Scripting/OOJSPlanet.h | 4 +++ src/Core/Scripting/OOJSPlanet.m | 2 -- src/Core/Scripting/OOJSPlayer.h | 4 +++ src/Core/Scripting/OOJSPlayer.m | 1 - src/Core/Scripting/OOJSPlayerShip.h | 3 ++ src/Core/Scripting/OOJSPlayerShip.m | 1 - src/Core/Scripting/OOJSShip.h | 3 ++ src/Core/Scripting/OOJSShip.m | 1 - src/Core/Scripting/OOJSSound.h | 3 ++ src/Core/Scripting/OOJSSound.m | 1 - src/Core/Scripting/OOJSStation.h | 3 ++ src/Core/Scripting/OOJSStation.m | 1 - src/Core/Scripting/OOJSVisualEffect.h | 3 ++ src/Core/Scripting/OOJSWaypoint.h | 2 ++ src/Core/Scripting/OOJSWaypoint.m | 1 - src/Core/Scripting/OOJSWormhole.h | 3 ++ src/Core/Scripting/OOJSWormhole.m | 1 - src/Core/Scripting/OOJavaScriptEngine.h | 2 ++ src/SDL/MyOpenGLView+Input.h | 3 ++ src/SDL/MyOpenGLView+Input.m | 1 - src/SDL/MyOpenGLView.h | 1 + src/SDL/MyOpenGLView.m | 1 - 68 files changed, 103 insertions(+), 164 deletions(-) diff --git a/src/Core/Debug/OODebuggerInterface.h b/src/Core/Debug/OODebuggerInterface.h index 77771fd64..7ead14486 100644 --- a/src/Core/Debug/OODebuggerInterface.h +++ b/src/Core/Debug/OODebuggerInterface.h @@ -30,6 +30,10 @@ SOFTWARE. */ +#pragma once + +#import "OOFoundation.h" + @class OODebugMonitor; // Interface for debugger. diff --git a/src/Core/Entities/DockEntity.h b/src/Core/Entities/DockEntity.h index 61787e0d8..6ab0a0f6d 100644 --- a/src/Core/Entities/DockEntity.h +++ b/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 diff --git a/src/Core/Entities/Entity.h b/src/Core/Entities/Entity.h index 07eca838b..254704dd3 100644 --- a/src/Core/Entities/Entity.h +++ b/src/Core/Entities/Entity.h @@ -24,6 +24,7 @@ MA 02110-1301, USA. */ +#pragma once #import "OOFoundation.h" #import "OOMaths.h" diff --git a/src/Core/Entities/OOVisualEffectEntity.h b/src/Core/Entities/OOVisualEffectEntity.h index 19f8b43e0..d98e808fb 100644 --- a/src/Core/Entities/OOVisualEffectEntity.h +++ b/src/Core/Entities/OOVisualEffectEntity.h @@ -24,6 +24,8 @@ */ +#pragma once + #import "OOEntityWithDrawable.h" #import "OOPlanetEntity.h" #import "OOJSPropID.h" diff --git a/src/Core/Entities/OOWaypointEntity.h b/src/Core/Entities/OOWaypointEntity.h index 6fef0b23e..226be4540 100644 --- a/src/Core/Entities/OOWaypointEntity.h +++ b/src/Core/Entities/OOWaypointEntity.h @@ -25,6 +25,8 @@ MA 02110-1301, USA. */ +#pragma once + #import "Entity.h" @interface OOWaypointEntity: Entity diff --git a/src/Core/Entities/PlanetEntity.h b/src/Core/Entities/PlanetEntity.h index 9bd6d4872..cefc52352 100644 --- a/src/Core/Entities/PlanetEntity.h +++ b/src/Core/Entities/PlanetEntity.h @@ -24,6 +24,8 @@ MA 02110-1301, USA. */ +#pragma once + #import "OOStellarBody.h" #if !NEW_PLANETS diff --git a/src/Core/Entities/PlayerEntity.h b/src/Core/Entities/PlayerEntity.h index cfb84fd54..59b367153 100644 --- a/src/Core/Entities/PlayerEntity.h +++ b/src/Core/Entities/PlayerEntity.h @@ -26,6 +26,8 @@ MA 02110-1301, USA. */ +#pragma once + #import #import "WormholeEntity.h" #import "ShipEntity.h" diff --git a/src/Core/Entities/ShipEntity.h b/src/Core/Entities/ShipEntity.h index 57faa4c83..23f71ab40 100644 --- a/src/Core/Entities/ShipEntity.h +++ b/src/Core/Entities/ShipEntity.h @@ -25,6 +25,8 @@ */ +#pragma once + #import "OOEntityWithDrawable.h" #import "OOPlanetEntity.h" #import "OOJSPropID.h" diff --git a/src/Core/Entities/StationEntity.h b/src/Core/Entities/StationEntity.h index a5ab3627c..b3373852f 100644 --- a/src/Core/Entities/StationEntity.h +++ b/src/Core/Entities/StationEntity.h @@ -24,6 +24,8 @@ MA 02110-1301, USA. */ +#pragma once + #import "ShipEntity.h" #import "OOJSInterfaceDefinition.h" #import "Universe.h" diff --git a/src/Core/Entities/WormholeEntity.h b/src/Core/Entities/WormholeEntity.h index 8699445c1..d0f5f3b97 100644 --- a/src/Core/Entities/WormholeEntity.h +++ b/src/Core/Entities/WormholeEntity.h @@ -26,6 +26,8 @@ MA 02110-1301, USA. */ +#pragma once + #import "Entity.h" #define WORMHOLE_EXPIRES_TIMEINTERVAL 900.0 diff --git a/src/Core/Materials/OOConcreteTexture.h b/src/Core/Materials/OOConcreteTexture.h index 61f5d31a8..0a7f0954d 100644 --- a/src/Core/Materials/OOConcreteTexture.h +++ b/src/Core/Materials/OOConcreteTexture.h @@ -28,6 +28,9 @@ SOFTWARE. */ +#pragma once + +#import "OOOpenGLExtensionManager.h" #import "OOTexture.h" diff --git a/src/Core/Materials/OOConcreteTexture.m b/src/Core/Materials/OOConcreteTexture.m index 830918fe9..5531ed0e2 100644 --- a/src/Core/Materials/OOConcreteTexture.m +++ b/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" diff --git a/src/Core/Materials/OOShaderUniformMethodType.h b/src/Core/Materials/OOShaderUniformMethodType.h index 34a5488f2..81f1511c9 100644 --- a/src/Core/Materials/OOShaderUniformMethodType.h +++ b/src/Core/Materials/OOShaderUniformMethodType.h @@ -33,7 +33,6 @@ SOFTWARE. #if OO_SHADERS || !defined(NDEBUG) #import "OOMaths.h" -#import "OOHPVector.h" typedef enum diff --git a/src/Core/Materials/OOTexture.h b/src/Core/Materials/OOTexture.h index cd4d5342b..f7071cf76 100644 --- a/src/Core/Materials/OOTexture.h +++ b/src/Core/Materials/OOTexture.h @@ -31,6 +31,8 @@ SOFTWARE. */ +#pragma once + #import #import "OOOpenGL.h" diff --git a/src/Core/Materials/OOTextureInternal.h b/src/Core/Materials/OOTextureInternal.h index d751e48fe..80d5ff309 100644 --- a/src/Core/Materials/OOTextureInternal.h +++ b/src/Core/Materials/OOTextureInternal.h @@ -27,6 +27,8 @@ SOFTWARE. */ +#pragma once + #import "OOTexture.h" #import "OOOpenGLExtensionManager.h" diff --git a/src/Core/NSFileManagerOOExtensions.h b/src/Core/NSFileManagerOOExtensions.h index 6ab137205..27d1ebe6d 100644 --- a/src/Core/NSFileManagerOOExtensions.h +++ b/src/Core/NSFileManagerOOExtensions.h @@ -26,7 +26,9 @@ MA 02110-1301, USA. */ -#import +#pragma once + +#import "OOFoundation.h" #define SAVEDIR "oolite-saves" diff --git a/src/Core/OOALSoundChannel.h b/src/Core/OOALSoundChannel.h index 8ac03aa15..345a329ff 100644 --- a/src/Core/OOALSoundChannel.h +++ b/src/Core/OOALSoundChannel.h @@ -30,7 +30,8 @@ SOFTWARE. */ -#import +#pragma once + #import "OOOpenALController.h" #import "OOMaths.h" diff --git a/src/Core/OOBoundingBox.h b/src/Core/OOBoundingBox.h index cfd7fca64..dde33ce56 100644 --- a/src/Core/OOBoundingBox.h +++ b/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 diff --git a/src/Core/OOEquipmentType.h b/src/Core/OOEquipmentType.h index fc7bc609b..6af455b14 100644 --- a/src/Core/OOEquipmentType.h +++ b/src/Core/OOEquipmentType.h @@ -28,6 +28,8 @@ SOFTWARE. */ +#pragma once + #import "OOFoundation.h" #import "OOTypes.h" #import "OOScript.h" diff --git a/src/Core/OOFastArithmetic.h b/src/Core/OOFastArithmetic.h index a81a9571b..f809b71bb 100644 --- a/src/Core/OOFastArithmetic.h +++ b/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 */ diff --git a/src/Core/OOFoundation.h b/src/Core/OOFoundation.h index a286f7312..96fe63c1b 100644 --- a/src/Core/OOFoundation.h +++ b/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 diff --git a/src/Core/OOHPVector.h b/src/Core/OOHPVector.h index a62be4528..49dc6b8e4 100644 --- a/src/Core/OOHPVector.h +++ b/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 */ diff --git a/src/Core/OOHPVector.m b/src/Core/OOHPVector.m index bf739c8ea..b58ea810c 100644 --- a/src/Core/OOHPVector.m +++ b/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 diff --git a/src/Core/OOJoystickManager.h b/src/Core/OOJoystickManager.h index 8d3b8966c..3ca2b3ce8 100644 --- a/src/Core/OOJoystickManager.h +++ b/src/Core/OOJoystickManager.h @@ -35,6 +35,8 @@ MA 02110-1301, USA. */ +#pragma once + #import "OOFoundation.h" diff --git a/src/Core/OOJoystickProfile.h b/src/Core/OOJoystickProfile.h index 19810b924..9ccd177ef 100644 --- a/src/Core/OOJoystickProfile.h +++ b/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 diff --git a/src/Core/OOMaths.h b/src/Core/OOMaths.h index 0c820f369..fd15892bf 100644 --- a/src/Core/OOMaths.h +++ b/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 #endif @@ -54,17 +45,9 @@ extern "C" { #include #include #include - -#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 */ diff --git a/src/Core/OOMatrix.h b/src/Core/OOMatrix.h index f0901f764..f7f182150 100644 --- a/src/Core/OOMatrix.h +++ b/src/Core/OOMatrix.h @@ -25,9 +25,8 @@ MA 02110-1301, USA. */ -#ifndef INCLUDED_OOMATHS_h - #error Do not include OOMatrix.h directly; include OOMaths.h. -#else +#include "OOVector.h" +#include "OOQuaternion.h" typedef struct OOMatrix { @@ -98,7 +97,6 @@ OOINLINE void OOMatrixGetBasisVectors(OOMatrix m, Vector *outRight, Vector *outU OOMatrix OOMatrixOrthogonalize(OOMatrix m) CONST_FUNC; -#if OOMATHS_OPENGL_INTEGRATION /* OpenGL conveniences. Need to be macros to work with OOMacroOpenGL. */ #define OOMatrixValuesForOpenGL(M) (&(M).m[0][0]) #define GLMultOOMatrix(M) do { OOMatrix m_ = M; OOGL(glMultMatrixf(OOMatrixValuesForOpenGL(m_))); } while (0) @@ -109,7 +107,6 @@ OOMatrix OOMatrixOrthogonalize(OOMatrix m) CONST_FUNC; void GLUniformMatrix3(GLint location, OOMatrix M); OOINLINE OOMatrix OOMatrixLoadGLMatrix(GLenum matrixID) ALWAYS_INLINE_FUNC; -#endif #if __OBJC__ @@ -364,13 +361,9 @@ OOINLINE OOMatrix OOMatrixTranspose(OOMatrix m) } -#if OOMATHS_OPENGL_INTEGRATION OOINLINE OOMatrix OOMatrixLoadGLMatrix(GLenum matrixID) { OOMatrix m; glGetFloatv(matrixID, OOMatrixValuesForOpenGL(m)); return m; } -#endif - -#endif /* INCLUDED_OOMATHS_h */ diff --git a/src/Core/OOMatrix.m b/src/Core/OOMatrix.m index 38e98acd3..f616df8a0 100644 --- a/src/Core/OOMatrix.m +++ b/src/Core/OOMatrix.m @@ -22,11 +22,8 @@ */ - #include "OOMaths.h" -#if OOMATHS_OPENGL_INTEGRATION #import "OOOpenGLExtensionManager.h" -#endif const OOMatrix kIdentityMatrix = { .m = { @@ -452,8 +449,6 @@ OOMatrix OOMatrixInverseWithDeterminant(OOMatrix M, OOScalar *d) return B; } -#if OOMATHS_OPENGL_INTEGRATION - void GLUniformMatrix3(int location, OOMatrix M) { OOScalar m[9]; @@ -469,5 +464,3 @@ void GLUniformMatrix3(int location, OOMatrix M) OOGL(glUniformMatrix3fvARB(location, 1, NO, m)); } -#endif - diff --git a/src/Core/OOOpenGLExtensionManager.h b/src/Core/OOOpenGLExtensionManager.h index 214141a89..bc2eabace 100644 --- a/src/Core/OOOpenGLExtensionManager.h +++ b/src/Core/OOOpenGLExtensionManager.h @@ -31,6 +31,8 @@ SOFTWARE. */ +#pragma once + #import "OOFoundation.h" #import "OOOpenGL.h" #import "OOFunctionAttributes.h" diff --git a/src/Core/OOOpenGLOnly.h b/src/Core/OOOpenGLOnly.h index 89b4b4e4f..f6234b430 100644 --- a/src/Core/OOOpenGLOnly.h +++ b/src/Core/OOOpenGLOnly.h @@ -25,27 +25,9 @@ MA 02110-1301, USA. */ -#ifndef OOLITE_SDL -#if (!OOLITE_MAC_OS_X && GNUSTEP_BASE_LIBRARY) -#define OOLITE_SDL 1 -#endif -#endif - -#if OOLITE_MAC_OS_X - -// Apple OpenGL includes... -#include -#include -#include -#include - -#elif OOLITE_SDL - +#pragma once // SDL OpenGL includes... -// prevent the including of SDL_opengl.h loading a previous version of glext.h -#define NO_SDL_GLEXT - // GL_GLEXT_PROTOTYPES must be defined for the Linux build to use shaders. #if OOLITE_LINUX #ifndef GL_GLEXT_PROTOTYPES @@ -65,9 +47,3 @@ MA 02110-1301, USA. #undef GL_GLEXT_PROTOTYPES #undef __DEFINED_GL_GLEXT_PROTOTYPES #endif - -#else // Not OS X or SDL - -#error OOOpenGL.h: unknown target! - -#endif diff --git a/src/Core/OOQuaternion.h b/src/Core/OOQuaternion.h index 8c2168fa8..dab9477ae 100644 --- a/src/Core/OOQuaternion.h +++ b/src/Core/OOQuaternion.h @@ -25,11 +25,6 @@ MA 02110-1301, USA. */ -#ifndef INCLUDED_OOMATHS_h - #error Do not include OOQuaternion.h directly; include OOMaths.h. -#else - - typedef struct Quaternion { OOScalar w; @@ -58,11 +53,9 @@ OOINLINE Quaternion quaternion_negate(Quaternion q) INLINE_CONST_FUNC; /* Conjugate, or spacial inverse -- negate x, y, z components */ OOINLINE Quaternion quaternion_conjugate(Quaternion q) INLINE_CONST_FUNC; -#if !OOMATHS_STANDALONE /* Set quaternion to random unit quaternion */ void quaternion_set_random(Quaternion *quat) NONNULL_FUNC; OOINLINE Quaternion OORandomQuaternion(void) ALWAYS_INLINE_FUNC; -#endif /* Build quaternion representing a rotation around a given axis */ OOINLINE void quaternion_set_rotate_about_axis(Quaternion *quat, Vector axis, OOScalar angle) NONNULL_FUNC; @@ -170,13 +163,9 @@ OOINLINE void quaternion_normalize(Quaternion *quat) } -#if !OOMATHS_STANDALONE OOINLINE Quaternion OORandomQuaternion(void) { Quaternion q; quaternion_set_random(&q); return q; } -#endif - -#endif /* INCLUDED_OOMATHS_h */ diff --git a/src/Core/OOQuaternion.m b/src/Core/OOQuaternion.m index d11b78ace..d072ede56 100644 --- a/src/Core/OOQuaternion.m +++ b/src/Core/OOQuaternion.m @@ -41,7 +41,6 @@ Quaternion quaternion_multiply(Quaternion q1, Quaternion q2) } -#if !OOMATHS_STANDALONE // NOTE: this is broken - its distribution is weighted towards corners of the hypercube. Probably doesn't matter, though. void quaternion_set_random(Quaternion *quat) { @@ -51,7 +50,6 @@ void quaternion_set_random(Quaternion *quat) quat->z = (OOScalar)(Ranrot() % 1024) - 511.5f; // -511.5 to +511.5 quaternion_normalize(quat); } -#endif Vector vector_forward_from_quaternion(Quaternion quat) diff --git a/src/Core/OOSound.h b/src/Core/OOSound.h index d7510e696..fa4924884 100644 --- a/src/Core/OOSound.h +++ b/src/Core/OOSound.h @@ -41,6 +41,8 @@ MA 02110-1301, USA. */ +#pragma once + #import "OOFoundation.h" #define OOLITE_OPENAL 1 diff --git a/src/Core/OOTriangle.h b/src/Core/OOTriangle.h index 49e759d6d..48f6ecd61 100644 --- a/src/Core/OOTriangle.h +++ b/src/Core/OOTriangle.h @@ -25,11 +25,6 @@ MA 02110-1301, USA. */ -#ifndef INCLUDED_OOMATHS_h - #error Do not include OOTriangle.h directly; include OOMaths.h. -#else - - typedef struct { Vector v[3]; @@ -81,6 +76,3 @@ OOINLINE bool OOTriangleIsDegenerate(Triangle tri) vector_equal(tri.v[1], tri.v[2]) || vector_equal(tri.v[2], tri.v[0]); } - - -#endif /* INCLUDED_OOMATHS_h */ diff --git a/src/Core/OOVector.h b/src/Core/OOVector.h index b622affa1..8184584fe 100644 --- a/src/Core/OOVector.h +++ b/src/Core/OOVector.h @@ -24,11 +24,7 @@ MA 02110-1301, USA. */ - -#ifndef INCLUDED_OOMATHS_h - #error Do not include OOVector.h directly; include OOMaths.h. -#else - +#pragma once #ifndef OOMATHS_EXTERNAL_VECTOR_TYPES @@ -64,7 +60,6 @@ extern const Vector2D kZeroVector2D, /* 0, 0 */ OOINLINE Vector make_vector(OOScalar vx, OOScalar vy, OOScalar vz) INLINE_CONST_FUNC; OOINLINE Vector2D MakeVector2D(OOScalar vx, OOScalar vy) INLINE_CONST_FUNC; -#if !OOMATHS_STANDALONE /* Generate random vectors. */ Vector OORandomUnitVector(void); Vector OOVectorRandomSpatial(OOScalar maxLength); // Random vector uniformly distributed in radius-maxLength sphere. (Longer vectors are more common.) @@ -72,7 +67,6 @@ Vector OOVectorRandomRadial(OOScalar maxLength); // Random vector with uniform // only needed in high-precision forms so far //Vector OORandomPositionInCylinder(Vector centre1, OOScalar exclusion1, Vector centre2, OOScalar exclusion2, OOScalar radius); //Vector OORandomPositionInShell(Vector centre, OOScalar inner, OOScalar outer); -#endif /* Multiply vector by scalar (in place) */ OOINLINE void scale_vector(Vector *outVector, OOScalar factor) ALWAYS_INLINE_FUNC NONNULL_FUNC; @@ -145,12 +139,9 @@ NSString *VectorDescription(Vector vector); // @"(x, y, z)" #endif -#if OOMATHS_OPENGL_INTEGRATION /* OpenGL conveniences. Need to be macros to work with OOMacroOpenGL. */ #define GLVertexOOVector(v) do { Vector v_ = v; glVertex3f(v_.x, v_.y, v_.z); } while (0) #define GLTranslateOOVector(v) do { Vector v_ = v; OOGL(glTranslatef(v_.x, v_.y, v_.z)); } while (0) -#endif - /*** Only inline definitions beyond this point ***/ @@ -343,6 +334,3 @@ OOINLINE Vector normal_to_surface(Vector v1, Vector v2, Vector v3) d1 = vector_subtract(v3, v2); return cross_product(d0, d1); } - - -#endif /* INCLUDED_OOMATHS_h */ diff --git a/src/Core/OOVector.m b/src/Core/OOVector.m index 73ca06ab2..ad2bea6de 100644 --- a/src/Core/OOVector.m +++ b/src/Core/OOVector.m @@ -34,9 +34,7 @@ const Vector2D kBasisXVector2D = { 1.0f, 0.0f }; const Vector2D kBasisYVector2D = { 0.0f, 1.0f }; -#if !OOMATHS_STANDALONE const BoundingBox kZeroBoundingBox = {{ 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }}; -#endif #if __OBJC__ @@ -69,7 +67,6 @@ - (Vector) getVector -#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 @@ -151,5 +148,3 @@ Vector OORandomPositionInShell(Vector centre, OOScalar inner, OOScalar outer) } while(distance2(result,centre) #include +#import "DockEntity.h" @class DockEntity; diff --git a/src/Core/Scripting/OOJSDock.m b/src/Core/Scripting/OOJSDock.m index 07afb8ffd..f2a6d6d84 100644 --- a/src/Core/Scripting/OOJSDock.m +++ b/src/Core/Scripting/OOJSDock.m @@ -27,7 +27,6 @@ #import "OOJSPlayer.h" #import "OOJavaScriptEngine.h" -#import "DockEntity.h" #import "GameController.h" diff --git a/src/Core/Scripting/OOJSEntity.h b/src/Core/Scripting/OOJSEntity.h index 9d2e079ee..1201036ee 100644 --- a/src/Core/Scripting/OOJSEntity.h +++ b/src/Core/Scripting/OOJSEntity.h @@ -27,6 +27,7 @@ MA 02110-1301, USA. #import #import "OOJavaScriptEngine.h" #import "Universe.h" +#import "EntityOOJavaScriptExtensions.h" @class Entity; diff --git a/src/Core/Scripting/OOJSEntity.m b/src/Core/Scripting/OOJSEntity.m index 79d78fac7..4f4712c94 100644 --- a/src/Core/Scripting/OOJSEntity.m +++ b/src/Core/Scripting/OOJSEntity.m @@ -27,7 +27,6 @@ #import "OOJSQuaternion.h" #import "OOJavaScriptEngine.h" #import "OOConstToJSString.h" -#import "EntityOOJavaScriptExtensions.h" #import "OOJSCall.h" #import "OOJSPlayer.h" diff --git a/src/Core/Scripting/OOJSEquipmentInfo.h b/src/Core/Scripting/OOJSEquipmentInfo.h index ff0144f6c..d88004dfe 100644 --- a/src/Core/Scripting/OOJSEquipmentInfo.h +++ b/src/Core/Scripting/OOJSEquipmentInfo.h @@ -25,8 +25,11 @@ MA 02110-1301, USA. */ +#pragma once + #include #import "OOFoundation.h" +#import "OOEquipmentType.h" @class OOEquipmentType; diff --git a/src/Core/Scripting/OOJSEquipmentInfo.m b/src/Core/Scripting/OOJSEquipmentInfo.m index 28a60f4f6..399daa132 100644 --- a/src/Core/Scripting/OOJSEquipmentInfo.m +++ b/src/Core/Scripting/OOJSEquipmentInfo.m @@ -25,7 +25,6 @@ #import "OOJSEquipmentInfo.h" #import "OOJavaScriptEngine.h" -#import "OOEquipmentType.h" #import "OOJSPlayer.h" #import "OODebugStandards.h" diff --git a/src/Core/Scripting/OOJSFlasher.h b/src/Core/Scripting/OOJSFlasher.h index 0999f4b35..d835041d7 100644 --- a/src/Core/Scripting/OOJSFlasher.h +++ b/src/Core/Scripting/OOJSFlasher.h @@ -24,6 +24,8 @@ MA 02110-1301, USA. */ +#pragma once + #import #include #import "OOFlasherEntity.h" diff --git a/src/Core/Scripting/OOJSPlanet.h b/src/Core/Scripting/OOJSPlanet.h index d0368ea4e..f4ab262b9 100644 --- a/src/Core/Scripting/OOJSPlanet.h +++ b/src/Core/Scripting/OOJSPlanet.h @@ -25,8 +25,12 @@ MA 02110-1301, USA. */ +#pragma once + #import #include +#import "OOPlanetEntity.h" + @class OOPlanetEntity; diff --git a/src/Core/Scripting/OOJSPlanet.m b/src/Core/Scripting/OOJSPlanet.m index 2ad763555..b828086c3 100644 --- a/src/Core/Scripting/OOJSPlanet.m +++ b/src/Core/Scripting/OOJSPlanet.m @@ -29,8 +29,6 @@ #import "OOJSQuaternion.h" #import "OOJSVector.h" -#import "OOPlanetEntity.h" - static JSObject *sPlanetPrototype; diff --git a/src/Core/Scripting/OOJSPlayer.h b/src/Core/Scripting/OOJSPlayer.h index 79a3e81e4..dafb7c951 100644 --- a/src/Core/Scripting/OOJSPlayer.h +++ b/src/Core/Scripting/OOJSPlayer.h @@ -24,8 +24,12 @@ MA 02110-1301, USA. */ +#pragma once + #import #include +#import "PlayerEntity.h" + @class PlayerEntity; diff --git a/src/Core/Scripting/OOJSPlayer.m b/src/Core/Scripting/OOJSPlayer.m index 7b73badcc..119a70a18 100644 --- a/src/Core/Scripting/OOJSPlayer.m +++ b/src/Core/Scripting/OOJSPlayer.m @@ -29,7 +29,6 @@ #import "OOJavaScriptEngine.h" #import "EntityOOJavaScriptExtensions.h" -#import "PlayerEntity.h" #import "PlayerEntityContracts.h" #import "PlayerEntityScriptMethods.h" #import "PlayerEntityLegacyScriptEngine.h" diff --git a/src/Core/Scripting/OOJSPlayerShip.h b/src/Core/Scripting/OOJSPlayerShip.h index 6169fb989..82581d41a 100644 --- a/src/Core/Scripting/OOJSPlayerShip.h +++ b/src/Core/Scripting/OOJSPlayerShip.h @@ -31,8 +31,11 @@ MA 02110-1301, USA. */ +#pragma once + #import #include +#import "PlayerEntity.h" @class PlayerEntity; diff --git a/src/Core/Scripting/OOJSPlayerShip.m b/src/Core/Scripting/OOJSPlayerShip.m index 26265fa9d..ef09e5dd4 100644 --- a/src/Core/Scripting/OOJSPlayerShip.m +++ b/src/Core/Scripting/OOJSPlayerShip.m @@ -31,7 +31,6 @@ #import "OOJavaScriptEngine.h" #import "EntityOOJavaScriptExtensions.h" #import "OOSystemDescriptionManager.h" -#import "PlayerEntity.h" #import "PlayerEntityControls.h" #import "PlayerEntityContracts.h" #import "PlayerEntityScriptMethods.h" diff --git a/src/Core/Scripting/OOJSShip.h b/src/Core/Scripting/OOJSShip.h index 3e5bab14d..562f2babb 100644 --- a/src/Core/Scripting/OOJSShip.h +++ b/src/Core/Scripting/OOJSShip.h @@ -24,8 +24,11 @@ MA 02110-1301, USA. */ +#pragma once + #import #include +#import "ShipEntity.h" @class ShipEntity; diff --git a/src/Core/Scripting/OOJSShip.m b/src/Core/Scripting/OOJSShip.m index ada8c5d31..5b80f2074 100644 --- a/src/Core/Scripting/OOJSShip.m +++ b/src/Core/Scripting/OOJSShip.m @@ -29,7 +29,6 @@ #import "OOJSQuaternion.h" #import "OOJSEquipmentInfo.h" #import "OOJavaScriptEngine.h" -#import "ShipEntity.h" #import "ShipEntityAI.h" #import "ShipEntityScriptMethods.h" #import "StationEntity.h" diff --git a/src/Core/Scripting/OOJSSound.h b/src/Core/Scripting/OOJSSound.h index 3e42ed396..b90430c32 100644 --- a/src/Core/Scripting/OOJSSound.h +++ b/src/Core/Scripting/OOJSSound.h @@ -24,8 +24,11 @@ MA 02110-1301, USA. */ +#pragma once #import #include +#import "OOSound.h" + @class OOSound; diff --git a/src/Core/Scripting/OOJSSound.m b/src/Core/Scripting/OOJSSound.m index 76b9e3269..1a6d563b7 100644 --- a/src/Core/Scripting/OOJSSound.m +++ b/src/Core/Scripting/OOJSSound.m @@ -24,7 +24,6 @@ #import "OOJSSound.h" #import "OOJavaScriptEngine.h" -#import "OOSound.h" #import "OOMusicController.h" #import "ResourceManager.h" #import "Universe.h" diff --git a/src/Core/Scripting/OOJSStation.h b/src/Core/Scripting/OOJSStation.h index 43fb64873..ddfdfe079 100644 --- a/src/Core/Scripting/OOJSStation.h +++ b/src/Core/Scripting/OOJSStation.h @@ -24,8 +24,11 @@ MA 02110-1301, USA. */ +#pragma once + #import #include +#import "StationEntity.h" @class StationEntity; diff --git a/src/Core/Scripting/OOJSStation.m b/src/Core/Scripting/OOJSStation.m index f7f8489fe..aa61c8fde 100644 --- a/src/Core/Scripting/OOJSStation.m +++ b/src/Core/Scripting/OOJSStation.m @@ -33,7 +33,6 @@ #import "OOEquipmentType.h" #import "OOShipRegistry.h" #import "OOConstToString.h" -#import "StationEntity.h" #import "GameController.h" diff --git a/src/Core/Scripting/OOJSVisualEffect.h b/src/Core/Scripting/OOJSVisualEffect.h index 75add867c..954df53e0 100644 --- a/src/Core/Scripting/OOJSVisualEffect.h +++ b/src/Core/Scripting/OOJSVisualEffect.h @@ -24,8 +24,11 @@ MA 02110-1301, USA. */ +#pragma once + #import #include +#import "OOVisualEffectEntity.h" @class OOVisualEffectEntity; diff --git a/src/Core/Scripting/OOJSWaypoint.h b/src/Core/Scripting/OOJSWaypoint.h index ccde61c98..e206d79d4 100644 --- a/src/Core/Scripting/OOJSWaypoint.h +++ b/src/Core/Scripting/OOJSWaypoint.h @@ -24,8 +24,10 @@ MA 02110-1301, USA. */ +#pragma once #import #include +#import "OOWaypointEntity.h" @class OOWaypointEntity; diff --git a/src/Core/Scripting/OOJSWaypoint.m b/src/Core/Scripting/OOJSWaypoint.m index 76583b8f0..0bc58bec1 100644 --- a/src/Core/Scripting/OOJSWaypoint.m +++ b/src/Core/Scripting/OOJSWaypoint.m @@ -21,7 +21,6 @@ */ -#import "OOWaypointEntity.h" #import "OOJSWaypoint.h" #import "OOJSEntity.h" #import "OOJSVector.h" diff --git a/src/Core/Scripting/OOJSWormhole.h b/src/Core/Scripting/OOJSWormhole.h index 7d0d76829..7ca87dc18 100644 --- a/src/Core/Scripting/OOJSWormhole.h +++ b/src/Core/Scripting/OOJSWormhole.h @@ -24,8 +24,11 @@ MA 02110-1301, USA. */ +#pragma once + #import #include +#import "WormholeEntity.h" @class WormholeEntity; diff --git a/src/Core/Scripting/OOJSWormhole.m b/src/Core/Scripting/OOJSWormhole.m index a7efd5b14..3a9360307 100644 --- a/src/Core/Scripting/OOJSWormhole.m +++ b/src/Core/Scripting/OOJSWormhole.m @@ -21,7 +21,6 @@ */ -#import "WormholeEntity.h" #import "OOJSWormhole.h" #import "OOJSEntity.h" #import "OOJSVector.h" diff --git a/src/Core/Scripting/OOJavaScriptEngine.h b/src/Core/Scripting/OOJavaScriptEngine.h index 36a67c160..0268b3369 100644 --- a/src/Core/Scripting/OOJavaScriptEngine.h +++ b/src/Core/Scripting/OOJavaScriptEngine.h @@ -23,6 +23,8 @@ MA 02110-1301, USA. */ +#pragma once + #import "OOFoundation.h" #import "Universe.h" #import "PlayerEntity.h" diff --git a/src/SDL/MyOpenGLView+Input.h b/src/SDL/MyOpenGLView+Input.h index 85145e3d6..933facdc2 100644 --- a/src/SDL/MyOpenGLView+Input.h +++ b/src/SDL/MyOpenGLView+Input.h @@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#pragma once + +#include @interface MyOpenGLView (Input) diff --git a/src/SDL/MyOpenGLView+Input.m b/src/SDL/MyOpenGLView+Input.m index 24ac98ef4..8dd6caa1a 100644 --- a/src/SDL/MyOpenGLView+Input.m +++ b/src/SDL/MyOpenGLView+Input.m @@ -8,7 +8,6 @@ #include #import "MyOpenGLView.h" - #import "GameController.h" #import "Universe.h" #import "OOSDLJoystickManager.h" diff --git a/src/SDL/MyOpenGLView.h b/src/SDL/MyOpenGLView.h index 828413ad2..dce29854f 100644 --- a/src/SDL/MyOpenGLView.h +++ b/src/SDL/MyOpenGLView.h @@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#pragma once #import "OOFoundation.h" #import "OOOpenGL.h" diff --git a/src/SDL/MyOpenGLView.m b/src/SDL/MyOpenGLView.m index cd83993ef..3208c9d43 100644 --- a/src/SDL/MyOpenGLView.m +++ b/src/SDL/MyOpenGLView.m @@ -27,7 +27,6 @@ #import "png.h" #import "MyOpenGLView.h" #import "MyOpenGLView+Input.h" - #import "GameController.h" #import "Universe.h" #import "OOSDLJoystickManager.h"