From ebcc6b774cb53ac7b5fe5a338286ebc6c6c3b976 Mon Sep 17 00:00:00 2001 From: ChenX Date: Wed, 25 Dec 2019 16:12:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96,=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=9D=A2=E5=9F=9F=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- src/Add-on/ExportData.ts | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d55cca021..3efbfc438 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "gitlog": "^3.1.2", "html-loader": "^0.5.5", "html-webpack-plugin": "^3.2.0", - "jest": "^23.6.0", + "jest": "^24.9.0", "jest-snapshot": "^24.9.0", "less": "^3.10.3", "less-loader": "^5.0.0", @@ -89,7 +89,7 @@ "react-dom": "^16.12.0", "react-rnd2": "^1.0.1", "stats.js": "^0.17.0", - "three": "^0.111.0", + "three": "^0.112.0", "xaop": "^1.3.3" }, "jest": { diff --git a/src/Add-on/ExportData.ts b/src/Add-on/ExportData.ts index b602ff63c..f65f35f30 100644 --- a/src/Add-on/ExportData.ts +++ b/src/Add-on/ExportData.ts @@ -16,7 +16,6 @@ import { TextureTableRecord } from "../DatabaseServices/Texture"; import { Command } from "../Editor/CommandMachine"; import { PromptStatus } from "../Editor/PromptResult"; - export class Command_ExportData implements Command { async exec() @@ -113,8 +112,14 @@ function ConverSweep2Data(e: SweepSolid) function ConveRegion2Data(e: Region) { + e = e.Clone(); + let reg: any = {}; reg.Type = "Region"; + + let ocsInv = e.OCSInv; + for (let s of e.ShapeManager.ShapeList) + s.ApplyMatrix(ocsInv); reg.Shapes = e.ShapeManager.ShapeList.map(ConverShape2Data); reg.OCS = e.OCS.toArray(); return reg;