Compare commits
16 Commits
semantic
...
ontology-m
| Author | SHA1 | Date | |
|---|---|---|---|
| faf9c3acea | |||
| 5a72c91891 | |||
| 8fec26f69f | |||
| 56d3f0a20f | |||
| 6a8acfeb0f | |||
| 60646cebf6 | |||
| 28a34905c7 | |||
| 8aa3f7cde8 | |||
| 0c3a049d12 | |||
| 3305e74776 | |||
| 8ce7492f4e | |||
| 03b9b9157b | |||
| eb7efbf616 | |||
| b80504aec4 | |||
| db2fc2d066 | |||
| 491371e495 |
BIN
assets/img/Rilievo Bezzi Gio e paolo.jpeg
Normal file
BIN
assets/img/Rilievo Bezzi Gio e paolo.jpeg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 224 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 |
25
config.js
25
config.js
@@ -16,16 +16,13 @@ const theater2Popup = `
|
||||
|
||||
export const config = {
|
||||
scene : {
|
||||
initialExposure: 0.95,
|
||||
initialExposure: 1.2,
|
||||
autoLP: false,
|
||||
shadows: false,
|
||||
initLightDir: [0.2,-0.3,-0.7],
|
||||
initRotation: [0, 1.5, 0],
|
||||
initLightDir: [-0.3,-0.7,0.1],
|
||||
initRotation: [0, 190, 0],
|
||||
ambientOcclusion: false,
|
||||
},
|
||||
menu : {
|
||||
//audioBtn1
|
||||
},
|
||||
markers : [
|
||||
{
|
||||
id : "salvador",
|
||||
@@ -49,12 +46,6 @@ export const config = {
|
||||
nodes: {
|
||||
label: 'Teatro',
|
||||
children: [
|
||||
/*
|
||||
{
|
||||
label: 'Struttura complessiva',
|
||||
model: 'models/ssgp/Teatro_SSGP_Full_ConSottrazioni.glb',
|
||||
},
|
||||
*/
|
||||
{
|
||||
label: 'Involucro',
|
||||
model: 'models/ssgp/Teatro_SSGP_Layer_Struttura_parete_di_fondo.glb',
|
||||
@@ -62,11 +53,11 @@ export const config = {
|
||||
opacity: 0.2,
|
||||
},
|
||||
{
|
||||
label: 'Sala / Auditorium',
|
||||
label: 'Sala / cavea',
|
||||
color: 'rgb(212, 96, 75)',
|
||||
children: [
|
||||
{
|
||||
label: 'Peplano / Platea',
|
||||
label: 'Peplano / platea',
|
||||
model: 'models/ssgp/Teatro_SSGP_Platea_peplano.glb',
|
||||
},
|
||||
{
|
||||
@@ -123,7 +114,7 @@ export const config = {
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Boccascena / Proscenio',
|
||||
label: 'Boccascena / proscenio',
|
||||
model: 'models/ssgp/Teatro_SSGP_Boccascena.glb',
|
||||
},
|
||||
{
|
||||
@@ -172,11 +163,11 @@ export const config = {
|
||||
}
|
||||
]
|
||||
},
|
||||
pano: `pano/gradient.jpg`,
|
||||
pano: `pano/hemi-green.jpg`,
|
||||
}
|
||||
],
|
||||
map : {
|
||||
center: [45.30833, 12.240278],
|
||||
center: [45.42833, 12.340278],
|
||||
initialZoom : 12,
|
||||
minZoom : 6,
|
||||
maxZoom : 18
|
||||
|
||||
10
css/app.css
10
css/app.css
@@ -57,6 +57,16 @@ input[type="checkbox"] {
|
||||
padding-left: 0;
|
||||
list-style-position: outside;
|
||||
}
|
||||
#instances li > a {
|
||||
color: #dee2e6;
|
||||
}
|
||||
#instances li > a:hover {
|
||||
color: var(--bs-nav-link-color);
|
||||
text-decoration: underline;
|
||||
}
|
||||
#instance-panel {
|
||||
z-index: 999;
|
||||
}
|
||||
/* Tooltips from https://codepen.io/pure-css/pen/bddggP */
|
||||
span:after {
|
||||
text-align: left;
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
<script type="text/javascript" src="./vendor/leaflet/dist/leaflet-src.js"></script>
|
||||
|
||||
<!-- Main js entry -->
|
||||
<script type="module" src="js/main.js"></script>
|
||||
<script type="module" src="src/main.js"></script>
|
||||
</head>
|
||||
|
||||
<body data-bs-theme="light">
|
||||
|
||||
@@ -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
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 AppState from "../../js/state.js";
|
||||
import { normalizeNodes } from "../../js/utils/nodeUtils.js";
|
||||
import { initStimulus } from "../../js/utils/stimulus.js";
|
||||
import AppState from "../../src/state.js";
|
||||
import { normalizeNodes } from "../../src/utils/nodeUtils.js";
|
||||
import { initStimulus } from "../../src/utils/stimulus.js";
|
||||
|
||||
initStimulus();
|
||||
|
||||
|
||||
@@ -58,25 +58,31 @@
|
||||
<script type="module" src="./index.js"></script>
|
||||
</head>
|
||||
|
||||
<body data-bs-theme="light" data-controller="menu modal" data-action="semantic-modal-show@document->modal#showSemanticModal">
|
||||
<body data-bs-theme="light" data-controller="menu modal node" 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" title="Impostazioni" data-toolbar-target="settings"
|
||||
data-action="toolbar#toggleSettings">
|
||||
<i class="bi bi-gear-fill"></i>
|
||||
</a>
|
||||
<a class="btn aton-btn fs-5" title="Attiva / disattiva sezionamento"
|
||||
data-clipper-target="trigger" data-action="clipper#toggleClipper">
|
||||
<i class="bi bi-scissors"></i>
|
||||
</a>
|
||||
<div class="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>
|
||||
</a>
|
||||
<a class="btn aton-btn fs-5 p-1 text-white" 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 p-1 text-white" title="Attiva / disattiva sezionamento"
|
||||
data-clipper-target="trigger" data-action="clipper#toggleClipper">
|
||||
<i class="bi bi-scissors"></i>
|
||||
</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
|
||||
position-absolute
|
||||
top-0 start-50
|
||||
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
|
||||
mt-4 text-dark text-center"
|
||||
id="clipper-bar"
|
||||
@@ -89,7 +95,7 @@
|
||||
<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 p-1 mt-1 text-white" id="menu" title="Menu"
|
||||
data-menu-target="trigger" data-action="menu#toggleMenu">
|
||||
<i class="bi bi-list"></i>
|
||||
</a>
|
||||
@@ -135,25 +141,20 @@
|
||||
<!-- 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">
|
||||
<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="true">
|
||||
<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 class="nav-link" id="content-tab" data-bs-toggle="tab" data-bs-target="#content" type="button" role="tab" aria-controls="media" aria-selected="false">
|
||||
<i class="bi bi-diagram-3 me-1"></i> Ontologia
|
||||
</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 class="tab-pane pt-3" data-menu-target="ontology" id="content" role="tabpanel" aria-labelledby="media-tab" tabindex="0"></div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -173,6 +174,19 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Instance panel (template it...)-->
|
||||
<div class="position-absolute top-0 start-0 w-25 h-100 container instance-panel d-none bg-dark" data-node-target="panel">
|
||||
<div class="container border-bottom border-secondary-subtle w-100">
|
||||
<h1 class="fs-4 py-2 text-center"></h1>
|
||||
</div>
|
||||
<div class="row h-100">
|
||||
<div class="border-end border-secondary-subtle h-100" id="properties-panel">
|
||||
<ul id="properties-list"></ul>
|
||||
</div>
|
||||
<div class="d-none" id="attachment-panel"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="aton-poweredby" >
|
||||
<a href="https://aton.ispc.cnr.it/site/" target="_blank"><img src="/res/aton-logo.png"></a>
|
||||
</div>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { openScene } from "../../js/scene.js";
|
||||
import { openScene } from "../../src/scene.js";
|
||||
import { config } from "../../config.js";
|
||||
import AppState from "../../js/state.js";
|
||||
import { normalizeNodes } from "../../js/utils/nodeUtils.js";
|
||||
import { initStimulus } from "../../js/utils/stimulus.js";
|
||||
import { initAtonEvents } from "../../js/utils/aton.js";
|
||||
import AppState from "../../src/state.js";
|
||||
import { normalizeNodes } from "../../src/utils/nodeUtils.js";
|
||||
import { initStimulus } from "../../src/utils/stimulus.js";
|
||||
import { initAtonEvents } from "../../src/utils/aton.js";
|
||||
|
||||
initStimulus();
|
||||
|
||||
|
||||
@@ -1,18 +1,20 @@
|
||||
// Global ATON
|
||||
import { Controller } from "@hotwired/stimulus";
|
||||
import AppState from "../state.js";
|
||||
import { traverseOntology } from "../ontology.js";
|
||||
import { loadOntology, traverseOntology, Ontology } from "../ontology.js";
|
||||
|
||||
const html = String.raw;
|
||||
const domParser = new DOMParser;
|
||||
// TODO: hard-coded, but follows a convention...
|
||||
const ontologyJsonPath = location.pathname + 'ontology.json';
|
||||
const ontologyJsonPath = '/a/scaenae/scenes/BaroqueTheatreOntology_BT_v1_8_ATON_by_domain_with_instances.json';
|
||||
|
||||
export default class extends Controller {
|
||||
static targets = ['trigger', 'layers', 'ontology'];
|
||||
|
||||
connect() {
|
||||
async connect() {
|
||||
console.log('#menu controller connected');
|
||||
this.ontologyObject = await loadOntology(ontologyJsonPath);
|
||||
AppState.ontology = this.ontologyObject;
|
||||
}
|
||||
/**
|
||||
* Open settings panel
|
||||
@@ -22,7 +24,7 @@ export default class extends Controller {
|
||||
ATON.UI.showSidePanel({header: 'Menu'});
|
||||
this.#buildMenuPanel(ATON.UI.elSidePanel);
|
||||
this.#buildLayersMenu(AppState.treeNodes, this.layersTarget);
|
||||
this.#buildOntologyMenu(await traverseOntology(ontologyJsonPath), this.ontologyTarget);
|
||||
this.#buildOntologyMenu(await traverseOntology(this.ontologyObject), this.ontologyTarget);
|
||||
}
|
||||
/**
|
||||
* @param {Event} event
|
||||
@@ -225,28 +227,90 @@ export default class extends Controller {
|
||||
/**
|
||||
* 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 {Array<{id: string, tree: Array<Object>}>} domains The traversed ontology domains
|
||||
* @param {HTMLElement} tab Tab content element
|
||||
*/
|
||||
#buildOntologyMenu(ontology, tab) {
|
||||
console.debug(ontology);
|
||||
#buildOntologyMenu(domains, tab) {
|
||||
const ontology = new Ontology;
|
||||
ontology.data = this.ontologyObject;
|
||||
|
||||
const mainNode = tab.querySelector('#ontology-list');
|
||||
mainNode.textContent = ontology.ontology;
|
||||
const tabs = this.#createOntologyTabs().tabs;
|
||||
const content = this.#createOntologyTabs().content;
|
||||
|
||||
let domainList = html`
|
||||
<ul class="list-group mt-2" id="domains-list"></ul>
|
||||
`;
|
||||
tab.appendChild(tabs);
|
||||
tab.appendChild(content);
|
||||
|
||||
// Very fragile and ugly!!
|
||||
mainNode.innerHTML += domainList;
|
||||
domainList = tab.querySelector('#domains-list');
|
||||
const classesTab = content.querySelector('#classes');
|
||||
|
||||
for(let domain of ontology.domains) {
|
||||
const domainItem = html`
|
||||
<li class="list-group-item">${domain.label}</li>
|
||||
for (let domain of domains) {
|
||||
const heading = document.createElement('span');
|
||||
heading.className ="fs-5 fw-bold";
|
||||
heading.textContent = domain.id;
|
||||
classesTab.appendChild(heading);
|
||||
|
||||
let domainList = document.createElement('div');
|
||||
|
||||
// Traverse class trees for each domain
|
||||
for (let item of domain.tree) {
|
||||
const domainItem = document.createElement('div');
|
||||
domainItem.className = 'border-start border-bottom rounded border-1 border-light-subtle';
|
||||
domainItem.textContent = item.label.it ?? item.label.en;
|
||||
// Indentation...
|
||||
domainItem.classList.add(`ms-${item.depth}`, `ps-${item.depth}`, 'py-2');
|
||||
|
||||
if (item.depth === 1) domainItem.classList.add('fw-bold');
|
||||
|
||||
domainList.appendChild(domainItem);
|
||||
}
|
||||
|
||||
classesTab.appendChild(domainList);
|
||||
}
|
||||
|
||||
const instancesTab = content.querySelector('#instances');
|
||||
const navList = instancesTab.querySelector('ul');
|
||||
const sortedItLabels = ontology.getInstanceLabels().map(l => l.it).sort();
|
||||
|
||||
for (let label of sortedItLabels) {
|
||||
const instanceItem = document.createElement('li');
|
||||
instanceItem.className = 'nav-item border-bottom ps-3 py-2 c-hand';
|
||||
instanceItem.innerHTML = html`
|
||||
<a class="nav-link">${label}</a>
|
||||
`;
|
||||
domainList.innerHTML += domainItem;
|
||||
instanceItem.setAttribute('data-node-id-param', label);
|
||||
instanceItem.setAttribute('data-action', 'click->node#open');
|
||||
|
||||
navList.appendChild(instanceItem);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @returns {{tabs: HTMLUListElement, content: HTMLDivElement}}
|
||||
*/
|
||||
#createOntologyTabs() {
|
||||
const tabs = html`
|
||||
<ul class="nav nav-pills" role="tablist" id="ontoTabs">
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link active" id="classes-tab" data-bs-toggle="tab" data-bs-target="#classes" type="button"
|
||||
role="tab" aria-controls="classes-tab-pane" aria-selected="true">Classi</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" id="instances-tab" data-bs-toggle="tab" data-bs-target="#instances" type="button"
|
||||
role="tab" aria-controls="instances-tab-pane" aria-selected="true">Istanze</button>
|
||||
</li>
|
||||
</ul>
|
||||
`;
|
||||
const content = html`
|
||||
<div class="tab-content" id="ontoTabsContent">
|
||||
<div class="tab-pane fade p-3 show active" id="classes" role="tabpanel" aria-labelledby="classes-tab" tabindex="0"></div>
|
||||
<div class="tab-pane fade" id="instances" role="tabpanel" aria-labelledby="instances-tab" tabindex="0">
|
||||
<ul class="nav flex-column"></ul>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
|
||||
return {
|
||||
tabs: domParser.parseFromString(tabs, 'text/html').querySelector('ul'),
|
||||
content: domParser.parseFromString(content, 'text/html').querySelector('div'),
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -24,14 +24,16 @@ export default class extends Controller {
|
||||
const content = document.createElement(contentType);
|
||||
if (contentType === 'img') {
|
||||
content.src = event.content?.imgSrc;
|
||||
content.alt = event.content?.description.trim();
|
||||
content.classList.add('img-fluid');
|
||||
}
|
||||
|
||||
const description = document.createElement('p');
|
||||
description.textContent = event.content?.description;
|
||||
description.classList.add('py-3', 'my-2', 'fst-italic');
|
||||
|
||||
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();
|
||||
130
src/controllers/node_controller.js
Normal file
130
src/controllers/node_controller.js
Normal file
@@ -0,0 +1,130 @@
|
||||
// Global ATON
|
||||
import { Controller } from "@hotwired/stimulus"
|
||||
import AppState from "../state.js";
|
||||
import { createSemanticNode } from "../scene.js";
|
||||
import { Ontology } from "../ontology.js";
|
||||
|
||||
const html = String.raw;
|
||||
const assetsBase = "/a/scaenae/assets";
|
||||
/**
|
||||
* Handle events for the clipper toolbar,
|
||||
* related to the clipping module
|
||||
*/
|
||||
export default class extends Controller {
|
||||
static targets = ['instance', 'node', 'panel'];
|
||||
static values = {
|
||||
id: String,
|
||||
};
|
||||
|
||||
connect() {
|
||||
console.log('#node controller connected');
|
||||
}
|
||||
|
||||
/**
|
||||
* Transition to ATON node (request POV)
|
||||
* if instance is architectural and
|
||||
* open the instance panel
|
||||
*/
|
||||
open({ params: {id} }) {
|
||||
// First disable transparent envelope node, if active
|
||||
ATON.getSceneNode(AppState.mainNodeId).toggle(false);
|
||||
|
||||
const node = ATON.getSceneNode(id);
|
||||
const normNode = AppState.normalizedNodes.find(n => n.id === id);
|
||||
|
||||
if (node) ATON.Nav.requestPOVbyNode(node);
|
||||
if (normNode) this.addSemanticNode(normNode);
|
||||
|
||||
const ontology = new Ontology;
|
||||
ontology.data = AppState.ontology;
|
||||
|
||||
const instance = ontology.getInstanceByLabel(id, 'it');
|
||||
if (instance) this.openInstancePanel(instance);
|
||||
}
|
||||
|
||||
/**
|
||||
* Attaches a semantic node to
|
||||
* an existing scene node using
|
||||
* its 3D model for the semantic shape
|
||||
* @param {import("../state.js").NormalizedSceneNode} normNode
|
||||
*/
|
||||
addSemanticNode(normNode) {
|
||||
// First remove any existing sem node
|
||||
if (AppState.currentSemNodeId) {
|
||||
ATON.SemFactory.deleteSemanticNode(AppState.currentSemNodeId);
|
||||
}
|
||||
createSemanticNode(normNode.model, normNode.label);
|
||||
AppState.currentSemNodeId = normNode.label;
|
||||
}
|
||||
|
||||
/**
|
||||
* Populates an instance panel based on the
|
||||
* instance data and opens it
|
||||
* @param {Object} instance
|
||||
*/
|
||||
openInstancePanel(instance) {
|
||||
const properties = instance.literalProperties;
|
||||
// Populate left side properties column
|
||||
/**
|
||||
* @type {HTMLDivElement}
|
||||
*/
|
||||
const panel = this.panelTarget;
|
||||
const propPanel = panel.querySelector('#properties-panel');
|
||||
const attachmentPanel = panel.querySelector('#attachment-panel');
|
||||
const list = panel.querySelector('#properties-list');
|
||||
list.innerHTML = '';
|
||||
|
||||
panel.querySelector('h1').textContent = instance.label.it;
|
||||
|
||||
let attachment = '';
|
||||
|
||||
// Reset attachment panel if previously activated...
|
||||
attachmentPanel.classList.add('d-none');
|
||||
attachmentPanel.classList.remove('col-7');
|
||||
propPanel.classList.remove('col-5');
|
||||
|
||||
for (const prop of properties) {
|
||||
// Include only DC properties (OK?)
|
||||
const [schema, term] = prop.property.split(':');
|
||||
if (schema === 'dcterms' && Object.keys(prop.propertyLabel).length !== 0) {
|
||||
const item = document.createElement('li');
|
||||
item.className = 'py-2';
|
||||
|
||||
item.innerHTML = html`
|
||||
<span class="text-primary-emphasis d-inline-block">${prop.propertyLabel.it ?? prop.propertyLabel.en}</span>
|
||||
<br />
|
||||
${prop.value.value}
|
||||
`;
|
||||
|
||||
list.appendChild(item);
|
||||
|
||||
// This will spawn bugs!!
|
||||
if (term === 'identifier'
|
||||
&& (prop.value.value.includes('.jpeg') || prop.value.value.includes('.pdf'))) {
|
||||
attachment = prop.value.value;
|
||||
}
|
||||
}
|
||||
|
||||
if (term === 'format') {
|
||||
propPanel.classList.add('col-5');
|
||||
attachmentPanel.classList.add('col-7');
|
||||
attachmentPanel.classList.remove('d-none');
|
||||
|
||||
const attachmentType = prop.value.value;
|
||||
// Idiotic!!
|
||||
const folder = attachmentType.includes('image') ? assetsBase + '/img/' : assetsBase + '/pdf/';
|
||||
const attachmentItem = document.createElement('img');
|
||||
attachmentItem.className = 'img-fluid mt-3';
|
||||
attachmentItem.src = folder + attachment;
|
||||
|
||||
attachmentPanel.appendChild(attachmentItem);
|
||||
}
|
||||
}
|
||||
|
||||
panel.classList.remove('d-none');
|
||||
}
|
||||
|
||||
closeInstancePanel() {
|
||||
|
||||
}
|
||||
}
|
||||
@@ -39,4 +39,3 @@ export default class extends Controller {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ const panelHeader = html`
|
||||
`;
|
||||
|
||||
export default class extends Controller {
|
||||
static targets = ['settings'];
|
||||
static targets = ['settings', 'fullscreen'];
|
||||
|
||||
connect() {
|
||||
console.log('#toolbar controller connected');
|
||||
@@ -23,6 +23,24 @@ export default class extends Controller {
|
||||
ATON.UI.showSidePanel({header: panelHeader});
|
||||
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
|
||||
* @param {String} id
|
||||
124
src/ontology.js
Normal file
124
src/ontology.js
Normal file
@@ -0,0 +1,124 @@
|
||||
/**
|
||||
* @module Ontology
|
||||
*/
|
||||
|
||||
export class Ontology {
|
||||
#data;
|
||||
|
||||
/**
|
||||
* @param {Object} data The parsed ontology object (from JSON)
|
||||
*/
|
||||
set data(data) {
|
||||
this.#data = data;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {String} id
|
||||
*/
|
||||
getInstanceById(id) {
|
||||
return this.#data.instancesById[id];
|
||||
}
|
||||
|
||||
/**
|
||||
* @todo Revise loop approach...
|
||||
* @param {String} label
|
||||
* @param {String} lang The language identifier, either 'en' or 'it'
|
||||
* @returns {Object} The instance object as per onto JSON... (document it!!)
|
||||
*/
|
||||
getInstanceByLabel(label, lang) {
|
||||
if (!['en','it'].includes(lang)) {
|
||||
throw new Error(`Invalid language string provided: '${lang}'`);
|
||||
}
|
||||
|
||||
let instance = {};
|
||||
|
||||
for (const key of Object.keys(this.#data.instancesById)) {
|
||||
const currentInstance = this.#data.instancesById[key];
|
||||
const currentLabel = currentInstance.label[lang];
|
||||
if (currentLabel === label) {
|
||||
instance = currentInstance;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* @returns {Array<{en: string, it: string}>} The bloody array of label objects
|
||||
*/
|
||||
getInstanceLabels() {
|
||||
const data = this.#data;
|
||||
const instances = [];
|
||||
|
||||
for (const key of Object.keys(data.instancesById)) {
|
||||
instances.push(data.instancesById[key]?.label);
|
||||
}
|
||||
|
||||
return instances;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @todo Temporarily returns domains and ontology labels only
|
||||
* Traverse an ontology from its JSON description
|
||||
* @param {Object} ontologyObject The parsed ontology JSON
|
||||
* @returns {Object}
|
||||
*/
|
||||
export async function traverseOntology(ontologyObject) {
|
||||
//const ontology = await loadOntology(jsonPath);
|
||||
const modules = ontologyObject.domains;
|
||||
|
||||
const domains = [];
|
||||
|
||||
for (const module of modules) {
|
||||
let tree = [];
|
||||
for (const classTree of module.classTrees) {
|
||||
traverseClasses(classTree, tree);
|
||||
}
|
||||
domains.push({
|
||||
id: module.label.it ?? module.label.en,
|
||||
tree
|
||||
});
|
||||
}
|
||||
|
||||
return domains;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @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;
|
||||
}
|
||||
@@ -107,12 +107,6 @@ function loadNodes(nodes) {
|
||||
AppState.clipping.boundingSphere = node.getBound();
|
||||
}
|
||||
|
||||
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,
|
||||
@@ -130,14 +124,19 @@ function loadNodes(nodes) {
|
||||
* @param {string} id The original scene node ID (3D object)
|
||||
* @returns {ATON.SceneNode}
|
||||
*/
|
||||
function createSemanticNode(model, id) {
|
||||
export function createSemanticNode(model, id) {
|
||||
// Default/highlight materials for semantic node
|
||||
let matSemDef = new THREE.MeshPhongMaterial({
|
||||
color: '#ecee66',
|
||||
let matSemDef = new THREE.MeshStandardMaterial({
|
||||
color: '#81eb81',
|
||||
transparent: true,
|
||||
opacity: 0.3,
|
||||
opacity: 0.4,
|
||||
});
|
||||
let matSemHL = ATON.MatHub.materials.semanticShapeHL;
|
||||
let matSemHL = new THREE.MeshStandardMaterial({
|
||||
color: '#e9757b',
|
||||
transparent: true,
|
||||
opacity: 0.5,
|
||||
});
|
||||
|
||||
|
||||
const semNode = ATON.createSemanticNode(id)
|
||||
.setCloneOnLoadHit(false)
|
||||
@@ -23,8 +23,17 @@ let AppState = {
|
||||
* @type {NormalizedSceneNode[]} normalizedNodes
|
||||
*/
|
||||
normalizedNodes: [],
|
||||
/**
|
||||
* The loaded ontology object
|
||||
*/
|
||||
ontology: {},
|
||||
treeNodes: {},
|
||||
// Redundant??
|
||||
semanticNodes: new Map,
|
||||
/**
|
||||
* @type {String|null}
|
||||
*/
|
||||
currentSemNodeId: null,
|
||||
mainNodeId: null,
|
||||
currentScene: null,
|
||||
sceneHasAudio: false,
|
||||
@@ -22,6 +22,7 @@ export function initAtonEvents() {
|
||||
});
|
||||
|
||||
// Triggers on mouse click / tap events
|
||||
/*
|
||||
ATON.on("Tap", (e) => {
|
||||
let node = ATON.getHoveredSemanticNode();
|
||||
if (node) {
|
||||
@@ -35,4 +36,5 @@ export function initAtonEvents() {
|
||||
document.dispatchEvent(event);
|
||||
}
|
||||
});
|
||||
*/
|
||||
}
|
||||
@@ -20,6 +20,7 @@
|
||||
* @property {Boolean} isMain
|
||||
* @property {Number|null} opacity
|
||||
* @property {Boolean} active
|
||||
* @property {String} content
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -4,6 +4,7 @@ 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';
|
||||
import NodeController from '../controllers/node_controller.js';
|
||||
|
||||
/**
|
||||
* Initialize Stimulus controllers
|
||||
@@ -15,4 +16,5 @@ export function initStimulus() {
|
||||
Stimulus.register("clipper", ClipperController);
|
||||
Stimulus.register("menu", MenuController);
|
||||
Stimulus.register("modal", ModalController);
|
||||
Stimulus.register("node", NodeController);
|
||||
}
|
||||
59
types/aton.d.ts
vendored
Normal file
59
types/aton.d.ts
vendored
Normal file
@@ -0,0 +1,59 @@
|
||||
declare global {
|
||||
const THREE: typeof import('three');
|
||||
}
|
||||
|
||||
declare namespace ATON {
|
||||
function realize(): void;
|
||||
function setPathCollection(path: string): void;
|
||||
function setMainLightDirection(v: THREE.Vector3): void;
|
||||
function getMainLightDirection(): THREE.Vector3;
|
||||
function toggleShadows(enabled: boolean): void;
|
||||
function setExposure(value: number): void;
|
||||
function setMainPanorama(path: string): void;
|
||||
function setAutoLP(enabled: boolean): void;
|
||||
function enableClipPlanes(): void;
|
||||
function disableClipPlanes(): void;
|
||||
function addClipPlane(normal: THREE.Vector3, point: THREE.Vector3): THREE.Plane;
|
||||
function createSceneNode(id: string): SceneNode;
|
||||
function getSceneNode(id: string): SceneNode;
|
||||
function getRootScene(): THREE.Object3D;
|
||||
|
||||
interface SceneNode {
|
||||
load(path: string): SceneNode;
|
||||
setRotation(x: number, y: number, z: number): SceneNode;
|
||||
setMaterial(material: THREE.Material): SceneNode;
|
||||
attachToRoot(): SceneNode;
|
||||
toggle(visible: boolean): SceneNode;
|
||||
getBound(): THREE.Sphere;
|
||||
add(object: THREE.Object3D): void;
|
||||
remove(object: THREE.Object3D): void;
|
||||
}
|
||||
|
||||
namespace Nav {
|
||||
let _camera: THREE.Camera;
|
||||
function setUserControl(enabled: boolean): void;
|
||||
function requestPOVbyNode(n: ATON.SceneNode, duration: number): void;
|
||||
}
|
||||
|
||||
namespace UI {
|
||||
let elSidePanel: HTMLElement;
|
||||
function init(): void;
|
||||
function addBasicEvents(): void;
|
||||
function setSidePanelLeft(): void;
|
||||
function setSidePanelRight(): void;
|
||||
function showSidePanel(options: { header: string }): void;
|
||||
function createSlider(options: {
|
||||
range: [number, number];
|
||||
label: string;
|
||||
value: number | string;
|
||||
oninput: (val: string) => void;
|
||||
}): HTMLElement;
|
||||
}
|
||||
|
||||
namespace FX {
|
||||
const PASS_AO: number;
|
||||
function togglePass(pass: number, enabled: boolean): void;
|
||||
}
|
||||
|
||||
let _renderer: THREE.WebGLRenderer;
|
||||
}
|
||||
Reference in New Issue
Block a user