feat(Texture): allow comparing with equals() using a string

arx-tools · Nov 1, 2023 · e33a955 · e33a955
1 parent cebe6f8
commit e33a955
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/Polygons.ts b/src/Polygons.ts
@@ -421,7 +421,7 @@ export class Polygons extends Array<Polygon> {
     return this.selectBy((polygon) => polygon.isWithin(box))
   }
 
-  selectByTextures(textures: Texture[]) {
+  selectByTextures(textures: (Texture | string)[]) {
     return this.selectBy((polygon) => polygon.texture?.equalsAny(textures) ?? false)
   }
 

diff --git a/src/Texture.ts b/src/Texture.ts
@@ -252,13 +252,22 @@ export class Texture extends ThreeJsTextue {
     }
   }
 
-  equals(texture: Texture) {
+  /**
+   * compares filenames of textures without the extensions
+   *
+   * For example:
+   *  - texture.jpg == TEXTURE.JPG
+   *  - texture.bmp == texture.jpg
+   */
+  equals(texture: Texture | string) {
     const { name: aFilename } = path.parse(this.filename.toLowerCase())
-    const { name: bFilename } = path.parse(texture.filename.toLowerCase())
+    const { name: bFilename } = path.parse(
+      typeof texture === 'string' ? texture.toLowerCase() : texture.filename.toLowerCase(),
+    )
     return aFilename === bFilename
   }
 
-  equalsAny(textures: Texture[]) {
+  equalsAny(textures: (Texture | string)[]) {
     if (textures.length === 0) {
       return false
     }