Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
pavophilip committed Dec 26, 2023
2 parents 01b654e + cf1e81b commit e783f2b
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 3 deletions.
30 changes: 30 additions & 0 deletions packages/demo/src/components/Shader.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { FragmentShader } from "react-shader-fiber";

import { Input, Main, Output, Uniform } from "@react-shader-fiber/stdlib";
import ShaderProvider from "../providers/ShaderProvider.jsx";

const Shader = ({ time, coords, color, children }) => {
return (
<FragmentShader>
<Output type={"vec4"} id={"fragColor"} ref={color} />

<Input ref={coords} type={"vec2"} id={"vCoords"} />

<Uniform ref={time} id={"u_time"} type={"float"} />

<Main>
<ShaderProvider
value={{
time: time,
color: color,
coords: coords,
}}
>
{children}
</ShaderProvider>
</Main>
</FragmentShader>
);
};

export default Shader;
27 changes: 27 additions & 0 deletions packages/demo/src/providers/ShaderProvider.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { createContext, useContext } from "react";

const ShaderContext = createContext({
time: null,
coords: null,
color: null,
});

const useTime = () => {
return useContext(ShaderContext).time;
};

const useCoords = () => {
return useContext(ShaderContext).coords;
};

const useColor = () => {
return useContext(ShaderContext).color;
};

const ShaderProvider = ({ value, children }) => {
return (
<ShaderContext.Provider value={value}>{children}</ShaderContext.Provider>
);
};

export default ShaderProvider;
4 changes: 2 additions & 2 deletions packages/react-shader-fiber/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "react-shader-fiber",
"name": "@react-shader/fiber",
"private": false,
"version": "1.1.0",
"type": "module",
Expand All @@ -18,7 +18,7 @@
"author": "Philip Pavo",
"dependencies": {
"@clotur/player": "^0.1.2",
"@react-shader-fiber/renderer": "^1.0.12",
"@react-shader-fiber/renderer": "^2.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 3 additions & 1 deletion packages/renderer/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# React Shader Fiber Renderer

Custom React Reconciler based on react-reconciler.
Custom React Renderer based on react-reconciler.

`npm i @react-shader/renderer`

0 comments on commit e783f2b

Please sign in to comment.