This commit is contained in:
ChenX
2024-06-04 16:00:08 +08:00
parent e41aee75a0
commit 53d81a3461
11 changed files with 111 additions and 34 deletions

View File

@@ -3455,7 +3455,7 @@ var BufferGeometryUtils;
maxMaterialIndex = Math.max(maxMaterialIndex, g.materialIndex ?? 0);
mergedGeometry.addGroup(offset + g.start, g.count, materialOffset + g.materialIndex);
}
materialOffset += maxMaterialIndex;
materialOffset += (maxMaterialIndex + 1);
}
offset += count;
}
@@ -15076,7 +15076,7 @@ const DefaultLatticOption = {
};
Object.freeze(DefaultLatticOption);
const DefaultDoorOption = {
version: 10,
version: 11,
col: 2,
row: 1,
isAllSelect: true,
@@ -15135,6 +15135,14 @@ const DefaultDoorOption = {
color: "", //颜色
roomName: "", //房名
cabinetName: "", //柜名
layerEdgeRemarkUp: '', //层板板边备注上下左右
layerEdgeRemarkDown: '',
layerEdgeRemarkLeft: '',
layerEdgeRemarkRight: '',
verticalEdgeRemarkUp: '', //立板板边备注上下左右
verticalEdgeRemarkDown: '',
verticalEdgeRemarkLeft: '',
verticalEdgeRemarkRight: '',
};
Object.freeze(DefaultDoorOption);
const DefaultHingeOption = {
@@ -16740,7 +16748,7 @@ class LookOverBoardInfosTool {
let { name, unit, factory, spec, model, brand } = h.HardwareOption;
let tags = this.ParseProcessingGroupTags(h);
// :230行 代码对关联复合实体又进行一遍分析 需同步修改
addDrillToMap(`${name},${unit},${factory},${this.ParseSpec(h, spec)},${this.ParseSpec(h, model)},${brand},${tags.join(",")}`, h);
addDrillToMap(`${name},${unit},${this.ParseSpec(h, factory)},${this.ParseSpec(h, spec)},${this.ParseSpec(h, model)},${this.ParseSpec(h, brand)},${tags.join(",")}`, h);
}
this.UpdateBoardMap(brsProps);
//统计 排钻 封边 关联的五金(排钻?)
@@ -16832,7 +16840,7 @@ class LookOverBoardInfosTool {
let { name, unit, factory, spec, model, brand } = metal.HardwareOption;
let tags = this.ParseProcessingGroupTags(metal);
// :113行 代码对关联复合实体又进行一遍分析 需同步修改
addDrillToMap(`${name},${unit},${factory},${this.ParseSpec(metal, spec)},${this.ParseSpec(metal, model)},${brand},${tags.join(",")}`, metal);
addDrillToMap(`${name},${unit},${this.ParseSpec(metal, factory)},${this.ParseSpec(metal, spec)},${this.ParseSpec(metal, model)},${this.ParseSpec(metal, brand)},${tags.join(",")}`, metal);
}
}
//封边
@@ -28428,7 +28436,32 @@ function Path2Polyline(path) {
return pl;
}
const MAX_CACHE_LEN = 100000;
class NestCache {
static SetPos(key, value) {
if (this._PosCacheCount > MAX_CACHE_LEN) {
// this._PosCacheCount = 0;
// this._PositionCache = {};
return;
}
this._PositionCache[key] = value;
this._PosCacheCount++;
}
static GetPos(key) {
return this._PositionCache[key];
}
static SetNoPut(key, value) {
if (this._NoPutCacheCount > MAX_CACHE_LEN) {
// this._NoPutCacheCount = 0;
// this._NoPutCache = {};
return;
}
this._NoPutCache[key] = value;
this._NoPutCacheCount++;
}
static GetNoPut(key) {
return this._NoPutCache[key];
}
/**
* 用于创建原点在0点的矩形路径
*/
@@ -28447,17 +28480,18 @@ class NestCache {
static Clear() {
this.CachePartPosCount = 0;
this.CacheNoSetCount = 0;
this.CacheRect.clear();
this.PositionCache = {};
this._PositionCache = {};
this._PosCacheCount = 0;
this._NoPutCache = {};
this._NoPutCacheCount = 0;
}
}
//放置零件时,命中缓存的次数
NestCache.CachePartPosCount = 0;
//放置零件时,命中无法放置缓存的次数
NestCache.CacheNoSetCount = 0; //noset
NestCache.PositionCache = {};
NestCache.NoPutCache = {};
NestCache.CacheRect = new Map();
NestCache._PositionCache = {};
NestCache._NoPutCache = {};
const TEXT_BOX = NestCache.CreatePath(570, 110);
/**
@@ -38582,7 +38616,7 @@ class DrawWineRackTool extends Singleton {
/** 拾取空间周围的板件柜名房名等信息*/
GetBoardProcessOption(br) {
if (!this._config)
return;
return; //在矩形变酒格时,因为没有配置 所以导致错误
//获取空间周围的板件数据
if (this.space.Boards.length > 0 && this._config.useBoardProcessOption) {
let refProcessData = this.space.Boards[0].BoardProcessOption;