Compare commits
24 Commits
87245233b7
...
ontology
| Author | SHA1 | Date | |
|---|---|---|---|
| 28a34905c7 | |||
| 8aa3f7cde8 | |||
| 0c3a049d12 | |||
| 3305e74776 | |||
| 8ce7492f4e | |||
| 03b9b9157b | |||
| eb7efbf616 | |||
| b80504aec4 | |||
| db2fc2d066 | |||
| 491371e495 | |||
| fc4dd8af62 | |||
| c837a6e55f | |||
| 4dccd58bf3 | |||
| 9a0d769e0f | |||
| 55f10e62d9 | |||
| b90d1614e9 | |||
| f5f105e786 | |||
| aa9a6f56b6 | |||
| 106841f6ef | |||
| 9ae4b0bb8f | |||
| 6777037d3d | |||
| 800edc41b9 | |||
| 5b1f828abd | |||
| 11acecd33d |
BIN
assets/img/rilievo_ssgp_bezzi.webp
Normal file
BIN
assets/img/rilievo_ssgp_bezzi.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 136 KiB |
BIN
assets/pano/hemi-green.jpg
Normal file
BIN
assets/pano/hemi-green.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.7 KiB |
38
config.js
38
config.js
@@ -16,16 +16,13 @@ const theater2Popup = `
|
|||||||
|
|
||||||
export const config = {
|
export const config = {
|
||||||
scene : {
|
scene : {
|
||||||
initialExposure: 0.85,
|
initialExposure: 1.2,
|
||||||
autoLP: false,
|
autoLP: false,
|
||||||
shadows: false,
|
shadows: false,
|
||||||
initLightDir: [0.2,-0.3,-0.7],
|
initLightDir: [-0.3,-0.7,0.1],
|
||||||
initRotation: [0, 1.5, 0],
|
initRotation: [0, 190, 0],
|
||||||
ambientOcclusion: false,
|
ambientOcclusion: false,
|
||||||
},
|
},
|
||||||
menu : {
|
|
||||||
//audioBtn1
|
|
||||||
},
|
|
||||||
markers : [
|
markers : [
|
||||||
{
|
{
|
||||||
id : "salvador",
|
id : "salvador",
|
||||||
@@ -48,16 +45,7 @@ export const config = {
|
|||||||
coords: [45.4401, 12.3408],
|
coords: [45.4401, 12.3408],
|
||||||
nodes: {
|
nodes: {
|
||||||
label: 'Teatro',
|
label: 'Teatro',
|
||||||
model: 'models/ssgp/Teatro_SSGP_Full_ConSottrazioni.glb',
|
|
||||||
opacity: 0.0,
|
|
||||||
isInvisible: true,
|
|
||||||
children: [
|
children: [
|
||||||
/*
|
|
||||||
{
|
|
||||||
label: 'Struttura complessiva',
|
|
||||||
model: 'models/ssgp/Teatro_SSGP_Full_ConSottrazioni.glb',
|
|
||||||
},
|
|
||||||
*/
|
|
||||||
{
|
{
|
||||||
label: 'Involucro',
|
label: 'Involucro',
|
||||||
model: 'models/ssgp/Teatro_SSGP_Layer_Struttura_parete_di_fondo.glb',
|
model: 'models/ssgp/Teatro_SSGP_Layer_Struttura_parete_di_fondo.glb',
|
||||||
@@ -114,6 +102,16 @@ export const config = {
|
|||||||
{
|
{
|
||||||
label: 'Palcoscenico',
|
label: 'Palcoscenico',
|
||||||
model: 'models/ssgp/Teatro_SSGP_Palcoscenico.glb',
|
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',
|
label: 'Boccascena / Proscenio',
|
||||||
@@ -145,17 +143,17 @@ export const config = {
|
|||||||
label: 'Ballatoio',
|
label: 'Ballatoio',
|
||||||
model: 'models/ssgp/Teatro_SSGP_Ballatoio.glb',
|
model: 'models/ssgp/Teatro_SSGP_Ballatoio.glb',
|
||||||
},
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: 'Spazio tecnico inferiore',
|
label: 'Spazio tecnico inferiore',
|
||||||
model: 'models/ssgp/Teatro_SSGP_Spazio_tecnico_inf.glb',
|
model: 'models/ssgp/Teatro_SSGP_Spazio_tecnico_inf.glb',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: 'Orchestra',
|
label: 'Orchestra',
|
||||||
color: 'rgb(187, 120, 218)',
|
color: 'rgb(195, 153, 235)',
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
label: 'Fossa orchestra',
|
label: 'Fossa orchestra',
|
||||||
@@ -165,11 +163,11 @@ export const config = {
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
pano: `pano/gradient.jpg`,
|
pano: `pano/hemi-green.jpg`,
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
map : {
|
map : {
|
||||||
center: [45.30833, 12.240278],
|
center: [45.42833, 12.340278],
|
||||||
initialZoom : 12,
|
initialZoom : 12,
|
||||||
minZoom : 6,
|
minZoom : 6,
|
||||||
maxZoom : 18
|
maxZoom : 18
|
||||||
|
|||||||
74
css/app.css
74
css/app.css
@@ -1,3 +1,20 @@
|
|||||||
|
: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 {
|
body {
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
}
|
}
|
||||||
@@ -36,6 +53,10 @@ input[type="checkbox"] {
|
|||||||
background-image: url('/a/scaenae/assets/icons/section_z.png');
|
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 */
|
/* Tooltips from https://codepen.io/pure-css/pen/bddggP */
|
||||||
span:after {
|
span:after {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
@@ -112,3 +133,56 @@ span:focus {
|
|||||||
width: 10em;
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
<script type="text/javascript" src="./vendor/leaflet/dist/leaflet-src.js"></script>
|
<script type="text/javascript" src="./vendor/leaflet/dist/leaflet-src.js"></script>
|
||||||
|
|
||||||
<!-- Main js entry -->
|
<!-- Main js entry -->
|
||||||
<script type="module" src="js/main.js"></script>
|
<script type="module" src="src/main.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body data-bs-theme="light">
|
<body data-bs-theme="light">
|
||||||
|
|||||||
@@ -1,146 +0,0 @@
|
|||||||
// 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.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;
|
|
||||||
const node = AppState.normalizedNodes.find(n => n.id === id);
|
|
||||||
|
|
||||||
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) {
|
|
||||||
if (child.model) {
|
|
||||||
ATON.getSceneNode(child.id).toggle(status);
|
|
||||||
child.active = status;
|
|
||||||
}
|
|
||||||
if (child.children.length > 0) {
|
|
||||||
this.#toggleGroup(child, status);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#syncGroupCheckboxes(groupNode, status, container) {
|
|
||||||
for (const child of groupNode.children) {
|
|
||||||
const checkbox = container.querySelector(
|
|
||||||
`[data-menu-node-param="${child.id}"]`
|
|
||||||
);
|
|
||||||
|
|
||||||
console.debug(checkbox, 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>} 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
/**
|
|
||||||
* @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;
|
|
||||||
}
|
|
||||||
2922
scenes/BaroqueTheatreOntology_BT_EN_v1_7_UI_by_domain_v3.json
Normal file
2922
scenes/BaroqueTheatreOntology_BT_EN_v1_7_UI_by_domain_v3.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,8 @@
|
|||||||
import { openScene } from "../../js/scene.js";
|
import { openScene } from "../../src/scene.js";
|
||||||
import { config } from "../../config.js";
|
import { config } from "../../config.js";
|
||||||
import AppState from "../../js/state.js";
|
import AppState from "../../src/state.js";
|
||||||
import { normalizeNodes } from "../../js/utils/nodeUtils.js";
|
import { normalizeNodes } from "../../src/utils/nodeUtils.js";
|
||||||
import { initStimulus } from "../../js/utils/stimulus.js";
|
import { initStimulus } from "../../src/utils/stimulus.js";
|
||||||
|
|
||||||
initStimulus();
|
initStimulus();
|
||||||
|
|
||||||
@@ -10,6 +10,4 @@ AppState.currentScene = 'salvador';
|
|||||||
const marker = config.markers.find(m => m.id === 'salvador');
|
const marker = config.markers.find(m => m.id === 'salvador');
|
||||||
AppState.normalizedNodes = normalizeNodes(marker.nodes).flat;
|
AppState.normalizedNodes = normalizeNodes(marker.nodes).flat;
|
||||||
|
|
||||||
console.debug(AppState.normalizedNodes);
|
|
||||||
|
|
||||||
openScene(marker, AppState.normalizedNodes);
|
openScene(marker, AppState.normalizedNodes);
|
||||||
@@ -58,30 +58,36 @@
|
|||||||
<script type="module" src="./index.js"></script>
|
<script type="module" src="./index.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body data-bs-theme="light" data-controller="menu">
|
<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"
|
<div id="toolbar" class="aton-toolbar-top w-100"
|
||||||
data-controller="toolbar clipper" data-clipper-enabled-value="false">
|
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">
|
<div class="bg-dark-subtle position-absolute opacity-50 mt-1 ms-1 rounded">
|
||||||
|
<a class="btn aton-btn fs-5 p-1 text-white" href="/a/scaenae" id="back" title="Torna alla mappa">
|
||||||
<i class="bi bi-map-fill"></i>
|
<i class="bi bi-map-fill"></i>
|
||||||
</a>
|
</a>
|
||||||
<a class="btn aton-btn fs-5" title="Impostazioni" data-toolbar-target="settings"
|
<a class="btn aton-btn fs-5 p-1 text-white" title="Impostazioni" data-toolbar-target="settings"
|
||||||
data-action="toolbar#toggleSettings">
|
data-action="toolbar#toggleSettings">
|
||||||
<i class="bi bi-gear-fill"></i>
|
<i class="bi bi-gear-fill"></i>
|
||||||
</a>
|
</a>
|
||||||
<a class="btn aton-btn fs-5" title="Attiva / disattiva sezionamento"
|
<a class="btn aton-btn fs-5 p-1 text-white" title="Attiva / disattiva sezionamento"
|
||||||
data-clipper-target="trigger" data-action="clipper#toggleClipper">
|
data-clipper-target="trigger" data-action="clipper#toggleClipper">
|
||||||
<i class="bi bi-scissors"></i>
|
<i class="bi bi-scissors"></i>
|
||||||
</a>
|
</a>
|
||||||
|
<a class="btn aton-btn fs-5 p-1 text-white" title="Attiva schermo intero" data-toolbar-target="fullscreen"
|
||||||
|
data-action="toolbar#toggleFullscreen">
|
||||||
|
<i class="bi bi-fullscreen"></i>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
<div class="d-none w-25
|
<div class="d-none w-25
|
||||||
position-absolute
|
position-absolute
|
||||||
top-0 start-50
|
top-0 start-50
|
||||||
translate-middle bg-light
|
translate-middle bg-light
|
||||||
px-4 pt-2 pb-2 bg-opacity-50
|
px-4 pt-2 pb-2 bg-opacity-75
|
||||||
rounded-bottom-3
|
rounded-bottom-3
|
||||||
mt-4 text-dark text-center"
|
mt-4 text-dark text-center"
|
||||||
id="clipper-bar"
|
id="clipper-bar"
|
||||||
data-clipper-target="clipper">
|
data-clipper-target="clipper">
|
||||||
<span class="pt-5 pb-2 d-block fw-bold">Sezionamento</span>
|
<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"
|
<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>
|
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"
|
<button class="btn aton-btn d-inline px-4 py-4 me-5" id="clipY"
|
||||||
@@ -89,7 +95,7 @@
|
|||||||
<button class="btn aton-btn d-inline px-4 py-4" id="clipZ"
|
<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>
|
data-clipper-target="axis" data-clipper-axis-param="z" data-action="clipper#clip" title="Sezione Z"></button>
|
||||||
</div>
|
</div>
|
||||||
<a class="btn aton-btn fs-5 float-end" id="menu" title="Menu"
|
<a class="btn aton-btn fs-5 float-end p-1 mt-1 text-white" id="menu" title="Menu"
|
||||||
data-menu-target="trigger" data-action="menu#toggleMenu">
|
data-menu-target="trigger" data-action="menu#toggleMenu">
|
||||||
<i class="bi bi-list"></i>
|
<i class="bi bi-list"></i>
|
||||||
</a>
|
</a>
|
||||||
@@ -146,8 +152,8 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<!-- Tab panes -->
|
<!-- Tab panes -->
|
||||||
<div class="tab-content ps-4 ms-3 overflow-y-auto">
|
<div class="tab-content ps-2 ms-2 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 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">
|
<div class="tab-pane pt-3" data-menu-target="ontology" id="content" role="tabpanel" aria-labelledby="media-tab" tabindex="0">
|
||||||
<!-- Temporary -->
|
<!-- Temporary -->
|
||||||
<ul class="list-group me-4 ms-0">
|
<ul class="list-group me-4 ms-0">
|
||||||
@@ -157,8 +163,21 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- TODO CSS-only popover -->
|
<!-- TODO Make it a template -->
|
||||||
<div class="card d-none" id="shadows-popover" popover>Disabilitare le ombre può migliorare le prestazioni</div>
|
<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" >
|
<div class="aton-poweredby" >
|
||||||
<a href="https://aton.ispc.cnr.it/site/" target="_blank"><img src="/res/aton-logo.png"></a>
|
<a href="https://aton.ispc.cnr.it/site/" target="_blank"><img src="/res/aton-logo.png"></a>
|
||||||
|
|||||||
@@ -1,13 +1,20 @@
|
|||||||
import { openScene } from "../../js/scene.js";
|
import { openScene } from "../../src/scene.js";
|
||||||
import { config } from "../../config.js";
|
import { config } from "../../config.js";
|
||||||
import AppState from "../../js/state.js";
|
import AppState from "../../src/state.js";
|
||||||
import { normalizeNodes } from "../../js/utils/nodeUtils.js";
|
import { normalizeNodes } from "../../src/utils/nodeUtils.js";
|
||||||
import { initStimulus } from "../../js/utils/stimulus.js";
|
import { initStimulus } from "../../src/utils/stimulus.js";
|
||||||
|
import { initAtonEvents } from "../../src/utils/aton.js";
|
||||||
|
|
||||||
initStimulus();
|
initStimulus();
|
||||||
|
|
||||||
AppState.currentScene = 'ssgp';
|
AppState.currentScene = 'ssgp';
|
||||||
const marker = config.markers.find(m => m.id === 'ssgp');
|
const marker = config.markers.find(m => m.id === 'ssgp');
|
||||||
AppState.normalizedNodes = normalizeNodes(marker.nodes).flat;
|
const {flat, tree} = normalizeNodes(marker.nodes);
|
||||||
|
AppState.normalizedNodes = flat;
|
||||||
|
AppState.treeNodes = tree;
|
||||||
|
|
||||||
|
// TODO: add Map object for lookup optimization
|
||||||
|
|
||||||
openScene(marker, AppState.normalizedNodes);
|
openScene(marker, AppState.normalizedNodes);
|
||||||
|
|
||||||
|
initAtonEvents();
|
||||||
|
|||||||
@@ -56,16 +56,16 @@ export default class extends Controller {
|
|||||||
btn.classList.remove('border', 'border-2', 'border-warning');
|
btn.classList.remove('border', 'border-2', 'border-warning');
|
||||||
});
|
});
|
||||||
|
|
||||||
// AO should be turned off if clipping is enabled
|
|
||||||
toggleAmbientOcclusion(!this.enabledValue);
|
|
||||||
|
|
||||||
if (this.enabledValue) {
|
if (this.enabledValue) {
|
||||||
|
// AO should be turned off if clipping is enabled
|
||||||
|
toggleAmbientOcclusion(false);
|
||||||
trigger.className += ' border border-2 border-white';
|
trigger.className += ' border border-2 border-white';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.enabledValue) {
|
if (!this.enabledValue) {
|
||||||
resetClipping();
|
resetClipping();
|
||||||
trigger.className = trigger.className.replace(/ border.*$/g, '');
|
trigger.className = trigger.className.replace(/ border.*$/g, '');
|
||||||
|
toggleAmbientOcclusion(AppState.ambientOcclusion);
|
||||||
}
|
}
|
||||||
|
|
||||||
AppState.clipping.enabled = this.enabledValue;
|
AppState.clipping.enabled = this.enabledValue;
|
||||||
254
src/controllers/menu_controller.js
Normal file
254
src/controllers/menu_controller.js
Normal file
@@ -0,0 +1,254 @@
|
|||||||
|
// 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 = '/a/scaenae/scenes/BaroqueTheatreOntology_BT_EN_v1_7_UI_by_domain_v3.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) {
|
||||||
|
const mainNode = tab.querySelector('#ontology-list');
|
||||||
|
mainNode.innerHTML = html`
|
||||||
|
<span class="fs-5 fw-bold">${ontology.ontology}</span>
|
||||||
|
`;
|
||||||
|
mainNode.classList.add('pb-3');
|
||||||
|
|
||||||
|
let domainList = document.createElement('div');
|
||||||
|
|
||||||
|
for (let domain of ontology.domains) {
|
||||||
|
const domainItem = document.createElement('div');
|
||||||
|
domainItem.className = 'border-start border-bottom rounded';
|
||||||
|
domainItem.textContent = domain.label;
|
||||||
|
// Indentation...
|
||||||
|
domainItem.classList.add(`ms-${domain.depth}`, `ps-${domain.depth}`, 'py-2');
|
||||||
|
|
||||||
|
if (domain.depth === 1) domainItem.classList.add('fw-bold');
|
||||||
|
|
||||||
|
domainList.appendChild(domainItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
mainNode.appendChild(domainList);
|
||||||
|
}
|
||||||
|
}
|
||||||
41
src/controllers/modal_controller.js
Normal file
41
src/controllers/modal_controller.js
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
|
||||||
|
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.alt = event.content?.description.trim();
|
||||||
|
content.classList.add('img-fluid');
|
||||||
|
}
|
||||||
|
|
||||||
|
body.appendChild(content);
|
||||||
|
|
||||||
|
const description = document.createElement('p');
|
||||||
|
description.textContent = event.content?.description.trim();
|
||||||
|
description.classList.add('py-3', 'my-0', 'fst-italic');
|
||||||
|
|
||||||
|
body.appendChild(description);
|
||||||
|
|
||||||
|
bootstrap.Modal.getOrCreateInstance(modal).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,7 +9,7 @@ const panelHeader = html`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export default class extends Controller {
|
export default class extends Controller {
|
||||||
static targets = ['settings'];
|
static targets = ['settings', 'fullscreen'];
|
||||||
|
|
||||||
connect() {
|
connect() {
|
||||||
console.log('#toolbar controller connected');
|
console.log('#toolbar controller connected');
|
||||||
@@ -23,6 +23,24 @@ export default class extends Controller {
|
|||||||
ATON.UI.showSidePanel({header: panelHeader});
|
ATON.UI.showSidePanel({header: panelHeader});
|
||||||
this.#buildSettingsPanel(ATON.UI.elSidePanel);
|
this.#buildSettingsPanel(ATON.UI.elSidePanel);
|
||||||
}
|
}
|
||||||
|
toggleFullscreen() {
|
||||||
|
/**
|
||||||
|
* @type {HTMLAnchorElement}
|
||||||
|
*/
|
||||||
|
const target = this.fullscreenTarget;
|
||||||
|
const icon = target.querySelector('i');
|
||||||
|
if (!document.fullscreenElement) {
|
||||||
|
document.body.requestFullscreen();
|
||||||
|
icon.classList.remove('bi-fullscreen');
|
||||||
|
icon.classList.add('bi-fullscreen-exit');
|
||||||
|
target.title = 'Esci da schermo intero';
|
||||||
|
} else {
|
||||||
|
document.exitFullscreen();
|
||||||
|
icon.classList.remove('bi-fullscreen-exit');
|
||||||
|
icon.classList.add('bi-fullscreen');
|
||||||
|
target.title = 'Attiva schermo intero';
|
||||||
|
}
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Clone a <template> by id
|
* Clone a <template> by id
|
||||||
* @param {String} id
|
* @param {String} id
|
||||||
69
src/ontology.js
Normal file
69
src/ontology.js
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
/**
|
||||||
|
* @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 modules = ontology.modules;
|
||||||
|
|
||||||
|
let tree = [];
|
||||||
|
|
||||||
|
for (const module of modules) {
|
||||||
|
if (module.id === 'Architecture') {
|
||||||
|
console.debug(module.classTrees);
|
||||||
|
for (const classTree of module.classTrees) {
|
||||||
|
traverseClasses(classTree, tree);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
ontology: "Architecture",
|
||||||
|
domains: tree
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param {Object} ontologyClass
|
||||||
|
* @param {Array<Object>} tree
|
||||||
|
* @param {Number} depth
|
||||||
|
*/
|
||||||
|
function traverseClasses(ontologyClass, tree, depth = 1) {
|
||||||
|
const ontologyNode = {
|
||||||
|
id: ontologyClass.id,
|
||||||
|
label: ontologyClass.label,
|
||||||
|
depth,
|
||||||
|
children: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
tree.push(ontologyNode);
|
||||||
|
|
||||||
|
if (ontologyClass.children && Array.isArray(ontologyClass.children)) {
|
||||||
|
for(const child of ontologyClass.children) {
|
||||||
|
ontologyNode.children.push(
|
||||||
|
traverseClasses(child, tree, depth + 1)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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;
|
||||||
|
}
|
||||||
@@ -37,7 +37,6 @@ function init () {
|
|||||||
ATON.setMainLightDirection(new THREE.Vector3(...config.scene.initLightDir));
|
ATON.setMainLightDirection(new THREE.Vector3(...config.scene.initLightDir));
|
||||||
ATON.toggleShadows(config.scene.shadows);
|
ATON.toggleShadows(config.scene.shadows);
|
||||||
ATON.setExposure(config.scene.initialExposure);
|
ATON.setExposure(config.scene.initialExposure);
|
||||||
// Open settings side panel when clicking on settings btn
|
|
||||||
|
|
||||||
AppState.camera = ATON.Nav._camera;
|
AppState.camera = ATON.Nav._camera;
|
||||||
AppState.renderer = ATON._renderer;
|
AppState.renderer = ATON._renderer;
|
||||||
@@ -46,6 +45,8 @@ function init () {
|
|||||||
AppState.exposure = config.scene.initialExposure;
|
AppState.exposure = config.scene.initialExposure;
|
||||||
|
|
||||||
ATON.Nav.setUserControl(true);
|
ATON.Nav.setUserControl(true);
|
||||||
|
// Avoid semantic occlusion
|
||||||
|
ATON._bQuerySemOcclusion = false;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* @param {Object} marker - The marker object from config
|
* @param {Object} marker - The marker object from config
|
||||||
@@ -79,10 +80,12 @@ function loadNodes(nodes) {
|
|||||||
node.load(n.model);
|
node.load(n.model);
|
||||||
node.setRotation(...config.scene.initRotation);
|
node.setRotation(...config.scene.initRotation);
|
||||||
|
|
||||||
|
/*
|
||||||
node.setMaterial(new THREE.MeshPhongMaterial({
|
node.setMaterial(new THREE.MeshPhongMaterial({
|
||||||
transparent: false,
|
transparent: false,
|
||||||
color: n.color ?? '#fff',
|
color: n.color ?? '#fff',
|
||||||
}));
|
}));
|
||||||
|
*/
|
||||||
|
|
||||||
// Apply any transparency before attaching to scene
|
// Apply any transparency before attaching to scene
|
||||||
if (n.opacity !== undefined && n.opacity !== null) {
|
if (n.opacity !== undefined && n.opacity !== null) {
|
||||||
@@ -104,10 +107,45 @@ function loadNodes(nodes) {
|
|||||||
AppState.clipping.boundingSphere = node.getBound();
|
AppState.clipping.boundingSphere = node.getBound();
|
||||||
}
|
}
|
||||||
|
|
||||||
AppState.nodes.push({id: n.label, active: n.isInvisible ? false: 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) {
|
if (!AppState.clipping.boundingSphere) {
|
||||||
console.error("No bounding sphere computed, clipping will fail. Ensure one node has 'isMain: true'.");
|
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;
|
||||||
|
}
|
||||||
@@ -23,6 +23,8 @@ let AppState = {
|
|||||||
* @type {NormalizedSceneNode[]} normalizedNodes
|
* @type {NormalizedSceneNode[]} normalizedNodes
|
||||||
*/
|
*/
|
||||||
normalizedNodes: [],
|
normalizedNodes: [],
|
||||||
|
treeNodes: {},
|
||||||
|
semanticNodes: new Map,
|
||||||
mainNodeId: null,
|
mainNodeId: null,
|
||||||
currentScene: null,
|
currentScene: null,
|
||||||
sceneHasAudio: false,
|
sceneHasAudio: false,
|
||||||
38
src/utils/aton.js
Normal file
38
src/utils/aton.js
Normal 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);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -66,11 +66,11 @@ function traverseTree(node, flatList, depth = 1, inheritedColor = null) {
|
|||||||
* Create a flat list of nodes from
|
* Create a flat list of nodes from
|
||||||
* the nested structure in config
|
* the nested structure in config
|
||||||
* @param {Array} nodes
|
* @param {Array} nodes
|
||||||
* @returns {{flat: NormalizedSceneNode[], normNode: object}} A flat list of nodes
|
* @returns {{flat: NormalizedSceneNode[], tree: NormalizedSceneNode[]}} A flat list of nodes
|
||||||
**/
|
**/
|
||||||
export function normalizeNodes (nodes) {
|
export function normalizeNodes (nodes) {
|
||||||
let flatList = [];
|
let flatList = [];
|
||||||
const normNode = traverseTree(nodes, flatList);
|
const normNode = traverseTree(nodes, flatList);
|
||||||
|
|
||||||
return {flat: flatList, normNode};
|
return {flat: flatList, tree: normNode.children};
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ import SettingController from '../controllers/settings_controller.js';
|
|||||||
import ToolbarController from '../controllers/toolbar_controller.js';
|
import ToolbarController from '../controllers/toolbar_controller.js';
|
||||||
import ClipperController from '../controllers/clipper_controller.js';
|
import ClipperController from '../controllers/clipper_controller.js';
|
||||||
import MenuController from '../controllers/menu_controller.js';
|
import MenuController from '../controllers/menu_controller.js';
|
||||||
|
import ModalController from '../controllers/modal_controller.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize Stimulus controllers
|
* Initialize Stimulus controllers
|
||||||
@@ -13,4 +14,5 @@ export function initStimulus() {
|
|||||||
Stimulus.register("toolbar", ToolbarController);
|
Stimulus.register("toolbar", ToolbarController);
|
||||||
Stimulus.register("clipper", ClipperController);
|
Stimulus.register("clipper", ClipperController);
|
||||||
Stimulus.register("menu", MenuController);
|
Stimulus.register("menu", MenuController);
|
||||||
|
Stimulus.register("modal", ModalController);
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user