Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
9045cb79c2 | |||
b9f14813fd | |||
8a693f005b |
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "material-editor",
|
"name": "material-editor",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.0.31",
|
"version": "1.0.34",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<legend>DEBUG</legend>
|
<legend>DEBUG</legend>
|
||||||
<label>上传路径ID</label>
|
<label>上传路径ID</label>
|
||||||
<input v-model="materialInfo.dirId" type="text" placeholder="材质路径ID" />
|
<input v-model="materialInfo.dirId" type="text" placeholder="材质路径ID" />
|
||||||
<label>配置JSON</label>
|
<label>纹理(BASE64)</label>
|
||||||
<input v-model="materialInfo.inputText" type="text" />
|
<input v-model="materialInfo.inputText" type="text" />
|
||||||
<button class="btn-success" style="min-width: 110px;" @click="loadData">加载</button>
|
<button class="btn-success" style="min-width: 110px;" @click="loadData">加载</button>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
@ -247,8 +247,7 @@ async function UpdateMaterial() {
|
|||||||
|
|
||||||
async function loadData() {
|
async function loadData() {
|
||||||
if (!materialInfo.inputText) return;
|
if (!materialInfo.inputText) return;
|
||||||
const json = JSON.parse(materialInfo.inputText);
|
const cadFile = FromDeflateBase64(materialInfo.inputText);
|
||||||
const cadFile = FromDeflateBase64(json.file);
|
|
||||||
scene.ImportMaterialAsync(cadFile)
|
scene.ImportMaterialAsync(cadFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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;
|
||||||
@ -98,7 +99,6 @@ const sceneSetup = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function ChangeTextureFromUrlAsync(url?: string) {
|
async function ChangeTextureFromUrlAsync(url?: string) {
|
||||||
console.warn("Update texture from url:", url);
|
|
||||||
// 关联贴图
|
// 关联贴图
|
||||||
const db = Material.value.Db;
|
const db = Material.value.Db;
|
||||||
// 材质未初始化
|
// 材质未初始化
|
||||||
@ -106,17 +106,15 @@ const sceneSetup = () => {
|
|||||||
console.warn("Material has not been initialized");
|
console.warn("Material has not been initialized");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 如果url为空,则保留原有材质中的纹理(修改模式),否则重新实例化纹理对象
|
||||||
let record = Material.value.map?.Object as TextureTableRecord;
|
let record = Material.value.map?.Object as TextureTableRecord;
|
||||||
if (!record) {
|
if (url) {
|
||||||
// record = db.TextureTable.Symbols.values().next().value;
|
|
||||||
// if(!record){
|
|
||||||
record = new TextureTableRecord();
|
record = new TextureTableRecord();
|
||||||
record.Name = db.TextureTable.AllocateName();
|
record.Name = db.TextureTable.AllocateName();
|
||||||
db.TextureTable.Add(record);
|
db.TextureTable.Add(record);
|
||||||
// 替换map
|
// 替换map
|
||||||
Material.value.map = record.Id;
|
Material.value.map = record.Id;
|
||||||
// Material.value.map = img ? record.Id : undefined;
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 设置Store
|
// 设置Store
|
||||||
@ -128,12 +126,14 @@ const sceneSetup = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!texture.image) {
|
if (!texture.image) {
|
||||||
|
console.warn('Load Image: ', GetConfig().host + '/' + record.imageUrl);
|
||||||
const img = await LoadImageFromUrl(GetConfig().host + '/' + record.imageUrl);
|
const img = await LoadImageFromUrl(GetConfig().host + '/' + record.imageUrl);
|
||||||
texture.image = img;
|
texture.image = img;
|
||||||
}
|
}
|
||||||
|
|
||||||
texture.needsUpdate = true;
|
|
||||||
UpdateTexture();
|
UpdateTexture();
|
||||||
|
await record.Update();
|
||||||
|
await AsyncDelay(10);
|
||||||
await UpdateMaterialAsync();
|
await UpdateMaterialAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user