[Bf-blender-cvs] [d23f1a5] fluid-mantaflow: added c api functions for liquid grid io

Sebastián Barschkis noreply at git.blender.org
Fri Jul 22 21:05:49 CEST 2016


Commit: d23f1a594705c5d3da70d432021d78f8d978b3a8
Author: Sebastián Barschkis
Date:   Wed Jul 20 09:34:54 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBd23f1a594705c5d3da70d432021d78f8d978b3a8

added c api functions for liquid grid io

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

M	intern/mantaflow/extern/manta_smoke_API.h
M	intern/mantaflow/intern/manta_smoke_API.cpp

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

diff --git a/intern/mantaflow/extern/manta_smoke_API.h b/intern/mantaflow/extern/manta_smoke_API.h
index 1efab25..b0a2a02 100644
--- a/intern/mantaflow/extern/manta_smoke_API.h
+++ b/intern/mantaflow/extern/manta_smoke_API.h
@@ -93,6 +93,8 @@ float *liquid_get_phiinit(struct SMOKE *liquid);
 float *liquid_turbulence_get_phi(struct SMOKE *liquid);
 void liquid_ensure_init(struct SMOKE *liquid, struct SmokeModifierData *smd);
 void liquid_save_mesh(struct SMOKE *liquid, char *filename);
+void liquid_save_data(struct SMOKE *liquid, char *pathname);
+void liquid_load_data(struct SMOKE *liquid, char *pathname);
 int liquid_get_num_verts(struct SMOKE *liquid);
 int liquid_get_num_normals(struct SMOKE *liquid);
 int liquid_get_num_triangles(struct SMOKE *liquid);
diff --git a/intern/mantaflow/intern/manta_smoke_API.cpp b/intern/mantaflow/intern/manta_smoke_API.cpp
index e3fc8da..6d8caef 100644
--- a/intern/mantaflow/intern/manta_smoke_API.cpp
+++ b/intern/mantaflow/intern/manta_smoke_API.cpp
@@ -509,6 +509,20 @@ extern "C" void liquid_save_mesh(SMOKE *liquid, char *filename)
 	}
 }
 
+extern "C" void liquid_save_data(SMOKE *liquid, char *pathname)
+{
+	if (liquid) {
+		liquid->saveLiquidData(pathname);
+	}
+}
+
+extern "C" void liquid_load_data(SMOKE *liquid, char *pathname)
+{
+	if (liquid) {
+		liquid->loadLiquidData(pathname);
+	}
+}
+
 extern "C" int liquid_get_num_verts(SMOKE *liquid)
 {
 	return liquid->getNumVertices();




More information about the Bf-blender-cvs mailing list