diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_NormalM_albedoM.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_NormalM_albedoM.fbx new file mode 100644 index 00000000..a54ac956 Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_NormalM_albedoM.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_albedoM.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_albedoM.fbx new file mode 100644 index 00000000..38c2271d Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_albedoM.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_albedoM_ao.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_albedoM_ao.fbx new file mode 100644 index 00000000..1d81eaf7 Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_albedoM_ao.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_albedoV.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_albedoV.fbx new file mode 100644 index 00000000..a3e0397b Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityA_albedoV.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_NormalM_albedoM.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_NormalM_albedoM.fbx new file mode 100644 index 00000000..b9436486 Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_NormalM_albedoM.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoM.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoM.fbx new file mode 100644 index 00000000..dfa44847 Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoM.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoM_ao.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoM_ao.fbx new file mode 100644 index 00000000..e36920fa Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoM_ao.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoV.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoV.fbx new file mode 100644 index 00000000..2e2cce04 Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoV.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoV_ao.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoV_ao.fbx new file mode 100644 index 00000000..70b67c5b Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityM_albedoV_ao.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_NormalM_albedoM.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_NormalM_albedoM.fbx new file mode 100644 index 00000000..fe8904fa Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_NormalM_albedoM.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoM.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoM.fbx new file mode 100644 index 00000000..71e7a6d1 Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoM.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoM_ao.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoM_ao.fbx index 68090ee7..d6dd3b6f 100644 Binary files a/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoM_ao.fbx and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoM_ao.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoV.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoV.fbx new file mode 100644 index 00000000..86fe5e7a Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoV.fbx differ diff --git a/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoV_ao.fbx b/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoV_ao.fbx new file mode 100644 index 00000000..9bfabbf6 Binary files /dev/null and b/assets/models/material_matrix_models/fbx/blender/hifi_opacityV_albedoV_ao.fbx differ diff --git a/assets/models/material_matrix_models/src/blender/albedo-alpha.png b/assets/models/material_matrix_models/src/blender/albedo-alpha.png new file mode 100644 index 00000000..0c9ccf92 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/albedo-alpha.png differ diff --git a/assets/models/material_matrix_models/src/blender/albedo-mask.png b/assets/models/material_matrix_models/src/blender/albedo-mask.png new file mode 100644 index 00000000..8280318f Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/albedo-mask.png differ diff --git a/assets/models/material_matrix_models/src/blender/albedo-metal.png b/assets/models/material_matrix_models/src/blender/albedo-metal.png index 56837fc5..b1138eda 100644 Binary files a/assets/models/material_matrix_models/src/blender/albedo-metal.png and b/assets/models/material_matrix_models/src/blender/albedo-metal.png differ diff --git a/assets/models/material_matrix_models/src/blender/albedo-nonmetal.png b/assets/models/material_matrix_models/src/blender/albedo-nonmetal.png index 70cfd11c..ac4c4087 100644 Binary files a/assets/models/material_matrix_models/src/blender/albedo-nonmetal.png and b/assets/models/material_matrix_models/src/blender/albedo-nonmetal.png differ diff --git a/assets/models/material_matrix_models/src/blender/albedo.png b/assets/models/material_matrix_models/src/blender/albedo.png new file mode 100644 index 00000000..80f12d25 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/albedo.png differ diff --git a/assets/models/material_matrix_models/src/blender/albedo.psd b/assets/models/material_matrix_models/src/blender/albedo.psd new file mode 100644 index 00000000..ae8b6b71 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/albedo.psd differ diff --git a/assets/models/material_matrix_models/src/blender/emissive.png b/assets/models/material_matrix_models/src/blender/emissive.png new file mode 100644 index 00000000..b810c342 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/emissive.png differ diff --git a/assets/models/material_matrix_models/src/blender/emissive.psd b/assets/models/material_matrix_models/src/blender/emissive.psd new file mode 100644 index 00000000..8932f9d6 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/emissive.psd differ diff --git a/assets/models/material_matrix_models/src/blender/fresnelcolours.png b/assets/models/material_matrix_models/src/blender/fresnelcolours.png new file mode 100644 index 00000000..50453562 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/fresnelcolours.png differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_albedoM_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_albedoM_ao.blend index e5a88e98..d6fdf1bd 100644 Binary files a/assets/models/material_matrix_models/src/blender/hifi_albedoM_ao.blend and b/assets/models/material_matrix_models/src/blender/hifi_albedoM_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_albedoVM_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_albedoVM_ao.blend index 06fc24ff..b09e8c76 100644 Binary files a/assets/models/material_matrix_models/src/blender/hifi_albedoVM_ao.blend and b/assets/models/material_matrix_models/src/blender/hifi_albedoVM_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_emissiveM_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_emissiveM_albedoV_ao.blend new file mode 100644 index 00000000..4d7962b7 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_emissiveM_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_emissiveV_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_emissiveV_albedoV_ao.blend new file mode 100644 index 00000000..0baccb7a Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_emissiveV_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_metallicM_albedoM_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_metallicM_albedoM_ao.blend index 5e281c00..cd2ce215 100644 Binary files a/assets/models/material_matrix_models/src/blender/hifi_metallicM_albedoM_ao.blend and b/assets/models/material_matrix_models/src/blender/hifi_metallicM_albedoM_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_metallicV_albedoM_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_metallicV_albedoM_ao.blend index 7f264584..9606cac7 100644 Binary files a/assets/models/material_matrix_models/src/blender/hifi_metallicV_albedoM_ao.blend and b/assets/models/material_matrix_models/src/blender/hifi_metallicV_albedoM_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_metallicV_albedoVM_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_metallicV_albedoVM_ao.blend index d5d452eb..6d53d62d 100644 Binary files a/assets/models/material_matrix_models/src/blender/hifi_metallicV_albedoVM_ao.blend and b/assets/models/material_matrix_models/src/blender/hifi_metallicV_albedoVM_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_normalM_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_normalM_albedoV_ao.blend new file mode 100644 index 00000000..44514ae5 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_normalM_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_normalM_metallicV_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_normalM_metallicV_albedoV_ao.blend new file mode 100644 index 00000000..be695aef Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_normalM_metallicV_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_opacityA_albedoM_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_opacityA_albedoM_ao.blend new file mode 100644 index 00000000..f9cbfe24 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_opacityA_albedoM_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_opacityM_albedoM_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_opacityM_albedoM_ao.blend new file mode 100644 index 00000000..e5102a81 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_opacityM_albedoM_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_opacityM_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_opacityM_albedoV_ao.blend new file mode 100644 index 00000000..41ab26b3 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_opacityM_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_opacityV_albedoM_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_opacityV_albedoM_ao.blend new file mode 100644 index 00000000..147f1d4a Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_opacityV_albedoM_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_opacityV_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_opacityV_albedoV_ao.blend new file mode 100644 index 00000000..c0f78f0d Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_opacityV_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessM_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessM_albedoV_ao.blend new file mode 100644 index 00000000..f519ff94 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessM_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessM_metallicV_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessM_metallicV_albedoV_ao.blend new file mode 100644 index 00000000..50906eca Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessM_metallicV_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessV00_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessV00_albedoV_ao.blend new file mode 100644 index 00000000..276a73a8 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessV00_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessV00_metallicV_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessV00_metallicV_albedoV_ao.blend new file mode 100644 index 00000000..915d0327 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessV00_metallicV_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessV100_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessV100_albedoV_ao.blend new file mode 100644 index 00000000..2ff2f74d Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessV100_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessV100_metallicV_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessV100_metallicV_albedoV_ao.blend new file mode 100644 index 00000000..83a6eee0 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessV100_metallicV_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessV25_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessV25_albedoV_ao.blend new file mode 100644 index 00000000..d3595d74 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessV25_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessV25_metallicV_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessV25_metallicV_albedoV_ao.blend new file mode 100644 index 00000000..5dff3066 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessV25_metallicV_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessV50_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessV50_albedoV_ao.blend new file mode 100644 index 00000000..310d410c Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessV50_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessV50_metallicV_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessV50_metallicV_albedoV_ao.blend new file mode 100644 index 00000000..e4994a70 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessV50_metallicV_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessV75_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessV75_albedoV_ao.blend new file mode 100644 index 00000000..91feac6b Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessV75_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/hifi_roughnessV75_metallicV_albedoV_ao.blend b/assets/models/material_matrix_models/src/blender/hifi_roughnessV75_metallicV_albedoV_ao.blend new file mode 100644 index 00000000..875b652f Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/hifi_roughnessV75_metallicV_albedoV_ao.blend differ diff --git a/assets/models/material_matrix_models/src/blender/metal.png b/assets/models/material_matrix_models/src/blender/metal.png new file mode 100644 index 00000000..35538201 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/metal.png differ diff --git a/assets/models/material_matrix_models/src/blender/metallic.psd b/assets/models/material_matrix_models/src/blender/metallic.psd new file mode 100644 index 00000000..6636818c Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/metallic.psd differ diff --git a/assets/models/material_matrix_models/src/blender/normal.psd b/assets/models/material_matrix_models/src/blender/normal.psd new file mode 100644 index 00000000..3ec50c8e Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/normal.psd differ diff --git a/assets/models/material_matrix_models/src/blender/occlusion.psd b/assets/models/material_matrix_models/src/blender/occlusion.psd new file mode 100644 index 00000000..047e47b7 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/occlusion.psd differ diff --git a/assets/models/material_matrix_models/src/blender/roughness.png b/assets/models/material_matrix_models/src/blender/roughness.png new file mode 100644 index 00000000..f1b66287 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/roughness.png differ diff --git a/assets/models/material_matrix_models/src/blender/roughness.psd b/assets/models/material_matrix_models/src/blender/roughness.psd new file mode 100644 index 00000000..4a2bd7f2 Binary files /dev/null and b/assets/models/material_matrix_models/src/blender/roughness.psd differ diff --git a/tests/engine/render/material/albedo/ExpectedImage_00000.png b/tests/engine/render/material/albedo/ExpectedImage_00000.png deleted file mode 100644 index f1720595..00000000 Binary files a/tests/engine/render/material/albedo/ExpectedImage_00000.png and /dev/null differ diff --git a/tests/engine/render/material/albedo/test.js b/tests/engine/render/material/albedo/albedoM/test.js similarity index 60% rename from tests/engine/render/material/albedo/test.js rename to tests/engine/render/material/albedo/albedoM/test.js index b3d3c2c7..cdf35119 100644 --- a/tests/engine/render/material/albedo/test.js +++ b/tests/engine/render/material/albedo/albedoM/test.js @@ -1,40 +1,49 @@ if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { - PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; - Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); nitpick = createNitpick(Script.resolvePath(".")); -} - -nitpick.perform("Effects of albedo on various materials", Script.resolvePath("."), "secondary", undefined, function(testType) { - // Test material matrix - Script.include("../matrix.js?raw=true") - - // List here all the entries of the Material Matrix tested in this test - var TEST_CASES = [ - {name:"hifi_albedoV_ao", a:0, b:-1, c:-0.5}, - {name:"hifi_albedoM_ao", a:0, b:0, c:-0.5}, - {name:"hifi_albedoVM_ao", a:0, b:1, c:-0.5}, - - {name:"hifi_metallicV_albedoV_ao", a:0, b:-1, c:0.5}, - {name:"hifi_metallicV_albedoM_ao", a:0, b:0, c:0.5}, - {name:"hifi_metallicV_albedoVM_ao", a:0, b:1, c:0.5}, - ]; - - // Add the test Cases - var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; - var createdEntities = []; - nitpick.addStep("Set up test case", function () { - createdEntities = addCases(TEST_CASES, true, true, nitpick.getOriginFrame()); - validationCamera_translate(OFFSET); - }); - - nitpick.addDelay(6); - nitpick.addStepSnapshot("Take snapshot of the effects"); - - nitpick.addStep("Clean up after test", function () { - for (var i = 0; i < createdEntities.length; i++) { - Entities.deleteEntity(createdEntities[i]); - } - }); - - var result = nitpick.runTest(testType); -}); +} + +nitpick.perform("Effects of albedo on various materials", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_albedoM_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_metallicV_albedoM_ao", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/albedo/albedoV/test.js b/tests/engine/render/material/albedo/albedoV/test.js new file mode 100644 index 00000000..09816415 --- /dev/null +++ b/tests/engine/render/material/albedo/albedoV/test.js @@ -0,0 +1,50 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Effects of albedo on various materials", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + // {name:"hifi_albedoM_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_albedoV_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_metallicV_albedoV_ao", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/albedo/albedoVM/test.js b/tests/engine/render/material/albedo/albedoVM/test.js new file mode 100644 index 00000000..0c515da9 --- /dev/null +++ b/tests/engine/render/material/albedo/albedoVM/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Effects of albedo on various materials", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_albedoVM_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_metallicV_albedoVM_ao", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/albedo/test.md b/tests/engine/render/material/albedo/test.md deleted file mode 100644 index 482b4ce8..00000000 --- a/tests/engine/render/material/albedo/test.md +++ /dev/null @@ -1,16 +0,0 @@ -# Effects of albedo on various materials -## Run this script URL: [Manual](./test.js?raw=true) [Auto](./testAuto.js?raw=true)(from menu/Edit/Open and Run scripts from URL...). - -## Preconditions -- In an empty region of a domain with editing rights. - -## Steps -Press 'n' key to advance step by step - -### Step 1 -- Set up test case -### Step 2 -- Take snapshot of the effects -- ![](./ExpectedImage_00000.png) -### Step 3 -- Clean up after test diff --git a/tests/engine/render/material/albedo/testAuto.js b/tests/engine/render/material/albedo/testAuto.js deleted file mode 100644 index a4f6e6bc..00000000 --- a/tests/engine/render/material/albedo/testAuto.js +++ /dev/null @@ -1,7 +0,0 @@ -if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') PATH_TO_THE_REPO_PATH_UTILS_FILE = 'https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js'; -Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); -var nitpick = createNitpick(Script.resolvePath('.')); - -nitpick.enableAuto(); - -Script.include('./test.js?raw=true'); diff --git a/tests/engine/render/material/base/test.js b/tests/engine/render/material/base/test.js index d0fd865a..c2aeee7c 100644 --- a/tests/engine/render/material/base/test.js +++ b/tests/engine/render/material/base/test.js @@ -1,24 +1,38 @@ -if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); - nitpick = createNitpick(Script.resolvePath(".")); + nitpick = createNitpick(Script.resolvePath(".")); } nitpick.perform("Show base effects on various materials", Script.resolvePath("."), "secondary", undefined, function(testType) { - // Test material matrix - Script.include("../matrix.js?raw=true") + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") // List here all the entries of the Material Matrix tested in this test - var TEST_CASES = [ - {name:"hifi", a:0, b:0, c:-0.5}, - {name:"hifi-ao", a:0, b:0, c:0.5}, + var TEST_CASES = [ + {name:"hifi", a:-1.5, b:-0.5, c:0}, + {name:"hifi-ao", a:-1.5, b:0.5, c:0}, ]; - + // Add the test Cases - var OFFSET = { x: 0.0, y: -1.0, z: -0.1 }; + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + nitpick.addStep("Set up test case", function () { - createdEntities = addCases(TEST_CASES, true, true, nitpick.getOriginFrame()); + createdEntities = addCases(TEST_CASES, initData); validationCamera_translate(OFFSET); }); diff --git a/tests/engine/render/material/emissive/test.js b/tests/engine/render/material/emissive/test.js index 2d56f81f..319e95fd 100644 --- a/tests/engine/render/material/emissive/test.js +++ b/tests/engine/render/material/emissive/test.js @@ -1,24 +1,38 @@ -if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); - nitpick = createNitpick(Script.resolvePath(".")); + nitpick = createNitpick(Script.resolvePath(".")); } nitpick.perform("Show effects of emmisive materials", Script.resolvePath("."), "secondary", undefined, function(testType) { - // Test material matrix - Script.include("../matrix.js?raw=true") + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") // List here all the entries of the Material Matrix tested in this test - var TEST_CASES = [ - {name:"hifi_emissiveV_albedoV_ao", a:0, b:0, c:-0.5}, - {name:"hifi_emissiveM_albedoV_ao", a:0, b:0, c:0.5}, + var TEST_CASES = [ + {name:"hifi_emissiveV_albedoV_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_emissiveM_albedoV_ao", a:-1.5, b:0.5, c:0}, ]; - + // Add the test Cases - var OFFSET = { x: 0.0, y: -1.0, z: -0.1 }; + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + nitpick.addStep("Set up test case", function () { - createdEntities = addCases(TEST_CASES, true, true, nitpick.getOriginFrame()); + createdEntities = addCases(TEST_CASES, initData); validationCamera_translate(OFFSET); }); diff --git a/tests/engine/render/material/normal_map/test.js b/tests/engine/render/material/normal_map/test.js index 32564082..8eca8b0f 100644 --- a/tests/engine/render/material/normal_map/test.js +++ b/tests/engine/render/material/normal_map/test.js @@ -1,24 +1,38 @@ -if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); - nitpick = createNitpick(Script.resolvePath(".")); + nitpick = createNitpick(Script.resolvePath(".")); } nitpick.perform("Show effects of normal maps", Script.resolvePath("."), "secondary", undefined, function(testType) { - // Test material matrix - Script.include("../matrix.js?raw=true") + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") // List here all the entries of the Material Matrix tested in this test - var TEST_CASES = [ + var TEST_CASES = [ {name:"hifi_normalM_albedoV_ao", a:-1.5, b:-0.5, c:0}, - {name:"hifi_normalM_metallicV_albedoV_ao", a:-1.5, b:0.5, c:0}, + {name:"hifi_normalM_metallicV_albedoV_ao", a:-1.5, b:0.5, c:0}, ]; // Add the test Cases - var OFFSET = { x: 0.0, y: -1.0, z: -0.1 }; + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + nitpick.addStep("Set up test case", function () { - createdEntities = addCases(TEST_CASES, true, true, nitpick.getOriginFrame()); + createdEntities = addCases(TEST_CASES, initData); validationCamera_translate(OFFSET); }); diff --git a/tests/engine/render/material/opacity/opacityA/test.js b/tests/engine/render/material/opacity/opacityA/test.js new file mode 100644 index 00000000..c0d0d3eb --- /dev/null +++ b/tests/engine/render/material/opacity/opacityA/test.js @@ -0,0 +1,50 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show opacity blend map model", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + // {name:"hifi_albedoM_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_opacityA_albedoV", a:-1.5, b:-0.5, c:0}, + {name:"hifi_opacityA_albedoM", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/opacity/opacityM/test.js b/tests/engine/render/material/opacity/opacityM/test.js new file mode 100644 index 00000000..72fae6ee --- /dev/null +++ b/tests/engine/render/material/opacity/opacityM/test.js @@ -0,0 +1,50 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show opacity masked model", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + // {name:"hifi_albedoM_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_opacityM_albedoV", a:-1.5, b:-0.5, c:0}, + {name:"hifi_opacityM_albedoM", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/opacity/opacityMA_normalMap/test.js b/tests/engine/render/material/opacity/opacityMA_normalMap/test.js new file mode 100644 index 00000000..0a4d278f --- /dev/null +++ b/tests/engine/render/material/opacity/opacityMA_normalMap/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show opacity map mask & blend with normal map model", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_opacityM_NormalM_albedoM", a:-1.5, b:-0.5, c:0}, + {name:"hifi_opacityA_NormalM_albedoM", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/opacity/opacityV/test.js b/tests/engine/render/material/opacity/opacityV/test.js new file mode 100644 index 00000000..4a613d54 --- /dev/null +++ b/tests/engine/render/material/opacity/opacityV/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show opacity value model", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_opacityV_albedoV", a:-1.5, b:-0.5, c:0}, + {name:"hifi_opacityV_albedoM", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/opacity/opacityVA/test.js b/tests/engine/render/material/opacity/opacityVA/test.js new file mode 100644 index 00000000..ed24abf8 --- /dev/null +++ b/tests/engine/render/material/opacity/opacityVA/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show opacity value and blend map model", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_opacityVA_albedoV", a:-1.5, b:-0.5, c:0}, + {name:"hifi_opacityVA_albedoM", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/opacity/opacityVM/test.js b/tests/engine/render/material/opacity/opacityVM/test.js new file mode 100644 index 00000000..e2cd9e4e --- /dev/null +++ b/tests/engine/render/material/opacity/opacityVM/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show opacity value and mask map model", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_opacityVM_albedoV", a:-1.5, b:-0.5, c:0}, + {name:"hifi_opacityVM_albedoM", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/opacity/opacityV_normalMap/test.js b/tests/engine/render/material/opacity/opacityV_normalMap/test.js new file mode 100644 index 00000000..a8ad776a --- /dev/null +++ b/tests/engine/render/material/opacity/opacityV_normalMap/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show opacity map mask & blend with normal map model", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_opacityV_NormalM_albedoV", a:-1.5, b:-0.5, c:0}, + {name:"hifi_opacityV_NormalM_albedoM", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/roughness/ExpectedImage_00000.png b/tests/engine/render/material/roughness/ExpectedImage_00000.png deleted file mode 100644 index d26408cd..00000000 Binary files a/tests/engine/render/material/roughness/ExpectedImage_00000.png and /dev/null differ diff --git a/tests/engine/render/material/roughness_map/test.js b/tests/engine/render/material/roughness/roughnessM/test.js similarity index 56% rename from tests/engine/render/material/roughness_map/test.js rename to tests/engine/render/material/roughness/roughnessM/test.js index efea8aee..465fb36b 100644 --- a/tests/engine/render/material/roughness_map/test.js +++ b/tests/engine/render/material/roughness/roughnessM/test.js @@ -1,35 +1,49 @@ if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { - PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; - Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); nitpick = createNitpick(Script.resolvePath(".")); -} - -nitpick.perform("Show effects of roughness maps", Script.resolvePath("."), "secondary", undefined, function(testType) { - // Test material matrix - Script.include("../matrix.js?raw=true") - - // List here all the entries of the Material Matrix tested in this test - var TEST_CASES = [ - {name:"hifi_roughnessM_albedoV_ao", a:0, b:0, c:-0.5}, - {name:"hifi_roughnessM_metallicV_albedoV_ao", a:0, b:0, c:0.5}, - ]; - - // Add the test Cases - var OFFSET = { x: 0.0, y: -1.0, z: -0.1 }; - var createdEntities = []; - nitpick.addStep("Set up test case", function () { - createdEntities = addCases(TEST_CASES, true, true, nitpick.getOriginFrame()); - validationCamera_translate(OFFSET); - }); - - nitpick.addDelay(6); - nitpick.addStepSnapshot("Take snapshot of the effects"); - - nitpick.addStep("Clean up after test", function () { - for (var i = 0; i < createdEntities.length; i++) { - Entities.deleteEntity(createdEntities[i]); - } - }); - - var result = nitpick.runTest(testType); -}); +} + +nitpick.perform("Show effects of roughness maps", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_roughnessM_albedoV_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_roughnessM_metallicV_albedoV_ao", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(6); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/roughness/roughnessV00/test.js b/tests/engine/render/material/roughness/roughnessV00/test.js new file mode 100644 index 00000000..65e42ecb --- /dev/null +++ b/tests/engine/render/material/roughness/roughnessV00/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show effects of roughnessV00", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_roughnessV00_albedoV_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_roughnessV00_metallicV_albedoV_ao", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(10); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/roughness/roughnessV100/test.js b/tests/engine/render/material/roughness/roughnessV100/test.js new file mode 100644 index 00000000..b6a412c4 --- /dev/null +++ b/tests/engine/render/material/roughness/roughnessV100/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show effects of roughnessV100", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_roughnessV100_albedoV_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_roughnessV100_metallicV_albedoV_ao", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(10); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/roughness/roughnessV25/test.js b/tests/engine/render/material/roughness/roughnessV25/test.js new file mode 100644 index 00000000..3e9dc9e2 --- /dev/null +++ b/tests/engine/render/material/roughness/roughnessV25/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show effects of roughnessV25", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_roughnessV25_albedoV_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_roughnessV25_metallicV_albedoV_ao", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(10); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/roughness/roughnessV50/test.js b/tests/engine/render/material/roughness/roughnessV50/test.js new file mode 100644 index 00000000..534fed92 --- /dev/null +++ b/tests/engine/render/material/roughness/roughnessV50/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show effects of roughnessV50", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_roughnessV50_albedoV_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_roughnessV50_metallicV_albedoV_ao", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(10); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/roughness/roughnessV75/test.js b/tests/engine/render/material/roughness/roughnessV75/test.js new file mode 100644 index 00000000..a2dcf93d --- /dev/null +++ b/tests/engine/render/material/roughness/roughnessV75/test.js @@ -0,0 +1,49 @@ +if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { + PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; + Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); + nitpick = createNitpick(Script.resolvePath(".")); +} + +nitpick.perform("Show effects of roughnessV75", Script.resolvePath("."), "secondary", undefined, function(testType) { + // standard test stage and model loaders + Script.include(nitpick.getUtilsRootPath() + "test_stageAndModels.js?raw=true") + + // List here all the entries of the Material Matrix tested in this test + var TEST_CASES = [ + {name:"hifi_roughnessV75_albedoV_ao", a:-1.5, b:-0.5, c:0}, + {name:"hifi_roughnessV75_metallicV_albedoV_ao", a:-1.5, b:0.5, c:0}, + ]; + + // Add the test Cases + var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; + var createdEntities = []; + // Add the test Cases + var initData = { + flags : { + hasZone: true, + hasKeyLight: true, + hasKeyLightShadow: false, + hasAmbientLight: true, + hasLocalLights: true, + hasBloom: false, + darkStage: true, + }, + originFrame: nitpick.getOriginFrame() + }; + + nitpick.addStep("Set up test case", function () { + createdEntities = addCases(TEST_CASES, initData); + validationCamera_translate(OFFSET); + }); + + nitpick.addDelay(10); + nitpick.addStepSnapshot("Take snapshot of the effects"); + + nitpick.addStep("Clean up after test", function () { + for (var i = 0; i < createdEntities.length; i++) { + Entities.deleteEntity(createdEntities[i]); + } + }); + + var result = nitpick.runTest(testType); +}); diff --git a/tests/engine/render/material/roughness/test.js b/tests/engine/render/material/roughness/test.js deleted file mode 100644 index b241a33f..00000000 --- a/tests/engine/render/material/roughness/test.js +++ /dev/null @@ -1,44 +0,0 @@ -if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') { - PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js"; - Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); - nitpick = createNitpick(Script.resolvePath(".")); -} - -nitpick.perform("Show effects of roughness", Script.resolvePath("."), "secondary", undefined, function(testType) { - // Test material matrix - Script.include("../matrix.js?raw=true") - - // List here all the entries of the Material Matrix tested in this test - var TEST_CASES = [ - {name:"hifi_roughnessV00_albedoV_ao", a:0, b:-2, c:-0.5}, - {name:"hifi_roughnessV25_albedoV_ao", a:0, b:-1, c:-0.5}, - {name:"hifi_roughnessV50_albedoV_ao", a:0, b:0, c:-0.5}, - {name:"hifi_roughnessV75_albedoV_ao", a:0, b:1, c:-0.5}, - {name:"hifi_roughnessV100_albedoV_ao", a:0, b:2, c:-0.5}, - - {name:"hifi_roughnessV00_metallicV_albedoV_ao", a:0, b:-2, c:0.5}, - {name:"hifi_roughnessV25_metallicV_albedoV_ao", a:0, b:-1, c:0.5}, - {name:"hifi_roughnessV50_metallicV_albedoV_ao", a:0, b:0, c:0.5}, - {name:"hifi_roughnessV75_metallicV_albedoV_ao", a:0, b:1, c:0.5}, - {name:"hifi_roughnessV100_metallicV_albedoV_ao", a:0, b:2, c:0.5}, - ]; - - // Add the test Cases - var OFFSET = { x: 0.0, y: -0.8, z: -0.1 }; - var createdEntities = []; - nitpick.addStep("Set up test case", function () { - createdEntities = addCases(TEST_CASES, true, true, nitpick.getOriginFrame()); - validationCamera_translate(OFFSET); - }); - - nitpick.addDelay(10); - nitpick.addStepSnapshot("Take snapshot of the effects"); - - nitpick.addStep("Clean up after test", function () { - for (var i = 0; i < createdEntities.length; i++) { - Entities.deleteEntity(createdEntities[i]); - } - }); - - var result = nitpick.runTest(testType); -}); diff --git a/tests/engine/render/material/roughness/test.md b/tests/engine/render/material/roughness/test.md deleted file mode 100644 index 9c898d24..00000000 --- a/tests/engine/render/material/roughness/test.md +++ /dev/null @@ -1,16 +0,0 @@ -# Show effects of roughness -## Run this script URL: [Manual](./test.js?raw=true) [Auto](./testAuto.js?raw=true)(from menu/Edit/Open and Run scripts from URL...). - -## Preconditions -- In an empty region of a domain with editing rights. - -## Steps -Press 'n' key to advance step by step - -### Step 1 -- Set up test case -### Step 2 -- Take snapshot of the effects -- ![](./ExpectedImage_00000.png) -### Step 3 -- Clean up after test diff --git a/tests/engine/render/material/roughness/testAuto.js b/tests/engine/render/material/roughness/testAuto.js deleted file mode 100644 index a4f6e6bc..00000000 --- a/tests/engine/render/material/roughness/testAuto.js +++ /dev/null @@ -1,7 +0,0 @@ -if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') PATH_TO_THE_REPO_PATH_UTILS_FILE = 'https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js'; -Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); -var nitpick = createNitpick(Script.resolvePath('.')); - -nitpick.enableAuto(); - -Script.include('./test.js?raw=true'); diff --git a/tests/engine/render/material/roughness_map/ExpectedImage_00000.png b/tests/engine/render/material/roughness_map/ExpectedImage_00000.png deleted file mode 100644 index 789d189c..00000000 Binary files a/tests/engine/render/material/roughness_map/ExpectedImage_00000.png and /dev/null differ diff --git a/tests/engine/render/material/roughness_map/test.md b/tests/engine/render/material/roughness_map/test.md deleted file mode 100644 index ea145a8f..00000000 --- a/tests/engine/render/material/roughness_map/test.md +++ /dev/null @@ -1,16 +0,0 @@ -# Show effects of roughness maps -## Run this script URL: [Manual](./test.js?raw=true) [Auto](./testAuto.js?raw=true)(from menu/Edit/Open and Run scripts from URL...). - -## Preconditions -- In an empty region of a domain with editing rights. - -## Steps -Press 'n' key to advance step by step - -### Step 1 -- Set up test case -### Step 2 -- Take snapshot of the effects -- ![](./ExpectedImage_00000.png) -### Step 3 -- Clean up after test diff --git a/tests/engine/render/material/roughness_map/testAuto.js b/tests/engine/render/material/roughness_map/testAuto.js deleted file mode 100644 index a4f6e6bc..00000000 --- a/tests/engine/render/material/roughness_map/testAuto.js +++ /dev/null @@ -1,7 +0,0 @@ -if (typeof PATH_TO_THE_REPO_PATH_UTILS_FILE === 'undefined') PATH_TO_THE_REPO_PATH_UTILS_FILE = 'https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js'; -Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE); -var nitpick = createNitpick(Script.resolvePath('.')); - -nitpick.enableAuto(); - -Script.include('./test.js?raw=true'); diff --git a/tests/utils/test_stageAndModels.js b/tests/utils/test_stageAndModels.js index 7e8b5da3..0715c7d7 100644 --- a/tests/utils/test_stageAndModels.js +++ b/tests/utils/test_stageAndModels.js @@ -48,7 +48,7 @@ function addTestModel(name, position, orientation) { function addTestCase(test, origin, orientation) { var center = getStagePosOriAt(test.a, test.b, test.c).pos; - return addTestModel(test.name, center, orientation); + return addTestModel(test.name, center, (test.yaw !== undefined ? Quat.multiply(orientation, Quat.angleAxis(test.yaw, Vec3.UNIT_Y)) : orientation)); } function addTestOverlay(name, infront, position, orientation) {