diff --git a/js/buoyancy/view/BuoyancyApplicationsScreenView.js b/js/buoyancy/view/BuoyancyApplicationsScreenView.js index ab4e161a..4545d22b 100644 --- a/js/buoyancy/view/BuoyancyApplicationsScreenView.js +++ b/js/buoyancy/view/BuoyancyApplicationsScreenView.js @@ -251,8 +251,8 @@ class BuoyancyApplicationsScreenView extends DensityBuoyancyScreenView { deselectedLineWidth: 1.5, touchAreaXDilation: 6, touchAreaYDilation: 6, - selectedStroke: densityBuoyancyCommonColorProfile.radioBorderProperty, - baseColor: densityBuoyancyCommonColorProfile.radioBackgroundProperty, + selectedStroke: densityBuoyancyCommonColorProfile.radioBorderColorProperty, + baseColor: densityBuoyancyCommonColorProfile.radioBackgroundColorProperty, bottom: this.layoutBounds.bottom - MARGIN, left: densityControlPanel.right + MARGIN diff --git a/js/common/model/Material.js b/js/common/model/Material.js index 2a9a12e0..c43585e2 100644 --- a/js/common/model/Material.js +++ b/js/common/model/Material.js @@ -178,13 +178,13 @@ Material.CEMENT = new Material( { name: densityBuoyancyCommonStrings.material.cement, identifier: 'CEMENT', density: 3150, - liquidColor: densityBuoyancyCommonColorProfile.materialCementProperty + liquidColor: densityBuoyancyCommonColorProfile.materialCementColorProperty } ); Material.COPPER = new Material( { name: densityBuoyancyCommonStrings.material.copper, identifier: 'COPPER', density: 8960, - liquidColor: densityBuoyancyCommonColorProfile.materialCopperProperty + liquidColor: densityBuoyancyCommonColorProfile.materialCopperColorProperty } ); Material.DIAMOND = new Material( { name: densityBuoyancyCommonStrings.material.diamond, @@ -215,7 +215,7 @@ Material.LEAD = new Material( { name: densityBuoyancyCommonStrings.material.lead, identifier: 'LEAD', density: 11342, - liquidColor: densityBuoyancyCommonColorProfile.materialLeadProperty + liquidColor: densityBuoyancyCommonColorProfile.materialLeadColorProperty } ); Material.PLATINUM = new Material( { name: densityBuoyancyCommonStrings.material.platinum, @@ -266,48 +266,48 @@ Material.AIR = new Material( { identifier: 'AIR', density: 1.2, viscosity: 0, - liquidColor: densityBuoyancyCommonColorProfile.materialAirProperty + liquidColor: densityBuoyancyCommonColorProfile.materialAirColorProperty } ); Material.DENSITY_P = new Material( { name: densityBuoyancyCommonStrings.material.densityP, identifier: 'DENSITY_P', density: 200, - liquidColor: densityBuoyancyCommonColorProfile.materialDensityPProperty, + liquidColor: densityBuoyancyCommonColorProfile.materialDensityPColorProperty, hidden: true } ); Material.DENSITY_Q = new Material( { name: densityBuoyancyCommonStrings.material.densityQ, identifier: 'DENSITY_Q', density: 4000, - liquidColor: densityBuoyancyCommonColorProfile.materialDensityQProperty, + liquidColor: densityBuoyancyCommonColorProfile.materialDensityQColorProperty, hidden: true } ); Material.DENSITY_R = new Material( { name: densityBuoyancyCommonStrings.material.densityR, identifier: 'DENSITY_R', density: 200, - liquidColor: densityBuoyancyCommonColorProfile.materialDensityRProperty, + liquidColor: densityBuoyancyCommonColorProfile.materialDensityRColorProperty, hidden: true } ); Material.DENSITY_S = new Material( { name: densityBuoyancyCommonStrings.material.densityS, identifier: 'DENSITY_S', density: 4000, - liquidColor: densityBuoyancyCommonColorProfile.materialDensitySProperty, + liquidColor: densityBuoyancyCommonColorProfile.materialDensitySColorProperty, hidden: true } ); Material.DENSITY_X = new Material( { name: densityBuoyancyCommonStrings.material.densityX, identifier: 'DENSITY_X', density: 500, - liquidColor: densityBuoyancyCommonColorProfile.materialDensityXProperty, + liquidColor: densityBuoyancyCommonColorProfile.materialDensityXColorProperty, hidden: true } ); Material.DENSITY_Y = new Material( { name: densityBuoyancyCommonStrings.material.densityY, identifier: 'DENSITY_Y', density: 5000, - liquidColor: densityBuoyancyCommonColorProfile.materialDensityYProperty, + liquidColor: densityBuoyancyCommonColorProfile.materialDensityYColorProperty, hidden: true } ); Material.GASOLINE = new Material( { @@ -315,49 +315,49 @@ Material.GASOLINE = new Material( { identifier: 'GASOLINE', density: 680, viscosity: 6e-4, - liquidColor: densityBuoyancyCommonColorProfile.materialGasolineProperty + liquidColor: densityBuoyancyCommonColorProfile.materialGasolineColorProperty } ); Material.HONEY = new Material( { name: densityBuoyancyCommonStrings.material.honey, identifier: 'HONEY', density: 1440, viscosity: 0.03, // NOTE: actual value around 2.5, but we can get away with this for animation - liquidColor: densityBuoyancyCommonColorProfile.materialHoneyProperty + liquidColor: densityBuoyancyCommonColorProfile.materialHoneyColorProperty } ); Material.MERCURY = new Material( { name: densityBuoyancyCommonStrings.material.mercury, identifier: 'MERCURY', density: 13593, viscosity: 1.53e-3, - liquidColor: densityBuoyancyCommonColorProfile.materialMercuryProperty + liquidColor: densityBuoyancyCommonColorProfile.materialMercuryColorProperty } ); Material.OIL = new Material( { name: densityBuoyancyCommonStrings.material.oil, identifier: 'OIL', density: 920, viscosity: 0.02, // Too much bigger and it won't work, not particularly physical - liquidColor: densityBuoyancyCommonColorProfile.materialOilProperty + liquidColor: densityBuoyancyCommonColorProfile.materialOilColorProperty } ); Material.SAND = new Material( { name: densityBuoyancyCommonStrings.material.sand, identifier: 'SAND', density: 1442, viscosity: 0.03, // Too much bigger and it won't work, not particularly physical - liquidColor: densityBuoyancyCommonColorProfile.materialSandProperty + liquidColor: densityBuoyancyCommonColorProfile.materialSandColorProperty } ); Material.SEAWATER = new Material( { name: densityBuoyancyCommonStrings.material.seawater, identifier: 'SEAWATER', density: 1029, viscosity: 1.88e-3, - liquidColor: densityBuoyancyCommonColorProfile.materialSeawaterProperty + liquidColor: densityBuoyancyCommonColorProfile.materialSeawaterColorProperty } ); Material.WATER = new Material( { name: densityBuoyancyCommonStrings.material.water, identifier: 'WATER', density: 1000, viscosity: 8.9e-4, - liquidColor: densityBuoyancyCommonColorProfile.materialWaterProperty + liquidColor: densityBuoyancyCommonColorProfile.materialWaterColorProperty } ); // @public {Array.} diff --git a/js/common/view/DensityBuoyancyScreenView.js b/js/common/view/DensityBuoyancyScreenView.js index d5466100..ade00294 100644 --- a/js/common/view/DensityBuoyancyScreenView.js +++ b/js/common/view/DensityBuoyancyScreenView.js @@ -765,7 +765,7 @@ class DensityBuoyancyScreenView extends ScreenView { const waterMaterial = new THREE.MeshLambertMaterial( { transparent: true } ); - const waterColor = densityBuoyancyCommonColorProfile.materialWaterProperty.value; + const waterColor = densityBuoyancyCommonColorProfile.materialWaterColorProperty.value; waterMaterial.color = ThreeUtils.colorToThree( waterColor ); waterMaterial.opacity = waterColor.alpha; @@ -807,7 +807,7 @@ class DensityBuoyancyScreenView extends ScreenView { const waterMaterial = new THREE.MeshLambertMaterial( { transparent: true } ); - const waterColor = densityBuoyancyCommonColorProfile.materialWaterProperty.value; + const waterColor = densityBuoyancyCommonColorProfile.materialWaterColorProperty.value; waterMaterial.color = ThreeUtils.colorToThree( waterColor ); waterMaterial.opacity = waterColor.alpha; diff --git a/js/common/view/densityBuoyancyCommonColorProfile.js b/js/common/view/densityBuoyancyCommonColorProfile.js index 73a23d7b..10e56232 100644 --- a/js/common/view/densityBuoyancyCommonColorProfile.js +++ b/js/common/view/densityBuoyancyCommonColorProfile.js @@ -68,185 +68,185 @@ const densityBuoyancyCommonColorProfile = { default: new Color( 48, 89, 166 ) } ), - comparingYellowProperty: new ProfileColorProperty( 'comparingYellow', { + comparingYellowColorProperty: new ProfileColorProperty( 'comparingYellow', { default: new Color( 252, 246, 80 ) }, { - tandem: tandem.createTandem( 'comparingYellowProperty' ) + tandem: tandem.createTandem( 'comparingYellowColorProperty' ) } ), - comparingBlueProperty: new ProfileColorProperty( 'comparingBlue', { + comparingBlueColorProperty: new ProfileColorProperty( 'comparingBlue', { default: new Color( 46, 88, 166 ) }, { - tandem: tandem.createTandem( 'comparingBlueProperty' ) + tandem: tandem.createTandem( 'comparingBlueColorProperty' ) } ), - comparingGreenProperty: new ProfileColorProperty( 'comparingGreen', { + comparingGreenColorProperty: new ProfileColorProperty( 'comparingGreen', { default: new Color( 125, 195, 52 ) }, { - tandem: tandem.createTandem( 'comparingGreenProperty' ) + tandem: tandem.createTandem( 'comparingGreenColorProperty' ) } ), - comparingRedProperty: new ProfileColorProperty( 'comparingRed', { + comparingRedColorProperty: new ProfileColorProperty( 'comparingRed', { default: new Color( 233, 55, 50 ) }, { - tandem: tandem.createTandem( 'comparingRedProperty' ) + tandem: tandem.createTandem( 'comparingRedColorProperty' ) } ), - comparingPurpleProperty: new ProfileColorProperty( 'comparingPurple', { + comparingPurpleColorProperty: new ProfileColorProperty( 'comparingPurple', { default: new Color( 131, 43, 126 ) }, { - tandem: tandem.createTandem( 'comparingPurpleProperty' ) + tandem: tandem.createTandem( 'comparingPurpleColorProperty' ) } ), - mysteryPinkProperty: new ProfileColorProperty( 'mysteryPink', { + mysteryPinkColorProperty: new ProfileColorProperty( 'mysteryPink', { default: new Color( 255, 192, 203 ) }, { - tandem: tandem.createTandem( 'mysteryPinkProperty' ) + tandem: tandem.createTandem( 'mysteryPinkColorProperty' ) } ), - mysteryOrangeProperty: new ProfileColorProperty( 'mysteryOrange', { + mysteryOrangeColorProperty: new ProfileColorProperty( 'mysteryOrange', { default: new Color( 255, 127, 0 ) }, { - tandem: tandem.createTandem( 'mysteryOrangeProperty' ) + tandem: tandem.createTandem( 'mysteryOrangeColorProperty' ) } ), - mysteryLightPurpleProperty: new ProfileColorProperty( 'mysteryLightPurple', { + mysteryLightPurpleColorProperty: new ProfileColorProperty( 'mysteryLightPurple', { default: new Color( 177, 156, 217 ) }, { - tandem: tandem.createTandem( 'mysteryLightPurpleProperty' ) + tandem: tandem.createTandem( 'mysteryLightPurpleColorProperty' ) } ), - mysteryLightGreenProperty: new ProfileColorProperty( 'mysteryLightGreen', { + mysteryLightGreenColorProperty: new ProfileColorProperty( 'mysteryLightGreen', { default: new Color( 144, 238, 144 ) }, { - tandem: tandem.createTandem( 'mysteryLightGreenProperty' ) + tandem: tandem.createTandem( 'mysteryLightGreenColorProperty' ) } ), - mysteryBrownProperty: new ProfileColorProperty( 'mysteryBrown', { + mysteryBrownColorProperty: new ProfileColorProperty( 'mysteryBrown', { default: new Color( 150, 75, 0 ) }, { - tandem: tandem.createTandem( 'mysteryBrownProperty' ) + tandem: tandem.createTandem( 'mysteryBrownColorProperty' ) } ), - mysteryWhiteProperty: new ProfileColorProperty( 'mysteryWhite', { + mysteryWhiteColorProperty: new ProfileColorProperty( 'mysteryWhite', { default: new Color( 255, 255, 255 ) }, { - tandem: tandem.createTandem( 'mysteryWhiteProperty' ) + tandem: tandem.createTandem( 'mysteryWhiteColorProperty' ) } ), - mysteryGrayProperty: new ProfileColorProperty( 'mysteryGray', { + mysteryGrayColorProperty: new ProfileColorProperty( 'mysteryGray', { default: new Color( 140, 140, 140 ) }, { - tandem: tandem.createTandem( 'mysteryGrayProperty' ) + tandem: tandem.createTandem( 'mysteryGrayColorProperty' ) } ), - mysteryMustardProperty: new ProfileColorProperty( 'mysteryMustard', { + mysteryMustardColorProperty: new ProfileColorProperty( 'mysteryMustard', { default: new Color( 225, 173, 0 ) }, { - tandem: tandem.createTandem( 'mysteryMustardProperty' ) + tandem: tandem.createTandem( 'mysteryMustardColorProperty' ) } ), - mysteryPeachProperty: new ProfileColorProperty( 'mysteryPeach', { + mysteryPeachColorProperty: new ProfileColorProperty( 'mysteryPeach', { default: new Color( 255, 229, 180 ) }, { - tandem: tandem.createTandem( 'mysteryPeachProperty' ) + tandem: tandem.createTandem( 'mysteryPeachColorProperty' ) } ), - mysteryMaroonProperty: new ProfileColorProperty( 'mysteryMaroon', { + mysteryMaroonColorProperty: new ProfileColorProperty( 'mysteryMaroon', { default: new Color( 128, 0, 0 ) }, { - tandem: tandem.createTandem( 'mysteryMaroonProperty' ) + tandem: tandem.createTandem( 'mysteryMaroonColorProperty' ) } ), - chartHeaderProperty: new ProfileColorProperty( 'chartHeader', { + chartHeaderColorProperty: new ProfileColorProperty( 'chartHeader', { default: new Color( 230, 230, 230 ) }, { - tandem: tandem.createTandem( 'chartHeaderProperty' ) + tandem: tandem.createTandem( 'chartHeaderColorProperty' ) } ), - radioBorderProperty: new ProfileColorProperty( 'radioBorder', { + radioBorderColorProperty: new ProfileColorProperty( 'radioBorder', { default: PhetColorScheme.BUTTON_YELLOW }, { - tandem: tandem.createTandem( 'radioBorderProperty' ) + tandem: tandem.createTandem( 'radioBorderColorProperty' ) } ), - radioBackgroundProperty: new ProfileColorProperty( 'radioBackground', { + radioBackgroundColorProperty: new ProfileColorProperty( 'radioBackground', { default: Color.WHITE }, { - tandem: tandem.createTandem( 'radioBackgroundProperty' ) + tandem: tandem.createTandem( 'radioBackgroundColorProperty' ) } ), // "liquid" material colors - materialAirProperty: new ProfileColorProperty( 'materialAir', { + materialAirColorProperty: new ProfileColorProperty( 'materialAir', { default: new Color( 0, 0, 0, 0 ) }, { - tandem: tandem.createTandem( 'materialAirProperty' ) + tandem: tandem.createTandem( 'materialAirColorProperty' ) } ), - materialCementProperty: new ProfileColorProperty( 'materialCement', { + materialCementColorProperty: new ProfileColorProperty( 'materialCement', { default: new Color( 128, 130, 133 ) }, { - tandem: tandem.createTandem( 'materialCementProperty' ) + tandem: tandem.createTandem( 'materialCementColorProperty' ) } ), - materialCopperProperty: new ProfileColorProperty( 'materialCopper', { + materialCopperColorProperty: new ProfileColorProperty( 'materialCopper', { default: new Color( 184, 115, 51 ) }, { - tandem: tandem.createTandem( 'materialCopperProperty' ) + tandem: tandem.createTandem( 'materialCopperColorProperty' ) } ), - materialDensityPProperty: new ProfileColorProperty( 'materialDensityP', { + materialDensityPColorProperty: new ProfileColorProperty( 'materialDensityP', { default: new Color( 255, 128, 128, 0.6 ) }, { - tandem: tandem.createTandem( 'materialDensityPProperty' ) + tandem: tandem.createTandem( 'materialDensityPColorProperty' ) } ), - materialDensityQProperty: new ProfileColorProperty( 'materialDensityQ', { + materialDensityQColorProperty: new ProfileColorProperty( 'materialDensityQ', { default: new Color( 128, 255, 128, 0.6 ) }, { - tandem: tandem.createTandem( 'materialDensityQProperty' ) + tandem: tandem.createTandem( 'materialDensityQColorProperty' ) } ), - materialDensityRProperty: new ProfileColorProperty( 'materialDensityR', { + materialDensityRColorProperty: new ProfileColorProperty( 'materialDensityR', { default: new Color( 255, 128, 255, 0.6 ) }, { - tandem: tandem.createTandem( 'materialDensityRProperty' ) + tandem: tandem.createTandem( 'materialDensityRColorProperty' ) } ), - materialDensitySProperty: new ProfileColorProperty( 'materialDensityS', { + materialDensitySColorProperty: new ProfileColorProperty( 'materialDensityS', { default: new Color( 128, 255, 255, 0.6 ) }, { - tandem: tandem.createTandem( 'materialDensitySProperty' ) + tandem: tandem.createTandem( 'materialDensitySColorProperty' ) } ), - materialDensityXProperty: new ProfileColorProperty( 'materialDensityX', { + materialDensityXColorProperty: new ProfileColorProperty( 'materialDensityX', { default: new Color( 255, 255, 80, 0.6 ) }, { - tandem: tandem.createTandem( 'materialDensityXProperty' ) + tandem: tandem.createTandem( 'materialDensityXColorProperty' ) } ), - materialDensityYProperty: new ProfileColorProperty( 'materialDensityY', { + materialDensityYColorProperty: new ProfileColorProperty( 'materialDensityY', { default: new Color( 80, 255, 255, 0.6 ) }, { - tandem: tandem.createTandem( 'materialDensityYProperty' ) + tandem: tandem.createTandem( 'materialDensityYColorProperty' ) } ), - materialGasolineProperty: new ProfileColorProperty( 'materialGasoline', { + materialGasolineColorProperty: new ProfileColorProperty( 'materialGasoline', { default: new Color( 230, 255, 0, 0.4 ) }, { - tandem: tandem.createTandem( 'materialGasolineProperty' ) + tandem: tandem.createTandem( 'materialGasolineColorProperty' ) } ), - materialHoneyProperty: new ProfileColorProperty( 'materialHoney', { + materialHoneyColorProperty: new ProfileColorProperty( 'materialHoney', { default: new Color( 238, 170, 0, 0.8 ) }, { - tandem: tandem.createTandem( 'materialHoneyProperty' ) + tandem: tandem.createTandem( 'materialHoneyColorProperty' ) } ), - materialLeadProperty: new ProfileColorProperty( 'materialLead', { + materialLeadColorProperty: new ProfileColorProperty( 'materialLead', { default: new Color( 80, 85, 90 ) }, { - tandem: tandem.createTandem( 'materialLeadProperty' ) + tandem: tandem.createTandem( 'materialLeadColorProperty' ) } ), - materialMercuryProperty: new ProfileColorProperty( 'materialMercury', { + materialMercuryColorProperty: new ProfileColorProperty( 'materialMercury', { default: new Color( 219, 206, 202 ) }, { - tandem: tandem.createTandem( 'materialMercuryProperty' ) + tandem: tandem.createTandem( 'materialMercuryColorProperty' ) } ), - materialOilProperty: new ProfileColorProperty( 'materialOil', { + materialOilColorProperty: new ProfileColorProperty( 'materialOil', { default: new Color( 180, 230, 20, 0.4 ) }, { - tandem: tandem.createTandem( 'materialOilProperty' ) + tandem: tandem.createTandem( 'materialOilColorProperty' ) } ), - materialSandProperty: new ProfileColorProperty( 'materialSand', { + materialSandColorProperty: new ProfileColorProperty( 'materialSand', { default: new Color( 194, 178, 128 ) }, { - tandem: tandem.createTandem( 'materialSandProperty' ) + tandem: tandem.createTandem( 'materialSandColorProperty' ) } ), - materialSeawaterProperty: new ProfileColorProperty( 'materialSeawater', { + materialSeawaterColorProperty: new ProfileColorProperty( 'materialSeawater', { default: new Color( 0, 150, 255, 0.4 ) }, { - tandem: tandem.createTandem( 'materialSeawaterProperty' ) + tandem: tandem.createTandem( 'materialSeawaterColorProperty' ) } ), - materialWaterProperty: new ProfileColorProperty( 'materialWater', { + materialWaterColorProperty: new ProfileColorProperty( 'materialWater', { default: new Color( 0, 128, 255, 0.4 ) }, { - tandem: tandem.createTandem( 'materialWaterProperty' ) + tandem: tandem.createTandem( 'materialWaterColorProperty' ) } ) }; diff --git a/js/density/model/DensityCompareModel.js b/js/density/model/DensityCompareModel.js index 436c89e9..58f8bc5a 100644 --- a/js/density/model/DensityCompareModel.js +++ b/js/density/model/DensityCompareModel.js @@ -33,66 +33,66 @@ class DensityCompareModel extends DensityBuoyancyModal( DensityBuoyancyModel, Mo return [ Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 500, - customColor: densityBuoyancyCommonColorProfile.comparingYellowProperty + customColor: densityBuoyancyCommonColorProfile.comparingYellowColorProperty } ), Vector2.ZERO, 5 ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 1000, - customColor: densityBuoyancyCommonColorProfile.comparingBlueProperty + customColor: densityBuoyancyCommonColorProfile.comparingBlueColorProperty } ), Vector2.ZERO, 5 ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 2000, - customColor: densityBuoyancyCommonColorProfile.comparingGreenProperty + customColor: densityBuoyancyCommonColorProfile.comparingGreenColorProperty } ), Vector2.ZERO, 5 ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 4000, - customColor: densityBuoyancyCommonColorProfile.comparingRedProperty + customColor: densityBuoyancyCommonColorProfile.comparingRedColorProperty } ), Vector2.ZERO, 5 ) ]; case Mode.SAME_VOLUME: return [ Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 1600, - customColor: densityBuoyancyCommonColorProfile.comparingYellowProperty + customColor: densityBuoyancyCommonColorProfile.comparingYellowColorProperty } ), Vector2.ZERO, 8 ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 1200, - customColor: densityBuoyancyCommonColorProfile.comparingBlueProperty + customColor: densityBuoyancyCommonColorProfile.comparingBlueColorProperty } ), Vector2.ZERO, 6 ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 800, - customColor: densityBuoyancyCommonColorProfile.comparingGreenProperty + customColor: densityBuoyancyCommonColorProfile.comparingGreenColorProperty } ), Vector2.ZERO, 4 ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 400, - customColor: densityBuoyancyCommonColorProfile.comparingRedProperty + customColor: densityBuoyancyCommonColorProfile.comparingRedColorProperty } ), Vector2.ZERO, 2 ) ]; case Mode.SAME_DENSITY: return [ Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 800, - customColor: densityBuoyancyCommonColorProfile.comparingYellowProperty + customColor: densityBuoyancyCommonColorProfile.comparingYellowColorProperty } ), Vector2.ZERO, 4 ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 800, - customColor: densityBuoyancyCommonColorProfile.comparingBlueProperty + customColor: densityBuoyancyCommonColorProfile.comparingBlueColorProperty } ), Vector2.ZERO, 3 ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 800, - customColor: densityBuoyancyCommonColorProfile.comparingGreenProperty + customColor: densityBuoyancyCommonColorProfile.comparingGreenColorProperty } ), Vector2.ZERO, 2 ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 800, - customColor: densityBuoyancyCommonColorProfile.comparingRedProperty + customColor: densityBuoyancyCommonColorProfile.comparingRedColorProperty } ), Vector2.ZERO, 1 ) ]; default: diff --git a/js/density/model/DensityMysteryModel.js b/js/density/model/DensityMysteryModel.js index 5f6e8a9f..f16562d5 100644 --- a/js/density/model/DensityMysteryModel.js +++ b/js/density/model/DensityMysteryModel.js @@ -37,21 +37,21 @@ const randomMaterials = [ Material.GOLD ]; const randomColors = [ - densityBuoyancyCommonColorProfile.comparingYellowProperty, - densityBuoyancyCommonColorProfile.comparingBlueProperty, - densityBuoyancyCommonColorProfile.comparingGreenProperty, - densityBuoyancyCommonColorProfile.comparingRedProperty, - densityBuoyancyCommonColorProfile.comparingPurpleProperty, - densityBuoyancyCommonColorProfile.mysteryPinkProperty, - densityBuoyancyCommonColorProfile.mysteryOrangeProperty, - densityBuoyancyCommonColorProfile.mysteryLightPurpleProperty, - densityBuoyancyCommonColorProfile.mysteryLightGreenProperty, - densityBuoyancyCommonColorProfile.mysteryBrownProperty, - densityBuoyancyCommonColorProfile.mysteryWhiteProperty, - densityBuoyancyCommonColorProfile.mysteryGrayProperty, - densityBuoyancyCommonColorProfile.mysteryMustardProperty, - densityBuoyancyCommonColorProfile.mysteryPeachProperty, - densityBuoyancyCommonColorProfile.mysteryMaroonProperty + densityBuoyancyCommonColorProfile.comparingYellowColorProperty, + densityBuoyancyCommonColorProfile.comparingBlueColorProperty, + densityBuoyancyCommonColorProfile.comparingGreenColorProperty, + densityBuoyancyCommonColorProfile.comparingRedColorProperty, + densityBuoyancyCommonColorProfile.comparingPurpleColorProperty, + densityBuoyancyCommonColorProfile.mysteryPinkColorProperty, + densityBuoyancyCommonColorProfile.mysteryOrangeColorProperty, + densityBuoyancyCommonColorProfile.mysteryLightPurpleColorProperty, + densityBuoyancyCommonColorProfile.mysteryLightGreenColorProperty, + densityBuoyancyCommonColorProfile.mysteryBrownColorProperty, + densityBuoyancyCommonColorProfile.mysteryWhiteColorProperty, + densityBuoyancyCommonColorProfile.mysteryGrayColorProperty, + densityBuoyancyCommonColorProfile.mysteryMustardColorProperty, + densityBuoyancyCommonColorProfile.mysteryPeachColorProperty, + densityBuoyancyCommonColorProfile.mysteryMaroonColorProperty ]; const Mode = Enumeration.byKeys( [ 'SET_1', @@ -72,81 +72,81 @@ class DensityMysteryModel extends DensityBuoyancyModal( DensityBuoyancyModel, Mo return [ Cuboid.createWithVolume( model.engine, Material.createCustomMaterial( { density: 920, - customColor: densityBuoyancyCommonColorProfile.comparingRedProperty + customColor: densityBuoyancyCommonColorProfile.comparingRedColorProperty } ), Vector2.ZERO, 0.004, { tag: Mass.MassTag.ONE_D } ), Cuboid.createWithVolume( model.engine, Material.createCustomMaterial( { density: Material.GASOLINE.density, - customColor: densityBuoyancyCommonColorProfile.comparingBlueProperty + customColor: densityBuoyancyCommonColorProfile.comparingBlueColorProperty } ), Vector2.ZERO, 0.004, { tag: Mass.MassTag.ONE_B } ), Cuboid.createWithVolume( model.engine, Material.createCustomMaterial( { density: Material.GASOLINE.density, - customColor: densityBuoyancyCommonColorProfile.comparingGreenProperty + customColor: densityBuoyancyCommonColorProfile.comparingGreenColorProperty } ), Vector2.ZERO, 0.00516, { tag: Mass.MassTag.ONE_E } ), Cuboid.createWithVolume( model.engine, Material.createCustomMaterial( { density: 19320, - customColor: densityBuoyancyCommonColorProfile.comparingYellowProperty + customColor: densityBuoyancyCommonColorProfile.comparingYellowColorProperty } ), Vector2.ZERO, 0.001, { tag: Mass.MassTag.ONE_C } ), Cuboid.createWithVolume( model.engine, Material.createCustomMaterial( { density: Material.DIAMOND.density, - customColor: densityBuoyancyCommonColorProfile.comparingPurpleProperty + customColor: densityBuoyancyCommonColorProfile.comparingPurpleColorProperty } ), Vector2.ZERO, 0.001, { tag: Mass.MassTag.ONE_A } ) ]; case Mode.SET_2: return [ Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 4500, - customColor: densityBuoyancyCommonColorProfile.mysteryPinkProperty + customColor: densityBuoyancyCommonColorProfile.mysteryPinkColorProperty } ), Vector2.ZERO, 18, { tag: Mass.MassTag.TWO_D } ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 11340, - customColor: densityBuoyancyCommonColorProfile.mysteryOrangeProperty + customColor: densityBuoyancyCommonColorProfile.mysteryOrangeColorProperty } ), Vector2.ZERO, 18, { tag: Mass.MassTag.TWO_A } ), Cuboid.createWithVolume( model.engine, Material.createCustomMaterial( { density: Material.COPPER.density, - customColor: densityBuoyancyCommonColorProfile.mysteryLightPurpleProperty + customColor: densityBuoyancyCommonColorProfile.mysteryLightPurpleColorProperty } ), Vector2.ZERO, 0.005, { tag: Mass.MassTag.TWO_E } ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 2700, - customColor: densityBuoyancyCommonColorProfile.mysteryLightGreenProperty + customColor: densityBuoyancyCommonColorProfile.mysteryLightGreenColorProperty } ), Vector2.ZERO, 2.7, { tag: Mass.MassTag.TWO_C } ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 2700, - customColor: densityBuoyancyCommonColorProfile.mysteryBrownProperty + customColor: densityBuoyancyCommonColorProfile.mysteryBrownColorProperty } ), Vector2.ZERO, 10.8, { tag: Mass.MassTag.TWO_B } ) ]; case Mode.SET_3: return [ Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 950, - customColor: densityBuoyancyCommonColorProfile.mysteryWhiteProperty + customColor: densityBuoyancyCommonColorProfile.mysteryWhiteColorProperty } ), Vector2.ZERO, 6, { tag: Mass.MassTag.THREE_E } ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 1000, - customColor: densityBuoyancyCommonColorProfile.mysteryGrayProperty + customColor: densityBuoyancyCommonColorProfile.mysteryGrayColorProperty } ), Vector2.ZERO, 6, { tag: Mass.MassTag.THREE_B } ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 400, - customColor: densityBuoyancyCommonColorProfile.mysteryMustardProperty + customColor: densityBuoyancyCommonColorProfile.mysteryMustardColorProperty } ), Vector2.ZERO, 2, { tag: Mass.MassTag.THREE_D } ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 7800, - customColor: densityBuoyancyCommonColorProfile.mysteryPeachProperty + customColor: densityBuoyancyCommonColorProfile.mysteryPeachColorProperty } ), Vector2.ZERO, 23.4, { tag: Mass.MassTag.THREE_C } ), Cuboid.createWithMass( model.engine, Material.createCustomMaterial( { density: 950, - customColor: densityBuoyancyCommonColorProfile.mysteryMaroonProperty + customColor: densityBuoyancyCommonColorProfile.mysteryMaroonColorProperty } ), Vector2.ZERO, 2.85, { tag: Mass.MassTag.THREE_A } ) ]; case Mode.RANDOM: { diff --git a/js/density/view/DensityTableNode.js b/js/density/view/DensityTableNode.js index 5c56ada9..adfa9802 100644 --- a/js/density/view/DensityTableNode.js +++ b/js/density/view/DensityTableNode.js @@ -105,7 +105,7 @@ class DensityTableNode extends Node { fill: 'white' } ); const highlightBackground = new Rectangle( 0, 0, fullWidth, headerCellHeight, { - fill: densityBuoyancyCommonColorProfile.chartHeaderProperty + fill: densityBuoyancyCommonColorProfile.chartHeaderColorProperty } ); this.children = [