-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
major changes to decouple frame objects and light sources, and introd…
…uce "scenes" (rulers and labels disabled) #217
- Loading branch information
Showing
18 changed files
with
1,029 additions
and
504 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| // Copyright 2022, University of Colorado Boulder | ||
|
|
||
| /** | ||
| * FramedObjectScene is a scene in which rays from a single framed object interact with an optic and produce | ||
| * an Image. Rays emanate from 2 points of interest on the framed object. | ||
| * | ||
| * @author Chris Malley (PixelZoom, Inc.) | ||
| */ | ||
|
|
||
| import Range from '../../../../dot/js/Range.js'; | ||
| import geometricOptics from '../../geometricOptics.js'; | ||
| import Optic from './Optic.js'; | ||
| import SourceObject from './SourceObject.js'; | ||
| import SecondPoint from './SecondPoint.js'; | ||
| import Target from './Target.js'; | ||
| import Property from '../../../../axon/js/Property.js'; | ||
| import Representation, { FRAMED_OBJECT_REPRESENTATIONS } from './Representation.js'; | ||
| import Vector2 from '../../../../dot/js/Vector2.js'; | ||
| import Tandem from '../../../../tandem/js/Tandem.js'; | ||
| import merge from '../../../../phet-core/js/merge.js'; | ||
| import { RaysType } from './RaysType.js'; | ||
| import NumberProperty from '../../../../axon/js/NumberProperty.js'; | ||
| import LightRays from './LightRays.js'; | ||
|
|
||
| type FramedObjectSceneOptions = { | ||
|
|
||
| // initial position of the source object and first light source | ||
| framedObjectPosition: Vector2, | ||
|
|
||
| // phet-io options | ||
| tandem: Tandem | ||
| }; | ||
|
|
||
| class FramedObjectScene { | ||
|
|
||
| readonly optic: Optic; | ||
| readonly representationProperty: Property<Representation>; | ||
| readonly framedObject: SourceObject; | ||
| readonly secondPoint: SecondPoint; | ||
| readonly target1: Target; | ||
| readonly target2: Target; | ||
| readonly lightRaysTimeProperty: NumberProperty; | ||
| readonly lightRays1: LightRays; | ||
| readonly lightRays2: LightRays; | ||
|
|
||
| /** | ||
| * @param optic | ||
| * @param raysTypeProperty | ||
| * @param providedOptions | ||
| */ | ||
| constructor( optic: Optic, raysTypeProperty: Property<RaysType>, providedOptions: FramedObjectSceneOptions ) { | ||
|
|
||
| const options = merge( { | ||
| //TODO | ||
| }, providedOptions ); | ||
|
|
||
| this.optic = optic; | ||
|
|
||
| this.representationProperty = new Property( FRAMED_OBJECT_REPRESENTATIONS[ 0 ], { | ||
| validValues: FRAMED_OBJECT_REPRESENTATIONS | ||
| } ); | ||
|
|
||
| this.framedObject = new SourceObject( this.representationProperty, { | ||
| position: options.framedObjectPosition, | ||
| tandem: options.tandem.createTandem( 'framedObject' ) | ||
| } ); | ||
|
|
||
| //TODO make secondPoint a property of framedObject | ||
| this.secondPoint = new SecondPoint( this.representationProperty, this.framedObject.positionProperty ); | ||
|
|
||
| this.target1 = new Target( this.framedObject.positionProperty, this.optic, this.representationProperty ); | ||
|
|
||
| this.target2 = new Target( this.secondPoint.positionProperty, this.optic, this.representationProperty ); | ||
|
|
||
| //TODO should each scene have this, or should it be shared by all scenes? | ||
| this.lightRaysTimeProperty = new NumberProperty( 0, { | ||
| units: 's', | ||
| range: new Range( 0, 10 ), // determines the duration of the light rays animation | ||
| tandem: options.tandem.createTandem( 'lightRaysTimeProperty' ) | ||
| } ); | ||
|
|
||
| // Changing raysTypeProperty resets the animation time for rays. | ||
| raysTypeProperty.link( () => this.lightRaysTimeProperty.reset() ); | ||
|
|
||
| this.lightRays1 = new LightRays( | ||
| this.lightRaysTimeProperty, | ||
| raysTypeProperty, | ||
| this.representationProperty, | ||
| this.framedObject.positionProperty, | ||
| this.optic, | ||
| this.target1, | ||
| null //TODO projectionScreen is not relevant for this scene | ||
| ); | ||
|
|
||
| this.lightRays2 = new LightRays( | ||
| this.lightRaysTimeProperty, | ||
| raysTypeProperty, | ||
| this.representationProperty, | ||
| this.secondPoint.positionProperty, | ||
| this.optic, | ||
| this.target2, | ||
| null //TODO projectionScreen is not relevant for this scene | ||
| ); | ||
|
|
||
| //TODO add Guides ala LightSourcesScene, but for Lens screen only | ||
| } | ||
|
|
||
| //TODO is this complete? | ||
| public reset(): void { | ||
| this.representationProperty.reset(); | ||
| this.framedObject.reset(); | ||
| this.secondPoint.reset(); | ||
| this.lightRaysTimeProperty.reset(); | ||
| } | ||
|
|
||
| /** | ||
| * Steps the animation of light rays. | ||
| * @param dt - time step, in seconds | ||
| */ | ||
| public stepLightRays( dt: number ): void { | ||
| const t = this.lightRaysTimeProperty.value + dt; | ||
| assert && assert( this.lightRaysTimeProperty.range ); // {Range|null} | ||
| if ( this.lightRaysTimeProperty.range!.contains( t ) ) { | ||
| this.lightRaysTimeProperty.value = t; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| geometricOptics.register( 'FramedObjectScene', FramedObjectScene ); | ||
| export default FramedObjectScene; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.