@erik9994857/cag 2.0.3 → 2.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@erik9994857/cag",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "CaG — A code library and custom language for building 3D worlds with .cagc files, .bbmodel support, and auto UV mapping",
   "main": "src/index.js",
   "bin": {

package/src/api/model-api.js

@@ -1,5 +1,6 @@
 const path = require("path");
 const fs = require("fs");
+const UVMapper = require("../models/uv-mapper");
 
 class ModelAPI {
   constructor(resourceMap, defaultModelsPath) {
@@ -122,6 +123,9 @@ class ModelAPI {
 
     const uvMappings = [];
 
+    const useBoxUV = !!data.box_uv;
+    const uvMapper = new UVMapper(geometry.resolution);
+
     if (data.elements && Array.isArray(data.elements)) {
       for (const element of data.elements) {
         const geomElement = {
@@ -133,23 +137,60 @@ class ModelAPI {
           faces: {}
         };
 
+        const needsAutoUV = useBoxUV || (element.box_uv !== undefined && element.box_uv);
+        let autoUVs = null;
+        if (needsAutoUV) {
+          autoUVs = uvMapper.autoMap(geomElement.from, geomElement.to);
+        }
+
         if (element.faces) {
           const faceNames = ["north", "south", "east", "west", "up", "down"];
           for (const faceName of faceNames) {
             if (element.faces[faceName]) {
               const face = element.faces[faceName];
+              let faceUV = face.uv;
+
+              if (!faceUV || !Array.isArray(faceUV) || faceUV.length < 4) {
+                faceUV = autoUVs ? autoUVs[faceName] : [0, 0, 16, 16];
+              }
+
               geomElement.faces[faceName] = {
-                uv: face.uv || [0, 0, 16, 16],
+                uv: faceUV,
                 texture: face.texture !== undefined ? face.texture : 0
               };
               uvMappings.push({
                 element: geomElement.name,
                 face: faceName,
-                uv: face.uv || [0, 0, 16, 16],
+                uv: faceUV,
                 textureIndex: face.texture !== undefined ? face.texture : 0
               });
+            } else if (needsAutoUV && autoUVs) {
+              geomElement.faces[faceName] = {
+                uv: autoUVs[faceName],
+                texture: 0
+              };
+              uvMappings.push({
+                element: geomElement.name,
+                face: faceName,
+                uv: autoUVs[faceName],
+                textureIndex: 0
+              });
             }
           }
+        } else if (needsAutoUV && autoUVs) {
+          const faceNames = ["north", "south", "east", "west", "up", "down"];
+          for (const faceName of faceNames) {
+            geomElement.faces[faceName] = {
+              uv: autoUVs[faceName],
+              texture: 0
+            };
+            uvMappings.push({
+              element: geomElement.name,
+              face: faceName,
+              uv: autoUVs[faceName],
+              textureIndex: 0
+            });
+          }
         }
 
         geometry.elements.push(geomElement);

package/src/models/uv-mapper.js

@@ -258,10 +258,10 @@ class UVMapper {
     var sizeZ = Math.abs(elementTo[2] - elementFrom[2]);
 
     return {
-      north: [sizeZ, sizeY + sizeZ, sizeZ + sizeX, sizeY + sizeZ + sizeY],
-      south: [sizeZ + sizeX + sizeZ, sizeY + sizeZ, sizeZ + sizeX + sizeZ + sizeX, sizeY + sizeZ + sizeY],
-      east: [0, sizeY + sizeZ, sizeZ, sizeY + sizeZ + sizeY],
-      west: [sizeZ + sizeX, sizeY + sizeZ, sizeZ + sizeX + sizeZ, sizeY + sizeZ + sizeY],
+      north: [sizeZ, sizeZ, sizeZ + sizeX, sizeZ + sizeY],
+      south: [sizeZ + sizeX + sizeZ, sizeZ, sizeZ + sizeX + sizeZ + sizeX, sizeZ + sizeY],
+      east: [0, sizeZ, sizeZ, sizeZ + sizeY],
+      west: [sizeZ + sizeX, sizeZ, sizeZ + sizeX + sizeZ, sizeZ + sizeY],
       up: [sizeZ, 0, sizeZ + sizeX, sizeZ],
       down: [sizeZ + sizeX, 0, sizeZ + sizeX + sizeX, sizeZ]
     };