Skip to content

Commit

Permalink
Updates samples-generator
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanjeet Suhag committed Jul 18, 2022
1 parent a6f5f3c commit 0bd42f0
Show file tree
Hide file tree
Showing 16 changed files with 316 additions and 314 deletions.
80 changes: 40 additions & 40 deletions samples-generator/gulpfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
'use strict';

var Promise = require('bluebird');
var Cesium = require('cesium');
var child_process = require('child_process');
var gulp = require('gulp');
var Jasmine = require('jasmine');
var SpecReporter = require('jasmine-spec-reporter').SpecReporter;
var path = require('path');
var yargs = require('yargs');
var fsExtra = require('fs-extra');
var open = require('open');

var defaultValue = Cesium.defaultValue;
var defined = Cesium.defined;
var argv = yargs.argv;
const Promise = require('bluebird');
const Cesium = require('cesium');
const child_process = require('child_process');
const gulp = require('gulp');
const Jasmine = require('jasmine');
const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
const path = require('path');
const yargs = require('yargs');
const fsExtra = require('fs-extra');
const open = require('open');

const defaultValue = Cesium.defaultValue;
const defined = Cesium.defined;
const argv = yargs.argv;

// Add third-party node module binaries to the system path
// since some tasks need to call them directly.
var environmentSeparator = (process.platform === 'win32') ? ';' : ':';
var nodeBinaries = path.join(__dirname, 'node_modules', '.bin');
const environmentSeparator = (process.platform === 'win32') ? ';' : ':';
const nodeBinaries = path.join(__dirname, 'node_modules', '.bin');
process.env.PATH += environmentSeparator + nodeBinaries;

var specFiles = ['**/*.js', '!node_modules/**'];
const specFiles = ['**/*.js', '!node_modules/**'];

gulp.task('test', function (done) {
var jasmine = new Jasmine();
const jasmine = new Jasmine();
jasmine.loadConfigFile('specs/jasmine.json');
jasmine.addReporter(new SpecReporter({
displaySuccessfulSpec: !defined(argv.suppressPassed) || !argv.suppressPassed
Expand Down Expand Up @@ -67,13 +67,13 @@ gulp.task('coverage', function () {
});

gulp.task('cloc', function() {
var cmdLine;
var clocPath = path.join('node_modules', 'cloc', 'lib', 'cloc');
let cmdLine;
const clocPath = path.join('node_modules', 'cloc', 'lib', 'cloc');

//Run cloc on primary Source files only
var source = new Promise(function(resolve, reject) {
cmdLine = 'perl ' + clocPath + ' --quiet --progress-rate=0' +
' lib/ bin/';
const source = new Promise(function(resolve, reject) {
cmdLine = `perl ${ clocPath } --quiet --progress-rate=0` +
` lib/ bin/`;

child_process.exec(cmdLine, function(error, stdout, stderr) {
if (error) {
Expand All @@ -89,8 +89,8 @@ gulp.task('cloc', function() {
//If running cloc on source succeeded, also run it on the tests.
return source.then(function() {
return new Promise(function(resolve, reject) {
cmdLine = 'perl ' + clocPath + ' --quiet --progress-rate=0' +
' specs/lib/ specs/bin/';
cmdLine = `perl ${ clocPath } --quiet --progress-rate=0` +
` specs/lib/ specs/bin/`;
child_process.exec(cmdLine, function(error, stdout, stderr) {
if (error) {
console.log(stderr);
Expand All @@ -106,16 +106,16 @@ gulp.task('cloc', function() {

function getLicenseDataFromPackage(packageName, override) {
override = defaultValue(override, defaultValue.EMPTY_OBJECT);
var packagePath = path.join('node_modules', packageName, 'package.json');
const packagePath = path.join('node_modules', packageName, 'package.json');

if (!fsExtra.existsSync(packagePath)) {
throw new Error(`Unable to find ${packageName} license information`);
}

var contents = fsExtra.readFileSync(packagePath);
var packageJson = JSON.parse(contents);
const contents = fsExtra.readFileSync(packagePath);
const packageJson = JSON.parse(contents);

var licenseField = override.license;
let licenseField = override.license;

if (!licenseField) {
licenseField = [packageJson.license];
Expand All @@ -130,7 +130,7 @@ function getLicenseDataFromPackage(packageName, override) {
licenseField = ['NONE'];
}

var version = packageJson.version;
let version = packageJson.version;
if (!packageJson.version) {
console.log(`No version information found for ${packageName}`);
version = 'NONE';
Expand All @@ -146,24 +146,24 @@ function getLicenseDataFromPackage(packageName, override) {
}

function readThirdPartyExtraJson() {
var path = 'ThirdParty.extra.json';
const path = 'ThirdParty.extra.json';
if (fsExtra.existsSync(path)) {
var contents = fsExtra.readFileSync(path);
const contents = fsExtra.readFileSync(path);
return JSON.parse(contents);
}
return [];
}

gulp.task('generate-third-party', async function() {
var packageJson = JSON.parse(fsExtra.readFileSync('package.json'));
var thirdPartyExtraJson = readThirdPartyExtraJson();
const packageJson = JSON.parse(fsExtra.readFileSync('package.json'));
const thirdPartyExtraJson = readThirdPartyExtraJson();

var thirdPartyJson = [];
const thirdPartyJson = [];

var dependencies = packageJson.dependencies;
for (var packageName in dependencies) {
const dependencies = packageJson.dependencies;
for (const packageName in dependencies) {
if (dependencies.hasOwnProperty(packageName)) {
var override = thirdPartyExtraJson.find(
const override = thirdPartyExtraJson.find(
(entry) => entry.name === packageName
);
thirdPartyJson.push(
Expand All @@ -173,8 +173,8 @@ gulp.task('generate-third-party', async function() {
}

thirdPartyJson.sort(function (a, b) {
var nameA = a.name.toLowerCase();
var nameB = b.name.toLowerCase();
const nameA = a.name.toLowerCase();
const nameB = b.name.toLowerCase();
if (nameA < nameB) {
return -1;
}
Expand Down
78 changes: 39 additions & 39 deletions samples-generator/lib/createB3dm.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';
var Cesium = require('cesium');
var getBufferPadded = require('./getBufferPadded');
var getJsonBufferPadded = require('./getJsonBufferPadded');
const Cesium = require('cesium');
const getBufferPadded = require('./getBufferPadded');
const getJsonBufferPadded = require('./getJsonBufferPadded');

var defaultValue = Cesium.defaultValue;
const defaultValue = Cesium.defaultValue;

module.exports = createB3dm;

Expand All @@ -21,21 +21,21 @@ module.exports = createB3dm;
* @returns {Buffer} The generated b3dm tile buffer.
*/
function createB3dm(options) {
var glb = options.glb;
var defaultFeatureTable = {
const glb = options.glb;
const defaultFeatureTable = {
BATCH_LENGTH : 0
};
var featureTableJson = defaultValue(options.featureTableJson, defaultFeatureTable);
var batchLength = featureTableJson.BATCH_LENGTH;
const featureTableJson = defaultValue(options.featureTableJson, defaultFeatureTable);
const batchLength = featureTableJson.BATCH_LENGTH;

var headerByteLength = 28;
var featureTableJsonBuffer = getJsonBufferPadded(featureTableJson, headerByteLength);
var featureTableBinary = getBufferPadded(options.featureTableBinary);
var batchTableJsonBuffer = getJsonBufferPadded(options.batchTableJson);
var batchTableBinary = getBufferPadded(options.batchTableBinary);
const headerByteLength = 28;
const featureTableJsonBuffer = getJsonBufferPadded(featureTableJson, headerByteLength);
const featureTableBinary = getBufferPadded(options.featureTableBinary);
const batchTableJsonBuffer = getJsonBufferPadded(options.batchTableJson);
const batchTableBinary = getBufferPadded(options.batchTableBinary);

var deprecated1 = defaultValue(options.deprecated1, false);
var deprecated2 = defaultValue(options.deprecated2, false);
const deprecated1 = defaultValue(options.deprecated1, false);
const deprecated2 = defaultValue(options.deprecated2, false);

if (deprecated1) {
return createB3dmDeprecated1(glb, batchLength, batchTableJsonBuffer);
Expand All @@ -47,16 +47,16 @@ function createB3dm(options) {
}

function createB3dmCurrent(glb, featureTableJson, featureTableBinary, batchTableJson, batchTableBinary) {
var version = 1;
var headerByteLength = 28;
var featureTableJsonByteLength = featureTableJson.length;
var featureTableBinaryByteLength = featureTableBinary.length;
var batchTableJsonByteLength = batchTableJson.length;
var batchTableBinaryByteLength = batchTableBinary.length;
var gltfByteLength = glb.length;
var byteLength = headerByteLength + featureTableJsonByteLength + featureTableBinaryByteLength + batchTableJsonByteLength + batchTableBinaryByteLength + gltfByteLength;

var header = Buffer.alloc(headerByteLength);
const version = 1;
const headerByteLength = 28;
const featureTableJsonByteLength = featureTableJson.length;
const featureTableBinaryByteLength = featureTableBinary.length;
const batchTableJsonByteLength = batchTableJson.length;
const batchTableBinaryByteLength = batchTableBinary.length;
const gltfByteLength = glb.length;
const byteLength = headerByteLength + featureTableJsonByteLength + featureTableBinaryByteLength + batchTableJsonByteLength + batchTableBinaryByteLength + gltfByteLength;

const header = Buffer.alloc(headerByteLength);
header.write('b3dm', 0);
header.writeUInt32LE(version, 4);
header.writeUInt32LE(byteLength, 8);
Expand All @@ -69,13 +69,13 @@ function createB3dmCurrent(glb, featureTableJson, featureTableBinary, batchTable
}

function createB3dmDeprecated1(glb, batchLength, batchTableJson) {
var version = 1;
var headerByteLength = 20;
var batchTableJsonByteLength = batchTableJson.length;
var gltfByteLength = glb.length;
var byteLength = headerByteLength + batchTableJsonByteLength + gltfByteLength;
const version = 1;
const headerByteLength = 20;
const batchTableJsonByteLength = batchTableJson.length;
const gltfByteLength = glb.length;
const byteLength = headerByteLength + batchTableJsonByteLength + gltfByteLength;

var header = Buffer.alloc(headerByteLength);
const header = Buffer.alloc(headerByteLength);
header.write('b3dm', 0);
header.writeUInt32LE(version, 4);
header.writeUInt32LE(byteLength, 8);
Expand All @@ -86,14 +86,14 @@ function createB3dmDeprecated1(glb, batchLength, batchTableJson) {
}

function createB3dmDeprecated2(glb, batchLength, batchTableJson, batchTableBinary) {
var version = 1;
var headerByteLength = 24;
var batchTableJsonByteLength = batchTableJson.length;
var batchTableBinaryByteLength = batchTableBinary.length;
var gltfByteLength = glb.length;
var byteLength = headerByteLength + batchTableJsonByteLength + batchTableBinaryByteLength + gltfByteLength;

var header = Buffer.alloc(headerByteLength);
const version = 1;
const headerByteLength = 24;
const batchTableJsonByteLength = batchTableJson.length;
const batchTableBinaryByteLength = batchTableBinary.length;
const gltfByteLength = glb.length;
const byteLength = headerByteLength + batchTableJsonByteLength + batchTableBinaryByteLength + gltfByteLength;

const header = Buffer.alloc(headerByteLength);
header.write('b3dm', 0);
header.writeUInt32LE(version, 4);
header.writeUInt32LE(byteLength, 8);
Expand Down
20 changes: 10 additions & 10 deletions samples-generator/lib/createCmpt.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
var getBufferPadded = require('./getBufferPadded');
const getBufferPadded = require('./getBufferPadded');

module.exports = createCmpt;

Expand All @@ -10,22 +10,22 @@ module.exports = createCmpt;
* @returns {Buffer} The generated cmpt tile buffer.
*/
function createCmpt(tiles) {
var byteLength = 0;
var buffers = [];
var tilesLength = tiles.length;
for (var i = 0; i < tilesLength; i++) {
var tile = getBufferPadded(tiles[i]);
var tileByteLength = tile.length;
let byteLength = 0;
const buffers = [];
const tilesLength = tiles.length;
for (let i = 0; i < tilesLength; i++) {
const tile = getBufferPadded(tiles[i]);
const tileByteLength = tile.length;
tile.writeUInt32LE(tileByteLength, 8); // Edit the tile's byte length
buffers.push(tile);
byteLength += tileByteLength;
}

var version = 1;
var headerByteLength = 16;
const version = 1;
const headerByteLength = 16;
byteLength += headerByteLength;

var header = Buffer.alloc(headerByteLength);
const header = Buffer.alloc(headerByteLength);
header.write('cmpt', 0);
header.writeUInt32LE(version, 4);
header.writeUInt32LE(byteLength, 8);
Expand Down
12 changes: 6 additions & 6 deletions samples-generator/lib/createGlb.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';
var path = require('path');
var createGltf = require('./createGltf');
var gltfPipeline = require('gltf-pipeline');
var gltfToGlb = gltfPipeline.gltfToGlb;
var gltfConversionOptions = { resourceDirectory: path.join(__dirname, '../') };
const path = require('path');
const createGltf = require('./createGltf');
const gltfPipeline = require('gltf-pipeline');
const gltfToGlb = gltfPipeline.gltfToGlb;
const gltfConversionOptions = { resourceDirectory: path.join(__dirname, '../') };

module.exports = createGlb;

Expand All @@ -20,7 +20,7 @@ module.exports = createGlb;
*/

function createGlb(options) {
var gltf = createGltf(options);
const gltf = createGltf(options);
return gltfToGlb(gltf, gltfConversionOptions).then(function (results) {
return results.glb;
});
Expand Down
Loading

0 comments on commit 0bd42f0

Please sign in to comment.