[Bf-blender-cvs] [12649fb] openvdb: Use openvdb::Name for passing strings around.
Kévin Dietrich
noreply at git.blender.org
Mon Aug 3 22:03:09 CEST 2015
Commit: 12649fbc216f105648460105f0afb0695c99d278
Author: Kévin Dietrich
Date: Mon Aug 3 21:55:53 2015 +0200
Branches: openvdb
https://developer.blender.org/rB12649fbc216f105648460105f0afb0695c99d278
Use openvdb::Name for passing strings around.
Although openvdb::Name is just a typedef for std::string, this change is
for two reasons:
- it makes it a bit more consistent API wise
- it sort of documents we are passing a name and not just a string
(which could be anything: a password, a brand, a poem...)
===================================================================
M intern/openvdb/intern/openvdb_dense_convert.cc
M intern/openvdb/intern/openvdb_dense_convert.h
M intern/openvdb/intern/openvdb_reader.cc
M intern/openvdb/intern/openvdb_reader.h
M intern/openvdb/intern/openvdb_writer.cc
M intern/openvdb/intern/openvdb_writer.h
M intern/openvdb/openvdb_capi.cc
===================================================================
diff --git a/intern/openvdb/intern/openvdb_dense_convert.cc b/intern/openvdb/intern/openvdb_dense_convert.cc
index eae3dfd..92160ec 100644
--- a/intern/openvdb/intern/openvdb_dense_convert.cc
+++ b/intern/openvdb/intern/openvdb_dense_convert.cc
@@ -73,7 +73,7 @@ public:
};
openvdb::GridBase *OpenVDB_export_vector_grid(OpenVDBWriter *writer,
- const std::string &name,
+ const openvdb::Name &name,
const float *data_x, const float *data_y, const float *data_z,
const int res[3],
float fluid_mat[4][4],
@@ -130,7 +130,7 @@ openvdb::GridBase *OpenVDB_export_vector_grid(OpenVDBWriter *writer,
}
void OpenVDB_import_grid_vector(OpenVDBReader *reader,
- const std::string &name,
+ const openvdb::Name &name,
float **data_x, float **data_y, float **data_z,
const int res[3])
{
diff --git a/intern/openvdb/intern/openvdb_dense_convert.h b/intern/openvdb/intern/openvdb_dense_convert.h
index fddd918..3bc3c3b 100644
--- a/intern/openvdb/intern/openvdb_dense_convert.h
+++ b/intern/openvdb/intern/openvdb_dense_convert.h
@@ -43,7 +43,7 @@ openvdb::Mat4R convertMatrix(const float mat[4][4]);
template <typename GridType, typename T>
GridType *OpenVDB_export_grid(OpenVDBWriter *writer,
- const std::string &name,
+ const openvdb::Name &name,
const T *data,
const int res[3],
float fluid_mat[4][4],
@@ -77,7 +77,7 @@ GridType *OpenVDB_export_grid(OpenVDBWriter *writer,
template <typename GridType, typename T>
void OpenVDB_import_grid(OpenVDBReader *reader,
- const std::string &name,
+ const openvdb::Name &name,
T **data,
const int res[3])
{
@@ -100,7 +100,7 @@ void OpenVDB_import_grid(OpenVDBReader *reader,
}
openvdb::GridBase *OpenVDB_export_vector_grid(OpenVDBWriter *writer,
- const std::string &name,
+ const openvdb::Name &name,
const float *data_x, const float *data_y, const float *data_z,
const int res[3],
float fluid_mat[4][4],
@@ -110,7 +110,7 @@ openvdb::GridBase *OpenVDB_export_vector_grid(OpenVDBWriter *writer,
void OpenVDB_import_grid_vector(OpenVDBReader *reader,
- const std::string &name,
+ const openvdb::Name &name,
float **data_x, float **data_y, float **data_z,
const int res[3]);
diff --git a/intern/openvdb/intern/openvdb_reader.cc b/intern/openvdb/intern/openvdb_reader.cc
index a4317a3..17a2513 100644
--- a/intern/openvdb/intern/openvdb_reader.cc
+++ b/intern/openvdb/intern/openvdb_reader.cc
@@ -40,7 +40,7 @@ OpenVDBReader::~OpenVDBReader()
cleanup_file();
}
-void OpenVDBReader::open(const std::string &filename)
+void OpenVDBReader::open(const openvdb::Name &filename)
{
cleanup_file();
@@ -51,17 +51,17 @@ void OpenVDBReader::open(const std::string &filename)
m_meta_map = m_file->getMetadata();
}
-void OpenVDBReader::floatMeta(const std::string &name, float &value)
+void OpenVDBReader::floatMeta(const openvdb::Name &name, float &value)
{
value = m_meta_map->metaValue<float>(name);
}
-void OpenVDBReader::intMeta(const std::string &name, int &value)
+void OpenVDBReader::intMeta(const openvdb::Name &name, int &value)
{
value = m_meta_map->metaValue<int>(name);
}
-void OpenVDBReader::vec3sMeta(const std::string &name, float value[3])
+void OpenVDBReader::vec3sMeta(const openvdb::Name &name, float value[3])
{
openvdb::Vec3s meta_val = m_meta_map->metaValue<openvdb::Vec3s>(name);
@@ -70,7 +70,7 @@ void OpenVDBReader::vec3sMeta(const std::string &name, float value[3])
value[2] = meta_val.z();
}
-void OpenVDBReader::vec3IMeta(const std::string &name, int value[3])
+void OpenVDBReader::vec3IMeta(const openvdb::Name &name, int value[3])
{
openvdb::Vec3i meta_val = m_meta_map->metaValue<openvdb::Vec3i>(name);
@@ -79,7 +79,7 @@ void OpenVDBReader::vec3IMeta(const std::string &name, int value[3])
value[2] = meta_val.z();
}
-void OpenVDBReader::mat4sMeta(const std::string &name, float value[4][4])
+void OpenVDBReader::mat4sMeta(const openvdb::Name &name, float value[4][4])
{
openvdb::Mat4s meta_val = m_meta_map->metaValue<openvdb::Mat4s>(name);
@@ -90,7 +90,7 @@ void OpenVDBReader::mat4sMeta(const std::string &name, float value[4][4])
}
}
-openvdb::GridBase::Ptr OpenVDBReader::getGrid(const std::string &name)
+openvdb::GridBase::Ptr OpenVDBReader::getGrid(const openvdb::Name &name)
{
return m_file->readGrid(name);
}
diff --git a/intern/openvdb/intern/openvdb_reader.h b/intern/openvdb/intern/openvdb_reader.h
index 2fcf0e8..fd87316 100644
--- a/intern/openvdb/intern/openvdb_reader.h
+++ b/intern/openvdb/intern/openvdb_reader.h
@@ -38,15 +38,15 @@ public:
OpenVDBReader();
~OpenVDBReader();
- void open(const std::string &filename);
+ void open(const openvdb::Name &filename);
- void floatMeta(const std::string &name, float &value);
- void intMeta(const std::string &name, int &value);
- void vec3sMeta(const std::string &name, float value[3]);
- void vec3IMeta(const std::string &name, int value[3]);
- void mat4sMeta(const std::string &name, float value[4][4]);
+ void floatMeta(const openvdb::Name &name, float &value);
+ void intMeta(const openvdb::Name &name, int &value);
+ void vec3sMeta(const openvdb::Name &name, float value[3]);
+ void vec3IMeta(const openvdb::Name &name, int value[3]);
+ void mat4sMeta(const openvdb::Name &name, float value[4][4]);
- openvdb::GridBase::Ptr getGrid(const std::string &name);
+ openvdb::GridBase::Ptr getGrid(const openvdb::Name &name);
size_t numGrids() const;
};
diff --git a/intern/openvdb/intern/openvdb_writer.cc b/intern/openvdb/intern/openvdb_writer.cc
index b24e393..a348be3 100644
--- a/intern/openvdb/intern/openvdb_writer.cc
+++ b/intern/openvdb/intern/openvdb_writer.cc
@@ -47,27 +47,27 @@ void OpenVDBWriter::insert(const openvdb::GridBase &grid)
m_grids->push_back(grid.copyGrid());
}
-void OpenVDBWriter::insertFloatMeta(const std::string &name, const float value)
+void OpenVDBWriter::insertFloatMeta(const openvdb::Name &name, const float value)
{
m_meta_map->insertMeta(name, openvdb::FloatMetadata(value));
}
-void OpenVDBWriter::insertIntMeta(const std::string &name, const int value)
+void OpenVDBWriter::insertIntMeta(const openvdb::Name &name, const int value)
{
m_meta_map->insertMeta(name, openvdb::Int32Metadata(value));
}
-void OpenVDBWriter::insertVec3sMeta(const std::string &name, const openvdb::Vec3s value)
+void OpenVDBWriter::insertVec3sMeta(const openvdb::Name &name, const openvdb::Vec3s value)
{
m_meta_map->insertMeta(name, openvdb::Vec3SMetadata(value));
}
-void OpenVDBWriter::insertVec3IMeta(const std::string &name, const openvdb::Vec3I value)
+void OpenVDBWriter::insertVec3IMeta(const openvdb::Name &name, const openvdb::Vec3I value)
{
m_meta_map->insertMeta(name, openvdb::Vec3IMetadata(value));
}
-void OpenVDBWriter::insertMat4sMeta(const std::string &name, const float value[4][4])
+void OpenVDBWriter::insertMat4sMeta(const openvdb::Name &name, const float value[4][4])
{
openvdb::Mat4s mat = openvdb::Mat4s(
value[0][0], value[0][1], value[0][2], value[0][3],
@@ -84,7 +84,7 @@ void OpenVDBWriter::setFlags(const int compression, const bool save_as_half)
m_save_as_half = save_as_half;
}
-void OpenVDBWriter::write(const std::string &filename) const
+void OpenVDBWriter::write(const openvdb::Name &filename) const
{
openvdb::io::File file(filename);
file.setCompression(m_compression_flags);
diff --git a/intern/openvdb/intern/openvdb_writer.h b/intern/openvdb/intern/openvdb_writer.h
index e9760ce..e2e7bb4 100644
--- a/intern/openvdb/intern/openvdb_writer.h
+++ b/intern/openvdb/intern/openvdb_writer.h
@@ -42,15 +42,15 @@ public:
void insert(const openvdb::GridBase::Ptr &grid);
void insert(const openvdb::GridBase &grid);
- void insertFloatMeta(const std::string &name, const float value);
- void insertIntMeta(const std::string &name, const int value);
- void insertVec3sMeta(const std::string &name, const openvdb::Vec3s value);
- void insertVec3IMeta(const std::string &name, const openvdb::Vec3I value);
- void insertMat4sMeta(const std::string &name, const float value[4][4]);
+ void insertFloatMeta(const openvdb::Name &name, const float value);
+ void insertIntMeta(const openvdb::Name &name, const int value);
+ void insertVec3sMeta(const openvdb::Name &name, const openvdb::Vec3s value);
+ void insertVec3IMeta(const openvdb::Name &name, const openvdb::Vec3I value);
+ void insertMat4sMeta(const openvdb::Name &name, const float value[4][4]);
void setFlags(const int compression, const bool save_as_half);
- void write(const std::string &filename) const;
+ void write(const openvdb::Name &filename) const;
};
#endif /* __OPENVDB_WRITER_H__ */
diff --git a/intern/openvdb/openvdb_capi.cc b/intern/openvdb/openvdb_capi.cc
index 99b024c..2b6850a 100644
--- a/intern/openvdb/openvdb_capi.cc
+++ b/intern/openvdb/openvdb_capi.cc
@@ -53,8 +53,8 @@ void OpenVDB_get_grid_info(const char *filename, OpenVDBGridInfoCallback cb, voi
for (size_t i = 0; i < grid_num; ++i) {
GridBase::ConstPtr grid = (*grids)[i];
- std::string name = grid->getName();
- std::string value_type = grid->valueType();
+ Name name = grid->getName();
+ Name value_type = grid->valueType();
bool is_color = false;
if (grid->getMetadata< TypedMetadata<bool> >("is_color"))
is_color = grid->metaValue<bool>("is_color");
More information about the Bf-blender-cvs
mailing list