[Bf-blender-cvs] [f6a5020] soc-2014-fluid: wavelet vars added

Roman Pogribnyi noreply at git.blender.org
Sun Jun 8 13:20:55 CEST 2014


Commit: f6a5020d09d67b543858bc801d6086ed51ea237a
Author: Roman Pogribnyi
Date:   Sat Jun 7 16:38:52 2014 +0200
https://developer.blender.org/rBf6a5020d09d67b543858bc801d6086ed51ea237a

wavelet vars added

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

M	intern/smoke/intern/MANTA.h

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

diff --git a/intern/smoke/intern/MANTA.h b/intern/smoke/intern/MANTA.h
index 6e6e443..b532aca 100644
--- a/intern/smoke/intern/MANTA.h
+++ b/intern/smoke/intern/MANTA.h
@@ -155,8 +155,16 @@ static void generate_manta_sim_file(Scene *scene, SmokeModifierData *smd)
 	
 	/*header*/
 	ss << "from manta import * \n";
-
+	ss << "import os, shutil, math, sys \n";
+	
 /*Data Declaration*/
+	/*Wavelets variables*/
+	ss << "upres = " << smd->domain->amplify << "\n";
+	ss << "wltStrength = " << smd->domain->strength << "\n";
+	ss << "uvs = 1" << "\n";					/*TODO:add UI*/
+	ss << "octaves = 0"<< "\n";					/*TODO:add UI*/
+	ss << "velInflow = vec3(2, 0, 0)"<< "\n";	/*TODO:add UI*/
+	
 	/*Solver Resolution*/
 	ss << "res = " << smd->domain->maxres << " \n";
 		/*Z axis in Blender = Y axis in Mantaflow*/




More information about the Bf-blender-cvs mailing list