From 088f40f056697649a95ac52da2e67b9120c70d12 Mon Sep 17 00:00:00 2001 From: jbphet Date: Wed, 23 Mar 2022 15:45:57 -0600 Subject: [PATCH] TS conversion step, see https://github.com/phetsims/tambo/issues/160 --- js/demo/sim-like-components/model/Ball.ts | 8 ++--- .../sim-like-components/model/BoxOfBalls.ts | 32 +++++++------------ 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/js/demo/sim-like-components/model/Ball.ts b/js/demo/sim-like-components/model/Ball.ts index 9d8cea44..5d025e76 100644 --- a/js/demo/sim-like-components/model/Ball.ts +++ b/js/demo/sim-like-components/model/Ball.ts @@ -11,10 +11,10 @@ import { Color } from '../../../../../scenery/js/imports.js'; import tambo from '../../../tambo.js'; class Ball { - private readonly radius: number; - private readonly color: Color; - private readonly positionProperty: Vector2Property; - private readonly velocityProperty: Vector2Property; + public readonly radius: number; + public readonly color: Color; + public readonly positionProperty: Vector2Property; + public readonly velocityProperty: Vector2Property; private readonly bounceEmitter: Emitter<[string]>; constructor( radius: number, color: Color, initialPosition: Vector2, initialVelocity: Vector2 ) { diff --git a/js/demo/sim-like-components/model/BoxOfBalls.ts b/js/demo/sim-like-components/model/BoxOfBalls.ts index 8b84a89e..fdcc8818 100644 --- a/js/demo/sim-like-components/model/BoxOfBalls.ts +++ b/js/demo/sim-like-components/model/BoxOfBalls.ts @@ -1,12 +1,10 @@ // Copyright 2018-2022, University of Colorado Boulder -// @ts-nocheck - /** * BoxOfBalls is a model of a box containing moving balls that bounce off the walls. */ -import createObservableArray from '../../../../../axon/js/createObservableArray.js'; +import createObservableArray, { ObservableArray } from '../../../../../axon/js/createObservableArray.js'; import dotRandom from '../../../../../dot/js/dotRandom.js'; import Vector2 from '../../../../../dot/js/Vector2.js'; import { Shape } from '../../../../../kite/js/imports.js'; @@ -28,13 +26,10 @@ const createRandomColor = () => { }; class BoxOfBalls { + private readonly box: Shape; + private readonly balls: ObservableArray; - /** - * @param {number} width - in centimeters - * @param {number} height - in centimeters - * @constructor - */ - constructor( width, height ) { + constructor( width: number, height: number ) { // @public (read-only) {Shape.rect} - the bounding box this.box = Shape.rect( 50, 0, width, height ); @@ -44,10 +39,9 @@ class BoxOfBalls { } /** - * add a ball with random size, color, position, and velocity - * @public + * Add a ball with random size, color, position, and velocity. */ - addRandomBall() { + public addRandomBall() { let xVelocity = MIN_X_OR_Y_VELOCITY + dotRandom.nextDouble() * ( MAX_X_OR_Y_VELOCITY - MIN_X_OR_Y_VELOCITY ); xVelocity = dotRandom.nextBoolean() ? xVelocity : -xVelocity; @@ -66,19 +60,17 @@ class BoxOfBalls { } /** - * remove a ball - * @public + * Remove a ball. */ - removeABall() { + public removeABall() { this.balls.pop(); } /** * step function to move and bounce the balls - * @param {number} dt - time step, in seconds - * @public + * @param dt - time step, in seconds */ - step( dt ) { + public step( dt: number ) { const boxBounds = this.box.bounds; this.balls.forEach( ball => { const positionBeforeMotion = ball.positionProperty.value; @@ -112,12 +104,10 @@ class BoxOfBalls { /** * restore initial state - * @public */ - reset() { + public reset() { this.balls.reset(); } - } tambo.register( 'BoxOfBalls', BoxOfBalls );