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

Use epsilon to fix Cube Map premultipled alpha test #4966

Merged
merged 4 commits into from Feb 8, 2017
Merged

Use epsilon to fix Cube Map premultipled alpha test #4966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcb6ece
Add epsilon option to expectContextToRender
shehzan10 Feb 8, 2017
ba91253
Use epsilon in cube map premultipled alpha test
shehzan10 Feb 8, 2017
34319d5
Use epsilon in texture premultipled alpha test
shehzan10 Feb 8, 2017
b2fc0c5
Use all 4 arguments in equalsEpsilon for contextToRender
shehzan10 Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion Specs/Renderer/CubeMapSpec.js
View file
Open in desktop
Expand Up @@ -82,7 +82,8 @@ defineSuite([
expect({
context : context,
fragmentShader : fs,
uniformMap : uniformMap
uniformMap : uniformMap,
epsilon : options.epsilon
}).contextToRender(expectedColors[i]);
}
}
Expand Down Expand Up @@ -239,6 +240,7 @@ defineSuite([

expectCubeMapFaces({
cubeMap : cubeMap,
epsilon : 1,
expectedColors : [
[0, 0, 127, 255], // +X
[0, 0, 127, 255], // -X
Expand Down
3 changes: 2 additions & 1 deletion Specs/Renderer/TextureSpec.js
View file
Open in desktop
Expand Up @@ -297,7 +297,8 @@ defineSuite([
expect({
context : cxt,
fragmentShader : fs,
uniformMap : uniformMap
uniformMap : uniformMap,
epsilon : 1
}).contextToRender([0, 0, 127, 127]);

texture.destroy();
Expand Down
17 changes: 9 additions & 8 deletions Specs/addDefaultMatchers.js
View file
Open in desktop
Expand Up @@ -505,6 +505,7 @@ define([
var modelMatrix = options.modelMatrix;
var depth = defaultValue(options.depth, 0.0);
var clear = defaultValue(options.clear, true);
var epsilon = defaultValue(options.epsilon, 0);

if (!defined(expected)) {
expected = [255, 255, 255, 255];
Expand Down Expand Up @@ -584,20 +585,20 @@ define([
var rgba = context.readPixels();
if (!webglStub) {
if (expectEqual) {
if ((rgba[0] !== expected[0]) ||
(rgba[1] !== expected[1]) ||
(rgba[2] !== expected[2]) ||
(rgba[3] !== expected[3])) {
if (!CesiumMath.equalsEpsilon(rgba[0], expected[0], 0, epsilon) ||
!CesiumMath.equalsEpsilon(rgba[1], expected[1], 0, epsilon) ||
!CesiumMath.equalsEpsilon(rgba[2], expected[2], 0, epsilon) ||
!CesiumMath.equalsEpsilon(rgba[3], expected[3], 0, epsilon)) {
return {
pass : false,
message : 'Expected context to render ' + expected + ', but rendered: ' + rgba
};
}
} else {
if ((rgba[0] === expected[0]) &&
(rgba[1] === expected[1]) &&
(rgba[2] === expected[2]) &&
(rgba[3] === expected[3])) {
if (CesiumMath.equalsEpsilon(rgba[0], expected[0], 0, epsilon) &&
CesiumMath.equalsEpsilon(rgba[1], expected[1], 0, epsilon) &&
CesiumMath.equalsEpsilon(rgba[2], expected[2], 0, epsilon) &&
CesiumMath.equalsEpsilon(rgba[3], expected[3], 0, epsilon)) {
return {
pass : false,
message : 'Expected context not to render ' + expected + ', but rendered: ' + rgba
Expand Down