同步源码

This commit is contained in:
ChenX
2023-02-25 16:20:42 +08:00
parent 72af70545a
commit 8e22f4d0c8
29 changed files with 61 additions and 34 deletions

View File

@@ -12172,7 +12172,7 @@ const DefaultBoardFindOption = {
};
Object.freeze(DefaultBoardFindOption);
const DefaultLatticOption = {
version: 1,
version: 2,
arrayType: ELatticeArrayType.ByWidth,
gripWidth: 100,
gripDepth: 100,
@@ -12193,6 +12193,7 @@ const DefaultLatticOption = {
isOpenCut: false,
upCut: 0,
downCut: 4,
linesType: LinesType.Reverse,
};
Object.freeze(DefaultLatticOption);
const DefaultDoorOption = {
@@ -12323,6 +12324,7 @@ const DefaultLatticeConfig = {
isOpenCut: false,
upCut: 0,
downCut: 4,
linesType: LinesType.Reverse,
};
Object.freeze(DefaultLatticeConfig);
const DefaultNailOption = {
@@ -24515,8 +24517,8 @@ class RoomWallParse {
if (p === iPts[1])
iPam[0] = iPam[1];
}
let isExtend = (preR.isReverse ? iPam[0].thisParam > 1 : iPam[0].thisParam < 0)
&& (nowR.isReverse ? iPam[0].argParam > 1 : iPam[0].argParam < 0);
let isExtend = (preR.isReverse ? iPam[0].thisParam > 0 : iPam[0].thisParam < 1)
&& (nowR.isReverse ? iPam[0].argParam > 0 : iPam[0].argParam < 1);
//tp 必须不能破坏圆弧,否则造成裁剪错误
if (!isExtend || p.distanceToSquared(v.position) > 500 * 500)
p = undefined;
@@ -29335,7 +29337,7 @@ class DrawLatticeDrawerTool extends Singleton {
br.BoardProcessOption.sealedRight = config.rightSealed.toString();
br.BoardProcessOption.drillType = DrillType.None;
br.BoardProcessOption.highDrill.fill(DrillType.None);
br.BoardProcessOption[EBoardKeyList.Lines] = LinesType.Reverse; //生成的板设置为反纹
br.BoardProcessOption[EBoardKeyList.Lines] = config.linesType; //纹路
}
ParseHighSealing(br, leftSealed, rightSealed, topSealed, downSealed, isHor) {
let cu = br.ContourCurve;
@@ -31830,7 +31832,7 @@ let TemplateLatticeRecord = class TemplateLatticeRecord extends TemplateRecord {
//对象应该实现dataIn和DataOut的方法,为了对象的序列化和反序列化
//对象从文件中读取数据,初始化自身
ReadFile(file) {
file.Read();
let ver = file.Read();
super.ReadFile(file);
this.option.arrayType = file.Read();
this.option.gripWidth = file.Read();
@@ -31852,10 +31854,13 @@ let TemplateLatticeRecord = class TemplateLatticeRecord extends TemplateRecord {
this.option.isOpenCut = file.Read();
this.option.upCut = file.Read();
this.option.downCut = file.Read();
if (ver > 1) {
this.option.linesType = file.Read();
}
}
//对象将自身数据写入到文件.
WriteFile(file) {
file.Write(1);
file.Write(2);
super.WriteFile(file);
file.Write(this.option.arrayType);
file.Write(this.option.gripWidth);
@@ -31877,6 +31882,7 @@ let TemplateLatticeRecord = class TemplateLatticeRecord extends TemplateRecord {
file.Write(this.option.isOpenCut);
file.Write(this.option.upCut);
file.Write(this.option.downCut);
file.Write(this.option.linesType);
}
};
TemplateLatticeRecord = __decorate([