You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-19 14:31:59 +00:00
ufbx: Update to 0.17.1
This commit is contained in:
@@ -251,18 +251,16 @@ static bool _thread_pool_init_fn(void *user, ufbx_thread_pool_context ctx, const
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool _thread_pool_run_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t start_index, uint32_t count) {
|
static void _thread_pool_run_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t start_index, uint32_t count) {
|
||||||
ThreadPoolFBX *pool = (ThreadPoolFBX *)user;
|
ThreadPoolFBX *pool = (ThreadPoolFBX *)user;
|
||||||
ThreadPoolFBX::Group &pool_group = pool->groups[group];
|
ThreadPoolFBX::Group &pool_group = pool->groups[group];
|
||||||
pool_group.start_index = start_index;
|
pool_group.start_index = start_index;
|
||||||
pool_group.task_id = pool->pool->add_native_group_task(_thread_pool_task, &pool_group, (int)count, -1, true, "ufbx");
|
pool_group.task_id = pool->pool->add_native_group_task(_thread_pool_task, &pool_group, (int)count, -1, true, "ufbx");
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool _thread_pool_wait_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t max_index) {
|
static void _thread_pool_wait_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t max_index) {
|
||||||
ThreadPoolFBX *pool = (ThreadPoolFBX *)user;
|
ThreadPoolFBX *pool = (ThreadPoolFBX *)user;
|
||||||
pool->pool->wait_for_group_task_completion(pool->groups[group].task_id);
|
pool->pool->wait_for_group_task_completion(pool->groups[group].task_id);
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
String FBXDocument::_gen_unique_name(HashSet<String> &unique_names, const String &p_name) {
|
String FBXDocument::_gen_unique_name(HashSet<String> &unique_names, const String &p_name) {
|
||||||
|
|||||||
2
thirdparty/README.md
vendored
2
thirdparty/README.md
vendored
@@ -976,7 +976,7 @@ Patches:
|
|||||||
## ufbx
|
## ufbx
|
||||||
|
|
||||||
- Upstream: https://github.com/ufbx/ufbx
|
- Upstream: https://github.com/ufbx/ufbx
|
||||||
- Version: 0.15.0 (24eea6f40929fe0f679b7950def378edb003afdb, 2024)
|
- Version: 0.17.1 (6ca5309972f03625e6990f3084ff4c1cc55a09b6, 2025)
|
||||||
- License: MIT
|
- License: MIT
|
||||||
|
|
||||||
Files extracted from upstream source:
|
Files extracted from upstream source:
|
||||||
|
|||||||
129
thirdparty/ufbx/ufbx.c
vendored
129
thirdparty/ufbx/ufbx.c
vendored
@@ -600,7 +600,7 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(UFBX_STANDARD_C) && !defined(UFBX_NO_SSE) && (defined(_MSC_VER) && defined(_M_X64) && !defined(_M_ARM64EC)) || ((defined(__GNUC__) || defined(__clang__)) && defined(__x86_64__)) || defined(UFBX_USE_SSE)
|
#if defined(UFBX_USE_SSE) || (!defined(UFBX_STANDARD_C) && !defined(UFBX_NO_SSE) && ((defined(_MSC_VER) && defined(_M_X64) && !defined(_M_ARM64EC)) || ((defined(__GNUC__) || defined(__clang__)) && defined(__x86_64__))))
|
||||||
#define UFBXI_HAS_SSE 1
|
#define UFBXI_HAS_SSE 1
|
||||||
#include <xmmintrin.h>
|
#include <xmmintrin.h>
|
||||||
#include <emmintrin.h>
|
#include <emmintrin.h>
|
||||||
@@ -830,7 +830,7 @@ ufbx_static_assert(sizeof_f64, sizeof(double) == 8);
|
|||||||
|
|
||||||
// -- Version
|
// -- Version
|
||||||
|
|
||||||
#define UFBX_SOURCE_VERSION ufbx_pack_version(0, 15, 0)
|
#define UFBX_SOURCE_VERSION ufbx_pack_version(0, 17, 1)
|
||||||
ufbx_abi_data_def const uint32_t ufbx_source_version = UFBX_SOURCE_VERSION;
|
ufbx_abi_data_def const uint32_t ufbx_source_version = UFBX_SOURCE_VERSION;
|
||||||
|
|
||||||
ufbx_static_assert(source_header_version, UFBX_SOURCE_VERSION/1000u == UFBX_HEADER_VERSION/1000u);
|
ufbx_static_assert(source_header_version, UFBX_SOURCE_VERSION/1000u == UFBX_HEADER_VERSION/1000u);
|
||||||
@@ -968,7 +968,7 @@ ufbx_static_assert(source_header_version, UFBX_SOURCE_VERSION/1000u == UFBX_HEAD
|
|||||||
#define ufbxi_regression_assert(cond) (void)0
|
#define ufbxi_regression_assert(cond) (void)0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(UFBX_REGRESSION) || defined(UFBX_DEV)
|
#if defined(UFBX_REGRESSION) || defined(UFBX_DEV) || defined(UFBX_UBSAN)
|
||||||
#define ufbxi_dev_assert(cond) ufbx_assert(cond)
|
#define ufbxi_dev_assert(cond) ufbx_assert(cond)
|
||||||
#else
|
#else
|
||||||
#define ufbxi_dev_assert(cond) (void)0
|
#define ufbxi_dev_assert(cond) (void)0
|
||||||
@@ -1400,7 +1400,7 @@ static ufbxi_noinline void ufbxi_bigint_shift_left(ufbxi_bigint *bigint, uint32_
|
|||||||
bigint->length += words + (b.limbs[b.length - 1] >> 1 >> bits_down != 0 ? 1 : 0);
|
bigint->length += words + (b.limbs[b.length - 1] >> 1 >> bits_down != 0 ? 1 : 0);
|
||||||
b.limbs[b.length] = 0;
|
b.limbs[b.length] = 0;
|
||||||
if (b.length <= 3 && words <= 3) {
|
if (b.length <= 3 && words <= 3) {
|
||||||
ufbxi_bigint_limb l0 = ufbxi_maybe_uninit(b.length >= 0, b.limbs[0], ~0u);
|
ufbxi_bigint_limb l0 = b.limbs[0];
|
||||||
ufbxi_bigint_limb l1 = ufbxi_maybe_uninit(b.length >= 1, b.limbs[1], ~0u);
|
ufbxi_bigint_limb l1 = ufbxi_maybe_uninit(b.length >= 1, b.limbs[1], ~0u);
|
||||||
ufbxi_bigint_limb l2 = ufbxi_maybe_uninit(b.length >= 2, b.limbs[2], ~0u);
|
ufbxi_bigint_limb l2 = ufbxi_maybe_uninit(b.length >= 2, b.limbs[2], ~0u);
|
||||||
b.limbs[0] = 0;
|
b.limbs[0] = 0;
|
||||||
@@ -1491,6 +1491,7 @@ static ufbxi_noinline double ufbxi_parse_double(const char *str, size_t max_leng
|
|||||||
digits = digits * 10 + (uint64_t)(c - '0');
|
digits = digits * 10 + (uint64_t)(c - '0');
|
||||||
num_digits++;
|
num_digits++;
|
||||||
if (num_digits >= 18) {
|
if (num_digits >= 18) {
|
||||||
|
ufbxi_dev_assert(num_digits < ufbxi_arraycount(ufbxi_pow5_tab));
|
||||||
ufbxi_bigint_mad(&big_mantissa, ufbxi_pow5_tab[num_digits] << num_digits, digits);
|
ufbxi_bigint_mad(&big_mantissa, ufbxi_pow5_tab[num_digits] << num_digits, digits);
|
||||||
digits = 0;
|
digits = 0;
|
||||||
num_digits = 0;
|
num_digits = 0;
|
||||||
@@ -1553,6 +1554,7 @@ static ufbxi_noinline double ufbxi_parse_double(const char *str, size_t max_leng
|
|||||||
big_mantissa.length = (digits >> 32u) ? 2 : digits ? 1 : 0;
|
big_mantissa.length = (digits >> 32u) ? 2 : digits ? 1 : 0;
|
||||||
if (big_mantissa.length == 0) return negative ? -0.0 : 0.0;
|
if (big_mantissa.length == 0) return negative ? -0.0 : 0.0;
|
||||||
} else {
|
} else {
|
||||||
|
ufbxi_dev_assert(num_digits < ufbxi_arraycount(ufbxi_pow5_tab));
|
||||||
ufbxi_bigint_mad(&big_mantissa, ufbxi_pow5_tab[num_digits] << num_digits, digits);
|
ufbxi_bigint_mad(&big_mantissa, ufbxi_pow5_tab[num_digits] << num_digits, digits);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6438,6 +6440,8 @@ typedef struct {
|
|||||||
bool parse_threaded;
|
bool parse_threaded;
|
||||||
ufbxi_thread_pool thread_pool;
|
ufbxi_thread_pool thread_pool;
|
||||||
|
|
||||||
|
uint8_t *base64_table;
|
||||||
|
|
||||||
} ufbxi_context;
|
} ufbxi_context;
|
||||||
|
|
||||||
static ufbxi_noinline int ufbxi_fail_imp(ufbxi_context *uc, const char *cond, const char *func, uint32_t line)
|
static ufbxi_noinline int ufbxi_fail_imp(ufbxi_context *uc, const char *cond, const char *func, uint32_t line)
|
||||||
@@ -10009,6 +10013,66 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_ascii_read_float_array(ufbxi_con
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ufbxi_noinline static int ufbxi_setup_base64(ufbxi_context *uc)
|
||||||
|
{
|
||||||
|
uint8_t *table = ufbxi_push(&uc->tmp, uint8_t, 256);
|
||||||
|
ufbxi_check(table);
|
||||||
|
uc->base64_table = table;
|
||||||
|
|
||||||
|
memset(table, 0x80, 256);
|
||||||
|
ufbxi_nounroll for (char c = 'A'; c <= 'Z'; c++) table[(size_t)c] = (uint8_t)(c - 'A');
|
||||||
|
ufbxi_nounroll for (char c = 'a'; c <= 'z'; c++) table[(size_t)c] = (uint8_t)(26 + (c - 'a'));
|
||||||
|
ufbxi_nounroll for (char c = '0'; c <= '9'; c++) table[(size_t)c] = (uint8_t)(52 + (c - '0'));
|
||||||
|
table[(size_t)'+'] = 62;
|
||||||
|
table[(size_t)'/'] = 63;
|
||||||
|
table[(size_t)'='] = 0x40;
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
ufbxi_noinline static int ufbxi_decode_base64(ufbxi_context *uc, ufbx_string *p_result, const char *src, size_t src_length, bool *p_failed)
|
||||||
|
{
|
||||||
|
if (!uc->base64_table) ufbxi_check(ufbxi_setup_base64(uc));
|
||||||
|
|
||||||
|
uint8_t *table = uc->base64_table;
|
||||||
|
uint32_t error_mask = 0, pad_error = 0;
|
||||||
|
|
||||||
|
char *p = (char*)p_result->data;
|
||||||
|
for (size_t i = 0; i + 4 <= src_length; i += 4) {
|
||||||
|
uint32_t a = table[(size_t)(uint8_t)src[i + 0]];
|
||||||
|
uint32_t b = table[(size_t)(uint8_t)src[i + 1]];
|
||||||
|
uint32_t c = table[(size_t)(uint8_t)src[i + 2]];
|
||||||
|
uint32_t d = table[(size_t)(uint8_t)src[i + 3]];
|
||||||
|
pad_error = error_mask;
|
||||||
|
error_mask |= a | b | c | d;
|
||||||
|
|
||||||
|
p[0] = (char)(uint8_t)(a << 2 | b >> 4);
|
||||||
|
p[1] = (char)(uint8_t)(b << 4 | c >> 2);
|
||||||
|
p[2] = (char)(uint8_t)(c << 6 | d);
|
||||||
|
p += 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (src_length >= 4) {
|
||||||
|
const char *end = src + src_length - 4;
|
||||||
|
uint32_t padding = 0;
|
||||||
|
padding |= end[0] == '=' ? 0x8 : 0x0;
|
||||||
|
padding |= end[1] == '=' ? 0x4 : 0x0;
|
||||||
|
padding |= end[2] == '=' ? 0x2 : 0x0;
|
||||||
|
padding |= end[3] == '=' ? 0x1 : 0x0;
|
||||||
|
if (padding <= 0x1) p -= padding; // "xxx=" or "xxxx"
|
||||||
|
else if (padding == 0x3) p -= 2; // "xx=="
|
||||||
|
else pad_error |= 0x40; // anything else
|
||||||
|
}
|
||||||
|
|
||||||
|
if (((error_mask & 0x80) != 0 || (pad_error & 0x40) != 0 || src_length % 4 != 0) && !*p_failed) {
|
||||||
|
ufbxi_check(ufbxi_warnf(UFBX_WARNING_BAD_BASE64_CONTENT, "Ignored bad base64 embedded content"));
|
||||||
|
*p_failed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
p_result->length = ufbxi_to_size(p - p_result->data);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
// Recursion limited by check at the start
|
// Recursion limited by check at the start
|
||||||
ufbxi_nodiscard ufbxi_noinline static int ufbxi_ascii_parse_node(ufbxi_context *uc, uint32_t depth, ufbxi_parse_state parent_state, bool *p_end, ufbxi_buf *tmp_buf, bool recursive)
|
ufbxi_nodiscard ufbxi_noinline static int ufbxi_ascii_parse_node(ufbxi_context *uc, uint32_t depth, ufbxi_parse_state parent_state, bool *p_end, ufbxi_buf *tmp_buf, bool recursive)
|
||||||
ufbxi_recursive_function(int, ufbxi_ascii_parse_node, (uc, depth, parent_state, p_end, tmp_buf, recursive), UFBXI_MAX_NODE_DEPTH + 1,
|
ufbxi_recursive_function(int, ufbxi_ascii_parse_node, (uc, depth, parent_state, p_end, tmp_buf, recursive), UFBXI_MAX_NODE_DEPTH + 1,
|
||||||
@@ -10054,6 +10118,7 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_ascii_parse_node(ufbxi_context *
|
|||||||
int arr_type = 0;
|
int arr_type = 0;
|
||||||
ufbxi_buf *arr_buf = NULL;
|
ufbxi_buf *arr_buf = NULL;
|
||||||
size_t arr_elem_size = 0;
|
size_t arr_elem_size = 0;
|
||||||
|
bool arr_error = false;
|
||||||
|
|
||||||
// Check if the values of the node we're parsing currently should be
|
// Check if the values of the node we're parsing currently should be
|
||||||
// treated as an array.
|
// treated as an array.
|
||||||
@@ -10134,13 +10199,16 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_ascii_parse_node(ufbxi_context *
|
|||||||
bool raw = arr_type == 's';
|
bool raw = arr_type == 's';
|
||||||
ufbx_string *v = ufbxi_push(&uc->tmp_stack, ufbx_string, 1);
|
ufbx_string *v = ufbxi_push(&uc->tmp_stack, ufbx_string, 1);
|
||||||
ufbxi_check(v);
|
ufbxi_check(v);
|
||||||
v->data = tok->str_data;
|
|
||||||
v->length = tok->str_len;
|
|
||||||
if (arr_type == 'C') {
|
if (arr_type == 'C') {
|
||||||
ufbxi_buf *buf = uc->opts.retain_dom ? &uc->result : tmp_buf;
|
ufbxi_buf *buf = uc->opts.retain_dom ? &uc->result : tmp_buf;
|
||||||
v->data = ufbxi_push_copy(buf, char, v->length, v->data);
|
size_t capacity = tok->str_len / 4 * 3 + 3;
|
||||||
|
v->data = ufbxi_push(buf, char, capacity);
|
||||||
ufbxi_check(v->data);
|
ufbxi_check(v->data);
|
||||||
|
ufbxi_check(ufbxi_decode_base64(uc, v, tok->str_data, tok->str_len, &arr_error));
|
||||||
|
ufbx_assert(v->length <= capacity);
|
||||||
} else {
|
} else {
|
||||||
|
v->data = tok->str_data;
|
||||||
|
v->length = tok->str_len;
|
||||||
ufbxi_check(ufbxi_push_string_place_str(&uc->string_pool, v, raw));
|
ufbxi_check(ufbxi_push_string_place_str(&uc->string_pool, v, raw));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -10324,6 +10392,10 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_ascii_parse_node(ufbxi_context *
|
|||||||
if (num_values > 0) {
|
if (num_values > 0) {
|
||||||
ufbxi_pop_size(&uc->tmp_stack, arr_elem_size, num_values, arr_data, false);
|
ufbxi_pop_size(&uc->tmp_stack, arr_elem_size, num_values, arr_data, false);
|
||||||
}
|
}
|
||||||
|
} else if (arr_error) {
|
||||||
|
ufbxi_pop_size(&uc->tmp_stack, arr_elem_size, num_values, NULL, false);
|
||||||
|
num_values = 0;
|
||||||
|
arr_data = (void*)ufbxi_zero_size_buffer;
|
||||||
} else {
|
} else {
|
||||||
arr_data = ufbxi_push_pop_size(arr_buf, &uc->tmp_stack, arr_elem_size, num_values);
|
arr_data = ufbxi_push_pop_size(arr_buf, &uc->tmp_stack, arr_elem_size, num_values);
|
||||||
}
|
}
|
||||||
@@ -11454,28 +11526,6 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_load_maps(ufbxi_context *uc)
|
|||||||
|
|
||||||
// -- Reading the parsed data
|
// -- Reading the parsed data
|
||||||
|
|
||||||
ufbxi_noinline static void ufbxi_decode_base64(char *dst, const char *src, size_t src_length)
|
|
||||||
{
|
|
||||||
uint8_t table[256] = { 0 };
|
|
||||||
for (char c = 'A'; c <= 'Z'; c++) table[(size_t)c] = (uint8_t)(c - 'A');
|
|
||||||
for (char c = 'a'; c <= 'z'; c++) table[(size_t)c] = (uint8_t)(26 + (c - 'a'));
|
|
||||||
for (char c = '0'; c <= '9'; c++) table[(size_t)c] = (uint8_t)(52 + (c - '0'));
|
|
||||||
table[(size_t)'+'] = 62;
|
|
||||||
table[(size_t)'/'] = 63;
|
|
||||||
|
|
||||||
for (size_t i = 0; i + 4 <= src_length; i += 4) {
|
|
||||||
uint32_t a = table[(size_t)(uint8_t)src[i + 0]];
|
|
||||||
uint32_t b = table[(size_t)(uint8_t)src[i + 1]];
|
|
||||||
uint32_t c = table[(size_t)(uint8_t)src[i + 2]];
|
|
||||||
uint32_t d = table[(size_t)(uint8_t)src[i + 3]];
|
|
||||||
|
|
||||||
dst[0] = (char)(uint8_t)(a << 2 | b >> 4);
|
|
||||||
dst[1] = (char)(uint8_t)(b << 4 | c >> 2);
|
|
||||||
dst[2] = (char)(uint8_t)(c << 6 | d);
|
|
||||||
dst += 3;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_embedded_blob(ufbxi_context *uc, ufbx_blob *dst_blob, ufbxi_node *node)
|
ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_embedded_blob(ufbxi_context *uc, ufbx_blob *dst_blob, ufbxi_node *node)
|
||||||
{
|
{
|
||||||
if (!node) return 1;
|
if (!node) return 1;
|
||||||
@@ -11485,15 +11535,15 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_embedded_blob(ufbxi_context
|
|||||||
ufbx_string content;
|
ufbx_string content;
|
||||||
size_t num_parts = content_arr->size;
|
size_t num_parts = content_arr->size;
|
||||||
ufbx_string *parts = (ufbx_string*)content_arr->data;
|
ufbx_string *parts = (ufbx_string*)content_arr->data;
|
||||||
if (num_parts == 1) {
|
|
||||||
|
if (num_parts == 1 && !uc->from_ascii) {
|
||||||
content = parts[0];
|
content = parts[0];
|
||||||
} else {
|
} else {
|
||||||
size_t total_size = 0;
|
size_t total_size = 0;
|
||||||
ufbxi_for(ufbx_string, part, parts, num_parts) {
|
ufbxi_for(ufbx_string, part, parts, num_parts) {
|
||||||
total_size += part->length;
|
total_size += part->length;
|
||||||
}
|
}
|
||||||
ufbxi_buf *dst_buf = uc->from_ascii ? &uc->tmp_parse : &uc->result;
|
char *dst = ufbxi_push(&uc->result, char, total_size);
|
||||||
char *dst = ufbxi_push(dst_buf, char, total_size);
|
|
||||||
ufbxi_check(dst);
|
ufbxi_check(dst);
|
||||||
content.data = dst;
|
content.data = dst;
|
||||||
content.length = total_size;
|
content.length = total_size;
|
||||||
@@ -11503,24 +11553,9 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_embedded_blob(ufbxi_context
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (uc->from_ascii) {
|
|
||||||
if (content.length % 4 == 0) {
|
|
||||||
size_t padding = 0;
|
|
||||||
while (padding < 2 && padding < content.length && content.data[content.length - 1 - padding] == '=') {
|
|
||||||
padding++;
|
|
||||||
}
|
|
||||||
|
|
||||||
dst_blob->size = content.length / 4 * 3 - padding;
|
|
||||||
dst_blob->data = ufbxi_push(&uc->result, char, dst_blob->size + 3);
|
|
||||||
ufbxi_check(dst_blob->data);
|
|
||||||
|
|
||||||
ufbxi_decode_base64((char*)dst_blob->data, content.data, content.length);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
dst_blob->data = content.data;
|
dst_blob->data = content.data;
|
||||||
dst_blob->size = content.length;
|
dst_blob->size = content.length;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
92
thirdparty/ufbx/ufbx.h
vendored
92
thirdparty/ufbx/ufbx.h
vendored
@@ -267,7 +267,7 @@ struct ufbx_converter { };
|
|||||||
// `ufbx_source_version` contains the version of the corresponding source file.
|
// `ufbx_source_version` contains the version of the corresponding source file.
|
||||||
// HINT: The version can be compared numerically to the result of `ufbx_pack_version()`,
|
// HINT: The version can be compared numerically to the result of `ufbx_pack_version()`,
|
||||||
// for example `#if UFBX_VERSION >= ufbx_pack_version(0, 12, 0)`.
|
// for example `#if UFBX_VERSION >= ufbx_pack_version(0, 12, 0)`.
|
||||||
#define UFBX_HEADER_VERSION ufbx_pack_version(0, 15, 0)
|
#define UFBX_HEADER_VERSION ufbx_pack_version(0, 17, 1)
|
||||||
#define UFBX_VERSION UFBX_HEADER_VERSION
|
#define UFBX_VERSION UFBX_HEADER_VERSION
|
||||||
|
|
||||||
// -- Basic types
|
// -- Basic types
|
||||||
@@ -1354,7 +1354,7 @@ struct ufbx_mesh {
|
|||||||
// The winding of the faces has been reversed.
|
// The winding of the faces has been reversed.
|
||||||
bool reversed_winding;
|
bool reversed_winding;
|
||||||
|
|
||||||
// Normals have been generated instead of evalauted.
|
// Normals have been generated instead of evaluated.
|
||||||
// Either from missing normals (via `ufbx_load_opts.generate_missing_normals`), skinning,
|
// Either from missing normals (via `ufbx_load_opts.generate_missing_normals`), skinning,
|
||||||
// tessellation, or subdivision.
|
// tessellation, or subdivision.
|
||||||
bool generated_normals;
|
bool generated_normals;
|
||||||
@@ -1566,7 +1566,7 @@ struct ufbx_camera {
|
|||||||
// Projection mode (perspective/orthographic).
|
// Projection mode (perspective/orthographic).
|
||||||
ufbx_projection_mode projection_mode;
|
ufbx_projection_mode projection_mode;
|
||||||
|
|
||||||
// If set to `true`, `resolution` reprensents actual pixel values, otherwise
|
// If set to `true`, `resolution` represents actual pixel values, otherwise
|
||||||
// it's only useful for its aspect ratio.
|
// it's only useful for its aspect ratio.
|
||||||
bool resolution_is_pixels;
|
bool resolution_is_pixels;
|
||||||
|
|
||||||
@@ -3509,6 +3509,9 @@ typedef enum ufbx_warning_type UFBX_ENUM_REPR {
|
|||||||
// HINT: You can use `ufbx_unicode_error_handling` to adjust behavior.
|
// HINT: You can use `ufbx_unicode_error_handling` to adjust behavior.
|
||||||
UFBX_WARNING_BAD_UNICODE,
|
UFBX_WARNING_BAD_UNICODE,
|
||||||
|
|
||||||
|
// Invalid base64-encoded embedded content ignored.
|
||||||
|
UFBX_WARNING_BAD_BASE64_CONTENT,
|
||||||
|
|
||||||
// Non-node element connected to root.
|
// Non-node element connected to root.
|
||||||
UFBX_WARNING_BAD_ELEMENT_CONNECTED_TO_ROOT,
|
UFBX_WARNING_BAD_ELEMENT_CONNECTED_TO_ROOT,
|
||||||
|
|
||||||
@@ -4085,7 +4088,8 @@ typedef struct ufbx_open_memory_opts {
|
|||||||
uint32_t _end_zero;
|
uint32_t _end_zero;
|
||||||
} ufbx_open_memory_opts;
|
} ufbx_open_memory_opts;
|
||||||
|
|
||||||
// Detailed error stack frame
|
// Detailed error stack frame.
|
||||||
|
// NOTE: You must compile `ufbx.c` with `UFBX_ENABLE_ERROR_STACK` to enable the error stack.
|
||||||
typedef struct ufbx_error_frame {
|
typedef struct ufbx_error_frame {
|
||||||
uint32_t source_line;
|
uint32_t source_line;
|
||||||
ufbx_string function;
|
ufbx_string function;
|
||||||
@@ -4183,30 +4187,48 @@ UFBX_ENUM_TYPE(ufbx_error_type, UFBX_ERROR_TYPE, UFBX_ERROR_DUPLICATE_OVERRIDE);
|
|||||||
// Error description with detailed stack trace
|
// Error description with detailed stack trace
|
||||||
// HINT: You can use `ufbx_format_error()` for formatting the error
|
// HINT: You can use `ufbx_format_error()` for formatting the error
|
||||||
typedef struct ufbx_error {
|
typedef struct ufbx_error {
|
||||||
|
|
||||||
|
// Type of the error, or `UFBX_ERROR_NONE` if successful.
|
||||||
ufbx_error_type type;
|
ufbx_error_type type;
|
||||||
|
|
||||||
|
// Description of the error type.
|
||||||
ufbx_string description;
|
ufbx_string description;
|
||||||
|
|
||||||
|
// Internal error stack.
|
||||||
|
// NOTE: You must compile `ufbx.c` with `UFBX_ENABLE_ERROR_STACK` to enable the error stack.
|
||||||
uint32_t stack_size;
|
uint32_t stack_size;
|
||||||
ufbx_error_frame stack[UFBX_ERROR_STACK_MAX_DEPTH];
|
ufbx_error_frame stack[UFBX_ERROR_STACK_MAX_DEPTH];
|
||||||
|
|
||||||
|
// Additional error information, such as missing file filename.
|
||||||
|
// `info` is a NULL-terminated UTF-8 string containing `info_length` bytes, excluding the trailing `'\0'`.
|
||||||
size_t info_length;
|
size_t info_length;
|
||||||
char info[UFBX_ERROR_INFO_LENGTH];
|
char info[UFBX_ERROR_INFO_LENGTH];
|
||||||
|
|
||||||
} ufbx_error;
|
} ufbx_error;
|
||||||
|
|
||||||
// -- Progress callbacks
|
// -- Progress callbacks
|
||||||
|
|
||||||
|
// Loading progress information.
|
||||||
typedef struct ufbx_progress {
|
typedef struct ufbx_progress {
|
||||||
uint64_t bytes_read;
|
uint64_t bytes_read;
|
||||||
uint64_t bytes_total;
|
uint64_t bytes_total;
|
||||||
} ufbx_progress;
|
} ufbx_progress;
|
||||||
|
|
||||||
|
// Progress result returned from `ufbx_progress_fn()` callback.
|
||||||
|
// Determines whether ufbx should continue or abort the loading.
|
||||||
typedef enum ufbx_progress_result UFBX_ENUM_REPR {
|
typedef enum ufbx_progress_result UFBX_ENUM_REPR {
|
||||||
|
|
||||||
|
// Continue loading the file.
|
||||||
UFBX_PROGRESS_CONTINUE = 0x100,
|
UFBX_PROGRESS_CONTINUE = 0x100,
|
||||||
|
|
||||||
|
// Cancel loading and fail with `UFBX_ERROR_CANCELLED`.
|
||||||
UFBX_PROGRESS_CANCEL = 0x200,
|
UFBX_PROGRESS_CANCEL = 0x200,
|
||||||
|
|
||||||
UFBX_ENUM_FORCE_WIDTH(UFBX_PROGRESS_RESULT)
|
UFBX_ENUM_FORCE_WIDTH(UFBX_PROGRESS_RESULT)
|
||||||
} ufbx_progress_result;
|
} ufbx_progress_result;
|
||||||
|
|
||||||
// Called periodically with the current progress
|
// Called periodically with the current progress.
|
||||||
// Return `false` to cancel further processing
|
// Return `UFBX_PROGRESS_CANCEL` to cancel further processing.
|
||||||
typedef ufbx_progress_result ufbx_progress_fn(void *user, const ufbx_progress *progress);
|
typedef ufbx_progress_result ufbx_progress_fn(void *user, const ufbx_progress *progress);
|
||||||
|
|
||||||
typedef struct ufbx_progress_cb {
|
typedef struct ufbx_progress_cb {
|
||||||
@@ -4509,33 +4531,71 @@ typedef struct ufbx_baked_anim {
|
|||||||
} ufbx_baked_anim;
|
} ufbx_baked_anim;
|
||||||
|
|
||||||
// -- Thread API
|
// -- Thread API
|
||||||
//
|
|
||||||
// NOTE: This API is still experimental and may change.
|
|
||||||
// Documentation is currently missing on purpose.
|
|
||||||
|
|
||||||
|
// Internal thread pool handle.
|
||||||
|
// Passed to `ufbx_thread_pool_run_task()` from an user thread to run ufbx tasks.
|
||||||
|
// HINT: This context can store a user pointer via `ufbx_thread_pool_set_user_ptr()`.
|
||||||
typedef uintptr_t ufbx_thread_pool_context;
|
typedef uintptr_t ufbx_thread_pool_context;
|
||||||
|
|
||||||
|
// Thread pool creation information from ufbx.
|
||||||
typedef struct ufbx_thread_pool_info {
|
typedef struct ufbx_thread_pool_info {
|
||||||
uint32_t max_concurrent_tasks;
|
uint32_t max_concurrent_tasks;
|
||||||
} ufbx_thread_pool_info;
|
} ufbx_thread_pool_info;
|
||||||
|
|
||||||
|
// Initialize the thread pool.
|
||||||
|
// Return `true` on success.
|
||||||
typedef bool ufbx_thread_pool_init_fn(void *user, ufbx_thread_pool_context ctx, const ufbx_thread_pool_info *info);
|
typedef bool ufbx_thread_pool_init_fn(void *user, ufbx_thread_pool_context ctx, const ufbx_thread_pool_info *info);
|
||||||
typedef bool ufbx_thread_pool_run_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t start_index, uint32_t count);
|
|
||||||
typedef bool ufbx_thread_pool_wait_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t max_index);
|
// Run tasks `count` tasks in threads.
|
||||||
|
// You must call `ufbx_thread_pool_run_task()` with indices `[start_index, start_index + count)`.
|
||||||
|
// The threads are launched in batches indicated by `group`, see `UFBX_THREAD_GROUP_COUNT` for more information.
|
||||||
|
// Ideally, you should run all the task indices in parallel within each `ufbx_thread_pool_run_fn()` call.
|
||||||
|
typedef void ufbx_thread_pool_run_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t start_index, uint32_t count);
|
||||||
|
|
||||||
|
// Wait for previous tasks spawned in `ufbx_thread_pool_run_fn()` to finish.
|
||||||
|
// `group` specifies the batch to wait for, `max_index` contains `start_index + count` from that group instance.
|
||||||
|
typedef void ufbx_thread_pool_wait_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t max_index);
|
||||||
|
|
||||||
|
// Free the thread pool.
|
||||||
typedef void ufbx_thread_pool_free_fn(void *user, ufbx_thread_pool_context ctx);
|
typedef void ufbx_thread_pool_free_fn(void *user, ufbx_thread_pool_context ctx);
|
||||||
|
|
||||||
|
// Thread pool interface.
|
||||||
|
// See functions above for more information.
|
||||||
|
//
|
||||||
|
// Hypothetical example of calls, where `UFBX_THREAD_GROUP_COUNT=2` for simplicity:
|
||||||
|
//
|
||||||
|
// run_fn(group=0, start_index=0, count=4) -> t0 := threaded { ufbx_thread_pool_run_task(0..3) }
|
||||||
|
// run_fn(group=1, start_index=4, count=10) -> t1 := threaded { ufbx_thread_pool_run_task(4..10) }
|
||||||
|
// wait_fn(group=0, max_index=4) -> wait_threads(t0)
|
||||||
|
// run_fn(group=0, start_index=10, count=15) -> t0 := threaded { ufbx_thread_pool_run_task(10..14) }
|
||||||
|
// wait_fn(group=1, max_index=10) -> wait_threads(t1)
|
||||||
|
// wait_fn(group=0, max_index=15) -> wait_threads(t0)
|
||||||
|
//
|
||||||
typedef struct ufbx_thread_pool {
|
typedef struct ufbx_thread_pool {
|
||||||
ufbx_thread_pool_init_fn *init_fn;
|
ufbx_thread_pool_init_fn *init_fn; // < Optional
|
||||||
ufbx_thread_pool_run_fn *run_fn;
|
ufbx_thread_pool_run_fn *run_fn; // < Required
|
||||||
ufbx_thread_pool_wait_fn *wait_fn;
|
ufbx_thread_pool_wait_fn *wait_fn; // < Required
|
||||||
ufbx_thread_pool_free_fn *free_fn;
|
ufbx_thread_pool_free_fn *free_fn; // < Optional
|
||||||
void *user;
|
void *user;
|
||||||
} ufbx_thread_pool;
|
} ufbx_thread_pool;
|
||||||
|
|
||||||
|
// Thread pool options.
|
||||||
typedef struct ufbx_thread_opts {
|
typedef struct ufbx_thread_opts {
|
||||||
|
|
||||||
|
// Thread pool interface.
|
||||||
|
// HINT: You can use `extra/ufbx_os.h` to provide a thread pool.
|
||||||
ufbx_thread_pool pool;
|
ufbx_thread_pool pool;
|
||||||
|
|
||||||
|
// Maximum of tasks to have in-flight.
|
||||||
|
// Default: 2048
|
||||||
size_t num_tasks;
|
size_t num_tasks;
|
||||||
|
|
||||||
|
// Maximum amount of memory to use for batched threaded processing.
|
||||||
|
// Default: 32MB
|
||||||
|
// NOTE: The actual used memory usage might be higher, if there are individual tasks
|
||||||
|
// that rqeuire a high amount of memory.
|
||||||
size_t memory_limit;
|
size_t memory_limit;
|
||||||
|
|
||||||
} ufbx_thread_opts;
|
} ufbx_thread_opts;
|
||||||
|
|
||||||
// -- Main API
|
// -- Main API
|
||||||
@@ -5202,7 +5262,7 @@ ufbx_abi ufbx_string ufbx_find_string(const ufbx_props *props, const char *name,
|
|||||||
ufbx_abi ufbx_blob ufbx_find_blob_len(const ufbx_props *props, const char *name, size_t name_len, ufbx_blob def);
|
ufbx_abi ufbx_blob ufbx_find_blob_len(const ufbx_props *props, const char *name, size_t name_len, ufbx_blob def);
|
||||||
ufbx_abi ufbx_blob ufbx_find_blob(const ufbx_props *props, const char *name, ufbx_blob def);
|
ufbx_abi ufbx_blob ufbx_find_blob(const ufbx_props *props, const char *name, ufbx_blob def);
|
||||||
|
|
||||||
// Find property in `props` with concatendated `parts[num_parts]`.
|
// Find property in `props` with concatenated `parts[num_parts]`.
|
||||||
ufbx_abi ufbx_prop *ufbx_find_prop_concat(const ufbx_props *props, const ufbx_string *parts, size_t num_parts);
|
ufbx_abi ufbx_prop *ufbx_find_prop_concat(const ufbx_props *props, const ufbx_string *parts, size_t num_parts);
|
||||||
|
|
||||||
// Get an element connected to a property.
|
// Get an element connected to a property.
|
||||||
|
|||||||
Reference in New Issue
Block a user