fixed an issue with the phet-io type of the mass position, see #76

phetsims · Nov 29, 2016 · 7de176f · 7de176f
1 parent b6544fe
commit 7de176f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/js/gravity-force-lab/GravityForceLabConstants.js b/js/gravity-force-lab/GravityForceLabConstants.js
@@ -15,10 +15,13 @@ define( function( require ) {
   // constants
   var MIN_MASS = 1; // kg
   var MAX_MASS = 1000; // kg
+  var MAX_DISTANCE_FROM_CENTER = 7.48; // meters, empirically determined boundary for masses
 
   var GravityForceLabConstants = {
     MIN_MASS: MIN_MASS,
     MAX_MASS: MAX_MASS,
+    RIGHT_MASS_BOUNDARY: MAX_DISTANCE_FROM_CENTER,
+    LEFT_MASS_BOUNDARY: -MAX_DISTANCE_FROM_CENTER,
     MASS_RANGE: new Range( MIN_MASS, MAX_MASS )
   };
 

diff --git a/js/gravity-force-lab/model/GravityForceLabModel.js b/js/gravity-force-lab/model/GravityForceLabModel.js
@@ -12,6 +12,7 @@ define( function( require ) {
   // modules
   var Color = require( 'SCENERY/util/Color' );
   var gravityForceLab = require( 'GRAVITY_FORCE_LAB/gravityForceLab' );
+  var GravityForceLabConstants = require( 'GRAVITY_FORCE_LAB/gravity-force-lab/GravityForceLabConstants' );
   var inherit = require( 'PHET_CORE/inherit' );
   var Mass = require( 'GRAVITY_FORCE_LAB/gravity-force-lab/model/Mass' );
   var Property = require( 'AXON/Property' );
@@ -78,8 +79,8 @@ define( function( require ) {
      * @public
      */
     step: function() {
-      var minX = LEFT_BOUNDARY + PULL_OBJECT_WIDTH + this.mass1.radiusProperty.get();
-      var maxX = RIGHT_BOUNDARY - PULL_OBJECT_WIDTH - this.mass2.radiusProperty.get();
+      var minX = GravityForceLabConstants.LEFT_MASS_BOUNDARY + PULL_OBJECT_WIDTH + this.mass1.radiusProperty.get();
+      var maxX = GravityForceLabConstants.RIGHT_MASS_BOUNDARY - PULL_OBJECT_WIDTH - this.mass2.radiusProperty.get();
       var locationMass1 = this.mass1.positionProperty.get();
       var locationMass2 = this.mass2.positionProperty.get();
 

diff --git a/js/gravity-force-lab/model/Mass.js b/js/gravity-force-lab/model/Mass.js
@@ -16,11 +16,11 @@ define( function( require ) {
   var GravityForceLabConstants = require( 'GRAVITY_FORCE_LAB/gravity-force-lab/GravityForceLabConstants' );
   var inherit = require( 'PHET_CORE/inherit' );
   var Property = require( 'AXON/Property' );
+  var Range = require( 'DOT/Range' );
 
   // phet-io modules
   var TColor = require( 'ifphetio!PHET_IO/types/scenery/util/TColor' );
   var TNumber = require( 'ifphetio!PHET_IO/types/TNumber' );
-  var TVector2 = require( 'ifphetio!PHET_IO/types/dot/TVector2' );
 
   // constants
   var DENSITY = 150; // kg/m^3
@@ -46,7 +46,10 @@ define( function( require ) {
 
     this.positionProperty = new Property( initialPosition, {
       tandem: tandem.createTandem( 'positionProperty' ),
-      phetioValueType: TVector2
+      phetioValueType: TNumber( {
+        units: 'meters',
+        range: new Range( GravityForceLabConstants.LEFT_MASS_BOUNDARY, GravityForceLabConstants.RIGHT_MASS_BOUNDARY )
+      } )
     } ); // @public
 
     this.radiusProperty = new DerivedProperty(