Skip to content

Commit

Permalink
Set three-stdlib as a peer dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewJSchoen committed Jul 7, 2022
1 parent 7bea7b7 commit 1f9d43c
Show file tree
Hide file tree
Showing 11 changed files with 50,074 additions and 192,790 deletions.
121,402 changes: 25,022 additions & 96,380 deletions dist/index.es.js

Large diffs are not rendered by default.

121,420 changes: 25,031 additions & 96,389 deletions dist/index.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -361,4 +361,4 @@



window['STORIES'] = [{"titlePrefix":"","directory":"./src","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"}];</script><script src="runtime~main.0e20677f.iframe.bundle.js"></script><script src="617.727c3ef4.iframe.bundle.js"></script><script src="main.8b8d1320.iframe.bundle.js"></script></body></html>
window['STORIES'] = [{"titlePrefix":"","directory":"./src","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"}];</script><script src="runtime~main.0e20677f.iframe.bundle.js"></script><script src="819.e97b45b2.iframe.bundle.js"></script><script src="main.36c98c07.iframe.bundle.js"></script></body></html>
1 change: 1 addition & 0 deletions docs/main.36c98c07.iframe.bundle.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/main.8b8d1320.iframe.bundle.js

This file was deleted.

2 changes: 1 addition & 1 deletion docs/project.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"generatedAt":1657155687007,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":false,"hasStorybookEslint":false,"refCount":0,"metaFramework":{"name":"CRA","packageName":"react-scripts","version":"5.0.1"},"packageManager":{"type":"yarn","version":"1.22.18"},"storybookVersion":"6.5.9","language":"javascript","storybookPackages":{"@storybook/addon-actions":{"version":"6.5.9"},"@storybook/addon-interactions":{"version":"6.5.9"},"@storybook/builder-webpack5":{"version":"6.5.9"},"@storybook/manager-webpack5":{"version":"6.5.9"},"@storybook/node-logger":{"version":"6.5.9"},"@storybook/preset-create-react-app":{"version":"4.1.2"},"@storybook/react":{"version":"6.5.9"},"@storybook/testing-library":{"version":"0.0.13"}},"framework":{"name":"react"},"addons":{"@storybook/addon-links":{"version":"6.5.9"},"@storybook/addon-essentials":{"version":"6.5.9"},"@storybook-create-react-app":{"version":null}}}
{"generatedAt":1657157189215,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":false,"hasStorybookEslint":false,"refCount":0,"metaFramework":{"name":"CRA","packageName":"react-scripts","version":"5.0.1"},"packageManager":{"type":"yarn","version":"1.22.18"},"storybookVersion":"6.5.9","language":"javascript","storybookPackages":{"@storybook/addon-actions":{"version":"6.5.9"},"@storybook/addon-interactions":{"version":"6.5.9"},"@storybook/builder-webpack5":{"version":"6.5.9"},"@storybook/manager-webpack5":{"version":"6.5.9"},"@storybook/node-logger":{"version":"6.5.9"},"@storybook/preset-create-react-app":{"version":"4.1.2"},"@storybook/react":{"version":"6.5.9"},"@storybook/testing-library":{"version":"0.0.13"}},"framework":{"name":"react"},"addons":{"@storybook/addon-links":{"version":"6.5.9"},"@storybook/addon-essentials":{"version":"6.5.9"},"@storybook-create-react-app":{"version":null}}}
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "robot-scene",
"version": "0.8.0",
"version": "0.8.1",
"main": "dist/index.js",
"module": "dist/index.es.js",
"private": false,
Expand All @@ -18,9 +18,6 @@
},
"dependencies": {
"@juggle/resize-observer": "^3.3.1",
"@react-three/drei": "^9.2.0",
"@react-three/fiber": "^8.0.10",
"@react-three/postprocessing": "^2.3.2",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^13.5.0",
Expand All @@ -29,8 +26,10 @@
"number-precision": "^1.5.2",
"postprocessing": "^6.26.2",
"react-scripts": "5.0.1",
"three": "^0.139.0",
"three-stdlib": "^2.12.1",
"@react-three/drei": "^9.2.0",
"@react-three/fiber": "^8.0.10",
"@react-three/postprocessing": "^2.3.2",
"three": "^0.142.0",
"web-vitals": "^2.1.4",
"zustand": "^4.0.0-rc.1"
},
Expand Down Expand Up @@ -73,7 +72,8 @@
},
"peerDependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"three-stdlib": "^2.12.1"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
Expand All @@ -97,6 +97,7 @@
"react-dom": "^18.2.0",
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-terser": "^7.0.2",
"webpack": "^5.73.0"
"webpack": "^5.73.0",
"three-stdlib": "^2.12.1"
}
}
7 changes: 3 additions & 4 deletions src/components/Util/StandardMeshes.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
Vector3
} from "three";

// import { RoundedBoxGeometry } from 'three-stdlib';
import { RoundedBoxGeometry } from 'three-stdlib';

import { mergeBufferGeometries } from "three-stdlib/utils/BufferGeometryUtils";

Expand All @@ -32,9 +32,8 @@ export const BOX_GEOM = (params) => {
x = x === undefined ? boxGeomDefaultDim : x;
y = y === undefined ? boxGeomDefaultDim : y;
z = z === undefined ? boxGeomDefaultDim : z;
// RoundedBoxGeometry()
// return new RoundedBoxGeometry(x, y, z, 2, 0.05)
return new BoxBufferGeometry(x,y,z)

return new RoundedBoxGeometry(x, y, z, 2, 0.05)
}
/*
* Sphere Mesh
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13683,10 +13683,10 @@ three-stdlib@^2.10.2, three-stdlib@^2.12.1, three-stdlib@^2.8.11:
potpack "^1.0.1"
zstddec "^0.0.2"

three@^0.139.0:
version "0.139.2"
resolved "https://registry.yarnpkg.com/three/-/three-0.139.2.tgz#b110799a15736df673b9293e31653a4ac73648dd"
integrity sha512-gV7q7QY8rogu7HLFZR9cWnOQAUedUhu2WXAnpr2kdXZP9YDKsG/0ychwQvWkZN5PlNw9mv5MoCTin6zNTXoONg==
three@^0.142.0:
version "0.142.0"
resolved "https://registry.yarnpkg.com/three/-/three-0.142.0.tgz#89e226a16221f212eb1d40f0786604b711f28aed"
integrity sha512-ESjPO+3geFr+ZUfVMpMnF/eVU2uJPOh0e2ZpMFqjNca1wApS9lJb7E4MjwGIczgt9iuKd8PEm6Pfgp2bJ92Xtg==

throat@^6.0.1:
version "6.0.1"
Expand Down

0 comments on commit 1f9d43c

Please sign in to comment.