[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23574] trunk/blender: Unified effector functionality for particles, cloth and softbody

Janne Karhu jhkarh at utu.fi
Thu Oct 1 00:10:14 CEST 2009


Revision: 23574
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23574
Author:   jhk
Date:     2009-10-01 00:10:14 +0200 (Thu, 01 Oct 2009)

Log Message:
-----------
Unified effector functionality for particles, cloth and softbody

* Unified scene wide gravity (currently in scene buttons) 
  instead of each simulation having it's own gravity.
* Weight parameters for all effectors and an effector group 
  setting.
* Every effector can use noise.
* Most effectors have "shapes" point, plane, surface, every point.
	- "Point" is most like the old effectors and uses the 
	  effector location as the effector point.
	- "Plane" uses the closest point on effectors local xy-plane 
	  as the effector point.
	- "Surface" uses the closest point on an effector object's 
	  surface as the effector point.
	- "Every Point" uses every point in a mesh effector object 
	  as an effector point.
	- The falloff is calculated from this point, so for example 
	  with "surface" shape and "use only negative z axis" it's 
	  possible to apply force only "inside" the effector object.
* Spherical effector is now renamed as "force" as it's no longer 
  just spherical.
* New effector parameter "flow", which makes the effector act as 
  surrounding air velocity, so the resulting force is 
  proportional to the velocity difference of the point and "air 
  velocity". For example a wind field with flow=1.0 results in 
  proper non-accelerating wind.
* New effector fields "turbulence", which creates nice random 
  flow paths, and "drag", which slows the points down.
* Much improved vortex field.
* Effectors can now effect particle rotation as well as location.
* Use full, or only positive/negative z-axis to apply force 
  (note. the z-axis is the surface normal in the case of 
  effector shape "surface")
* New "force field" submenu in add menu, which adds an empty 
  with the chosen effector (curve object for corve guides).
* Other dynamics should be quite easy to add to the effector 
  system too if wanted.
* "Unified" doesn't mean that force fields give the exact same results for 
  particles, softbody & cloth, since their final effect depends on many external 
  factors, like for example the surface area of the effected faces.

Code changes
* Subversion bump for correct handling of global gravity.
* Separate ui py file for common dynamics stuff.
* Particle settings updating is flushed with it's id through 
  DAG_id_flush_update(..).
  
Known issues
* Curve guides don't yet have all ui buttons in place, but they 
  should work none the less.
* Hair dynamics don't yet respect force fields.

Other changes
* Particle emission defaults now to frames 1-200 with life of 50 
  frames to fill the whole default timeline.
* Many particles drawing related crashes fixed.
* Sometimes particles didn't update on first frame properly.
* Hair with object/group visualization didn't work properly.
* Memory leaks with PointCacheID lists (Genscher, remember to 
  free pidlists after use :).

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/buttons_particle.py
    trunk/blender/release/scripts/ui/buttons_physics_cloth.py
    trunk/blender/release/scripts/ui/buttons_physics_field.py
    trunk/blender/release/scripts/ui/buttons_physics_softbody.py
    trunk/blender/release/scripts/ui/buttons_scene.py
    trunk/blender/source/blender/blenkernel/BKE_collision.h
    trunk/blender/source/blender/blenkernel/BKE_effect.h
    trunk/blender/source/blender/blenkernel/BKE_particle.h
    trunk/blender/source/blender/blenkernel/intern/boids.c
    trunk/blender/source/blender/blenkernel/intern/cloth.c
    trunk/blender/source/blender/blenkernel/intern/collision.c
    trunk/blender/source/blender/blenkernel/intern/depsgraph.c
    trunk/blender/source/blender/blenkernel/intern/effect.c
    trunk/blender/source/blender/blenkernel/intern/implicit.c
    trunk/blender/source/blender/blenkernel/intern/modifier.c
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/blenkernel/intern/particle.c
    trunk/blender/source/blender/blenkernel/intern/particle_system.c
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/blenkernel/intern/smoke.c
    trunk/blender/source/blender/blenkernel/intern/softbody.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/blenloader/intern/writefile.c
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/editors/object/object_edit.c
    trunk/blender/source/blender/editors/object/object_intern.h
    trunk/blender/source/blender/editors/object/object_modifier.c
    trunk/blender/source/blender/editors/object/object_ops.c
    trunk/blender/source/blender/editors/physics/particle_boids.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/makesdna/DNA_cloth_types.h
    trunk/blender/source/blender/makesdna/DNA_object_force.h
    trunk/blender/source/blender/makesdna/DNA_particle_types.h
    trunk/blender/source/blender/makesdna/DNA_scene_types.h
    trunk/blender/source/blender/makesrna/intern/rna_boid.c
    trunk/blender/source/blender/makesrna/intern/rna_cloth.c
    trunk/blender/source/blender/makesrna/intern/rna_object.c
    trunk/blender/source/blender/makesrna/intern/rna_object_force.c
    trunk/blender/source/blender/makesrna/intern/rna_particle.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Added Paths:
-----------
    trunk/blender/release/scripts/ui/buttons_physics_common.py

Modified: trunk/blender/release/scripts/ui/buttons_particle.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_particle.py	2009-09-30 21:31:08 UTC (rev 23573)
+++ trunk/blender/release/scripts/ui/buttons_particle.py	2009-09-30 22:10:14 UTC (rev 23574)
@@ -1,6 +1,11 @@
 
 import bpy
 
+from buttons_physics_common import point_cache_ui
+from buttons_physics_common import effector_weights_ui
+from buttons_physics_common import basic_force_field_settings_ui
+from buttons_physics_common import basic_force_field_falloff_ui
+
 def particle_panel_enabled(psys):
 	return psys.point_cache.baked==False and psys.edited==False
 	
@@ -10,72 +15,6 @@
 	if psys.settings==None:  return False
 	return psys.settings.type in ('EMITTER', 'REACTOR', 'HAIR')
 	
-def point_cache_ui(self, cache, enabled, particles, smoke):
-	layout = self.layout
-	layout.set_context_pointer("PointCache", cache)
-	
-	row = layout.row()
-	row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2 )
-	col = row.column(align=True)
-	col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
-	col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")
-	
-	row = layout.row()
-	row.itemL(text="File Name:")
-	if particles:
-		row.itemR(cache, "external")
-	
-	if cache.external:
-		split = layout.split(percentage=0.80)
-		split.itemR(cache, "name", text="")
-		split.itemR(cache, "index", text="")
-		
-		layout.itemL(text="File Path:")
-		layout.itemR(cache, "filepath", text="")
-		
-		layout.itemL(text=cache.info)
-	else:
-		layout.itemR(cache, "name", text="")
-		
-		if not particles:
-			row = layout.row()
-			row.enabled = enabled
-			row.itemR(cache, "start_frame")
-			row.itemR(cache, "end_frame")
-		
-		row = layout.row()
-	
-		if cache.baked == True:
-			row.itemO("ptcache.free_bake", text="Free Bake")
-		else:
-			row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
-	
-		sub = row.row()
-		sub.enabled = (cache.frames_skipped or cache.outdated) and enabled
-		sub.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
-		
-		row = layout.row()
-		row.enabled = enabled
-		row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
-		if not smoke:
-			row.itemR(cache, "step");
-	
-		if not smoke:
-			row = layout.row()
-			sub = row.row()
-			sub.enabled = enabled
-			sub.itemR(cache, "quick_cache")
-			row.itemR(cache, "disk_cache")
-	
-		layout.itemL(text=cache.info)
-		
-		layout.itemS()
-		
-		row = layout.row()
-		row.item_booleanO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
-		row.itemO("ptcache.free_bake_all", text="Free All Bakes")
-		layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
-	
 
 class ParticleButtonsPanel(bpy.types.Panel):
 	__space_type__ = 'PROPERTIES'
@@ -245,23 +184,22 @@
 		split = layout.split()
 			
 		col = split.column()
-		col.itemL(text="Quality:")
-		col.itemR(cloth, "quality", text="Steps",slider=True)
-		col.itemL(text="Gravity:")
-		col.itemR(cloth, "gravity", text="")
-		
-		col = split.column()
 		col.itemL(text="Material:")
 		sub = col.column(align=True)
 		sub.itemR(cloth, "pin_stiffness", text="Stiffness")
 		sub.itemR(cloth, "mass")
 		sub.itemR(cloth, "bending_stiffness", text="Bending")
+		sub.itemR(cloth, "internal_friction", slider="True")
+		
+		col = split.column()
+
 		col.itemL(text="Damping:")
 		sub = col.column(align=True)
 		sub.itemR(cloth, "spring_damping", text="Spring")
 		sub.itemR(cloth, "air_damping", text="Air")
 		
-		layout.itemR(cloth, "internal_friction", slider="True")
+		col.itemL(text="Quality:")
+		col.itemR(cloth, "quality", text="Steps",slider=True)
 				
 class PARTICLE_PT_cache(ParticleButtonsPanel):
 	__label__ = "Cache"
@@ -385,9 +323,11 @@
 			sub.itemR(part, "brownian_factor")
 			sub.itemR(part, "drag_factor", slider=True)
 			sub.itemR(part, "damp_factor", slider=True)
-			sub.itemR(part, "integrator")
 			sub = split.column()
-			sub.itemR(part, "acceleration")
+			sub.itemR(part, "size_deflect")
+			sub.itemR(part, "die_on_collision")
+			sub.itemR(part, "integrator")
+			sub.itemR(part, "time_tweak")
 			
 		elif part.physics_type == 'KEYED':
 			split = layout.split()
@@ -445,14 +385,10 @@
 			
 			col = row.column()
 			col.itemL(text="Misc:")
-			col.itemR(part, "gravity")
 			col.itemR(boids, "banking", slider=True)
 			col.itemR(boids, "height", slider=True)
 			
-		if part.physics_type=='NEWTON':
-			sub.itemR(part, "size_deflect")
-			sub.itemR(part, "die_on_collision")
-		elif part.physics_type=='KEYED' or part.physics_type=='BOIDS':
+		if part.physics_type=='KEYED' or part.physics_type=='BOIDS':
 			if part.physics_type=='BOIDS':
 				layout.itemL(text="Relations:")
 			
@@ -502,11 +438,10 @@
 		return psys.settings.physics_type=='BOIDS'
 	
 	def draw(self, context):
-		psys = context.particle_system
-		boids = psys.settings.boids
+		boids = context.particle_system.settings.boids
 		layout = self.layout
 		
-		layout.enabled = particle_panel_enabled(psys)
+		layout.enabled = particle_panel_enabled(context.particle_system)
 		
 		# Currently boids can only use the first state so these are commented out for now.
 		#row = layout.row()
@@ -858,30 +793,41 @@
 		sub = split.column()
 		sub.itemR(part, "kink_shape", slider=True)
 
-class PARTICLE_PT_effectors(ParticleButtonsPanel):
-	__label__ = "Effectors"
+class PARTICLE_PT_field_weights(ParticleButtonsPanel):
+	__label__ = "Field Weights"
 	__default_closed__ = True
 	
 	def draw(self, context):
+		part = context.particle_system.settings
+		effector_weights_ui(self, part.effector_weights)
+		
+		if part.type == 'HAIR':
+			self.layout.itemR(part.effector_weights, "do_growing_hair")
+		
+class PARTICLE_PT_force_fields(ParticleButtonsPanel):
+	__label__ = "Force Field Settings"
+	__default_closed__ = True
+	
+	def draw(self, context):
 		layout = self.layout
-
-		psys = context.particle_system
-		part = psys.settings
+		part = context.particle_system.settings
 		
-		layout.itemR(part, "effector_group")
+		layout.itemR(part, "self_effect")
 		
-		layout.itemR(part, "eweight_all", slider=True)
+		split = layout.split(percentage=0.2)
+		split.itemL(text="Type 1:")
+		split.itemR(part.force_field_1, "type",text="")
+		basic_force_field_settings_ui(self, part.force_field_1)
+		basic_force_field_falloff_ui(self, part.force_field_1)
 		
-		layout.itemS()
-		layout.itemR(part, "eweight_spherical", slider=True)
-		layout.itemR(part, "eweight_vortex", slider=True)
-		layout.itemR(part, "eweight_magnetic", slider=True)
-		layout.itemR(part, "eweight_wind", slider=True)
-		layout.itemR(part, "eweight_curveguide", slider=True)
-		layout.itemR(part, "eweight_texture", slider=True)
-		layout.itemR(part, "eweight_harmonic", slider=True)
-		layout.itemR(part, "eweight_charge", slider=True)
-		layout.itemR(part, "eweight_lennardjones", slider=True)
+		if part.force_field_1.type != 'NONE':
+			layout.itemL(text="")
+			
+		split = layout.split(percentage=0.2)
+		split.itemL(text="Type 2:")
+		split.itemR(part.force_field_2, "type",text="")
+		basic_force_field_settings_ui(self, part.force_field_2)
+		basic_force_field_falloff_ui(self, part.force_field_2)
 		
 class PARTICLE_PT_vertexgroups(ParticleButtonsPanel):
 	__label__ = "Vertexgroups"
@@ -958,5 +904,6 @@
 bpy.types.register(PARTICLE_PT_render)
 bpy.types.register(PARTICLE_PT_draw)
 bpy.types.register(PARTICLE_PT_children)
-bpy.types.register(PARTICLE_PT_effectors)
+bpy.types.register(PARTICLE_PT_field_weights)
+bpy.types.register(PARTICLE_PT_force_fields)
 bpy.types.register(PARTICLE_PT_vertexgroups)

Modified: trunk/blender/release/scripts/ui/buttons_physics_cloth.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_physics_cloth.py	2009-09-30 21:31:08 UTC (rev 23573)
+++ trunk/blender/release/scripts/ui/buttons_physics_cloth.py	2009-09-30 22:10:14 UTC (rev 23574)
@@ -1,7 +1,8 @@
 
 import bpy
 
-from buttons_particle import point_cache_ui
+from buttons_physics_common import point_cache_ui
+from buttons_physics_common import effector_weights_ui
 
 def cloth_panel_enabled(md):
 	return md.point_cache.baked==False
@@ -49,10 +50,11 @@
 			split = layout.split()
 			
 			col = split.column()
-			col.itemL(text="Quality:")
-			col.itemR(cloth, "quality", text="Steps",slider=True)
-			col.itemL(text="Gravity:")
-			col.itemR(cloth, "gravity", text="")
+			col.itemL(text="Material:")
+			sub = col.column(align=True)
+			sub.itemR(cloth, "mass")
+			sub.itemR(cloth, "structural_stiffness", text="Structural")
+			sub.itemR(cloth, "bending_stiffness", text="Bending")
 
 			col.itemR(cloth, "pin_cloth", text="Pin")
 			sub = col.column(align=True)
@@ -61,18 +63,18 @@
 			sub.item_pointerR(cloth, "mass_vertex_group", ob, "vertex_groups", text="")
 			
 			col = split.column()
-			col.itemL(text="Presets...")
-			col.itemL(text="TODO!")
-			col.itemL(text="Material:")
-			sub = col.column(align=True)
-			sub.itemR(cloth, "mass")
-			sub.itemR(cloth, "structural_stiffness", text="Structural")
-			sub.itemR(cloth, "bending_stiffness", text="Bending")
+
 			col.itemL(text="Damping:")
 			sub = col.column(align=True)
 			sub.itemR(cloth, "spring_damping", text="Spring")
 			sub.itemR(cloth, "air_damping", text="Air")
 			
+			col.itemL(text="Presets...")
+			col.itemL(text="TODO!")
+			
+			col.itemL(text="Quality:")
+			col.itemR(cloth, "quality", text="Steps",slider=True)
+			
 			# Disabled for now
 			"""
 			if cloth.mass_vertex_group:
@@ -165,8 +167,20 @@
 		sub = col.column(align=True)
 		sub.itemR(cloth, "bending_stiffness_max", text="Max")
 		sub.item_pointerR(cloth, "bending_vertex_group", ob, "vertex_groups", text="")
+
+class PHYSICS_PT_cloth_field_weights(PhysicButtonsPanel):
+	__label__ = "Cloth Field Weights"
+	__default_closed__ = True
+	
+	def poll(self, context):
+		return (context.cloth)
+	
+	def draw(self, context):
+		cloth = context.cloth.settings
+		effector_weights_ui(self, cloth.effector_weights)
 		
 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_field_weights)

Added: trunk/blender/release/scripts/ui/buttons_physics_common.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_physics_common.py	                        (rev 0)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list