Merge pull request #589 from hx2A/fix584-take2

Fix584 take2

Author: hx2A

generator/reference.py

@@ -26,11 +26,11 @@
 PY5_SKIP_RETURN_TYPES = set()
 
 PARAM_TYPE_OVERRIDES = {
-    "boolean[]": "Iterator[bool]",
-    "char[]": "Iterator[chr]",
-    "float[]": "Iterator[float]",
-    "float[][]": "Iterator[Iterator[float]]",
-    "int[]": "Iterator[int]",
+    "boolean[]": "Sequence[bool]",
+    "char[]": "Sequence[chr]",
+    "float[]": "Sequence[float]",
+    "float[][]": "Sequence[Sequence[float]]",
+    "int[]": "Sequence[int]",
 }
 
 RETURN_TYPE_OVERRIDES = {

py5_docs/Reference/api_en/Py5Graphics_bezier_vertices.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = vertex
 
 @@ signatures
-bezier_vertices(coordinates: Iterator[Iterator[float]], /) -> None
+bezier_vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of bezier vertex coordinates with 6 or 9 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of bezier vertex coordinates with 6 or 9 columns for 2D or 3D points, respectively
 
 @@ description
 Create a collection of bezier vertices. The purpose of this method is to provide an alternative to repeatedly calling [](py5graphics_bezier_vertex) in a loop. For a large number of bezier vertices, the performance of `bezier_vertices()` will be much faster.

py5_docs/Reference/api_en/Py5Graphics_curve_vertices.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = vertex
 
 @@ signatures
-curve_vertices(coordinates: Iterator[Iterator[float]], /) -> None
+curve_vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of curve vertex coordinates with 2 or 3 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of curve vertex coordinates with 2 or 3 columns for 2D or 3D points, respectively
 
 @@ description
 Create a collection of curve vertices. The purpose of this method is to provide an alternative to repeatedly calling [](py5graphics_curve_vertex) in a loop. For a large number of curve vertices, the performance of `curve_vertices()` will be much faster.

py5_docs/Reference/api_en/Py5Graphics_lines.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = 2d_primitives
 
 @@ signatures
-lines(coordinates: Iterator[Iterator[float]], /) -> None
+lines(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of line coordinates with 4 or 6 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of line coordinates with 4 or 6 columns for 2D or 3D points, respectively
 
 @@ description
 Draw a collection of lines to the Py5Graphics drawing surface. The purpose of this method is to provide an alternative to repeatedly calling [](py5graphics_line) in a loop. For a large number of lines, the performance of `lines()` will be much faster.

py5_docs/Reference/api_en/Py5Graphics_mask.txt

@@ -8,11 +8,11 @@ processing_name = mask
 
 @@ signatures
 mask(img: Py5Image, /) -> None
-mask(mask_array: Iterator[int], /) -> None
+mask(mask_array: Sequence[int], /) -> None
 
 @@ variables
 img: Py5Image - image to use as the mask
-mask_array: Iterator[int] - 1D array of integers used as the alpha channel, needs to be the same length as the image's pixel array
+mask_array: Sequence[int] - 1D array of integers used as the alpha channel, needs to be the same length as the image's pixel array
 
 @@ description
 Masks part of the Py5Graphics drawing surface from displaying by loading an image and using it as an alpha channel. This mask image should only contain grayscale data, but only the blue color channel is used. The mask image needs to be the same size as the image to which it is applied.

py5_docs/Reference/api_en/Py5Graphics_points.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = 2d_primitives
 
 @@ signatures
-points(coordinates: Iterator[Iterator[float]], /) -> None
+points(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of point coordinates with 2 or 3 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of point coordinates with 2 or 3 columns for 2D or 3D points, respectively
 
 @@ description
 Draw a collection of points, each a coordinate in space at the dimension of one pixel. The purpose of this method is to provide an alternative to repeatedly calling [](py5graphics_point) in a loop. For a large number of points, the performance of `points()` will be much faster.

py5_docs/Reference/api_en/Py5Graphics_quadratic_vertices.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = vertex
 
 @@ signatures
-quadratic_vertices(coordinates: Iterator[Iterator[float]], /) -> None
+quadratic_vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of quadratic vertex coordinates with 4 or 6 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of quadratic vertex coordinates with 4 or 6 columns for 2D or 3D points, respectively
 
 @@ description
 Create a collection of quadratic vertices. The purpose of this method is to provide an alternative to repeatedly calling [](py5graphics_quadratic_vertex) in a loop. For a large number of quadratic vertices, the performance of `quadratic_vertices()` will be much faster.

py5_docs/Reference/api_en/Py5Graphics_text.txt

@@ -9,8 +9,8 @@ processing_name = text
 @@ signatures
 text(c: chr, x: float, y: float, /) -> None
 text(c: chr, x: float, y: float, z: float, /) -> None
-text(chars: Iterator[chr], start: int, stop: int, x: float, y: float, /) -> None
-text(chars: Iterator[chr], start: int, stop: int, x: float, y: float, z: float, /) -> None
+text(chars: Sequence[chr], start: int, stop: int, x: float, y: float, /) -> None
+text(chars: Sequence[chr], start: int, stop: int, x: float, y: float, z: float, /) -> None
 text(num: float, x: float, y: float, /) -> None
 text(num: float, x: float, y: float, z: float, /) -> None
 text(num: int, x: float, y: float, /) -> None
@@ -21,7 +21,7 @@ text(str: str, x: float, y: float, z: float, /) -> None
 
 @@ variables
 c: chr - the alphanumeric character to be displayed
-chars: Iterator[chr] - the alphanumberic symbols to be displayed
+chars: Sequence[chr] - the alphanumberic symbols to be displayed
 num: float - the numeric value to be displayed
 num: int - the numeric value to be displayed
 start: int - array index at which to start writing characters

py5_docs/Reference/api_en/Py5Graphics_text_width.txt

@@ -8,12 +8,12 @@ processing_name = textWidth
 
 @@ signatures
 text_width(c: chr, /) -> float
-text_width(chars: Iterator[chr], start: int, length: int, /) -> float
+text_width(chars: Sequence[chr], start: int, length: int, /) -> float
 text_width(str: str, /) -> float
 
 @@ variables
 c: chr - the character to measure
-chars: Iterator[chr] - the characters to measure
+chars: Sequence[chr] - the characters to measure
 length: int - number of characters to measure
 start: int - first character to measure
 str: str - the String of characters to measure

py5_docs/Reference/api_en/Py5Graphics_vertices.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = vertex
 
 @@ signatures
-vertices(coordinates: Iterator[Iterator[float]], /) -> None
+vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of vertex coordinates and optional UV texture mapping values
+coordinates: Sequence[Sequence[float]] - 2D array of vertex coordinates and optional UV texture mapping values
 
 @@ description
 Create a collection of vertices. The purpose of this method is to provide an alternative to repeatedly calling [](py5graphics_vertex) in a loop. For a large number of vertices, the performance of `vertices()` will be much faster.

py5_docs/Reference/api_en/Py5Image_mask.txt

@@ -8,11 +8,11 @@ processing_name = mask
 
 @@ signatures
 mask(img: Py5Image, /) -> None
-mask(mask_array: Iterator[int], /) -> None
+mask(mask_array: Sequence[int], /) -> None
 
 @@ variables
 img: Py5Image - image to use as the mask
-mask_array: Iterator[int] - 1D array of integers used as the alpha channel, needs to be the same length as the image's pixel array
+mask_array: Sequence[int] - 1D array of integers used as the alpha channel, needs to be the same length as the image's pixel array
 
 @@ description
 Masks part of an image from displaying by loading another image and using it as an alpha channel. This mask image should only contain grayscale data, but only the blue color channel is used. The mask image needs to be the same size as the image to which it is applied.

py5_docs/Reference/api_en/Py5Shader_set.txt

@@ -7,16 +7,16 @@ pclass = PShader
 processing_name = set
 
 @@ signatures
-set(name: str, boolvec: Iterator[bool], ncoords: int, /) -> None
+set(name: str, boolvec: Sequence[bool], ncoords: int, /) -> None
 set(name: str, mat: npt.NDArray[np.floating], /) -> None
 set(name: str, mat: npt.NDArray[np.floating], use3x3: bool, /) -> None
 set(name: str, tex: Py5Image, /) -> None
-set(name: str, vec: Iterator[bool], /) -> None
-set(name: str, vec: Iterator[float], /) -> None
-set(name: str, vec: Iterator[float], ncoords: int, /) -> None
-set(name: str, vec: Iterator[int], /) -> None
-set(name: str, vec: Iterator[int], ncoords: int, /) -> None
 set(name: str, vec: Py5Vector, /) -> None
+set(name: str, vec: Sequence[bool], /) -> None
+set(name: str, vec: Sequence[float], /) -> None
+set(name: str, vec: Sequence[float], ncoords: int, /) -> None
+set(name: str, vec: Sequence[int], /) -> None
+set(name: str, vec: Sequence[int], ncoords: int, /) -> None
 set(name: str, x: bool, /) -> None
 set(name: str, x: bool, y: bool, /) -> None
 set(name: str, x: bool, y: bool, z: bool, /) -> None
@@ -31,16 +31,16 @@ set(name: str, x: int, y: int, z: int, /) -> None
 set(name: str, x: int, y: int, z: int, w: int, /) -> None
 
 @@ variables
-boolvec: Iterator[bool] - modifies all the components of an array/vector uniform variable
+boolvec: Sequence[bool] - modifies all the components of an array/vector uniform variable
 mat: npt.NDArray[np.floating] - 2D numpy array of values with shape 2x3 for 2D matrices or 4x4 for 3D matrices
 name: str - the name of the uniform variable to modify
 ncoords: int - number of coordinates per element, max 4
 tex: Py5Image - sets the sampler uniform variable to read from this image texture
 use3x3: bool - enforces the numpy array is 3 x 3
-vec: Iterator[bool] - modifies all the components of an array/vector uniform variable
-vec: Iterator[float] - 1D numpy array of values to modify all the components of an array/vector uniform variable
-vec: Iterator[int] - 1D numpy array of values to modify all the components of an array/vector uniform variable
 vec: Py5Vector - vector of values to modify all the components of an array/vector uniform variable
+vec: Sequence[bool] - modifies all the components of an array/vector uniform variable
+vec: Sequence[float] - 1D numpy array of values to modify all the components of an array/vector uniform variable
+vec: Sequence[int] - 1D numpy array of values to modify all the components of an array/vector uniform variable
 w: bool - fourth component of the variable to modify. The variable has to be declared with an array/vector type in the shader (i.e.: int[4], vec4)
 w: float - fourth component of the variable to modify. The variable has to be declared with an array/vector type in the shader (i.e.: int[4], vec4)
 w: int - fourth component of the variable to modify. The variable has to be declared with an array/vector type in the shader (i.e.: int[4], vec4)

py5_docs/Reference/api_en/Py5Shape_bezier_vertices.txt

@@ -6,10 +6,10 @@ category = vertices
 subcategory = None
 
 @@ signatures
-bezier_vertices(coordinates: Iterator[Iterator[float]], /) -> None
+bezier_vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of bezier vertex coordinates with 6 or 9 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of bezier vertex coordinates with 6 or 9 columns for 2D or 3D points, respectively
 
 @@ description
 Create a collection of bezier vertices. The purpose of this method is to provide an alternative to repeatedly calling [](py5shape_bezier_vertex) in a loop. For a large number of bezier vertices, the performance of `bezier_vertices()` will be much faster.

py5_docs/Reference/api_en/Py5Shape_curve_vertices.txt

@@ -6,10 +6,10 @@ category = vertices
 subcategory = None
 
 @@ signatures
-curve_vertices(coordinates: Iterator[Iterator[float]], /) -> None
+curve_vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of curve vertex coordinates with 2 or 3 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of curve vertex coordinates with 2 or 3 columns for 2D or 3D points, respectively
 
 @@ description
 Create a collection of curve vertices. The purpose of this method is to provide an alternative to repeatedly calling [](py5shape_curve_vertex) in a loop. For a large number of curve vertices, the performance of `curve_vertices()` will be much faster.

py5_docs/Reference/api_en/Py5Shape_quadratic_vertices.txt

@@ -6,10 +6,10 @@ category = vertices
 subcategory = None
 
 @@ signatures
-quadratic_vertices(coordinates: Iterator[Iterator[float]], /) -> None
+quadratic_vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of quadratic vertex coordinates with 4 or 6 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of quadratic vertex coordinates with 4 or 6 columns for 2D or 3D points, respectively
 
 @@ description
 Create a collection of quadratic vertices. The purpose of this method is to provide an alternative to repeatedly calling [](py5shape_quadratic_vertex) in a loop. For a large number of quadratic vertices, the performance of `quadratic_vertices()` will be much faster.

py5_docs/Reference/api_en/Py5Shape_set_fills.txt

@@ -5,10 +5,10 @@ subcategory = fill
 type = method
 
 @@ signatures
-set_fills(fills: Iterator[int], /) -> None
+set_fills(fills: Sequence[int], /) -> None
 
 @@ variables
-fills: Iterator[int] - array of fill colors
+fills: Sequence[int] - array of fill colors
 
 @@ description
 Set the fill color for each of the individual vertices of a `Py5Shape`. The length of the passed `fills` array must equal the number of vertices in the shape. This method exists to provide an alternative to repeatedly calling [](py5shape_set_fill) in a loop.

py5_docs/Reference/api_en/Py5Shape_set_path.txt

@@ -7,11 +7,11 @@ category = vertices
 subcategory = None
 
 @@ signatures
-set_path(vcount: int, verts: Iterator[Iterator[float]], /) -> None
+set_path(vcount: int, verts: Sequence[Sequence[float]], /) -> None
 
 @@ variables
 vcount: int - number of vertices
-verts: Iterator[Iterator[float]] - 2D array of vertex coordinates
+verts: Sequence[Sequence[float]] - 2D array of vertex coordinates
 
 @@ description
 Set many vertex points at the same time, using a numpy array. This will be faster and more efficient than repeatedly calling [](py5shape_set_vertex) in a loop. Setting the vertex codes is not supported, so the vertices will be regular vertices and not bezier, quadratic or curve vertices.

py5_docs/Reference/api_en/Py5Shape_set_strokes.txt

@@ -5,10 +5,10 @@ subcategory = stroke
 type = method
 
 @@ signatures
-set_strokes(strokes: Iterator[int], /) -> None
+set_strokes(strokes: Sequence[int], /) -> None
 
 @@ variables
-strokes: Iterator[int] - array of stroke colors
+strokes: Sequence[int] - array of stroke colors
 
 @@ description
 Set the stroke color for each of the individual vertices of a `Py5Shape`. The length of the passed `strokes` array must equal the number of vertices in the shape. This method exists to provide an alternative to repeatedly calling [](py5shape_set_fill) in a loop.

py5_docs/Reference/api_en/Py5Shape_vertices.txt

@@ -6,10 +6,10 @@ category = vertices
 subcategory = None
 
 @@ signatures
-vertices(coordinates: Iterator[Iterator[float]], /) -> None
+vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of vertex coordinates and optional UV texture mapping values
+coordinates: Sequence[Sequence[float]] - 2D array of vertex coordinates and optional UV texture mapping values
 
 @@ description
 Create a collection of vertices. The purpose of this method is to provide an alternative to repeatedly calling [](py5shape_vertex) in a loop. For a large number of vertices, the performance of `vertices()` will be much faster.

py5_docs/Reference/api_en/Sketch_bezier_vertices.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = vertex
 
 @@ signatures
-bezier_vertices(coordinates: Iterator[Iterator[float]], /) -> None
+bezier_vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of bezier vertex coordinates with 6 or 9 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of bezier vertex coordinates with 6 or 9 columns for 2D or 3D points, respectively
 
 @@ description
 Create a collection of bezier vertices. The purpose of this method is to provide an alternative to repeatedly calling [](sketch_bezier_vertex) in a loop. For a large number of bezier vertices, the performance of `bezier_vertices()` will be much faster.

py5_docs/Reference/api_en/Sketch_create_font.txt

@@ -9,10 +9,10 @@ processing_name = createFont
 @@ signatures
 create_font(name: str, size: float, /) -> Py5Font
 create_font(name: str, size: float, smooth: bool, /) -> Py5Font
-create_font(name: str, size: float, smooth: bool, charset: Iterator[chr], /) -> Py5Font
+create_font(name: str, size: float, smooth: bool, charset: Sequence[chr], /) -> Py5Font
 
 @@ variables
-charset: Iterator[chr] - characters to be generated
+charset: Sequence[chr] - characters to be generated
 name: str - name of the font to load
 size: float - point size of the font
 smooth: bool - true for an antialiased font, false for aliased

py5_docs/Reference/api_en/Sketch_curve_vertices.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = vertex
 
 @@ signatures
-curve_vertices(coordinates: Iterator[Iterator[float]], /) -> None
+curve_vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of curve vertex coordinates with 2 or 3 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of curve vertex coordinates with 2 or 3 columns for 2D or 3D points, respectively
 
 @@ description
 Create a collection of curve vertices. The purpose of this method is to provide an alternative to repeatedly calling [](sketch_curve_vertex) in a loop. For a large number of curve vertices, the performance of `curve_vertices()` will be much faster.

py5_docs/Reference/api_en/Sketch_lines.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = 2d_primitives
 
 @@ signatures
-lines(coordinates: Iterator[Iterator[float]], /) -> None
+lines(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of line coordinates with 4 or 6 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of line coordinates with 4 or 6 columns for 2D or 3D points, respectively
 
 @@ description
 Draw a collection of lines to the screen. The purpose of this method is to provide an alternative to repeatedly calling [](sketch_line) in a loop. For a large number of lines, the performance of `lines()` will be much faster.

py5_docs/Reference/api_en/Sketch_points.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = 2d_primitives
 
 @@ signatures
-points(coordinates: Iterator[Iterator[float]], /) -> None
+points(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of point coordinates with 2 or 3 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of point coordinates with 2 or 3 columns for 2D or 3D points, respectively
 
 @@ description
 Draw a collection of points, each a coordinate in space at the dimension of one pixel. The purpose of this method is to provide an alternative to repeatedly calling [](sketch_point) in a loop. For a large number of points, the performance of `points()` will be much faster.

py5_docs/Reference/api_en/Sketch_quadratic_vertices.txt

@@ -6,10 +6,10 @@ category = shape
 subcategory = vertex
 
 @@ signatures
-quadratic_vertices(coordinates: Iterator[Iterator[float]], /) -> None
+quadratic_vertices(coordinates: Sequence[Sequence[float]], /) -> None
 
 @@ variables
-coordinates: Iterator[Iterator[float]] - 2D array of quadratic vertex coordinates with 4 or 6 columns for 2D or 3D points, respectively
+coordinates: Sequence[Sequence[float]] - 2D array of quadratic vertex coordinates with 4 or 6 columns for 2D or 3D points, respectively
 
 @@ description
 Create a collection of quadratic vertices. The purpose of this method is to provide an alternative to repeatedly calling [](sketch_quadratic_vertex) in a loop. For a large number of quadratic vertices, the performance of `quadratic_vertices()` will be much faster.