yanjie/eskin-player
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构手部分段查表逻辑并新增 Excel 数据提取脚本

Browse Source 
- src/app.rs: 将 update_hand_signal_histories 改为返回总力作为汇总路径；新增 raw_to_g6/raw_to_g7 与 raw_to_hand_segment_g 索引映射，把 segment 5/6 从兜底 raw_to_gd 拆出，并按 H 版本校准数据更新 g1~g5 的查表数组
This commit is contained in:
lenn
2026-07-08 17:45:27 +08:00
parent 9fb4c0edf4
commit 5af3c2862b
2 changed files with 377 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/app.rs
View File

@@ -342,20 +342,13 @@ impl EskinDesktopApp {
self.analyze_spatial_force(&sample.matrix);
// Keep JE-Skin's summary path separate from the optional spatial-force vector.
let raw_total = sample
.matrix
.iter()
.fold(0_u64, |sum, value| sum + *value as u64)
.min(u32::MAX as u64) as u32;
let force = raw_to_g1(raw_total).min(25.6);
let force = if force <= 0.1 { 0.0 } else { force };
let force =
update_hand_signal_histories(&mut self.hand_signal_histories, &sample.matrix)
.min(25.6);
self.signal_history.push(force);
if self.signal_history.len() > SUMMARY_POINTS_PER_SERIES {
self.signal_history.remove(0);
}
update_hand_signal_histories(&mut self.hand_signal_histories, &sample.matrix);
}
}
@@ -665,26 +658,23 @@ fn paint_spatial_force_arrow(
fn update_hand_signal_histories(
histories: &mut [Vec<f32>; HAND_FORCE_PANEL_COUNT],
raw_values: &[u32],
) {
) -> f32 {
let mut offset = 0usize;
for (index, (history, sample_count)) in histories.iter_mut().zip(HAND_FORCE_SEGMENT_COUNTS).enumerate() {
let mut total_force = 0.0;
for (index, (history, sample_count)) in histories
.iter_mut()
.zip(HAND_FORCE_SEGMENT_COUNTS)
.enumerate()
{
let raw_total = raw_values
.get(offset..offset + sample_count)
.unwrap_or(&[])
.iter()
.fold(0_u64, |sum, value| sum + *value as u64)
.min(u32::MAX as u64) as u32;
let force = match index {
0 => raw_to_g1(raw_total).min(20.6),
1 => raw_to_g2(raw_total).min(20.6),
2 => raw_to_g3(raw_total).min(20.6),
3 => raw_to_g4(raw_total).min(20.6),
4 => raw_to_g5(raw_total).min(20.6),
_ => raw_to_gd(raw_total).min(20.6),
};
// let force = raw_to_g1(raw_total).min(25.6);
let force = raw_to_hand_segment_g(index, raw_total).min(20.6);
let force = if force <= 0.1 { 0.0 } else { force };
total_force += force;
history.push(force);
if history.len() > SUMMARY_POINTS_PER_SERIES {
history.remove(0);
@@ -692,6 +682,21 @@ fn update_hand_signal_histories(
offset += sample_count;
}
total_force
}
fn raw_to_hand_segment_g(index: usize, raw: u32) -> f32 {
match index {
0 => raw_to_g1(raw),
1 => raw_to_g2(raw),
2 => raw_to_g3(raw),
3 => raw_to_g4(raw),
4 => raw_to_g5(raw),
5 => raw_to_g6(raw),
6 => raw_to_g7(raw),
_ => raw_to_gd(raw),
}
}
fn raw_to_gd(raw: u32) -> f32 {
@@ -731,7 +736,7 @@ fn raw_to_gd(raw: u32) -> f32 {
fn raw_to_g1(raw: u32) -> f32 {
const RAW: [u32; 11] = [
0, 20239, 121454, 171532, 223968, 241467, 293500, 322744, 436294, 523275, 633083,
0, 115181, 365308, 485911, 598964, 681811, 761756, 877545, 976003, 1168784, 1309378,
];
const FORCE_CENTI_N: [f32; 11] = [
0.0, 57.0, 257.0, 357.0, 457.0, 557.0, 657.0, 857.0, 1057.0, 1557.0, 2057.0,
@@ -766,7 +771,7 @@ fn raw_to_g1(raw: u32) -> f32 {
fn raw_to_g2(raw: u32) -> f32 {
const RAW: [u32; 11] = [
0, 5398, 52896, 86945, 122546, 145001, 165933, 220575, 241578, 350285, 449530,
0, 116825, 371568, 475160, 567645, 651220, 714733, 832157, 938778, 1144649, 1290773,
];
const FORCE_CENTI_N: [f32; 11] = [
0.0, 57.0, 257.0, 357.0, 457.0, 557.0, 657.0, 857.0, 1057.0, 1557.0, 2057.0,
@@ -801,7 +806,7 @@ fn raw_to_g2(raw: u32) -> f32 {
fn raw_to_g3(raw: u32) -> f32 {
const RAW: [u32; 11] = [
0, 4920, 35945, 46499, 65566, 69613, 89971, 122321, 146384, 203426, 269474,
0, 113320, 367656, 457415, 538259, 613913, 666943, 791771, 877385, 1035434, 1196014,
];
const FORCE_CENTI_N: [f32; 11] = [
0.0, 57.0, 257.0, 357.0, 457.0, 557.0, 657.0, 857.0, 1057.0, 1557.0, 2057.0,
@@ -836,7 +841,7 @@ fn raw_to_g3(raw: u32) -> f32 {
fn raw_to_g4(raw: u32) -> f32 {
const RAW: [u32; 11] = [
0, 11346, 92229, 139822, 182282, 220004, 259898, 307303, 377922, 460755, 587834,
0, 106394, 383401, 495623, 590405, 681715, 767392, 906395, 1030218, 1254130, 1385368,
];
const FORCE_CENTI_N: [f32; 11] = [
0.0, 57.0, 257.0, 357.0, 457.0, 557.0, 657.0, 857.0, 1057.0, 1557.0, 2057.0,
@@ -870,6 +875,76 @@ fn raw_to_g4(raw: u32) -> f32 {
}
fn raw_to_g5(raw: u32) -> f32 {
const RAW: [u32; 11] = [
0, 150954, 469433, 613171, 717043, 817483, 963155, 1129123, 1327873, 1668629, 1885354,
];
const FORCE_CENTI_N: [f32; 11] = [
0.0, 57.0, 257.0, 357.0, 457.0, 557.0, 657.0, 857.0, 1057.0, 1557.0, 2057.0,
];
if raw <= RAW[0] {
return FORCE_CENTI_N[0] / 100.0;
}
if raw >= RAW[RAW.len() - 1] {
return FORCE_CENTI_N[FORCE_CENTI_N.len() - 1] / 100.0;
}
let mut left = 0usize;
let mut right = RAW.len() - 1;
while left + 1 < right {
let mid = (left + right) / 2;
if RAW[mid] <= raw {
left = mid;
} else {
right = mid;
}
}
let raw_left = RAW[left] as f32;
let raw_right = RAW[right] as f32;
let span = (raw_right - raw_left).max(1.0);
let ratio = (raw as f32 - raw_left) / span;
(FORCE_CENTI_N[left] + ratio * (FORCE_CENTI_N[right] - FORCE_CENTI_N[left])) / 100.0
}
fn raw_to_g6(raw: u32) -> f32 {
const RAW: [u32; 11] = [
0, 0, 4290, 8096, 10567, 14856, 19685, 43856, 84675, 114001, 129068,
];
const FORCE_CENTI_N: [f32; 11] = [
0.0, 57.0, 257.0, 357.0, 457.0, 557.0, 657.0, 857.0, 1057.0, 1557.0, 2057.0,
];
if raw <= RAW[0] {
return FORCE_CENTI_N[0] / 100.0;
}
if raw >= RAW[RAW.len() - 1] {
return FORCE_CENTI_N[FORCE_CENTI_N.len() - 1] / 100.0;
}
let mut left = 0usize;
let mut right = RAW.len() - 1;
while left + 1 < right {
let mid = (left + right) / 2;
if RAW[mid] <= raw {
left = mid;
} else {
right = mid;
}
}
let raw_left = RAW[left] as f32;
let raw_right = RAW[right] as f32;
let span = (raw_right - raw_left).max(1.0);
let ratio = (raw as f32 - raw_left) / span;
(FORCE_CENTI_N[left] + ratio * (FORCE_CENTI_N[right] - FORCE_CENTI_N[left])) / 100.0
}
fn raw_to_g7(raw: u32) -> f32 {
const RAW: [u32; 11] = [
0, 10081, 40910, 49944, 64291, 68299, 79282, 97767, 113567, 140520, 167132,
];
@@ -1034,3 +1109,4 @@ impl eframe::App for EskinDesktopApp {
ctx.request_repaint();
}
}