refactor(soba): extract THREE.REVISION to a constant

nartc · nartc · commit c6a253c8eb50 · 2023-09-26T13:59:47.000-04:00
diff --git a/libs/soba/loaders/src/texture-loader/texture-loader.ts b/libs/soba/loaders/src/texture-loader/texture-loader.ts
@@ -21,13 +21,16 @@ export function injectNgtsTextureLoader<TInput extends string[] | string | Recor
 		effect(() => {
 			const textures = result();
 			if (!textures) return;
-			const array = Array.isArray(textures)
-				? textures
-				: textures instanceof THREE.Texture
-				? [textures]
-				: Object.values(textures);
-			if (onLoad) onLoad(array);
-			array.forEach(store.get('gl').initTexture);
+			const gl = store.get('gl');
+			if ('initTexture' in gl) {
+				const array = Array.isArray(textures)
+					? textures
+					: textures instanceof THREE.Texture
+					? [textures]
+					: Object.values(textures);
+				if (onLoad) onLoad(array);
+				array.forEach(store.get('gl').initTexture);
+			}
 		});
 
 		return result;
diff --git a/libs/soba/shaders/src/caustics/caustics-projection-material.ts b/libs/soba/shaders/src/caustics/caustics-projection-material.ts
@@ -1,3 +1,4 @@
+import { revision } from 'angular-three-soba/utils';
 import * as THREE from 'three';
 import { shaderMaterial } from '../shader-material/shader-material';
 
@@ -30,6 +31,6 @@ export const CausticsProjectionMaterial = shaderMaterial(
     vec3 back = texture2D(causticsTextureB, lightSpacePos.xy).rgb;
     gl_FragColor = vec4((front + back) * color, 1.0);
     #include <tonemapping_fragment>
-    #include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
+    #include <${revision >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
    }`,
 );
diff --git a/libs/soba/shaders/src/convolution-material/convolution-material.ts b/libs/soba/shaders/src/convolution-material/convolution-material.ts
@@ -1,3 +1,4 @@
+import { revision } from 'angular-three-soba/utils';
 import { NoBlending, ShaderMaterial, Uniform, Vector2 } from 'three';
 
 export class ConvolutionMaterial extends ShaderMaterial {
@@ -53,7 +54,7 @@ export class ConvolutionMaterial extends ShaderMaterial {
 
           #include <dithering_fragment>
           #include <tonemapping_fragment>
-          #include <encodings_fragment>
+          #include <${revision >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
         }`,
 			vertexShader: `uniform vec2 texelSize;
         uniform vec2 halfTexelSize;
diff --git a/libs/soba/shaders/src/grid-material/grid-material.ts b/libs/soba/shaders/src/grid-material/grid-material.ts
@@ -1,4 +1,5 @@
 import type { NgtShaderMaterial } from 'angular-three';
+import { revision } from 'angular-three-soba/utils';
 import * as THREE from 'three';
 import { shaderMaterial } from '../shader-material/shader-material';
 
@@ -74,7 +75,7 @@ export const GridMaterial = shaderMaterial(
       if (gl_FragColor.a <= 0.0) discard;
 
       #include <tonemapping_fragment>
-      #include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
+      #include <${revision >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
     }
   `,
 );
diff --git a/libs/soba/shaders/src/mesh-refraction-material/mesh-refraction-material.ts b/libs/soba/shaders/src/mesh-refraction-material/mesh-refraction-material.ts
@@ -1,6 +1,7 @@
 // Author: N8Programs
 // https://github.com/N8python/diamonds
 
+import { revision } from 'angular-three-soba/utils';
 import * as THREE from 'three';
 // @ts-expect-error: shaderIntersectFunction is available but typescript complains
 import { MeshBVHUniformStruct, shaderIntersectFunction, shaderStructs } from 'three-mesh-bvh';
@@ -168,6 +169,6 @@ export const MeshRefractionMaterial = shaderMaterial(
     float nFresnel = fresnelFunc(viewDirection, normal) * fresnel;
     gl_FragColor = vec4(mix(finalColor, vec3(1.0), nFresnel), 1.0);
     #include <tonemapping_fragment>
-    #include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
+    #include <${revision >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
   }`,
 );
diff --git a/libs/soba/shaders/src/soft-shadow-material/soft-shadow-material.ts b/libs/soba/shaders/src/soft-shadow-material/soft-shadow-material.ts
@@ -1,4 +1,5 @@
 import type { NgtShaderMaterial } from 'angular-three';
+import { revision } from 'angular-three-soba/utils';
 import * as THREE from 'three';
 import { shaderMaterial } from '../shader-material/shader-material';
 
@@ -25,7 +26,7 @@ export const SoftShadowMaterial = shaderMaterial(
      vec4 sampledDiffuseColor = texture2D(map, vUv);
      gl_FragColor = vec4(color * sampledDiffuseColor.r * blend, max(0.0, (1.0 - (sampledDiffuseColor.r + sampledDiffuseColor.g + sampledDiffuseColor.b) / alphaTest)) * opacity);
      #include <tonemapping_fragment>
-     #include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
+     #include <${revision >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
    }`,
 );
 
diff --git a/libs/soba/shaders/src/sparkles-material/sparkles-material.ts b/libs/soba/shaders/src/sparkles-material/sparkles-material.ts
@@ -1,5 +1,5 @@
 import type { NgtShaderMaterial } from 'angular-three';
-import * as THREE from 'three';
+import { revision } from 'angular-three-soba/utils';
 import { shaderMaterial } from '../shader-material/shader-material';
 
 export const SparklesMaterial = shaderMaterial(
@@ -33,7 +33,7 @@ export const SparklesMaterial = shaderMaterial(
       float strength = 0.05 / distanceToCenter - 0.1;
       gl_FragColor = vec4(vColor, strength * vOpacity);
       #include <tonemapping_fragment>
-      #include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
+      #include <${revision >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
     }`,
 );
 
diff --git a/libs/soba/shaders/src/spot-light-material/spot-light-material.ts b/libs/soba/shaders/src/spot-light-material/spot-light-material.ts
@@ -1,4 +1,5 @@
 import type { NgtShaderMaterial } from 'angular-three';
+import { revision } from 'angular-three-soba/utils';
 import * as THREE from 'three';
 
 export class SpotLightMaterial extends THREE.ShaderMaterial {
@@ -80,7 +81,7 @@ export class SpotLightMaterial extends THREE.ShaderMaterial {
         gl_FragColor = vec4(lightColor, intensity * opacity);
 
         #include <tonemapping_fragment>
-	      #include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
+	      #include <${revision >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
       }`,
 		});
 	}
diff --git a/libs/soba/shaders/src/star-field-material/star-field-material.ts b/libs/soba/shaders/src/star-field-material/star-field-material.ts
@@ -1,5 +1,5 @@
 import type { NgtShaderMaterial } from 'angular-three';
-import * as THREE from 'three';
+import { revision } from 'angular-three-soba/utils';
 import { shaderMaterial } from '../shader-material/shader-material';
 
 export const StarFieldMaterial = shaderMaterial(
@@ -30,7 +30,7 @@ void main() {
   gl_FragColor = vec4(vColor, opacity);
 
   #include <tonemapping_fragment>
-	#include <${parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
+	#include <${revision >= 154 ? 'colorspace_fragment' : 'encodings_fragment'}>
 }
   `,
 );
diff --git a/libs/soba/staging/src/accumulative-shadows/randomized-lights.ts b/libs/soba/staging/src/accumulative-shadows/randomized-lights.ts
@@ -1,5 +1,6 @@
 import { CUSTOM_ELEMENTS_SCHEMA, Component, Input, computed, effect } from '@angular/core';
 import { NgtArgs, extend, injectNgtRef, signalStore, type NgtGroup } from 'angular-three';
+import { revision } from 'angular-three-soba/utils';
 import { Repeat } from 'ngxtension/repeat';
 import * as THREE from 'three';
 import { DirectionalLight, Group, OrthographicCamera, Vector2 } from 'three';
@@ -76,7 +77,7 @@ export class NgtsRandomizedLights {
 		position: [0, 0, 0],
 		radius: 1,
 		amount: 8,
-		intensity: parseInt(THREE.REVISION.replace(/\D+/g, '')) >= 155 ? Math.PI : 1,
+		intensity: revision >= 155 ? Math.PI : 1,
 		ambient: 0.5,
 	});
 	Math = Math;
diff --git a/libs/soba/utils/src/constants.ts b/libs/soba/utils/src/constants.ts
@@ -0,0 +1,3 @@
+import { REVISION } from 'three';
+
+export const revision = parseInt(REVISION.replace(/\D+/g, ''));
diff --git a/libs/soba/utils/src/index.ts b/libs/soba/utils/src/index.ts
@@ -1 +1,2 @@
+export { revision } from './constants';
 export * from './content/content';

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { REVISION } from 'three';`
	`2`	`+`
	`3`	`+export const revision = parseInt(REVISION.replace(/\D+/g, ''));`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+export { revision } from './constants';`
`1`	`2`	`export * from './content/content';`