Kimelas/bgc-c
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Небольшие изменения в библиотеке геометрии и тестах

Browse source
This commit is contained in:
Andrey Pokidov 2024-11-21 23:42:19 +07:00
parent 23fcdc2c28
commit da61a9bf7c
5 changed files with 44 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/versor.c
View file

@ -7,7 +7,7 @@ const BgFP32Versor BG_FP32_IDLE_VERSOR = { 1.0f, 0.0f, 0.0f, 0.0f };
const BgFP64Versor BG_FP64_IDLE_VERSOR = { 1.0, 0.0, 0.0, 0.0 }; const BgFP64Versor BG_FP64_IDLE_VERSOR = { 1.0, 0.0, 0.0, 0.0 };
void __bg_fp32_versor_normalize(const float square_module, __BgFP32VersorDarkTwin* twin) void __bg_fp32_versor_normalize(const float square_module, __BgFP32DarkTwinVersor* twin)
{ {
if (square_module <= BG_FP32_SQUARE_EPSYLON || (twin->x1 * twin->x1 + twin->x2 * twin->x2 + twin->x3 * twin->x3) <= BG_FP32_SQUARE_EPSYLON * square_module) { if (square_module <= BG_FP32_SQUARE_EPSYLON || (twin->x1 * twin->x1 + twin->x2 * twin->x2 + twin->x3 * twin->x3) <= BG_FP32_SQUARE_EPSYLON * square_module) {
twin->s0 = 1.0f; twin->s0 = 1.0f;
@ -25,7 +25,7 @@ void __bg_fp32_versor_normalize(const float square_module, __BgFP32VersorDarkTwi
twin->x3 /= module; twin->x3 /= module;
} }
void __bg_fp64_versor_normalize(const double square_module, __BgFP64VersorDarkTwin* twin) void __bg_fp64_versor_normalize(const double square_module, __BgFP64DarkTwinVersor* twin)
{ {
if (square_module <= BG_FP64_SQUARE_EPSYLON || (twin->x1 * twin->x1 + twin->x2 * twin->x2 + twin->x3 * twin->x3) <= BG_FP64_SQUARE_EPSYLON * square_module) { if (square_module <= BG_FP64_SQUARE_EPSYLON || (twin->x1 * twin->x1 + twin->x2 * twin->x2 + twin->x3 * twin->x3) <= BG_FP64_SQUARE_EPSYLON * square_module) {
twin->s0 = 1.0; twin->s0 = 1.0;

36
src/versor.h
View file

@ -3,6 +3,8 @@
#include <stdint.h> #include <stdint.h>
#include <xmmintrin.h>
#include "basis.h" #include "basis.h"
#include "vector3.h" #include "vector3.h"
#include "rotation3.h" #include "rotation3.h"
@ -22,11 +24,11 @@ typedef struct {
typedef struct { typedef struct {
float s0, x1, x2, x3; float s0, x1, x2, x3;
} __BgFP32VersorDarkTwin; } __BgFP32DarkTwinVersor;
typedef struct { typedef struct {
double s0, x1, x2, x3; double s0, x1, x2, x3;
} __BgFP64VersorDarkTwin; } __BgFP64DarkTwinVersor;
// ================= Constants ================== // // ================= Constants ================== //
@ -37,7 +39,7 @@ extern const BgFP64Versor BG_FP64_IDLE_VERSOR;
static inline void bg_fp32_versor_reset(BgFP32Versor* versor) static inline void bg_fp32_versor_reset(BgFP32Versor* versor)
{ {
__BgFP32VersorDarkTwin* twin = (__BgFP32VersorDarkTwin*)versor; __BgFP32DarkTwinVersor* twin = (__BgFP32DarkTwinVersor*)versor;
twin->s0 = 1.0f; twin->s0 = 1.0f;
twin->x1 = 0.0f; twin->x1 = 0.0f;
@ -47,7 +49,7 @@ static inline void bg_fp32_versor_reset(BgFP32Versor* versor)
static inline void bg_fp64_versor_reset(BgFP64Versor* versor) static inline void bg_fp64_versor_reset(BgFP64Versor* versor)
{ {
__BgFP64VersorDarkTwin* twin = (__BgFP64VersorDarkTwin*)versor; __BgFP64DarkTwinVersor* twin = (__BgFP64DarkTwinVersor*)versor;
twin->s0 = 1.0; twin->s0 = 1.0;
twin->x1 = 0.0; twin->x1 = 0.0;
@ -57,13 +59,13 @@ static inline void bg_fp64_versor_reset(BgFP64Versor* versor)
// ==================== Set ===================== // // ==================== Set ===================== //
void __bg_fp32_versor_normalize(const float square_module, __BgFP32VersorDarkTwin* twin); void __bg_fp32_versor_normalize(const float square_module, __BgFP32DarkTwinVersor* twin);
void __bg_fp64_versor_normalize(const double square_module, __BgFP64VersorDarkTwin* twin); void __bg_fp64_versor_normalize(const double square_module, __BgFP64DarkTwinVersor* twin);
static inline void bg_fp32_versor_set_values(const float s0, const float x1, const float x2, const float x3, BgFP32Versor* versor) static inline void bg_fp32_versor_set_values(const float s0, const float x1, const float x2, const float x3, BgFP32Versor* versor)
{ {
__BgFP32VersorDarkTwin* twin = (__BgFP32VersorDarkTwin*)versor; __BgFP32DarkTwinVersor* twin = (__BgFP32DarkTwinVersor*)versor;
twin->s0 = s0; twin->s0 = s0;
twin->x1 = x1; twin->x1 = x1;
@ -73,13 +75,13 @@ static inline void bg_fp32_versor_set_values(const float s0, const float x1, con
const float square_module = (s0 * s0 + x1 * x1) + (x2 * x2 + x3 * x3); const float square_module = (s0 * s0 + x1 * x1) + (x2 * x2 + x3 * x3);
if (square_module < 1.0f - BG_FP32_TWO_EPSYLON || 1.0f + BG_FP32_TWO_EPSYLON < square_module) { if (square_module < 1.0f - BG_FP32_TWO_EPSYLON || 1.0f + BG_FP32_TWO_EPSYLON < square_module) {
__bg_fp32_versor_normalize(square_module, (__BgFP32VersorDarkTwin*)versor); __bg_fp32_versor_normalize(square_module, (__BgFP32DarkTwinVersor*)versor);
} }
} }
static inline void bg_fp64_versor_set_values(const double s0, const double x1, const double x2, const double x3, BgFP64Versor* versor) static inline void bg_fp64_versor_set_values(const double s0, const double x1, const double x2, const double x3, BgFP64Versor* versor)
{ {
__BgFP64VersorDarkTwin* twin = (__BgFP64VersorDarkTwin*)versor; __BgFP64DarkTwinVersor* twin = (__BgFP64DarkTwinVersor*)versor;
twin->s0 = s0; twin->s0 = s0;
twin->x1 = x1; twin->x1 = x1;
@ -97,7 +99,7 @@ static inline void bg_fp64_versor_set_values(const double s0, const double x1, c
static inline void bg_fp32_versor_copy(const BgFP32Versor* from, BgFP32Versor* to) static inline void bg_fp32_versor_copy(const BgFP32Versor* from, BgFP32Versor* to)
{ {
__BgFP32VersorDarkTwin* twin = (__BgFP32VersorDarkTwin*)to; __BgFP32DarkTwinVersor* twin = (__BgFP32DarkTwinVersor*)to;
twin->s0 = from->s0; twin->s0 = from->s0;
twin->x1 = from->x1; twin->x1 = from->x1;
@ -107,7 +109,7 @@ static inline void bg_fp32_versor_copy(const BgFP32Versor* from, BgFP32Versor* t
static inline void bg_fp64_versor_copy(const BgFP64Versor* from, BgFP64Versor* to) static inline void bg_fp64_versor_copy(const BgFP64Versor* from, BgFP64Versor* to)
{ {
__BgFP64VersorDarkTwin* twin = (__BgFP64VersorDarkTwin*)to; __BgFP64DarkTwinVersor* twin = (__BgFP64DarkTwinVersor*)to;
twin->s0 = from->s0; twin->s0 = from->s0;
twin->x1 = from->x1; twin->x1 = from->x1;
@ -185,7 +187,7 @@ static inline void bg_fp64_versor_set_from_fp32(const BgFP32Versor* versor, BgFP
static inline void bg_fp32_versor_invert(BgFP32Versor* versor) static inline void bg_fp32_versor_invert(BgFP32Versor* versor)
{ {
__BgFP32VersorDarkTwin* twin = (__BgFP32VersorDarkTwin*)versor; __BgFP32DarkTwinVersor* twin = (__BgFP32DarkTwinVersor*)versor;
twin->x1 = -versor->x1; twin->x1 = -versor->x1;
twin->x2 = -versor->x2; twin->x2 = -versor->x2;
twin->x3 = -versor->x3; twin->x3 = -versor->x3;
@ -193,7 +195,7 @@ static inline void bg_fp32_versor_invert(BgFP32Versor* versor)
static inline void bg_fp64_versor_invert(BgFP64Versor* versor) static inline void bg_fp64_versor_invert(BgFP64Versor* versor)
{ {
__BgFP64VersorDarkTwin* twin = (__BgFP64VersorDarkTwin*)versor; __BgFP64DarkTwinVersor* twin = (__BgFP64DarkTwinVersor*)versor;
twin->x1 = -versor->x1; twin->x1 = -versor->x1;
twin->x2 = -versor->x2; twin->x2 = -versor->x2;
twin->x3 = -versor->x3; twin->x3 = -versor->x3;
@ -203,7 +205,7 @@ static inline void bg_fp64_versor_invert(BgFP64Versor* versor)
static inline void bg_fp32_versor_set_inverted(const BgFP32Versor* versor, BgFP32Versor* to) static inline void bg_fp32_versor_set_inverted(const BgFP32Versor* versor, BgFP32Versor* to)
{ {
__BgFP32VersorDarkTwin* twin = (__BgFP32VersorDarkTwin*)to; __BgFP32DarkTwinVersor* twin = (__BgFP32DarkTwinVersor*)to;
twin->s0 = versor->s0; twin->s0 = versor->s0;
twin->x1 = -versor->x1; twin->x1 = -versor->x1;
twin->x2 = -versor->x2; twin->x2 = -versor->x2;
@ -212,7 +214,7 @@ static inline void bg_fp32_versor_set_inverted(const BgFP32Versor* versor, BgFP3
static inline void bg_fp64_versor_set_inverted(const BgFP64Versor* versor, BgFP64Versor* to) static inline void bg_fp64_versor_set_inverted(const BgFP64Versor* versor, BgFP64Versor* to)
{ {
__BgFP64VersorDarkTwin* twin = (__BgFP64VersorDarkTwin*)to; __BgFP64DarkTwinVersor* twin = (__BgFP64DarkTwinVersor*)to;
twin->s0 = versor->s0; twin->s0 = versor->s0;
twin->x1 = -versor->x1; twin->x1 = -versor->x1;
twin->x2 = -versor->x2; twin->x2 = -versor->x2;
@ -254,7 +256,7 @@ static inline void bg_fp32_versor_combine(const BgFP32Versor* second, const BgFP
const float square_module = (s0 * s0 + x1 * x1) + (x2 * x2 + x3 * x3); const float square_module = (s0 * s0 + x1 * x1) + (x2 * x2 + x3 * x3);
__BgFP32VersorDarkTwin* twin = (__BgFP32VersorDarkTwin*)result; __BgFP32DarkTwinVersor* twin = (__BgFP32DarkTwinVersor*)result;
twin->s0 = s0; twin->s0 = s0;
twin->x1 = x1; twin->x1 = x1;
@ -275,7 +277,7 @@ static inline void bg_fp64_versor_combine(const BgFP64Versor* second, const BgFP
const double square_module = (s0 * s0 + x1 * x1) + (x2 * x2 + x3 * x3); const double square_module = (s0 * s0 + x1 * x1) + (x2 * x2 + x3 * x3);
__BgFP64VersorDarkTwin* twin = (__BgFP64VersorDarkTwin*)result; __BgFP64DarkTwinVersor* twin = (__BgFP64DarkTwinVersor*)result;
twin->s0 = s0; twin->s0 = s0;
twin->x1 = x1; twin->x1 = x1;

38
test/fp32_vector2_test.c
View file

@ -1,4 +1,4 @@
#include "sp_vector2_test.h" #include "fp32_vector2_test.h"
const int TEST_BG_FP32_VECTOR2_AMOUNT_1 = 5; const int TEST_BG_FP32_VECTOR2_AMOUNT_1 = 5;
@ -22,7 +22,7 @@ const BgFP32Vector2 TEST_BG_FP32_VECTOR2_COMMON_2[] = {
const float BG_FP32_VECTOR2_SQUARE_MODULE_1[] = { 25.0f, 25.0f, 500000000.0f, 100.01f, 15266.150221f }; const float BG_FP32_VECTOR2_SQUARE_MODULE_1[] = { 25.0f, 25.0f, 500000000.0f, 100.01f, 15266.150221f };
int test_sp_vector2_square_module() int test_bg_fp32_vector2_square_module()
{ {
print_test_name("BgFP32Vector2 square module"); print_test_name("BgFP32Vector2 square module");
@ -31,7 +31,7 @@ int test_sp_vector2_square_module()
for (int i = 0; i < TEST_BG_FP32_VECTOR2_AMOUNT_1; i++) { for (int i = 0; i < TEST_BG_FP32_VECTOR2_AMOUNT_1; i++) {
square_module = bg_fp32_vector2_get_square_module(&TEST_BG_FP32_VECTOR2_COMMON_1[i]); square_module = bg_fp32_vector2_get_square_module(&TEST_BG_FP32_VECTOR2_COMMON_1[i]);
if (!test_sp_are_equal(square_module, BG_FP32_VECTOR2_SQUARE_MODULE_1[i], TEST_BG_FP32_TWO_EPSYLON)) { if (!test_bg_fp32_are_equal(square_module, BG_FP32_VECTOR2_SQUARE_MODULE_1[i], TEST_BG_FP32_TWO_EPSYLON)) {
print_test_failed(); print_test_failed();
return TEST_RESULT_FAILED; return TEST_RESULT_FAILED;
} }
@ -45,16 +45,16 @@ int test_sp_vector2_square_module()
const float BG_FP32_VECTOR2_MODULE_1[] = { 5.0f, 5.0f, 22360.68f, 10.0005f, 123.55626338f }; const float BG_FP32_VECTOR2_MODULE_1[] = { 5.0f, 5.0f, 22360.68f, 10.0005f, 123.55626338f };
int test_sp_vector2_module() int test_bg_fp32_vector2_module()
{ {
print_test_name("BgFP32Vector2 module"); print_test_name("BgFP32Vector2 module");
float square_module; float square_module;
for (int i = 0; i < TEST_BG_FP32_VECTOR2_AMOUNT_1; i++) { for (int i = 0; i < TEST_BG_FP32_VECTOR2_AMOUNT_1; i++) {
square_module = sp_vector2_get_module(&TEST_BG_FP32_VECTOR2_COMMON_1[i]); square_module = bg_fp32_vector2_get_module(&TEST_BG_FP32_VECTOR2_COMMON_1[i]);
if (!test_sp_are_equal(square_module, BG_FP32_VECTOR2_MODULE_1[i], TEST_BG_FP32_EPSYLON)) { if (!test_bg_fp32_are_equal(square_module, BG_FP32_VECTOR2_MODULE_1[i], TEST_BG_FP32_EPSYLON)) {
print_test_failed(); print_test_failed();
return TEST_RESULT_FAILED; return TEST_RESULT_FAILED;
} }
@ -74,17 +74,17 @@ const BgFP32Vector2 TEST_BG_FP32_VECTOR2_COMMON_1_2_SUM[] = {
{ -122.0f, -19.6217f } { -122.0f, -19.6217f }
}; };
int test_sp_vector2_add() int test_bg_fp32_vector2_add()
{ {
print_test_name("BgFP32Vector2 add"); print_test_name("BgFP32Vector2 add");
BgFP32Vector2 vector; BgFP32Vector2 vector;
for (int i = 0; i < TEST_BG_FP32_VECTOR2_AMOUNT_1; i++) { for (int i = 0; i < TEST_BG_FP32_VECTOR2_AMOUNT_1; i++) {
sp_vector2_add(&TEST_BG_FP32_VECTOR2_COMMON_1[i], &TEST_BG_FP32_VECTOR2_COMMON_2[i], &vector); bg_fp32_vector2_add(&TEST_BG_FP32_VECTOR2_COMMON_1[i], &TEST_BG_FP32_VECTOR2_COMMON_2[i], &vector);
if (!test_sp_are_equal(vector.x1, TEST_BG_FP32_VECTOR2_COMMON_1_2_SUM[i].x1, TEST_BG_FP32_EPSYLON) || if (!test_bg_fp32_are_equal(vector.x1, TEST_BG_FP32_VECTOR2_COMMON_1_2_SUM[i].x1, TEST_BG_FP32_EPSYLON) ||
!test_sp_are_equal(vector.x2, TEST_BG_FP32_VECTOR2_COMMON_1_2_SUM[i].x2, TEST_BG_FP32_EPSYLON)) { !test_bg_fp32_are_equal(vector.x2, TEST_BG_FP32_VECTOR2_COMMON_1_2_SUM[i].x2, TEST_BG_FP32_EPSYLON)) {
print_test_failed(); print_test_failed();
return TEST_RESULT_FAILED; return TEST_RESULT_FAILED;
} }
@ -104,17 +104,17 @@ const BgFP32Vector2 TEST_BG_FP32_VECTOR2_COMMON_1_2_DIFF[] = {
{ -125.0f, 27.0783f } { -125.0f, 27.0783f }
}; };
int test_sp_vector2_subtract() int test_bg_fp32_vector2_subtract()
{ {
print_test_name("BgFP32Vector2 subtract"); print_test_name("BgFP32Vector2 subtract");
BgFP32Vector2 vector; BgFP32Vector2 vector;
for (int i = 0; i < TEST_BG_FP32_VECTOR2_AMOUNT_1; i++) { for (int i = 0; i < TEST_BG_FP32_VECTOR2_AMOUNT_1; i++) {
sp_vector2_subtract(&TEST_BG_FP32_VECTOR2_COMMON_1[i], &TEST_BG_FP32_VECTOR2_COMMON_2[i], &vector); bg_fp32_vector2_subtract(&TEST_BG_FP32_VECTOR2_COMMON_1[i], &TEST_BG_FP32_VECTOR2_COMMON_2[i], &vector);
if (!test_sp_are_equal(vector.x1, TEST_BG_FP32_VECTOR2_COMMON_1_2_DIFF[i].x1, TEST_BG_FP32_EPSYLON) || if (!test_bg_fp32_are_equal(vector.x1, TEST_BG_FP32_VECTOR2_COMMON_1_2_DIFF[i].x1, TEST_BG_FP32_EPSYLON) ||
!test_sp_are_equal(vector.x2, TEST_BG_FP32_VECTOR2_COMMON_1_2_DIFF[i].x2, TEST_BG_FP32_EPSYLON)) { !test_bg_fp32_are_equal(vector.x2, TEST_BG_FP32_VECTOR2_COMMON_1_2_DIFF[i].x2, TEST_BG_FP32_EPSYLON)) {
print_test_failed(); print_test_failed();
return TEST_RESULT_FAILED; return TEST_RESULT_FAILED;
} }
@ -126,23 +126,23 @@ int test_sp_vector2_subtract()
// ==================== 1234 ==================== // // ==================== 1234 ==================== //
int test_sp_vector2() int test_bg_fp32_vector2()
{ {
print_test_section("BgFP32Vector2"); print_test_section("BgFP32Vector2");
if (test_sp_vector2_square_module() != TEST_RESULT_SUCCES) { if (test_bg_fp32_vector2_square_module() != TEST_RESULT_SUCCES) {
return TEST_RESULT_FAILED; return TEST_RESULT_FAILED;
} }
if (test_sp_vector2_module() != TEST_RESULT_SUCCES) { if (test_bg_fp32_vector2_module() != TEST_RESULT_SUCCES) {
return TEST_RESULT_FAILED; return TEST_RESULT_FAILED;
} }
if (test_sp_vector2_add() != TEST_RESULT_SUCCES) { if (test_bg_fp32_vector2_add() != TEST_RESULT_SUCCES) {
return TEST_RESULT_FAILED; return TEST_RESULT_FAILED;
} }
if (test_sp_vector2_subtract() != TEST_RESULT_SUCCES) { if (test_bg_fp32_vector2_subtract() != TEST_RESULT_SUCCES) {
return TEST_RESULT_FAILED; return TEST_RESULT_FAILED;
} }

4
test/geometry-test.vcxproj
View file

@ -148,13 +148,13 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="fp32_vector2_test.c" />
<ClCompile Include="geometry_test.c" /> <ClCompile Include="geometry_test.c" />
<ClCompile Include="main.c" /> <ClCompile Include="main.c" />
<ClCompile Include="sp_vector2_test.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="fp32_vector2_test.h" />
<ClInclude Include="geometry_test.h" /> <ClInclude Include="geometry_test.h" />
<ClInclude Include="sp_vector2_test.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

4
test/geometry-test.vcxproj.filters
View file

@ -21,7 +21,7 @@
<ClCompile Include="geometry_test.c"> <ClCompile Include="geometry_test.c">
<Filter>Исходные файлы</Filter> <Filter>Исходные файлы</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="sp_vector2_test.c"> <ClCompile Include="fp32_vector2_test.c">
<Filter>Исходные файлы</Filter> <Filter>Исходные файлы</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
@ -29,7 +29,7 @@
<ClInclude Include="geometry_test.h"> <ClInclude Include="geometry_test.h">
<Filter>Исходные файлы</Filter> <Filter>Исходные файлы</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="sp_vector2_test.h"> <ClInclude Include="fp32_vector2_test.h">
<Filter>Исходные файлы</Filter> <Filter>Исходные файлы</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>