Skip to content

Commit

Permalink
Merge pull request #1614 from AnalyticalGraphicsInc/ie8
Browse files Browse the repository at this point in the history
Tweaks to make Cesium not totally bomb on IE8.
  • Loading branch information
shunter committed Apr 11, 2014
2 parents 12c1fae + 51aaba2 commit debca9f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Source/Core/EarthOrientationParameters.js
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ define([
if (taiMinusUtc !== lastTaiMinusUtc && defined(lastTaiMinusUtc)) {
// We crossed a leap second boundary, so add the leap second
// if it does not already exist.
var leapSeconds = LeapSecond.leapSeconds;
var leapSeconds = LeapSecond._leapSeconds;
var leapSecondIndex = binarySearch(leapSeconds, date, compareLeapSecondDates);
if (leapSecondIndex < 0) {
var leapSecond = new LeapSecond(date, taiMinusUtc);
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/JulianDate.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ define([
//Even though julianDate is in UTC, we'll treat it as TAI and
//search the leap second table for it.
binarySearchScratchLeapSecond.julianDate = julianDate;
var leapSeconds = LeapSecond.leapSeconds;
var leapSeconds = LeapSecond._leapSeconds;
var index = binarySearch(leapSeconds, binarySearchScratchLeapSecond, LeapSecond.compareLeapSecondDate);

if (index < 0) {
Expand Down Expand Up @@ -111,7 +111,7 @@ define([

function convertTaiToUtc(julianDate, result) {
binarySearchScratchLeapSecond.julianDate = julianDate;
var leapSeconds = LeapSecond.leapSeconds;
var leapSeconds = LeapSecond._leapSeconds;
var index = binarySearch(leapSeconds, binarySearchScratchLeapSecond, LeapSecond.compareLeapSecondDate);
if (index < 0) {
index = ~index;
Expand Down Expand Up @@ -969,7 +969,7 @@ define([
*/
JulianDate.prototype.getTaiMinusUtc = function() {
binarySearchScratchLeapSecond.julianDate = this;
var leapSeconds = LeapSecond.leapSeconds;
var leapSeconds = LeapSecond._leapSeconds;
var index = binarySearch(leapSeconds, binarySearchScratchLeapSecond, LeapSecond.compareLeapSecondDate);
if (index < 0) {
index = ~index;
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Simon1994PlanetaryPositions.js
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ define([
var Sl7 = -112 * 1e-7;
var Sl8 = -80 * 1e-7;

var scratchDate = new JulianDate();
var scratchDate = new JulianDate(0, 0.0, TimeStandard.TAI);
/**
* Gets a point describing the motion of the Earth-Moon barycenter according to the equations
* described in section 6.
Expand Down
4 changes: 2 additions & 2 deletions Source/Renderer/AutomaticUniforms.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ define([
});

AutomaticUniform.prototype.getDeclaration = function(name) {
var declaration = 'uniform ' + this.datatype.glsl + ' ' + name;
var declaration = 'uniform ' + this._datatype.glsl + ' ' + name;

var size = this.size;
var size = this._size;
if (size === 1) {
declaration += ';';
} else {
Expand Down

0 comments on commit debca9f

Please sign in to comment.