package.json

@@ -1,7 +1,7 @@
 {
   "name": "material-editor",
   "private": true,
-  "version": "1.0.34",
+  "version": "1.0.30",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/components/MaterialAdjuster.vue

@@ -7,7 +7,7 @@
                 <legend>DEBUG</legend>
                 <label>上传路径ID</label>
                 <input v-model="materialInfo.dirId" type="text" placeholder="材质路径ID" />
-                <label>纹理(BASE64)</label>
+                <label>配置JSON</label>
                 <input v-model="materialInfo.inputText" type="text" />
                 <button class="btn-success" style="min-width: 110px;" @click="loadData">加载</button>
             </fieldset>
@@ -200,7 +200,7 @@ const uploading = ref(false);
 // });
 const materialInfo = reactive({
     dirId: DirectoryId.MaterialDir, // 正常来说是2
-    materialName: props.name || Textures.value[0]?.name || '材质',
+    materialName: props.name || Textures.value?.[0].name || '材质',
     inputText: '',
 });
 
@@ -210,7 +210,7 @@ watch(Textures, async (val) => {
 });
 
 watch(() => props.name, () => {
-    materialInfo.materialName = props.name || Textures.value[0]?.name || '材质';
+    materialInfo.materialName = props.name || Textures.value?.[0].name || '材质';
 });
 
 watch(textureAdjustment, async (val) => {
@@ -247,7 +247,8 @@ async function UpdateMaterial() {
 
 async function loadData() {
     if (!materialInfo.inputText) return;
-    const cadFile = FromDeflateBase64(materialInfo.inputText);
+    const json = JSON.parse(materialInfo.inputText);
+    const cadFile = FromDeflateBase64(json.file);
     scene.ImportMaterialAsync(cadFile)
 }
 

src/stores/sceneStore.ts

@@ -7,7 +7,6 @@ import { ClampToEdgeWrapping, MirroredRepeatWrapping, RepeatWrapping, Texture }
 import { materialRenderer } from "../common/MaterialRenderer";
 import { MaterialIn, MaterialOut } from "../common/MaterialSerializer";
 import { GetConfig } from "../lib/libOutputConfig";
-import { AsyncDelay } from "../helpers/helper.async";
 
 const sceneSetup = () => {
     let _editor: MaterialEditor | undefined;
@@ -99,6 +98,7 @@ const sceneSetup = () => {
     }
 
     async function ChangeTextureFromUrlAsync(url?: string) {
+        console.warn("Update texture from url:", url);
         // 关联贴图
         const db = Material.value.Db;
         // 材质未初始化
@@ -106,15 +106,17 @@ const sceneSetup = () => {
             console.warn("Material has not been initialized");
             return;
         }
-
-        // 如果url为空，则保留原有材质中的纹理（修改模式），否则重新实例化纹理对象
         let record = Material.value.map?.Object as TextureTableRecord;
-        if (url) {
+        if (!record) {
+            // record = db.TextureTable.Symbols.values().next().value;
+            // if(!record){
             record = new TextureTableRecord();
             record.Name = db.TextureTable.AllocateName();
             db.TextureTable.Add(record);
             // 替换map
             Material.value.map = record.Id;
+            // Material.value.map = img ? record.Id : undefined;
+            // }
         }
 
         // 设置Store
@@ -126,14 +128,12 @@ const sceneSetup = () => {
         }
 
         if (!texture.image) {
-            console.warn('Load Image: ', GetConfig().host + '/' + record.imageUrl);
             const img = await LoadImageFromUrl(GetConfig().host + '/' + record.imageUrl);
             texture.image = img;
         }
         
+        texture.needsUpdate = true;
         UpdateTexture();
-        await record.Update();
-        await AsyncDelay(10);
         await UpdateMaterialAsync();
     }