Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for KHR_materials_emissive_strength #4535

Merged
merged 2 commits into from
Aug 15, 2022
Merged

Add support for KHR_materials_emissive_strength #4535

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
744e938
Add support for KHR_materials_emissive_strength
GSterbrant Aug 12, 2022
548909b
Shuffled extensions to be in alphabetical order
GSterbrant Aug 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/resources/parser/glb-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,12 @@ const extensionSheen = function (data, material, textures) {
material.chunks.sheenGlossPS = sheenGlossChunk;
};

const extensionEmissiveStrength = function (data, material, textures) {
if (data.hasOwnProperty('emissiveStrength')) {
material.emissiveIntensity = data.emissiveStrength;
}
};

const createMaterial = function (gltfMaterial, textures, flipV) {
// TODO: integrate these shader chunks into the native engine
const glossChunk = `
Expand Down Expand Up @@ -1363,13 +1369,14 @@ const createMaterial = function (gltfMaterial, textures, flipV) {

// Provide list of supported extensions and their functions
const extensions = {
"KHR_materials_pbrSpecularGlossiness": extensionPbrSpecGlossiness,
"KHR_materials_clearcoat": extensionClearCoat,
"KHR_materials_unlit": extensionUnlit,
"KHR_materials_specular": extensionSpecular,
"KHR_materials_emissive_strength": extensionEmissiveStrength,
"KHR_materials_ior": extensionIor,
"KHR_materials_pbrSpecularGlossiness": extensionPbrSpecGlossiness,
"KHR_materials_sheen": extensionSheen,
"KHR_materials_specular": extensionSpecular,
"KHR_materials_transmission": extensionTransmission,
"KHR_materials_sheen": extensionSheen
"KHR_materials_unlit": extensionUnlit
};

// Handle extensions
Expand Down