From 9ee1f286a7a1568fe9c7ec259af4343fdb9cfb9c Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Tue, 31 Jul 2018 16:46:15 +0800
Subject: [PATCH] Support model detection when uploading textures

---
 resources/assets/src/js/common/skinview3d.js |  2 ++
 resources/assets/src/js/skinlib/upload.js    | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/resources/assets/src/js/common/skinview3d.js b/resources/assets/src/js/common/skinview3d.js
index d2d096f3..ebf12885 100644
--- a/resources/assets/src/js/common/skinview3d.js
+++ b/resources/assets/src/js/common/skinview3d.js
@@ -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
diff --git a/resources/assets/src/js/skinlib/upload.js b/resources/assets/src/js/skinlib/upload.js
index a5104bba..099525ca 100644
--- a/resources/assets/src/js/skinlib/upload.js
+++ b/resources/assets/src/js/skinlib/upload.js
@@ -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')) {