Merge pull request #348 from AsoboStudio/merge_main_4_5

Update the blender 4.5 branch

Author: y-khodja

README.md

@@ -13,6 +13,9 @@ This repository contains the current version of the official Microsoft Flight Si
 :warning: This plugin is NOT compatible with the legacy exporter developed for FSX and P3D.  Remove these plugin (Prefered) or disabled these plugins.
 <br>
 
+:warning: This addon need to have the `Import-Export: gltf 2.0 format` addon (gltf2 Khronos IO) **enabled** to work. Do not remove it or disable it !
+<br>
+
 :warning: Supported blender versions of the latest version of the addon:
 - **3.3.x LTS**
 - **3.6.x LTS**
@@ -23,25 +26,17 @@ We can't guarantee not having bugs with other unstable versions
 *******
 
 # Summary
-- [How to Install the Add-on](#how-to-install-the-add-on)
-  - [How to Install the ASOBO Blender MSFS2020 Importer/Exporter using Blender:](#how-to-install-the-asobo-blender-msfs2020-importerexporter-using-blender)
-  - [How to Install the ASOBO Blender msfs2020 exporter by Copy/Paste to AppData](#how-to-install-the-asobo-blender-msfs2020-exporter-by-copypaste-to-appdata)
+- [How to Install the ASOBO Blender MSFS2020 Importer/Exporter using Blender:](#how-to-install-the-asobo-blender-msfs2020-importerexporter-using-blender)
 - [How to remove the Add-on](#how-to-remove-the-add-on)
 - [Migration of Legacy Blend File Material Types/Modes](#migration-of-legacy-blend-file-material-typesmodes)
   - [Steps For Migration](#steps-for-migration)
 - [Documentation](#documentation)
 - [Notes On Shadertree](#notes-on-shadertree)
 
 
-# How to Install the Add-on
-
-There are two ways to install the MSFS2020 Blender exporter. Either using the Edit Preferences Menu and Install tab, or copy/paste the addon files to your %APPDATA% folder. Installation steps are explained down bellow :
-
 ## How to Install the ASOBO Blender MSFS2020 Importer/Exporter using Blender:
 
-1. Go to the Releases section of the https://github.com/AsoboStudio/Microsoft-Flight-Simulator-2020-glTF-Blender-IO repository. Then download the zip file `io_scene_gltf2_msfs_2020.zip`.
-
-![Download Release](misc/Install/Download_rel.png)
+1. Go to the Releases section of the https://github.com/AsoboStudio/Microsoft-Flight-Simulator-2020-glTF-Blender-IO repository. Then download the zip file `io_scene_gltf2_msfs_2020.zip` of the latest release.
 
 2. Open Blender and go to : Edit > Preferences.
 
@@ -59,23 +54,6 @@ There are two ways to install the MSFS2020 Blender exporter. Either using the Ed
 
 <br>
 
-## How to Install the ASOBO Blender MSFS2020 exporter by Copy/Paste to AppData
-
-1. Close Blender if you have it open.
-2. Go to the Releases section of the https://github.com/AsoboStudio/glTF-Blender-IO-MSFS repository. Then download the zip file `io_scene_gltf2_msfs_2020.zip`
-3. Decompress the contents of the file to a temporary location.
-4. Select the `io_scene_gltf2_msfs_2020` folder then copy it to the clipboard (Ctrl + "C").
-5. Now browse to the Blender `addons` folder, which - by default - can be found in the following locations:
-   - **Windows**: This will usually be in `%AppData%\Blender Foundation\Blender\<blender-version>\scripts\addons\`.
-   - **Mac OS X**: This will be in your Library (Press the *Option* key when in Finder's `Go` menu to open your Library folder): `\Users\<username>\Library\Application Support\Blender\<blender-version>\scripts\addons\`.
-6. Paste the `io_scene_gltf2_msfs_2020` into the Blender `addons` folder (Ctrl + V).
-
-After completing the process outlined above, you will need to start Blender and then activate the plugin. Activation is done from Edit > Preferences, as shown in the image below:
-
-**NOTE** : You may need to restart Blender again after activating the plugin for all the options to be visible in the IDE.
-
-![Edit Preferences - Enable](misc/Install/Enable_checkbox_addon.png)
-
 # How to remove the Add-on
 
 1. If you previously installed the Microsoft Flight Simulator 2020 glTF Extensions Add-on, Remove/Delete the older version using the Blender Edit > Preferences Menu. 
@@ -84,7 +62,7 @@ After completing the process outlined above, you will need to start Blender and
 
 
 2. Select the Add-ons tab. Search for the `Microsoft Flight Simulator 2020 glTF Extension` Importer/Exporter add-on in the search box. Delete the `Import-Export: Microsoft Flight Simulator 2020 gltf Extension` using the `Remove` button.<br>  
-:warning: DO NOT DELETE THE `Import-Export: gltf 2.0 format` Add-on.
+:warning: DO NOT DELETE OR DISABLE THE `Import-Export: gltf 2.0 format` Add-on.
 
 ![Search Remove](misc/Install/Edit_Pref_search_rem.png)
 

addons/io_scene_gltf2_msfs_2020/blender/material/msfs_material_environment_occluder.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from ..msfs_material_function import MSFS2020_Material
-
+from .utils.msfs_material_enum import MSFS2020_PrincipledBSDFInputs
 
 class MSFS2020_Environment_Occluder(MSFS2020_Material):
     def __init__(self, material, buildTree=False):
@@ -22,4 +22,4 @@ def __init__(self, material, buildTree=False):
     def customShaderTree(self):
         super().defaultShadersTree()
         principledBSDF = self.getNodesByClassName("ShaderNodeBsdfPrincipled")[0]
-        principledBSDF.inputs[21].default_value = 0
+        principledBSDF.inputs[MSFS2020_PrincipledBSDFInputs.alpha.value].default_value = 0

addons/io_scene_gltf2_msfs_2020/blender/material/utils/msfs_material_enum.py

@@ -146,14 +146,15 @@ class MSFS2020_PrincipledBSDFInputs(Enum):
     roughness = "Roughness"
     anisotropic = "Anisotropic"
     anisotropicRotation = "Anisotropic Rotation"
-    clearcoat = "Clearcoat"
-    clearcoatRoughness = "Clearcoat Roughness"
     emissionStrength = "Emission Strength"
     alpha = "Alpha"
     normal = "Normal"
     if bpy.app.version < (4, 2, 0):
         emission = "Emission"
         subsurfaceColor = "Subsurface Color"
+        clearcoat = "Clearcoat"
+        clearcoatRoughness = "Clearcoat Roughness"
     else:
         emission = "Emission Color"
-    
+        clearcoat = "Coat Tint"
+        clearcoatRoughness = "Coat Roughness"

addons/io_scene_gltf2_msfs_2020/com/msfs_material_props.py

@@ -549,12 +549,16 @@ def from_dict(blender_material, gltf2_material, import_settings):
 
     @staticmethod
     def to_extension(blender_material, gltf2_material, export_settings):
+        result = {}
         if (
             blender_material.msfs_material_type == "msfs_standard"
             and blender_material.msfs_day_night_cycle
         ):
+            result["enabled"] = True
             gltf2_material.extensions[AsoboDayNightCycle.SerializedName] = Extension(
-                name=AsoboDayNightCycle.SerializedName, extension={'dummy': None} , required=False
+                name=AsoboDayNightCycle.SerializedName, 
+                extension=result , 
+                required=False
             )
 
 

addons/io_scene_gltf2_msfs_2020/io/msfs_export.py

@@ -133,5 +133,8 @@ def gather_material_hook(
             export_settings
         )
 
+        if "KHR_materials_clearcoat" in gltf2_material.extensions:
+            gltf2_material.extensions.pop("KHR_materials_clearcoat", None)
+            
         if "KHR_materials_anisotropy" in gltf2_material.extensions:
             gltf2_material.extensions.pop("KHR_materials_anisotropy", None)