2
0
Эх сурвалжийг харах

Merge pull request #2400 from mlavik1/issue_2393

issue_2393: Added AI_MATKEY_TRANSPARENCYFACTOR
Kim Kulling 6 жил өмнө
parent
commit
906a60a38d

+ 6 - 0
code/FBXConverter.cpp

@@ -2041,6 +2041,12 @@ namespace Assimp {
                 CalculatedOpacity = 1.0f - ((Transparent.r + Transparent.g + Transparent.b) / 3.0f);
                 CalculatedOpacity = 1.0f - ((Transparent.r + Transparent.g + Transparent.b) / 3.0f);
             }
             }
 
 
+            // try to get the transparency factor
+            const float TransparencyFactor = PropertyGet<float>(props, "TransparencyFactor", ok);
+            if (ok) {
+                out_mat->AddProperty(&TransparencyFactor, 1, AI_MATKEY_TRANSPARENCYFACTOR);
+            }
+
             // use of TransparencyFactor is inconsistent.
             // use of TransparencyFactor is inconsistent.
             // Maya always stores it as 1.0,
             // Maya always stores it as 1.0,
             // so we can't use it to set AI_MATKEY_OPACITY.
             // so we can't use it to set AI_MATKEY_OPACITY.

+ 1 - 0
include/assimp/material.h

@@ -900,6 +900,7 @@ extern "C" {
 #define AI_MATKEY_ENABLE_WIREFRAME "$mat.wireframe",0,0
 #define AI_MATKEY_ENABLE_WIREFRAME "$mat.wireframe",0,0
 #define AI_MATKEY_BLEND_FUNC "$mat.blend",0,0
 #define AI_MATKEY_BLEND_FUNC "$mat.blend",0,0
 #define AI_MATKEY_OPACITY "$mat.opacity",0,0
 #define AI_MATKEY_OPACITY "$mat.opacity",0,0
+#define AI_MATKEY_TRANSPARENCYFACTOR "$mat.transparencyfactor",0,0
 #define AI_MATKEY_BUMPSCALING "$mat.bumpscaling",0,0
 #define AI_MATKEY_BUMPSCALING "$mat.bumpscaling",0,0
 #define AI_MATKEY_SHININESS "$mat.shininess",0,0
 #define AI_MATKEY_SHININESS "$mat.shininess",0,0
 #define AI_MATKEY_REFLECTIVITY "$mat.reflectivity",0,0
 #define AI_MATKEY_REFLECTIVITY "$mat.reflectivity",0,0