Skip to content

Commit 0512882

Browse files
Applied the '.clang-format' rules to 'Vector2.hpp', 'Vector3.hpp' and 'Vector4.hpp'
1 parent d3b22a4 commit 0512882

3 files changed

Lines changed: 26 additions & 51 deletions

File tree

‎include/Vector2.hpp‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace raylib {
1313
* Vector2 type
1414
*/
1515
class Vector2 : public ::Vector2 {
16-
public:
16+
public:
1717
constexpr Vector2(const ::Vector2& vec) : ::Vector2{vec.x, vec.y} {}
1818

1919
constexpr Vector2(float x = 0, float y = 0) : ::Vector2{x, y} {}
@@ -66,16 +66,12 @@ class Vector2 : public ::Vector2 {
6666
/**
6767
* Add vector and float value
6868
*/
69-
Vector2 Add(float value) const {
70-
return Vector2AddValue(*this, value);
71-
}
69+
Vector2 Add(float value) const { return Vector2AddValue(*this, value); }
7270

7371
/**
7472
* Add vector and float value
7573
*/
76-
Vector2 operator+(float value) const {
77-
return Vector2AddValue(*this, value);
78-
}
74+
Vector2 operator+(float value) const { return Vector2AddValue(*this, value); }
7975

8076
/**
8177
* Add vector and float value
@@ -108,16 +104,12 @@ class Vector2 : public ::Vector2 {
108104
/**
109105
* Subtract vector by float value
110106
*/
111-
RLCPP_NODISCARD Vector2 Subtract(float value) const {
112-
return Vector2SubtractValue(*this, value);
113-
}
107+
RLCPP_NODISCARD Vector2 Subtract(float value) const { return Vector2SubtractValue(*this, value); }
114108

115109
/**
116110
* Subtract vector by float value
117111
*/
118-
Vector2 operator-(float value) const {
119-
return Vector2SubtractValue(*this, value);
120-
}
112+
Vector2 operator-(float value) const { return Vector2SubtractValue(*this, value); }
121113

122114
/**
123115
* Subtract vector by float value
@@ -381,16 +373,15 @@ class Vector2 : public ::Vector2 {
381373
RLCPP_NODISCARD bool CheckCollisionPointLine(::Vector2 p1, ::Vector2 p2, int threshold = 1) const {
382374
return ::CheckCollisionPointLine(*this, p1, p2, threshold);
383375
}
384-
385-
protected:
376+
protected:
386377
void set(const ::Vector2& vec) {
387378
x = vec.x;
388379
y = vec.y;
389380
}
390381
};
391382

392-
} // namespace raylib
383+
} // namespace raylib
393384

394385
using RVector2 = raylib::Vector2;
395386

396-
#endif // RAYLIB_CPP_INCLUDE_VECTOR2_HPP_
387+
#endif // RAYLIB_CPP_INCLUDE_VECTOR2_HPP_

‎include/Vector3.hpp‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace raylib {
1212
* Vector3 type
1313
*/
1414
class Vector3 : public ::Vector3 {
15-
public:
15+
public:
1616
constexpr Vector3(const ::Vector3& vec) : ::Vector3{vec.x, vec.y, vec.z} {}
1717

1818
constexpr Vector3(float x = 0, float y = 0, float z = 0) : ::Vector3{x, y, z} {}
@@ -56,16 +56,12 @@ class Vector3 : public ::Vector3 {
5656
/**
5757
* Add vector and float value
5858
*/
59-
RLCPP_NODISCARD Vector3 Add(float value) const {
60-
return Vector3AddValue(*this, value);
61-
}
59+
RLCPP_NODISCARD Vector3 Add(float value) const { return Vector3AddValue(*this, value); }
6260

6361
/**
6462
* Add vector and float value
6563
*/
66-
Vector3 operator+(float value) const {
67-
return Vector3AddValue(*this, value);
68-
}
64+
Vector3 operator+(float value) const { return Vector3AddValue(*this, value); }
6965

7066
Vector3& operator+=(float value) {
7167
set(Vector3AddValue(*this, value));
@@ -92,16 +88,12 @@ class Vector3 : public ::Vector3 {
9288
/**
9389
* Subtract vector by float value
9490
*/
95-
RLCPP_NODISCARD Vector3 Subtract(float value) const {
96-
return Vector3SubtractValue(*this, value);
97-
}
91+
RLCPP_NODISCARD Vector3 Subtract(float value) const { return Vector3SubtractValue(*this, value); }
9892

9993
/**
10094
* Subtract vector by float value
10195
*/
102-
Vector3 operator-(float value) const {
103-
return Vector3SubtractValue(*this, value);
104-
}
96+
Vector3 operator-(float value) const { return Vector3SubtractValue(*this, value); }
10597

10698
Vector3& operator-=(float value) {
10799
set(Vector3SubtractValue(*this, value));
@@ -296,16 +288,15 @@ class Vector3 : public ::Vector3 {
296288
RLCPP_NODISCARD bool CheckCollision(float radius1, const ::Vector3& center2, float radius2) const {
297289
return CheckCollisionSpheres(*this, radius1, center2, radius2);
298290
}
299-
300-
protected:
291+
protected:
301292
void set(const ::Vector3& vec) {
302293
x = vec.x;
303294
y = vec.y;
304295
z = vec.z;
305296
}
306297
};
307-
} // namespace raylib
298+
} // namespace raylib
308299

309300
using RVector3 = raylib::Vector3;
310301

311-
#endif // RAYLIB_CPP_INCLUDE_VECTOR3_HPP_
302+
#endif // RAYLIB_CPP_INCLUDE_VECTOR3_HPP_

‎include/Vector4.hpp‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Quaternion : public ::Quaternion {};
1515
* Vector4 type
1616
*/
1717
class Vector4 : public ::Vector4 {
18-
public:
18+
public:
1919
constexpr Vector4(const ::Vector4& vec) : ::Vector4{vec.x, vec.y, vec.z, vec.w} {}
2020
explicit constexpr Vector4(const raylib::Quaternion quat) : ::Vector4{quat.x, quat.y, quat.z, quat.w} {}
2121

@@ -82,16 +82,12 @@ class Vector4 : public ::Vector4 {
8282
/**
8383
* Add vector and float value
8484
*/
85-
RLCPP_NODISCARD Vector4 Add(const float value) const {
86-
return ::Vector4AddValue(*this, value);
87-
}
85+
RLCPP_NODISCARD Vector4 Add(const float value) const { return ::Vector4AddValue(*this, value); }
8886

8987
/**
9088
* Add vector and float value
9189
*/
92-
Vector4 operator+(const float value) const {
93-
return ::Vector4AddValue(*this, value);
94-
}
90+
Vector4 operator+(const float value) const { return ::Vector4AddValue(*this, value); }
9591

9692
/**
9793
* Add vector and float value
@@ -126,16 +122,12 @@ class Vector4 : public ::Vector4 {
126122
/**
127123
* Subtract vector by float value
128124
*/
129-
RLCPP_NODISCARD Vector4 Subtract(const float value) const {
130-
return ::Vector4SubtractValue(*this, value);
131-
}
125+
RLCPP_NODISCARD Vector4 Subtract(const float value) const { return ::Vector4SubtractValue(*this, value); }
132126

133127
/**
134128
* Subtract vector by float value
135129
*/
136-
Vector4 operator-(const float value) const {
137-
return ::Vector4SubtractValue(*this, value);
138-
}
130+
Vector4 operator-(const float value) const { return ::Vector4SubtractValue(*this, value); }
139131

140132
/**
141133
* Subtract vector by float value
@@ -251,12 +243,14 @@ class Vector4 : public ::Vector4 {
251243
* Divide vector components by value
252244
*/
253245
constexpr friend Vector4 operator/(const float lhs, const Vector4& rhs) {
246+
// clang-format off
254247
return Vector4{
255248
lhs / rhs.x,
256249
lhs / rhs.y,
257250
lhs / rhs.z,
258251
lhs / rhs.w
259252
};
253+
// clang-format on
260254
}
261255

262256
RLCPP_NODISCARD float Length() const { return ::Vector4Length(*this); }
@@ -296,8 +290,7 @@ class Vector4 : public ::Vector4 {
296290
RLCPP_NODISCARD Color ColorFromNormalized() const { return ::ColorFromNormalized(*this); }
297291

298292
operator Color() const { return ColorFromNormalized(); }
299-
300-
protected:
293+
protected:
301294
void set(const ::Vector4& vec4) {
302295
x = vec4.x;
303296
y = vec4.y;
@@ -306,8 +299,8 @@ class Vector4 : public ::Vector4 {
306299
}
307300
};
308301

309-
} // namespace raylib
302+
} // namespace raylib
310303

311304
using RVector4 = raylib::Vector4;
312305

313-
#endif // RAYLIB_CPP_INCLUDE_VECTOR4_HPP_
306+
#endif // RAYLIB_CPP_INCLUDE_VECTOR4_HPP_

0 commit comments

Comments
 (0)