Merge pull request #7 from yushijinhun/master

Fix #5, #6
This commit is contained in:
Sean Boult 2017-09-02 21:50:56 -05:00 committed by GitHub
commit ffdae88b43
3 changed files with 4 additions and 3 deletions

View File

@ -39,5 +39,6 @@ $(() => {
* `/img/mojang_cape.png` Copyright Mojang AB. [Link](https://minecraft.gamepedia.com/File:MojangCape2016.png)
* `/img/hatsune_miku.png` Copyright xilefian. [Link](http://www.minecraftforum.net/forums/mapping-and-modding/skins/2646900-hatsune-miku-skin-1-9-transparency-layers)
* `/img/1_8_texturemap_redux.png` Copyright Mojang AB. [Link](https://minecraft.gamepedia.com/File:1_8_texturemap_redux.png)
* `/img/steve_old.png` Copyright Mojang AB. [Link](https://minecraft.gamepedia.com/File:Char.png)
Other parts of the repository are licensed under GPLv3 License.

BIN
img/steve_old.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 965 B

View File

@ -42,7 +42,7 @@ var skinpreview3d = new function(){
var convertSkinTo1_8 = (context, width) => {
var scale = width/64.0;
var copySkin = (context, sX, sY, w, h, dX, dY, flipHorizontal) => this.copyImage(context, sX*scale, sY*scale, w*scale, h*scale, dX*scale, dY*scale, flipHorizontal);
var copySkin = (context, sX, sY, w, h, dX, dY, flipHorizontal) => copyImage(context, sX*scale, sY*scale, w*scale, h*scale, dX*scale, dY*scale, flipHorizontal);
copySkin(context, 4, 16, 4, 4, 20, 48, true); // Top Leg
copySkin(context, 8, 16, 4, 4, 24, 48, true); // Bottom Leg
@ -399,7 +399,7 @@ var skinpreview3d = new function(){
capePivot.rotation.x = 25 * (Math.PI/180);
this.scene.add(capePivot);
this.domElement.append(this.renderer.domElement);
this.domElement.appendChild(this.renderer.domElement);
}
skinImg.crossOrigin = '';
@ -420,7 +420,7 @@ var skinpreview3d = new function(){
skinCanvas.height = width;
skinContext.clearRect(0, 0, width, width);
skinContext.drawImage(skinImg, 0, 0, width, width/2.0);
utils.convertSkinTo1_8(skinContext, width);
convertSkinTo1_8(skinContext, width);
} else {
skinCanvas.width = skinImg.width;
skinCanvas.height = skinImg.height;