diff --git a/images/crate_svg.ts b/images/crate_svg.ts new file mode 100644 index 00000000..eb7341b5 --- /dev/null +++ b/images/crate_svg.ts @@ -0,0 +1,8 @@ +/* eslint-disable */ +import asyncLoader from '../../phet-core/js/asyncLoader.js'; + +const image = new Image(); +const unlock = asyncLoader.createLock( image ); +image.onload = unlock; +image.src = `data:image/svg+xml;base64,${btoa('')}`; +export default image; \ No newline at end of file diff --git a/images/fridge_svg.ts b/images/fridge_svg.ts new file mode 100644 index 00000000..0c5cdd7e --- /dev/null +++ b/images/fridge_svg.ts @@ -0,0 +1,8 @@ +/* eslint-disable */ +import asyncLoader from '../../phet-core/js/asyncLoader.js'; + +const image = new Image(); +const unlock = asyncLoader.createLock( image ); +image.onload = unlock; +image.src = `data:image/svg+xml;base64,${btoa('')}`; +export default image; \ No newline at end of file diff --git a/images/license.json b/images/license.json index 6821cd03..8013f02f 100644 --- a/images/license.json +++ b/images/license.json @@ -39,6 +39,14 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Noah Podolefsky" }, + "crate.svg": { + "text": [ + "Copyright 2024 University of Colorado Boulder" + ], + "projectURL": "https://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by Noah Podolefsky and Mariah Hermsmeyer" + }, "frictionIcon.png": { "text": [ "Copyright 2002-2015 University of Colorado Boulder" @@ -55,6 +63,14 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Noah Podolefsky" }, + "fridge.svg": { + "text": [ + "Copyright 2024 University of Colorado Boulder" + ], + "projectURL": "https://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by Noah Podolefsky and Mariah Hermsmeyer" + }, "grass.png": { "text": [ "Copyright 2002-2015 University of Colorado Boulder" @@ -87,6 +103,14 @@ "license": "contact phethelp@colorado.edu", "notes": "taken from balancing act" }, + "mysteryObject01.svg": { + "text": [ + "Copyright 2024 University of Colorado Boulder" + ], + "projectURL": "https://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by John Blanco and Mariah Hermsmeyer" + }, "rope.png": { "text": [ "Copyright 2002-2015 University of Colorado Boulder" @@ -103,6 +127,14 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Noah Podolefsky" }, + "trashCan.svg": { + "text": [ + "Copyright 2024 University of Colorado Boulder" + ], + "projectURL": "https://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by John Blanco and Mariah Hermsmeyer" + }, "tugIcon.png": { "text": [ "Copyright 2002-2015 University of Colorado Boulder" @@ -118,5 +150,13 @@ "projectURL": "https://phet.colorado.edu", "license": "contact phethelp@colorado.edu", "notes": "created by Noah Podolefsky" + }, + "waterBucket.svg": { + "text": [ + "Copyright 2024 University of Colorado Boulder" + ], + "projectURL": "https://phet.colorado.edu", + "license": "contact phethelp@colorado.edu", + "notes": "created by Noah Podolefsky and Mariah Hermsmeyer" } } \ No newline at end of file diff --git a/images/mysteryObject01_svg.ts b/images/mysteryObject01_svg.ts new file mode 100644 index 00000000..ef4599ad --- /dev/null +++ b/images/mysteryObject01_svg.ts @@ -0,0 +1,8 @@ +/* eslint-disable */ +import asyncLoader from '../../phet-core/js/asyncLoader.js'; + +const image = new Image(); +const unlock = asyncLoader.createLock( image ); +image.onload = unlock; +image.src = `data:image/svg+xml;base64,${btoa('')}`; +export default image; \ No newline at end of file diff --git a/images/trashCan_svg.ts b/images/trashCan_svg.ts new file mode 100644 index 00000000..fb1423c3 --- /dev/null +++ b/images/trashCan_svg.ts @@ -0,0 +1,8 @@ +/* eslint-disable */ +import asyncLoader from '../../phet-core/js/asyncLoader.js'; + +const image = new Image(); +const unlock = asyncLoader.createLock( image ); +image.onload = unlock; +image.src = `data:image/svg+xml;base64,${btoa('')}`; +export default image; \ No newline at end of file diff --git a/images/waterBucket_svg.ts b/images/waterBucket_svg.ts new file mode 100644 index 00000000..e020cd22 --- /dev/null +++ b/images/waterBucket_svg.ts @@ -0,0 +1,8 @@ +/* eslint-disable */ +import asyncLoader from '../../phet-core/js/asyncLoader.js'; + +const image = new Image(); +const unlock = asyncLoader.createLock( image ); +image.onload = unlock; +image.src = `data:image/svg+xml;base64,${btoa('')}`; +export default image; \ No newline at end of file diff --git a/js/motion/model/MotionModel.js b/js/motion/model/MotionModel.js index db6345d1..07bfb70f 100644 --- a/js/motion/model/MotionModel.js +++ b/js/motion/model/MotionModel.js @@ -18,11 +18,11 @@ import Vector2 from '../../../../dot/js/Vector2.js'; import Stopwatch from '../../../../scenery-phet/js/Stopwatch.js'; import IOType from '../../../../tandem/js/types/IOType.js'; import ReferenceIO from '../../../../tandem/js/types/ReferenceIO.js'; -import crate_png from '../../../images/crate_png.js'; -import fridge_png from '../../../images/fridge_png.js'; -import mysteryObject01_png from '../../../images/mysteryObject01_png.js'; -import waterBucket_png from '../../../images/waterBucket_png.js'; -import trashCan_png from '../../../mipmaps/trashCan_png.js'; +import crate_svg from '../../../images/crate_svg.js'; +import fridge_svg from '../../../images/fridge_svg.js'; +import mysteryObject01_svg from '../../../images/mysteryObject01_svg.js'; +import waterBucket_svg from '../../../images/waterBucket_svg.js'; +import trashCan_svg from '../../../images/trashCan_svg.js'; import forcesAndMotionBasics from '../../forcesAndMotionBasics.js'; import MotionConstants from '../MotionConstants.js'; import HumanTypeEnum from './HumanTypeEnum.js'; @@ -238,16 +238,16 @@ class MotionModel { const bucketSpacing = isTrashCanPresent ? 63 : 75; // distance between the mystery box and the water bucket // create the items - Initial positions determined empirically - const fridge = new Item( this, 'fridge', tandem.createTandem( 'fridge' ), fridge_png, 200, leftmostItemXLeft, 437, 0.8, 1.1, 4 ); - const crate1 = new Item( this, 'crate1', tandem.createTandem( 'crate1' ), crate_png, 50, leftmostItemXLeft + crate1Spacing, 507, 0.5 ); - const crate2 = new Item( this, 'crate2', tandem.createTandem( 'crate2' ), crate_png, 50, leftmostItemXLeft + crate1Spacing + crate2Spacing, 507, 0.5 ); + const fridge = new Item( this, 'fridge', tandem.createTandem( 'fridge' ), fridge_svg, 200, leftmostItemXLeft, 443, 0.5, 1.1, 4 ); + const crate1 = new Item( this, 'crate1', tandem.createTandem( 'crate1' ), crate_svg, 50, leftmostItemXLeft + crate1Spacing, 507, 0.5 ); + const crate2 = new Item( this, 'crate2', tandem.createTandem( 'crate2' ), crate_svg, 50, leftmostItemXLeft + crate1Spacing + crate2Spacing, 507, 0.5 ); const girl = new Item( this, HumanTypeEnum.GIRL, tandem.createTandem( 'girl' ), undefined, 40, leftmostItemXRight, 465, 0.6, 1.0, 4.2 ); const man = new Item( this, HumanTypeEnum.MAN, tandem.createTandem( 'man' ), undefined, 80, leftmostItemXRight + manSpacing, 428, 0.6, 0.92, 5 ); if ( isTrashCanPresent ) { - trashCan = new Item( this, 'trash', tandem.createTandem( 'trash' ), trashCan_png, 100, leftmostItemXRight + manSpacing + trashSpacing, 496, 0.7, 1.0, 5 ); + trashCan = new Item( this, 'trash', tandem.createTandem( 'trash' ), trashCan_svg, 100, leftmostItemXRight + manSpacing + trashSpacing, 496, 0.5, 1.0, 5 ); } - const mysteryBox = new Item( this, 'mystery', tandem.createTandem( 'mystery' ), mysteryObject01_png, 50, leftmostItemXRight + manSpacing + trashSpacing + mysterySpacing, 513, 0.3, 1.0, undefined, undefined, undefined, true ); - const bucket = new Item( this, 'bucket', tandem.createTandem( 'bucket' ), waterBucket_png, 100, leftmostItemXRight + manSpacing + trashSpacing + mysterySpacing + bucketSpacing, 547 + -35, 0.68, 1.0, 8 ); + const mysteryBox = new Item( this, 'mystery', tandem.createTandem( 'mystery' ), mysteryObject01_svg, 50, leftmostItemXRight + manSpacing + trashSpacing + mysterySpacing, 513, 0.5, 1.0, undefined, undefined, undefined, true ); + const bucket = new Item( this, 'bucket', tandem.createTandem( 'bucket' ), waterBucket_svg, 100, leftmostItemXRight + manSpacing + trashSpacing + mysterySpacing + bucketSpacing, 547 + -35, 0.68, 1.0, 8 ); bucket.bucket = true; const itemsToAdd = this.accelerometer ? [ bucket ] : [];