Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
70862b6
init submodule for glTF-Sample-Assets.
bhouston Oct 24, 2023
37f5faa
fix left over popd in fetch khronos gltf-smaples.
bhouston Oct 24, 2023
e8ead7e
remove tests from config.json that no longer have corresponding asset…
bhouston Oct 24, 2023
fb17048
upgrade babylon + filament, check in their latest goldens for new ani…
bhouston Oct 24, 2023
7390b25
update config.json with the new anisotropy tests.
bhouston Oct 24, 2023
17e936e
add more time for tests.
bhouston Oct 25, 2023
33d17e2
add more gltf tests along with goldens for filament,babylon and model…
bhouston Oct 25, 2023
b89fa9a
using checkout with submodule support.
bhouston Oct 25, 2023
bc5c08f
Merge branch 'additional-tests' of git@github.com:bhouston/model-view…
bhouston Oct 25, 2023
9647901
using checkout with submodule support.
bhouston Oct 25, 2023
a11d8cf
update goldens for model-viewer + filament for khronos-TextureTransfo…
bhouston Oct 25, 2023
c850c59
update goldens for model-viewer + filament for khronos-TextureTransfo…
bhouston Oct 25, 2023
ed9844e
add more goldens for anisotropy from gltf-sample-viewer and three-gpu…
bhouston Oct 25, 2023
bce8a03
add more goldens for anisotropy from gltf-sample-viewer and three-gpu…
bhouston Oct 25, 2023
2ed0708
exclude a few renderers for now to get the PR accepted.
bhouston Oct 25, 2023
e8e0be2
exclude a few renderers for now to get the PR accepted.
bhouston Oct 25, 2023
66ba502
add gltf-sample viewer goldens for new tests.
bhouston Oct 25, 2023
47167db
add goldens for AnisotropyDiscTest
bhouston Oct 25, 2023
342a9e2
remove barn lamp test for now.
bhouston Oct 25, 2023
a8ffc1d
remove blank golden image.
bhouston Oct 26, 2023
26468e2
remove barn lamp test for now.
bhouston Oct 25, 2023
b04a230
exclude three-gpu-pathtracer from rotation test.
bhouston Oct 26, 2023
41b8d8d
exclude three-gpu-pathtracer from rotation test.
bhouston Oct 26, 2023
89add3e
Merge remote-tracking branch 'origin/master' into additional-tests
bhouston Oct 26, 2023
d6a589b
Merge remote-tracking branch 'origin/master' into additional-tests
bhouston Oct 27, 2023
648c5fc
remove failing test for now.
bhouston Oct 27, 2023
7cd01be
Merge branch 'even-more-tests' into additional-tests
bhouston Oct 27, 2023
6a66cdd
Merge branch 'master' into additional-tests
bhouston Oct 30, 2023
5ee586a
add missing anisotropy goldens, and re-add barn lamp with model-viewe…
bhouston Oct 30, 2023
c684bb8
ensure goldens tests are excluded if renderer is excluded.
bhouston Oct 30, 2023
028c52f
remove blank image.
bhouston Nov 8, 2023
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
52 changes: 26 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/render-fidelity-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"dependencies": {
"@actions/core": "^1.2.4",
"@babylonjs/core": "^5.44.0",
"@babylonjs/loaders": "^5.44.0",
"@babylonjs/core": "^6.25.0",
"@babylonjs/loaders": "^6.25.0",
"@google/model-viewer": "^3.3.0",
"@khronosgroup/gltf-viewer": "^1.0.9",
"@polymer/paper-button": "^3.0.1",
Expand All @@ -36,7 +36,7 @@
"@types/puppeteer": "^5.4.6",
"@types/rimraf": "^3.0.1",
"@types/three": "^0.156.0",
"filament": "1.31.5",
"filament": "1.44.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did none of the existing renders change appreciably when these versions were bumped?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you merge in the other PR, I can run the fidelity test with "filament" as the target renderer and find out!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, lots of PRs merged - let's see how this does when it's all pulled together!

"http-server": "^14.1.1",
"lit": "^2.7.2",
"mkdirp": "^1.0.4",
Expand Down
14 changes: 14 additions & 0 deletions packages/render-fidelity-tools/src/artifact-creator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ export class ArtifactCreator {
const {rootDirectory, outputDirectory, goldens} = this;
const {name: scenarioName, exclude, dimensions} = scenario;

// skip if this renderer is excluded from this scenario
if(exclude != null && exclude.includes(renderer) ) {
return;
}

console.log(
`Start to compare ${renderer}'s golden with other renderers' goldens:`);

Expand Down Expand Up @@ -200,10 +205,16 @@ export class ArtifactCreator {
const scenarioName = scenarioBase.name;
const scenario = this[$configReader].scenarioConfig(scenarioName)!;

// skip if white lists exists and this scenario isn't in it
if (scenarioWhitelist != null && !scenarioWhitelist.has(scenarioName)) {
continue;
}

// skip if this renderer is excluded from this scenario
if(scenario.exclude != null && scenario.exclude.includes(renderer) ) {
continue;
}

console.log(`\n🎨 Scenario: ${scenarioName}`);

const scenarioOutputDirectory = join(outputDirectory, scenarioName);
Expand Down Expand Up @@ -241,6 +252,9 @@ export class ArtifactCreator {
this.config,
{scenarios: analyzedScenarios, errors: compareRenderersErrors});

// ensure directory exists, this can happen if all scenarios are ignored
await fs.mkdir(outputDirectory, {recursive: true});

await fs.writeFile(
join(outputDirectory, 'config.json'), JSON.stringify(finalConfig));

Expand Down
104 changes: 103 additions & 1 deletion packages/render-fidelity-tools/test/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@
},
"exclude": [
"stellar",
"vray"
"vray",
"three-gpu-pathtracer"
]
},
{
Expand Down Expand Up @@ -407,6 +408,37 @@
"three-gpu-pathtracer"
]
},
{
"name": "khronos-GlassHurricaneCandleHolder",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/GlassHurricaneCandleHolder/glTF-Binary/GlassHurricaneCandleHolder.glb",
"target": {
"y": 0.13
},
"orbit": {
"radius": 0.75
},
"exclude": [
"stellar",
"vray",
"three-gpu-pathtracer"
]
},
{
"name": "khronos-GlassVaseFlowers",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/GlassVaseFlowers/glTF-Binary/GlassVaseFlowers.glb",
"target": {
"y": 0.1,
"x": 0.05
},
"orbit": {
"radius": 0.5
},
"exclude": [
"stellar",
"vray",
"three-gpu-pathtracer"
]
},
{
"name": "khronos-Sponza",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf",
Expand Down Expand Up @@ -608,13 +640,40 @@
"vray"
]
},
{
"name": "khronos-ClearCoatCarPaint",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/ClearCoatCarPaint/glTF/ClearCoatCarPaint.gltf",
"target": {
"y": 0.5
},
"orbit": {
"radius": 2
},
"exclude": [
"stellar",
"vray",
"three-gpu-pathtracer"
]
},
{
"name": "khronos-ClearCoatTest",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/ClearCoatTest/glTF/ClearCoatTest.gltf",
"orbit": {
"radius": 20
}
},
{
"name": "khronos-NegativeScaleTest",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/NegativeScaleTest/glTF/NegativeScaleTest.gltf",
"orbit": {
"radius": 13
},
"exclude": [
"stellar",
"vray",
"three-gpu-pathtracer"
]
},
{
"name": "khronos-NormalTangentMirrorTest",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/NormalTangentMirrorTest/glTF/NormalTangentMirrorTest.gltf",
Expand Down Expand Up @@ -689,6 +748,49 @@
"stellar"
]
},
{
"name": "khronos-AnisotropyBarnLamp",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/AnisotropyBarnLamp/glTF/AnisotropyBarnLamp.gltf",
"target": {
"y": -0.10
},
"orbit": {
"radius": 0.5
},
"exclude": [
"stellar",
"vray",
"model-viewer",
"three-gpu-pathtracer"
]
},
{
"name": "khronos-AnisotropyRotationTest",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/AnisotropyRotationTest/glTF/AnisotropyRotationTest.gltf",
"orbit": {
"radius": 18
},
"exclude": [
"stellar",
"vray",
"three-gpu-pathtracer"
]
},
{
"name": "khronos-AnisotropyStrengthTest",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/AnisotropyStrengthTest/glTF/AnisotropyStrengthTest.gltf",
"target": {
"y": 2.5
},
"orbit": {
"radius": 12
},
"exclude": [
"stellar",
"vray",
"three-gpu-pathtracer"
]
},
{
"name": "khronos-TextureTransformMultiTest",
"model": "../../../shared-assets/models/glTF-Sample-Assets/Models/TextureTransformMultiTest/glTF-Binary/TextureTransformMultiTest.glb",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.