Skip to content

Commit

Permalink
add fifties landscape, see #49
Browse files Browse the repository at this point in the history
  • Loading branch information
jbphet committed Oct 3, 2022
1 parent c8f33d3 commit 439c953
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
Binary file added images/fiftiesLandscape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions images/fiftiesLandscape_png.ts

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions images/license.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
"license": "contact [email protected]",
"notes": "created by Amy Rouinfar"
},
"fiftiesLandscape.png": {
"text": [
"Copyright 2022 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact [email protected]",
"notes": "created by Mariah Hermsmeyer"
},
"flashlightOff.png": {
"text": [
"Copyright 2002-2015 University of Colorado Boulder"
Expand Down
5 changes: 4 additions & 1 deletion js/common/view/GreenhouseEffectObservationWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import Tandem from '../../../../tandem/js/Tandem.js';
import Animation from '../../../../twixt/js/Animation.js';
import Easing from '../../../../twixt/js/Easing.js';
import agriculturalLandscape1_png from '../../../images/agriculturalLandscape1_png.js';
import fiftiesLandscape_png from '../../../images/fiftiesLandscape_png.js';
import startSunlightChord_mp3 from '../../../sounds/startSunlightChord_mp3.js';
import greenhouseEffect from '../../greenhouseEffect.js';
import GreenhouseEffectStrings from '../../GreenhouseEffectStrings.js';
Expand All @@ -44,6 +45,7 @@ const EXPECTED_MAX_TEMPERATURE = 309; // in Kelvin

// TODO: Flag to make it easy to switch between computer-generated ground and full artwork for the ground.
const USE_ARTWORK_FOR_GROUND = false;
const AGRICULTURAL = false;

// The opacity of the surface temperature is scaled over this range. The values, which are in Kelvin, were empirically
// determined and can be adjusted as needed to achieve the desired visual effect.
Expand Down Expand Up @@ -182,8 +184,9 @@ class GreenhouseEffectObservationWindow extends Node {
let groundNode: Node;
let groundShape: Shape;
const nominalGroundHeight = SIZE.height * GROUND_VERTICAL_PROPORTION;
const imageSource = AGRICULTURAL ? agriculturalLandscape1_png : fiftiesLandscape_png;
if ( USE_ARTWORK_FOR_GROUND ) {
groundNode = new Image( agriculturalLandscape1_png, {
groundNode = new Image( imageSource, {
maxWidth: this.width,
bottom: SIZE.height
} );
Expand Down

0 comments on commit 439c953

Please sign in to comment.