miijs 2.3.1 → 2.3.3

package/index.js

@@ -12,7 +12,7 @@ const httpsLib = require('https');
 const asmCrypto = require("./asmCrypto.js");
 const path = require("path");
 const createGL = require('gl');
-
+const typeCheat = [1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3];
 const {
     createCharModel, initCharModelTextures,
     initializeFFL, exitFFL, parseHexOrB64ToUint8Array,
@@ -1255,14 +1255,40 @@ let _fflRes;
 function getFFLRes() {
     // If we've already tried loading, just return the result
     if (_fflRes !== undefined) return _fflRes;
-    for (const path of ["./FFLResHigh.dat", "./ffl/FFLResHigh.dat", "./AFLResHigh.dat", "./afl/AFLResHigh.dat", "./ffl/AFLResHigh.dat"]) {
-        if (fs.existsSync(path)) {
-            // Convert Buffer to Uint8Array explicitly
-            const buffer = fs.readFileSync(path);
-            return _fflRes = new Uint8Array(buffer);
+
+    const searchPaths = [
+        "./FFLResHigh.dat",
+        "../FFLResHigh.dat",
+        "../../FFLResHigh.dat",
+        "./ffl/FFLResHigh.dat",
+        "./afl/AFLResHigh.dat",
+        "../ffl/FFLResHigh.dat",
+        "../afl/AFLResHigh.dat",
+        "../../ffl/FFLResHigh.dat",
+        "../../afl/AFLResHigh.dat"
+    ];
+
+    for (const filePath of searchPaths) {
+        try {
+            if (fs.existsSync(filePath)) {
+                const stats = fs.statSync(filePath);
+                // Make sure it's a file, not a directory
+                if (stats.isFile()) {
+                    // Convert Buffer to Uint8Array explicitly
+                    const buffer = fs.readFileSync(filePath);
+                    _fflRes = new Uint8Array(buffer);
+                    console.log(`Loaded FFLResHigh.dat from: ${filePath} (${_fflRes.length} bytes)`);
+                    return _fflRes;
+                }
+            }
+        } catch (e) {
+            // Silently continue to next path
+            continue;
         }
     }
+
     // If no file found, mark as null
+    console.warn('FFLResHigh.dat not found. Mii rendering will fall back to Mii Studio.');
     return _fflRes = null;
 }
 
@@ -1742,23 +1768,88 @@ function convertMii(jsonIn, typeTo) {
         miiTo.console = "wii";
     }
     else if (typeFrom === "wii") {
-        miiTo.perms.sharing = mii.general.mingle;
-        miiTo.perms.copying = mii.general.mingle;
-        miiTo.hair.style = convTables.hairWiiTo3DS[mii.hair.page][mii.hair.type];
-        miiTo.face.shape = convTables.faceWiiTo3DS[mii.face.shape];
+        miiTo.perms.sharing = mii.perms.mingle;
+        miiTo.perms.copying = mii.perms.mingle;
+
+        // Convert hair
+        const hairConv = convTables.hairWiiTo3DS[mii.hair.page][mii.hair.type];
+        miiTo.hair.page = hairConv[0];
+        miiTo.hair.type = hairConv[1];
+        miiTo.hair.color = mii.hair.color;
+        miiTo.hair.flipped = mii.hair.flipped;
+
+        // Convert face
+        miiTo.face.type = convTables.faceWiiTo3DS[mii.face.type];
+        miiTo.face.color = mii.face.color;
         miiTo.face.makeup = 0;
         miiTo.face.feature = 0;
+
+        // Handle facial features/makeup
         if (typeof (convTables.featureWiiTo3DS[mii.face.feature]) === 'string') {
-            miiTo.face.makeup = makeups3DS[+convTables.featureWiiTo3DS[mii.face.feature]];
+            miiTo.face.makeup = +convTables.featureWiiTo3DS[mii.face.feature];
         }
         else {
-            miiTo.face.feature = faceFeatures3DS[convTables.featureWiiTo3DS[mii.face.feature]];
+            miiTo.face.feature = +convTables.featureWiiTo3DS[mii.face.feature];
         }
-        miiTo.eyes.squash = 3;
-        miiTo.eyebrows.squash = 3;
+
+        // Convert eyes - preserve page/type structure
+        miiTo.eyes.page = mii.eyes.page;
+        miiTo.eyes.type = mii.eyes.type;
+        miiTo.eyes.color = mii.eyes.color;
+        miiTo.eyes.size = mii.eyes.size;
+        miiTo.eyes.squash = 3; // Default for 3DS
+        miiTo.eyes.rotation = mii.eyes.rotation;
+        miiTo.eyes.distanceApart = mii.eyes.distanceApart;
+        miiTo.eyes.yPosition = mii.eyes.yPosition;
+
+        // Convert eyebrows - preserve page/type structure
+        miiTo.eyebrows.page = mii.eyebrows.page;
+        miiTo.eyebrows.type = mii.eyebrows.type;
+        miiTo.eyebrows.color = mii.eyebrows.color;
+        miiTo.eyebrows.size = mii.eyebrows.size;
+        miiTo.eyebrows.squash = 3; // Default for 3DS
+        miiTo.eyebrows.rotation = mii.eyebrows.rotation;
+        miiTo.eyebrows.distanceApart = mii.eyebrows.distanceApart;
+        miiTo.eyebrows.yPosition = mii.eyebrows.yPosition;
+
+        // Convert nose - preserve page/type structure
+        miiTo.nose.page = mii.nose.page || 0;
+        miiTo.nose.type = mii.nose.type;
+        miiTo.nose.size = mii.nose.size;
+        miiTo.nose.yPosition = mii.nose.yPosition;
+
+        // Convert mouth - preserve page/type structure
+        miiTo.mouth.page = mii.mouth.page;
+        miiTo.mouth.type = mii.mouth.type;
         miiTo.mouth.color = mii.mouth.color;
-        miiTo.mouth.squash = 3;
-        miiTo.console = "3ds";
+        miiTo.mouth.size = mii.mouth.size;
+        miiTo.mouth.squash = 3; // Default for 3DS
+        miiTo.mouth.yPosition = mii.mouth.yPosition;
+
+        // Convert glasses
+        miiTo.glasses.type = mii.glasses.type;
+        miiTo.glasses.color = mii.glasses.color;
+        miiTo.glasses.size = mii.glasses.size;
+        miiTo.glasses.yPosition = mii.glasses.yPosition;
+
+        // Convert beard
+        miiTo.beard.mustache.type = mii.beard.mustache.type;
+        miiTo.beard.mustache.size = mii.beard.mustache.size;
+        miiTo.beard.mustache.yPosition = mii.beard.mustache.yPosition;
+        miiTo.beard.type = mii.beard.type;
+        miiTo.beard.color = mii.beard.color;
+
+        // Convert mole
+        miiTo.mole.on = mii.mole.on;
+        miiTo.mole.size = mii.mole.size;
+        miiTo.mole.xPosition = mii.mole.xPosition;
+        miiTo.mole.yPosition = mii.mole.yPosition;
+
+        // Copy general info
+        miiTo.general = { ...mii.general };
+        miiTo.meta = { ...mii.meta };
+
+        miiTo.console = "3DS";
     }
     return miiTo;
 }
@@ -1838,7 +1929,11 @@ function convertStudioToMii(input) {
             gender: s[0x16],
             favoriteColor: s[0x15],
             height: s[0x1E],
-            weight: s[0x02]
+            weight: s[0x02],
+
+            //The following is not provided by Studio codes and are hardcoded
+            birthday: 0,
+            birthMonth: 0
         },
 
         face: {
@@ -1937,7 +2032,8 @@ function convertStudioToMii(input) {
         meta: {
             name: "Studio Mii",
             creatorName: "StudioUser",
-            console: "3DS"
+            console: "3DS",
+            type: "Default"
         },
 
         perms: {
@@ -2255,182 +2351,373 @@ async function renderMiiWithStudio(jsonIn) {
     var studioMii = convertMiiToStudio(jsonIn);
     return await downloadImage('https://studio.mii.nintendo.com/miis/image.png?data=' + studioMii + "&width=270&type=face");
 }
-async function createFFLMiiIcon(data, width, height, useBody, shirtColor, fflRes) {
-    /**
-     * Creates a Mii face render using FFL.js/Three.js/gl-headless.
-     * @example
-     * const fs = require('fs');
-     * // NOTE: ASSUMES that this function IS EXPORTED in index.js.
-     * const createFFLMiiIcon = require('./index.js').createFFLMiiIcon;
-     * const miiData = '000d142a303f434b717a7b84939ba6b2bbbec5cbc9d0e2ea010d15252b3250535960736f726870757f8289a0a7aeb1';
-     * const outFilePath = 'mii-render.png';
-     * const fflRes = fs.readFileSync('./FFLResHigh.dat');
-     * createFFLMiiIcon(miiData, 512, 512, fflRes)
-     *   .then(pngBytes => fs.writeFileSync(outFilePath, pngBytes));
-     */
-
-    // Create WebGL context.
+
+
+function flipPixelsVertically(src, w, h) {
+    const dst = new Uint8Array(src.length);
+    const row = w * 4;
+    for (let y = 0; y < h; y++) {
+        const a = y * row, b = (h - 1 - y) * row;
+        dst.set(src.subarray(a, a + row), b);
+    }
+    return dst;
+}
+function invLerp(a, b, v) { return (v - a) / (b - a); }
+function clamp01(t) { return Math.max(0, Math.min(1, t)); }
+function easePow(t, p) { return Math.pow(t, p); }
+// ------------------------------
+// Small helpers
+// ------------------------------
+function remap01(v, min = 0, max = 127) {
+    const cl = Math.min(max, Math.max(min, +v || 0));
+    return (cl - min) / (max - min || 1);
+}
+function lerp(a, b, t) { return a + (b - a) * t; }
+
+function offsetObjectAlongView(object3D, camera, delta) {
+    const forward = new THREE.Vector3();
+    camera.getWorldDirection(forward);      // forward
+    object3D.position.addScaledVector(forward, -delta); // -delta → toward camera
+}
+
+// Project a pixel Y offset at a given depth into world Y units
+function pixelYToWorldY(camera, depthZ, pixels, viewportHeightPx) {
+    // Visible height at depth for a perspective camera:
+    const fov = (camera.fov ?? 30) * Math.PI / 180;
+    const visibleH = 2 * Math.abs(depthZ) * Math.tan(fov / 2);
+    return (pixels / viewportHeightPx) * visibleH;
+}
+
+// Render a specific layer to a pixel buffer (optionally flipY)
+function renderLayerToPixels(renderer, scene, camera, gl, width, height, layerIndex, flipY) {
+    const rt = new THREE.WebGLRenderTarget(width, height, { depthBuffer: true, stencilBuffer: false });
+    camera.layers.set(layerIndex);
+    renderer.setRenderTarget(rt);
+    renderer.clear(true, true, true);
+    renderer.render(scene, camera);
+
+    const pixels = new Uint8Array(width * height * 4);
+    gl.readPixels(0, 0, width, height, gl.RGBA, gl.UNSIGNED_BYTE, pixels);
+
+    renderer.setRenderTarget(null);
+    rt.dispose();
+
+    if (!flipY) return pixels;
+
+    // flipVert
+    const rowBytes = width * 4;
+    const out = new Uint8Array(pixels.length);
+    for (let y = 0; y < height; y++) {
+        const src = y * rowBytes;
+        const dst = (height - 1 - y) * rowBytes;
+        out.set(pixels.subarray(src, src + rowBytes), dst);
+    }
+    return out;
+}
+
+// Camera fit (unchanged)
+function fitCameraToObject(camera, object3D) {
+    const padding = 0.525;
+    const box = new THREE.Box3().setFromObject(object3D);
+    const size = new THREE.Vector3();
+    const center = new THREE.Vector3();
+    box.getSize(size);
+    box.getCenter(center);
+
+    const maxSize = Math.max(size.y, size.x / camera.aspect);
+    const fov = (camera.fov ?? 30) * Math.PI / 180;
+    const dist = (maxSize * padding) / Math.tan(fov / 2);
+
+    const dir = new THREE.Vector3();
+    camera.getWorldDirection(dir);            // forward
+    dir.normalize().multiplyScalar(-dist);    // back
+
+    camera.position.copy(center).add(dir);
+    camera.near = Math.max(0.1, dist - maxSize * 3.0);
+    camera.far = dist + maxSize * 3.0;
+    camera.lookAt(center);
+    camera.updateProjectionMatrix();
+}
+async function createFFLMiiIcon(data, options, shirtColor, fflRes) {
+    options ||= {};
+    const isFullBody = !!options.fullBody;
+
+    const width = 450;
+    const height = 900;
+    const BODY_SCALE_Y_RANGE = [0.55, 1.35];
+    const FULLBODY_CROP_BOTTOM_PX_RANGE = [220, 40]; // [at minYScale, at maxYScale]
+
     const gl = createGL(width, height);
-    if (!gl) {
-        throw new Error('Failed to create WebGL 1 context');
+    if (!gl) throw new Error("Failed to create WebGL 1 context");
+
+    // Normalize potential gender inputs; And the body files for females and males have different mesh names for some reason, so adjust for that too
+    let shirtMesh = "mesh_1_";
+    if (typeof options.gender === "string") {
+        options.gender = options.gender.toLowerCase() === "female" ? "Female" : "Male";
     }
+    else if (typeof options.gender === "number") {
+        options.gender = options.gender === 1 ? "Female" : "Male";
+    }
+    else {
+        options.gender = "Male";
+    }
+    if (options.gender === "Female") shirtMesh = "mesh_0_";
 
-    // Create a dummy canvas for Three.js to use.
+    // Fake canvas
     const canvas = {
         width, height, style: {},
-        addEventListener() { },
-        removeEventListener() { },
-        // Return the context for 'webgl' (not webgl2)
-        getContext: (type, _) => type === 'webgl' ? gl : null,
+        addEventListener() { }, removeEventListener() { },
+        getContext: (t) => (t === "webgl" ? gl : null),
     };
+    globalThis.self ??= { cancelAnimationFrame: () => { } };
 
-    // WebGLRenderer constructor sets "self" as the context.
-    // As of r162, it only tries to call cancelAnimationFrame frame on it.
-    globalThis.self ??= {
-        // Mock window functions called by Three.js.
-        cancelAnimationFrame: () => { },
-    };
-    // Create the Three.js renderer and scene.
     const renderer = new THREE.WebGLRenderer({ canvas, context: gl, alpha: true });
-    setIsWebGL1State(!renderer.capabilities.isWebGL2); // Tell FFL.js we are WebGL1
+    renderer.setSize(width, height, false);
+    setIsWebGL1State(!renderer.capabilities.isWebGL2);
+
+    // Color mgmt + silence warnings
+    THREE.ColorManagement.enabled = true;
+    renderer.outputColorSpace = THREE.SRGBColorSpace;
+    const _warn = console.warn;
+    console.warn = function (...args) {
+        const s = String(args[0] ?? "");
+        if (s.includes("ImageUtils.sRGBToLinear(): Unsupported image type")) return;
+        if (s.includes("Texture is not power of two")) return;
+        return _warn.apply(this, args);
+    };
 
     const scene = new THREE.Scene();
-    scene.background = null; // Transparent background.
-
-    if (useBody) {
-        // After: const scene = new THREE.Scene(); scene.background = null;
-        const ambient = new THREE.AmbientLight(0xffffff, 0.15);
-        scene.add(ambient);
-
-        const rim = new THREE.DirectionalLight(0xffffff, 3);
-        rim.position.set(0.5, -7, -1.0);
-        scene.add(rim);
-
-    }
+    scene.background = null;
 
     let ffl, currentCharModel;
-
-    const _realConsoleDebug = console.debug;
+    const _realDebug = console.debug;
     console.debug = () => { };
+
     try {
-        // Initialize FFL
+        // Head (FFL)
         ffl = await initializeFFL(fflRes, ModuleFFL);
-
-        // Create Mii model and add to the scene.
-        const studioRaw = parseHexOrB64ToUint8Array(data); // Parse studio data
-
-        // Convert Uint8Array to Buffer for struct-fu compatibility
+        const studioRaw = parseHexOrB64ToUint8Array(data);
         const studioBuffer = Buffer.from(studioRaw);
-
         currentCharModel = createCharModel(studioBuffer, null, FFLShaderMaterial, ffl.module);
-        initCharModelTextures(currentCharModel, renderer); // Initialize fully
-        scene.add(currentCharModel.meshes); // Add to scene
-
-        //Add body
-        if (useBody) {
-            if (typeof GLTFLoader === 'undefined' || !GLTFLoader) {
-                const mod = await import('three/examples/jsm/loaders/GLTFLoader.js');
-                GLTFLoader = mod.GLTFLoader;
-            }
-            //Read GLB from disk and parse (avoids URL/fetch issues)
-            const absPath = path.resolve(__dirname, './mii-body.glb');
-            const buf = fs.readFileSync(absPath);
-            const arrayBuffer = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-            const loader = new GLTFLoader();
-            const gltf = await new Promise((resolve, reject) => {
-                loader.parse(
-                    arrayBuffer,
-                    path.dirname(absPath) + path.sep,
-                    resolve,
-                    reject
-                );
-            });
+        initCharModelTextures(currentCharModel, renderer);
 
-            const body = gltf.scene;
-
-            body.position.y -= 110;
-
-            //Recolor
-            body.userData.isMiiBody = true;
-            body.traverse(o => {
-                if (o.isMesh) {
-                    if (!o.geometry.attributes.normal) {
-                        o.geometry.computeVertexNormals();
-                    }
-                    const isShirt = (o.name === 'mesh_1_');
-                    o.material?.dispose?.();
-                    o.material = new THREE.MeshLambertMaterial({
-                        //["Red", "Orange", "Yellow", "Lime", "Green", "Blue", "Cyan", "Pink", "Purple", "Brown", "White", "Black"]
-                        color: isShirt ? [0xFF2400, 0xF08000, 0xFFD700, 0xAAFF00, 0x008000, 0x0000FF, 0x00D7FF, 0xFF69B4, 0x7F00FF, 0x6F4E37, 0xFFFFFF, 0x303030][shirtColor] : 0x808080,
-                        emissive: isShirt ? 0x330000 : 0x222222,
-                        emissiveIntensity: 0.0
-                    });
-                    o.material.side = THREE.DoubleSide;
-                    o.material.needsUpdate = true;
-                }
-            });
+        // Body GLTF (for baking)
+        if (typeof GLTFLoader === "undefined" || !GLTFLoader) {
+            const mod = await import("three/examples/jsm/loaders/GLTFLoader.js");
+            GLTFLoader = mod.GLTFLoader;
+        }
+        const absPath = path.resolve(__dirname, `./mii${options.gender}Body.glb`);
+        const buf = fs.readFileSync(absPath);
+        const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+        const loader = new GLTFLoader();
+        const gltf = await new Promise((res, rej) =>
+            loader.parse(ab, path.dirname(absPath) + path.sep, res, rej)
+        );
+        const body = gltf.scene;
+        body.position.y -= 110;
+        body.userData.isMiiBody = true;
+
+        // Recolor body (bakes into texture)
+        var pantsColor=[0x808080,0xFFC000,0x89CFF0,0x913831,0x913831][["default","special","foreign","favorite","favorited"].indexOf(options.pantsType?.toLowerCase()||"default")];
+        body.traverse((o) => {
+            if (o.isMesh) {
+                if (!o.geometry.attributes.normal) o.geometry.computeVertexNormals();
+                const isShirt = o.name === shirtMesh;
+                o.material?.dispose?.();
+                o.material = new THREE.MeshLambertMaterial({
+                    color: isShirt
+                        ? [
+                            0xff2400, 0xf08000, 0xffd700, 0xaaff00, 0x008000, 0x0000ff,
+                            0x00d7ff, 0xff69b4, 0x7f00ff, 0x6f4e37, 0xffffff, 0x303030,
+                        ][shirtColor]
+                        : pantsColor,
+                    emissive: isShirt ? 0x330000 : 0x222222,
+                    emissiveIntensity: 0.0,
+                    side: THREE.DoubleSide,
+                });
+                o.material.needsUpdate = true;
+            }
+        });
 
+        // Graph (only used for framing / body bbox)
+        const wholeMii = new THREE.Group();
+        wholeMii.add(body);
+        wholeMii.add(currentCharModel.meshes);
+        scene.add(wholeMii);
 
+        // Layers for baking head/body
+        body.traverse(obj => obj.layers?.set(1));
+        currentCharModel.meshes.traverse(obj => obj.layers?.set(2)); // head only on 2
 
-            // (6) Add to scene
-            scene.add(body);
+        // Camera
+        const camera = getCameraForViewType(ViewType.MakeIcon);
+        camera.aspect = width / height;
+        camera.updateProjectionMatrix();
+        fitCameraToObject(camera, wholeMii);
+
+        // --- Body world bounds (for plane sizing/placement)
+        const bodyBox = new THREE.Box3().setFromObject(body);
+        const bodySize = new THREE.Vector3();
+        const bodyCenter = new THREE.Vector3();
+        bodyBox.getSize(bodySize);
+        bodyBox.getCenter(bodyCenter);
+
+        // --- BODY BAKE (lights for body only, depend on mode)
+        const bakeAmbient = new THREE.AmbientLight(0xffffff, 0.15);
+        const bakeRim = new THREE.DirectionalLight(
+            0xffffff,
+            3
+        );
+        bakeRim.position.set(-3, 7, 1.0);
+        bakeAmbient.layers.enable(1);
+        bakeRim.layers.enable(1);
+        scene.add(bakeAmbient, bakeRim);
+
+        // Pass: body layer → pixels (no CPU flip; we'll let Three flip on texture)
+        const bodyPixels = renderLayerToPixels(renderer, scene, camera, gl, width, height, /*layer*/1, /*flipY*/false);
+        const bodyCanvas = createCanvas(width, height);
+        bodyCanvas.getContext("2d").putImageData(new ImageData(new Uint8ClampedArray(bodyPixels), width, height), 0, 0);
+
+        // Remove bake lights & 3D body; we’ll insert a plane instead
+        scene.remove(bakeAmbient, bakeRim);
+        wholeMii.remove(body);
+        bakeAmbient.dispose?.(); bakeRim.dispose?.();
+
+        // --- BODY PLANE (unlit; texture carries shading)
+        const bodyTex = new THREE.CanvasTexture(bodyCanvas);
+        bodyTex.colorSpace = THREE.SRGBColorSpace;
+        bodyTex.generateMipmaps = false;
+        bodyTex.minFilter = THREE.LinearFilter;
+        bodyTex.magFilter = THREE.LinearFilter;
+        bodyTex.wrapS = THREE.ClampToEdgeWrapping;
+        bodyTex.wrapT = THREE.ClampToEdgeWrapping;
+        bodyTex.flipY = true;   // let Three handle UV-space flip
+        bodyTex.premultiplyAlpha = true;
+        bodyTex.needsUpdate = true;
+        bodyTex.flipY = false;
+
+        const planeW = Math.max(1e-4, bodySize.x);
+        const planeH = Math.max(1e-4, bodySize.y);
+        const planeGeo = new THREE.PlaneGeometry(planeW, planeH);
+        const planeMat = new THREE.MeshBasicMaterial({ map: bodyTex, transparent: true, depthWrite: true, depthTest: true });
+        const bodyPlane = new THREE.Mesh(planeGeo, planeMat);
+        bodyPlane.userData.isBodyPlane = true;
+
+        // Place plane at body world center so the neck peg aligns into head
+        bodyPlane.position.copy(bodyCenter);
+        bodyPlane.layers.set(2); // render with head
+
+        // === Apply height/weight scaling in BOTH modes ===
+        const w01 = remap01(options.weight ?? 64);
+        const h01 = remap01(options.height ?? 64);
+        const scaleX = lerp(0.55, 1.50, w01);
+        const scaleY = lerp(0.55, 1.35, h01);
+        bodyPlane.scale.set(scaleX, scaleY, 1);
+
+        // --- Auto vertical offset (per-mode) + manual per-mode knob ---
+        var tYraw = invLerp(BODY_SCALE_Y_RANGE[0], BODY_SCALE_Y_RANGE[1], scaleY);
+        var tY = clamp01(easePow(tYraw, 1));
+
+        const autoRange = [150, 125];
+
+        const autoOffsetYPx = autoRange[0] + (autoRange[1] - autoRange[0]) * tY;
+
+        // Manual knobs (mode-specific; falls back to legacy bodyOffsetYPx)
+        const manualPx = (options.bodyOffsetYPxFull ?? options.bodyOffsetYPx ?? 0);
+
+        const combinedOffsetYPx = Math.round(manualPx + autoOffsetYPx);
+
+        // Convert screen-px → world-Y at the plane depth & apply
+        if (combinedOffsetYPx) {
+            const planeDepthFromCam = bodyPlane.position.clone().sub(camera.position).length();
+            const worldYOffset = pixelYToWorldY(camera, planeDepthFromCam, combinedOffsetYPx, height);
+            bodyPlane.position.y += worldYOffset;
         }
 
 
-        // Use the camera for an icon pose.
-        const camera = getCameraForViewType(ViewType.MakeIcon);
+        // Optional depth nudge
+        const bodyDepthOffset = Number(options.bodyDepthOffset ?? 0);
+        if (bodyDepthOffset) offsetObjectAlongView(bodyPlane, camera, bodyDepthOffset);
 
-        // The pixels coming from WebGL are upside down.
-        camera.projectionMatrix.elements[5] *= -1; // Flip the camera Y axis.
-        // When flipping the camera, the triangles are in the wrong direction.
-        scene.traverse(mesh => {
-            if (
-                mesh.isMesh &&
-                mesh.material.side === THREE.FrontSide &&
-                !mesh.userData.isMiiBody
-            ) {
-                mesh.material.side = THREE.BackSide;
-            }
-        });
+        scene.add(bodyPlane);
 
+        // Ensure head renders with the plane on the same layer and with NO head lights
+        currentCharModel.meshes.traverse(o => o.layers?.set(2));
 
-        // Render the scene, and read the pixels into a buffer.
+        // Final pass: render layer 2 (head + body plane), then flip pixels for PNG
+        camera.layers.set(2);
+        renderer.setRenderTarget(null);
+        renderer.clear(true, true, true);
         renderer.render(scene, camera);
-        const pixels = new Uint8Array(width * height * 4);
-        gl.readPixels(0, 0, width, height, gl.RGBA, gl.UNSIGNED_BYTE, pixels);
-
-        // Draw the pixels to a new canvas.
-        const canvas = createCanvas(width, height);
-        const img = new ImageData(new Uint8ClampedArray(pixels), width, height);
-        canvas.getContext('2d').putImageData(img, 0, 0);
-
-        return canvas.toBuffer('image/png'); // Encode image to PNG
 
-    } catch (error) {
-        console.error('Error during rendering:', error);
-        throw error;
+        // Read back & flip to top-left
+        const finalPixels = new Uint8Array(width * height * 4);
+        gl.readPixels(0, 0, width, height, gl.RGBA, gl.UNSIGNED_BYTE, finalPixels);
+        const upright = flipPixelsVertically(finalPixels, width, height);
+
+        // Stage onto a canvas
+        const stage = createCanvas(width, height);
+        stage.getContext("2d").putImageData(
+            new ImageData(new Uint8ClampedArray(upright), width, height),
+            0, 0
+        );
+
+        // === FullBody-only: crop from the BOTTOM based on scaleY ===
+        let cropBottom = 0;
+        tYraw = invLerp(BODY_SCALE_Y_RANGE[0], BODY_SCALE_Y_RANGE[1], scaleY);
+        tY = clamp01(easePow(tYraw, 1));
+
+        // Interpolate bottom crop across the configured range
+        const bottomPx = Math.round(
+            FULLBODY_CROP_BOTTOM_PX_RANGE[0] +
+            (FULLBODY_CROP_BOTTOM_PX_RANGE[1] - FULLBODY_CROP_BOTTOM_PX_RANGE[0]) * tY
+        );
+
+        cropBottom = Math.max(0, Math.min(height - 1, bottomPx + (options.fullBodyCropExtraBottomPx ?? 0)));
+
+        // Output with bottom crop applied (no top crop)
+        const outH = Math.max(1, isFullBody?height - cropBottom:450);
+        const outCanvas = createCanvas(width, outH);
+        const ctxOut = outCanvas.getContext("2d");
+
+        // Source: take the top `outH` rows (i.e., drop `cropBottom` pixels at the bottom)
+        ctxOut.drawImage(
+            stage,
+            0, 0,            // sx, sy
+            width, outH,     // sw, sh
+            0, 0,            // dx, dy
+            width, outH      // dw, dh
+        );
+
+        return outCanvas.toBuffer("image/png");
+
+    } catch (err) {
+        console.error("Error rendering Mii:", err);
+        throw err;
     } finally {
-        // Clean up.
         try {
-            (currentCharModel) && currentCharModel.dispose(); // Mii model
-            exitFFL(ffl.module, ffl.resourceDesc); // Free fflRes from memory.
-            renderer.dispose(); // Dispose Three.js renderer.
+            currentCharModel?.dispose?.();
+            exitFFL(ffl?.module, ffl?.resourceDesc);
+            renderer.dispose();
             gl.finish();
-        } catch (error) {
-            console.warn('Error disposing Mii and renderer:', error);
-        }// finally {
-        //    console.debug = _realConsoleDebug;
-        //}
+        } catch { }
+        console.debug = _realDebug;
     }
 }
-async function renderMii(jsonIn, fflRes = getFFLRes()) {
+
+async function renderMii(jsonIn, options = {}, fflRes = getFFLRes()) {
     if (!["3ds", "wii u"].includes(jsonIn.console?.toLowerCase())) {
         jsonIn = convertMii(jsonIn);
     }
     const studioMii = convertMiiToStudio(jsonIn);
-    const width = height = 600;
+    options = Object.assign(options, {
+        gender: jsonIn.general.gender,
+        height: jsonIn.general.height,
+        weight: jsonIn.general.weight,
+        pantsType: jsonIn.meta?.type||"Default"
+    });
 
-    return createFFLMiiIcon(studioMii, width, height, true, jsonIn.general.favoriteColor, fflRes);
+    return createFFLMiiIcon(studioMii, options, jsonIn.general.favoriteColor, fflRes);
 }
 async function writeWiiBin(jsonIn, outPath) {
     if (jsonIn.console?.toLowerCase() !== "wii") {
@@ -2674,7 +2961,9 @@ async function write3DSQR(miiJson, outPath, returnBin, fflRes = getFFLRes()) {
     }
     const buffer = Buffer.from(buffers);
     var encryptedData = Buffer.from(encodeAesCcm(new Uint8Array(buffer)));
-
+    if (returnBin) {
+        return encryptedData;
+    }
     //Prepare a QR code
     const options = {
         width: 300,
@@ -2776,7 +3065,7 @@ function make3DSChild(dad, mom, options = {}) {
             "height": 64,
             "weight": 64,
             "gender": g,
-            "favColor": options.favColor || favCols[Math.floor(Math.random() * favCols.length)]
+            "favoriteColor": options.favoriteColor || favCols[Math.floor(Math.random() * favCols.length)]
         },
         "meta": {
             "name": options.name || kidNames[g][Math.floor(Math.random() * kidNames[g].length)],
@@ -2826,7 +3115,6 @@ function make3DSChild(dad, mom, options = {}) {
 function generateInstructions(mii, full) {
     let type = mii.console?.toLowerCase();
     if (type.toLowerCase() === "wii") {
-        var typeCheat = [1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3];
         var instrs = {
             "base": `Select "${mii.general.gender}", and then "Start from Scratch".`,
             "col": `On the info page (first tab), set the Favorite Color to ${lookupTables.favCols[mii.general.favoriteColor]} (${mii.general.favoriteColor <= 5 ? mii.general.favoriteColor + 1 : mii.general.favoriteColor - 5} from the left, ${mii.general.favoriteColor > 5 ? "bottom" : "top"} row).`,
@@ -2836,7 +3124,7 @@ function generateInstructions(mii, full) {
             "makeup": `On the face page's makeup tab, set the makeup to the one ${Math.ceil((mii.face.feature + 1) / 3)} from the top, and ${typeCheat[mii.face.feature]} from the left.`,
             "hairStyle": `On the hair page (fourth tab), set the hair style to the one ${typeCheat[mii.hair.type]} from the left, ${Math.ceil((mii.hair.type + 1) / 3)} from the top, on page ${mii.hair.page}.`,
             "hairFlipped": `${mii.hair.flipped ? `On the hair page (fourth tab), press the button to flip the hair.` : ``}`,
-            "hairColor": `On the hair page (fourth tab), set the hair color to the one ${mii.hair.col + (mii.hair.col > 3 ? -3 : 1)} from the left, on the ${mii.hair.col > 3 ? `bottom` : `top`} row.`,
+            "hairColor": `On the hair page (fourth tab), set the hair color to the one ${mii.hair.color + (mii.hair.color > 3 ? -3 : 1)} from the left, on the ${mii.hair.color > 3 ? `bottom` : `top`} row.`,
             "eyebrowStyle": `On the eyebrow page (fifth tab), set the eyebrow style to the one ${typeCheat[mii.eyebrows.type]} from the left, ${Math.ceil((mii.eyebrows.type + 1) / 3)} from the top, on page ${mii.eyebrows.page}.`,
             "eyebrowColor": `On the eyebrow page (fifth tab), set the eyebrow color to the one ${mii.eyebrows.color + (mii.eyebrows.color > 3 ? -3 : 1)} from the left, on the ${mii.eyebrows.color > 3 ? `bottom` : `top`} row.`,
             "eyebrowY": `${mii.eyebrows.yPos !== 7 ? `On the eyebrow page (fifth tab), ` : ``}${mii.eyebrows.yPosition < 7 ? `press the up button ${7 - mii.eyebrows.yPosition} times.` : mii.eyebrows.yPosition > 7 ? `press the down button ${mii.eyebrows.yPosition - 7} times.` : ``}`,
@@ -2853,7 +3141,7 @@ function generateInstructions(mii, full) {
             "noseY": `${mii.nose.yPosition !== 9 ? `On the nose page (seventh tab), ` : ``}${mii.nose.yPosition < 9 ? `press the up button ${9 - mii.nose.yPosition} times.` : mii.nose.yPosition > 9 ? `press the down button ${mii.nose.yPosition - 9} times.` : ``}`,
             "noseSize": `${mii.nose.size !== 4 ? `On the nose page (seventh tab), ` : ``}${mii.nose.size < 4 ? `press the shrink button ${4 - mii.nose.size} times.` : mii.nose.size > 4 ? `press the enlarge button ${mii.nose.size - 4} times.` : ``}`,
             "mouthType": `On the mouth page (eighth tab), set the mouth type to the one ${typeCheat[mii.mouth.type]} from the left, ${Math.ceil((mii.mouth.type + 1) / 3)} from the top, on page ${mii.mouth.page}.`,
-            "mouthCol": `On the mouth page (eighth tab), set the color to the one ${mii.mouth.col + 1} from the left.`,
+            "mouthCol": `On the mouth page (eighth tab), set the color to the one ${mii.mouth.color + 1} from the left.`,
             "mouthY": `${mii.mouth.yPosition !== 13 ? `On the mouth page (eighth tab), ` : ``}${mii.mouth.yPosition < 13 ? `press the up button ${13 - mii.mouth.yPosition} times.` : mii.mouth.yPosition > 13 ? `press the down button ${mii.mouth.yPosition - 13} times.` : ``}`,
             "mouthSize": `${mii.mouth.size !== 4 ? `On the mouth page (eighth tab), ` : ``}${mii.mouth.size < 4 ? `press the shrink button ${4 - mii.mouth.size} times.` : mii.mouth.size > 4 ? `press the enlarge button ${mii.mouth.size - 4} times.` : ``}`,
             "glasses": `On the glasses page (within the ninth tab), set the glasses to the one ${Math.ceil((mii.glasses.type + 1) / 3)} from the top, and ${typeCheat[mii.glasses.type]} from the left.`,
@@ -2868,7 +3156,7 @@ function generateInstructions(mii, full) {
             "moleY": `${mii.mole.yPosition !== 20 ? `On the mole page (within the ninth tab), press the ` : ``}${mii.mole.yPosition > 20 ? `down button ${mii.mole.yPosition - 20} times.` : mii.mole.yPosition < 20 ? `up button ${20 - mii.mole.yPosition} times.` : ``}`,
             "moleSize": `${mii.mole.size !== 4 ? `On the mole page (within the ninth tab), ` : ``}${mii.mole.size < 4 ? `press the shrink button ${4 - mii.mole.size} times.` : mii.mole.size > 4 ? `press the enlarge button ${mii.mole.size - 4} times.` : ``}`,
             "beard": `On the beard page (within the ninth tab), set the beard to the one on the ${[0, 1].includes(mii.beard.type) ? `top` : `bottom`}-${[0, 2].includes(mii.beard.type) ? `left` : `right`}.`,
-            "beardCol": `On the mustache OR beard pages (within the ninth tab), set the color to the one ${mii.beard.col + (mii.beard.col > 3 ? -3 : 1)} from the left, on the ${mii.facialHair.col > 3 ? `bottom` : `top`} row.`,
+            "beardCol": `On the mustache OR beard pages (within the ninth tab), set the color to the one ${mii.beard.color + (mii.beard.color > 3 ? -3 : 1)} from the left, on the ${mii.facialHair.color > 3 ? `bottom` : `top`} row.`,
             "other": `The Nickname of this Mii is ${mii.info.name}.${mii.info.creatorName ? ` The creator was ${mii.info.creatorName}.` : ``} Mingle was turned ${mii.info.mingle ? `on` : `off`}.${mii.info.birthday !== 0 ? ` Its birthday is ${["", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][mii.info.birthMonth]} ${mii.info.birthday}.` : ``}`
         };
         if (!full) {
@@ -2899,7 +3187,7 @@ function generateInstructions(mii, full) {
             "eyebrowDist": `${mii.eyebrows.distanceApart !== 2 ? `On the eyebrow page (third tab), ` : ``}${mii.eyebrows.distanceApart < 2 ? `press the closer-together button ${2 - mii.eyebrows.distanceApart} times.` : mii.eyebrows.distanceApart > 2 ? `press the further-apart button ${mii.eyebrows.distanceApart - 2} times.` : ``}`,
             "eyebrowSquash": `${mii.eyebrows.squash !== 3 ? `On the eyebrow page (third tab), ` : ``}${mii.eyebrows.squash < 3 ? `press the squish button ${3 - mii.eyebrows.squash} times.` : mii.eyebrows.squash > 3 ? `press the un-squish button ${mii.eyebrows.squash - 3} times.` : ``}`,
             "eyeType": `On the eye page (fourth tab), set the eye type to the one ${typeCheat[mii.eyes.type]} from the left, ${Math.ceil((mii.eyes.type + 1) / 3)} from the top, on page ${mii.eyes.page + 1}.`,
-            "eyeColor": `On the eye page (fourth tab), set the color to the one ${mii.eyes.col + 1} from the top.`,
+            "eyeColor": `On the eye page (fourth tab), set the color to the one ${mii.eyes.color + 1} from the top.`,
             "eyeY": `${mii.eyes.yPosition !== 12 ? `On the eye page (fourth tab), ` : ``}${mii.eyes.yPosition < 12 ? `press the up button ${12 - mii.eyes.yPosition} times.` : mii.eyes.yPosition > 12 ? `press the down button ${mii.eyes.yPosition - 12} times.` : ``}`,
             "eyeSize": `${mii.eyes.size !== 4 ? `On the eye page (fourth tab), ` : ``}${mii.eyes.size < 4 ? `press the shrink button ${4 - mii.eyes.size} times.` : mii.eyes.size > 4 ? `press the enlarge button ${mii.eyes.size - 4} times.` : ``}`,
             "eyeRot": `${mii.eyes.rotation !== (mii.general.gender === "Female" ? 3 : 4) ? `On the eye page (fourth tab), ` : ``}${mii.eyes.rotation < (mii.general.gender === "Female" ? 3 : 4) ? `press the rotate clockwise button ${(mii.general.gender === "Female" ? 3 : 4) - mii.eyes.rotation} times.` : mii.eyes.rotation > (mii.general.gender === "Female" ? 3 : 4) ? `press the rotate counter-clockwise button ${mii.eyes.rotation - (mii.general.gender === "Female" ? 3 : 4)} times.` : ``}`,
@@ -2914,7 +3202,7 @@ function generateInstructions(mii, full) {
             "mouthSize": `${mii.mouth.size !== 4 ? `On the mouth page (sixth tab), ` : ``}${mii.mouth.size < 4 ? `press the shrink button ${4 - mii.mouth.size} times.` : mii.mouth.size > 4 ? `press the enlarge button ${mii.mouth.size - 4} times.` : ``}`,
             "mouthSquash": `${mii.mouth.squash !== 3 ? `On the mouth page (sixth tab), ` : ``}${mii.mouth.squash < 3 ? `press the squish button ${3 - mii.mouth.squash} times.` : mii.mouth.squash > 3 ? `press the un-squish button ${mii.mouth.squash - 3} times.` : ``}`,
             "glasses": `On the glasses page (within the seventh tab), set the glasses to the one ${Math.ceil((mii.glasses.type + 1) / 3)} from the top, and ${typeCheat[mii.glasses.type]} from the left.`,
-            "glassesCol": `On the glasses page (within the seventh tab), set the color to the one ${mii.glasses.col + 1} from the top.`,
+            "glassesCol": `On the glasses page (within the seventh tab), set the color to the one ${mii.glasses.color + 1} from the top.`,
             "glassesY": `${mii.glasses.yPosition !== 10 ? `On the glasses page (within the seventh tab), ` : ``}${mii.glasses.yPosition < 10 ? `press the up button ${10 - mii.glasses.yPosition} times.` : mii.glasses.yPosition > 10 ? `press the down button ${mii.glasses.yPosition - 10} times.` : ``}`,
             "glassesSize": `${mii.glasses.size !== 4 ? `On the glasses page (within the seventh tab), ` : ``}${mii.glasses.size < 4 ? `press the shrink button ${4 - mii.glasses.size} times.` : mii.glasses.size > 4 ? `press the enlarge button ${mii.glasses.size - 4} times.` : ``}`,
             "stache": `On the mustache page (within the seventh tab), set the mustache to the one on the ${[0, 1].includes(mii.beard.mustache.type) ? `top` : [2, 3].includes(mii.beard.mustache.type) ? `middle` : `bottom`}-${[0, 2, 4].includes(mii.beard.mustache.type) ? `left` : `right`}.`,
@@ -2928,7 +3216,7 @@ function generateInstructions(mii, full) {
             "beardCol": `On the mustache OR beard pages (within the seventh tab), set the color to the one ${mii.beard.color + 1} from the top.`,
             "heightWeight": `On the build page (eighth tab), set the height to ${Math.round((100 / 128) * mii.general.height)}%, and the weight to ${Math.round((100 / 128) * mii.general.weight)}%.`,
             "col": `On the info page (after pressing "Next"), set the Favorite Color to ${mii.general.favoriteColor} (${mii.general.favoriteColor <= 5 ? mii.general.favoriteColor + 1 : mii.general.favoriteColor - 5} from the left, ${mii.general.favoriteColor > 5 ? "bottom" : "top"} row).`,
-            "other": `The Nickname of this Mii is ${mii.general.name}.${mii.general.creatorName ? ` The creator was ${mii.general.creatorName}.` : ``} ${mii.general.birthday !== 0 ? ` Its birthday is ${["", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][mii.general.birthMonth]} ${mii.general.birthday}.` : ``}`
+            "other": `The Nickname of this Mii is ${mii.meta.name}.${mii.meta.creatorName ? ` The creator was ${mii.meta.creatorName}.` : ``} ${mii.general.birthday !== 0 ? ` Its birthday is ${["", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][mii.general.birthMonth]} ${mii.general.birthday}.` : ``}`
         };
         if (!full) {
             var defaultMiiInstrs = structuredClone(mii.general.gender === "Male" ? defaultInstrs["3ds"].male : defaultInstrs["3ds"].female);
@@ -3051,9 +3339,9 @@ module.exports = {
     miiWeightToRealWeight,//EXPERIMENTAL
 
     /*
-        Handle Amiibo Functions
-        insertMiiIntoAmiibo(amiiboDump, decrypted3DSMiiBuffer),
-        extractMiiFromAmiibo(amiiboDump)
+    Handle Amiibo Functions
+    insertMiiIntoAmiibo(amiiboDump, decrypted3DSMiiBuffer),
+    extractMiiFromAmiibo(amiiboDump)
     */
     ...require("./amiiboHandler.js")
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miijs",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "description": "Work with Mii characters in every possible way needed for your project.",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/KestronProgramming/MiiJS.git"
+    "url": "git+https://github.com/Stewared/MiiJS.git"
   },
   "keywords": [
     "Mii",
@@ -19,12 +19,12 @@
     "Remote",
     "Special"
   ],
-  "author": "Kestron",
+  "author": "Stewared",
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/KestronProgramming/MiiJS/issues"
+    "url": "https://github.com/Stewared/MiiJS/issues"
   },
-  "homepage": "https://github.com/KestronProgramming/MiiJS#readme",
+  "homepage": "https://github.com/Stewared/MiiJS#readme",
   "dependencies": {
     "canvas": "^3.1.0",
     "ffl.js": "github:ariankordi/FFL.js#06ede8f",