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

Allow normals to be used when model material is unlit #9173

Merged
merged 3 commits into from
Nov 1, 2020
Merged

Allow normals to be used when model material is unlit #9173

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
424d274
Fix normals not being computed for unlit models
lilleyse Sep 26, 2020
3526968
Merge branch 'master' into unlit-model-normals
Nov 1, 2020
d113713
Update CHANGES.md
Nov 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Source/Scene/Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3003,12 +3003,10 @@ function getAttributeLocations(model, primitive) {

var attributes = technique.attributes;
var program = model._rendererResources.programs[technique.program];
var programVertexAttributes = program.vertexAttributes;
var programAttributeLocations = program._attributeLocations;

// Note: WebGL shader compiler may have optimized and removed some attributes from programVertexAttributes
for (location in programVertexAttributes) {
if (programVertexAttributes.hasOwnProperty(location)) {
for (location in programAttributeLocations) {
if (programAttributeLocations.hasOwnProperty(location)) {
var attribute = attributes[location];
if (defined(attribute)) {
index = programAttributeLocations[location];
Expand All @@ -3017,11 +3015,7 @@ function getAttributeLocations(model, primitive) {
}
}

// Always add pre-created attributes.
// Some pre-created attributes, like per-instance pickIds, may be compiled out of the draw program
// but should be included in the list of attribute locations for the pick program.
// This is safe to do since programVertexAttributes and programAttributeLocations are equivalent except
// that programVertexAttributes optimizes out unused attributes.
// Add pre-created attributes.
var precreatedAttributes = model._precreatedAttributes;
if (defined(precreatedAttributes)) {
for (location in precreatedAttributes) {
Expand Down
25 changes: 12 additions & 13 deletions Source/Scene/processPbrMaterials.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ function generateTechnique(
defined(material.extensions.KHR_materials_unlit)
) {
isUnlit = true;
hasNormals = false;
hasTangents = false;
}

if (hasNormals) {
Expand Down Expand Up @@ -480,15 +478,16 @@ function generateTechnique(
semantic: "NORMAL",
};
vertexShader += "attribute vec3 a_normal;\n";
vertexShader += "varying vec3 v_normal;\n";
if (hasSkinning) {
vertexShaderMain +=
" v_normal = u_normalMatrix * mat3(skinMatrix) * weightedNormal;\n";
} else {
vertexShaderMain += " v_normal = u_normalMatrix * weightedNormal;\n";
if (!isUnlit) {
vertexShader += "varying vec3 v_normal;\n";
if (hasSkinning) {
vertexShaderMain +=
" v_normal = u_normalMatrix * mat3(skinMatrix) * weightedNormal;\n";
} else {
vertexShaderMain += " v_normal = u_normalMatrix * weightedNormal;\n";
}
fragmentShader += "varying vec3 v_normal;\n";
}

fragmentShader += "varying vec3 v_normal;\n";
fragmentShader += "varying vec3 v_positionEC;\n";
}

Expand Down Expand Up @@ -638,7 +637,7 @@ function generateTechnique(
vertexShader += "}\n";

// Fragment shader lighting
if (hasNormals) {
if (hasNormals && !isUnlit) {
fragmentShader += "const float M_PI = 3.141592653589793;\n";

fragmentShader +=
Expand Down Expand Up @@ -737,7 +736,7 @@ function generateTechnique(
fragmentShader += fragmentShaderMain;

// Add normal mapping to fragment shader
if (hasNormals) {
if (hasNormals && !isUnlit) {
fragmentShader += " vec3 ng = normalize(v_normal);\n";
fragmentShader +=
" vec3 positionWC = vec3(czm_inverseView * vec4(v_positionEC, 1.0));\n";
Expand Down Expand Up @@ -814,7 +813,7 @@ function generateTechnique(

fragmentShader += " vec3 baseColor = baseColorWithAlpha.rgb;\n";

if (hasNormals) {
if (hasNormals && !isUnlit) {
if (useSpecGloss) {
if (defined(generatedMaterialValues.u_specularGlossinessTexture)) {
fragmentShader +=
Expand Down