Change initial speed on Intro screen, see #88

phetsims · Aug 10, 2017 · 20c1722 · 20c1722
1 parent f819e20
commit 20c1722
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/js/common/model/ProjectileMotionModel.js b/js/common/model/ProjectileMotionModel.js
@@ -34,9 +34,10 @@ define( function( require ) {
    * @param {boolean} defaultAirResistance -  default air resistance on value
    * @param {number} defaultCannonHeight - optional, defaults to 0, only used by Intro screen
    * @param {number} defaultCannonAngle - option, defaults to 80, only used by Intro screen
+   * @param {number} defaultInitialSpeed - option, defaults to 80, only used by Intro screen
    * @constructor
    */
-  function ProjectileMotionModel( defaultProjectileObjectType, defaultAirResistance, defaultCannonHeight, defaultCannonAngle ) {
+  function ProjectileMotionModel( defaultProjectileObjectType, defaultAirResistance, defaultCannonHeight, defaultCannonAngle, defaultInitialSpeed ) {
 
 
     // @public {ObservableArray.<Trajectory>} observable array of trajectories, limited to 5
@@ -60,7 +61,7 @@ define( function( require ) {
     this.cannonAngleProperty = new NumberProperty( defaultCannonHeight ? defaultCannonAngle : 80 );
 
     // @public {Property.<number>} launch speed, in meters per second
-    this.launchVelocityProperty = new NumberProperty( 18 );
+    this.launchVelocityProperty = new NumberProperty( defaultCannonHeight ? defaultInitialSpeed : 18 );
 
     // --parameters for next projectile fired
 

diff --git a/js/intro/model/IntroModel.js b/js/intro/model/IntroModel.js
@@ -32,7 +32,7 @@ define( function( require ) {
       ProjectileObjectType.CAR
     ];
 
-    ProjectileMotionModel.call( this, this.objectTypes[ 0 ], false, 10, 0 );
+    ProjectileMotionModel.call( this, this.objectTypes[ 0 ], false, 10, 0, 15 );
   }
 
   projectileMotion.register( 'IntroModel', IntroModel );