diff --git a/js/gravity-and-orbits/module/CartoonModeList.js b/js/cartoon/module/CartoonModeList.js similarity index 94% rename from js/gravity-and-orbits/module/CartoonModeList.js rename to js/cartoon/module/CartoonModeList.js index 7689d22e..492b516c 100644 --- a/js/gravity-and-orbits/module/CartoonModeList.js +++ b/js/cartoon/module/CartoonModeList.js @@ -14,8 +14,8 @@ define( function( require ) { // modules var inherit = require( 'PHET_CORE/inherit' ); - var ModeList = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/ModeList' ); - var ModeListParameterList = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/ModeListParameterList' ); + var ModeList = require( 'GRAVITY_AND_ORBITS/common/module/ModeList' ); + var ModeListParameterList = require( 'GRAVITY_AND_ORBITS/common/module/ModeListParameterList' ); function SunEarthModeConfig() { diff --git a/js/gravity-and-orbits/GravityAndOrbitsColorProfile.js b/js/common/GravityAndOrbitsColorProfile.js similarity index 100% rename from js/gravity-and-orbits/GravityAndOrbitsColorProfile.js rename to js/common/GravityAndOrbitsColorProfile.js diff --git a/js/gravity-and-orbits/GravityAndOrbitsConstants.js b/js/common/GravityAndOrbitsConstants.js similarity index 95% rename from js/gravity-and-orbits/GravityAndOrbitsConstants.js rename to js/common/GravityAndOrbitsConstants.js index 3971be38..dca5578d 100644 --- a/js/gravity-and-orbits/GravityAndOrbitsConstants.js +++ b/js/common/GravityAndOrbitsConstants.js @@ -9,7 +9,7 @@ define( function( require ) { 'use strict'; // modules - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); // constants var CONTROL_PANEL_STROKE = '#8E9097'; diff --git a/js/gravity-and-orbits/GravityAndOrbitsScreen.js b/js/common/GravityAndOrbitsScreen.js similarity index 82% rename from js/gravity-and-orbits/GravityAndOrbitsScreen.js rename to js/common/GravityAndOrbitsScreen.js index d5871b6a..a63397f7 100644 --- a/js/gravity-and-orbits/GravityAndOrbitsScreen.js +++ b/js/common/GravityAndOrbitsScreen.js @@ -8,13 +8,13 @@ define( function( require ) { 'use strict'; // modules - var GravityAndOrbitsModel = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/model/GravityAndOrbitsModel' ); - var GravityAndOrbitsScreenView = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/GravityAndOrbitsScreenView' ); + var GravityAndOrbitsModel = require( 'GRAVITY_AND_ORBITS/common/model/GravityAndOrbitsModel' ); + var GravityAndOrbitsScreenView = require( 'GRAVITY_AND_ORBITS/common/view/GravityAndOrbitsScreenView' ); var inherit = require( 'PHET_CORE/inherit' ); var Screen = require( 'JOIST/Screen' ); // strings - var gravityAndOrbitsTitleString = require( 'string!GRAVITY_AND_ORBITS/gravity-and-orbits.title' ); + var gravityAndOrbitsTitleString = require( 'string!GRAVITY_AND_ORBITS/common.title' ); /** * @constructor diff --git a/js/gravity-and-orbits/model/Body.js b/js/common/model/Body.js similarity index 97% rename from js/gravity-and-orbits/model/Body.js rename to js/common/model/Body.js index 6aaf07c6..f99c4a10 100644 --- a/js/gravity-and-orbits/model/Body.js +++ b/js/common/model/Body.js @@ -16,9 +16,9 @@ define( function( require ) { var Bounds2 = require( 'DOT/Bounds2' ); var DerivedProperty = require( 'AXON/DerivedProperty' ); var PropertySet = require( 'AXON/PropertySet' ); - var RewindableProperty = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/model/RewindableProperty' ); - var BodyState = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/model/BodyState' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var RewindableProperty = require( 'GRAVITY_AND_ORBITS/common/model/RewindableProperty' ); + var BodyState = require( 'GRAVITY_AND_ORBITS/common/model/BodyState' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); // reduce Vector2 allocation by reusing this Vector2 in collidesWith computation var tempVector = new Vector2(); diff --git a/js/gravity-and-orbits/model/BodyState.js b/js/common/model/BodyState.js similarity index 100% rename from js/gravity-and-orbits/model/BodyState.js rename to js/common/model/BodyState.js diff --git a/js/gravity-and-orbits/model/GravityAndOrbitsClock.js b/js/common/model/GravityAndOrbitsClock.js similarity index 100% rename from js/gravity-and-orbits/model/GravityAndOrbitsClock.js rename to js/common/model/GravityAndOrbitsClock.js diff --git a/js/gravity-and-orbits/model/GravityAndOrbitsModel.js b/js/common/model/GravityAndOrbitsModel.js similarity index 97% rename from js/gravity-and-orbits/model/GravityAndOrbitsModel.js rename to js/common/model/GravityAndOrbitsModel.js index d00dd84d..843cac87 100644 --- a/js/gravity-and-orbits/model/GravityAndOrbitsModel.js +++ b/js/common/model/GravityAndOrbitsModel.js @@ -15,8 +15,8 @@ define( function( require ) { // modules var inherit = require( 'PHET_CORE/inherit' ); var PropertySet = require( 'AXON/PropertySet' ); - var ModelState = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/model/ModelState' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var ModelState = require( 'GRAVITY_AND_ORBITS/common/model/ModelState' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); // strings var starString = require( 'string!GRAVITY_AND_ORBITS/star' ); diff --git a/js/gravity-and-orbits/model/ModelState.js b/js/common/model/ModelState.js similarity index 100% rename from js/gravity-and-orbits/model/ModelState.js rename to js/common/model/ModelState.js diff --git a/js/gravity-and-orbits/model/RewindableProperty.js b/js/common/model/RewindableProperty.js similarity index 100% rename from js/gravity-and-orbits/model/RewindableProperty.js rename to js/common/model/RewindableProperty.js diff --git a/js/gravity-and-orbits/module/BodyConfiguration.js b/js/common/module/BodyConfiguration.js similarity index 100% rename from js/gravity-and-orbits/module/BodyConfiguration.js rename to js/common/module/BodyConfiguration.js diff --git a/js/gravity-and-orbits/module/GravityAndOrbitsMode.js b/js/common/module/GravityAndOrbitsMode.js similarity index 95% rename from js/gravity-and-orbits/module/GravityAndOrbitsMode.js rename to js/common/module/GravityAndOrbitsMode.js index 5b062d20..d734373d 100644 --- a/js/gravity-and-orbits/module/GravityAndOrbitsMode.js +++ b/js/common/module/GravityAndOrbitsMode.js @@ -24,10 +24,10 @@ define( function( require ) { var Bounds2 = require( 'DOT/Bounds2' ); var Property = require( 'AXON/Property' ); var ModelViewTransform2 = require( 'PHETCOMMON/view/ModelViewTransform2' ); - var GravityAndOrbitsModel = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/model/GravityAndOrbitsModel' ); - var GravityAndOrbitsClock = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/model/GravityAndOrbitsClock' ); - var GravityAndOrbitsCanvas = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/GravityAndOrbitsCanvas' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var GravityAndOrbitsModel = require( 'GRAVITY_AND_ORBITS/common/model/GravityAndOrbitsModel' ); + var GravityAndOrbitsClock = require( 'GRAVITY_AND_ORBITS/common/model/GravityAndOrbitsClock' ); + var GravityAndOrbitsCanvas = require( 'GRAVITY_AND_ORBITS/common/view/GravityAndOrbitsCanvas' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); // constants var PLAY_AREA_WIDTH = GravityAndOrbitsCanvas.STAGE_SIZE.width; diff --git a/js/gravity-and-orbits/module/GravityAndOrbitsModule.js b/js/common/module/GravityAndOrbitsModule.js similarity index 97% rename from js/gravity-and-orbits/module/GravityAndOrbitsModule.js rename to js/common/module/GravityAndOrbitsModule.js index a6d41136..8c7cbb35 100644 --- a/js/gravity-and-orbits/module/GravityAndOrbitsModule.js +++ b/js/common/module/GravityAndOrbitsModule.js @@ -20,7 +20,7 @@ define( function( require ) { var inherit = require( 'PHET_CORE/inherit' ); var Property = require( 'AXON/Property' ); var PropertySet = require( 'AXON/PropertySet' ); - var ModeListParameterList = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/ModeListParameterList' ); + var ModeListParameterList = require( 'GRAVITY_AND_ORBITS/common/module/ModeListParameterList' ); // constants var G = 6.67428E-11; diff --git a/js/gravity-and-orbits/module/ModeConfig.js b/js/common/module/ModeConfig.js similarity index 94% rename from js/gravity-and-orbits/module/ModeConfig.js rename to js/common/module/ModeConfig.js index b95c3ba7..acd27cad 100644 --- a/js/gravity-and-orbits/module/ModeConfig.js +++ b/js/common/module/ModeConfig.js @@ -14,7 +14,7 @@ define( function( require ) { var Vector2 = require( 'DOT/Vector2' ); // constants - var DEFAULT_DT = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/model/GravityAndOrbitsClock' ).DEFAULT_DT; + var DEFAULT_DT = require( 'GRAVITY_AND_ORBITS/common/model/GravityAndOrbitsClock' ).DEFAULT_DT; /** * diff --git a/js/gravity-and-orbits/module/ModeList.js b/js/common/module/ModeList.js similarity index 94% rename from js/gravity-and-orbits/module/ModeList.js rename to js/common/module/ModeList.js index fb7b6707..0622db10 100644 --- a/js/gravity-and-orbits/module/ModeList.js +++ b/js/common/module/ModeList.js @@ -15,20 +15,20 @@ define( function( require ) { var Color = require( 'SCENERY/util/Color' ); var Line = require( 'SCENERY/nodes/Line' ); var Vector2 = require( 'DOT/Vector2' ); - var Body = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/model/Body' ); - var GravityAndOrbitsClock = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/model/GravityAndOrbitsClock' ); - var BodyConfiguration = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/BodyConfiguration' ); - var ModeConfig = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/ModeConfig' ); - var GravityAndOrbitsMode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/GravityAndOrbitsMode' ); - var BodyRenderer = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/BodyRenderer' ); - var EarthMassReadoutNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/EarthMassReadoutNode' ); - var SpaceStationMassReadoutNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/SpaceStationMassReadoutNode' ); - var VectorNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/VectorNode' ); + var Body = require( 'GRAVITY_AND_ORBITS/common/model/Body' ); + var GravityAndOrbitsClock = require( 'GRAVITY_AND_ORBITS/common/model/GravityAndOrbitsClock' ); + var BodyConfiguration = require( 'GRAVITY_AND_ORBITS/common/module/BodyConfiguration' ); + var ModeConfig = require( 'GRAVITY_AND_ORBITS/common/module/ModeConfig' ); + var GravityAndOrbitsMode = require( 'GRAVITY_AND_ORBITS/common/module/GravityAndOrbitsMode' ); + var BodyRenderer = require( 'GRAVITY_AND_ORBITS/common/view/BodyRenderer' ); + var EarthMassReadoutNode = require( 'GRAVITY_AND_ORBITS/common/view/EarthMassReadoutNode' ); + var SpaceStationMassReadoutNode = require( 'GRAVITY_AND_ORBITS/common/view/SpaceStationMassReadoutNode' ); + var VectorNode = require( 'GRAVITY_AND_ORBITS/common/view/VectorNode' ); var Image = require( 'SCENERY/nodes/Image' ); var HBox = require( 'SCENERY/nodes/HBox' ); var StringUtils = require( 'PHETCOMMON/util/StringUtils' ); var Util = require( 'DOT/Util' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); // strings var earthDaysString = require( 'string!GRAVITY_AND_ORBITS/earthDays' ); diff --git a/js/gravity-and-orbits/module/ModeListParameterList.js b/js/common/module/ModeListParameterList.js similarity index 100% rename from js/gravity-and-orbits/module/ModeListParameterList.js rename to js/common/module/ModeListParameterList.js diff --git a/js/gravity-and-orbits/view/BodyNode.js b/js/common/view/BodyNode.js similarity index 96% rename from js/gravity-and-orbits/view/BodyNode.js rename to js/common/view/BodyNode.js index afce28f1..ee938dfe 100644 --- a/js/gravity-and-orbits/view/BodyNode.js +++ b/js/common/view/BodyNode.js @@ -19,8 +19,8 @@ define( function( require ) { var Text = require( 'SCENERY/nodes/Text' ); var Line = require( 'SCENERY/nodes/Line' ); var PhetFont = require( 'SCENERY_PHET/PhetFont' ); - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); /** * Constructor for BodyNode diff --git a/js/gravity-and-orbits/view/BodyRenderer.js b/js/common/view/BodyRenderer.js similarity index 100% rename from js/gravity-and-orbits/view/BodyRenderer.js rename to js/common/view/BodyRenderer.js diff --git a/js/gravity-and-orbits/view/EarthMassReadoutNode.js b/js/common/view/EarthMassReadoutNode.js similarity index 90% rename from js/gravity-and-orbits/view/EarthMassReadoutNode.js rename to js/common/view/EarthMassReadoutNode.js index 244c7065..655cf33f 100644 --- a/js/gravity-and-orbits/view/EarthMassReadoutNode.js +++ b/js/common/view/EarthMassReadoutNode.js @@ -11,8 +11,8 @@ define( function( require ) { // modules var inherit = require( 'PHET_CORE/inherit' ); - var MassReadoutNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/MassReadoutNode' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var MassReadoutNode = require( 'GRAVITY_AND_ORBITS/common/view/MassReadoutNode' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); var StringUtils = require( 'PHETCOMMON/util/StringUtils' ); var Util = require( 'DOT/Util' ); diff --git a/js/gravity-and-orbits/view/ExplosionNode.js b/js/common/view/ExplosionNode.js similarity index 97% rename from js/gravity-and-orbits/view/ExplosionNode.js rename to js/common/view/ExplosionNode.js index 47d991bb..b27c208d 100644 --- a/js/gravity-and-orbits/view/ExplosionNode.js +++ b/js/common/view/ExplosionNode.js @@ -13,7 +13,7 @@ define( function( require ) { var inherit = require( 'PHET_CORE/inherit' ); var DerivedProperty = require( 'AXON/DerivedProperty' ); var LinearFunction = require( 'DOT/LinearFunction' ); - var BodyRenderer = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/BodyRenderer' ); + var BodyRenderer = require( 'GRAVITY_AND_ORBITS/common/view/BodyRenderer' ); var Node = require( 'SCENERY/nodes/Node' ); // constants diff --git a/js/gravity-and-orbits/view/GlobalOptionsNode.js b/js/common/view/GlobalOptionsNode.js similarity index 96% rename from js/gravity-and-orbits/view/GlobalOptionsNode.js rename to js/common/view/GlobalOptionsNode.js index 18ce7a2d..af9d7b6a 100644 --- a/js/gravity-and-orbits/view/GlobalOptionsNode.js +++ b/js/common/view/GlobalOptionsNode.js @@ -16,7 +16,7 @@ define( function( require ) { var Text = require( 'SCENERY/nodes/Text' ); var CheckBox = require( 'SUN/CheckBox' ); var OptionsDialog = require( 'JOIST/OptionsDialog' ); - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); // strings var projectorModeString = require( 'string!GRAVITY_AND_ORBITS/projectorMode' ); diff --git a/js/gravity-and-orbits/view/GrabbableVectorNode.js b/js/common/view/GrabbableVectorNode.js similarity index 93% rename from js/gravity-and-orbits/view/GrabbableVectorNode.js rename to js/common/view/GrabbableVectorNode.js index ea9924b9..2398e71d 100644 --- a/js/gravity-and-orbits/view/GrabbableVectorNode.js +++ b/js/common/view/GrabbableVectorNode.js @@ -15,11 +15,11 @@ define( function( require ) { var Property = require( 'AXON/Property' ); var Path = require( 'SCENERY/nodes/Path' ); var Text = require( 'SCENERY/nodes/Text' ); - var VectorNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/VectorNode' ); + var VectorNode = require( 'GRAVITY_AND_ORBITS/common/view/VectorNode' ); var PhetFont = require( 'SCENERY_PHET/PhetFont' ); var Shape = require( 'KITE/Shape' ); var SimpleDragHandler = require( 'SCENERY/input/SimpleDragHandler' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); /** * Constructor for GrabbableVectorNode diff --git a/js/gravity-and-orbits/view/GravityAndOrbitsCanvas.js b/js/common/view/GravityAndOrbitsCanvas.js similarity index 88% rename from js/gravity-and-orbits/view/GravityAndOrbitsCanvas.js rename to js/common/view/GravityAndOrbitsCanvas.js index cd4c7a7b..5d89d135 100644 --- a/js/gravity-and-orbits/view/GravityAndOrbitsCanvas.js +++ b/js/common/view/GravityAndOrbitsCanvas.js @@ -12,23 +12,23 @@ define( function( require ) { // modules var inherit = require( 'PHET_CORE/inherit' ); - var PathsNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/PathsNode' ); - var BodyNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/BodyNode' ); - var GridNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/GridNode' ); + var PathsNode = require( 'GRAVITY_AND_ORBITS/common/view/PathsNode' ); + var BodyNode = require( 'GRAVITY_AND_ORBITS/common/view/BodyNode' ); + var GridNode = require( 'GRAVITY_AND_ORBITS/common/view/GridNode' ); var Color = require( 'SCENERY/util/Color' ); var Bounds2 = require( 'DOT/Bounds2' ); var Property = require( 'AXON/Property' ); var DerivedProperty = require( 'AXON/DerivedProperty' ); var TextPushButton = require( 'SUN/buttons/TextPushButton' ); var PhetFont = require( 'SCENERY_PHET/PhetFont' ); - var VectorNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/VectorNode' ); - var GrabbableVectorNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/GrabbableVectorNode' ); + var VectorNode = require( 'GRAVITY_AND_ORBITS/common/view/VectorNode' ); + var GrabbableVectorNode = require( 'GRAVITY_AND_ORBITS/common/view/GrabbableVectorNode' ); var Rectangle = require( 'SCENERY/nodes/Rectangle' ); - var ExplosionNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/ExplosionNode' ); - var DayCounter = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/bottom-control-panel/DayCounter' ); - var ScaleSlider = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/ScaleSlider' ); + var ExplosionNode = require( 'GRAVITY_AND_ORBITS/common/view/ExplosionNode' ); + var DayCounter = require( 'GRAVITY_AND_ORBITS/common/view/bottom-control-panel/DayCounter' ); + var ScaleSlider = require( 'GRAVITY_AND_ORBITS/common/view/ScaleSlider' ); var PhetColorScheme = require( 'SCENERY_PHET/PhetColorScheme' ); - var TimeControlPanel = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/bottom-control-panel/TimeControlPanel' ); + var TimeControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/bottom-control-panel/TimeControlPanel' ); var MeasuringTape = require( 'SCENERY_PHET/MeasuringTape' ); // strings diff --git a/js/gravity-and-orbits/view/GravityAndOrbitsScreenView.js b/js/common/view/GravityAndOrbitsScreenView.js similarity index 89% rename from js/gravity-and-orbits/view/GravityAndOrbitsScreenView.js rename to js/common/view/GravityAndOrbitsScreenView.js index 8bbd3008..befd3dd0 100644 --- a/js/gravity-and-orbits/view/GravityAndOrbitsScreenView.js +++ b/js/common/view/GravityAndOrbitsScreenView.js @@ -13,9 +13,9 @@ define( function( require ) { var inherit = require( 'PHET_CORE/inherit' ); var ScreenView = require( 'JOIST/ScreenView' ); var ResetAllButton = require( 'SCENERY_PHET/buttons/ResetAllButton' ); - var RightControlPanel = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/right-control-panel/RightControlPanel' ); - var SpeedRadioButtons = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/bottom-control-panel/SpeedRadioButtons' ); - var MassControlPanel = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/right-control-panel/MassControlPanel' ); + var RightControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/RightControlPanel' ); + var SpeedRadioButtons = require( 'GRAVITY_AND_ORBITS/common/view/bottom-control-panel/SpeedRadioButtons' ); + var MassControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/MassControlPanel' ); // constants var MARGIN = 5; diff --git a/js/gravity-and-orbits/view/GridNode.js b/js/common/view/GridNode.js similarity index 100% rename from js/gravity-and-orbits/view/GridNode.js rename to js/common/view/GridNode.js diff --git a/js/gravity-and-orbits/view/MassReadoutNode.js b/js/common/view/MassReadoutNode.js similarity index 100% rename from js/gravity-and-orbits/view/MassReadoutNode.js rename to js/common/view/MassReadoutNode.js diff --git a/js/gravity-and-orbits/view/PathsNode.js b/js/common/view/PathsNode.js similarity index 97% rename from js/gravity-and-orbits/view/PathsNode.js rename to js/common/view/PathsNode.js index 03005036..c6759034 100644 --- a/js/gravity-and-orbits/view/PathsNode.js +++ b/js/common/view/PathsNode.js @@ -17,7 +17,7 @@ define( function( require ) { var inherit = require( 'PHET_CORE/inherit' ); var Color = require( 'SCENERY/util/Color' ); var CanvasNode = require( 'SCENERY/nodes/CanvasNode' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); // constants var STROKE_WIDTH = 3; diff --git a/js/gravity-and-orbits/view/ScaleSlider.js b/js/common/view/ScaleSlider.js similarity index 100% rename from js/gravity-and-orbits/view/ScaleSlider.js rename to js/common/view/ScaleSlider.js diff --git a/js/gravity-and-orbits/view/SpaceStationMassReadoutNode.js b/js/common/view/SpaceStationMassReadoutNode.js similarity index 89% rename from js/gravity-and-orbits/view/SpaceStationMassReadoutNode.js rename to js/common/view/SpaceStationMassReadoutNode.js index 31e69639..d460ced6 100644 --- a/js/gravity-and-orbits/view/SpaceStationMassReadoutNode.js +++ b/js/common/view/SpaceStationMassReadoutNode.js @@ -11,10 +11,10 @@ define( function( require ) { // modules var inherit = require( 'PHET_CORE/inherit' ); - var MassReadoutNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/MassReadoutNode' ); + var MassReadoutNode = require( 'GRAVITY_AND_ORBITS/common/view/MassReadoutNode' ); var StringUtils = require( 'PHETCOMMON/util/StringUtils' ); var Util = require( 'DOT/Util' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); // strings var billionBillionSpaceStationMassesString = require( 'string!GRAVITY_AND_ORBITS/billionBillionSpaceStationMasses' ); diff --git a/js/gravity-and-orbits/view/VectorNode.js b/js/common/view/VectorNode.js similarity index 100% rename from js/gravity-and-orbits/view/VectorNode.js rename to js/common/view/VectorNode.js diff --git a/js/gravity-and-orbits/view/bottom-control-panel/DayCounter.js b/js/common/view/bottom-control-panel/DayCounter.js similarity index 97% rename from js/gravity-and-orbits/view/bottom-control-panel/DayCounter.js rename to js/common/view/bottom-control-panel/DayCounter.js index cac5b687..c23438ca 100644 --- a/js/gravity-and-orbits/view/bottom-control-panel/DayCounter.js +++ b/js/common/view/bottom-control-panel/DayCounter.js @@ -18,7 +18,7 @@ define( function( require ) { var Text = require( 'SCENERY/nodes/Text' ); var PhetFont = require( 'SCENERY_PHET/PhetFont' ); var VBox = require( 'SCENERY/nodes/VBox' ); - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); // strings var clearString = require( 'string!GRAVITY_AND_ORBITS/clear' ); diff --git a/js/gravity-and-orbits/view/bottom-control-panel/SpeedRadioButtons.js b/js/common/view/bottom-control-panel/SpeedRadioButtons.js similarity index 91% rename from js/gravity-and-orbits/view/bottom-control-panel/SpeedRadioButtons.js rename to js/common/view/bottom-control-panel/SpeedRadioButtons.js index cc02c26b..e45a62b2 100644 --- a/js/gravity-and-orbits/view/bottom-control-panel/SpeedRadioButtons.js +++ b/js/common/view/bottom-control-panel/SpeedRadioButtons.js @@ -16,8 +16,8 @@ define( function( require ) { var VerticalAquaRadioButtonGroup = require( 'SUN/VerticalAquaRadioButtonGroup' ); var Text = require( 'SCENERY/nodes/Text' ); var PhetFont = require( 'SCENERY_PHET/PhetFont' ); - var GravityAndOrbitsModule = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/GravityAndOrbitsModule' ); - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); + var GravityAndOrbitsModule = require( 'GRAVITY_AND_ORBITS/common/module/GravityAndOrbitsModule' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); // constants var STARTING_VALUE = GravityAndOrbitsModule.STARTING_SPEED_SCALE; diff --git a/js/gravity-and-orbits/view/bottom-control-panel/TimeControlPanel.js b/js/common/view/bottom-control-panel/TimeControlPanel.js similarity index 100% rename from js/gravity-and-orbits/view/bottom-control-panel/TimeControlPanel.js rename to js/common/view/bottom-control-panel/TimeControlPanel.js diff --git a/js/gravity-and-orbits/view/right-control-panel/BodyMassControl.js b/js/common/view/right-control-panel/BodyMassControl.js similarity index 98% rename from js/gravity-and-orbits/view/right-control-panel/BodyMassControl.js rename to js/common/view/right-control-panel/BodyMassControl.js index 86809611..1e3bd0b8 100644 --- a/js/gravity-and-orbits/view/right-control-panel/BodyMassControl.js +++ b/js/common/view/right-control-panel/BodyMassControl.js @@ -19,7 +19,7 @@ define( function( require ) { var Dimension2 = require( 'DOT/Dimension2' ); var HSlider = require( 'SUN/HSlider' ); var PhetFont = require( 'SCENERY_PHET/PhetFont' ); - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); // constants var SNAP_TOLERANCE = 0.03; diff --git a/js/gravity-and-orbits/view/right-control-panel/GravityModeMenu.js b/js/common/view/right-control-panel/GravityModeMenu.js similarity index 96% rename from js/gravity-and-orbits/view/right-control-panel/GravityModeMenu.js rename to js/common/view/right-control-panel/GravityModeMenu.js index fd1e828d..b9119741 100644 --- a/js/gravity-and-orbits/view/right-control-panel/GravityModeMenu.js +++ b/js/common/view/right-control-panel/GravityModeMenu.js @@ -17,7 +17,7 @@ define( function( require ) { var Text = require( 'SCENERY/nodes/Text' ); var PhetFont = require( 'SCENERY_PHET/PhetFont' ); var HBox = require( 'SCENERY/nodes/HBox' ); - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); // strings var onString = require( 'string!GRAVITY_AND_ORBITS/on' ); diff --git a/js/gravity-and-orbits/view/right-control-panel/MassControlPanel.js b/js/common/view/right-control-panel/MassControlPanel.js similarity index 88% rename from js/gravity-and-orbits/view/right-control-panel/MassControlPanel.js rename to js/common/view/right-control-panel/MassControlPanel.js index 2ba9ed34..c29bad7c 100644 --- a/js/gravity-and-orbits/view/right-control-panel/MassControlPanel.js +++ b/js/common/view/right-control-panel/MassControlPanel.js @@ -13,12 +13,12 @@ define( function( require ) { var Panel = require( 'SUN/Panel' ); var inherit = require( 'PHET_CORE/inherit' ); var Node = require( 'SCENERY/nodes/Node' ); - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); var HStrut = require( 'SCENERY/nodes/HStrut' ); var VBox = require( 'SCENERY/nodes/VBox' ); var HBox = require( 'SCENERY/nodes/HBox' ); - var BodyMassControl = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/right-control-panel/BodyMassControl' ); + var BodyMassControl = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/BodyMassControl' ); var Text = require( 'SCENERY/nodes/Text' ); var PhetFont = require( 'SCENERY_PHET/PhetFont' ); diff --git a/js/gravity-and-orbits/view/right-control-panel/PlanetModeMenu.js b/js/common/view/right-control-panel/PlanetModeMenu.js similarity index 98% rename from js/gravity-and-orbits/view/right-control-panel/PlanetModeMenu.js rename to js/common/view/right-control-panel/PlanetModeMenu.js index 5404e514..22a9eb54 100644 --- a/js/gravity-and-orbits/view/right-control-panel/PlanetModeMenu.js +++ b/js/common/view/right-control-panel/PlanetModeMenu.js @@ -18,7 +18,7 @@ define( function( require ) { var RadioButtonGroup = require( 'SUN/buttons/RadioButtonGroup' ); var Image = require( 'SCENERY/nodes/Image' ); var RectangularPushButton = require( 'SUN/buttons/RectangularPushButton' ); - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); var HStrut = require( 'SCENERY/nodes/HStrut' ); // images diff --git a/js/gravity-and-orbits/view/right-control-panel/RightControlPanel.js b/js/common/view/right-control-panel/RightControlPanel.js similarity index 81% rename from js/gravity-and-orbits/view/right-control-panel/RightControlPanel.js rename to js/common/view/right-control-panel/RightControlPanel.js index 696e6907..9e84c459 100644 --- a/js/gravity-and-orbits/view/right-control-panel/RightControlPanel.js +++ b/js/common/view/right-control-panel/RightControlPanel.js @@ -13,10 +13,10 @@ define( function( require ) { var Panel = require( 'SUN/Panel' ); var inherit = require( 'PHET_CORE/inherit' ); var Rectangle = require( 'SCENERY/nodes/Rectangle' ); - var PlanetModeMenu = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/right-control-panel/PlanetModeMenu' ); - var GravityModeMenu = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/right-control-panel/GravityModeMenu' ); - var SpaceObjectsPropertyCheckbox = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/right-control-panel/SpaceObjectsPropertyCheckbox' ); - var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsConstants' ); + var PlanetModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/PlanetModeMenu' ); + var GravityModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/GravityModeMenu' ); + var SpaceObjectsPropertyCheckbox = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/SpaceObjectsPropertyCheckbox' ); + var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); var VBox = require( 'SCENERY/nodes/VBox' ); // constants diff --git a/js/gravity-and-orbits/view/right-control-panel/SpaceObjectsPropertyCheckbox.js b/js/common/view/right-control-panel/SpaceObjectsPropertyCheckbox.js similarity index 97% rename from js/gravity-and-orbits/view/right-control-panel/SpaceObjectsPropertyCheckbox.js rename to js/common/view/right-control-panel/SpaceObjectsPropertyCheckbox.js index afaacf01..1ad2a537 100644 --- a/js/gravity-and-orbits/view/right-control-panel/SpaceObjectsPropertyCheckbox.js +++ b/js/common/view/right-control-panel/SpaceObjectsPropertyCheckbox.js @@ -11,7 +11,7 @@ define( function( require ) { 'use strict'; // modules - var GridNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/GridNode' ); + var GridNode = require( 'GRAVITY_AND_ORBITS/common/view/GridNode' ); var inherit = require( 'PHET_CORE/inherit' ); var ModelViewTransform2 = require( 'PHETCOMMON/view/ModelViewTransform2' ); var Property = require( 'AXON/Property' ); @@ -24,7 +24,7 @@ define( function( require ) { var VBox = require( 'SCENERY/nodes/VBox' ); var HBox = require( 'SCENERY/nodes/HBox' ); var MeasuringTape = require( 'SCENERY_PHET/MeasuringTape' ); - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); // images var pathIconImg = require( 'image!GRAVITY_AND_ORBITS/path_icon.png' ); diff --git a/js/gravity-and-orbits-main.js b/js/gravity-and-orbits-main.js index fe6b1500..83c53344 100644 --- a/js/gravity-and-orbits-main.js +++ b/js/gravity-and-orbits-main.js @@ -9,12 +9,12 @@ define( function( require ) { 'use strict'; // modules - var GravityAndOrbitsModule = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/GravityAndOrbitsModule' ); - var GravityAndOrbitsScreenView = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/GravityAndOrbitsScreenView' ); - var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/GravityAndOrbitsColorProfile' ); - var CartoonModeList = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/CartoonModeList' ); - var RealModeList = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/RealModeList' ); - var GlobalOptionsNode = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/view/GlobalOptionsNode' ); + var GravityAndOrbitsModule = require( 'GRAVITY_AND_ORBITS/common/module/GravityAndOrbitsModule' ); + var GravityAndOrbitsScreenView = require( 'GRAVITY_AND_ORBITS/common/view/GravityAndOrbitsScreenView' ); + var GravityAndOrbitsColorProfile = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsColorProfile' ); + var CartoonModeList = require( 'GRAVITY_AND_ORBITS/cartoon/module/CartoonModeList' ); + var RealModeList = require( 'GRAVITY_AND_ORBITS/toScale/module/RealModeList' ); + var GlobalOptionsNode = require( 'GRAVITY_AND_ORBITS/common/view/GlobalOptionsNode' ); var inherit = require( 'PHET_CORE/inherit' ); var Sim = require( 'JOIST/Sim' ); var SimLauncher = require( 'JOIST/SimLauncher' ); diff --git a/js/gravity-and-orbits/module/RealModeList.js b/js/toScale/module/RealModeList.js similarity index 84% rename from js/gravity-and-orbits/module/RealModeList.js rename to js/toScale/module/RealModeList.js index b48ea71b..1474dceb 100644 --- a/js/gravity-and-orbits/module/RealModeList.js +++ b/js/toScale/module/RealModeList.js @@ -11,8 +11,8 @@ define( function( require ) { // modules var inherit = require( 'PHET_CORE/inherit' ); - var ModeList = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/ModeList' ); - var ModeListParameterList = require( 'GRAVITY_AND_ORBITS/gravity-and-orbits/module/ModeListParameterList' ); + var ModeList = require( 'GRAVITY_AND_ORBITS/common/module/ModeList' ); + var ModeListParameterList = require( 'GRAVITY_AND_ORBITS/common/module/ModeListParameterList' ); /** *