Added as and pt to DLL, increased version, added changelog

blueburncz · Feb 4, 2023 · eac91c4 · eac91c4
1 parent b1d5f2e
commit eac91c4
Show file tree

Hide file tree

Showing 20 changed files with 104 additions and 18 deletions.
diff --git a/BBMOD_GML/datafiles/Data/BBMOD/BBMOD b/BBMOD_GML/datafiles/Data/BBMOD/BBMOD
diff --git a/BBMOD_GML/datafiles/Data/BBMOD/libBBMOD.dylib b/BBMOD_GML/datafiles/Data/BBMOD/libBBMOD.dylib
diff --git a/BBMOD_GML/datafiles/Data/BBMOD/libassimp.5.dylib b/BBMOD_GML/datafiles/Data/BBMOD/libassimp.5.dylib
diff --git a/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy b/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy
diff --git a/BBMOD_GML/options/amazonfire/options_amazonfire.yy b/BBMOD_GML/options/amazonfire/options_amazonfire.yy
diff --git a/BBMOD_GML/options/android/options_android.yy b/BBMOD_GML/options/android/options_android.yy
diff --git a/BBMOD_GML/options/html5/options_html5.yy b/BBMOD_GML/options/html5/options_html5.yy
diff --git a/BBMOD_GML/options/ios/options_ios.yy b/BBMOD_GML/options/ios/options_ios.yy
diff --git a/BBMOD_GML/options/linux/options_linux.yy b/BBMOD_GML/options/linux/options_linux.yy
diff --git a/BBMOD_GML/options/mac/options_mac.yy b/BBMOD_GML/options/mac/options_mac.yy
diff --git a/BBMOD_GML/options/operagx/options_operagx.yy b/BBMOD_GML/options/operagx/options_operagx.yy
diff --git a/BBMOD_GML/options/tvos/options_tvos.yy b/BBMOD_GML/options/tvos/options_tvos.yy
diff --git a/BBMOD_GML/options/windows/options_windows.yy b/BBMOD_GML/options/windows/options_windows.yy
diff --git a/BBMOD_GML/options/windowsuap/options_windowsuap.yy b/BBMOD_GML/options/windowsuap/options_windowsuap.yy
diff --git a/BBMOD_GML/scripts/BBMOD_DLL/BBMOD_DLL.gml b/BBMOD_GML/scripts/BBMOD_DLL/BBMOD_DLL.gml
@@ -123,7 +123,7 @@ function BBMOD_DLL()
 	///
 	/// @throws {BBMOD_Exception} If the operation fails.
 	///
-	/// @see BBMOD_DLL.get_disable_bone 
+	/// @see BBMOD_DLL.get_disable_bone
 	static set_disable_bone = function (_disable) {
 		gml_pragma("forceinline");
 		static _fn = external_define(
@@ -687,6 +687,84 @@ function BBMOD_DLL()
 		return self;
 	};
 
+	/// @func get_apply_scale()
+	///
+	/// @desc Checks whether the "apply scale" option is enabled.
+	///
+	/// @return {Bool} If `true` then the "apply scale" option is enabled.
+	///
+	/// @see BBMOD_DLL.set_apply_scale
+	static get_apply_scale = function () {
+		gml_pragma("forceinline");
+		static _fn = external_define(
+			BBMOD_DLL_PATH, "bbmod_dll_get_apply_scale", dll_cdecl, ty_real, 0);
+		return external_call(_fn);
+	};
+
+	/// @func set_apply_scale(_enable)
+	///
+	/// @desc Enables/disables the "apply scale" option, which applies global
+	/// scaling factor defined in the model file if enabled.
+	/// This is by default **disabled**.
+	///
+	/// @param {Bool} _enable `true` to enable the option.
+	///
+	/// @return {Struct.BBMOD_DLL} Returns `self`.
+	///
+	/// @throws {BBMOD_Exception} If the operation fails.
+	///
+	/// @see BBMOD_DLL.get_apply_scale
+	static set_apply_scale = function (_enable) {
+		gml_pragma("forceinline");
+		static _fn = external_define(
+			BBMOD_DLL_PATH, "bbmod_dll_set_apply_scale", dll_cdecl, ty_real, 1, ty_real);
+		var _retval = external_call(_fn, _enable);
+		if (_retval != __BBMOD_DLL_SUCCESS)
+		{
+			throw new BBMOD_Exception();
+		}
+		return self;
+	};
+
+	/// @func get_pre_transform()
+	///
+	/// @desc Checks whether the "pre-transform" option is enabled.
+	///
+	/// @return {Bool} If `true` then the "pre-transform" option is enabled.
+	///
+	/// @see BBMOD_DLL.set_pre_transform
+	static get_pre_transform = function () {
+		gml_pragma("forceinline");
+		static _fn = external_define(
+			BBMOD_DLL_PATH, "bbmod_dll_get_pre_transform", dll_cdecl, ty_real, 0);
+		return external_call(_fn);
+	};
+
+	/// @func set_pre_transform(_enable)
+	///
+	/// @desc Enables/disables the "pre-transform" option, which pre-transforms
+	/// the models and collapses all nodes into one if possible.
+	/// This is by default **disabled**.
+	///
+	/// @param {Bool} _enable `true` to enable the option.
+	///
+	/// @return {Struct.BBMOD_DLL} Returns `self`.
+	///
+	/// @throws {BBMOD_Exception} If the operation fails.
+	///
+	/// @see BBMOD_DLL.get_pre_transform
+	static set_pre_transform = function (_enable) {
+		gml_pragma("forceinline");
+		static _fn = external_define(
+			BBMOD_DLL_PATH, "bbmod_dll_set_apply_scale", dll_cdecl, ty_real, 1, ty_real);
+		var _retval = external_call(_fn, _enable);
+		if (_retval != __BBMOD_DLL_SUCCESS)
+		{
+			throw new BBMOD_Exception();
+		}
+		return self;
+	};
+
 	/// @func get_optimize_animations()
 	///
 	/// @desc Retrieves the animation optimization level.

diff --git a/ChangelogDev.md b/ChangelogDev.md
@@ -1,7 +1,3 @@
 # Changelog dev
 > This file is used to accumulate changes before a changelog for a release is
 > created.
-
-* Added option `--apply-scale` (or `-as`), which applies global scaling factor defined in the model file if enabled. For backwards compatibility this is by default disabled.
-* Added option `--pre-transform` (or `-as`), which pre-transforms the models and collapses all nodes into one if possible. For backwards compatibility this is by default disabled.
-* Reconfigured Assimp to do less post-processing on the models by default, as the old settings caused issues with some models.
diff --git a/docs_src/Changelog/Changelog3.16.7.md b/docs_src/Changelog/Changelog3.16.7.md
@@ -0,0 +1,10 @@
+# Changelog 3.16.7
+This release reconfigures Assimp and adds new options to BBMOD CLI and DLL to give you more control over model conversion.
+
+* Reconfigured Assimp to do less post-processing on models by default, as the old settings could sometime cause issues and make the model unusable.
+* Added new option `--apply-scale` (or `-as`) to BBMOD CLI, which applies global scaling factor defined in the model file if enabled. For backwards compatibility this is by default disabled.
+* Added new option `--pre-transform` (or `-pt`) to BBMOD CLI, which pre-transforms the models and collapses all nodes into one if possible. For backwards compatibility this is by default disabled.
+* Added new method `get_apply_scale` to `BBMOD_DLL`, which checks whether the new "apply scale" option is enabled.
+* Added new method `set_apply_scale` to `BBMOD_DLL`, which enables/disables the new "apply scale" option.
+* Added new method `get_pre_transform` to `BBMOD_DLL`, which checks whether the new "pre-transform" option is enabled.
+* Added new method `set_pre_transform` to `BBMOD_DLL`, which enables/disables the new "pre-transform" option.
diff --git a/docs_src/Changelog/Changelog_.md b/docs_src/Changelog/Changelog_.md
@@ -2,6 +2,7 @@
 In this section you can find changelogs for all releases of BBMOD since 3.0.0.
 
 ## Contents
+* [3.16.7](./Changelog3.16.7.html)
 * [3.16.6](./Changelog3.16.6.html)
 * [3.16.5](./Changelog3.16.5.html)
 * [3.16.4](./Changelog3.16.4.html)

diff --git a/docs_src/index.md b/docs_src/index.md
@@ -1,5 +1,5 @@
 # BBMOD
-Welcome to the official documentation of BBMOD 3.16.6!
+Welcome to the official documentation of BBMOD 3.16.7!
 
 BBMOD is an advanced 3D rendering solution for GameMaker. It consists of a
 custom model and animation file formats (`*.bbmod`, `*.bbanim`), a model

diff --git a/gmdoc.json b/gmdoc.json
@@ -5,7 +5,7 @@
   "title": "BBMOD Docs",
   "author": "BlueBurn",
   "prefix": ["bbmod", "__bbmod"],
-  "version": "3.16.6",
+  "version": "3.16.7",
   "analytics": "",
   "api": {
     "rating": "/bbmod/page_rating.php"
@@ -15,6 +15,7 @@
     "Changelog": {
       "file": "Changelog/Changelog_.md",
       "pages": {
+        "3.16.7": "Changelog/Changelog3.16.7.md",
         "3.16.6": "Changelog/Changelog3.16.6.md",
         "3.16.5": "Changelog/Changelog3.16.5.md",
         "3.16.4": "Changelog/Changelog3.16.4.md",