Jelajahi Sumber

Enabled FBX, BLEND assimp loaders.

Mark Sibly 8 tahun lalu
induk
melakukan
19f646e6cd

+ 12 - 3
modules/assimp/assimp/include/assimp/config.h

@@ -106,12 +106,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ASSIMP_BUILD_NO_OPENGEX_IMPORTER 1
 #define ASSIMP_BUILD_NO_MS3D_IMPORTER 1
 #define ASSIMP_BUILD_NO_COB_IMPORTER 1
-#define ASSIMP_BUILD_NO_BLEND_IMPORTER 1
+//#define ASSIMP_BUILD_NO_BLEND_IMPORTER 1
 #define ASSIMP_BUILD_NO_Q3BSP_IMPORTER 1
 #define ASSIMP_BUILD_NO_NDO_IMPORTER 1
 #define ASSIMP_BUILD_NO_IFC_IMPORTER 1
 #define ASSIMP_BUILD_NO_XGL_IMPORTER 1
-#define ASSIMP_BUILD_NO_FBX_IMPORTER 1
+//#define ASSIMP_BUILD_NO_FBX_IMPORTER 1
 #define ASSIMP_BUILD_NO_ASSBIN_IMPORTER 1
 #define ASSIMP_BUILD_NO_GLTF_IMPORTER 1
 #define ASSIMP_BUILD_NO_3MF_IMPORTER 1
@@ -691,7 +691,16 @@ enum aiComponent
     "IMPORT_FBX_OPTIMIZE_EMPTY_ANIMATION_CURVES"
 
 
-
+// ---------------------------------------------------------------------------
+/** @brief Set whether the fbx importer will search for embedded loaded textures, where no embedded texture data is provided.
+*
+* The default value is false (0)
+* Property type: bool
+*/
+#define AI_CONFIG_IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES \
+	"IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES"
+	
+	
 // ---------------------------------------------------------------------------
 /** @brief  Set the vertex animation keyframe to be imported
  *

+ 23 - 0
modules/assimp/makefile.monkey2

@@ -102,6 +102,29 @@ Namespace assimp
 
 #Import "assimp/code/MS3DLoader.cpp"
 
+#Import "assimp/code/FBXImporter.cpp"
+#Import "assimp/code/FBXParser.cpp"
+#Import "assimp/code/FBXTokenizer.cpp"
+#Import "assimp/code/FBXConverter.cpp"
+#Import "assimp/code/FBXUtil.cpp"
+#Import "assimp/code/FBXDocument.cpp"
+#Import "assimp/code/FBXProperties.cpp"
+#Import "assimp/code/FBXMeshGeometry.cpp"
+#Import "assimp/code/FBXMaterial.cpp"
+#Import "assimp/code/FBXModel.cpp"
+#Import "assimp/code/FBXAnimation.cpp"
+#Import "assimp/code/FBXNodeAttribute.cpp"
+#Import "assimp/code/FBXDeformer.cpp"
+#Import "assimp/code/FBXBinaryTokenizer.cpp"
+#Import "assimp/code/FBXDocumentUtil.cpp"
+
+#Import "assimp/code/BlenderLoader.cpp"
+#Import "assimp/code/BlenderDNA.cpp"
+#Import "assimp/code/BlenderScene.cpp"
+#Import "assimp/code/BlenderModifier.cpp"
+#Import "assimp/code/BlenderBMesh.cpp"
+#Import "assimp/code/BlenderTessellator.cpp"
+
 #rem
 #Import "assimp/code/StepExporter.cpp"
 #Import "assimp/code/AMFImporter.cpp"