From b46f1a00f22418c86ec5f9456672cd063ae9dbfc Mon Sep 17 00:00:00 2001 From: Luisav1 Date: Tue, 19 Mar 2024 09:38:44 -0600 Subject: [PATCH] Convert number-line-integers and number-line-distance to new region and culture approach. See https://github.com/phetsims/joist/issues/958. --- js/NumberLineDistanceImages.ts | 57 +++++++++++++++++++ js/explore/NLDExploreScreen.js | 20 ++++--- js/explore/model/DistanceSceneModel.js | 9 +-- js/explore/model/NLDExploreModel.js | 5 +- js/explore/view/DistanceSceneView.js | 32 ++--------- .../view/portrayals/ExplorerPortrayal.js | 33 ----------- .../portrayals/ExplorerPortrayalAfrica.js | 23 -------- .../ExplorerPortrayalAfricaModest.js | 24 -------- .../view/portrayals/ExplorerPortrayalAsia.js | 24 -------- .../ExplorerPortrayalLatinAmerica.js | 24 -------- .../portrayals/ExplorerPortrayalOceania.js | 25 -------- .../portrayals/ExplorerPortrayalRandom.js | 34 ----------- .../view/portrayals/ExplorerPortrayalUSA.js | 24 -------- js/number-line-distance-main.js | 6 +- number-line-distance-images.json | 32 +++++++++++ 15 files changed, 111 insertions(+), 261 deletions(-) create mode 100644 js/NumberLineDistanceImages.ts delete mode 100644 js/explore/view/portrayals/ExplorerPortrayal.js delete mode 100644 js/explore/view/portrayals/ExplorerPortrayalAfrica.js delete mode 100644 js/explore/view/portrayals/ExplorerPortrayalAfricaModest.js delete mode 100644 js/explore/view/portrayals/ExplorerPortrayalAsia.js delete mode 100644 js/explore/view/portrayals/ExplorerPortrayalLatinAmerica.js delete mode 100644 js/explore/view/portrayals/ExplorerPortrayalOceania.js delete mode 100644 js/explore/view/portrayals/ExplorerPortrayalRandom.js delete mode 100644 js/explore/view/portrayals/ExplorerPortrayalUSA.js create mode 100644 number-line-distance-images.json diff --git a/js/NumberLineDistanceImages.ts b/js/NumberLineDistanceImages.ts new file mode 100644 index 0000000..5c8c9cb --- /dev/null +++ b/js/NumberLineDistanceImages.ts @@ -0,0 +1,57 @@ +// Copyright 2024, University of Colorado Boulder + +/** + * Auto-generated from modulify, DO NOT manually modify. + */ +/* eslint-disable */ +import LocalizedImageProperty from '../../joist/js/i18n/LocalizedImageProperty.js'; +import numberLineDistance from './numberLineDistance.js'; +import africaExploreHomeIcon_png from '../images/africa/africaExploreHomeIcon_png.js'; +import africaExploreNavbarIcon_png from '../images/africa/africaExploreNavbarIcon_png.js'; +import africaPerson_png from '../images/africa/africaPerson_png.js'; +import africaModestExploreHomeIcon_png from '../images/africaModest/africaModestExploreHomeIcon_png.js'; +import africaModestExploreNavbarIcon_png from '../images/africaModest/africaModestExploreNavbarIcon_png.js'; +import africaModestPerson_png from '../images/africaModest/africaModestPerson_png.js'; +import asiaExploreHomeIcon_png from '../images/asia/asiaExploreHomeIcon_png.js'; +import asiaExploreNavbarIcon_png from '../images/asia/asiaExploreNavbarIcon_png.js'; +import asiaPerson_png from '../images/asia/asiaPerson_png.js'; +import latinAmericaExploreHomeIcon_png from '../images/latinAmerica/latinAmericaExploreHomeIcon_png.js'; +import latinAmericaExploreNavbarIcon_png from '../images/latinAmerica/latinAmericaExploreNavbarIcon_png.js'; +import latinAmericaPerson_png from '../images/latinAmerica/latinAmericaPerson_png.js'; +import oceaniaExploreHomeIcon_png from '../images/oceania/oceaniaExploreHomeIcon_png.js'; +import oceaniaExploreNavbarIcon_png from '../images/oceania/oceaniaExploreNavbarIcon_png.js'; +import oceaniaPerson_png from '../images/oceania/oceaniaPerson_png.js'; +import usaExploreHomeIcon_png from '../images/usa/usaExploreHomeIcon_png.js'; +import usaExploreNavbarIcon_png from '../images/usa/usaExploreNavbarIcon_png.js'; +import usaPerson_png from '../images/usa/usaPerson_png.js'; + +const NumberLineDistanceImages = { + exploreHomeIconImageProperty: new LocalizedImageProperty( 'exploreHomeIcon', { + africa: africaExploreHomeIcon_png, + africaModest: africaModestExploreHomeIcon_png, + asia: asiaExploreHomeIcon_png, + latinAmerica: latinAmericaExploreHomeIcon_png, + oceania: oceaniaExploreHomeIcon_png, + usa: usaExploreHomeIcon_png + } ), + exploreNavbarIconImageProperty: new LocalizedImageProperty( 'exploreNavbarIcon', { + africa: africaExploreNavbarIcon_png, + africaModest: africaModestExploreNavbarIcon_png, + asia: asiaExploreNavbarIcon_png, + latinAmerica: latinAmericaExploreNavbarIcon_png, + oceania: oceaniaExploreNavbarIcon_png, + usa: usaExploreNavbarIcon_png + } ), + personImageProperty: new LocalizedImageProperty( 'person', { + africa: africaPerson_png, + africaModest: africaModestPerson_png, + asia: asiaPerson_png, + latinAmerica: latinAmericaPerson_png, + oceania: oceaniaPerson_png, + usa: usaPerson_png + } ) +}; + +numberLineDistance.register( 'NumberLineDistanceImages', NumberLineDistanceImages ); + +export default NumberLineDistanceImages; diff --git a/js/explore/NLDExploreScreen.js b/js/explore/NLDExploreScreen.js index c275944..a216d86 100644 --- a/js/explore/NLDExploreScreen.js +++ b/js/explore/NLDExploreScreen.js @@ -7,9 +7,10 @@ */ import Screen from '../../../joist/js/Screen.js'; -import ExploreScreenIcon from '../../../number-line-common/js/explore/view/ExploreScreenIcon.js'; +import ScreenIcon from '../../../joist/js/ScreenIcon.js'; import NLDColors from '../common/NLDColors.js'; -import ExplorerImages from './view/ExplorerImages.js'; +import NumberLineDistanceImages from '../NumberLineDistanceImages.js'; +import { Image } from '../../../scenery/js/imports.js'; import numberLineDistance from '../numberLineDistance.js'; import NumberLineDistanceStrings from '../NumberLineDistanceStrings.js'; import NLDExploreModel from './model/NLDExploreModel.js'; @@ -18,21 +19,26 @@ import NLDExploreScreenView from './view/NLDExploreScreenView.js'; class NLDExploreScreen extends Screen { /** - * @param { PreferencesModel } preferencesModel * @param {Tandem} tandem * @public */ - constructor( preferencesModel, tandem ) { + constructor( tandem ) { const options = { name: NumberLineDistanceStrings.screen.exploreStringProperty, backgroundColorProperty: NLDColors.exploreScreenBackgroundColorProperty, - homeScreenIcon: new ExploreScreenIcon( ExplorerImages.EXPLORER_CHARACTER_SETS, preferencesModel.localizationModel.regionAndCulturePortrayalProperty, 'home' ), - navigationBarIcon: new ExploreScreenIcon( ExplorerImages.EXPLORER_CHARACTER_SETS, preferencesModel.localizationModel.regionAndCulturePortrayalProperty, 'nav' ), + homeScreenIcon: new ScreenIcon( new Image( NumberLineDistanceImages.exploreHomeIconImageProperty ), { + maxIconWidthProportion: 1, + maxIconHeightProportion: 1 + } ), + navigationBarIcon: new ScreenIcon( new Image( NumberLineDistanceImages.exploreNavbarIconImageProperty ), { + maxIconWidthProportion: 1, + maxIconHeightProportion: 1 + } ), tandem: tandem }; super( - () => new NLDExploreModel( preferencesModel, tandem.createTandem( 'model' ) ), + () => new NLDExploreModel( tandem.createTandem( 'model' ) ), model => new NLDExploreScreenView( model, tandem.createTandem( 'view' ) ), options ); diff --git a/js/explore/model/DistanceSceneModel.js b/js/explore/model/DistanceSceneModel.js index 62ca3bd..e68f33f 100644 --- a/js/explore/model/DistanceSceneModel.js +++ b/js/explore/model/DistanceSceneModel.js @@ -20,10 +20,9 @@ const SIDEWALK_HEIGHT = 50; class DistanceSceneModel extends AbstractNLDBaseModel { /** - * @param {preferencesModel} preferencesModel * @param {Tandem} tandem */ - constructor( preferencesModel, tandem ) { + constructor( tandem ) { // values empirically determined const numberLine = new SpatializedNumberLine( NLDConstants.NLD_LAYOUT_BOUNDS.center.plusXY( 0, -75 ), { @@ -68,12 +67,6 @@ class DistanceSceneModel extends AbstractNLDBaseModel { // @public (read-only) {Bounds2} this.sidewalkBounds = sidewalkBounds; - - /** - * @public (read-only) - * @type {preferencesModel} - */ - this.preferencesModel = preferencesModel; } } diff --git a/js/explore/model/NLDExploreModel.js b/js/explore/model/NLDExploreModel.js index 48a144a..8a276b4 100644 --- a/js/explore/model/NLDExploreModel.js +++ b/js/explore/model/NLDExploreModel.js @@ -15,13 +15,12 @@ import TemperatureSceneModel from './TemperatureSceneModel.js'; class NLDExploreModel { /** - * @param {PreferencesModel} preferencesModel * @param {Tandem} tandem */ - constructor( preferencesModel, tandem ) { + constructor( tandem ) { // @public the instance for the model of the 'Distance' scene - this.distanceSceneModel = new DistanceSceneModel( preferencesModel, tandem ); + this.distanceSceneModel = new DistanceSceneModel( tandem ); // @public the instance for the model of the 'Temperature' scene this.temperatureSceneModel = new TemperatureSceneModel( tandem ); diff --git a/js/explore/view/DistanceSceneView.js b/js/explore/view/DistanceSceneView.js index 47074cd..b9e3394 100644 --- a/js/explore/view/DistanceSceneView.js +++ b/js/explore/view/DistanceSceneView.js @@ -8,12 +8,11 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; -import { AlignGroup, Image, ManualConstraint, Node, Text } from '../../../../scenery/js/imports.js'; +import { Image, ManualConstraint, Node, Text } from '../../../../scenery/js/imports.js'; import fireHydrant_png from '../../../images/fireHydrant_png.js'; import house_png from '../../../images/house_png.js'; import sidewalk_png from '../../../images/sidewalk_png.js'; -import ExplorerPortrayalUSA from './portrayals/ExplorerPortrayalUSA.js'; -import ExplorerImages from './ExplorerImages.js'; +import NumberLineDistanceImages from '../../NumberLineDistanceImages.js'; import numberLineDistance from '../../numberLineDistance.js'; import NumberLineDistanceStrings from '../../NumberLineDistanceStrings.js'; import DistancePointControllerNode from './DistancePointControllerNode.js'; @@ -40,33 +39,13 @@ class DistanceSceneView extends NLDSceneView { */ constructor( model ) { - /** - * - * @param {number} scale - * @param {AlignGroup} alignGroup - * @returns {AlignBox[]} - */ - const createPersonImages = ( scale, alignGroup ) => ExplorerImages.EXPLORER_CHARACTER_SETS.map( set => { - return alignGroup.createBox( new Image( set.standing, { - scale: scale, - visibleProperty: new DerivedProperty( [ model.preferencesModel.localizationModel.regionAndCulturePortrayalProperty ], portrayal => { - return portrayal === set; - } ) - } ), { - yAlign: 'bottom' - } ); - } ); - // Create the representations for the person and the house in the area that they can be swapped. // scales were empirically determined - const legendAlignGroup = new AlignGroup(); - const personRepresentationScale = 0.1; const houseRepresentation = new Image( house_png, { scale: 0.15 } ); - const personRepresentation = new Node( { children: createPersonImages( personRepresentationScale, legendAlignGroup ) } ); + const personRepresentation = new Image( NumberLineDistanceImages.personImageProperty, { scale: 0.1 } ); // All the personRepresentation images have the same width. - const smallestWidth = Math.min( houseRepresentation.getImageWidth(), - new Image( ExplorerPortrayalUSA.standing, { scale: personRepresentationScale } ).getImageWidth() ); + const smallestWidth = Math.min( houseRepresentation.getImageWidth(), personRepresentation.getImageWidth() ); houseRepresentation.maxWidth = smallestWidth; personRepresentation.maxWidth = smallestWidth; @@ -116,8 +95,7 @@ class DistanceSceneView extends NLDSceneView { // Point controllers that are in different parent nodes so that the person is always on top of the house in terms of // layering. The mouse area dilation for the personPointControllerImage is for #38. // the image scales and dilations are empirically determined - const controllerAlignGroup = new AlignGroup(); - const personPointControllerImage = new Node( { children: createPersonImages( 0.22, controllerAlignGroup ) } ); + const personPointControllerImage = new Image( NumberLineDistanceImages.personImageProperty, { scale: 0.22 } ); personPointControllerImage.mouseArea = personPointControllerImage.localBounds.dilated( 5 / personPointControllerImage.getScaleVector().x ); diff --git a/js/explore/view/portrayals/ExplorerPortrayal.js b/js/explore/view/portrayals/ExplorerPortrayal.js deleted file mode 100644 index 03d9f68..0000000 --- a/js/explore/view/portrayals/ExplorerPortrayal.js +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2023-2024, University of Colorado Boulder - -/** - * The ExplorerPortrayal defines what is needed for each portrayal in Number Line Distance. - * - * @author Luisa Vargas - * - */ - -import RegionAndCulturePortrayal from '../../../../../joist/js/preferences/RegionAndCulturePortrayal.js'; -import numberLineDistance from '../../../numberLineDistance.js'; - -export default class ExplorerPortrayal extends RegionAndCulturePortrayal { - - /** - * @param {RegionAndCulture} regionAndCulture - * @param standing { HTMLImageElement } - * @param offset { number } - * @param screenHomeIcon { HTMLImageElement } - * @param screenNavIcon { HTMLImageElement } - */ - constructor( regionAndCulture, standing, offset, screenHomeIcon, screenNavIcon ) { - - super( regionAndCulture, {} ); - - this.standing = standing; - this.screenHomeIcon = screenHomeIcon; - this.screenNavIcon = screenNavIcon; - this.offset = offset; - } -} - -numberLineDistance.register( 'ExplorerPortrayal', ExplorerPortrayal ); \ No newline at end of file diff --git a/js/explore/view/portrayals/ExplorerPortrayalAfrica.js b/js/explore/view/portrayals/ExplorerPortrayalAfrica.js deleted file mode 100644 index 95e7078..0000000 --- a/js/explore/view/portrayals/ExplorerPortrayalAfrica.js +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2023-2024, University of Colorado Boulder - -/** - * This file instantiates the Africa region and culture portrayals. - * - * @author Luisa Vargas - * - */ - -import africaExploreHomeIcon_png from '../../../../images/africa/africaExploreHomeIcon_png.js'; -import africaExploreNavbarIcon_png from '../../../../images/africa/africaExploreNavbarIcon_png.js'; -import africaPerson_png from '../../../../images/africa/africaPerson_png.js'; -import ExplorerPortrayal from './ExplorerPortrayal.js'; - -const ExplorerPortrayalAfrica = new ExplorerPortrayal( - 'africa', - africaPerson_png, - 30, - africaExploreHomeIcon_png, - africaExploreNavbarIcon_png -); - -export default ExplorerPortrayalAfrica; \ No newline at end of file diff --git a/js/explore/view/portrayals/ExplorerPortrayalAfricaModest.js b/js/explore/view/portrayals/ExplorerPortrayalAfricaModest.js deleted file mode 100644 index 5db4727..0000000 --- a/js/explore/view/portrayals/ExplorerPortrayalAfricaModest.js +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023-2024, University of Colorado Boulder - -/** - * This file instantiates the Africa Modest region and culture portrayals. - * - * @author Luisa Vargas - * - */ - -import africaModestExploreHomeIcon_png from '../../../../images/africaModest/africaModestExploreHomeIcon_png.js'; -import africaModestExploreNavbarIcon_png from '../../../../images/africaModest/africaModestExploreNavbarIcon_png.js'; -import africaModestPerson_png from '../../../../images/africaModest/africaModestPerson_png.js'; -import ExplorerPortrayal from './ExplorerPortrayal.js'; - - -const ExplorerPortrayalAfricaModest = new ExplorerPortrayal( - 'africaModest', - africaModestPerson_png, - 25, - africaModestExploreHomeIcon_png, - africaModestExploreNavbarIcon_png -); - -export default ExplorerPortrayalAfricaModest; \ No newline at end of file diff --git a/js/explore/view/portrayals/ExplorerPortrayalAsia.js b/js/explore/view/portrayals/ExplorerPortrayalAsia.js deleted file mode 100644 index 241461a..0000000 --- a/js/explore/view/portrayals/ExplorerPortrayalAsia.js +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023-2024, University of Colorado Boulder - -/** - * This file instantiates the Asia region and culture portrayals. - * - * @author Luisa Vargas - * - */ - -import asiaExploreHomeIcon_png from '../../../../images/asia/asiaExploreHomeIcon_png.js'; -import asiaExploreNavbarIcon_png from '../../../../images/asia/asiaExploreNavbarIcon_png.js'; -import asiaPerson_png from '../../../../images/asia/asiaPerson_png.js'; -import ExplorerPortrayal from './ExplorerPortrayal.js'; - - -const ExplorerPortrayalAsia = new ExplorerPortrayal( - 'asia', - asiaPerson_png, - 30, - asiaExploreHomeIcon_png, - asiaExploreNavbarIcon_png -); - -export default ExplorerPortrayalAsia; \ No newline at end of file diff --git a/js/explore/view/portrayals/ExplorerPortrayalLatinAmerica.js b/js/explore/view/portrayals/ExplorerPortrayalLatinAmerica.js deleted file mode 100644 index 08a5e37..0000000 --- a/js/explore/view/portrayals/ExplorerPortrayalLatinAmerica.js +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023-2024, University of Colorado Boulder - -/** - * This file instantiates the Latin America region and culture portrayals. - * - * @author Luisa Vargas - * - */ - -import latinAmericaExploreHomeIcon_png from '../../../../images/latinAmerica/latinAmericaExploreHomeIcon_png.js'; -import latinAmericaExploreNavbarIcon_png from '../../../../images/latinAmerica/latinAmericaExploreNavbarIcon_png.js'; -import latinAmericaPerson_png from '../../../../images/latinAmerica/latinAmericaPerson_png.js'; -import ExplorerPortrayal from './ExplorerPortrayal.js'; - - -const ExplorerPortrayalLatinAmerica = new ExplorerPortrayal( - 'latinAmerica', - latinAmericaPerson_png, - 35, - latinAmericaExploreHomeIcon_png, - latinAmericaExploreNavbarIcon_png -); - -export default ExplorerPortrayalLatinAmerica; \ No newline at end of file diff --git a/js/explore/view/portrayals/ExplorerPortrayalOceania.js b/js/explore/view/portrayals/ExplorerPortrayalOceania.js deleted file mode 100644 index dfec602..0000000 --- a/js/explore/view/portrayals/ExplorerPortrayalOceania.js +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2023-2024, University of Colorado Boulder - -/** - * This file instantiates the Africa region and culture portrayals. - * - * @author Luisa Vargas - * - */ - - -import oceaniaExploreHomeIcon_png from '../../../../images/oceania/oceaniaExploreHomeIcon_png.js'; -import oceaniaExploreNavbarIcon_png from '../../../../images/oceania/oceaniaExploreNavbarIcon_png.js'; -import oceaniaPerson_png from '../../../../images/oceania/oceaniaPerson_png.js'; -import ExplorerPortrayal from './ExplorerPortrayal.js'; - - -const ExplorerPortrayalOceania = new ExplorerPortrayal( - 'oceania', - oceaniaPerson_png, - 30, - oceaniaExploreHomeIcon_png, - oceaniaExploreNavbarIcon_png -); - -export default ExplorerPortrayalOceania; \ No newline at end of file diff --git a/js/explore/view/portrayals/ExplorerPortrayalRandom.js b/js/explore/view/portrayals/ExplorerPortrayalRandom.js deleted file mode 100644 index 162cc4b..0000000 --- a/js/explore/view/portrayals/ExplorerPortrayalRandom.js +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2023-2024, University of Colorado Boulder - -/** - * This file instantiates the Latin America region and culture portrayals. - * - * @author Luisa Vargas - * - */ - -import dotRandom from '../../../../../dot/js/dotRandom.js'; -import ExplorerPortrayal from './ExplorerPortrayal.js'; -import ExplorerPortrayalAfrica from './ExplorerPortrayalAfrica.js'; -import ExplorerPortrayalAfricaModest from './ExplorerPortrayalAfricaModest.js'; -import ExplorerPortrayalAsia from './ExplorerPortrayalAsia.js'; -import ExplorerPortrayalLatinAmerica from './ExplorerPortrayalLatinAmerica.js'; -import ExplorerPortrayalUSA from './ExplorerPortrayalUSA.js'; - -const RANDOM_CHARACTER_SET = dotRandom.sample( [ - ExplorerPortrayalAfrica, - ExplorerPortrayalAfricaModest, - ExplorerPortrayalAsia, - ExplorerPortrayalLatinAmerica, - ExplorerPortrayalUSA -] ); - -const ExplorerPortrayalRandom = new ExplorerPortrayal( - 'random', - RANDOM_CHARACTER_SET.standing, - RANDOM_CHARACTER_SET.offset, - RANDOM_CHARACTER_SET.screenHomeIcon, - RANDOM_CHARACTER_SET.screenNavIcon -); - -export default ExplorerPortrayalRandom; \ No newline at end of file diff --git a/js/explore/view/portrayals/ExplorerPortrayalUSA.js b/js/explore/view/portrayals/ExplorerPortrayalUSA.js deleted file mode 100644 index b724f33..0000000 --- a/js/explore/view/portrayals/ExplorerPortrayalUSA.js +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023-2024, University of Colorado Boulder - -/** - * This file instantiates the USA region and culture portrayals. - * - * @author Luisa Vargas - * - */ - -import usaExploreHomeIcon_png from '../../../../images/usa/usaExploreHomeIcon_png.js'; -import usaExploreNavbarIcon_png from '../../../../images/usa/usaExploreNavbarIcon_png.js'; -import usaPerson_png from '../../../../images/usa/usaPerson_png.js'; -import ExplorerPortrayal from './ExplorerPortrayal.js'; - - -const ExplorerPortrayalUSA = new ExplorerPortrayal( - 'usa', - usaPerson_png, - 18, - usaExploreHomeIcon_png, - usaExploreNavbarIcon_png -); - -export default ExplorerPortrayalUSA; \ No newline at end of file diff --git a/js/number-line-distance-main.js b/js/number-line-distance-main.js index 6453c9b..f2766ca 100644 --- a/js/number-line-distance-main.js +++ b/js/number-line-distance-main.js @@ -11,7 +11,6 @@ import PreferencesModel from '../../joist/js/preferences/PreferencesModel.js'; import Sim from '../../joist/js/Sim.js'; import simLauncher from '../../joist/js/simLauncher.js'; import Tandem from '../../tandem/js/Tandem.js'; -import ExplorerImages from './explore/view/ExplorerImages.js'; import SimulationPreferencesContentNode from './common/view/SimulationPreferencesContentNode.js'; import NLDExploreScreen from './explore/NLDExploreScreen.js'; import NLDGenericScreen from './generic/NLDGenericScreen.js'; @@ -26,9 +25,6 @@ const preferencesModel = new PreferencesModel( { createContent: () => new SimulationPreferencesContentNode() } ] - }, - localizationOptions: { - portrayals: ExplorerImages.EXPLORER_CHARACTER_SETS } } ); @@ -47,7 +43,7 @@ const simOptions = { // until the images are fully loaded, see https://github.com/phetsims/coulombs-law/issues/70 simLauncher.launch( () => { const screens = [ - new NLDExploreScreen( preferencesModel, Tandem.ROOT.createTandem( 'exploreScreen' ) ), + new NLDExploreScreen( Tandem.ROOT.createTandem( 'exploreScreen' ) ), new NLDGenericScreen( Tandem.ROOT.createTandem( 'genericScreen' ) ) ]; const sim = new Sim( numberLineDistanceTitleStringProperty, screens, simOptions ); diff --git a/number-line-distance-images.json b/number-line-distance-images.json new file mode 100644 index 0000000..744815a --- /dev/null +++ b/number-line-distance-images.json @@ -0,0 +1,32 @@ +{ + "usa": { + "exploreHomeIcon": "images/usa/usaExploreHomeIcon_png.ts", + "exploreNavbarIcon": "images/usa/usaExploreNavbarIcon_png.ts", + "person": "images/usa/usaPerson_png.ts" + }, + "africa": { + "exploreHomeIcon": "images/africa/africaExploreHomeIcon_png.ts", + "exploreNavbarIcon": "images/africa/africaExploreNavbarIcon_png.ts", + "person": "images/africa/africaPerson_png.ts" + }, + "africaModest": { + "exploreHomeIcon": "images/africaModest/africaModestExploreHomeIcon_png.ts", + "exploreNavbarIcon": "images/africaModest/africaModestExploreNavbarIcon_png.ts", + "person": "images/africaModest/africaModestPerson_png.ts" + }, + "asia": { + "exploreHomeIcon": "images/asia/asiaExploreHomeIcon_png.ts", + "exploreNavbarIcon": "images/asia/asiaExploreNavbarIcon_png.ts", + "person": "images/asia/asiaPerson_png.ts" + }, + "latinAmerica": { + "exploreHomeIcon": "images/latinAmerica/latinAmericaExploreHomeIcon_png.ts", + "exploreNavbarIcon": "images/latinAmerica/latinAmericaExploreNavbarIcon_png.ts", + "person": "images/latinAmerica/latinAmericaPerson_png.ts" + }, + "oceania": { + "exploreHomeIcon": "images/oceania/oceaniaExploreHomeIcon_png.ts", + "exploreNavbarIcon": "images/oceania/oceaniaExploreNavbarIcon_png.ts", + "person": "images/oceania/oceaniaPerson_png.ts" + } +} \ No newline at end of file