Rename rasterized => rasterizeNode, see scenerystack/scenerystack#43

Author: jonathanolson

doc/implementation-notes.md

@@ -81,7 +81,7 @@ ModifiedNodalAnalysisCircuit.js for details.
   their dispose functions.
 * To attain reasonable performance on iPad2, some of the CircuitNode child node layers have been implemented in WebGL
   using `renderer:'webgl'`. This means all of the nodes must be rendered with solid-fill Rectangle (without rounded
-  corners or gradients), and images. rasterized() is used throughout these view layers to rasterize as images.
+  corners or gradients), and images. rasterizeNode() is used throughout these view layers to rasterize as images.
 * CircuitElementNumberControl (which appears at the bottom of the screen when a CircuitElement is selected) and
   ValueNode.js (which shows a text readout over an item when "values" is checked) use a similar pattern of containing
   logic for the different kinds of CircuitElements. Other ways to solve this may have been:

js/view/ACVoltageNode.ts

@@ -15,7 +15,7 @@ import PlusNode from '../../../scenery-phet/js/PlusNode.js';
 import Circle from '../../../scenery/js/nodes/Circle.js';
 import Node from '../../../scenery/js/nodes/Node.js';
 import Path from '../../../scenery/js/nodes/Path.js';
-import { rasterized } from '../../../scenery/js/util/rasterized.js';
+import { rasterizeNode } from '../../../scenery/js/util/rasterizeNode.js';
 import type Tandem from '../../../tandem/js/Tandem.js';
 import CCKCConstants from '../CCKCConstants.js';
 import circuitConstructionKitCommon from '../circuitConstructionKitCommon.js';
@@ -78,8 +78,8 @@ const createNode = ( schematic: boolean ) => new Node( {
         } ) ]
   ]
 } );
-const schematicNode = rasterized( createNode( true ), { wrap: false, resolution: 2 } );
-const lifelikeNode = rasterized( createNode( false ), { wrap: false, resolution: 2 } );
+const schematicNode = rasterizeNode( createNode( true ), { wrap: false, resolution: 2 } );
+const lifelikeNode = rasterizeNode( createNode( false ), { wrap: false, resolution: 2 } );
 
 // Expand the pointer areas with a defensive copy, see https://github.com/phetsims/circuit-construction-kit-common/issues/310
 schematicNode.mouseArea = Shape.circle(

js/view/BatteryNode.ts

@@ -13,7 +13,7 @@ import { combineOptions } from '../../../phet-core/js/optionize.js';
 import Image from '../../../scenery/js/nodes/Image.js';
 import Path from '../../../scenery/js/nodes/Path.js';
 import Color from '../../../scenery/js/util/Color.js';
-import { rasterized } from '../../../scenery/js/util/rasterized.js';
+import { rasterizeNode } from '../../../scenery/js/util/rasterizeNode.js';
 import type Tandem from '../../../tandem/js/Tandem.js';
 import battery_png from '../../images/battery_png.js';
 import batteryHigh_png from '../../images/batteryHigh_png.js';
@@ -51,7 +51,7 @@ const schematicScale = desiredWidth / schematicWidth;
 
 // Scale to fit the correct width
 schematicShape = schematicShape.transformed( Matrix3.scale( schematicScale, schematicScale ) );
-const schematicNode = rasterized( new Path( schematicShape, {
+const schematicNode = rasterizeNode( new Path( schematicShape, {
   stroke: Color.BLACK,
   lineWidth: CCKCConstants.SCHEMATIC_LINE_WIDTH
 } ), { wrap: false } );

js/view/ChargeNode.ts

@@ -13,7 +13,7 @@ import Utils from '../../../dot/js/Utils.js';
 import Shape from '../../../kite/js/Shape.js';
 import ElectronChargeNode from '../../../scenery-phet/js/ElectronChargeNode.js';
 import Node from '../../../scenery/js/nodes/Node.js';
-import { rasterized } from '../../../scenery/js/util/rasterized.js';
+import { rasterizeNode } from '../../../scenery/js/util/rasterizeNode.js';
 import Tandem from '../../../tandem/js/Tandem.js';
 import circuitConstructionKitCommon from '../circuitConstructionKitCommon.js';
 import Capacitor from '../model/Capacitor.js';
@@ -25,7 +25,7 @@ import type CircuitNode from './CircuitNode.js';
 import ConventionalCurrentArrowNode from './ConventionalCurrentArrowNode.js';
 
 // constants
-const ELECTRON_CHARGE_NODE = rasterized( new ElectronChargeNode( {
+const ELECTRON_CHARGE_NODE = rasterizeNode( new ElectronChargeNode( {
 
   // Electrons are transparent to convey they are a representation rather than physical objects
   // Workaround for https://github.com/phetsims/circuit-construction-kit-dc/issues/160
@@ -36,13 +36,13 @@ const ELECTRON_CHARGE_NODE = rasterized( new ElectronChargeNode( {
   scale: 0.78
 } ), { wrap: false } );
 
-const INITIAL_ARROW_NODE = rasterized( new ConventionalCurrentArrowNode( Tandem.OPT_OUT ), { wrap: false } );
+const INITIAL_ARROW_NODE = rasterizeNode( new ConventionalCurrentArrowNode( Tandem.OPT_OUT ), { wrap: false } );
 
 const arrowNode = new Node( { children: [ INITIAL_ARROW_NODE ] } );
 
 Multilink.multilink( [ CCKCColors.conventionalCurrentArrowFillProperty, CCKCColors.conventionalCurrentArrowStrokeProperty ],
   ( arrowFill, arrowStroke ) => {
-    arrowNode.children = [ rasterized( new ConventionalCurrentArrowNode( Tandem.OPT_OUT ), { wrap: false } ) ];
+    arrowNode.children = [ rasterizeNode( new ConventionalCurrentArrowNode( Tandem.OPT_OUT ), { wrap: false } ) ];
   } );
 
 // Below this amperage, no conventional current will be rendered.

js/view/SeriesAmmeterNode.ts

@@ -13,7 +13,7 @@ import MathSymbols from '../../../scenery-phet/js/MathSymbols.js';
 import Node from '../../../scenery/js/nodes/Node.js';
 import Rectangle, { type RectangleOptions } from '../../../scenery/js/nodes/Rectangle.js';
 import Text from '../../../scenery/js/nodes/Text.js';
-import { rasterized } from '../../../scenery/js/util/rasterized.js';
+import { rasterizeNode } from '../../../scenery/js/util/rasterizeNode.js';
 import Panel from '../../../sun/js/Panel.js';
 import type Tandem from '../../../tandem/js/Tandem.js';
 import CCKCConstants from '../CCKCConstants.js';
@@ -43,7 +43,7 @@ const CORNER_RADIUS = 4;
  * Rasterize so it can be rendered in WebGL, see https://github.com/phetsims/circuit-construction-kit-dc/issues/67
  * @param [providedOptions]
  */
-const createPanel = ( providedOptions?: RectangleOptions ) => rasterized( new Rectangle( 0, 0, PANEL_WIDTH, PANEL_HEIGHT, providedOptions ), { wrap: false } );
+const createPanel = ( providedOptions?: RectangleOptions ) => rasterizeNode( new Rectangle( 0, 0, PANEL_WIDTH, PANEL_HEIGHT, providedOptions ), { wrap: false } );
 
 const orangeBackgroundPanel = createPanel( { cornerRadius: CORNER_RADIUS, fill: ORANGE } );
 const blackBorder = createPanel( {

js/view/SolderNode.ts

@@ -9,7 +9,7 @@
 import type Vector2 from '../../../dot/js/Vector2.js';
 import Circle from '../../../scenery/js/nodes/Circle.js';
 import Node from '../../../scenery/js/nodes/Node.js';
-import { rasterized } from '../../../scenery/js/util/rasterized.js';
+import { rasterizeNode } from '../../../scenery/js/util/rasterizeNode.js';
 import circuitConstructionKitCommon from '../circuitConstructionKitCommon.js';
 import type Vertex from '../model/Vertex.js';
 import type CircuitNode from './CircuitNode.js';
@@ -21,7 +21,7 @@ const SOLDER_COLOR = '#ae9f9e';
 const SOLDER_RADIUS = 11.2;
 
 // {Image} raster created by init() for WebGL usage
-const CIRCLE_NODE = rasterized( new Circle( SOLDER_RADIUS, { fill: SOLDER_COLOR } ), { wrap: false } );
+const CIRCLE_NODE = rasterizeNode( new Circle( SOLDER_RADIUS, { fill: SOLDER_COLOR } ), { wrap: false } );
 
 export default class SolderNode extends Node {
   public readonly vertex: Vertex;

js/view/SwitchNode.ts

@@ -17,7 +17,7 @@ import Rectangle from '../../../scenery/js/nodes/Rectangle.js';
 import Color from '../../../scenery/js/util/Color.js';
 import type Gradient from '../../../scenery/js/util/Gradient.js';
 import LinearGradient from '../../../scenery/js/util/LinearGradient.js';
-import { rasterized } from '../../../scenery/js/util/rasterized.js';
+import { rasterizeNode } from '../../../scenery/js/util/rasterizeNode.js';
 import type Tandem from '../../../tandem/js/Tandem.js';
 import CCKCConstants from '../CCKCConstants.js';
 import circuitConstructionKitCommon from '../circuitConstructionKitCommon.js';
@@ -138,18 +138,18 @@ const createNode = function( viewType: CircuitElementViewType, fill: Gradient |
 const lifelikeOpenNode = createNode(
   CircuitElementViewType.LIFELIKE, lifelikeGradient, LIFELIKE_DIAMETER, 6, false
 );
-const lifelikeOpenImage = rasterized( lifelikeOpenNode, { wrap: false } );
+const lifelikeOpenImage = rasterizeNode( lifelikeOpenNode, { wrap: false } );
 
 const lifelikeClosedNode = createNode(
   CircuitElementViewType.LIFELIKE, lifelikeGradient, LIFELIKE_DIAMETER, 6, true
 );
-const lifelikeClosedImage = rasterized( lifelikeClosedNode, { wrap: false } );
+const lifelikeClosedImage = rasterizeNode( lifelikeClosedNode, { wrap: false } );
 
-const schematicOpenImage = rasterized( createNode(
+const schematicOpenImage = rasterizeNode( createNode(
   CircuitElementViewType.SCHEMATIC, Color.BLACK, CCKCConstants.SCHEMATIC_LINE_WIDTH, 0, false
 ), { wrap: false } );
 
-const schematicClosedImage = rasterized( createNode(
+const schematicClosedImage = rasterizeNode( createNode(
   CircuitElementViewType.SCHEMATIC, Color.BLACK, CCKCConstants.SCHEMATIC_LINE_WIDTH, 0, true
 ), { wrap: false } );
 

js/view/VertexNode.ts

@@ -17,7 +17,7 @@ import Node from '../../../scenery/js/nodes/Node.js';
 import Text from '../../../scenery/js/nodes/Text.js';
 import SceneryConstants from '../../../scenery/js/SceneryConstants.js';
 import Color from '../../../scenery/js/util/Color.js';
-import { rasterized } from '../../../scenery/js/util/rasterized.js';
+import { rasterizeNode } from '../../../scenery/js/util/rasterizeNode.js';
 import type Tandem from '../../../tandem/js/Tandem.js';
 import CCKCConstants from '../CCKCConstants.js';
 import CCKCQueryParameters from '../CCKCQueryParameters.js';
@@ -38,10 +38,10 @@ const CIRCLE_OPTIONS = {
   lineWidth: 1.3,
   lineDash: [ 6, 4 ]
 };
-const RED_CIRCLE_NODE = rasterized( new Circle( VERTEX_RADIUS, combineOptions<CircleOptions>( {
+const RED_CIRCLE_NODE = rasterizeNode( new Circle( VERTEX_RADIUS, combineOptions<CircleOptions>( {
   stroke: Color.RED
 }, CIRCLE_OPTIONS ) ), { wrap: false } );
-const BLACK_CIRCLE_NODE = rasterized( new Circle( VERTEX_RADIUS, combineOptions<CircleOptions>( {
+const BLACK_CIRCLE_NODE = rasterizeNode( new Circle( VERTEX_RADIUS, combineOptions<CircleOptions>( {
   stroke: Color.BLACK
 }, CIRCLE_OPTIONS ) ), { wrap: false } );
 

js/view/WireNode.ts

@@ -18,7 +18,7 @@ import Node from '../../../scenery/js/nodes/Node.js';
 import Path from '../../../scenery/js/nodes/Path.js';
 import Color from '../../../scenery/js/util/Color.js';
 import LinearGradient from '../../../scenery/js/util/LinearGradient.js';
-import { rasterized } from '../../../scenery/js/util/rasterized.js';
+import { rasterizeNode } from '../../../scenery/js/util/rasterizeNode.js';
 import type Tandem from '../../../tandem/js/Tandem.js';
 import CCKCConstants from '../CCKCConstants.js';
 import circuitConstructionKitCommon from '../circuitConstructionKitCommon.js';
@@ -40,13 +40,13 @@ const MATRIX = new Matrix3(); // The Matrix entries are mutable
 const WIRE_RASTER_LENGTH = 100;
 
 // Node used to render the black line for schematic, rasterized so it can render with WebGL
-const BLACK_LINE_NODE = rasterized( new Line( 0, 0, WIRE_RASTER_LENGTH, 0, {
+const BLACK_LINE_NODE = rasterizeNode( new Line( 0, 0, WIRE_RASTER_LENGTH, 0, {
   lineWidth: SCHEMATIC_LINE_WIDTH,
   stroke: Color.BLACK
 } ), { wrap: false } );
 
 // Not displayed, used to get accurate hit bounds for the schematic view.
-const SCHEMATIC_BACKGROUND = rasterized( new Line( 0, 0, WIRE_RASTER_LENGTH, 0, {
+const SCHEMATIC_BACKGROUND = rasterizeNode( new Line( 0, 0, WIRE_RASTER_LENGTH, 0, {
   lineWidth: LIFELIKE_LINE_WIDTH,
   stroke: Color.BLUE,
   opacity: 0.0
@@ -76,23 +76,23 @@ const colorStops = [
 const normalGradient = createGradient( colorStops, _.identity );
 const reverseGradient = createGradient( colorStops.reverse(), ( e: number ) => 1.0 - e );
 
-const lifelikeNodeNormal = rasterized( new Line( 0, 0, WIRE_RASTER_LENGTH, 0, {
+const lifelikeNodeNormal = rasterizeNode( new Line( 0, 0, WIRE_RASTER_LENGTH, 0, {
   lineWidth: LIFELIKE_LINE_WIDTH,
   stroke: normalGradient
 } ), { wrap: false } );
 
-const lifelikeNodeReversed = rasterized( new Line( 0, 0, WIRE_RASTER_LENGTH, 0, {
+const lifelikeNodeReversed = rasterizeNode( new Line( 0, 0, WIRE_RASTER_LENGTH, 0, {
   lineWidth: LIFELIKE_LINE_WIDTH,
   stroke: reverseGradient
 } ), { wrap: false } );
 
 // Make sure the heights are the same as the wires so they will line up properly, see
 // https://github.com/phetsims/circuit-construction-kit-common/issues/390
-const lifelikeRoundedCapNormal = rasterized( new Circle( LIFELIKE_LINE_WIDTH / 2, {
+const lifelikeRoundedCapNormal = rasterizeNode( new Circle( LIFELIKE_LINE_WIDTH / 2, {
   fill: normalGradient
 } ), { wrap: false } );
 
-const lifelikeRoundedCapReversed = rasterized( new Circle( LIFELIKE_LINE_WIDTH / 2, {
+const lifelikeRoundedCapReversed = rasterizeNode( new Circle( LIFELIKE_LINE_WIDTH / 2, {
   fill: reverseGradient
 } ), { wrap: false } );