Skip to content

Commit b773197

Browse files
upgrade to gl-react v5
1 parent 4c533c4 commit b773197

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

example/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"buffer": "^5.6.0",
1313
"expo": "^40.0.0",
1414
"expo-gl": "~9.2.0",
15-
"gl-react": "^4.0.1",
15+
"gl-react": "^5.0.0",
1616
"gl-react-blurhash": "latest",
17-
"gl-react-expo": "^4.0.1",
17+
"gl-react-expo": "^5.0.0",
1818
"react": "16.13.1",
1919
"react-dom": "16.13.1",
2020
"react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",

example/yarn.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3425,26 +3425,26 @@ gl-react-blurhash@latest:
34253425
dependencies:
34263426
blurhash "^1.1.3"
34273427

3428-
gl-react-expo@^4.0.1:
3429-
version "4.1.0"
3430-
resolved "https://registry.yarnpkg.com/gl-react-expo/-/gl-react-expo-4.1.0.tgz#0f3b13fae7fe490bc72fcf59c894605293da642d"
3431-
integrity sha512-3Q4LOBGYsNNqpLkwUsUlRrFCNLUqjVsVPKE3c6pLABfkNxyBacbDK3mg3T8XOD7jp+Vsp/Ic9McjICMsYHANJw==
3428+
gl-react-expo@^5.0.0:
3429+
version "5.0.0"
3430+
resolved "https://registry.yarnpkg.com/gl-react-expo/-/gl-react-expo-5.0.0.tgz#bda62d7645cbff907c13ffdf2429d1d7d98d3046"
3431+
integrity sha512-CiK01vU/CMk7qs94Hz3Sl27KWlcsrmNDRvy9FHvL6DTISnNWXg21sx/VIpoqYMAFyx9DmBZt1m4tis5byVVVjA==
34323432
dependencies:
34333433
invariant "^2.2.4"
34343434
webgltexture-loader-expo "1.0.0"
34353435

3436-
gl-react@^4.0.1:
3437-
version "4.1.0"
3438-
resolved "https://registry.yarnpkg.com/gl-react/-/gl-react-4.1.0.tgz#b7623555a4c3ba92a1ccbbb122c28c46231cd863"
3439-
integrity sha512-hTvxQHN2wxLfbA4c6mRcMdXWjA0/8UY2Sxn5eNre0DOrcauBj/+vMeAMbL2+zwE1BfVYnraE4cvKJTIzFIeBLw==
3436+
gl-react@^5.0.0:
3437+
version "5.0.0"
3438+
resolved "https://registry.yarnpkg.com/gl-react/-/gl-react-5.0.0.tgz#33ce47942c068a137250cbdceb4aae31f1ac81ec"
3439+
integrity sha512-qZihcgl5objZ1BoJsDE/jEgDXi/ysUeqfYpDvcUGZewKV7F+NsQOWXgLt3NnaBn/Ju3ijPwRzzlFRJ8CVR8nxw==
34403440
dependencies:
34413441
gl-shader "^4.2.1"
34423442
invariant "^2.2.4"
34433443
ndarray "^1.0.19"
34443444
prop-types "^15.7.2"
34453445
typedarray-pool "^1.2.0"
34463446
webgltexture-loader "1.0.0"
3447-
webgltexture-loader-ndarray "1.1.0"
3447+
webgltexture-loader-ndarray "1.1.1"
34483448

34493449
gl-shader@^4.2.1:
34503450
version "4.2.1"
@@ -6489,10 +6489,10 @@ webgltexture-loader-expo@1.0.0:
64896489
dependencies:
64906490
webgltexture-loader "^1.0.0"
64916491

6492-
webgltexture-loader-ndarray@1.1.0:
6493-
version "1.1.0"
6494-
resolved "https://registry.yarnpkg.com/webgltexture-loader-ndarray/-/webgltexture-loader-ndarray-1.1.0.tgz#20869150e79dfb6190cbd6bedafacda262e29a5e"
6495-
integrity sha512-t9Q4x5do5feHjMOJLCg8UdQVx1eInnWXvgAqaL9NJJSL5pzI59Ynx3ZZSw3QqGxj15iRbYij7vK8BCIDyp5EZA==
6492+
webgltexture-loader-ndarray@1.1.1:
6493+
version "1.1.1"
6494+
resolved "https://registry.yarnpkg.com/webgltexture-loader-ndarray/-/webgltexture-loader-ndarray-1.1.1.tgz#6e9bd5ac3ad4d09ea8d90aea33bd683ab709ab28"
6495+
integrity sha512-jz2Wa/mupBomP/JYkbzwDFqEFNIgwliw+CXzQaMSZQup1jyGVAaprbYCus+46rVWepCnb+DWiNV/WUPC/iCj2w==
64966496
dependencies:
64976497
ndarray "^1.0.19"
64986498
ndarray-ops "^1.2.2"

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
"blurhash": "^1.1.3"
4747
},
4848
"peerDependencies": {
49-
"gl-react": "^4.0.1"
49+
"gl-react": "^5.1.0"
5050
},
5151
"devDependencies": {
52-
"@types/gl-react": "^3.15.2",
52+
"@types/gl-react": "^3.15.3",
5353
"@types/react": "^16.9.34",
5454
"@typescript-eslint/eslint-plugin": "^2.30.0",
5555
"@typescript-eslint/parser": "^2.30.0",

src/getShader.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ import { GLSL } from 'gl-react';
22

33
export function getShader(numX: number, numY: number) {
44
return GLSL`
5+
#version 300 es
56
#define M_PI 3.1415926535897932384626433832795
67
78
precision highp float;
8-
varying vec2 uv;
9+
in vec2 uv;
10+
out vec4 fragColor;
911
uniform vec3 colors[${numX * numY}];
1012
1113
const int numX = ${numX};
@@ -27,7 +29,7 @@ export function getShader(numX: number, numY: number) {
2729
linear += color * basis;
2830
}
2931
}
30-
gl_FragColor = vec4(linearTosRGB(linear), 1.0);
32+
fragColor = vec4(linearTosRGB(linear), 1.0);
3133
}
3234
`;
3335
}

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@
941941
resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
942942
integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
943943

944-
"@types/gl-react@^3.15.2":
944+
"@types/gl-react@^3.15.3":
945945
version "3.15.3"
946946
resolved "https://registry.yarnpkg.com/@types/gl-react/-/gl-react-3.15.3.tgz#447287344af23ecb81785bd1912382e89ad93993"
947947
integrity sha512-T/zTsjWQ9gxYkwUBt8YMqTXb/hGEbxugGmPgMWnsaZwILU2PnM9b6H9HtEuhqneqOS/W21wEVSvpUHbrYH/E3g==

0 commit comments

Comments
 (0)