From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- intern/openvdb/openvdb_capi.cc | 218 +++++++++++++++++++++-------------------- 1 file changed, 111 insertions(+), 107 deletions(-) (limited to 'intern/openvdb/openvdb_capi.cc') diff --git a/intern/openvdb/openvdb_capi.cc b/intern/openvdb/openvdb_capi.cc index 997c7638537..aff27ee6c62 100644 --- a/intern/openvdb/openvdb_capi.cc +++ b/intern/openvdb/openvdb_capi.cc @@ -21,216 +21,220 @@ #include "openvdb_dense_convert.h" #include "openvdb_util.h" -struct OpenVDBFloatGrid { int unused; }; -struct OpenVDBIntGrid { int unused; }; -struct OpenVDBVectorGrid { int unused; }; +struct OpenVDBFloatGrid { + int unused; +}; +struct OpenVDBIntGrid { + int unused; +}; +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], const float clipping, - OpenVDBFloatGrid *mask) +OpenVDBFloatGrid *OpenVDB_export_grid_fl(OpenVDBWriter *writer, + const char *name, + float *data, + const int res[3], + float matrix[4][4], + const float clipping, + OpenVDBFloatGrid *mask) { - Timer(__func__); + Timer(__func__); - using openvdb::FloatGrid; + using openvdb::FloatGrid; - FloatGrid *mask_grid = reinterpret_cast(mask); - FloatGrid *grid = internal::OpenVDB_export_grid( - writer, - name, - data, - res, - matrix, - clipping, - mask_grid); + FloatGrid *mask_grid = reinterpret_cast(mask); + FloatGrid *grid = internal::OpenVDB_export_grid( + writer, name, data, res, matrix, clipping, mask_grid); - return reinterpret_cast(grid); + return reinterpret_cast(grid); } -OpenVDBIntGrid *OpenVDB_export_grid_ch( - OpenVDBWriter *writer, - const char *name, unsigned char *data, - const int res[3], float matrix[4][4], const float clipping, - OpenVDBFloatGrid *mask) +OpenVDBIntGrid *OpenVDB_export_grid_ch(OpenVDBWriter *writer, + const char *name, + unsigned char *data, + const int res[3], + float matrix[4][4], + const float clipping, + OpenVDBFloatGrid *mask) { - Timer(__func__); + Timer(__func__); - using openvdb::FloatGrid; - using openvdb::Int32Grid; + using openvdb::FloatGrid; + using openvdb::Int32Grid; - FloatGrid *mask_grid = reinterpret_cast(mask); - Int32Grid *grid = internal::OpenVDB_export_grid( - writer, - name, - data, - res, - matrix, - clipping, - mask_grid); + FloatGrid *mask_grid = reinterpret_cast(mask); + Int32Grid *grid = internal::OpenVDB_export_grid( + writer, name, data, res, matrix, clipping, mask_grid); - return reinterpret_cast(grid); + return reinterpret_cast(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 float clipping, - const bool is_color, OpenVDBFloatGrid *mask) + 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 float clipping, + const bool is_color, + OpenVDBFloatGrid *mask) { - Timer(__func__); + Timer(__func__); - using openvdb::GridBase; - using openvdb::FloatGrid; - using openvdb::VecType; + using openvdb::FloatGrid; + using openvdb::GridBase; + using openvdb::VecType; - FloatGrid *mask_grid = reinterpret_cast(mask); - GridBase *grid = internal::OpenVDB_export_vector_grid( - writer, - name, - data_x, - data_y, - data_z, - res, - matrix, - static_cast(vec_type), - is_color, - clipping, - mask_grid); + FloatGrid *mask_grid = reinterpret_cast(mask); + GridBase *grid = internal::OpenVDB_export_vector_grid(writer, + name, + data_x, + data_y, + data_z, + res, + matrix, + static_cast(vec_type), + is_color, + clipping, + mask_grid); - return reinterpret_cast(grid); + return reinterpret_cast(grid); } -void OpenVDB_import_grid_fl( - OpenVDBReader *reader, - const char *name, float **data, - const int res[3]) +void OpenVDB_import_grid_fl(OpenVDBReader *reader, + const char *name, + float **data, + const int res[3]) { - Timer(__func__); + Timer(__func__); - internal::OpenVDB_import_grid(reader, name, data, res); + internal::OpenVDB_import_grid(reader, name, data, res); } -void OpenVDB_import_grid_ch( - OpenVDBReader *reader, - const char *name, unsigned char **data, - const int res[3]) +void OpenVDB_import_grid_ch(OpenVDBReader *reader, + const char *name, + unsigned char **data, + const int res[3]) { - internal::OpenVDB_import_grid(reader, name, data, res); + internal::OpenVDB_import_grid(reader, name, data, res); } -void OpenVDB_import_grid_vec( - struct OpenVDBReader *reader, - const char *name, - float **data_x, float **data_y, float **data_z, - const int res[3]) +void OpenVDB_import_grid_vec(struct OpenVDBReader *reader, + const char *name, + float **data_x, + float **data_y, + float **data_z, + const int res[3]) { - Timer(__func__); + Timer(__func__); - internal::OpenVDB_import_grid_vector(reader, name, data_x, data_y, data_z, res); + internal::OpenVDB_import_grid_vector(reader, name, data_x, data_y, data_z, res); } OpenVDBWriter *OpenVDBWriter_create() { - return new OpenVDBWriter(); + return new OpenVDBWriter(); } void OpenVDBWriter_free(OpenVDBWriter *writer) { - delete writer; + delete writer; } void OpenVDBWriter_set_flags(OpenVDBWriter *writer, const int flag, const bool half) { - int compression_flags = openvdb::io::COMPRESS_ACTIVE_MASK; + int compression_flags = openvdb::io::COMPRESS_ACTIVE_MASK; #ifdef WITH_OPENVDB_BLOSC - if (flag == 0) { - compression_flags |= openvdb::io::COMPRESS_BLOSC; - } - else + if (flag == 0) { + compression_flags |= openvdb::io::COMPRESS_BLOSC; + } + else #endif - if (flag == 1) { - compression_flags |= openvdb::io::COMPRESS_ZIP; - } - else { - compression_flags = openvdb::io::COMPRESS_NONE; - } + if (flag == 1) { + compression_flags |= openvdb::io::COMPRESS_ZIP; + } + else { + compression_flags = openvdb::io::COMPRESS_NONE; + } - writer->setFlags(compression_flags, half); + writer->setFlags(compression_flags, half); } void OpenVDBWriter_add_meta_fl(OpenVDBWriter *writer, const char *name, const float value) { - writer->insertFloatMeta(name, value); + writer->insertFloatMeta(name, value); } void OpenVDBWriter_add_meta_int(OpenVDBWriter *writer, const char *name, const int value) { - writer->insertIntMeta(name, value); + writer->insertIntMeta(name, value); } void OpenVDBWriter_add_meta_v3(OpenVDBWriter *writer, const char *name, const float value[3]) { - writer->insertVec3sMeta(name, value); + writer->insertVec3sMeta(name, value); } void OpenVDBWriter_add_meta_v3_int(OpenVDBWriter *writer, const char *name, const int value[3]) { - writer->insertVec3IMeta(name, value); + writer->insertVec3IMeta(name, value); } void OpenVDBWriter_add_meta_mat4(OpenVDBWriter *writer, const char *name, float value[4][4]) { - writer->insertMat4sMeta(name, value); + writer->insertMat4sMeta(name, value); } void OpenVDBWriter_write(OpenVDBWriter *writer, const char *filename) { - writer->write(filename); + writer->write(filename); } OpenVDBReader *OpenVDBReader_create() { - return new OpenVDBReader(); + return new OpenVDBReader(); } void OpenVDBReader_free(OpenVDBReader *reader) { - delete reader; + delete reader; } void OpenVDBReader_open(OpenVDBReader *reader, const char *filename) { - reader->open(filename); + reader->open(filename); } void OpenVDBReader_get_meta_fl(OpenVDBReader *reader, const char *name, float *value) { - reader->floatMeta(name, *value); + reader->floatMeta(name, *value); } void OpenVDBReader_get_meta_int(OpenVDBReader *reader, const char *name, int *value) { - reader->intMeta(name, *value); + reader->intMeta(name, *value); } void OpenVDBReader_get_meta_v3(OpenVDBReader *reader, const char *name, float value[3]) { - reader->vec3sMeta(name, value); + reader->vec3sMeta(name, value); } void OpenVDBReader_get_meta_v3_int(OpenVDBReader *reader, const char *name, int value[3]) { - reader->vec3IMeta(name, value); + reader->vec3IMeta(name, value); } void OpenVDBReader_get_meta_mat4(OpenVDBReader *reader, const char *name, float value[4][4]) { - reader->mat4sMeta(name, value); + reader->mat4sMeta(name, value); } -- cgit v1.2.3