@damienmortini/three 0.1.157 → 0.1.161

package/examples/loaders/GLTFLoader.js

@@ -1445,7 +1445,7 @@ class GLTFTextureTransformExtension {
 /**
  * Specular-Glossiness Extension
  *
- * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_pbrSpecularGlossiness
+ * Specification: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Archived/KHR_materials_pbrSpecularGlossiness
  */
 
 /**
@@ -2253,7 +2253,7 @@ class GLTFParser {
 
 		// Use an ImageBitmapLoader if imageBitmaps are supported. Moves much of the
 		// expensive work of uploading a texture to the GPU off the main thread.
-		if ( typeof createImageBitmap !== 'undefined' && /Firefox/.test( navigator.userAgent ) === false ) {
+		if ( typeof createImageBitmap !== 'undefined' && /Firefox|Safari/.test( navigator.userAgent ) === false ) {
 
 			this.textureLoader = new ImageBitmapLoader( this.options.manager );
 

package/examples/loaders/KTX2Loader.js

@@ -94,6 +94,14 @@ class KTX2Loader extends Loader {
 				|| renderer.extensions.has( 'WEBKIT_WEBGL_compressed_texture_pvrtc' )
 		};
 
+
+		if ( renderer.capabilities.isWebGL2 ) {
+
+			// https://github.com/mrdoob/three.js/pull/22928
+			this.workerConfig.etc1Supported = false;
+
+		}
+
 		return this;
 
 	}
@@ -169,7 +177,7 @@ class KTX2Loader extends Loader {
 
 			}
 
-			_activeLoaders++;
+			_activeLoaders ++;
 
 		}
 
@@ -265,7 +273,7 @@ class KTX2Loader extends Loader {
 		URL.revokeObjectURL( this.workerSourceURL );
 		this.workerPool.dispose();
 
-		_activeLoaders--;
+		_activeLoaders --;
 
 		return this;
 
@@ -519,8 +527,8 @@ KTX2Loader.BasisWorker = function () {
 		{
 			if: 'etc1Supported',
 			basisFormat: [ BasisFormat.ETC1S, BasisFormat.UASTC_4x4 ],
-			transcoderFormat: [ TranscoderFormat.ETC1, TranscoderFormat.ETC1 ],
-			engineFormat: [ EngineFormat.RGB_ETC1_Format, EngineFormat.RGB_ETC1_Format ],
+			transcoderFormat: [ TranscoderFormat.ETC1 ],
+			engineFormat: [ EngineFormat.RGB_ETC1_Format ],
 			priorityETC1S: 2,
 			priorityUASTC: 4,
 			needsPowerOfTwo: false,
@@ -560,6 +568,7 @@ KTX2Loader.BasisWorker = function () {
 
 			if ( ! config[ opt.if ] ) continue;
 			if ( ! opt.basisFormat.includes( basisFormat ) ) continue;
+			if ( hasAlpha && opt.transcoderFormat.length < 2 ) continue;
 			if ( opt.needsPowerOfTwo && ! ( isPowerOfTwo( width ) && isPowerOfTwo( height ) ) ) continue;
 
 			transcoderFormat = opt.transcoderFormat[ hasAlpha ? 1 : 0 ];

package/examples/objects/Lensflare.js

@@ -2,14 +2,12 @@ import {
 	AdditiveBlending,
 	Box2,
 	BufferGeometry,
-	ClampToEdgeWrapping,
 	Color,
-	DataTexture,
+	FramebufferTexture,
 	InterleavedBuffer,
 	InterleavedBufferAttribute,
 	Mesh,
 	MeshBasicMaterial,
-	NearestFilter,
 	RGBFormat,
 	RawShaderMaterial,
 	Vector2,
@@ -34,17 +32,8 @@ class Lensflare extends Mesh {
 
 		// textures
 
-		const tempMap = new DataTexture( new Uint8Array( 16 * 16 * 3 ), 16, 16, RGBFormat );
-		tempMap.minFilter = NearestFilter;
-		tempMap.magFilter = NearestFilter;
-		tempMap.wrapS = ClampToEdgeWrapping;
-		tempMap.wrapT = ClampToEdgeWrapping;
-
-		const occlusionMap = new DataTexture( new Uint8Array( 16 * 16 * 3 ), 16, 16, RGBFormat );
-		occlusionMap.minFilter = NearestFilter;
-		occlusionMap.magFilter = NearestFilter;
-		occlusionMap.wrapS = ClampToEdgeWrapping;
-		occlusionMap.wrapT = ClampToEdgeWrapping;
+		const tempMap = new FramebufferTexture( 16, 16, RGBFormat );
+		const occlusionMap = new FramebufferTexture( 16, 16, RGBFormat );
 
 		// material
 

package/examples/utils/WorkerPool.js

@@ -4,7 +4,7 @@
 
 export class WorkerPool {
 
-	constructor ( pool = 4 ) {
+	constructor( pool = 4 ) {
 
 		this.pool = pool;
 		this.queue = [];
@@ -14,9 +14,9 @@ export class WorkerPool {
 
 	}
 
-	_initWorker ( workerId ) {
+	_initWorker( workerId ) {
 
-		if ( !this.workers[ workerId ] ) {
+		if ( ! this.workers[ workerId ] ) {
 
 			const worker = this.workerCreator();
 			worker.addEventListener( 'message', this._onMessage.bind( this, workerId ) );
@@ -26,12 +26,12 @@ export class WorkerPool {
 
 	}
 
-	_getIdleWorker () {
+	_getIdleWorker() {
 
-		for ( let i = 0 ; i < this.pool ; i ++ ) 
+		for ( let i = 0; i < this.pool; i ++ )
 			if ( ! ( this.workerStatus & ( 1 << i ) ) ) return i;
 
-		return -1;
+		return - 1;
 
 	}
 
@@ -54,25 +54,25 @@ export class WorkerPool {
 
 	}
 
-	setWorkerCreator ( workerCreator ) {
+	setWorkerCreator( workerCreator ) {
 
 		this.workerCreator = workerCreator;
 
 	}
 
-	setWorkerLimit ( pool ) {
+	setWorkerLimit( pool ) {
 
 		this.pool = pool;
 
 	}
 
-	postMessage ( msg, transfer ) {
+	postMessage( msg, transfer ) {
 
 		return new Promise( ( resolve ) => {
 
 			const workerId = this._getIdleWorker();
 
-			if ( workerId !== -1 ) {
+			if ( workerId !== - 1 ) {
 
 				this._initWorker( workerId );
 				this.workerStatus |= 1 << workerId;
@@ -89,7 +89,7 @@ export class WorkerPool {
 
 	}
 
-	dispose () {
+	dispose() {
 
 		this.workers.forEach( ( worker ) => worker.terminate() );
 		this.workersResolve.length = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@damienmortini/three",
-  "version": "0.1.157",
+  "version": "0.1.161",
   "description": "Three.js helpers",
   "scripts": {
     "install": "npm run copyexamples",
@@ -25,9 +25,11 @@
   "bugs": "https://github.com/damienmortini/lib/issues",
   "homepage": "https://github.com/damienmortini/lib/tree/main/packages/three",
   "dependencies": {
-    "@damienmortini/core": "^0.2.124",
-    "fs-extra": "^10.0.0",
-    "three": "0.135.0"
+    "@damienmortini/core": "^0.2.127",
+    "three": "0.136.0"
   },
-  "gitHead": "ade945458d4e28b5eecafafea7d75ba4edc20ed8"
+  "devDependencies": {
+    "fs-extra": "^10.0.0"
+  },
+  "gitHead": "8228aa1a33d9fa907d7cdaf21a03d2f2e7660d82"
 }