Allow height-field elevation data to be specified in XML.
PiperOrigin-RevId: 602374498 Change-Id: I2d3364d68876a35799b24aca1051e2f5aebdda75
This commit is contained in:
committed by
Copybara-Service
parent
e6847f843d
commit
e143b3dbc0
@@ -20,9 +20,11 @@
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <optional>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "lodepng.h"
|
||||
@@ -2233,6 +2235,7 @@ mjCHField::mjCHField(mjCModel* _model) {
|
||||
nrow = 0;
|
||||
ncol = 0;
|
||||
data = 0;
|
||||
userdata_.clear();
|
||||
}
|
||||
|
||||
|
||||
@@ -2335,6 +2338,14 @@ void mjCHField::LoadPNG(mjResource* resource) {
|
||||
|
||||
|
||||
|
||||
// user data setter
|
||||
void mjCHField::set_userdata(std::optional<std::vector<float>>&& userdata) {
|
||||
if (userdata.has_value()) {
|
||||
userdata_ = std::move(userdata.value());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// compiler
|
||||
void mjCHField::Compile(const mjVFS* vfs) {
|
||||
// check size parameters
|
||||
|
||||
Reference in New Issue
Block a user