pull/192/MERGE
ChenX 6 years ago
parent 5c98f0e47a
commit ece7c2a3d3

@ -30,7 +30,7 @@ export class Command_Extend implements Command
let exRefSsRes = await app.m_Editor.GetSelection({
Msg: "请选择对象<全部选择>:",
UseSelect: true,
Filter: { filterTypes: [Curve] }
Filter: { filterTypes: [Curve], filterErase: true }
});
if (exRefSsRes.Status === PromptStatus.Cancel) return;

@ -612,7 +612,7 @@ export class Polyline extends Curve
}
//修改顶点
this.m_LineData[ptIndex].pt = Vec3DTo2D(this.GetPointAtParam(newParam));
this.m_LineData[ptIndex].pt = Vec3DTo2D(this.GetPointAtParam(newParam).applyMatrix4(this.OCSInv));
//修改凸度
let oldBul = this.m_LineData[bulIndex].bul;

@ -24,7 +24,7 @@ export class SelectBox extends SelectSetBase
{
private m_SelectBox: Box2 = new Box2();
private m_BoxCheck: BoxCheckIntersect
private m_BoxCheck: BoxCheckIntersect;
m_SelectType: SelectType;
m_bIsPerCamera: boolean;

@ -1,6 +1,7 @@
import { EffectComposer, Object3D, OutlinePass, RenderPass, Scene, Vector2, Vector3, WebGLRenderer } from 'three';
import * as xaop from 'xaop';
import { end } from 'xaop';
import { app } from '../ApplicationServices/Application';
import { GetEntity } from '../Common/Utils';
import { Database } from '../DatabaseServices/Database';
import { Entity } from '../DatabaseServices/Entity';
@ -168,7 +169,10 @@ export class Viewer
ScreenToWorld(pt: Vector3, planVec?: Vector3, constant?: number | Vector3)
{
//变换和求交点
let plan = new PlaneExt(planVec || new Vector3(0, 0, 1), constant);
let plan = new PlaneExt(
(planVec === undefined) ? new Vector3().setFromMatrixColumn(app.m_Editor.UCSMatrix, 2) : planVec,
(constant === undefined) ? new Vector3().setFromMatrixColumn(app.m_Editor.UCSMatrix, 3) : constant
);
let raycaster = GenerateRaycaster(pt, this);
plan.intersectRay(raycaster.ray, pt, true);
return pt;

Loading…
Cancel
Save