[Bf-blender-cvs] [df5cfbd] alembic_pointcache: Let the smoke cache work on a smoke domain rather than the smoke modifier data. This is a bit cleaner, it avoids referring to modifiers which are a separate concern and will probably be replaced as the container for smoke data at some point anyway.

Lukas Tönne noreply at git.blender.org
Thu Oct 16 16:54:14 CEST 2014


Commit: df5cfbdc47c06c23aac1417f59b5d7865db53f6a
Author: Lukas Tönne
Date:   Fri Jan 10 11:56:35 2014 +0100
Branches: alembic_pointcache
https://developer.blender.org/rBdf5cfbdc47c06c23aac1417f59b5d7865db53f6a

Let the smoke cache work on a smoke domain rather than the smoke
modifier data. This is a bit cleaner, it avoids referring to modifiers
which are a separate concern and will probably be replaced as the
container for smoke data at some point anyway.

===================================================================

M	source/blender/pointcache/PTC_api.cpp
M	source/blender/pointcache/PTC_api.h
M	source/blender/pointcache/intern/smoke.cpp
M	source/blender/pointcache/intern/smoke.h

===================================================================

diff --git a/source/blender/pointcache/PTC_api.cpp b/source/blender/pointcache/PTC_api.cpp
index 75622c1..1769e8c 100644
--- a/source/blender/pointcache/PTC_api.cpp
+++ b/source/blender/pointcache/PTC_api.cpp
@@ -221,14 +221,14 @@ PTCReader *PTC_reader_rigidbody(Scene *scene, RigidBodyWorld *rbw)
 }
 
 /* Smoke */
-PTCWriter *PTC_writer_smoke(Scene *scene, Object *ob, SmokeModifierData *smd)
+PTCWriter *PTC_writer_smoke(Scene *scene, Object *ob, SmokeDomainSettings *domain)
 {
-	return (PTCWriter *)(new PTC::SmokeWriter(scene, ob, smd));
+	return (PTCWriter *)(new PTC::SmokeWriter(scene, ob, domain));
 }
 
-PTCReader *PTC_reader_smoke(Scene *scene, Object *ob, SmokeModifierData *smd)
+PTCReader *PTC_reader_smoke(Scene *scene, Object *ob, SmokeDomainSettings *domain)
 {
-	return (PTCReader *)(new PTC::SmokeReader(scene, ob, smd));
+	return (PTCReader *)(new PTC::SmokeReader(scene, ob, domain));
 }
 
 /* Dynamic Paint */
diff --git a/source/blender/pointcache/PTC_api.h b/source/blender/pointcache/PTC_api.h
index 94edde1..72d3bab 100644
--- a/source/blender/pointcache/PTC_api.h
+++ b/source/blender/pointcache/PTC_api.h
@@ -35,7 +35,7 @@ struct DynamicPaintSurface;
 struct Object;
 struct ParticleSystem;
 struct RigidBodyWorld;
-struct SmokeModifierData;
+struct SmokeDomainSettings;
 struct SoftBody;
 
 struct PTCWriter;
@@ -79,8 +79,8 @@ struct PTCWriter *PTC_writer_rigidbody(struct Scene *scene, struct RigidBodyWorl
 struct PTCReader *PTC_reader_rigidbody(struct Scene *scene, struct RigidBodyWorld *rbw);
 
 /* Smoke */
-struct PTCWriter *PTC_writer_smoke(struct Scene *scene, struct Object *ob, struct SmokeModifierData *smd);
-struct PTCReader *PTC_reader_smoke(struct Scene *scene, struct Object *ob, struct SmokeModifierData *smd);
+struct PTCWriter *PTC_writer_smoke(struct Scene *scene, struct Object *ob, struct SmokeDomainSettings *domain);
+struct PTCReader *PTC_reader_smoke(struct Scene *scene, struct Object *ob, struct SmokeDomainSettings *domain);
 
 /* Dynamic Paint */
 struct PTCWriter *PTC_writer_dynamicpaint(struct Scene *scene, struct Object *ob, struct DynamicPaintSurface *surface);
diff --git a/source/blender/pointcache/intern/smoke.cpp b/source/blender/pointcache/intern/smoke.cpp
index 18370cb..4a516f2 100644
--- a/source/blender/pointcache/intern/smoke.cpp
+++ b/source/blender/pointcache/intern/smoke.cpp
@@ -20,7 +20,6 @@
 
 extern "C" {
 #include "DNA_object_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_smoke_types.h"
 }
 
@@ -29,10 +28,10 @@ namespace PTC {
 using namespace Abc;
 using namespace AbcGeom;
 
-SmokeWriter::SmokeWriter(Scene *scene, Object *ob, SmokeModifierData *smd) :
-    Writer(scene, &ob->id, smd->domain->point_cache[0]),
+SmokeWriter::SmokeWriter(Scene *scene, Object *ob, SmokeDomainSettings *domain) :
+    Writer(scene, &ob->id, domain->point_cache[0]),
     m_ob(ob),
-    m_smd(smd)
+    m_domain(domain)
 {
 	uint32_t fs = add_frame_sampling();
 	
@@ -49,10 +48,10 @@ void SmokeWriter::write_sample()
 }
 
 
-SmokeReader::SmokeReader(Scene *scene, Object *ob, SmokeModifierData *smd) :
-    Reader(scene, &ob->id, smd->domain->point_cache[0]),
+SmokeReader::SmokeReader(Scene *scene, Object *ob, SmokeDomainSettings *domain) :
+    Reader(scene, &ob->id, domain->point_cache[0]),
     m_ob(ob),
-    m_smd(smd)
+    m_domain(domain)
 {
 	if (m_archive.valid()) {
 		IObject root = m_archive.getTop();
diff --git a/source/blender/pointcache/intern/smoke.h b/source/blender/pointcache/intern/smoke.h
index 673efe7..dae41f3 100644
--- a/source/blender/pointcache/intern/smoke.h
+++ b/source/blender/pointcache/intern/smoke.h
@@ -27,34 +27,34 @@
 #include "writer.h"
 
 struct Object;
-struct SmokeModifierData;
+struct SmokeDomainSettings;
 
 namespace PTC {
 
 class SmokeWriter : public Writer {
 public:
-	SmokeWriter(Scene *scene, Object *ob, SmokeModifierData *smd);
+	SmokeWriter(Scene *scene, Object *ob, SmokeDomainSettings *domain);
 	~SmokeWriter();
 	
 	void write_sample();
 	
 private:
 	Object *m_ob;
-	SmokeModifierData *m_smd;
+	SmokeDomainSettings *m_domain;
 	
 //	AbcGeom::OPoints m_points;
 };
 
 class SmokeReader : public Reader {
 public:
-	SmokeReader(Scene *scene, Object *ob, SmokeModifierData *smd);
+	SmokeReader(Scene *scene, Object *ob, SmokeDomainSettings *domain);
 	~SmokeReader();
 	
 	PTCReadSampleResult read_sample(float frame);
 	
 private:
 	Object *m_ob;
-	SmokeModifierData *m_smd;
+	SmokeDomainSettings *m_domain;
 	
 //	AbcGeom::IPoints m_points;
 };




More information about the Bf-blender-cvs mailing list