From a144fe1a5efb9c434bac9a67e3a9ca181ca3a585 Mon Sep 17 00:00:00 2001 From: Fabio Pellacini Date: Sun, 12 Jul 2020 16:23:53 +0200 Subject: [PATCH 1/2] updated --- .vscode/settings.json | 16 +- tests/arealights1/arealights1.json | 233 ++------------- tests/cornellbox/cornellbox.json | 71 +---- tests/environments1/environments1.json | 203 ++----------- tests/environments2/environments2.json | 203 ++----------- tests/features1/features1.json | 245 ++-------------- tests/features2/features2.json | 260 ++--------------- tests/instances1/instances1.json | 157 ++-------- tests/materials1/materials1.json | 344 +++------------------- tests/materials2/materials2.json | 344 +++------------------- tests/materials3/materials3.json | 344 +++------------------- tests/materials4/materials4.json | 390 +++---------------------- tests/materials5/materials5.json | 344 +++------------------- tests/shapes1/shapes1.json | 239 ++------------- tests/shapes2/shapes2.json | 239 ++------------- tests/shapes3/shapes3.json | 281 ++---------------- 16 files changed, 408 insertions(+), 3505 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index d20199953..8faeb3e2f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -100,11 +100,17 @@ }, "json.schemas": [ { - "fileMatch": [ - "/*.json" - ], + "fileMatch": ["/*.json"], "url": "./scripts/scene.schema.json" } ], - "editor.formatOnSave": true -} \ No newline at end of file + "editor.formatOnSave": true, + "cpplint.filters": [ + "-runtime/references", + "-legal/copyright", + "-build/header_guard", + "-build/include_subdir", + "-whitespace/braces", + "-build/c++11" + ] +} diff --git a/tests/arealights1/arealights1.json b/tests/arealights1/arealights1.json index 103002abf..a55b2887d 100644 --- a/tests/arealights1/arealights1.json +++ b/tests/arealights1/arealights1.json @@ -7,115 +7,45 @@ "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "front": { "lens": 0.05, "aspect": 3, "aperture": 0.0, - "lookat": [ - 0, - 0.575, - 1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, 1.4, 0, 0.05, 0, 0, 1, 0] }, "back": { "lens": 0.05, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 0.575, - -1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, -1.4, 0, 0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "perspective-dof": { "lens": 0.05, "aperture": 0.025, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-dof": { "lens": 0.05, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] } }, "instances": { @@ -125,193 +55,76 @@ }, "arealight1": { "shape": "arealight1", - "lookat": [ - -0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "material": "arealight1" }, "arealight2": { "shape": "arealight2", - "lookat": [ - 0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "material": "arealight2" }, "bunny-uvgrid": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "bunny-uvgrid" }, "sphere-plastic-sharp": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "sphere-plastic-sharp" }, "bunny-metal-rough": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "bunny-metal-rough" }, "sphere-plastic-rough": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "sphere-plastic-rough" }, "bunny-metal-sharp": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "bunny-metal-sharp" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "arealight1": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "arealight2": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "bunny-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" }, "sphere-plastic-sharp": { "specular": 1, - "color": [ - 0.5, - 0.5, - 0.7 - ], + "color": [0.5, 0.5, 0.7], "roughness": 0.01 }, "bunny-metal-rough": { - "color": [ - 0.66, - 0.45, - 0.34 - ], + "color": [0.66, 0.45, 0.34], "metallic": 1, "roughness": 0.2 }, "sphere-plastic-rough": { "specular": 1, - "color": [ - 0.5, - 0.7, - 0.5 - ], + "color": [0.5, 0.7, 0.5], "roughness": 0.2 }, "bunny-metal-sharp": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "metallic": 1, "roughness": 0 } } -} \ No newline at end of file +} diff --git a/tests/cornellbox/cornellbox.json b/tests/cornellbox/cornellbox.json index 99071335b..7eaadef3b 100644 --- a/tests/cornellbox/cornellbox.json +++ b/tests/cornellbox/cornellbox.json @@ -5,88 +5,43 @@ "cameras": { "camera1": { "aspect": 1.0, - "film": 0.024000000208616257, - "focus": 3.9000000953674316, - "frame": [ - 1.0, - 0.0, - 0.0, - 0.0, - 1.0, - 0.0, - 0.0, - 0.0, - 1.0, - 0.0, - 1.0, - 3.9000000953674316 - ], - "lens": 0.03500000014901161 + "film": 0.024, + "focus": 3.9, + "frame": [1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 3.9], + "lens": 0.035 } }, "materials": { "backwall": { - "color": [ - 0.7250000238418579, - 0.7099999785423279, - 0.6800000071525574 - ], + "color": [0.725, 0.71, 0.68], "displacement": 1.0 }, "ceiling": { - "color": [ - 0.7250000238418579, - 0.7099999785423279, - 0.6800000071525574 - ], + "color": [0.725, 0.71, 0.68], "displacement": 1.0 }, "floor": { - "color": [ - 0.7250000238418579, - 0.7099999785423279, - 0.6800000071525574 - ], + "color": [0.725, 0.71, 0.68], "displacement": 1.0 }, "leftwall": { - "color": [ - 0.6299999952316284, - 0.06499999761581421, - 0.05000000074505806 - ], + "color": [0.63, 0.065, 0.05], "displacement": 1.0 }, "light": { "displacement": 1.0, - "emission": [ - 17.0, - 12.0, - 4.0 - ] + "emission": [17.0, 12.0, 4.0] }, "rightwall": { - "color": [ - 0.14000000059604645, - 0.44999998807907104, - 0.09099999815225601 - ], + "color": [0.14, 0.45, 0.09], "displacement": 1.0 }, "shortbox": { - "color": [ - 0.7250000238418579, - 0.7099999785423279, - 0.6800000071525574 - ], + "color": [0.725, 0.71, 0.68], "displacement": 1.0 }, "tallbox": { - "color": [ - 0.7250000238418579, - 0.7099999785423279, - 0.6800000071525574 - ], + "color": [0.725, 0.71, 0.68], "displacement": 1.0 } }, @@ -124,4 +79,4 @@ "shape": "tallbox" } } -} \ No newline at end of file +} diff --git a/tests/environments1/environments1.json b/tests/environments1/environments1.json index e5f8fd1b2..52cb0a0fd 100644 --- a/tests/environments1/environments1.json +++ b/tests/environments1/environments1.json @@ -7,124 +7,50 @@ "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "front": { "lens": 0.05, "aspect": 3, "aperture": 0.0, - "lookat": [ - 0, - 0.575, - 1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, 1.4, 0, 0.05, 0, 0, 1, 0] }, "back": { "lens": 0.05, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 0.575, - -1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, -1.4, 0, 0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "perspective-dof": { "lens": 0.05, "aperture": 0.025, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-dof": { "lens": 0.05, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] } }, "environments": { "sunsky": { - "emission": [ - 1, - 1, - 1 - ], + "emission": [1, 1, 1], "emission_tex": "sunsky" } }, @@ -135,149 +61,60 @@ }, "bunny-uvgrid": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "bunny-uvgrid" }, "sphere-plastic-sharp": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "sphere-plastic-sharp" }, "bunny-metal-rough": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "bunny-metal-rough" }, "sphere-plastic-rough": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "sphere-plastic-rough" }, "bunny-metal-sharp": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "bunny-metal-sharp" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "bunny-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" }, "sphere-plastic-sharp": { "specular": 1, - "color": [ - 0.5, - 0.5, - 0.7 - ], + "color": [0.5, 0.5, 0.7], "roughness": 0.01 }, "bunny-metal-rough": { - "color": [ - 0.66, - 0.45, - 0.34 - ], + "color": [0.66, 0.45, 0.34], "metallic": 1, "roughness": 0.2 }, "sphere-plastic-rough": { "specular": 1, - "color": [ - 0.5, - 0.7, - 0.5 - ], + "color": [0.5, 0.7, 0.5], "roughness": 0.2 }, "bunny-metal-sharp": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "metallic": 1, "roughness": 0 } } -} \ No newline at end of file +} diff --git a/tests/environments2/environments2.json b/tests/environments2/environments2.json index 78fe0efbf..29d8a7984 100644 --- a/tests/environments2/environments2.json +++ b/tests/environments2/environments2.json @@ -7,124 +7,50 @@ "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "front": { "lens": 0.05, "aspect": 3, "aperture": 0.0, - "lookat": [ - 0, - 0.575, - 1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, 1.4, 0, 0.05, 0, 0, 1, 0] }, "back": { "lens": 0.05, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 0.575, - -1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, -1.4, 0, 0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "perspective-dof": { "lens": 0.05, "aperture": 0.025, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-dof": { "lens": 0.05, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 1, - 1, - 1 - ], + "emission": [1, 1, 1], "emission_tex": "sky" } }, @@ -135,149 +61,60 @@ }, "bunny-uvgrid": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "bunny-uvgrid" }, "sphere-plastic-sharp": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "sphere-plastic-sharp" }, "bunny-metal-rough": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "bunny-metal-rough" }, "sphere-plastic-rough": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "sphere-plastic-rough" }, "bunny-metal-sharp": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "bunny-metal-sharp" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "bunny-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" }, "sphere-plastic-sharp": { "specular": 1, - "color": [ - 0.5, - 0.5, - 0.7 - ], + "color": [0.5, 0.5, 0.7], "roughness": 0.01 }, "bunny-metal-rough": { - "color": [ - 0.66, - 0.45, - 0.34 - ], + "color": [0.66, 0.45, 0.34], "metallic": 1, "roughness": 0.2 }, "sphere-plastic-rough": { "specular": 1, - "color": [ - 0.5, - 0.7, - 0.5 - ], + "color": [0.5, 0.7, 0.5], "roughness": 0.2 }, "bunny-metal-sharp": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "metallic": 1, "roughness": 0 } } -} \ No newline at end of file +} diff --git a/tests/features1/features1.json b/tests/features1/features1.json index b53b42397..e21d95f5a 100644 --- a/tests/features1/features1.json +++ b/tests/features1/features1.json @@ -7,124 +7,50 @@ "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "front": { "lens": 0.05, "aspect": 3, "aperture": 0.0, - "lookat": [ - 0, - 0.575, - 1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, 1.4, 0, 0.05, 0, 0, 1, 0] }, "back": { "lens": 0.05, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 0.575, - -1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, -1.4, 0, 0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "perspective-dof": { "lens": 0.05, "aperture": 0.025, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-dof": { "lens": 0.05, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -134,178 +60,69 @@ "material": "floor" }, "bunny-uvgrid-coated": { - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "shape": "bunny", "material": "bunny-uvgrid-coated" }, "bunny-volume-jade": { - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "shape": "bunny", "material": "bunny-volume-jade" }, "bunny-metal-rough": { - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "shape": "bunny", "material": "bunny-metal-rough" }, "sphere-volume-glass": { - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "shape": "sphere", "material": "sphere-volume-glass" }, "sphere-plastic-rough-bumped": { - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "shape": "sphere", "material": "sphere-plastic-rough-bumped" }, "arealight1": { - "lookat": [ - -0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "shape": "arealight1", "material": "arealight1" }, "arealight2": { - "lookat": [ - 0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "shape": "arealight2", "material": "arealight2" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor", "specular": 0 }, "bunny-uvgrid-coated": { - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "specular": 1, "roughness": 0.2, "coat": 1, "color_tex": "uvgrid" }, "bunny-volume-jade": { - "color": [ - 0.5, - 0.5, - 0.5 - ], + "color": [0.5, 0.5, 0.5], "roughness": 0, "specular": 1, "transmission": 1, - "scattering": [ - 0.3, - 0.6, - 0.3 - ], + "scattering": [0.3, 0.6, 0.3], "thin": false }, "bunny-metal-rough": { - "color": [ - 0.66, - 0.45, - 0.34 - ], + "color": [0.66, 0.45, 0.34], "metallic": 1, "roughness": 0.2 }, "sphere-volume-glass": { - "color": [ - 1, - 0.5, - 0.5 - ], + "color": [1, 0.5, 0.5], "roughness": 0, "specular": 1, "transmission": 1, @@ -313,28 +130,16 @@ "thin": false }, "sphere-plastic-rough-bumped": { - "color": [ - 0.5, - 0.7, - 0.5 - ], + "color": [0.5, 0.7, 0.5], "specular": 1, "roughness": 0.2, "normal_tex": "bumps-normal" }, "arealight1": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "arealight2": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] } } -} \ No newline at end of file +} diff --git a/tests/features2/features2.json b/tests/features2/features2.json index a0bbffdf9..2fe465144 100644 --- a/tests/features2/features2.json +++ b/tests/features2/features2.json @@ -7,124 +7,50 @@ "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "front": { "lens": 0.05, "aspect": 3, "aperture": 0.0, - "lookat": [ - 0, - 0.575, - 1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, 1.4, 0, 0.05, 0, 0, 1, 0] }, "back": { "lens": 0.05, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 0.575, - -1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, -1.4, 0, 0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "perspective-dof": { "lens": 0.05, "aperture": 0.025, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-dof": { "lens": 0.05, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -135,88 +61,29 @@ }, "arealight1": { "shape": "arealight1", - "lookat": [ - -0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "material": "arealight1" }, "arealight2": { "shape": "arealight2", - "lookat": [ - 0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "material": "arealight2" }, "sphere-uvgrid": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "sphere-uvgrid" }, "suzanne-subdiv-plastic-rough": { "shape": "suzanne-subdiv", "subdivisions": 2, "smooth": true, - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "suzanne-subdiv-plastic-rough" }, "hairball1-hair": { "shape": "hairball1", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "hairball1-hair" }, "sphere-displaced-plastic-rough": { @@ -225,138 +92,63 @@ "displacement_tex": "bumps-displacement", "subdivisions": 0, "smooth": true, - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "sphere-displaced-plastic-rough" }, "cube-uvgrid": { "shape": "cube", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "cube-uvgrid" }, "hairballi-hair": { "shape": "hairballi", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "hairballi-hair" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor", "specular": 0 }, "arealight1": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "arealight2": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "sphere-uvgrid": { - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "specular": 1, "roughness": 0.1, "color_tex": "uvgrid" }, "suzanne-subdiv-plastic-rough": { - "color": [ - 0.5, - 0.7, - 0.5 - ], + "color": [0.5, 0.7, 0.5], "specular": 1, "roughness": 0.2 }, "hairball1-hair": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "specular": 0, "roughness": 1 }, "sphere-displaced-plastic-rough": { - "color": [ - 0.5, - 0.7, - 0.5 - ], + "color": [0.5, 0.7, 0.5], "specular": 1, "roughness": 0.2 }, "cube-uvgrid": { - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "specular": 1, "roughness": 0.1, "color_tex": "uvgrid" }, "hairballi-hair": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "specular": 0, "roughness": 1 } } -} \ No newline at end of file +} diff --git a/tests/instances1/instances1.json b/tests/instances1/instances1.json index 99d09bba2..15499a96c 100644 --- a/tests/instances1/instances1.json +++ b/tests/instances1/instances1.json @@ -7,124 +7,50 @@ "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "front": { "lens": 0.05, "aspect": 3, "aperture": 0.0, - "lookat": [ - 0, - 0.575, - 1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, 1.4, 0, 0.05, 0, 0, 1, 0] }, "back": { "lens": 0.05, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 0.575, - -1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, -1.4, 0, 0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "perspective-dof": { "lens": 0.05, "aperture": 0.025, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-dof": { "lens": 0.05, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -134,88 +60,39 @@ "material": "floor" }, "sphere": { - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "shape": "sphere", "instance": "instances", "material": "sphere-uvgrid" }, "arealight1": { - "lookat": [ - -0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "shape": "arealight1", "material": "arealight1" }, "arealight2": { - "lookat": [ - 0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "shape": "arealight2", "material": "arealight2" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor", "specular": 0 }, "sphere-uvgrid": { - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "specular": 1, "roughness": 0.2, "color_tex": "uvgrid" }, - "arealight1": { - "emission": [ - 20, - 20, - 20 - ] + "arealight1": { + "emission": [20, 20, 20] }, "arealight2": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] } } -} \ No newline at end of file +} diff --git a/tests/materials1/materials1.json b/tests/materials1/materials1.json index 407e9390a..1c66d9d55 100644 --- a/tests/materials1/materials1.json +++ b/tests/materials1/materials1.json @@ -7,124 +7,50 @@ "lens": 0.1, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "front": { "lens": 0.1, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 1.75, - 3, - 0, - 0.175, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 1.75, 3, 0, 0.175, 0, 0, 1, 0] }, "back": { "lens": 0.1, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 1.5, - -3.25, - 0, - -0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 1.5, -3.25, 0, -0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.1, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "perspective-dof": { "lens": 0.1, "aperture": 0.05, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.03, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.5, - 1, - 2, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.5, 1, 2, -0.05, 0.15, 0, 0, 1, 0] }, "orthographic-dof": { "lens": 0.03, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.5, - 1, - 2, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.5, 1, 2, -0.05, 0.15, 0, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -135,325 +61,123 @@ }, "largearealight1": { "shape": "largearealight1", - "lookat": [ - -0.8, - 1.6, - 1.6, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.8, 1.6, 1.6, 0, 0.1, 0, 0, 1, 0], "material": "largearealight1" }, "largearealight2": { "shape": "largearealight2", - "lookat": [ - 0.8, - 1.6, - 1.6, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.8, 1.6, 1.6, 0, 0.1, 0, 0, 1, 0], "material": "largearealight2" }, "sphere-plastic-sharp": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "sphere-plastic-sharp" }, "sphere-plastic-rough": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "sphere-plastic-rough" }, "sphere-matte": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "sphere-matte" }, "sphere-metal-sharp": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "sphere-metal-sharp" }, "sphere-metal-rough": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "sphere-metal-rough" }, "bunny-plastic-sharp": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, -0.4], "material": "bunny-plastic-sharp" }, "bunny-plastic-rough": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, -0.4], "material": "bunny-plastic-rough" }, "bunny-matte": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.4], "material": "bunny-matte" }, "bunny-metal-sharp": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, -0.4], "material": "bunny-metal-sharp" }, "bunny-metal-rough": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, -0.4], "material": "bunny-metal-rough" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "largearealight1": { - "emission": [ - 10, - 10, - 10 - ] + "emission": [10, 10, 10] }, "largearealight2": { - "emission": [ - 10, - 10, - 10 - ] + "emission": [10, 10, 10] }, "sphere-plastic-sharp": { "specular": 1, - "color": [ - 0.5, - 0.5, - 0.7 - ], + "color": [0.5, 0.5, 0.7], "roughness": 0.01 }, "sphere-plastic-rough": { "specular": 1, - "color": [ - 0.5, - 0.7, - 0.5 - ], + "color": [0.5, 0.7, 0.5], "roughness": 0.2 }, "sphere-matte": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "roughness": 1 }, "sphere-metal-sharp": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "metallic": 1, "roughness": 0 }, "sphere-metal-rough": { - "color": [ - 0.66, - 0.45, - 0.34 - ], + "color": [0.66, 0.45, 0.34], "metallic": 1, "roughness": 0.2 }, "bunny-plastic-sharp": { "specular": 1, - "color": [ - 0.5, - 0.5, - 0.7 - ], + "color": [0.5, 0.5, 0.7], "roughness": 0.01 }, "bunny-plastic-rough": { "specular": 1, - "color": [ - 0.5, - 0.7, - 0.5 - ], + "color": [0.5, 0.7, 0.5], "roughness": 0.2 }, "bunny-matte": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "roughness": 1 }, "bunny-metal-sharp": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "metallic": 1, "roughness": 0 }, "bunny-metal-rough": { - "color": [ - 0.66, - 0.45, - 0.34 - ], + "color": [0.66, 0.45, 0.34], "metallic": 1, "roughness": 0.2 } } -} \ No newline at end of file +} diff --git a/tests/materials2/materials2.json b/tests/materials2/materials2.json index 84beeb1e6..c0ae93ce4 100644 --- a/tests/materials2/materials2.json +++ b/tests/materials2/materials2.json @@ -7,124 +7,50 @@ "lens": 0.1, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "front": { "lens": 0.1, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 1.75, - 3, - 0, - 0.175, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 1.75, 3, 0, 0.175, 0, 0, 1, 0] }, "back": { "lens": 0.1, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 1.5, - -3.25, - 0, - -0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 1.5, -3.25, 0, -0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.1, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "perspective-dof": { "lens": 0.1, "aperture": 0.05, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.03, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.5, - 1, - 2, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.5, 1, 2, -0.05, 0.15, 0, 0, 1, 0] }, "orthographic-dof": { "lens": 0.03, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.5, - 1, - 2, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.5, 1, 2, -0.05, 0.15, 0, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -135,244 +61,78 @@ }, "largearealight1": { "shape": "largearealight1", - "lookat": [ - -0.8, - 1.6, - 1.6, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.8, 1.6, 1.6, 0, 0.1, 0, 0, 1, 0], "material": "largearealight1" }, "largearealight2": { "shape": "largearealight2", - "lookat": [ - 0.8, - 1.6, - 1.6, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.8, 1.6, 1.6, 0, 0.1, 0, 0, 1, 0], "material": "largearealight2" }, "sphere-glass-sharp": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "sphere-glass-sharp" }, "sphere-glass-rough": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "sphere-glass-rough" }, "sphere-transparent": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "sphere-transparent" }, "sphere-thinglass-sharp": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "sphere-thinglass-sharp" }, "sphere-thinglass-rough": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "sphere-thinglass-rough" }, "bunny-glass-sharp": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, -0.4], "material": "bunny-glass-sharp" }, "bunny-glass-rough": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, -0.4], "material": "bunny-glass-rough" }, "bunny-transparent": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.4], "material": "bunny-transparent" }, "bunny-thinglass-sharp": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, -0.4], "material": "bunny-thinglass-sharp" }, "bunny-thinglass-rough": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, -0.4], "material": "bunny-thinglass-rough" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "largearealight1": { - "emission": [ - 10, - 10, - 10 - ] + "emission": [10, 10, 10] }, "largearealight2": { - "emission": [ - 10, - 10, - 10 - ] + "emission": [10, 10, 10] }, "sphere-glass-sharp": { - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "specular": 1, "transmission": 1, "roughness": 0, @@ -380,52 +140,32 @@ }, "sphere-glass-rough": { "specular": 1, - "color": [ - 1, - 0.7, - 0.7 - ], + "color": [1, 0.7, 0.7], "transmission": 1, "roughness": 0.1, "thin": false }, "sphere-transparent": { - "color": [ - 0.7, - 0.5, - 0.5 - ], + "color": [0.7, 0.5, 0.5], "roughness": 1, "opacity": 0.2 }, "sphere-thinglass-sharp": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "transmission": 1, "roughness": 0, "thin": true }, "sphere-thinglass-rough": { "specular": 1, - "color": [ - 1, - 0.7, - 0.7 - ], + "color": [1, 0.7, 0.7], "transmission": 1, "roughness": 0.05, "thin": true }, "bunny-glass-sharp": { - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "specular": 1, "transmission": 1, "roughness": 0, @@ -433,45 +173,29 @@ }, "bunny-glass-rough": { "specular": 1, - "color": [ - 1, - 0.7, - 0.7 - ], + "color": [1, 0.7, 0.7], "transmission": 1, "roughness": 0.1, "thin": false }, "bunny-transparent": { - "color": [ - 0.7, - 0.5, - 0.5 - ], + "color": [0.7, 0.5, 0.5], "roughness": 1, "opacity": 0.2 }, "bunny-thinglass-sharp": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "transmission": 1, "roughness": 0, "thin": true }, "bunny-thinglass-rough": { "specular": 1, - "color": [ - 1, - 0.7, - 0.7 - ], + "color": [1, 0.7, 0.7], "transmission": 1, "roughness": 0.05, "thin": true } } -} \ No newline at end of file +} diff --git a/tests/materials3/materials3.json b/tests/materials3/materials3.json index 15bf53610..bd57f1d57 100644 --- a/tests/materials3/materials3.json +++ b/tests/materials3/materials3.json @@ -7,124 +7,50 @@ "lens": 0.1, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "front": { "lens": 0.1, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 1.75, - 3, - 0, - 0.175, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 1.75, 3, 0, 0.175, 0, 0, 1, 0] }, "back": { "lens": 0.1, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 1.5, - -3.25, - 0, - -0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 1.5, -3.25, 0, -0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.1, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "perspective-dof": { "lens": 0.1, "aperture": 0.05, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.03, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.5, - 1, - 2, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.5, 1, 2, -0.05, 0.15, 0, 0, 1, 0] }, "orthographic-dof": { "lens": 0.03, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.5, - 1, - 2, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.5, 1, 2, -0.05, 0.15, 0, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -135,335 +61,133 @@ }, "largearealight1": { "shape": "largearealight1", - "lookat": [ - -0.8, - 1.6, - 1.6, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.8, 1.6, 1.6, 0, 0.1, 0, 0, 1, 0], "material": "largearealight1" }, "largearealight2": { "shape": "largearealight2", - "lookat": [ - 0.8, - 1.6, - 1.6, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.8, 1.6, 1.6, 0, 0.1, 0, 0, 1, 0], "material": "largearealight2" }, "sphere-plastic-sharp-bumped": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "sphere-plastic-sharp-bumped" }, "sphere-plastic-rough-coated": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "sphere-plastic-rough-coated" }, "sphere-metal-sharp-bumped": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "sphere-metal-sharp-bumped" }, "sphere-metal-rough-coated": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "sphere-metal-rough-coated" }, "sphere-metal-rough": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "sphere-metal-rough" }, "bunny-plastic-sharp-bumped": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, -0.4], "material": "bunny-plastic-sharp-bumped" }, "bunny-plastic-rough-coated": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, -0.4], "material": "bunny-plastic-rough-coated" }, "bunny-metal-sharp-bumped": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.4], "material": "bunny-metal-sharp-bumped" }, "bunny-metal-rough-coated": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, -0.4], "material": "bunny-metal-rough-coated" }, "bunny-metal-rough": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, -0.4], "material": "bunny-metal-rough" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "largearealight1": { - "emission": [ - 10, - 10, - 10 - ] + "emission": [10, 10, 10] }, "largearealight2": { - "emission": [ - 10, - 10, - 10 - ] + "emission": [10, 10, 10] }, "sphere-plastic-sharp-bumped": { "specular": 1, - "color": [ - 0.5, - 0.5, - 0.7 - ], + "color": [0.5, 0.5, 0.7], "roughness": 0.01, "normal_tex": "bumps-normal" }, "sphere-plastic-rough-coated": { "specular": 1, "coat": 1, - "color": [ - 0.5, - 0.7, - 0.5 - ], + "color": [0.5, 0.7, 0.5], "roughness": 0.2 }, "sphere-metal-sharp-bumped": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "metallic": 1, "roughness": 0, "normal_tex": "bumps-normal" }, "sphere-metal-rough-coated": { "coat": 1, - "color": [ - 0.66, - 0.45, - 0.34 - ], + "color": [0.66, 0.45, 0.34], "metallic": 1, "roughness": 0.2 }, "sphere-metal-rough": { - "color": [ - 0.66, - 0.45, - 0.34 - ], + "color": [0.66, 0.45, 0.34], "metallic": 1, "roughness": 0.2 }, "bunny-plastic-sharp-bumped": { "specular": 1, - "color": [ - 0.5, - 0.5, - 0.7 - ], + "color": [0.5, 0.5, 0.7], "roughness": 0.01, "normal_tex": "bumps-normal" }, "bunny-plastic-rough-coated": { "specular": 1, "coat": 1, - "color": [ - 0.5, - 0.7, - 0.5 - ], + "color": [0.5, 0.7, 0.5], "roughness": 0.2 }, "bunny-metal-sharp-bumped": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "metallic": 1, "roughness": 0, "normal_tex": "bumps-normal" }, "bunny-metal-rough-coated": { "coat": 1, - "color": [ - 0.66, - 0.45, - 0.34 - ], + "color": [0.66, 0.45, 0.34], "metallic": 1, "roughness": 0.2 }, "bunny-metal-rough": { - "color": [ - 0.66, - 0.45, - 0.34 - ], + "color": [0.66, 0.45, 0.34], "metallic": 1, "roughness": 0.2 } } -} \ No newline at end of file +} diff --git a/tests/materials4/materials4.json b/tests/materials4/materials4.json index 3c29fbce9..d6d2fc451 100644 --- a/tests/materials4/materials4.json +++ b/tests/materials4/materials4.json @@ -7,124 +7,50 @@ "lens": 0.1, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "front": { "lens": 0.1, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 1.75, - 3, - 0, - 0.175, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 1.75, 3, 0, 0.175, 0, 0, 1, 0] }, "back": { "lens": 0.1, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 1.5, - -3.25, - 0, - -0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 1.5, -3.25, 0, -0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.1, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "perspective-dof": { "lens": 0.1, "aperture": 0.05, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.03, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.5, - 1, - 2, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.5, 1, 2, -0.05, 0.15, 0, 0, 1, 0] }, "orthographic-dof": { "lens": 0.03, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.5, - 1, - 2, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.5, 1, 2, -0.05, 0.15, 0, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -135,250 +61,80 @@ }, "largearealight1": { "shape": "largearealight1", - "lookat": [ - -0.8, - 1.6, - 1.6, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.8, 1.6, 1.6, 0, 0.1, 0, 0, 1, 0], "material": "largearealight1" }, "largearealight2": { "shape": "largearealight2", - "lookat": [ - 0.8, - 1.6, - 1.6, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.8, 1.6, 1.6, 0, 0.1, 0, 0, 1, 0], "material": "largearealight2" }, "sphere-volume-cloud": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "sphere-volume-cloud" }, "sphere-volume-glass": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "sphere-volume-glass" }, "sphere-volume-jade": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "sphere-volume-jade" }, "sphere-volume-jade2": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "sphere-volume-jade2" }, "sphere-volume-smoke": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "sphere-volume-smoke" }, "bunny-volume-cloud": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, -0.4], "material": "bunny-volume-cloud" }, "bunny-volume-glass": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, -0.4], "material": "bunny-volume-glass" }, "bunny-volume-jade": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.4], "material": "bunny-volume-jade" }, "bunny-volume-jade2": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, -0.4], "material": "bunny-volume-jade2" }, "bunny-volume-smoke": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, -0.4], "material": "bunny-volume-smoke" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "largearealight1": { - "emission": [ - 10, - 10, - 10 - ] + "emission": [10, 10, 10] }, "largearealight2": { - "emission": [ - 10, - 10, - 10 - ] + "emission": [10, 10, 10] }, "sphere-volume-cloud": { - "color": [ - 0.65, - 0.65, - 0.65 - ], + "color": [0.65, 0.65, 0.65], "transmission": 1, - "scattering": [ - 0.9, - 0.9, - 0.9 - ], + "scattering": [0.9, 0.9, 0.9], "ior": 1, "thin": false }, @@ -386,11 +142,7 @@ "specular": 1, "roughness": 0, "transmission": 1, - "color": [ - 1, - 0.5, - 0.5 - ], + "color": [1, 0.5, 0.5], "trdepth": 0.02, "thin": false }, @@ -398,62 +150,30 @@ "specular": 1, "roughness": 0, "transmission": 1, - "color": [ - 0.5, - 0.5, - 0.5 - ], - "scattering": [ - 0.3, - 0.6, - 0.3 - ], + "color": [0.5, 0.5, 0.5], + "scattering": [0.3, 0.6, 0.3], "thin": false }, "sphere-volume-jade2": { "translucency": 1, "specular": 1, "roughness": 0, - "color": [ - 0.5, - 0.5, - 0.5 - ], - "scattering": [ - 0.3, - 0.6, - 0.3 - ], + "color": [0.5, 0.5, 0.5], + "scattering": [0.3, 0.6, 0.3], "thin": false }, "sphere-volume-smoke": { "transmission": 1, - "color": [ - 0.5, - 0.5, - 0.5 - ], - "scattering": [ - 0.2, - 0.2, - 0.2 - ], + "color": [0.5, 0.5, 0.5], + "scattering": [0.2, 0.2, 0.2], "phaseg": 0, "ior": 1, "thin": false }, "bunny-volume-cloud": { - "color": [ - 0.65, - 0.65, - 0.65 - ], + "color": [0.65, 0.65, 0.65], "transmission": 1, - "scattering": [ - 0.9, - 0.9, - 0.9 - ], + "scattering": [0.9, 0.9, 0.9], "ior": 1, "thin": false }, @@ -461,11 +181,7 @@ "specular": 1, "roughness": 0, "transmission": 1, - "color": [ - 1, - 0.5, - 0.5 - ], + "color": [1, 0.5, 0.5], "trdepth": 0.02, "thin": false }, @@ -473,46 +189,22 @@ "specular": 1, "roughness": 0, "transmission": 1, - "color": [ - 0.5, - 0.5, - 0.5 - ], - "scattering": [ - 0.3, - 0.6, - 0.3 - ], + "color": [0.5, 0.5, 0.5], + "scattering": [0.3, 0.6, 0.3], "thin": false }, "bunny-volume-jade2": { "specular": 1, "roughness": 0.1, "translucency": 1, - "color": [ - 0.5, - 0.5, - 0.5 - ], - "scattering": [ - 0.3, - 0.6, - 0.3 - ], + "color": [0.5, 0.5, 0.5], + "scattering": [0.3, 0.6, 0.3], "thin": false }, "bunny-volume-smoke": { "transmission": 1, - "color": [ - 0.5, - 0.5, - 0.5 - ], - "scattering": [ - 0.2, - 0.2, - 0.2 - ], + "color": [0.5, 0.5, 0.5], + "scattering": [0.2, 0.2, 0.2], "scanisotropy": 0, "ior": 1, "thin": false diff --git a/tests/materials5/materials5.json b/tests/materials5/materials5.json index b35fc8ac7..71fe7a6ee 100644 --- a/tests/materials5/materials5.json +++ b/tests/materials5/materials5.json @@ -7,124 +7,50 @@ "lens": 0.1, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "front": { "lens": 0.1, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 1.75, - 3, - 0, - 0.175, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 1.75, 3, 0, 0.175, 0, 0, 1, 0] }, "back": { "lens": 0.1, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 1.5, - -3.25, - 0, - -0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 1.5, -3.25, 0, -0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.1, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "perspective-dof": { "lens": 0.1, "aperture": 0.05, "aspect": 2.4, - "lookat": [ - -0.6, - 1.5, - 2.75, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.6, 1.5, 2.75, -0.05, 0.15, 0, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.03, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.5, - 1, - 2, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.5, 1, 2, -0.05, 0.15, 0, 0, 1, 0] }, "orthographic-dof": { "lens": 0.03, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.5, - 1, - 2, - -0.05, - 0.15, - 0, - 0, - 1, - 0 - ] + "lookat": [-0.5, 1, 2, -0.05, 0.15, 0, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -135,251 +61,81 @@ }, "largearealight1": { "shape": "largearealight1", - "lookat": [ - -0.8, - 1.6, - 1.6, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.8, 1.6, 1.6, 0, 0.1, 0, 0, 1, 0], "material": "largearealight1" }, "largearealight2": { "shape": "largearealight2", - "lookat": [ - 0.8, - 1.6, - 1.6, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.8, 1.6, 1.6, 0, 0.1, 0, 0, 1, 0], "material": "largearealight2" }, "sphere-skin1a": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "skin1a" }, "sphere-skin2a": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "skin2a" }, "sphere-skins": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "skins" }, "sphere-skin1b": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "skin1b" }, "sphere-skin2b": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "skin2b" }, "bunny-skin1a": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, -0.4], "material": "skin1a" }, "bunny-skin2a": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, -0.4], "material": "skin2a" }, "bunny-skins": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.4], "material": "skins" }, "bunny-skin1b": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, -0.4], "material": "skin1b" }, "bunny-skin2b": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - -0.4 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, -0.4], "material": "skin2b" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "largearealight1": { - "emission": [ - 10, - 10, - 10 - ] + "emission": [10, 10, 10] }, "largearealight2": { - "emission": [ - 10, - 10, - 10 - ] + "emission": [10, 10, 10] }, "skin1a": { "transmission": 1, "roughness": 0.25, - "color": [ - 0.76, - 0.48, - 0.23 - ], - "scattering": [ - 0.436, - 0.227, - 0.131 - ], + "color": [0.76, 0.48, 0.23], + "scattering": [0.436, 0.227, 0.131], "scanisotropy": -0.8, "trdepth": 0.001, "thin": false @@ -388,16 +144,8 @@ "specular": 1, "roughness": 0.25, "transmission": 1, - "color": [ - 0.82, - 0.55, - 0.40 - ], - "scattering": [ - 0.623, - 0.433, - 0.343 - ], + "color": [0.82, 0.55, 0.4], + "scattering": [0.623, 0.433, 0.343], "scanisotropy": -0.8, "trdepth": 0.001, "thin": false @@ -406,16 +154,8 @@ "specular": 1, "roughness": 0, "transmission": 1, - "color": [ - 0.76, - 0.48, - 0.23 - ], - "scattering": [ - 0.436, - 0.227, - 0.131 - ], + "color": [0.76, 0.48, 0.23], + "scattering": [0.436, 0.227, 0.131], "scanisotropy": -0.8, "trdepth": 0.001, "thin": false @@ -424,16 +164,8 @@ "translucency": 1, "specular": 1, "roughness": 0.25, - "color": [ - 0.76, - 0.48, - 0.23 - ], - "scattering": [ - 0.436, - 0.227, - 0.131 - ], + "color": [0.76, 0.48, 0.23], + "scattering": [0.436, 0.227, 0.131], "scanisotropy": -0.8, "trdepth": 0.001, "thin": false @@ -442,19 +174,11 @@ "translucency": 1, "specular": 1, "roughness": 0.25, - "color": [ - 0.82, - 0.55, - 0.40 - ], - "scattering": [ - 0.623, - 0.433, - 0.343 - ], + "color": [0.82, 0.55, 0.4], + "scattering": [0.623, 0.433, 0.343], "scanisotropy": -0.8, "trdepth": 0.001, "thin": false } } -} \ No newline at end of file +} diff --git a/tests/shapes1/shapes1.json b/tests/shapes1/shapes1.json index ffa10d619..60ccabffb 100644 --- a/tests/shapes1/shapes1.json +++ b/tests/shapes1/shapes1.json @@ -7,124 +7,50 @@ "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "front": { "lens": 0.05, "aspect": 3, "aperture": 0.0, - "lookat": [ - 0, - 0.575, - 1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, 1.4, 0, 0.05, 0, 0, 1, 0] }, "back": { "lens": 0.05, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 0.575, - -1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, -1.4, 0, 0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "perspective-dof": { "lens": 0.05, "aperture": 0.025, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-dof": { "lens": 0.05, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -135,197 +61,80 @@ }, "arealight1": { "shape": "arealight1", - "lookat": [ - -0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "material": "arealight1" }, "arealight2": { "shape": "arealight2", - "lookat": [ - 0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "material": "arealight2" }, "sphere-uvgrid": { "shape": "sphere", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "sphere-uvgrid" }, "uvsphere-flipcap-uvgrid": { "shape": "uvsphere-flipcap", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "uvsphere-flipcap-uvgrid" }, "disk-uvgrid": { "shape": "disk", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "disk-uvgrid" }, "uvcylinder-uvgrid": { "shape": "uvcylinder", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "uvcylinder-uvgrid" }, "cube-uvgrid": { "shape": "cube", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "cube-uvgrid" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "arealight1": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "arealight2": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "sphere-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" }, "uvsphere-flipcap-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" }, "disk-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" }, "uvcylinder-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" }, "cube-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" } } -} \ No newline at end of file +} diff --git a/tests/shapes2/shapes2.json b/tests/shapes2/shapes2.json index 081ca7e0f..7fb33b20a 100644 --- a/tests/shapes2/shapes2.json +++ b/tests/shapes2/shapes2.json @@ -7,124 +7,50 @@ "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "front": { "lens": 0.05, "aspect": 3, "aperture": 0.0, - "lookat": [ - 0, - 0.575, - 1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, 1.4, 0, 0.05, 0, 0, 1, 0] }, "back": { "lens": 0.05, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 0.575, - -1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, -1.4, 0, 0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "perspective-dof": { "lens": 0.05, "aperture": 0.025, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-dof": { "lens": 0.05, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -135,72 +61,26 @@ }, "arealight1": { "shape": "arealight1", - "lookat": [ - -0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "material": "arealight1" }, "arealight2": { "shape": "arealight2", - "lookat": [ - 0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "material": "arealight2" }, "cube-subdiv-uvgrid": { "shape": "cube-subdiv", "subdivisions": 4, "smooth": false, - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.4, 0, 0], "material": "cube-subdiv-uvgrid" }, "suzanne-subdiv-plastic-sharp": { "shape": "suzanne-subdiv", "subdivisions": 2, "smooth": true, - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "suzanne-subdiv-plastic-sharp" }, "sphere-displaced-matte": { @@ -209,128 +89,57 @@ "smooth": true, "displacement": 0.025, "displacement_tex": "bumps-displacement", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "sphere-displaced-matte" }, "bunny-uvgrid": { "shape": "bunny", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "bunny-uvgrid" }, "teapot-uvgrid": { "shape": "teapot", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "teapot-uvgrid" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "arealight1": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "arealight2": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "cube-subdiv-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" }, "suzanne-subdiv-plastic-sharp": { "specular": 1, - "color": [ - 0.5, - 0.5, - 0.7 - ], + "color": [0.5, 0.5, 0.7], "roughness": 0.01 }, "sphere-displaced-matte": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "roughness": 1 }, "bunny-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" }, "teapot-uvgrid": { "specular": 1, - "color": [ - 1, - 1, - 1 - ], + "color": [1, 1, 1], "roughness": 0.1, "color_tex": "uvgrid" } } -} \ No newline at end of file +} diff --git a/tests/shapes3/shapes3.json b/tests/shapes3/shapes3.json index d05a967ec..793da396c 100644 --- a/tests/shapes3/shapes3.json +++ b/tests/shapes3/shapes3.json @@ -7,124 +7,50 @@ "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "front": { "lens": 0.05, "aspect": 3, "aperture": 0.0, - "lookat": [ - 0, - 0.575, - 1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, 1.4, 0, 0.05, 0, 0, 1, 0] }, "back": { "lens": 0.05, "aperture": 0.0, "aspect": 3, - "lookat": [ - 0, - 0.575, - -1.4, - 0, - 0.05, - 0, - 0, - 1, - 0 - ] + "lookat": [0, 0.575, -1.4, 0, 0.05, 0, 0, 1, 0] }, "perspective-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "perspective-dof": { "lens": 0.05, "aperture": 0.025, "aspect": 2.4, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-sharp": { "lens": 0.05, "aperture": 0.0, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] }, "orthographic-dof": { "lens": 0.05, "aperture": 0.02, "aspect": 2.4, "orthographic": true, - "lookat": [ - -0.75, - 0.4, - 0.9, - -0.075, - 0.05, - -0.05, - 0, - 1, - 0 - ] + "lookat": [-0.75, 0.4, 0.9, -0.075, 0.05, -0.05, 0, 1, 0] } }, "environments": { "sky": { - "emission": [ - 0.5, - 0.5, - 0.5 - ], + "emission": [0.5, 0.5, 0.5], "emission_tex": "sky" } }, @@ -135,239 +61,88 @@ }, "arealight1": { "shape": "arealight1", - "lookat": [ - -0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [-0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "material": "arealight1" }, "arealight2": { "shape": "arealight2", - "lookat": [ - 0.4, - 0.8, - 0.8, - 0, - 0.1, - 0, - 0, - 1, - 0 - ], + "lookat": [0.4, 0.8, 0.8, 0, 0.1, 0, 0, 1, 0], "material": "arealight2" }, "sphere-matte": { "shape": "sphere", - "frame": [ - 0.5, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.4, - 0, - 0 - ], + "frame": [0.5, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0], "material": "sphere-matte" }, "hairball1-hair": { "shape": "hairball1", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "hairball1-hair" }, "hairball2-hair": { "shape": "hairball2", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "hairball2-hair" }, "hairball3-hair": { "shape": "hairball3", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "hairball3-hair" }, "hairballi1-hair": { "shape": "hairballi", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - -0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0], "material": "hairballi1-hair" }, "hairballi2-hair": { "shape": "hairballi", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0], "material": "hairballi2-hair" }, "hairballi3-hair": { "shape": "hairballi", - "frame": [ - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0.2, - 0, - 0 - ], + "frame": [1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, 0], "material": "hairballi3-hair" } }, "materials": { "floor": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "color_tex": "floor" }, "arealight1": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "arealight2": { - "emission": [ - 20, - 20, - 20 - ] + "emission": [20, 20, 20] }, "sphere-matte": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "roughness": 1 }, "hairball1-hair": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "roughness": 1 }, "hairball2-hair": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "roughness": 1 }, "hairball3-hair": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "roughness": 1 }, "hairballi1-hair": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "roughness": 1 }, "hairballi2-hair": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "roughness": 1 }, "hairballi3-hair": { - "color": [ - 0.7, - 0.7, - 0.7 - ], + "color": [0.7, 0.7, 0.7], "roughness": 1 } } -} \ No newline at end of file +} From 12d6ae9ed91f29678cfe932901d495fe2c896b30 Mon Sep 17 00:00:00 2001 From: Fabio Pellacini Date: Sun, 12 Jul 2020 16:41:16 +0200 Subject: [PATCH 2/2] updated --- .vscode/settings.json | 1 + libs/yocto/yocto_bvh.h | 2 ++ libs/yocto/yocto_color.h | 3 ++ libs/yocto/yocto_common.h | 1 + libs/yocto/yocto_commonio.h | 3 +- libs/yocto/yocto_geometry.h | 3 ++ libs/yocto/yocto_image.h | 1 + libs/yocto/yocto_math.h | 55 ++++++++++++++++++------------------ libs/yocto/yocto_modelio.h | 4 +-- libs/yocto/yocto_sampling.h | 3 ++ libs/yocto/yocto_scene.cpp | 2 ++ libs/yocto/yocto_scene.h | 3 ++ libs/yocto/yocto_sceneio.cpp | 4 +++ libs/yocto/yocto_sceneio.h | 1 + libs/yocto/yocto_shading.h | 2 ++ libs/yocto/yocto_shape.cpp | 1 + libs/yocto/yocto_shape.h | 3 ++ libs/yocto/yocto_trace.h | 8 +++--- 18 files changed, 65 insertions(+), 35 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 8faeb3e2f..812a06808 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -111,6 +111,7 @@ "-build/header_guard", "-build/include_subdir", "-whitespace/braces", + "-readability/casting", "-build/c++11" ] } diff --git a/libs/yocto/yocto_bvh.h b/libs/yocto/yocto_bvh.h index 3f233b2c4..70229407d 100644 --- a/libs/yocto/yocto_bvh.h +++ b/libs/yocto/yocto_bvh.h @@ -39,8 +39,10 @@ // ----------------------------------------------------------------------------- #include +#include #include #include +#include #include "yocto_math.h" diff --git a/libs/yocto/yocto_color.h b/libs/yocto/yocto_color.h index 2b00ff4d9..124a59327 100644 --- a/libs/yocto/yocto_color.h +++ b/libs/yocto/yocto_color.h @@ -74,6 +74,9 @@ // INCLUDES // ----------------------------------------------------------------------------- +#include +#include + #include "yocto_math.h" // ----------------------------------------------------------------------------- diff --git a/libs/yocto/yocto_common.h b/libs/yocto/yocto_common.h index bce3553b9..cb0376a4f 100644 --- a/libs/yocto/yocto_common.h +++ b/libs/yocto/yocto_common.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include diff --git a/libs/yocto/yocto_commonio.h b/libs/yocto/yocto_commonio.h index f3acbae81..4acdc03df 100644 --- a/libs/yocto/yocto_commonio.h +++ b/libs/yocto/yocto_commonio.h @@ -235,7 +235,8 @@ inline string format_duration(int64_t duration) { auto secs = (int)(elapsed / 1000); auto msecs = (int)(elapsed % 1000); char buffer[256]; - sprintf(buffer, "%02d:%02d:%02d.%03d", hours, mins, secs, msecs); + snprintf( + buffer, sizeof(buffer), "%02d:%02d:%02d.%03d", hours, mins, secs, msecs); return buffer; } diff --git a/libs/yocto/yocto_geometry.h b/libs/yocto/yocto_geometry.h index 70f55efe3..358d2630e 100644 --- a/libs/yocto/yocto_geometry.h +++ b/libs/yocto/yocto_geometry.h @@ -38,6 +38,9 @@ // INCLUDES // ----------------------------------------------------------------------------- +#include +#include + #include "yocto_math.h" // ----------------------------------------------------------------------------- diff --git a/libs/yocto/yocto_image.h b/libs/yocto/yocto_image.h index 8f39c82cc..418a6378f 100644 --- a/libs/yocto/yocto_image.h +++ b/libs/yocto/yocto_image.h @@ -45,6 +45,7 @@ #include #include #include +#include #include "yocto_math.h" diff --git a/libs/yocto/yocto_math.h b/libs/yocto/yocto_math.h index d3beae210..b6130ff45 100644 --- a/libs/yocto/yocto_math.h +++ b/libs/yocto/yocto_math.h @@ -43,6 +43,7 @@ #include #include #include +#include #include // ----------------------------------------------------------------------------- @@ -1252,15 +1253,13 @@ inline vec2f log(const vec2f& a) { return {log(a.x), log(a.y)}; } inline vec2f exp2(const vec2f& a) { return {exp2(a.x), exp2(a.y)}; } inline vec2f log2(const vec2f& a) { return {log2(a.x), log2(a.y)}; } inline bool isfinite(const vec2f& a) { return isfinite(a.x) && isfinite(a.y); } -inline vec2f pow(const vec2f& a, float b) { - return {pow(a.x, b), pow(a.y, b)}; -}; +inline vec2f pow(const vec2f& a, float b) { return {pow(a.x, b), pow(a.y, b)}; } inline vec2f pow(const vec2f& a, const vec2f& b) { return {pow(a.x, b.x), pow(a.y, b.y)}; -}; +} inline vec2f gain(const vec2f& a, float b) { return {gain(a.x, b), gain(a.y, b)}; -}; +} inline void swap(vec2f& a, vec2f& b) { std::swap(a, b); } // Vector sequence operations. @@ -1401,24 +1400,24 @@ inline float sum(const vec3f& a) { return a.x + a.y + a.z; } inline float mean(const vec3f& a) { return sum(a) / 3; } // Functions applied to vector elements -inline vec3f abs(const vec3f& a) { return {abs(a.x), abs(a.y), abs(a.z)}; }; -inline vec3f sqrt(const vec3f& a) { return {sqrt(a.x), sqrt(a.y), sqrt(a.z)}; }; -inline vec3f exp(const vec3f& a) { return {exp(a.x), exp(a.y), exp(a.z)}; }; -inline vec3f log(const vec3f& a) { return {log(a.x), log(a.y), log(a.z)}; }; -inline vec3f exp2(const vec3f& a) { return {exp2(a.x), exp2(a.y), exp2(a.z)}; }; -inline vec3f log2(const vec3f& a) { return {log2(a.x), log2(a.y), log2(a.z)}; }; +inline vec3f abs(const vec3f& a) { return {abs(a.x), abs(a.y), abs(a.z)}; } +inline vec3f sqrt(const vec3f& a) { return {sqrt(a.x), sqrt(a.y), sqrt(a.z)}; } +inline vec3f exp(const vec3f& a) { return {exp(a.x), exp(a.y), exp(a.z)}; } +inline vec3f log(const vec3f& a) { return {log(a.x), log(a.y), log(a.z)}; } +inline vec3f exp2(const vec3f& a) { return {exp2(a.x), exp2(a.y), exp2(a.z)}; } +inline vec3f log2(const vec3f& a) { return {log2(a.x), log2(a.y), log2(a.z)}; } inline vec3f pow(const vec3f& a, float b) { return {pow(a.x, b), pow(a.y, b), pow(a.z, b)}; -}; +} inline vec3f pow(const vec3f& a, const vec3f& b) { return {pow(a.x, b.x), pow(a.y, b.y), pow(a.z, b.z)}; -}; +} inline vec3f gain(const vec3f& a, float b) { return {gain(a.x, b), gain(a.y, b), gain(a.z, b)}; -}; +} inline bool isfinite(const vec3f& a) { return isfinite(a.x) && isfinite(a.y) && isfinite(a.z); -}; +} inline void swap(vec3f& a, vec3f& b) { std::swap(a, b); } // Vector sequence operations. @@ -1552,34 +1551,34 @@ inline float mean(const vec4f& a) { return sum(a) / 4; } // Functions applied to vector elements inline vec4f abs(const vec4f& a) { return {abs(a.x), abs(a.y), abs(a.z), abs(a.w)}; -}; +} inline vec4f sqrt(const vec4f& a) { return {sqrt(a.x), sqrt(a.y), sqrt(a.z), sqrt(a.w)}; -}; +} inline vec4f exp(const vec4f& a) { return {exp(a.x), exp(a.y), exp(a.z), exp(a.w)}; -}; +} inline vec4f log(const vec4f& a) { return {log(a.x), log(a.y), log(a.z), log(a.w)}; -}; +} inline vec4f exp2(const vec4f& a) { return {exp2(a.x), exp2(a.y), exp2(a.z), exp2(a.w)}; -}; +} inline vec4f log2(const vec4f& a) { return {log2(a.x), log2(a.y), log2(a.z), log2(a.w)}; -}; +} inline vec4f pow(const vec4f& a, float b) { return {pow(a.x, b), pow(a.y, b), pow(a.z, b), pow(a.w, b)}; -}; +} inline vec4f pow(const vec4f& a, const vec4f& b) { return {pow(a.x, b.x), pow(a.y, b.y), pow(a.z, b.z), pow(a.w, b.w)}; -}; +} inline vec4f gain(const vec4f& a, float b) { return {gain(a.x, b), gain(a.y, b), gain(a.z, b), gain(a.w, b)}; -}; +} inline bool isfinite(const vec4f& a) { return isfinite(a.x) && isfinite(a.y) && isfinite(a.z) && isfinite(a.w); -}; +} inline void swap(vec4f& a, vec4f& b) { std::swap(a, b); } // Quaternion operatons represented as xi + yj + zk + w @@ -1700,7 +1699,7 @@ inline int min(const vec2i& a) { return min(a.x, a.y); } inline int sum(const vec2i& a) { return a.x + a.y; } // Functions applied to vector elements -inline vec2i abs(const vec2i& a) { return {abs(a.x), abs(a.y)}; }; +inline vec2i abs(const vec2i& a) { return {abs(a.x), abs(a.y)}; } inline void swap(vec2i& a, vec2i& b) { std::swap(a, b); } // Vector sequence operations. @@ -1792,7 +1791,7 @@ inline int min(const vec3i& a) { return min(min(a.x, a.y), a.z); } inline int sum(const vec3i& a) { return a.x + a.y + a.z; } // Functions applied to vector elements -inline vec3i abs(const vec3i& a) { return {abs(a.x), abs(a.y), abs(a.z)}; }; +inline vec3i abs(const vec3i& a) { return {abs(a.x), abs(a.y), abs(a.z)}; } inline void swap(vec3i& a, vec3i& b) { std::swap(a, b); } // Vector sequence operations. @@ -1887,7 +1886,7 @@ inline int sum(const vec4i& a) { return a.x + a.y + a.z + a.w; } // Functions applied to vector elements inline vec4i abs(const vec4i& a) { return {abs(a.x), abs(a.y), abs(a.z), abs(a.w)}; -}; +} inline void swap(vec4i& a, vec4i& b) { std::swap(a, b); } } // namespace yocto diff --git a/libs/yocto/yocto_modelio.h b/libs/yocto/yocto_modelio.h index 096918088..08d6bbca4 100644 --- a/libs/yocto/yocto_modelio.h +++ b/libs/yocto/yocto_modelio.h @@ -224,8 +224,8 @@ struct obj_texture { unordered_map> props; obj_texture() {} - obj_texture(const char* path) : path{path} {} - obj_texture(const string& path) : path{path} {} + explicit obj_texture(const char* path) : path{path} {} + explicit obj_texture(const string& path) : path{path} {} }; // Obj element diff --git a/libs/yocto/yocto_sampling.h b/libs/yocto/yocto_sampling.h index fe14f064e..0a517e12f 100644 --- a/libs/yocto/yocto_sampling.h +++ b/libs/yocto/yocto_sampling.h @@ -46,6 +46,9 @@ // INCLUDES // ----------------------------------------------------------------------------- +#include +#include + #include "yocto_math.h" // ----------------------------------------------------------------------------- diff --git a/libs/yocto/yocto_scene.cpp b/libs/yocto/yocto_scene.cpp index 6a1a98737..8b3477bf3 100644 --- a/libs/yocto/yocto_scene.cpp +++ b/libs/yocto/yocto_scene.cpp @@ -28,6 +28,7 @@ #include "yocto_scene.h" +#include #include #include #include @@ -37,6 +38,7 @@ #include #include #include +#include #include "yocto_color.h" #include "yocto_geometry.h" diff --git a/libs/yocto/yocto_scene.h b/libs/yocto/yocto_scene.h index 989d50011..c04fff79c 100644 --- a/libs/yocto/yocto_scene.h +++ b/libs/yocto/yocto_scene.h @@ -39,6 +39,9 @@ #include #include +#include +#include +#include #include "yocto_image.h" #include "yocto_math.h" diff --git a/libs/yocto/yocto_sceneio.cpp b/libs/yocto/yocto_sceneio.cpp index 336af0568..f9d0a5ff2 100644 --- a/libs/yocto/yocto_sceneio.cpp +++ b/libs/yocto/yocto_sceneio.cpp @@ -28,6 +28,7 @@ #include "yocto_sceneio.h" +#include #include #include #include @@ -36,6 +37,9 @@ #include #include #include +#include +#include +#include #include "ext/cgltf.h" #include "ext/filesystem.hpp" diff --git a/libs/yocto/yocto_sceneio.h b/libs/yocto/yocto_sceneio.h index 5eaf960d3..fcfaf9cab 100644 --- a/libs/yocto/yocto_sceneio.h +++ b/libs/yocto/yocto_sceneio.h @@ -40,6 +40,7 @@ #include #include +#include #include "yocto_scene.h" diff --git a/libs/yocto/yocto_shading.h b/libs/yocto/yocto_shading.h index 0f445faa8..fcd1e7d9f 100644 --- a/libs/yocto/yocto_shading.h +++ b/libs/yocto/yocto_shading.h @@ -36,8 +36,10 @@ // INCLUDES // ----------------------------------------------------------------------------- +#include #include #include +#include #include "yocto_math.h" #include "yocto_sampling.h" diff --git a/libs/yocto/yocto_shape.cpp b/libs/yocto/yocto_shape.cpp index 2b905931d..8cc1c141b 100644 --- a/libs/yocto/yocto_shape.cpp +++ b/libs/yocto/yocto_shape.cpp @@ -8,6 +8,7 @@ #include "yocto_shape.h" +#include #include #include #include diff --git a/libs/yocto/yocto_shape.h b/libs/yocto/yocto_shape.h index ae70ec5a2..7a591b451 100644 --- a/libs/yocto/yocto_shape.h +++ b/libs/yocto/yocto_shape.h @@ -39,8 +39,11 @@ // ----------------------------------------------------------------------------- #include +#include #include #include +#include +#include #include "yocto_math.h" diff --git a/libs/yocto/yocto_trace.h b/libs/yocto/yocto_trace.h index 2ae54ac49..c95d27eab 100644 --- a/libs/yocto/yocto_trace.h +++ b/libs/yocto/yocto_trace.h @@ -30,8 +30,6 @@ // // -// TODO: flatten state - #ifndef _YOCTO_TRACE_H_ #define _YOCTO_TRACE_H_ @@ -42,6 +40,8 @@ #include #include #include +#include +#include #include "yocto_image.h" #include "yocto_math.h" @@ -83,8 +83,8 @@ enum struct trace_sampler_type { // Type of false color visualization enum struct trace_falsecolor_type { // clang-format off - position, normal, frontfacing, gnormal, gfrontfacing, texcoord, color, - emission, diffuse, specular, coat, metal, transmission, translucency, + position, normal, frontfacing, gnormal, gfrontfacing, texcoord, color, + emission, diffuse, specular, coat, metal, transmission, translucency, refraction, roughness, opacity, ior, instance, element, highlight // clang-format on };