Fix use_330 defaulting to True instead of None

simplepbr/__init__.py

@@ -1,6 +1,12 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field, InitVar
+from dataclasses import (
+    dataclass,
+    field,
+    Field,
+    InitVar,
+    MISSING,
+)
 import builtins
 import functools
 import math
@@ -90,6 +96,11 @@ def add_prc_fields(cls: type) -> type:
 
     def factoryfn(attrname: str, attrtype: str, default_value: Any) -> Any:
         name=f'simplepbr-{attrname.replace("_", "-")}'
+        if isinstance(default_value, Field):
+            if default_value.default_factory is not MISSING:
+                default_value = default_value.default_factory()
+            elif default_value.default is not MISSING:
+                default_value = default_value.default
         return prc_types[attrtype](
             name=name,
             default_value=default_value,
@@ -99,13 +110,15 @@ def wrap(cls: type) -> type:
         annotations = cls.__dict__.get('__annotations__', {})
         for attrname, attrtype in annotations.items():
             if attrname.startswith('_'):
+                # Private member, skip
                 continue
 
             default_value = getattr(cls, attrname)
             if attrtype.startswith('Literal') and isinstance(default_value, int):
                 attrtype = 'int'
 
             if attrtype not in prc_types:
+                # Not a currently supported type, skip
                 continue
 
             # pylint:disable-next=invalid-field-call

tests/test_setup.py

@@ -31,6 +31,7 @@ def test_setup_prc_variables(showbase):
     assert pipeline.max_lights == 4
     assert not pipeline.use_emission_maps
     assert pipeline.msaa_samples == 8
+    assert not pipeline.use_330
 
 
 @pytest.mark.parametrize('showbase', ['', 'gl-version 3 2'], indirect=True)