@erik9994857/cag 2.0.2 → 2.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@erik9994857/cag",
-  "version": "2.0.2",
+  "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]
     };

package/src/runtime/electron-runner.js

@@ -296,20 +296,25 @@ ElectronRunner.prototype.getRendererSource = function () {
   js.push("}");
   js.push("");
 
+  // Flip UV V-axis for side faces (v0/v1 are bottom vertices but addFace assigns fuv[1] to them)
+  js.push("function flipV(uv) { return [uv[0], uv[3], uv[2], uv[1]]; }");
+  js.push("");
+
   // Build mesh for a chunk
   js.push("function buildChunkMesh(blocks, blockMap) {");
   js.push("  var pos = [], uvArr = [], nrm = [];");
   js.push("  var uv = getModelUVs('Grass');");
+  js.push("  var sN = flipV(uv.north), sS = flipV(uv.south), sE = flipV(uv.east), sW = flipV(uv.west);");
   js.push("  for (var i = 0; i < blocks.length; i++) {");
   js.push("    var b = blocks[i];");
   js.push("    var x = b.x, y = b.y, z = b.z;");
   js.push("    var k = function(bx,by,bz) { return bx+','+by+','+bz; };");
   js.push("    if (!blockMap[k(x,y+1,z)]) addFace(pos,uvArr,nrm, [x,y+1,z],[x+1,y+1,z],[x+1,y+1,z+1],[x,y+1,z+1], uv.up, [0,1,0]);");
   js.push("    if (!blockMap[k(x,y-1,z)]) addFace(pos,uvArr,nrm, [x,y,z+1],[x+1,y,z+1],[x+1,y,z],[x,y,z], uv.down, [0,-1,0]);");
-  js.push("    if (!blockMap[k(x,y,z-1)]) addFace(pos,uvArr,nrm, [x,y,z],[x+1,y,z],[x+1,y+1,z],[x,y+1,z], uv.north, [0,0,-1]);");
-  js.push("    if (!blockMap[k(x,y,z+1)]) addFace(pos,uvArr,nrm, [x+1,y,z+1],[x,y,z+1],[x,y+1,z+1],[x+1,y+1,z+1], uv.south, [0,0,1]);");
-  js.push("    if (!blockMap[k(x+1,y,z)]) addFace(pos,uvArr,nrm, [x+1,y,z],[x+1,y,z+1],[x+1,y+1,z+1],[x+1,y+1,z], uv.east, [1,0,0]);");
-  js.push("    if (!blockMap[k(x-1,y,z)]) addFace(pos,uvArr,nrm, [x,y,z+1],[x,y,z],[x,y+1,z],[x,y+1,z+1], uv.west, [-1,0,0]);");
+  js.push("    if (!blockMap[k(x,y,z-1)]) addFace(pos,uvArr,nrm, [x,y,z],[x+1,y,z],[x+1,y+1,z],[x,y+1,z], sN, [0,0,-1]);");
+  js.push("    if (!blockMap[k(x,y,z+1)]) addFace(pos,uvArr,nrm, [x+1,y,z+1],[x,y,z+1],[x,y+1,z+1],[x+1,y+1,z+1], sS, [0,0,1]);");
+  js.push("    if (!blockMap[k(x+1,y,z)]) addFace(pos,uvArr,nrm, [x+1,y,z],[x+1,y,z+1],[x+1,y+1,z+1],[x+1,y+1,z], sE, [1,0,0]);");
+  js.push("    if (!blockMap[k(x-1,y,z)]) addFace(pos,uvArr,nrm, [x,y,z+1],[x,y,z],[x,y+1,z],[x,y+1,z+1], sW, [-1,0,0]);");
   js.push("  }");
   js.push("  return { positions: pos, uvs: uvArr, normals: nrm };");
   js.push("}");
@@ -585,28 +590,6 @@ ElectronRunner.prototype.getRendererSource = function () {
   js.push("};");
   js.push("");
 
-  // HUD
-  js.push("game.updateHUD = function () {");
-  js.push("  var pcx = Math.floor(this.camX / CHUNK_SIZE);");
-  js.push("  var pcz = Math.floor(this.camZ / CHUNK_SIZE);");
-  js.push("  var loadedCount = Object.keys(this.chunks).length;");
-  js.push("  var sprint = this.keys['ShiftLeft'] || this.keys['ShiftRight'];");
-  js.push("  var html = '<div class=\"hud-title\">' + INFO_ID + '</div>';");
-  js.push("  html += '<div>v' + INFO_VERSION + '</div>';");
-  js.push("  html += '<div class=\"hud-sep\"></div>';");
-  js.push("  html += '<div>FPS: ' + this.fps + '</div>';");
-  js.push("  html += '<div>Triangles: ' + Math.floor(this.totalVerts / 3) + '</div>';");
-  js.push("  html += '<div>Blocks: ' + this.totalBlocks + '</div>';");
-  js.push("  html += '<div>Chunks: ' + loadedCount + '</div>';");
-  js.push("  html += '<div class=\"hud-sep\"></div>';");
-  js.push("  html += '<div>X: ' + this.camX.toFixed(1) + '</div>';");
-  js.push("  html += '<div>Y: ' + this.camY.toFixed(1) + '</div>';");
-  js.push("  html += '<div>Z: ' + this.camZ.toFixed(1) + '</div>';");
-  js.push("  html += '<div>Chunk: ' + pcx + ', ' + pcz + '</div>';");
-  js.push("  html += '<div class=\"hud-sep\"></div>';");
-  js.push("  html += '<div>Sprint: ' + (sprint ? 'ON' : 'OFF') + '</div>';");
-  js.push("  document.getElementById('hud-info').innerHTML = html;");
-  js.push("};");
   js.push("");
 
   // Game loop
@@ -616,7 +599,6 @@ ElectronRunner.prototype.getRendererSource = function () {
   js.push("  game.update();");
   js.push("  updateChunks();");
   js.push("  game.render();");
-  js.push("  game.updateHUD();");
   js.push("};");
   js.push("");
 
@@ -628,8 +610,7 @@ ElectronRunner.prototype.getRendererSource = function () {
   html += "<style>\n" + css + "\n</style>\n";
   html += "</head>\n<body>\n";
   html += "<div id='crosshair' style='display:none'></div>\n";
-  html += "<div id='hud'><div id='hud-box'><div id='hud-info'></div></div></div>\n";
-  html += "<div id='controls-hint'><b>WASD</b> Move &nbsp; <b>Mouse</b> Look &nbsp; <b>Space</b> Jump &nbsp; <b>Shift</b> Sprint &nbsp; <b>F11</b> Fullscreen &nbsp; <b>Esc</b> Release</div>\n";
+  html += "";
   html += "<canvas id='cag-canvas'></canvas>\n";
   html += "<script>\n" + js.join("\n") + "\n</script>\n";
   html += "</body>\n</html>";