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

Fix a couple issues with glTF tangent processing. #6302

Merged
merged 2 commits into from
Mar 2, 2018
Merged

Fix a couple issues with glTF tangent processing. #6302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2990c50
Fix a couple issues with glTF tangent processing.
emackey Mar 2, 2018
d85c9f1
CHANGES.md
emackey Mar 2, 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
5 changes: 5 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Change Log
==========

### 1.44 - 2018-04-02

##### Fixes :wrench:
* Fixed support of glTF-supplied tangent vectors. [#6302](https://github.com/AnalyticalGraphicsInc/cesium/pull/6302)

### 1.43 - 2018-03-01

##### Major Announcements :loudspeaker:
Expand Down
19 changes: 10 additions & 9 deletions Source/ThirdParty/GltfPipeline/processPbrMetallicRoughness.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ define([
vertexShaderMain += ' vec3 weightedNormal = a_normal;\n';
}
if (hasTangents) {
vertexShaderMain += ' vec3 weightedTangent = a_tangent;\n';
vertexShaderMain += ' vec4 weightedTangent = a_tangent;\n';
}
if (hasMorphTargets) {
for (var k = 0; k < morphTargets.length; k++) {
Expand All @@ -258,7 +258,7 @@ define([
} else if (targetAttribute === 'NORMAL') {
vertexShaderMain += ' weightedNormal += u_morphWeights[' + k + '] * a_' + attributeLower + ';\n';
} else if (targetAttribute === 'TANGENT') {
vertexShaderMain += ' weightedTangent += u_morphWeights[' + k + '] * a_' + attributeLower + ';\n';
vertexShaderMain += ' weightedTangent.xyz += u_morphWeights[' + k + '] * a_' + attributeLower + ';\n';
}
}
}
Expand Down Expand Up @@ -305,13 +305,14 @@ define([
techniqueAttributes.a_tangent = 'tangent';
techniqueParameters.tangent = {
semantic : 'TANGENT',
type : WebGLConstants.FLOAT_VEC3
type : WebGLConstants.FLOAT_VEC4
};
vertexShader += 'attribute vec3 a_tangent;\n';
vertexShader += 'varying vec3 v_tangent;\n';
vertexShaderMain += ' v_tangent = (u_modelViewMatrix * vec4(weightedTangent, 1.0)).xyz;\n';
vertexShader += 'attribute vec4 a_tangent;\n';
vertexShader += 'varying vec4 v_tangent;\n';
vertexShaderMain += ' v_tangent.xyz = u_normalMatrix * weightedTangent.xyz;\n';
vertexShaderMain += ' v_tangent.w = weightedTangent.w;\n';

fragmentShader += 'varying vec3 v_tangent;\n';
fragmentShader += 'varying vec4 v_tangent;\n';
}

// Add texture coordinates if the material uses them
Expand Down Expand Up @@ -420,8 +421,8 @@ define([
if (defined(parameterValues.normalTexture)) {
if (hasTangents) {
// Read tangents from varying
fragmentShader += ' vec3 t = normalize(v_tangent);\n';
fragmentShader += ' vec3 b = normalize(cross(ng, t));\n';
fragmentShader += ' vec3 t = normalize(v_tangent.xyz);\n';
fragmentShader += ' vec3 b = normalize(cross(ng, t) * v_tangent.w);\n';
fragmentShader += ' mat3 tbn = mat3(t, b, ng);\n';
fragmentShader += ' vec3 n = texture2D(u_normalTexture, ' + v_texcoord + ').rgb;\n';
fragmentShader += ' n = normalize(tbn * (2.0 * n - 1.0));\n';
Expand Down