mirror of
https://github.com/bkaradzic/bgfx.git
synced 2026-02-17 20:52:36 +01:00
Updated cgltf.
This commit is contained in:
36
3rdparty/cgltf/cgltf.h
vendored
36
3rdparty/cgltf/cgltf.h
vendored
@@ -376,13 +376,29 @@ typedef struct cgltf_image
|
||||
cgltf_extension* extensions;
|
||||
} cgltf_image;
|
||||
|
||||
typedef enum cgltf_filter_type {
|
||||
cgltf_filter_type_undefined = 0,
|
||||
cgltf_filter_type_nearest = 9728,
|
||||
cgltf_filter_type_linear = 9729,
|
||||
cgltf_filter_type_nearest_mipmap_nearest = 9984,
|
||||
cgltf_filter_type_linear_mipmap_nearest = 9985,
|
||||
cgltf_filter_type_nearest_mipmap_linear = 9986,
|
||||
cgltf_filter_type_linear_mipmap_linear = 9987
|
||||
} cgltf_filter_type;
|
||||
|
||||
typedef enum cgltf_wrap_mode {
|
||||
cgltf_wrap_mode_clamp_to_edge = 33071,
|
||||
cgltf_wrap_mode_mirrored_repeat = 33648,
|
||||
cgltf_wrap_mode_repeat = 10497
|
||||
} cgltf_wrap_mode;
|
||||
|
||||
typedef struct cgltf_sampler
|
||||
{
|
||||
char* name;
|
||||
cgltf_int mag_filter;
|
||||
cgltf_int min_filter;
|
||||
cgltf_int wrap_s;
|
||||
cgltf_int wrap_t;
|
||||
cgltf_filter_type mag_filter;
|
||||
cgltf_filter_type min_filter;
|
||||
cgltf_wrap_mode wrap_s;
|
||||
cgltf_wrap_mode wrap_t;
|
||||
cgltf_extras extras;
|
||||
cgltf_size extensions_count;
|
||||
cgltf_extension* extensions;
|
||||
@@ -4476,8 +4492,8 @@ static int cgltf_parse_json_sampler(cgltf_options* options, jsmntok_t const* tok
|
||||
(void)options;
|
||||
CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_OBJECT);
|
||||
|
||||
out_sampler->wrap_s = 10497;
|
||||
out_sampler->wrap_t = 10497;
|
||||
out_sampler->wrap_s = cgltf_wrap_mode_repeat;
|
||||
out_sampler->wrap_t = cgltf_wrap_mode_repeat;
|
||||
|
||||
int size = tokens[i].size;
|
||||
++i;
|
||||
@@ -4494,28 +4510,28 @@ static int cgltf_parse_json_sampler(cgltf_options* options, jsmntok_t const* tok
|
||||
{
|
||||
++i;
|
||||
out_sampler->mag_filter
|
||||
= cgltf_json_to_int(tokens + i, json_chunk);
|
||||
= (cgltf_filter_type)cgltf_json_to_int(tokens + i, json_chunk);
|
||||
++i;
|
||||
}
|
||||
else if (cgltf_json_strcmp(tokens + i, json_chunk, "minFilter") == 0)
|
||||
{
|
||||
++i;
|
||||
out_sampler->min_filter
|
||||
= cgltf_json_to_int(tokens + i, json_chunk);
|
||||
= (cgltf_filter_type)cgltf_json_to_int(tokens + i, json_chunk);
|
||||
++i;
|
||||
}
|
||||
else if (cgltf_json_strcmp(tokens + i, json_chunk, "wrapS") == 0)
|
||||
{
|
||||
++i;
|
||||
out_sampler->wrap_s
|
||||
= cgltf_json_to_int(tokens + i, json_chunk);
|
||||
= (cgltf_wrap_mode)cgltf_json_to_int(tokens + i, json_chunk);
|
||||
++i;
|
||||
}
|
||||
else if (cgltf_json_strcmp(tokens + i, json_chunk, "wrapT") == 0)
|
||||
{
|
||||
++i;
|
||||
out_sampler->wrap_t
|
||||
= cgltf_json_to_int(tokens + i, json_chunk);
|
||||
= (cgltf_wrap_mode)cgltf_json_to_int(tokens + i, json_chunk);
|
||||
++i;
|
||||
}
|
||||
else if (cgltf_json_strcmp(tokens + i, json_chunk, "extras") == 0)
|
||||
|
||||
Reference in New Issue
Block a user