From 07565d42c4f70361f728808f97711741de2a2b9a Mon Sep 17 00:00:00 2001
From: "2817212736@qq.com" <2817212736@qq.com>
Date: Tue, 3 Jun 2025 14:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=94=B9=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=A8=A1=E5=9E=8B=E5=92=8C=E7=BA=B9=E7=90=86=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                        |  2 +-
 src/components/MaterialAdjuster.vue | 15 ++++++---------
 src/stores/sceneStore.ts            |  1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 810097b..30fbd4d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "material-editor",
   "private": true,
-  "version": "1.0.16",
+  "version": "1.0.17",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src/components/MaterialAdjuster.vue b/src/components/MaterialAdjuster.vue
index 651ac21..6ef88fd 100644
--- a/src/components/MaterialAdjuster.vue
+++ b/src/components/MaterialAdjuster.vue
@@ -108,13 +108,13 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, reactive, watch, onMounted, computed } from "vue"
+import { ref, reactive, watch } from "vue"
 import { useScene, type TextureAdjustment } from "../stores/sceneStore";
 import CfFlex from "./CfFlex.vue";
 import { DirectoryId } from "../api/Request";
 import { IsNullOrWhitespace } from "../helpers/helper.string";
 import { FromDeflateBase64, ToDeflatedBase64 } from "../helpers/helper.material";
-import { AsyncDelay } from "../helpers/helper.async";
+import { storeToRefs } from "pinia";
 
 export interface MaterialRequest {
     /** 材质名 */
@@ -126,6 +126,7 @@ export interface MaterialRequest {
 }
 
 const scene = useScene();
+const { Material, CurrGeometry, Geometries } = storeToRefs(scene);
 
 const props = defineProps<{
     name?: string;
@@ -138,10 +139,6 @@ const emits = defineEmits<{
     (e: 'submit', data: MaterialRequest[]): void;
 }>();
 
-const Material = computed(() => scene.Material);
-const CurrGeometry = computed(() => scene.CurrGeometry);
-const Geometries = computed(() => scene.Geometries);
-
 const debugMode = ref(true);
 const _textureSrc = ref(props.textureSrcList);
 const debugTextureSrc = ref("");
@@ -174,7 +171,7 @@ watch(() => props.textureSrcList, async (val) => {
 
 watch(textureAdjustment, async (val) => {
     UpdateTexture();
-});
+}, { deep: true });
 
 // 监听纹理更新
 watch(() => scene.CurrTexture, (val) => {
@@ -205,7 +202,6 @@ async function UpdateMaterial() {
 }
 
 function UpdateTexture() {
-    console.log('UpdateTexture')
     const texture = scene.CurrTexture;
     const val = textureAdjustment.value;
     texture.wrapS = val.wrapS;
@@ -227,6 +223,7 @@ async function loadData() {
 }
 
 async function HandleUpload() {
+    console.log(scene.GetEditor().Viewer.Scene.children);
     try {
         if (IsNullOrWhitespace(materialInfo.materialName)) {
             alert('材质名称不可为空');
@@ -244,7 +241,7 @@ async function HandleUpload() {
                 file: ToDeflatedBase64(await scene.SerializeMaterialAsync())
             };
             result.push(mat);
-        } 
+        }
         else {
             // 遍历纹理链接列表，更改纹理后将材质序列化，然后还原场景
             let idx = 0;
diff --git a/src/stores/sceneStore.ts b/src/stores/sceneStore.ts
index 3b72f2f..9638bbd 100644
--- a/src/stores/sceneStore.ts
+++ b/src/stores/sceneStore.ts
@@ -75,7 +75,6 @@ const sceneSetup = () => {
     }
 
     async function UpdateMaterialAsync() {
-        console.log(Material.value.Update);
         // TODO: Danger: 如果等待下面这一行，会导致更新卡住（未知问题）
         Material.value.Update();
         // Material.value.Material.needsUpdate = true;