Commit: 5d9db8192d17bcf84b093e8deda3caacd115f0be
Author: Lukas Tönne
Date: Thu Feb 12 15:55:20 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB5d9db8192d17bcf84b093e8deda3caacd115f0be
Read/Write implementation for cloth/hair data in alembic files.
This data is very simple, just deform positions, velocities and goal
positions. Future cloth might become more complex, but for now a plain
Abc::Point schema is sufficient.
===================================================================
M source/blender/pointcache/alembic/abc_cloth.cpp
M source/blender/pointcache/alembic/abc_cloth.h
===================================================================
diff --git a/source/blender/pointcache/alembic/abc_cloth.cpp
b/source/blender/pointcache/alembic/abc_cloth.cpp
index ca54315..0efc731 100644
--- a/source/blender/pointcache/alembic/abc_cloth.cpp
+++ b/source/blender/pointcache/alembic/abc_cloth.cpp
@@ -21,8 +21,13 @@
#include "abc_cloth.h"
extern "C" {
+#include "BLI_math.h"
+
+#include "DNA_cloth_types.h"
#include "DNA_object_types.h"
#include "DNA_modifier_types.h"
+
+#include "BKE_cloth.h"
}
#include "PTC_api.h"
@@ -36,14 +41,85 @@ AbcClothWriter::AbcClothWriter(Scene *scene, Object *ob,
ClothModifierData *clmd
ClothWriter(scene, ob, clmd, &m_archive),
m_archive(scene, &ob->id, clmd->point_cache, m_error_handler)
{
+ set_error_handler(new ModifierErrorHandler(&clmd->modifier));
+
+ uint32_t fs = m_archive.add_frame_sampling();
+
+ OObject root = m_archive.archive.getTop();
+ m_points = OPoints(root, m_clmd->modifier.name, fs);
+
+ OPointsSchema &schema = m_points.getSchema();
+ OCompoundProperty geom_params = schema.getArbGeomParams();
+
+ m_param_velocities = OV3fGeomParam(geom_params, "velocities", false,
kVaryingScope, 1, 0);
+ m_param_goal_positions = OP3fGeomParam(geom_params, "goal_positions",
false, kVaryingScope, 1, 0);
}
AbcClothWriter::~AbcClothWriter()
{
}
+static V3fArraySample create_sample_velocities(Cloth *cloth, std::vector<V3f>
&data)
+{
+ ClothVertex *vert;
+ int i, totvert = cloth->numverts;
+
+ data.reserve(totvert);
+ for (i = 0, vert = cloth->verts; i < totvert; ++i, ++vert) {
+ float *co = vert->v;
+ data.push_back(V3f(co[0], co[1], co[2]));
+ }
+
+ return V3fArraySample(data);
+}
+
+static P3fArraySample create_sample_goal_positions(Cloth *cloth,
std::vector<V3f> &data)
+{
+ ClothVertex *vert;
+ int i, totvert = cloth->numverts;
+
+ data.reserve(totvert);
+ for (i = 0, vert = cloth->verts; i < totvert; ++i, ++vert) {
+ float *co = vert->xconst;
+ data.push_back(V3f(co[0], co[1], co[2]));
+ }
+
+ return P3fArraySample(data);
+}
+
void AbcClothWriter::write_sample()
{
+ Cloth *cloth = m_clmd->clothObject;
+
+ OPointsSchema &schema = m_points.getSchema();
+
+ int totpoint = cloth->numverts;
+ ClothVertex *vert;
+ int i;
+
+ /* XXX TODO only needed for the first frame/sample */
+ std::vector<Util::uint64_t> ids;
+ ids.reserve(totpoint);
+ for (i = 0, vert = cloth->verts; i < totpoint; ++i, ++vert)
+ ids.push_back(i);
+
+ std::vector<V3f> positions;
+ positions.reserve(totpoint);
+ for (i = 0, vert = cloth->verts; i < totpoint; ++i, ++vert) {
+ float *co = vert->x;
+ positions.push_back(V3f(co[0], co[1], co[2]));
+ }
+
+ std::vector<V3f> velocities_buffer;
+ std::vector<V3f> goal_positions_buffer;
+ V3fArraySample velocities = create_sample_velocities(cloth,
velocities_buffer);
+ P3fArraySample goal_positions = create_sample_goal_positions(cloth,
goal_positions_buffer);
+
+ OPointsSchema::Sample sample =
OPointsSchema::Sample(V3fArraySample(positions), UInt64ArraySample(ids));
+ schema.set(sample);
+
+ m_param_velocities.set(OV3fGeomParam::Sample(velocities,
kVaryingScope));
+ m_param_goal_positions.set(OP3fGeomParam::Sample(goal_positions,
kVaryingScope));
}
@@ -51,9 +127,19 @@ AbcClothReader::AbcClothReader(Scene *scene, Object *ob,
ClothModifierData *clmd
ClothReader(scene, ob, clmd, &m_archive),
m_archive(scene, &ob->id, clmd->point_cache, m_error_handler)
{
+ set_error_handler(new ModifierErrorHandler(&clmd->modifier));
+
if (m_archive.archive.valid()) {
IObject root = m_archive.archive.getTop();
-// m_points = IPoints(root, m_psys->name);
+ if (root.valid() && root.getChild(m_clmd->modifier.name)) {
+ m_points = IPoints(root, m_clmd->modifier.name);
+
+ IPointsSchema &schema = m_points.getSchema();
+ ICompoundProperty geom_params =
schema.getArbGeomParams();
+
+ m_param_velocities = IV3fGeomParam(geom_params,
"velocities", 0);
+ m_param_goal_positions= IP3fGeomParam(geom_params,
"goal_positions", 0);
+ }
}
}
@@ -61,9 +147,91 @@ AbcClothReader::~AbcClothReader()
{
}
+static void apply_sample_positions(Cloth *cloth, P3fArraySamplePtr sample)
+{
+ ClothVertex *vert;
+ int i, totvert = cloth->numverts;
+
+ BLI_assert(sample->size() == totvert);
+
+ const V3f *data = sample->get();
+ for (i = 0, vert = cloth->verts; i < totvert; ++i, ++vert) {
+ const V3f &co = data[i];
+ copy_v3_v3(vert->x, co.getValue());
+ }
+}
+
+static void apply_sample_velocities(Cloth *cloth, V3fArraySamplePtr sample)
+{
+ ClothVertex *vert;
+ int i, totvert = cloth->numverts;
+
+ BLI_assert(sample->size() == totvert);
+
+ const V3f *data = sample->get();
+ for (i = 0, vert = cloth->verts; i < totvert; ++i, ++vert) {
+ const V3f &vel = data[i];
+ copy_v3_v3(vert->v, vel.getValue());
+ }
+}
+
+static void apply_sample_goal_positions(Cloth *cloth, P3fArraySamplePtr sample)
+{
+ ClothVertex *vert;
+ int i, totvert = cloth->numverts;
+
+ BLI_assert(sample->size() == totvert);
+
+ const V3f *data = sample->get();
+ for (i = 0, vert = cloth->verts; i < totvert; ++i, ++vert) {
+ const V3f &co = data[i];
+ copy_v3_v3(vert->xconst, co.getValue());
+ }
+}
+
PTCReadSampleResult AbcClothReader::read_sample(float frame)
{
- return PTC_READ_SAMPLE_INVALID;
+ Cloth *cloth = m_clmd->clothObject;
+
+ if (!m_points.valid())
+ return PTC_READ_SAMPLE_INVALID;
+
+ IPointsSchema &schema = m_points.getSchema();
+ TimeSamplingPtr ts = schema.getTimeSampling();
+
+ ISampleSelector ss = m_archive.get_frame_sample_selector(frame);
+// chrono_t time = ss.getRequestedTime();
+
+// std::pair<index_t, chrono_t> sres = ts->getFloorIndex(time,
schema.getNumSamples());
+// chrono_t stime = sres.second;
+// float sframe = m_archive.time_to_frame(stime);
+
+ IPointsSchema::Sample sample;
+ schema.get(sample, ss);
+
+ P3fArraySamplePtr positions = sample.getPositions();
+
+ V3fArraySamplePtr velocities;
+ if (m_param_velocities && m_param_velocities.getNumSamples() > 0) {
+ IV3fGeomParam::Sample sample_velocities;
+ m_param_velocities.getExpanded(sample_velocities, ss);
+ velocities = sample_velocities.getVals();
+ }
+
+ P3fArraySamplePtr goal_positions;
+ if (m_param_goal_positions && m_param_goal_positions.getNumSamples() >
0) {
+ IP3fGeomParam::Sample sample_goal_positions;
+ m_param_goal_positions.getExpanded(sample_goal_positions, ss);
+ goal_positions = sample_goal_positions.getVals();
+ }
+
+ apply_sample_positions(cloth, positions);
+ if (velocities)
+ apply_sample_velocities(cloth, velocities);
+ if (goal_positions)
+ apply_sample_goal_positions(cloth, goal_positions);
+
+ return PTC_READ_SAMPLE_EXACT;
}
/* ==== API ==== */
diff --git a/source/blender/pointcache/alembic/abc_cloth.h
b/source/blender/pointcache/alembic/abc_cloth.h
index d6aacb8..217186d 100644
--- a/source/blender/pointcache/alembic/abc_cloth.h
+++ b/source/blender/pointcache/alembic/abc_cloth.h
@@ -19,8 +19,8 @@
#ifndef PTC_ABC_CLOTH_H
#define PTC_ABC_CLOTH_H
-//#include <Alembic/AbcGeom/IPoints.h>
-//#include <Alembic/AbcGeom/OPoints.h>
+#include <Alembic/AbcGeom/IPoints.h>
+#include <Alembic/AbcGeom/OPoints.h>
#include "ptc_types.h"
@@ -42,7 +42,10 @@ public:
private:
AbcWriterArchive m_archive;
-// AbcGeom::OPoints m_points;
+
+ AbcGeom::OPoints m_points;
+ AbcGeom::OV3fGeomParam m_param_velocities;
+ AbcGeom::OP3fGeomParam m_param_goal_positions;
};
class AbcClothReader : public ClothReader {
@@ -54,7 +57,10 @@ public:
private:
AbcReaderArchive m_archive;
-// AbcGeom::IPoints m_points;
+
+ AbcGeom::IPoints m_points;
+ AbcGeom::IV3fGeomParam m_param_velocities;
+ AbcGeom::IP3fGeomParam m_param_goal_positions;
};
} /* namespace PTC */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
