[Bf-blender-cvs] [ec998c9] gooseberry: Support for CustomData in Alembic caches.
Lukas Tönne
noreply at git.blender.org
Mon Mar 23 13:02:50 CET 2015
Commit: ec998c9cf5eb60f1596e91846ee91c4d8d69ca8e
Author: Lukas Tönne
Date: Sat Mar 7 17:56:47 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBec998c9cf5eb60f1596e91846ee91c4d8d69ca8e
Support for CustomData in Alembic caches.
This is a skeleton feature that provides a general way of storing
CustomData types. Currently only ORIGINDEX layers are implemented, the
code is designed to make extension easy.
Storing CustomData layers in Alembic is a bit involved because the
complex structs often used as customdata need to be de-interleaved for
Alembic into a set of POD (plain-old-datatype) array properties.
In addition the property names should be unique, so that mapping abc
properties back to customdata layers is safe. This works by using 2
levels of compound properties: the first level stored per CD type
properties, with a number of properties for each layer of this type,
using either a name or index (for unnamed layers). The internal
properties can then in turn be compounds, if structs need to be
serialized into PODs.
Abc property readers/writers are created dynamically for the CustomData
compounds. This is necessary because we don't know in advance what kind
of data layers a DerivedMesh or other CD user will have, and this can
change each frame in theory. Alembic is easier with state data schemes,
but using it this way is possible (if somewhat cumbersome).
===================================================================
M source/blender/pointcache/alembic/CMakeLists.txt
A source/blender/pointcache/alembic/abc_customdata.cpp
A source/blender/pointcache/alembic/abc_customdata.h
M source/blender/pointcache/alembic/abc_mesh.cpp
M source/blender/pointcache/alembic/abc_mesh.h
===================================================================
diff --git a/source/blender/pointcache/alembic/CMakeLists.txt b/source/blender/pointcache/alembic/CMakeLists.txt
index becf845..fe80cde 100644
--- a/source/blender/pointcache/alembic/CMakeLists.txt
+++ b/source/blender/pointcache/alembic/CMakeLists.txt
@@ -54,6 +54,8 @@ set(SRC
abc_cloth.cpp
abc_cloth.h
+ abc_customdata.cpp
+ abc_customdata.h
abc_mesh.cpp
abc_mesh.h
abc_particles.cpp
diff --git a/source/blender/pointcache/alembic/abc_customdata.cpp b/source/blender/pointcache/alembic/abc_customdata.cpp
new file mode 100644
index 0000000..9a5e069
--- /dev/null
+++ b/source/blender/pointcache/alembic/abc_customdata.cpp
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2015, Blender Foundation.
+ *
+ * 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 <sstream>
+
+#include <Alembic/AbcGeom/IGeomParam.h>
+#include <Alembic/AbcGeom/OGeomParam.h>
+
+#include "abc_customdata.h"
+
+extern "C" {
+#include "BLI_utildefines.h"
+
+#include "DNA_customdata_types.h"
+
+#include "BKE_customdata.h"
+}
+
+namespace PTC {
+
+using namespace Abc;
+using namespace AbcGeom;
+
+/* DEBUG */
+BLI_INLINE void print_writer_compound(OCompoundProperty &prop)
+{
+ CompoundPropertyWriterPtr ptr = prop.getPtr()->asCompoundPtr();
+ printf("compound %s: [%p] (%d)\n", ptr->getName().c_str(), ptr.get(), (int)ptr->getNumProperties());
+ for (int i = 0; i < ptr->getNumProperties(); ++i) {
+ printf(" %d: [%p]\n", i, prop.getProperty(i).getPtr().get());
+ printf(" %s\n", prop.getProperty(i).getName().c_str());
+ }
+}
+
+/* ========================================================================= */
+
+template <CustomDataType CDTYPE>
+static void write_sample(CustomDataWriter *writer, OCompoundProperty &parent, const std::string &name, void *data, int num_data)
+{
+ /* no implementation available, should not happen */
+ BLI_assert(false);
+}
+
+template <>
+void write_sample<CD_ORIGINDEX>(CustomDataWriter *writer, OCompoundProperty &parent, const std::string &name, void *data, int num_data)
+{
+ OInt32ArrayProperty prop = writer->add_array_property<OInt32ArrayProperty>(name, parent);
+
+ prop.set(OInt32ArrayProperty::sample_type((int *)data, num_data));
+}
+
+/* ------------------------------------------------------------------------- */
+
+template <CustomDataType CDTYPE>
+static PTCReadSampleResult read_sample(CustomDataReader *reader, ICompoundProperty &parent, const ISampleSelector &ss, const std::string &name, void *data, int num_data)
+{
+ /* no implementation available, should not happen */
+ BLI_assert(false);
+}
+
+template <>
+PTCReadSampleResult read_sample<CD_ORIGINDEX>(CustomDataReader *reader, ICompoundProperty &parent, const ISampleSelector &ss, const std::string &name, void *data, int num_data)
+{
+ IInt32ArrayProperty prop = reader->add_array_property<IInt32ArrayProperty>(name, parent);
+
+ Int32ArraySamplePtr sample = prop.getValue(ss);
+
+ if (sample->size() != num_data)
+ return PTC_READ_SAMPLE_INVALID;
+
+ memcpy(data, sample->getData(), num_data);
+ return PTC_READ_SAMPLE_EXACT;
+}
+
+/* ========================================================================= */
+
+/* recursive template that handles dispatch by CD layer type */
+template <int CDTYPE>
+BLI_INLINE void write_sample_call(CustomDataWriter *writer, OCompoundProperty &parent, CustomDataType type, const std::string &name, void *data, int num_data)
+{
+ if (type == CDTYPE)
+ write_sample<(CustomDataType)CDTYPE>(writer, parent, name, data, num_data);
+ else
+ write_sample_call<CDTYPE+1>(writer, parent, type, name, data, num_data);
+}
+
+/* terminator specialization */
+template <>
+void write_sample_call<CD_NUMTYPES>(CustomDataWriter *writer, OCompoundProperty &parent, CustomDataType type, const std::string &name, void *data, int num_data)
+{
+}
+
+/* ------------------------------------------------------------------------- */
+
+/* recursive template that handles dispatch by CD layer type */
+template <int CDTYPE>
+BLI_INLINE PTCReadSampleResult read_sample_call(CustomDataReader *reader, ICompoundProperty &parent, const ISampleSelector &ss, CustomDataType type, const std::string &name, void *data, int num_data)
+{
+ if (type == CDTYPE)
+ return read_sample<(CustomDataType)CDTYPE>(reader, parent, ss, name, data, num_data);
+ else
+ return read_sample_call<CDTYPE+1>(reader, parent, ss, type, name, data, num_data);
+}
+
+/* terminator specialization */
+template <>
+PTCReadSampleResult read_sample_call<CD_NUMTYPES>(CustomDataReader *reader, ICompoundProperty &parent, const ISampleSelector &ss, CustomDataType type, const std::string &name, void *data, int num_data)
+{
+ return PTC_READ_SAMPLE_INVALID;
+}
+
+/* ========================================================================= */
+
+CustomDataWriter::CustomDataWriter(const std::string &name, int cdmask) :
+ m_name(name),
+ m_cdmask(cdmask)
+{
+}
+
+CustomDataWriter::~CustomDataWriter()
+{
+ for (LayerPropsMap::iterator it = m_layer_props.begin(); it != m_layer_props.end(); ++it) {
+ BasePropertyWriterPtr prop = it->second;
+ if (prop)
+ prop.reset();
+ }
+}
+
+/* unique property name based on either layer name or index */
+static std::string cdtype_to_name(CustomData *cdata, CustomDataType type, int n)
+{
+ const char *layer_name = CustomData_get_layer_name(cdata, type, n);
+ std::string name;
+ if (layer_name && layer_name[0] != '\0') {
+ name = "S" + std::string(layer_name);
+ }
+ else {
+ std::stringstream ss; ss << n;
+ name = "N" + ss.str();
+ }
+ return name;
+}
+
+/* parse property name to CD layer name based on S or N prefix for named/unnamed layers */
+static void cdtype_from_name(CustomData *cdata, const std::string &name, int *n, char *layer_name, int max_layer_name)
+{
+ if (name.empty()) {
+ *n = -1;
+ layer_name[0] = '\0';
+ }
+ else if (name[0] == 'S') {
+ /* named layer */
+ *n = -1;
+ BLI_strncpy(layer_name, name.c_str() + 1, max_layer_name);
+ }
+ else if (name[0] == 'N') {
+ /* unnamed layer */
+ std::istringstream ss(name.c_str() + 1);
+ ss >> (*n);
+ layer_name[0] = '\0';
+ }
+ else {
+ *n = -1;
+ layer_name[0] = '\0';
+ }
+}
+
+void CustomDataWriter::write_sample(CustomData *cdata, int num_data, OCompoundProperty &parent)
+{
+ /* compound property for all CD layers in the CustomData instance */
+ m_props = add_compound_property<OCompoundProperty>(m_name, parent);
+
+ for (int type = 0; type < CD_NUMTYPES; ++type) {
+ int mask = (1 << type);
+ /* only use specified types */
+ if (!(mask & m_cdmask))
+ continue;
+
+ const char *layertype_name = CustomData_layertype_name(type);
+ int num = CustomData_number_of_layers(cdata, type);
+
+ OCompoundProperty layertype_props;
+ for (int n = 0; n < num; ++n) {
+ /* compound for all CD layers of the same type */
+ if (!layertype_props)
+ layertype_props = add_compound_property<OCompoundProperty>(layertype_name, m_props);
+
+ std::string name = cdtype_to_name(cdata, (CustomDataType)type, n);
+ void *data = CustomData_get_layer_n(cdata, type, n);
+ write_sample_call<0>(this, layertype_props, (CustomDataType)type, name, data, num_data);
+ }
+ }
+}
+
+/* ------------------------------------------------------------------------- */
+
+CustomDataReader::CustomDataReader(const std::string &name, int cdmask) :
+ m_name(name),
+ m_cdmask(cdmask)
+{
+}
+
+CustomDataReader::~CustomDataReader()
+{
+ for (LayerPropsMap::iterator it = m_layer_props.begin(); it != m_layer_props.end(); ++it) {
+ BasePropertyReaderPtr prop = it->second;
+ if (prop)
+ prop.reset();
+ }
+}
+
+PTCReadSampleResult CustomDataReader::read_sample(const ISampleSelector &ss, CustomData *cdata, int num_data, ICompoundProperty &parent)
+{
+ m_props = add_compound_property<ICompoundProperty>(m_name, parent);
+
+ for (int type = 0; type < CD_NUMTYPES; ++type) {
+ int mask = (1 << type);
+ /* only use specified types */
+ if (!(mask & m_cdmask))
+ continue;
+
+ const char *layertype_name = CustomData_layertype_name(type);
+
+ BasePropertyReaderPtr ptr = m_props.getPtr()->asCompoundPtr()->getProperty(layertype_name);
+ if (!ptr) {
+ /* no layer of this type stored */
+ continue;
+ }
+ ICompoundProperty layertype_props(ptr->asCompoundPtr(), kWrapExisting);
+
+ for (int i = 0; i < layertype_props.getNumProperties(); ++i) {
+ const std::string &name = layertype_props.getPropertyHeader(i).getName();
+ char layer_name[MAX_CUSTOMDATA_LAYER_NAME];
+ int n;
+ void *data;
+
+ cdtype_from_name(cdata, name, &n, layer_name, sizeof(layer_name));
+ if (layer_name[0] == '\0')
+ data = CustomData_add_layer(cdata, type, CD_DEFAULT, NULL, num_data);
+ else
+ data = CustomData_add_layer_named(cdata, type, CD_DEFAULT, NULL, num_data, layer_name);
+
+ read_sample_call<0>(this, layertype_props, ss, (CustomDataType)type, name, data, num_data);
+ }
+ }
+
+ return PTC_READ_SAMPLE_EXACT;
+}
+
+} /* namespace PTC */
diff --git a/source/blender/pointcache/alembic/abc_customdata.h b/source/blender/pointcache/alembic/abc_customdata.h
new file mode 100644
index 0000000..82efa70
--- /dev/null
+++ b/source/blender/pointcache/alembic/abc_customdata.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2015, Blender Foundation.
+ *
+ * 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 WARRA
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list