Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-11-22 00:48:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Style: Ensure consistent formatting with clang-format 15

Browse Source
This commit is contained in:
Rémi Verschelde 2022-09-21 13:08:17 +02:00 committed by Relintai
parent 160462c57b
commit 43de2b9ecc
5 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/math/math_fieldwise.cpp
View File

@ -47,9 +47,7 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
/* clang-format off */
switch (p_source.get_type()) {
case Variant::RECT2: {
SETUP_TYPE(Rect2)
/**/ TRY_TRANSFER_FIELD("x", position.x)
@ -61,7 +59,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}
case Variant::RECT2I: {
SETUP_TYPE(Rect2i)
/**/ TRY_TRANSFER_FIELD("x", position.x)
@ -93,7 +90,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}
case Variant::VECTOR3: {
SETUP_TYPE(Vector3)
/**/ TRY_TRANSFER_FIELD("x", x)
@ -137,7 +133,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}
case Variant::PLANE: {
SETUP_TYPE(Plane)
/**/ TRY_TRANSFER_FIELD("x", normal.x)
@ -149,7 +144,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}
case Variant::QUATERNION: {
SETUP_TYPE(Quaternion)
/**/ TRY_TRANSFER_FIELD("x", x)
@ -161,7 +155,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}
case Variant::AABB: {
SETUP_TYPE(AABB)
/**/ TRY_TRANSFER_FIELD("px", position.x)
@ -175,7 +168,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}
case Variant::BASIS: {
SETUP_TYPE(Basis)
/**/ TRY_TRANSFER_FIELD("xx", rows[0][0])
@ -192,7 +184,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}
case Variant::TRANSFORM: {
SETUP_TYPE(Transform)
/**/ TRY_TRANSFER_FIELD("xx", basis.rows[0][0])

12
core/variant/variant_op.cpp
View File

@ -2273,8 +2273,12 @@ Variant Variant::get_named(const StringName &p_index, bool *r_valid) const {
} \
} break;
// clang-format 14 wants to add a space after the last return,
// and clang-format 15 removes it...
/* clang-format off */
#define DEFAULT_OP_DVECTOR_SET(m_name, dv_type, skip_cond) \
DEFAULT_OP_ARRAY_CMD(m_name, PoolVector<dv_type>, if (skip_cond) return;, arr->set(index, p_value); return )
DEFAULT_OP_ARRAY_CMD(m_name, PoolVector<dv_type>, if (skip_cond) return;, arr->set(index, p_value); return)
/* clang-format on */
#define DEFAULT_OP_DVECTOR_GET(m_name, dv_type) \
DEFAULT_OP_ARRAY_CMD(m_name, const PoolVector<dv_type>, ;, return arr->get(index))
@ -3300,7 +3304,11 @@ void Variant::set(const Variant &p_index, const Variant &p_value, bool *r_valid)
valid = true; //always valid, i guess? should this really be ok?
return;
} break;
DEFAULT_OP_ARRAY_CMD(ARRAY, Array, ;, (*arr)[index] = p_value; return ) // 20
// clang-format 14 wants to add a space after the last return,
// and clang-format 15 removes it...
/* clang-format off */
DEFAULT_OP_ARRAY_CMD(ARRAY, Array, ;, (*arr)[index] = p_value; return) // 20
/* clang-format on */
DEFAULT_OP_DVECTOR_SET(POOL_BYTE_ARRAY, uint8_t, p_value.type != Variant::REAL && p_value.type != Variant::INT)
DEFAULT_OP_DVECTOR_SET(POOL_INT_ARRAY, int, p_value.type != Variant::REAL && p_value.type != Variant::INT)
DEFAULT_OP_DVECTOR_SET(POOL_REAL_ARRAY, real_t, p_value.type != Variant::REAL && p_value.type != Variant::INT)

2
misc/hooks/README.md
View File

@ -28,7 +28,7 @@ so they should work out of the box on Linux/macOS.
#### Windows
##### clang-format
- Download LLVM for Windows (version 8 or later) from
- Download LLVM for Windows (version 13 or later) from
<https://releases.llvm.org/download.html>
- Make sure LLVM is added to the `PATH` during installation

4
misc/hooks/pre-commit-clang-format
View File

@ -76,8 +76,8 @@ fi
# To get consistent formatting, we recommend contributors to use the same
# clang-format version as CI.
RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="12"
RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="14"
RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="13"
RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="15"
if [ ! -x "$CLANG_FORMAT" ] ; then
message="Error: clang-format executable not found. Please install clang-format $RECOMMENDED_CLANG_FORMAT_MAJOR_MAX."

50
modules/websocket/websocket_macros.h
View File

@ -40,34 +40,32 @@
#define WSS_OUT_BUF "network/limits/websocket_server/max_out_buffer_kb"
#define WSS_OUT_PKT "network/limits/websocket_server/max_out_packets"
/* clang-format off */
#define GDCICLASS(CNAME) \
public:\
static CNAME *(*_create)();\
\
static Ref<CNAME > create_ref() {\
\
if (!_create)\
return Ref<CNAME >();\
return Ref<CNAME >(_create());\
}\
\
static CNAME *create() {\
\
if (!_create)\
return NULL;\
return _create();\
}\
protected:\
#define GDCICLASS(CNAME) \
public: \
static CNAME *(*_create)(); \
\
static Ref<CNAME> create_ref() { \
if (!_create) \
return Ref<CNAME>(); \
return Ref<CNAME>(_create()); \
} \
\
static CNAME *create() { \
if (!_create) \
return NULL; \
return _create(); \
} \
\
protected:
#define GDCINULL(CNAME) \
CNAME *(*CNAME::_create)() = NULL;
CNAME *(*CNAME::_create)() = NULL;
#define GDCIIMPL(IMPNAME, CNAME) \
public:\
static CNAME *_create() { return memnew(IMPNAME); }\
static void make_default() { CNAME::_create = IMPNAME::_create; }\
protected:\
/* clang-format on */
#define GDCIIMPL(IMPNAME, CNAME) \
public: \
static CNAME *_create() { return memnew(IMPNAME); } \
static void make_default() { CNAME::_create = IMPNAME::_create; } \
\
protected:
#endif // WEBSOCKETMACTOS_H