Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support model detection when uploading textures

Browse Source
This commit is contained in:
printempw 2018-07-31 16:46:15 +08:00
parent 298791a4e5
commit 9ee1f286a7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/src/js/common/skinview3d.js
View File

@ -20,6 +20,8 @@ function initSkinViewer(cameraPositionZ = 70) {
$.msp.viewer = new skinview3d.SkinViewer($.msp.config);
$.msp.viewer.camera.position.z = cameraPositionZ;
// Disable auto model detection
$.msp.viewer.detectModel = false;
$.msp.viewer.animation = new skinview3d.CompositeAnimation();
// Init all available animations and pause them

15
resources/assets/src/js/skinlib/upload.js
View File

@ -1,4 +1,4 @@
/* global initSkinViewer, defaultSteveSkin, defaultAlexSkin */
/* global skinview3d, initSkinViewer, defaultSteveSkin, defaultAlexSkin */
// TODO: Help wanted. This file needs to be tested.
@ -14,11 +14,10 @@ function initUploadListeners() {
.on('ifToggled', '#type-cape', () => handleFiles())
.on('change', '#skin-type', function () {
if ($('#file').prop('files').length === 0) {
$.msp.config.slim = ($(this).val() === 'alex');
$.msp.config.skinUrl = getDefaultSkin();
initSkinViewer();
// Load default skin
$.msp.viewer.skinUrl = getDefaultSkin();
}
handleFiles();
$.msp.viewer.playerObject.skin.slim = ($(this).val() === 'alex');
})
.on('ifToggled', '#type-skin', function () {
$(this).prop('checked') ? $('#skin-type').show() : $('#skin-type').hide();
@ -66,14 +65,16 @@ function handleFiles(files, type) {
if (img.width === img.height || img.width / img.height === 2) {
$.msp.config.skinUrl = img.src;
$.msp.config.capeUrl = null;
// Determine model from texture image
$.msp.config.slim = skinview3d.isSlimSkin(img);
$('#skin-type').val($.msp.config.slim ? 'alex' : 'steve');
} else {
$.msp.config.skinUrl = getDefaultSkin();
toastr.warning(trans('skinlib.badSkinSize'));
}
}
$.msp.config.slim = ($('#skin-type').val() === 'alex');
initSkinViewer();
if ($name.val() === '' || $name.val() === $name.attr('data-last-file-name')) {