[Bf-blender-cvs] [f33519945cd] fluid-mantaflow: Merge branch 'rnaSmoke' into smokeTypes
Sebastián Barschkis
noreply at git.blender.org
Sat Apr 6 22:13:42 CEST 2019
Commit: f33519945cdde35eef3c806a89e54c61320cdc07
Author: Sebastián Barschkis
Date: Tue Mar 26 20:44:00 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBf33519945cdde35eef3c806a89e54c61320cdc07
Merge branch 'rnaSmoke' into smokeTypes
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_smoke_types.h
index 5a80b4aeff3,e4f4db0be78..80ba3e28115
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@@ -366,58 -250,46 +363,59 @@@ typedef struct SmokeDomainSettings
float vector_scale;
char vector_draw_type;
char use_coba;
- /** Simulation field used for the color mapping. */
- char coba_field;
- char interp_method;
+ char coba_field; /* simulation field used for the color mapping */
+ char pad_display; /* unused */
+ /* -- Deprecated / unsed options (below)-- */
+
+ /* view options */
+ int viewsettings;
+ char pad_view[4]; /* unused */
+
+ /* OpenVDB cache options */
+ int openvdb_comp;
float clipping;
- char _pad3[4];
-} SmokeDomainSettings;
+ char data_depth;
+ char pad_vdb[7]; /* unused */
+ /* pointcache options */
+ /* Smoke uses only one cache from now on (index [0]), but keeping the array for now for reading old files. */
+ struct PointCache *point_cache[2]; /* definition is in DNA_object_force_types.h */
+ struct ListBase ptcaches[2];
+ int cache_comp;
+ int cache_high_comp;
-/* inflow / outflow */
+} SmokeDomainSettings;
/* type */
-#define MOD_SMOKE_FLOW_TYPE_SMOKE 0
-#define MOD_SMOKE_FLOW_TYPE_FIRE 1
-#define MOD_SMOKE_FLOW_TYPE_OUTFLOW 2
-#define MOD_SMOKE_FLOW_TYPE_SMOKEFIRE 3
+#define FLUID_FLOW_TYPE_SMOKE 1
+#define FLUID_FLOW_TYPE_FIRE 2
+#define FLUID_FLOW_TYPE_SMOKEFIRE 3
+#define FLUID_FLOW_TYPE_LIQUID 4
+
+/* behavior */
+#define FLUID_FLOW_BEHAVIOR_INFLOW 0
+#define FLUID_FLOW_BEHAVIOR_OUTFLOW 1
+#define FLUID_FLOW_BEHAVIOR_GEOMETRY 2
/* flow source */
-#define MOD_SMOKE_FLOW_SOURCE_PARTICLES 0
-#define MOD_SMOKE_FLOW_SOURCE_MESH 1
+#define FLUID_FLOW_SOURCE_PARTICLES 0
+#define FLUID_FLOW_SOURCE_MESH 1
/* flow texture type */
-#define MOD_SMOKE_FLOW_TEXTURE_MAP_AUTO 0
-#define MOD_SMOKE_FLOW_TEXTURE_MAP_UV 1
+#define FLUID_FLOW_TEXTURE_MAP_AUTO 0
+#define FLUID_FLOW_TEXTURE_MAP_UV 1
/* flags */
-enum {
- /**old style emission*/
- MOD_SMOKE_FLOW_ABSOLUTE = (1 << 1),
- /** passes particles speed to the smoke */
- MOD_SMOKE_FLOW_INITVELOCITY = (1 << 2),
- /** use texture to control emission speed */
- MOD_SMOKE_FLOW_TEXTUREEMIT = (1 << 3),
- /** use specific size for particles instead of closest cell */
- MOD_SMOKE_FLOW_USE_PART_SIZE = (1 << 4),
-};
+#define FLUID_FLOW_ABSOLUTE (1<<1) /* old style emission */
+#define FLUID_FLOW_INITVELOCITY (1<<2) /* passes particles speed to the smoke */
+#define FLUID_FLOW_TEXTUREEMIT (1<<3) /* use texture to control emission speed */
+#define FLUID_FLOW_USE_PART_SIZE (1<<4) /* use specific size for particles instead of closest cell */
+#define FLUID_FLOW_USE_INFLOW (1<<5) /* control when to apply inflow */
typedef struct SmokeFlowSettings {
- struct SmokeModifierData *smd; /* for fast RNA access */
+ /** For fast RNA access. */
+ struct SmokeModifierData *smd;
struct Mesh *mesh;
struct ParticleSystem *psys;
struct Tex *noise_texture;
@@@ -435,36 -305,34 +434,40 @@@
float density;
float color[3];
float fuel_amount;
- float temp; /* delta temperature (temp - ambient temp) */
- float volume_density; /* density emitted within mesh volume */
- float surface_distance; /* maximum emission distance from mesh surface */
+ /** Delta temperature (temp - ambient temp). */
+ float temp;
+ /** Density emitted within mesh volume. */
+ float volume_density;
+ /** Maximum emission distance from mesh surface. */
+ float surface_distance;
float particle_size;
int subframes;
+
/* texture control */
float texture_size;
float texture_offset;
- int pad;
- char uvlayer_name[64]; /* MAX_CUSTOMDATA_LAYER_NAME */
+ char _pad[4];
+ /** MAX_CUSTOMDATA_LAYER_NAME. */
+ char uvlayer_name[64];
short vgroup_density;
- /** Smoke, flames, both, outflow. */
- short type;
+ short type; /* smoke, flames, both, outflow, liquid */
+ short behavior; /* inflow, outflow, static */
short source;
short texture_type;
- /** Absolute emission et.c*/
- int flags;
+ short pad2[3];
+ int flags; /* absolute emission etc*/
} SmokeFlowSettings;
+/* effector types */
+#define FLUID_EFFECTOR_TYPE_COLLISION 0
+#define FLUID_EFFECTOR_TYPE_GUIDE 1
-// struct BVHTreeFromMesh *bvh;
-// float mat[4][4];
-// float mat_old[4][4];
+/* guiding velocity modes */
+#define FLUID_EFFECTOR_GUIDING_MAXIMUM 0
+#define FLUID_EFFECTOR_GUIDING_MINIMUM 1
+#define FLUID_EFFECTOR_GUIDING_OVERRIDE 2
+#define FLUID_EFFECTOR_GUIDING_AVERAGED 3
/* collision objects (filled with smoke) */
typedef struct SmokeCollSettings {
More information about the Bf-blender-cvs
mailing list