mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-10-05 09:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cgltf.h

Browse Source
This commit is contained in:
Ray
2023-05-10 12:48:17 +02:00
parent fe595d60f7
commit 152262dbfc
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/external/cgltf.h vendored
View File

@@ -65,7 +65,8 @@
* *
* `cgltf_num_components` is a tiny utility that tells you the dimensionality of * `cgltf_num_components` is a tiny utility that tells you the dimensionality of
* a certain accessor type. This can be used before `cgltf_accessor_unpack_floats` to help allocate * a certain accessor type. This can be used before `cgltf_accessor_unpack_floats` to help allocate
* the necessary amount of memory. * the necessary amount of memory. `cgltf_component_size` and `cgltf_calc_size` exist for
* similar purposes.
* *
* `cgltf_accessor_read_float` reads a certain element from a non-sparse accessor and converts it to * `cgltf_accessor_read_float` reads a certain element from a non-sparse accessor and converts it to
* floating point, assuming that `cgltf_load_buffers` has already been called. The passed-in element * floating point, assuming that `cgltf_load_buffers` has already been called. The passed-in element
@@ -837,6 +838,8 @@ cgltf_bool cgltf_accessor_read_uint(const cgltf_accessor* accessor, cgltf_size i
cgltf_size cgltf_accessor_read_index(const cgltf_accessor* accessor, cgltf_size index); cgltf_size cgltf_accessor_read_index(const cgltf_accessor* accessor, cgltf_size index);
cgltf_size cgltf_num_components(cgltf_type type); cgltf_size cgltf_num_components(cgltf_type type);
cgltf_size cgltf_component_size(cgltf_component_type component_type);
cgltf_size cgltf_calc_size(cgltf_type type, cgltf_component_type component_type);
cgltf_size cgltf_accessor_unpack_floats(const cgltf_accessor* accessor, cgltf_float* out, cgltf_size float_count); cgltf_size cgltf_accessor_unpack_floats(const cgltf_accessor* accessor, cgltf_float* out, cgltf_size float_count);
@@ -1488,8 +1491,6 @@ cgltf_result cgltf_load_buffers(const cgltf_options* options, cgltf_data* data,
return cgltf_result_success; return cgltf_result_success;
} }
static cgltf_size cgltf_calc_size(cgltf_type type, cgltf_component_type component_type);
static cgltf_size cgltf_calc_index_bound(cgltf_buffer_view* buffer_view, cgltf_size offset, cgltf_component_type component_type, cgltf_size count) static cgltf_size cgltf_calc_index_bound(cgltf_buffer_view* buffer_view, cgltf_size offset, cgltf_component_type component_type, cgltf_size count)
{ {
char* data = (char*)buffer_view->buffer->data + offset + buffer_view->offset; char* data = (char*)buffer_view->buffer->data + offset + buffer_view->offset;
@@ -2217,7 +2218,7 @@ static cgltf_size cgltf_component_read_index(const void* in, cgltf_component_typ
case cgltf_component_type_r_32u: case cgltf_component_type_r_32u:
return *((const uint32_t*) in); return *((const uint32_t*) in);
case cgltf_component_type_r_32f: case cgltf_component_type_r_32f:
return (cgltf_size)*((const float*) in); return (cgltf_size)((cgltf_ssize)*((const float*) in));
case cgltf_component_type_r_8u: case cgltf_component_type_r_8u:
return *((const uint8_t*) in); return *((const uint8_t*) in);
default: default:
@@ -2253,8 +2254,6 @@ static cgltf_float cgltf_component_read_float(const void* in, cgltf_component_ty
return (cgltf_float)cgltf_component_read_integer(in, component_type); return (cgltf_float)cgltf_component_read_integer(in, component_type);
} }
static cgltf_size cgltf_component_size(cgltf_component_type component_type);
static cgltf_bool cgltf_element_read_float(const uint8_t* element, cgltf_type type, cgltf_component_type component_type, cgltf_bool normalized, cgltf_float* out, cgltf_size element_size) static cgltf_bool cgltf_element_read_float(const uint8_t* element, cgltf_type type, cgltf_component_type component_type, cgltf_bool normalized, cgltf_float* out, cgltf_size element_size)
{ {
cgltf_size num_components = cgltf_num_components(type); cgltf_size num_components = cgltf_num_components(type);
@@ -5965,7 +5964,7 @@ cgltf_size cgltf_num_components(cgltf_type type) {
} }
} }
static cgltf_size cgltf_component_size(cgltf_component_type component_type) { cgltf_size cgltf_component_size(cgltf_component_type component_type) {
switch (component_type) switch (component_type)
{ {
case cgltf_component_type_r_8: case cgltf_component_type_r_8:
@@ -5983,7 +5982,7 @@ static cgltf_size cgltf_component_size(cgltf_component_type component_type) {
} }
} }
static cgltf_size cgltf_calc_size(cgltf_type type, cgltf_component_type component_type) cgltf_size cgltf_calc_size(cgltf_type type, cgltf_component_type component_type)
{ {
cgltf_size component_size = cgltf_component_size(component_type); cgltf_size component_size = cgltf_component_size(component_type);
if (type == cgltf_type_mat2 && component_size == 1) if (type == cgltf_type_mat2 && component_size == 1)