Merge pull request #392 from KhronosGroup/feature/emissiveStrength

Feature/emissive strength

Author: UX3D-kanzler

app_web/index.html

@@ -386,10 +386,9 @@ <h2 class="title is-spaced">Advanced Controls</h2>
                                     v-bind:disabled="transmissionEnabled === false ? true : false"
                                     v-model="volumeEnabled">KHR_materials_volume</b-switch>
                                 <b-switch class="smallerLabel" v-model="iorEnabled">KHR_materials_ior</b-switch>
-                                <b-switch class="smallerLabel" v-model="specularEnabled">KHR_materials_specular
-                                </b-switch>
-                                <b-switch class="smallerLabel" v-model="iridescenceEnabled">
-                                    KHR_materials_iridescence</b-switch>
+                                <b-switch class="smallerLabel" v-model="specularEnabled">KHR_materials_specular</b-switch>
+                                <b-switch class="smallerLabel" v-model="emissiveStrengthEnabled">KHR_materials_emissive_strength</b-switch>
+                                <b-switch class="smallerLabel" v-model="iridescenceEnabled">KHR_materials_iridescence</b-switch>
                             </b-field>
                             <b-field label="Statistics" class="subtitle">
                                 <json-to-ui-template v-bind:data="statistics" v-bind:isinner="false">
@@ -406,4 +405,4 @@ <h2 class="title is-spaced">Advanced Controls</h2>
 
 <script src="GltfSVApp.umd.js"></script>
 
-</html>
+</html>

app_web/src/logic/uimodel.js

@@ -97,6 +97,8 @@ class UIModel
                                             map( ({ newValue, oldValue }) => newValue));
         this.specularEnabled = app.$watchAsObservable('specularEnabled').pipe(
                                             map( ({ newValue, oldValue }) => newValue));
+        this.emissiveStrengthEnabled = app.$watchAsObservable('emissiveStrengthEnabled').pipe(
+                                            map( ({ newValue, oldValue }) => newValue));
         this.iblEnabled = app.iblChanged$.pipe(pluck("event", "msg"));
         this.punctualLightsEnabled = app.punctualLightsChanged$.pipe(pluck("event", "msg"));
         this.renderEnvEnabled = app.$watchAsObservable('renderEnv').pipe(

app_web/src/main.js

@@ -218,13 +218,17 @@ async function main()
     uiModel.specularEnabled.subscribe( specularEnabled => {
         state.renderingParameters.enabledExtensions.KHR_materials_specular = specularEnabled;
     });
+    uiModel.emissiveStrengthEnabled.subscribe( enabled => {
+        state.renderingParameters.enabledExtensions.KHR_materials_emissive_strength = enabled;
+    });
     listenForRedraw(uiModel.clearcoatEnabled);
     listenForRedraw(uiModel.sheenEnabled);
     listenForRedraw(uiModel.transmissionEnabled);
     listenForRedraw(uiModel.volumeEnabled);
     listenForRedraw(uiModel.iorEnabled);
     listenForRedraw(uiModel.specularEnabled);
     listenForRedraw(uiModel.iridescenceEnabled);
+    listenForRedraw(uiModel.emissiveStrengthEnabled);
 
     uiModel.iblEnabled.subscribe( iblEnabled => {
         state.renderingParameters.useIBL = iblEnabled;

app_web/src/ui/ui.js

@@ -93,6 +93,7 @@ const app = new Vue({
             iorEnabled: true,
             iridescenceEnabled: true,
             specularEnabled: true,
+            emissiveStrengthEnabled: true,
 
             activeTab: 0,
             tabsHidden: false,

assets/environments

@@ -55,6 +55,7 @@ class GltfState
                 KHR_materials_specular: true,
                 /** KHR_materials_iridescence adds a thin-film iridescence effect */
                 KHR_materials_iridescence: true,
+                KHR_materials_emissive_strength: true,
             },
             /** clear color expressed as list of ints in the range [0, 255] */
             clearColor: [58, 64, 74, 255],

assets/models

@@ -63,7 +63,9 @@ mat4 getSkinningMatrix()
         a_weights_1.z * getMatrixFromTexture(u_jointsSampler, int(a_joints_1.z) * 2) +
         a_weights_1.w * getMatrixFromTexture(u_jointsSampler, int(a_joints_1.w) * 2);
 #endif
-
+    if (skin == mat4(0)) { 
+        return mat4(1); 
+    }
     return skin;
 }
 
@@ -87,7 +89,9 @@ mat4 getSkinningNormalMatrix()
         a_weights_1.z * getMatrixFromTexture(u_jointsSampler, int(a_joints_1.z) * 2 + 1) +
         a_weights_1.w * getMatrixFromTexture(u_jointsSampler, int(a_joints_1.w) * 2 + 1);
 #endif
-
+    if (skin == mat4(0)) { 
+        return mat4(1); 
+    }
     return skin;
 }
 

source/GltfState/gltf_state.js

@@ -34,7 +34,10 @@ uniform float u_IridescenceIOR;
 uniform float u_IridescenceThicknessMinimum;
 uniform float u_IridescenceThicknessMaximum;
 
-//PBR Next IOR
+// Emissive Strength
+uniform float u_EmissiveStrength;
+
+// PBR Next IOR
 uniform float u_Ior;
 
 // Alpha mode

source/Renderer/shaders/animation.glsl

@@ -245,6 +245,9 @@ void main()
 #endif
 
     f_emissive = u_EmissiveFactor;
+#ifdef MATERIAL_EMISSIVE_STRENGTH
+    f_emissive *= u_EmissiveStrength;
+#endif
 #ifdef HAS_EMISSIVE_MAP
     f_emissive *= texture(u_EmissiveSampler, getEmissiveUV()).rgb;
 #endif