[Bf-blender-cvs] [7b648f2b4c1] fluid-mantaflow: secondary particle naming update
Sebastián Barschkis
noreply at git.blender.org
Fri Aug 24 00:25:47 CEST 2018
Commit: 7b648f2b4c17c5183580a713085985b2275f5954
Author: Sebastián Barschkis
Date: Fri Aug 24 00:24:01 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB7b648f2b4c17c5183580a713085985b2275f5954
secondary particle naming update
===================================================================
M intern/mantaflow/intern/FLUID.cpp
M source/blender/blenkernel/intern/particle_system.c
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/FLUID.cpp b/intern/mantaflow/intern/FLUID.cpp
index 33671341d4c..ada723cc893 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -70,9 +70,9 @@ FLUID::FLUID(int *res, SmokeModifierData *smd) : mCurrentID(++solverID)
mUsingGuiding = smd->domain->flags & FLUID_DOMAIN_USE_GUIDING;
mUsingLiquid = smd->domain->type == FLUID_DOMAIN_TYPE_LIQUID;
mUsingSmoke = smd->domain->type == FLUID_DOMAIN_TYPE_GAS;
- mUsingDrops = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_DROP;
+ mUsingDrops = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_SPRAY;
mUsingBubbles = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_BUBBLE;
- mUsingFloats = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_FLOAT;
+ mUsingFloats = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_FOAM;
mUsingTracers = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_TRACER;
// Simulation constants
@@ -788,14 +788,14 @@ std::string FLUID::getRealValue(const std::string& varName, SmokeModifierData *
else if (varName == "FLUID_DOMAIN_SIZE")
ss << smd->domain->domain_size;
else if (varName == "SNDPARTICLE_TYPES") {
- if (smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_DROP) {
+ if (smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_SPRAY) {
ss << "PtypeSpray";
}
if (smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_BUBBLE) {
if (!ss.str().empty()) ss << "|";
ss << "PtypeBubble";
}
- if (smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_FLOAT) {
+ if (smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_FOAM) {
if (!ss.str().empty()) ss << "|";
ss << "PtypeFoam";
}
@@ -806,8 +806,8 @@ std::string FLUID::getRealValue(const std::string& varName, SmokeModifierData *
if (ss.str().empty()) ss << "0";
} else if (varName == "USING_SNDPARTS") {
- tmpVar = (FLUID_DOMAIN_PARTICLE_DROP | FLUID_DOMAIN_PARTICLE_BUBBLE |
- FLUID_DOMAIN_PARTICLE_FLOAT | FLUID_DOMAIN_PARTICLE_TRACER);
+ tmpVar = (FLUID_DOMAIN_PARTICLE_SPRAY | FLUID_DOMAIN_PARTICLE_BUBBLE |
+ FLUID_DOMAIN_PARTICLE_FOAM | FLUID_DOMAIN_PARTICLE_TRACER);
ss << (((smd->domain->particle_type & tmpVar)) ? "True" : "False");
} else if (varName == "GUIDING_ALPHA")
ss << smd->domain->guiding_alpha;
@@ -1496,9 +1496,9 @@ void FLUID::exportLiquidScript(SmokeModifierData *smd)
BLI_path_make_safe(cacheDirScript);
bool mesh = smd->domain->flags & FLUID_DOMAIN_USE_MESH;
- bool drops = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_DROP;
+ bool drops = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_SPRAY;
bool bubble = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_BUBBLE;
- bool floater = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_FLOAT;
+ bool floater = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_FOAM;
bool tracer = smd->domain->particle_type & FLUID_DOMAIN_PARTICLE_TRACER;
bool obstacle = smd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE;
bool guiding = smd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDING;
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index e0535fd4916..269dda13b2b 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3848,9 +3848,9 @@ static void particles_manta_step(
// Sanity check: parts also enabled in fluid domain?
if ((part->type == PART_MANTA_FLIP && (sds->particle_type & FLUID_DOMAIN_PARTICLE_FLIP)==0) ||
- (part->type == PART_MANTA_SPRAY && (sds->particle_type & FLUID_DOMAIN_PARTICLE_DROP)==0) ||
+ (part->type == PART_MANTA_SPRAY && (sds->particle_type & FLUID_DOMAIN_PARTICLE_SPRAY)==0) ||
(part->type == PART_MANTA_BUBBLE && (sds->particle_type & FLUID_DOMAIN_PARTICLE_BUBBLE)==0) ||
- (part->type == PART_MANTA_FOAM && (sds->particle_type & FLUID_DOMAIN_PARTICLE_FLOAT)==0) ||
+ (part->type == PART_MANTA_FOAM && (sds->particle_type & FLUID_DOMAIN_PARTICLE_FOAM)==0) ||
(part->type == PART_MANTA_TRACER && (sds->particle_type & FLUID_DOMAIN_PARTICLE_TRACER)==0) )
{
BLI_snprintf(debugStrBuffer, sizeof(debugStrBuffer), "particles_manta_step::error - found particle system that is not enabled in fluid domain\n");
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 163d5e1e9d2..f840ec5e2e3 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2534,7 +2534,7 @@ static void update_flowsflags(SmokeDomainSettings *sds, Object **flowobjs, int n
/* initialize all smoke with "active_color" */
smoke_ensure_colors(sds->fluid, sds->smd);
}
- if (sds->type == FLUID_DOMAIN_TYPE_LIQUID && (sds->particle_type & FLUID_DOMAIN_PARTICLE_DROP || sds->particle_type & FLUID_DOMAIN_PARTICLE_FLOAT || sds->particle_type & FLUID_DOMAIN_PARTICLE_TRACER)) {
+ if (sds->type == FLUID_DOMAIN_TYPE_LIQUID && (sds->particle_type & FLUID_DOMAIN_PARTICLE_SPRAY || sds->particle_type & FLUID_DOMAIN_PARTICLE_FOAM || sds->particle_type & FLUID_DOMAIN_PARTICLE_TRACER)) {
liquid_ensure_sndparts(sds->fluid, sds->smd);
}
sds->active_fields = active_fields;
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 0de1b11abf8..a4bae87b6cd 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -142,9 +142,9 @@ enum {
/* particle types */
#define FLUID_DOMAIN_PARTICLE_FLIP (1<<0)
-#define FLUID_DOMAIN_PARTICLE_DROP (1<<1)
+#define FLUID_DOMAIN_PARTICLE_SPRAY (1<<1)
#define FLUID_DOMAIN_PARTICLE_BUBBLE (1<<2)
-#define FLUID_DOMAIN_PARTICLE_FLOAT (1<<3)
+#define FLUID_DOMAIN_PARTICLE_FOAM (1<<3)
#define FLUID_DOMAIN_PARTICLE_TRACER (1<<4)
/* cache options */
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 416f17b6a26..d47aa5d4156 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -221,7 +221,7 @@ static void rna_Smoke_flip_parts_update(Main *bmain, Scene *UNUSED(scene), Point
rna_Smoke_reset(NULL, NULL, ptr);
}
-static void rna_Smoke_drop_parts_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
+static void rna_Smoke_spray_parts_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{
Object *ob = (Object *)ptr->id.data;
SmokeModifierData *smd;
@@ -229,14 +229,14 @@ static void rna_Smoke_drop_parts_update(Main *bmain, Scene *UNUSED(scene), Point
bool exists = rna_Smoke_parts_exists(ptr, PART_MANTA_SPRAY);
if (ob->type == OB_MESH && !exists) {
- rna_Smoke_parts_create(bmain, ptr, "DropParticleSettings", "Drop Particles", "Drop Particle System", PART_MANTA_SPRAY);
- smd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_DROP;
+ rna_Smoke_parts_create(bmain, ptr, "SprayParticleSettings", "Spray Particles", "Spray Particle System", PART_MANTA_SPRAY);
+ smd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_SPRAY;
}
else {
rna_Smoke_parts_delete(ptr, PART_MANTA_SPRAY);
rna_Smoke_resetCache(NULL, NULL, ptr);
- smd->domain->particle_type &= ~FLUID_DOMAIN_PARTICLE_DROP;
+ smd->domain->particle_type &= ~FLUID_DOMAIN_PARTICLE_SPRAY;
}
rna_Smoke_draw_type_update(NULL, NULL, ptr);
rna_Smoke_reset(NULL, NULL, ptr);
@@ -263,7 +263,7 @@ static void rna_Smoke_bubble_parts_update(Main *bmain, Scene *UNUSED(scene), Poi
rna_Smoke_reset(NULL, NULL, ptr);
}
-static void rna_Smoke_float_parts_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
+static void rna_Smoke_foam_parts_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{
Object *ob = (Object *)ptr->id.data;
SmokeModifierData *smd;
@@ -271,14 +271,14 @@ static void rna_Smoke_float_parts_update(Main *bmain, Scene *UNUSED(scene), Poin
bool exists = rna_Smoke_parts_exists(ptr, PART_MANTA_FOAM);
if (ob->type == OB_MESH && !exists) {
- rna_Smoke_parts_create(bmain, ptr, "FloatParticleSettings", "Float Particles", "Float Particle System", PART_MANTA_FOAM);
- smd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_FLOAT;
+ rna_Smoke_parts_create(bmain, ptr, "FoamParticleSettings", "Foam Particles", "Foam Particle System", PART_MANTA_FOAM);
+ smd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_FOAM;
}
else {
rna_Smoke_parts_delete(ptr, PART_MANTA_FOAM);
rna_Smoke_resetCache(NULL, NULL, ptr);
- smd->domain->particle_type &= ~FLUID_DOMAIN_PARTICLE_FLOAT;
+ smd->domain->particle_type &= ~FLUID_DOMAIN_PARTICLE_FOAM;
}
rna_Smoke_draw_type_update(NULL, NULL, ptr);
rna_Smoke_reset(NULL, NULL, ptr);
@@ -1516,23 +1516,23 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");
- prop = RNA_def_property(srna, "use_drop_particles", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "particle_type", FLUID_DOMAIN_PARTICLE_DROP);
- RNA_def_property_ui_text(prop, "Drop", "Create drop particle system");
+ prop = RNA_def_property(srna, "use_spray_particles", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "particle_type", FLUID_DOMAIN_PARTICLE_SPRAY);
+ RNA_def_property_ui_text(prop, "Spray", "Create spray particle system");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
- RNA_def_property_update(prop, 0, "rna_Smoke_drop_parts_update");
+ RNA_def_property_update(prop, 0, "rna_Smoke_spray_parts_update");
prop = RNA_def_property(srna, "use_bubble_particles", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "particle_type", FLUID_DOMAIN_PARTICLE_BUBBLE);
- RNA_def_property_ui_text(prop, "Drop", "Create bubble particle system");
+ RNA_def_property_ui_text(prop, "Bubble", "Create bubble particle system");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_update(prop, 0, "rna_Smoke_bubble_parts_update");
- prop = RNA_def_property(srna, "use_floater_particles", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "particle_type", FLUID_DOMAIN_PARTICLE_FLOAT);
- RNA_de
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list