androidとの正規化

takuma-hmng8 · takuma-hmng8 · commit 6ee92d9a80c6 · 2023-11-21T14:54:08.000+09:00
diff --git a/packages/use-shader-fx/build/use-shader-fx.js b/packages/use-shader-fx/build/use-shader-fx.js
diff --git a/packages/use-shader-fx/build/use-shader-fx.js.map b/packages/use-shader-fx/build/use-shader-fx.js.map
diff --git a/packages/use-shader-fx/build/use-shader-fx.umd.cjs b/packages/use-shader-fx/build/use-shader-fx.umd.cjs
diff --git a/packages/use-shader-fx/build/use-shader-fx.umd.cjs.map b/packages/use-shader-fx/build/use-shader-fx.umd.cjs.map
diff --git a/packages/use-shader-fx/package-lock.json b/packages/use-shader-fx/package-lock.json
diff --git a/packages/use-shader-fx/package.json b/packages/use-shader-fx/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@hmng8/use-shader-fx",
-   "version": "1.0.10",
+   "version": "1.0.11",
    "description": "wide variety of shader effects for React",
    "main": "./build/use-shader-fx.umd.cjs",
    "module": "./build/use-shader-fx.js",
diff --git a/packages/use-shader-fx/src/hooks/useBrush/shader/main.frag b/packages/use-shader-fx/src/hooks/useBrush/shader/main.frag
@@ -1,4 +1,4 @@
-precision mediump float;
+precision highp float;
 
 uniform sampler2D uMap;
 uniform sampler2D uTexture;
diff --git a/packages/use-shader-fx/src/hooks/useDuoTone/shader/main.frag b/packages/use-shader-fx/src/hooks/useDuoTone/shader/main.frag
@@ -1,4 +1,4 @@
-precision mediump float;
+precision highp float;
 
 varying vec2 vUv;
 uniform sampler2D uTexture;
diff --git a/packages/use-shader-fx/src/hooks/useFogProjection/shader/main.frag b/packages/use-shader-fx/src/hooks/useFogProjection/shader/main.frag
@@ -1,4 +1,4 @@
-precision mediump float;
+precision highp float;
 
 varying vec2 vUv;
 uniform float uTime;
diff --git a/packages/use-shader-fx/src/hooks/useFruid/shaders/advection.frag b/packages/use-shader-fx/src/hooks/useFruid/shaders/advection.frag
@@ -1,5 +1,4 @@
-precision mediump float;
-precision mediump sampler2D;
+precision highp float;
 
 varying vec2 vUv;
 uniform sampler2D uVelocity;
diff --git a/packages/use-shader-fx/src/hooks/useFruid/shaders/clear.frag b/packages/use-shader-fx/src/hooks/useFruid/shaders/clear.frag
@@ -1,5 +1,4 @@
-precision mediump float;
-precision mediump sampler2D;
+precision highp float;
 
 varying vec2 vUv;
 uniform sampler2D uTexture;
diff --git a/packages/use-shader-fx/src/hooks/useFruid/shaders/curl.frag b/packages/use-shader-fx/src/hooks/useFruid/shaders/curl.frag
@@ -1,5 +1,4 @@
-precision mediump float;
-precision mediump sampler2D;
+precision highp float;
 
 varying vec2 vUv;
 varying vec2 vL;
diff --git a/packages/use-shader-fx/src/hooks/useFruid/shaders/divergence.frag b/packages/use-shader-fx/src/hooks/useFruid/shaders/divergence.frag
@@ -1,5 +1,4 @@
-precision mediump float;
-precision mediump sampler2D;
+precision highp float;
 
 varying vec2 vUv;
 varying vec2 vL;
diff --git a/packages/use-shader-fx/src/hooks/useFruid/shaders/gradientSubtract.frag b/packages/use-shader-fx/src/hooks/useFruid/shaders/gradientSubtract.frag
@@ -1,5 +1,4 @@
-precision mediump float;
-precision mediump sampler2D;
+precision highp float;
 
 varying vec2 vUv;
 varying vec2 vL;
diff --git a/packages/use-shader-fx/src/hooks/useFruid/shaders/init.frag b/packages/use-shader-fx/src/hooks/useFruid/shaders/init.frag
@@ -1,4 +1,4 @@
-precision mediump float;
+precision highp float;
 
 void main(){
 	gl_FragColor = vec4(0.0);
diff --git a/packages/use-shader-fx/src/hooks/useFruid/shaders/main.vert b/packages/use-shader-fx/src/hooks/useFruid/shaders/main.vert
@@ -1,6 +1,3 @@
-precision mediump float;
-precision mediump sampler2D;
-
 varying vec2 vUv;
 varying vec2 vL;
 varying vec2 vR;
diff --git a/packages/use-shader-fx/src/hooks/useFruid/shaders/pressure.frag b/packages/use-shader-fx/src/hooks/useFruid/shaders/pressure.frag
@@ -1,5 +1,4 @@
-precision mediump float;
-precision mediump sampler2D;
+precision highp float;
 
 varying vec2 vUv;
 varying vec2 vL;
diff --git a/packages/use-shader-fx/src/hooks/useFruid/shaders/splat.frag b/packages/use-shader-fx/src/hooks/useFruid/shaders/splat.frag
@@ -1,5 +1,4 @@
-precision mediump float;
-precision mediump sampler2D;
+precision highp float;
 
 varying vec2 vUv;
 uniform sampler2D uTarget;
diff --git a/packages/use-shader-fx/src/hooks/useFruid/shaders/vorticity.frag b/packages/use-shader-fx/src/hooks/useFruid/shaders/vorticity.frag
@@ -1,5 +1,4 @@
-precision mediump float;
-precision mediump sampler2D;
+precision highp float;
 
 varying vec2 vUv;
 varying vec2 vT;
diff --git a/packages/use-shader-fx/src/hooks/useNoise/shader/main.frag b/packages/use-shader-fx/src/hooks/useNoise/shader/main.frag
@@ -1,22 +1,23 @@
-precision mediump float;
+precision highp float;
 
 varying vec2 vUv;
-
 uniform float uTime;
 uniform float timeStrength;
 uniform int noiseOctaves;
 uniform int fbmOctaves;
 
 const float per  = 0.5;
-const float PI   = 3.1415926;
+const float PI   = 3.14159265359;
 
 float interpolate(float a, float b, float x){
     float f = (1.0 - cos(x * PI)) * 0.5;
     return a * (1.0 - f) + b * f;
 }
 
 float rnd(vec2 p){
-    return fract(sin(dot(p ,vec2(12.9898,78.233))) * 43758.5453);
+	vec3 p3 = fract(vec3(p.xyx) * .1995);
+	p3 += dot(p3, p3.yzx + 11.28);
+	return fract((p3.x + p3.y) * p3.z);
 }
 
 float irnd(vec2 p){
@@ -26,6 +27,8 @@ float irnd(vec2 p){
 	return interpolate(interpolate(v.x, v.y, f.x), interpolate(v.z, v.w, f.x), f.y);
 }
 
+// Based on The Book of Shaders
+// https://thebookofshaders.com/13/
 float noise(vec2 p, float time){
 	float t = 0.0;
 	for(int i = 0; i < noiseOctaves; i++){
@@ -40,7 +43,7 @@ float fbm(vec2 x, float time) {
 	float v = 0.0;
 	float a = 0.5;
 	vec2 shift = vec2(100);
-	mat2 rot = mat2(cos(0.5), sin(0.5), -sin(0.5), cos(0.50));
+	mat2 rot = mat2(cos(0.5), sin(0.5), -sin(0.5), cos(0.5));
 	float sign = 1.0;
 	for (int i = 0; i < fbmOctaves; ++i) {
 		v += a * noise(x, time * sign);
@@ -52,7 +55,6 @@ float fbm(vec2 x, float time) {
 }
 
 void main() {
-	vec2 uv = vUv;
 	float noiseMap = fbm(gl_FragCoord.xy ,uTime * timeStrength);
 	gl_FragColor = vec4(noiseMap,noiseMap,noiseMap,1.0);
 }
diff --git a/packages/use-shader-fx/src/hooks/useTransitionBg/shader/main.frag b/packages/use-shader-fx/src/hooks/useTransitionBg/shader/main.frag
@@ -1,4 +1,4 @@
-precision mediump float;
+precision highp float;
 
 varying vec2 vUv;
 uniform vec2 uResolution;
diff --git a/utils/fxMaterial.tsx b/utils/fxMaterial.tsx
@@ -25,7 +25,7 @@ export const FxMaterial = shaderMaterial(
 		}
 	`,
    `
-		precision mediump float;
+		precision highp float;
 		varying vec2 vUv;
 		uniform sampler2D u_fx;
 
diff --git a/utils/fxTextureMaterial.tsx b/utils/fxTextureMaterial.tsx
@@ -27,7 +27,7 @@ export const FxTextureMaterial = shaderMaterial(
 		}
 	`,
    `
-		precision mediump float;
+		precision highp float;
 		varying vec2 vUv;
 		uniform sampler2D u_fx;
 		uniform sampler2D u_postFx;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@hmng8/use-shader-fx",`
`3`		`- "version": "1.0.10",`
	`3`	`+ "version": "1.0.11",`
`4`	`4`	`"description": "wide variety of shader effects for React",`
`5`	`5`	`"main": "./build/use-shader-fx.umd.cjs",`
`6`	`6`	`"module": "./build/use-shader-fx.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-precision mediump float;`
	`1`	`+precision highp float;`
`2`	`2`
`3`	`3`	`uniform sampler2D uMap;`
`4`	`4`	`uniform sampler2D uTexture;`