diff options
Diffstat (limited to 'intern/opensubdiv/internal/base')
-rw-r--r-- | intern/opensubdiv/internal/base/edge_map.h | 2 | ||||
-rw-r--r-- | intern/opensubdiv/internal/base/opensubdiv_capi.cc | 1 | ||||
-rw-r--r-- | intern/opensubdiv/internal/base/type.h | 47 | ||||
-rw-r--r-- | intern/opensubdiv/internal/base/util.cc | 54 | ||||
-rw-r--r-- | intern/opensubdiv/internal/base/util.h | 33 |
5 files changed, 136 insertions, 1 deletions
diff --git a/intern/opensubdiv/internal/base/edge_map.h b/intern/opensubdiv/internal/base/edge_map.h index eb70af2354c..da1ec5bd31b 100644 --- a/intern/opensubdiv/internal/base/edge_map.h +++ b/intern/opensubdiv/internal/base/edge_map.h @@ -19,7 +19,7 @@ #ifndef OPENSUBDIV_BASE_EDGE_MAP_H_ #define OPENSUBDIV_BASE_EDGE_MAP_H_ -#include "internal/opensubdiv_util.h" +#include "internal/base/type.h" namespace blender { namespace opensubdiv { diff --git a/intern/opensubdiv/internal/base/opensubdiv_capi.cc b/intern/opensubdiv/internal/base/opensubdiv_capi.cc index 1d0f23f3046..430acfd4497 100644 --- a/intern/opensubdiv/internal/base/opensubdiv_capi.cc +++ b/intern/opensubdiv/internal/base/opensubdiv_capi.cc @@ -20,6 +20,7 @@ # include <iso646.h> #endif +#include "internal/base/util.h" #include "internal/device/device_context_cuda.h" #include "internal/device/device_context_glsl_compute.h" #include "internal/device/device_context_glsl_transform_feedback.h" diff --git a/intern/opensubdiv/internal/base/type.h b/intern/opensubdiv/internal/base/type.h new file mode 100644 index 00000000000..95c307bed6a --- /dev/null +++ b/intern/opensubdiv/internal/base/type.h @@ -0,0 +1,47 @@ +// Copyright 2013 Blender Foundation. All rights reserved. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software Foundation, +// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +#ifndef OPENSUBDIV_BASE_TYPE_H_ +#define OPENSUBDIV_BASE_TYPE_H_ + +#include <stdint.h> + +#include <algorithm> +#include <cassert> +#include <stack> +#include <string> +#include <unordered_map> +#include <utility> +#include <vector> + +namespace blender { +namespace opensubdiv { + +using std::fill; +using std::make_pair; +using std::max; +using std::min; +using std::pair; +using std::stack; +using std::string; +using std::swap; +using std::unordered_map; +using std::vector; + +} // namespace opensubdiv +} // namespace blender + +#endif // OPENSUBDIV_BASE_TYPE_H_ diff --git a/intern/opensubdiv/internal/base/util.cc b/intern/opensubdiv/internal/base/util.cc new file mode 100644 index 00000000000..9c858ec3cda --- /dev/null +++ b/intern/opensubdiv/internal/base/util.cc @@ -0,0 +1,54 @@ +// Copyright 2013 Blender Foundation. All rights reserved. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software Foundation, +// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +#include "internal/base/util.h" + +namespace blender { +namespace opensubdiv { + +void stringSplit(vector<string> *tokens, + const string &str, + const string &separators, + bool skip_empty) +{ + size_t token_start = 0, token_length = 0; + for (size_t i = 0; i < str.length(); ++i) { + const char ch = str[i]; + if (separators.find(ch) == string::npos) { + // Append non-separator char to a token. + ++token_length; + } + else { + // Append current token to the list (if any). + if (token_length > 0 || !skip_empty) { + string token = str.substr(token_start, token_length); + tokens->push_back(token); + } + // Re-set token pointers. + token_start = i + 1; + token_length = 0; + } + } + // Append token which might be at the end of the string. + if ((token_length != 0) || + (!skip_empty && token_start > 0 && separators.find(str[token_start - 1]) != string::npos)) { + string token = str.substr(token_start, token_length); + tokens->push_back(token); + } +} + +} // namespace opensubdiv +} // namespace blender diff --git a/intern/opensubdiv/internal/base/util.h b/intern/opensubdiv/internal/base/util.h new file mode 100644 index 00000000000..4035ba7301a --- /dev/null +++ b/intern/opensubdiv/internal/base/util.h @@ -0,0 +1,33 @@ +// Copyright 2013 Blender Foundation. All rights reserved. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software Foundation, +// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +#ifndef OPENSUBDIV_BASE_UTIL_H_ +#define OPENSUBDIV_BASE_UTIL_H_ + +#include "internal/base/type.h" + +namespace blender { +namespace opensubdiv { + +void stringSplit(vector<string> *tokens, + const string &str, + const string &separators, + bool skip_empty); + +} // namespace opensubdiv +} // namespace blender + +#endif // OPENSUBDIV_BASE_UTIL_H_ |