Reset core/viewer/editor/mcp packages and apps/editor from private-editor
Wholesale swap of packages/{core,viewer,editor,mcp} and apps/editor with the
versions from the private editor repo, which is the production source of truth.
Setup changes:
- packages/{core,viewer,editor} versions held at 0.7.0 baseline (matching
the most recent published release) so a bump=minor publishes 0.8.0
- packages/mcp held at 0.1.1 (never published; first publish will go through
the new release.yml flow)
- peerDependencies and devDependencies for inter-package @pascal-app/*
references pinned to ^0.7.0 instead of '*' / 'workspace:*' so they are
valid for npm consumers
- Root package.json: TypeScript bumped to 6.0.2, added overrides for
@types/react, @types/react-dom, @types/three to prevent JSX namespace
fragmentation across the workspace
- release.yml extended to also publish editor and mcp; 'both' option renamed
to 'all'; added a sync step that updates inter-package peerDeps/devDeps to
match the new versions on every bump (so viewer/editor/mcp tarballs always
reference the version of core they were built against)
- Root scripts gained release:editor and release:mcp shortcuts
Verification:
- bun install --frozen-lockfile is consistent
- packages/{core,viewer,mcp} build cleanly, dist/index.d.ts emitted
- packages/editor check-types reports 21 pre-existing errors, identical to
what private-editor currently reports
Open PRs against editor-v2 will need rebasing/conflict resolution.
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
import { useFrame } from '@react-three/fiber'
|
||||
import {
|
||||
type AnyNode,
|
||||
type AnyNodeId,
|
||||
@@ -8,11 +7,21 @@ import {
|
||||
sceneRegistry,
|
||||
useScene,
|
||||
} from '@pascal-app/core'
|
||||
import { useFrame } from '@react-three/fiber'
|
||||
import * as THREE from 'three'
|
||||
import { mergeVertices } from 'three/examples/jsm/utils/BufferGeometryUtils.js'
|
||||
import { ADDITION, Brush, Evaluator, SUBTRACTION } from 'three-bvh-csg'
|
||||
import { computeBoundsTree } from 'three-mesh-bvh'
|
||||
|
||||
function csgGeometry(brush: Brush): THREE.BufferGeometry {
|
||||
return brush.geometry as unknown as THREE.BufferGeometry
|
||||
}
|
||||
|
||||
function csgMaterials(brush: Brush): THREE.Material[] {
|
||||
const mat = (brush as any).material
|
||||
return Array.isArray(mat) ? mat : [mat]
|
||||
}
|
||||
|
||||
const csgEvaluator = new Evaluator()
|
||||
csgEvaluator.useGroups = true
|
||||
;(csgEvaluator as any).consolidateGroups = false // shared dummyMats across brushes causes consolidation to misalign groupIndices vs groupOrder indices → crash
|
||||
@@ -183,7 +192,7 @@ function updateMergedRoofGeometry(
|
||||
)
|
||||
|
||||
const applyTransform = (brush: Brush) => {
|
||||
brush.geometry.applyMatrix4(_matrix)
|
||||
csgGeometry(brush).applyMatrix4(_matrix)
|
||||
brush.updateMatrixWorld()
|
||||
}
|
||||
|
||||
@@ -242,11 +251,9 @@ function updateMergedRoofGeometry(
|
||||
const shinDeck = csgEvaluator.evaluate(finalShinTrimmed, finalDeckTrimmed, ADDITION)
|
||||
const combined = csgEvaluator.evaluate(shinDeck, finalWallTrimmed, ADDITION)
|
||||
|
||||
const resultGeo = combined.geometry
|
||||
const resultGeo = csgGeometry(combined)
|
||||
|
||||
const resultMaterials: THREE.Material[] = Array.isArray(combined.material)
|
||||
? combined.material
|
||||
: [combined.material]
|
||||
const resultMaterials = csgMaterials(combined)
|
||||
|
||||
const matToIndex = new Map<THREE.Material, number>([
|
||||
[dummyMats[0], 0],
|
||||
@@ -259,8 +266,8 @@ function updateMergedRoofGeometry(
|
||||
g.materialIndex = mapRoofGroupMaterialIndex(g.materialIndex, resultMaterials, matToIndex)
|
||||
}
|
||||
|
||||
ensureUv2Attribute(resultGeo)
|
||||
resultGeo.computeVertexNormals()
|
||||
ensureUv2Attribute(resultGeo)
|
||||
mergedMesh.geometry.dispose()
|
||||
mergedMesh.geometry = resultGeo
|
||||
|
||||
@@ -614,11 +621,9 @@ export function generateRoofSegmentGeometry(node: RoofSegmentNode): THREE.Buffer
|
||||
const shinDeck = csgEvaluator.evaluate(shinSlab, deckSlab, ADDITION)
|
||||
const combined = csgEvaluator.evaluate(shinDeck, hollowWall, ADDITION)
|
||||
|
||||
resultGeo = combined.geometry
|
||||
resultGeo = csgGeometry(combined)
|
||||
|
||||
const resultMaterials: THREE.Material[] = Array.isArray(combined.material)
|
||||
? combined.material
|
||||
: [combined.material]
|
||||
const resultMaterials = csgMaterials(combined)
|
||||
|
||||
const matToIndex = new Map<THREE.Material, number>([
|
||||
[dummyMats[0], 0],
|
||||
@@ -641,7 +646,7 @@ export function generateRoofSegmentGeometry(node: RoofSegmentNode): THREE.Buffer
|
||||
shinDeck.geometry.dispose()
|
||||
} catch (e) {
|
||||
console.error('Roof CSG failed:', e)
|
||||
resultGeo = wallBrush.geometry.clone()
|
||||
resultGeo = csgGeometry(wallBrush).clone()
|
||||
}
|
||||
|
||||
deckSlab.geometry.dispose()
|
||||
@@ -649,8 +654,8 @@ export function generateRoofSegmentGeometry(node: RoofSegmentNode): THREE.Buffer
|
||||
wallBrush.geometry.dispose()
|
||||
innerBrush.geometry.dispose()
|
||||
|
||||
ensureUv2Attribute(resultGeo)
|
||||
resultGeo.computeVertexNormals()
|
||||
ensureUv2Attribute(resultGeo)
|
||||
return resultGeo
|
||||
}
|
||||
|
||||
@@ -1014,8 +1019,8 @@ function createGeometryFromFaces(
|
||||
// Merge identical vertices to optimize geometry for CSG and create clean topology
|
||||
const mergedGeo = mergeVertices(geometry, 1e-4)
|
||||
geometry.dispose()
|
||||
ensureUv2Attribute(mergedGeo)
|
||||
|
||||
ensureUv2Attribute(mergedGeo)
|
||||
return mergedGeo
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user