pull/509/MERGE
ChenX 5 years ago
parent 469957ab43
commit 569032ba78

@ -3,9 +3,8 @@ import { app } from "../ApplicationServices/Application";
import { Entity } from "../DatabaseServices/Entity/Entity";
import { PromptStatus } from "../Editor/PromptResult";
export async function JigMoveEntity(entitys: Entity[]): Promise<Matrix4 | undefined>
export async function JigMoveEntity(entitys: Entity[], pos = new Vector3): Promise<Matrix4 | undefined>
{
let pos = new Vector3();
let mtx = new Matrix4();
let baseP = new Vector3();

@ -343,9 +343,9 @@ export class Arc extends Curve
{
if (cu instanceof Arc)
{
this.WriteAllObjectRecord();
if (equalv3(cu.Center, this.Center) && equaln(cu.m_Radius, this.m_Radius))
{
this.WriteAllObjectRecord();
let [sa, ea] = [cu.StartAngle, cu.EndAngle];
if (cu.m_Clockwise != this.m_Clockwise)
[sa, ea] = [ea, sa];

Loading…
Cancel
Save