Merge pull request #311 from AsoboStudio/glTF-Blender-IO-MSFS-v1.3.3

Update MSFS exporter/importer glTF Blender v1.3.3

Author: y-khodja

addons/io_scene_gltf2_msfs/__init__.py

@@ -24,7 +24,7 @@
     "author": "Luca Pierabella, Yasmine Khodja, Wing42, pepperoni505, ronh991, and others",
     "description": "This toolkit prepares your 3D assets to be used for Microsoft Flight Simulator",
     "blender": (3, 3, 0),
-    "version": (1, 3, 2),
+    "version": (1, 3, 3),
     "location": "File > Import-Export",
     "category": "Import-Export",
     "tracker_url": "https://github.com/AsoboStudio/glTF-Blender-IO-MSFS"
@@ -34,18 +34,23 @@ def get_version_string():
     return str(bl_info['version'][0]) + '.' + str(bl_info['version'][1]) + '.' + str(bl_info['version'][2])
 
 class MSFS_ImporterProperties(bpy.types.PropertyGroup):
-    enabled: bpy.props.BoolProperty(
+    enable_msfs_extension: bpy.props.BoolProperty(
         name='Microsoft Flight Simulator Extensions',
         description='Enable MSFS glTF import extensions',
         default=True
     )
 
 class MSFS_ExporterProperties(bpy.types.PropertyGroup):
+    def msfs_enable_msfs_extension_update(self, context):
+        props = bpy.context.scene.msfs_exporter_settings
+        settings = bpy.context.scene.msfs_multi_exporter_settings
+        settings.enable_msfs_extension = props.enable_msfs_extension
 
-    enabled: bpy.props.BoolProperty(
+    enable_msfs_extension: bpy.props.BoolProperty(
         name='Microsoft Flight Simulator Extensions',
         description='Enable MSFS glTF export extensions',
         default=True,
+        update=msfs_enable_msfs_extension_update
     )
 
     use_unique_id: bpy.props.BoolProperty(
@@ -79,7 +84,7 @@ def draw(self, context):
         layout.use_property_split = True
         layout.use_property_decorate = False  # No animation.
 
-        layout.prop(props, 'enabled', text="Enabled")
+        layout.prop(props, 'enable_msfs_extension', text="Enabled")
 
 class GLTF_PT_MSFSExporterExtensionPanel(bpy.types.Panel):
     bl_space_type = 'FILE_BROWSER'
@@ -96,17 +101,17 @@ def poll(cls, context):
 
     def draw_header(self, context):
         layout = self.layout
-        layout.label(text="MSFS Extensions", icon='TOOL_SETTINGS')
+        layout.label(text="Microsoft Flight Simulator Extensions", icon='TOOL_SETTINGS')
 
     def draw(self, context):
-        props = bpy.context.scene.msfs_exporter_properties
+        props = bpy.context.scene.msfs_exporter_settings
 
         layout = self.layout
         layout.use_property_split = True
         layout.use_property_decorate = False  # No animation.
 
-        layout.prop(props, 'enabled', text="Enabled")
-        if props.enabled:
+        layout.prop(props, 'enable_msfs_extension', text="Enabled")
+        if props.enable_msfs_extension:
             layout.prop(props, 'use_unique_id', text="Enable ASOBO Unique ID extension")
 
 def recursive_module_search(path, root=""):
@@ -164,7 +169,7 @@ def register():
             pass
 
     bpy.types.Scene.msfs_importer_properties = bpy.props.PointerProperty(type=MSFS_ImporterProperties)
-    bpy.types.Scene.msfs_exporter_properties = bpy.props.PointerProperty(type=MSFS_ExporterProperties)
+    bpy.types.Scene.msfs_exporter_settings = bpy.props.PointerProperty(type=MSFS_ExporterProperties)
 
 
 def register_panel():
@@ -231,4 +236,4 @@ def __init__(self):
         # Otherwise, it may fail because the gltf2 may not be loaded yet
         from io_scene_gltf2.io.com.gltf2_io_extensions import Extension
         self.Extension = Extension
-        self.properties = bpy.context.scene.msfs_exporter_properties
+        self.properties = bpy.context.scene.msfs_exporter_settings

addons/io_scene_gltf2_msfs/blender/gizmo.py

@@ -12,14 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import bpy
+from math import radians
+
 import bgl
-import gpu
 import bmesh
+import bpy
+import gpu
 import numpy as np
-from mathutils import Matrix
-from math import radians
 from gpu_extras.batch import batch_for_shader
+from mathutils import Matrix
 
 
 class MSFSGizmoProperties():
@@ -216,8 +217,9 @@ def refresh(self, context):
 
         for _, (empty, gizmo) in enumerate(self.__class__.empties.copy().items()):
             if empty not in found_empties:
-                self.gizmos.remove(gizmo)
                 del self.__class__.empties[empty]
+                if gizmo:
+                    self.gizmos.remove(gizmo)
 
         # Check if there are any new gizmo empties, and if so create new gizmo. We can't do this in the above loop due to the crash mentioned above
         for object in context.view_layer.objects:

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

@@ -67,6 +67,7 @@ class MSFS_ShaderNodesTypes(Enum):
     shaderNodeRGB = "ShaderNodeRGB"
     shaderNodeValue = "ShaderNodeValue"
     shaderNodeRGBCurve = "ShaderNodeRGBCurve"
+    shaderNodeMapRange = "ShaderNodeMapRange"
 
 class MSFS_FrameNodes(Enum):
     baseColorFrame = "Base Color Frame"
@@ -95,6 +96,9 @@ class MSFS_ShaderNodes(Enum):
     occlusionMul = "Occlusion Multiplier"
     roughnessMul = "Roughness Multiplier"
     metallicMul = "Metallic Multiplier"
+    detailOMRMul = "Multiply detail OcclMetalRough"
+    detailOMRSubtract = "Subtract detail OcclMetalRough"
+    detailOMRClamp = "Clamp detail OcclMetalRough"
     emissiveTex = "Emissive Texture"
     emissiveColor = "Emissive RGB"
     emissiveScale = "Emissive Scale"
@@ -120,7 +124,7 @@ class MSFS_ShaderNodes(Enum):
     blendNormalMap = "Blend Normal Map"
     blendColorMap = "Blend Color Map"
     blendAlphaMap = "Blend Alpha Map"
-    blendCompMap = "Blend Occlusion(R) Roughness(G) Metallic(B) Map"
+    blendCompMap = "Add Occlusion(R) Roughness(G) Metallic(B)"
     vertexColor = "Vertex Color"
     albedoDetailMix = "Albedo Detail Mix"
     behindGlassTex = "Behind Glass"

addons/io_scene_gltf2_msfs/blender/msfs_material_function.py

@@ -443,6 +443,54 @@ def defaultShadersTree(self):
             color = (0.1, 0.4, 0.6)
         )
 
+        ## Multiply Detail OMR
+        # In[0] : Detail OMR texture
+        # Out[0] : Substract Detail OMR
+        multiplyDetailOMR = self.addNode(
+            name = MSFS_ShaderNodes.detailOMRMul.value,
+            typeNode = MSFS_ShaderNodesTypes.shaderNodeVectorMath.value,
+            operation = "MULTIPLY",
+            location = (-500.0, 200.0),
+            width = 200.0,
+            frame = omrFrame
+        )
+        multiplyDetailOMR.inputs[1].default_value = (2.0, 2.0, 2.0)
+
+        ## Links
+        self.link(detailCompTexNode.outputs[0], multiplyDetailOMR.inputs[0])
+
+        ## Substract Detail OMR
+        # In[0] : Multiply Detail OMR
+        # Out[0] : Clamp Detail OMR
+        subtractDetailOMR = self.addNode(
+            name = MSFS_ShaderNodes.detailOMRSubtract.value,
+            typeNode = MSFS_ShaderNodesTypes.shaderNodeVectorMath.value,
+            operation = "SUBTRACT",
+            location = (-500.0, 150.0),
+            width = 200.0,
+            frame = omrFrame
+        )
+        subtractDetailOMR.inputs[1].default_value = (1.0, 1.0, 1.0)
+
+        ## Links
+        self.link(multiplyDetailOMR.outputs[0], subtractDetailOMR.inputs[0])
+
+        ## Map to clamp detail OMR
+        # In[0] : Substract Detail OMR
+        # Out[0] : Add Detail comp
+        clampDetailOMR = self.addNode(
+            name = MSFS_ShaderNodes.detailOMRClamp.value,
+            typeNode = MSFS_ShaderNodesTypes.shaderNodeMapRange.value,
+            location = (-500.0, 100.0),
+            width = 200.0,
+            frame = omrFrame
+        )
+        clampDetailOMR.data_type = "FLOAT_VECTOR"
+        clampDetailOMR.interpolation_type = "LINEAR"
+
+        ## Links
+        self.link(subtractDetailOMR.outputs[0], clampDetailOMR.inputs[6]) ## input[6] == "Vector"
+
         ## Metallic scale
         # Out[0] : Metallic Multiplier -> In[0] 
         # Out[0] : PrincipledBSDF -> In["Metallic"] 
@@ -464,24 +512,22 @@ def defaultShadersTree(self):
         )
 
         ## Blend Detail Operations (OccMetalRough)
-        # Detail comp operators
+        # Add Detail comp 
         # In[0] : Vertex Color -> Out[1]
         # In[1] : Comp Texture -> Out[0]
         # In[2] : Detail Comp Texture -> Out[0]
         blendCompMapNode = self.addNode(
             name = MSFS_ShaderNodes.blendCompMap.value,
-            typeNode = MSFS_ShaderNodesTypes.shaderNodeMixRGB.value,
-            blend_type = "MULTIPLY",
+            typeNode = MSFS_ShaderNodesTypes.shaderNodeVectorMath.value,
+            operation = "ADD",
             location = (-150.0, 200.0),
             width = 300.0,
             frame = omrFrame
-        )     
-        blendCompMapNode.inputs[0].default_value = 1.0
+        )
 
         ## Links
-        self.link(blendCompMapNode.inputs[0], vertexColorNode.outputs[1])
-        self.link(blendCompMapNode.inputs[1], compTexNode.outputs[0])
-        self.link(blendCompMapNode.inputs[2], detailCompTexNode.outputs[0])
+        self.link(compTexNode.outputs[0], blendCompMapNode.inputs[0])
+        self.link(clampDetailOMR.outputs[1], blendCompMapNode.inputs[1])
 
         ## Split Occlusion Metallic Roughness
         # In[0] : Blend Comp Map -> Out[0]
@@ -554,7 +600,7 @@ def defaultShadersTree(self):
             name = MSFS_ShaderNodes.emissiveMul.value,
             typeNode = MSFS_ShaderNodesTypes.shaderNodeMixRGB.value,
             blend_type = "MULTIPLY",
-            location = (200.0, 0.0),
+            location = (250.0, -50.0),
             frame = emissiveFrame
         )
 
@@ -868,11 +914,14 @@ def updateEmissiveLinks(self):
 
         # emissive
         if nodeEmissiveTex.image:
-            self.link(nodeEmissiveColor.outputs[0], nodeMulEmissive.inputs[0])
-            self.link(nodeEmissiveTex.outputs[0], nodeMulEmissive.inputs[1])
+            self.link(nodeEmissiveScale.outputs[0], nodeMulEmissive.inputs[0])
+            self.link(nodeEmissiveColor.outputs[0], nodeMulEmissive.inputs[1])
+            self.link(nodeEmissiveTex.outputs[0], nodeMulEmissive.inputs[2])
             self.link(nodeMulEmissive.outputs[0], nodePrincipledBSDF.inputs[MSFS_PrincipledBSDFInputs.emission.value])
         else:
             self.link(nodeEmissiveColor.outputs[0], nodePrincipledBSDF.inputs[MSFS_PrincipledBSDFInputs.emission.value])
+            self.unLinkNodeInput(nodeMulEmissive, 0)
+            self.unLinkNodeInput(nodeMulEmissive, 1)
 
         self.link(nodeEmissiveScale.outputs[0], nodePrincipledBSDF.inputs[MSFS_PrincipledBSDFInputs.emissionStrength.value])
 
@@ -888,11 +937,6 @@ def updateCompLinks(self):
         nodeGltfSettings = self.getNodeByName(MSFS_ShaderNodes.glTFSettings.value)
         nodePrincipledBSDF = self.getNodeByName(MSFS_ShaderNodes.principledBSDF.value)
 
-        # blend comp
-        # !!!! input orders matters for the exporter here
-        self.link(nodeCompTex.outputs[0], nodeBlendCompMap.inputs[1])
-        self.link(nodeDetailCompTex.outputs[0], nodeBlendCompMap.inputs[2])
-
         # occlMetalRough
         self.link(nodeBlendCompMap.outputs[0], nodeSeparateComp.inputs[0])
         self.link(nodeMetallicScale.outputs[0], nodeMulMetallic.inputs[0])
@@ -910,13 +954,6 @@ def updateCompLinks(self):
             self.link(nodeMulRoughness.outputs[0], nodePrincipledBSDF.inputs[MSFS_PrincipledBSDFInputs.roughness.value])
             self.link(nodeMulMetallic.outputs[0], nodePrincipledBSDF.inputs[MSFS_PrincipledBSDFInputs.metallic.value])
 
-            if nodeCompTex.image and nodeDetailCompTex.image:
-                nodeBlendCompMap.blend_type = "MULTIPLY"
-            else: # we have only one of the two images
-                nodeBlendCompMap.blend_type = "ADD"
-
-
-
     def setBlendMode(self, blendMode):
         if blendMode == "BLEND":
             self.makeAlphaBlend()
@@ -930,17 +967,14 @@ def setBlendMode(self, blendMode):
     def toggleVertexBlendMapMask(self, useVertex=True):
         nodeVertexColor = self.getNodeByName(MSFS_ShaderNodes.vertexColor.value)
         nodeBlendColorMap = self.getNodeByName(MSFS_ShaderNodes.blendColorMap.value)
-        nodeBlendCompMap = self.getNodeByName(MSFS_ShaderNodes.blendCompMap.value)
         nodeBlendNormalMap = self.getNodeByName(MSFS_ShaderNodes.blendNormalMap.value)
         nodeBlendMaskTex = self.getNodeByName(MSFS_ShaderNodes.blendMaskTex.value)
         # vertexcolor mask
         if useVertex:
             self.link(nodeVertexColor.outputs[1], nodeBlendColorMap.inputs[0])
-            self.link(nodeVertexColor.outputs[1], nodeBlendCompMap.inputs[0])
             self.link(nodeVertexColor.outputs[1], nodeBlendNormalMap.inputs[0])
         else:
             self.link(nodeBlendMaskTex.outputs[0], nodeBlendColorMap.inputs[0])
-            self.link(nodeBlendMaskTex.outputs[0], nodeBlendCompMap.inputs[0])
             self.link(nodeBlendMaskTex.outputs[0], nodeBlendNormalMap.inputs[0])
 
     def makeOpaque(self):

addons/io_scene_gltf2_msfs/blender/msfs_material_prop_update.py

@@ -136,7 +136,7 @@ def update_msfs_material_type(self, context):
     def reset_material_prop_object(self):
         self.msfs_alpha_cutoff = 0.5
         self.msfs_base_color_blend_factor = 1.0
-        self.msfs_base_color_factor = [0.8, 0.8, 0.8, 1.0]
+        self.msfs_base_color_factor = [1.0, 1.0, 1.0, 1.0]
         self.msfs_base_color_texture = None
         self.msfs_blend_mask_texture = None
         self.msfs_clamp_uv_x = False
@@ -188,7 +188,7 @@ def reset_material_prop_object(self):
         self.msfs_road_collision_material = False
         self.msfs_roughness_blend_factor = 1.0
         self.msfs_roughness_factor = 1.0
-        self.msfs_sss_color = [0.8, 0.8, 0.8, 1.0]
+        self.msfs_sss_color = [1.0, 1.0, 1.0, 1.0]
         self.msfs_use_pearl = False
         self.msfs_uv_offset_u = 0.0
         self.msfs_uv_offset_v = 0.0
@@ -199,6 +199,7 @@ def reset_material_prop_object(self):
         self.msfs_wiper_2_state = 0.0
         self.msfs_wiper_3_state = 0.0
         self.msfs_wiper_4_state = 0.0
+        self.msfs_alpha_mode = "OPAQUE"
         return
 
     @staticmethod

addons/io_scene_gltf2_msfs/blender/ui_properties.py

@@ -14,14 +14,6 @@
 
 import bpy
 
-# from .func_properties import *
-
-# class MSFS_UL_ObjectBehaviorListItem(bpy.types.UIList):
-#     bl_idname = "MSFS_UL_object_behaviorListItem"
-#     def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-#         split = layout.split(factor=0.65)
-#         split.label(text=item.name)
-#         split.label(text="(kf:%i-%i)"%(item.kf_start,item.kf_end))
 
 class MSFS_PT_BoneProperties(bpy.types.Panel):
     bl_label = "MSFS Properties"
@@ -91,32 +83,10 @@ def draw(self, context):
         elif active_object.type == 'EMPTY':
             box = layout.box()
             box.label(text="MSFS Collision Parameters", icon='SHADING_BBOX')
-            box.prop(active_object, "msfs_gizmo_type") # TODO: change to msfs_msfs_gizmo_type
+            box.prop(active_object, "msfs_gizmo_type")
             if active_object.msfs_gizmo_type != "NONE":
                 box.prop(active_object, "msfs_collision_is_road_collider")
 
-        
-
-
-        #if bpy.context.active_object.type == 'ARMATURE':
-        #    box=layout.box()
-        #    box.label(text = "Behavior tags are stored in individual bones.", icon = 'ANIM')
-        #else:
-        #    box=layout.box()
-        #    box.label(text = "Behavior list", icon = 'ANIM')
-        #    box.template_list('OBJECTBEHAVIOR_UL_listItem', "", context.object, 'msfs_behavior', context.object, 'msfs_active_behavior')
-
-        #    if len(context.object.msfs_behavior) > context.object.msfs_active_behavior:
-        #        behavior = context.object.msfs_behavior[context.object.msfs_active_behavior]
-
-        #        subbox=box.box()
-        #        subbox.label(text=behavior.name,icon='OUTLINER_DATA_GP_LAYER')
-        #        if behavior.source_file != "":
-        #            subbox.label(text="XML: %s"%behavior.source_filename,icon='FILE')
-        #        split=subbox.split(factor=0.75)
-        #        split.label(text="Keyframes start: %i"%behavior.kf_start,icon='DECORATE_KEYFRAME')
-        #        split.label(text="end: %i"%behavior.kf_end)
-        #        subbox.operator('msfs.behavior_remove_selected_from_object',text="Remove selected behavior",icon='TRASH')