From b9f6183d2a56cce5a592a2b1c47ce05eaf7b091c Mon Sep 17 00:00:00 2001 From: ChenX Date: Wed, 29 Sep 2021 15:02:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E7=8E=B0=E5=9C=A8=E6=8B=BD?= =?UTF-8?q?=E6=8B=96=E5=BA=94=E7=94=A8=E6=9D=90=E8=B4=A8=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=A2=E5=9F=9F=E5=92=8C=E5=A4=8D=E5=90=88?= =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DatabaseServices/Entity/Region.ts | 9 +++------ src/UI/Components/SourceManage/MaterialList.tsx | 3 ++- .../ToolBar/ResourceLibrary/Resource_ResourceList.tsx | 6 ++---- .../Components/ToolBar/ResourceLibrary/RsourceStore.ts | 3 ++- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/DatabaseServices/Entity/Region.ts b/src/DatabaseServices/Entity/Region.ts index 968995310..0611e9db8 100644 --- a/src/DatabaseServices/Entity/Region.ts +++ b/src/DatabaseServices/Entity/Region.ts @@ -382,13 +382,10 @@ export class Region extends Entity } } } - else + else if (type === RenderType.Physical) { - for (let m of obj.children) - { - let mesh = m as Mesh; - mesh.material = this.MeshMaterial; - } + let mesh = obj as Mesh; + mesh.material = this.MeshMaterial; } } diff --git a/src/UI/Components/SourceManage/MaterialList.tsx b/src/UI/Components/SourceManage/MaterialList.tsx index 1564065ad..abd07cac5 100644 --- a/src/UI/Components/SourceManage/MaterialList.tsx +++ b/src/UI/Components/SourceManage/MaterialList.tsx @@ -10,6 +10,7 @@ import { inflate, MaterialIn, MaterialInAndAppendAppData } from '../../../Common import { DuplicateRecordCloning } from '../../../Common/Status'; import { GetEntity, getFileSize } from '../../../Common/Utils'; import { Board } from '../../../DatabaseServices/Entity/Board'; +import { CompositeEntity } from '../../../DatabaseServices/Entity/CompositeEntity'; import { Region } from '../../../DatabaseServices/Entity/Region'; import { PhysicalMaterialRecord } from '../../../DatabaseServices/PhysicalMaterialRecord'; import { CommandWrap } from '../../../Editor/CommandMachine'; @@ -135,7 +136,7 @@ export class MaterialList extends React.Component { for (let o of selectObj) { let en = GetEntity(o); - if (en instanceof Board || en instanceof Region) + if (en instanceof Board || en instanceof Region || en instanceof CompositeEntity) en.Material = mtl.Id; if (en instanceof Board) { diff --git a/src/UI/Components/ToolBar/ResourceLibrary/Resource_ResourceList.tsx b/src/UI/Components/ToolBar/ResourceLibrary/Resource_ResourceList.tsx index 02b7a3d3c..6acf2eb35 100644 --- a/src/UI/Components/ToolBar/ResourceLibrary/Resource_ResourceList.tsx +++ b/src/UI/Components/ToolBar/ResourceLibrary/Resource_ResourceList.tsx @@ -10,9 +10,7 @@ import { PostJson } from '../../../../Common/Request'; import { Hole } from '../../../../DatabaseServices/3DSolid/Hole'; import { Board } from '../../../../DatabaseServices/Entity/Board'; import { CommandWrap } from '../../../../Editor/CommandMachine'; -import { userConfig } from '../../../../Editor/UserConfig'; import { VisualSpaceBox } from '../../../../Editor/VisualSpaceBox'; -import { ApplyGoodInfo } from '../../Asset'; import { AppToaster } from '../../Toaster'; import ModuleReport from './ModuleReport'; import { MyRadio, MyRadio2 } from './MyRadio'; @@ -478,8 +476,8 @@ export class ResourceItem extends Component<{ module: ModuleData; }, {}> en.Material = material.Id; if (en instanceof Board) { - if (userConfig.isModifyMaterial) - ApplyGoodInfo(en, material); + // if (userConfig.isModifyMaterial) //因为这个材质没有板材 所以我们不改它. + // ApplyGoodInfo(en, material); brCount++; } count++; diff --git a/src/UI/Components/ToolBar/ResourceLibrary/RsourceStore.ts b/src/UI/Components/ToolBar/ResourceLibrary/RsourceStore.ts index b61c9d206..c4ee38e8f 100644 --- a/src/UI/Components/ToolBar/ResourceLibrary/RsourceStore.ts +++ b/src/UI/Components/ToolBar/ResourceLibrary/RsourceStore.ts @@ -13,6 +13,7 @@ import { UpdateDraw } from "../../../../Common/Status"; import { GetEntity } from "../../../../Common/Utils"; import { Board } from "../../../../DatabaseServices/Entity/Board"; import { GetBoxGeoBufferGeometry } from "../../../../DatabaseServices/Entity/BoxSolid"; +import { CompositeEntity } from "../../../../DatabaseServices/Entity/CompositeEntity"; import { EntityRef } from "../../../../DatabaseServices/Entity/EntityRef"; import { Region } from "../../../../DatabaseServices/Entity/Region"; import { PhysicalMaterialRecord } from "../../../../DatabaseServices/PhysicalMaterialRecord"; @@ -91,7 +92,7 @@ export default class ResourceStore for (let o of selectObj) { let en = GetEntity(o); - if (en instanceof Board || en instanceof Region) + if (en instanceof Board || en instanceof Region || en instanceof CompositeEntity) en.Material = mtl.Id; }