|
|
|
|
@ -3,8 +3,9 @@ import { arrayPushArray } from "../../../../Common/ArrayExt";
|
|
|
|
|
import { ColorMaterial } from "../../../../Common/ColorPalette";
|
|
|
|
|
import { ObjectSnapMode } from "../../../../Editor/ObjectSnapMode";
|
|
|
|
|
import { BufferGeometryUtils } from "../../../../Geometry/BufferGeometryUtils";
|
|
|
|
|
import { CreatePolylinePath } from "../../../../Geometry/CreatePolylinePath";
|
|
|
|
|
import { AsVector3, clampRad, equalv2, updateGeometry, ZeroVec } from "../../../../Geometry/GeUtils";
|
|
|
|
|
import { SubtractRange, Tape } from "../../../../Geometry/ExtrudeMeshGeomBuilder/ExtrudeEdgeGeometry2";
|
|
|
|
|
import { SplitArcParams, SplitCurveParams } from "../../../../Geometry/ExtrudeMeshGeomBuilder/SplitCurveParams";
|
|
|
|
|
import { AsVector2, AsVector3, clampRad, equaln, updateGeometry, ZeroVec } from "../../../../Geometry/GeUtils";
|
|
|
|
|
import { RenderType } from "../../../../GraphicsSystem/RenderType";
|
|
|
|
|
import { Factory } from "../../../CADFactory";
|
|
|
|
|
import { CADFiler } from "../../../CADFiler";
|
|
|
|
|
@ -12,7 +13,7 @@ import { Arc } from "../../../Entity/Arc";
|
|
|
|
|
import { Curve } from "../../../Entity/Curve";
|
|
|
|
|
import { Line } from "../../../Entity/Line";
|
|
|
|
|
import { Polyline } from "../../../Entity/Polyline";
|
|
|
|
|
import { LEFT_ROTATE_MTX2 } from "../../ParseService/GetCurveParam";
|
|
|
|
|
import { GetArcParam, GetLineParam } from "../../ParseService/GetCurveParam";
|
|
|
|
|
import { applyMixins, CURVE_FACE_TYPE_KEY, CURVE_MESH_NAMES, RoomWallBase, WallFaceType } from "./RoomWallBase";
|
|
|
|
|
import { WallSnapMode } from "./WallSnapMode";
|
|
|
|
|
|
|
|
|
|
@ -71,14 +72,14 @@ export class RoomWallArc extends RoomWallBase
|
|
|
|
|
|
|
|
|
|
//顶部线
|
|
|
|
|
let bakZ = curve.OCSNoClone.elements[14];
|
|
|
|
|
curve.OCSNoClone.elements[14] = 2700;
|
|
|
|
|
curve.OCSNoClone.elements[14] = this._Height;
|
|
|
|
|
arrayPushArray(pts, curve.GetObjectSnapPoints(snapMode, pickPoint, lastPoint, viewXform));
|
|
|
|
|
curve.OCSNoClone.elements[14] = bakZ;
|
|
|
|
|
|
|
|
|
|
let spep = [curve.StartPoint, curve.EndPoint];
|
|
|
|
|
for (let p of spep)
|
|
|
|
|
{
|
|
|
|
|
let l = new Line(p, p.clone().setZ(2700));
|
|
|
|
|
let l = new Line(p, p.clone().setZ(this._Height));
|
|
|
|
|
arrayPushArray(pts, l.GetObjectSnapPoints(snapMode, pickPoint, lastPoint, viewXform));
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
@ -104,7 +105,7 @@ export class RoomWallArc extends RoomWallBase
|
|
|
|
|
let count = pts.length;
|
|
|
|
|
|
|
|
|
|
for (let i = 0; i < count; i++)
|
|
|
|
|
pts.push(pts[i].clone().setZ(pts[i].z + 2700));
|
|
|
|
|
pts.push(pts[i].clone().setZ(pts[i].z + this._Height));
|
|
|
|
|
return pts;
|
|
|
|
|
}
|
|
|
|
|
MoveGripPoints(indexList: Array<number>, vec: Vector3)
|
|
|
|
|
@ -156,6 +157,10 @@ export class RoomWallArc extends RoomWallBase
|
|
|
|
|
{
|
|
|
|
|
if (this._EdgeGeometry) return this._EdgeGeometry;
|
|
|
|
|
|
|
|
|
|
for (let hole of this.Holes)
|
|
|
|
|
if (hole.StartParam > hole.EndParam)
|
|
|
|
|
[hole.StartParam, hole.EndParam] = [hole.EndParam, hole.StartParam];
|
|
|
|
|
|
|
|
|
|
let pts: Vector3[];
|
|
|
|
|
if (!this.LeftCurves)
|
|
|
|
|
{
|
|
|
|
|
@ -169,15 +174,15 @@ export class RoomWallArc extends RoomWallBase
|
|
|
|
|
let leftPts = left.Shape.getPoints(this.GetDrawCount()).map(AsVector3);
|
|
|
|
|
let rightPts = right.Shape.getPoints(this.GetDrawCount()).map(AsVector3);
|
|
|
|
|
|
|
|
|
|
let leftPts2 = leftPts.map(p => p.clone().setZ(2700));
|
|
|
|
|
let rightPts2 = rightPts.map(p => p.clone().setZ(2700));
|
|
|
|
|
let leftPts2 = leftPts.map(p => p.clone().setZ(this._Height));
|
|
|
|
|
let rightPts2 = rightPts.map(p => p.clone().setZ(this._Height));
|
|
|
|
|
|
|
|
|
|
pts = [
|
|
|
|
|
leftPts[0], leftPts[0].clone().setZ(2700),
|
|
|
|
|
leftPts[leftPts.length - 1], leftPts[leftPts.length - 1].clone().setZ(2700),
|
|
|
|
|
leftPts[0], leftPts[0].clone().setZ(this._Height),
|
|
|
|
|
leftPts[leftPts.length - 1], leftPts[leftPts.length - 1].clone().setZ(this._Height),
|
|
|
|
|
|
|
|
|
|
rightPts[0], rightPts[0].clone().setZ(2700),
|
|
|
|
|
rightPts[rightPts.length - 1], rightPts[rightPts.length - 1].clone().setZ(2700),
|
|
|
|
|
rightPts[0], rightPts[0].clone().setZ(this._Height),
|
|
|
|
|
rightPts[rightPts.length - 1], rightPts[rightPts.length - 1].clone().setZ(this._Height),
|
|
|
|
|
|
|
|
|
|
leftPts.shift()];
|
|
|
|
|
|
|
|
|
|
@ -197,7 +202,7 @@ export class RoomWallArc extends RoomWallBase
|
|
|
|
|
{
|
|
|
|
|
pts = [];
|
|
|
|
|
let inv = this.OCSInv;
|
|
|
|
|
const DrawCurve = (curve: Line | Arc) =>
|
|
|
|
|
const DrawCurve = (curve: Curve, _leftRanges: [number, number][], _rightRanges: [number, number][]) =>
|
|
|
|
|
{
|
|
|
|
|
if (curve instanceof Line)
|
|
|
|
|
{
|
|
|
|
|
@ -205,25 +210,81 @@ export class RoomWallArc extends RoomWallBase
|
|
|
|
|
let p2 = curve.EndPoint.applyMatrix4(inv);
|
|
|
|
|
pts.push(p1, p2);
|
|
|
|
|
|
|
|
|
|
pts.push(p1, p1.clone().setZ(2700));
|
|
|
|
|
pts.push(p2, p2.clone().setZ(2700));
|
|
|
|
|
pts.push(p1.clone().setZ(2700), p2.clone().setZ(2700));
|
|
|
|
|
for (let range of _leftRanges)
|
|
|
|
|
pts.push(p1.clone().setZ(range[0]), p1.clone().setZ(range[1]));
|
|
|
|
|
for (let range of _rightRanges)
|
|
|
|
|
pts.push(p2.clone().setZ(range[0]), p2.clone().setZ(range[1]));
|
|
|
|
|
|
|
|
|
|
pts.push(p1.clone().setZ(this._Height), p2.clone().setZ(this._Height));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
else//arc
|
|
|
|
|
{
|
|
|
|
|
let cpts = curve.Shape.getPoints(this.GetDrawCount()).map(AsVector3);
|
|
|
|
|
let topPts = cpts.map(p => p.clone().setZ(2700));
|
|
|
|
|
pts.push(topPts[0]);//左上
|
|
|
|
|
for (let p of cpts) pts.push(p, p);//底部
|
|
|
|
|
|
|
|
|
|
topPts.reverse();
|
|
|
|
|
for (let p of topPts) pts.push(p, p);//顶部
|
|
|
|
|
pts.pop();
|
|
|
|
|
let topPts = cpts.map(p => p.clone().setZ(this._Height));
|
|
|
|
|
|
|
|
|
|
//底部
|
|
|
|
|
pts.push(cpts[0]);
|
|
|
|
|
for (let i = 1; i < cpts.length - 1; i++)
|
|
|
|
|
{
|
|
|
|
|
let p = cpts[i];
|
|
|
|
|
pts.push(p, p);
|
|
|
|
|
}
|
|
|
|
|
pts.push(cpts[cpts.length - 1]);
|
|
|
|
|
|
|
|
|
|
//顶部
|
|
|
|
|
pts.push(topPts[0]);
|
|
|
|
|
for (let i = 1; i < topPts.length - 1; i++)
|
|
|
|
|
{
|
|
|
|
|
let p = topPts[i];
|
|
|
|
|
pts.push(p, p);
|
|
|
|
|
}
|
|
|
|
|
pts.push(topPts[topPts.length - 1]);
|
|
|
|
|
|
|
|
|
|
//竖线
|
|
|
|
|
for (let range of _leftRanges)
|
|
|
|
|
pts.push(cpts[0].clone().setZ(range[0]), cpts[0].clone().setZ(range[1]));
|
|
|
|
|
for (let range of _rightRanges)
|
|
|
|
|
pts.push(cpts[cpts.length - 1].clone().setZ(range[0]), cpts[cpts.length - 1].clone().setZ(range[1]));
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
this.LeftCurves.forEach(DrawCurve);
|
|
|
|
|
this.RightCurves.forEach(DrawCurve);
|
|
|
|
|
this.LidCurves.forEach(DrawCurve);
|
|
|
|
|
|
|
|
|
|
let lidRanges: [number, number][] = [[0, this._Height]];
|
|
|
|
|
let leftRanges = lidRanges;
|
|
|
|
|
let rightRanges = lidRanges;
|
|
|
|
|
for (let hole of this.Holes)
|
|
|
|
|
{
|
|
|
|
|
if (hole.StartParam === 0)
|
|
|
|
|
{
|
|
|
|
|
let newLeftRanges = [];
|
|
|
|
|
for (let range of leftRanges)
|
|
|
|
|
arrayPushArray(newLeftRanges, SubtractRange(range[0], range[1], hole.Bottom, hole.Top, 1e5));
|
|
|
|
|
leftRanges = newLeftRanges;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (hole.EndParam === 1)
|
|
|
|
|
{
|
|
|
|
|
let newRightRanges = [];
|
|
|
|
|
for (let range of rightRanges)
|
|
|
|
|
arrayPushArray(newRightRanges, SubtractRange(range[0], range[1], hole.Bottom, hole.Top, 1e5));
|
|
|
|
|
rightRanges = newRightRanges;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (let i = 0; i < this.LeftCurves.length; i++)
|
|
|
|
|
{
|
|
|
|
|
let curve = this.LeftCurves[i];
|
|
|
|
|
DrawCurve(curve, i === 0 ? leftRanges : lidRanges, (i === this.LeftCurves.length - 1) ? rightRanges : lidRanges);
|
|
|
|
|
}
|
|
|
|
|
for (let i = 0; i < this.RightCurves.length; i++)
|
|
|
|
|
{
|
|
|
|
|
let curve = this.RightCurves[i];
|
|
|
|
|
DrawCurve(curve, i === 0 ? leftRanges : lidRanges, (i === this.RightCurves.length - 1) ? rightRanges : lidRanges);
|
|
|
|
|
}
|
|
|
|
|
for (let i = 0; i < this.LidCurves.length; i++)
|
|
|
|
|
{
|
|
|
|
|
let curve = this.LidCurves[i];
|
|
|
|
|
DrawCurve(curve, lidRanges, lidRanges);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this._EdgeGeometry = BufferGeometryUtils.CreateFromPts(pts);
|
|
|
|
|
@ -241,61 +302,163 @@ export class RoomWallArc extends RoomWallBase
|
|
|
|
|
let center = this.Center;
|
|
|
|
|
let inv = this.OCSInv;
|
|
|
|
|
|
|
|
|
|
let thisParam = new GetArcParam(this as unknown as Arc);
|
|
|
|
|
|
|
|
|
|
const BuildLeftFace = (curve: Curve) =>
|
|
|
|
|
{
|
|
|
|
|
if (curve[CURVE_FACE_TYPE_KEY] === WallFaceType.Outside) return;//我们暂时直接不绘制外墙 (我们应该和酷家乐一样 在视线所到之处 将整个墙隐藏 而不是只隐藏一个面)
|
|
|
|
|
|
|
|
|
|
if (curve instanceof Line)
|
|
|
|
|
{
|
|
|
|
|
let startIndex = geo.vertices.length;
|
|
|
|
|
let tapes = [new Tape(0, 1, 0, this._Height)];
|
|
|
|
|
let curveParam = new GetLineParam(curve);
|
|
|
|
|
|
|
|
|
|
let dir = curve.GetFistDeriv(0).normalize();
|
|
|
|
|
LEFT_ROTATE_MTX2.applyVector(dir);
|
|
|
|
|
if (this.Holes.length)
|
|
|
|
|
{
|
|
|
|
|
for (let hole of this.Holes)
|
|
|
|
|
{
|
|
|
|
|
let start = equaln(hole.StartParam, 0) ? 0 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.StartParam));
|
|
|
|
|
let end = equaln(hole.EndParam, 1) ? 1 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.EndParam));
|
|
|
|
|
if (start > end) [start, end] = [end, start];
|
|
|
|
|
let holeTape = new Tape(start, end, hole.Bottom, hole.Top);
|
|
|
|
|
|
|
|
|
|
let newTapes: Tape[] = [];
|
|
|
|
|
for (let tape of tapes)
|
|
|
|
|
arrayPushArray(newTapes, tape.Clip(holeTape));
|
|
|
|
|
|
|
|
|
|
tapes = newTapes;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let p1 = curve.StartPoint.applyMatrix4(inv);
|
|
|
|
|
let p2 = curve.EndPoint.applyMatrix4(inv);
|
|
|
|
|
geo.vertices.push(p1, p2);
|
|
|
|
|
geo.vertices.push(p1.clone().setZ(2700));
|
|
|
|
|
geo.vertices.push(p2.clone().setZ(2700));
|
|
|
|
|
for (let tape of tapes)
|
|
|
|
|
{
|
|
|
|
|
let startIndex = geo.vertices.length;
|
|
|
|
|
|
|
|
|
|
let p1 = curveParam.GetPointAtParam(tape.start).applyMatrix4(inv);
|
|
|
|
|
let p2 = curveParam.GetPointAtParam(tape.end).applyMatrix4(inv);
|
|
|
|
|
geo.vertices.push(p1.setZ(tape.bottom), p2.setZ(tape.bottom));
|
|
|
|
|
geo.vertices.push(p1.clone().setZ(tape.top));
|
|
|
|
|
geo.vertices.push(p2.clone().setZ(tape.top));
|
|
|
|
|
|
|
|
|
|
let x = curve.Length * 1e-3;
|
|
|
|
|
let z = 2700 * 1e-3;
|
|
|
|
|
let startX = curveParam.Length * 1e-3 * tape.start;
|
|
|
|
|
let endX = curveParam.Length * 1e-3 * tape.end;
|
|
|
|
|
|
|
|
|
|
geo.faces.push(
|
|
|
|
|
new Face3(startIndex, startIndex + 2, startIndex + 1, dir),
|
|
|
|
|
new Face3(startIndex + 1, startIndex + 2, startIndex + 3, dir),
|
|
|
|
|
);
|
|
|
|
|
let startZ = tape.bottom * 1e-3;
|
|
|
|
|
let endZ = tape.top * 1e-3;
|
|
|
|
|
|
|
|
|
|
geo.faceVertexUvs[0].push(
|
|
|
|
|
[new Vector2(), new Vector2(0, z), new Vector2(x, 0)],
|
|
|
|
|
[new Vector2(x, 0), new Vector2(0, z), new Vector2(x, z)],
|
|
|
|
|
);
|
|
|
|
|
geo.faces.push(
|
|
|
|
|
new Face3(startIndex, startIndex + 2, startIndex + 1, curveParam.LeftDir),
|
|
|
|
|
new Face3(startIndex + 1, startIndex + 2, startIndex + 3, curveParam.LeftDir),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
geo.faceVertexUvs[0].push(
|
|
|
|
|
[new Vector2(startX, startZ), new Vector2(startX, endZ), new Vector2(endX, startZ)],
|
|
|
|
|
[new Vector2(endX, startZ), new Vector2(startX, endZ), new Vector2(endX, endZ)],
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
let arc = curve as Arc;
|
|
|
|
|
let startIndex = geo.vertices.length;
|
|
|
|
|
|
|
|
|
|
let pts = curve.Shape.getPoints(this.GetDrawCount()).map(AsVector3);
|
|
|
|
|
let pts2 = pts.map(p => p.clone().setZ(2700));
|
|
|
|
|
arrayPushArray(geo.vertices, pts);
|
|
|
|
|
arrayPushArray(geo.vertices, pts2);
|
|
|
|
|
let tapes = [new Tape(0, 1, 0, this._Height)];
|
|
|
|
|
let curveParam = new GetArcParam(arc);
|
|
|
|
|
|
|
|
|
|
let count = pts.length;
|
|
|
|
|
for (let i = 1; i < count; i++)
|
|
|
|
|
if (this.Holes.length)
|
|
|
|
|
{
|
|
|
|
|
let pre = i - 1;
|
|
|
|
|
for (let hole of this.Holes)
|
|
|
|
|
{
|
|
|
|
|
let start = equaln(hole.StartParam, 0) ? 0 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.StartParam));
|
|
|
|
|
let end = equaln(hole.EndParam, 1) ? 1 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.EndParam));
|
|
|
|
|
if (start > end) [start, end] = [end, start];
|
|
|
|
|
let holeTape = new Tape(start, end, hole.Bottom, hole.Top);
|
|
|
|
|
|
|
|
|
|
let newTapes: Tape[] = [];
|
|
|
|
|
for (let tape of tapes)
|
|
|
|
|
arrayPushArray(newTapes, tape.Clip(holeTape));
|
|
|
|
|
|
|
|
|
|
tapes = newTapes;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let dir = pts[i].clone().add(pts[pre]).multiplyScalar(0.5).sub(center).subScalar(arc.Radius);
|
|
|
|
|
geo.faces.push(
|
|
|
|
|
new Face3(startIndex + i, startIndex + pre, startIndex + pre + count, dir),
|
|
|
|
|
new Face3(startIndex + i + count, startIndex + i, startIndex + pre + count, dir),
|
|
|
|
|
);
|
|
|
|
|
geo.faceVertexUvs[0].push(
|
|
|
|
|
[new Vector2(), new Vector2(0, 0), new Vector2(0, 0)],
|
|
|
|
|
[new Vector2(0, 0), new Vector2(0, 0), new Vector2(0, 0)],
|
|
|
|
|
);
|
|
|
|
|
if (this.Holes.length)
|
|
|
|
|
{
|
|
|
|
|
let length = arc.Length;
|
|
|
|
|
let params: number[] = SplitArcParams(arc);
|
|
|
|
|
|
|
|
|
|
//需要合并顶点,所以建立一个map
|
|
|
|
|
let cacheIndex: { [key: string]: number; } = {};
|
|
|
|
|
const GetIndex = (param: number, z: number) =>
|
|
|
|
|
{
|
|
|
|
|
let key = `${param}_${z}`;
|
|
|
|
|
let index = cacheIndex[key];
|
|
|
|
|
if (index === undefined)
|
|
|
|
|
{
|
|
|
|
|
index = geo.vertices.length;
|
|
|
|
|
cacheIndex[key] = index;
|
|
|
|
|
geo.vertices.push(curveParam.GetPointAtParam(param).applyMatrix4(inv).setZ(z));
|
|
|
|
|
}
|
|
|
|
|
return index;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for (let tapeaaaaa of tapes)
|
|
|
|
|
{
|
|
|
|
|
for (let tape of tapeaaaaa.Split(params))
|
|
|
|
|
{
|
|
|
|
|
let p1Index = GetIndex(tape.start, tape.bottom);
|
|
|
|
|
let p2Index = GetIndex(tape.end, tape.bottom);
|
|
|
|
|
let p3Index = GetIndex(tape.start, tape.top);
|
|
|
|
|
let p4Index = GetIndex(tape.end, tape.top);
|
|
|
|
|
|
|
|
|
|
let startX = length * 1e-3 * tape.start;
|
|
|
|
|
let endX = length * 1e-3 * tape.end;
|
|
|
|
|
|
|
|
|
|
let startZ = tape.bottom * 1e-3;
|
|
|
|
|
let endZ = tape.top * 1e-3;
|
|
|
|
|
|
|
|
|
|
let dir = arc.GetPointAtParam((tape.start + tape.end) * 0.5).applyMatrix4(inv).sub(center).subScalar(arc.Radius);
|
|
|
|
|
|
|
|
|
|
geo.faces.push(
|
|
|
|
|
new Face3(p1Index, p3Index, p2Index, dir),
|
|
|
|
|
new Face3(p2Index, p3Index, p4Index, dir),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
geo.faceVertexUvs[0].push(
|
|
|
|
|
[new Vector2(startX, startZ), new Vector2(startX, endZ), new Vector2(endX, startZ)],
|
|
|
|
|
[new Vector2(endX, startZ), new Vector2(startX, endZ), new Vector2(endX, endZ)],
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
let startIndex = geo.vertices.length;
|
|
|
|
|
|
|
|
|
|
let pts = curve.Shape.getPoints(this.GetDrawCount()).map(AsVector3);
|
|
|
|
|
let pts2 = pts.map(p => p.clone().setZ(this._Height));
|
|
|
|
|
arrayPushArray(geo.vertices, pts);
|
|
|
|
|
arrayPushArray(geo.vertices, pts2);
|
|
|
|
|
|
|
|
|
|
let count = pts.length;
|
|
|
|
|
let length = curve.Length * 1e-3;
|
|
|
|
|
let divLength = length / pts.length;
|
|
|
|
|
for (let i = 1; i < count; i++)
|
|
|
|
|
{
|
|
|
|
|
let pre = i - 1;
|
|
|
|
|
|
|
|
|
|
let preX = pre * divLength;
|
|
|
|
|
let nowX = i * divLength;
|
|
|
|
|
|
|
|
|
|
let dir = pts[i].clone().add(pts[pre]).multiplyScalar(0.5).sub(center).subScalar(arc.Radius);
|
|
|
|
|
geo.faces.push(
|
|
|
|
|
new Face3(startIndex + i, startIndex + pre, startIndex + pre + count, dir),
|
|
|
|
|
new Face3(startIndex + i + count, startIndex + i, startIndex + pre + count, dir),
|
|
|
|
|
);
|
|
|
|
|
geo.faceVertexUvs[0].push(
|
|
|
|
|
[new Vector2(nowX, 0), new Vector2(preX, 0), new Vector2(preX, this._Height * 1e-3)],
|
|
|
|
|
[new Vector2(nowX, this._Height * 1e-3), new Vector2(nowX, 0), new Vector2(preX, this._Height * 1e-3)],
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
@ -305,75 +468,169 @@ export class RoomWallArc extends RoomWallBase
|
|
|
|
|
|
|
|
|
|
if (curve instanceof Line)
|
|
|
|
|
{
|
|
|
|
|
let startIndex = geo.vertices.length;
|
|
|
|
|
|
|
|
|
|
let p1 = curve.StartPoint.applyMatrix4(inv);
|
|
|
|
|
let p2 = curve.EndPoint.applyMatrix4(inv);
|
|
|
|
|
geo.vertices.push(p1, p2);
|
|
|
|
|
geo.vertices.push(p1.clone().setZ(2700));
|
|
|
|
|
geo.vertices.push(p2.clone().setZ(2700));
|
|
|
|
|
|
|
|
|
|
let dir = curve.GetFistDeriv(0).normalize();
|
|
|
|
|
LEFT_ROTATE_MTX2.applyVector(dir);
|
|
|
|
|
dir.negate();
|
|
|
|
|
|
|
|
|
|
let x = curve.Length * 1e-3;
|
|
|
|
|
let z = 2700 * 1e-3;
|
|
|
|
|
|
|
|
|
|
geo.faces.push(
|
|
|
|
|
new Face3(startIndex, startIndex + 1, startIndex + 2, dir),
|
|
|
|
|
new Face3(startIndex + 1, startIndex + 3, startIndex + 2, dir),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
geo.faceVertexUvs[0].push(
|
|
|
|
|
[new Vector2(), new Vector2(x, 0), new Vector2(0, z)],
|
|
|
|
|
[new Vector2(x, 0), new Vector2(x, z), new Vector2(0, z)],
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
let arc = curve as Arc;
|
|
|
|
|
let startIndex = geo.vertices.length;
|
|
|
|
|
let tapes = [new Tape(0, 1, 0, this._Height)];
|
|
|
|
|
let curveParam = new GetLineParam(curve);
|
|
|
|
|
|
|
|
|
|
let pts = curve.Shape.getPoints(this.GetDrawCount()).map(AsVector3);
|
|
|
|
|
let pts2 = pts.map(p => p.clone().setZ(2700));
|
|
|
|
|
arrayPushArray(geo.vertices, pts);
|
|
|
|
|
arrayPushArray(geo.vertices, pts2);
|
|
|
|
|
if (this.Holes.length)
|
|
|
|
|
{
|
|
|
|
|
for (let hole of this.Holes)
|
|
|
|
|
{
|
|
|
|
|
let start = equaln(hole.StartParam, 0) ? 0 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.StartParam));
|
|
|
|
|
let end = equaln(hole.EndParam, 1) ? 1 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.EndParam));
|
|
|
|
|
if (start > end) [start, end] = [end, start];
|
|
|
|
|
let holeTape = new Tape(start, end, hole.Bottom, hole.Top);
|
|
|
|
|
|
|
|
|
|
let newTapes: Tape[] = [];
|
|
|
|
|
for (let tape of tapes)
|
|
|
|
|
arrayPushArray(newTapes, tape.Clip(holeTape));
|
|
|
|
|
|
|
|
|
|
tapes = newTapes;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let count = pts.length;
|
|
|
|
|
for (let i = 1; i < count; i++)
|
|
|
|
|
for (let tape of tapes)
|
|
|
|
|
{
|
|
|
|
|
let pre = i - 1;
|
|
|
|
|
let startIndex = geo.vertices.length;
|
|
|
|
|
|
|
|
|
|
let p1 = curveParam.GetPointAtParam(tape.start).applyMatrix4(inv);
|
|
|
|
|
let p2 = curveParam.GetPointAtParam(tape.end).applyMatrix4(inv);
|
|
|
|
|
geo.vertices.push(p1.setZ(tape.bottom), p2.setZ(tape.bottom));
|
|
|
|
|
geo.vertices.push(p1.clone().setZ(tape.top));
|
|
|
|
|
geo.vertices.push(p2.clone().setZ(tape.top));
|
|
|
|
|
|
|
|
|
|
let startX = curveParam.Length * 1e-3 * tape.start;
|
|
|
|
|
let endX = curveParam.Length * 1e-3 * tape.end;
|
|
|
|
|
|
|
|
|
|
let startZ = tape.bottom * 1e-3;
|
|
|
|
|
let endZ = tape.top * 1e-3;
|
|
|
|
|
|
|
|
|
|
let dir = pts[i].clone().add(pts[pre]).multiplyScalar(0.5).sub(center).subScalar(arc.Radius);
|
|
|
|
|
geo.faces.push(
|
|
|
|
|
new Face3(startIndex + pre, startIndex + i, startIndex + pre + count, dir),
|
|
|
|
|
new Face3(startIndex + i, startIndex + i + count, startIndex + pre + count, dir),
|
|
|
|
|
new Face3(startIndex, startIndex + 1, startIndex + 2, curveParam.RightDir),
|
|
|
|
|
new Face3(startIndex + 1, startIndex + 3, startIndex + 2, curveParam.RightDir),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
geo.faceVertexUvs[0].push(
|
|
|
|
|
[new Vector2(), new Vector2(0, 0), new Vector2(0, 0)],
|
|
|
|
|
[new Vector2(0, 0), new Vector2(0, 0), new Vector2(0, 0)],
|
|
|
|
|
[new Vector2(startX, startZ), new Vector2(endX, startZ), new Vector2(startX, endZ)],
|
|
|
|
|
[new Vector2(endX, startZ), new Vector2(endX, endZ), new Vector2(startX, endZ)],
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
let arc = curve as Arc;
|
|
|
|
|
|
|
|
|
|
let tapes = [new Tape(0, 1, 0, this._Height)];
|
|
|
|
|
let curveParam = new GetArcParam(arc);
|
|
|
|
|
|
|
|
|
|
if (this.Holes.length)
|
|
|
|
|
{
|
|
|
|
|
for (let hole of this.Holes)
|
|
|
|
|
{
|
|
|
|
|
let start = equaln(hole.StartParam, 0) ? 0 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.StartParam));
|
|
|
|
|
let end = equaln(hole.EndParam, 1) ? 1 : curveParam.GetParamAtPoint(thisParam.GetPointAtParam(hole.EndParam));
|
|
|
|
|
if (start > end) [start, end] = [end, start];
|
|
|
|
|
let holeTape = new Tape(start, end, hole.Bottom, hole.Top);
|
|
|
|
|
|
|
|
|
|
let newTapes: Tape[] = [];
|
|
|
|
|
for (let tape of tapes)
|
|
|
|
|
arrayPushArray(newTapes, tape.Clip(holeTape));
|
|
|
|
|
|
|
|
|
|
tapes = newTapes;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let length = arc.Length;
|
|
|
|
|
let params: number[] = SplitArcParams(arc);
|
|
|
|
|
|
|
|
|
|
//需要合并顶点,所以建立一个map
|
|
|
|
|
let cacheIndex: { [key: string]: number; } = {};
|
|
|
|
|
const GetIndex = (param: number, z: number) =>
|
|
|
|
|
{
|
|
|
|
|
let key = `${param}_${z}`;
|
|
|
|
|
let index = cacheIndex[key];
|
|
|
|
|
if (index === undefined)
|
|
|
|
|
{
|
|
|
|
|
index = geo.vertices.length;
|
|
|
|
|
cacheIndex[key] = index;
|
|
|
|
|
geo.vertices.push(curveParam.GetPointAtParam(param).applyMatrix4(inv).setZ(z));
|
|
|
|
|
}
|
|
|
|
|
return index;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for (let tapeaaaaa of tapes)
|
|
|
|
|
{
|
|
|
|
|
for (let tape of tapeaaaaa.Split(params))
|
|
|
|
|
{
|
|
|
|
|
let p1Index = GetIndex(tape.start, tape.bottom);
|
|
|
|
|
let p2Index = GetIndex(tape.end, tape.bottom);
|
|
|
|
|
let p3Index = GetIndex(tape.start, tape.top);
|
|
|
|
|
let p4Index = GetIndex(tape.end, tape.top);
|
|
|
|
|
|
|
|
|
|
let startX = length * 1e-3 * tape.start;
|
|
|
|
|
let endX = length * 1e-3 * tape.end;
|
|
|
|
|
|
|
|
|
|
let startZ = tape.bottom * 1e-3;
|
|
|
|
|
let endZ = tape.top * 1e-3;
|
|
|
|
|
|
|
|
|
|
let dir = arc.GetPointAtParam((tape.start + tape.end) * 0.5).applyMatrix4(inv).sub(center).subScalar(arc.Radius).negate();
|
|
|
|
|
|
|
|
|
|
geo.faces.push(
|
|
|
|
|
new Face3(p1Index, p2Index, p3Index, dir),
|
|
|
|
|
new Face3(p2Index, p4Index, p3Index, dir),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
geo.faceVertexUvs[0].push(
|
|
|
|
|
[new Vector2(startX, startZ), new Vector2(endX, startZ), new Vector2(startX, endZ)],
|
|
|
|
|
[new Vector2(endX, startZ), new Vector2(endX, endZ), new Vector2(startX, endZ)],
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
let arc = curve as Arc;
|
|
|
|
|
let startIndex = geo.vertices.length;
|
|
|
|
|
|
|
|
|
|
let pts = curve.Shape.getPoints(this.GetDrawCount()).map(AsVector3);
|
|
|
|
|
let pts2 = pts.map(p => p.clone().setZ(this._Height));
|
|
|
|
|
arrayPushArray(geo.vertices, pts);
|
|
|
|
|
arrayPushArray(geo.vertices, pts2);
|
|
|
|
|
|
|
|
|
|
let length = curve.Length * 1e-3;
|
|
|
|
|
let divLength = length / pts.length;
|
|
|
|
|
|
|
|
|
|
let count = pts.length;
|
|
|
|
|
for (let i = 1; i < count; i++)
|
|
|
|
|
{
|
|
|
|
|
let pre = i - 1;
|
|
|
|
|
|
|
|
|
|
let preX = pre * divLength;
|
|
|
|
|
let nowX = i * divLength;
|
|
|
|
|
|
|
|
|
|
let dir = pts[i].clone().add(pts[pre]).multiplyScalar(0.5).sub(center).subScalar(arc.Radius);
|
|
|
|
|
geo.faces.push(
|
|
|
|
|
new Face3(startIndex + pre, startIndex + i, startIndex + pre + count, dir),
|
|
|
|
|
new Face3(startIndex + i, startIndex + i + count, startIndex + pre + count, dir),
|
|
|
|
|
);
|
|
|
|
|
geo.faceVertexUvs[0].push(
|
|
|
|
|
[new Vector2(preX, 0), new Vector2(nowX, 0), new Vector2(preX, this._Height * 1e-3)],
|
|
|
|
|
[new Vector2(nowX, 0), new Vector2(nowX, this._Height * 1e-3), new Vector2(preX, this._Height * 1e-3)],
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
const BuildRegionFace = (region: Polyline) =>
|
|
|
|
|
{
|
|
|
|
|
let lined = region.MatrixAlignTo2(this.OCSNoClone);
|
|
|
|
|
if (region.CloseMark && !equalv2(lined.pts[0], lined.pts[lined.pts.length - 1], 1e-4))
|
|
|
|
|
{
|
|
|
|
|
lined.pts.push(lined.pts[0]);
|
|
|
|
|
lined.buls.push(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let path = CreatePolylinePath(lined.pts, lined.buls);
|
|
|
|
|
let params = SplitCurveParams(region);
|
|
|
|
|
let ocsInv = this.OCSInv;
|
|
|
|
|
let pts = params.map(param => AsVector2(region.GetPointAtParam(param).applyMatrix4(ocsInv)));
|
|
|
|
|
|
|
|
|
|
let pts = path.getPoints(this.GetDrawCount());
|
|
|
|
|
let faces = ShapeUtils.triangulateShape(pts, []);
|
|
|
|
|
|
|
|
|
|
//top
|
|
|
|
|
let startIndex = geo.vertices.length;
|
|
|
|
|
for (let p of pts) geo.vertices.push(new Vector3(p.x, p.y, 2700));
|
|
|
|
|
for (let p of pts) geo.vertices.push(new Vector3(p.x, p.y, this._Height));
|
|
|
|
|
for (let p of pts) geo.vertices.push(new Vector3(p.x, p.y, 0));
|
|
|
|
|
|
|
|
|
|
for (let i = 0; i < faces.length; i++)
|
|
|
|
|
@ -400,8 +657,8 @@ export class RoomWallArc extends RoomWallBase
|
|
|
|
|
// {
|
|
|
|
|
// startIndex = geo.vertices.length;
|
|
|
|
|
// geo.vertices.push(AsVector3(pre), AsVector3(p));
|
|
|
|
|
// geo.vertices.push(AsVector3(pre).setZ(2700));
|
|
|
|
|
// geo.vertices.push(AsVector3(p).setZ(2700));
|
|
|
|
|
// geo.vertices.push(AsVector3(pre).setZ(this._Height));
|
|
|
|
|
// geo.vertices.push(AsVector3(p).setZ(this._Height));
|
|
|
|
|
|
|
|
|
|
// LEFT_ROTATE_MTX2.applyVector(tempV);
|
|
|
|
|
// tempV.negate();
|
|
|
|
|
|
ChenX
2 years ago