From e037b310e560bc2294cab0def0be3bb42cf7e7c4 Mon Sep 17 00:00:00 2001 From: AlexandruPopovici Date: Thu, 2 Mar 2023 13:13:57 +0200 Subject: [PATCH] Disabled tonemapping for point and point cloud materials --- packages/viewer-sandbox/src/main.ts | 3 ++- packages/viewer/src/modules/materials/Materials.ts | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/viewer-sandbox/src/main.ts b/packages/viewer-sandbox/src/main.ts index 7efb1e8bf..46c0cbfb8 100644 --- a/packages/viewer-sandbox/src/main.ts +++ b/packages/viewer-sandbox/src/main.ts @@ -137,7 +137,7 @@ sandbox.makeBatchesUI() await sandbox.loadUrl( // 'https://speckle.xyz/streams/da9e320dad/commits/5388ef24b8?c=%5B-7.66134,10.82932,6.41935,-0.07739,-13.88552,1.8697,0,1%5D' // Revit sample house (good for bim-like stuff with many display meshes) - 'https://speckle.xyz/streams/da9e320dad/commits/5388ef24b8' + // 'https://speckle.xyz/streams/da9e320dad/commits/5388ef24b8' // 'Super' heavy revit shit // 'https://speckle.xyz/streams/e6f9156405/commits/0694d53bb5' // IFC building (good for a tree based structure) @@ -179,6 +179,7 @@ await sandbox.loadUrl( // 'https://latest.speckle.dev/streams/c1faab5c62/commits/78bdd8eb76' // Point cloud // 'https://latest.speckle.dev/streams/2d19273d31/commits/9ceb423feb' + 'https://latest.speckle.dev/streams/7707df6cae/commits/02bdf09092' // Luis sphere // 'https://speckle.xyz/streams/b85d53c3b4/commits/b47f21b707' // Crankshaft diff --git a/packages/viewer/src/modules/materials/Materials.ts b/packages/viewer/src/modules/materials/Materials.ts index b72820ec0..4fc9d4daa 100644 --- a/packages/viewer/src/modules/materials/Materials.ts +++ b/packages/viewer/src/modules/materials/Materials.ts @@ -388,12 +388,17 @@ export default class Materials { ;( this.pointCloudHighlightMaterial as SpecklePointMaterial ).color.convertSRGBToLinear() + ;(this.pointCloudHighlightMaterial as SpecklePointMaterial).toneMapped = false ;(this.pointHighlightMaterial as SpecklePointMaterial).color.convertSRGBToLinear() + ;(this.pointHighlightMaterial as SpecklePointMaterial).toneMapped = false ;(this.pointOverlayMaterial as SpecklePointMaterial).color.convertSRGBToLinear() + ;(this.pointOverlayMaterial as SpecklePointMaterial).toneMapped = false // Jesus prettier... o_0 ;( this.pointCloudOverlayMaterial as SpecklePointMaterial ).color.convertSRGBToLinear() + ;(this.pointCloudOverlayMaterial as SpecklePointMaterial).toneMapped = false + ;(this.pointGhostMaterial as SpecklePointMaterial).toneMapped = false } private async createDefaultNullMaterials() { @@ -554,6 +559,7 @@ export default class Materials { ) mat.transparent = mat.opacity < 1 ? true : false mat.depthWrite = mat.transparent ? false : true + mat.toneMapped = false mat.color.convertSRGBToLinear() return mat }