Compare commits

9 Commits

Author SHA1 Message Date
c6e0314769 Minor fixes and guard clauses
TODO: Bootstrap ms-* and ps-* can't account for all possible levels of indentation/nesting...
2026-04-07 22:03:16 +02:00
a617985789 Draft Ontology module 2026-04-07 16:45:28 +02:00
1117018fad Add JSDoc config 2026-04-07 16:36:32 +02:00
36f118e5c7 Fix state path + minor changes 2026-04-07 16:26:54 +02:00
6e02236124 Refactor into proper modules 2026-04-07 15:53:43 +02:00
39c3b1b537 Spread config node in normalisation + types 2026-04-07 13:05:48 +02:00
a3ca2eb372 Fix bug with clipping 2026-04-07 12:37:43 +02:00
9a8f6c7dc5 Structured layers menu (WIP) 2026-04-07 10:57:11 +02:00
2df5a71241 WIP: first reworking based on requirements
NOTE: node loading logic not working yet!
2026-02-20 17:25:10 +01:00
16 changed files with 759 additions and 363 deletions

2
.gitignore vendored
View File

@@ -8,3 +8,5 @@
vendor/
.vscode
docs/

BIN
assets/pano/gradient.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

180
config.js
View File

@@ -17,7 +17,7 @@ const theater2Popup = `
export const config = {
scene : {
initialExposure: 0.7,
autoLP: true,
autoLP: false,
},
menu : {
//audioBtn1
@@ -36,7 +36,7 @@ export const config = {
isMain: true,
},
],
pano: `pano/defsky-grass.jpg`,
pano: `pano/gradient.jpg`,
},
{
id : "ssgp",
@@ -45,88 +45,120 @@ export const config = {
popup: theater2Popup,
coords: [45.4401, 12.3408],
nodes: [
/*
{
label: 'Struttura principale',
model: 'models/ssgp/Teatro_SSGP_Full_ConSottrazioni.glb',
isMain: true,
},
*/
{
label: 'Struttura parete di fondo',
model: 'models/ssgp/Teatro_SSGP_Layer_Struttura_parete_di_fondo.glb',
isMain: true,
label: 'Teatro',
children: [
/*
{
label: 'Struttura complessiva',
model: 'models/ssgp/Teatro_SSGP_Full_ConSottrazioni.glb',
},
*/
{
label: 'Involucro',
model: 'models/ssgp/Teatro_SSGP_Layer_Struttura_parete_di_fondo.glb',
isMain: true,
opacity: 0.2,
},
]
},
{
label: 'Ballatoio',
model: 'models/ssgp/Teatro_SSGP_Ballatoio.glb',
label: 'Sala / Auditorium',
children: [
{
label: 'Peplano / Platea',
model: 'models/ssgp/Teatro_SSGP_Platea_peplano.glb',
},
{
label: 'Ordini di palchi',
children: [
{
label: 'Ordine 1',
model: 'models/ssgp/Teatro_SSGP_Ordine1.glb',
},
{
label: 'Ordine 2',
model: 'models/ssgp/Teatro_SSGP_Ordine2.glb',
},
{
label: 'Ordine 3',
model: 'models/ssgp/Teatro_SSGP_Ordine3.glb',
},
{
label: 'Ordine 4',
model: 'models/ssgp/Teatro_SSGP_Ordine4.glb',
},
{
label: 'Ordine 5',
model: 'models/ssgp/Teatro_SSGP_Ordine5.glb',
},
]
},
{
label: 'Parapetto',
model: 'models/ssgp/Teatro_SSGP_parapetto_scala_piani.glb',
},
{
label: 'Percorsi pubblico',
model: 'models/ssgp/Teatro_SSGP_Percorsi_scale_corridoi.glb',
},
]
},
{
label: 'Boccascena',
model: 'models/ssgp/Teatro_SSGP_Boccascena.glb',
label: 'Scena',
children: [
{
label: 'Palcoscenico',
model: 'models/ssgp/Teatro_SSGP_Palcoscenico.glb',
},
{
label: 'Boccascena / Proscenio',
model: 'models/ssgp/Teatro_SSGP_Boccascena.glb',
},
{
label: 'Quinte architettoniche fisse',
model: 'models/ssgp/Teatro_SSGP_Layer_quinte_architettoniche_fisse.glb',
},
{
label: 'Quinte architettoniche mobili',
model: 'models/ssgp/Teatro_SSGP_Layer_quinte_architettoniche_mobili.glb',
},
]
},
{
label: 'Fossa orchestra',
model: 'models/ssgp/Teatro_SSGP_Fossa_orchestra.glb',
label: 'Spazi tecnici',
children: [
{
label: 'Spazio tecnico superiore',
model: 'models/ssgp/Teatro_SSGP_Layer_Spazio_tecnico_sup_soffitta.glb',
children: [
{
label: 'Graticcia',
model: 'models/ssgp/Teatro_SSGP_Graticcia.glb',
},
{
label: 'Ballatoio',
model: 'models/ssgp/Teatro_SSGP_Ballatoio.glb',
},
{
label: 'Spazio tecnico inferiore',
model: 'models/ssgp/Teatro_SSGP_Spazio_tecnico_inf.glb',
},
]
},
]
},
{
label: 'Graticcia',
model: 'models/ssgp/Teatro_SSGP_Graticcia.glb',
},
{
label: 'Ordine 1',
model: 'models/ssgp/Teatro_SSGP_Ordine1.glb',
},
{
label: 'Ordine 2',
model: 'models/ssgp/Teatro_SSGP_Ordine2.glb',
},
{
label: 'Ordine 3',
model: 'models/ssgp/Teatro_SSGP_Ordine3.glb',
},
{
label: 'Ordine 4',
model: 'models/ssgp/Teatro_SSGP_Ordine4.glb',
},
{
label: 'Ordine 5',
model: 'models/ssgp/Teatro_SSGP_Ordine5.glb',
},
{
label: 'Palcoscenico',
model: 'models/ssgp/Teatro_SSGP_Palcoscenico.glb',
},
{
label: 'Parapetto scala piani',
model: 'models/ssgp/Teatro_SSGP_parapetto_scala_piani.glb',
},
{
label: 'Percorsi scale corridoi',
model: 'models/ssgp/Teatro_SSGP_Percorsi_scale_corridoi.glb',
},
{
label: 'Platea peplano',
model: 'models/ssgp/Teatro_SSGP_Platea_peplano.glb',
},
{
label: 'Quinte architettoniche fisse',
model: 'models/ssgp/Teatro_SSGP_Layer_quinte_architettoniche_fisse.glb',
},
{
label: 'Quinte architettoniche mobili',
model: 'models/ssgp/Teatro_SSGP_Layer_quinte_architettoniche_mobili.glb',
},
{
label: 'Spazio tecnico superiore',
model: 'models/ssgp/Teatro_SSGP_Layer_Spazio_tecnico_sup_soffitta.glb',
},
{
label: 'Spazio tecnico inferiore',
model: 'models/ssgp/Teatro_SSGP_Spazio_tecnico_inf.glb',
},
label: 'Orchestra',
children: [
{
label: 'Fossa orchestra',
model: 'models/ssgp/Teatro_SSGP_Fossa_orchestra.glb',
},
]
}
],
pano: `pano/defsky-grass.jpg`,
pano: `pano/gradient.jpg`,
}
],
map : {

16
js/ontology.js Normal file
View File

@@ -0,0 +1,16 @@
/**
* @module Ontology
*/
/**
* Load an ontology from its JSON description
* @param {String} jsonPath The path (URI) of the ontology JSON file
* @returns {Object}
*/
export async function loadOntology(jsonPath) {
const ontology = await fetch(jsonPath)
.then(res => res.json())
.catch(err => console.error(err));
return ontology;
}

View File

@@ -2,17 +2,17 @@
import AppState from "./state.js";
import { config } from "../config.js";
import UI from "./ui.js";
import { toggleAmbientOcclusion } from "./utils/environment.js";
const Scene = {};
Scene.UI = UI;
/**
* @module Scene
*/
/**
* @todo Experimental...
* @param {THREE.Object3D} object - A THREE Object3D instance
*/
Scene.showEdges = function(object) {
function showEdges (object) {
const edgeMaterial = new THREE.LineBasicMaterial( { color: 0x000000 } );
object.traverse(function(child) {
@@ -27,169 +27,7 @@ Scene.showEdges = function(object) {
});
}
/**
* Calculate bounding box for the scene root object
* and return it along with its center and size (bad?).
* It only uses meshes to prevent "empty" nodes in the scene
* from being included in the calculation.
* @todo Use ATON.Node.getBound()? [bounding sphere]
*/
Scene.getRootBoundingBox = function() {
const meshes = [];
AppState.root.traverse(obj => {
if (obj.isMesh) meshes.push(obj);
});
if (meshes.length === 0) return null;
const bbox = new THREE.Box3().setFromObject(meshes[0]);
for (let i = 1; i < meshes.length; i++) {
bbox.union(new THREE.Box3().setFromObject(meshes[i]));
}
const center = bbox.getCenter(new THREE.Vector3());
const size = bbox.getSize(new THREE.Vector3());
return { bbox, center, size };
}
/**
*
* @param {THREE.Sphere} boundingSphere - The bounding sphere for the main node
* @returns {THREE.Mesh}
*/
Scene.createClippingPlaneMesh = function (boundingSphere) {
const planeSize = boundingSphere.radius * 1.5;
const mesh = new THREE.Mesh(
new THREE.PlaneGeometry(planeSize, planeSize),
new THREE.MeshBasicMaterial({ color: 0xffff00, opacity: 0.1, side: THREE.DoubleSide, transparent: true })
);
return mesh;
}
/**
*
* @param {THREE.Mesh} planeMesh
* @param {THREE.ArrowHelper} arrowHelper
* @param {String} axis
*/
Scene.dragClipper = function(planeMesh, axis) {
const controls = new THREE.DragControls(
[planeMesh],
ATON.Nav._camera,
ATON._renderer.domElement,
);
const startPosition = new THREE.Vector3();
// Only move along the selected axis (exlude the others)
const excludedAxes = ['x', 'y', 'z'].filter(a => a != axis);
if (AppState.clipping.enabled && AppState.clipping.vector) {
controls.addEventListener('dragstart', function (event) {
startPosition.copy(event.object.position);
ATON.Nav.setUserControl(false);
});
controls.addEventListener('drag', function(event) {
const point = event.object.position;
Scene.updateClipper(AppState.clipping.vector, point);
for (const a of excludedAxes) {
event.object.position[a] = startPosition[a];
}
});
controls.addEventListener('dragend', function (event) {
ATON.Nav.setUserControl(true);
});
AppState.clipping.controls = controls;
}
}
/**
* @param {String} axis - The axis along which the plane's normal should be directed,
* one of 'x', 'y', 'z'
* @param {Number} orientation - Positive (1) or negative (-1) orientation on the axis
*/
Scene.addClippingPlane = function(axis, orientation = -1) {
axis = axis.toLowerCase();
const bound = AppState.clipping.boundingSphere;
if (!bound) return;
const vector = [
axis === 'x' ? orientation : 0,
axis === 'y' ? orientation : 0,
axis === 'z' ? orientation : 0,
];
AppState.clipping.vector = vector;
// First, add a default clipping plane
// at a default point (calculated...)
const defaultPoint = bound.center.clone();
Scene.activateClipper(vector, axis, defaultPoint);
}
/**
* @todo WIP!
* Activate clipping plane
* @param {Number[]} vector - The vector array to direct the plane
* @param {String} axis - The x,y,z axis
* @param {?THREE.Vector3} point - The queried scene point
*/
Scene.activateClipper = function(vector, axis, point = null) {
ATON.enableClipPlanes();
Scene.updateClipper(vector, point);
Scene.dragClipper(AppState.clipping.helper, axis);
}
/**
*
* @param {THREE.Vector3} vector
* @param {THREE.Vector3} point
*/
Scene.updateClipper = function(vector, point) {
// Useless guard...
if (vector) {
// Normal of the clipping plane along the axis facing down
const normal = new THREE.Vector3(...vector).normalize();
const plane = AppState.clipping.plane ?? ATON.addClipPlane(normal, point);
// Add a visible plane helper for the clipping plane
const visiblePlane = AppState.clipping.helper ?? Scene.createClippingPlaneMesh(AppState.clipping.boundingSphere);
if (!AppState.clipping.helper) {
AppState.root.add(visiblePlane);
AppState.clipping.helper = visiblePlane;
}
visiblePlane.position.copy(point);
visiblePlane.lookAt(point.clone().add(normal));
plane.setFromNormalAndCoplanarPoint(normal, point);
AppState.clipping.plane = plane;
}
}
/**
*
* @param {THREE.Vector3} vector - An object with x,y,z coordinates
*/
Scene.changeLightDirection = function(vector) {
ATON.setMainLightDirection(vector);
}
/**
*
* @param {Boolean} isEnabled
*/
Scene.toggleAmbientOcclusion = function(isEnabled) {
ATON.FX.togglePass(ATON.FX.PASS_AO, isEnabled);
console.log('Ambient occlusion', isEnabled ? 'ON' : 'OFF');
}
Scene.init = function() {
function init () {
ATON.realize();
ATON.UI.addBasicEvents();
ATON.UI.init();
@@ -200,67 +38,53 @@ Scene.init = function() {
ATON.toggleShadows(true);
ATON.setExposure(config.scene.initialExposure);
// Open settings side panel when clicking on settings btn
Scene.UI.toggleSettingsPanel('settings');
Scene.UI.toggleContentMenu('menu');
AppState.camera = ATON.Nav._camera;
AppState.renderer = ATON._renderer;
ATON.Nav.setUserControl(true);
}
/**
* Reset clipping state after disabling from UI
* @todo DragControls errors!!
*/
Scene.resetClipping = function () {
AppState.clipping.enabled = false;
ATON.disableClipPlanes();
AppState.clipping.controls.deactivate();
// Manually remove event listeners from DragControls!!
AppState.renderer.domElement.removeEventListener( 'pointermove', AppState.clipping.controls.onPointerMove );
AppState.renderer.domElement.removeEventListener( 'pointerdown', AppState.clipping.controls.onPointerDown );
AppState.renderer.domElement.removeEventListener( 'pointerup', AppState.clipping.controls.onPointerCancel );
AppState.renderer.domElement.removeEventListener( 'pointerleave', AppState.clipping.controls.onPointerCancel )
AppState.clipping.controls = null;
AppState.clipping.helper.removeFromParent();
AppState.root.remove(AppState.clipping.helper);
AppState.clipping.helper = null;
AppState.clipping.plane = null;
AppState.clipping.vector = null;
// Ensure nav controls are reactivated!
ATON.Nav.setUserControl(true);
}
/**
* @param {Object} marker - The marker object from config
* @param {Object[]} nodes - The flat list of nodes for this scene
*/
Scene.openScene = function(marker) {
Scene.init();
Scene.UI.toggleClipperBar('#clipper', '#clipper-bar');
export function openScene (marker, nodes) {
init();
// Filter nodes with models first
nodes = nodes.filter(n => n.model);
// Load 3D models and create nodes
Scene.loadNodes(marker.nodes);
loadNodes(nodes);
ATON.setMainPanorama(marker.pano);
// TODO: hardcoded...
AppState.initialRotation = new THREE.Vector3(0, 1.5, 0);
//Scene.showEdges(mainNode);
ATON.setAutoLP(config.scene.autoLP);
AppState.lightProbe = config.scene.autoLP;
Scene.toggleAmbientOcclusion(true);
toggleAmbientOcclusion(true);
AppState.ambientOcclusion = true;
AppState.root = ATON.getRootScene();
}
/**
*
* @param {Array} nodes
* @param {Object[]} nodes
*/
Scene.loadNodes = function (nodes) {
function loadNodes(nodes) {
nodes.forEach(n => {
let node = ATON.createSceneNode(n.label);
node.load(n.model);
node.setRotation(0, 1.5, 0);
// Apply any transparency before attaching to scene
if (n.opacity) {
node.setMaterial(new THREE.MeshPhongMaterial({
transparent: true,
opacity: n.opacity,
color: '#fff'
}));
}
node.attachToRoot();
if (n.isMain) {
@@ -271,6 +95,8 @@ Scene.loadNodes = function (nodes) {
AppState.nodes.push({id: n.label, active: true});
});
}
export default Scene;
if (!AppState.clipping.boundingSphere) {
console.error("No bounding sphere computed, clipping will fail. Ensure one node has 'isMain: true'.");
}
}

View File

@@ -1,6 +1,17 @@
/**
* @namespace AppState
*/
/**
* @typedef {Object} NormalizedSceneNode
* @property {String} label Required
* @property {String} id
* @property {String} model
* @property {Boolean} isMain
* @property {Number|null} opacity
* @property {Boolean} active
*/
let AppState = {
// The Leaflet map object
map : null,
@@ -8,6 +19,10 @@ let AppState = {
root: null,
// {id: String, active: Boolean}
nodes: [],
/**
* @property {NormalizedSceneNode[]} normalizedNodes
*/
normalizedNodes: [],
mainNodeId: null,
currentScene: null,
sceneHasAudio: false,

142
js/ui.js
View File

@@ -1,36 +1,36 @@
import { config } from "../config.js";
import Scene from "./scene.js";
import AppState from "./state.js";
import { changeLightDirection, toggleAmbientOcclusion } from "./utils/environment.js";
import { resetClipping, addClippingPlane } from "./utils/clipping.js";
/**
* @namespace UI
* @module UI
*/
const UI = {};
UI.domParser = new DOMParser;
const domParser = new DOMParser;
UI.contentMenuTabs = `
<!-- Nav tabs -->
const contentMenuTabs = `
<!-- Nav tabs -->
<ul class="nav nav-pills" id="content-tabs" role="tablist">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="media-tab" data-bs-toggle="tab" data-bs-target="#media" type="button" role="tab" aria-controls="media" aria-selected="true">
<i class="bi bi-music-note-list me-1"></i> Media
<button class="nav-link active" id="layer-tab" data-bs-toggle="tab" data-bs-target="#layer" type="button" role="tab" aria-controls="layer" aria-selected="false">
<i class="bi bi-boxes me-1"></i> Elementi 3D
</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="layer-tab" data-bs-toggle="tab" data-bs-target="#layer" type="button" role="tab" aria-controls="layer" aria-selected="false">
<i class="bi bi-stack me-1"></i> Layer
<button class="nav-link" id="media-tab" data-bs-toggle="tab" data-bs-target="#media" type="button" role="tab" aria-controls="media" aria-selected="true">
<i class="bi bi-diagram-3 me-1"></i> Contenuti
</button>
</li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active p-3" id="media" role="tabpanel" aria-labelledby="media-tab" tabindex="0"></div>
<div class="tab-pane p-3" id="layer" role="tabpanel" aria-labelledby="layer-tab" tabindex="0"></div>
<div class="tab-content ps-4 ms-3 overflow-y-auto">
<div class="tab-pane active p-3 ms-3" id="layer" role="tabpanel" aria-labelledby="layer-tab" tabindex="0"></div>
<div class="tab-pane p-3" id="media" role="tabpanel" aria-labelledby="media-tab" tabindex="0"></div>
</div>
`;
UI.audioExample = `
const audioExample = `
<button type="button" id="audio-example" class="text-left btn aton-btn fs-6 mx-2" data-bs-toggle="modal" data-bs-target="#audio1">
<i class="bi bi-play-btn me-2"></i> Esempio audio (<em>Che fiero costume</em>)
</button>
@@ -40,7 +40,7 @@ UI.audioExample = `
*
* @param {String} triggerSelector - Usually, the close modal trigger element(s) selector
*/
UI.pauseAudio = function(triggerSelector) {
export function pauseAudio(triggerSelector) {
// What if more than one audio element is playing?
const audio = document.querySelector('audio');
@@ -57,7 +57,7 @@ UI.pauseAudio = function(triggerSelector) {
* Resets the UI state (essentially hides the clipper toolbar if visible...)
* @todo Other elements to reset?? Restore inital lighting conditions and viewpoint...
*/
UI.reset = function() {
function reset() {
document.querySelector('#clipper-bar')?.classList.add('d-none');
document.querySelector('#clipper')?.classList.remove('border', 'border-2', 'border-white');
}
@@ -68,9 +68,9 @@ UI.reset = function() {
* @param {NodeListOf<HTMLButtonElement>} btns
* @param {String} axis - One of 'x', 'y', 'z'
*/
UI.showClipping = function(target, btns, axis) {
function showClipping(target, btns, axis) {
if (axis) {
Scene.addClippingPlane(axis, -1);
addClippingPlane(axis, -1);
target.classList.add('border', 'border-2', 'border-warning');
btns.forEach(btn => {
if (btn.id !== target.id) {
@@ -84,7 +84,7 @@ UI.showClipping = function(target, btns, axis) {
* @param {String} triggerSelector
* @param {String} targetSelector The selector for the target toolbar to be displayed
*/
UI.toggleClipperBar = function(triggerSelector, targetSelector) {
function toggleClipperBar(triggerSelector, targetSelector) {
const trigger = document.querySelector(triggerSelector);
const toolbar = document.querySelector(targetSelector);
const btns = toolbar.querySelectorAll('button');
@@ -103,7 +103,7 @@ UI.toggleClipperBar = function(triggerSelector, targetSelector) {
if (!toolbar.classList.contains('d-none')) {
AppState.clipping.enabled = true;
Scene.toggleAmbientOcclusion(false);
toggleAmbientOcclusion(false);
btns.forEach(btn => {
btn.classList.remove('border', 'border-2', 'border-warning');
@@ -111,13 +111,13 @@ UI.toggleClipperBar = function(triggerSelector, targetSelector) {
trigger.className += ' border border-2 border-white';
toolbar.addEventListener('click', event => {
UI.showClipping(event.target, btns, clipTargets[event.target.id]?.axis);
showClipping(event.target, btns, clipTargets[event.target.id]?.axis);
});
} else {
Scene.resetClipping();
resetClipping();
let noBorder = trigger.className.replace(/ border.*$/g, '');
trigger.className = noBorder;
Scene.toggleAmbientOcclusion(aoCurrentState);
toggleAmbientOcclusion(aoCurrentState);
}
}
);
@@ -128,7 +128,7 @@ UI.toggleClipperBar = function(triggerSelector, targetSelector) {
* A left side settings panel
* @param {String} triggerId - The settings button id
*/
UI.toggleSettingsPanel = function(triggerId) {
function toggleSettingsPanel(triggerId) {
const btn = document.querySelector(`#${triggerId}`);
const lightHeading = document.createElement('h2');
lightHeading.className = 'fs-5 ms-2 mb-3 mt-3';
@@ -142,9 +142,9 @@ UI.toggleSettingsPanel = function(triggerId) {
ATON.UI.showSidePanel({header: '<i class="bi bi-gear-fill me-1"></i> Impostazioni'});
ATON.UI.elSidePanel.appendChild(lightHeading);
const lightSliderX = this.createLightSlider('x', 'Asse X', [-2, 2], 0.1);
const lightSliderY = this.createLightSlider('y', 'Asse Y', [-2, 2], 0.1);
const lightSliderZ = this.createLightSlider('z', 'Asse Z', [-2, 2], 0.1);
const lightSliderX = createLightSlider('x', 'Asse X', [-2, 2], 0.1);
const lightSliderY = createLightSlider('y', 'Asse Y', [-2, 2], 0.1);
const lightSliderZ = createLightSlider('z', 'Asse Z', [-2, 2], 0.1);
ATON.UI.elSidePanel.appendChild(lightSliderX);
ATON.UI.elSidePanel.appendChild(lightSliderY);
@@ -166,26 +166,17 @@ UI.toggleSettingsPanel = function(triggerId) {
<label class="form-check-label" for="shadowsSwitch">Ombre <i class="bi bi-info-circle ms-2 c-hand" title=""></i></label>
`;
const lightProbeSwitch = document.createElement('div');
lightProbeSwitch.className = 'form-check form-switch ms-4 mt-2';
lightProbeSwitch.innerHTML = `
<input class="form-check-input" type="checkbox" role="switch" id="lpSwitch" title="Abilita / disabilita mappa HDRi">
<label class="form-check-label" for="lpSwitch">Mappa HDRi <em>(light probe)</em> <i class="bi bi-info-circle ms-2 c-hand"></i></label>
`;
shadowsSwitch.querySelector('input[type="checkbox"').checked = AppState.shadows;
ambientOcclSwitch.querySelector('input[type="checkbox"').checked = AppState.ambientOcclusion;
lightProbeSwitch.querySelector('input[type="checkbox"').checked = AppState.lightProbe;
shadowsSwitch.querySelector('input[type="checkbox"]').checked = AppState.shadows;
ambientOcclSwitch.querySelector('input[type="checkbox"]').checked = AppState.ambientOcclusion;
ATON.UI.elSidePanel.appendChild(ambientOcclSwitch);
ATON.UI.elSidePanel.appendChild(shadowsSwitch);
ATON.UI.elSidePanel.appendChild(lightProbeSwitch);
// TODO: move somewhere else...
document.querySelector('#aoSwitch').addEventListener(
'change',
event => {
Scene.toggleAmbientOcclusion(event.target.checked);
toggleAmbientOcclusion(event.target.checked);
AppState.ambientOcclusion = event.target.checked;
}
);
@@ -197,18 +188,6 @@ UI.toggleSettingsPanel = function(triggerId) {
AppState.shadows = checked;
}
);
// Not working properly?
document.querySelector('#lpSwitch').addEventListener(
'change',
event => {
const checked = event.target.checked;
ATON.setAutoLP(checked);
//if (!checked) ATON.clearLightProbes();
AppState.lightProbe = checked;
if (checked) ATON.updateLightProbes();
console.log('Light probe: ', checked);
}
);
});
}
/**
@@ -218,7 +197,7 @@ UI.toggleSettingsPanel = function(triggerId) {
* @param {Number[]} range - The slider's range
* @param {Number} step - The slider's step
*/
UI.createLightSlider = function(direction, label, range, step) {
function createLightSlider(direction, label, range, step) {
const currentVal = ATON.getMainLightDirection()[direction];
const lightSlider = ATON.UI.createSlider({
range,
@@ -228,7 +207,7 @@ UI.createLightSlider = function(direction, label, range, step) {
const lightDir = ATON.getMainLightDirection();
// Keep existing direction values for the other axes
lightDir[direction] = Number.parseFloat(val);
Scene.changeLightDirection(lightDir);
changeLightDirection(lightDir);
},
});
@@ -241,24 +220,17 @@ UI.createLightSlider = function(direction, label, range, step) {
* Right-side main menu panel
* @param {String} triggerId - The menu button id
*/
UI.toggleContentMenu = function(triggerId) {
function toggleContentMenu(triggerId) {
const btn = document.querySelector(`#${triggerId}`);
btn.addEventListener('click', () => {
ATON.UI.setSidePanelRight();
ATON.UI.showSidePanel({header: 'Contenuti'});
ATON.UI.showSidePanel({header: 'Menu'});
// Append tabs, then tab panes
const tabs = this.domParser.parseFromString(UI.contentMenuTabs, 'text/html');
const tabs = domParser.parseFromString(contentMenuTabs, 'text/html');
ATON.UI.elSidePanel.appendChild(tabs.querySelector('#content-tabs'));
ATON.UI.elSidePanel.appendChild(tabs.querySelector('.tab-content'));
this.buildLayersMenu(AppState.nodes, ATON.UI.elSidePanel.querySelector('#layer'));
// This is just an example, at the moment... to be revised with config -> markers (scenes) -> menu
if (AppState.sceneHasAudio) {
let btn = this.domParser.parseFromString(UI.audioExample, 'text/html');
const audio = btn.querySelector('#audio-example');
ATON.UI.elSidePanel.querySelector('#media').appendChild(audio);
}
buildLayersMenu(AppState.normalizedNodes, ATON.UI.elSidePanel.querySelector('#layer'));
});
}
/**
@@ -266,21 +238,28 @@ UI.toggleContentMenu = function(triggerId) {
* @param {Array} nodes The scenes nodes (IDs and status)
* @param {HTMLElement} sidePanel ATON's side panel element
*/
UI.buildLayersMenu = function(nodes, sidePanel) {
function buildLayersMenu(nodes, sidePanel) {
for(let node of nodes) {
const checkboxStr = `
<div class="form-check form-switch ms-4 mt-2">
<input class="form-check-input" type="checkbox" ${node.active ? 'checked' : ''} role="switch" title="Mostra / nascondi layer">
<label class="form-check-label" for="aoSwitch">${node.id}</label>
</div>
`;
const menuItem = document.createElement('div');
menuItem.className = `form-check form-switch ms-${node.depth} ps-${node.depth} mt-2`;
const checkbox = document.createElement('input');
checkbox.type = 'checkbox';
checkbox.className = "form-check-input";
checkbox.checked = node.active;
checkbox.role = 'switch';
checkbox.title = "Mostra / nascondi layer";
let element = this.domParser.parseFromString(checkboxStr, 'text/html');
element = element.querySelector('div.form-check');
menuItem.appendChild(checkbox);
sidePanel.appendChild(element);
const label = document.createElement('label');
label.className = "form-check-label";
label.textContent = node.label;
menuItem.appendChild(label);
sidePanel.appendChild(menuItem);
// Will this ever work??
element.addEventListener('change', event => toggleNode(node.id, event.target.checked));
menuItem.addEventListener('change', event => toggleNode(node.label, event.target.checked));
}
/**
@@ -290,8 +269,15 @@ UI.buildLayersMenu = function(nodes, sidePanel) {
*/
const toggleNode = (id, status) => {
ATON.getSceneNode(id).toggle(status);
AppState.nodes.find(n => n.id === id).active = status;
AppState.normalizedNodes.find(n => n.label === id).active = status;
}
}
export default UI;
/**
* Initialize required components for scene UI
*/
export function initUI() {
toggleSettingsPanel('settings');
toggleContentMenu('menu');
toggleClipperBar('#clipper', '#clipper-bar');
}

154
js/utils/clipping.js Normal file
View File

@@ -0,0 +1,154 @@
// Global ATON and THREE
import AppState from "../state.js";
/**
* @module Clipping
*/
/**
*
* @param {THREE.Sphere} boundingSphere - The bounding sphere for the main node
* @returns {THREE.Mesh}
*/
function createClippingPlaneMesh (boundingSphere) {
const planeSize = boundingSphere.radius * 1.5;
const mesh = new THREE.Mesh(
new THREE.PlaneGeometry(planeSize, planeSize),
new THREE.MeshBasicMaterial({ color: 0xffff00, opacity: 0.05, side: THREE.DoubleSide, transparent: true })
);
return mesh;
}
/**
*
* @param {THREE.Mesh} planeMesh
* @param {THREE.ArrowHelper} arrowHelper
* @param {String} axis
*/
function dragClipper (planeMesh, axis) {
const controls = new THREE.DragControls(
[planeMesh],
ATON.Nav._camera,
ATON._renderer.domElement,
);
const startPosition = new THREE.Vector3();
// Only move along the selected axis (exlude the others)
const excludedAxes = ['x', 'y', 'z'].filter(a => a != axis);
if (AppState.clipping.enabled && AppState.clipping.vector) {
controls.addEventListener('dragstart', function (event) {
startPosition.copy(event.object.position);
ATON.Nav.setUserControl(false);
});
controls.addEventListener('drag', function(event) {
const point = event.object.position;
updateClipper(AppState.clipping.vector, point);
for (const a of excludedAxes) {
event.object.position[a] = startPosition[a];
}
});
controls.addEventListener('dragend', function (event) {
ATON.Nav.setUserControl(true);
});
AppState.clipping.controls = controls;
}
}
/**
* @param {String} axis - The axis along which the plane's normal should be directed,
* one of 'x', 'y', 'z'
* @param {Number} orientation - Positive (1) or negative (-1) orientation on the axis
*/
export function addClippingPlane (axis, orientation = -1) {
axis = axis.toLowerCase();
const bound = AppState.clipping.boundingSphere;
if (!bound) return;
const vector = [
axis === 'x' ? orientation : 0,
axis === 'y' ? orientation : 0,
axis === 'z' ? orientation : 0,
];
AppState.clipping.vector = vector;
// First, add a default clipping plane
// at a default point (calculated...)
const defaultPoint = bound.center.clone();
activateClipper(vector, axis, defaultPoint);
}
/**
* @todo WIP!
* Activate clipping plane
* @param {Number[]} vector - The vector array to direct the plane
* @param {String} axis - The x,y,z axis
* @param {?THREE.Vector3} point - The queried scene point
*/
function activateClipper (vector, axis, point = null) {
ATON.enableClipPlanes();
updateClipper(vector, point);
dragClipper(AppState.clipping.helper, axis);
}
/**
*
* @param {THREE.Vector3} vector
* @param {THREE.Vector3} point
*/
function updateClipper (vector, point) {
// Useless guard...
if (vector) {
// Normal of the clipping plane along the axis facing down
const normal = new THREE.Vector3(...vector).normalize();
const plane = AppState.clipping.plane ?? ATON.addClipPlane(normal, point);
// Add a visible plane helper for the clipping plane
const visiblePlane = AppState.clipping.helper ?? createClippingPlaneMesh(AppState.clipping.boundingSphere);
if (!AppState.clipping.helper) {
AppState.root.add(visiblePlane);
AppState.clipping.helper = visiblePlane;
}
visiblePlane.position.copy(point);
visiblePlane.lookAt(point.clone().add(normal));
plane.setFromNormalAndCoplanarPoint(normal, point);
AppState.clipping.plane = plane;
}
}
/**
* Reset clipping state after disabling from UI
* @todo DragControls errors!!
*/
export function resetClipping () {
AppState.clipping.enabled = false;
ATON.disableClipPlanes();
if (AppState.clipping.controls) {
AppState.clipping.controls.deactivate();
// Manually remove event listeners from DragControls!!
AppState.renderer.domElement.removeEventListener( 'pointermove', AppState.clipping.controls.onPointerMove );
AppState.renderer.domElement.removeEventListener( 'pointerdown', AppState.clipping.controls.onPointerDown );
AppState.renderer.domElement.removeEventListener( 'pointerup', AppState.clipping.controls.onPointerCancel );
AppState.renderer.domElement.removeEventListener( 'pointerleave', AppState.clipping.controls.onPointerCancel )
AppState.clipping.controls = null;
}
if (AppState.clipping.helper) {
AppState.clipping.helper.removeFromParent();
AppState.root.remove(AppState.clipping.helper);
AppState.clipping.helper = null;
}
AppState.clipping.plane = null;
AppState.clipping.vector = null;
// Ensure nav controls are reactivated!
ATON.Nav.setUserControl(true);
}

22
js/utils/environment.js Normal file
View File

@@ -0,0 +1,22 @@
// Global ATON and THREE
/**
* @module Environment
*/
/**
*
* @param {THREE.Vector3} vector - An object with x,y,z coordinates
*/
export function changeLightDirection (vector) {
ATON.setMainLightDirection(vector);
}
/**
*
* @param {Boolean} isEnabled
*/
export function toggleAmbientOcclusion (isEnabled) {
ATON.FX.togglePass(ATON.FX.PASS_AO, isEnabled);
console.log('Ambient occlusion', isEnabled ? 'ON' : 'OFF');
}

71
js/utils/nodeUtils.js Normal file
View File

@@ -0,0 +1,71 @@
/**
* @module nodeUtils
* Utilities to process scene nodes.
*/
/**
* @typedef {Object} SceneNode
* @property {String} label Required
* @property {String} model
* @property {Boolean} isMain
* @property {Number|null} opacity
* @property {SceneNode[]|null} children
*/
/**
* @typedef {Object} NormalizedSceneNode
* @property {String} label Required
* @property {String} id
* @property {String} model
* @property {Boolean} isMain
* @property {Number|null} opacity
* @property {Boolean} active
*/
/**
*
* @param {SceneNode} node
* @param {Array} flatList
* @param {Number} depth
*/
function traverse(node, flatList, depth = 1) {
if (!node.label) {
console.error("Node missing label:", node);
return;
}
const normNode = {
...node,
id: node.id ?? node.label,
isMain: node.isMain ?? false,
active: true,
};
if (node.model) {
normNode.model = node.model;
}
flatList.push({
...normNode,
depth
});
if (node.children && Array.isArray(node.children)) {
for(let child of node.children) {
traverse(child, flatList, depth + 1);
}
}
}
/**
* Create a flat list of nodes from
* the nested structure in config
* @param {Array} nodes
* @returns {NormalizedSceneNode[]} A flat list of nodes
**/
export function normalizeNodes (nodes) {
let flatList = [];
for (let node of nodes) {
traverse(node, flatList);
}
return flatList;
}

20
jsdoc.json Normal file
View File

@@ -0,0 +1,20 @@
{
"source": {
"include": ["js/"]
},
"opts": {
"plugins": ["plugins/markdown"],
"markdown": {
"tags": ["module", "namespace"]
},
"encoding": "utf8",
"destination": "docs/",
"recurse": true,
"verbose": true,
"theme_opts": {
"theme": "light",
"title": "SCAENAE - ATON-based Web App"
}
}
}

View File

@@ -6,7 +6,9 @@
"author": "Nicolò P. <nicolo.paraciani@cnr.it>",
"license": "MIT",
"dependencies": {
"@hotwired/stimulus": "^3.2.2",
"leaflet": "^1.9.4",
"three": "0.147"
}
},
"devDependencies": {}
}

View File

@@ -1,9 +1,14 @@
import Scene from "../../js/scene.js";
import { openScene } from "../../js/scene.js";
import { config } from "../../config.js";
import AppState from "../../js/state.js";
import { normalizeNodes } from "../../js/utils/nodeUtils.js";
import { initUI, pauseAudio } from "../../js/ui.js";
AppState.currentScene = 'salvador';
AppState.sceneHasAudio = true;
const marker = config.markers.find(m => m.id === 'salvador');
AppState.normalizedNodes = normalizeNodes(marker.nodes);
Scene.openScene(config.markers.find(m => m.id === 'salvador'));
Scene.UI.pauseAudio('[data-bs-dismiss="modal"]');
openScene(marker, AppState.normalizedNodes);
initUI();
pauseAudio('[data-bs-dismiss="modal"]');

View File

@@ -1,6 +1,16 @@
import Scene from "../../js/scene.js";
import { openScene } from "../../js/scene.js";
import { config } from "../../config.js";
import AppState from "../../js/state.js";
import { normalizeNodes } from "../../js/utils/nodeUtils.js";
import { initUI } from "../../js/ui.js";
import { loadOntology } from "../../js/ontology.js";
AppState.currentScene = 'ssgp';
Scene.openScene(config.markers.find(m => m.id === 'ssgp'));
const marker = config.markers.find(m => m.id === 'ssgp');
AppState.normalizedNodes = normalizeNodes(marker.nodes);
openScene(marker, AppState.normalizedNodes);
initUI();
// DEBUG
console.debug(await loadOntology('ontology.json'));

230
scenes/ssgp/ontology.json Executable file
View File

@@ -0,0 +1,230 @@
{
"ontology": "Baroque Theatre Ontology (BT)",
"generatedOn": "2026-01-29",
"note": "Only bt: classes and bt: subclass relations; excludes Core; no CIDOC/BOT equivalences included.",
"domains": {
"TheatreArchitecture": [
{
"id": "bt:ArchitecturalComponent",
"label": "ArchitecturalComponent",
"children": [
{
"id": "bt:ArchitecturalWings",
"label": "ArchitecturalWings",
"children": []
},
{
"id": "bt:Gridiron",
"label": "Gridiron",
"children": []
},
{
"id": "bt:Proscenium",
"label": "Proscenium",
"children": []
},
{
"id": "bt:StructuralBackdrop",
"label": "StructuralBackdrop",
"children": []
},
{
"id": "bt:TechnicalGallery",
"label": "TechnicalGallery",
"children": []
},
{
"id": "bt:Trapdoor",
"label": "Trapdoor",
"children": []
}
]
},
{
"id": "bt:ArchitecturalSpace",
"label": "ArchitecturalSpace",
"children": [
{
"id": "bt:Auditorium",
"label": "Auditorium",
"children": [
{
"id": "bt:BoxTier",
"label": "BoxTier",
"children": [
{
"id": "bt:Box",
"label": "Box",
"children": []
}
]
},
{
"id": "bt:Gallery",
"label": "Gallery",
"children": []
},
{
"id": "bt:Stalls",
"label": "Stalls",
"children": []
}
]
},
{
"id": "bt:BackstageArea",
"label": "BackstageArea",
"children": []
},
{
"id": "bt:CirculationRoute",
"label": "CirculationRoute",
"children": []
},
{
"id": "bt:Entrance",
"label": "Entrance",
"children": []
},
{
"id": "bt:OrchestraPit",
"label": "OrchestraPit",
"children": []
},
{
"id": "bt:Stage",
"label": "Stage",
"children": [
{
"id": "bt:Overstage",
"label": "Overstage",
"children": []
},
{
"id": "bt:Understage",
"label": "Understage",
"children": []
}
]
}
]
},
{
"id": "bt:TheatreBuilding",
"label": "TheatreBuilding",
"children": []
}
],
"ScenicApparatus": [
{
"id": "bt:ScenicApparatus",
"label": "ScenicApparatus",
"children": [
{
"id": "bt:Backdrop",
"label": "Backdrop",
"children": [
{
"id": "bt:FixedBackdrop",
"label": "FixedBackdrop",
"children": []
},
{
"id": "bt:MobileBackdrop",
"label": "MobileBackdrop",
"children": []
}
]
},
{
"id": "bt:LightingDevice",
"label": "LightingDevice",
"children": []
},
{
"id": "bt:ScenicMachine",
"label": "ScenicMachine",
"children": [
{
"id": "bt:FlightMechanism",
"label": "FlightMechanism",
"children": []
},
{
"id": "bt:MovingDevice",
"label": "MovingDevice",
"children": []
}
]
},
{
"id": "bt:ScenicObject",
"label": "ScenicObject",
"children": []
},
{
"id": "bt:SoundEffectDevice",
"label": "SoundEffectDevice",
"children": []
}
]
}
],
"PerformativeEvent": [
{
"id": "bt:PerformativeEvent",
"label": "PerformativeEvent",
"children": [
{
"id": "bt:PublicCelebration",
"label": "PublicCelebration",
"children": []
},
{
"id": "bt:Rehearsal",
"label": "Rehearsal",
"children": []
},
{
"id": "bt:TheatricalPerformance",
"label": "TheatricalPerformance",
"children": []
}
]
}
],
"DocumentaryResource": [
{
"id": "bt:DocumentaryResource",
"label": "DocumentaryResource",
"children": [
{
"id": "bt:DigitalModel",
"label": "DigitalModel",
"children": []
},
{
"id": "bt:IconographicSource",
"label": "IconographicSource",
"children": []
},
{
"id": "bt:TechnicalDocument",
"label": "TechnicalDocument",
"children": []
},
{
"id": "bt:TextualSource",
"label": "TextualSource",
"children": []
}
]
},
{
"id": "bt:DocumentationEvent",
"label": "DocumentationEvent",
"children": []
}
]
}
}

View File

@@ -2,12 +2,17 @@
# yarn lockfile v1
"@hotwired/stimulus@^3.2.2":
version "3.2.2"
resolved "https://registry.npmjs.org/@hotwired/stimulus/-/stimulus-3.2.2.tgz"
integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A==
leaflet@^1.9.4:
version "1.9.4"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
resolved "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz"
integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
three@0.147:
version "0.147.0"
resolved "https://registry.yarnpkg.com/three/-/three-0.147.0.tgz#1974af9e8e0c1efb3a8561334d57c0b6c29a7951"
resolved "https://registry.npmjs.org/three/-/three-0.147.0.tgz"
integrity sha512-LPTOslYQXFkmvceQjFTNnVVli2LaVF6C99Pv34fJypp8NbQLbTlu3KinZ0zURghS5zEehK+VQyvWuPZ/Sm8fzw==