Campus pipeline hardening: backend parity, wall union, mullion grids, Draco tooling
Sandbox round (Linux): - detect_sheet_frames.py: multi-frame sheet splitter (column AND row layouts), grid-vote per-floor offsets, section-elevation harvesting for storey heights - dwg_dump_json.mjs + dwgjson_to_dxf.py: WASM libredwg DWG->DXF fallback (blocks/INSERT preserved, ATTRIB->TEXT so axis labels survive) - assemble_campus.py: manifest-driven campus assembly with mandatory neighbour-gap gate (overlap = exit 3, 0.1-0.3m flagged as expansion joints) - site_context_from_dump.py: site-context floors (ground/roads/parking/ fence/trees/context massings) from site-plan dumps - write_offline_viewer.py + assets/offline-viewer-libs/: fully-offline single-file viewer (vendored three r147 + pako, gzip-embedded GLB) - audit: clip-scoped coverage figures; report: multi_frame_sheet warning; audit gate floors_aligned catches the diagonal-staircase failure mode Mac round: - build_blender_showcase.py now honors slab_bounds_fallback and prefers footprint polygons for generated roofs (bounds rects made roof plates jut past the facade and buried campuses under full-extent slabs); contract now matches spec_to_glb.py exactly - merge_wall_solids (default off) in BOTH backends: shapely union in spec_to_glb.py, native delaunay_2d_cdt union in Blender; endpoint-shared wall ends pre-extended w/2 so L-corners close seamlessly (flat caps leave a notch a union alone cannot fill) while openings stay flat - glazing_mullions (default off): curtain-wall panel grid (verticals every glazing_panel_w + floor-line transoms) as pseudo wall segments in the <floor>__walls node; glass pane kept - build_showcase_variants.py keeps source_file=="site" floors intact in all variants (roads/trees live on filtered categories) - web template: instanced low-poly trees from metadata site_trees, grade-level shadow catcher (was at basement depth), data-URI favicon - tools/compress.mjs deps pinned (package.json); 15MB campus GLB -> 0.57MB - tests: 24 -> 52 checks (wall union, mullions, byte-identical defaults) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
3862
assets/offline-viewer-libs/GLTFLoader.js
Normal file
3862
assets/offline-viewer-libs/GLTFLoader.js
Normal file
File diff suppressed because it is too large
Load Diff
1101
assets/offline-viewer-libs/OrbitControls.js
Normal file
1101
assets/offline-viewer-libs/OrbitControls.js
Normal file
File diff suppressed because it is too large
Load Diff
124
assets/offline-viewer-libs/RoomEnvironment.js
Normal file
124
assets/offline-viewer-libs/RoomEnvironment.js
Normal file
@@ -0,0 +1,124 @@
|
||||
( function () {
|
||||
|
||||
/**
|
||||
* https://github.com/google/model-viewer/blob/master/packages/model-viewer/src/three-components/EnvironmentScene.ts
|
||||
*/
|
||||
class RoomEnvironment extends THREE.Scene {
|
||||
|
||||
constructor() {
|
||||
|
||||
super();
|
||||
const geometry = new THREE.BoxGeometry();
|
||||
geometry.deleteAttribute( 'uv' );
|
||||
const roomMaterial = new THREE.MeshStandardMaterial( {
|
||||
side: THREE.BackSide
|
||||
} );
|
||||
const boxMaterial = new THREE.MeshStandardMaterial();
|
||||
const mainLight = new THREE.PointLight( 0xffffff, 5.0, 28, 2 );
|
||||
mainLight.position.set( 0.418, 16.199, 0.300 );
|
||||
this.add( mainLight );
|
||||
const room = new THREE.Mesh( geometry, roomMaterial );
|
||||
room.position.set( - 0.757, 13.219, 0.717 );
|
||||
room.scale.set( 31.713, 28.305, 28.591 );
|
||||
this.add( room );
|
||||
const box1 = new THREE.Mesh( geometry, boxMaterial );
|
||||
box1.position.set( - 10.906, 2.009, 1.846 );
|
||||
box1.rotation.set( 0, - 0.195, 0 );
|
||||
box1.scale.set( 2.328, 7.905, 4.651 );
|
||||
this.add( box1 );
|
||||
const box2 = new THREE.Mesh( geometry, boxMaterial );
|
||||
box2.position.set( - 5.607, - 0.754, - 0.758 );
|
||||
box2.rotation.set( 0, 0.994, 0 );
|
||||
box2.scale.set( 1.970, 1.534, 3.955 );
|
||||
this.add( box2 );
|
||||
const box3 = new THREE.Mesh( geometry, boxMaterial );
|
||||
box3.position.set( 6.167, 0.857, 7.803 );
|
||||
box3.rotation.set( 0, 0.561, 0 );
|
||||
box3.scale.set( 3.927, 6.285, 3.687 );
|
||||
this.add( box3 );
|
||||
const box4 = new THREE.Mesh( geometry, boxMaterial );
|
||||
box4.position.set( - 2.017, 0.018, 6.124 );
|
||||
box4.rotation.set( 0, 0.333, 0 );
|
||||
box4.scale.set( 2.002, 4.566, 2.064 );
|
||||
this.add( box4 );
|
||||
const box5 = new THREE.Mesh( geometry, boxMaterial );
|
||||
box5.position.set( 2.291, - 0.756, - 2.621 );
|
||||
box5.rotation.set( 0, - 0.286, 0 );
|
||||
box5.scale.set( 1.546, 1.552, 1.496 );
|
||||
this.add( box5 );
|
||||
const box6 = new THREE.Mesh( geometry, boxMaterial );
|
||||
box6.position.set( - 2.193, - 0.369, - 5.547 );
|
||||
box6.rotation.set( 0, 0.516, 0 );
|
||||
box6.scale.set( 3.875, 3.487, 2.986 );
|
||||
this.add( box6 );
|
||||
|
||||
// -x right
|
||||
const light1 = new THREE.Mesh( geometry, createAreaLightMaterial( 50 ) );
|
||||
light1.position.set( - 16.116, 14.37, 8.208 );
|
||||
light1.scale.set( 0.1, 2.428, 2.739 );
|
||||
this.add( light1 );
|
||||
|
||||
// -x left
|
||||
const light2 = new THREE.Mesh( geometry, createAreaLightMaterial( 50 ) );
|
||||
light2.position.set( - 16.109, 18.021, - 8.207 );
|
||||
light2.scale.set( 0.1, 2.425, 2.751 );
|
||||
this.add( light2 );
|
||||
|
||||
// +x
|
||||
const light3 = new THREE.Mesh( geometry, createAreaLightMaterial( 17 ) );
|
||||
light3.position.set( 14.904, 12.198, - 1.832 );
|
||||
light3.scale.set( 0.15, 4.265, 6.331 );
|
||||
this.add( light3 );
|
||||
|
||||
// +z
|
||||
const light4 = new THREE.Mesh( geometry, createAreaLightMaterial( 43 ) );
|
||||
light4.position.set( - 0.462, 8.89, 14.520 );
|
||||
light4.scale.set( 4.38, 5.441, 0.088 );
|
||||
this.add( light4 );
|
||||
|
||||
// -z
|
||||
const light5 = new THREE.Mesh( geometry, createAreaLightMaterial( 20 ) );
|
||||
light5.position.set( 3.235, 11.486, - 12.541 );
|
||||
light5.scale.set( 2.5, 2.0, 0.1 );
|
||||
this.add( light5 );
|
||||
|
||||
// +y
|
||||
const light6 = new THREE.Mesh( geometry, createAreaLightMaterial( 100 ) );
|
||||
light6.position.set( 0.0, 20.0, 0.0 );
|
||||
light6.scale.set( 1.0, 0.1, 1.0 );
|
||||
this.add( light6 );
|
||||
|
||||
}
|
||||
dispose() {
|
||||
|
||||
const resources = new Set();
|
||||
this.traverse( object => {
|
||||
|
||||
if ( object.isMesh ) {
|
||||
|
||||
resources.add( object.geometry );
|
||||
resources.add( object.material );
|
||||
|
||||
}
|
||||
|
||||
} );
|
||||
for ( const resource of resources ) {
|
||||
|
||||
resource.dispose();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
function createAreaLightMaterial( intensity ) {
|
||||
|
||||
const material = new THREE.MeshBasicMaterial();
|
||||
material.color.setScalar( intensity );
|
||||
return material;
|
||||
|
||||
}
|
||||
|
||||
THREE.RoomEnvironment = RoomEnvironment;
|
||||
|
||||
} )();
|
||||
2
assets/offline-viewer-libs/pako_inflate.min.js
vendored
Normal file
2
assets/offline-viewer-libs/pako_inflate.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
6
assets/offline-viewer-libs/three.min.js
vendored
Normal file
6
assets/offline-viewer-libs/three.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@@ -2,6 +2,7 @@ import * as THREE from "three";
|
||||
import { OrbitControls } from "three/addons/controls/OrbitControls.js";
|
||||
import { GLTFLoader } from "three/addons/loaders/GLTFLoader.js";
|
||||
import { DRACOLoader } from "three/addons/loaders/DRACOLoader.js";
|
||||
import { RoomEnvironment } from "three/addons/environments/RoomEnvironment.js";
|
||||
|
||||
const canvas = document.querySelector("#scene");
|
||||
const loading = document.querySelector("#loading");
|
||||
@@ -67,14 +68,22 @@ controls.dampingFactor = 0.08;
|
||||
controls.screenSpacePanning = true;
|
||||
controls.maxPolarAngle = Math.PI * 0.49;
|
||||
|
||||
scene.add(new THREE.HemisphereLight(0xf7f3e8, 0x20262a, 1.45));
|
||||
scene.add(new THREE.HemisphereLight(0xf7f3e8, 0x20262a, 0.9));
|
||||
|
||||
const keyLight = new THREE.DirectionalLight(0xffffff, 3.6);
|
||||
keyLight.position.set(-45, -62, 85);
|
||||
// Image-based lighting: cheap, no HDR download, transforms material readability.
|
||||
const pmrem = new THREE.PMREMGenerator(renderer);
|
||||
scene.environment = pmrem.fromScene(new RoomEnvironment(), 0.04).texture;
|
||||
if ("environmentIntensity" in scene) scene.environmentIntensity = 0.85;
|
||||
|
||||
// Y-up scene: the sun must sit ABOVE the model (positive Y) or shadows break.
|
||||
const keyLight = new THREE.DirectionalLight(0xffffff, 3.2);
|
||||
keyLight.position.set(-45, 85, 62);
|
||||
keyLight.castShadow = true;
|
||||
keyLight.shadow.mapSize.set(2048, 2048);
|
||||
keyLight.shadow.bias = -0.0004;
|
||||
scene.add(keyLight);
|
||||
|
||||
const fillLight = new THREE.DirectionalLight(0x9fd4ff, 1.15);
|
||||
const fillLight = new THREE.DirectionalLight(0x9fd4ff, 0.9);
|
||||
fillLight.position.set(80, 55, 48);
|
||||
scene.add(fillLight);
|
||||
|
||||
@@ -260,6 +269,10 @@ function ingestModel(gltfScene, meta) {
|
||||
modelRoot.add(mesh);
|
||||
continue;
|
||||
}
|
||||
if (parsed.category === "trees" && meta.site_trees?.length) {
|
||||
mesh.visible = false; // replaced by instanced trunk+crown trees below
|
||||
continue;
|
||||
}
|
||||
mesh.castShadow = !["grid", "floor_lines", "detail_lines", "glazing"].includes(parsed.category);
|
||||
mesh.receiveShadow = true;
|
||||
mesh.userData.floor = parsed.floor;
|
||||
@@ -273,7 +286,60 @@ function ingestModel(gltfScene, meta) {
|
||||
floorGroups.get(parsed.floor).add(mesh);
|
||||
}
|
||||
|
||||
if (meta.site_trees?.length) addInstancedTrees(meta.site_trees);
|
||||
|
||||
state.bounds = new THREE.Box3().setFromObject(modelRoot);
|
||||
fitShadowsAndGround(state.bounds);
|
||||
}
|
||||
|
||||
function addInstancedTrees(points) {
|
||||
// spec plan coords (x, y) -> Y-up world (x, ?, -y), same mapping as the GLB export
|
||||
const trunk = new THREE.InstancedMesh(
|
||||
new THREE.CylinderGeometry(0.14, 0.2, 1.4, 6),
|
||||
new THREE.MeshStandardMaterial({ color: 0x6b4a2e, roughness: 0.9, clippingPlanes: [sectionPlane] }),
|
||||
points.length,
|
||||
);
|
||||
const crown = new THREE.InstancedMesh(
|
||||
new THREE.IcosahedronGeometry(1.5, 1),
|
||||
new THREE.MeshStandardMaterial({ color: 0x3e7d4f, roughness: 0.8, clippingPlanes: [sectionPlane] }),
|
||||
points.length,
|
||||
);
|
||||
const matrix = new THREE.Matrix4();
|
||||
points.forEach(([x, y], index) => {
|
||||
matrix.setPosition(x, 0.7, -y);
|
||||
trunk.setMatrixAt(index, matrix);
|
||||
matrix.setPosition(x, 2.2, -y);
|
||||
crown.setMatrixAt(index, matrix);
|
||||
});
|
||||
trunk.castShadow = crown.castShadow = true;
|
||||
crown.receiveShadow = true;
|
||||
const group = floorGroups.get("TREES");
|
||||
(group || modelRoot).add(trunk, crown);
|
||||
}
|
||||
|
||||
function fitShadowsAndGround(bounds) {
|
||||
// Default directional-shadow frustum is ±5 m — useless for buildings.
|
||||
const center = bounds.getCenter(new THREE.Vector3());
|
||||
const size = bounds.getSize(new THREE.Vector3());
|
||||
const radius = Math.max(size.x, size.z, 20) * 0.75;
|
||||
keyLight.target.position.copy(center);
|
||||
scene.add(keyLight.target);
|
||||
Object.assign(keyLight.shadow.camera, {
|
||||
left: -radius, right: radius, top: radius, bottom: -radius, near: 5, far: radius * 6,
|
||||
});
|
||||
keyLight.shadow.camera.updateProjectionMatrix();
|
||||
const ground = new THREE.Mesh(
|
||||
new THREE.PlaneGeometry(radius * 8, radius * 8),
|
||||
new THREE.ShadowMaterial({ opacity: 0.32 }),
|
||||
);
|
||||
ground.rotation.x = -Math.PI / 2;
|
||||
// Grade sits at y=0 by spec convention; bounds.min.y is the BASEMENT floor
|
||||
// when one exists, and a catcher 5 m below grade shows shadows detached
|
||||
// from the building. Clamp to grade unless the whole model floats above it.
|
||||
const groundY = Math.max(bounds.min.y, Math.min(0, bounds.max.y)) - 0.03;
|
||||
ground.position.set(center.x, groundY, center.z);
|
||||
ground.receiveShadow = true;
|
||||
scene.add(ground);
|
||||
}
|
||||
|
||||
function parseObjectName(name) {
|
||||
@@ -291,6 +357,16 @@ function labelForObject({ floor, category }) {
|
||||
function materialForCategory(category, meta) {
|
||||
if (materialByCategory.has(category)) return materialByCategory.get(category);
|
||||
const color = new THREE.Color(meta.categories[category]?.color || "#cccccc");
|
||||
if (category === "glazing") {
|
||||
// Physical glass (transmission) instead of flat alpha — key perceived-quality win.
|
||||
const glass = new THREE.MeshPhysicalMaterial({
|
||||
color, metalness: 0, roughness: 0.18, transmission: 0.7, ior: 1.5, thickness: 0.3,
|
||||
transparent: true, depthWrite: false, side: THREE.DoubleSide, clippingPlanes: [sectionPlane],
|
||||
});
|
||||
glass.envMapIntensity = 1.2;
|
||||
materialByCategory.set(category, glass);
|
||||
return glass;
|
||||
}
|
||||
const opacity =
|
||||
category === "slab"
|
||||
? 0.64
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title>{{TITLE}}</title>
|
||||
<link rel="icon" href="data:," /><!-- keep the console free of favicon 404s -->
|
||||
<link rel="stylesheet" href="./styles.css" />
|
||||
<script type="importmap">
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user