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

Fix generating model shaders for case where material is not used by a primitve #6315

Merged
merged 3 commits into from
Mar 13, 2018
Merged

Fix generating model shaders for case where material is not used by a primitve #6315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bcdee7
Fix generating shaders for case where material is not used by a primi…
lilleyse Mar 9, 2018
013624e
Merge branch 'master' into material-bug-fix
lilleyse Mar 12, 2018
34338c1
Updated CHANGES.md
lilleyse Mar 12, 2018
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Change Log
##### Fixes :wrench:
* Fixed support of glTF-supplied tangent vectors. [#6302](https://github.com/AnalyticalGraphicsInc/cesium/pull/6302)
* Fixed improper zoom during model load failure. [#6305](https://github.com/AnalyticalGraphicsInc/cesium/pull/6305)
* Fixed model loading failure when containing unused materials. [6315](https://github.com/AnalyticalGraphicsInc/cesium/pull/6315)

### 1.43 - 2018-03-01

Expand Down
24 changes: 16 additions & 8 deletions Source/ThirdParty/GltfPipeline/processModelMaterialsCommon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,17 @@ define([
parameterValues.doubleSided = khrMaterialsCommon.doubleSided;
}
var jointCount = defaultValue(khrMaterialsCommon.jointCount, 0);

var hasSkinning = jointCount > 0;
var primitiveInfo = khrMaterialsCommon.extras._pipeline.primitive;
var skinningInfo = primitiveInfo.skinning;
var hasVertexColors = primitiveInfo.hasVertexColors;

var skinningInfo;
var hasSkinning = false;
var hasVertexColors = false;

if (defined(primitiveInfo)) {
skinningInfo = primitiveInfo.skinning;
hasSkinning = skinningInfo.skinned;
hasVertexColors = primitiveInfo.hasVertexColors;
}

var vertexShader = 'precision highp float;\n';
var fragmentShader = 'precision highp float;\n';
Expand Down Expand Up @@ -788,11 +794,13 @@ define([
var jointCount = defaultValue(khrMaterialsCommon.jointCount, 0);
techniqueKey += jointCount.toString() + ';';
var primitiveInfo = khrMaterialsCommon.extras._pipeline.primitive;
var skinningInfo = primitiveInfo.skinning;
if (jointCount > 0) {
techniqueKey += skinningInfo.type + ';';
if (defined(primitiveInfo)) {
var skinningInfo = primitiveInfo.skinning;
if (jointCount > 0) {
techniqueKey += skinningInfo.type + ';';
}
techniqueKey += primitiveInfo.hasVertexColors;
}
techniqueKey += primitiveInfo.hasVertexColors;

return techniqueKey;
}
Expand Down
13 changes: 10 additions & 3 deletions Source/ThirdParty/GltfPipeline/processPbrMetallicRoughness.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,16 @@ define([
var joints = (defined(skin)) ? skin.joints : [];
var jointCount = joints.length;
var primitiveInfo = material.extras._pipeline.primitive;
var skinningInfo = primitiveInfo.skinning;
var hasSkinning = skinningInfo.skinned;
var hasVertexColors = primitiveInfo.hasVertexColors;

var skinningInfo;
var hasSkinning = false;
var hasVertexColors = false;

if (defined(primitiveInfo)) {
skinningInfo = primitiveInfo.skinning;
hasSkinning = skinningInfo.skinned;
hasVertexColors = primitiveInfo.hasVertexColors;
}

var hasNormals = true;
var hasTangents = false;
Expand Down