Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add smokescreen test for Node support to travis. #6177

Merged
merged 2 commits into from
Feb 1, 2018
Merged

Add smokescreen test for Node support to travis. #6177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a2a5e4
Add smokescreen test for Node support to travis.
mramato Feb 1, 2018
2896e38
Fix Cesium in Node.js
mramato Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ script:
- npm run test -- --browsers Electron --failTaskOnError --webgl-stub --release --suppressPassed
- echo -en 'travis_fold:end:script test.release\\r'

- echo 'test node' && echo -en 'travis_fold:start:script test.node\\r'
- node index.js
- echo -en 'travis_fold:end:script test.node\\r'

- echo 'cloc' && echo -en 'travis_fold:start:script.cloc\\r'
- npm run cloc
- echo -en 'travis_fold:end:script.cloc\\r'
6 changes: 1 addition & 5 deletions Source/Scene/GroundPrimitive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ define([
}
};

var terrainHeightsResource = new Resource({
url: buildModuleUrl('Assets/approximateTerrainHeights.json')
});

/**
* A ground primitive represents geometry draped over the terrain in the {@link Scene}. The geometry must be from a single {@link GeometryInstance}.
* Batching multiple geometries is not yet supported.
Expand Down Expand Up @@ -667,7 +663,7 @@ define([
return initPromise;
}

GroundPrimitive._initPromise = terrainHeightsResource.fetchJson().then(function(json) {
GroundPrimitive._initPromise = Resource.fetchJson(buildModuleUrl('Assets/approximateTerrainHeights.json')).then(function(json) {
GroundPrimitive._initialized = true;
GroundPrimitive._terrainHeights = json;
});
Expand Down