Compare commits
7 Commits
337bcce0bb
...
stimulus
| Author | SHA1 | Date | |
|---|---|---|---|
| 26733a4b84 | |||
| 380999ff4b | |||
| d0d24c0e6c | |||
| becb0865b9 | |||
| 26bea5daae | |||
| d37e72390d | |||
| 7a6e084a97 |
@@ -32,13 +32,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`,
|
||||
},
|
||||
{
|
||||
|
||||
74
js/controllers/clipper_controller.js
Normal file
74
js/controllers/clipper_controller.js
Normal file
@@ -0,0 +1,74 @@
|
||||
// Global ATON
|
||||
import { Controller } from "@hotwired/stimulus"
|
||||
import AppState from "../state.js";
|
||||
import { addClippingPlane, resetClipping } from "../utils/clipping.js";
|
||||
import { toggleAmbientOcclusion } from "../utils/environment.js";
|
||||
|
||||
/**
|
||||
* Handle events for the clipper toolbar,
|
||||
* related to the clipping module
|
||||
*/
|
||||
export default class extends Controller {
|
||||
static targets = ['trigger', 'clipper', 'axis'];
|
||||
static values = { enabled: Boolean };
|
||||
|
||||
connect() {
|
||||
console.log('#clipper controller connected');
|
||||
}
|
||||
|
||||
clip(event) {
|
||||
/**
|
||||
* @type {string}
|
||||
*/
|
||||
const label = event.params.axis;
|
||||
/**
|
||||
* @type {HTMLButtonElement}
|
||||
*/
|
||||
const target = event.target;
|
||||
/**
|
||||
* @type {NodeListOf<HTMLButtonElement>}
|
||||
*/
|
||||
const axes = this.axisTargets;
|
||||
const classes = ['border', 'border-2', 'border-warning'];
|
||||
|
||||
addClippingPlane(label, -1);
|
||||
target.classList.add(...classes);
|
||||
|
||||
for (const btn of axes) {
|
||||
if (btn.id !== target.id) {
|
||||
btn.classList.remove(...classes);
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Toggle clipper toolbar
|
||||
*/
|
||||
toggleClipper() {
|
||||
/**
|
||||
* @type {HTMLElement}
|
||||
*/
|
||||
const trigger = this.triggerTarget;
|
||||
this.clipperTarget.classList.toggle('d-none');
|
||||
// If the toolbar is shown, clipping is enabled and vice versa
|
||||
this.enabledValue = !this.clipperTarget.classList.contains('d-none');
|
||||
|
||||
this.axisTargets.forEach(btn => {
|
||||
btn.classList.remove('border', 'border-2', 'border-warning');
|
||||
});
|
||||
|
||||
// AO should be turned off if clipping is enabled
|
||||
toggleAmbientOcclusion(!this.enabledValue);
|
||||
|
||||
if (this.enabledValue) {
|
||||
trigger.className += ' border border-2 border-white';
|
||||
}
|
||||
|
||||
if (!this.enabledValue) {
|
||||
resetClipping();
|
||||
trigger.className = trigger.className.replace(/ border.*$/g, '');
|
||||
}
|
||||
|
||||
AppState.clipping.enabled = this.enabledValue;
|
||||
}
|
||||
}
|
||||
|
||||
109
js/controllers/menu_controller.js
Normal file
109
js/controllers/menu_controller.js
Normal file
@@ -0,0 +1,109 @@
|
||||
// Global ATON
|
||||
import { Controller } from "@hotwired/stimulus"
|
||||
import AppState from "../state.js";
|
||||
import { traverseOntology } from "../ontology.js";
|
||||
|
||||
const html = String.raw;
|
||||
const domParser = new DOMParser;
|
||||
// TODO: hard-coded, but follows a convention...
|
||||
const ontologyJsonPath = location.pathname + 'ontology.json';
|
||||
|
||||
export default class extends Controller {
|
||||
static targets = ['trigger', 'layers', 'ontology'];
|
||||
|
||||
connect() {
|
||||
console.log('#menu controller connected');
|
||||
}
|
||||
/**
|
||||
* Open settings panel
|
||||
* @param {Event} event
|
||||
*/
|
||||
async toggleMenu() {
|
||||
ATON.UI.setSidePanelRight();
|
||||
ATON.UI.showSidePanel({header: 'Menu'});
|
||||
this.#buildMenuPanel(ATON.UI.elSidePanel);
|
||||
this.#buildLayersMenu(AppState.normalizedNodes, this.layersTarget);
|
||||
this.#buildOntologyMenu(await traverseOntology(ontologyJsonPath), this.ontologyTarget);
|
||||
}
|
||||
/**
|
||||
* @param {Event} event
|
||||
*/
|
||||
toggleNode(event) {
|
||||
/**
|
||||
* The node's id
|
||||
* @type {string}
|
||||
*/
|
||||
const id = event.params.node;
|
||||
const status = event.target.checked;
|
||||
ATON.getSceneNode(id).toggle(status);
|
||||
AppState.normalizedNodes.find(n => n.id === id).active = status;
|
||||
}
|
||||
/**
|
||||
* Clone a <template> by id
|
||||
* @param {String} id
|
||||
* @returns {DocumentFragment}
|
||||
*/
|
||||
#cloneTemplate(id) {
|
||||
return document.getElementById(id).content.cloneNode(true);
|
||||
}
|
||||
/**
|
||||
* Create the left-side settings panel
|
||||
* content
|
||||
* @param {Element} panel
|
||||
*/
|
||||
#buildMenuPanel(panel) {
|
||||
const fragment = this.#cloneTemplate('tmpl-menu-tabs');
|
||||
|
||||
panel.appendChild(fragment);
|
||||
}
|
||||
/**
|
||||
* @todo Don't rebuild it every time, use caching, return a container with checkboxes
|
||||
* @param {Array} nodes The normalized scene nodes (IDs and status)
|
||||
* @param {HTMLElement} tab Tab content element
|
||||
*/
|
||||
#buildLayersMenu(nodes, tab) {
|
||||
for(let node of nodes) {
|
||||
const menuItem = html`
|
||||
<div class="form-check form-switch ms-${node.depth} ps-${node.depth} mt-2">
|
||||
<input class="form-check-input" type="checkbox" ${node.active ? 'checked' : ''} role="switch"
|
||||
title="Mostra / nascondi layer"
|
||||
data-menu-node-param="${node.id}"
|
||||
data-action="change->menu#toggleNode">
|
||||
<label class="form-check-label">${node.id}</label>
|
||||
</div>
|
||||
`;
|
||||
|
||||
// Awful?
|
||||
tab.appendChild(
|
||||
domParser.parseFromString(menuItem, 'text/html').querySelector('div')
|
||||
);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Temporary implementation to show domains only
|
||||
* @todo Don't rebuild it every time, use caching, return a container
|
||||
* @param {Object} ontology The traversed ontology object (temp)
|
||||
* @param {HTMLElement} tab Tab content element
|
||||
*/
|
||||
#buildOntologyMenu(ontology, tab) {
|
||||
console.debug(ontology);
|
||||
|
||||
const mainNode = tab.querySelector('#ontology-list');
|
||||
mainNode.textContent = ontology.ontology;
|
||||
|
||||
let domainList = html`
|
||||
<ul class="list-group mt-2" id="domains-list"></ul>
|
||||
`;
|
||||
|
||||
// Very fragile and ugly!!
|
||||
mainNode.innerHTML += domainList;
|
||||
domainList = tab.querySelector('#domains-list');
|
||||
|
||||
for(let domain of ontology.domains) {
|
||||
const domainItem = html`
|
||||
<li class="list-group-item">${domain.label}</li>
|
||||
`;
|
||||
domainList.innerHTML += domainItem;
|
||||
}
|
||||
}
|
||||
}
|
||||
28
js/controllers/settings_controller.js
Normal file
28
js/controllers/settings_controller.js
Normal 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;
|
||||
}
|
||||
}
|
||||
42
js/controllers/tabs_controller.js
Normal file
42
js/controllers/tabs_controller.js
Normal 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');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
53
js/controllers/toolbar_controller.js
Normal file
53
js/controllers/toolbar_controller.js
Normal 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);
|
||||
}
|
||||
}
|
||||
@@ -42,6 +42,8 @@ function init () {
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ let AppState = {
|
||||
// {id: String, active: Boolean}
|
||||
nodes: [],
|
||||
/**
|
||||
* @property {NormalizedSceneNode[]} normalizedNodes
|
||||
* @type {NormalizedSceneNode[]} normalizedNodes
|
||||
*/
|
||||
normalizedNodes: [],
|
||||
mainNodeId: null,
|
||||
@@ -28,6 +28,11 @@ let AppState = {
|
||||
sceneHasAudio: false,
|
||||
layersMenuBuilt: false,
|
||||
initialRotation: null,
|
||||
lightDirection: [],
|
||||
/**
|
||||
* @type {Number}
|
||||
*/
|
||||
exposure: null,
|
||||
camera: null,
|
||||
renderer: null,
|
||||
ambientOcclusion : true,
|
||||
|
||||
313
js/ui.js
313
js/ui.js
@@ -1,313 +0,0 @@
|
||||
import AppState from "./state.js";
|
||||
import { changeLightDirection, toggleAmbientOcclusion } from "./utils/environment.js";
|
||||
import { resetClipping, addClippingPlane } from "./utils/clipping.js";
|
||||
import { traverseOntology } from "./ontology.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="#content" type="button" role="tab" aria-controls="media" aria-selected="true">
|
||||
<i class="bi bi-diagram-3 me-1"></i> Contenuti
|
||||
</button>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<!-- Tab panes -->
|
||||
<div class="tab-content ps-4 ms-3 overflow-y-auto">
|
||||
<div class="tab-pane active p-3 ms-2" id="layer" role="tabpanel" aria-labelledby="layer-tab" tabindex="0"></div>
|
||||
<div class="tab-pane pt-3" id="content" 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
|
||||
* @param {String} ontologyJsonPath
|
||||
*/
|
||||
function toggleContentMenu(triggerId, ontologyJsonPath) {
|
||||
const btn = document.querySelector(`#${triggerId}`);
|
||||
|
||||
btn.addEventListener('click', async () => {
|
||||
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'));
|
||||
buildOntologyMenu(await traverseOntology(ontologyJsonPath), ATON.UI.elSidePanel.querySelector('#content'));
|
||||
});
|
||||
}
|
||||
/**
|
||||
* @todo Don't rebuild it every time the side panel is shown...
|
||||
* @param {Array} nodes The normalized scene 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.id;
|
||||
|
||||
menuItem.appendChild(label);
|
||||
|
||||
sidePanel.appendChild(menuItem);
|
||||
// Will this ever work??
|
||||
menuItem.addEventListener('change', event => toggleNode(node.id, 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.id === id).active = status;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @see traverseOntology
|
||||
* @param {Object} ontology The traversed ontology object (temp)
|
||||
* @param {HTMLElement} sidePanel ATON's side panel element
|
||||
*/
|
||||
function buildOntologyMenu(ontology, sidePanel) {
|
||||
const list = document.createElement('ul');
|
||||
list.className = 'list-group';
|
||||
const mainNode = document.createElement('li');
|
||||
mainNode.className = 'list-group-item';
|
||||
mainNode.textContent = ontology.ontology;
|
||||
|
||||
const domainList = document.createElement('ul');
|
||||
domainList.className = 'list-group';
|
||||
|
||||
for(let domain of ontology.domains) {
|
||||
const domainItem = document.createElement('li');
|
||||
domainItem.textContent = domain.label;
|
||||
domainItem.className = 'list-group-item';
|
||||
domainList.appendChild(domainItem);
|
||||
}
|
||||
|
||||
mainNode.appendChild(domainList);
|
||||
list.appendChild(mainNode);
|
||||
sidePanel.appendChild(list);
|
||||
}
|
||||
/**
|
||||
* Initialize required components for scene UI
|
||||
* @param {String} ontologyJsonPath
|
||||
*/
|
||||
export async function initUI(ontologyJsonPath) {
|
||||
toggleSettingsPanel('settings');
|
||||
toggleContentMenu('menu', ontologyJsonPath);
|
||||
toggleClipperBar('#clipper', '#clipper-bar');
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
// Global ATON and THREE
|
||||
|
||||
import AppState from "../state.js";
|
||||
|
||||
/**
|
||||
* @module Environment
|
||||
*/
|
||||
@@ -20,3 +22,60 @@ export function toggleAmbientOcclusion (isEnabled) {
|
||||
ATON.FX.togglePass(ATON.FX.PASS_AO, isEnabled);
|
||||
console.log('Ambient occlusion', isEnabled ? 'ON' : 'OFF');
|
||||
}
|
||||
/**
|
||||
* Slider to change light direction, based on ATON.UI
|
||||
* @param {String} direction - The axis direction, one of 'x','y','z'
|
||||
* @param {String} label - The slider label
|
||||
* @param {Array<Number>} range - The slider's range
|
||||
* @param {Number} step - The slider's step
|
||||
*/
|
||||
export function createLightSlider(direction, label, range, step) {
|
||||
const currentVal = AppState.lightDirection[direction];
|
||||
|
||||
console.debug(currentVal);
|
||||
|
||||
const lightSlider = ATON.UI.createSlider({
|
||||
range,
|
||||
label,
|
||||
value: Number.parseFloat(currentVal).toPrecision(2),
|
||||
oninput: val => {
|
||||
const lightDir = AppState.lightDirection;
|
||||
|
||||
// Keep existing direction values for the other axes
|
||||
lightDir[direction] = Number.parseFloat(val);
|
||||
changeLightDirection(lightDir);
|
||||
AppState.lightDirection = lightDir;
|
||||
},
|
||||
});
|
||||
|
||||
lightSlider.classList.add('ms-4');
|
||||
lightSlider.querySelector('input').step = step;
|
||||
|
||||
return lightSlider;
|
||||
}
|
||||
/**
|
||||
* Slider to change the env exposure level, based on ATON.UI
|
||||
* @param {String} label - The slider label
|
||||
* @param {Array<Number>} range - The slider's range
|
||||
* @param {Number} step - The slider's step
|
||||
*/
|
||||
export function createExposureSlider(label, range, step = 0.05) {
|
||||
const currentVal = AppState.exposure;
|
||||
|
||||
const exposureSlider = ATON.UI.createSlider({
|
||||
range,
|
||||
label,
|
||||
value: Number.parseFloat(currentVal).toPrecision(1),
|
||||
oninput: val => {
|
||||
ATON.setExposure(val);
|
||||
AppState.exposure = val;
|
||||
|
||||
console.debug('Current exposure:', ATON.getExposure());
|
||||
},
|
||||
});
|
||||
|
||||
exposureSlider.classList.add('ms-4');
|
||||
exposureSlider.querySelector('input').step = step;
|
||||
|
||||
return exposureSlider;
|
||||
}
|
||||
16
js/utils/stimulus.js
Normal file
16
js/utils/stimulus.js
Normal file
@@ -0,0 +1,16 @@
|
||||
import { Application } from '@hotwired/stimulus';
|
||||
import SettingController from '../controllers/settings_controller.js';
|
||||
import ToolbarController from '../controllers/toolbar_controller.js';
|
||||
import ClipperController from '../controllers/clipper_controller.js';
|
||||
import MenuController from '../controllers/menu_controller.js';
|
||||
|
||||
/**
|
||||
* Initialize Stimulus controllers
|
||||
*/
|
||||
export function initStimulus() {
|
||||
window.Stimulus = Application.start();
|
||||
Stimulus.register("settings", SettingController);
|
||||
Stimulus.register("toolbar", ToolbarController);
|
||||
Stimulus.register("clipper", ClipperController);
|
||||
Stimulus.register("menu", MenuController);
|
||||
}
|
||||
@@ -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">
|
||||
<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,17 +79,77 @@
|
||||
px-4 pt-2 pb-2 bg-opacity-50
|
||||
rounded-bottom-3
|
||||
mt-4 text-dark text-center"
|
||||
id="clipper-bar">
|
||||
id="clipper-bar"
|
||||
data-clipper-target="clipper">
|
||||
<span class="pt-5 pb-2 d-block fw-bold">Sezionamento</span>
|
||||
<button class="btn aton-btn d-inline px-4 py-4 me-5" id="clipX" 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>
|
||||
<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">
|
||||
<h2 class="fs-5 ms-2 mb-3 mt-3">
|
||||
<i class="bi bi-lightbulb me-1"></i> Illuminazione
|
||||
</h2>
|
||||
<h3 class="fs-6 ms-4 mb-3 mt-3">
|
||||
Direzione (x, y, z)
|
||||
</h3>
|
||||
<div data-sliders-container></div>
|
||||
<h3 class="fs-6 ms-4 mb-3 mt-3">
|
||||
Intensità
|
||||
</h3>
|
||||
<div data-slider-exposure-container></div>
|
||||
<h2 class="fs-5 ms-2 mb-3 mt-3">
|
||||
<i class="bi bi-brightness-high me-1"></i> Ambiente
|
||||
</h2>
|
||||
<div class="form-check form-switch ms-4 mt-2">
|
||||
<input class="form-check-input" type="checkbox" role="switch"
|
||||
data-settings-target="ao" data-action="change->settings#toggleAO">
|
||||
<label class="form-check-label" for="aoSwitch">Ambient occlusion</label>
|
||||
</div>
|
||||
<div class="form-check form-switch ms-4 mt-2">
|
||||
<input class="form-check-input" type="checkbox" role="switch"
|
||||
data-settings-target="shadows" data-action="change->settings#toggleShadows">
|
||||
<label class="form-check-label" for="shadowsSwitch">Ombre</label>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template id="tmpl-menu-tabs">
|
||||
<!-- Nav tabs -->
|
||||
<ul class="nav nav-pills" id="content-tabs" role="tablist">
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link active" id="layer-tab" data-bs-toggle="tab" data-bs-target="#layer" type="button" role="tab" aria-controls="layer" aria-selected="false">
|
||||
<i class="bi bi-boxes me-1"></i> Elementi 3D
|
||||
</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" id="content-tab" data-bs-toggle="tab" data-bs-target="#content" type="button" role="tab" aria-controls="media" aria-selected="true">
|
||||
<i class="bi bi-diagram-3 me-1"></i> Contenuti
|
||||
</button>
|
||||
</li>
|
||||
</ul>
|
||||
<!-- Tab panes -->
|
||||
<div class="tab-content ps-4 ms-3 overflow-y-auto">
|
||||
<div class="tab-pane active p-3 ms-2" data-menu-target="layers" id="layer" role="tabpanel" aria-labelledby="layer-tab" tabindex="0"></div>
|
||||
<div class="tab-pane pt-3" data-menu-target="ontology" id="content" role="tabpanel" aria-labelledby="media-tab" tabindex="0">
|
||||
<!-- Temporary -->
|
||||
<ul class="list-group me-4 ms-0">
|
||||
<li class="list-group-item pt-2 pb-2" id="ontology-list"> </li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- TODO CSS-only popover -->
|
||||
<div class="card d-none" id="shadows-popover" popover>Disabilitare le ombre può migliorare le prestazioni</div>
|
||||
|
||||
@@ -2,11 +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 } from "../../js/ui.js";
|
||||
import { initStimulus } from "../../js/utils/stimulus.js";
|
||||
|
||||
initStimulus();
|
||||
|
||||
AppState.currentScene = 'ssgp';
|
||||
const marker = config.markers.find(m => m.id === 'ssgp');
|
||||
AppState.normalizedNodes = normalizeNodes(marker.nodes);
|
||||
|
||||
openScene(marker, AppState.normalizedNodes);
|
||||
initUI(location.pathname + '/ontology.json');
|
||||
|
||||
Reference in New Issue
Block a user