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.

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

Custom light source #8493

Merged
merged 21 commits into from
Jan 8, 2020
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Eslint fixes
  • Loading branch information
lilleyse committed Dec 24, 2019
commit b40faa5fa5ee1b22ed4e014013bfd06ce1571751
2 changes: 1 addition & 1 deletion Source/Scene/GlobeSurfaceShaderSet.js
Original file line number Diff line number Diff line change
@@ -221,7 +221,7 @@ import SceneMode from './SceneMode.js';
if (dynamicAtmosphereLighting) {
fs.defines.push('DYNAMIC_ATMOSPHERE_LIGHTING');
if (dynamicAtmosphereLightingFromSun) {
fs.defines.push('DYNAMIC_ATMOSPHERE_LIGHTING_FROM_SUN')
fs.defines.push('DYNAMIC_ATMOSPHERE_LIGHTING_FROM_SUN');
}
}

4 changes: 2 additions & 2 deletions Specs/Scene/Cesium3DTilesetSpec.js
Original file line number Diff line number Diff line change
@@ -1892,10 +1892,10 @@ describe('Scene/Cesium3DTileset', function() {
time : new JulianDate(2457522.154792)
};
return Cesium3DTilesTester.loadTileset(scene, withoutBatchTableUrl).then(function(tileset) {
expect(scene).toRenderAndCall(function(rgba) {
expect(renderOptions).toRenderAndCall(function(rgba) {
expect(rgba).not.toEqual([0, 0, 0, 255]);
tileset.imageBasedLightingFactor = new Cartesian2(0.0, 0.0);
expect(scene).notToRender(rgba);
expect(renderOptions).notToRender(rgba);
});
});
});
2 changes: 1 addition & 1 deletion Specs/Scene/ShadowMapSpec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BoundingSphere, SunLight } from '../../Source/Cesium.js';
import { BoundingSphere } from '../../Source/Cesium.js';
import { BoxGeometry } from '../../Source/Cesium.js';
import { Cartesian3 } from '../../Source/Cesium.js';
import { Color } from '../../Source/Cesium.js';
2 changes: 1 addition & 1 deletion Specs/createScene.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Cartesian2, DirectionalLight } from '../Source/Cesium.js';
import { Cartesian2 } from '../Source/Cesium.js';
import { clone } from '../Source/Cesium.js';
import { Color } from '../Source/Cesium.js';
import { defaultValue } from '../Source/Cesium.js';