28 Commits

Author SHA1 Message Date
491371e495 Change default env settings 2026-05-21 10:35:59 +02:00
fc4dd8af62 Try different semantic material 2026-05-21 09:47:32 +02:00
c837a6e55f Add modal controller 2026-05-21 09:36:25 +02:00
4dccd58bf3 ATON utils + optimize image asset 2026-05-21 09:30:25 +02:00
9a0d769e0f Sample semantic modal 2026-05-20 20:34:46 +02:00
55f10e62d9 Listen for ATON Tap event 2026-05-20 18:32:07 +02:00
b90d1614e9 Semantic node on 'palcoscenico' 2026-05-20 14:16:01 +02:00
f5f105e786 Test semantic node 2026-05-20 11:45:51 +02:00
aa9a6f56b6 clipping: Fix wrong AO handling 2026-05-19 07:49:40 +02:00
106841f6ef Disable colors + restore clipping 2026-05-19 07:40:45 +02:00
9ae4b0bb8f Fix node status sync error (WIP)
TODO: Use Map object to optimize node lookup
2026-05-18 12:40:32 +02:00
6777037d3d Menu toggles styling and icons 2026-05-18 10:08:07 +02:00
800edc41b9 Add color swatches to layer groups (tentative) 2026-05-15 20:17:16 +02:00
5b1f828abd Don't use Bootstrap switches in layers menu 2026-05-15 19:59:37 +02:00
11acecd33d Draft groups in layers menu
TODO: don't use Bootstrap's switches!!
2026-05-15 17:32:06 +02:00
87245233b7 Node group colors and toggling (draft) 2026-05-14 16:53:28 +02:00
589b551558 Styling changes + tooltips and defaults 2026-05-11 11:31:38 +02:00
cabfe687e2 Handle invisible nodes (temp) 2026-04-22 10:34:27 +02:00
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
24 changed files with 1144 additions and 458 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

View File

@@ -16,11 +16,12 @@ const theater2Popup = `
export const config = {
scene : {
initialExposure: 0.7,
initialExposure: 1.5,
autoLP: false,
},
menu : {
//audioBtn1
shadows: false,
initLightDir: [-0.3,-0.7,0.1],
initRotation: [0, 190, 0],
ambientOcclusion: false,
},
markers : [
{
@@ -29,13 +30,11 @@ export const config = {
uri : `${BASE_URI}/scenes/salvador/`,
popup: theater1Popup,
coords: [45.4363, 12.3352],
nodes: [
{
nodes: {
label: 'Teatro',
model: "teatro_san_salvador_20250926.gltf",
isMain: true,
},
],
pano: `pano/gradient.jpg`,
},
{
@@ -44,8 +43,7 @@ export const config = {
uri : `${BASE_URI}/scenes/ssgp/`,
popup: theater2Popup,
coords: [45.4401, 12.3408],
nodes: [
{
nodes: {
label: 'Teatro',
children: [
/*
@@ -60,10 +58,9 @@ export const config = {
isMain: true,
opacity: 0.2,
},
]
},
{
label: 'Sala / Auditorium',
color: 'rgb(212, 96, 75)',
children: [
{
label: 'Peplano / Platea',
@@ -106,10 +103,21 @@ export const config = {
},
{
label: 'Scena',
color: 'rgb(75, 100, 212)',
children: [
{
label: 'Palcoscenico',
model: 'models/ssgp/Teatro_SSGP_Palcoscenico.glb',
isSemantic: true,
// TEMP
content: {
type: 'img',
imgSrc: '/a/scaenae/assets/img/rilievo_ssgp_bezzi.webp',
title: 'Disegno della pianta del teatro SS. Giovanni e Paolo',
description: `
Tommaso Bezzi: Disegno della pianta del teatro di SS. Giovanni e Paolo di Venezia, 1691-1693, Sir John Soane's Museum, Londra.
`
}
},
{
label: 'Boccascena / Proscenio',
@@ -127,6 +135,7 @@ export const config = {
},
{
label: 'Spazi tecnici',
color: 'rgb(42, 139, 75)',
children: [
{
label: 'Spazio tecnico superiore',
@@ -140,16 +149,17 @@ export const config = {
label: 'Ballatoio',
model: 'models/ssgp/Teatro_SSGP_Ballatoio.glb',
},
],
},
{
label: 'Spazio tecnico inferiore',
model: 'models/ssgp/Teatro_SSGP_Spazio_tecnico_inf.glb',
},
]
},
]
},
{
label: 'Orchestra',
color: 'rgb(195, 153, 235)',
children: [
{
label: 'Fossa orchestra',
@@ -157,7 +167,8 @@ export const config = {
},
]
}
],
]
},
pano: `pano/gradient.jpg`,
}
],

View File

@@ -1,26 +1,188 @@
:root {
--toggle-background-color-on: #6da0ff;
--toggle-background-color-off: darkgray;
--toggle-width: 32px;
--toggle-height: 15px;
--toggle-gutter: 2px;
--toggle-radius: 50%;
--toggle-control-size: 40px;
--toggle-control-color: white;
--toggle-control-speed: .15s;
--toggle-control-ease: ease-in;
/** Don't change calculated values! **/
--toggle-radius: calc(var(--toggle-height) / 2);
--toggle-control-size: calc(var(--toggle-height) - (var(--toggle-gutter) * 2));
}
body {
height: 100vh;
}
.c-hand {
cursor: pointer;
}
input[type="checkbox"] {
cursor: pointer;
}
.c-hand {
cursor: pointer;
}
.w-max-content {
width: max-content;
}
#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');
}
.tab-pane details > summary {
padding-left: 0;
list-style-position: outside;
}
/* Tooltips from https://codepen.io/pure-css/pen/bddggP */
span:after {
text-align: left;
white-space: normal;
}
span:focus {
outline: none;
}
.app-tooltip {
cursor: help;
position: relative;
}
/*== common styles for both parts of app-tooltip tip ==*/
.app-tooltip::before,
.app-tooltip::after {
left: 50%;
opacity: 0;
position: absolute;
z-index: -100;
}
.app-tooltip:hover::before,
.app-tooltip:focus::before,
.app-tooltip:hover::after,
.app-tooltip:focus::after {
opacity: 1;
transform: scale(1) translateY(0);
z-index: 100;
}
/*== pointer tip ==*/
.app-tooltip::before {
border-style: solid;
border-width: 1em 0.75em 0 0.75em;
border-color: #3E474F transparent transparent transparent;
bottom: 100%;
content: "";
margin-left: -0.5em;
transition: all .65s cubic-bezier(.84,-0.18,.31,1.26), opacity .65s .5s;
transform: scale(.6) translateY(-90%);
}
.app-tooltip:hover::before,
.app-tooltip:focus::before {
transition: all .65s cubic-bezier(.84,-0.18,.31,1.26) .2s;
}
/*== speech bubble ==*/
.app-tooltip::after {
background: #3E474F;
border-radius: .25em;
bottom: 180%;
color: #EDEFF0;
content: attr(data-tip);
margin-left: -4.75em;
padding: 1em;
transition: all .65s cubic-bezier(.84,-0.18,.31,1.26) .2s;
transform: scale(.6) translateY(50%);
width: 17.5em;
}
.app-tooltip:hover::after,
.app-tooltip:focus::after {
transition: all .65s cubic-bezier(.84,-0.18,.31,1.26);
}
@media (max-width: 760px) {
.app-tooltip::after {
font-size: .75em;
margin-left: -5em;
width: 10em;
}
}
/**
* Toggle switch styles
* From: https://codepen.io/AriTheElk/pen/YmxYZr
*/
.toggle-control {
display: block;
position: relative;
padding-left: var(--toggle-width);
margin-bottom: 12px;
cursor: pointer;
font-size: 18px;
user-select: none;
color: #fff;
input {
position: absolute;
opacity: 0;
cursor: pointer;
height: 0;
width: 0;
}
input:checked ~ .control {
background-color: var(--toggle-background-color-on);
&:after {
left: calc(var(--toggle-width) - var(--toggle-control-size) - var(--toggle-gutter));
}
}
.control {
position: absolute;
top: 25%;
left: 0;
height: var(--toggle-height);
width: var(--toggle-width);
border-radius: var(--toggle-radius);
background-color: var(--toggle-background-color-off);
transition: background-color var(--toggle-control-speed) var(--toggle-control-ease);
&:after {
content: "";
position: absolute;
left: var(--toggle-gutter);
top: var(--toggle-gutter);
width: var(--toggle-control-size);
height: var(--toggle-control-size);
border-radius: var(--toggle-radius);
background: var(--toggle-control-color);
transition: left var(--toggle-control-speed) var(--toggle-control-ease);
}
}
}

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');
});
if (this.enabledValue) {
// AO should be turned off if clipping is enabled
toggleAmbientOcclusion(false);
trigger.className += ' border border-2 border-white';
}
if (!this.enabledValue) {
resetClipping();
trigger.className = trigger.className.replace(/ border.*$/g, '');
toggleAmbientOcclusion(AppState.ambientOcclusion);
}
AppState.clipping.enabled = this.enabledValue;
}
}

View File

@@ -0,0 +1,252 @@
// 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
*/
async toggleMenu() {
ATON.UI.setSidePanelRight();
ATON.UI.showSidePanel({header: 'Menu'});
this.#buildMenuPanel(ATON.UI.elSidePanel);
this.#buildLayersMenu(AppState.treeNodes, this.layersTarget);
this.#buildOntologyMenu(await traverseOntology(ontologyJsonPath), this.ontologyTarget);
}
/**
* @param {Event} event
*/
toggleNode(event) {
console.debug(AppState.treeNodes);
/**
* The node's id
* @type {string}
*/
const id = event?.params.node;
const status = event?.target?.checked;
const node = AppState.normalizedNodes.find(n => n.id === id);
/**
* @type {HTMLElement|null}
*/
const eye = event.target.parentElement.querySelector('i');
if (eye) {
eye.classList.toggle('bi-eye');
eye.classList.toggle('bi-eye-slash');
}
if (node.children.length > 0) {
this.#toggleGroup(node, status);
this.#syncGroupCheckboxes(node, status, this.layersTarget);
} else {
ATON.getSceneNode(id).toggle(status);
node.active = status;
}
}
/**
* Recursively toggle children in a nodes group
* @param {Object} groupNode
* @param {Boolean} status
*/
#toggleGroup(groupNode, status) {
for (const child of groupNode.children) {
child.active = status;
if (child.model) {
ATON.getSceneNode(child.id).toggle(status);
}
if (child.children.length > 0) {
this.#toggleGroup(child, status);
}
}
}
/**
* Toggles checkboxes in a group based on status
* @param {Object} groupNode
* @param {Boolean} status
* @param {HTMLElement} container
*/
#syncGroupCheckboxes(groupNode, status, container) {
for (const child of groupNode.children) {
const checkbox = container.querySelector(
`[data-menu-node-param="${child.id}"]`
);
if (checkbox) checkbox.checked = status;
if (child.children.length > 0) {
this.#syncGroupCheckboxes(child, status, container);
}
}
}
/**
* 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<import("../state.js").NormalizedSceneNode>} tree The normalized scene nodes tree
* @param {HTMLElement} tab Tab content element
*/
#buildLayersMenu(tree, tab) {
const heading = document.createElement('h1');
heading.classList.add('fs-5', 'fw-bold', 'ms-0');
heading.textContent = 'Teatro'; // Hard-coded!!
tab.appendChild(heading);
for (const node of tree) {
tab.appendChild(
node.children.length > 0
? this.#createLayerGroup(node)
: this.#createLayerToggle(node)
);
}
}
/**
* @param {import("../state.js").NormalizedSceneNode} node
* @param {boolean} isGroup
* @returns {HTMLDivElement}
*/
#createLayerToggle(node, isGroup = false) {
// This should be calculated somehow!
const labelIndent = node.depth < 3 ? '1.5rem' : '1rem';
const labelText = isGroup ? '<i class="bi bi-eye"></i>' : node.id;
const toggle = html`
<label class="toggle-control ms-${node.depth} ps-${node.depth} mt-1 mb-1">
<input id="${node.id}" type="checkbox" ${node.active ? 'checked' : ''} role="switch"
data-menu-node-param="${node.id}"
data-action="change->menu#toggleNode">
<span class="control"></span>
<span class="ps-2 fs-6" title="Mostra / nascondi ${isGroup ? 'gruppo' : 'layer'}" style="margin-left: ${labelIndent}">
${labelText}
</span>
</label>
`;
return domParser.parseFromString(toggle, 'text/html').querySelector('label');
}
/**
* @param {import("../state.js").NormalizedSceneNode} node
* @returns {HTMLDetailsElement}
*/
#createLayerGroup(node) {
const { trigger, collapseDiv } = this.#createNodeCollapse(node);
const wrapper = document.createElement('div');
wrapper.classList.add('w-max-content', 'ps-1', 'mb-1');
collapseDiv.appendChild(this.#createLayerToggle(node, true));
for (const child of node.children) {
collapseDiv.appendChild(
child.children.length > 0
? this.#createLayerGroup(child)
: this.#createLayerToggle(child)
);
}
wrapper.appendChild(trigger);
wrapper.appendChild(collapseDiv);
wrapper.classList.add('border-start', 'border-bottom', 'rounded', `ms-${node.depth}`);
return wrapper;
}
/**
*
* @param {import("../state.js").NormalizedSceneNode} node
* @returns {{trigger: HTMLButtonElement, collapseDiv: HTMLDivElement}}
*/
#createNodeCollapse(node) {
const cleanId = node.id.replace(/[\s\/\-]+/g, '');
const trigger = document.createElement('button');
trigger.className = 'btn btn-link p-0 fs-6 fw-bold text-decoration-none text-reset';
trigger.setAttribute('data-bs-toggle', 'collapse');
trigger.setAttribute('data-bs-target', `#group-${cleanId}`);
trigger.setAttribute('data-action', 'menu#toggleChevron');
trigger.innerHTML = html`
<i class="bi bi-chevron-down me-1"></i>${node.id}
`;
// Add color "swatch" only for first level groups
/*
if (node.depth === 2) {
trigger.innerHTML += html`
<div class="d-inline-block border rounded ms-2"
style="background-color: ${node.color}; height: 15px; width:15px">
</div>
`;
}
*/
const collapseDiv = document.createElement('div');
collapseDiv.className = 'collapse';
collapseDiv.id = `group-${cleanId}`;
return {trigger, collapseDiv};
}
/**
*
* @param {Event} event
*/
toggleChevron(event) {
/**
* @type {HTMLButtonElement} collapse
*/
const collapse = event.target;
const icon = collapse.querySelector('i');
icon.classList.toggle('bi-chevron-down');
icon.classList.toggle('bi-chevron-up');
}
/**
* 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,40 @@
import { Controller } from "@hotwired/stimulus";
export default class extends Controller {
static targets = ['modal'];
connect() {
console.log('#modal controller connected');
}
/**
*
* @param {Event} event
*/
showSemanticModal(event) {
const modal = this.modalTarget;
const title = modal.querySelector('.modal-title');
// Clear any existing content first
title.innerHTML = '';
title.innerHTML = event.content?.title;
const body = modal.querySelector('.modal-body');
body.innerHTML = '';
const contentType = event.content?.type;
const content = document.createElement(contentType);
if (contentType === 'img') {
content.src = event.content?.imgSrc;
content.classList.add('img-fluid');
}
body.appendChild(content);
const description = document.createElement('p');
description.textContent = event.content?.description;
description.classList.add('py-3', 'my-2', 'fst-italic');
body.appendChild(description);
bootstrap.Modal.getOrCreateInstance(modal).show();
}
}

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

@@ -2,6 +2,33 @@
* @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

View File

@@ -34,15 +34,19 @@ function init () {
// All assets for this app are stored here
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
AppState.camera = ATON.Nav._camera;
AppState.renderer = ATON._renderer;
AppState.shadows = config.scene.shadows;
AppState.lightDirection = ATON.getMainLightDirection();
AppState.exposure = config.scene.initialExposure;
ATON.Nav.setUserControl(true);
// Avoid semantic occlusion
ATON._bQuerySemOcclusion = false;
}
/**
* @param {Object} marker - The marker object from config
@@ -57,12 +61,12 @@ export function openScene (marker, nodes) {
ATON.setMainPanorama(marker.pano);
// TODO: hardcoded...
AppState.initialRotation = new THREE.Vector3(0, 1.5, 0);
AppState.initialRotation = new THREE.Vector3(...config.scene.initRotation);
ATON.setAutoLP(config.scene.autoLP);
AppState.lightProbe = config.scene.autoLP;
toggleAmbientOcclusion(true);
AppState.ambientOcclusion = true;
toggleAmbientOcclusion(config.scene.ambientOcclusion);
AppState.ambientOcclusion = config.scene.ambientOcclusion;
AppState.root = ATON.getRootScene();
}
@@ -74,10 +78,17 @@ function loadNodes(nodes) {
nodes.forEach(n => {
let node = ATON.createSceneNode(n.label);
node.load(n.model);
node.setRotation(0, 1.5, 0);
node.setRotation(...config.scene.initRotation);
/*
node.setMaterial(new THREE.MeshPhongMaterial({
transparent: false,
color: n.color ?? '#fff',
}));
*/
// Apply any transparency before attaching to scene
if (n.opacity) {
if (n.opacity !== undefined && n.opacity !== null) {
node.setMaterial(new THREE.MeshPhongMaterial({
transparent: true,
opacity: n.opacity,
@@ -85,6 +96,9 @@ function loadNodes(nodes) {
}));
}
// Disable a node for picking (shadows, light probe etc.)
if (n.isInvisible) node.hide();
node.attachToRoot();
if (n.isMain) {
@@ -93,10 +107,45 @@ function loadNodes(nodes) {
AppState.clipping.boundingSphere = node.getBound();
}
AppState.nodes.push({id: n.label, active: true});
if (n.isSemantic) {
createSemanticNode(n.model, n.label);
AppState.semanticNodes.set(n.label, n.content);
//ATON.getSemanticRoot().attach(semNode);
}
AppState.nodes.push({
id: n.label,
active: n.isInvisible ? false: true,
isSemantic: n.isSemantic
});
});
if (!AppState.clipping.boundingSphere) {
console.error("No bounding sphere computed, clipping will fail. Ensure one node has 'isMain: true'.");
}
}
/**
* Creates a semantic annotation from a model
* @param {string} model The model's path to load
* @param {string} id The original scene node ID (3D object)
* @returns {ATON.SceneNode}
*/
function createSemanticNode(model, id) {
// Default/highlight materials for semantic node
let matSemDef = new THREE.MeshStandardMaterial({
color: '#f7e6af',
transparent: true,
opacity: 0.2,
});
let matSemHL = ATON.MatHub.materials.semanticShapeHL;
const semNode = ATON.createSemanticNode(id)
.setCloneOnLoadHit(false)
.load(model)
.setDefaultAndHighlightMaterials(matSemDef, matSemHL)
.attachToRoot();
semNode.setRotation(...config.scene.initRotation);
return semNode;
}

View File

@@ -20,14 +20,21 @@ let AppState = {
// {id: String, active: Boolean}
nodes: [],
/**
* @property {NormalizedSceneNode[]} normalizedNodes
* @type {NormalizedSceneNode[]} normalizedNodes
*/
normalizedNodes: [],
treeNodes: {},
semanticNodes: new Map,
mainNodeId: null,
currentScene: null,
sceneHasAudio: false,
layersMenuBuilt: false,
initialRotation: null,
lightDirection: [],
/**
* @type {Number}
*/
exposure: null,
camera: null,
renderer: null,
ambientOcclusion : true,

283
js/ui.js
View File

@@ -1,283 +0,0 @@
import AppState from "./state.js";
import { changeLightDirection, toggleAmbientOcclusion } from "./utils/environment.js";
import { resetClipping, addClippingPlane } from "./utils/clipping.js";
/**
* @module UI
*/
const domParser = new DOMParser;
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="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="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 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>
`;
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>
`;
/**
*
* @param {String} triggerSelector - Usually, the close modal trigger element(s) selector
*/
export function pauseAudio(triggerSelector) {
// What if more than one audio element is playing?
const audio = document.querySelector('audio');
if (audio) {
document.querySelectorAll(triggerSelector).forEach(el => {
el.addEventListener('click', () => audio.pause());
});
document.querySelector('.modal').addEventListener('blur', () => {
audio.pause();
});
}
}
/**
* Resets the UI state (essentially hides the clipper toolbar if visible...)
* @todo Other elements to reset?? Restore inital lighting conditions and viewpoint...
*/
function reset() {
document.querySelector('#clipper-bar')?.classList.add('d-none');
document.querySelector('#clipper')?.classList.remove('border', 'border-2', 'border-white');
}
/**
*
* @param {HTMLElement} target
* @param {NodeListOf<HTMLButtonElement>} btns
* @param {String} axis - One of 'x', 'y', 'z'
*/
function showClipping(target, btns, axis) {
if (axis) {
addClippingPlane(axis, -1);
target.classList.add('border', 'border-2', 'border-warning');
btns.forEach(btn => {
if (btn.id !== target.id) {
btn.classList.remove('border', 'border-2', 'border-warning');
}
});
}
}
/**
* @todo Get clipping button from state? Review logic!!
* @param {String} triggerSelector
* @param {String} targetSelector The selector for the target toolbar to be displayed
*/
function toggleClipperBar(triggerSelector, targetSelector) {
const trigger = document.querySelector(triggerSelector);
const toolbar = document.querySelector(targetSelector);
const btns = toolbar.querySelectorAll('button');
const clipTargets = {
clipX: {axis: 'x'},
clipY: {axis: 'y'},
clipZ: {axis: 'z'},
};
if (!AppState.clipping.listeners.button) {
trigger.addEventListener(
'click',
() => {
toolbar.classList.toggle('d-none');
const aoCurrentState = AppState.ambientOcclusion;
if (!toolbar.classList.contains('d-none')) {
AppState.clipping.enabled = true;
toggleAmbientOcclusion(false);
btns.forEach(btn => {
btn.classList.remove('border', 'border-2', 'border-warning');
});
trigger.className += ' border border-2 border-white';
toolbar.addEventListener('click', event => {
showClipping(event.target, btns, clipTargets[event.target.id]?.axis);
});
} else {
resetClipping();
let noBorder = trigger.className.replace(/ border.*$/g, '');
trigger.className = noBorder;
toggleAmbientOcclusion(aoCurrentState);
}
}
);
AppState.clipping.listeners.button = true;
}
}
/**
* A left side settings panel
* @param {String} triggerId - The settings button id
*/
function toggleSettingsPanel(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 = 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);
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>
`;
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);
// TODO: move somewhere else...
document.querySelector('#aoSwitch').addEventListener(
'change',
event => {
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;
}
);
});
}
/**
*
* @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
*/
function createLightSlider(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);
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
*/
function toggleContentMenu(triggerId) {
const btn = document.querySelector(`#${triggerId}`);
btn.addEventListener('click', () => {
ATON.UI.setSidePanelRight();
ATON.UI.showSidePanel({header: 'Menu'});
// Append tabs, then tab panes
const tabs = domParser.parseFromString(contentMenuTabs, 'text/html');
ATON.UI.elSidePanel.appendChild(tabs.querySelector('#content-tabs'));
ATON.UI.elSidePanel.appendChild(tabs.querySelector('.tab-content'));
buildLayersMenu(AppState.normalizedNodes, ATON.UI.elSidePanel.querySelector('#layer'));
});
}
/**
* @todo Don't rebuild it every time the side panel is shown...
* @param {Array} nodes The scenes nodes (IDs and status)
* @param {HTMLElement} sidePanel ATON's side panel element
*/
function buildLayersMenu(nodes, sidePanel) {
for(let node of nodes) {
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";
menuItem.appendChild(checkbox);
const label = document.createElement('label');
label.className = "form-check-label";
label.textContent = node.label;
menuItem.appendChild(label);
sidePanel.appendChild(menuItem);
// Will this ever work??
menuItem.addEventListener('change', event => toggleNode(node.label, event.target.checked));
}
/**
* This is terrible...
* @param {String} id
* @param {Boolean} status
*/
const toggleNode = (id, status) => {
ATON.getSceneNode(id).toggle(status);
AppState.normalizedNodes.find(n => n.label === id).active = status;
}
}
/**
* Initialize required components for scene UI
*/
export function initUI() {
toggleSettingsPanel('settings');
toggleContentMenu('menu');
toggleClipperBar('#clipper', '#clipper-bar');
}

38
js/utils/aton.js Normal file
View File

@@ -0,0 +1,38 @@
// Global ATON
import AppState from "../state.js";
/**
* @module AtonUtils
*/
/**
* Initializes required ATON events for interactions
* with semantic nodes
*/
export function initAtonEvents() {
// General hover/leave events handling for all semantic nodes.
ATON.on("SemanticNodeHover", (semid) => {
let node = ATON.getSemanticNode(semid);
if (node) node.highlight();
});
ATON.on("SemanticNodeLeave", (semid) => {
let node = ATON.getSemanticNode(semid);
if (node) node.restoreDefaultMaterial();
});
// Triggers on mouse click / tap events
ATON.on("Tap", (e) => {
let node = ATON.getHoveredSemanticNode();
if (node) {
// Retrieve semantic node from AppState to trigger a modal with its content
const content = AppState.semanticNodes.get(node.nid);
// Triggers a modal to show the content (listened by Stimulus)
const event = new Event('semantic-modal-show');
event.content = content;
document.dispatchEvent(event);
}
});
}

View File

@@ -18,6 +18,9 @@ function createClippingPlaneMesh (boundingSphere) {
new THREE.MeshBasicMaterial({ color: 0xffff00, opacity: 0.05, side: THREE.DoubleSide, transparent: true })
);
mesh.castShadow = false;
mesh.receiveShadow = false;
return mesh;
}

View File

@@ -1,14 +1,17 @@
/** @import { Vector3 } from 'three' */
// Global ATON and THREE
import AppState from "../state.js";
/**
* @module Environment
*/
/**
*
* @param {THREE.Vector3} vector - An object with x,y,z coordinates
* @param {Vector3} vector - An object with x,y,z coordinates
*/
export function changeLightDirection (vector) {
export function changeLightDirection(vector) {
ATON.setMainLightDirection(vector);
}
@@ -16,7 +19,64 @@ export function changeLightDirection (vector) {
*
* @param {Boolean} isEnabled
*/
export function toggleAmbientOcclusion (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 {[number, 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];
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-1');
const input = lightSlider.querySelector('input');
if (input) input.step = step;
return lightSlider;
}
/**
* Slider to change the env exposure level, based on ATON.UI
* @param {String} label - The slider label
* @param {[number, number]} range - The slider's range
* @param {Number} step - The slider's step
*/
export function createExposureSlider(label, range, step = 0.05) {
const currentVal = String(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-1');
let input = exposureSlider.querySelector('input');
if (input) input.step = step;
return exposureSlider;
}

View File

@@ -28,44 +28,49 @@
* @param {Array} flatList
* @param {Number} depth
*/
function traverse(node, flatList, depth = 1) {
function traverseTree(node, flatList, depth = 1, inheritedColor = null) {
if (!node.label) {
console.error("Node missing label:", node);
return;
}
const color = node.color ?? inheritedColor;
const normNode = {
...node,
id: node.id ?? node.label,
isMain: node.isMain ?? false,
active: true,
color: color ?? null,
depth,
children: [],
};
if (node.model) {
normNode.model = node.model;
}
flatList.push({
...normNode,
depth
});
flatList.push(normNode);
if (node.children && Array.isArray(node.children)) {
for(let child of node.children) {
traverse(child, flatList, depth + 1);
for(const child of node.children) {
normNode.children.push(
traverseTree(child, flatList, depth + 1, color)
);
}
}
return normNode;
}
/**
* Create a flat list of nodes from
* the nested structure in config
* @param {Array} nodes
* @returns {NormalizedSceneNode[]} A flat list of nodes
* @returns {{flat: NormalizedSceneNode[], tree: NormalizedSceneNode[]}} A flat list of nodes
**/
export function normalizeNodes (nodes) {
let flatList = [];
const normNode = traverseTree(nodes, flatList);
for (let node of nodes) {
traverse(node, flatList);
}
return flatList;
return {flat: flatList, tree: normNode.children};
}

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

@@ -0,0 +1,18 @@
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';
import ModalController from '../controllers/modal_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);
Stimulus.register("modal", ModalController);
}

View File

@@ -46,6 +46,13 @@
<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>

View File

@@ -2,13 +2,12 @@ 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";
import { initStimulus } from "../../js/utils/stimulus.js";
initStimulus();
AppState.currentScene = 'salvador';
AppState.sceneHasAudio = true;
const marker = config.markers.find(m => m.id === 'salvador');
AppState.normalizedNodes = normalizeNodes(marker.nodes);
AppState.normalizedNodes = normalizeNodes(marker.nodes).flat;
openScene(marker, AppState.normalizedNodes);
initUI();
pauseAudio('[data-bs-dismiss="modal"]');

View File

@@ -46,19 +46,30 @@
<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">
<div id="toolbar" class="aton-toolbar-top w-100">
<body data-bs-theme="light" data-controller="menu modal" data-action="semantic-modal-show@document->modal#showSemanticModal">
<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" id="settings" title="Impostazioni">
<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" id="clipper" title="Attiva / disattiva sezionamento">
<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
@@ -68,20 +79,99 @@
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>
id="clipper-bar"
data-clipper-target="clipper">
<span class="pt-5 pb-2 d-block fw-bold">Sezione</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">
<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">
<details class="w-max-content">
<summary class="fs-5 ms-3 mb-3 mt-3">
<i class="bi bi-lightbulb me-1"></i> Illuminazione
</summary>
<h3 class="fs-6 p-2 ms-4 mb-1 mt-3 border border-1 rounded bg-info-subtle">
Direzione (x, y, z)
</h3>
<div class="border border-1 rounded ms-4" data-sliders-container></div>
<h3 class="fs-6 p-2 ms-4 mb-1 mt-3 border border-1 rounded bg-info-subtle">
Intensità <span class="d-inline app-tooltip" data-tip="Le modifiche di intensità hanno effetto solo se Ambient Occlusion non è attivo" tabindex="1"><i class="bi bi-info-circle ms-1"></i></span>
</h3>
<div class="ms-4 border border-1 rounded" data-slider-exposure-container></div>
</details>
<details>
<summary class="fs-5 ms-3 mb-3 mt-3">
<i class="bi bi-brightness-high me-1"></i> Ambiente
</summary>
<div class="form-check form-switch ms-4 mt-4">
<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 <span class="d-inline app-tooltip" data-tip="Attivare le ombre può rallentare l'applicazione" tabindex="2"><i class="bi bi-info-circle ms-1"></i></span>
</label>
</div>
</details>
</div>
</template>
<!-- TODO CSS-only popover -->
<div class="card d-none" id="shadows-popover" popover>Disabilitare le ombre può migliorare le prestazioni</div>
<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-2 ms-2 overflow-y-auto">
<div class="tab-pane active ps-3 pt-0 mt-4 ms-0" 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 Make it a template -->
<div class="modal" id="semanticModal" tabindex="-1" data-modal-target="modal">
<div class="modal-dialog modal-dialog-centered modal-dialog-scrollable modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title"></h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Chiudi"></button>
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Chiudi</button>
</div>
</div>
</div>
</div>
<div class="aton-poweredby" >
<a href="https://aton.ispc.cnr.it/site/" target="_blank"><img src="/res/aton-logo.png"></a>

View File

@@ -2,15 +2,19 @@ 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";
import { initStimulus } from "../../js/utils/stimulus.js";
import { initAtonEvents } from "../../js/utils/aton.js";
initStimulus();
AppState.currentScene = 'ssgp';
const marker = config.markers.find(m => m.id === 'ssgp');
AppState.normalizedNodes = normalizeNodes(marker.nodes);
const {flat, tree} = normalizeNodes(marker.nodes);
AppState.normalizedNodes = flat;
AppState.treeNodes = tree;
// TODO: add Map object for lookup optimization
openScene(marker, AppState.normalizedNodes);
initUI();
// DEBUG
console.debug(await loadOntology('ontology.json'));
initAtonEvents();