Продолжение переименования типов и функций
This commit is contained in:
parent
605afabd94
commit
3b6efaafa9
25 changed files with 768 additions and 916 deletions
|
|
@ -31,7 +31,6 @@
|
|||
<Add directory="../basic-geometry" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="-O2" />
|
||||
<Add option="-s" />
|
||||
<Add library="basic-geometry" />
|
||||
<Add library="m" />
|
||||
|
|
|
|||
|
|
@ -10,19 +10,19 @@
|
|||
#endif // _WINDOWS_
|
||||
|
||||
typedef struct {
|
||||
// fp32_versor_t versor1, versor2, result;
|
||||
fp32_matrix3x3_t matrix;
|
||||
fp32_vector3_t vector1, vector2;
|
||||
} fp32_structure_t;
|
||||
versor_fp32_t versor1, versor2, result;
|
||||
matrix3x3_fp32_t matrix;
|
||||
vector3_fp32_t vector1, vector2;
|
||||
} structure_fp32_t;
|
||||
|
||||
fp32_structure_t* allocate_structures(const unsigned int amount)
|
||||
structure_fp32_t* allocate_structures(const unsigned int amount)
|
||||
{
|
||||
return calloc(amount, sizeof(fp32_structure_t));
|
||||
return calloc(amount, sizeof(structure_fp32_t));
|
||||
}
|
||||
|
||||
fp32_structure_t* make_structures(const unsigned int amount)
|
||||
structure_fp32_t* make_structures(const unsigned int amount)
|
||||
{
|
||||
fp32_structure_t* list = allocate_structures(amount);
|
||||
structure_fp32_t* list = allocate_structures(amount);
|
||||
|
||||
if (list == 0) {
|
||||
return 0;
|
||||
|
|
@ -31,8 +31,7 @@ fp32_structure_t* make_structures(const unsigned int amount)
|
|||
const float multiplier = 2.0f / RAND_MAX;
|
||||
|
||||
for (unsigned int i = 0; i < amount; i++) {
|
||||
/*
|
||||
fp32_versor_set_values(
|
||||
versor_fp32_set_values(
|
||||
rand() * multiplier - 1.0f,
|
||||
rand() * multiplier - 1.0f,
|
||||
rand() * multiplier - 1.0f,
|
||||
|
|
@ -40,7 +39,7 @@ fp32_structure_t* make_structures(const unsigned int amount)
|
|||
&list[i].versor1
|
||||
);
|
||||
|
||||
fp32_versor_set_values(
|
||||
versor_fp32_set_values(
|
||||
rand() * multiplier - 1.0f,
|
||||
rand() * multiplier - 1.0f,
|
||||
rand() * multiplier - 1.0f,
|
||||
|
|
@ -48,54 +47,54 @@ fp32_structure_t* make_structures(const unsigned int amount)
|
|||
&list[i].versor2
|
||||
);
|
||||
|
||||
fp32_versor_reset(&list[i].result);
|
||||
*/
|
||||
fp32_matrix3x3_set_to_identity(&list[i].matrix);
|
||||
versor_reset_fp32(&list[i].result);
|
||||
|
||||
fp32_vector3_set_values(
|
||||
matrix3x3_fp32_set_to_identity(&list[i].matrix);
|
||||
|
||||
vector3_set_fp32(
|
||||
rand() * multiplier - 1.0f,
|
||||
rand() * multiplier - 1.0f,
|
||||
rand() * multiplier - 1.0f,
|
||||
&list[i].vector1
|
||||
);
|
||||
|
||||
fp32_vector3_reset(&list[i].vector2);
|
||||
vector3_reset_fp32(&list[i].vector2);
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
void print_versor(const fp32_versor_t* versor)
|
||||
void print_versor_fp32(const versor_fp32_t* versor)
|
||||
{
|
||||
printf("Versor (%f, %f, %f, %f)\n", versor->s0, versor->x1, versor->x2, versor->x3);
|
||||
}
|
||||
|
||||
void print_vector(const fp32_vector3_t* vector)
|
||||
void print_versor_fp64(const versor_fp64_t* versor)
|
||||
{
|
||||
printf("(%f, %f, %f) / %f\n", vector->x1, vector->x2, vector->x3, fp32_vector3_get_modulus(vector));
|
||||
printf("Versor (%lf, %lf, %lf, %lf)\n", versor->s0, versor->x1, versor->x2, versor->x3);
|
||||
}
|
||||
|
||||
void item_work(fp32_structure_t* item)
|
||||
void print_vector_fp32(const vector3_fp32_t* vector)
|
||||
{
|
||||
//fp32_versor_combine(&item->versor1, &item->versor1, &item->result);
|
||||
//fp32_versor_make_rotation_matrix(&item->result, &item->matrix);
|
||||
fp32_matrix3x3_right_product(&item->matrix, &item->vector1, &item->vector2);
|
||||
printf("(%f, %f, %f) / %f\n", vector->x1, vector->x2, vector->x3, vector3_get_modulus_fp32(vector));
|
||||
}
|
||||
|
||||
void circle_work(const unsigned int amount, fp32_structure_t* list)
|
||||
void print_vector_fp64(const vector3_fp64_t* vector)
|
||||
{
|
||||
for (unsigned int i = 0; i < amount; i++) {
|
||||
//fp32_versor_combine(&list[i].versor1, &list[i].versor1, &list[i].result);
|
||||
//fp32_versor_make_rotation_matrix(&list[i].result, &list[i].matrix);
|
||||