[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46137] branches/smoke2/intern/smoke/ intern: Change svn properties for new added files.
Daniel Genrich
daniel.genrich at gmx.net
Tue May 1 09:54:35 CEST 2012
Revision: 46137
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46137
Author: genscher
Date: 2012-05-01 07:54:34 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Change svn properties for new added files.
Modified Paths:
--------------
branches/smoke2/intern/smoke/intern/source/smoke.cpp
Property Changed:
----------------
branches/smoke2/intern/smoke/intern/source/advectionplugins.cpp
branches/smoke2/intern/smoke/intern/source/animplugins.cpp
branches/smoke2/intern/smoke/intern/source/conjugategrad.cpp
branches/smoke2/intern/smoke/intern/source/conjugategrad.h
branches/smoke2/intern/smoke/intern/source/fileio.cpp
branches/smoke2/intern/smoke/intern/source/fluidsolver.cpp
branches/smoke2/intern/smoke/intern/source/fluidsolver.h
branches/smoke2/intern/smoke/intern/source/glutgui.cpp
branches/smoke2/intern/smoke/intern/source/grid.h
branches/smoke2/intern/smoke/intern/source/guihelpers.cpp
branches/smoke2/intern/smoke/intern/source/initplugins.cpp
branches/smoke2/intern/smoke/intern/source/main.cpp
branches/smoke2/intern/smoke/intern/source/operators.h
branches/smoke2/intern/smoke/intern/source/poissonsolvers.cpp
branches/smoke2/intern/smoke/intern/source/smoke.cpp
branches/smoke2/intern/smoke/intern/source/smoke.h
branches/smoke2/intern/smoke/intern/source/smokeplugins.cpp
branches/smoke2/intern/smoke/intern/source/solverinit.cpp
branches/smoke2/intern/smoke/intern/source/solverinit.h
branches/smoke2/intern/smoke/intern/source/solverparams.cpp
branches/smoke2/intern/smoke/intern/source/solverparams.h
branches/smoke2/intern/smoke/intern/source/solverplugin.h
branches/smoke2/intern/smoke/intern/source/stdplugins.cpp
branches/smoke2/intern/smoke/intern/source/vortexpart.cpp
branches/smoke2/intern/smoke/intern/source/vortexpart.h
branches/smoke2/intern/smoke/intern/source/vortexplugins.cpp
branches/smoke2/intern/smoke/intern/util/boundbox.h
branches/smoke2/intern/smoke/intern/util/globals.cpp
branches/smoke2/intern/smoke/intern/util/globals.h
branches/smoke2/intern/smoke/intern/util/matrixbase.h
branches/smoke2/intern/smoke/intern/util/paramset.cpp
branches/smoke2/intern/smoke/intern/util/paramset.h
branches/smoke2/intern/smoke/intern/util/quaternion.h
branches/smoke2/intern/smoke/intern/util/randomstream.h
branches/smoke2/intern/smoke/intern/util/vectorbase.h
branches/smoke2/intern/smoke/intern/util/waveletnoise.h
Property changes on: branches/smoke2/intern/smoke/intern/source/advectionplugins.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/animplugins.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/conjugategrad.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/conjugategrad.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/fileio.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/fluidsolver.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/fluidsolver.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/glutgui.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/grid.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/guihelpers.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/initplugins.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/main.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/operators.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/smoke2/intern/smoke/intern/source/poissonsolvers.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/smoke2/intern/smoke/intern/source/smoke.cpp
===================================================================
--- branches/smoke2/intern/smoke/intern/source/smoke.cpp 2012-05-01 06:50:43 UTC (rev 46136)
+++ branches/smoke2/intern/smoke/intern/source/smoke.cpp 2012-05-01 07:54:34 UTC (rev 46137)
@@ -1,48 +1,48 @@
-#include "smoke.h"
-
-using namespace std;
-using namespace DDF;
-
-void FLUID_3D::init()
-{
- printf("-------------------- SMOKE INIT A-------------------------\n");
- { // static scene
- SolverObject* solver = new SolverObject( "makescene", nVec3i ( _res[0], _res[1], _res[2] ), DDF_GRID_NO_FREE );
- solver->createVec3Grid ( "normal", DDF_GRID_NO_FREE /* Do not free grid when freeing solver */);
- solver->createRealGrid ( "dist", DDF_GRID_NO_FREE );
- solver->addInitPlugin ( "init-box-domain", IntArg ( "flag-inside",FFLUID ) + IntArg ( "flag-border",FINFLOW ) + IntArg("flag-floor", FOBSTACLE) );
-
- // obstacles
- solver->addInitPlugin ( "init-sphere", VecArg("center",Vec3(0.25,0.6,0.35)) + RealArg("radius",0.1) + StringArg("norm","normal")+StringArg("dist","dist"));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.2,0.0,0.3)) + VecArg("pos2",Vec3(0.3,0.6,0.4)) + StringArg("norm","normal")+StringArg("dist","dist"));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.3,0.0,0.65)) + VecArg("pos2",Vec3(0.5,0.3,0.9)) + StringArg("norm","normal")+StringArg("dist","dist"));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.6,0.0,0.3)) + VecArg("pos2",Vec3(0.65,0.4,0.5)) + StringArg("norm","normal")+StringArg("dist","dist"));
-
- // smoke seed
- solver->addInitPlugin ( "init-sphere", VecArg("center",Vec3(0.3,0.65,0.35)) + RealArg("radius",0.1) + IntArg("type", FDENSITYSOURCE));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.25,0.0,0.3)) + VecArg("pos2",Vec3(0.35,0.65,0.4)) + IntArg("type", FDENSITYSOURCE));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.35,0.0,0.65)) + VecArg("pos2",Vec3(0.55,0.35,0.9)) + IntArg("type", FDENSITYSOURCE));
- solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.65,0.0,0.3)) + VecArg("pos2",Vec3(0.7,0.45,0.5)) + IntArg("type", FDENSITYSOURCE));
-
- _solvers.push_back(solver);
- }
-
- initAllSolvers();
-
- advanceAllSolvers();
-
- finalizeAllSolvers();
-
- _flags = _solvers[0]->getParams().getGridInt("flags");
- _normal = _solvers[0]->getParams().getGridVec3("normal");
- _dist = _solvers[0]->getParams().getGridReal("dist");
-
- freeAllSolvers();
-
- precompute();
-
- printf("-------------------- SMOKE INIT B-------------------------\n");
- {
+#include "smoke.h"
+
+using namespace std;
+using namespace DDF;
+
+void FLUID_3D::init()
+{
+ printf("-------------------- SMOKE INIT A-------------------------\n");
+ { // static scene
+ SolverObject* solver = new SolverObject( "makescene", nVec3i ( _res[0], _res[1], _res[2] ), DDF_GRID_NO_FREE );
+ solver->createVec3Grid ( "normal", DDF_GRID_NO_FREE /* Do not free grid when freeing solver */);
+ solver->createRealGrid ( "dist", DDF_GRID_NO_FREE );
+ solver->addInitPlugin ( "init-box-domain", IntArg ( "flag-inside",FFLUID ) + IntArg ( "flag-border",FINFLOW ) + IntArg("flag-floor", FOBSTACLE) );
+
+ // obstacles
+ solver->addInitPlugin ( "init-sphere", VecArg("center",Vec3(0.25,0.6,0.35)) + RealArg("radius",0.1) + StringArg("norm","normal")+StringArg("dist","dist"));
+ solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.2,0.0,0.3)) + VecArg("pos2",Vec3(0.3,0.6,0.4)) + StringArg("norm","normal")+StringArg("dist","dist"));
+ solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.3,0.0,0.65)) + VecArg("pos2",Vec3(0.5,0.3,0.9)) + StringArg("norm","normal")+StringArg("dist","dist"));
+ solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.6,0.0,0.3)) + VecArg("pos2",Vec3(0.65,0.4,0.5)) + StringArg("norm","normal")+StringArg("dist","dist"));
+
+ // smoke seed
+ solver->addInitPlugin ( "init-sphere", VecArg("center",Vec3(0.3,0.65,0.35)) + RealArg("radius",0.1) + IntArg("type", FDENSITYSOURCE));
+ solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.25,0.0,0.3)) + VecArg("pos2",Vec3(0.35,0.65,0.4)) + IntArg("type", FDENSITYSOURCE));
+ solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.35,0.0,0.65)) + VecArg("pos2",Vec3(0.55,0.35,0.9)) + IntArg("type", FDENSITYSOURCE));
+ solver->addInitPlugin ( "init-box", VecArg("pos1",Vec3(0.65,0.0,0.3)) + VecArg("pos2",Vec3(0.7,0.45,0.5)) + IntArg("type", FDENSITYSOURCE));
+
+ _solvers.push_back(solver);
+ }
+
+ initAllSolvers();
+
+ advanceAllSolvers();
+
+ finalizeAllSolvers();
+
+ _flags = _solvers[0]->getParams().getGridInt("flags");
+ _normal = _solvers[0]->getParams().getGridVec3("normal");
+ _dist = _solvers[0]->getParams().getGridReal("dist");
+
+ freeAllSolvers();
+
+ precompute();
+
+ printf("-------------------- SMOKE INIT B-------------------------\n");
+ {
SolverObject* solver = new SolverObject( "run_static", _flags );
Vec3 inflow (0.0, 0, 0.4); // DG TODO: get this from blender
@@ -88,86 +88,86 @@
solver->addPlugin ("maccormack-advect-real", StringArg("real-src","density"));
// solver->addPlugin( "dump-df3", IntArg("max-frames",200) + StringArg("gridname","density") + StringArg("prefix","sta") + RealArg("start-time",0) + IntArg("pbrt",1) + StringArg ( "override-name", "render/static" ));
- _solvers.push_back(solver);
- }
-
- initAllSolvers();
-
- _vorticity = _solvers[0]->getParams().getGridVec3("vorticity");
- _density = _solvers[0]->getParams().getGridReal("density");
-
-}
-
-// static precompute
-void FLUID_3D::precompute(/* const std::string& name, const Vec3& inflow, int frames, bool dynamic, const Vec3& rotAxis = Vec3(0.), Real rotSpeed = 0. */)
-{
- Vec3 inflow (0.0, 0, 0.4); /* DG TODO: Use blender stuff here */
- const int frames = 50; /* DG TODO: Use blender stuff here */
- SolverObject* solver = new SolverObject( "precompute", _flags );
-
- // create grids
- solver->createVec3Grid ( "normal", _normal );
- solver->createRealGrid ( "dist", _dist );
- solver->createVec3Grid ( "mean-vel", DDF_GRID_NO_FREE );
- solver->createVec3Grid ( "abl", DDF_GRID_NO_FREE );
- solver->addStandardSolverGrids(); // DG TODO: need to transfer them to smoke: Are these only temp grids? --> Don't think so, will get updated after every frame?
-
- // load grids, initialize fluid velocities
- // TODO solver->addInitPlugin ( "load-universal", StringArg("grid","dist") + StringArg("file","scene/" + name + "-dist.gz"));
- // TODO solver->addInitPlugin ( "load-universal", StringArg("grid","normal") + StringArg("file","scene/" + name + "-normal.gz"));
- solver->addInitPlugin ( "set-conditional", StringArg ( "gridname","vel-curr" ) + VecArg ( "target-vec",inflow ) + IntArg ( "flag", FFLUID ) );
-
- // program solver main loop
- solver->addPlugin ( "set-conditional", StringArg ( "gridname","vel-curr" ) + VecArg ( "target-vec",inflow ) + IntArg ( "flag", FINFLOW ) );
- solver->addPlugin ( "maccormack-advect-vec3", StringArg ( "vel-src", "vel-curr" ) );
- solver->addPlugin ( "set-noslip-bcs", StringArg ( "grid","vel-curr" ) );
- solver->addPlugin ( "diffuse-grid", StringArg ( "src-vec3", "vel-curr" ) + RealArg ( "diff", 0.3 ) );
-
- solver->addPlugin ( "solve-pressure", IntArg ( "openbound",0 ) );
-
- solver->addPlugin ( "average", StringArg ( "gridname","vel-curr" ) + StringArg ( "sumgrid","mean-vel" ) + IntArg ( "from", frames ) + IntArg ( "frames", frames ) + IntArg ( "post-quit",1 ) );
-
- // program final steps
- solver->addEndPlugin ( "calc-abl", StringArg ("mean-vel","mean-vel") + StringArg ("dist","dist") + StringArg("normal","normal") + StringArg("abl","abl") + RealArg("d", 1.7));
-
- // if (dynamic)
- // solver->addEndPlugin ( "add-database", StringArg("grid","abl") + StringArg("normal","normal") + VecArg("u0",rotate ? (rotSpeed*rotAxis):inflow));
- // else
- // {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list