@r2o3/rgskin-nodejs 0.0.1 → 0.0.2

package/README.md

@@ -27,7 +27,7 @@ A library for loading and creating skins for various rhythm games. It supports c
 Add this to your `Cargo.toml`:
 ```toml
 [dependencies]
-rgskin = "0.0.1"
+rgskin = "0.0.2"
 ```
 
 Or run:
@@ -45,10 +45,12 @@ cargo add rgskin
 use rgskin::prelude::*;
 
 // importing a skin from a directory
-let osu_skin = import::osu::skin_from_dir("path/to/skin").expect("Failed to import skin!");
-let fluxis_skin = import::fluxis::skin_from_dir("path/to/skin").expect("Failed to import skin!");
+let osu_skin = import::osu::skin_from_dir("path/to/skin").expect("Failed to import skin!", false);
+let fluxis_skin = import::fluxis::skin_from_dir("path/to/skin").expect("Failed to import skin!", false);
 ```
 
+The second argument is for if you want to import ALL assets for a skin, it will import all textures but leave the unrequired unloaded, usually recommended when merging skins of the same type as you might need all assets; otherwise if false it will only import and load the required assets.
+
 ##### Manually loading a skin
 
 ```rust
@@ -58,7 +60,7 @@ use rgskin::prelude::*;
 let mut textures = TextureStore::new();
 
 // you can import textures from a directory like this:
-textures = import::all_textures_from_dir("path/to/skin")?;
+textures = import::all_textures_from_dir("path/to/skin", None)?;
 
 // or alternatively if you parse the skin config first, you can import only the textures you need like this:
 let raw_str = import::osu::ini_str_from_dir("path/to/skin");
@@ -84,7 +86,7 @@ Additionally all skins can be converting into a generic version of it.
 Examples:
 ```rust
 OsuSkin::from_generic_mania(&generic); 
-OsuSkin.to_generic_mania();
+OsuSkin.to_generic_mania(()); // yes, the extra parethesis is required.
 ```
 ```rust
 FluXisSkin::from_generic_mania(&generic); 
@@ -208,8 +210,8 @@ let osuSkin = new rgskin.OsuSkin(skin_config, textures, null); // last parameter
 
 ##### Preparing the filesMap
 
-The `filesMap` parameter is a JavaScript `Map` object where:
-- Keys are filenames (strings)
+The `filesMap` parameter is a `Map` object where:
+- Keys are relative paths (strings)
 - Values are file contents as `Uint8Array`
 
 Example: Reading files from an HTML file input

package/package.json

@@ -4,7 +4,7 @@
     "menvae"
   ],
   "description": "A library for converting rhythm game skins.",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "license": "MIT",
   "repository": {
     "type": "git",

package/rgskin.d.ts

@@ -24,6 +24,7 @@ export class BinaryStore {
   clear(): void;
   copy(original_path: string, new_path: string): string | undefined;
   makeUniqueCopy(original_path: string, new_base_path: string): string | undefined;
+  extend(other: BinaryStore): void;
 }
 
 export class FluXisKeymode {
@@ -151,12 +152,12 @@ export class OsuKeymode {
   set combo_position(value: number | null | undefined);
   column_start: number;
   column_right: number;
-  column_line_width: Uint32Array;
-  column_width: Uint32Array;
-  column_spacing: Uint32Array;
+  column_line_width: Float32Array;
+  column_width: Float32Array;
+  column_spacing: Float32Array;
   barline_height: number;
-  lighting_n_width: Uint32Array;
-  lighting_l_width: Uint32Array;
+  lighting_n_width: Float32Array;
+  lighting_l_width: Float32Array;
   get width_for_note_height_scale(): number | undefined;
   set width_for_note_height_scale(value: number | null | undefined);
   light_frame_per_second: number;
@@ -283,6 +284,7 @@ export class TextureStore {
   clear(): void;
   copy(original_path: string, new_path: string): string | undefined;
   makeUniqueCopy(original_path: string, new_base_path: string): string | undefined;
+  extend(other: TextureStore): void;
 }
 
 export function allSamplesFromDir(path: string): BinaryStore;

package/rgskin.js

@@ -2,7 +2,7 @@
 let imports = {};
 imports['__wbindgen_placeholder__'] = module.exports;
 
-const { createDirAll, isDirectory, joinPath, readDir, readFileBytes, readFileString, writeFile } = require(String.raw`./snippets/rgskin-ddf01b385d257895/inline0.js`);
+const { createDirAll, isDirectory, joinPath, readDir, readFileBytes, readFileString, writeFile } = require(String.raw`./snippets/rgskin-65f1492efda13f32/inline0.js`);
 
 function addToExternrefTable0(obj) {
     const idx = wasm.__externref_table_alloc();
@@ -81,6 +81,11 @@ function debugString(val) {
     return className;
 }
 
+function getArrayF32FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getFloat32ArrayMemory0().subarray(ptr / 4, ptr / 4 + len);
+}
+
 function getArrayJsValueFromWasm0(ptr, len) {
     ptr = ptr >>> 0;
     const mem = getDataViewMemory0();
@@ -97,11 +102,6 @@ function getArrayU16FromWasm0(ptr, len) {
     return getUint16ArrayMemory0().subarray(ptr / 2, ptr / 2 + len);
 }
 
-function getArrayU32FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint32ArrayMemory0().subarray(ptr / 4, ptr / 4 + len);
-}
-
 function getArrayU8FromWasm0(ptr, len) {
     ptr = ptr >>> 0;
     return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
@@ -115,6 +115,14 @@ function getDataViewMemory0() {
     return cachedDataViewMemory0;
 }
 
+let cachedFloat32ArrayMemory0 = null;
+function getFloat32ArrayMemory0() {
+    if (cachedFloat32ArrayMemory0 === null || cachedFloat32ArrayMemory0.byteLength === 0) {
+        cachedFloat32ArrayMemory0 = new Float32Array(wasm.memory.buffer);
+    }
+    return cachedFloat32ArrayMemory0;
+}
+
 function getStringFromWasm0(ptr, len) {
     ptr = ptr >>> 0;
     return decodeText(ptr, len);
@@ -128,14 +136,6 @@ function getUint16ArrayMemory0() {
     return cachedUint16ArrayMemory0;
 }
 
-let cachedUint32ArrayMemory0 = null;
-function getUint32ArrayMemory0() {
-    if (cachedUint32ArrayMemory0 === null || cachedUint32ArrayMemory0.byteLength === 0) {
-        cachedUint32ArrayMemory0 = new Uint32Array(wasm.memory.buffer);
-    }
-    return cachedUint32ArrayMemory0;
-}
-
 let cachedUint8ArrayMemory0 = null;
 function getUint8ArrayMemory0() {
     if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
@@ -164,16 +164,16 @@ function passArray16ToWasm0(arg, malloc) {
     return ptr;
 }
 
-function passArray32ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 4, 4) >>> 0;
-    getUint32ArrayMemory0().set(arg, ptr / 4);
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1, 1) >>> 0;
+    getUint8ArrayMemory0().set(arg, ptr / 1);
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
 
-function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1, 1) >>> 0;
-    getUint8ArrayMemory0().set(arg, ptr / 1);
+function passArrayF32ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 4, 4) >>> 0;
+    getFloat32ArrayMemory0().set(arg, ptr / 4);
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
@@ -539,6 +539,13 @@ class BinaryStore {
         }
         return v3;
     }
+    /**
+     * @param {BinaryStore} other
+     */
+    extend(other) {
+        _assertClass(other, BinaryStore);
+        wasm.binarystore_extend(this.__wbg_ptr, other.__wbg_ptr);
+    }
 }
 if (Symbol.dispose) BinaryStore.prototype[Symbol.dispose] = BinaryStore.prototype.free;
 exports.BinaryStore = BinaryStore;
@@ -1728,7 +1735,7 @@ class OsuKeymode {
      */
     get column_start() {
         const ret = wasm.__wbg_get_osukeymode_column_start(this.__wbg_ptr);
-        return ret >>> 0;
+        return ret;
     }
     /**
      * @param {number} arg0
@@ -1741,7 +1748,7 @@ class OsuKeymode {
      */
     get column_right() {
         const ret = wasm.__wbg_get_osukeymode_column_right(this.__wbg_ptr);
-        return ret >>> 0;
+        return ret;
     }
     /**
      * @param {number} arg0
@@ -1750,53 +1757,53 @@ class OsuKeymode {
         wasm.__wbg_set_osukeymode_column_right(this.__wbg_ptr, arg0);
     }
     /**
-     * @returns {Uint32Array}
+     * @returns {Float32Array}
      */
     get column_line_width() {
         const ret = wasm.__wbg_get_osukeymode_column_line_width(this.__wbg_ptr);
-        var v1 = getArrayU32FromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayF32FromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
     /**
-     * @param {Uint32Array} arg0
+     * @param {Float32Array} arg0
      */
     set column_line_width(arg0) {
-        const ptr0 = passArray32ToWasm0(arg0, wasm.__wbindgen_malloc);
+        const ptr0 = passArrayF32ToWasm0(arg0, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_osukeymode_column_line_width(this.__wbg_ptr, ptr0, len0);
     }
     /**
-     * @returns {Uint32Array}
+     * @returns {Float32Array}
      */
     get column_width() {
         const ret = wasm.__wbg_get_osukeymode_column_width(this.__wbg_ptr);
-        var v1 = getArrayU32FromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayF32FromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
     /**
-     * @param {Uint32Array} arg0
+     * @param {Float32Array} arg0
      */
     set column_width(arg0) {
-        const ptr0 = passArray32ToWasm0(arg0, wasm.__wbindgen_malloc);
+        const ptr0 = passArrayF32ToWasm0(arg0, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_osukeymode_column_width(this.__wbg_ptr, ptr0, len0);
     }
     /**
-     * @returns {Uint32Array}
+     * @returns {Float32Array}
      */
     get column_spacing() {
         const ret = wasm.__wbg_get_osukeymode_column_spacing(this.__wbg_ptr);
-        var v1 = getArrayU32FromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayF32FromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
     /**
-     * @param {Uint32Array} arg0
+     * @param {Float32Array} arg0
      */
     set column_spacing(arg0) {
-        const ptr0 = passArray32ToWasm0(arg0, wasm.__wbindgen_malloc);
+        const ptr0 = passArrayF32ToWasm0(arg0, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_osukeymode_column_spacing(this.__wbg_ptr, ptr0, len0);
     }
@@ -1814,36 +1821,36 @@ class OsuKeymode {
         wasm.__wbg_set_osukeymode_barline_height(this.__wbg_ptr, arg0);
     }
     /**
-     * @returns {Uint32Array}
+     * @returns {Float32Array}
      */
     get lighting_n_width() {
         const ret = wasm.__wbg_get_osukeymode_lighting_n_width(this.__wbg_ptr);
-        var v1 = getArrayU32FromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayF32FromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
     /**
-     * @param {Uint32Array} arg0
+     * @param {Float32Array} arg0
      */
     set lighting_n_width(arg0) {
-        const ptr0 = passArray32ToWasm0(arg0, wasm.__wbindgen_malloc);
+        const ptr0 = passArrayF32ToWasm0(arg0, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_osukeymode_lighting_n_width(this.__wbg_ptr, ptr0, len0);
     }
     /**
-     * @returns {Uint32Array}
+     * @returns {Float32Array}
      */
     get lighting_l_width() {
         const ret = wasm.__wbg_get_osukeymode_lighting_l_width(this.__wbg_ptr);
-        var v1 = getArrayU32FromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayF32FromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
         return v1;
     }
     /**
-     * @param {Uint32Array} arg0
+     * @param {Float32Array} arg0
      */
     set lighting_l_width(arg0) {
-        const ptr0 = passArray32ToWasm0(arg0, wasm.__wbindgen_malloc);
+        const ptr0 = passArrayF32ToWasm0(arg0, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_osukeymode_lighting_l_width(this.__wbg_ptr, ptr0, len0);
     }
@@ -1858,7 +1865,7 @@ class OsuKeymode {
      * @param {number | null} [arg0]
      */
     set width_for_note_height_scale(arg0) {
-        wasm.__wbg_set_osukeymode_width_for_note_height_scale(this.__wbg_ptr, isLikeNone(arg0) ? 0x100000001 : (arg0) >>> 0);
+        wasm.__wbg_set_osukeymode_width_for_note_height_scale(this.__wbg_ptr, isLikeNone(arg0) ? 0x100000001 : Math.fround(arg0));
     }
     /**
      * @returns {number}
@@ -2381,7 +2388,7 @@ class OsuSkin {
      * @returns {TextureStore}
      */
     get textures() {
-        const ret = wasm.__wbg_get_osuskin_textures(this.__wbg_ptr);
+        const ret = wasm.__wbg_get_genericmaniaskin_textures(this.__wbg_ptr);
         return TextureStore.__wrap(ret);
     }
     /**
@@ -2390,13 +2397,13 @@ class OsuSkin {
     set textures(arg0) {
         _assertClass(arg0, TextureStore);
         var ptr0 = arg0.__destroy_into_raw();
-        wasm.__wbg_set_osuskin_textures(this.__wbg_ptr, ptr0);
+        wasm.__wbg_set_genericmaniaskin_textures(this.__wbg_ptr, ptr0);
     }
     /**
      * @returns {BinaryStore}
      */
     get samples() {
-        const ret = wasm.__wbg_get_osuskin_samples(this.__wbg_ptr);
+        const ret = wasm.__wbg_get_genericmaniaskin_samples(this.__wbg_ptr);
         return BinaryStore.__wrap(ret);
     }
     /**
@@ -2405,7 +2412,7 @@ class OsuSkin {
     set samples(arg0) {
         _assertClass(arg0, BinaryStore);
         var ptr0 = arg0.__destroy_into_raw();
-        wasm.__wbg_set_osuskin_samples(this.__wbg_ptr, ptr0);
+        wasm.__wbg_set_genericmaniaskin_samples(this.__wbg_ptr, ptr0);
     }
     /**
      * @param {OsuSkinIni} skin_ini
@@ -3261,6 +3268,13 @@ class TextureStore {
         }
         return v3;
     }
+    /**
+     * @param {TextureStore} other
+     */
+    extend(other) {
+        _assertClass(other, TextureStore);
+        wasm.texturestore_extend(this.__wbg_ptr, other.__wbg_ptr);
+    }
 }
 if (Symbol.dispose) TextureStore.prototype[Symbol.dispose] = TextureStore.prototype.free;
 exports.TextureStore = TextureStore;
@@ -3528,7 +3542,7 @@ exports.__wbg___wbindgen_throw_dd24417ed36fc46e = function(arg0, arg1) {
     throw new Error(getStringFromWasm0(arg0, arg1));
 };
 
-exports.__wbg_createDirAll_3fa17ad31f0b67eb = function() { return handleError(function (arg0, arg1) {
+exports.__wbg_createDirAll_ed59516d327d16d7 = function() { return handleError(function (arg0, arg1) {
     createDirAll(getStringFromWasm0(arg0, arg1));
 }, arguments) };
 
@@ -3547,12 +3561,12 @@ exports.__wbg_get_6b7bd52aca3f9671 = function(arg0, arg1) {
     return ret;
 };
 
-exports.__wbg_isDirectory_dc61910333390a70 = function() { return handleError(function (arg0, arg1) {
+exports.__wbg_isDirectory_d9447fc59d890759 = function() { return handleError(function (arg0, arg1) {
     const ret = isDirectory(getStringFromWasm0(arg0, arg1));
     return ret;
 }, arguments) };
 
-exports.__wbg_joinPath_f4200fd11e4bf2e2 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+exports.__wbg_joinPath_09e3f297160d67ae = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
     const ret = joinPath(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
     const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len1 = WASM_VECTOR_LEN;
@@ -3604,17 +3618,17 @@ exports.__wbg_push_7d9be8f38fc13975 = function(arg0, arg1) {
     return ret;
 };
 
-exports.__wbg_readDir_f8fed9ecdf7010ee = function() { return handleError(function (arg0, arg1) {
+exports.__wbg_readDir_d68d219c55b1d4c0 = function() { return handleError(function (arg0, arg1) {
     const ret = readDir(getStringFromWasm0(arg0, arg1));
     return ret;
 }, arguments) };
 
-exports.__wbg_readFileBytes_933ada0a0e8a93d5 = function() { return handleError(function (arg0, arg1) {
+exports.__wbg_readFileBytes_2c1b7dda2708a44c = function() { return handleError(function (arg0, arg1) {
     const ret = readFileBytes(getStringFromWasm0(arg0, arg1));
     return ret;
 }, arguments) };
 
-exports.__wbg_readFileString_a187767bff213fb1 = function() { return handleError(function (arg0, arg1, arg2) {
+exports.__wbg_readFileString_fecdefcb119365ed = function() { return handleError(function (arg0, arg1, arg2) {
     const ret = readFileString(getStringFromWasm0(arg1, arg2));
     const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len1 = WASM_VECTOR_LEN;
@@ -3622,7 +3636,7 @@ exports.__wbg_readFileString_a187767bff213fb1 = function() { return handleError(
     getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 }, arguments) };
 
-exports.__wbg_writeFile_ec1852732052ad12 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
+exports.__wbg_writeFile_be43d94d078ac294 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
     writeFile(getStringFromWasm0(arg0, arg1), getArrayU8FromWasm0(arg2, arg3));
 }, arguments) };