Revision: 21628
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21628
Author: genscher
Date: 2009-07-16 16:31:32 +0200 (Thu, 16 Jul 2009)
Log Message:
-----------
Another fluid + (little) cloth gui and settings update
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_physic_cloth.py
branches/blender2.5/blender/release/ui/buttons_physics_fluid.py
branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
Modified: branches/blender2.5/blender/release/ui/buttons_physic_cloth.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_physic_cloth.py
2009-07-16 13:19:43 UTC (rev 21627)
+++ branches/blender2.5/blender/release/ui/buttons_physic_cloth.py
2009-07-16 14:31:32 UTC (rev 21628)
@@ -40,25 +40,28 @@
split = layout.split()
- col = split.column(align=True)
+ col = split.column()
col.itemR(cloth, "quality", slider=True)
- col.itemR(cloth, "gravity")
+ col.itemL(text="Gravity:")
+ col.itemR(cloth, "gravity", text="")
col.itemR(cloth, "pin_cloth", text="Pin")
- col = col.column(align=True)
- col.active = cloth.pin_cloth
- col.itemR(cloth, "pin_stiffness", text="Stiffness")
- col.item_pointerR(cloth, "mass_vertex_group", ob,
"vertex_groups", text="")
+ colsub = col.column(align=True)
+ colsub.active = cloth.pin_cloth
+ colsub.itemR(cloth, "pin_stiffness", text="Stiffness")
+ colsub.item_pointerR(cloth, "mass_vertex_group", ob,
"vertex_groups", text="")
- col = split.column(align=True)
+ col = split.column()
col.itemL(text="Presets...")
- col.itemL(text="")
- col.itemR(cloth, "mass")
- col.itemR(cloth, "structural_stiffness",
text="Structural")
- col.itemR(cloth, "bending_stiffness", text="Bending")
- col.itemL(text="Damping")
- col.itemR(cloth, "spring_damping", text="Spring")
- col.itemR(cloth, "air_damping", text="Air")
+ col.itemL(text="Material:")
+ colsub = col.column(align=True)
+ colsub.itemR(cloth, "mass")
+ colsub.itemR(cloth, "structural_stiffness",
text="Structural")
+ colsub.itemR(cloth, "bending_stiffness", text="Bending")
+ col.itemL(text="Damping:")
+ colsub = col.column(align=True)
+ colsub.itemR(cloth, "spring_damping", text="Spring")
+ colsub.itemR(cloth, "air_damping", text="Air")
# Disabled for now
"""
@@ -124,6 +127,7 @@
class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
__idname__ = "PHYSICS_PT_clothcollision"
__label__ = "Cloth Collision"
+ __default_closed__ = True
def poll(self, context):
return (context.cloth != None)
@@ -146,7 +150,7 @@
col.itemR(cloth, "min_distance", text="Distance")
col.itemR(cloth, "friction")
- col = split.column(align="True")
+ col = split.column(align=True)
col.itemR(cloth, "enable_self_collision", text="Self Collision")
col = col.column(align=True)
col.active = cloth.enable_self_collision
@@ -156,6 +160,7 @@
class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel):
__idname__ = "PHYSICS_PT_stiffness"
__label__ = "Cloth Stiffness Scaling"
+ __default_closed__ = True
def poll(self, context):
return (context.cloth != None)
@@ -175,17 +180,19 @@
split = layout.split()
- sub = split.column(align=True)
- sub.itemL(text="Structural Stiffness:")
- sub.itemR(cloth, "structural_stiffness_max", text="Max")
- sub.item_pointerR(cloth, "structural_stiffness_vertex_group",
ob, "vertex_groups", text="")
+ col = split.column()
+ col.itemL(text="Structural Stiffness:")
+ colsub = col.column(align=True)
+ colsub.itemR(cloth, "structural_stiffness_max", text="Max")
+ colsub.item_pointerR(cloth,
"structural_stiffness_vertex_group", ob, "vertex_groups", text="")
- sub = split.column(align=True)
- sub.itemL(text="Bending Stiffness:")
- sub.itemR(cloth, "bending_stiffness_max", text="Max")
- sub.item_pointerR(cloth, "bending_vertex_group", ob,
"vertex_groups", text="")
+ col = split.column()
+ col.itemL(text="Bending Stiffness:")
+ colsub = col.column(align=True)
+ colsub.itemR(cloth, "bending_stiffness_max", text="Max")
+ colsub.item_pointerR(cloth, "bending_vertex_group", ob,
"vertex_groups", text="")
bpy.types.register(PHYSICS_PT_cloth)
bpy.types.register(PHYSICS_PT_cloth_cache)
bpy.types.register(PHYSICS_PT_cloth_collision)
-bpy.types.register(PHYSICS_PT_cloth_stiffness)
+bpy.types.register(PHYSICS_PT_cloth_stiffness)
\ No newline at end of file
Modified: branches/blender2.5/blender/release/ui/buttons_physics_fluid.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_physics_fluid.py
2009-07-16 13:19:43 UTC (rev 21627)
+++ branches/blender2.5/blender/release/ui/buttons_physics_fluid.py
2009-07-16 14:31:32 UTC (rev 21628)
@@ -51,102 +51,127 @@
if fluid.type == 'DOMAIN':
layout.itemO("FLUID_OT_bake", text="BAKE")
- layout.itemL(text="Required Memory: " +
fluid.memory_estimate)
-
- layout.itemL(text="Resolution:")
-
split = layout.split()
col = split.column()
- colsub = col.column(align=True)
+ col.itemL(text="Resolution:")
+ colsub = col.column()
colsub.itemR(fluid, "resolution", text="Final")
+ colsub.itemL(text="Render Display:")
colsub.itemR(fluid, "render_display_mode",
text="")
+ col.itemL(text="Time:")
colsub = col.column(align=True)
- colsub.itemL(text="Time:")
colsub.itemR(fluid, "start_time", text="Start")
colsub.itemR(fluid, "end_time", text="End")
col = split.column()
- colsub = col.column(align=True)
- colsub.itemR(fluid, "preview_resolution",
text="Preview", slider=True)
+ colsub = col.column()
+ colsub.itemL(text="Required Memory: " +
fluid.memory_estimate)
+ colsub.itemR(fluid, "preview_resolution",
text="Preview")
+ colsub.itemL(text="Viewport Display:")
colsub.itemR(fluid, "viewport_display_mode",
text="")
colsub = col.column()
+ colsub.itemL(text="")
colsub.itemR(fluid, "reverse_frames")
colsub.itemR(fluid, "generate_speed_vectors")
- colsub.itemR(fluid, "path", text="")
- if fluid.type in ('FLUID', 'OBSTACLE', 'INFLOW',
'OUTFLOW'):
- layout.itemR(fluid, "volume_initialization")
+ layout.itemL(text="Path:")
+ layout.itemR(fluid, "path", text="")
if fluid.type == 'FLUID':
- row = layout.row()
- row.column().itemR(fluid, "initial_velocity")
- row.itemR(fluid, "export_animated_mesh")
+ split = layout.split()
+ col = split.column()
+ col.itemL(text="Volume Initialization:")
+ col.itemR(fluid, "volume_initialization",
text="")
+ col.itemR(fluid, "export_animated_mesh")
+ col = split.column()
+ col.itemL(text="Initial Velocity:")
+ col.itemR(fluid, "initial_velocity", text="")
if fluid.type == 'OBSTACLE':
- row = layout.row()
- row.itemL()
- row.itemR(fluid, "export_animated_mesh")
- layout.itemR(fluid, "slip_type", expand=True)
+ split = layout.split()
+ col = split.column()
+ col.itemL(text="Volume Initialization:")
+ col.itemR(fluid, "volume_initialization",
text="")
+ col.itemR(fluid, "export_animated_mesh")
+ col = split.column()
+ col.itemL(text="Slip Type:")
+ colsub=col.column(align=True)
+ colsub.itemR(fluid, "slip_type", text="")
if fluid.slip_type == 'PARTIALSLIP':
- layout.itemR(fluid,
"partial_slip_amount", text="Amount")
+ colsub.itemR(fluid,
"partial_slip_amount", text="Amount")
- layout.itemR(fluid, "impact_factor")
+ col.itemR(fluid, "impact_factor")
if fluid.type == 'INFLOW':
- row = layout.row()
- row.column().itemR(fluid, "inflow_velocity")
- row.itemR(fluid, "export_animated_mesh")
- layout.itemR(fluid, "local_coordinates")
+ split = layout.split()
+ col = split.column()
+ col.itemL(text="Volume Initialization:")
+ col.itemR(fluid, "volume_initialization",
text="")
+ col.itemR(fluid, "export_animated_mesh")
+ col.itemR(fluid, "local_coordinates")
+ col = split.column()
+ col.itemL(text="Inflow Velocity:")
+ col.itemR(fluid, "inflow_velocity", text="")
+
if fluid.type == 'OUTFLOW':
- row = layout.row()
- row.itemL()
- row.itemR(fluid, "export_animated_mesh")
+ split = layout.split()
+ col = split.column()
+ col.itemL(text="Volume Initialization:")
+ col.itemR(fluid, "volume_initialization",
text="")
+ col.itemR(fluid, "export_animated_mesh")
+ col = split.column()
if fluid.type == 'PARTICLE':
split = layout.split()
col = split.column()
+ col.itemL(text="Influence:")
+ colsub = col.column(align=True)
+ colsub.itemR(fluid, "particle_influence",
text="Size")
+ colsub.itemR(fluid, "alpha_influence",
text="Alpha")
+ col.itemL(text="Path:")
+
+ layout.itemR(fluid, "path", text="")
+
+ col = split.column()
col.itemL(text="Type:")
col.itemR(fluid, "drops")
col.itemR(fluid, "floats")
col.itemR(fluid, "tracer")
- col = split.column()
- col.itemL(text="Influence:")
- col.itemR(fluid, "particle_influence",
text="Particle")
- col.itemR(fluid, "alpha_influence",
text="Alpha")
-
- layout.itemR(fluid, "path")
-
if fluid.type == 'CONTROL':
split = layout.split()
col = split.column()
+ col.itemL(text="")
+ col.itemR(fluid, "quality", slider=True)
+ col.itemR(fluid, "reverse_frames")
+
+ col = split.column()
col.itemL(text="Time:")
+ col=col.column(align=True)
col.itemR(fluid, "start_time", text="Start")
col.itemR(fluid, "end_time", text="End")
- col = split.column()
- col.itemR(fluid, "quality", slider=True)
- col.itemR(fluid, "reverse_frames")
-
split = layout.split()
col = split.column()
- col.itemL(text="Attraction:")
+ col.itemL(text="Attraction Force:")
+ col=col.column(align=True)
col.itemR(fluid, "attraction_strength",
text="Strength")
col.itemR(fluid, "attraction_radius",
text="Radius")
col = split.column()
- col.itemL(text="Velocity:")
+ col.itemL(text="Velocity Force:")
+ col=col.column(align=True)
col.itemR(fluid, "velocity_strength",
text="Strength")
col.itemR(fluid, "velocity_radius",
text="Radius")
class PHYSICS_PT_domain_gravity(PhysicButtonsPanel):
__idname__ = "PHYSICS_PT_domain_gravity"
- __label__ = "Domain World/Gravity"
+ __label__ = "Domain World"
__default_closed__ = True
def poll(self, context):
@@ -161,18 +186,27 @@
split = layout.split()
col = split.column()
- col.itemR(fluid, "gravity")
+ col.itemL(text="Gravity:")
+ col.itemR(fluid, "gravity", text="")
- col = split.column(align=True)
- col.itemL(text="Viscosity:")
- col.itemR(fluid, "viscosity_preset", text="")
+ col.itemL(text="Size:")
+ col.itemR(fluid, "real_world_size", text="Real World Size")
+
+ col = split.column()
+ col.itemL(text="Viscosity Presets:")
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
