Ubujira
/
skinview3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'v1.2.x'

This commit is contained in:
yushijinhun 2020-01-01 16:03:27 +08:00
parent 9f6017d14c 7d742b93e9
commit acda22d0e4
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "skinview3d", "name": "skinview3d",
"version": "1.2.0-alpha.1", "version": "1.2.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -164,12 +164,6 @@
"@types/node": "*" "@types/node": "*"
} }
}, },
"@types/three": {
"version": "0.93.4",
"resolved": "https://registry.npmjs.org/@types/three/-/three-0.93.4.tgz",
"integrity": "sha512-39yGI/s870c730jksA2dxlqAFRN3ASUoD8Ljob+CLAOnRKnAea+kr/cRdRx9zRMxS+hL/NSD8GUzN0XV6M3mFQ==",
"dev": true
},
"@webassemblyjs/ast": { "@webassemblyjs/ast": {
"version": "1.8.5", "version": "1.8.5",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
@ -7276,9 +7270,9 @@
} }
}, },
"three": { "three": {
"version": "0.112.0", "version": "0.112.1",
"resolved": "https://registry.npmjs.org/three/-/three-0.112.0.tgz", "resolved": "https://registry.npmjs.org/three/-/three-0.112.1.tgz",
"integrity": "sha512-dX2fm4kmpaEq3A8sMGOBZzI5X132Lzoh+Aw/uFF3iGXnjM0jzxo5vugDbydTQbWU2I31XC1Nn7kIPdyhxx1uqg==" "integrity": "sha512-8I0O74hiYtKl3LgDNcPJbBGOlpekbcJ6fJnImmW3mFdeUFJ2H9Y3/UuUSW2sBdjrIlCM0gvOkaTEFlofO900TQ=="
}, },
"through": { "through": {
"version": "2.3.8", "version": "2.3.8",

5
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "skinview3d", "name": "skinview3d",
"version": "1.2.0", "version": "1.2.1",
"description": "Three.js powered Minecraft skin viewer", "description": "Three.js powered Minecraft skin viewer",
"module": "dist/skinview3d.module.js", "module": "dist/skinview3d.module.js",
"main": "dist/skinview3d.js", "main": "dist/skinview3d.js",
@ -33,13 +33,12 @@
"dist" "dist"
], ],
"dependencies": { "dependencies": {
"three": "^0.112.0" "three": "^0.112.1"
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-node-resolve": "^6.0.0", "@rollup/plugin-node-resolve": "^6.0.0",
"@types/chai": "^4.1.4", "@types/chai": "^4.1.4",
"@types/mocha": "^5.2.5", "@types/mocha": "^5.2.5",
"@types/three": "^0.93.4",
"chai": "^4.2.0", "chai": "^4.2.0",
"karma": "^3.0.0", "karma": "^3.0.0",
"karma-chrome-launcher": "^2.2.0", "karma-chrome-launcher": "^2.2.0",

1
src/viewer.ts
View File

@ -79,7 +79,6 @@ export class SkinViewer {
this.renderer = new WebGLRenderer({ alpha: true, antialias: false }); this.renderer = new WebGLRenderer({ alpha: true, antialias: false });
this.renderer.setSize(300, 300); // default size this.renderer.setSize(300, 300); // default size
this.renderer.context.getShaderInfoLog = () => ""; // shut firefox up
this.domElement.appendChild(this.renderer.domElement); this.domElement.appendChild(this.renderer.domElement);
this.playerObject = new PlayerObject(this.layer1Material, this.layer2Material, this.capeMaterial); this.playerObject = new PlayerObject(this.layer1Material, this.layer2Material, this.capeMaterial);