From ad4cec2008450c5ce5471def6f53206b0aa5057f Mon Sep 17 00:00:00 2001
From: Sean Boult <996134+Hacksore@users.noreply.github.com>
Date: Mon, 13 Jul 2020 13:22:31 -0500
Subject: [PATCH] Update from review feedback
---
.storybook/main.js | 4 +-
examples/index.html | 40 ------------------
.../stories}/index.stories.js | 8 ++--
.../textures}/1_8_texturemap_redux.png | Bin
.../textures}/Hacksore.png | Bin
examples/textures/README.md | 11 +++++
.../texture => examples/textures}/cape.png | Bin
.../textures}/hatsune_miku.png | Bin
.../texture => examples/textures}/hd_cape.png | Bin
.../textures}/ironman_hd.png | Bin
.../textures}/mojang_cape.png | Bin
package.json | 9 ++--
public/texture/haka.png | Bin 1973 -> 0 bytes
public/texture/sethbling.png | Bin 1469 -> 0 bytes
14 files changed, 20 insertions(+), 52 deletions(-)
delete mode 100644 examples/index.html
rename {stories => examples/stories}/index.stories.js (91%)
rename {public/texture => examples/textures}/1_8_texturemap_redux.png (100%)
rename {public/texture => examples/textures}/Hacksore.png (100%)
create mode 100644 examples/textures/README.md
rename {public/texture => examples/textures}/cape.png (100%)
rename {public/texture => examples/textures}/hatsune_miku.png (100%)
rename {public/texture => examples/textures}/hd_cape.png (100%)
rename {public/texture => examples/textures}/ironman_hd.png (100%)
rename {public/texture => examples/textures}/mojang_cape.png (100%)
delete mode 100644 public/texture/haka.png
delete mode 100644 public/texture/sethbling.png
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 cfcbfc5cb8439ff711c588e451a5556b5251f52e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1973
zcmV;m2TJ&fP)H1O){J1_cEM1_lQP1_%cS2nYxX2M7rX2?_`a3JD1c3JMDe
z3JVJh3?6BQK|77`Q|78Vy16&Ms27#J8C6&D#678w^88WtED
z8X6lH85%CMO^xCnqN;Atfj%C@CT(DkCN0EHNo9
zF)=YSDlRiKGc+qNG%PSSEipDWHa9LZH#avpE;BedI5{sgIxsalIyyTsHaj~zJTf;u
zGdMmpIX^WzKsGx-KtMt^JVHW3Mmj)9JVHoBNJ%|IN!zFAq*%9h
zUFToCa}$Em@ZqE95%1xF-^)4Y-kWm>qG=?Bfl5fqYBDLHf^bjORE
z#e_3-XDW&kXRZ!lJtp+`-C*Joysfe7rsi`N&rwVs#rS?E64F!C(*WT6-F!OE5JY~i
zns;BdZQt?n)YS2D@a%SeIXrahqYpkFVs#xyz`p;*=Y7MUeD>)?fDL~YW^eTbsB`l%
zL9Gyw{hd2d38E-OiWMy~K63MVGF!2ykOXt4AZSIk2;Y-ax_$?8fD`49SMp06vjXfECZyyKF~B_*Po%T?jh$6h?758|kIy}3?6(YhV^_x+x5wib
zql(Bg=8@jp+uN>%sa2)|aIIJHY_DVtG+N7|euh2AnGBYtTqw6a(Bt?;INQZNP
z0oXTToFw54$O$l#MqCR(0~H|`g$-QzQJMl#2>#fnZ@{n~2qpk=(#eAap+F#jTm}N(
z;GjVS7Gmwbq+^5`Db3jcpbm#I0rW168XZL-f>Rh`?LH^zT-y}F*qVBXB|Iw2qad1^
z0+HQEoUTKLCV(XAlL*4C1TY~CcSsK6xI=7EhTD`h{Uj7o=g^Ru!jL@zBLg!8%H={>
z1b|cu0{|wQ0NE^Jn;L{M!OQ`t5WryvWp;X+m4ikK5CR0if?T4mUn5O`#Mx57h(NOj
z;V>>73StplXMmR&Z(KRmrl{NNurb40m`Z6#I*IA
zb}m5T)N*3QT2;LiKq-|vr_dTi+-|=4twe(NGHxclnTtfmM0G9`QRmZwpNUM)-^+Cb
zh;Fa4Y`XV~W6a=Sv$@BYx5}mU?UJ7v;I+p)<&FS>@r>k6SB-f+1AQJQR$7mE6U*zx
z+qGKGe{(=cm&)mm03Rc?s-F=UCfb~k#KgGhkBHvB_pZ8qV-cP>uVpIv)xtt9M_kk<
zH#gIzjg8EO0Yv$SYINc0B>k+Ork1=-J5(-3@
zJ5T{Rye$91aoR7_E({EfgGQq@OTr_}-c++o^OIcx51;MsHGt6SpYRa11D1Z-DRc!)
z%-nr&uz#>`1DuMW_|vx56#)7NjfOpi(-EZS3h|D$z>VWBC($$v4l^sdZav10-VDu^
z=i#<#%ZVsFTrwps;T-$TCJ7w@rUmFhRwKa#JRkUdjF_$cT)n-uRVX}ue7haMW%M{?
z7-jWB!=N|%z21?SR@3s8s#@5tsciwsoEfmWtQ0uTOu;+QKj;^tydaDTqLLVK09sAb
zm>UAfng@^}C&``%ilVF}aL+|9YaZZ?A`a2#0T?B~JsS@mRt>mj4SE7xRtC+%0|Urw
z*C}JZkj@8yVJmDQkhP6ca~scB1B551u(6Y8ccIfwtXR*5-a8~<2q^P`r1qKKD00000NkvXX
Hu0mjfu);A-
diff --git a/public/texture/sethbling.png b/public/texture/sethbling.png
deleted file mode 100644
index db47a845b4c139e9df1bf41b38eee5c6c20062cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1469
zcmV;u1w#6XP)004R=004l4008;_004mK004C`008P>0026d000+nm#LZ5000F@
zNkl>o=cJ#6?B;z%-{#IwM{S2!LC5_W#ucd9cg9
z|H7bl=paSr0|XEgC7NLX-SfD_$N{)KPe_hf01!YV1%QMg1S11{9;H?w&=LRy5YYjE
z>~Zu!7|H-3fGExasVQY-$qg0&5I{r+z>D|T*+U%w1Q1Cn0OWCOp2rr`Lm~D-03d*<
zQVW0pvWKbZc~DhHjvTQ7Ab=R%gc7^deq1YJFUHlQU~&^{A?qJ2PaN2FwSM8
zN)-qK00G28NCC+63vWZh=+TC5FfA8Q3Z~;#8L3_#pvNl6qad;W$-fxb)%zIK)fpIW
zGFUO(n)?MVhpwI!01!Yp0{|B5&D~vKT2Wkr;o90pIQ#y~7ht*CQb=+qHz2SjW8~Hy
zxFv|z+Eb4|4h(%vIS?OLfZ!4b2q26AfO%X*3_`=2v>?DNB#)vNBnMLm1C*o)Y|UDH
zO52q16(pvOAMqaY7~0z%y}0W7v1McWAm&t{+q5Z~Ot9j*sv#+z3VGeLm>qp<;y
zTP|CshOK<$_K56p@<^%DwM5C8}uZ~(v@2y-yZL&!-UY#|N+^E}Aov}z>b
zv!42{9VW|Ke;ER1?
z0YCsTqK^m2`PKdZ`0*nHKR-VMh&Fh<6h;2vy*GF*1roVhqyftrbz@a&%@XXqNM2u2q26AK=wR{j(5@^*-#_&pDz=?nk@h+qm>xbFsvd=dczLG|m|otwaH&Kr;bIQx(dBF6`;dp}V(
z1%Q%0auy&J00a;tpIzR6kmdYxx)`2EreO|57eD>~0*0aBd=3OKIdncca1pQv)3sOE
zgXw1NKrp@M!$Hd1{2RC8EfW9&hy~&i%$UcdF|!A_jQD_QC|Dc_4qk;6g8bSLJ~p)=
z01jXvfHhi5pnQ4&fB<5FS&rZHAK?zgCJq9i799+H{B#+`l8=ud{DYqnYLHuKumFPv
z5Hg?AF0UE^d4K?-I0e9B85w+-%gMlCZ5#{&$=|^RD+t5**gOx@15$^LPip`WKor*k
z@cfDeAg3;J0jMUR1Q41z0tg@$SmT43G639Eg_e78ngM&DAO{X%vvJeNWd&IQKtLWK
zfEeu*g~4s>3w*YC6&idxj8&YFK1#u^rIZb@nrmC)O#uJ_!~$>X?!)du7{JvezHl2y
z3IJAp;A{n|0&!#=VrX(&cccJ-0D?D#VIBlEeX+4|0h}Iyc^;n{B4}Xmj^V-UTVQiQ
zY;1s#JU##rKr9*xJPbD;d|?35uzha~00=Mu
XfQ3%OJ~(3H00000NkvXXu0mjf0cKJ_