|
|
|
@ -277,40 +277,35 @@ export class GetPointServices implements EditorService
|
|
|
|
|
}
|
|
|
|
|
//或者用户输入了一个点
|
|
|
|
|
let strList = inputData.split(",");
|
|
|
|
|
if (strList.length >= 2)
|
|
|
|
|
let vlist: number[] = [];
|
|
|
|
|
for (let str of strList)
|
|
|
|
|
{
|
|
|
|
|
let vlist = [];
|
|
|
|
|
for (let str of strList)
|
|
|
|
|
{
|
|
|
|
|
let v = safeEval(str);
|
|
|
|
|
if (!isNaN(v))
|
|
|
|
|
vlist.push(v);
|
|
|
|
|
else
|
|
|
|
|
console.log("输入的格式错误!");
|
|
|
|
|
}
|
|
|
|
|
if (vlist.length >= 2)
|
|
|
|
|
{
|
|
|
|
|
vlist.push(0);
|
|
|
|
|
let p = new Vector3();
|
|
|
|
|
p.fromArray(vlist);
|
|
|
|
|
let v = safeEval(str);
|
|
|
|
|
if (!isNaN(v))
|
|
|
|
|
vlist.push(v);
|
|
|
|
|
else
|
|
|
|
|
console.log("输入的格式错误!");
|
|
|
|
|
}
|
|
|
|
|
if (vlist.length >= 2)
|
|
|
|
|
{
|
|
|
|
|
vlist.push(0);
|
|
|
|
|
let p = new Vector3();
|
|
|
|
|
p.fromArray(vlist);
|
|
|
|
|
|
|
|
|
|
if (relative)
|
|
|
|
|
this.UpdatePointOfRelative(p, prompt);
|
|
|
|
|
if (relative)
|
|
|
|
|
this.UpdatePointOfRelative(p, prompt);
|
|
|
|
|
|
|
|
|
|
this.ReturnPoint(p);
|
|
|
|
|
}
|
|
|
|
|
else if (vlist.length === 1)
|
|
|
|
|
this.ReturnPoint(p);
|
|
|
|
|
}
|
|
|
|
|
else if (vlist.length === 1)
|
|
|
|
|
{
|
|
|
|
|
if (prompt.BasePoint)
|
|
|
|
|
{
|
|
|
|
|
//TODO: 因为事件触发失败导致这个根本触发不到.
|
|
|
|
|
//事件同时监听导致的事件无法捕获.
|
|
|
|
|
if (prompt.BasePoint)
|
|
|
|
|
{
|
|
|
|
|
let curP = this.curPoint;
|
|
|
|
|
let bp = prompt.BasePoint.clone();//基点
|
|
|
|
|
let v = curP.clone().sub(bp).normalize();//指向向量
|
|
|
|
|
bp.add(v.multiplyScalar(vlist[0]));
|
|
|
|
|
return this.ReturnPoint(bp);
|
|
|
|
|
}
|
|
|
|
|
let curP = this.curPoint;
|
|
|
|
|
let bp = prompt.BasePoint.clone();//基点
|
|
|
|
|
let v = curP.clone().sub(bp).normalize();//指向向量
|
|
|
|
|
bp.add(v.multiplyScalar(vlist[0]));
|
|
|
|
|
return this.ReturnPoint(bp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}));
|
|
|
|
@ -322,7 +317,6 @@ export class GetPointServices implements EditorService
|
|
|
|
|
if (prompt.Msg)
|
|
|
|
|
{
|
|
|
|
|
app.Editor.CommandStore.commandPrompt = prompt.Msg;
|
|
|
|
|
// app.m_Editor.Prompt(prompt.Msg);
|
|
|
|
|
this.removeCalls.push(() =>
|
|
|
|
|
{
|
|
|
|
|
app.Editor.CommandStore.commandPrompt = "";
|
|
|
|
|