-
Notifications
You must be signed in to change notification settings - Fork 293
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add EnvironmentalData component #1616
Changes from all commits
2e6c93a
f4180de
de42c6e
c8789b8
762410c
abe1c18
e230ef3
3b024af
e05ebd2
a5d2864
4df3424
587b6ad
1048279
7f38d57
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
/* | ||
* Copyright (C) 2022 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 GZ_SIM_ENVIRONMENT_HH_ | ||
#define GZ_SIM_ENVIRONMENT_HH_ | ||
|
||
#include <memory> | ||
#include <string> | ||
|
||
#include <gz/common/DataFrame.hh> | ||
#include <gz/math/SphericalCoordinates.hh> | ||
#include <gz/math/TimeVaryingVolumetricGrid.hh> | ||
|
||
#include <gz/sim/components/Factory.hh> | ||
#include <gz/sim/components/Component.hh> | ||
#include <gz/sim/Export.hh> | ||
|
||
namespace gz | ||
{ | ||
namespace sim | ||
{ | ||
// Inline bracket to help doxygen filtering. | ||
inline namespace GZ_SIM_VERSION_NAMESPACE { | ||
namespace components | ||
{ | ||
/// \brief Environment data across time and space. This is useful to | ||
/// introduce physical quantities that may be of interest even if not | ||
/// modelled in simulation. | ||
struct GZ_SIM_VISIBLE EnvironmentalData | ||
{ | ||
using T = math::InMemoryTimeVaryingVolumetricGrid<double>; | ||
using FrameT = common::DataFrame<std::string, T>; | ||
using ReferenceT = math::SphericalCoordinates::CoordinateType; | ||
|
||
/// \brief Instantiate environmental data. | ||
/// | ||
/// An std::make_shared equivalent that ensures | ||
/// dynamically loaded call sites use a template | ||
/// instantiation that is guaranteed to outlive | ||
/// them. | ||
static std::shared_ptr<EnvironmentalData> | ||
MakeShared(FrameT _frame, ReferenceT _reference); | ||
|
||
/// \brief Environmental data frame. | ||
FrameT frame; | ||
|
||
/// \brief Spatial reference for data coordinates. | ||
ReferenceT reference; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I assume There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @arjo129 I'll start by saying that I chose to use
It means the data uses lat-lon coordinates. Code may as well be using global cartesian coordinates. As long as the conversion gets carried out before looking up the frame (see DVL code for an example), it'll be fine. Same for |
||
}; | ||
|
||
/// \brief A component type that contains a environment data. | ||
/// Ownership is shared to avoid data copies unless necessary. | ||
using Environment = | ||
Component<std::shared_ptr<EnvironmentalData>, class EnvironmentalDataTag>; | ||
|
||
GZ_SIM_REGISTER_COMPONENT( | ||
"gz_sim_components.Environment", Environment) | ||
} | ||
} | ||
} | ||
} | ||
|
||
#endif |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
/* | ||
* Copyright (C) 2022 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. | ||
* | ||
*/ | ||
|
||
#include "gz/sim/components/Environment.hh" | ||
|
||
#include <memory> | ||
#include <utility> | ||
|
||
using namespace gz::sim::components; | ||
|
||
std::shared_ptr<EnvironmentalData> | ||
EnvironmentalData::MakeShared(FrameT _frame, ReferenceT _reference) | ||
{ | ||
auto data = std::make_shared<EnvironmentalData>(); | ||
data->frame = std::move(_frame); | ||
data->reference = _reference; | ||
return data; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
gz_add_gui_plugin(EnvironmentLoader | ||
SOURCES EnvironmentLoader.cc | ||
QT_HEADERS EnvironmentLoader.hh | ||
PRIVATE_LINK_LIBS | ||
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER} | ||
gz-common${GZ_COMMON_VER}::io | ||
gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER} | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Knit: There's a bit of whitespace at EOL issue here. Should be caught when running
make codecheck
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 36c444d.