diff --git a/Source/Core/OrthographicFrustum.js b/Source/Core/OrthographicFrustum.js index be0a941eb616..9fa793ea3dcd 100644 --- a/Source/Core/OrthographicFrustum.js +++ b/Source/Core/OrthographicFrustum.js @@ -1,9 +1,7 @@ -import Cartesian2 from './Cartesian2.js'; import Check from './Check.js'; import defaultValue from './defaultValue.js'; import defined from './defined.js'; import defineProperties from './defineProperties.js'; -import deprecationWarning from './deprecationWarning.js'; import DeveloperError from './DeveloperError.js'; import CesiumMath from './Math.js'; import OrthographicOffCenterFrustum from './OrthographicOffCenterFrustum.js'; @@ -217,12 +215,6 @@ import OrthographicOffCenterFrustum from './OrthographicOffCenterFrustum.js'; */ OrthographicFrustum.prototype.getPixelDimensions = function(drawingBufferWidth, drawingBufferHeight, distance, pixelRatio, result) { update(this); - - if (pixelRatio instanceof Cartesian2) { - result = pixelRatio; - pixelRatio = 1.0; - deprecationWarning('getPixelDimensions-parameter-change', 'getPixelDimensions now takes a pixelRatio argument before the result argument in Cesium 1.63. The previous function definition will no longer work in 1.65.'); - } return this._offCenterFrustum.getPixelDimensions(drawingBufferWidth, drawingBufferHeight, distance, pixelRatio, result); }; diff --git a/Source/Core/OrthographicOffCenterFrustum.js b/Source/Core/OrthographicOffCenterFrustum.js index 96d2eca200c0..6ca8971b60a6 100644 --- a/Source/Core/OrthographicOffCenterFrustum.js +++ b/Source/Core/OrthographicOffCenterFrustum.js @@ -1,11 +1,9 @@ -import Cartesian2 from './Cartesian2.js'; import Cartesian3 from './Cartesian3.js'; import Cartesian4 from './Cartesian4.js'; import CullingVolume from './CullingVolume.js'; import defaultValue from './defaultValue.js'; import defined from './defined.js'; import defineProperties from './defineProperties.js'; -import deprecationWarning from './deprecationWarning.js'; import DeveloperError from './DeveloperError.js'; import CesiumMath from './Math.js'; import Matrix4 from './Matrix4.js'; @@ -290,12 +288,6 @@ import Matrix4 from './Matrix4.js'; OrthographicOffCenterFrustum.prototype.getPixelDimensions = function(drawingBufferWidth, drawingBufferHeight, distance, pixelRatio, result) { update(this); - if (pixelRatio instanceof Cartesian2) { - result = pixelRatio; - pixelRatio = 1.0; - deprecationWarning('getPixelDimensions-parameter-change', 'getPixelDimensions now takes a pixelRatio argument before the result argument in Cesium 1.63. The previous function definition will no longer work in 1.65.'); - } - //>>includeStart('debug', pragmas.debug); if (!defined(drawingBufferWidth) || !defined(drawingBufferHeight)) { throw new DeveloperError('Both drawingBufferWidth and drawingBufferHeight are required.'); diff --git a/Source/Core/PerspectiveFrustum.js b/Source/Core/PerspectiveFrustum.js index f16f8e34496b..64dd216bb5dd 100644 --- a/Source/Core/PerspectiveFrustum.js +++ b/Source/Core/PerspectiveFrustum.js @@ -1,9 +1,7 @@ -import Cartesian2 from './Cartesian2.js'; import Check from './Check.js'; import defaultValue from './defaultValue.js'; import defined from './defined.js'; import defineProperties from './defineProperties.js'; -import deprecationWarning from './deprecationWarning.js'; import DeveloperError from './DeveloperError.js'; import CesiumMath from './Math.js'; import PerspectiveOffCenterFrustum from './PerspectiveOffCenterFrustum.js'; @@ -312,13 +310,6 @@ import PerspectiveOffCenterFrustum from './PerspectiveOffCenterFrustum.js'; */ PerspectiveFrustum.prototype.getPixelDimensions = function(drawingBufferWidth, drawingBufferHeight, distance, pixelRatio, result) { update(this); - - if (pixelRatio instanceof Cartesian2) { - result = pixelRatio; - pixelRatio = 1.0; - deprecationWarning('getPixelDimensions-parameter-change', 'getPixelDimensions now takes a pixelRatio argument before the result argument in Cesium 1.63. The previous function definition will no longer work in 1.65.'); - } - return this._offCenterFrustum.getPixelDimensions(drawingBufferWidth, drawingBufferHeight, distance, pixelRatio, result); }; diff --git a/Source/Core/PerspectiveOffCenterFrustum.js b/Source/Core/PerspectiveOffCenterFrustum.js index 7e716bc8cc83..19d2cf37e47f 100644 --- a/Source/Core/PerspectiveOffCenterFrustum.js +++ b/Source/Core/PerspectiveOffCenterFrustum.js @@ -1,11 +1,9 @@ -import Cartesian2 from './Cartesian2.js'; import Cartesian3 from './Cartesian3.js'; import Cartesian4 from './Cartesian4.js'; import CullingVolume from './CullingVolume.js'; import defaultValue from './defaultValue.js'; import defined from './defined.js'; import defineProperties from './defineProperties.js'; -import deprecationWarning from './deprecationWarning.js'; import DeveloperError from './DeveloperError.js'; import CesiumMath from './Math.js'; import Matrix4 from './Matrix4.js'; @@ -340,12 +338,6 @@ import Matrix4 from './Matrix4.js'; PerspectiveOffCenterFrustum.prototype.getPixelDimensions = function(drawingBufferWidth, drawingBufferHeight, distance, pixelRatio, result) { update(this); - if (pixelRatio instanceof Cartesian2) { - result = pixelRatio; - pixelRatio = 1.0; - deprecationWarning('getPixelDimensions-parameter-change', 'getPixelDimensions now takes a pixelRatio argument before the result argument in Cesium 1.63. The previous function definition will no longer work in 1.65.'); - } - //>>includeStart('debug', pragmas.debug); if (!defined(drawingBufferWidth) || !defined(drawingBufferHeight)) { throw new DeveloperError('Both drawingBufferWidth and drawingBufferHeight are required.');