Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/pmndrs/drei
Browse files Browse the repository at this point in the history
  • Loading branch information
drcmda committed Nov 18, 2024
2 parents 414f1a6 + 1e7de95 commit b30ab59
Show file tree
Hide file tree
Showing 35 changed files with 1,334 additions and 777 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ To check an item, place an "x" in the box like so: "- [x] Documentation"
Remove items that are irrelevant to your changes.
-->

- [ ] Documentation updated ([example](https://github.com/pmndrs/drei/blob/master/README.md#example))
- [ ] Documentation updated ([example](https://github.com/pmndrs/drei/blob/master/docs/misc/example.mdx?plain=1))
- [ ] Storybook entry added ([example](https://github.com/pmndrs/drei/blob/master/.storybook/stories/Example.stories.tsx))
- [ ] Ready to be merged

Expand Down
8 changes: 6 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@ updates:

# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups
groups:

# Always update react and react-dom together
react-packages:
patterns:
- 'react'
- 'react-dom'

rollup-packages:
patterns:
- 'rollup'
- '@rollup/*'
- 'rollup-plugin-*'

#
# pkg.json "dependencies"
#
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
on:
schedule:
- cron: "30 8 * * *"
- cron: '30 8 * * *'
workflow_dispatch: # Allows manual triggering of the workflow

permissions:
contents: write # Necessary for delete-branch option
contents: write # Necessary for delete-branch option
issues: write
pull-requests: write

Expand All @@ -16,7 +16,7 @@ jobs:
with:
operations-per-run: 3000
exempt-all-assignees: true

#
# Issues
#
Expand All @@ -26,7 +26,7 @@ jobs:
Any activity, like adding an update or comment, will automatically remove the stale label so it stays on our radar.
Feel free to reach out on [Discord](https://discord.com/channels/740090768164651008/741751532592038022) if you need support or feedback from the community. This issue will close automatically soon if there’s no further activity. Thank you for understanding and for being part of the project!
close-issue-message: |
We’re closing this issue to keep our project manageable and make room for other active work, but we truly appreciate your effort and contribution.
Expand All @@ -41,7 +41,7 @@ jobs:
Any update, comment, or change to the PR will automatically remove the stale label so it stays active in our workflow.
If you need any help, don’t hesitate to connect with us on [Discord](https://discord.com/channels/740090768164651008/741751532592038022) for feedback and support. This PR will close automatically soon if there’s no further activity, but we’re here to help if you’re interested in getting it merged. Thank you for your contribution!
close-pr-message: |
We’re closing this pull request to help manage our workload and focus on active contributions. We really appreciate the effort you put into this, and we’d be happy to revisit it anytime you’re ready.
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
yarn pretty-quick --staged
yarn eslint:ci --quiet
yarn eslint:ci
yarn typecheck
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
dist/
storybook-static/
public/
*.typeface.json

# waiting for mdx3 support some day (https://github.com/prettier/prettier/issues/12209)
*.mdx
300 changes: 300 additions & 0 deletions .storybook/public/cyclops.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,300 @@
{"frames": {

"Attacking_000":
{
"frame": {"x":1,"y":1,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_001":
{
"frame": {"x":643,"y":1,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_002":
{
"frame": {"x":1285,"y":1,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_003":
{
"frame": {"x":1927,"y":1,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_004":
{
"frame": {"x":2569,"y":1,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_005":
{
"frame": {"x":3211,"y":1,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_006":
{
"frame": {"x":1,"y":483,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_007":
{
"frame": {"x":643,"y":483,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_008":
{
"frame": {"x":1285,"y":483,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_009":
{
"frame": {"x":1927,"y":483,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_010":
{
"frame": {"x":2569,"y":483,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Attacking_011":
{
"frame": {"x":3211,"y":483,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_000":
{
"frame": {"x":1,"y":965,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_001":
{
"frame": {"x":643,"y":965,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_002":
{
"frame": {"x":1285,"y":965,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_003":
{
"frame": {"x":1927,"y":965,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_004":
{
"frame": {"x":2569,"y":965,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_005":
{
"frame": {"x":3211,"y":965,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_006":
{
"frame": {"x":1,"y":1447,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_007":
{
"frame": {"x":643,"y":1447,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_008":
{
"frame": {"x":1285,"y":1447,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_009":
{
"frame": {"x":1927,"y":1447,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_010":
{
"frame": {"x":2569,"y":1447,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Hurt_011":
{
"frame": {"x":3211,"y":1447,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_000":
{
"frame": {"x":1,"y":1929,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_001":
{
"frame": {"x":643,"y":1929,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_002":
{
"frame": {"x":1285,"y":1929,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_003":
{
"frame": {"x":1927,"y":1929,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_004":
{
"frame": {"x":2569,"y":1929,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_005":
{
"frame": {"x":3211,"y":1929,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_006":
{
"frame": {"x":1,"y":2411,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_007":
{
"frame": {"x":643,"y":2411,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_008":
{
"frame": {"x":1285,"y":2411,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_009":
{
"frame": {"x":1927,"y":2411,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_010":
{
"frame": {"x":2569,"y":2411,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
},
"Idle_011":
{
"frame": {"x":3211,"y":2411,"w":640,"h":480},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {"x":0,"y":0,"w":640,"h":480},
"sourceSize": {"w":640,"h":480}
}},
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "1.0",
"image": "cyclops.png",
"format": "RGBA8888",
"size": {"w":3852,"h":2892},
"scale": "1",
"smartupdate": "$TexturePacker:SmartUpdate:0e87593e152aa1b96dcc023abeafd158:bb7257f44207a87046359dab31983daf:cf3b5afa5774b99a9ed80f2056562301$"
}
}
Binary file added .storybook/public/cyclops.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .storybook/public/fonts/lemon-round.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion .storybook/stories/Line.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const points = GeometryUtils.hilbert3D(new Vector3(0), 5).map((p) => [p.x, p.y,
const colors = new Array(points.length).fill(0).map(() => [Math.random(), Math.random(), Math.random()]) as [
number,
number,
number
number,
][]

export default {
Expand Down
Loading

0 comments on commit b30ab59

Please sign in to comment.