Fixed broken promise chain

package.json

@@ -31,23 +31,27 @@
   },
   "homepage": "https://github.com/aardgoose/CaveView.js#readme",
   "devDependencies": {
-    "@babel/plugin-transform-runtime": "^7.19.0",
-    "@babel/preset-env": "^7.20.0",
+    "@babel/plugin-transform-runtime": "^7.22.0",
+    "@babel/preset-env": "^7.22.0",
     "@rollup/plugin-babel": "^6.0.0",
-    "@rollup/plugin-commonjs": "^24.0.0",
+    "@rollup/plugin-beep": "^1.0.2",
+    "@rollup/plugin-commonjs": "^25.0.0",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.0",
+    "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-terser": "^0.4.0",
     "@rollup/pluginutils": "^5.0.0",
-    "concurrently": "^7.5.0",
-    "eslint": "^8.19.0",
+    "concurrently": "^8.1.0",
+    "eslint": "^8.41.0",
     "postcss": "^8.4.00",
-    "proj4": "^2.8.0",
-    "rollup": "^3.2.0",
+    "proj4": "^2.9.0",
+    "rollup": "^3.23.0",
     "rollup-plugin-graph": "^2.0.0",
     "serve": "^14.0.0",
-    "terser": "^5.14.0",
-    "three": "^0.150.0",
+    "terser": "^5.17.0",
+    "three": "^0.156.0",
     "x18n": "^2.0.3"
+  },
+  "dependencies": {
+    "acorn-walk": "^8.2.0"
   }
 }

rollup-gl.mjs

@@ -52,6 +52,7 @@ function glconstants() {
 		INT: 5124,
 		FLOAT: 5126,
 		HALF_FLOAT: 5131,
+		COLOR: 6144,
 		DEPTH_COMPONENT: 6402,
 		RED: 6403,
 		ALPHA: 6406,
@@ -163,7 +164,11 @@ function glconstants() {
 		DRAW_FRAMEBUFFER: 36009,
 		SAMPLE_ALPHA_TO_COVERAGE: 32926,
 		SRGB8_ALPHA8: 35907,
-		MAX_UNIFORM_BUFFER_BINDINGS: 35375	};
+		MAX_UNIFORM_BUFFER_BINDINGS: 35375,
+		TEXTURE_COMPARE_MODE: 34892,
+		TEXTURE_COMPARE_FUNC: 34893,
+		COMPARE_REF_TO_TEXTURE: 34894
+};
 
 	return {
 

rollup-plugin-three-nodes.mjs

@@ -0,0 +1,84 @@
+import { simple } from 'acorn-walk';
+
+const nodeElements = {};
+
+export default function threeNodes () {
+
+	return {
+		name: 'three-nodes', // this name will show up in logs and errors
+
+		transform: {
+
+			order: 'post',
+
+			handler ( code, id ) {
+
+				const fileName =  id.split( '\\' ).pop();
+
+				// prevent creation of circular dependencies with spurious imports
+				if ( fileName === 'ShaderNode.js' ) return null;
+
+				const ast = this.parse( code );
+				const newImports = [];
+				const currentImports = {};
+
+				simple( ast, {
+
+					ImportSpecifier( node ) {
+
+						// track file's current imports
+						currentImports[ node.imported.name ] = true;
+
+					},
+
+					CallExpression ( node ) {
+
+						if ( node.callee.type == 'Identifier' && node.callee.name == 'addNodeElement'  ) {
+
+							nodeElements[ node.arguments[ 0 ].value ] = id;
+							return;
+
+						}
+
+						if ( node.callee.type === 'MemberExpression' ) {
+
+							const propertyName = node.callee.property.name;
+
+							// don't duplicate imports
+							if ( currentImports[ propertyName ] === true ) return;
+
+							// exclude builtin Math.x methods
+							if ( node.callee.object.name === 'Math' ) return;
+
+							const moduleId = nodeElements[ propertyName ];
+
+							if ( moduleId === undefined || typeof moduleId !== 'string' ) return;
+
+							newImports.push( `import { ${propertyName} } from '${moduleId.replaceAll( '\\', '\/' ) }';` );
+							newImports.push( `console.log( 'custard:', ${propertyName});` );
+
+							delete nodeElements[ propertyName ];
+
+						}
+
+					}
+
+				} );
+
+				if ( newImports.length === 0 ) {
+
+					return { code: code, ast: ast, map: null };
+
+				} else {
+
+					return newImports.join( "\n" ) +  "\n" + code;
+
+				}
+
+			},
+
+		}
+
+	};
+
+}

rollup.config.mjs

@@ -3,35 +3,39 @@ import commonjs from '@rollup/plugin-commonjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
 import terser from '@rollup/plugin-terser';
 import { glconstants, glsl, glslThree } from './rollup-gl.mjs';
+import beep from '@rollup/plugin-beep';
+import threeNodes from './rollup-plugin-three-nodes.mjs';
+//import graph from 'rollup-plugin-graph';
 
 export default [
 	{
+//		treeshake: false,
 		input: 'src/js/CV2.js',
 		output: [
 			{
 				name: 'CV2',
 				file: 'build/CaveView/js/CaveView2.js',
-				format: 'umd'
+				format: 'es'
 			},
 			{
 				name: 'CV2',
 				file: 'build/CaveView/js/CaveView2.min.js',
-				format: 'umd',
+				format: 'es',
 				plugins: [ terser() ]
 			}
 		],
 		plugins: [
-			glsl(),
-			glslThree(),
-			glconstants(),
+			threeNodes(),
+			beep(),
 			json( {
 				exclude: [ 'node_modules/**', 'build/**', 'tools/**' ],
 				preferConst: true, // Default: false
 			} ),
 			nodeResolve( {} ),
 			commonjs( {
 				sourceMap: false,  // Default: true
-			} )
+			} ),
+			// graph()
 		]
 	}, {
 		input: 'src/js/CV2Plugins.js',

rollup.graph.mjs

@@ -1,8 +1,8 @@
 import json from '@rollup/plugin-json';
 import commonjs from '@rollup/plugin-commonjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
+import beep from '@rollup/plugin-beep';
 
-import { glconstants, glsl, glslThree } from './rollup-gl.mjs';
 
 import graph from 'rollup-plugin-graph';
 
@@ -22,9 +22,7 @@ export default [
 			}
 		],
 		plugins: [
-			glsl(),
-			glslThree(),
-			glconstants(),
+			beep(),
 			json( {
 				exclude: [ 'node_modules/**', 'build/**', 'tools/**' ],
 				preferConst: true, // Default: false

src/css/caveview.scss

@@ -94,13 +94,6 @@ $animation-speed: 0.25s;
 	display: none;
 }
 
-.cv-frame div.page div.slide ul.cv-tree {
-	width: 280px;
-}
-
-.cv-frame div.page div.slide ul.cv-tree li {
-	margin-left: 20px;
-}
 
 .cv-frame div.page ul {
 	list-style-type: none;
@@ -134,16 +127,6 @@ $animation-speed: 0.25s;
 	background-color: black;
 }
 
-.cv-frame div.page div.slide {
-	position: absolute;
-	top: 42px;
-	bottom: 4px;
-	left: 0px;
-	max-height: 100%;
-	background-color: $background;
-	transition: transform $animation-speed ease-in;
-}
-
 .cv-frame div.slide-out {
 	border-right: $page-rule;
 	transform: translateX(-100%);
@@ -364,10 +347,6 @@ div.cv-frame::-webkit-scrollbar-button:end {
 		top: $tab-size * 2;
 	}
 
-	.cv-frame div.page div.slide, .cv-frame div.slide ul {
-		width: 100%;
-	}
-
 	.cv-tab-box {
 		left: 0px;
 		right: 0px;

src/js/Nodes.js

@@ -0,0 +1 @@
+export * from '../../node_modules/three/examples/jsm/nodes/Nodes';

src/js/Three.js

@@ -1,10 +1,15 @@
+export * from 'three';
+export { cloneUniforms, mergeUniforms } from 'three/src/renderers/shaders/UniformsUtils.js';
+
+/*
 export { WebGLRenderTarget } from 'three/src/renderers/WebGLRenderTarget.js';
 export { WebGLRenderer } from 'three/src/renderers/WebGLRenderer.js';
 export { ShaderChunk } from 'three/src/renderers/shaders/ShaderChunk.js';
 export { cloneUniforms, mergeUniforms } from 'three/src/renderers/shaders/UniformsUtils.js';
 export { FogExp2 } from 'three/src/scenes/FogExp2.js';
 export { Scene } from 'three/src/scenes/Scene.js';
 export { Mesh } from 'three/src/objects/Mesh.js';
+export { Sprite } from 'three/src/objects/Sprite.js';
 export { LineSegments } from 'three/src/objects/LineSegments.js';
 export { Line } from 'three/src/objects/Line.js';
 export { Points } from 'three/src/objects/Points.js';
@@ -22,11 +27,11 @@ export { PlaneGeometry } from 'three/src/geometries/PlaneGeometry.js';
 export { CylinderGeometry } from 'three/src/geometries/CylinderGeometry.js';
 
 export { ShaderMaterial } from 'three/src/materials/ShaderMaterial.js';
-export { PointsMaterial } from 'three/src/materials/PointsMaterial.js';
-export { MeshBasicMaterial } from 'three/src/materials/MeshBasicMaterial.js';
-export { MeshLambertMaterial } from 'three/src/materials/MeshLambertMaterial.js';
-export { MeshPhongMaterial } from 'three/src/materials/MeshPhongMaterial.js';
-export { LineBasicMaterial } from 'three/src/materials/LineBasicMaterial.js';
+//export { PointsMaterial } from 'three/src/materials/PointsMaterial.js';
+//export { MeshBasicMaterial } from 'three/src/materials/MeshBasicMaterial.js';
+//export { MeshLambertMaterial } from 'three/src/materials/MeshLambertMaterial.js';
+//export { MeshPhongMaterial } from 'three/src/materials/MeshPhongMaterial.js';
+export { SpriteMaterial } from 'three/src/materials/SpriteMaterial.js';
 export { UniformsLib } from 'three/src/renderers/shaders/UniformsLib.js';
 export { TextureLoader } from 'three/src/loaders/TextureLoader.js';
 export { ImageLoader } from 'three/src/loaders/ImageLoader.js';
@@ -70,14 +75,20 @@ export { Vector2 } from 'three/src/math/Vector2.js';
 export { Quaternion } from 'three/src/math/Quaternion.js';
 export { Color } from 'three/src/math/Color.js';
 export { Line3 } from 'three/src/math/Line3.js';
+export { ColorManagement } from 'three/src/math/ColorManagement.js';
+
 export * from 'three/src/constants.js';
+*/
+import { ColorManagement } from 'three';
+import { Object3D } from 'three';
+//import { Object3D } from 'three/src/core/Object3D.js';
 
-import { Object3D } from 'three/src/core/Object3D.js';
+ColorManagement.enabled = true;
 
 Object3D.onUploadDropBuffer = function () {
 
 	// call back from BufferAttribute to drop JS buffers after data has been transfered to GPU
-	this.array = null;
+//	this.array = null;
 
 };
 

src/js/core/Cfg.js

@@ -131,13 +131,13 @@ class Cfg extends EventDispatcher {
 
 		}
 
-		return value || defaultValue;
+		return value ?? defaultValue;
 
 	}
 
-	themeAngle ( name ) {
+	themeAngle ( name, defaultAngle = 0 ) {
 
-		return MathUtils.degToRad( this.themeValue ( name ) );
+		return MathUtils.degToRad( this.themeValue ( name, defaultAngle ) );
 
 	}
 
@@ -159,21 +159,26 @@ class Cfg extends EventDispatcher {
 
 	}
 
-	themeColorCSS ( name ) {
+	themeColorCSS ( name, defaultColor = 'black' ) {
 
-		return this.themeColor( name ).getStyle();
+		const color = this.themeColor( name, defaultColor ).getStyle();
+
+		return color === undefined ? defaultColor : color;
 
 	}
 
-	themeColor ( name ) {
+	themeColor ( name, defaultColor = undefined ) {
 
 		let color = this.themeColors.get( name );
 
 		if ( color === undefined ) {
 
 			const savedColorName = window.localStorage.getItem( 'cv-color:' + name );
 
-			color = new Color( savedColorName ? savedColorName : this.themeValue( name ) );
+			let dcColor = this.themeValue( name );
+			if ( dcColor === undefined ) dcColor = defaultColor;
+
+			color = new Color( savedColorName ? savedColorName : dcColor );
 			this.themeColors.set( name, color );
 
 		}
@@ -215,7 +220,9 @@ class Cfg extends EventDispatcher {
 
 if ( document.currentScript !== undefined ) {
 
-	Cfg.home = document.currentScript.src.match( /^(.*\/)js\// )[ 1 ];
+	console.log( import.meta );
+	Cfg.home = import.meta.url.match( /^(.*\/)js\// )[ 1 ];
+//	Cfg.home = document.currentScript.src.match( /^(.*\/)js\// )[ 1 ];
 
 }
 

src/js/core/CommonAttributes.js

@@ -11,9 +11,17 @@ const positionAttribute = new Float32BufferAttribute( [
 	1, 0, 0
 ], 3 );
 
+const uvAttribute = new Float32BufferAttribute( [
+	0, 0,
+	0, 1,
+	1, 1,
+	1, 0
+], 2 );
+
 const CommonAttributes = {
 	index: indexAttribute,
-	position: positionAttribute
+	position: positionAttribute,
+	uv: uvAttribute
 };
 
 export { CommonAttributes };