!1801 修复:灯光阵列,开关灯光光照无效问题

pull/1804/MERGE
林三 3 years ago committed by ChenX
parent e5a8f3f268
commit b9b24a15eb

@ -1,9 +1,9 @@
import { Box3, MathUtils, Matrix4, Vector2, Vector3 } from 'three'; import { Box3, MathUtils, Matrix4, Vector2, Vector3 } from 'three';
import { observable } from '../../node_modules/mobx'; import { observable } from '../../node_modules/mobx';
import { app } from '../ApplicationServices/Application'; import { app } from '../ApplicationServices/Application';
import { Draw } from '../Common/Append2CurSpace';
import { CheckObjectType, CheckoutValid } from '../Common/CheckoutVaildValue'; import { CheckObjectType, CheckoutValid } from '../Common/CheckoutVaildValue';
import { DataAdapter } from '../Common/DataAdapter'; import { DataAdapter } from '../Common/DataAdapter';
import { Draw } from '../Common/Draw';
import { Singleton } from '../Common/Singleton'; import { Singleton } from '../Common/Singleton';
import { FixedNotZero } from '../Common/Utils'; import { FixedNotZero } from '../Common/Utils';
import { Hole } from '../DatabaseServices/3DSolid/Hole'; import { Hole } from '../DatabaseServices/3DSolid/Hole';

@ -2,8 +2,8 @@ import { Intent } from "@blueprintjs/core";
import { DxfParser, EntityARC, EntityCIRCLE, EntityDIMENSION, EntityELLIPSE, EntityLINE, EntityLWPOLYLINE, EntitySPLINE, EntityTEXT } from "dxf-parser-2"; import { DxfParser, EntityARC, EntityCIRCLE, EntityDIMENSION, EntityELLIPSE, EntityLINE, EntityLWPOLYLINE, EntitySPLINE, EntityTEXT } from "dxf-parser-2";
import { MathUtils, Matrix4, Vector2, Vector3 } from "three"; import { MathUtils, Matrix4, Vector2, Vector3 } from "three";
import { app } from "../ApplicationServices/Application"; import { app } from "../ApplicationServices/Application";
import { Draw } from "../Common/Append2CurSpace";
import { arrayLast } from "../Common/ArrayExt"; import { arrayLast } from "../Common/ArrayExt";
import { Draw } from "../Common/Draw";
import { FileSystem } from "../Common/FileSystem"; import { FileSystem } from "../Common/FileSystem";
import { LineAngularDimension } from "../DatabaseServices/Dimension/2LineAngularDimension"; import { LineAngularDimension } from "../DatabaseServices/Dimension/2LineAngularDimension";
import { AlignedDimension } from "../DatabaseServices/Dimension/AlignedDimension"; import { AlignedDimension } from "../DatabaseServices/Dimension/AlignedDimension";

@ -1,7 +1,7 @@
import { Matrix4, Vector3 } from 'three'; import { Matrix4, Vector3 } from 'three';
import { app } from '../ApplicationServices/Application'; import { app } from '../ApplicationServices/Application';
import { Draw } from '../Common/Append2CurSpace';
import { ComputerCurvesNormalOCS } from '../Common/CurveUtils'; import { ComputerCurvesNormalOCS } from '../Common/CurveUtils';
import { Draw } from '../Common/Draw';
import { Log } from '../Common/Log'; import { Log } from '../Common/Log';
import { Arc } from '../DatabaseServices/Entity/Arc'; import { Arc } from '../DatabaseServices/Entity/Arc';
import { Circle } from '../DatabaseServices/Entity/Circle'; import { Circle } from '../DatabaseServices/Entity/Circle';

@ -1,5 +1,5 @@
import { app } from "../../ApplicationServices/Application"; import { app } from "../../ApplicationServices/Application";
import { Draw } from "../../Common/Append2CurSpace"; import { Draw } from "../../Common/Draw";
import { ArcDimension } from "../../DatabaseServices/Dimension/ArcDimension"; import { ArcDimension } from "../../DatabaseServices/Dimension/ArcDimension";
import { Arc } from "../../DatabaseServices/Entity/Arc"; import { Arc } from "../../DatabaseServices/Entity/Arc";
import { Board } from "../../DatabaseServices/Entity/Board"; import { Board } from "../../DatabaseServices/Entity/Board";

@ -1,6 +1,6 @@
import { Box3, CubicBezierCurve, Curve as TCurve, LineCurve, Path, QuadraticBezierCurve, Shape, Vector2 } from "three"; import { Box3, CubicBezierCurve, Curve as TCurve, LineCurve, Path, QuadraticBezierCurve, Shape, Vector2 } from "three";
import { app } from "../ApplicationServices/Application"; import { app } from "../ApplicationServices/Application";
import { Draw } from "../Common/Append2CurSpace"; import { Draw } from "../Common/Draw";
import { Curve } from "../DatabaseServices/Entity/Curve"; import { Curve } from "../DatabaseServices/Entity/Curve";
import { Line } from "../DatabaseServices/Entity/Line"; import { Line } from "../DatabaseServices/Entity/Line";
import { Polyline } from "../DatabaseServices/Entity/Polyline"; import { Polyline } from "../DatabaseServices/Entity/Polyline";

@ -1,6 +1,6 @@
import { Vector3 } from "three"; import { Vector3 } from "three";
import { app } from "../../ApplicationServices/Application"; import { app } from "../../ApplicationServices/Application";
import { Draw } from "../../Common/Append2CurSpace"; import { Draw } from "../../Common/Draw";
import { ResourceLibraryURL } from "../../Common/HostUrl"; import { ResourceLibraryURL } from "../../Common/HostUrl";
import { PostJson, RequestStatus } from "../../Common/Request"; import { PostJson, RequestStatus } from "../../Common/Request";
import { EntityRef } from "../../DatabaseServices/Entity/EntityRef"; import { EntityRef } from "../../DatabaseServices/Entity/EntityRef";

@ -3,5 +3,5 @@ import { Entity } from "../DatabaseServices/Entity/Entity";
export function Draw(en: Entity) export function Draw(en: Entity)
{ {
app.LayoutTool.CurrentSpace.Append(en); app.LayoutTool.AppendDatabaseSpace(en);
} }

@ -164,9 +164,9 @@ export class LayoutTool
{ {
if (app.Viewer.isLayout) if (app.Viewer.isLayout)
{ {
app.Database.LayoutSpace.Append(en);
if (changeColor && en.ColorIndex === 7) if (changeColor && en.ColorIndex === 7)
en.ColorIndex = 256; en.ColorIndex = 256;
app.Database.LayoutSpace.Append(en);
} }
else else
{ {

Loading…
Cancel
Save