Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 14f2f0d

Browse files
author
takuma-hmng8
committed
fix:types
1 parent 9f6d40d commit 14f2f0d

File tree

97 files changed

+8582
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+8582
-13
lines changed

‎packages/use-shader-fx/build/use-shader-fx.js‎

Lines changed: 4727 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/use-shader-fx/build/use-shader-fx.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/use-shader-fx/build/use-shader-fx.umd.cjs‎

Lines changed: 1571 additions & 0 deletions
Large diffs are not rendered by default.

‎packages/use-shader-fx/build/use-shader-fx.umd.cjs.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/use-shader-fx/package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/use-shader-fx/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@funtech-inc/use-shader-fx",
3-
"version": "1.1.27",
3+
"version": "1.1.28",
44
"description": "⚡️ More FXs, Less GLSL",
55
"main": "./build/use-shader-fx.umd.cjs",
66
"module": "./build/use-shader-fx.js",

‎packages/use-shader-fx/src/fxs/3D/useWobble3D/useMaterial.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export interface WobbleMaterialProps<T extends WobbleMaterialConstructor>
127127
* @param renderer — WebGLRenderer Context that is initializing the material
128128
*/
129129
depthOnBeforeCompile?: (
130-
shader: THREE.Shader,
130+
shader: THREE.WebGLProgramParametersWithUniforms,
131131
renderer: THREE.WebGLRenderer
132132
) => void;
133133
/**

‎packages/use-shader-fx/src/fxs/types/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ export type MaterialProps = {
1717
};
1818
/**
1919
* An optional callback that is executed immediately before the shader program is compiled. `use-shader-fx` already defines `onBeforeCompile`, so pass the function to this props instead of redefining it in material.
20-
* @param shader — Source code of the shader
20+
* @param parameters — WebGL program parameters
2121
* @param renderer — WebGLRenderer Context that is initializing the material
2222
*/
2323
onBeforeCompile?: (
24-
shader: THREE.Shader,
24+
parameters: THREE.WebGLProgramParametersWithUniforms,
2525
renderer: THREE.WebGLRenderer
2626
) => void;
2727
};

‎packages/use-shader-fx/src/libs/shaders/resolveShaders.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ function resolveIncludes(string: string) {
2525
return string.replace(includePattern, includeReplacer);
2626
}
2727

28-
export const resolveShaders = (shader: THREE.Shader) => {
29-
shader.vertexShader = resolveIncludes(shader.vertexShader);
30-
shader.fragmentShader = resolveIncludes(shader.fragmentShader);
28+
export const resolveShaders = (
29+
parameters: THREE.WebGLProgramParametersWithUniforms
30+
) => {
31+
parameters.vertexShader = resolveIncludes(parameters.vertexShader);
32+
parameters.fragmentShader = resolveIncludes(parameters.fragmentShader);
3133
};
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1+
import * as THREE from "three";
12
import { resolveShaders } from "../libs/shaders/resolveShaders";
23

34
type OnBeforeCompile = (
4-
shader: THREE.Shader,
5+
parameters: THREE.WebGLProgramParametersWithUniforms,
56
renderer: THREE.WebGLRenderer
67
) => void;
78

89
export const setOnBeforeCompile = (
910
onBeforeCompile?: OnBeforeCompile
1011
): OnBeforeCompile => {
11-
return (shader, renderer) => {
12-
onBeforeCompile && onBeforeCompile(shader, renderer);
13-
resolveShaders(shader);
12+
return (parameters, renderer) => {
13+
onBeforeCompile && onBeforeCompile(parameters, renderer);
14+
resolveShaders(parameters);
1415
};
1516
};

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /