Skip to content
This repository has been archived by the owner on Feb 3, 2025. It is now read-only.

Specify wide angle camera cube map texture format #2960

Merged
merged 14 commits into from
Apr 13, 2021
Merged

Specify wide angle camera cube map texture format #2960

merged 14 commits into from
Apr 13, 2021

Conversation

audrow
Copy link
Contributor

@audrow audrow commented Apr 7, 2021

This PR sets the texture format based on the custom element //camera/lens/gazebo:env_texture_format.

Fixes #2928.

scpeters and others added 10 commits February 17, 2021 14:21
The WideAngleCamera has a texture for a cube map that
uses the same pixel format as the camera image. If there
are intermediate shaders applied to the camera, the choice
of this image format may cause pixel values to be truncated.
To provide flexibility to the user, the pixel format for
the cube map texture can be specified with a custom SDFormat
element in `//camera/lens/gazebo:env_texture_format`
using the same values as `//camera/image/format`.

Add friend WideAngleCamera statement to Camera.hh to allow
access to private OgrePixelFormat method.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
This matches the values used in ignition.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Test update_rate parameter value of 3.03 instead of 0.03 to
reduce test time from over 30 seconds to about 1 second.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* Added color setting to LensFlare and LensFlareSensorPlugin.
Added methods to expose scale and color to derived plugins.
* Removed unused animated lens flare effect.
* Removed noise_rgba.png, which is no longer used.
* Changed a value in the lens flare shader back to its original 1.0.
This means there will be no compensation for the removal of the
legacy animation effect and the lens flares will look less intense.
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Audrow Nash <audrow@hey.com>
Signed-off-by: Audrow Nash <audrow@hey.com>
Signed-off-by: Audrow Nash <audrow@hey.com>
@audrow audrow requested a review from scpeters April 7, 2021 20:47
scpeters and others added 2 commits April 7, 2021 13:49
@audrow audrow self-assigned this Apr 7, 2021
@audrow audrow marked this pull request as ready for review April 7, 2021 21:47
Signed-off-by: Audrow Nash <audrow@hey.com>
@audrow audrow requested a review from scpeters April 8, 2021 16:38
Signed-off-by: Audrow Nash <audrow@hey.com>
@audrow audrow requested a review from scpeters April 9, 2021 18:46
@scpeters
Copy link
Member

CI looks ok to me

Copy link
Contributor

@iche033 iche033 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.

@scpeters scpeters merged commit 37095ff into gazebosim:gazebo11 Apr 13, 2021
WilliamLewww pushed a commit to WilliamLewww/gazebo that referenced this pull request Apr 13, 2021
The WideAngleCamera has a texture for a cube map that
uses the same pixel format as the camera image. If there
are intermediate shaders applied to the camera, the choice
of this image format may cause pixel values to be truncated.
To provide flexibility to the user, the pixel format for
the cube map texture can be specified with a custom SDFormat
element in `//camera/lens/ignition:env_texture_format`
using the same values as `//camera/image/format`.

Add friend WideAngleCamera statement to Camera.hh to allow
access to private OgrePixelFormat method.

Camera: recognize R_FLOAT16 and R_FLOAT32 to match
ignition.

* PhysicsEngine_TEST: speed up test

Test update_rate parameter value of 3.03 instead of 0.03 to
reduce test time from over 30 seconds to about 1 second.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

* Add test for wide angle camera with texture plugin
* Add check that grayscale image isn't black

Signed-off-by: Audrow Nash <audrow@hey.com>

Co-authored-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit to scpeters/gazebo that referenced this pull request Apr 14, 2021
The WideAngleCamera has a texture for a cube map that
uses the same pixel format as the camera image. If there
are intermediate shaders applied to the camera, the choice
of this image format may cause pixel values to be truncated.
To provide flexibility to the user, the pixel format for
the cube map texture can be specified with a custom SDFormat
element in `//camera/lens/ignition:env_texture_format`
using the same values as `//camera/image/format`.

Add friend WideAngleCamera statement to Camera.hh to allow
access to private OgrePixelFormat method.

Camera: recognize R_FLOAT16 and R_FLOAT32 to match
ignition.

* PhysicsEngine_TEST: speed up test

Test update_rate parameter value of 3.03 instead of 0.03 to
reduce test time from over 30 seconds to about 1 second.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

* Add test for wide angle camera with texture plugin
* Add check that grayscale image isn't black

Signed-off-by: Audrow Nash <audrow@hey.com>

Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WideAngleCamera cube map texture pixel format should be customizable
5 participants