Update technique render states and support for KHR_blend #387
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,219 @@ | ||
| 'use strict'; | ||
| var Cesium = require('cesium'); | ||
| var moveTechniqueRenderStates = require('../../lib/moveTechniqueRenderStates'); | ||
|
|
||
| var WebGLConstants = Cesium.WebGLConstants; | ||
|
|
||
| var gltf = { | ||
| programs: { | ||
| program_0: { | ||
| attributes: [ | ||
| 'a_normal', | ||
| 'a_position', | ||
| 'a_texcoord0' | ||
| ], | ||
| fragmentShader: 'BoxTextured0FS', | ||
| vertexShader: 'BoxTextured0VS' | ||
| } | ||
| }, | ||
| shaders: { | ||
| BoxTextured0FS: { | ||
| type: WebGLConstants.FRAGMENT_SHADER, | ||
| uri: 'BoxTextured0FS.glsl' | ||
| }, | ||
| BoxTextured0VS: { | ||
| type: WebGLConstants.VERTEX_SHADER, | ||
| uri: 'BoxTextured0VS.glsl' | ||
| } | ||
| }, | ||
| techniques: { | ||
| technique0: { | ||
| states: { | ||
| enable: [ | ||
| WebGLConstants.DEPTH_TEST, | ||
| WebGLConstants.BLEND, | ||
| WebGLConstants.CULL_FACE | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| materials: [ | ||
| { | ||
| technique: 'technique0' | ||
| } | ||
| ] | ||
| }; | ||
|
|
||
| describe('updateMaterialProperties', function() { | ||
| it('sets material.doubleSided property if CULL_FACE is not enabled', function () { | ||
| var gltfWithUpdatedMaterials = moveTechniqueRenderStates(gltf); | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. This may also be causing intermittent failures when tests are run in random order, which I think jasmine does now? |
||
| var material = gltfWithUpdatedMaterials.materials[0]; | ||
| expect(material.doubleSided).toBeUndefined(); | ||
|
|
||
| var gltfDoubleSided = JSON.parse(JSON.stringify(gltf)); | ||
|
There was a problem hiding this comment. Maybe use Cesium's There was a problem hiding this comment. I was having issues with the depth of the cloning when it came to arrays (even when using the deep clone argument). This was much more reliable. There was a problem hiding this comment. Is that a Cesium bug? I don't think that should be happening... There was a problem hiding this comment. The documentation isn't partially clear on what the behavior should be: https://cesiumjs.org/Cesium/Build/Documentation/clone.html There was a problem hiding this comment. Alright, if this way works consistently then let's go with it. |
||
| gltfDoubleSided.techniques.technique0.states = { | ||
| enable : [ | ||
| WebGLConstants.DEPTH_TEST, | ||
| WebGLConstants.BLEND | ||
| ] | ||
| }; | ||
|
|
||
| gltfWithUpdatedMaterials = moveTechniqueRenderStates(gltfDoubleSided); | ||
| material = gltfWithUpdatedMaterials.materials[0]; | ||
| expect(material.doubleSided).toBe(true); | ||
| }); | ||
|
|
||
| it('sets alphaMode and moves technique render state blending functions to material EXT_blend extension', function() { | ||
| var gltfWithBlendFunctions = JSON.parse(JSON.stringify(gltf)); | ||
|
|
||
| gltfWithBlendFunctions.techniques.technique0.states = { | ||
| enable: [ | ||
| WebGLConstants.DEPTH_TEST, | ||
| WebGLConstants.BLEND, | ||
| WebGLConstants.CULL_FACE | ||
| ], | ||
| functions: { | ||
| blendEquationSeparate: [ | ||
| WebGLConstants.FUNC_ADD, | ||
| WebGLConstants.FUNC_ADD | ||
| ], | ||
| blendFuncSeparate: [ | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ONE_MINUS_SRC_ALPHA, | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ONE_MINUS_SRC_ALPHA | ||
| ] | ||
| } | ||
| }; | ||
|
|
||
| var gltfWithBlendExtension = moveTechniqueRenderStates(gltfWithBlendFunctions); | ||
| expect(gltfWithBlendExtension.extensionsUsed.indexOf('EXT_blend')).toBeGreaterThan(-1); | ||
| expect(gltfWithBlendExtension.extensionsRequired).toBeUndefined(); | ||
|
|
||
| var material = gltfWithBlendExtension.materials[0]; | ||
| expect(material.alphaMode).toBe('BLEND'); | ||
| expect(material.extensions).toBeDefined(); | ||
| var materialBlending = material.extensions.EXT_blend; | ||
| expect(materialBlending).toBeDefined(); | ||
| expect(materialBlending.blendEquation).toEqual([ | ||
| WebGLConstants.FUNC_ADD, | ||
| WebGLConstants.FUNC_ADD | ||
| ]); | ||
| expect(materialBlending.blendFactors).toEqual([ | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ONE_MINUS_SRC_ALPHA, | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ONE_MINUS_SRC_ALPHA | ||
| ]); | ||
| }); | ||
|
|
||
| it('provides defaults for extension properties if not provided', function () { | ||
| var gltfWithBlendFunctions = JSON.parse(JSON.stringify(gltf)); | ||
| gltfWithBlendFunctions.techniques.technique0.states = { | ||
| enable: [ | ||
| WebGLConstants.DEPTH_TEST, | ||
| WebGLConstants.BLEND, | ||
| WebGLConstants.CULL_FACE | ||
| ], | ||
| functions: { | ||
| blendFuncSeparate: [ | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ONE_MINUS_SRC_ALPHA, | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ONE_MINUS_SRC_ALPHA | ||
| ] | ||
| } | ||
| }; | ||
|
|
||
| var gltfWithBlendExtension = moveTechniqueRenderStates(gltfWithBlendFunctions); | ||
| var materialBlending = gltfWithBlendExtension.materials[0].extensions.EXT_blend; | ||
| expect(materialBlending).toBeDefined(); | ||
| expect(materialBlending.blendEquation).toEqual([ | ||
| WebGLConstants.FUNC_ADD, | ||
| WebGLConstants.FUNC_ADD | ||
| ]); | ||
| expect(materialBlending.blendFactors).toEqual([ | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ONE_MINUS_SRC_ALPHA, | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ONE_MINUS_SRC_ALPHA | ||
| ]); | ||
|
|
||
| gltfWithBlendFunctions.techniques.technique0.states = { | ||
| enable: [ | ||
| WebGLConstants.DEPTH_TEST, | ||
| WebGLConstants.BLEND, | ||
| WebGLConstants.CULL_FACE | ||
| ], | ||
| functions: { | ||
| blendEquationSeparate: [ | ||
| WebGLConstants.FUNC_ADD, | ||
| WebGLConstants.FUNC_ADD | ||
| ] | ||
| } | ||
| }; | ||
|
|
||
| gltfWithBlendExtension = moveTechniqueRenderStates(gltfWithBlendFunctions); | ||
| materialBlending = gltfWithBlendExtension.materials[0].extensions.EXT_blend; | ||
| expect(materialBlending).toBeDefined(); | ||
| expect(materialBlending.blendEquation).toEqual([ | ||
| WebGLConstants.FUNC_ADD, | ||
| WebGLConstants.FUNC_ADD | ||
| ]); | ||
| expect(materialBlending.blendFactors).toEqual([ | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ZERO, | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ZERO | ||
| ]); | ||
| }); | ||
|
|
||
| it('falls back to default blending factors if unsupported factor is found', function () { | ||
| var gltfWithBlendFunctions = JSON.parse(JSON.stringify(gltf)); | ||
| gltfWithBlendFunctions.techniques.technique0.states = { | ||
| enable: [ | ||
| WebGLConstants.DEPTH_TEST, | ||
| WebGLConstants.BLEND, | ||
| WebGLConstants.CULL_FACE | ||
| ], | ||
| functions : { | ||
| blendFuncSeparate: [ | ||
| WebGLConstants.SRC_ALPHA_SATURATE, | ||
| WebGLConstants.ONE_MINUS_SRC_ALPHA, | ||
| WebGLConstants.SRC_ALPHA_SATURATE, | ||
| WebGLConstants.ONE_MINUS_SRC_ALPHA | ||
| ] | ||
| } | ||
| }; | ||
|
|
||
| var gltfWithBlendExtension = moveTechniqueRenderStates(gltfWithBlendFunctions); | ||
|
|
||
| var materialBlending = gltfWithBlendExtension.materials[0].extensions.EXT_blend; | ||
| expect(materialBlending).toBeDefined(); | ||
| expect(materialBlending.blendFactors).toEqual([ | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ZERO, | ||
| WebGLConstants.ONE, | ||
| WebGLConstants.ZERO | ||
| ]); | ||
| }); | ||
|
|
||
| it('does not set alphaMode or add EXT_blend if no blending is found in render states', function () { | ||
| var gltfWithoutBlending = JSON.parse(JSON.stringify(gltf)); | ||
| delete gltfWithoutBlending.techniques.technique0.states; | ||
| gltfWithoutBlending.techniques.technique0.states = { | ||
| enable: [ | ||
| WebGLConstants.DEPTH_TEST, | ||
| WebGLConstants.CULL_FACE | ||
| ] | ||
| }; | ||
|
|
||
| var updatedGltf = moveTechniqueRenderStates(gltfWithoutBlending); | ||
| expect(updatedGltf.extensionsUsed).toBeUndefined(); | ||
| expect(updatedGltf.extensionsRequired).toBeUndefined(); | ||
|
|
||
| var material = updatedGltf.materials[0]; | ||
| expect(material.alphaMode).toBeUndefined(); | ||
| expect(material.extensions).toBeUndefined(); | ||
| }); | ||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update the name to
moveTechniqueToRenderStates.