Skip to content

Commit 16fd74e

Browse files
author
Hannah
authoredFeb 21, 2018
Merge pull request #6234 from AnalyticalGraphicsInc/fix-typo
Fix typo when cloning ShaderSource.
2 parents 3736538 + 53bacc5 commit 16fd74e

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed
 

‎Source/Renderer/ShaderSource.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ define([
313313
return new ShaderSource({
314314
sources : this.sources,
315315
defines : this.defines,
316-
pickColorQuantifier : this.pickColorQualifier,
316+
pickColorQualifier : this.pickColorQualifier,
317317
includeBuiltIns : this.includeBuiltIns
318318
});
319319
};

‎Specs/Renderer/ShaderSourceSpec.js

+18
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,22 @@ defineSuite([
7676
var shaderText = source.createCombinedVertexShader(mockContext);
7777
expect(shaderText).toStartWith('#version 300 es\n');
7878
});
79+
80+
it('clones', function() {
81+
var source = new ShaderSource({
82+
defines : ['A'],
83+
sources : ['void main() { gl_FragColor = vec4(1.0); }'],
84+
pickColorQualifier : 'varying',
85+
includeBuiltIns : false
86+
});
87+
var clone = source.clone();
88+
expect(clone.defines).toBeDefined();
89+
expect(clone.defines.length).toEqual(1);
90+
expect(clone.defines[0]).toEqual(source.defines[0]);
91+
expect(clone.sources).toBeDefined();
92+
expect(clone.sources.length).toEqual(1);
93+
expect(clone.sources[0]).toEqual(source.sources[0]);
94+
expect(clone.pickColorQualifier).toEqual(source.pickColorQualifier);
95+
expect(clone.includeBuiltIns).toEqual(source.includeBuiltIns);
96+
});
7997
});

0 commit comments

Comments
 (0)
Please sign in to comment.