geometric-optics-basics initial setup, #2

phetsims · Feb 22, 2022 · 34c6b6a · 34c6b6a
1 parent 10da1a3
commit 34c6b6a
Show file tree

Hide file tree

Showing 12 changed files with 606 additions and 245 deletions.
diff --git a/geometric-optics-basics_a11y_view.html b/geometric-optics-basics_a11y_view.html
diff --git a/geometric-optics-basics_en.html b/geometric-optics-basics_en.html
@@ -33,13 +33,24 @@
       },
       "phet": {
         "requirejsNamespace": "GEOMETRIC_OPTICS_BASICS",
+        "phetLibs": [
+          "geometric-optics"
+        ],
+        "colorProfiles": [
+          "default",
+          "projector"
+        ],
         "simulation": true,
         "runnable": true,
-        "readmeCreatedManually": true,
         "supportedBrands": [
           "phet",
+          "phet-io",
           "adapted-from-phet"
         ],
+        "simFeatures": {
+          "supportsSound": true,
+          "supportsInteractiveDescription": true
+        },
         "supportsOutputJS": true
       },
       "eslintConfig": {
@@ -48,6 +59,14 @@
     };
   window.phet.chipper.stringRepos =
     [
+      {
+        "repo": "geometric-optics",
+        "requirejsNamespace": "GEOMETRIC_OPTICS"
+      },
+      {
+        "repo": "geometric-optics-basics",
+        "requirejsNamespace": "GEOMETRIC_OPTICS_BASICS"
+      },
       {
         "repo": "joist",
         "requirejsNamespace": "JOIST"
@@ -56,10 +75,6 @@
         "repo": "scenery-phet",
         "requirejsNamespace": "SCENERY_PHET"
       },
-      {
-        "repo": "geometric-optics-basics",
-        "requirejsNamespace": "GEOMETRIC_OPTICS_BASICS"
-      },
       {
         "repo": "sun",
         "requirejsNamespace": "SUN"

diff --git a/js/common/GeometricOpticsBasicsColors.ts b/js/common/GeometricOpticsBasicsColors.ts
diff --git a/js/common/GeometricOpticsBasicsConstants.ts b/js/common/GeometricOpticsBasicsConstants.ts
diff --git a/js/common/GeometricOpticsBasicsQueryParameters.ts b/js/common/GeometricOpticsBasicsQueryParameters.ts
diff --git a/js/geometric-optics-basics-main.ts b/js/geometric-optics-basics-main.ts
@@ -6,33 +6,32 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
+import GOConstants from '../../geometric-optics/js/common/GOConstants.js';
+import GOGlobalOptionsNode from '../../geometric-optics/js/common/view/GOGlobalOptionsNode.js';
+import LensScreen from '../../geometric-optics/js/lens/LensScreen.js';
+import MirrorScreen from '../../geometric-optics/js/mirror/MirrorScreen.js';
 import Sim from '../../joist/js/Sim.js';
 import simLauncher from '../../joist/js/simLauncher.js';
 import Tandem from '../../tandem/js/Tandem.js';
-import GeometricOpticsBasicsScreen from './geometric-optics-basics/GeometricOpticsBasicsScreen.js';
 import geometricOpticsBasicsStrings from './geometricOpticsBasicsStrings.js';
 
-const geometricOpticsBasicsTitleString = geometricOpticsBasicsStrings[ 'geometric-optics-basics' ].title;
-
 const simOptions = {
 
-  //TODO fill in credits, all of these fields are optional, see joist.CreditsNode
-  credits: {
-    leadDesign: '',
-    softwareDevelopment: '',
-    team: '',
-    qualityAssurance: '',
-    graphicArts: '',
-    soundDesign: '',
-    thanks: ''
-  }
+  credits: GOConstants.CREDITS,
+
+  // Creates content for the Options dialog, accessible via the PhET menu
+  createOptionsDialogContent: ( tandem: Tandem ) => new GOGlobalOptionsNode( {
+    tandem: tandem
+  } ),
+
+  // pdom options
+  hasKeyboardHelpContent: true
 };
 
-// launch the sim - beware that scenery Image nodes created outside of simLauncher.launch() will have zero bounds
-// until the images are fully loaded, see https://github.com/phetsims/coulombs-law/issues/70
 simLauncher.launch( () => {
-  const sim = new Sim( geometricOpticsBasicsTitleString, [
-    new GeometricOpticsBasicsScreen( { tandem: Tandem.ROOT.createTandem( 'geometricOpticsBasicsScreen' ) } )
+  const sim = new Sim( geometricOpticsBasicsStrings[ 'geometric-optics-basics' ].title, [
+    new LensScreen( { tandem: Tandem.ROOT.createTandem( 'lensScreen' ) } ),
+    new MirrorScreen( { tandem: Tandem.ROOT.createTandem( 'mirrorScreen' ) } )
   ], simOptions );
   sim.start();
-} );
+} );
diff --git a/js/geometric-optics-basics-phet-io-overrides.js b/js/geometric-optics-basics-phet-io-overrides.js
@@ -0,0 +1,2 @@
+/* eslint-disable */
+window.phet.preloads.phetio.phetioElementsOverrides = {};
diff --git a/js/geometric-optics-basics/GeometricOpticsBasicsScreen.ts b/js/geometric-optics-basics/GeometricOpticsBasicsScreen.ts
diff --git a/js/geometric-optics-basics/model/GeometricOpticsBasicsModel.ts b/js/geometric-optics-basics/model/GeometricOpticsBasicsModel.ts
diff --git a/js/geometric-optics-basics/view/GeometricOpticsBasicsScreenView.ts b/js/geometric-optics-basics/view/GeometricOpticsBasicsScreenView.ts
diff --git a/package.json b/package.json
@@ -11,12 +11,24 @@
   },
   "phet": {
     "requirejsNamespace": "GEOMETRIC_OPTICS_BASICS",
+    "phetLibs": [
+      "geometric-optics"
+    ],
+    "colorProfiles": [
+      "default",
+      "projector"
+    ],
     "simulation": true,
     "runnable": true,
     "supportedBrands": [
       "phet",
+      "phet-io",
       "adapted-from-phet"
     ],
+    "simFeatures": {
+      "supportsSound": true,
+      "supportsInteractiveDescription": true
+    },
     "supportsOutputJS": true
   },
   "eslintConfig": {

diff --git a/tsconfig.json b/tsconfig.json
@@ -3,6 +3,9 @@
   "references": [
     {
       "path": "../joist/tsconfig-module.json"
+    },
+    {
+      "path": "../geometric-optics"
     }
   ],
   "include": [
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/* eslint-disable */
		window.phet.preloads.phetio.phetioElementsOverrides = {};