From b9d22cc04cc8fbb7d9d25a0c045d077c18fc8612 Mon Sep 17 00:00:00 2001 From: AlexandruPopovici Date: Mon, 1 Aug 2022 15:16:54 +0300 Subject: [PATCH] #827 Fixed an issue with Brep speckle type not being parsed as Mesh geometry type --- packages/viewer-sandbox/src/main.ts | 2 +- packages/viewer/src/modules/batching/Batcher.ts | 3 +-- packages/viewer/src/modules/tree/NodeRenderView.ts | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/viewer-sandbox/src/main.ts b/packages/viewer-sandbox/src/main.ts index 0ca7d9963..6d7a5edaf 100644 --- a/packages/viewer-sandbox/src/main.ts +++ b/packages/viewer-sandbox/src/main.ts @@ -40,5 +40,5 @@ sandbox.makeSceneUI() sandbox.makeFilteringUI() // Load demo object sandbox.loadUrl( - ' https://speckle.xyz/streams/99abc74dd4/commits/b32fdcf171?c=%5B198440.6051,6522070.21462,19199.49584,176653.24219,6523663.5,0,0,1%5D' + 'https://speckle.xyz/streams/dc7cb8a37a/commits/1d049ff461?c=%5B46.72989,-4.72172,164.64962,-5,35,10,0,1%5D' ) diff --git a/packages/viewer/src/modules/batching/Batcher.ts b/packages/viewer/src/modules/batching/Batcher.ts index 41f951cbf..f977f54fc 100644 --- a/packages/viewer/src/modules/batching/Batcher.ts +++ b/packages/viewer/src/modules/batching/Batcher.ts @@ -4,7 +4,6 @@ import { SpeckleType } from '../converter/GeometryConverter' import { WorldTree } from '../tree/WorldTree' import LineBatch from './LineBatch' import Materials from '../materials/Materials' -import SpeckleLineMaterial from '../materials/SpeckleLineMaterial' import { NodeRenderView } from '../tree/NodeRenderView' import { Batch, BatchUpdateRange, GeometryType } from './Batch' import PointBatch from './PointBatch' @@ -75,7 +74,7 @@ export default class Batcher { break } - this.batches[batchID].setBatchMaterial(material as SpeckleLineMaterial) + this.batches[batchID].setBatchMaterial(material) this.batches[batchID].buildBatch() console.warn(batch) } diff --git a/packages/viewer/src/modules/tree/NodeRenderView.ts b/packages/viewer/src/modules/tree/NodeRenderView.ts index b2aabb4c2..b0ef35492 100644 --- a/packages/viewer/src/modules/tree/NodeRenderView.ts +++ b/packages/viewer/src/modules/tree/NodeRenderView.ts @@ -130,6 +130,8 @@ export class NodeRenderView { switch (this._renderData.speckleType) { case SpeckleType.Mesh: return GeometryType.MESH + case SpeckleType.Brep: + return GeometryType.MESH case SpeckleType.Point: return GeometryType.POINT case SpeckleType.Pointcloud: