huanld/speckle-server
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #604 from specklesystems/jrm/display-value-fix

Browse Source 
Fixed converter issues 2.4.0
This commit is contained in:
Dimitrie Stefanescu
2022-02-24 15:18:08 +00:00
committed by GitHub
parent 92f0fe9239 154b8c3533
commit c7bb874577
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/viewer/src/modules/converter/Converter.js
+9 -3
View File
@@ -278,7 +278,11 @@ export default class Coverter {
async BrepToBufferGeometry( obj, scale = true ) {
try {
if ( !obj ) return
let { bufferGeometry } = await this.MeshToBufferGeometry( await this.resolveReference( obj.displayValue || obj.displayMesh ), scale )
let displayValue = obj.displayValue || obj.displayMesh
if( Array.isArray( displayValue ) ) displayValue = displayValue[0] //Just take the first display value for now (not ideal)
let { bufferGeometry } = await this.MeshToBufferGeometry( await this.resolveReference( displayValue ), scale )
// deletes known unneeded fields
// delete obj.displayMesh
@@ -448,8 +452,10 @@ export default class Coverter {
async CurveToBufferGeometry( object, scale = true ) {
let obj = {}
Object.assign( obj, object )
obj.displayValue.units = obj.displayValue.units || obj.units
const poly = await this.PolylineToBufferGeometry( obj.displayValue, scale )
let displayValue = await this.resolveReference( obj.displayValue )
displayValue.units = displayValue.units || obj.units
const poly = await this.PolylineToBufferGeometry( displayValue, scale )
return new ObjectWrapper( poly.bufferGeometry, obj, 'line' )
}