Merge pull request #56489 from Calinou/doc-cameraserver-3.x

Improve the CameraServer and CameraFeed class documentations (3.x)
This commit is contained in:
Rémi Verschelde 2022-01-04 23:01:59 +01:00 committed by GitHub
commit c7f9f4adc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions

View file

@ -4,7 +4,7 @@
A camera feed gives you access to a single physical camera attached to your device.
</brief_description>
<description>
A camera feed gives you access to a single physical camera attached to your device. When enabled, Godot will start capturing frames from the camera which can then be used.
A camera feed gives you access to a single physical camera attached to your device. When enabled, Godot will start capturing frames from the camera which can then be used. See also [CameraServer].
[b]Note:[/b] Many cameras will return YCbCr images which are split into two textures and need to be combined in a shader. Godot does this automatically for you if you set the environment to show the camera image in the background.
</description>
<tutorials>

View file

@ -6,6 +6,7 @@
<description>
The [CameraServer] keeps track of different cameras accessible in Godot. These are external cameras such as webcams or the cameras on your phone.
It is notably used to provide AR modules with a video feed from the camera.
[b]Note:[/b] This class is currently only implemented on macOS and iOS. On other platforms, no [CameraFeed]s will be available.
</description>
<tutorials>
</tutorials>
@ -14,7 +15,7 @@
<return type="void" />
<argument index="0" name="feed" type="CameraFeed" />
<description>
Adds a camera feed to the camera server.
Adds the camera [code]feed[/code] to the camera server.
</description>
</method>
<method name="feeds">
@ -27,7 +28,7 @@
<return type="CameraFeed" />
<argument index="0" name="index" type="int" />
<description>
Returns the [CameraFeed] with this id.
Returns the [CameraFeed] corresponding to the camera with the given [code]index[/code].
</description>
</method>
<method name="get_feed_count">
@ -40,7 +41,7 @@
<return type="void" />
<argument index="0" name="feed" type="CameraFeed" />
<description>
Removes a [CameraFeed].
Removes the specified camera [code]feed[/code].
</description>
</method>
</methods>
@ -48,13 +49,13 @@
<signal name="camera_feed_added">
<argument index="0" name="id" type="int" />
<description>
Emitted when a [CameraFeed] is added (e.g. webcam is plugged in).
Emitted when a [CameraFeed] is added (e.g. a webcam is plugged in).
</description>
</signal>
<signal name="camera_feed_removed">
<argument index="0" name="id" type="int" />
<description>
Emitted when a [CameraFeed] is removed (e.g. webcam is unplugged).
Emitted when a [CameraFeed] is removed (e.g. a webcam is unplugged).
</description>
</signal>
</signals>
@ -63,7 +64,7 @@
The RGBA camera image.
</constant>
<constant name="FEED_YCBCR_IMAGE" value="0" enum="FeedImage">
The YCbCr camera image.
The [url=https://en.wikipedia.org/wiki/YCbCr]YCbCr[/url] camera image.
</constant>
<constant name="FEED_Y_IMAGE" value="0" enum="FeedImage">
The Y component camera image.