Merge pull request #198 from CesiumGS/samples_next

Samples next
CesiumGS · Apr 30, 2020 · 78827cc · 78827cc
2 parents d2502ff + f1323ba
commit 78827cc
Show file tree

Hide file tree

Showing 9 changed files with 2,358 additions and 1,277 deletions.
diff --git a/samples-generator/bin/3d-tiles-samples-generator.ts b/samples-generator/bin/3d-tiles-samples-generator.ts
diff --git a/samples-generator/lib/compositeSamplesNext.ts b/samples-generator/lib/compositeSamplesNext.ts
@@ -68,9 +68,10 @@ export namespace CompositeSamplesNext {
             properties: {
                 Height: {
                     values: i3dmHeights
+                    }
                 }
             }
-        });
+        );
 
         // b3dm
         const transform = FeatureTableUtils.getDefaultTransform();
@@ -104,6 +105,7 @@ export namespace CompositeSamplesNext {
                 featureLayers: [
                     {
                         featureTable: 1,
+                        instanceStride: 1,
                         vertexAttribute: {
                             implicit: {
                                 increment: 1,

diff --git a/samples-generator/lib/createBuildingsTile.ts b/samples-generator/lib/createBuildingsTile.ts
@@ -183,8 +183,8 @@ export function createBuildingsTile(options) {
 
 export type BatchTable = {
     id?: number[];
-    Longitude: number[];
-    Latitude: number[];
+    Longitude?: number[];
+    Latitude?: number[];
     Height: number[];
 }
 

diff --git a/samples-generator/lib/createInstancesTile.ts b/samples-generator/lib/createInstancesTile.ts
@@ -1,8 +1,19 @@
 import fsExtra = require('fs-extra');
 import path = require('path');
 import { Gltf } from './gltfType';
-import { FLOAT32_SIZE_BYTES, UINT16_SIZE_BYTES, UINT32_SIZE_BYTES, UINT8_SIZE_BYTES } from './typeSize';
-import { Cartesian2, Cartesian3, defaultValue, Math as CesiumMath, Matrix4 } from 'cesium';
+import {
+    FLOAT32_SIZE_BYTES,
+    UINT16_SIZE_BYTES,
+    UINT8_SIZE_BYTES,
+    UINT32_SIZE_BYTES
+} from './typeSize';
+import {
+    Matrix4,
+    Cartesian2,
+    Cartesian3,
+    Math as CesiumMath,
+    defaultValue
+} from 'cesium';
 
 const createI3dm = require('./createI3dm');
 const AttributeCompression = require('cesium').AttributeCompression;
@@ -29,10 +40,10 @@ export interface InstanceTileOptions {
 }
 
 export interface InstancesTileResult {
-    glb?: Buffer;
-    gltf?: Gltf;
-    i3dm?: any;
-    batchTableJson?: any;
+    glb?: Buffer,
+    gltf?: Gltf,
+    i3dm?: any,
+    batchTableJson?: any
 }
 
 /**
@@ -69,7 +80,7 @@ export async function createInstancesTile(
     const transform = defaultValue(options.transform, Matrix4.IDENTITY);
     const instancesLength = defaultValue(options.instancesLength, 25);
     let uri = options.uri;
-    const embed = defaultValue(options.embed, true);
+    const embed = defaultValue(options.embed, true) as boolean;
     const modelSize = defaultValue(options.modelSize, 20.0) as number;
     const createBatchTable = defaultValue(options.createBatchTable, true);
     const createBatchTableBinary = defaultValue(

diff --git a/samples-generator/lib/createPointCloudTile.ts b/samples-generator/lib/createPointCloudTile.ts
@@ -1,11 +1,11 @@
 'use strict';
 import { createFeatureMetadataExtension } from './createFeatureMetadataExtension';
-import { Extensions } from './Extensions';
 
 var Cesium = require('cesium');
 var draco3d = require('draco3d');
 var SimplexNoise = require('simplex-noise');
 var createPnts = require('./createPnts');
+var Extensions = require('./Extensions');
 var createGltfFromPnts = require('./createGltfFromPnts');
 var typeConversion = require('./typeConversion');