Improve types, see #401

phetsims · Oct 11, 2021 · 6fc2589 · 6fc2589
1 parent 82308da
commit 6fc2589
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/js/common/model/BendingLightModel.ts b/js/common/model/BendingLightModel.ts
@@ -91,6 +91,8 @@ abstract class BendingLightModel {
    */
   clearModel() {
     for ( let i = 0; i < this.rays.length; i++ ) {
+
+      // @ts-ignore createObservableArray
       this.rays[ i ].particles.clear();
     }
     this.rays.length = 0;

diff --git a/js/common/model/LightRay.ts b/js/common/model/LightRay.ts
@@ -15,6 +15,7 @@ import Shape from '../../../../kite/js/Shape.js';
 import Color from '../../../../scenery/js/util/Color.js';
 import bendingLight from '../../bendingLight.js';
 import BendingLightConstants from '../BendingLightConstants.js';
+import WaveParticle from './WaveParticle.js';
 
 // constants
 /**
@@ -32,7 +33,7 @@ const makeFinite = ( vector: Vector2 ) => {
 
 class LightRay {
   extendBackwards: boolean;
-  color: any;
+  color: Color;
   waveWidth: number;
   trapeziumWidth: number;
   tip: Vector2;
@@ -44,7 +45,7 @@ class LightRay {
   numWavelengthsPhaseOffset: number;
   extend: boolean;
   vectorForm: Vector2;
-  particles: any;
+  particles: WaveParticle[];
   time: number;
   rayType: string;
   unitVector: Vector2;

diff --git a/js/common/model/WaveParticle.ts b/js/common/model/WaveParticle.ts
@@ -16,9 +16,9 @@ class WaveParticle {
   private readonly position: Vector2;
   private readonly width: number;
   private readonly color: Color;
-  private readonly angle: number;
-  private readonly height: number;
-  private readonly particleGradientColor: Color;
+  readonly angle: number;
+  readonly height: number;
+  readonly particleGradientColor: Color;
 
   /**
    * @param {Vector2} position - position of wave particle

diff --git a/js/intro/model/IntroModel.ts b/js/intro/model/IntroModel.ts
@@ -510,7 +510,7 @@ class IntroModel extends BendingLightModel {
 
       // Changing the wave particle position within the wave particle phase
       for ( let j = 0; j < waveParticles.length; j++ ) {
-        const particle = waveParticles.get( j );
+        const particle = waveParticles[j];
         particle.setX( tailX + ( directionVector.x * ( ( j * wavelength ) + phaseDiff ) ) );
         particle.setY( tailY + ( directionVector.y * ( ( j * wavelength ) + phaseDiff ) ) );
       }

diff --git a/js/intro/view/WaveCanvasNode.ts b/js/intro/view/WaveCanvasNode.ts
@@ -63,7 +63,7 @@ class WaveCanvasNode extends CanvasNode {
           context.clip();
         }
 
-        const particle = ray.particles.get( 0 );
+        const particle = ray.particles[ 0 ];
 
         // Set the origin at the beginning of the particle
         context.translate(
@@ -78,10 +78,12 @@ class WaveCanvasNode extends CanvasNode {
         const wavelength = this.modelViewTransform.modelToViewDeltaX( particle.height );
 
         // Fill the background with the dark color, in the entire clip area
+        // @ts-ignore
         context.fillStyle = particle.particleGradientColor;
         context.fillRect( -1000, -1000, 2000, 2000 );
 
         // Set up the color for the wave crests
+        // @ts-ignore
         context.fillStyle = particle.color;
 
         // Render each crest, but we don't need as many wavelengths for the incoming light

diff --git a/js/intro/view/WaveWebGLNode.ts b/js/intro/view/WaveWebGLNode.ts
@@ -165,8 +165,11 @@ class WavePainter {
         );
 
         // light ray color
+        // @ts-ignore
         const red = lightRay.color.r / 255;
+        // @ts-ignore
         const green = lightRay.color.g / 255;
+        // @ts-ignore
         const blue = lightRay.color.b / 255;
 
         gl.bindBuffer( gl.ARRAY_BUFFER, this.vertexBuffer );