From 2eab303457ddd295a9184cfd513fe6c097938f30 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 4 May 2019 13:31:46 +0800
Subject: [PATCH] Fix previewing alex textures

---
 resources/assets/src/components/Previewer.vue | 7 +++++++
 resources/assets/src/views/skinlib/Show.vue   | 1 +
 resources/assets/src/views/skinlib/Upload.vue | 1 +
 resources/assets/src/views/user/Closet.vue    | 2 ++
 resources/assets/src/views/user/Players.vue   | 2 ++
 resources/misc/changelogs/en/4.1.4.md         | 1 +
 resources/misc/changelogs/zh_CN/4.1.4.md      | 1 +
 7 files changed, 15 insertions(+)

diff --git a/resources/assets/src/components/Previewer.vue b/resources/assets/src/components/Previewer.vue
index c7717bd4..bdfa21d8 100644
--- a/resources/assets/src/components/Previewer.vue
+++ b/resources/assets/src/components/Previewer.vue
@@ -58,6 +58,10 @@ export default {
   props: {
     skin: String,
     cape: String,
+    model: {
+      type: String,
+      default: 'steve',
+    },
     closetMode: Boolean,
     title: {
       type: String,
@@ -106,6 +110,9 @@ export default {
       }
       this.viewer.capeUrl = url
     },
+    model(value) {
+      this.viewer.playerObject.skin.slim = value === 'alex'
+    },
   },
   mounted() {
     this.initPreviewer()
diff --git a/resources/assets/src/views/skinlib/Show.vue b/resources/assets/src/views/skinlib/Show.vue
index 7b3b7c03..d18328cb 100644
--- a/resources/assets/src/views/skinlib/Show.vue
+++ b/resources/assets/src/views/skinlib/Show.vue
@@ -4,6 +4,7 @@
       <previewer
         :skin="type !== 'cape' && textureUrl"
         :cape="type === 'cape' ? textureUrl : ''"
+        :model="type"
         :init-position-z="60"
       >
         <template #footer>
diff --git a/resources/assets/src/views/skinlib/Upload.vue b/resources/assets/src/views/skinlib/Upload.vue
index 34d49302..28fe5931 100644
--- a/resources/assets/src/views/skinlib/Upload.vue
+++ b/resources/assets/src/views/skinlib/Upload.vue
@@ -91,6 +91,7 @@
         <previewer
           :skin="type !== 'cape' && texture"
           :cape="type === 'cape' ? texture : ''"
+          :model="type"
         />
       </div>
     </div>
diff --git a/resources/assets/src/views/user/Closet.vue b/resources/assets/src/views/user/Closet.vue
index cb32330e..43a70211 100644
--- a/resources/assets/src/views/user/Closet.vue
+++ b/resources/assets/src/views/user/Closet.vue
@@ -176,6 +176,7 @@ export default {
     capeTotalPages: 1,
     selectedSkin: 0,
     skinUrl: '',
+    model: 'steve',
     selectedCape: 0,
     capeUrl: '',
     linkToSkin: `${blessing.base_url}/skinlib?filter=skin`,
@@ -236,6 +237,7 @@ export default {
       } else {
         this.skinUrl = `/textures/${hash}`
         this.selectedSkin = tid
+        this.model = type
       }
     },
     resetSelected() {
diff --git a/resources/assets/src/views/user/Players.vue b/resources/assets/src/views/user/Players.vue
index aeec8d5d..29e64d12 100644
--- a/resources/assets/src/views/user/Players.vue
+++ b/resources/assets/src/views/user/Players.vue
@@ -180,6 +180,7 @@ export default {
       using3dPreviewer: true,
       skinUrl: '',
       capeUrl: '',
+      model: 'steve',
       preview2d: {
         skin: 0,
         cape: 0,
@@ -209,6 +210,7 @@ export default {
       if (player.tid_skin) {
         const { data: skin } = await this.$http.get(`/skinlib/info/${player.tid_skin}`)
         this.skinUrl = `${this.baseUrl}/textures/${skin.hash}`
+        this.model = skin.type
       } else {
         this.skinUrl = ''
       }
diff --git a/resources/misc/changelogs/en/4.1.4.md b/resources/misc/changelogs/en/4.1.4.md
index 0e5237b7..0ba201a2 100644
--- a/resources/misc/changelogs/en/4.1.4.md
+++ b/resources/misc/changelogs/en/4.1.4.md
@@ -1,3 +1,4 @@
 ## Fixed
 
 - Fixed dropdown menu of skin library for mobile users.
+- Fixed previewing alex textures.
diff --git a/resources/misc/changelogs/zh_CN/4.1.4.md b/resources/misc/changelogs/zh_CN/4.1.4.md
index 93cf04fe..e30be515 100644
--- a/resources/misc/changelogs/zh_CN/4.1.4.md
+++ b/resources/misc/changelogs/zh_CN/4.1.4.md
@@ -1,3 +1,4 @@
 ## 修复
 
 - 修复移动端下皮肤库下拉菜单失效的问题
+- 修复 Alex 材质的预览