Code-style consistency improvement:

Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions

View File

@@ -4,89 +4,87 @@
#define GWEN_MACROS_H
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h> // vsnprintf
#include <stdio.h> // vsnprintf
#if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
#include <malloc.h>
#include <malloc.h>
#else
#include <stdlib.h>
#endif //__APPLE__
#include <stdlib.h>
#endif //__APPLE__
#include <memory.h>
#include <algorithm>
// Not tied to platform api.
#define GwenUtil_Min( a, b ) ( ( (a) < (b) ) ? (a) : (b) )
#define GwenUtil_Max( a, b ) ( ( (a) > (b) ) ? (a) : (b) )
#define GwenUtil_VSWPrintFSafeSized( _DstBuf_ARRAY_, _Format, _ArgList ) GwenUtil_VSWPrintFSafe( _DstBuf_ARRAY_, sizeof( _DstBuf_ARRAY_ ) / sizeof( wchar_t ), _Format, _ArgList )
#define GwenUtil_Min(a, b) (((a) < (b)) ? (a) : (b))
#define GwenUtil_Max(a, b) (((a) > (b)) ? (a) : (b))
#define GwenUtil_VSWPrintFSafeSized(_DstBuf_ARRAY_, _Format, _ArgList) GwenUtil_VSWPrintFSafe(_DstBuf_ARRAY_, sizeof(_DstBuf_ARRAY_) / sizeof(wchar_t), _Format, _ArgList)
#ifdef _MSC_VER
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#define GwenUtil_VSNPrintFSafe( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList ) vsnprintf_s( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList )
#define GwenUtil_VSWPrintFSafe( _DstBuf, _SizeInWords, _Format, _ArgList ) vswprintf_s( _DstBuf, _SizeInWords, _Format, _ArgList )
#define GwenUtil_OutputDebugCharString( lpOutputString ) OutputDebugStringA( lpOutputString )
#define GwenUtil_OutputDebugWideString( lpOutputString ) OutputDebugStringW( lpOutputString )
#define GwenUtil_WideStringToFloat( _Str ) _wtof( _Str )
#define GwenUtil_VSNPrintFSafe(_DstBuf, _DstSize, _MaxCount, _Format, _ArgList) vsnprintf_s(_DstBuf, _DstSize, _MaxCount, _Format, _ArgList)
#define GwenUtil_VSWPrintFSafe(_DstBuf, _SizeInWords, _Format, _ArgList) vswprintf_s(_DstBuf, _SizeInWords, _Format, _ArgList)
#define GwenUtil_OutputDebugCharString(lpOutputString) OutputDebugStringA(lpOutputString)
#define GwenUtil_OutputDebugWideString(lpOutputString) OutputDebugStringW(lpOutputString)
#define GwenUtil_WideStringToFloat(_Str) _wtof(_Str)
#elif defined(__APPLE__)
#include <CoreFoundation/CoreFoundation.h>
#include <CoreFoundation/CoreFoundation.h>
#define GwenUtil_VSNPrintFSafe( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList ) vsnprintf( _DstBuf, _DstSize, _Format, _ArgList )
#define GwenUtil_VSWPrintFSafe( _DstBuf, _SizeInWords, _Format, _ArgList ) vswprintf( _DstBuf, _SizeInWords, _Format, _ArgList )
#define GwenUtil_OutputDebugCharString( lpOutputString ) //printf( lpOutputString )
#define GwenUtil_OutputDebugWideString( lpOutputString ) //wprintf( lpOutputString )
#define GwenUtil_WideStringToFloat( _Str ) wcstof(_Str, NULL)
#define GwenUtil_VSNPrintFSafe(_DstBuf, _DstSize, _MaxCount, _Format, _ArgList) vsnprintf(_DstBuf, _DstSize, _Format, _ArgList)
#define GwenUtil_VSWPrintFSafe(_DstBuf, _SizeInWords, _Format, _ArgList) vswprintf(_DstBuf, _SizeInWords, _Format, _ArgList)
#define GwenUtil_OutputDebugCharString(lpOutputString) //printf( lpOutputString )
#define GwenUtil_OutputDebugWideString(lpOutputString) //wprintf( lpOutputString )
#define GwenUtil_WideStringToFloat(_Str) wcstof(_Str, NULL)
#elif defined(__linux__) || defined(__GNUC__)
#elif defined(__linux__) || defined( __GNUC__ )
#define GwenUtil_VSNPrintFSafe( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList ) vsnprintf( _DstBuf, _DstSize, _Format, _ArgList )
#ifdef _WIN32
#define GwenUtil_VSWPrintFSafe( _DstBuf, _SizeInWords, _Format, _ArgList ) vsnwprintf( _DstBuf, _SizeInWords, _Format, _ArgList )
#else
#define GwenUtil_VSWPrintFSafe( _DstBuf, _SizeInWords, _Format, _ArgList ) vswprintf( _DstBuf, _SizeInWords, _Format, _ArgList )
#endif
#define GwenUtil_OutputDebugCharString( lpOutputString ) //printf( lpOutputString )
#define GwenUtil_OutputDebugWideString( lpOutputString ) //wprintf( lpOutputString )
#define GwenUtil_WideStringToFloat( _Str ) wcstof(_Str, NULL)
#define GwenUtil_VSNPrintFSafe(_DstBuf, _DstSize, _MaxCount, _Format, _ArgList) vsnprintf(_DstBuf, _DstSize, _Format, _ArgList)
#ifdef _WIN32
#define GwenUtil_VSWPrintFSafe(_DstBuf, _SizeInWords, _Format, _ArgList) vsnwprintf(_DstBuf, _SizeInWords, _Format, _ArgList)
#else
#define GwenUtil_VSWPrintFSafe(_DstBuf, _SizeInWords, _Format, _ArgList) vswprintf(_DstBuf, _SizeInWords, _Format, _ArgList)
#endif
#define GwenUtil_OutputDebugCharString(lpOutputString) //printf( lpOutputString )
#define GwenUtil_OutputDebugWideString(lpOutputString) //wprintf( lpOutputString )
#define GwenUtil_WideStringToFloat(_Str) wcstof(_Str, NULL)
#else
#error MUST_IMPLEMENT_PLATFORM
#error MUST_IMPLEMENT_PLATFORM
#endif
namespace Gwen
{
template <typename T1, typename T2, typename T3 >
T1 Clamp( T1 current, T2 vmin, T3 vmax )
{
if ( current > vmax ) return (T1)vmax;
if ( current < vmin ) return (T1)vmin;
return current;
}
template <typename T, typename T2>
inline T Approach( T fCurrent, T fTarget, T2 fDelta )
{
if ( fCurrent < fTarget )
{
fCurrent += fDelta;
if ( fCurrent > fTarget ) return fTarget;
}
else if ( fCurrent > fTarget )
{
fCurrent -= fDelta;
if ( fCurrent < fTarget ) return fTarget;
}
return fCurrent;
}
template <typename T1, typename T2, typename T3>
T1 Clamp(T1 current, T2 vmin, T3 vmax)
{
if (current > vmax) return (T1)vmax;
if (current < vmin) return (T1)vmin;
return current;
}
template <typename T, typename T2>
inline T Approach(T fCurrent, T fTarget, T2 fDelta)
{
if (fCurrent < fTarget)
{
fCurrent += fDelta;
if (fCurrent > fTarget) return fTarget;
}
else if (fCurrent > fTarget)
{
fCurrent -= fDelta;
if (fCurrent < fTarget) return fTarget;
}
return fCurrent;
}
} // namespace Gwen
#endif