Skip to content

Commit 89b5ad1

Browse files
committed
Merge branch 'main' into texture-wrap
2 parents 4033955 + 9792a4d commit 89b5ad1

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
include-regex: ^.*\.((((c|C)(c|pp|xx|\+\+)?$)|((h|H)h?(pp|xx|\+\+)?$))|(vert|frag))$
2424

2525
- name: Run Linter
26-
uses: ZedThree/clang-tidy-review@v0.14.0
26+
uses: ZedThree/clang-tidy-review@v0.21.0
2727
with:
2828
apt_packages: ninja-build,libglu1-mesa-dev,mesa-common-dev,xorg-dev
2929
cmake_command: cmake -B build -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=on
@@ -33,4 +33,4 @@ jobs:
3333
config_file: .clang-tidy
3434

3535
- name: Upload Result
36-
uses: ZedThree/clang-tidy-review/upload@v0.14.0
36+
uses: ZedThree/clang-tidy-review/upload@v0.21.0

include/Util/Input.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ class Input {
114114
/**
115115
* @brief Sets the position of the cursor.
116116
* @param pos The position to set the cursor to.
117-
* @note This also triggers a mouse motion event, making Util::Input::IsMouseMoving() return true
118-
* in the current update cycle.
117+
* @note This also triggers a mouse motion event, making
118+
* Util::Input::IsMouseMoving() return true in the current update cycle.
119119
*
120120
* @see Util::Input::GetCursorPosition()
121121
* @see Util::PTSDPosition

include/Util/Position.hpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ struct PTSDPosition;
1111
* @struct SDLPosition
1212
* @brief A class representing a position in screen coordinates.
1313
*
14-
* This class is used to store the X and Y coordinates of a point in a screen coordinate system where:
14+
* This class is used to store the X and Y coordinates of a point in a screen
15+
* coordinate system where:
1516
* - The origin (0, 0) is at the upper-left corner of the window.
1617
* - X increases to the right.
1718
* - Y increases downwards.
@@ -33,7 +34,8 @@ struct SDLPosition {
3334
* @struct PTSDPosition
3435
* @brief A class representing a position in a Cartesian coordinates.
3536
*
36-
* This class is used to store the X and Y coordinates of a point in a Cartesian coordinate system where:
37+
* This class is used to store the X and Y coordinates of a point in a Cartesian
38+
* coordinate system where:
3739
* - The origin (0, 0) is at the center of the window.
3840
* - X increases to the right.
3941
* - Y increases upwards.
@@ -47,7 +49,8 @@ struct PTSDPosition {
4749
: x{x},
4850
y{y} {};
4951
[[deprecated("Implicit conversion will be removed. Use explicit conversion "
50-
"instead")]] // `\_(:/)_/`
52+
"instead")]]
53+
// `\_(:/)_/`
5154
PTSDPosition(glm::vec2 v)
5255
: x{v.x},
5356
y{v.y} {};
@@ -58,7 +61,7 @@ struct PTSDPosition {
5861
}
5962

6063
[[deprecated("Implicit conversion will be removed. Use explicit conversion "
61-
"instead")]]
64+
"instead")]] //
6265
operator glm::vec2() const {
6366
return {x, y};
6467
}

src/Util/Position.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PTSDPosition PTSDPosition::FromSDL(int sdlx, int sdly) {
1111
static_cast<float>(sdlx) -
1212
static_cast<float>(PTSD_Config::WINDOW_WIDTH) / 2.0F,
1313
-(static_cast<float>(sdly) -
14-
static_cast<float>(PTSD_Config::WINDOW_HEIGHT) / 2.0F)};
14+
static_cast<float>(PTSD_Config::WINDOW_HEIGHT) / 2.0F)};
1515
}
1616

1717
SDLPosition PTSDPosition::ToSDLPosition() const {

0 commit comments

Comments
 (0)