From fb0b05d7ef60577fbc0b6adaf4edbbf3d0b503a5 Mon Sep 17 00:00:00 2001 From: Orange Date: Thu, 25 Sep 2025 19:33:06 +0300 Subject: [PATCH] imprvoed code style --- include/omath/linear_algebra/mat.hpp | 24 +++++++++---------- .../proj_pred_engine_legacy.hpp | 6 +++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/include/omath/linear_algebra/mat.hpp b/include/omath/linear_algebra/mat.hpp index 08e8f89..3549db2 100644 --- a/include/omath/linear_algebra/mat.hpp +++ b/include/omath/linear_algebra/mat.hpp @@ -425,7 +425,7 @@ namespace omath for (std::size_t k = 0; k < Columns; ++k) { const float bkj = reinterpret_cast(other_mat_data)[k + j * Columns]; - __m256 bkjv = _mm256_set1_ps(bkj); + const __m256 bkj_vec = _mm256_set1_ps(bkj); const auto* a_col_k = reinterpret_cast(this_mat_data + k * Rows); @@ -433,8 +433,8 @@ namespace omath for (; i + vector_size <= Rows; i += vector_size) { __m256 cvec = _mm256_loadu_ps(c_col + i); - __m256 avec = _mm256_loadu_ps(a_col_k + i); - cvec = _mm256_fmadd_ps(avec, bkjv, cvec); + const __m256 a_vec = _mm256_loadu_ps(a_col_k + i); + cvec = _mm256_fmadd_ps(a_vec, bkj_vec, cvec); _mm256_storeu_ps(c_col + i, cvec); } for (; i < Rows; ++i) @@ -452,7 +452,7 @@ namespace omath for (std::size_t k = 0; k < Columns; ++k) { const double bkj = reinterpret_cast(other_mat_data)[k + j * Columns]; - __m256d bkjv = _mm256_set1_pd(bkj); + const __m256d bkj_vec = _mm256_set1_pd(bkj); const auto* a_col_k = reinterpret_cast(this_mat_data + k * Rows); @@ -460,8 +460,8 @@ namespace omath for (; i + vector_size <= Rows; i += vector_size) { __m256d cvec = _mm256_loadu_pd(c_col + i); - __m256d avec = _mm256_loadu_pd(a_col_k + i); - cvec = _mm256_fmadd_pd(avec, bkjv, cvec); + const __m256d a_vec = _mm256_loadu_pd(a_col_k + i); + cvec = _mm256_fmadd_pd(a_vec, bkj_vec, cvec); _mm256_storeu_pd(c_col + i, cvec); } for (; i < Rows; ++i) @@ -495,15 +495,15 @@ namespace omath for (std::size_t k = 0; k < Columns; ++k) { const auto aik = static_cast(this_mat_data[i * Columns + k]); - __m256 aikv = _mm256_set1_ps(aik); + const __m256 aik_vec = _mm256_set1_ps(aik); const auto* b_row = reinterpret_cast(other_mat_data + k * OtherColumns); std::size_t j = 0; for (; j + vector_size <= OtherColumns; j += vector_size) { __m256 cvec = _mm256_loadu_ps(c_row + j); - __m256 bvec = _mm256_loadu_ps(b_row + j); - cvec = _mm256_fmadd_ps(bvec, aikv, cvec); + const __m256 b_vec = _mm256_loadu_ps(b_row + j); + cvec = _mm256_fmadd_ps(b_vec, aik_vec, cvec); _mm256_storeu_ps(c_row + j, cvec); } @@ -522,15 +522,15 @@ namespace omath for (std::size_t k = 0; k < Columns; ++k) { const auto aik = static_cast(this_mat_data[i * Columns + k]); - __m256d aikv = _mm256_set1_pd(aik); + const __m256d aik_vec = _mm256_set1_pd(aik); const auto* b_row = reinterpret_cast(other_mat_data + k * OtherColumns); std::size_t j = 0; for (; j + vector_size <= OtherColumns; j += vector_size) { __m256d cvec = _mm256_loadu_pd(c_row + j); - __m256d bvec = _mm256_loadu_pd(b_row + j); - cvec = _mm256_fmadd_pd(bvec, aikv, cvec); + const __m256d b_vec = _mm256_loadu_pd(b_row + j); + cvec = _mm256_fmadd_pd(b_vec, aik_vec, cvec); _mm256_storeu_pd(c_row + j, cvec); } diff --git a/include/omath/projectile_prediction/proj_pred_engine_legacy.hpp b/include/omath/projectile_prediction/proj_pred_engine_legacy.hpp index 231db3b..bd75554 100644 --- a/include/omath/projectile_prediction/proj_pred_engine_legacy.hpp +++ b/include/omath/projectile_prediction/proj_pred_engine_legacy.hpp @@ -4,8 +4,8 @@ #pragma once -#include "omath/linear_algebra/vector3.hpp" #include "omath/engines/source_engine/traits/pred_engine_trait.hpp" +#include "omath/linear_algebra/vector3.hpp" #include "omath/projectile_prediction/proj_pred_engine.hpp" #include "omath/projectile_prediction/projectile.hpp" #include "omath/projectile_prediction/target.hpp" @@ -20,7 +20,9 @@ namespace omath::projectile_prediction Vector3 v3, // by-value for calc_viewpoint_from_angles float pitch, float yaw, float time, float gravity, std::optional maybe_pitch) { // Presence + return types - { T::predict_projectile_position(projectile, pitch, yaw, time, gravity) } -> std::same_as>; + { + T::predict_projectile_position(projectile, pitch, yaw, time, gravity) + } -> std::same_as>; { T::predict_target_position(target, time, gravity) } -> std::same_as>; { T::calc_vector_2d_distance(vec_a) } -> std::same_as; { T::get_vector_height_coordinate(vec_b) } -> std::same_as;