diff --git a/.storybook/main.js b/.storybook/main.js index 4f52c58..c393c54 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -1,4 +1,4 @@ module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-knobs/register'] + stories: ["../examples/**/*.stories.js"], + addons: ["@storybook/addon-knobs/register"], }; diff --git a/examples/index.html b/examples/index.html deleted file mode 100644 index d8f02fc..0000000 --- a/examples/index.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - skinview3d - - - - - - -
- - - - - - - - - diff --git a/stories/index.stories.js b/examples/stories/index.stories.js similarity index 91% rename from stories/index.stories.js rename to examples/stories/index.stories.js index 419e70b..86557a9 100644 --- a/stories/index.stories.js +++ b/examples/stories/index.stories.js @@ -1,5 +1,5 @@ /* eslint-disable */ -import * as skinview3d from "../libs/skinview3d"; +import * as skinview3d from "../../libs/skinview3d"; import { withKnobs, radios, number } from "@storybook/addon-knobs"; export default { @@ -14,7 +14,7 @@ const createViewer = () => { const viewer = new skinview3d.SkinViewer(element, { width: 300, height: 400, - skin: "texture/1_8_texturemap_redux.png", + skin: "textures/1_8_texturemap_redux.png", }); console.log(viewer); @@ -88,12 +88,12 @@ export const Textures = () => { }; const capeUrl = radios("Cape Textures", capeOptions, "none"); - viewer.loadSkin(`texture/${skinUrl}.png`); + viewer.loadSkin(`textures/${skinUrl}.png`); if (capeUrl === "none") { viewer.loadCape(null); } else { - viewer.loadCape(`texture/${capeUrl}.png`); + viewer.loadCape(`textures/${capeUrl}.png`); } return element; diff --git a/public/texture/1_8_texturemap_redux.png b/examples/textures/1_8_texturemap_redux.png similarity index 100% rename from public/texture/1_8_texturemap_redux.png rename to examples/textures/1_8_texturemap_redux.png diff --git a/public/texture/Hacksore.png b/examples/textures/Hacksore.png similarity index 100% rename from public/texture/Hacksore.png rename to examples/textures/Hacksore.png diff --git a/examples/textures/README.md b/examples/textures/README.md new file mode 100644 index 0000000..5b6ffa2 --- /dev/null +++ b/examples/textures/README.md @@ -0,0 +1,11 @@ +# Copyright Infomration + +| Texture | Owner | +| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------- | +| Hacksore.png | @Hacksore | +| 1_8_texturemap_redux.png | Mojang Studios | +| cape.png | Mojang Studios | +| mojang_cape.png | Mojang Studios | +| hatsune_miku.png | [xilefian](http://www.minecraftforum.net/forums/mapping-and-modding/skins/2646900-hatsune-miku-skin-1-9-transparency-layers) | +| hd_cape.png | TBD | +| ironman_hd.png | TBD | diff --git a/public/texture/cape.png b/examples/textures/cape.png similarity index 100% rename from public/texture/cape.png rename to examples/textures/cape.png diff --git a/public/texture/hatsune_miku.png b/examples/textures/hatsune_miku.png similarity index 100% rename from public/texture/hatsune_miku.png rename to examples/textures/hatsune_miku.png diff --git a/public/texture/hd_cape.png b/examples/textures/hd_cape.png similarity index 100% rename from public/texture/hd_cape.png rename to examples/textures/hd_cape.png diff --git a/public/texture/ironman_hd.png b/examples/textures/ironman_hd.png similarity index 100% rename from public/texture/ironman_hd.png rename to examples/textures/ironman_hd.png diff --git a/public/texture/mojang_cape.png b/examples/textures/mojang_cape.png similarity index 100% rename from public/texture/mojang_cape.png rename to examples/textures/mojang_cape.png diff --git a/package.json b/package.json index 8fa3eb8..13b605a 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,9 @@ "test": "npm run test:lint", "dev:watch:modules": "tsc -w --declaration --sourceMap --outDir libs -p .", "dev:watch:bundles": "rollup -w -c", - "dev:serve": "ws", - "storybook": "start-storybook -s ./public -p 6006", - "dev": "npm-run-all --parallel dev:watch:modules dev:watch:bundles dev:serve", - "prepublishOnly": "npm run clean && npm run build", - "build-storybook": "build-storybook" + "storybook": "start-storybook -s ./examples -p 6006", + "dev": "npm run storybook", + "prepublishOnly": "npm run clean && npm run build" }, "repository": { "type": "git", @@ -54,7 +52,6 @@ "@yushijinhun/three-minifier-rollup": "^0.1.7", "babel-loader": "^8.1.0", "eslint": "^7.3.1", - "local-web-server": "^4.2.1", "npm-run-all": "^4.1.5", "rimraf": "^3.0.2", "rollup": "^2.18.0", diff --git a/public/texture/haka.png b/public/texture/haka.png deleted file mode 100644 index cfcbfc5..0000000 Binary files a/public/texture/haka.png and /dev/null differ diff --git a/public/texture/sethbling.png b/public/texture/sethbling.png deleted file mode 100644 index db47a84..0000000 Binary files a/public/texture/sethbling.png and /dev/null differ