From 6b3446cf86a1e2d99b1ce6808e2f9269f07cbe82 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 12 Jan 2020 09:57:55 +0800
Subject: [PATCH] display 3D avatar when applying texture to player

---
 app/Http/Controllers/TextureController.php    |  25 ++++++++++++------
 .../src/components/ApplyToPlayerDialog.vue    |   2 +-
 resources/assets/src/components/Previewer.vue |   2 +-
 .../components/ApplyToPlayerDialog.test.ts    |   2 +-
 .../assets/tests/views/user/Closet.test.ts    |   2 +-
 resources/misc/changelogs/en/5.0.0.md         |   2 ++
 resources/misc/changelogs/zh_CN/5.0.0.md      |   2 ++
 .../misc/textures/avatar2d.png                | Bin
 resources/misc/textures/avatar3d.png          | Bin 0 -> 11612 bytes
 .../src/images => misc}/textures/steve.png    | Bin
 storage/static_textures/broken.png            | Bin 185 -> 0 bytes
 .../ControllersTest/TextureControllerTest.php |   9 +++++++
 12 files changed, 34 insertions(+), 12 deletions(-)
 rename storage/static_textures/avatar.png => resources/misc/textures/avatar2d.png (100%)
 create mode 100644 resources/misc/textures/avatar3d.png
 rename resources/{assets/src/images => misc}/textures/steve.png (100%)
 delete mode 100644 storage/static_textures/broken.png

diff --git a/app/Http/Controllers/TextureController.php b/app/Http/Controllers/TextureController.php
index c0074e52..4cfe0ed6 100644
--- a/app/Http/Controllers/TextureController.php
+++ b/app/Http/Controllers/TextureController.php
@@ -106,28 +106,31 @@ class TextureController extends Controller
     {
         $player = Player::where('name', $name)->firstOrFail();
 
-        return $this->avatar($minecraft, $player->skin, (int) $request->query('size', 100));
+        return $this->avatar($minecraft, $request, $player->skin);
     }
 
     public function avatarByUser(Minecraft $minecraft, Request $request, $uid)
     {
         $texture = Texture::find(optional(User::find($uid))->avatar);
 
-        return $this->avatar($minecraft, $texture, (int) $request->query('size', 100));
+        return $this->avatar($minecraft, $request, $texture);
     }
 
     public function avatarByTexture(Minecraft $minecraft, Request $request, $tid)
     {
         $texture = Texture::find($tid);
 
-        return $this->avatar($minecraft, $texture, (int) $request->query('size', 100));
+        return $this->avatar($minecraft, $request, $texture);
     }
 
-    protected function avatar(Minecraft $minecraft, Texture $texture = null, int $size = 100)
+    protected function avatar(Minecraft $minecraft, Request $request, Texture $texture = null)
     {
+        $size = (int) $request->query('size', 100);
+        $mode = $request->has('3d') ? '3d' : '2d';
+
         $disk = Storage::disk('textures');
         if (is_null($texture) || $disk->missing($texture->hash)) {
-            return Image::make(storage_path('static_textures/avatar.png'))
+            return Image::make(resource_path("misc/textures/avatar$mode.png"))
                 ->resize($size, $size)
                 ->response('png', 100);
         }
@@ -135,10 +138,16 @@ class TextureController extends Controller
         $hash = $texture->hash;
         $now = Carbon::now();
         $response = Cache::remember(
-            'avatar-2d-t'.$texture->tid.'-s'.$size,
+            'avatar-'.$mode.'-t'.$texture->tid.'-s'.$size,
             option('enable_avatar_cache') ? $now->addYear() : $now->addMinute(),
-            function () use ($minecraft, $disk, $hash, $size) {
-                $image = $minecraft->render2dAvatar($disk->get($hash), 25);
+            function () use ($minecraft, $disk, $hash, $size, $mode) {
+                $file = $disk->get($hash);
+                if ($mode === '3d') {
+                    $image = $minecraft->render3dAvatar($file, 25);
+                } else {
+                    $image = $minecraft->render2dAvatar($file, 25);
+                }
+
                 $lastModified = Carbon::createFromTimestamp($disk->lastModified($hash));
 
                 return Image::make($image)
diff --git a/resources/assets/src/components/ApplyToPlayerDialog.vue b/resources/assets/src/components/ApplyToPlayerDialog.vue
index 7e926608..6d26b18a 100644
--- a/resources/assets/src/components/ApplyToPlayerDialog.vue
+++ b/resources/assets/src/components/ApplyToPlayerDialog.vue
@@ -92,7 +92,7 @@ export default {
       }
     },
     avatarUrl(player) {
-      return `${blessing.base_url}/avatar/${player.tid_skin}?size=35`
+      return `${blessing.base_url}/avatar/${player.tid_skin}?3d&size=35`
     },
   },
 }
diff --git a/resources/assets/src/components/Previewer.vue b/resources/assets/src/components/Previewer.vue
index 4a33c1ce..7e30cfe4 100644
--- a/resources/assets/src/components/Previewer.vue
+++ b/resources/assets/src/components/Previewer.vue
@@ -53,7 +53,7 @@
 <script>
 import * as skinview3d from 'skinview3d'
 import { emit } from '../scripts/event'
-import SkinSteve from '../images/textures/steve.png'
+import SkinSteve from '../../../misc/textures/steve.png'
 
 export default {
   name: 'Previewer',
diff --git a/resources/assets/tests/components/ApplyToPlayerDialog.test.ts b/resources/assets/tests/components/ApplyToPlayerDialog.test.ts
index 55612143..e3b5e5fd 100644
--- a/resources/assets/tests/components/ApplyToPlayerDialog.test.ts
+++ b/resources/assets/tests/components/ApplyToPlayerDialog.test.ts
@@ -48,5 +48,5 @@ test('compute avatar URL', () => {
   // eslint-disable-next-line camelcase
   const wrapper = mount<Vue & { avatarUrl(player: { tid_skin: number }): string }>(ApplyToPlayerDialog)
   const { avatarUrl } = wrapper.vm
-  expect(avatarUrl({ tid_skin: 1 })).toBe('/avatar/1?size=35')
+  expect(avatarUrl({ tid_skin: 1 })).toBe('/avatar/1?3d&size=35')
 })
diff --git a/resources/assets/tests/views/user/Closet.test.ts b/resources/assets/tests/views/user/Closet.test.ts
index 8d854923..feab6776 100644
--- a/resources/assets/tests/views/user/Closet.test.ts
+++ b/resources/assets/tests/views/user/Closet.test.ts
@@ -210,7 +210,7 @@ test('apply texture', async () => {
   button.trigger('click')
   await flushPromises()
   expect(wrapper.find('input[type="radio"]').attributes('value')).toBe('1')
-  expect(wrapper.find('.model-label > img').attributes('src')).toBe('/avatar/10?size=35')
+  expect(wrapper.find('.model-label > img').attributes('src')).toBe('/avatar/10?3d&size=35')
   expect(wrapper.find('.modal-body').text()).toContain('name')
   jest.runAllTimers()
 })
diff --git a/resources/misc/changelogs/en/5.0.0.md b/resources/misc/changelogs/en/5.0.0.md
index 200d2267..bcba5d09 100644
--- a/resources/misc/changelogs/en/5.0.0.md
+++ b/resources/misc/changelogs/en/5.0.0.md
@@ -32,6 +32,8 @@
 - Optimized performance of invoking texture previewer (skinview3d).
 - Changed method of retrieving IP.
 - Use `utf8mb4` encoding in MySQL/MariaDB.
+- Switched to a new PHP texture renderer.
+- Display 3D avatar of player when applying texture to player.
 
 ## Fixed
 
diff --git a/resources/misc/changelogs/zh_CN/5.0.0.md b/resources/misc/changelogs/zh_CN/5.0.0.md
index 203722c9..d3639822 100644
--- a/resources/misc/changelogs/zh_CN/5.0.0.md
+++ b/resources/misc/changelogs/zh_CN/5.0.0.md
@@ -32,6 +32,8 @@
 - 优化调用材质预览器（skinview3d）的性能
 - 修改获取 IP 地址的方法
 - MySQL/MariaDB 使用 `utf8mb4` 编码
+- 使用新的 PHP 材质渲染器
+- 将材质应用到角色时显示角色的 3D 头像
 
 ## 修复
 
diff --git a/storage/static_textures/avatar.png b/resources/misc/textures/avatar2d.png
similarity index 100%
rename from storage/static_textures/avatar.png
rename to resources/misc/textures/avatar2d.png
diff --git a/resources/misc/textures/avatar3d.png b/resources/misc/textures/avatar3d.png
new file mode 100644
index 0000000000000000000000000000000000000000..af7726702d8b236d282dbdb462c8c218b029c845
GIT binary patch
literal 11612
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
a>Hh;_Fe$D#k=x|}0000<MNUMnLSTZncd?cL

literal 0
HcmV?d00001

diff --git a/resources/assets/src/images/textures/steve.png b/resources/misc/textures/steve.png
similarity index 100%
rename from resources/assets/src/images/textures/steve.png
rename to resources/misc/textures/steve.png
diff --git a/storage/static_textures/broken.png b/storage/static_textures/broken.png
deleted file mode 100644
index ca66be1fa3ca8b9dc6e76d022fa08d24b0a83642..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^(}1{@kr_xf_fDPyq}T#{LR^7#aB%R7O!faj7Gp_}
zUoeBivm0qZ4rhT!WHAE+w=f7ZGR&GI0TlG{ba4#v=uA$KU|pOb!c+R;|NsB&Pr7Uq
zHcVLP(6h5KW+Ri=kvIP*>mEDMaJ2StM9+WzpGmA|&ZczpPN;9plu<s{DJl)p8X(TV
Y@M1#*n|~KyJJ4JPPgg&ebxsLQ03fqEasU7T

diff --git a/tests/HttpTest/ControllersTest/TextureControllerTest.php b/tests/HttpTest/ControllersTest/TextureControllerTest.php
index cbe6d703..b56b7ca9 100644
--- a/tests/HttpTest/ControllersTest/TextureControllerTest.php
+++ b/tests/HttpTest/ControllersTest/TextureControllerTest.php
@@ -225,5 +225,14 @@ class TextureControllerTest extends TestCase
         $this->assertEquals(50, $image->width());
         $this->assertEquals(50, $image->height());
         $this->assertTrue(Cache::has('avatar-2d-t'.$texture->tid.'-s50'));
+
+        $image = $this->get('/avatar/'.$texture->tid.'?3d')
+            ->assertSuccessful()
+            ->assertHeader('Content-Type', 'image/png')
+            ->getContent();
+        $image = Image::make($image);
+        $this->assertEquals(100, $image->width());
+        $this->assertEquals(100, $image->height());
+        $this->assertTrue(Cache::has('avatar-3d-t'.$texture->tid.'-s100'));
     }
 }