Skip to content

Commit

Permalink
Add Heightmap class (gazebosim#388)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Guillaume Doisy <guillaume.doisy@wyca.fr>
  • Loading branch information
2 people authored and Guillaume Doisy committed Jan 6, 2021
1 parent 1d099b5 commit 2ae6fc7
Show file tree
Hide file tree
Showing 9 changed files with 1,419 additions and 13 deletions.
1 change: 1 addition & 0 deletions include/sdf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ set (headers
Frame.hh
Geometry.hh
Gui.hh
Heightmap.hh
Imu.hh
Joint.hh
JointAxis.hh
Expand Down
15 changes: 15 additions & 0 deletions include/sdf/Geometry.hh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ namespace sdf
class GeometryPrivate;
class Box;
class Cylinder;
class Heightmap;
class Mesh;
class Plane;
class Sphere;
Expand All @@ -56,6 +57,9 @@ namespace sdf

/// \brief A mesh geometry.
MESH = 5,

/// \brief A heightmap geometry.
HEIGHTMAP = 6,
};

/// \brief Geometry provides access to a shape, such as a Box. Use the
Expand Down Expand Up @@ -159,6 +163,17 @@ namespace sdf
/// \param[in] _mesh The mesh shape.
public: void SetMeshShape(const Mesh &_mesh);

/// \brief Get the heightmap geometry, or nullptr if the contained geometry
/// is not a heightmap.
/// \return Pointer to the heightmap geometry, or nullptr if the geometry is
/// not a heightmap.
/// \sa GeometryType Type() const
public: const Heightmap *HeightmapShape() const;

/// \brief Set the heightmap shape.
/// \param[in] _heightmap The heightmap shape.
public: void SetHeightmapShape(const Heightmap &_heightmap);

/// \brief Get a pointer to the SDF element that was used during
/// load.
/// \return SDF element pointer. The value will be nullptr if Load has
Expand Down
291 changes: 291 additions & 0 deletions include/sdf/Heightmap.hh
Original file line number Diff line number Diff line change
@@ -0,0 +1,291 @@
/*
* Copyright 2020 Open Source Robotics Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#ifndef SDF_HEIGHTMAP_HH_
#define SDF_HEIGHTMAP_HH_

#include <string>
#include <ignition/math/Vector3.hh>
#include <sdf/Element.hh>
#include <sdf/Error.hh>
#include <sdf/sdf_config.h>

namespace sdf
{
// Inline bracket to help doxygen filtering.
inline namespace SDF_VERSION_NAMESPACE {
//

// Forward declare private data class.
class HeightmapPrivate;
class HeightmapTexturePrivate;
class HeightmapBlendPrivate;

/// \brief Texture to be used on heightmaps.
class SDFORMAT_VISIBLE HeightmapTexture
{
/// \brief Constructor
public: HeightmapTexture();

/// \brief Copy constructor
/// \param[in] _texture HeightmapTexture to copy.
public: HeightmapTexture(const HeightmapTexture &_texture);

/// \brief Move constructor
/// \param[in] _texture HeightmapTexture to move.
public: HeightmapTexture(HeightmapTexture &&_texture) noexcept;

/// \brief Destructor
public: virtual ~HeightmapTexture();

/// \brief Move assignment operator.
/// \param[in] _texture Heightmap texture to move.
/// \return Reference to this.
public: HeightmapTexture &operator=(HeightmapTexture &&_texture);

/// \brief Copy Assignment operator.
/// \param[in] _texture The heightmap texture to set values from.
/// \return *this
public: HeightmapTexture &operator=(const HeightmapTexture &_texture);

/// \brief Load the heightmap texture geometry based on a element pointer.
/// This is *not* the usual entry point. Typical usage of the SDF DOM is
/// through the Root object.
/// \param[in] _sdf The SDF Element pointer
/// \return Errors, which is a vector of Error objects. Each Error includes
/// an error code and message. An empty vector indicates no error.
public: Errors Load(ElementPtr _sdf);

/// \brief Get the heightmap texture's size.
/// \return The size of the heightmap texture in meters.
public: double Size() const;

/// \brief Set the size of the texture in meters.
/// \param[in] _uri The size of the texture in meters.
public: void SetSize(double _uri);

/// \brief Get the heightmap texture's diffuse map.
/// \return The diffuse map of the heightmap texture.
public: std::string Diffuse() const;

/// \brief Set the filename of the diffuse map.
/// \param[in] _diffuse The diffuse map of the heightmap texture.
public: void SetDiffuse(const std::string &_diffuse);

/// \brief Get the heightmap texture's normal map.
/// \return The normal map of the heightmap texture.
public: std::string Normal() const;

/// \brief Set the filename of the normal map.
/// \param[in] _normal The normal map of the heightmap texture.
public: void SetNormal(const std::string &_normal);

/// \brief Get a pointer to the SDF element that was used during load.
/// \return SDF element pointer. The value will be nullptr if Load has
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Private data pointer.
private: HeightmapTexturePrivate *dataPtr;
};

/// \brief Blend information to be used between textures on heightmaps.
class SDFORMAT_VISIBLE HeightmapBlend
{
/// \brief Constructor
public: HeightmapBlend();

/// \brief Copy constructor
/// \param[in] _blend HeightmapBlend to copy.
public: HeightmapBlend(const HeightmapBlend &_blend);

/// \brief Move constructor
/// \param[in] _blend HeightmapBlend to move.
public: HeightmapBlend(HeightmapBlend &&_blend) noexcept;

/// \brief Destructor
public: virtual ~HeightmapBlend();

/// \brief Move assignment operator.
/// \param[in] _blend Heightmap blend to move.
/// \return Reference to this.
public: HeightmapBlend &operator=(HeightmapBlend &&_blend);

/// \brief Copy Assignment operator.
/// \param[in] _blend The heightmap blend to set values from.
/// \return *this
public: HeightmapBlend &operator=(const HeightmapBlend &_blend);

/// \brief Load the heightmap blend geometry based on a element pointer.
/// This is *not* the usual entry point. Typical usage of the SDF DOM is
/// through the Root object.
/// \param[in] _sdf The SDF Element pointer
/// \return Errors, which is a vector of Error objects. Each Error includes
/// an error code and message. An empty vector indicates no error.
public: Errors Load(ElementPtr _sdf);

/// \brief Get the heightmap blend's minimum height.
/// \return The minimum height of the blend layer.
public: double MinHeight() const;

/// \brief Set the minimum height of the blend in meters.
/// \param[in] _uri The minimum height of the blend in meters.
public: void SetMinHeight(double _minHeight);

/// \brief Get the heightmap blend's fade distance.
/// \return The fade distance of the heightmap blend in meters.
public: double FadeDistance() const;

/// \brief Set the distance over which the blend occurs.
/// \param[in] _uri The distance in meters.
public: void SetFadeDistance(double _fadeDistance);

/// \brief Get a pointer to the SDF element that was used during load.
/// \return SDF element pointer. The value will be nullptr if Load has
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Private data pointer.
private: HeightmapBlendPrivate *dataPtr;
};

/// \brief Heightmap represents a shape defined by a 2D field, and is usually
/// accessed through a Geometry.
class SDFORMAT_VISIBLE Heightmap
{
/// \brief Constructor
public: Heightmap();

/// \brief Copy constructor
/// \param[in] _heightmap Heightmap to copy.
public: Heightmap(const Heightmap &_heightmap);

/// \brief Move constructor
/// \param[in] _heightmap Heightmap to move.
public: Heightmap(Heightmap &&_heightmap) noexcept;

/// \brief Destructor
public: virtual ~Heightmap();

/// \brief Move assignment operator.
/// \param[in] _heightmap Heightmap to move.
/// \return Reference to this.
public: Heightmap &operator=(Heightmap &&_heightmap);

/// \brief Copy Assignment operator.
/// \param[in] _heightmap The heightmap to set values from.
/// \return *this
public: Heightmap &operator=(const Heightmap &_heightmap);

/// \brief Load the heightmap geometry based on a element pointer.
/// This is *not* the usual entry point. Typical usage of the SDF DOM is
/// through the Root object.
/// \param[in] _sdf The SDF Element pointer
/// \return Errors, which is a vector of Error objects. Each Error includes
/// an error code and message. An empty vector indicates no error.
public: Errors Load(ElementPtr _sdf);

/// \brief Get the heightmap's URI.
/// \return The URI of the heightmap data.
public: std::string Uri() const;

/// \brief Set the URI to a grayscale image.
/// \param[in] _uri The URI of the heightmap.
public: void SetUri(const std::string &_uri);

/// \brief The path to the file where this element was loaded from.
/// \return Full path to the file on disk.
public: const std::string &FilePath() const;

/// \brief Set the path to the file where this element was loaded from.
/// \paramp[in] _filePath Full path to the file on disk.
public: void SetFilePath(const std::string &_filePath);

/// \brief Get the heightmap's scaling factor.
/// \return The heightmap's size.
public: ignition::math::Vector3d Size() const;

/// \brief Set the heightmap's scaling factor. Defaults to 1x1x1.
/// \return The heightmap's size factor.
public: void SetSize(const ignition::math::Vector3d &_size);

/// \brief Get the heightmap's position offset.
/// \return The heightmap's position offset.
public: ignition::math::Vector3d Position() const;

/// \brief Set the heightmap's position offset.
/// \return The heightmap's position offset.
public: void SetPosition(const ignition::math::Vector3d &_position);

/// \brief Get whether the heightmap uses terrain paging.
/// \return True if the heightmap uses terrain paging.
public: bool UseTerrainPaging() const;

/// \brief Set whether the heightmap uses terrain paging. Defaults to false.
/// \param[in] _use True to use.
public: void SetUseTerrainPaging(bool _use);

/// \brief Get the heightmap's sampling per datum.
/// \return The heightmap's sampling.
public: unsigned int Sampling() const;

/// \brief Set the heightmap's sampling. Defaults to 2.
/// \param[in] _sampling The heightmap's sampling per datum.
public: void SetSampling(unsigned int _sampling);

/// \brief Get the number of heightmap textures.
/// \return Number of heightmap textures contained in this Heightmap object.
public: uint64_t TextureCount() const;

/// \brief Get a heightmap texture based on an index.
/// \param[in] _index Index of the heightmap texture. The index should be in
/// the range [0..TextureCount()).
/// \return Pointer to the heightmap texture. Nullptr if the index does not
/// exist.
/// \sa uint64_t TextureCount() const
public: const HeightmapTexture *TextureByIndex(uint64_t _index) const;

/// \brief Add a heightmap texture.
/// \param[in] _texture Texture to add.
public: void AddTexture(const HeightmapTexture &_texture);

/// \brief Get the number of heightmap blends.
/// \return Number of heightmap blends contained in this Heightmap object.
public: uint64_t BlendCount() const;

/// \brief Get a heightmap blend based on an index.
/// \param[in] _index Index of the heightmap blend. The index should be in
/// the range [0..BlendCount()).
/// \return Pointer to the heightmap blend. Nullptr if the index does not
/// exist.
/// \sa uint64_t BlendCount() const
public: const HeightmapBlend *BlendByIndex(uint64_t _index) const;

/// \brief Add a heightmap blend.
/// \param[in] _blend Blend to add.
public: void AddBlend(const HeightmapBlend &_blend);

/// \brief Get a pointer to the SDF element that was used during load.
/// \return SDF element pointer. The value will be nullptr if Load has
/// not been called.
public: sdf::ElementPtr Element() const;

/// \brief Private data pointer.
private: HeightmapPrivate *dataPtr;
};
}
}
#endif
12 changes: 7 additions & 5 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ set (sources
Filesystem.cc
Geometry.cc
Gui.cc
Heightmap.cc
ign.cc
Imu.cc
Joint.cc
Expand Down Expand Up @@ -110,6 +111,7 @@ if (BUILD_SDF_TEST)
Filesystem_TEST.cc
Geometry_TEST.cc
Gui_TEST.cc
Heightmap_TEST.cc
Imu_TEST.cc
Joint_TEST.cc
JointAxis_TEST.cc
Expand Down Expand Up @@ -139,26 +141,26 @@ if (BUILD_SDF_TEST)
Visual_TEST.cc
World_TEST.cc
)

# Build this test file only if Ignition Tools is installed.
if (IGNITION-TOOLS_BINARY_DIRS)
set (gtest_sources ${gtest_sources}
ign_TEST.cc
)
endif()

sdf_build_tests(${gtest_sources})

if (NOT WIN32)
set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Utils.cc)
sdf_build_tests(Utils_TEST.cc)
endif()

if (NOT WIN32)
set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS FrameSemantics.cc)
sdf_build_tests(FrameSemantics_TEST.cc)
endif()

if (NOT WIN32)
set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Converter.cc)
sdf_build_tests(Converter_TEST.cc)
Expand Down
Loading

0 comments on commit 2ae6fc7

Please sign in to comment.