Public
/
WebCAD
mirror of https://gitee.com/cf-fz/WebCAD.git
7
1
Fork 0
Code Issues Projects Releases Wiki Activity

清理GetPoint代码. 分离部分代码

Browse Source
pull/7/head
ChenX 7 years ago
parent 82005556b2
commit 8ebb513fb9
1 changed files with 133 additions and 92 deletions
Show Stats Download Patch File Download Diff File

185
src/Editor/Editor.ts
Unescape View File

@ -36,104 +36,141 @@ export class Editor
}
GetPoint(prompt?: GetPointPrompt): Promise<PromptPointResult>
{
prompt = prompt ? prompt : {};
this.m_App.m_CursorViewer.ToGetpoint();
this.m_InputState = InputState.GetPoint;
let retValue = new PromptPointResult();
let removeSnap = this.Snap(prompt ? prompt.BasePoint : undefined);
let removeCalls = []; //删除回调列表
removeCalls.push(this.Snap());
let res = new Promise<PromptPointResult>((resolve, reject) =>
{
let line: Line, removeDrag;
if (prompt)
{
let p = this.m_MouseCtrl.m_CurMousePointWCS.clone();
if (prompt.Callback)
{
prompt.Callback(p);
}
//如果有基点,那么绘制直线
if (prompt.BasePoint)
{
line = new Line(prompt.BasePoint, prompt.BasePoint);
let line = new Line(prompt.BasePoint, prompt.BasePoint);
this.m_App.m_Database.appendEntity(line);
this.noSnapList.add(line.Draw(RenderType.Wireframe));
}
removeDrag = xaop.end(this.m_MouseCtrl, this.m_MouseCtrl.onMouseMove, () =>
{
let p = app.m_CursorViewer.ptWcs;
app.m_Viewer.ScreenToWorld(p);
let drawObj = line.Draw(RenderType.Wireframe);
if (prompt.BasePoint)
this.noSnapList.add(drawObj);
removeCalls.push(
() =>
{
this.m_App.m_Database.removeEntityId(line.objectId);
},
xaop.end(this.m_MouseCtrl, this.m_MouseCtrl.onMouseMove, () =>
{
let p = this.GetNowPoint(prompt.BasePoint);
line.setEndPoint(p);
this.UpdateScreen();
})
);
}
if (prompt.Callback)
{
removeCalls.push(
xaop.end(this.m_MouseCtrl, this.m_MouseCtrl.onMouseMove, () =>
{
let p = this.GetNowPoint(prompt.BasePoint);
prompt.Callback(p);
}
this.UpdateScreen();
})
);
}
let dispose = () =>
{
if (line)
this.m_App.m_Database.removeEntityId(line.objectId);
removeSnap();
this.noSnapList.clear();
this.m_App.m_CursorViewer.ToSelect();
this.m_InputState = InputState.None;
remove();
remove2();
if (prompt)
{
removeDrag();
}
resolve(retValue);
this.UpdateScreen();
}
let remove = xaop.end(this.m_MouseCtrl, this.m_MouseCtrl.onMouseDown, (e: MouseEvent) =>
//鼠标按下
removeCalls.push(
xaop.end(this.m_MouseCtrl, this.m_MouseCtrl.onMouseDown, (e: MouseEvent) =>
{
if (e.button == MouseKey.Left)
{
retValue.Status = PromptStatus.OK;
retValue.Value = this.m_MouseCtrl.m_CurMousePointWCS;
let p = app.m_CursorViewer.ptWcs;
app.m_Viewer.ScreenToWorld(p);
retValue.Value = p;
dispose();
retValue.Value = this.GetNowPoint(prompt.BasePoint);
_return();
}
});
let remove2 = xaop.begin(this.m_KeyCtrl, this.m_KeyCtrl.OnKeyDown, (e: KeyboardEvent) =>
})
);
//键盘按下
removeCalls.push(
xaop.begin(this.m_KeyCtrl, this.m_KeyCtrl.OnKeyDown, (e: KeyboardEvent) =>
{
if (e.keyCode == 27)
{
retValue.Status = PromptStatus.Cancel;
dispose();
_return();
}
else if (e.keyCode == 32)
{
console.log("空格 退出");
retValue.Status = PromptStatus.None;
dispose();
_return();
}
})
);
//返回
let _return = () =>
{
this.m_App.m_CursorViewer.ToSelect();
this.m_InputState = InputState.None;
this.noSnapList.clear();
for (let f of removeCalls)
{
f();
}
resolve(retValue);
this.UpdateScreen();
}
})
return res;
}
/**
*
* 获得当前光标所在的点, 先判断捕捉,在判断极轴捕捉
*
* @private
* @param {THREE.Vector3} [basePoint]
* @returns {THREE.Vector3}
* @memberof Editor
*/
private GetNowPoint(basePoint?: THREE.Vector3): THREE.Vector3
{
if (this.m_App.m_CursorViewer.m_LastSnapPoint)
{
let retP = app.m_CursorViewer.ptWcs;
app.m_Viewer.ScreenToWorld(retP);
return retP;
}
if (basePoint)
{
let newP = this.AxisSnap(basePoint);
if (newP)
{
return newP;
}
}
return this.m_MouseCtrl.m_CurMousePointWCS.clone();
}
noSnapList = new Set<THREE.Object3D>();
Snap(basePoint?: THREE.Vector3)
/**
* 点捕捉服务. 如果有捕捉 将设置光标的捕捉设置
*
* @returns
* @memberof Editor
*/
Snap()
{
let testSnap = () =>
{
@ -179,13 +216,25 @@ export class Editor
}
}
}
}
testSnap();
return xaop.end(this.m_MouseCtrl, this.m_MouseCtrl.onMouseMove, testSnap);
}
if (basePoint)
/**
*
* 轴捕捉
* @param {any} basePoint
* @returns {THREE.Vector3} 返回捕捉的点 如果捕捉不到 那么返回空
* @memberof Editor
*/
AxisSnap(basePoint): THREE.Vector3
{
let p = this.m_MouseCtrl.m_CurMousePointWCS.clone();
let wcs = this.m_MouseCtrl.m_CurMousePointWCS.clone();
let anV = p.clone().sub(basePoint);
let an = Math.atan2(anV.y, anV.x);
//相差向量
let subVec = wcs.clone().sub(basePoint);
let an = Math.atan2(subVec.y, subVec.x);
if (an < 0) an += Math.PI * 2;
let newan = GeUtils.fixAngle(an, Math.PI * 0.25);
@ -196,22 +245,14 @@ export class Editor
let v0 = new THREE.Vector3(0, 0, 0);
GeUtils.angle(v0, newan, 1);
let dis = v0.dot(p.sub(basePoint));
console.log(dis);
let dis = v0.dot(wcs.sub(basePoint));
let newP = basePoint.clone();
GeUtils.angle(newP, newan, dis);
let retP = basePoint.clone();
GeUtils.angle(retP, newan, dis);
app.m_Viewer.WorldToScreen(newP);
app.m_CursorViewer.SerCursorPostion(newP);
app.m_CursorViewer.render();
return;
}
return retP;
}
}
testSnap();
return xaop.end(this.m_MouseCtrl, this.m_MouseCtrl.onMouseMove, testSnap);
return undefined;
}
PointToScreen(pt: THREE.Vector3): THREE.Vector2

Write Preview
Loading…
Cancel
Save