package.json

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

src/components/MaterialAdjuster.vue

@@ -1,13 +1,12 @@
 <template>
     <div vertical class="material-adjuster">
-        <!-- 新增模式下，隐藏材质名输入框 -->
-        <div v-if="ignoreTexture" class="adjust-section">
+        <div class="adjust-section">
             <h3>操作</h3>
             <fieldset v-if="debugMode" style="margin: 1em 0;">
                 <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>
@@ -60,8 +59,7 @@
             <label>高光</label>
             <CfFlex gap="1em" class="input-range">
                 <input v-model="emissiveIntensity" type="range" min="0" max="1" step="0.01" />
-                <input v-model="emissiveIntensity" type="number" @change="ClampNumericValue" min="0" max="1"
-                    step="0.01" />
+                <input v-model="emissiveIntensity" type="number" @change="ClampNumericValue" min="0" max="1" step="0.01" />
             </CfFlex>
         </div>
 
@@ -137,7 +135,7 @@ const { Material, CurrGeometry, Geometries } = storeToRefs(scene);
 
 const props = defineProps<{
     name?: string;
-    textures?: { name: string, src: string }[];
+    textures?: {name: string, src: string}[];
     /** 忽略纹理参数，提交时直接输出场景内的材质，用于某些在组件外对场景进行编辑的特殊情况（例如材质编辑模式） */
     ignoreTexture?: boolean;
 }>();
@@ -200,17 +198,17 @@ const uploading = ref(false);
 // });
 const materialInfo = reactive({
     dirId: DirectoryId.MaterialDir, // 正常来说是2
-    materialName: props.name || Textures.value[0]?.name || '材质',
+    materialName: props.name || '材质',
     inputText: '',
 });
 
 watch(Textures, async (val) => {
-    if (val.length == 0 || props.ignoreTexture) return;
+    if (val.length == 0) return;
     await scene.ChangeTextureFromUrlAsync(val[0].src);
 });
 
 watch(() => props.name, () => {
-    materialInfo.materialName = props.name || Textures.value[0]?.name || '材质';
+    materialInfo.materialName = props.name || '材质';
 });
 
 watch(textureAdjustment, async (val) => {
@@ -247,7 +245,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)
 }
 
@@ -288,10 +287,10 @@ async function HandleUpload() {
                 };
                 result.push(mat);
             }
-            // 还原场景纹理
-            await scene.ChangeTextureFromUrlAsync(Textures.value[0].src);
         }
 
+        // 还原场景纹理
+        await scene.ChangeTextureFromUrlAsync(Textures.value[0].src);
         emits('submit', result);
         return result;
     } finally {

src/components/MaterialView.vue

@@ -56,7 +56,7 @@ async function HandleUpdateConfig() {
         editMode.value = true;
     }
     else { editMode.value = false; }
-    if (config.textures && config.textures.length > 0) {
+    if (config.textures) {
         textures.value = Array.from(config.textures);
         await scene.ChangeTextureFromUrlAsync(textures.value[0].src); // 这一行是保证首次Mount组件时纹理能够立刻刷新
     }

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();
     }