first pass at flat mirror, using a concave mirror with very large ROC, …

…#227
phetsims · Feb 22, 2022 · 7cc92bc · 7cc92bc
1 parent 986b8ef
commit 7cc92bc
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git a/js/common/model/Optic.ts b/js/common/model/Optic.ts
@@ -31,12 +31,15 @@ import { FocalLengthControlType } from './FocalLengthControlType.js';
 import DirectFocalLengthModel, { DirectFocalLengthModelOptions } from './DirectFocalLengthModel.js';
 import IndirectFocalLengthModel, { IndirectFocalLengthModelOptions } from './IndirectFocalLengthModel.js';
 
+const EFFECTIVELY_INFINITE_ROC = -200000; // negative, to make it concave
+const EFFECTIVELY_INFINITE_FOCAL_LENGTH = EFFECTIVELY_INFINITE_ROC / 2;
+
 type OpticOptions = {
 
   // initial shape of the optic, 'convex' or 'concave'
   opticShape: OpticShape,
 
-  // supported values of OpticShape, in the left-to-right order that they appear as radio buttons
+  // supported values of OpticShape, radio buttons will be created left-to-right in this order
   opticShapes: OpticShape[]
 
   // range of diameter, in cm
@@ -194,9 +197,14 @@ abstract class Optic extends PhetioObject {
         focalLengthControlType: string,
         directRadiusOfCurvatureMagnitude: number,
         indirectRadiusOfCurvatureMagnitude: number ) => {
-        const sign = ( opticShape === 'convex' ) ? 1 : -1;
-        const magnitude = ( focalLengthControlType === 'direct' ) ? directRadiusOfCurvatureMagnitude : indirectRadiusOfCurvatureMagnitude;
-        return sign * magnitude;
+        if ( opticShape === 'flat' ) {
+          return EFFECTIVELY_INFINITE_ROC;
+        }
+        else {
+          const sign = ( opticShape === 'convex' ) ? 1 : -1;
+          const magnitude = ( focalLengthControlType === 'direct' ) ? directRadiusOfCurvatureMagnitude : indirectRadiusOfCurvatureMagnitude;
+          return sign * magnitude;
+        }
       }, {
         units: 'cm',
         tandem: options.tandem.createTandem( 'radiusOfCurvatureProperty' ),
@@ -228,9 +236,14 @@ abstract class Optic extends PhetioObject {
         focalLengthControlType: string,
         directFocalLengthMagnitude: number,
         indirectFocalLengthMagnitude: number ) => {
-        const sign = this.isConverging( opticShape ) ? 1 : -1;
-        const magnitude = ( focalLengthControlType === 'direct' ) ? directFocalLengthMagnitude : indirectFocalLengthMagnitude;
-        return sign * magnitude;
+        if ( opticShape === 'flat' ) {
+          return EFFECTIVELY_INFINITE_FOCAL_LENGTH;
+        }
+        else {
+          const sign = this.isConverging( opticShape ) ? 1 : -1;
+          const magnitude = ( focalLengthControlType === 'direct' ) ? directFocalLengthMagnitude : indirectFocalLengthMagnitude;
+          return sign * magnitude;
+        }
       }, {
         units: 'cm',
         tandem: options.tandem.createTandem( 'focalLengthProperty' ),

diff --git a/js/lens/model/Lens.ts b/js/lens/model/Lens.ts
@@ -44,7 +44,7 @@ class Lens extends Optic {
 
     const options = merge( {
       opticShape: 'convex',
-      opticShapes: [ 'convex', 'concave' ],
+      opticShapes: [ 'convex', 'concave' ], // radio buttons will be created left-to-right in this order
       diameterRange: GOConstants.DIAMETER_RANGE, // in cm
       sign: 1,
       directFocalLengthModelOptions: {

diff --git a/js/mirror/model/Mirror.ts b/js/mirror/model/Mirror.ts
@@ -39,7 +39,7 @@ class Mirror extends Optic {
 
     const options = merge( {
       opticShape: 'concave',
-      opticShapes: [ 'concave', 'convex' ], //TODO https://github.com/phetsims/geometric-optics/issues/227 add 'flat'
+      opticShapes: [ 'concave', 'convex', 'flat' ], // radio buttons will be created left-to-right in this order
       diameterRange: GOConstants.DIAMETER_RANGE, // in cm
       sign: -1,
       directFocalLengthModelOptions: {

diff --git a/js/mirror/view/MirrorNode.ts b/js/mirror/view/MirrorNode.ts
@@ -24,7 +24,9 @@ import merge from '../../../../phet-core/js/merge.js';
 const FILL = GOColors.mirrorBackingColorProperty;
 const STROKE = GOColors.mirrorReflectiveCoatingColorProperty;
 const LINE_WIDTH = 2;
-const ICON_RADIUS_OF_CURVATURE_MAGNITUDE = 20;
+const ICON_EFFECTIVELY_INFINITE_RADIUS_OF_CURVATURE_MAGNITUDE = -200000;
+const ICON_CONVEX_RADIUS_OF_CURVATURE_MAGNITUDE = 20;
+const ICON_CONCAVE_RADIUS_OF_CURVATURE_MAGNITUDE = -ICON_CONVEX_RADIUS_OF_CURVATURE_MAGNITUDE;
 const ICON_DIAMETER = 30;
 
 type MirrorNodeOptions = {
@@ -95,7 +97,9 @@ class MirrorNode extends Node {
    */
   public static createIconNode( opticShape: OpticShape ): Node {
 
-    const radiusOfCurvature = ( opticShape === 'convex' ) ? ICON_RADIUS_OF_CURVATURE_MAGNITUDE : -ICON_RADIUS_OF_CURVATURE_MAGNITUDE;
+    const radiusOfCurvature = ( opticShape === 'flat' ) ? ICON_EFFECTIVELY_INFINITE_RADIUS_OF_CURVATURE_MAGNITUDE :
+                              ( opticShape === 'convex' ) ? ICON_CONVEX_RADIUS_OF_CURVATURE_MAGNITUDE :
+                              ICON_CONCAVE_RADIUS_OF_CURVATURE_MAGNITUDE;
 
     const mirrorShapes = new MirrorShapes( radiusOfCurvature, ICON_DIAMETER, {
       backingThickness: 4 // cm