Merge pull request #22 from AdaRoseCannon/compat-aframe-150

Compatibility with aframe 1.5.0
AdaRoseCannon · Jan 13, 2024 · 319a9c2 · 319a9c2
2 parents 4ef368a + 125a478
commit 319a9c2
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/build/aframe-html.js b/build/aframe-html.js
diff --git a/build/aframe-html.js.map b/build/aframe-html.js.map
diff --git a/build/aframe-html.min.js b/build/aframe-html.min.js
diff --git a/build/aframe-html.min.js.map b/build/aframe-html.min.js.map
diff --git a/src/HTMLMesh.js b/src/HTMLMesh.js
@@ -1,6 +1,6 @@
 // This is a copy of https://github.com/mrdoob/three.js/blob/0403020848c26a9605eb91c99a949111ad4a532e/examples/jsm/interactive/HTMLMesh.js
 // with the following changes:
-// - Revert back to using "this.encoding = sRGBEncoding" instead of "this.colorSpace = SRGBColorSpace;" for compatibility with three r147 aframe 1.4.2
+// - Keep compatibility with three r147 aframe 1.4.2, still using "this.encoding = sRGBEncoding", otherwise using "this.colorSpace = SRGBColorSpace;"
 // - window.dispatchEvent line commented, see the TODO below.
 // Look at https://github.com/mrdoob/three.js/commits/dev/examples/jsm/interactive/HTMLMesh.js
 // to see if there are other changes that can be retrieved here.
@@ -10,6 +10,7 @@ import {
 	Mesh,
 	MeshBasicMaterial,
 	PlaneGeometry,
+	SRGBColorSpace,
 	sRGBEncoding,
 	Color
 } from 'three';
@@ -65,7 +66,16 @@ class HTMLTexture extends CanvasTexture {
 		this.dom = dom;
 
 		this.anisotropy = 16;
-		this.encoding = sRGBEncoding;
+		if ( THREE.REVISION === '147' ) { // Keep compatibility with aframe 1.4.2
+
+			this.encoding = sRGBEncoding;
+
+		} else {
+
+			this.colorSpace = SRGBColorSpace;
+
+		}
+
 		this.minFilter = LinearFilter;
 		this.magFilter = LinearFilter;