From b72081d791eda1e81de2e6f2bbfe8cdb262dce5e Mon Sep 17 00:00:00 2001 From: Ed Mackey Date: Tue, 9 Sep 2014 11:32:54 -0400 Subject: [PATCH] Add read-only flag, and update tests to use new flag. --- Source/Scene/Scene.js | 13 +++++++++++++ Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js | 4 ++-- Specs/Widgets/Viewer/ViewerSpec.js | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js index ff624df8fb86..9e2537d670ff 100644 --- a/Source/Scene/Scene.js +++ b/Source/Scene/Scene.js @@ -732,6 +732,19 @@ define([ } }, + /** + * Gets whether or not the scene has order independent translucency enabled. + * Note that this only reflects the original construction option, and there are + * other factors that could prevent OIT from functioning on a given system configuration. + * @memberof Scene.prototype + * @type {Boolean} + */ + orderIndependentTranslucency : { + get : function() { + return defined(this._oit); + } + }, + /** * Gets the unique identifier for this scene. * @memberof Scene.prototype diff --git a/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js b/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js index 6d33abd025da..1083b1f95906 100644 --- a/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js +++ b/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js @@ -185,14 +185,14 @@ defineSuite([ widget = new CesiumWidget(container, { orderIndependentTranslucency : true }); - expect(widget.scene._oit).toBeDefined(); + expect(widget.scene.orderIndependentTranslucency).toBe(true); }); it('can disable Order Independent Translucency', function() { widget = new CesiumWidget(container, { orderIndependentTranslucency : false }); - expect(widget.scene._oit).not.toBeDefined(); + expect(widget.scene.orderIndependentTranslucency).toBe(false); }); it('throws if no container provided', function() { diff --git a/Specs/Widgets/Viewer/ViewerSpec.js b/Specs/Widgets/Viewer/ViewerSpec.js index 4ba5f9085d4e..960f68b07292 100644 --- a/Specs/Widgets/Viewer/ViewerSpec.js +++ b/Specs/Widgets/Viewer/ViewerSpec.js @@ -316,14 +316,14 @@ defineSuite([ viewer = new Viewer(container, { orderIndependentTranslucency : true }); - expect(viewer.scene._oit).toBeDefined(); + expect(viewer.scene.orderIndependentTranslucency).toBe(true); }); it('can disable Order Independent Translucency', function() { viewer = new Viewer(container, { orderIndependentTranslucency : false }); - expect(viewer.scene._oit).not.toBeDefined(); + expect(viewer.scene.orderIndependentTranslucency).toBe(false); }); it('can set scene mode', function() {