Run clang-format

SFML · Sep 1, 2024 · 54d2832 · 54d2832
1 parent 42aec92
commit 54d2832
Show file tree

Hide file tree

Showing 156 changed files with 1,035 additions and 767 deletions.
diff --git a/examples/example.c b/examples/example.c
@@ -6,8 +6,8 @@
 int main(void)
 {
     // Create the main window
-    const sfVideoMode mode = {{800, 600}, 32};
-    sfRenderWindow* window = sfRenderWindow_create(mode, "SFML window", sfResize | sfClose, sfWindowed, NULL);
+    const sfVideoMode mode   = {{800, 600}, 32};
+    sfRenderWindow*   window = sfRenderWindow_create(mode, "SFML window", sfResize | sfClose, sfWindowed, NULL);
     if (!window)
         return EXIT_FAILURE;
 
@@ -18,7 +18,7 @@ int main(void)
         sfRenderWindow_destroy(window);
         return EXIT_FAILURE;
     }
-    sfSprite* sprite = sfSprite_create(texture);
+    sfSprite*        sprite         = sfSprite_create(texture);
     const sfVector2f spritePosition = {200, 200};
     sfSprite_setPosition(sprite, spritePosition);
 

diff --git a/include/CSFML/Audio.h b/include/CSFML/Audio.h
@@ -28,7 +28,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 
-#include <CSFML/System.h>
 #include <CSFML/Audio/Listener.h>
 #include <CSFML/Audio/Music.h>
 #include <CSFML/Audio/Sound.h>
@@ -37,3 +36,4 @@
 #include <CSFML/Audio/SoundRecorder.h>
 #include <CSFML/Audio/SoundStatus.h>
 #include <CSFML/Audio/SoundStream.h>
+#include <CSFML/System.h>
diff --git a/include/CSFML/Audio/Export.h b/include/CSFML/Audio/Export.h
@@ -35,10 +35,10 @@
 ////////////////////////////////////////////////////////////
 #if defined(CSFML_AUDIO_EXPORTS)
 
-    #define CSFML_AUDIO_API CSFML_API_EXPORT
+#define CSFML_AUDIO_API CSFML_API_EXPORT
 
 #else
 
-    #define CSFML_AUDIO_API CSFML_API_IMPORT
+#define CSFML_AUDIO_API CSFML_API_IMPORT
 
 #endif
diff --git a/include/CSFML/Audio/Listener.h b/include/CSFML/Audio/Listener.h
@@ -28,6 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/Export.h>
+
 #include <CSFML/System/Vector3.h>
 
 

diff --git a/include/CSFML/Audio/Music.h b/include/CSFML/Audio/Music.h
@@ -28,11 +28,13 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/Export.h>
+
 #include <CSFML/Audio/SoundStatus.h>
 #include <CSFML/Audio/Types.h>
 #include <CSFML/System/InputStream.h>
 #include <CSFML/System/Time.h>
 #include <CSFML/System/Vector3.h>
+
 #include <stddef.h>
 
 

diff --git a/include/CSFML/Audio/Sound.h b/include/CSFML/Audio/Sound.h
@@ -28,6 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/Export.h>
+
 #include <CSFML/Audio/SoundStatus.h>
 #include <CSFML/Audio/Types.h>
 #include <CSFML/System/Time.h>
@@ -36,7 +37,7 @@
 
 ////////////////////////////////////////////////////////////
 /// \brief Create a new sound
-/// 
+///
 /// \param soundBuffer Sound buffer containing the audio data to play with the sound
 ///
 /// \return A new sfSound object

diff --git a/include/CSFML/Audio/SoundBuffer.h b/include/CSFML/Audio/SoundBuffer.h
@@ -28,10 +28,12 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/Export.h>
-#include <CSFML/Audio/Types.h>
+
 #include <CSFML/Audio/SoundChannel.h>
+#include <CSFML/Audio/Types.h>
 #include <CSFML/System/InputStream.h>
 #include <CSFML/System/Time.h>
+
 #include <stddef.h>
 
 
@@ -94,12 +96,13 @@ CSFML_AUDIO_API sfSoundBuffer* sfSoundBuffer_createFromStream(sfInputStream* str
 /// \return A new sfSoundBuffer object (NULL if failed)
 ///
 ////////////////////////////////////////////////////////////
-CSFML_AUDIO_API sfSoundBuffer* sfSoundBuffer_createFromSamples(const int16_t*  samples,
-                                                               uint64_t        sampleCount,
-                                                               unsigned int    channelCount,
-                                                               unsigned int    sampleRate,
-                                                               sfSoundChannel* channelMapData,
-                                                               size_t          channelMapSize);
+CSFML_AUDIO_API sfSoundBuffer* sfSoundBuffer_createFromSamples(
+    const int16_t*  samples,
+    uint64_t        sampleCount,
+    unsigned int    channelCount,
+    unsigned int    sampleRate,
+    sfSoundChannel* channelMapData,
+    size_t          channelMapSize);
 
 ////////////////////////////////////////////////////////////
 /// \brief Create a new sound buffer by copying an existing one

diff --git a/include/CSFML/Audio/SoundBufferRecorder.h b/include/CSFML/Audio/SoundBufferRecorder.h
@@ -28,6 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/Export.h>
+
 #include <CSFML/Audio/Types.h>
 
 

diff --git a/include/CSFML/Audio/SoundRecorder.h b/include/CSFML/Audio/SoundRecorder.h
@@ -28,14 +28,16 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/Export.h>
+
 #include <CSFML/Audio/Types.h>
 #include <CSFML/System/Time.h>
+
 #include <stddef.h>
 
 
-typedef bool (*sfSoundRecorderStartCallback)(void*);                           ///< Type of the callback used when starting a capture
+typedef bool (*sfSoundRecorderStartCallback)(void*); ///< Type of the callback used when starting a capture
 typedef bool (*sfSoundRecorderProcessCallback)(const int16_t*, size_t, void*); ///< Type of the callback used to process audio data
-typedef void (*sfSoundRecorderStopCallback)(void*);                            ///< Type of the callback used when stopping a capture
+typedef void (*sfSoundRecorderStopCallback)(void*); ///< Type of the callback used when stopping a capture
 
 
 ////////////////////////////////////////////////////////////

diff --git a/include/CSFML/Audio/SoundStream.h b/include/CSFML/Audio/SoundStream.h
@@ -28,11 +28,13 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/Export.h>
+
+#include <CSFML/Audio/SoundChannel.h>
 #include <CSFML/Audio/SoundStatus.h>
 #include <CSFML/Audio/Types.h>
-#include <CSFML/Audio/SoundChannel.h>
 #include <CSFML/System/Time.h>
 #include <CSFML/System/Vector3.h>
+
 #include <stddef.h>
 
 
@@ -47,7 +49,7 @@ typedef struct
 } sfSoundStreamChunk;
 
 typedef bool (*sfSoundStreamGetDataCallback)(sfSoundStreamChunk*, void*); ///< Type of the callback used to get a sound stream data
-typedef void (*sfSoundStreamSeekCallback)(sfTime, void*);                 ///< Type of the callback used to seek in a sound stream
+typedef void (*sfSoundStreamSeekCallback)(sfTime, void*); ///< Type of the callback used to seek in a sound stream
 
 
 ////////////////////////////////////////////////////////////
@@ -64,13 +66,14 @@ typedef void (*sfSoundStreamSeekCallback)(sfTime, void*);                 ///< T
 /// \return A new sfSoundStream object
 ///
 ////////////////////////////////////////////////////////////
-CSFML_AUDIO_API sfSoundStream* sfSoundStream_create(sfSoundStreamGetDataCallback onGetData,
-                                                    sfSoundStreamSeekCallback    onSeek,
-                                                    unsigned int                 channelCount,
-                                                    unsigned int                 sampleRate,
-                                                    sfSoundChannel*              channelMapData,
-                                                    size_t                       channelMapSize,
-                                                    void*                        userData);
+CSFML_AUDIO_API sfSoundStream* sfSoundStream_create(
+    sfSoundStreamGetDataCallback onGetData,
+    sfSoundStreamSeekCallback    onSeek,
+    unsigned int                 channelCount,
+    unsigned int                 sampleRate,
+    sfSoundChannel*              channelMapData,
+    size_t                       channelMapSize,
+    void*                        userData);
 
 ////////////////////////////////////////////////////////////
 /// \brief Destroy a sound stream

diff --git a/include/CSFML/Audio/Types.h b/include/CSFML/Audio/Types.h
@@ -24,9 +24,9 @@
 
 #pragma once
 
-typedef struct sfMusic sfMusic;
-typedef struct sfSound sfSound;
-typedef struct sfSoundBuffer sfSoundBuffer;
+typedef struct sfMusic               sfMusic;
+typedef struct sfSound               sfSound;
+typedef struct sfSoundBuffer         sfSoundBuffer;
 typedef struct sfSoundBufferRecorder sfSoundBufferRecorder;
-typedef struct sfSoundRecorder sfSoundRecorder;
-typedef struct sfSoundStream sfSoundStream;
+typedef struct sfSoundRecorder       sfSoundRecorder;
+typedef struct sfSoundStream         sfSoundStream;
diff --git a/include/CSFML/Config.h b/include/CSFML/Config.h
@@ -28,8 +28,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 
 
 ////////////////////////////////////////////////////////////
@@ -44,9 +44,9 @@
 // Check if we need to mark functions as extern "C"
 ////////////////////////////////////////////////////////////
 #ifdef __cplusplus
-    #define CSFML_EXTERN_C extern "C"
+#define CSFML_EXTERN_C extern "C"
 #else
-    #define CSFML_EXTERN_C extern
+#define CSFML_EXTERN_C extern
 #endif
 
 
@@ -55,28 +55,28 @@
 ////////////////////////////////////////////////////////////
 #if defined(_WIN32) || defined(__WIN32__)
 
-    // Windows
-    #define CSFML_SYSTEM_WINDOWS
+// Windows
+#define CSFML_SYSTEM_WINDOWS
 
 #elif defined(linux) || defined(__linux)
 
-    // Linux
-    #define CSFML_SYSTEM_LINUX
+// Linux
+#define CSFML_SYSTEM_LINUX
 
 #elif defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || defined(Macintosh)
 
-    // MacOS
-    #define CSFML_SYSTEM_MACOS
+// MacOS
+#define CSFML_SYSTEM_MACOS
 
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
-    // FreeBSD
-    #define CSFML_SYSTEM_FREEBSD
+// FreeBSD
+#define CSFML_SYSTEM_FREEBSD
 
 #else
 
-    // Unsupported system
-    #error This operating system is not supported by SFML library
+// Unsupported system
+#error This operating system is not supported by SFML library
 
 #endif
 
@@ -86,21 +86,21 @@
 ////////////////////////////////////////////////////////////
 #if defined(CSFML_SYSTEM_WINDOWS)
 
-    // Windows compilers need specific (and different) keywords for export and import
-    #define CSFML_API_EXPORT extern "C" __declspec(dllexport)
-    #define CSFML_API_IMPORT CSFML_EXTERN_C __declspec(dllimport)
+// Windows compilers need specific (and different) keywords for export and import
+#define CSFML_API_EXPORT extern "C" __declspec(dllexport)
+#define CSFML_API_IMPORT CSFML_EXTERN_C __declspec(dllimport)
 
-    // For Visual C++ compilers, we also need to turn off this annoying C4251 warning
-    #ifdef _MSC_VER
+// For Visual C++ compilers, we also need to turn off this annoying C4251 warning
+#ifdef _MSC_VER
 
-        #pragma warning(disable : 4251)
+#pragma warning(disable : 4251)
 
-    #endif
+#endif
 
 #else // Linux, FreeBSD, Mac OS X
 
-    #define CSFML_API_EXPORT extern "C" __attribute__ ((__visibility__ ("default")))
-    #define CSFML_API_IMPORT CSFML_EXTERN_C __attribute__ ((__visibility__ ("default")))
+#define CSFML_API_EXPORT extern "C" __attribute__((__visibility__("default")))
+#define CSFML_API_IMPORT CSFML_EXTERN_C __attribute__((__visibility__("default")))
 
 #endif
 
@@ -117,27 +117,27 @@
 ////////////////////////////////////////////////////////////
 #if defined(CSFML_NO_DEPRECATED_WARNINGS)
 
-    // User explicitly requests to disable deprecation warnings
-    #define CSFML_DEPRECATED
+// User explicitly requests to disable deprecation warnings
+#define CSFML_DEPRECATED
 
 #elif defined(_MSC_VER)
 
-    // Microsoft C++ compiler
-    // Note: On newer MSVC versions, using deprecated functions causes a compiler error. In order to
-    // trigger a warning instead of an error, the compiler flag /sdl- (instead of /sdl) must be specified.
-    #define CSFML_DEPRECATED __declspec(deprecated)
+// Microsoft C++ compiler
+// Note: On newer MSVC versions, using deprecated functions causes a compiler error. In order to
+// trigger a warning instead of an error, the compiler flag /sdl- (instead of /sdl) must be specified.
+#define CSFML_DEPRECATED __declspec(deprecated)
 
 #elif defined(__GNUC__)
 
-    // g++ and Clang
-    #define CSFML_DEPRECATED __attribute__ ((deprecated))
+// g++ and Clang
+#define CSFML_DEPRECATED __attribute__((deprecated))
 
 #else
 
-    // Other compilers are not supported, leave class or function as-is.
-    // With a bit of luck, the #pragma directive works, otherwise users get a warning (no error!) for unrecognized #pragma.
-    #pragma message("CSFML_DEPRECATED is not supported for your compiler, please contact the CSFML team")
-    #define CSFML_DEPRECATED
+// Other compilers are not supported, leave class or function as-is.
+// With a bit of luck, the #pragma directive works, otherwise users get a warning (no error!) for unrecognized #pragma.
+#pragma message("CSFML_DEPRECATED is not supported for your compiler, please contact the CSFML team")
+#define CSFML_DEPRECATED
 
 #endif
 

diff --git a/include/CSFML/GPUPreference.h b/include/CSFML/GPUPreference.h
@@ -58,12 +58,12 @@
 ////////////////////////////////////////////////////////////
 #if defined(SFML_SYSTEM_WINDOWS)
 
-    #define SFML_DEFINE_DISCRETE_GPU_PREFERENCE \
-                CSFML_EXTERN_C __declspec(dllexport) unsigned long NvOptimusEnablement = 1; \
-                CSFML_EXTERN_C __declspec(dllexport) unsigned long AmdPowerXpressRequestHighPerformance = 1;
+#define SFML_DEFINE_DISCRETE_GPU_PREFERENCE                                                      \
+    CSFML_EXTERN_C __declspec(dllexport) unsigned long NvOptimusEnablement                  = 1; \
+    CSFML_EXTERN_C __declspec(dllexport) unsigned long AmdPowerXpressRequestHighPerformance = 1;
 
 #else
 
-    #define SFML_DEFINE_DISCRETE_GPU_PREFERENCE
+#define SFML_DEFINE_DISCRETE_GPU_PREFERENCE
 
 #endif
diff --git a/include/CSFML/Graphics.h b/include/CSFML/Graphics.h
@@ -28,7 +28,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 
-#include <CSFML/Window.h>
 #include <CSFML/Graphics/BlendMode.h>
 #include <CSFML/Graphics/CircleShape.h>
 #include <CSFML/Graphics/Color.h>
@@ -54,3 +53,4 @@
 #include <CSFML/Graphics/VertexArray.h>
 #include <CSFML/Graphics/VertexBuffer.h>
 #include <CSFML/Graphics/View.h>
+#include <CSFML/Window.h>
diff --git a/include/CSFML/Graphics/BlendMode.h b/include/CSFML/Graphics/BlendMode.h
@@ -69,12 +69,12 @@ typedef enum
 ////////////////////////////////////////////////////////////
 typedef struct
 {
-    sfBlendFactor colorSrcFactor;  ///< Source blending factor for the color channels
-    sfBlendFactor colorDstFactor;  ///< Destination blending factor for the color channels
-    sfBlendEquation colorEquation; ///< Blending equation for the color channels
-    sfBlendFactor alphaSrcFactor;  ///< Source blending factor for the alpha channel
-    sfBlendFactor alphaDstFactor;  ///< Destination blending factor for the alpha channel
-    sfBlendEquation alphaEquation; ///< Blending equation for the alpha channel
+    sfBlendFactor   colorSrcFactor; ///< Source blending factor for the color channels
+    sfBlendFactor   colorDstFactor; ///< Destination blending factor for the color channels
+    sfBlendEquation colorEquation;  ///< Blending equation for the color channels
+    sfBlendFactor   alphaSrcFactor; ///< Source blending factor for the alpha channel
+    sfBlendFactor   alphaDstFactor; ///< Destination blending factor for the alpha channel
+    sfBlendEquation alphaEquation;  ///< Blending equation for the alpha channel
 } sfBlendMode;