Unit test fixes and two important notes - XPlanePrimative is now of equal start weight to XPlaneObject again and ATTR_light_level_reset is not "written" by default. This makes the resetter system try less hard and actually get it right. See test_03_mesh_ll_overload for the perforamance increase and the v12 repo's #26 for when we debugged this in the resetter system. The change to assertAttributesEqualDict fixes materials.test.py's instability.

Author: tngreene

io_xplane2blender/tests/__init__.py

@@ -467,22 +467,20 @@ def assertAttributesEqualDict(
             f"Attribute lists {list(expected_attrs.keys())}, {list(attrs.keys())} have different length",
         )
 
-        attr_names = tuple(attrs.keys())
-        attr_values = tuple((v.getValue() for v in attrs.values()))
-        for name, (value, expected_value) in zip(
-            attr_names, zip(attr_values, expected_attrs.values())
-        ):
+        for name in attrs.keys():
+            value = attrs[name].getValue()
+            expected_value = expected_attrs[name]
 
             if isinstance(expected_value, (list, tuple)):
                 self.assertIsInstance(
                     value,
                     (list, tuple),
-                    msg='Attribute value for "%s" is no list or tuple but: %s',
+                    msg='Attribute value for "{value}" is a {type(value)}, not a list or tuple',
                 )
                 self.assertEquals(
                     len(expected_value),
                     len(value),
-                    'Attribute values for "%s" have different length' % name,
+                    'Attribute value list for "{name}" have different length',
                 )
 
                 for i, (v, expectedV) in enumerate(zip(value, expected_value)):
@@ -492,11 +490,11 @@ def assertAttributesEqualDict(
                         self.assertEquals(
                             expectedV,
                             v,
-                            'Attribute list value %d for "%s" is different' % (i, name),
                         )
             else:
                 self.assertEquals(
-                    expected_value, value, 'Attribute "%s" is not equal' % name
+                    expected_value,
+                    value,
                 )
 
     def createXPlaneFileFromPotentialRoot(

io_xplane2blender/xplane_types/xplane_material.py

@@ -76,6 +76,7 @@ def __init__(self, xplaneObject: xplane_object.XPlaneObject):
         self.attributes.add(XPlaneAttribute("ATTR_solid_camera"))
         self.attributes.add(XPlaneAttribute("ATTR_no_solid_camera"))
 
+        # These weights are hueristics
         self.attributes.add(XPlaneAttribute("ATTR_light_level", None, 1000))
         self.attributes.add(XPlaneAttribute("ATTR_light_level_reset", True, 1000))
         self.attributes.add(XPlaneAttribute("ATTR_poly_os", None, 1000))

io_xplane2blender/xplane_types/xplane_primitive.py

@@ -30,8 +30,9 @@ class XPlanePrimitive(XPlaneObject):
     def __init__(self, blenderObject: bpy.types.Object):
         assert blenderObject.type == "MESH"
         super().__init__(blenderObject)
-        self.attributes.add(XPlaneAttribute("ATTR_light_level", None, 1000))
-        self.attributes.add(XPlaneAttribute("ATTR_light_level_reset", True, 1000))
+        # TODO: Do these weights make sense?
+        self.attributes.add(XPlaneAttribute("ATTR_light_level"))
+        self.attributes.add(XPlaneAttribute("ATTR_light_level_reset"))
         # Starting end ending indices for this object.
         self.indices = [0, 0]
         self.material = XPlaneMaterial(self)