|
|
|
@ -32,7 +32,7 @@ import { CuttingBoardByBoard } from "../../BoardCutting/CuttingUtils2";
|
|
|
|
|
import { KJL_DrillData, KJL_JsonFile, KJL_ModelType, KJL_Parameter, KJL_ParamModel, KJL_ParamModel_Board, KJL_ParamModel_Hardware } from "./KJLInterface";
|
|
|
|
|
import { KJLMaterialLoader } from "./KJLMaterialLoader";
|
|
|
|
|
import { ParseBCBZ, ParseBT, ParseCabNameMap, ParseDrilling, ParseEdgeBanding, ParseEdges, ParseKMFX, ParsePathOutlineAndHole, ParseRoomNameMap, ParseTopline } from "./KJLParse";
|
|
|
|
|
import { ApplyMaterial, CreateHardware } from "./KJLUtils";
|
|
|
|
|
import { ApplyMaterial, CreateHardware, ParseHardwareParam } from "./KJLUtils";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
export class Command_KJLImport implements Command
|
|
|
|
@ -199,7 +199,7 @@ async function ParseModel(model: KJL_ParamModel,
|
|
|
|
|
|
|
|
|
|
if (model.profileSegments)
|
|
|
|
|
{
|
|
|
|
|
let toplines = await ParseTopline(model, mtlLoader);
|
|
|
|
|
let toplines = await ParseTopline(model, mtlLoader, roomName, gName);
|
|
|
|
|
if (toplines)
|
|
|
|
|
{
|
|
|
|
|
for (const topline of toplines)
|
|
|
|
@ -227,10 +227,12 @@ async function ParseModel(model: KJL_ParamModel,
|
|
|
|
|
en.BoardProcessOption[EBoardKeyList.RoomName] = roomName;
|
|
|
|
|
en.BoardProcessOption[EBoardKeyList.CabinetName] = gName;
|
|
|
|
|
}
|
|
|
|
|
else if (en instanceof HardwareCompositeEntity || en instanceof HardwareTopline)
|
|
|
|
|
else if (en instanceof HardwareCompositeEntity)
|
|
|
|
|
{
|
|
|
|
|
en.HardwareOption[EBoardKeyList.RoomName] = roomName;
|
|
|
|
|
en.HardwareOption[EBoardKeyList.CabinetName] = gName;
|
|
|
|
|
let hmodel = model as KJL_ParamModel_Hardware;
|
|
|
|
|
ParseHardwareParam(en, hmodel);
|
|
|
|
|
}
|
|
|
|
|
en.ApplyMatrix(new Matrix4().premultiply(mtx));
|
|
|
|
|
}
|
|
|
|
@ -262,6 +264,7 @@ async function ParseModel(model: KJL_ParamModel,
|
|
|
|
|
en.HardwareOption[EBoardKeyList.RoomName] = roomName;
|
|
|
|
|
en.HardwareOption[EBoardKeyList.CabinetName] = gName;
|
|
|
|
|
en.HardwareOption.comments = hmodel.modelProductNumber ?? "";
|
|
|
|
|
ParseHardwareParam(en, hmodel);
|
|
|
|
|
}
|
|
|
|
|
en.ApplyMatrix(new Matrix4().premultiply(mtx));
|
|
|
|
|
}
|
|
|
|
|