Handle new point cloud format (#314)

aurora-opensource · May 7, 2019 · b123daa · b123daa
1 parent f039ca6
commit b123daa
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 35 deletions.
diff --git a/modules/core/package.json b/modules/core/package.json
@@ -22,7 +22,7 @@
     "@deck.gl/mesh-layers": "^7.0.4",
     "@deck.gl/react": "^7.0.4",
     "@streetscape.gl/monochrome": "^1.0.0-beta.1",
-    "@xviz/parser": "^1.0.0-beta.9",
+    "@xviz/parser": "^1.0.0-beta.11",
     "lodash.merge": "^4.6.1",
     "math.gl": "^2.3.1",
     "promise-retry": "^1.1.1",

diff --git a/modules/core/src/components/log-viewer/core-3d-viewer.js b/modules/core/src/components/log-viewer/core-3d-viewer.js
@@ -47,6 +47,11 @@ function getStreamMetadata(metadata, streamName) {
   return (metadata && metadata.streams && metadata.streams[streamName]) || {};
 }
 
+const Z_INDEX = {
+  point: 1,
+  polygon: 2
+};
+
 export default class Core3DViewer extends PureComponent {
   static propTypes = {
     // Props from loader
@@ -278,33 +283,16 @@ export default class Core3DViewer extends PureComponent {
               data: primitives,
               style: stylesheet,
               objectStates,
+              vehicleRelativeTransform: frame.vehicleRelativeTransform,
 
               // Hack: draw extruded polygons last to defeat depth test when rendering translucent objects
               // This is not used by deck.gl, only used in this function to sort the layers
-              zIndex: primitives[0].type === 'polygon' ? 2 : 0,
+              zIndex: Z_INDEX[primitives[0].type] || 0,
 
               // Selection props (app defined, not used by deck.gl)
               streamName
             });
           }
-          if (stream.pointCloud) {
-            return new XVIZLayer({
-              id: `xviz-${streamName}`,
-              ...coordinateProps,
-
-              pickable: showTooltip,
-
-              data: stream.pointCloud,
-              style: stylesheet,
-              vehicleRelativeTransform: frame.vehicleRelativeTransform,
-
-              // Hack: draw point clouds before polygons to defeat depth test when rendering translucent objects
-              // This is not used by deck.gl, only used in this function to sort the layers
-              zIndex: 1,
-
-              streamName
-            });
-          }
           return null;
         })
         .filter(Boolean)

diff --git a/modules/core/src/layers/xviz-layer.js b/modules/core/src/layers/xviz-layer.js
@@ -251,7 +251,7 @@ export default class XVIZLayer extends CompositeLayer {
     if (data.length > 0) {
       return data[0].type;
     }
-    return data.type;
+    return null;
   }
 
   updateState({props, oldProps, changeFlags}) {
@@ -320,18 +320,12 @@ export default class XVIZLayer extends CompositeLayer {
         return new PointCloudLayer(
           forwardProps,
           layerProps,
-          Array.isArray(data)
-            ? {
-                data: data[0].vertices
-              }
-            : {
-                data: data.ids,
-                numInstances: data.numInstances,
-                instancePositions: data.positions,
-                instanceColors: data.colors
-              },
           this.getSubLayerProps({
             id: 'pointcloud',
+            data: data[0].ids,
+            numInstances: data[0].points.length / 3,
+            instancePositions: data[0].points,
+            instanceColors: data[0].colors,
             vehicleRelativeTransform: this.props.vehicleRelativeTransform,
             getPosition: p => p
           })

diff --git a/yarn.lock b/yarn.lock
@@ -1233,10 +1233,10 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-"@xviz/parser@^1.0.0-beta.9":
-  version "1.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@xviz/parser/-/parser-1.0.0-beta.10.tgz#a0786ce8d52333f963ba17f88b97f0c66f65a174"
-  integrity sha512-ro4L3BZjGxaSWCGjcmqgEfG4Pv8eW6/HR8claIxmPIsMq6HOT2VtsdYMgDUeWDmmIyOQybpjPnWHNNjkmi66uw==
+"@xviz/parser@^1.0.0-beta.11":
+  version "1.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@xviz/parser/-/parser-1.0.0-beta.11.tgz#e480a33f093c5343f20df5b2d142cd886b1c7ca5"
+  integrity sha512-aKV4j82JSq4bTnPwQV5C8cGQCQPZ5Z/EyQNPBb7Ho1B617AvGDO7LNe+OdIEd/RDoj0rOb+w3dNj257fMMoghA==
   dependencies:
     "@loaders.gl/draco" "^1.0.3"
     "@loaders.gl/gltf" "^1.0.3"