[Bf-blender-cvs] [45e4ef5] alembic_pointcache: Moved C API functions for individual data types into their respective files to simplify the code structure.
Lukas Tönne
noreply at git.blender.org
Tue Nov 4 09:43:29 CET 2014
Commit: 45e4ef57dc35e9d37f9e542c16cf16e32da27f01
Author: Lukas Tönne
Date: Mon Nov 3 14:05:31 2014 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB45e4ef57dc35e9d37f9e542c16cf16e32da27f01
Moved C API functions for individual data types into their respective
files to simplify the code structure.
===================================================================
M source/blender/pointcache/PTC_api.cpp
M source/blender/pointcache/intern/cloth.cpp
M source/blender/pointcache/intern/dynamicpaint.cpp
M source/blender/pointcache/intern/mesh.cpp
M source/blender/pointcache/intern/particles.cpp
M source/blender/pointcache/intern/rigidbody.cpp
M source/blender/pointcache/intern/smoke.cpp
M source/blender/pointcache/intern/softbody.cpp
===================================================================
diff --git a/source/blender/pointcache/PTC_api.cpp b/source/blender/pointcache/PTC_api.cpp
index 999c4e2..4b7f58b 100644
--- a/source/blender/pointcache/PTC_api.cpp
+++ b/source/blender/pointcache/PTC_api.cpp
@@ -24,14 +24,6 @@
#include "writer.h"
#include "export.h"
-#include "particles.h"
-#include "cloth.h"
-#include "dynamicpaint.h"
-#include "mesh.h"
-#include "smoke.h"
-#include "softbody.h"
-#include "rigidbody.h"
-
extern "C" {
#include "BLI_math.h"
@@ -181,101 +173,6 @@ PTCReader *PTC_reader_from_rna(Scene *scene, PointerRNA *ptr)
return NULL;
}
-/* Particles */
-PTCWriter *PTC_writer_particles(Scene *scene, Object *ob, ParticleSystem *psys)
-{
- return (PTCWriter *)(new PTC::ParticlesWriter(scene, ob, psys));
-}
-
-PTCReader *PTC_reader_particles(Scene *scene, Object *ob, ParticleSystem *psys)
-{
- return (PTCReader *)(new PTC::ParticlesReader(scene, ob, psys));
-}
-
-int PTC_reader_particles_totpoint(PTCReader *_reader)
-{
- PTC::ParticlesReader *reader = (PTC::ParticlesReader *)_reader;
- return reader->totpoint();
-}
-
-/* Cloth */
-PTCWriter *PTC_writer_cloth(Scene *scene, Object *ob, ClothModifierData *clmd)
-{
- return (PTCWriter *)(new PTC::ClothWriter(scene, ob, clmd));
-}
-
-PTCReader *PTC_reader_cloth(Scene *scene, Object *ob, ClothModifierData *clmd)
-{
- return (PTCReader *)(new PTC::ClothReader(scene, ob, clmd));
-}
-
-/* SoftBody */
-PTCWriter *PTC_writer_softbody(Scene *scene, Object *ob, SoftBody *softbody)
-{
- return (PTCWriter *)(new PTC::SoftBodyWriter(scene, ob, softbody));
-}
-
-PTCReader *PTC_reader_softbody(Scene *scene, Object *ob, SoftBody *softbody)
-{
- return (PTCReader *)(new PTC::SoftBodyReader(scene, ob, softbody));
-}
-
-/* Rigid Bodies */
-PTCWriter *PTC_writer_rigidbody(Scene *scene, RigidBodyWorld *rbw)
-{
- return (PTCWriter *)(new PTC::RigidBodyWriter(scene, rbw));
-}
-
-PTCReader *PTC_reader_rigidbody(Scene *scene, RigidBodyWorld *rbw)
-{
- return (PTCReader *)(new PTC::RigidBodyReader(scene, rbw));
-}
-
-/* Smoke */
-PTCWriter *PTC_writer_smoke(Scene *scene, Object *ob, SmokeDomainSettings *domain)
-{
- return (PTCWriter *)(new PTC::SmokeWriter(scene, ob, domain));
-}
-
-PTCReader *PTC_reader_smoke(Scene *scene, Object *ob, SmokeDomainSettings *domain)
-{
- return (PTCReader *)(new PTC::SmokeReader(scene, ob, domain));
-}
-
-/* Dynamic Paint */
-PTCWriter *PTC_writer_dynamicpaint(Scene *scene, Object *ob, DynamicPaintSurface *surface)
-{
- return (PTCWriter *)(new PTC::DynamicPaintWriter(scene, ob, surface));
-}
-
-PTCReader *PTC_reader_dynamicpaint(Scene *scene, Object *ob, DynamicPaintSurface *surface)
-{
- return (PTCReader *)(new PTC::DynamicPaintReader(scene, ob, surface));
-}
-
-/* DerivedMesh */
-PTCWriter *PTC_writer_mesh_cache(Scene *scene, Object *ob, MeshCacheModifierData *mcmd)
-{
- return (PTCWriter *)(new PTC::MeshCacheWriter(scene, ob, mcmd));
-}
-
-PTCReader *PTC_reader_mesh_cache(Scene *scene, Object *ob, MeshCacheModifierData *mcmd)
-{
- return (PTCReader *)(new PTC::MeshCacheReader(scene, ob, mcmd));
-}
-
-struct DerivedMesh *PTC_reader_mesh_cache_acquire_result(PTCReader *_reader)
-{
- PTC::MeshCacheReader *reader = (PTC::MeshCacheReader *)_reader;
- return reader->acquire_result();
-}
-
-void PTC_reader_mesh_cache_discard_result(PTCReader *_reader)
-{
- PTC::MeshCacheReader *reader = (PTC::MeshCacheReader *)_reader;
- reader->discard_result();
-}
-
#else
void PTC_writer_free(PTCWriter *_writer)
@@ -286,9 +183,4 @@ void PTC_write(struct PTCWriter *_writer)
{
}
-PTCWriter *PTC_writer_create_particles(const char *filename, struct Object *ob, struct ParticleSystem *psys)
-{
- return NULL;
-}
-
#endif
diff --git a/source/blender/pointcache/intern/cloth.cpp b/source/blender/pointcache/intern/cloth.cpp
index 0c15078..4fbc23d 100644
--- a/source/blender/pointcache/intern/cloth.cpp
+++ b/source/blender/pointcache/intern/cloth.cpp
@@ -23,6 +23,8 @@ extern "C" {
#include "DNA_modifier_types.h"
}
+#include "PTC_api.h"
+
namespace PTC {
using namespace Abc;
@@ -69,3 +71,16 @@ PTCReadSampleResult ClothReader::read_sample(float frame)
}
} /* namespace PTC */
+
+
+/* ==== C API ==== */
+
+PTCWriter *PTC_writer_cloth(Scene *scene, Object *ob, ClothModifierData *clmd)
+{
+ return (PTCWriter *)(new PTC::ClothWriter(scene, ob, clmd));
+}
+
+PTCReader *PTC_reader_cloth(Scene *scene, Object *ob, ClothModifierData *clmd)
+{
+ return (PTCReader *)(new PTC::ClothReader(scene, ob, clmd));
+}
diff --git a/source/blender/pointcache/intern/dynamicpaint.cpp b/source/blender/pointcache/intern/dynamicpaint.cpp
index d8f9921..8422e7f 100644
--- a/source/blender/pointcache/intern/dynamicpaint.cpp
+++ b/source/blender/pointcache/intern/dynamicpaint.cpp
@@ -23,6 +23,8 @@ extern "C" {
#include "DNA_dynamicpaint_types.h"
}
+#include "PTC_api.h"
+
namespace PTC {
using namespace Abc;
@@ -69,3 +71,16 @@ PTCReadSampleResult DynamicPaintReader::read_sample(float frame)
}
} /* namespace PTC */
+
+
+/* ==== C API ==== */
+
+PTCWriter *PTC_writer_dynamicpaint(Scene *scene, Object *ob, DynamicPaintSurface *surface)
+{
+ return (PTCWriter *)(new PTC::DynamicPaintWriter(scene, ob, surface));
+}
+
+PTCReader *PTC_reader_dynamicpaint(Scene *scene, Object *ob, DynamicPaintSurface *surface)
+{
+ return (PTCReader *)(new PTC::DynamicPaintReader(scene, ob, surface));
+}
diff --git a/source/blender/pointcache/intern/mesh.cpp b/source/blender/pointcache/intern/mesh.cpp
index 41f8713..367e31c 100644
--- a/source/blender/pointcache/intern/mesh.cpp
+++ b/source/blender/pointcache/intern/mesh.cpp
@@ -30,6 +30,8 @@ extern "C" {
#include "BKE_cdderivedmesh.h"
}
+#include "PTC_api.h"
+
namespace PTC {
using namespace Abc;
@@ -188,3 +190,28 @@ void MeshCacheReader::discard_result()
}
} /* namespace PTC */
+
+
+/* ==== C API ==== */
+
+PTCWriter *PTC_writer_mesh_cache(Scene *scene, Object *ob, MeshCacheModifierData *mcmd)
+{
+ return (PTCWriter *)(new PTC::MeshCacheWriter(scene, ob, mcmd));
+}
+
+PTCReader *PTC_reader_mesh_cache(Scene *scene, Object *ob, MeshCacheModifierData *mcmd)
+{
+ return (PTCReader *)(new PTC::MeshCacheReader(scene, ob, mcmd));
+}
+
+struct DerivedMesh *PTC_reader_mesh_cache_acquire_result(PTCReader *_reader)
+{
+ PTC::MeshCacheReader *reader = (PTC::MeshCacheReader *)_reader;
+ return reader->acquire_result();
+}
+
+void PTC_reader_mesh_cache_discard_result(PTCReader *_reader)
+{
+ PTC::MeshCacheReader *reader = (PTC::MeshCacheReader *)_reader;
+ reader->discard_result();
+}
diff --git a/source/blender/pointcache/intern/particles.cpp b/source/blender/pointcache/intern/particles.cpp
index 0e0668e..7d653dc 100644
--- a/source/blender/pointcache/intern/particles.cpp
+++ b/source/blender/pointcache/intern/particles.cpp
@@ -23,6 +23,8 @@ extern "C" {
#include "DNA_particle_types.h"
}
+#include "PTC_api.h"
+
namespace PTC {
using namespace Abc;
@@ -322,3 +324,22 @@ PTCReadSampleResult ParticlesReader::read_sample(float frame)
}
} /* namespace PTC */
+
+
+/* ==== C API ==== */
+
+PTCWriter *PTC_writer_particles(Scene *scene, Object *ob, ParticleSystem *psys)
+{
+ return (PTCWriter *)(new PTC::ParticlesWriter(scene, ob, psys));
+}
+
+PTCReader *PTC_reader_particles(Scene *scene, Object *ob, ParticleSystem *psys)
+{
+ return (PTCReader *)(new PTC::ParticlesReader(scene, ob, psys));
+}
+
+int PTC_reader_particles_totpoint(PTCReader *_reader)
+{
+ PTC::ParticlesReader *reader = (PTC::ParticlesReader *)_reader;
+ return reader->totpoint();
+}
diff --git a/source/blender/pointcache/intern/rigidbody.cpp b/source/blender/pointcache/intern/rigidbody.cpp
index accfbc3..279d3ff 100644
--- a/source/blender/pointcache/intern/rigidbody.cpp
+++ b/source/blender/pointcache/intern/rigidbody.cpp
@@ -23,6 +23,8 @@ extern "C" {
#include "DNA_rigidbody_types.h"
}
+#include "PTC_api.h"
+
namespace PTC {
using namespace Abc;
@@ -67,3 +69,16 @@ PTCReadSampleResult RigidBodyReader::read_sample(float frame)
}
} /* namespace PTC */
+
+
+/* ==== C API ==== */
+
+PTCWriter *PTC_writer_rigidbody(Scene *scene, RigidBodyWorld *rbw)
+{
+ return (PTCWriter *)(new PTC::RigidBodyWriter(scene, rbw));
+}
+
+PTCReader *PTC_reader_rigidbody(Scene *scene, RigidBodyWorld *rbw)
+{
+ return (PTCReader *)(new PTC::RigidBodyReader(scene, rbw));
+}
diff --git a/source/blender/pointcache/intern/smoke.cpp b/source/blender/pointcache/intern/smoke.cpp
index 4a516f2..2a12258 100644
--- a/source/blender/pointcache/intern/smoke.cpp
+++ b/source/blender/pointcache/intern/smoke.cpp
@@ -23,6 +23,8 @@ extern "C" {
#include "DNA_smoke_types.h"
}
+#include "PTC_api.h"
+
namespace PTC {
using namespace Abc;
@@ -69,3 +71,16 @@ PTCReadSampleResult SmokeReader::read_sample(float frame)
}
} /* namespace PTC */
+
+
+/* ==== C API ==== */
+
+PTCWriter *PTC_writer_smoke(Scene *scene, Object *ob, SmokeDomainSettings *domain)
+{
+ return (PTCWriter *)(new PTC::SmokeWriter(scene, ob, domain));
+}
+
+PTCReader *PTC_reader_smoke(Scene *scene, Object *ob, SmokeDomainSettings *domain)
+{
+ return (PTCReader *)(new PTC::SmokeReader(scene, ob, domain));
+}
diff --git a/source/blender/pointcache/intern/softbody.cpp b/source/blender/pointcache/intern/softbody.cpp
index 60e023b..a0cbb05 100644
--- a/source/blender/pointcache/intern/softbody.cpp
+++ b/source/blender/pointcache/intern/softbody.cpp
@@ -23,6 +23,8 @@ extern "C" {
#include "DNA_object_force.h"
}
+#include "PTC_api.h"
+
namespace PTC {
using namespace Abc;
@@ -69,3 +71,16 @@ PTCReadSampleResult SoftBodyReader::read_sample(float frame)
}
} /* namespace PTC */
+
+
+/* ==== C API ==== */
+
+PTCWriter *PTC_writer_softbody(Scene *scene, Object *ob, SoftBody *softbody)
+{
+ return (PTCWriter *)(new PTC::SoftBodyWriter(scene, ob, softbody));
+}
+
+PTCReader *PTC_reader_softbody(Scene *scene, Object *ob, SoftBody *softbody)
+{
+ return (PTCReader *)(new PTC::SoftBodyReader(scene, ob, softbody));
+}
More information about the Bf-blender-cvs
mailing list