diff --git a/.clang-format b/.clang-format index 66ab9505..0e777ed8 100644 --- a/.clang-format +++ b/.clang-format @@ -106,6 +106,6 @@ SpacesInAngles: false SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false -Standard: Cpp11 +Standard: Latest TabWidth: 8 UseTab: ForIndentation diff --git a/.github/workflows/Format.yml b/.github/workflows/Format.yml index cf3c1668..ad87fc3a 100644 --- a/.github/workflows/Format.yml +++ b/.github/workflows/Format.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Run clang-format style check for C/C++/Protobuf programs. - uses: jidicula/clang-format-action@v4.13.0 + uses: jidicula/clang-format-action@2c659fea724e981e94741c0e7db663982cd7d3f4 with: - clang-format-version: '18' + clang-format-version: '21' check-path: ${{ matrix.path }} diff --git a/client/application.cpp b/client/application.cpp index 3e62a085..9a659bf7 100644 --- a/client/application.cpp +++ b/client/application.cpp @@ -1674,8 +1674,7 @@ void application::run() #else void application::run() { - struct sigaction act - {}; + struct sigaction act{}; act.sa_handler = [](int) { instance().exit_requested = true; }; diff --git a/client/render/animation.cpp b/client/render/animation.cpp index b96f06f5..fd00b95e 100644 --- a/client/render/animation.cpp +++ b/client/render/animation.cpp @@ -74,7 +74,7 @@ glm::quat cubic_spline(const glm::quat & a, const glm::quat & vb, const glm::qua td * (t3 - t2) * va); } -template +template void apply_track(entt::registry & scene, const components::animation_track_impl & track, float current_time) { entt::entity target = track.target; diff --git a/client/render/scene_components.h b/client/render/scene_components.h index d13ac12d..ca3bcad3 100644 --- a/client/render/scene_components.h +++ b/client/render/scene_components.h @@ -174,7 +174,7 @@ struct animation_track_base interpolation_t interpolation; }; -template +template struct animation_track_impl : animation_track_base { static const constexpr auto field = Field; diff --git a/client/scenes/stream.h b/client/scenes/stream.h index 2bc0a63c..f13ebfa8 100644 --- a/client/scenes/stream.h +++ b/client/scenes/stream.h @@ -262,7 +262,7 @@ private: struct subplot { std::string title; - float scenes::stream::global_metric::*data; + float scenes::stream::global_metric::* data; }; std::vector subplots; const char * unit; diff --git a/client/scenes/stream_gui.cpp b/client/scenes/stream_gui.cpp index 39dba21b..d87ca6b3 100644 --- a/client/scenes/stream_gui.cpp +++ b/client/scenes/stream_gui.cpp @@ -223,7 +223,7 @@ void scenes::stream::gui_performance_metrics() for (const auto & [subtitle, data]: subplots) { getter_data gdata{ - .data = (uintptr_t) & (global_metrics.data()->*data), + .data = (uintptr_t)&(global_metrics.data()->*data), .stride = sizeof(global_metric), .multiplier = multiplier, }; @@ -260,57 +260,57 @@ void scenes::stream::gui_performance_metrics() ImPlot::SetupAxesLimits(0, metrics.size() - 1, min_v * 1e3f, axis_scale[n] * 1e3f, ImGuiCond_Always); getter_data getter_encode_begin{ - .data = (uintptr_t) & (metrics.data()->encode_begin), + .data = (uintptr_t)&(metrics.data()->encode_begin), .stride = sizeof(decoder_metric), .multiplier = 1e3f}; getter_data getter_encode_end{ - .data = (uintptr_t) & (metrics.data()->encode_end), + .data = (uintptr_t)&(metrics.data()->encode_end), .stride = sizeof(decoder_metric), .multiplier = 1e3f}; getter_data getter_send_begin{ - .data = (uintptr_t) & (metrics.data()->send_begin), + .data = (uintptr_t)&(metrics.data()->send_begin), .stride = sizeof(decoder_metric), .multiplier = 1e3f}; getter_data getter_send_end{ - .data = (uintptr_t) & (metrics.data()->send_end), + .data = (uintptr_t)&(metrics.data()->send_end), .stride = sizeof(decoder_metric), .multiplier = 1e3f}; getter_data getter_received_first_packet{ - .data = (uintptr_t) & (metrics.data()->received_first_packet), + .data = (uintptr_t)&(metrics.data()->received_first_packet), .stride = sizeof(decoder_metric), .multiplier = 1e3f}; getter_data getter_received_last_packet{ - .data = (uintptr_t) & (metrics.data()->received_last_packet), + .data = (uintptr_t)&(metrics.data()->received_last_packet), .stride = sizeof(decoder_metric), .multiplier = 1e3f}; getter_data getter_sent_to_decoder{ - .data = (uintptr_t) & (metrics.data()->sent_to_decoder), + .data = (uintptr_t)&(metrics.data()->sent_to_decoder), .stride = sizeof(decoder_metric), .multiplier = 1e3f}; getter_data getter_received_from_decoder{ - .data = (uintptr_t) & (metrics.data()->received_from_decoder), + .data = (uintptr_t)&(metrics.data()->received_from_decoder), .stride = sizeof(decoder_metric), .multiplier = 1e3f}; getter_data getter_blitted{ - .data = (uintptr_t) & (metrics.data()->blitted), + .data = (uintptr_t)&(metrics.data()->blitted), .stride = sizeof(decoder_metric), .multiplier = 1e3f}; getter_data getter_displayed{ - .data = (uintptr_t) & (metrics.data()->displayed), + .data = (uintptr_t)&(metrics.data()->displayed), .stride = sizeof(decoder_metric), .multiplier = 1e3f}; getter_data getter_predicted{ - .data = (uintptr_t) & (metrics.data()->predicted_display), + .data = (uintptr_t)&(metrics.data()->predicted_display), .stride = sizeof(decoder_metric), .multiplier = 1e3f};