Skip to content

Commit 7177c01

Browse files
jkuhlmannjkuhlmann
authored
Merge pull request #179 from abwood/diffuse-transmission
2 parents 9bc9ea3 + 28216b2 commit 7177c01

File tree

3 files changed

+88
-1
lines changed

3 files changed

+88
-1
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ cgltf also supports some glTF extensions:
106106
- KHR_lights_punctual
107107
- KHR_materials_anisotropy
108108
- KHR_materials_clearcoat
109+
- KHR_materials_diffuse_transmission
109110
- KHR_materials_dispersion
110111
- KHR_materials_emissive_strength
111112
- KHR_materials_ior

‎cgltf.h‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,14 @@ typedef struct cgltf_iridescence
500500
cgltf_texture_view iridescence_thickness_texture;
501501
} cgltf_iridescence;
502502

503+
typedef struct cgltf_diffuse_transmission
504+
{
505+
cgltf_texture_view diffuse_transmission_texture;
506+
cgltf_float diffuse_transmission_factor;
507+
cgltf_float diffuse_transmission_color_factor[3];
508+
cgltf_texture_view diffuse_transmission_color_texture;
509+
} cgltf_diffuse_transmission;
510+
503511
typedef struct cgltf_anisotropy
504512
{
505513
cgltf_float anisotropy_strength;
@@ -525,6 +533,7 @@ typedef struct cgltf_material
525533
cgltf_bool has_sheen;
526534
cgltf_bool has_emissive_strength;
527535
cgltf_bool has_iridescence;
536+
cgltf_bool has_diffuse_transmission;
528537
cgltf_bool has_anisotropy;
529538
cgltf_bool has_dispersion;
530539
cgltf_pbr_metallic_roughness pbr_metallic_roughness;
@@ -537,6 +546,7 @@ typedef struct cgltf_material
537546
cgltf_volume volume;
538547
cgltf_emissive_strength emissive_strength;
539548
cgltf_iridescence iridescence;
549+
cgltf_diffuse_transmission diffuse_transmission;
540550
cgltf_anisotropy anisotropy;
541551
cgltf_dispersion dispersion;
542552
cgltf_texture_view normal_texture;
@@ -4292,6 +4302,52 @@ static int cgltf_parse_json_iridescence(cgltf_options* options, jsmntok_t const*
42924302
return i;
42934303
}
42944304

4305+
static int cgltf_parse_json_diffuse_transmission(cgltf_options* options, jsmntok_t const* tokens, int i, const uint8_t* json_chunk, cgltf_diffuse_transmission* out_diff_transmission)
4306+
{
4307+
CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_OBJECT);
4308+
int size = tokens[i].size;
4309+
++i;
4310+
4311+
// Defaults
4312+
cgltf_fill_float_array(out_diff_transmission->diffuse_transmission_color_factor, 3, 1.0f);
4313+
out_diff_transmission->diffuse_transmission_factor = 0.f;
4314+
4315+
for (int j = 0; j < size; ++j)
4316+
{
4317+
CGLTF_CHECK_KEY(tokens[i]);
4318+
4319+
if (cgltf_json_strcmp(tokens + i, json_chunk, "diffuseTransmissionFactor") == 0)
4320+
{
4321+
++i;
4322+
out_diff_transmission->diffuse_transmission_factor = cgltf_json_to_float(tokens + i, json_chunk);
4323+
++i;
4324+
}
4325+
else if (cgltf_json_strcmp(tokens + i, json_chunk, "diffuseTransmissionTexture") == 0)
4326+
{
4327+
i = cgltf_parse_json_texture_view(options, tokens, i + 1, json_chunk, &out_diff_transmission->diffuse_transmission_texture);
4328+
}
4329+
else if (cgltf_json_strcmp(tokens + i, json_chunk, "diffuseTransmissionColorFactor") == 0)
4330+
{
4331+
i = cgltf_parse_json_float_array(tokens, i + 1, json_chunk, out_diff_transmission->diffuse_transmission_color_factor, 3);
4332+
}
4333+
else if (cgltf_json_strcmp(tokens + i, json_chunk, "diffuseTransmissionColorTexture") == 0)
4334+
{
4335+
i = cgltf_parse_json_texture_view(options, tokens, i + 1, json_chunk, &out_diff_transmission->diffuse_transmission_color_texture);
4336+
}
4337+
else
4338+
{
4339+
i = cgltf_skip_json(tokens, i + 1);
4340+
}
4341+
4342+
if (i < 0)
4343+
{
4344+
return i;
4345+
}
4346+
}
4347+
4348+
return i;
4349+
}
4350+
42954351
static int cgltf_parse_json_anisotropy(cgltf_options* options, jsmntok_t const* tokens, int i, const uint8_t* json_chunk, cgltf_anisotropy* out_anisotropy)
42964352
{
42974353
CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_OBJECT);
@@ -4780,6 +4836,11 @@ static int cgltf_parse_json_material(cgltf_options* options, jsmntok_t const* to
47804836
out_material->has_iridescence = 1;
47814837
i = cgltf_parse_json_iridescence(options, tokens, i + 1, json_chunk, &out_material->iridescence);
47824838
}
4839+
else if (cgltf_json_strcmp(tokens + i, json_chunk, "KHR_materials_diffuse_transmission") == 0)
4840+
{
4841+
out_material->has_diffuse_transmission = 1;
4842+
i = cgltf_parse_json_diffuse_transmission(options, tokens, i + 1, json_chunk, &out_material->diffuse_transmission);
4843+
}
47834844
else if (cgltf_json_strcmp(tokens + i, json_chunk, "KHR_materials_anisotropy") == 0)
47844845
{
47854846
out_material->has_anisotropy = 1;
@@ -6643,6 +6704,9 @@ static int cgltf_fixup_pointers(cgltf_data* data)
66436704
CGLTF_PTRFIXUP(data->materials[i].iridescence.iridescence_texture.texture, data->textures, data->textures_count);
66446705
CGLTF_PTRFIXUP(data->materials[i].iridescence.iridescence_thickness_texture.texture, data->textures, data->textures_count);
66456706

6707+
CGLTF_PTRFIXUP(data->materials[i].diffuse_transmission.diffuse_transmission_texture.texture, data->textures, data->textures_count);
6708+
CGLTF_PTRFIXUP(data->materials[i].diffuse_transmission.diffuse_transmission_color_texture.texture, data->textures, data->textures_count);
6709+
66466710
CGLTF_PTRFIXUP(data->materials[i].anisotropy.anisotropy_texture.texture, data->textures, data->textures_count);
66476711
}
66486712

‎cgltf_write.h‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ cgltf_size cgltf_write(const cgltf_options* options, char* buffer, cgltf_size si
8888
#define CGLTF_EXTENSION_FLAG_MATERIALS_ANISOTROPY (1 << 16)
8989
#define CGLTF_EXTENSION_FLAG_MATERIALS_DISPERSION (1 << 17)
9090
#define CGLTF_EXTENSION_FLAG_TEXTURE_WEBP (1 << 18)
91+
#define CGLTF_EXTENSION_FLAG_MATERIALS_DIFFUSE_TRANSMISSION (1 << 19)
9192

9293
typedef struct {
9394
char* buffer;
@@ -656,6 +657,11 @@ static void cgltf_write_material(cgltf_write_context* context, const cgltf_mater
656657
context->extension_flags |= CGLTF_EXTENSION_FLAG_MATERIALS_IRIDESCENCE;
657658
}
658659

660+
if (material->has_diffuse_transmission)
661+
{
662+
context->extension_flags |= CGLTF_EXTENSION_FLAG_MATERIALS_DIFFUSE_TRANSMISSION;
663+
}
664+
659665
if (material->has_anisotropy)
660666
{
661667
context->extension_flags |= CGLTF_EXTENSION_FLAG_MATERIALS_ANISOTROPY;
@@ -681,7 +687,7 @@ static void cgltf_write_material(cgltf_write_context* context, const cgltf_mater
681687
cgltf_write_line(context, "}");
682688
}
683689

684-
if (material->unlit || material->has_pbr_specular_glossiness || material->has_clearcoat || material->has_ior || material->has_specular || material->has_transmission || material->has_sheen || material->has_volume || material->has_emissive_strength || material->has_iridescence || material->has_anisotropy || material->has_dispersion)
690+
if (material->unlit || material->has_pbr_specular_glossiness || material->has_clearcoat || material->has_ior || material->has_specular || material->has_transmission || material->has_sheen || material->has_volume || material->has_emissive_strength || material->has_iridescence || material->has_anisotropy || material->has_dispersion || material->has_diffuse_transmission)
685691
{
686692
cgltf_write_line(context, "\"extensions\": {");
687693
if (material->has_clearcoat)
@@ -792,6 +798,19 @@ static void cgltf_write_material(cgltf_write_context* context, const cgltf_mater
792798
CGLTF_WRITE_TEXTURE_INFO("iridescenceThicknessTexture", params->iridescence_thickness_texture);
793799
cgltf_write_line(context, "}");
794800
}
801+
if (material->has_diffuse_transmission)
802+
{
803+
const cgltf_diffuse_transmission* params = &material->diffuse_transmission;
804+
cgltf_write_line(context, "\"KHR_materials_diffuse_transmission\": {");
805+
CGLTF_WRITE_TEXTURE_INFO("diffuseTransmissionTexture", params->diffuse_transmission_texture);
806+
cgltf_write_floatprop(context, "diffuseTransmissionFactor", params->diffuse_transmission_factor, 0.f);
807+
if (cgltf_check_floatarray(params->diffuse_transmission_color_factor, 3, 1.f))
808+
{
809+
cgltf_write_floatarrayprop(context, "diffuseTransmissionColorFactor", params->diffuse_transmission_color_factor, 3);
810+
}
811+
CGLTF_WRITE_TEXTURE_INFO("diffuseTransmissionColorTexture", params->diffuse_transmission_color_texture);
812+
cgltf_write_line(context, "}");
813+
}
795814
if (material->has_anisotropy)
796815
{
797816
cgltf_write_line(context, "\"KHR_materials_anisotropy\": {");
@@ -1298,6 +1317,9 @@ static void cgltf_write_extensions(cgltf_write_context* context, uint32_t extens
12981317
if (extension_flags & CGLTF_EXTENSION_FLAG_MATERIALS_IRIDESCENCE) {
12991318
cgltf_write_stritem(context, "KHR_materials_iridescence");
13001319
}
1320+
if (extension_flags & CGLTF_EXTENSION_FLAG_MATERIALS_DIFFUSE_TRANSMISSION) {
1321+
cgltf_write_stritem(context, "KHR_materials_diffuse_transmission");
1322+
}
13011323
if (extension_flags & CGLTF_EXTENSION_FLAG_MATERIALS_ANISOTROPY) {
13021324
cgltf_write_stritem(context, "KHR_materials_anisotropy");
13031325
}

0 commit comments

Comments
 (0)