Commit: f91b07d655c58d4191f892617fe8c8fab50574b3 Author: Roman Pogribnyi Date: Mon Sep 22 14:46:14 2014 +0200 Branches: soc-2014-fluid https://developer.blender.org/rBf91b07d655c58d4191f892617fe8c8fab50574b3
loading flow data on first sim frame =================================================================== M intern/smoke/intern/scenarios/smoke.h =================================================================== diff --git a/intern/smoke/intern/scenarios/smoke.h b/intern/smoke/intern/scenarios/smoke.h index 505cb36..270996e 100644 --- a/intern/smoke/intern/scenarios/smoke.h +++ b/intern/smoke/intern/scenarios/smoke.h @@ -8,6 +8,11 @@ def transform_back(obj, gs):\n\ obj.scale(gs/2)\n\ obj.offset(gs/2)\n\ \n\ +def load_once(grid, file, dict):\n\ + if grid not in dict:\n\ + print('Loading file' + file + 'in grid')\n\ + grid.load(file)\n\ + dict[grid] = 1\n\ # solver params\n\ res = $RES$\n\ gs = vec3($RESX$,$RESY$,$RESZ$)\n\ @@ -35,7 +40,8 @@ flags.initDomain()\n\ flags.fillGrid()\n\ \n\ source = s.create(Mesh)\n\ -forces = s.create(MACGrid)\n"; +forces = s.create(MACGrid)\n\ +dict_loaded = dict()\n"; const string smoke_setup_high = "xl_gs = vec3($HRESX$, $HRESY$, $HRESZ$) \n\ xl = Solver(name = 'larger', gridSize = xl_gs, dim = solver_dim) \n\ @@ -71,8 +77,11 @@ if $USE_WAVELETS$ and $UPRES$ > 0:\n\ "; const string smoke_step_low = "def sim_step(t):\n\ - source.load('manta_flow.obj')\n\ - transform_back(source, gs)\n\ + #load_once(source,'manta_flow.obj',dict_loaded)\n\ + if t == 2:#loading data on first sim frame only\n\ + print('First frame: loading flows and obstacles')\n\ + source.load('manta_flow.obj')\n\ + transform_back(source, gs)\n\ if noise.valScale > 0.:\n\ densityInflowMeshNoise( flags=flags, density=density, noise=noise, mesh=source, scale=3, sigma=0.5 )\n\ else:\n\ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs