Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
8a693f005b | |||
c5f97495e8 |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "material-editor",
|
"name": "material-editor",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.0.30",
|
"version": "1.0.32",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
@@ -200,7 +200,7 @@ const uploading = ref(false);
|
|||||||
// });
|
// });
|
||||||
const materialInfo = reactive({
|
const materialInfo = reactive({
|
||||||
dirId: DirectoryId.MaterialDir, // 正常来说是2
|
dirId: DirectoryId.MaterialDir, // 正常来说是2
|
||||||
materialName: props.name || Textures.value?.[0].name || '材质',
|
materialName: props.name || Textures.value[0]?.name || '材质',
|
||||||
inputText: '',
|
inputText: '',
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -210,7 +210,7 @@ watch(Textures, async (val) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
watch(() => props.name, () => {
|
watch(() => props.name, () => {
|
||||||
materialInfo.materialName = props.name || Textures.value?.[0].name || '材质';
|
materialInfo.materialName = props.name || Textures.value[0]?.name || '材质';
|
||||||
});
|
});
|
||||||
|
|
||||||
watch(textureAdjustment, async (val) => {
|
watch(textureAdjustment, async (val) => {
|
||||||
|
@@ -106,18 +106,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 +126,8 @@ const sceneSetup = () => {
|
|||||||
texture.image = img;
|
texture.image = img;
|
||||||
}
|
}
|
||||||
|
|
||||||
texture.needsUpdate = true;
|
|
||||||
UpdateTexture();
|
UpdateTexture();
|
||||||
|
await record.Update();
|
||||||
await UpdateMaterialAsync();
|
await UpdateMaterialAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user