Added 3.18.0 source

blueburncz · Aug 9, 2023 · 5a96182 · 5a96182
1 parent 45ce066
commit 5a96182
Show file tree

Hide file tree

Showing 108 changed files with 7,238 additions and 405 deletions.
diff --git a/BBMOD_CLI/CMakeLists.txt b/BBMOD_CLI/CMakeLists.txt
@@ -24,14 +24,14 @@ function(configure_target target)
 
     target_link_libraries(${target} ${LIBASSIMP})
 
-    if(APPLE)
-        # Find shared libraries next to the executable
-        # Source: https://stackoverflow.com/a/69707790
-        # ($ORIGIN doesn't work but . does)
-        set_target_properties(${target} PROPERTIES
-            BUILD_WITH_INSTALL_RPATH FALSE
-            LINK_FLAGS "-Wl,-rpath,./")
-    endif()
+    # if(APPLE)
+    #     # Find shared libraries next to the executable
+    #     # Source: https://stackoverflow.com/a/69707790
+    #     # ($ORIGIN doesn't work but . does)
+    #     set_target_properties(${target} PROPERTIES
+    #         BUILD_WITH_INSTALL_RPATH FALSE
+    #         LINK_FLAGS "-Wl,-rpath,./")
+    # endif()
 endfunction()
 
 # BBMOD CLI

diff --git a/BBMOD_CLI/include/BBMOD/Config.hpp b/BBMOD_CLI/include/BBMOD/Config.hpp
@@ -77,6 +77,15 @@ struct SConfig
 	/** Apply scale defined in the model. */
 	bool ApplyScale = false;
 
+	/** Export materials to BBMAT files. (experimental) */
+	bool ExportMaterials = false;
+
+	/** Convert model from Y-up to Z-up. (experimental)  */
+	bool ConvertToZUp = false;
+
+	/** Prefix output files with model name. */
+	bool Prefix = true;
+
 	/**
 	 * Configures generation of normal vectors.
 	 * 

diff --git a/BBMOD_CLI/include/BBMOD/Mesh.hpp b/BBMOD_CLI/include/BBMOD/Mesh.hpp
@@ -51,7 +51,7 @@ struct SVertex
 
 struct SMesh
 {
-	static SMesh* FromAssimp(struct aiMesh* mesh, struct SModel* model, const struct SConfig& config);
+	static SMesh* FromAssimp(const struct aiScene* scene, struct aiMesh* mesh, struct SModel* model, const struct SConfig& config);
 
 	bool Save(std::ofstream& file);