Refactored perspective plugin tests to use load_dict

Author: leroyvn

src/sensors/tests/test_perspective.py

@@ -4,32 +4,37 @@
 import mitsuba
 
 
-def create_camera(o, d, fov=34, fov_axis='x', s_open=1.5, s_close=5, xml_srf=""):
-    from mitsuba.core.xml import load_string
-    return load_string("""
-        <sensor version='2.0.0' type='perspective'>
-            <float name='near_clip' value='1'/>
-            <float name='far_clip' value='35'/>
-            <float name='focus_distance' value='15'/>
-            <float name='fov' value='{fov}'/>
-            <string name='fov_axis' value='{fov_axis}'/>
-            <float name='shutter_open' value='{so}'/>
-            <float name='shutter_close' value='{sc}'/>
-            <transform name="to_world">
-                <lookat origin="{ox}, {oy}, {oz}"
-                        target="{tx}, {ty}, {tz}"
-                        up    =" 0.0,  1.0,  0.0"/>
-            </transform>
-            <film type="hdrfilm">
-                <integer name="width" value="512"/>
-                <integer name="height" value="256"/>
-            </film>
-            {srf}
-        </sensor> 
-    """.format(ox=o[0], oy=o[1], oz=o[2],
-               tx=o[0] + d[0], ty=o[1] + d[1], tz=o[2] + d[2],
-               fov=fov, fov_axis=fov_axis, so=s_open, sc=s_close,
-               srf=xml_srf))
+def create_camera(o, d, fov=34, fov_axis="x", s_open=1.5, s_close=5, dict_srf=None):
+    from mitsuba.core.xml import load_dict
+    from mitsuba.core import Transform4f, Vector3f
+
+    dict_camera = {
+        "type": "perspective",
+        "near_clip": 1.0,
+        "far_clip": 35.0,
+        "focus_distance": 15.0,
+        "to_world": Transform4f.look_at(
+            origin=Vector3f(o),
+            target=Vector3f(o) + Vector3f(d),
+            up=[0, 1, 0]
+        ),
+        "fov": fov,
+        "fov_axis": fov_axis,
+        "shutter_open": s_open,
+        "shutter_close": s_close,
+        "film": {
+            "type": "hdrfilm",
+            "width": 512,
+            "height": 256,
+        }
+    }
+
+    if dict_srf:
+        dict_camera["srf"] = dict_srf
+
+    print(dict_camera)
+
+    return load_dict(dict_camera)
 
 
 origins = [[1.0, 0.0, 1.5], [1.0, 4.0, 1.5]]
@@ -165,40 +170,41 @@ def check_fov(camera, sample):
         check_fov(camera, sample)
 
 
-xml_srf_dict = {
+dicts_srf = {
     # Uniform SRF covering full spectral range
-    "uniform_full": """
-        <spectrum version="2.0.0" name="srf" type="uniform">
-            <float name="value" value="1"/>
-        </spectrum>""",
+    "uniform_full": {
+        "type": "uniform",
+        "value": 1
+    },
     # Uniform SRF covering the [400, 700] nm spectral range
-    "uniform_restricted": """
-        <spectrum version="2.0.0" name="srf" type="uniform">
-            <float name="value" value="1"/>
-            <float name="lambda_min" value="400"/>
-            <float name="lambda_max" value="700"/>
-        </spectrum>""",
+    "uniform_restricted": {
+        "type": "uniform",
+        "value": 1,
+        "lambda_min": 400,
+        "lambda_max": 700
+
+    },
     # Uniform SRF covering full spectral range, not equal to 1
-    "uniform_scaled": """
-        <spectrum version="2.0.0" name="srf" type="uniform">
-            <float name="value" value="2"/>
-        </spectrum>""",
+    "uniform_scaled": {
+        "type": "uniform",
+        "value": 2
+    }
 }
 
 
-@pytest.mark.parametrize("srf", list(xml_srf_dict.keys()))
+@pytest.mark.parametrize("srf", list(dicts_srf.keys()))
 def test_srf(variant_scalar_spectral, srf):
     # Test the spectral response function specification feature
-    from mitsuba.core.xml import load_string
+    from mitsuba.core.xml import load_dict
     from mitsuba.core import sample_shifted
     from mitsuba.render import SurfaceInteraction3f
 
     origin = [0, 0, 0]
     direction = [0, 0, 1]
-    xml_srf = xml_srf_dict[srf]
+    dict_srf = dicts_srf[srf]
 
-    camera = create_camera(origin, direction, xml_srf=xml_srf)
-    srf = load_string(xml_srf)
+    camera = create_camera(origin, direction, dict_srf=dict_srf)
+    srf = load_dict(dict_srf)
     time = 0.5
     wav_sample = 0.5
     pos_sample = [0.2, 0.6]
@@ -208,7 +214,8 @@ def test_srf(variant_scalar_spectral, srf):
 
     # Importance sample wavelength and weight
     print(sample_shifted(wav_sample))
-    wav, wav_weight = srf.sample(SurfaceInteraction3f(), sample_shifted(wav_sample))
+    wav, wav_weight = srf.sample(
+        SurfaceInteraction3f(), sample_shifted(wav_sample))
     print(wav)
 
     assert ek.allclose(ray.wavelengths, wav)