Skip to content

Commit

Permalink
Merge pull request #37 from readyplayerme/feat/support-for-post-proce…
Browse files Browse the repository at this point in the history
…ssing-bloom

feat/support post processing bloom effects
  • Loading branch information
Zaehiel authored Aug 2, 2023
2 parents 47a98d7 + 1e2afc3 commit e41707f
Show file tree
Hide file tree
Showing 30 changed files with 30,197 additions and 35,711 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module.exports = {
rules: {
'import/prefer-default-export': 'off',
'import/no-extraneous-dependencies': 'off',
'react/no-unknown-property': 'off',
'react/jsx-filename-extension': [
1,
{
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- main
- "feature/**"
- "feat/**"
- "hotfix/**"

concurrency:
Expand All @@ -20,11 +21,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '17.x'
node-version: '18.x'
- name: Install deps
run: npm ci
- name: Run linter
Expand All @@ -34,11 +35,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '17.x'
node-version: '18.x'
- name: Install deps
run: npm ci
- name: Run tests
Expand All @@ -58,7 +59,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '17.x'
node-version: '18.x'
- name: 🛠 Install & Build
run: |
npm ci
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,6 @@ typings/
.env.development.local
.env.test.local
.env.production.local

# Storybook
storybook-static
Empty file modified .husky/commit-msg
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm test
npx lint-staged
3 changes: 2 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
engine-strict=true
engine-strict=true
auto-install-peers=true
4 changes: 2 additions & 2 deletions .storybook/index.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
html,
body,
#root {
#storybook-root {
width: 100%;
height: 100%;
margin: 0;
Expand All @@ -13,7 +13,7 @@ body,
user-select: none;
}

#root {
#storybook-root {
overflow: auto;
height: 100%;
width: 100%;
Expand Down
9 changes: 6 additions & 3 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ module.exports = {
typescript: {
check: true
},
framework: '@storybook/react',
core: {
builder: 'webpack5'
framework: {
name: '@storybook/react-webpack5',
options: {}
},
docs: {
autodocs: true,
}
};
8 changes: 3 additions & 5 deletions .storybook/theme.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { create } from '@storybook/theming';
import logo from './logo.png';
import { create, themes } from '@storybook/theming';

export default create({
base: 'light',
brandImage: logo,
brandUlr: 'https://readyplayer.me',
appBg: '#fafafa'
brandImage: '/logo.png',
brandUrl: 'https://readyplayer.me',
});
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ npm install @readyplayerme/visage

Make sure to install peer-dependencies if your project doesn't already include them:
```sh
npm install @react-three/drei @react-three/fiber three three-stdlib suspend-react
npm install @react-three/drei@9.79.3 @react-three/fiber@8.13.15 @react-three/[email protected] three@0.154 three-stdlib@2.23.13 suspend-react@0.1.3 [email protected]
```

# Documentation & examples
Expand Down Expand Up @@ -46,7 +46,7 @@ Supported resource formats are:
* Base64 strings
* `data:application/octet-stream;base64`
* `data:model/gltf-binary;base64`
* Binary input as `model/gltf-binary`
* Binary input such as `model/gltf-binary`

## License

Expand Down
Loading

0 comments on commit e41707f

Please sign in to comment.