Max/korenkonder_AFTMods
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 41 Wiki Activity

Update KKdLib from upstream

Browse Source
This commit is contained in:
korenkonder
2024-01-28 13:34:19 +03:00
parent a9e7707dca
commit 6c05ebbfdb
16 changed files with 755 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KKdLib/interpolation.cpp
+138 -5
View File
@@ -28,6 +28,61 @@ void interpolate_chs_reverse_value(float_t* arr, size_t length,
t2 = h10.y * t1_t2.x - h10.x * t1_t2.y;
}
void interpolate_chs_reverse_value(float_t* arr, size_t length, float_t& t1a, float_t& t2a,
float_t& t1b, float_t& t2b, float_t& t1c, float_t& t2c, size_t f1, size_t f2, size_t f) {
vec4 t = vec4(
(float_t)(int64_t)(f - f1 + 0),
(float_t)(int64_t)(f - f1 + 1),
(float_t)(int64_t)(f - f1 + 2),
(float_t)(int64_t)(f - f1 + 3)
) / (float_t)(int64_t)(f2 - f1);
vec4 t_2 = t * t;
vec4 t_3 = t_2 * t;
vec4 t_23 = 3.0f * t_2;
vec4 t_32 = 2.0f * t_3;
vec4 h00 = t_32 - t_23 + 1.0f;
vec4 h01 = t_23 - t_32;
vec4 h10 = t_3 - 2.0f * t_2 + t;
vec4 h11 = t_3 - t_2;
vec4 t1_t2 = *(vec4*)&arr[f] - h00 * arr[f1] - h01 * arr[f2];
vec3 t_div = (*(vec3*)&t_2.x - *(vec3*)&t.x) * (*(vec3*)&t_2.y - *(vec3*)&t.y);
vec2 t1_t2a = *(vec2*)&t1_t2.x / t_div.x;
vec2 t1_t2b = *(vec2*)&t1_t2.y / t_div.y;
vec2 t1_t2c = *(vec2*)&t1_t2.z / t_div.z;
t1a = -h11.y * t1_t2a.x + h11.x * t1_t2a.y;
t2a = h10.y * t1_t2a.x - h10.x * t1_t2a.y;
t1b = -h11.z * t1_t2b.x + h11.y * t1_t2b.y;
t2b = h10.z * t1_t2b.x - h10.y * t1_t2b.y;
t1c = -h11.w * t1_t2c.x + h11.z * t1_t2c.y;
t2c = h10.w * t1_t2c.x - h10.z * t1_t2c.y;
}
void interpolate_chs_reverse_value(double_t* arr, size_t length,
double_t& t1, double_t& t2, size_t f1, size_t f2, size_t f) {
vec2d t = vec2d(
(double_t)(int64_t)(f - f1 + 0),
(double_t)(int64_t)(f - f1 + 1)
) / (double_t)(int64_t)(f2 - f1);
vec2d t_2 = t * t;
vec2d t_3 = t_2 * t;
vec2d t_23 = 3.0 * t_2;
vec2d t_32 = 2.0 * t_3;
vec2d h00 = t_32 - t_23 + 1.0;
vec2d h01 = t_23 - t_32;
vec2d h10 = t_3 - 2.0 * t_2 + t;
vec2d h11 = t_3 - t_2;
vec2d t1_t2 = *(vec2d*)&arr[f] - h00 * arr[f1] - h01 * arr[f2];
t1_t2 /= (t_2.x - t.x) * (t_2.y - t.y);
t1 = -h11.y * t1_t2.x + h11.x * t1_t2.y;
t2 = h10.y * t1_t2.x - h10.x * t1_t2.y;
}
void interpolate_chs_reverse(float_t* arr, size_t length,
float_t& t1, float_t& t2, size_t f1, size_t f2) {
t1 = 0.0f;
@@ -36,8 +91,48 @@ void interpolate_chs_reverse(float_t* arr, size_t length,
if (f2 - f1 - 2 < 1)
return;
float_t _t1 = 0.0f;
float_t _t2 = 0.0f;
double_t tt1 = 0.0;
double_t tt2 = 0.0;
size_t i = f1 + 1;
for (; i < f2 - 1 && i + 3 <= f2 - 1; i += 3) {
float_t t1a = 0.0f;
float_t t2a = 0.0f;
float_t t1b = 0.0f;
float_t t2b = 0.0f;
float_t t1c = 0.0f;
float_t t2c = 0.0f;
interpolate_chs_reverse_value(arr, length, t1a, t2a, t1b, t2b, t1c, t2c, f1, f2, i);
tt1 += t1a;
tt1 += t2a;
tt1 += t1b;
tt1 += t2b;
tt1 += t1c;
tt1 += t2c;
}
for (; i < f2 - 1; i++) {
float_t t1 = 0.0f;
float_t t2 = 0.0f;
interpolate_chs_reverse_value(arr, length, t1, t2, f1, f2, i);
tt1 += t1;
tt2 += t2;
}
t1 = (float_t)(tt1 / (double_t)(f2 - f1 - 2));
t2 = (float_t)(tt2 / (double_t)(f2 - f1 - 2));
}
void interpolate_chs_reverse(double_t* arr, size_t length,
double_t& t1, double_t& t2, size_t f1, size_t f2) {
t1 = 0.0;
t2 = 0.0;
if (f2 - f1 - 2 < 1)
return;
double_t _t1 = 0.0;
double_t _t2 = 0.0;
double_t tt1 = 0.0;
double_t tt2 = 0.0;
for (size_t i = f1 + 1; i < f2 - 1; i++) {
@@ -45,8 +140,8 @@ void interpolate_chs_reverse(float_t* arr, size_t length,
tt1 += _t1;
tt2 += _t2;
}
t1 = (float_t)(tt1 / (double_t)(f2 - f1 - 2));
t2 = (float_t)(tt2 / (double_t)(f2 - f1 - 2));
t1 = tt1 / (double_t)(f2 - f1 - 2);
t2 = tt2 / (double_t)(f2 - f1 - 2);
}
int32_t interpolate_chs_reverse_sequence(
@@ -122,7 +217,25 @@ int32_t interpolate_chs_reverse_sequence(
if (!fast) {
double_t t1_accum = 0.0;
double_t t2_accum = 0.0;
for (size_t j = 1; j < i - 1; j++) {
size_t j = 1;
for (; j < i - 1 && j + 3 <= i - 1; j += 3) {
float_t t1a = 0.0f;
float_t t2a = 0.0f;
float_t t1b = 0.0f;
float_t t2b = 0.0f;
float_t t1c = 0.0f;
float_t t2c = 0.0f;
interpolate_chs_reverse_value(a, left_count, t1a, t2a, t1b, t2b, t1c, t2c, 0, i, j);
t1_accum += t1a;
t2_accum += t2a;
t1_accum += t1b;
t2_accum += t2b;
t1_accum += t1c;
t2_accum += t2c;
}
for (; j < i - 1; j++) {
float_t t1 = 0.0f;
float_t t2 = 0.0f;
interpolate_chs_reverse_value(a, left_count, t1, t2, 0, i, j);
@@ -210,6 +323,26 @@ int32_t interpolate_chs_reverse_sequence(
values.push_back({ (float_t)(int64_t)(count - 1), arr[count - 1], t2_old, 0.0f });
if (values.size() > 2) {
kft3* keys = values.data();
size_t length = values.size();
for (size_t i = 0; i < length - 3; i++)
if (*(uint32_t*)&keys[i + 0].value == *(uint32_t*)&keys[i + 1].value
&& *(uint32_t*)&keys[i + 1].value == *(uint32_t*)&keys[i + 2].value
&& *(uint32_t*)&keys[i + 0].tangent2 == 0
&& *(uint32_t*)&keys[i + 1].tangent1 == 0
&& *(uint32_t*)&keys[i + 1].tangent2 == 0
&& *(uint32_t*)&keys[i + 2].tangent1 == 0) {
keys[i + 1].frame = keys[i + 2].frame;
keys[i + 1].tangent2 = keys[i + 2].tangent2;
values.erase(values.begin() + (i + 2));
keys = values.data();
length = values.size();
if (length < 3)
break;
}
}
kft3* keys = values.data();
size_t length = values.size();
for (size_t i = 0; i < count; i++) {