[Bf-blender-cvs] [c0ecba8] soc-2014-fluid: UI for UVS count
Roman Pogribnyi
noreply at git.blender.org
Tue Jun 10 23:57:02 CEST 2014
Commit: c0ecba800204067e7c5f5927923a98e4daedcd5c
Author: Roman Pogribnyi
Date: Tue Jun 10 22:59:58 2014 +0200
https://developer.blender.org/rBc0ecba800204067e7c5f5927923a98e4daedcd5c
UI for UVS count
===================================================================
M intern/smoke/intern/MANTA.h
M release/scripts/startup/bl_ui/properties_physics_smoke.py
M source/blender/makesdna/DNA_smoke_types.h
M source/blender/makesrna/intern/rna_smoke.c
===================================================================
diff --git a/intern/smoke/intern/MANTA.h b/intern/smoke/intern/MANTA.h
index 8e1deda..1897a7b 100644
--- a/intern/smoke/intern/MANTA.h
+++ b/intern/smoke/intern/MANTA.h
@@ -168,7 +168,7 @@ static void generate_manta_sim_file(Scene *scene, SmokeModifierData *smd)
/*Data Declaration*/
/*Wavelets variables*/
int upres = smd->domain->amplify;
- ss << "uvs = 1" << "\n"; /*TODO:add UI*/
+ ss << "uvs = " << smd->domain->manta_uvs_num << "\n";
ss << "velInflow = vec3(2, 0, 0)"<< "\n"; /*TODO:add UI*/
if (wavelets) {
ss << "upres = " << upres << "\n";
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index bebcb13..82c5435 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -343,9 +343,11 @@ class PHYSICS_PT_smoke_manta_settings(PhysicButtonsPanel, Panel):
domain = context.smoke.domain_settings
layout.active = domain.use_manta
- col = layout.split()
- col.operator("manta.make_file", text="Create Manta Setup")
+ split = layout.split()
+ split.operator("manta.make_file", text="Create Manta Setup")
+ col = split.column()
col.prop(domain, "manta_solver_res", text="Solver Resolution")
+ col.prop(domain, "manta_uvs", text="UVs count")
if __name__ == "__main__": # only for live edit.
bpy.utils.register_module(__name__)
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 9384ed8..c8bec28 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -152,7 +152,7 @@ typedef struct SmokeDomainSettings {
float flame_smoke_color[3];
/* mantaflow settings */
int manta_solver_res; /*dimension of manta solver, 2d or 3d*/
- int manta_mockvar;
+ int manta_uvs_num; /*number of UVs, important for octaves count*/
} SmokeDomainSettings;
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 137c1fc..6c1abbb 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -557,6 +557,13 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Solver Res", "Solver resolution(2D/3D)");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");
+ prop = RNA_def_property(srna, "manta_uvs", PROP_INT, PROP_NONE);
+ RNA_def_property_int_sdna(prop, NULL, "manta_uvs_num");
+ RNA_def_property_range(prop, 0, 4);
+ RNA_def_property_ui_range(prop, 0, 4, 1, -1);
+ RNA_def_property_ui_text(prop, "UVs number", "how many uv coordinate grind to use(Better not more than 2)");
+ RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");
+
}
static void rna_def_smoke_flow_settings(BlenderRNA *brna)
More information about the Bf-blender-cvs
mailing list