miijs 2.1.3 → 2.2.1

package/README.md

@@ -93,3 +93,4 @@ You can find FFLResHigh using a Wii U with an FTP program installed at `sys/titl
 # Credits
  - **[kazuki-4ys' MiiInfoEditorCTR](https://github.com/kazuki-4ys/kazuki-4ys.github.io/tree/master/web_apps/MiiInfoEditorCTR)** - I repurposed how to decrypt and reencrypt the QR codes from here, including repurposing the asmCrypto.js file in its entirety with very small modifications (it has since been stripped down to only include the functions this library uses). I believe I also modified the code for rendering the Mii using Nintendo's Mii Studio from here as well, though I do not remember for certain.
  - **[ariankordi's FFL.js](https://github.com/ariankordi/FFL.js/)** - Rendering Miis locally would not be possible without this library. Instructions for finding FFLResHigh are also learned from [ariankordi's FFL-Testing repository](https://github.com/ariankordi/FFL-Testing).
+ - **[Models Resource](https://models.spriters-resource.com/3ds/systembios/asset/306260/)** - For the bodies used in Mii rendering

package/heightWeightConversion.js

@@ -0,0 +1,123 @@
+// ------------------------------
+// Helpers
+// ------------------------------
+const clamp = (v, min, max) => Math.min(max, Math.max(min, v));
+
+// ------------------------------
+// Height (0..127)  <->  feet/inches
+// Calibrated so height=64 -> 67 inches exactly.
+// Range: 36" (3'0") .. 84" (7'0").
+// ------------------------------
+const HEIGHT_MIN_IN = 36;
+const HEIGHT_MAX_IN = 84;
+const HEIGHT_RANGE_IN = HEIGHT_MAX_IN - HEIGHT_MIN_IN;
+
+// Calibration target: slider mid (64) should be 67"
+const HEIGHT_MID_SLIDER = 64;
+const HEIGHT_MID_IN = 67;
+
+// Compute exponent k so that x0^k = y0 (bias curve, invertible)
+const x0 = HEIGHT_MID_SLIDER / 127;                       // ~0.50394
+const y0 = (HEIGHT_MID_IN - HEIGHT_MIN_IN) / HEIGHT_RANGE_IN; // 31/48 ≈ 0.64583
+const HEIGHT_EXP = Math.log(y0) / Math.log(x0);           // ≈ 0.638 (computed once)
+
+/** 0..127 -> { feet, inches, totalInches } */
+function miiHeightToFeetInches(heightValue) {
+  const hv = clamp(heightValue | 0, 0, 127);
+  const x = hv / 127;
+  const s = Math.pow(x, HEIGHT_EXP); // calibrated bias
+  const inches = HEIGHT_MIN_IN + s * HEIGHT_RANGE_IN;
+
+  const totalInches = Math.round(inches);
+  const feet = Math.floor(totalInches / 12);
+  const inchesR = totalInches % 12;
+
+  return { feet, inches: inchesR, totalInches };
+}
+
+/** inches -> 0..127 (inverse of the calibrated mapping) */
+function inchesToMiiHeight(targetInches) {
+  const y = clamp((targetInches - HEIGHT_MIN_IN) / HEIGHT_RANGE_IN, 0, 1);
+  const x = Math.pow(y, 1 / HEIGHT_EXP);
+  return Math.round(x * 127);
+}
+
+// ------------------------------
+// Weight (0..127) + height(0..127)  <->  pounds
+// Baseline by BMI; composition slider is nonlinear & invertible.
+// Center (64) -> multiplier 1.0.
+// ------------------------------
+const BMI_AVG = 23.5;      // gives ~150 lb at 67"
+const WEIGHT_SPREAD = 0.35; // ±35% around baseline at extremes
+const WEIGHT_GAMMA = 1.6;   // steeper near ends, softer center
+
+/** weight slider + height slider -> pounds */
+function miiWeightToPounds(weightValue, heightValue) {
+  const wv = clamp(weightValue | 0, 0, 127);
+  const hv = clamp(heightValue | 0, 0, 127);
+
+  // Height in inches using the calibrated mapping
+  const { totalInches: H } = miiHeightToFeetInches(hv);
+
+  // BMI baseline
+  const base = (BMI_AVG * H * H) / 703;
+
+  // Nonlinear symmetric multiplier around 1.0 (64 -> 0 offset)
+  const d = clamp((wv - 64) / 63, -1, 1);
+  const multiplier = 1 + Math.sign(d) * WEIGHT_SPREAD * Math.pow(Math.abs(d), WEIGHT_GAMMA);
+
+  return Math.round(base * multiplier);
+}
+
+/** pounds + height slider -> weight slider (inverse of above) */
+function poundsToMiiWeight(pounds, heightValue) {
+  const hv = clamp(heightValue | 0, 0, 127);
+  const { totalInches: H } = miiHeightToFeetInches(hv);
+  const base = (BMI_AVG * H * H) / 703;
+
+  // Guard against tiny numeric drift outside the spread
+  const mult = clamp(pounds / base, 1 - WEIGHT_SPREAD * 1.0001, 1 + WEIGHT_SPREAD * 1.0001);
+
+  let d;
+  if (Math.abs(mult - 1) < 1e-9) {
+    d = 0;
+  } else if (mult > 1) {
+    d = Math.pow((mult - 1) / WEIGHT_SPREAD, 1 / WEIGHT_GAMMA);
+  } else {
+    d = -Math.pow((1 - mult) / WEIGHT_SPREAD, 1 / WEIGHT_GAMMA);
+  }
+
+  const wv = Math.round(64 + 63 * clamp(d, -1, 1));
+  return clamp(wv, 0, 127);
+}
+
+// ------------------------------
+// Quick checks (should match your expectations)
+// ------------------------------
+// Average points
+// console.log(miiHeightToFeetInches(64), miiWeightToPounds(64, 64)); // ~5'7", ~150 lb
+// Extremes
+// console.log(miiHeightToFeetInches(0),   miiWeightToPounds(0, 0));       // 3'0",  ~28 lb
+// console.log(miiHeightToFeetInches(127), miiWeightToPounds(127, 127));   // 7'0", ~318 lb
+// Inverses
+// const h = miiHeightToFeetInches(64);
+// console.log(inchesToMiiHeight(h.totalInches)); // ~64
+// const lbs = miiWeightToPounds(96, 64);
+// console.log(lbs);                              // ~135
+// console.log(poundsToMiiWeight(lbs, 64));       // ~96
+
+
+// ------------------------------
+// Quick sanity checks
+// ------------------------------
+// Average points
+console.log(miiHeightToFeetInches(64), miiWeightToPounds(64, 64)); // ~5'0", ~150 lb
+// // Extremes
+console.log(miiHeightToFeetInches(0), miiWeightToPounds(0, 0));//3'0, 28 lb
+console.log(miiHeightToFeetInches(127), miiWeightToPounds(127, 127));//7'0 318 lb
+// // Inverses
+const h = miiHeightToFeetInches(64);
+console.log(inchesToMiiHeight(h.totalInches)); // ~64
+const lbs = miiWeightToPounds(96, 64);
+console.log(lbs);//168
+console.log(poundsToMiiWeight(lbs, 64)); // ~96

package/index.js

@@ -5,6 +5,7 @@ const { createCanvas, loadImage, ImageData } = nodeCanvas;
 const jsQR = require('jsqr');
 const Jimp = require('jimp');
 const THREE = require('three');
+var GLTFLoader=null;
 const QRCodeStyling = require("qr-code-styling");
 const { JSDOM } = require("jsdom");
 const httpsLib = require('https');
@@ -2178,11 +2179,11 @@ function convertMii(jsonIn,typeTo){
         }
         miiTo.nose.type=convTables.nose3DSToWii[mii.nose.page][mii.nose.type];
         miiTo.mouth.type=convTables.mouth3DSToWii[mii.mouth.page][mii.mouth.type];
-        miiTo.mouth.color=mii.mouth.col>2?0:mii.mouth.col;
+        miiTo.mouth.color=mii.mouth.color>2?0:mii.mouth.color;
         miiTo.hair.type=convTables.hair3DSToWii[mii.hair.page][mii.hair.type];
         miiTo.eyebrows.type=convTables.eyebrows3DSToWii[mii.eyebrows.page][mii.eyebrows.type];
         miiTo.eyes.type=convTables.eyes3DSToWii[mii.eyes.page][mii.eyes.type];
-        miiTo.glasses.col=mii.glasses.col;
+        miiTo.glasses.color=mii.glasses.color;
         if(miiTo.beard.mustache.type===4){
             miiTo.beard.mustache.type=2;
         }
@@ -2210,7 +2211,7 @@ function convertMii(jsonIn,typeTo){
         }
         miiTo.eyes.squash=3;
         miiTo.eyebrows.squash=3;
-        miiTo.mouth.col=mouthCols3DS[mii.mouth.col];//qk
+        miiTo.mouth.color=mii.mouth.color;
         miiTo.mouth.squash=3;
         miiTo.console="3ds";
     }
@@ -2263,7 +2264,7 @@ function convertMiiToStudio(jsonIn) {
     studioMii[0x23] = mii.mouth.squash;
     studioMii[0x27] = mii.mouth.yPosition;
     studioMii[0x29] = mii.beard.mustache.type;
-    studioMii[1] = mii.beard.beardType;
+    studioMii[1] = mii.beard.type;
     studioMii[0] = mii.beard.color;
     if (!studioMii[0]) studioMii[0] = 8;
     studioMii[0x28] = mii.beard.mustache.size;
@@ -2569,7 +2570,7 @@ 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, fflRes) {
+async function createFFLMiiIcon(data, width, height, useBody, shirtColor, fflRes) {
     /**
      * Creates a Mii face render using FFL.js/Three.js/gl-headless.
      * @example
@@ -2609,11 +2610,18 @@ async function createFFLMiiIcon(data, width, height, fflRes) {
     setIsWebGL1State(!renderer.capabilities.isWebGL2); // Tell FFL.js we are WebGL1
 
     const scene = new THREE.Scene();
-    // scene.background = null; // Transparent background.
-    scene.background = new THREE.Color('white');
-    // (You DO NOT need to add any lights to the scene,
-    // unless you are using a Three.js built-in material.
-    // If you are, look at demo-basic.js "addLightsToScene".)
+    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);
+
+    }
 
     let ffl, currentCharModel;
 
@@ -2629,11 +2637,61 @@ async function createFFLMiiIcon(data, width, height, fflRes) {
         // Convert Uint8Array to Buffer for struct-fu compatibility
         const studioBuffer = Buffer.from(studioRaw);
         
-        currentCharModel = createCharModel(studioBuffer, null,
-        FFLShaderMaterial, ffl.module);
+        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
+                );
+            });
+
+            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;
+                }
+            });
+
+
+
+            // (6) Add to scene
+            scene.add(body);
+        }
+
+
         // Use the camera for an icon pose.
         const camera = getCameraForViewType(ViewType.MakeIcon);
 
@@ -2641,11 +2699,16 @@ async function createFFLMiiIcon(data, width, height, fflRes) {
         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)
-            // Fix triangle winding by changing the culling (side).
-            mesh.material.side = THREE.BackSide;
+            if (
+                mesh.isMesh &&
+                mesh.material.side === THREE.FrontSide &&
+                !mesh.userData.isMiiBody
+            ) {
+                mesh.material.side = THREE.BackSide;
+            }
         });
 
+
         // Render the scene, and read the pixels into a buffer.
         renderer.render(scene, camera);
         const pixels = new Uint8Array(width * height * 4);
@@ -2682,7 +2745,7 @@ async function renderMii(jsonIn, fflRes=getFFLRes()){
     const studioMii = convertMiiToStudio(jsonIn);
     const width = height = 600;
 
-    return createFFLMiiIcon(studioMii, width, height, fflRes);
+    return createFFLMiiIcon(studioMii, width, height, true, jsonIn.general.favoriteColor, fflRes);
 }
 async function writeWiiBin(jsonIn, outPath) {
     if (jsonIn.console?.toLowerCase() !== "wii") {
@@ -2991,8 +3054,8 @@ async function write3DSQR(miiJson, outPath, fflRes = getFFLRes()) {
     main_img.blit(canvas, 212 - 100 / 2, 212 - 100 / 2);
     const font = await Jimp.loadFont(Jimp.FONT_SANS_16_BLACK)
 
-    main_img.print(font, 0, 55, {
-        text: miiJson.name,
+    main_img.print(font, 0, 70, {
+        text: miiJson.meta.name,
         alignmentX: Jimp.HORIZONTAL_ALIGN_CENTER,
         alignmentY: Jimp.VERTICAL_ALIGN_MIDDLE
     }, 424, 395);
@@ -3014,61 +3077,64 @@ async function write3DSQR(miiJson, outPath, fflRes = getFFLRes()) {
     return imageBuffer;
 }
 function make3DSChild(dad,mom,options={}){
-    if(!["3ds","wii u"].includes(dad.console?.toLowerCase())){
+    if(!["3ds","wii u"].includes(dad.meta.console?.toLowerCase())){
         dad=convertMii(dad,"wii");
     }
-    if(!["3ds","wii u"].includes(mom.console?.toLowerCase())){
+    if(!["3ds","wii u"].includes(mom.meta.console?.toLowerCase())){
         mom=convertMii(dad,"wii");
     }
-    var g=options.gender||Math.floor(Math.random()*2)===1?"Male":"Female";
+    var g=options.gender||Math.floor(Math.random()*2);
     var child={
-        "info":{
+        "general":{
             "birthMonth":new Date().getMonth()+1,
             "birthday":new Date().getDay(),
             "height":64,
             "weight":64,
-            "creatorName":"",
             "gender":g,
-            "name":options.name||kidNames[g][Math.floor(Math.random()*kidNames[g].length)],
             "favColor":options.favColor||favCols[Math.floor(Math.random()*favCols.length)]
         },
+        "meta":{
+            "name":options.name||kidNames[g][Math.floor(Math.random()*kidNames[g].length)],
+            "creatorName":"",
+        },
         "perms":{
             "sharing":true,
             "copying":true
         },
         "hair":{
-            "style":[8,3],//Hardcoded
-            "col":Math.floor(Math.random()*2)===1?dad.hair.col:mom.hair.col,
+            "page":8,//Hardcoded, needs to be generated
+            "type":3,// ^
+            "color":Math.floor(Math.random()*2)===1?dad.hair.color:mom.hair.color,
             "flipped":Math.floor(Math.random()*2)===0?true:false
         },
         "face":{
             "shape":Math.floor(Math.random()*2)===1?dad.face.shape:mom.face.shape,
             "feature":Math.floor(Math.random()*2)===1?dad.face.feature:mom.face.feature,
-            "makeup":g==="Male"?"None":Math.floor(Math.random()*2)===1?dad.face.makeup:mom.face.makeup
+            "makeup":g===0?0:Math.floor(Math.random()*2)===1?dad.face.makeup:mom.face.makeup
         },
         "eyes":Math.floor(Math.random()*2)===1?dad.eyes:mom.eyes,
         "eyebrows":Math.floor(Math.random()*2)===1?dad.eyebrows:mom.eyebrows,
         "nose":Math.floor(Math.random()*2)===1?dad.nose:mom.nose,
         "mouth":Math.floor(Math.random()*2)===1?dad.mouth:mom.mouth,
-        "facialHair":g==="Female"?{
-            "mustacheType": 0,
-            "beardType": 0,
-            "col": "Black",
-            "mustacheSize": 4,
-            "mustacheYPos": 10
-        }:Math.floor(Math.random()*2)===0?dad.facialHair:mom.facialHair,
+        "beard":{//Beards can never be generated for children allegedly, confirm before finishing
+            "mustache":{
+                "type":0,
+                "mustacheSize": 4,
+                "mustacheYPos": 10
+            },
+            "type": 0,
+            "color": 0
+        },
         "glasses":Math.floor(Math.random()*2)===1?dad.glasses:mom.glasses,
-        "mole":Math.floor(Math.random()*2)===1?dad.mole:mom.mole,
-        "creatorName":""
+        "mole":Math.floor(Math.random()*2)===1?dad.mole:mom.mole
     };
-    child.eyebrows.col=child.hair.col;
-    var c=[skinCols.indexOf(mom.face.col),skinCols.indexOf(dad.face.col)];
+    child.eyebrows.color=child.hair.color;
+    var c=[mom.face.color,dad.face.color];
     if(c[0]>c[1]){
         c[1]=c[0];
-        c[0]=skinCols.indexOf(dad.face.col);
+        c[0]=dad.face.color;
     }
-    child.face.col=skinCols[c[0]+Math.round((c[1]-c[0])/2)];
-    child.name=child.info.name;
+    child.face.color=c[0]+Math.round((c[1]-c[0])/2);
     child.type="3DS";
     return child;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miijs",
-  "version": "2.1.3",
+  "version": "2.2.1",
   "description": "Work with Mii characters in every possible way needed for your project.",
   "main": "index.js",
   "scripts": {

package/defaultMii.json

@@ -1,188 +0,0 @@
-{
-    "male":{
-        "general": {
-            "type":3,
-            "birthday": 17,
-            "birthMonth": 4,
-            "height": 0,
-            "weight": 0,
-            "gender": 1,
-            "favoriteColor": 7
-        },
-        "meta":{
-            "name": "",
-            "creatorName": "",
-            "console":"3ds",
-            "miiId":"148",
-            "systemId":"148"
-        },
-        "perms": {
-            "sharing": false,
-            "copying": true,
-            "fromCheckMiiOut": false,
-            "mingle": true
-        },
-        "hair": {
-            "page":0,
-            "type":7,
-            "color": 7,
-            "flipped": false
-        },
-        "face": {
-            "type": 5,
-            "color": 0,
-            "feature": 0,
-            "makeup": 0
-        },
-        "eyes": {
-            "page":0,
-            "type": 9,
-            "col": 4,
-            "size": 1,
-            "squash": 3,
-            "rotation": 4,
-            "distanceApart": 3,
-            "yPosition": 11
-        },
-        "eyebrows": {
-            "page":0,
-            "type":5,
-            "color":7,
-            "size": 2,
-            "squash": 4,
-            "rotation": 4,
-            "distanceApart": 4,
-            "yPosition": 6
-        },
-        "nose": {
-            "page":1,
-            "type":0,
-            "size": 0,
-            "yPosition": 5
-        },
-        "mouth": {
-            "page":1,
-            "type":6,
-            "color": 0,
-            "size": 2,
-            "squash": 3,
-            "yPosition": 10
-        },
-        "beard": {
-            "mustache":{
-                "type": 0,
-                "size": 4,
-                "yPosition": 10
-            },
-            "col": 0,
-            "type": 0
-        },
-        "glasses": {
-            "type": 0,
-            "color":0,
-            "size": 4,
-            "yPosition": 10
-        },
-        "mole": {
-            "on": false,
-            "size": 4,
-            "xPosition": 2,
-            "yPosition": 20
-        },
-        "name": "",
-        "creatorName": ""
-    },
-    "female":{
-        "general": {
-            "type":3,
-            "birthday": 17,
-            "birthMonth": 4,
-            "height": 0,
-            "weight": 0,
-            "gender": 1,
-            "favoriteColor": 7
-        },
-        "meta":{
-            "name": "",
-            "creatorName": "",
-            "console":"3ds",
-            "miiId":"148",
-            "systemId":"148"
-        },
-        "perms": {
-            "sharing": false,
-            "copying": true,
-            "fromCheckMiiOut": false,
-            "mingle": true
-        },
-        "hair": {
-            "page":0,
-            "type":7,
-            "color": 7,
-            "flipped": false
-        },
-        "face": {
-            "type": 5,
-            "color": 0,
-            "feature": 0,
-            "makeup": 0
-        },
-        "eyes": {
-            "page":0,
-            "type": 9,
-            "col": 4,
-            "size": 1,
-            "squash": 3,
-            "rotation": 4,
-            "distanceApart": 3,
-            "yPosition": 11
-        },
-        "eyebrows": {
-            "page":0,
-            "type":5,
-            "color":7,
-            "size": 2,
-            "squash": 4,
-            "rotation": 4,
-            "distanceApart": 4,
-            "yPosition": 6
-        },
-        "nose": {
-            "page":1,
-            "type":0,
-            "size": 0,
-            "yPosition": 5
-        },
-        "mouth": {
-            "page":1,
-            "type":6,
-            "color": 0,
-            "size": 2,
-            "squash": 3,
-            "yPosition": 10
-        },
-        "beard": {
-            "mustache":{
-                "type": 0,
-                "size": 4,
-                "yPosition": 10
-            },
-            "col": 0,
-            "type": 0
-        },
-        "glasses": {
-            "type": 0,
-            "color":0,
-            "size": 4,
-            "yPosition": 10
-        },
-        "mole": {
-            "on": false,
-            "size": 4,
-            "xPosition": 2,
-            "yPosition": 20
-        },
-        "name": "",
-        "creatorName": ""
-    }
-}