Skip to content

Commit

Permalink
Allow copper, platinum, steel in density, see #307
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Aug 2, 2024
1 parent 2a6d113 commit 6a218e9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions js/common/model/Material.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export default class Material extends PhetioObject implements HasValueProperty {
colorProperty: DensityBuoyancyCommonColors.materialConcreteColorProperty
} );

public static readonly COPPER = new Material( packageJSON.name === 'buoyancy' ? SOLIDS_TANDEM.createTandem( 'copper' ) : Tandem.OPT_OUT, {
public static readonly COPPER = new Material( packageJSON.name === 'density' || packageJSON.name === 'buoyancy' ? SOLIDS_TANDEM.createTandem( 'copper' ) : Tandem.OPT_OUT, {
nameProperty: DensityBuoyancyCommonStrings.material.copperStringProperty,
density: 8960,
colorProperty: DensityBuoyancyCommonColors.materialCopperColorProperty
Expand All @@ -214,7 +214,7 @@ export default class Material extends PhetioObject implements HasValueProperty {
density: 19320
} );

public static readonly PLATINUM = new Material( packageJSON.name === 'buoyancy' ? SOLIDS_TANDEM.createTandem( 'platinum' ) : Tandem.OPT_OUT, {
public static readonly PLATINUM = new Material( packageJSON.name === 'density' || packageJSON.name === 'buoyancy' ? SOLIDS_TANDEM.createTandem( 'platinum' ) : Tandem.OPT_OUT, {
nameProperty: DensityBuoyancyCommonStrings.material.platinumStringProperty,
density: 21450
} );
Expand All @@ -236,7 +236,7 @@ export default class Material extends PhetioObject implements HasValueProperty {
density: 10490
} );

public static readonly STEEL = new Material( packageJSON.name === 'buoyancy' ? SOLIDS_TANDEM.createTandem( 'steel' ) : Tandem.OPT_OUT, {
public static readonly STEEL = new Material( packageJSON.name === 'density' || packageJSON.name === 'buoyancy' ? SOLIDS_TANDEM.createTandem( 'steel' ) : Tandem.OPT_OUT, {
nameProperty: DensityBuoyancyCommonStrings.material.steelStringProperty,
density: 7800
} );
Expand Down

0 comments on commit 6a218e9

Please sign in to comment.