Rename DOT/Util and SCENERY/Util to Utils, see phetsims/tasks#966

phetsims · Dec 30, 2019 · f967380 · f967380
1 parent 71813bd
commit f967380
Show file tree

Hide file tree

Showing 18 changed files with 375 additions and 375 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -48,7 +48,7 @@ module.exports = function( grunt ) {
       Sphere3: 'sphere3',
       Transform3: 'transform3',
       Transform4: 'transform4',
-      Util: 'util',
+      Utils: 'util',
       Vector2: 'vector2',
       Vector3: 'vector3',
       Vector4: 'vector4'
@@ -82,7 +82,7 @@ module.exports = function( grunt ) {
     docFile( 'js/Dimension2.js', 'Dimension2', [ 'Dimension2' ] );
     docFile( 'js/Transform3.js', 'Transform3', [ 'Transform3' ] );
     docFile( 'js/Transform4.js', 'Transform4', [ 'Transform4' ] );
-    docFile( 'js/Util.js', 'Util', [ 'Util' ] );
+    docFile( 'js/Utils.js', 'Utils', [ 'Utils' ] );
     docFile( 'js/Vector2.js', 'Vector2', [ 'Vector2' ] );
     docFile( 'js/Vector3.js', 'Vector3', [ 'Vector3' ] );
     docFile( 'js/Vector4.js', 'Vector4', [ 'Vector4' ] );

diff --git a/doc/index.html b/doc/index.html
diff --git a/js/Complex.js b/js/Complex.js
@@ -12,7 +12,7 @@ define( require => {
   'use strict';
 
   const dot = require( 'DOT/dot' );
-  require( 'DOT/Util' );
+  require( 'DOT/Utils' );
   const inherit = require( 'PHET_CORE/inherit' );
 
   /**
@@ -212,8 +212,8 @@ define( require => {
      */
     sinOf: function() {
       return new Complex(
-        Math.sin( this.real ) * dot.Util.cosh( this.imaginary ),
-        Math.cos( this.real ) * dot.Util.sinh( this.imaginary )
+        Math.sin( this.real ) * dot.Utils.cosh( this.imaginary ),
+        Math.cos( this.real ) * dot.Utils.sinh( this.imaginary )
       );
     },
 
@@ -226,8 +226,8 @@ define( require => {
      */
     cosOf: function() {
       return new Complex(
-        Math.cos( this.real ) * dot.Util.cosh( this.imaginary ),
-        - Math.sin( this.real ) * dot.Util.sinh( this.imaginary )
+        Math.cos( this.real ) * dot.Utils.cosh( this.imaginary ),
+        - Math.sin( this.real ) * dot.Utils.sinh( this.imaginary )
       );
     },
 
@@ -430,8 +430,8 @@ define( require => {
      */
     sin: function() {
       return this.setRealImaginary(
-        Math.sin( this.real ) * dot.Util.cosh( this.imaginary ),
-        Math.cos( this.real ) * dot.Util.sinh( this.imaginary )
+        Math.sin( this.real ) * dot.Utils.cosh( this.imaginary ),
+        Math.cos( this.real ) * dot.Utils.sinh( this.imaginary )
       );
     },
 
@@ -444,8 +444,8 @@ define( require => {
      */
     cos: function() {
       return this.setRealImaginary(
-        Math.cos( this.real ) * dot.Util.cosh( this.imaginary ),
-        - Math.sin( this.real ) * dot.Util.sinh( this.imaginary )
+        Math.cos( this.real ) * dot.Utils.cosh( this.imaginary ),
+        - Math.sin( this.real ) * dot.Utils.sinh( this.imaginary )
       );
     },
 

diff --git a/js/DelaunayTriangulation.js b/js/DelaunayTriangulation.js
@@ -21,7 +21,7 @@ define( require => {
   const dot = require( 'DOT/dot' );
   const inherit = require( 'PHET_CORE/inherit' );
   const merge = require( 'PHET_CORE/merge' );
-  const Util = require( 'DOT/Util' );
+  const Utils = require( 'DOT/Utils' );
   const Vector2 = require( 'DOT/Vector2' );
 
   /**
@@ -271,7 +271,7 @@ define( require => {
       const middleVertex = rightFrontEdge.endVertex;
 
       while ( rightFrontEdge.previousEdge &&
-              Util.triangleAreaSigned( middleVertex.point, rightFrontEdge.startVertex.point, rightFrontEdge.previousEdge.startVertex.point ) > 0 &&
+              Utils.triangleAreaSigned( middleVertex.point, rightFrontEdge.startVertex.point, rightFrontEdge.previousEdge.startVertex.point ) > 0 &&
               ( middleVertex.point.minus( rightFrontEdge.startVertex.point ) ).angleBetween( rightFrontEdge.previousEdge.startVertex.point.minus( rightFrontEdge.startVertex.point ) ) < Math.PI / 2 ) {
         const previousEdge = rightFrontEdge.previousEdge;
         const newRightEdge = new Edge( previousEdge.startVertex, middleVertex );
@@ -286,7 +286,7 @@ define( require => {
         rightFrontEdge = newRightEdge;
       }
       while ( leftFrontEdge.nextEdge &&
-              Util.triangleAreaSigned( middleVertex.point, leftFrontEdge.nextEdge.endVertex.point, leftFrontEdge.endVertex.point ) > 0 &&
+              Utils.triangleAreaSigned( middleVertex.point, leftFrontEdge.nextEdge.endVertex.point, leftFrontEdge.endVertex.point ) > 0 &&
               ( middleVertex.point.minus( leftFrontEdge.endVertex.point ) ).angleBetween( leftFrontEdge.nextEdge.endVertex.point.minus( leftFrontEdge.endVertex.point ) ) < Math.PI / 2 ) {
         const nextEdge = leftFrontEdge.nextEdge;
         const newLeftEdge = new Edge( middleVertex, nextEdge.endVertex );
@@ -474,7 +474,7 @@ define( require => {
           const startVertex = edge.getOtherVertex( sharedVertex );
           const endVertex = nextEdge.getOtherVertex( sharedVertex );
 
-          if ( Util.triangleAreaSigned( startVertex.point, sharedVertex.point,  endVertex.point ) <= 0 ) {
+          if ( Utils.triangleAreaSigned( startVertex.point, sharedVertex.point,  endVertex.point ) <= 0 ) {
             continue;
           }
 
@@ -563,7 +563,7 @@ define( require => {
       for ( var i = 0; i < frontEdges.length - 1; i++ ) {
         var firstEdge = frontEdges[ i ];
         var secondEdge = frontEdges[ i + 1 ];
-        if ( Util.triangleAreaSigned( secondEdge.endVertex.point, firstEdge.endVertex.point, firstEdge.startVertex.point ) > 1e-10 ) {
+        if ( Utils.triangleAreaSigned( secondEdge.endVertex.point, firstEdge.endVertex.point, firstEdge.startVertex.point ) > 1e-10 ) {
           var newEdge = this.fillBorderTriangle( firstEdge, secondEdge, firstEdge.startVertex, firstEdge.endVertex, secondEdge.endVertex );
           frontEdges.splice( i, 2, newEdge );
           // start scanning from behind where we were previously (if possible)
@@ -619,7 +619,7 @@ define( require => {
         sharedVertex = firstEdge.getSharedVertex( secondEdge );
         const firstVertex = firstEdge.getOtherVertex( sharedVertex );
         const secondVertex = secondEdge.getOtherVertex( sharedVertex );
-        if ( Util.triangleAreaSigned( secondVertex.point, sharedVertex.point, firstVertex.point ) > 1e-10 ) {
+        if ( Utils.triangleAreaSigned( secondVertex.point, sharedVertex.point, firstVertex.point ) > 1e-10 ) {
           newEdge = this.fillBorderTriangle( firstEdge, secondEdge, firstVertex, sharedVertex, secondVertex );
           backEdges.splice( i, 2, newEdge );
           // start scanning from behind where we were previously (if possible)
@@ -659,8 +659,8 @@ define( require => {
       const farVertex1 = triangle1.getVertexOppositeFromEdge( edge );
       const farVertex2 = triangle2.getVertexOppositeFromEdge( edge );
 
-      if ( Util.pointInCircleFromPoints( triangle1.aVertex.point, triangle1.bVertex.point, triangle1.cVertex.point, farVertex2.point ) ||
-           Util.pointInCircleFromPoints( triangle2.aVertex.point, triangle2.bVertex.point, triangle2.cVertex.point, farVertex1.point ) ) {
+      if ( Utils.pointInCircleFromPoints( triangle1.aVertex.point, triangle1.bVertex.point, triangle1.cVertex.point, farVertex2.point ) ||
+           Utils.pointInCircleFromPoints( triangle2.aVertex.point, triangle2.bVertex.point, triangle2.cVertex.point, farVertex1.point ) ) {
         // TODO: better helper functions for adding/removing triangles (takes care of the edge stuff)
         triangle1.remove();
         triangle2.remove();
@@ -952,7 +952,7 @@ define( require => {
      * @returns {boolean}
      */
     intersectsConstrainedEdge: function( vertex, bottomVertex ) {
-      return Util.lineSegmentIntersection( vertex.point.x, vertex.point.y, bottomVertex.point.x, bottomVertex.point.y,
+      return Utils.lineSegmentIntersection( vertex.point.x, vertex.point.y, bottomVertex.point.x, bottomVertex.point.y,
                                            this.startVertex.point.x, this.startVertex.point.y,
                                            this.endVertex.point.x, this.endVertex.point.y );
     }
@@ -992,7 +992,7 @@ define( require => {
     assert && assert( cVertex === aEdge.startVertex || cVertex === aEdge.endVertex, 'cVertex should be in aEdge' );
     assert && assert( cVertex === bEdge.startVertex || cVertex === bEdge.endVertex, 'cVertex should be in bEdge' );
 
-    assert && assert( Util.triangleAreaSigned( aVertex.point, bVertex.point, cVertex.point ) > 0,
+    assert && assert( Utils.triangleAreaSigned( aVertex.point, bVertex.point, cVertex.point ) > 0,
       'Should be counterclockwise' );
 
     // @public {Vertex}

diff --git a/js/LinearFunction.js b/js/LinearFunction.js
@@ -18,7 +18,7 @@ define( require => {
   const dot = require( 'DOT/dot' );
 
   // modules
-  require( 'DOT/Util' );
+  require( 'DOT/Utils' );
 
   /**
    * @param {number} a1
@@ -48,11 +48,11 @@ define( require => {
      * @returns {number}
      */
     const map = function( a1, a2, b1, b2, a3, clamp ) {
-      let b3 = dot.Util.linear( a1, a2, b1, b2, a3 );
+      let b3 = dot.Utils.linear( a1, a2, b1, b2, a3 );
       if ( clamp ) {
         const max = Math.max( b1, b2 );
         const min = Math.min( b1, b2 );
-        b3 = dot.Util.clamp( b3, min, max );
+        b3 = dot.Utils.clamp( b3, min, max );
       }
       return b3;
     };

diff --git a/js/Permutation.js b/js/Permutation.js
@@ -12,7 +12,7 @@ define( require => {
   const dot = require( 'DOT/dot' );
 
   const isArray = require( 'PHET_CORE/isArray' );
-  require( 'DOT/Util' ); // for rangeInclusive
+  require( 'DOT/Utils' ); // for rangeInclusive
 
   // Creates a permutation that will rearrange a list so that newList[i] = oldList[permutation[i]]
   function Permutation( indices ) {

diff --git a/js/PiecewiseLinearFunction.js b/js/PiecewiseLinearFunction.js
@@ -9,10 +9,10 @@ define( require => {
   'use strict';
 
   const dot = require( 'DOT/dot' );
-  const Util = require( 'DOT/Util' );
+  const Utils = require( 'DOT/Utils' );
 
   // modules
-  require( 'DOT/Util' );
+  require( 'DOT/Utils' );
 
   class PiecewiseLinearFunction {
 
@@ -70,7 +70,7 @@ define( require => {
       const anchor1Y = array[ lowerIndex + 1 ];
       const anchor2X = array[ upperIndex ];
       const anchor2Y = array[ upperIndex + 1 ];
-      return Util.linear( anchor1X, anchor2X, anchor1Y, anchor2Y, x );
+      return Utils.linear( anchor1X, anchor2X, anchor1Y, anchor2Y, x );
     }
   }
 

diff --git a/js/Quaternion.js b/js/Quaternion.js
@@ -16,7 +16,7 @@ define( require => {
   const Poolable = require( 'PHET_CORE/Poolable' );
   require( 'DOT/Vector3' );
   require( 'DOT/Matrix3' );
-  require( 'DOT/Util' );
+  require( 'DOT/Utils' );
 
   /**
    * Quaternion defines hypercomplex numbers of the form {x, y, z, w}

diff --git a/js/Random.js b/js/Random.js
@@ -15,7 +15,7 @@ define( require => {
   const dot = require( 'DOT/dot' );
   const inherit = require( 'PHET_CORE/inherit' );
   const merge = require( 'PHET_CORE/merge' );
-  const Util = require( 'DOT/Util' );
+  const Utils = require( 'DOT/Utils' );
 
   /**
    * Construct a Random instance.
@@ -91,8 +91,8 @@ define( require => {
     nextIntBetween: function( min, max ) {
 
       assert && assert( arguments.length === 2, 'nextIntBetween must have exactly 2 arguments' );
-      assert && assert( Util.isInteger( min ), 'min must be an integer: ' + min );
-      assert && assert( Util.isInteger( max ), 'max must be an integer: ' + max );
+      assert && assert( Utils.isInteger( min ), 'min must be an integer: ' + min );
+      assert && assert( Utils.isInteger( max ), 'max must be an integer: ' + max );
 
       const range = max - min;
       return this.nextInt( range + 1 ) + min;
@@ -160,7 +160,7 @@ define( require => {
      * @returns {number}
      */
     nextGaussian: function() {
-      return Util.boxMullerTransform( 0, 1, this );
+      return Utils.boxMullerTransform( 0, 1, this );
     }
   } );