Refactor into proper modules
This commit is contained in:
63
js/ui.js
63
js/ui.js
@@ -1,14 +1,14 @@
|
||||
import { config } from "../config.js";
|
||||
import Scene from "./scene.js";
|
||||
import AppState from "./state.js";
|
||||
import { changeLightDirection, toggleAmbientOcclusion } from "./utils/environment.js";
|
||||
import { resetClipping, addClippingPlane } from "./utils/clipping.js";
|
||||
|
||||
/**
|
||||
* @namespace UI
|
||||
* @module UI
|
||||
*/
|
||||
const UI = {};
|
||||
|
||||
UI.domParser = new DOMParser;
|
||||
const domParser = new DOMParser;
|
||||
|
||||
UI.contentMenuTabs = `
|
||||
const contentMenuTabs = `
|
||||
<!-- Nav tabs -->
|
||||
<ul class="nav nav-pills" id="content-tabs" role="tablist">
|
||||
<li class="nav-item" role="presentation">
|
||||
@@ -30,7 +30,7 @@ UI.contentMenuTabs = `
|
||||
</div>
|
||||
`;
|
||||
|
||||
UI.audioExample = `
|
||||
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>
|
||||
@@ -40,7 +40,7 @@ UI.audioExample = `
|
||||
*
|
||||
* @param {String} triggerSelector - Usually, the close modal trigger element(s) selector
|
||||
*/
|
||||
UI.pauseAudio = function(triggerSelector) {
|
||||
export function pauseAudio(triggerSelector) {
|
||||
// What if more than one audio element is playing?
|
||||
const audio = document.querySelector('audio');
|
||||
|
||||
@@ -57,7 +57,7 @@ UI.pauseAudio = function(triggerSelector) {
|
||||
* Resets the UI state (essentially hides the clipper toolbar if visible...)
|
||||
* @todo Other elements to reset?? Restore inital lighting conditions and viewpoint...
|
||||
*/
|
||||
UI.reset = function() {
|
||||
function reset() {
|
||||
document.querySelector('#clipper-bar')?.classList.add('d-none');
|
||||
document.querySelector('#clipper')?.classList.remove('border', 'border-2', 'border-white');
|
||||
}
|
||||
@@ -68,9 +68,9 @@ UI.reset = function() {
|
||||
* @param {NodeListOf<HTMLButtonElement>} btns
|
||||
* @param {String} axis - One of 'x', 'y', 'z'
|
||||
*/
|
||||
UI.showClipping = function(target, btns, axis) {
|
||||
function showClipping(target, btns, axis) {
|
||||
if (axis) {
|
||||
Scene.addClippingPlane(axis, -1);
|
||||
addClippingPlane(axis, -1);
|
||||
target.classList.add('border', 'border-2', 'border-warning');
|
||||
btns.forEach(btn => {
|
||||
if (btn.id !== target.id) {
|
||||
@@ -84,7 +84,7 @@ UI.showClipping = function(target, btns, axis) {
|
||||
* @param {String} triggerSelector
|
||||
* @param {String} targetSelector The selector for the target toolbar to be displayed
|
||||
*/
|
||||
UI.toggleClipperBar = function(triggerSelector, targetSelector) {
|
||||
function toggleClipperBar(triggerSelector, targetSelector) {
|
||||
const trigger = document.querySelector(triggerSelector);
|
||||
const toolbar = document.querySelector(targetSelector);
|
||||
const btns = toolbar.querySelectorAll('button');
|
||||
@@ -103,7 +103,7 @@ UI.toggleClipperBar = function(triggerSelector, targetSelector) {
|
||||
|
||||
if (!toolbar.classList.contains('d-none')) {
|
||||
AppState.clipping.enabled = true;
|
||||
Scene.toggleAmbientOcclusion(false);
|
||||
toggleAmbientOcclusion(false);
|
||||
|
||||
btns.forEach(btn => {
|
||||
btn.classList.remove('border', 'border-2', 'border-warning');
|
||||
@@ -111,13 +111,13 @@ UI.toggleClipperBar = function(triggerSelector, targetSelector) {
|
||||
|
||||
trigger.className += ' border border-2 border-white';
|
||||
toolbar.addEventListener('click', event => {
|
||||
UI.showClipping(event.target, btns, clipTargets[event.target.id]?.axis);
|
||||
showClipping(event.target, btns, clipTargets[event.target.id]?.axis);
|
||||
});
|
||||
} else {
|
||||
Scene.resetClipping();
|
||||
resetClipping();
|
||||
let noBorder = trigger.className.replace(/ border.*$/g, '');
|
||||
trigger.className = noBorder;
|
||||
Scene.toggleAmbientOcclusion(aoCurrentState);
|
||||
toggleAmbientOcclusion(aoCurrentState);
|
||||
}
|
||||
}
|
||||
);
|
||||
@@ -128,7 +128,7 @@ UI.toggleClipperBar = function(triggerSelector, targetSelector) {
|
||||
* A left side settings panel
|
||||
* @param {String} triggerId - The settings button id
|
||||
*/
|
||||
UI.toggleSettingsPanel = function(triggerId) {
|
||||
function toggleSettingsPanel(triggerId) {
|
||||
const btn = document.querySelector(`#${triggerId}`);
|
||||
const lightHeading = document.createElement('h2');
|
||||
lightHeading.className = 'fs-5 ms-2 mb-3 mt-3';
|
||||
@@ -142,9 +142,9 @@ UI.toggleSettingsPanel = function(triggerId) {
|
||||
ATON.UI.showSidePanel({header: '<i class="bi bi-gear-fill me-1"></i> Impostazioni'});
|
||||
ATON.UI.elSidePanel.appendChild(lightHeading);
|
||||
|
||||
const lightSliderX = this.createLightSlider('x', 'Asse X', [-2, 2], 0.1);
|
||||
const lightSliderY = this.createLightSlider('y', 'Asse Y', [-2, 2], 0.1);
|
||||
const lightSliderZ = this.createLightSlider('z', 'Asse Z', [-2, 2], 0.1);
|
||||
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);
|
||||
@@ -176,7 +176,7 @@ UI.toggleSettingsPanel = function(triggerId) {
|
||||
document.querySelector('#aoSwitch').addEventListener(
|
||||
'change',
|
||||
event => {
|
||||
Scene.toggleAmbientOcclusion(event.target.checked);
|
||||
toggleAmbientOcclusion(event.target.checked);
|
||||
AppState.ambientOcclusion = event.target.checked;
|
||||
}
|
||||
);
|
||||
@@ -197,7 +197,7 @@ UI.toggleSettingsPanel = function(triggerId) {
|
||||
* @param {Number[]} range - The slider's range
|
||||
* @param {Number} step - The slider's step
|
||||
*/
|
||||
UI.createLightSlider = function(direction, label, range, step) {
|
||||
function createLightSlider(direction, label, range, step) {
|
||||
const currentVal = ATON.getMainLightDirection()[direction];
|
||||
const lightSlider = ATON.UI.createSlider({
|
||||
range,
|
||||
@@ -207,7 +207,7 @@ UI.createLightSlider = function(direction, label, range, step) {
|
||||
const lightDir = ATON.getMainLightDirection();
|
||||
// Keep existing direction values for the other axes
|
||||
lightDir[direction] = Number.parseFloat(val);
|
||||
Scene.changeLightDirection(lightDir);
|
||||
changeLightDirection(lightDir);
|
||||
},
|
||||
});
|
||||
|
||||
@@ -220,17 +220,17 @@ UI.createLightSlider = function(direction, label, range, step) {
|
||||
* Right-side main menu panel
|
||||
* @param {String} triggerId - The menu button id
|
||||
*/
|
||||
UI.toggleContentMenu = function(triggerId) {
|
||||
function toggleContentMenu(triggerId) {
|
||||
const btn = document.querySelector(`#${triggerId}`);
|
||||
|
||||
btn.addEventListener('click', () => {
|
||||
ATON.UI.setSidePanelRight();
|
||||
ATON.UI.showSidePanel({header: 'Menu'});
|
||||
// Append tabs, then tab panes
|
||||
const tabs = this.domParser.parseFromString(UI.contentMenuTabs, 'text/html');
|
||||
const tabs = domParser.parseFromString(contentMenuTabs, 'text/html');
|
||||
ATON.UI.elSidePanel.appendChild(tabs.querySelector('#content-tabs'));
|
||||
ATON.UI.elSidePanel.appendChild(tabs.querySelector('.tab-content'));
|
||||
this.buildLayersMenu(AppState.normalizedNodes, ATON.UI.elSidePanel.querySelector('#layer'));
|
||||
buildLayersMenu(AppState.normalizedNodes, ATON.UI.elSidePanel.querySelector('#layer'));
|
||||
});
|
||||
}
|
||||
/**
|
||||
@@ -238,7 +238,7 @@ UI.toggleContentMenu = function(triggerId) {
|
||||
* @param {Array} nodes The scenes nodes (IDs and status)
|
||||
* @param {HTMLElement} sidePanel ATON's side panel element
|
||||
*/
|
||||
UI.buildLayersMenu = function(nodes, sidePanel) {
|
||||
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`;
|
||||
@@ -273,4 +273,11 @@ UI.buildLayersMenu = function(nodes, sidePanel) {
|
||||
}
|
||||
}
|
||||
|
||||
export default UI;
|
||||
/**
|
||||
* Initialize required components for scene UI
|
||||
*/
|
||||
export function initUI() {
|
||||
toggleSettingsPanel('settings');
|
||||
toggleContentMenu('menu');
|
||||
toggleClipperBar('#clipper', '#clipper-bar');
|
||||
}
|
||||
Reference in New Issue
Block a user