Commit: 03eac283a5d59ad38aaaf01c6a5cd6805f81409c
Author: Sebastián Barschkis
Date: Tue Jul 19 00:19:37 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB03eac283a5d59ad38aaaf01c6a5cd6805f81409c
added functions to save / load liquid grids and particle systems
===================================================================
M intern/mantaflow/intern/SMOKE.cpp
M intern/mantaflow/intern/SMOKE.h
===================================================================
diff --git a/intern/mantaflow/intern/SMOKE.cpp
b/intern/mantaflow/intern/SMOKE.cpp
index bf524cf..f687bb1 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -291,6 +291,8 @@ void SMOKE::initLiquid(SmokeModifierData *smd)
+ liquid_variables
+ prep_domain
+ save_mesh
+ + save_liquid_data
+ + load_liquid_data
+ adaptive_step_liquid
+ liquid_step;
std::string finalString = parseScript(tmpString, smd);
@@ -862,10 +864,34 @@ void SMOKE::saveMesh(char *filename)
mCommands.clear();
std::ostringstream save_mesh;
- save_mesh << "save_mesh('" << path << "')";
+ save_mesh << "save_mesh('" << path << "')";
mCommands.push_back(save_mesh.str());
runPythonString(mCommands);
}
+void SMOKE::saveLiquidData(char *pathname)
+{
+ std::string path(pathname);
+
+ mCommands.clear();
+ std::ostringstream save_liquid_data;
+ save_liquid_data << "save_liquid_data('" << path << "')";
+ mCommands.push_back(save_liquid_data.str());
+
+ runPythonString(mCommands);
+}
+
+void SMOKE::loadLiquidData(char *pathname)
+{
+ std::string path(pathname);
+
+ mCommands.clear();
+ std::ostringstream load_liquid_data;
+ load_liquid_data << "load_liquid_data('" << path << "')";
+ mCommands.push_back(load_liquid_data.str());
+
+ runPythonString(mCommands);
+}
+
diff --git a/intern/mantaflow/intern/SMOKE.h b/intern/mantaflow/intern/SMOKE.h
index c2b5d0c..d054a8f 100644
--- a/intern/mantaflow/intern/SMOKE.h
+++ b/intern/mantaflow/intern/SMOKE.h
@@ -62,6 +62,10 @@ public:
// Write files for liquids
void saveMesh(char *filename);
+ void saveLiquidData(char *pathname);
+
+ // Load files for liquids
+ void loadLiquidData(char * pathname);
// Smoke getters
inline size_t getTotalCells() { return mTotalCells; }
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
