Skip to content

Commit

Permalink
Remove LOD factor code from CentralBody.
Browse files Browse the repository at this point in the history
  • Loading branch information
kring committed Mar 8, 2013
1 parent 2115f12 commit da32bed
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions Source/Scene/CentralBody.js
Expand Up @@ -229,9 +229,6 @@ define([
this._showingPrettyOcean = false;
this._hasWaterMask = false;

this.showLodFactor = false;
this._showLodFactor = undefined;

var that = this;

this._drawUniforms = {
Expand Down Expand Up @@ -629,15 +626,13 @@ define([
var projectionChanged = this._projection !== projection;
var hasWaterMask = this._surface._terrainProvider.hasWaterMask();
var hasWaterMaskChanged = this._hasWaterMask !== hasWaterMask;
var hasShowLodFactorChanged = this.showLodFactor !== this._showLodFactor;

if (typeof this._surfaceShaderSet === 'undefined' ||
typeof this._northPoleCommand.shaderProgram === 'undefined' ||
typeof this._southPoleCommand.shaderProgram === 'undefined' ||
modeChanged ||
projectionChanged ||
hasWaterMaskChanged ||
hasShowLodFactorChanged ||
(typeof this._oceanNormalMap !== 'undefined') !== this._showingPrettyOcean) {

var getPosition3DMode = 'vec4 getPosition(vec3 position3DWC) { return getPosition3DMode(position3DWC); }';
Expand Down Expand Up @@ -683,7 +678,6 @@ define([
this._surfaceShaderSet.baseFragmentShaderString =
(hasWaterMask ? '#define SHOW_REFLECTIVE_OCEAN\n' : '') +
(showPrettyOcean ? '#define SHOW_OCEAN_WAVES\n' : '') +
(this.showLodFactor ? '#define SHOW_LOD_FACTOR\n' : '') +
'#line 0\n' +
CentralBodyFS;
this._surfaceShaderSet.invalidateShaders();
Expand All @@ -696,7 +690,6 @@ define([

this._showingPrettyOcean = typeof this._oceanNormalMap !== 'undefined';
this._hasWaterMask = hasWaterMask;
this._showLodFactor = this.showLodFactor;
}

var cameraPosition = frameState.camera.getPositionWC();
Expand Down

0 comments on commit da32bed

Please sign in to comment.