Compare commits

27 Commits

Author SHA1 Message Date
26733a4b84 Remove UI module 2026-04-22 10:30:04 +02:00
380999ff4b Add exposure slider (not working?) 2026-04-22 09:35:33 +02:00
d0d24c0e6c Fix handling of light direction (hopefully) 2026-04-22 09:06:29 +02:00
becb0865b9 Move menu building to Stimulus (WIP)
TODO: cache menu container, build ontology and load templates from external HTML source.
2026-04-21 17:53:23 +02:00
26bea5daae Move UI logic to Stimulus: toolbar only 2026-04-21 15:30:35 +02:00
d37e72390d Fix config for salvador 2026-04-17 18:12:23 +02:00
7a6e084a97 Disable shadows for clipping plane 2026-04-17 18:12:08 +02:00
337bcce0bb Better config defaults 2026-04-16 15:23:16 +02:00
12ae63d332 Draft ontology menu 2026-04-08 11:39:57 +02:00
556086117b Theater at top level in menu 2026-04-08 10:59:58 +02:00
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
32424e7b0b Tabs in content menu 2026-01-18 15:59:24 +01:00
9c29894241 Fix config error 2026-01-17 15:41:30 +01:00
168c725650 Layers logic (WIP) + some refactoring 2026-01-16 17:56:53 +01:00
bd93f8ba2a Fix audio example issues 2026-01-14 16:59:31 +01:00
e85bd4f959 Restructure to use separate scenes
Uses pseudo-router logic...
2026-01-14 16:42:47 +01:00
8c1da5e4e2 Rewrite scene switching logic (with bugs!!) 2026-01-12 21:48:26 +01:00
91961ec216 Fix clipping state bug (partial) 2026-01-11 22:27:36 +01:00
8434f3bdc9 Draggable clipping plane (buggy...)
TODO: refactor to avoid unnecessary object creation
2026-01-07 16:55:32 +01:00
28 changed files with 1555 additions and 602 deletions

3
.gitignore vendored
View File

@@ -7,3 +7,6 @@
*.obj
vendor/
.vscode
docs/

BIN
assets/icons/section_z.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

BIN
assets/pano/gradient.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

146
config.js
View File

@@ -1,3 +1,5 @@
const BASE_URI = "/a/scaenae";
const theater1Popup = `
<div class="text-center">
<h1 class="fs-4">Teatro San Salvador, Venezia</h1>
@@ -12,42 +14,158 @@ const theater2Popup = `
</div>
`;
const audioBtn1 = `
<button type="button" 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>
`;
export const config = {
scene : {
initialExposure: 0.7,
autoLP: true,
autoLP: false,
shadows: false,
initLightDir: [0.2,-0.3,-0.7],
initRotation: [0, 1.5, 0],
},
menu : {
audioBtn1
//audioBtn1
},
markers : [
{
id : "salvador",
label : "Teatro San Salvador, Venezia",
uri : `${BASE_URI}/scenes/salvador/`,
popup: theater1Popup,
coords: [45.4363, 12.3352],
nodes: {
label: 'Teatro',
model: "teatro_san_salvador_20250926.gltf",
pano: "pano/defsky-grass.jpg",
isMain: true,
},
pano: `pano/gradient.jpg`,
},
{
id : "ssgp",
label : "Teatro Santi Giovanni e Paolo, Venezia",
uri : `${BASE_URI}/scenes/ssgp/`,
popup: theater2Popup,
coords: [45.4401, 12.3408],
model: "SSGP.glb",
pano: "pano/defsky-grass.jpg",
nodes: {
label: 'Teatro',
model: 'models/ssgp/Teatro_SSGP_Full_ConSottrazioni.glb',
opacity: 0.0,
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: '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: '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: '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: 'Orchestra',
children: [
{
label: 'Fossa orchestra',
model: 'models/ssgp/Teatro_SSGP_Fossa_orchestra.glb',
},
]
}
]
},
pano: `pano/gradient.jpg`,
}
],
map : {
center: [43.570833, 12.140278],
initialZoom : 8,
center: [45.30833, 12.240278],
initialZoom : 12,
minZoom : 6,
maxZoom : 16
maxZoom : 18
}
}

26
css/app.css Normal file
View File

@@ -0,0 +1,26 @@
body {
height: 100vh;
}
.c-hand {
cursor: pointer;
}
input[type="checkbox"] {
cursor: pointer;
}
#clipper-bar .btn {
background-repeat: no-repeat;
background-position: center;
background-size: 80%;
}
#map {
height: 100%;
}
#clipX {
background-image: url('/a/scaenae/assets/icons/section_x.png');
}
#clipY {
background-image: url('/a/scaenae/assets/icons/section_y.png');
}
#clipZ {
background-image: url('/a/scaenae/assets/icons/section_z.png');
}

View File

@@ -27,10 +27,10 @@
<link rel="manifest" href="app.webmanifest">
<!-- Web-app ID -->
<meta name="aton:appid" content="app_template">
<meta name="aton:appid" content="scaenae">
<meta name="title" content="SCAENE">
<meta name="description" content="__APPDESC__">
<meta name="description" content="Web App 3D per il progetto PRINN 'SCAENAE'">
<!-- Add meta theme-color -->
<meta name="theme-color" content="#000000" />
@@ -39,6 +39,7 @@
<link rel="stylesheet" type="text/css" href="/vendors/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="/vendors/bootstrap/css/bootstrap-icons/font/bootstrap-icons.min.css">
<link rel="stylesheet" type="text/css" href="/res/css/main.css">
<link rel="stylesheet" type="text/css" href="./css/app.css">
<link rel="stylesheet" href="./vendor/leaflet/dist/leaflet.css">
<!-- Vendors -->
@@ -51,97 +52,8 @@
<!-- Main js entry -->
<script type="module" src="js/main.js"></script>
<style>
body {
height: 100vh;
}
.c-hand {
cursor: pointer;
}
input[type="checkbox"] {
cursor: pointer;
}
#clipper-bar .btn {
background-repeat: no-repeat;
background-position: center;
background-size: 80%;
}
#clipX {
background-image: url('assets/icons/section_x.png');
}
#clipY {
background-image: url('assets/icons/section_y.png');
}
#clipZ {
background-image: url('assets/icons/section_z.png');
}
</style>
</head>
<body data-bs-theme="light">
<div class="map" id="map" style="height: 100%;"></div>
<div class="d-none" id="scene">
<div id="toolbar" class="aton-toolbar-top w-100">
<a class="btn aton-btn fs-5" id="back" title="Torna alla mappa">
<i class="bi bi-map-fill"></i>
</a>
<a class="btn aton-btn fs-5" id="settings" title="Impostazioni">
<i class="bi bi-gear-fill"></i>
</a>
<a class="btn aton-btn fs-5" id="clipper" title="Attiva / disattiva sezionamento">
<i class="bi bi-scissors"></i>
</a>
<div class="d-none w-25
position-absolute
top-0 start-50
translate-middle bg-light
px-4 pt-2 pb-2 bg-opacity-50
rounded-bottom-3
mt-4 text-dark text-center"
id="clipper-bar">
<span class="pt-5 pb-2 d-block fw-bold">Sezionamento</span>
<button class="btn aton-btn d-inline px-4 py-4 me-5" id="clipX" title="Sezione X"></button>
<button class="btn aton-btn d-inline px-4 py-4 me-5" id="clipY" title="Sezione Y"></button>
<button class="btn aton-btn d-inline px-4 py-4" id="clipZ" title="Sezione Z"></button>
</div>
<a class="btn aton-btn fs-5 float-end" id="menu" title="Menu">
<i class="bi bi-list"></i>
</a>
</div>
<!-- TODO CSS-only popover -->
<div class="card d-none" id="shadows-popover" popover>Disabilitare le ombre può migliorare le prestazioni</div>
<div class="aton-poweredby" >
<a href="https://aton.ispc.cnr.it/site/" target="_blank"><img src="/res/aton-logo.png"></a>
</div>
</div>
<!-- Info / media modal -->
<div class="modal fade" id="audio1" tabindex="-1" aria-labelledby="audio1" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-4 text-center" id="exampleModalLabel">Che fiero costume</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<h2 class="fs-5 font-bold text-center">Informazioni</h2>
<p class="mt-2">
L'aria "Che fiero costume" bla bla...
</p>
<p>
Lorem ipsum dolor...
</p>
<h2 class="fs-5 mt-4 text-center font-bold">Ascolta</h2>
<audio class="w-100 p-2 mt-1" src="./assets/bt_TracciaAudio_ Che fiero costume.mp3" controls></audio>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">Chiudi</button>
</div>
</div>
</div>
</div>
<div class="map" id="map"></div>
</body>

View File

@@ -0,0 +1,74 @@
// Global ATON
import { Controller } from "@hotwired/stimulus"
import AppState from "../state.js";
import { addClippingPlane, resetClipping } from "../utils/clipping.js";
import { toggleAmbientOcclusion } from "../utils/environment.js";
/**
* Handle events for the clipper toolbar,
* related to the clipping module
*/
export default class extends Controller {
static targets = ['trigger', 'clipper', 'axis'];
static values = { enabled: Boolean };
connect() {
console.log('#clipper controller connected');
}
clip(event) {
/**
* @type {string}
*/
const label = event.params.axis;
/**
* @type {HTMLButtonElement}
*/
const target = event.target;
/**
* @type {NodeListOf<HTMLButtonElement>}
*/
const axes = this.axisTargets;
const classes = ['border', 'border-2', 'border-warning'];
addClippingPlane(label, -1);
target.classList.add(...classes);
for (const btn of axes) {
if (btn.id !== target.id) {
btn.classList.remove(...classes);
}
}
}
/**
* Toggle clipper toolbar
*/
toggleClipper() {
/**
* @type {HTMLElement}
*/
const trigger = this.triggerTarget;
this.clipperTarget.classList.toggle('d-none');
// If the toolbar is shown, clipping is enabled and vice versa
this.enabledValue = !this.clipperTarget.classList.contains('d-none');
this.axisTargets.forEach(btn => {
btn.classList.remove('border', 'border-2', 'border-warning');
});
// AO should be turned off if clipping is enabled
toggleAmbientOcclusion(!this.enabledValue);
if (this.enabledValue) {
trigger.className += ' border border-2 border-white';
}
if (!this.enabledValue) {
resetClipping();
trigger.className = trigger.className.replace(/ border.*$/g, '');
}
AppState.clipping.enabled = this.enabledValue;
}
}

View File

@@ -0,0 +1,109 @@
// Global ATON
import { Controller } from "@hotwired/stimulus"
import AppState from "../state.js";
import { traverseOntology } from "../ontology.js";
const html = String.raw;
const domParser = new DOMParser;
// TODO: hard-coded, but follows a convention...
const ontologyJsonPath = location.pathname + 'ontology.json';
export default class extends Controller {
static targets = ['trigger', 'layers', 'ontology'];
connect() {
console.log('#menu controller connected');
}
/**
* Open settings panel
* @param {Event} event
*/
async toggleMenu() {
ATON.UI.setSidePanelRight();
ATON.UI.showSidePanel({header: 'Menu'});
this.#buildMenuPanel(ATON.UI.elSidePanel);
this.#buildLayersMenu(AppState.normalizedNodes, this.layersTarget);
this.#buildOntologyMenu(await traverseOntology(ontologyJsonPath), this.ontologyTarget);
}
/**
* @param {Event} event
*/
toggleNode(event) {
/**
* The node's id
* @type {string}
*/
const id = event.params.node;
const status = event.target.checked;
ATON.getSceneNode(id).toggle(status);
AppState.normalizedNodes.find(n => n.id === id).active = status;
}
/**
* Clone a <template> by id
* @param {String} id
* @returns {DocumentFragment}
*/
#cloneTemplate(id) {
return document.getElementById(id).content.cloneNode(true);
}
/**
* Create the left-side settings panel
* content
* @param {Element} panel
*/
#buildMenuPanel(panel) {
const fragment = this.#cloneTemplate('tmpl-menu-tabs');
panel.appendChild(fragment);
}
/**
* @todo Don't rebuild it every time, use caching, return a container with checkboxes
* @param {Array} nodes The normalized scene nodes (IDs and status)
* @param {HTMLElement} tab Tab content element
*/
#buildLayersMenu(nodes, tab) {
for(let node of nodes) {
const menuItem = html`
<div class="form-check form-switch ms-${node.depth} ps-${node.depth} mt-2">
<input class="form-check-input" type="checkbox" ${node.active ? 'checked' : ''} role="switch"
title="Mostra / nascondi layer"
data-menu-node-param="${node.id}"
data-action="change->menu#toggleNode">
<label class="form-check-label">${node.id}</label>
</div>
`;
// Awful?
tab.appendChild(
domParser.parseFromString(menuItem, 'text/html').querySelector('div')
);
}
}
/**
* Temporary implementation to show domains only
* @todo Don't rebuild it every time, use caching, return a container
* @param {Object} ontology The traversed ontology object (temp)
* @param {HTMLElement} tab Tab content element
*/
#buildOntologyMenu(ontology, tab) {
console.debug(ontology);
const mainNode = tab.querySelector('#ontology-list');
mainNode.textContent = ontology.ontology;
let domainList = html`
<ul class="list-group mt-2" id="domains-list"></ul>
`;
// Very fragile and ugly!!
mainNode.innerHTML += domainList;
domainList = tab.querySelector('#domains-list');
for(let domain of ontology.domains) {
const domainItem = html`
<li class="list-group-item">${domain.label}</li>
`;
domainList.innerHTML += domainItem;
}
}
}

View File

@@ -0,0 +1,28 @@
import { Controller } from "@hotwired/stimulus"
import AppState from "../state.js";
export default class extends Controller {
static targets = ['ao', 'shadows'];
connect() {
console.log('#settings controller connected');
this.aoTarget.checked = AppState.ambientOcclusion;
this.shadowsTarget.checked = AppState.shadows;
}
/**
* Toggle Ambient Occlusion
* @param {Event} event
*/
toggleAO(event) {
ATON.FX.togglePass(ATON.FX.PASS_AO, event.target.checked);
AppState.ambientOcclusion = event.target.checked;
}
/**
* Toggle shadows
* @param {Event} event
*/
toggleShadows(event) {
ATON.toggleShadows(event.target.checked);
AppState.shadows = event.target.checked;
}
}

View File

@@ -0,0 +1,42 @@
import { Controller } from "@hotwired/stimulus"
export default class extends Controller {
static targets = ['active', 'tab', 'content'];
connect() {
console.log('#tabs controller connected');
}
/**
*
* @param {Event} event
*/
activate(event) {
event.preventDefault();
this.deactivate();
const activeId = event.currentTarget.dataset.id;
event.currentTarget.parentElement.classList.add('active');
this.contentTargets.find(c => c.dataset.id === activeId)
.classList.remove('d-hide');
}
reset() {
this.deactivate();
const activeId = this.activeTarget.dataset.id;
this.activeTarget.classList.add('active');
this.contentTargets.find(c => c.dataset.id === activeId)
.classList.remove('d-hide');
}
deactivate() {
this.tabTargets.forEach(tab => {
tab.classList.remove('active');
});
this.contentTargets.forEach(content => {
content.classList.add('d-hide');
});
}
}

View File

@@ -0,0 +1,53 @@
// Global ATON
import { Controller } from "@hotwired/stimulus"
import AppState from "../state.js";
import { createExposureSlider, createLightSlider } from "../utils/environment.js";
const html = String.raw;
const panelHeader = html`
<i class="bi bi-gear-fill me-1"></i> Impostazioni
`;
export default class extends Controller {
static targets = ['settings'];
connect() {
console.log('#toolbar controller connected');
}
/**
* Open settings panel
* @param {Event} event
*/
toggleSettings(event) {
ATON.UI.setSidePanelLeft();
ATON.UI.showSidePanel({header: panelHeader});
this.#buildSettingsPanel(ATON.UI.elSidePanel);
}
/**
* Clone a <template> by id
* @param {String} id
* @returns {DocumentFragment}
*/
#cloneTemplate(id) {
return document.getElementById(id).content.cloneNode(true);
}
/**
* Create the left-side settings panel
* content
* @param {Element} panel
*/
#buildSettingsPanel(panel) {
const fragment = this.#cloneTemplate('tmpl-settings');
let sliderContainer = fragment.querySelector('[data-sliders-container]');
let exposureContainer = fragment.querySelector('[data-slider-exposure-container]');
['x', 'y', 'z'].forEach((axis, i) => {
const label = ['Asse X', 'Asse Y', 'Asse Z'][i];
sliderContainer.appendChild(createLightSlider(axis, label, [-2, 2], 0.1));
})
exposureContainer.appendChild(createExposureSlider('Valore', [0, 5]));
panel.appendChild(fragment);
}
}

View File

@@ -1,5 +1,4 @@
import Map from "./map.js";
import Scene from "./scene.js";
/*
Main js entry for ATON web-app
@@ -7,31 +6,10 @@ import Scene from "./scene.js";
// Realize our app
let APP = ATON.App.realize();
APP.UI = {};
/**
*
* @param {String} triggerSelector - Usually, the close modal trigger element(s) selector
*/
APP.UI.pauseAudio = function(triggerSelector) {
// What if more than one audio element is playing?
const audio = document.querySelector('audio');
document.querySelectorAll(triggerSelector).forEach(el => {
el.addEventListener('click', () => audio.pause());
});
document.querySelector('.modal').addEventListener('blur', () => {
audio.pause();
});
}
// APP.setup() is required for web-app initialization
// You can place here UI setup (HTML), events handling, etc.
APP.setup = ()=>{
Map.init('map');
Scene.toggleScene('back');
APP.UI.pauseAudio('[data-bs-dismiss="modal"');
//APP.UI.showClipper('#clipper');
};
/* If you plan to use an update routine (executed continuously), you can place its logic here.

View File

@@ -1,8 +1,7 @@
// Global Leaflet and ATON
import {config} from '../config.js';
import Scene from './scene.js';
import { AppState } from './state.js';
import AppState from './state.js';
const Map = {};
@@ -29,7 +28,7 @@ Map.init = function(mapContainerId) {
const popup = this.domParser.parseFromString(marker.popup, 'text/html')
.querySelector('div');
popup.querySelector('button').onclick = () => {
Scene.openScene(marker);
this.goToScene(marker.uri);
map.getContainer().classList.toggle('d-none');
};
@@ -41,4 +40,12 @@ Map.init = function(mapContainerId) {
AppState.map = map;
}
/**
*
* @param {String} uri The scene's absolute URI (from config)
*/
Map.goToScene = function (uri) {
location.href = uri;
}
export default Map;

43
js/ontology.js Normal file
View File

@@ -0,0 +1,43 @@
/**
* @module Ontology
*/
/**
* @todo Temporarily returns domains and ontology labels only
* Traverse an ontology from its JSON description
* @param {String} jsonPath The path (URI) of the ontology JSON file
* @returns {Object}
*/
export async function traverseOntology(jsonPath) {
const ontology = await loadOntology(jsonPath);
const domains = [];
for (const k of Object.keys(ontology)) {
if (k === 'domains') {
for (const domainKey of Object.keys(ontology[k])) {
domains.push({
label: domainKey,
child: ontology[k][domainKey][0].label,
});
}
}
}
return {
ontology: ontology.ontology,
domains
};
}
/**
* 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

@@ -1,109 +1,18 @@
// Global ATON
import { AppState, getSceneStatus, setSceneStatus, getCurrentScene, setCurrentScene } from "./state.js";
import AppState from "./state.js";
import { config } from "../config.js";
const material = {
color: "#fff",
//color: "#e6f2ff",
emissive: true,
};
const Scene = {};
Scene.UI = {};
Scene.UI.domParser = new DOMParser;
import { toggleAmbientOcclusion } from "./utils/environment.js";
/**
* Resets the UI state (essentially hides the clipper toolbar if visible...)
* @todo Other elements to reset?? Restore inital lighting conditions and viewpoint...
* @module Scene
*/
Scene.UI.reset = function() {
document.querySelector('#clipper-bar')?.classList.add('d-none');
document.querySelector('#clipper')?.classList.remove('border', 'border-2', 'border-white');
}
/**
* @todo Get clipping button from state? Review logic!!
* @param {String} triggerSelector
* @param {String} targetSelector The selector for the target toolbar to be displayed
*/
Scene.UI.toggleClipper = function(triggerSelector, targetSelector) {
const trigger = document.querySelector(triggerSelector);
const toolbar = document.querySelector(targetSelector);
if (!AppState.clipping.listenerAdded) {
trigger.addEventListener(
'click',
() => {
console.log('Clipping enabled?', AppState.clipping.enabled);
toolbar.classList.toggle('d-none');
const aoCurrentState = AppState.ambientOcclusion;
if (!AppState.clipping.enabled) {
AppState.clipping.enabled = true;
Scene.toggleAmbientOcclusion(false);
const btns = toolbar.querySelectorAll('button');
btns.forEach(btn => {
btn.classList.remove('border', 'border-2', 'border-warning');
});
trigger.className += ' border border-2 border-white';
toolbar.addEventListener('click', event => {
console.log('Clipping target:', event.target);
if (event.target.id === 'clipX') {
// Clip along X...
Scene.addClippingPlane('x', -1);
// Export to function...
event.target.classList.add('border', 'border-2', 'border-warning');
btns.forEach(btn => {
if (btn.id !== event.target.id) {
btn.classList.remove('border', 'border-2', 'border-warning');
}
});
}
else if (event.target.id === 'clipY') {
// Clip along Y...
Scene.addClippingPlane('y', -1);
event.target.classList.add('border', 'border-2', 'border-warning');
btns.forEach(btn => {
if (btn.id !== event.target.id) {
btn.classList.remove('border', 'border-2', 'border-warning');
}
})
}
else if (event.target.id === 'clipZ') {
// Clip along Z...
Scene.addClippingPlane('z', 1);
event.target.classList.add('border', 'border-2', 'border-warning');
btns.forEach(btn => {
if (btn.id !== event.target.id) {
btn.classList.remove('border', 'border-2', 'border-warning');
}
})
}
});
} else {
AppState.clipping.enabled = false;
ATON.disableClipPlanes();
AppState.root.remove(AppState.clipping.helper);
AppState.clipping.helper = null;
let noBorder = trigger.className.replace(/ border.*$/g, '');
trigger.className = noBorder;
Scene.toggleAmbientOcclusion(aoCurrentState);
}
}
);
AppState.clipping.listenerAdded = true;
}
}
/**
* @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) {
@@ -118,352 +27,79 @@ 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.
*/
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.Vector3} rootBBoxSize - The size of the bounding box for the root object
* @returns {THREE.Mesh}
*/
Scene.createClippingPlaneMesh = function(rootBBoxSize) {
const averageDim = (Number(rootBBoxSize.x) + Number(rootBBoxSize.y) + Number(rootBBoxSize.z)) / 3;
const planeSize = averageDim * 1.2;
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 {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 bboxData = AppState.clipping.rootBoundingBox ?? this.getRootBoundingBox();
if (!bboxData) return;
const defaultPoint = bboxData.center.clone();
const vector = [
axis === 'x' ? orientation : 0,
axis === 'y' ? orientation : 0,
axis === 'z' ? orientation : 0,
];
// First, add a default clipping plane
// at a default point (calculated...)
Scene.activateClipper(vector, defaultPoint);
console.log(vector, defaultPoint);
window.addEventListener('mousedown', event => {
// Activate clipping when left-clicking on the scene
if (AppState.clipping.enabled && event.buttons === 1) {
Scene.activateClipper(vector);
}
});
}
/**
* @todo WIP!
* Activate clipping plane
* @param {Number[]} vector - The vector array to direct the plane
*/
Scene.activateClipper = function(vector, point = null) {
point ??= ATON.getSceneQueriedPoint();
const bboxData = AppState.clipping.rootBoundingBox ?? this.getRootBoundingBox();
if (point) {
console.log('Queried point:', point);
// First remove any existing clipping planes
ATON.disableClipPlanes();
// Normal of the clipping plane along the Y axis facing down
const normal = new THREE.Vector3(...vector).normalize();
//const constant = -normal.dot(point);
const plane = ATON.addClipPlane(normal, point);
// Add a visible plane helper for the clipping plane
const visiblePlane = Scene.createClippingPlaneMesh(bboxData.size);
visiblePlane.position.copy(point);
visiblePlane.lookAt(point.clone().add(normal));
// Remove any already visbile helper plane
if (AppState.clipping.helper !== null) AppState.root.remove(AppState.clipping.helper);
AppState.root.add(visiblePlane);
AppState.clipping.helper = visiblePlane;
console.log("I'm clipping, baby!");
}
}
/**
*
* @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');
}
/**
*
* @param {String} direction - The axis direction, one of 'x','y','z'
* @param {String} label - The slider label
* @param {Number[]} range - The slider's range
* @param {Number} step - The slider's step
*/
Scene.createLightSlider = function(direction, label, range, step) {
const currentVal = ATON.getMainLightDirection()[direction];
const lightSlider = ATON.UI.createSlider({
range,
label,
value: Number.parseFloat(currentVal).toPrecision(1),
oninput: val => {
const lightDir = ATON.getMainLightDirection();
// Keep existing direction values for the other axes
lightDir[direction] = Number.parseFloat(val);
this.changeLightDirection(lightDir);
},
});
lightSlider.classList.add('ms-4');
lightSlider.querySelector('input').step = step;
return lightSlider;
}
/**
* Right-side main menu panel
* @param {String} triggerId - The menu button id
*/
Scene.toggleContentMenu = function(triggerId) {
const btn = document.querySelector(`#${triggerId}`);
const audio1 = this.UI.domParser.parseFromString(config.menu.audioBtn1, 'text/html')
.querySelector('button');
btn.addEventListener('click', () => {
ATON.UI.setSidePanelRight();
ATON.UI.showSidePanel({header: '<i class="bi bi-music-note-list me-1"></i> Contenuti'});
ATON.UI.elSidePanel.appendChild(audio1);
});
}
/**
* A left side settings panel
* @param {String} triggerId - The settings button id
*/
Scene.toggleSettingsPanel = function(triggerId) {
const btn = document.querySelector(`#${triggerId}`);
const lightHeading = document.createElement('h2');
lightHeading.className = 'fs-5 ms-2 mb-3 mt-3';
lightHeading.innerHTML = '<i class="bi bi-lightbulb me-1"></i> Direzione luce';
const envHeading = document.createElement('h2');
envHeading.className = 'fs-5 ms-2 mb-3 mt-3';
envHeading.innerHTML = '<i class="bi bi-brightness-high me-1"></i> Ambiente';
btn.addEventListener('click', () => {
ATON.UI.setSidePanelLeft();
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);
ATON.UI.elSidePanel.appendChild(lightSliderX);
ATON.UI.elSidePanel.appendChild(lightSliderY);
ATON.UI.elSidePanel.appendChild(lightSliderZ);
ATON.UI.elSidePanel.appendChild(envHeading);
const ambientOcclSwitch = document.createElement('div');
ambientOcclSwitch.className = 'form-check form-switch ms-4 mt-2';
ambientOcclSwitch.innerHTML = `
<input class="form-check-input" type="checkbox" role="switch" id="aoSwitch" title="Abilita / disabilita ambient occlusion">
<label class="form-check-label" for="aoSwitch"><em>Ambient occlusion</em> <i class="bi bi-info-circle ms-2 c-hand"></i></label>
`;
const shadowsSwitch = document.createElement('div');
shadowsSwitch.className = 'form-check form-switch ms-4 mt-2';
shadowsSwitch.innerHTML = `
<input class="form-check-input" type="checkbox" role="switch" id="shadowsSwitch" title="Abilita / disabilita ombre">
<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;
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 => {
this.toggleAmbientOcclusion(event.target.checked);
AppState.ambientOcclusion = event.target.checked;
}
);
document.querySelector('#shadowsSwitch').addEventListener(
'change',
event => {
const checked = event.target.checked;
ATON.toggleShadows(checked);
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);
}
);
});
}
Scene.init = function() {
function init () {
ATON.realize();
ATON.UI.addBasicEvents();
ATON.UI.init();
// All assets for this app are stored here
ATON.setPathCollection('./assets/');
ATON.setPathCollection('/a/scaenae/assets/');
// Initial light direction
ATON.setMainLightDirection(new THREE.Vector3(0.2,-0.3,-0.7));
ATON.toggleShadows(true);
ATON.setMainLightDirection(new THREE.Vector3(...config.scene.initLightDir));
ATON.toggleShadows(config.scene.shadows);
ATON.setExposure(config.scene.initialExposure);
// Open settings side panel when clicking on settings btn
Scene.toggleSettingsPanel('settings');
Scene.toggleContentMenu('menu');
}
/**
* @param {String} btnId - The back-to-map button id
*/
Scene.toggleScene = function(btnId) {
const btn = document.querySelector(`#${btnId}`);
const scene = document.querySelector('#scene');
AppState.camera = ATON.Nav._camera;
AppState.renderer = ATON._renderer;
AppState.shadows = config.scene.shadows;
AppState.lightDirection = ATON.getMainLightDirection();
AppState.exposure = config.scene.initialExposure;
btn.addEventListener('click', () => {
const currentScene = getCurrentScene();
// Deactivate the current scene before toggling
setSceneStatus(currentScene.id, false);
scene.classList.toggle('d-none');
// Pause rendering the 3D scene to free resources (hopefully)
// when browsing the map
ATON.renderPause();
if (AppState.clipping.enabled) {
ATON.disableClipPlanes();
AppState.clipping.enabled = false;
Scene.UI.reset();
AppState.root.remove(AppState.clipping.helper);
AppState.clipping.helper = null;
}
AppState.root.setRotation(AppState.initialRotation ?? new THREE.Vector3(0, 1.5, 0));
document.querySelector('#map').classList.toggle('d-none');
AppState.map.invalidateSize();
});
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) {
let canvas = document.querySelector('canvas');
let scene = document.querySelector('#scene');
export function openScene (marker, nodes) {
init();
// Filter nodes with models first
nodes = nodes.filter(n => n.model);
// Load 3D models and create nodes
loadNodes(nodes);
if (canvas === null) {
Scene.init();
}
Scene.UI.toggleClipper('#clipper', '#clipper-bar');
scene.classList.toggle('d-none');
ATON.renderResume();
// TODO: reset scene only if changing to a different model from the map
// set scene status to inactive, first get current scene id...
let currentScene = getCurrentScene();
if (currentScene && currentScene.id !== marker.id) {
AppState.root.removeChildren();
currentScene.current = false;
}
if (!AppState.scenes.find(s => s.id === marker.id)) {
const newScene = {id: marker.id, active: false, current: true};
AppState.scenes.push(newScene);
}
if (!getSceneStatus(marker.id)) {
// Set scene as active
setSceneStatus(marker.id, true);
// Load 3D model
let mainNode = ATON.createSceneNode(marker.label).load(marker.model);
ATON.setMainPanorama(marker.pano);
//mainNode.setMaterial(new THREE.MeshPhongMaterial(material));
// TODO: hardcoded...
mainNode.setRotation(0, 1.5, 0)
AppState.initialRotation = new THREE.Vector3(0, 1.5, 0);
Scene.showEdges(mainNode);
mainNode.attachToRoot();
AppState.initialRotation = new THREE.Vector3(...config.scene.initRotation);
ATON.setAutoLP(config.scene.autoLP);
AppState.lightProbe = config.scene.autoLP;
Scene.toggleAmbientOcclusion(true);
toggleAmbientOcclusion(true);
AppState.ambientOcclusion = true;
AppState.root = ATON.getRootScene();
// TODO: set the scene as current!!
setCurrentScene(marker.id);
}
}
export default Scene;
/**
*
* @param {Object[]} nodes
*/
function loadNodes(nodes) {
nodes.forEach(n => {
let node = ATON.createSceneNode(n.label);
node.load(n.model);
node.setRotation(...config.scene.initRotation);
// Apply any transparency before attaching to scene
if (n.opacity !== undefined && n.opacity !== null) {
node.setMaterial(new THREE.MeshPhongMaterial({
transparent: true,
opacity: n.opacity,
color: '#fff'
}));
}
node.attachToRoot();
if (n.isMain) {
AppState.mainNodeId = n.label;
// ATON.Node.getBound() returns a THREE.Sphere object
AppState.clipping.boundingSphere = node.getBound();
}
AppState.nodes.push({id: n.label, active: true});
});
if (!AppState.clipping.boundingSphere) {
console.error("No bounding sphere computed, clipping will fail. Ensure one node has 'isMain: true'.");
}
}

View File

@@ -1,52 +1,90 @@
export const AppState = {
/**
* @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,
// The root scene object
root: null,
// {id: String, active: Boolean}
nodes: [],
/**
* @type {NormalizedSceneNode[]} normalizedNodes
*/
normalizedNodes: [],
mainNodeId: null,
currentScene: null,
sceneHasAudio: false,
layersMenuBuilt: false,
initialRotation: null,
scenes : [],
lightDirection: [],
/**
* @type {Number}
*/
exposure: null,
camera: null,
renderer: null,
ambientOcclusion : true,
shadows : true,
lightProbe : false,
map : null,
clipping : {
enabled: false,
plane : null,
controls: null,
onDrag: null,
helper : null,
rootBoundingBox: null,
listenerAdded: false,
}
}
/**
* @todo Buggyyyyy!!!!
* @param {String} id
* @returns {Boolean}
*/
export function getSceneStatus(id) {
return AppState.scenes.find(s => s.id === id).active;
}
/**
* @todo Buggyyyyy!!!!
* @param {String} id
* @param {Boolean} status
* @returns {Boolean}
*/
export function setSceneStatus(id, status) {
AppState.scenes.find(s => s.id === id).active = status;
}
export function getCurrentScene() {
return AppState.scenes.find(s => s.current);
}
arrow : null,
boundingSphere: null,
listeners: {
button: false,
plane: false,
},
vector: null,
},
/**
* Reset the overall app state
* to default values but keep map
*
* @param {String} id The scene's id
* @returns
* @param {L.Map} map - The Leaflet map object
*/
export function setCurrentScene(id) {
// First set the correct status for the other scenes
let otherScenes = AppState.scenes.filter(s => s.id !== id);
otherScenes.forEach(scene => scene.current = false)
AppState.scenes.find(s => s.id === id).current = true;
resetSceneState(map) {
AppState = {
root: null,
mainNodeId: null,
initialRotation: null,
camera: null,
renderer: null,
ambientOcclusion : true,
shadows : true,
lightProbe : false,
map,
clipping : {
enabled: false,
plane : null,
controls: null,
onDrag: null,
helper : null,
arrow : null,
boundingSphere: null,
listeners: {
button: false,
plane: false,
},
vector: null,
}
}
}
}
export default AppState;

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

@@ -0,0 +1,157 @@
// 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 })
);
mesh.castShadow = false;
mesh.receiveShadow = false;
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);
}

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

@@ -0,0 +1,81 @@
// Global ATON and THREE
import AppState from "../state.js";
/**
* @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');
}
/**
* Slider to change light direction, based on ATON.UI
* @param {String} direction - The axis direction, one of 'x','y','z'
* @param {String} label - The slider label
* @param {Array<Number>} range - The slider's range
* @param {Number} step - The slider's step
*/
export function createLightSlider(direction, label, range, step) {
const currentVal = AppState.lightDirection[direction];
console.debug(currentVal);
const lightSlider = ATON.UI.createSlider({
range,
label,
value: Number.parseFloat(currentVal).toPrecision(2),
oninput: val => {
const lightDir = AppState.lightDirection;
// Keep existing direction values for the other axes
lightDir[direction] = Number.parseFloat(val);
changeLightDirection(lightDir);
AppState.lightDirection = lightDir;
},
});
lightSlider.classList.add('ms-4');
lightSlider.querySelector('input').step = step;
return lightSlider;
}
/**
* Slider to change the env exposure level, based on ATON.UI
* @param {String} label - The slider label
* @param {Array<Number>} range - The slider's range
* @param {Number} step - The slider's step
*/
export function createExposureSlider(label, range, step = 0.05) {
const currentVal = AppState.exposure;
const exposureSlider = ATON.UI.createSlider({
range,
label,
value: Number.parseFloat(currentVal).toPrecision(1),
oninput: val => {
ATON.setExposure(val);
AppState.exposure = val;
console.debug('Current exposure:', ATON.getExposure());
},
});
exposureSlider.classList.add('ms-4');
exposureSlider.querySelector('input').step = step;
return exposureSlider;
}

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

@@ -0,0 +1,68 @@
/**
* @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 = [];
traverse(nodes, flatList);
return flatList;
}

16
js/utils/stimulus.js Normal file
View File

@@ -0,0 +1,16 @@
import { Application } from '@hotwired/stimulus';
import SettingController from '../controllers/settings_controller.js';
import ToolbarController from '../controllers/toolbar_controller.js';
import ClipperController from '../controllers/clipper_controller.js';
import MenuController from '../controllers/menu_controller.js';
/**
* Initialize Stimulus controllers
*/
export function initStimulus() {
window.Stimulus = Application.start();
Stimulus.register("settings", SettingController);
Stimulus.register("toolbar", ToolbarController);
Stimulus.register("clipper", ClipperController);
Stimulus.register("menu", MenuController);
}

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

114
scenes/salvador/index.html Normal file
View File

@@ -0,0 +1,114 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0" />
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<link rel="icon" href="../../appicon.png" sizes="512x512" type="image/png">
<!-- Add iOS meta tags and icons -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="SCAENE">
<link rel="apple-touch-icon" href="appicon.png">
<!-- OpenGraph tags -->
<meta property="og:title" content="SCAENE" />
<meta property="og:description" content="Web App 3D per il progetto PRIN 'SCAENAE'" />
<meta property="og:image" content="../../appicon.png" />
<meta property="og:image:secure_url" content="../../appicon.png" />
<meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="200" />
<meta property="og:image:height" content="200" />
<!-- Web-app ID -->
<meta name="aton:appid" content="app_scaenae">
<meta name="title" content="SCAENAE - Teatro Santi Giovanni e Paolo, Venezia">
<meta name="description" content="SCAENAE - Teatro Santi Giovanni e Paolo, Venezia">
<!-- Add meta theme-color -->
<meta name="theme-color" content="#000000" />
<title>SCAENE</title>
<link rel="stylesheet" type="text/css" href="/vendors/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="/vendors/bootstrap/css/bootstrap-icons/font/bootstrap-icons.min.css">
<link rel="stylesheet" type="text/css" href="/res/css/main.css">
<link rel="stylesheet" type="text/css" href="../../css/app.css">
<!-- Vendors -->
<script type="text/javascript" src="/vendors/vendors.min.js"></script>
<script type="text/javascript" src="/vendors/bootstrap/js/bootstrap.bundle.min.js"></script>
<script type="text/javascript" src="/dist/THREE.bundle.js"></script>
<script type="text/javascript" src="../../vendor/three/examples/js/controls/DragControls.js"></script>
<script type="text/javascript" src="/dist/ATON.min.js"></script>
<!-- Main js entry -->
<script type="module" src="./index.js"></script>
</head>
<body data-bs-theme="light">
<div id="toolbar" class="aton-toolbar-top w-100">
<a class="btn aton-btn fs-5" href="/a/scaenae" id="back" title="Torna alla mappa">
<i class="bi bi-map-fill"></i>
</a>
<a class="btn aton-btn fs-5" id="settings" title="Impostazioni">
<i class="bi bi-gear-fill"></i>
</a>
<a class="btn aton-btn fs-5" id="clipper" title="Attiva / disattiva sezionamento">
<i class="bi bi-scissors"></i>
</a>
<div class="d-none w-25
position-absolute
top-0 start-50
translate-middle bg-light
px-4 pt-2 pb-2 bg-opacity-50
rounded-bottom-3
mt-4 text-dark text-center"
id="clipper-bar">
<span class="pt-5 pb-2 d-block fw-bold">Sezionamento</span>
<button class="btn aton-btn d-inline px-4 py-4 me-5" id="clipX" title="Sezione X"></button>
<button class="btn aton-btn d-inline px-4 py-4 me-5" id="clipY" title="Sezione Y"></button>
<button class="btn aton-btn d-inline px-4 py-4" id="clipZ" title="Sezione Z"></button>
</div>
<a class="btn aton-btn fs-5 float-end" id="menu" title="Menu">
<i class="bi bi-list"></i>
</a>
</div>
<!-- TODO CSS-only popover -->
<div class="card d-none" id="shadows-popover" popover>Disabilitare le ombre può migliorare le prestazioni</div>
<div class="aton-poweredby" >
<a href="https://aton.ispc.cnr.it/site/" target="_blank"><img src="/res/aton-logo.png"></a>
</div>
<!-- Info / media modal -->
<div class="modal fade" id="audio1" tabindex="-1" aria-labelledby="audio1" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-4 text-center" id="exampleModalLabel">Che fiero costume</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<h2 class="fs-5 font-bold text-center">Informazioni</h2>
<p class="mt-2">
L'aria "Che fiero costume" bla bla...
</p>
<p>
Lorem ipsum dolor...
</p>
<h2 class="fs-5 mt-4 text-center font-bold">Ascolta</h2>
<audio class="w-100 p-2 mt-1" src="/a/scaenae/assets/bt_TracciaAudio_ Che fiero costume.mp3" controls></audio>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">Chiudi</button>
</div>
</div>
</div>
</div>
</body>

14
scenes/salvador/index.js Normal file
View File

@@ -0,0 +1,14 @@
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);
openScene(marker, AppState.normalizedNodes);
initUI();
pauseAudio('[data-bs-dismiss="modal"]');

160
scenes/ssgp/index.html Normal file
View File

@@ -0,0 +1,160 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0" />
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<link rel="icon" href="../../appicon.png" sizes="512x512" type="image/png">
<!-- Add iOS meta tags and icons -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="SCAENE">
<link rel="apple-touch-icon" href="appicon.png">
<!-- OpenGraph tags -->
<meta property="og:title" content="SCAENE" />
<meta property="og:description" content="Web App 3D per il progetto PRIN 'SCAENAE'" />
<meta property="og:image" content="../../appicon.png" />
<meta property="og:image:secure_url" content="../../appicon.png" />
<meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="200" />
<meta property="og:image:height" content="200" />
<!-- Web-app ID -->
<meta name="aton:appid" content="app_scaenae">
<meta name="title" content="SCAENAE - Teatro Santi Giovanni e Paolo, Venezia">
<meta name="description" content="SCAENAE - Teatro Santi Giovanni e Paolo, Venezia">
<!-- Add meta theme-color -->
<meta name="theme-color" content="#000000" />
<title>SCAENE</title>
<link rel="stylesheet" type="text/css" href="/vendors/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="/vendors/bootstrap/css/bootstrap-icons/font/bootstrap-icons.min.css">
<link rel="stylesheet" type="text/css" href="/res/css/main.css">
<link rel="stylesheet" type="text/css" href="../../css/app.css">
<!-- Vendors -->
<script type="text/javascript" src="/vendors/vendors.min.js"></script>
<script type="text/javascript" src="/vendors/bootstrap/js/bootstrap.bundle.min.js"></script>
<script type="text/javascript" src="/dist/THREE.bundle.js"></script>
<script type="text/javascript" src="../../vendor/three/examples/js/controls/DragControls.js"></script>
<script type="text/javascript" src="/dist/ATON.min.js"></script>
<script type="importmap">
{
"imports": {
"@hotwired/stimulus": "../../vendor/@hotwired/stimulus/dist/stimulus.js"
}
}
</script>
<!-- Main js entry -->
<script type="module" src="./index.js"></script>
</head>
<body data-bs-theme="light" data-controller="menu">
<div id="toolbar" class="aton-toolbar-top w-100"
data-controller="toolbar clipper" data-clipper-enabled-value="false">
<a class="btn aton-btn fs-5" href="/a/scaenae" id="back" title="Torna alla mappa">
<i class="bi bi-map-fill"></i>
</a>
<a class="btn aton-btn fs-5" title="Impostazioni" data-toolbar-target="settings"
data-action="toolbar#toggleSettings">
<i class="bi bi-gear-fill"></i>
</a>
<a class="btn aton-btn fs-5" title="Attiva / disattiva sezionamento"
data-clipper-target="trigger" data-action="clipper#toggleClipper">
<i class="bi bi-scissors"></i>
</a>
<div class="d-none w-25
position-absolute
top-0 start-50
translate-middle bg-light
px-4 pt-2 pb-2 bg-opacity-50
rounded-bottom-3
mt-4 text-dark text-center"
id="clipper-bar"
data-clipper-target="clipper">
<span class="pt-5 pb-2 d-block fw-bold">Sezionamento</span>
<button class="btn aton-btn d-inline px-4 py-4 me-5" id="clipX"
data-clipper-target="axis" data-clipper-axis-param="x" data-action="clipper#clip" title="Sezione X"></button>
<button class="btn aton-btn d-inline px-4 py-4 me-5" id="clipY"
data-clipper-target="axis" data-clipper-axis-param="y" data-action="clipper#clip" title="Sezione Y"></button>
<button class="btn aton-btn d-inline px-4 py-4" id="clipZ"
data-clipper-target="axis" data-clipper-axis-param="z" data-action="clipper#clip" title="Sezione Z"></button>
</div>
<a class="btn aton-btn fs-5 float-end" id="menu" title="Menu"
data-menu-target="trigger" data-action="menu#toggleMenu">
<i class="bi bi-list"></i>
</a>
</div>
<!-- Settings menu template (except dynamic light sliders) -->
<template id="tmpl-settings">
<div data-controller="settings">
<h2 class="fs-5 ms-2 mb-3 mt-3">
<i class="bi bi-lightbulb me-1"></i> Illuminazione
</h2>
<h3 class="fs-6 ms-4 mb-3 mt-3">
Direzione (x, y, z)
</h3>
<div data-sliders-container></div>
<h3 class="fs-6 ms-4 mb-3 mt-3">
Intensità
</h3>
<div data-slider-exposure-container></div>
<h2 class="fs-5 ms-2 mb-3 mt-3">
<i class="bi bi-brightness-high me-1"></i> Ambiente
</h2>
<div class="form-check form-switch ms-4 mt-2">
<input class="form-check-input" type="checkbox" role="switch"
data-settings-target="ao" data-action="change->settings#toggleAO">
<label class="form-check-label" for="aoSwitch">Ambient occlusion</label>
</div>
<div class="form-check form-switch ms-4 mt-2">
<input class="form-check-input" type="checkbox" role="switch"
data-settings-target="shadows" data-action="change->settings#toggleShadows">
<label class="form-check-label" for="shadowsSwitch">Ombre</label>
</div>
</div>
</template>
<template id="tmpl-menu-tabs">
<!-- Nav tabs -->
<ul class="nav nav-pills" id="content-tabs" role="tablist">
<li class="nav-item" role="presentation">
<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="content-tab" data-bs-toggle="tab" data-bs-target="#content" 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 ps-4 ms-3 overflow-y-auto">
<div class="tab-pane active p-3 ms-2" data-menu-target="layers" id="layer" role="tabpanel" aria-labelledby="layer-tab" tabindex="0"></div>
<div class="tab-pane pt-3" data-menu-target="ontology" id="content" role="tabpanel" aria-labelledby="media-tab" tabindex="0">
<!-- Temporary -->
<ul class="list-group me-4 ms-0">
<li class="list-group-item pt-2 pb-2" id="ontology-list"> </li>
</ul>
</div>
</div>
</template>
<!-- TODO CSS-only popover -->
<div class="card d-none" id="shadows-popover" popover>Disabilitare le ombre può migliorare le prestazioni</div>
<div class="aton-poweredby" >
<a href="https://aton.ispc.cnr.it/site/" target="_blank"><img src="/res/aton-logo.png"></a>
</div>
</body>

13
scenes/ssgp/index.js Normal file
View File

@@ -0,0 +1,13 @@
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 { initStimulus } from "../../js/utils/stimulus.js";
initStimulus();
AppState.currentScene = 'ssgp';
const marker = config.markers.find(m => m.id === 'ssgp');
AppState.normalizedNodes = normalizeNodes(marker.nodes);
openScene(marker, AppState.normalizedNodes);

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,7 +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.npmjs.org/three/-/three-0.147.0.tgz"
integrity sha512-LPTOslYQXFkmvceQjFTNnVVli2LaVF6C99Pv34fJypp8NbQLbTlu3KinZ0zURghS5zEehK+VQyvWuPZ/Sm8fzw==