[Bf-blender-cvs] [7816e52] temp-openvdb: Cleanup: indentation
Campbell Barton
noreply at git.blender.org
Sat Jan 23 07:28:38 CET 2016
Commit: 7816e52df8202c19d3b4ac78cd30a6cdc8d1707a
Author: Campbell Barton
Date: Sat Jan 23 17:18:21 2016 +1100
Branches: temp-openvdb
https://developer.blender.org/rB7816e52df8202c19d3b4ac78cd30a6cdc8d1707a
Cleanup: indentation
===================================================================
M intern/openvdb/intern/openvdb_dense_convert.cc
M intern/openvdb/intern/openvdb_dense_convert.h
M intern/openvdb/openvdb_capi.cc
M intern/openvdb/openvdb_capi.h
M source/blender/blenkernel/intern/pointcache.c
M source/blender/makesrna/intern/rna_smoke.c
M source/blender/python/intern/CMakeLists.txt
M source/blender/python/intern/bpy_app_openvdb.c
===================================================================
diff --git a/intern/openvdb/intern/openvdb_dense_convert.cc b/intern/openvdb/intern/openvdb_dense_convert.cc
index 2a6ebc0..d4f6277 100644
--- a/intern/openvdb/intern/openvdb_dense_convert.cc
+++ b/intern/openvdb/intern/openvdb_dense_convert.cc
@@ -33,11 +33,11 @@ namespace internal {
openvdb::Mat4R convertMatrix(const float mat[4][4])
{
- return openvdb::Mat4R(
- mat[0][0], mat[0][1], mat[0][2], mat[0][3],
- mat[1][0], mat[1][1], mat[1][2], mat[1][3],
- mat[2][0], mat[2][1], mat[2][2], mat[2][3],
- mat[3][0], mat[3][1], mat[3][2], mat[3][3]);
+ return openvdb::Mat4R(
+ mat[0][0], mat[0][1], mat[0][2], mat[0][3],
+ mat[1][0], mat[1][1], mat[1][2], mat[1][3],
+ mat[2][0], mat[2][1], mat[2][2], mat[2][3],
+ mat[3][0], mat[3][1], mat[3][2], mat[3][3]);
}
@@ -72,14 +72,15 @@ public:
}
};
-openvdb::GridBase *OpenVDB_export_vector_grid(OpenVDBWriter *writer,
- 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],
- openvdb::VecType vec_type,
- const bool is_color,
- const openvdb::FloatGrid *mask)
+openvdb::GridBase *OpenVDB_export_vector_grid(
+ OpenVDBWriter *writer,
+ 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],
+ openvdb::VecType vec_type,
+ const bool is_color,
+ const openvdb::FloatGrid *mask)
{
using namespace openvdb;
@@ -129,10 +130,11 @@ openvdb::GridBase *OpenVDB_export_vector_grid(OpenVDBWriter *writer,
return vecgrid.get();
}
-void OpenVDB_import_grid_vector(OpenVDBReader *reader,
- const openvdb::Name &name,
- float **data_x, float **data_y, float **data_z,
- const int res[3])
+void OpenVDB_import_grid_vector(
+ OpenVDBReader *reader,
+ const openvdb::Name &name,
+ float **data_x, float **data_y, float **data_z,
+ const int res[3])
{
using namespace openvdb;
diff --git a/intern/openvdb/intern/openvdb_dense_convert.h b/intern/openvdb/intern/openvdb_dense_convert.h
index 561a30f..fd10334 100644
--- a/intern/openvdb/intern/openvdb_dense_convert.h
+++ b/intern/openvdb/intern/openvdb_dense_convert.h
@@ -43,12 +43,13 @@ namespace internal {
openvdb::Mat4R convertMatrix(const float mat[4][4]);
template <typename GridType, typename T>
-GridType *OpenVDB_export_grid(OpenVDBWriter *writer,
- const openvdb::Name &name,
- const T *data,
- const int res[3],
- float fluid_mat[4][4],
- const openvdb::FloatGrid *mask)
+GridType *OpenVDB_export_grid(
+ OpenVDBWriter *writer,
+ const openvdb::Name &name,
+ const T *data,
+ const int res[3],
+ float fluid_mat[4][4],
+ const openvdb::FloatGrid *mask)
{
using namespace openvdb;
@@ -77,10 +78,11 @@ GridType *OpenVDB_export_grid(OpenVDBWriter *writer,
}
template <typename GridType, typename T>
-void OpenVDB_import_grid(OpenVDBReader *reader,
- const openvdb::Name &name,
- T **data,
- const int res[3])
+void OpenVDB_import_grid(
+ OpenVDBReader *reader,
+ const openvdb::Name &name,
+ T **data,
+ const int res[3])
{
using namespace openvdb;
@@ -106,20 +108,22 @@ void OpenVDB_import_grid(OpenVDBReader *reader,
}
}
-openvdb::GridBase *OpenVDB_export_vector_grid(OpenVDBWriter *writer,
- 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],
- openvdb::VecType vec_type,
- const bool is_color,
- const openvdb::FloatGrid *mask);
-
-
-void OpenVDB_import_grid_vector(OpenVDBReader *reader,
- const openvdb::Name &name,
- float **data_x, float **data_y, float **data_z,
- const int res[3]);
+openvdb::GridBase *OpenVDB_export_vector_grid(
+ OpenVDBWriter *writer,
+ 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],
+ openvdb::VecType vec_type,
+ const bool is_color,
+ const openvdb::FloatGrid *mask);
+
+
+void OpenVDB_import_grid_vector(
+ OpenVDBReader *reader,
+ const openvdb::Name &name,
+ float **data_x, float **data_y, float **data_z,
+ const int res[3]);
} /* namespace internal */
diff --git a/intern/openvdb/openvdb_capi.cc b/intern/openvdb/openvdb_capi.cc
index a9391f0..c9dea8d 100644
--- a/intern/openvdb/openvdb_capi.cc
+++ b/intern/openvdb/openvdb_capi.cc
@@ -33,33 +33,36 @@ struct OpenVDBVectorGrid { int unused; };
int OpenVDB_getVersionHex()
{
- return openvdb::OPENVDB_LIBRARY_VERSION;
+ return openvdb::OPENVDB_LIBRARY_VERSION;
}
-OpenVDBFloatGrid *OpenVDB_export_grid_fl(OpenVDBWriter *writer,
- const char *name, float *data,
- const int res[3], float matrix[4][4],
- OpenVDBFloatGrid *mask)
+OpenVDBFloatGrid *OpenVDB_export_grid_fl(
+ OpenVDBWriter *writer,
+ const char *name, float *data,
+ const int res[3], float matrix[4][4],
+ OpenVDBFloatGrid *mask)
{
Timer(__func__);
using openvdb::FloatGrid;
FloatGrid *mask_grid = reinterpret_cast<FloatGrid *>(mask);
- FloatGrid *grid = internal::OpenVDB_export_grid<FloatGrid>(writer,
- name,
- data,
- res,
- matrix,
- mask_grid);
+ FloatGrid *grid = internal::OpenVDB_export_grid<FloatGrid>(
+ writer,
+ name,
+ data,
+ res,
+ matrix,
+ mask_grid);
return reinterpret_cast<OpenVDBFloatGrid *>(grid);
}
-OpenVDBIntGrid *OpenVDB_export_grid_ch(OpenVDBWriter *writer,
- const char *name, unsigned char *data,
- const int res[3], float matrix[4][4],
- OpenVDBFloatGrid *mask)
+OpenVDBIntGrid *OpenVDB_export_grid_ch(
+ OpenVDBWriter *writer,
+ const char *name, unsigned char *data,
+ const int res[3], float matrix[4][4],
+ OpenVDBFloatGrid *mask)
{
Timer(__func__);
@@ -67,21 +70,23 @@ OpenVDBIntGrid *OpenVDB_export_grid_ch(OpenVDBWriter *writer,
using openvdb::Int32Grid;
FloatGrid *mask_grid = reinterpret_cast<FloatGrid *>(mask);
- Int32Grid *grid = internal::OpenVDB_export_grid<Int32Grid>(writer,
- name,
- data,
- res,
- matrix,
- mask_grid);
+ Int32Grid *grid = internal::OpenVDB_export_grid<Int32Grid>(
+ writer,
+ name,
+ data,
+ res,
+ matrix,
+ mask_grid);
return reinterpret_cast<OpenVDBIntGrid *>(grid);
}
-OpenVDBVectorGrid *OpenVDB_export_grid_vec(struct OpenVDBWriter *writer,
- const char *name,
- const float *data_x, const float *data_y, const float *data_z,
- const int res[3], float matrix[4][4], short vec_type,
- const bool is_color, OpenVDBFloatGrid *mask)
+OpenVDBVectorGrid *OpenVDB_export_grid_vec(
+ struct OpenVDBWriter *writer,
+ const char *name,
+ const float *data_x, const float *data_y, const float *data_z,
+ const int res[3], float matrix[4][4], short vec_type,
+ const bool is_color, OpenVDBFloatGrid *mask)
{
Timer(__func__);
@@ -90,40 +95,44 @@ OpenVDBVectorGrid *OpenVDB_export_grid_vec(struct OpenVDBWriter *writer,
using openvdb::VecType;
FloatGrid *mask_grid = reinterpret_cast<FloatGrid *>(mask);
- GridBase *grid = internal::OpenVDB_export_vector_grid(writer,
- name,
- data_x,
- data_y,
- data_z,
- res,
- matrix,
- static_cast<VecType>(vec_type),
- is_color,
- mask_grid);
+ GridBase *grid = internal::OpenVDB_export_vector_grid(
+ writer,
+ name,
+ data_x,
+ data_y,
+ data_z,
+ res,
+ matrix,
+ static_cast<VecType>(vec_type),
+ is_color,
+ mask_grid);
return
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list