Add launcher to screen view - see #7

phetsims · Nov 19, 2023 · af36303 · af36303
1 parent 91c011b
commit af36303
Showing 1 changed file with 32 additions and 7 deletions.
diff --git a/js/common/view/PDLScreenView.ts b/js/common/view/PDLScreenView.ts
@@ -19,20 +19,29 @@ import GradientBackgroundNode from '../../../../scenery-phet/js/GradientBackgrou
 import FieldNode from './FieldNode.js';
 import ProjectileDataLabModel from '../model/ProjectileDataLabModel.js';
 import FieldOverlayNode from './FieldOverlayNode.js';
+import LauncherNode from './LauncherNode.js';
 
 type SelfOptions = EmptySelfOptions;
 type PDLScreenViewOptions = SelfOptions & ScreenViewOptions;
 
 export class PDLScreenView extends ScreenView {
   protected readonly resetAllButton: ResetAllButton;
   private readonly field: FieldNode;
+  private readonly launcher: LauncherNode;
 
   public constructor( model: ProjectileDataLabModel, options: PDLScreenViewOptions ) {
     super( options );
 
-    const backgroundNode = new GradientBackgroundNode( 0, 0, 1, 1,
-      ProjectileDataLabColors.screenBackgroundTopColorProperty, ProjectileDataLabColors.screenBackgroundBottomColorProperty,
-      0, 1 );
+    const backgroundNode = new GradientBackgroundNode(
+      0,
+      0,
+      1,
+      1,
+      ProjectileDataLabColors.screenBackgroundTopColorProperty,
+      ProjectileDataLabColors.screenBackgroundBottomColorProperty,
+      0,
+      1
+    );
 
     // This instance lives for the lifetime of the simulation, so we don't need to remove this listener
     this.visibleBoundsProperty.link( visibleBounds => {
@@ -66,15 +75,31 @@ export class PDLScreenView extends ScreenView {
     this.field = new FieldNode( fieldX, fieldY, model.binWidthProperty, {} );
     const fieldOverlayNode = new FieldOverlayNode( fieldX, fieldY, {} );
 
+    // Create the launcher
+    const originX = fieldX - 0.5 * ProjectileDataLabConstants.FIELD_WIDTH;
+    this.launcher = new LauncherNode(
+      originX,
+      fieldY,
+      model.launcherAngleProperty,
+      model.launcherHeightProperty,
+      model.launcherTypeProperty,
+      {}
+    );
+
     this.addChild( this.field );
+    this.addChild( this.launcher );
     this.addChild( fieldOverlayNode );
 
     // layout
-    ManualConstraint.create( this, [ noAirResistanceText, this.resetAllButton ],
+    ManualConstraint.create(
+      this,
+      [ noAirResistanceText, this.resetAllButton ],
       ( noAirResistanceTextProxy, resetAllButtonProxy ) => {
-        noAirResistanceTextProxy.right = resetAllButtonProxy.left - ProjectileDataLabConstants.SCREEN_VIEW_X_MARGIN;
+        noAirResistanceTextProxy.right =
+          resetAllButtonProxy.left - ProjectileDataLabConstants.SCREEN_VIEW_X_MARGIN;
         noAirResistanceTextProxy.bottom = resetAllButtonProxy.bottom;
-      } );
+      }
+    );
   }
 
   /**
@@ -94,4 +119,4 @@ export class PDLScreenView extends ScreenView {
   }
 }
 
-projectileDataLab.register( 'PDLScreenView', PDLScreenView );
+projectileDataLab.register( 'PDLScreenView', PDLScreenView );