6 Commits

4 changed files with 22 additions and 24 deletions

View File

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

View File

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

View File

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

View File

@@ -7,6 +7,7 @@ import { ClampToEdgeWrapping, MirroredRepeatWrapping, RepeatWrapping, Texture }
import { materialRenderer } from "../common/MaterialRenderer"; import { materialRenderer } from "../common/MaterialRenderer";
import { MaterialIn, MaterialOut } from "../common/MaterialSerializer"; import { MaterialIn, MaterialOut } from "../common/MaterialSerializer";
import { GetConfig } from "../lib/libOutputConfig"; import { GetConfig } from "../lib/libOutputConfig";
import { AsyncDelay } from "../helpers/helper.async";
const sceneSetup = () => { const sceneSetup = () => {
let _editor: MaterialEditor | undefined; let _editor: MaterialEditor | undefined;
@@ -106,18 +107,12 @@ const sceneSetup = () => {
console.warn("Material has not been initialized"); console.warn("Material has not been initialized");
return; return;
} }
let record = Material.value.map?.Object as TextureTableRecord;
if (!record) { const record = new TextureTableRecord();
// record = db.TextureTable.Symbols.values().next().value; record.Name = db.TextureTable.AllocateName();
// if(!record){ db.TextureTable.Add(record);
record = new TextureTableRecord(); // 替换map
record.Name = db.TextureTable.AllocateName(); Material.value.map = record.Id;
db.TextureTable.Add(record);
// 替换map
Material.value.map = record.Id;
// Material.value.map = img ? record.Id : undefined;
// }
}
// 设置Store // 设置Store
_currTexture.value = record; _currTexture.value = record;
@@ -132,8 +127,9 @@ const sceneSetup = () => {
texture.image = img; texture.image = img;
} }
texture.needsUpdate = true;
UpdateTexture(); UpdateTexture();
await record.Update();
await AsyncDelay(10);
await UpdateMaterialAsync(); await UpdateMaterialAsync();
} }