xelatihy · xelatihy · Oct 24, 2021 · Oct 23, 2021 · Oct 24, 2021 · Oct 24, 2021
diff --git a/scripts/make-tests.py b/scripts/make-tests.py
diff --git a/scripts/scenes.py b/scripts/scenes.py
@@ -34,7 +34,7 @@ def view(directory='mcguire', scene='*', format='json', mode='path', envname='')
             if format == 'pbrt':
                 with open(filename) as f:
                     if 'WorldBegin' not in f.read(): continue
-            cmd = f'../yocto-gl/bin/yscene view {options} {extraoptions} {envoptions} {filename}'
+            cmd = f'../yocto-gl/bin/yscene view {options} {extraoptions} {envoptions} --scene {filename}'
             print(cmd, file=sys.stderr)
             os.system(cmd)
 
@@ -79,7 +79,7 @@ def render(directory='mcguire', scene='*', format='json', mode='path'):
             os.system(cmd)
             for idx, cam in enumerate(extracams, 1):
                 imagename = f'{directory}/{outprefix}-{format}/{basename}-c{idx}.{outformat}'
-                cmd = f'../yocto-gl/bin/yscene render --output {imagename} --camera {cam} {options} {extraoptions} {filename}'
+                cmd = f'../yocto-gl/bin/yscene render --output {imagename} --camera {cam} {options} {extraoptions} --scene {filename}'
                 print(cmd, file=sys.stderr)
                 os.system(cmd)
 
@@ -106,7 +106,7 @@ def info(directory='mcguire', scene='*', format='json', mode='default'):
             if format == 'pbrt':
                 with open(filename) as f:
                     if 'WorldBegin' not in f.read(): continue
-            cmd = f'../yocto-gl/bin/yscene info {options} {extraoptions} {filename}'
+            cmd = f'../yocto-gl/bin/yscene info {options} {extraoptions} --scene {filename}'
             print(cmd, file=sys.stderr)
             os.system(cmd)
 
@@ -154,7 +154,7 @@ def tonemap(directory='mcguire', scene='*', format='json', mode='filmic'):
             glob.glob(f'{directory}/{outprefix}-{format}/{scene}.exr')):
         imagename = filename.replace(f'.exr', f'.{outformat}').replace(
             f'.hdr', f'.{outformat}')
-        cmd = f'../yocto-gl/bin/yimage convert --output {imagename} {options} {filename}'
+        cmd = f'../yocto-gl/bin/yimage convert --output {imagename} {options} --image {filename}'
         print(cmd, file=sys.stderr)
         os.system(cmd)
         img = Image.open(imagename)

diff --git a/tests/arealights1/shapes/arealight1.ply → tests/_assets/shapes/arealight1.ply b/tests/arealights1/shapes/arealight1.ply → tests/_assets/shapes/arealight1.ply
diff --git a/tests/arealights1/shapes/arealight2.ply → tests/_assets/shapes/arealight2.ply b/tests/arealights1/shapes/arealight2.ply → tests/_assets/shapes/arealight2.ply
diff --git a/tests/arealights1/shapes/bunny.ply → tests/_assets/shapes/bunny.ply b/tests/arealights1/shapes/bunny.ply → tests/_assets/shapes/bunny.ply
diff --git a/tests/_assets/shapes/cube.ply b/tests/_assets/shapes/cube.ply
diff --git a/tests/shapes2/shapes/cube-subdiv.ply → tests/_assets/shapes/cubesubdiv.ply b/tests/shapes2/shapes/cube-subdiv.ply → tests/_assets/shapes/cubesubdiv.ply
diff --git a/tests/_assets/shapes/disk.ply b/tests/_assets/shapes/disk.ply
diff --git a/tests/features2/shapes/sphere-displaced.ply → tests/_assets/shapes/displacedsubdiv.ply b/tests/features2/shapes/sphere-displaced.ply → tests/_assets/shapes/displacedsubdiv.ply
diff --git a/tests/shapes1/shapes/uvsphere-flipcap.ply → tests/_assets/shapes/flipcapuvsphere.ply b/tests/shapes1/shapes/uvsphere-flipcap.ply → tests/_assets/shapes/flipcapuvsphere.ply
diff --git a/tests/arealights1/shapes/floor.ply → tests/_assets/shapes/floor.ply b/tests/arealights1/shapes/floor.ply → tests/_assets/shapes/floor.ply
diff --git a/tests/features2/shapes/hairball1.ply → tests/_assets/shapes/hairball.ply b/tests/features2/shapes/hairball1.ply → tests/_assets/shapes/hairball.ply
diff --git a/tests/shapes3/shapes/hairball1.ply → tests/_assets/shapes/hairball1.ply b/tests/shapes3/shapes/hairball1.ply → tests/_assets/shapes/hairball1.ply
diff --git a/tests/shapes3/shapes/hairballi.ply → tests/_assets/shapes/hairballi.ply b/tests/shapes3/shapes/hairballi.ply → tests/_assets/shapes/hairballi.ply
diff --git a/tests/materials3/shapes/largearealight1.ply → tests/_assets/shapes/largearealight1.ply b/tests/materials3/shapes/largearealight1.ply → tests/_assets/shapes/largearealight1.ply
diff --git a/tests/materials3/shapes/largearealight2.ply → tests/_assets/shapes/largearealight2.ply b/tests/materials3/shapes/largearealight2.ply → tests/_assets/shapes/largearealight2.ply
diff --git a/tests/arealights1/shapes/sphere.ply → tests/_assets/shapes/sphere.ply b/tests/arealights1/shapes/sphere.ply → tests/_assets/shapes/sphere.ply
diff --git a/tests/features2/shapes/suzanne-subdiv.ply → tests/_assets/shapes/suzannesubdiv.ply b/tests/features2/shapes/suzanne-subdiv.ply → tests/_assets/shapes/suzannesubdiv.ply
diff --git a/tests/_assets/shapes/teapot.ply b/tests/_assets/shapes/teapot.ply
diff --git a/tests/_assets/shapes/uvcylinder.ply b/tests/_assets/shapes/uvcylinder.ply
diff --git a/tests/shapes2/subdivs/cube-subdiv.obj → tests/_assets/subdivs/cubesubdiv.obj b/tests/shapes2/subdivs/cube-subdiv.obj → tests/_assets/subdivs/cubesubdiv.obj
diff --git a/tests/features2/subdivs/sphere-displaced.obj → tests/_assets/subdivs/displacedsubdiv.obj b/tests/features2/subdivs/sphere-displaced.obj → tests/_assets/subdivs/displacedsubdiv.obj
diff --git a/tests/features2/subdivs/suzanne-subdiv.obj → tests/_assets/subdivs/suzannesubdiv.obj b/tests/features2/subdivs/suzanne-subdiv.obj → tests/_assets/subdivs/suzannesubdiv.obj
diff --git a/...features2/textures/bumps-displacement.png → tests/_assets/textures/bumpsdisplacement.png b/...features2/textures/bumps-displacement.png → tests/_assets/textures/bumpsdisplacement.png
diff --git a/tests/features1/textures/bumps-normal.png → tests/_assets/textures/bumpsnormal.png b/tests/features1/textures/bumps-normal.png → tests/_assets/textures/bumpsnormal.png
diff --git a/tests/arealights1/textures/floor.png → tests/_assets/textures/floor.png b/tests/arealights1/textures/floor.png → tests/_assets/textures/floor.png
diff --git a/tests/environments2/textures/sky.hdr → tests/_assets/textures/sky.hdr b/tests/environments2/textures/sky.hdr → tests/_assets/textures/sky.hdr
diff --git a/tests/arealights1/textures/uvgrid.png → tests/_assets/textures/uvgrid.png b/tests/arealights1/textures/uvgrid.png → tests/_assets/textures/uvgrid.png
diff --git a/tests/arealights1/arealights1.json → ...s/_version43/arealights1/arealights1.json b/tests/arealights1/arealights1.json → ...s/_version43/arealights1/arealights1.json
diff --git a/tests/instances1/shapes/arealight1.ply → ...rsion43/arealights1/shapes/arealight1.ply b/tests/instances1/shapes/arealight1.ply → ...rsion43/arealights1/shapes/arealight1.ply
diff --git a/tests/instances1/shapes/arealight2.ply → ...rsion43/arealights1/shapes/arealight2.ply b/tests/instances1/shapes/arealight2.ply → ...rsion43/arealights1/shapes/arealight2.ply
diff --git a/tests/environments1/shapes/bunny.ply → ...s/_version43/arealights1/shapes/bunny.ply b/tests/environments1/shapes/bunny.ply → ...s/_version43/arealights1/shapes/bunny.ply
diff --git a/tests/environments1/shapes/floor.ply → ...s/_version43/arealights1/shapes/floor.ply b/tests/environments1/shapes/floor.ply → ...s/_version43/arealights1/shapes/floor.ply
diff --git a/tests/environments1/shapes/sphere.ply → .../_version43/arealights1/shapes/sphere.ply b/tests/environments1/shapes/sphere.ply → .../_version43/arealights1/shapes/sphere.ply
diff --git a/tests/environments1/textures/floor.png → ..._version43/arealights1/textures/floor.png b/tests/environments1/textures/floor.png → ..._version43/arealights1/textures/floor.png
diff --git a/tests/environments1/textures/uvgrid.png → ...version43/arealights1/textures/uvgrid.png b/tests/environments1/textures/uvgrid.png → ...version43/arealights1/textures/uvgrid.png
diff --git a/tests/cornellbox/cornellbox.json → tests/_version43/cornellbox/cornellbox.json b/tests/cornellbox/cornellbox.json → tests/_version43/cornellbox/cornellbox.json
diff --git a/tests/cornellbox/shapes/backwall.ply → ..._version43/cornellbox/shapes/backwall.ply b/tests/cornellbox/shapes/backwall.ply → ..._version43/cornellbox/shapes/backwall.ply
diff --git a/tests/cornellbox/shapes/ceiling.ply → .../_version43/cornellbox/shapes/ceiling.ply b/tests/cornellbox/shapes/ceiling.ply → .../_version43/cornellbox/shapes/ceiling.ply
diff --git a/tests/cornellbox/shapes/floor.ply → tests/_version43/cornellbox/shapes/floor.ply b/tests/cornellbox/shapes/floor.ply → tests/_version43/cornellbox/shapes/floor.ply
diff --git a/tests/cornellbox/shapes/leftwall.ply → ..._version43/cornellbox/shapes/leftwall.ply b/tests/cornellbox/shapes/leftwall.ply → ..._version43/cornellbox/shapes/leftwall.ply
diff --git a/tests/cornellbox/shapes/light.ply → tests/_version43/cornellbox/shapes/light.ply b/tests/cornellbox/shapes/light.ply → tests/_version43/cornellbox/shapes/light.ply
diff --git a/tests/cornellbox/shapes/rightwall.ply → ...version43/cornellbox/shapes/rightwall.ply b/tests/cornellbox/shapes/rightwall.ply → ...version43/cornellbox/shapes/rightwall.ply
diff --git a/tests/cornellbox/shapes/shortbox.ply → ..._version43/cornellbox/shapes/shortbox.ply b/tests/cornellbox/shapes/shortbox.ply → ..._version43/cornellbox/shapes/shortbox.ply
diff --git a/tests/cornellbox/shapes/tallbox.ply → .../_version43/cornellbox/shapes/tallbox.ply b/tests/cornellbox/shapes/tallbox.ply → .../_version43/cornellbox/shapes/tallbox.ply
diff --git a/tests/environments1/environments1.json → ...ersion43/environments1/environments1.json b/tests/environments1/environments1.json → ...ersion43/environments1/environments1.json
diff --git a/tests/environments2/shapes/bunny.ply → ..._version43/environments1/shapes/bunny.ply b/tests/environments2/shapes/bunny.ply → ..._version43/environments1/shapes/bunny.ply
diff --git a/tests/environments2/shapes/floor.ply → ..._version43/environments1/shapes/floor.ply b/tests/environments2/shapes/floor.ply → ..._version43/environments1/shapes/floor.ply
diff --git a/tests/environments2/shapes/sphere.ply → ...version43/environments1/shapes/sphere.ply b/tests/environments2/shapes/sphere.ply → ...version43/environments1/shapes/sphere.ply
diff --git a/tests/environments2/textures/floor.png → ...ersion43/environments1/textures/floor.png b/tests/environments2/textures/floor.png → ...ersion43/environments1/textures/floor.png
diff --git a/tests/environments1/textures/sunsky.hdr → ...rsion43/environments1/textures/sunsky.hdr b/tests/environments1/textures/sunsky.hdr → ...rsion43/environments1/textures/sunsky.hdr
diff --git a/tests/environments2/textures/uvgrid.png → ...rsion43/environments1/textures/uvgrid.png b/tests/environments2/textures/uvgrid.png → ...rsion43/environments1/textures/uvgrid.png
diff --git a/tests/environments2/environments2.json → ...ersion43/environments2/environments2.json b/tests/environments2/environments2.json → ...ersion43/environments2/environments2.json
diff --git a/tests/materials1/shapes/bunny.ply → ..._version43/environments2/shapes/bunny.ply b/tests/materials1/shapes/bunny.ply → ..._version43/environments2/shapes/bunny.ply
diff --git a/tests/instances1/shapes/floor.ply → ..._version43/environments2/shapes/floor.ply b/tests/instances1/shapes/floor.ply → ..._version43/environments2/shapes/floor.ply
diff --git a/tests/furnace1/shapes/sphere.ply → ...version43/environments2/shapes/sphere.ply b/tests/furnace1/shapes/sphere.ply → ...version43/environments2/shapes/sphere.ply
diff --git a/tests/instances1/textures/floor.png → ...ersion43/environments2/textures/floor.png b/tests/instances1/textures/floor.png → ...ersion43/environments2/textures/floor.png
diff --git a/tests/instances1/textures/sky.hdr → ..._version43/environments2/textures/sky.hdr b/tests/instances1/textures/sky.hdr → ..._version43/environments2/textures/sky.hdr
diff --git a/tests/instances1/textures/uvgrid.png → ...rsion43/environments2/textures/uvgrid.png b/tests/instances1/textures/uvgrid.png → ...rsion43/environments2/textures/uvgrid.png
diff --git a/tests/_version43/features1/features1.json b/tests/_version43/features1/features1.json
@@ -0,0 +1,253 @@
+{
+  "asset": {
+    "copyright": "Model by Fabio Pellacini from github.com/~xelatihy/yocto-gl",
+    "generator": "Yocto/GL - https://github.com/xelatihy/yocto-gl",
+    "version": "4.2"
+  },
+  "cameras": [
+    {
+      "name": "default",
+      "frame": [
+        0.8151804208755493, -0.0, 0.579207181930542, 0.16660168766975403,
+        0.9577393531799316, -0.23447643220424652, -0.5547295212745667,
+        0.28763750195503235, 0.7807304263114929, -0.75, 0.4000000059604645,
+        0.8999999761581421
+      ],
+      "aspect": 2.4000000953674316,
+      "focus": 1.2168092727661133
+    },
+    {
+      "name": "front",
+      "frame": [
+        1.0, 0.0, 0.0, 0.0, 0.936329185962677, -0.3511234223842621, 0.0,
+        0.3511234223842621, 0.936329185962677, 0.0, 0.574999988079071,
+        1.399999976158142
+      ],
+      "aspect": 3.0,
+      "focus": 1.4952006340026855
+    },
+    {
+      "name": "back",
+      "frame": [
+        -1.0, 0.0, 0.0, 0.0, 0.936329185962677, 0.3511234223842621, 0.0,
+        0.3511234223842621, -0.936329185962677, 0.0, 0.574999988079071,
+        -1.399999976158142
+      ],
+      "aspect": 3.0,
+      "focus": 1.4952006340026855
+    },
+    {
+      "name": "perspective-sharp",
+      "frame": [
+        0.8151804208755493, -0.0, 0.579207181930542, 0.16660168766975403,
+        0.9577393531799316, -0.23447643220424652, -0.5547295212745667,
+        0.28763750195503235, 0.7807304263114929, -0.75, 0.4000000059604645,
+        0.8999999761581421
+      ],
+      "aspect": 2.4000000953674316,
+      "focus": 1.2168092727661133
+    },
+    {
+      "name": "perspective-dof",
+      "frame": [
+        0.8151804208755493, -0.0, 0.579207181930542, 0.16660168766975403,
+        0.9577393531799316, -0.23447643220424652, -0.5547295212745667,
+        0.28763750195503235, 0.7807304263114929, -0.75, 0.4000000059604645,
+        0.8999999761581421
+      ],
+      "aspect": 2.4000000953674316,
+      "focus": 1.2168092727661133,
+      "aperture": 0.02500000037252903
+    },
+    {
+      "name": "orthographic-sharp",
+      "frame": [
+        0.8151804208755493, -0.0, 0.579207181930542, 0.16660168766975403,
+        0.9577393531799316, -0.23447643220424652, -0.5547295212745667,
+        0.28763750195503235, 0.7807304263114929, -0.75, 0.4000000059604645,
+        0.8999999761581421
+      ],
+      "orthographic": true,
+      "aspect": 2.4000000953674316,
+      "focus": 1.2168092727661133
+    },
+    {
+      "name": "orthographic-dof",
+      "frame": [
+        0.8151804208755493, -0.0, 0.579207181930542, 0.16660168766975403,
+        0.9577393531799316, -0.23447643220424652, -0.5547295212745667,
+        0.28763750195503235, 0.7807304263114929, -0.75, 0.4000000059604645,
+        0.8999999761581421
+      ],
+      "orthographic": true,
+      "aspect": 2.4000000953674316,
+      "focus": 1.2168092727661133,
+      "aperture": 0.019999999552965164
+    }
+  ],
+  "environments": [
+    {
+      "name": "sky",
+      "emission": [0.5, 0.5, 0.5],
+      "emission_tex": 0
+    }
+  ],
+  "textures": [
+    {
+      "name": "sky",
+      "uri": "textures/sky.hdr"
+    },
+    {
+      "name": "floor",
+      "uri": "textures/floor.png"
+    },
+    {
+      "name": "uvgrid",
+      "uri": "textures/uvgrid.png"
+    },
+    {
+      "name": "bumps-normal",
+      "uri": "textures/bumps-normal.png"
+    }
+  ],
+  "materials": [
+    {
+      "name": "floor",
+      "color": [0.699999988079071, 0.699999988079071, 0.699999988079071],
+      "color_tex": 1
+    },
+    {
+      "name": "bunny-uvgrid-coated",
+      "type": "glossy",
+      "color": [1.0, 1.0, 1.0],
+      "roughness": 0.20000000298023224,
+      "color_tex": 2
+    },
+    {
+      "name": "bunny-volume-jade",
+      "type": "refractive",
+      "color": [0.5, 0.5, 0.5],
+      "scattering": [
+        0.30000001192092896, 0.6000000238418579, 0.30000001192092896
+      ]
+    },
+    {
+      "name": "bunny-metal-rough",
+      "type": "reflective",
+      "color": [0.6600000262260437, 0.44999998807907104, 0.3400000035762787],
+      "roughness": 0.20000000298023224
+    },
+    {
+      "name": "sphere-volume-glass",
+      "type": "refractive",
+      "color": [1.0, 0.5, 0.5]
+    },
+    {
+      "name": "sphere-plastic-rough-bumped",
+      "type": "glossy",
+      "color": [0.5, 0.699999988079071, 0.5],
+      "roughness": 0.20000000298023224,
+      "normal_tex": 3
+    },
+    {
+      "name": "arealight1",
+      "emission": [20.0, 20.0, 20.0]
+    },
+    {
+      "name": "arealight2",
+      "emission": [20.0, 20.0, 20.0]
+    }
+  ],
+  "shapes": [
+    {
+      "name": "floor",
+      "uri": "shapes/floor.ply"
+    },
+    {
+      "name": "bunny",
+      "uri": "shapes/bunny.ply"
+    },
+    {
+      "name": "sphere",
+      "uri": "shapes/sphere.ply"
+    },
+    {
+      "name": "arealight1",
+      "uri": "shapes/arealight1.ply"
+    },
+    {
+      "name": "arealight2",
+      "uri": "shapes/arealight2.ply"
+    }
+  ],
+  "instances": [
+    {
+      "name": "floor",
+      "shape": 0,
+      "material": 0
+    },
+    {
+      "name": "bunny-uvgrid-coated",
+      "frame": [
+        1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, -0.4000000059604645, 0.0,
+        0.0
+      ],
+      "shape": 1,
+      "material": 1
+    },
+    {
+      "name": "bunny-volume-jade",
+      "shape": 1,
+      "material": 2
+    },
+    {
+      "name": "bunny-metal-rough",
+      "frame": [
+        1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.4000000059604645, 0.0,
+        0.0
+      ],
+      "shape": 1,
+      "material": 3
+    },
+    {
+      "name": "sphere-volume-glass",
+      "frame": [
+        1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, -0.20000000298023224, 0.0,
+        0.0
+      ],
+      "shape": 2,
+      "material": 4
+    },
+    {
+      "name": "sphere-plastic-rough-bumped",
+      "frame": [
+        1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.20000000298023224, 0.0,
+        0.0
+      ],
+      "shape": 2,
+      "material": 5
+    },
+    {
+      "name": "arealight1",
+      "frame": [
+        0.8944271802902222, -0.0, 0.4472135901451111, 0.27562475204467773,
+        0.7874992489814758, -0.5512495040893555, -0.3521803617477417,
+        0.6163156628608704, 0.7043607234954834, -0.4000000059604645,
+        0.800000011920929, 0.800000011920929
+      ],
+      "shape": 3,
+      "material": 6
+    },
+    {
+      "name": "arealight2",
+      "frame": [
+        0.8944271802902222, 0.0, -0.4472135901451111, -0.27562475204467773,
+        0.7874992489814758, -0.5512495040893555, 0.3521803617477417,
+        0.6163156628608704, 0.7043607234954834, 0.4000000059604645,
+        0.800000011920929, 0.800000011920929
+      ],
+      "shape": 4,
+      "material": 7
+    }
+  ]
+}
diff --git a/tests/shapes3/shapes/arealight1.ply → ...version43/features1/shapes/arealight1.ply b/tests/shapes3/shapes/arealight1.ply → ...version43/features1/shapes/arealight1.ply
diff --git a/tests/shapes3/shapes/arealight2.ply → ...version43/features1/shapes/arealight2.ply b/tests/shapes3/shapes/arealight2.ply → ...version43/features1/shapes/arealight2.ply
diff --git a/tests/materials2/shapes/bunny.ply → tests/_version43/features1/shapes/bunny.ply b/tests/materials2/shapes/bunny.ply → tests/_version43/features1/shapes/bunny.ply
diff --git a/tests/materials3/shapes/floor.ply → tests/_version43/features1/shapes/floor.ply b/tests/materials3/shapes/floor.ply → tests/_version43/features1/shapes/floor.ply
diff --git a/tests/furnace2/shapes/sphere.ply → tests/_version43/features1/shapes/sphere.ply b/tests/furnace2/shapes/sphere.ply → tests/_version43/features1/shapes/sphere.ply
diff --git a/tests/materials3/textures/bumps-normal.png → ...ion43/features1/textures/bumps-normal.png b/tests/materials3/textures/bumps-normal.png → ...ion43/features1/textures/bumps-normal.png
diff --git a/tests/materials3/textures/floor.png → ...s/_version43/features1/textures/floor.png b/tests/materials3/textures/floor.png → ...s/_version43/features1/textures/floor.png
diff --git a/tests/materials3/textures/sky.hdr → tests/_version43/features1/textures/sky.hdr b/tests/materials3/textures/sky.hdr → tests/_version43/features1/textures/sky.hdr
diff --git a/tests/shapes4/textures/uvgrid.png → .../_version43/features1/textures/uvgrid.png b/tests/shapes4/textures/uvgrid.png → .../_version43/features1/textures/uvgrid.png