@drawcall/charta 0.1.26 → 0.1.28

package/dist/place/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/place/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAQ,MAAM,OAAO,CAAA;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAO/C,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;AAEvD,MAAM,MAAM,mBAAmB,GAAG,CAAC,IAAI,EAAE;IACvC,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAA;IACpB,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,WAAW,CAAA;IACxB,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAA;IAC5D,IAAI,EAAE,MAAM,CAAA;CACb,KAAK,IAAI,CAAA;AAKV,wBAAgB,aAAa,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAOvD;AAED,qBAAa,kBAAkB;aAIX,UAAU,EAAE,OAAO;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAJpC,SAAgB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAK;gBAG3B,UAAU,EAAE,OAAO,EAClB,iBAAiB,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,QAAQ;IAG5E,GAAG,CAAC,MAAM,EAAE,OAAO;IAKZ,KAAK,IAAI,QAAQ;CAGzB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAA;CACjC,CAAA;AAED,qBAAa,UAAW,SAAQ,KAAK;IACnC,SAAgB,aAAa,kCAAwC;gBAEzD,WAAW,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,QAAQ,EAAE,IAAI,GAAE,iBAAsB;IAkPhG,OAAO;CAOR"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/place/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAQ,MAAM,OAAO,CAAA;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAO/C,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;AAEvD,MAAM,MAAM,mBAAmB,GAAG,CAAC,IAAI,EAAE;IACvC,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAA;IACpB,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,WAAW,CAAA;IACxB,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAA;IAC5D,IAAI,EAAE,MAAM,CAAA;CACb,KAAK,IAAI,CAAA;AAKV,wBAAgB,aAAa,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAOvD;AAED,qBAAa,kBAAkB;aAIX,UAAU,EAAE,OAAO;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAJpC,SAAgB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAK;gBAG3B,UAAU,EAAE,OAAO,EAClB,iBAAiB,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,QAAQ;IAG5E,GAAG,CAAC,MAAM,EAAE,OAAO;IAKZ,KAAK,IAAI,QAAQ;CAGzB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAA;CACjC,CAAA;AAED,qBAAa,UAAW,SAAQ,KAAK;IACnC,SAAgB,aAAa,kCAAwC;gBAEzD,WAAW,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,QAAQ,EAAE,IAAI,GAAE,iBAAsB;IA4OhG,OAAO;CAOR"}

package/dist/place/index.js

@@ -61,17 +61,17 @@ export class PlaceGroup extends Group {
             const scale = Math.min(sFactorX ?? sFactorZ ?? 1, sFactorZ ?? sFactorX ?? 1);
             return new Vector3(scale, scale, scale);
         };
-        const computeTransform = (worldX, worldZ, cell, transformOpts) => {
+        const computeTransform = (gridCoord, transformOpts) => {
             const normal = new Vector3();
-            const { offsetX, offsetZ } = interpreter.worldToGrid({ x: worldX, z: worldZ });
-            let py = 0;
+            let y = 0;
             if (transformOpts.useFixedY) {
-                py = transformOpts.fixedY;
+                y = transformOpts.fixedY;
             }
             else {
-                py = tilesGeometry.getHeightAt({ row: cell.row, col: cell.col, offsetX, offsetZ }, { stackIndex: transformOpts.layerIndex, normalTarget: normal });
+                y = tilesGeometry.getHeightAt(gridCoord, { stackIndex: transformOpts.layerIndex, normalTarget: normal });
             }
-            const pos = new Vector3(worldX, py, worldZ);
+            const { x, z } = interpreter.gridToWorld(gridCoord);
+            const pos = new Vector3(x, y, z);
             const quat = new Quaternion();
             if (transformOpts.alignMode === 'normal' && !transformOpts.useFixedY) {
                 const qAlign = new Quaternion().setFromUnitVectors(new Vector3(0, 1, 0), normal);
@@ -93,7 +93,6 @@ export class PlaceGroup extends Group {
                 const placeEntries = interpreter.getCalls({ row, col }, { place: placeSchema });
                 if (scatterEntries.length === 0 && placeEntries.length === 0)
                     continue;
-                const { x: cx, z: cz } = interpreter.gridToWorld({ row, col });
                 const half = cellSize * 0.5;
                 // Collect location points in this cell for collision/footprint validation
                 const locationEntries = interpreter.getCalls({ row, col }, { location: locationSchema });
@@ -129,19 +128,16 @@ export class PlaceGroup extends Group {
                         continue;
                     const useFixedY = parsed.bottomY != null;
                     const yawMin = parsed.yawMin ?? 0;
-                    const yawMax = parsed.yawMax ?? (parsed.yaw != null ? parsed.yaw : Math.PI * 2);
+                    const yawMax = parsed.yawMax ?? 360;
                     const minSizeX = parsed.minSizeX ?? parsed.sizeX ?? usualSize.x * 0.8;
                     const maxSizeX = parsed.maxSizeX ?? parsed.sizeX ?? usualSize.x * 1.2;
                     const minSizeZ = parsed.minSizeZ ?? parsed.sizeZ ?? usualSize.z * 0.8;
                     const maxSizeZ = parsed.maxSizeZ ?? parsed.sizeZ ?? usualSize.z * 1.2;
                     const alignMode = (parsed.align ?? 'up').toLowerCase();
                     for (let i = 0; i < count; i++) {
-                        const ox = (rng() * 2 - 1) * half;
-                        const oz = (rng() * 2 - 1) * half;
-                        const px = cx + ox;
-                        const pz = cz + oz;
-                        const yaw = yawMin === yawMax ? yawMin : yawMin + (yawMax - yawMin) * rng();
-                        const { pos, quat, scl } = computeTransform(px, pz, { row, col }, {
+                        const gridCoord = { col, row, offsetX: (rng() * 2 - 1) * half, offsetZ: (rng() * 2 - 1) * half };
+                        const yaw = parsed.yaw ?? (yawMin + (yawMax - yawMin) * rng());
+                        const { pos, quat, scl } = computeTransform(gridCoord, {
                             alignMode,
                             yaw,
                             useFixedY: useFixedY,
@@ -159,7 +155,8 @@ export class PlaceGroup extends Group {
                         // Check if any location point falls inside this scattered object's footprint
                         const halfX = (usualSize.x * scale.x) / 2;
                         const halfZ = (usualSize.z * scale.z) / 2;
-                        const overlapsLocation = locationPoints.some((locPoint) => isPointInsideFootprint(locPoint.x, locPoint.z, px, pz, halfX, halfZ));
+                        const { x, z } = interpreter.gridToWorld(gridCoord);
+                        const overlapsLocation = locationPoints.some((locationPoint) => isPointInsideFootprint(locationPoint.x, locationPoint.z, x, z, halfX, halfZ));
                         if (overlapsLocation)
                             continue;
                         batchBuilder.add(matrixHelper.compose(pos, quat, scl));
@@ -172,19 +169,20 @@ export class PlaceGroup extends Group {
                     if (!batchBuilder)
                         continue;
                     const usualSize = batchBuilder.prefabSize;
-                    const { x: px, z: pz } = interpreter.gridToWorld({
+                    const gridCoord = {
                         row,
                         col,
                         offsetX: parsed.offsetX,
                         offsetZ: parsed.offsetZ,
-                    });
+                    };
                     // Compute scale for footprint validation (needed for both validateOnly and normal mode)
                     const scale = computeScale(usualSize, parsed.sizeX, parsed.sizeZ);
                     const halfX = (usualSize.x * scale.x) / 2;
                     const halfZ = (usualSize.z * scale.z) / 2;
                     // Validate that no location point is inside this placed object's footprint
-                    for (const locPoint of locationPoints) {
-                        if (isPointInsideFootprint(locPoint.x, locPoint.z, px, pz, halfX, halfZ)) {
+                    const { x, z } = interpreter.gridToWorld(gridCoord);
+                    for (const locationPoint of locationPoints) {
+                        if (isPointInsideFootprint(locationPoint.x, locationPoint.z, x, z, halfX, halfZ)) {
                             interpreter.reportError(new ChartaError(`location is inside place(${parsed.model}) footprint`, interpreter.getSource(), loc));
                         }
                     }
@@ -195,7 +193,7 @@ export class PlaceGroup extends Group {
                     const layerIndex = interpreter.countCalls({ row, col }, (c) => c.name === 'ground' || c.name === 'ceiling', 0, callIdx) - 1;
                     const yaw = parsed.yaw ?? 0;
                     const alignMode = (parsed.align ?? 'up').toLowerCase();
-                    const { pos, quat, scl } = computeTransform(px, pz, { row, col }, {
+                    const { pos, quat, scl } = computeTransform(gridCoord, {
                         alignMode,
                         yaw,
                         useFixedY: parsed.bottomY != null,

package/dist/walls/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/walls/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAER,IAAI,EAGJ,YAAY,EAEZ,YAAY,EAOb,MAAM,OAAO,CAAA;AAEd,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAGpD,OAAO,EAAe,aAAa,EAAE,MAAM,cAAc,CAAA;AAUzD,cAAc,eAAe,CAAA;AAK7B,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,MAAM,EAAE,YAAY,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,YAAY,CAAA;IACpB,IAAI,EAAE,YAAY,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,UAAU,EAAE,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;CAed,CAAA;AAEV,eAAO,MAAM,+BAA+B,QAAQ,CAAA;AAEpD,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,MAAM,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EACxD,MAAM,EAAE,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,EACtD,GAAG,EAAE,aAAa;YAwFO,YAAY;UACd,YAAY;;;cA8DpC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,qBAAa,QAAS,SAAQ,IAAI;gBACpB,WAAW,EAAE,WAAW,EAAE,QAAQ,GAAE,QAAkC,EAAE,OAAO,GAAE,eAAoB;CAkTlH;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAGrG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/walls/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAER,IAAI,EAGJ,YAAY,EAEZ,YAAY,EAOb,MAAM,OAAO,CAAA;AAEd,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAGpD,OAAO,EAAe,aAAa,EAAE,MAAM,cAAc,CAAA;AAUzD,cAAc,eAAe,CAAA;AAK7B,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,MAAM,EAAE,YAAY,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,YAAY,CAAA;IACpB,IAAI,EAAE,YAAY,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,UAAU,EAAE,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;CAed,CAAA;AAEV,eAAO,MAAM,+BAA+B,QAAQ,CAAA;AAEpD,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,MAAM,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EACxD,MAAM,EAAE,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,EACtD,GAAG,EAAE,aAAa;YAwFO,YAAY;UACd,YAAY;;;cA6EpC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,qBAAa,QAAS,SAAQ,IAAI;gBACpB,WAAW,EAAE,WAAW,EAAE,QAAQ,GAAE,QAAkC,EAAE,OAAO,GAAE,eAAoB;CAkTlH;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAGrG"}

package/dist/walls/index.js

@@ -90,8 +90,8 @@ export function computeWallVerticalBounds(interpreter, tilesGeometry, row, col,
         checkCell(neighborRow, neighborCol);
         return bestLayer;
     };
-    const bottomLayer = resolveLayer(parsed.bottomY, false);
-    const topLayer = resolveLayer(parsed.topY, true);
+    let bottomLayer = resolveLayer(parsed.bottomY, false);
+    let topLayer = resolveLayer(parsed.topY, true);
     if (bottomLayer === undefined && parsed.bottomY === undefined)
         return undefined;
     if (topLayer === undefined && parsed.topY === undefined)
@@ -137,6 +137,17 @@ export function computeWallVerticalBounds(interpreter, tilesGeometry, row, col,
         else {
             yEnd[k] = parsed.topY;
         }
+        if (yStart[k] != yEnd[k] || (parsed.bottomY == null && parsed.topY == null)) {
+            continue;
+        }
+        const bottomDist = parsed.bottomY == null ? 0 : Math.abs(yStart[k] - parsed.bottomY);
+        const topDist = parsed.topY == null ? 0 : Math.abs(yEnd[k] - parsed.topY);
+        if (bottomDist > topDist) {
+            yStart[k] = parsed.bottomY;
+        }
+        else {
+            yEnd[k] = parsed.topY;
+        }
     }
     // Ensure non-negative height (fix inverted walls)
     for (let k = 0; k < 3; k++) {
@@ -146,6 +157,7 @@ export function computeWallVerticalBounds(interpreter, tilesGeometry, row, col,
             yEnd[k] = tmp;
         }
     }
+    console.log(yStart, yEnd);
     return {
         yStart,
         yEnd,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drawcall/charta",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "author": "Bela Bohlender",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://drawcall.ai",
@@ -14,6 +14,7 @@
   "type": "module",
   "devDependencies": {
     "@gltf-transform/core": "^4.3.0",
+    "@gltf-transform/extensions": "^4.3.0",
     "@types/imurmurhash": "^0.1.4",
     "@types/nearley": "^2.11.5",
     "@types/seedrandom": "^3.0.8",