Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
b9f14813fd | |||
8a693f005b | |||
c5f97495e8 |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "material-editor",
|
||||
"private": true,
|
||||
"version": "1.0.30",
|
||||
"version": "1.0.33",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
@@ -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) => {
|
||||
|
@@ -7,6 +7,7 @@ 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;
|
||||
@@ -106,18 +107,12 @@ const sceneSetup = () => {
|
||||
console.warn("Material has not been initialized");
|
||||
return;
|
||||
}
|
||||
let record = Material.value.map?.Object as TextureTableRecord;
|
||||
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;
|
||||
// }
|
||||
}
|
||||
|
||||
const record = new TextureTableRecord();
|
||||
record.Name = db.TextureTable.AllocateName();
|
||||
db.TextureTable.Add(record);
|
||||
// 替换map
|
||||
Material.value.map = record.Id;
|
||||
|
||||
// 设置Store
|
||||
_currTexture.value = record;
|
||||
@@ -132,8 +127,9 @@ const sceneSetup = () => {
|
||||
texture.image = img;
|
||||
}
|
||||
|
||||
texture.needsUpdate = true;
|
||||
UpdateTexture();
|
||||
await record.Update();
|
||||
await AsyncDelay(10);
|
||||
await UpdateMaterialAsync();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user