better and more consistent pattern for THREE webgl icon generation, p…

…hetsims/buoyancy#141 Signed-off-by: Michael Kauzmann <michael.kauzmann@colorado.edu>
phetsims · Apr 23, 2024 · f023dd9 · f023dd9
1 parent d18ef48
commit f023dd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/js/compare/CompareScreen.ts b/js/compare/CompareScreen.ts
@@ -6,23 +6,20 @@
  * @author Jonathan Olson <jonathan.olson@colorado.edu>
  */
 
-import DensityBuoyancyCommonQueryParameters from '../../../density-buoyancy-common/js/common/DensityBuoyancyCommonQueryParameters.js';
 import DensityBuoyancyCommonColors from '../../../density-buoyancy-common/js/common/view/DensityBuoyancyCommonColors.js';
 import DensityCompareModel from '../../../density-buoyancy-common/js/density/model/DensityCompareModel.js';
 import DensityCompareScreenView from '../../../density-buoyancy-common/js/density/view/DensityCompareScreenView.js';
 import Screen from '../../../joist/js/Screen.js';
 import ScreenIcon from '../../../joist/js/ScreenIcon.js';
-import { Image } from '../../../scenery/js/imports.js';
 import Tandem from '../../../tandem/js/Tandem.js';
 import compare_screen_icon_png from '../../mipmaps/compare_screen_icon_png.js';
 import density from '../density.js';
 import DensityStrings from '../DensityStrings.js';
-import ThreeUtils from '../../../mobius/js/ThreeUtils.js';
+import DensityBuoyancyScreenView from '../../../density-buoyancy-common/js/common/view/DensityBuoyancyScreenView.js';
 
 export default class CompareScreen extends Screen<DensityCompareModel, DensityCompareScreenView> {
   public constructor( tandem: Tandem ) {
-    const icon = DensityBuoyancyCommonQueryParameters.generateIconImages && ThreeUtils.isWebGLEnabled() ? DensityCompareScreenView.getDensityCompareIcon() :
-                 new Image( compare_screen_icon_png );
+    const icon = DensityBuoyancyScreenView.getThreeIcon( compare_screen_icon_png, () => DensityCompareScreenView.getDensityCompareIcon() );
 
     super(
       () => new DensityCompareModel( {

diff --git a/js/intro/IntroScreen.ts b/js/intro/IntroScreen.ts
@@ -6,23 +6,20 @@
  * @author Jonathan Olson <jonathan.olson@colorado.edu>
  */
 
-import DensityBuoyancyCommonQueryParameters from '../../../density-buoyancy-common/js/common/DensityBuoyancyCommonQueryParameters.js';
 import DensityBuoyancyCommonColors from '../../../density-buoyancy-common/js/common/view/DensityBuoyancyCommonColors.js';
 import DensityIntroModel from '../../../density-buoyancy-common/js/density/model/DensityIntroModel.js';
 import DensityIntroScreenView from '../../../density-buoyancy-common/js/density/view/DensityIntroScreenView.js';
 import Screen from '../../../joist/js/Screen.js';
 import ScreenIcon from '../../../joist/js/ScreenIcon.js';
-import { Image } from '../../../scenery/js/imports.js';
 import Tandem from '../../../tandem/js/Tandem.js';
 import intro_screen_icon_png from '../../mipmaps/intro_screen_icon_png.js';
 import density from '../density.js';
 import DensityStrings from '../DensityStrings.js';
-import ThreeUtils from '../../../mobius/js/ThreeUtils.js';
+import DensityBuoyancyScreenView from '../../../density-buoyancy-common/js/common/view/DensityBuoyancyScreenView.js';
 
 export default class IntroScreen extends Screen<DensityIntroModel, DensityIntroScreenView> {
   public constructor( tandem: Tandem ) {
-    const icon = DensityBuoyancyCommonQueryParameters.generateIconImages && ThreeUtils.isWebGLEnabled() ? DensityIntroScreenView.getDensityIntroIcon() :
-                 new Image( intro_screen_icon_png );
+    const icon = DensityBuoyancyScreenView.getThreeIcon( intro_screen_icon_png, () => DensityIntroScreenView.getDensityIntroIcon() );
 
     super(
       () => new DensityIntroModel( {

diff --git a/js/mystery/MysteryScreen.ts b/js/mystery/MysteryScreen.ts
@@ -6,23 +6,20 @@
  * @author Jonathan Olson <jonathan.olson@colorado.edu>
  */
 
-import DensityBuoyancyCommonQueryParameters from '../../../density-buoyancy-common/js/common/DensityBuoyancyCommonQueryParameters.js';
 import DensityBuoyancyCommonColors from '../../../density-buoyancy-common/js/common/view/DensityBuoyancyCommonColors.js';
 import DensityMysteryModel from '../../../density-buoyancy-common/js/density/model/DensityMysteryModel.js';
 import DensityMysteryScreenView from '../../../density-buoyancy-common/js/density/view/DensityMysteryScreenView.js';
 import Screen from '../../../joist/js/Screen.js';
 import ScreenIcon from '../../../joist/js/ScreenIcon.js';
-import { Image } from '../../../scenery/js/imports.js';
 import Tandem from '../../../tandem/js/Tandem.js';
 import mystery_screen_icon_png from '../../mipmaps/mystery_screen_icon_png.js';
 import density from '../density.js';
 import DensityStrings from '../DensityStrings.js';
-import ThreeUtils from '../../../mobius/js/ThreeUtils.js';
+import DensityBuoyancyScreenView from '../../../density-buoyancy-common/js/common/view/DensityBuoyancyScreenView.js';
 
 export default class MysteryScreen extends Screen<DensityMysteryModel, DensityMysteryScreenView> {
   public constructor( tandem: Tandem ) {
-    const icon = DensityBuoyancyCommonQueryParameters.generateIconImages && ThreeUtils.isWebGLEnabled() ? DensityMysteryScreenView.getDensityMysteryIcon() :
-                 new Image( mystery_screen_icon_png );
+    const icon = DensityBuoyancyScreenView.getThreeIcon( mystery_screen_icon_png, () => DensityMysteryScreenView.getDensityMysteryIcon() );
 
     super(
       () => new DensityMysteryModel( {