Skip to content

Commit 1c1697e

Browse files
authored
Merge pull request #392 from hx2A/renameosx
rename osx -> macOS
2 parents 1b48129 + f09dfba commit 1c1697e

26 files changed

+32
-32
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ If you have Java 17 installed on your computer, you can install py5 using pip:
4646
pip install py5
4747
```
4848

49-
[Detailed installation instructions](https://py5coding.org/content/install.html) are available on the documentation website. There are some [Special Notes for Mac Users](https://py5coding.org/content/osx_users.html) that you should read if you use OSX.
49+
[Detailed installation instructions](https://py5coding.org/content/install.html) are available on the documentation website. There are some [Special Notes for Mac Users](https://py5coding.org/content/osx_users.html) that you should read if you use macOS.
5050

5151
## Getting Started
5252

py5_docs/Reference/api_en/Py5Functions_render.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Decorator function to render a single frame using the decorated `draw` function.
1818

1919
The decorated draw function's first parameter must be either a `py5.Sketch` object or a `py5.Py5Graphics` object, depending on the parameter `use_py5graphics`. That object must be used for all of the function's py5 commands. The function can have additional positional and keyword arguments. To use them, pass the desired values when you call the decorated function as you would to any other Python function.
2020

21-
On OSX, only the default renderer is currently supported. Other platforms support the default renderer and the OpenGL renderers (P2D and P3D).
21+
On macOS, only the default renderer is currently supported. Other platforms support the default renderer and the OpenGL renderers (P2D and P3D).
2222

2323
The rendered frame can have transparent pixels if and only if the `use_py5graphics` parameter is `True` because only a `py5.Py5Graphics` object can create an image with transparency. There is no need to call [](py5graphics_begin_draw) or [](py5graphics_end_draw) in the decorated function as `@render()` does that for you.
2424

py5_docs/Reference/api_en/Py5Functions_render_frame.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Helper function to render a single frame using the passed `draw` function argume
2121

2222
The passed function's first parameter must be either a `py5.Sketch` object or a `py5.Py5Graphics` object, depending on the parameter `use_py5graphics`. That object must be used for all of the function's py5 commands. The function can have additional positional and keyword arguments. To use them, pass the desired values as `render_frame`'s `draw_args` and `draw_kwargs` arguments.
2323

24-
On OSX, only the default renderer is currently supported. Other platforms support the default renderer and the OpenGL renderers (P2D and P3D).
24+
On macOS, only the default renderer is currently supported. Other platforms support the default renderer and the OpenGL renderers (P2D and P3D).
2525

2626
The rendered frame can have transparent pixels if and only if the `use_py5graphics` parameter is `True` because only a `py5.Py5Graphics` object can create an image with transparency. There is no need to call [](py5graphics_begin_draw) or [](py5graphics_end_draw) in the passed function as `render_frame()` does that for you.
2727

py5_docs/Reference/api_en/Py5Functions_render_frame_sequence.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Helper function to render a sequence of frames using the passed `draw` function
2525

2626
The passed `draw` function's first parameter must be either a `py5.Sketch` object or a `py5.Py5Graphics` object, depending on the parameter `use_py5graphics`. That object must be used for all py5 commands. The function can have additional positional and keyword arguments. To use them, pass the desired values to `render_frame_sequence`'s `draw_args` and `draw_kwargs` arguments.
2727

28-
On OSX, only the default renderer is currently supported. Other platforms support the default renderer and the OpenGL renderers (P2D and P3D).
28+
On macOS, only the default renderer is currently supported. Other platforms support the default renderer and the OpenGL renderers (P2D and P3D).
2929

3030
The rendered frames can have transparent pixels if and only if the `use_py5graphics` parameter is `True` because only a `py5.Py5Graphics` object can create an image with transparency. If you need to clear the canvas between one frame and the next, use [](py5graphics_clear). There is no need to call [](py5graphics_begin_draw) or [](py5graphics_end_draw) in the passed `draw` function as `render_frame_sequence()` does that for you.
3131

py5_docs/Reference/api_en/Py5Functions_render_sequence.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The decorated function's first parameter must be either a `py5.Sketch` object or
2424

2525
Optionally, the caller can pass the decorator a `setup` function, along with corresponding `setup_args` and `setup_kwargs` arguments. This will be called once, just like it would for any other py5 Sketch. The type of the first parameter must also depend on the `use_py5graphics` parameter.
2626

27-
On OSX, only the default renderer is currently supported. Other platforms support the default renderer and the OpenGL renderers (P2D and P3D).
27+
On macOS, only the default renderer is currently supported. Other platforms support the default renderer and the OpenGL renderers (P2D and P3D).
2828

2929
The rendered frames can have transparent pixels if and only if the `use_py5graphics` parameter is `True` because only a `py5.Py5Graphics` object can create an image with transparency. If you need to clear the canvas between one frame and the next, use [](py5graphics_clear). There is no need to call [](py5graphics_begin_draw) or [](py5graphics_end_draw) in the decorated function as `@render_sequence()` does that for you.
3030

py5_docs/Reference/api_en/Py5Graphics_pixel_height.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ pclass = PGraphics
77
processing_name = pixelHeight
88

99
@@ description
10-
Height of the Py5Graphics drawing surface in pixels. When `pixel_density(2)` was used in `settings()` to make use of a high resolution display (called a Retina display on OSX or high-dpi on Windows and Linux), the width and height of the Py5Graphics drawing surface does not change, but the number of pixels is doubled. As a result, all operations that use pixels (like [](py5graphics_load_pixels), [](py5graphics_get_pixels), etc.) happen in this doubled space. As a convenience, the variables [](py5graphics_pixel_width) and `pixel_height` hold the actual width and height of the drawing surface in pixels. This is useful for any Py5Graphics objects that use the [](py5graphics_pixels) or [](py5graphics_np_pixels) arrays, for instance, because the number of elements in each array will be `pixel_width*pixel_height`, not `width*height`.
10+
Height of the Py5Graphics drawing surface in pixels. When `pixel_density(2)` was used in `settings()` to make use of a high resolution display (called a Retina display on macOS or high-dpi on Windows and Linux), the width and height of the Py5Graphics drawing surface does not change, but the number of pixels is doubled. As a result, all operations that use pixels (like [](py5graphics_load_pixels), [](py5graphics_get_pixels), etc.) happen in this doubled space. As a convenience, the variables [](py5graphics_pixel_width) and `pixel_height` hold the actual width and height of the drawing surface in pixels. This is useful for any Py5Graphics objects that use the [](py5graphics_pixels) or [](py5graphics_np_pixels) arrays, for instance, because the number of elements in each array will be `pixel_width*pixel_height`, not `width*height`.
1111

1212
This field is the same as [](sketch_pixel_height) but linked to a `Py5Graphics` object. To see example code for how it can be used, see [](sketch_pixel_height).

py5_docs/Reference/api_en/Py5Graphics_pixel_width.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ pclass = PGraphics
77
processing_name = pixelWidth
88

99
@@ description
10-
Width of the Py5Graphics drawing surface in pixels. When `pixel_density(2)` was used in `settings()` to make use of a high resolution display (called a Retina display on OSX or high-dpi on Windows and Linux), the width and height of the Py5Graphics drawing surface does not change, but the number of pixels is doubled. As a result, all operations that use pixels (like [](py5graphics_load_pixels), [](py5graphics_get_pixels), etc.) happen in this doubled space. As a convenience, the variables `pixel_width` and [](py5graphics_pixel_height) hold the actual width and height of the drawing surface in pixels. This is useful for any Py5Graphics objects that use the [](py5graphics_pixels) or [](py5graphics_np_pixels) arrays, for instance, because the number of elements in each array will be `pixel_width*pixel_height`, not `width*height`.
10+
Width of the Py5Graphics drawing surface in pixels. When `pixel_density(2)` was used in `settings()` to make use of a high resolution display (called a Retina display on macOS or high-dpi on Windows and Linux), the width and height of the Py5Graphics drawing surface does not change, but the number of pixels is doubled. As a result, all operations that use pixels (like [](py5graphics_load_pixels), [](py5graphics_get_pixels), etc.) happen in this doubled space. As a convenience, the variables `pixel_width` and [](py5graphics_pixel_height) hold the actual width and height of the drawing surface in pixels. This is useful for any Py5Graphics objects that use the [](py5graphics_pixels) or [](py5graphics_np_pixels) arrays, for instance, because the number of elements in each array will be `pixel_width*pixel_height`, not `width*height`.
1111

1212
This field is the same as [](sketch_pixel_width) but linked to a `Py5Graphics` object. To see example code for how it can be used, see [](sketch_pixel_width).

py5_docs/Reference/api_en/Py5Magics_py5bot.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This cell magic uses the same rendering mechanism as the py5bot kernel. For user
1818

1919
This magic is similar to [](py5magics_py5draw) in that both can be used to create a static Sketch. One key difference is that `%%py5bot` requires the user to begin the code with a call to [](sketch_size), while [](py5magics_py5draw) calls [](sketch_size) for you based on the magic's arguments.
2020

21-
This magic supports the default renderer and the `P2D` and `P3D` renderers. Note that both of the OpenGL renderers will briefly open a window on your screen. This magic is only available when using the py5 kernel and coding in imported mode. The `P2D` and `P3D` renderers are not available when the py5 kernel is hosted on an OSX computer.
21+
This magic supports the default renderer and the `P2D` and `P3D` renderers. Note that both of the OpenGL renderers will briefly open a window on your screen. This magic is only available when using the py5 kernel and coding in imported mode. The `P2D` and `P3D` renderers are not available when the py5 kernel is hosted on an macOS computer.
2222

2323
Code used in this cell can reference functions and variables defined in other cells because a copy of the user namespace is provided during execution. Variables and functions created in this cell will be local to only this cell because to do otherwise would be unsafe. Mutable objects in the user namespace, however, can be altered and those changes will persist elsewhere in the notebook. Be aware that using py5 objects in a different notebook cell or reusing them in another Sketch can result in nasty errors and bizzare consequences.
2424

py5_docs/Reference/api_en/Py5Magics_py5draw.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Create a PNG image with py5 and embed the result in the notebook.
2828

2929
For users who are familiar with Processing and py5 programming, you can pretend the code in this cell will be executed in a Sketch with no `draw()` function and your code in the `setup()` function. By default it will use the default Processing renderer.
3030

31-
On OSX, only the default renderer is currently supported. Other platforms support the default renderer and the OpenGL renderers (P2D and P3D).
31+
On macOS, only the default renderer is currently supported. Other platforms support the default renderer and the OpenGL renderers (P2D and P3D).
3232

3333
Internally this magic command creates a static Sketch using the user provided code. The static Sketch drawing surface does not allow transparency. If you want to quickly create an image that has transparency, consider using [](py5functions_render) or [](py5functions_render_frame) with the `use_py5graphics` parameter.
3434

py5_docs/Reference/api_en/Py5Magics_py5drawdxf.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ For users who are familiar with Processing and py5 programming, you can pretend
2424

2525
As this is creating a DXF file, your code will be limited to the capabilities of that renderer.
2626

27-
This magic is not available on OSX.
27+
This magic is not available on macOS.
2828

2929
Code used in this cell can reference functions and variables defined in other cells because a copy of the user namespace is provided during execution. By default, variables and functions created in this cell will be local to only this cell because to do otherwise would be unsafe. Mutable objects in the user namespace, however, can be altered and those changes will persist elsewhere in the notebook.
3030

py5_docs/Reference/api_en/Py5Tools_animated_gif.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You have two choices for how to specify which frames should be included in the a
2626

2727
Bottom line, you must use either the `count` parameter or the `frame_numbers` parameter but not both. The `period` parameter can only be used in conjunction with the `count` parameter. The duration parameter must always be used.
2828

29-
By default this function will return right away and construct the animated gif in the background while the Sketch is running. The completed gif will be saved to the location specified by the `filename` parameter when it is ready. Set the `block` parameter to `True` to instruct the function to not return until the gif construction is complete. This blocking feature is not available on OSX when the Sketch is executed through an IPython kernel. If the Sketch terminates prematurely, no gif will be created.
29+
By default this function will return right away and construct the animated gif in the background while the Sketch is running. The completed gif will be saved to the location specified by the `filename` parameter when it is ready. Set the `block` parameter to `True` to instruct the function to not return until the gif construction is complete. This blocking feature is not available on macOS when the Sketch is executed through an IPython kernel. If the Sketch terminates prematurely, no gif will be created.
3030

3131
By default the Sketch will be the currently running Sketch, as returned by [](py5functions_get_current_sketch). Use the `sketch` parameter to specify a different running Sketch, such as a Sketch created using Class mode.
3232

py5_docs/Reference/api_en/Py5Tools_offline_frame_processing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Use the `limit` parameter to stop frame processing after a set number of frames.
2828

2929
The `queue_limit` parameter specifies a maximum queue size. If frames are added to the queue faster than they can be processed, the queue size will grow unbounded. Setting a queue limit will cause the oldest frames on the queue to be dropped, one batch at a time. You can use the `period` parameter to pause between frames that are collected for processing, throttling the workload.
3030

31-
By default this function will return right away and will process frames in the background while the Sketch is running. Set the `block` parameter to `True` to instruct the method to not return until the processing is complete or the Sketch terminates. This blocking feature is not available on OSX when the Sketch is executed through an IPython kernel.
31+
By default this function will return right away and will process frames in the background while the Sketch is running. Set the `block` parameter to `True` to instruct the method to not return until the processing is complete or the Sketch terminates. This blocking feature is not available on macOS when the Sketch is executed through an IPython kernel.
3232

3333
Use the `sketch` parameter to specify a different running Sketch, such as a Sketch created using Class mode. If your Sketch has a `post_draw()` method, use the `hook_post_draw` parameter to make this function run after `post_draw()` instead of `draw()`. This is important when using Processing libraries that support `post_draw()` such as Camera3D or ColorBlindness.
3434

py5_docs/Reference/api_en/Py5Tools_save_frames.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ start: int = None - frame starting number instead of Sketch frame_count
2121
@@ description
2222
Save a running Sketch's frames to a directory.
2323

24-
By default this function will return right away and save frames in the background while the Sketch is running. The frames will be saved in the directory specified by the `dirname` parameter. Set the `block` parameter to `True` to instruct the method to not return until the number of frames saved reaches the number specified by the `limit` parameter. This blocking feature is not available on OSX when the Sketch is executed through an IPython kernel.
24+
By default this function will return right away and save frames in the background while the Sketch is running. The frames will be saved in the directory specified by the `dirname` parameter. Set the `block` parameter to `True` to instruct the method to not return until the number of frames saved reaches the number specified by the `limit` parameter. This blocking feature is not available on macOS when the Sketch is executed through an IPython kernel.
2525

2626
By default the Sketch will be the currently running Sketch, as returned by [](py5functions_get_current_sketch). Use the `sketch` parameter to specify a different running Sketch, such as a Sketch created using Class mode.
2727

py5_docs/Reference/api_en/Sketch_display_density.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ display_density(display: int, /) -> int
1414
display: int - the display number to check (1-indexed to match the Preferences dialog box)
1515

1616
@@ description
17-
This function returns the number "2" if the screen is a high-density screen (called a Retina display on OSX or high-dpi on Windows and Linux) and a "1" if not. This information is useful for a program to adapt to run at double the pixel density on a screen that supports it.
17+
This function returns the number "2" if the screen is a high-density screen (called a Retina display on macOS or high-dpi on Windows and Linux) and a "1" if not. This information is useful for a program to adapt to run at double the pixel density on a screen that supports it.
1818

1919
@@ example
2020
def setup():

py5_docs/Reference/api_en/Sketch_pixel_height.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pclass = PApplet
77
processing_name = pixelHeight
88

99
@@ description
10-
Height of the display window in pixels. When `pixel_density(2)` is used to make use of a high resolution display (called a Retina display on OSX or high-dpi on Windows and Linux), the width and height of the Sketch do not change, but the number of pixels is doubled. As a result, all operations that use pixels (like [](sketch_load_pixels), [](sketch_get_pixels), etc.) happen in this doubled space. As a convenience, the variables [](sketch_pixel_width) and `pixel_height` hold the actual width and height of the Sketch in pixels. This is useful for any Sketch that use the [](sketch_pixels) or [](sketch_np_pixels) arrays, for instance, because the number of elements in each array will be `pixel_width*pixel_height`, not `width*height`.
10+
Height of the display window in pixels. When `pixel_density(2)` is used to make use of a high resolution display (called a Retina display on macOS or high-dpi on Windows and Linux), the width and height of the Sketch do not change, but the number of pixels is doubled. As a result, all operations that use pixels (like [](sketch_load_pixels), [](sketch_get_pixels), etc.) happen in this doubled space. As a convenience, the variables [](sketch_pixel_width) and `pixel_height` hold the actual width and height of the Sketch in pixels. This is useful for any Sketch that use the [](sketch_pixels) or [](sketch_np_pixels) arrays, for instance, because the number of elements in each array will be `pixel_width*pixel_height`, not `width*height`.
1111

1212
@@ example
1313
def setup():

0 commit comments

Comments
 (0)