[Bf-blender-cvs] [2e6abd0] fluid-mantaflow: liquid settings: removed narrow band option (no need to toggle / turn off) and fixed particle randomness setting
Sebastián Barschkis
noreply at git.blender.org
Mon Aug 8 01:26:38 CEST 2016
Commit: 2e6abd0186a03a89f11f084014364a0f7c1d3a54
Author: Sebastián Barschkis
Date: Sun Aug 7 14:18:21 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB2e6abd0186a03a89f11f084014364a0f7c1d3a54
liquid settings: removed narrow band option (no need to toggle / turn off) and fixed particle randomness setting
===================================================================
M intern/mantaflow/intern/SMOKE.cpp
M intern/mantaflow/intern/strings/liquid_script.h
M release/scripts/startup/bl_ui/properties_physics_smoke.py
M source/blender/blenkernel/intern/smoke.c
M source/blender/makesdna/DNA_smoke_types.h
M source/blender/makesrna/intern/rna_smoke.c
===================================================================
diff --git a/intern/mantaflow/intern/SMOKE.cpp b/intern/mantaflow/intern/SMOKE.cpp
index 097e9f6..9313e69 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -542,6 +542,8 @@ std::string SMOKE::getRealValue(const std::string& varName, SmokeModifierData *
ss << smd->domain->flame_smoke_color[2];
else if (varName == "CURRENT_FRAME")
ss << md->scene->r.cfra;
+ else if (varName == "RANDOMNESS")
+ ss << smd->domain->particle_randomness;
else if (varName == "MANTA_EXPORT_PATH") {
char parent_dir[1024];
BLI_split_dir_part(smd->domain->manta_filepath, parent_dir, sizeof(parent_dir));
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index 6130c6f..7cf8a47 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -40,7 +40,8 @@ combineBandWidth = narrowBandWidth - 1\n\
\n\
minParticles = pow(2,dim)\n\
particleNumber = 2\n\
-radiusFactor = 1.0\n\
+radiusFactor = 1.0\n\
+randomness = $RANDOMNESS$\n\
\n\
gravity = (0,0,-1)\n\
step = -1\n\
@@ -89,7 +90,7 @@ def manta_step(start_frame):\n\
last_frame = s.frame\n\
\n\
pVel.setSource( vel, isMAC=True )\n\
- sampleLevelsetWithParticles( phi=phiInit, flags=flags, parts=pp, discretization=2, randomness=0.01, refillEmpty=True )\n\
+ sampleLevelsetWithParticles( phi=phiInit, flags=flags, parts=pp, discretization=2, randomness=randomness, refillEmpty=True )\n\
mapGridToPartsVec3(source=vel, parts=pp, target=pVel )\n\
adjustNumber( parts=pp, vel=vel, flags=flags, minParticles=1*minParticles, maxParticles=2*minParticles, phi=phi, radiusFactor=radiusFactor, narrowBand=narrowBandWidth )\n\
phi.join(phiInit)\n\
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index aa6b33a..ac63c1a 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -110,12 +110,6 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel):
col.label(text="Liquid:")
col.prop(domain, "particle_randomness")
- col = split.column(align=True)
- col.prop(domain, "use_narrow_band", text="Narrow Band")
- sub = col.column()
- sub.active = domain.use_narrow_band
- sub.prop(domain, "nb_width", text="Width")
-
elif md.smoke_type == 'FLOW':
flow = md.flow_settings
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 5ac3677..5c91a41 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -553,6 +553,9 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
smd->domain->viewsettings = MOD_SMOKE_VIEW_SHOWBIG;
smd->domain->effector_weights = BKE_add_effector_weights(NULL);
+ /* liquid */
+ smd->domain->particle_randomness = 0.1f;
+
#ifdef WITH_MANTA
/*mantaflow settings*/
smd->domain->manta_solver_res = 3;
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 84e996f..52021ca 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -42,7 +42,6 @@ enum {
MOD_SMOKE_DISSOLVE = (1 << 2), /* let smoke dissolve */
MOD_SMOKE_DISSOLVE_LOG = (1 << 3), /* using 1/x for dissolve */
MOD_SMOKE_USE_MANTA = (1 << 4),
- MOD_LIQUID_NARROW_BAND = (1 << 5),
#ifdef DNA_DEPRECATED
MOD_SMOKE_HIGH_SMOOTH = (1 << 5), /* -- Deprecated -- */
@@ -189,7 +188,7 @@ typedef struct SmokeDomainSettings {
/* liquid parameters */
float particle_randomness;
- float nb_width;
+ float mock_var2;
/* mantaflow settings */
struct SMOKE *fluid;
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 96038cc..e804e98 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -811,21 +811,10 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Time", "Animation time of noise");
prop = RNA_def_property(srna, "particle_randomness", PROP_FLOAT, PROP_NONE);
- RNA_def_property_range(prop, 0.0, 1.0);
- RNA_def_property_ui_range(prop, 1.0, 5.0, 1.0, 5);
+ RNA_def_property_range(prop, 0.01, 1.0);
+ RNA_def_property_ui_range(prop, 0.01, 2.0, 1.0, 5);
RNA_def_property_ui_text(prop, "Randomness", "Randomness factor for particle sampling");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");
-
- prop = RNA_def_property(srna, "nb_width", PROP_FLOAT, PROP_NONE);
- RNA_def_property_range(prop, 1.0, 10.0);
- RNA_def_property_ui_range(prop, 1.0, 5.0, 1.0, 5);
- RNA_def_property_ui_text(prop, "Width", "Narrow band width in cells");
- RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");
-
- prop = RNA_def_property(srna, "use_narrow_band", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_LIQUID_NARROW_BAND);
- RNA_def_property_ui_text(prop, "Use Narrow Band", "Enable narrow band for liquids");
- RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");
}
static void rna_def_smoke_flow_settings(BlenderRNA *brna)
More information about the Bf-blender-cvs
mailing list