#4742 exported normals are now correct #4821 & 4956 for complex movements in/outflows can now also use the animated mesh option - new features * isosurface subdivision: directly creates a finer surface mesh from the simulation data. this increases simulation time and harddisk usage, though, so be careful - usually values of 2-4 should be enough. * fluidsim particles: extended model for particle simulation and generation. When isosurface subdivision is enabled, the particles are now included in the surface generation, giving a better impression of a single connected surface. Note - the particles are only included in the final surface mesh, so the preview surface shows none of the particle effects. * particle loading: different types of particles can now be selected for display: drops, floats and tracers. This is a bit obsolete due to the extensions mentioned above, but might still be useful. Floats are just particles floating on the fluid surface, could be used for e.g. foam. * moving objects impact factor: this is another tweaking option, as the handling of moving objects is still not conserving mass. setting this to zero simply deletes the fluid, 1 is the default, while larger values cause a stronger impact. For tweaking the simulation: if fluid disappears, try increasing this value, and if too much is appearing reduce it. You can even use negative values for some strange results :) - more code cleanup, e.g. removed config file writing in fluidsim.c, added additional safety checks for particles & fluidsim domains (these currently dont work together). I also removed the "build particles" debug message in effects.c (seemed to be unnecessary?). Some more info on the new features: Here are two test animations showing the difference between using the particle generation with isosurface subdivision. This is how it would look with the old solver version: http://www10.informatik.uni-erlangen.de/~sinithue/blender/fluid6_fl6manc4_1noparts.mpg and this with the new one: http://www10.informatik.uni-erlangen.de/~sinithue/blender/fluid6_fl6manc4_2wparts.mpg Both simulations use a resolution of 64, however, the version with particles takes significantly longer (almost twice as long). The .blend file for a similar setup can be found here: http://www10.informatik.uni-erlangen.de/~sinithue/blender/fluid6_testmanc4.blend (Minor Tips for this file: dont enable subdivions of characters until rendering, thus leave off for simulation, as it uses the rendering settings! For making nice pictures switch on subdivion, and OSA.) And here's a picture of old vs. new (for webpage or so): http://www10.informatik.uni-erlangen.de/~sinithue/blender/fluid6_manc4compare.png
158 lines
4.5 KiB
C++
158 lines
4.5 KiB
C++
/**
|
|
*
|
|
* $Id:
|
|
*
|
|
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version. The Blender
|
|
* Foundation also sells licenses for use in proprietary software under
|
|
* the Blender License. See http://www.blender.org/BL/ for information
|
|
* about this.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2004-2005 by Blender Foundation
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
|
*/
|
|
#ifndef DNA_OBJECT_FLUIDSIM_H
|
|
#define DNA_OBJECT_FLUIDSIM_H
|
|
|
|
#include "DNA_ID.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct Mesh;
|
|
struct Ipo;
|
|
struct MVert;
|
|
|
|
typedef struct FluidsimSettings {
|
|
/* domain,fluid or obstacle */
|
|
short type;
|
|
/* display advanced options in fluid sim tab (on=1,off=0)*/
|
|
short show_advancedoptions;
|
|
|
|
/* domain object settings */
|
|
/* resolutions */
|
|
short resolutionxyz;
|
|
short previewresxyz;
|
|
/* size of the domain in real units (meters along largest resolution x,y,z extent) */
|
|
float realsize;
|
|
/* show original meshes, preview or final sim */
|
|
short guiDisplayMode;
|
|
short renderDisplayMode;
|
|
|
|
/* fluid properties */
|
|
float viscosityValue;
|
|
short viscosityMode;
|
|
short viscosityExponent;
|
|
/* gravity strength */
|
|
float gravx,gravy,gravz;
|
|
/* anim start end time */
|
|
float animStart, animEnd;
|
|
/* g star param (LBM compressibility) */
|
|
float gstar;
|
|
/* activate refinement? */
|
|
int maxRefine;
|
|
|
|
/* fluid object type settings */
|
|
/* gravity strength */
|
|
float iniVelx,iniVely,iniVelz;
|
|
|
|
/* store pointer to original mesh (for replacing the current one) */
|
|
struct Mesh *orgMesh;
|
|
/* pointer to the currently loaded fluidsim mesh */
|
|
struct Mesh *meshSurface;
|
|
/* a mesh to display the bounding box used for simulation */
|
|
struct Mesh *meshBB;
|
|
|
|
/* store output path, and file prefix for baked fluid surface */
|
|
/* strlens; 80= FILE_MAXFILE, 160= FILE_MAXDIR */
|
|
char surfdataPath[240];
|
|
|
|
/* store start coords of axis aligned bounding box together with size */
|
|
/* values are inited during derived mesh display */
|
|
float bbStart[3], bbSize[3];
|
|
|
|
/* animated params */
|
|
struct Ipo *ipo;
|
|
|
|
/* additional flags depending on the type, lower short contains flags
|
|
* to check validity, higher short additional flags */
|
|
short typeFlags;
|
|
/* switch off velocity genration, volume init type for fluid/obstacles (volume=1,shell=2,both=3) */
|
|
char domainNovecgen,volumeInitType;
|
|
|
|
/* boundary "stickiness" for part slip values */
|
|
float partSlipValue;
|
|
|
|
/* number of tracers to generate */
|
|
int generateTracers;
|
|
/* particle generation - on if >0, then determines amount (experimental...) */
|
|
float generateParticles;
|
|
/* smooth fluid surface? */
|
|
float surfaceSmoothing;
|
|
/* number of surface subdivisions*/
|
|
int surfaceSubdivs;
|
|
int unusedDNADummy;
|
|
|
|
/* particle display - size scaling, and alpha influence */
|
|
float particleInfSize, particleInfAlpha;
|
|
/* testing vars */
|
|
float farFieldSize;
|
|
|
|
/* save fluidsurface normals in mvert.no, and surface vertex velocities (if available) in mvert.co */
|
|
struct MVert *meshSurfNormals;
|
|
|
|
} FluidsimSettings;
|
|
|
|
/* ob->fluidsimSettings defines */
|
|
#define OB_FLUIDSIM_ENABLE 1
|
|
#define OB_FLUIDSIM_DOMAIN 2
|
|
#define OB_FLUIDSIM_FLUID 4
|
|
#define OB_FLUIDSIM_OBSTACLE 8
|
|
#define OB_FLUIDSIM_INFLOW 16
|
|
#define OB_FLUIDSIM_OUTFLOW 32
|
|
#define OB_FLUIDSIM_PARTICLE 64
|
|
|
|
#define OB_TYPEFLAG_START 0
|
|
#define OB_FSGEO_THIN (1<<(OB_TYPEFLAG_START+1))
|
|
#define OB_FSBND_NOSLIP (1<<(OB_TYPEFLAG_START+2))
|
|
#define OB_FSBND_PARTSLIP (1<<(OB_TYPEFLAG_START+3))
|
|
#define OB_FSBND_FREESLIP (1<<(OB_TYPEFLAG_START+4))
|
|
#define OB_FSINFLOW_LOCALCOORD (1<<(OB_TYPEFLAG_START+5))
|
|
|
|
// guiDisplayMode particle flags
|
|
#define OB_FSDOM_GEOM 1
|
|
#define OB_FSDOM_PREVIEW 2
|
|
#define OB_FSDOM_FINAL 3
|
|
#define OB_FSPART_BUBBLE (1<<1)
|
|
#define OB_FSPART_DROP (1<<2)
|
|
#define OB_FSPART_NEWPART (1<<3)
|
|
#define OB_FSPART_FLOAT (1<<4)
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|