Fix export of base color, metalic and roughness factors

Author: y-khodja

addons/io_scene_gltf2_msfs/com/msfs_material_props.py

@@ -282,7 +282,19 @@ def from_dict(
 
     @staticmethod
     def to_extension(blender_material, gltf2_material, export_settings):
-        # All the properties here (besides some textures, which we handle elsewhere) are exported from the Khronos exporter
+
+        if gltf2_material.pbr_metallic_roughness:
+            gltf2_material.pbr_metallic_roughness.base_color_factor = [f for f in blender_material.msfs_base_color_factor] 
+            gltf2_material.emissive_factor = [f * blender_material.msfs_emissive_scale for f in blender_material.msfs_emissive_factor]
+            gltf2_material.pbr_metallic_roughness.metallic_factor = blender_material.msfs_metallic_factor
+            gltf2_material.pbr_metallic_roughness.roughness_factor = blender_material.msfs_roughness_factor
+        
+        if gltf2_material.normal_texture:
+            gltf2_material.normal_texture.scale = blender_material.msfs_normal_scale
+
+        if "KHR_materials_emissive_strength" in gltf2_material.extensions:
+            gltf2_material.extensions.pop("KHR_materials_emissive_strength")
+
         gltf2_material.emissive_factor = [f * blender_material.msfs_emissive_scale for f in blender_material.msfs_emissive_factor]
 
         if "KHR_materials_emissive_strength" in gltf2_material.extensions:

addons/io_scene_gltf2_msfs/io/msfs_multi_export.py

@@ -218,11 +218,11 @@ def execute(self, context):
             sort_by_collection = context.scene.multi_exporter_grouped_by_collections
 
             for lod_group in lod_groups:
-                # Generate XML if needed
                 export_folder_path = lod_group.folder_path
                 if export_folder_path == '//\\':
                         export_folder_path = export_folder_path.rsplit('\\')[0]
                 export_folder_path = bpy.path.abspath(export_folder_path)
+                # Generate XML if needed
                 if lod_group.generate_xml:
                     xml_path = os.path.join(export_folder_path, lod_group.group_name + ".xml")
                     found_guid = None