2009-11-01 15:21:20 +00:00
|
|
|
# ##### BEGIN GPL LICENSE BLOCK #####
|
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or
|
|
|
|
# modify it under the terms of the GNU General Public License
|
|
|
|
# as published by the Free Software Foundation; either version 2
|
|
|
|
# of the License, or (at your option) any later version.
|
2009-11-03 07:23:02 +00:00
|
|
|
#
|
2009-11-01 15:21:20 +00:00
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
2009-11-03 07:23:02 +00:00
|
|
|
#
|
2009-11-01 15:21:20 +00:00
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2009-11-01 15:21:20 +00:00
|
|
|
#
|
|
|
|
# ##### END GPL LICENSE BLOCK #####
|
2009-10-31 20:16:59 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
# <pep8 compliant>
|
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 :).
2009-09-30 22:10:14 +00:00
|
|
|
|
2010-05-03 03:02:27 +00:00
|
|
|
import bpy
|
2009-11-18 21:57:13 +00:00
|
|
|
|
2010-05-11 20:06:20 +00:00
|
|
|
#cachetype can be 'PSYS' 'HAIR' 'SMOKE' etc
|
2010-05-16 12:15:04 +00:00
|
|
|
|
|
|
|
|
2010-05-11 20:06:20 +00:00
|
|
|
def point_cache_ui(self, context, cache, enabled, cachetype):
|
2009-10-31 19:31:45 +00:00
|
|
|
layout = self.layout
|
2009-11-21 00:05:43 +00:00
|
|
|
|
2010-09-03 07:25:37 +00:00
|
|
|
layout.context_pointer_set("point_cache", cache)
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
row = layout.row()
|
2010-08-24 04:02:50 +00:00
|
|
|
row.template_list(cache, "point_caches", cache.point_caches, "active_index", rows=2)
|
2009-10-31 19:31:45 +00:00
|
|
|
col = row.column(align=True)
|
2009-12-10 10:23:53 +00:00
|
|
|
col.operator("ptcache.add", icon='ZOOMIN', text="")
|
|
|
|
col.operator("ptcache.remove", icon='ZOOMOUT', text="")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
row = layout.row()
|
2010-07-04 20:59:10 +00:00
|
|
|
if cachetype in ('PSYS', 'HAIR', 'SMOKE'):
|
2010-08-19 12:51:31 +00:00
|
|
|
row.prop(cache, "use_external")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-19 12:51:31 +00:00
|
|
|
if cache.use_external:
|
2009-10-31 19:31:45 +00:00
|
|
|
split = layout.split(percentage=0.80)
|
2010-05-02 14:34:37 +00:00
|
|
|
split.prop(cache, "name", text="File Name")
|
2009-11-23 00:27:30 +00:00
|
|
|
split.prop(cache, "index", text="")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-07-14 07:47:03 +00:00
|
|
|
row = layout.row()
|
|
|
|
row.label(text="File Path:")
|
|
|
|
row.prop(cache, "use_library_path", "Use Lib Path")
|
2010-09-07 15:17:42 +00:00
|
|
|
|
2009-11-23 00:27:30 +00:00
|
|
|
layout.prop(cache, "filepath", text="")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2009-11-23 00:27:30 +00:00
|
|
|
layout.label(text=cache.info)
|
2009-10-31 19:31:45 +00:00
|
|
|
else:
|
2010-09-27 12:24:12 +00:00
|
|
|
if cachetype == 'SMOKE':
|
|
|
|
if bpy.data.is_dirty:
|
|
|
|
layout.label(text="Cache is disabled until the file is saved")
|
|
|
|
layout.enabled = false
|
|
|
|
|
2010-05-02 14:34:37 +00:00
|
|
|
layout.prop(cache, "name", text="File Name")
|
2010-05-03 16:00:42 +00:00
|
|
|
|
2010-05-02 14:34:37 +00:00
|
|
|
split = layout.split()
|
|
|
|
col = split.column(align=True)
|
2010-05-03 16:00:42 +00:00
|
|
|
|
2010-05-11 20:06:20 +00:00
|
|
|
if cachetype != 'PSYS':
|
2010-05-02 14:34:37 +00:00
|
|
|
col.enabled = enabled
|
|
|
|
col.prop(cache, "frame_start")
|
|
|
|
col.prop(cache, "frame_end")
|
2010-09-18 15:57:42 +00:00
|
|
|
if cachetype not in ('SMOKE', 'CLOTH'):
|
2010-08-19 12:51:31 +00:00
|
|
|
col.prop(cache, "frame_step")
|
2010-05-02 14:34:37 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = split.column()
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-05-11 20:06:20 +00:00
|
|
|
if cachetype != 'SMOKE':
|
2010-05-02 14:34:37 +00:00
|
|
|
sub = col.column()
|
2009-10-31 19:31:45 +00:00
|
|
|
sub.enabled = enabled
|
2010-08-19 12:51:31 +00:00
|
|
|
sub.prop(cache, "use_quick_cache")
|
2010-05-16 12:15:04 +00:00
|
|
|
|
2010-05-03 03:02:27 +00:00
|
|
|
sub = col.column()
|
2010-08-18 07:14:10 +00:00
|
|
|
sub.enabled = (not bpy.data.is_dirty)
|
2010-08-19 12:51:31 +00:00
|
|
|
sub.prop(cache, "use_disk_cache")
|
2010-05-02 14:34:37 +00:00
|
|
|
col.label(text=cache.info)
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-05-06 17:12:44 +00:00
|
|
|
sub = col.column()
|
|
|
|
sub.prop(cache, "use_library_path", "Use Lib Path")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2009-11-23 00:27:30 +00:00
|
|
|
layout.separator()
|
2010-05-03 16:00:42 +00:00
|
|
|
|
2010-05-02 14:34:37 +00:00
|
|
|
split = layout.split()
|
2010-05-03 16:00:42 +00:00
|
|
|
|
2010-05-02 14:34:37 +00:00
|
|
|
col = split.column()
|
2010-05-03 16:00:42 +00:00
|
|
|
|
2010-08-18 08:26:18 +00:00
|
|
|
if cache.is_baked == True:
|
2010-05-02 14:34:37 +00:00
|
|
|
col.operator("ptcache.free_bake", text="Free Bake")
|
|
|
|
else:
|
|
|
|
col.operator("ptcache.bake", text="Bake").bake = True
|
2010-05-03 16:00:42 +00:00
|
|
|
|
2010-05-02 14:34:37 +00:00
|
|
|
sub = col.row()
|
2010-08-18 08:26:18 +00:00
|
|
|
sub.enabled = (cache.frames_skipped or cache.is_outdated) and enabled
|
2010-05-02 14:34:37 +00:00
|
|
|
sub.operator("ptcache.bake", text="Calculate To Frame").bake = False
|
|
|
|
|
|
|
|
sub = col.column()
|
|
|
|
sub.enabled = enabled
|
|
|
|
sub.operator("ptcache.bake_from_cache", text="Current Cache to Bake")
|
2010-05-03 16:00:42 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = split.column()
|
2010-05-02 14:34:37 +00:00
|
|
|
col.operator("ptcache.bake_all", text="Bake All Dynamics").bake = True
|
|
|
|
col.operator("ptcache.free_bake_all", text="Free All Bakes")
|
|
|
|
col.operator("ptcache.bake_all", text="Update All To Frame").bake = False
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-05-16 12:15:04 +00:00
|
|
|
|
2009-11-18 21:57:13 +00:00
|
|
|
def effector_weights_ui(self, context, weights):
|
2009-11-14 13:35:44 +00:00
|
|
|
layout = self.layout
|
2009-11-21 00:05:43 +00:00
|
|
|
|
2009-11-23 00:27:30 +00:00
|
|
|
layout.prop(weights, "group")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2009-11-14 13:35:44 +00:00
|
|
|
split = layout.split()
|
2009-11-21 00:05:43 +00:00
|
|
|
|
2009-11-18 21:57:13 +00:00
|
|
|
col = split.column()
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(weights, "gravity", slider=True)
|
2009-11-21 00:05:43 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = split.column()
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(weights, "all", slider=True)
|
2009-11-14 13:35:44 +00:00
|
|
|
|
2009-11-23 00:27:30 +00:00
|
|
|
layout.separator()
|
2009-11-21 00:05:43 +00:00
|
|
|
|
2009-11-18 21:57:13 +00:00
|
|
|
split = layout.split()
|
2009-11-14 13:35:44 +00:00
|
|
|
|
2009-11-18 21:57:13 +00:00
|
|
|
col = split.column()
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(weights, "force", slider=True)
|
|
|
|
col.prop(weights, "vortex", slider=True)
|
|
|
|
col.prop(weights, "magnetic", slider=True)
|
|
|
|
col.prop(weights, "wind", slider=True)
|
2010-08-19 12:51:31 +00:00
|
|
|
col.prop(weights, "curve_guide", slider=True)
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(weights, "texture", slider=True)
|
2009-11-18 21:57:13 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = split.column()
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(weights, "harmonic", slider=True)
|
|
|
|
col.prop(weights, "charge", slider=True)
|
|
|
|
col.prop(weights, "lennardjones", slider=True)
|
|
|
|
col.prop(weights, "turbulence", slider=True)
|
|
|
|
col.prop(weights, "drag", slider=True)
|
|
|
|
col.prop(weights, "boid", slider=True)
|
2009-11-18 21:57:13 +00:00
|
|
|
|
|
|
|
|
|
|
|
def basic_force_field_settings_ui(self, context, field):
|
2009-10-31 19:31:45 +00:00
|
|
|
layout = self.layout
|
2009-11-21 00:05:43 +00:00
|
|
|
|
2009-10-31 19:31:45 +00:00
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
if not field or field.type == 'NONE':
|
|
|
|
return
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
|
|
|
|
if field.type == 'DRAG':
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(field, "linear_drag", text="Linear")
|
2009-10-31 19:31:45 +00:00
|
|
|
else:
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(field, "strength")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
if field.type == 'TURBULENCE':
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(field, "size")
|
|
|
|
col.prop(field, "flow")
|
2009-10-31 19:31:45 +00:00
|
|
|
elif field.type == 'HARMONIC':
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(field, "harmonic_damping", text="Damping")
|
2009-12-21 11:19:07 +00:00
|
|
|
col.prop(field, "rest_length")
|
2009-10-31 19:31:45 +00:00
|
|
|
elif field.type == 'VORTEX' and field.shape != 'POINT':
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(field, "inflow")
|
2009-10-31 19:31:45 +00:00
|
|
|
elif field.type == 'DRAG':
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(field, "quadratic_drag", text="Quadratic")
|
2009-10-31 19:31:45 +00:00
|
|
|
else:
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(field, "flow")
|
2009-11-21 00:05:43 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = split.column()
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(field, "noise")
|
|
|
|
col.prop(field, "seed")
|
2009-10-31 19:31:45 +00:00
|
|
|
if field.type == 'TURBULENCE':
|
2010-08-20 06:09:58 +00:00
|
|
|
col.prop(field, "use_global_coords", text="Global")
|
2009-12-21 11:19:07 +00:00
|
|
|
elif field.type == 'HARMONIC':
|
2010-08-20 06:09:58 +00:00
|
|
|
col.prop(field, "use_multiple_springs")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
2009-11-23 00:27:30 +00:00
|
|
|
col.label(text="Effect point:")
|
2010-08-20 06:09:58 +00:00
|
|
|
col.prop(field, "apply_to_location")
|
|
|
|
col.prop(field, "apply_to_rotation")
|
2009-11-21 00:05:43 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = split.column()
|
2009-11-23 00:27:30 +00:00
|
|
|
col.label(text="Collision:")
|
2010-08-20 06:09:58 +00:00
|
|
|
col.prop(field, "use_absorption")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
|
2009-11-18 21:57:13 +00:00
|
|
|
def basic_force_field_falloff_ui(self, context, field):
|
2009-10-31 19:31:45 +00:00
|
|
|
layout = self.layout
|
2009-11-21 00:05:43 +00:00
|
|
|
|
|
|
|
# XXX: This doesn't update for some reason.
|
2010-08-06 15:17:44 +00:00
|
|
|
#split = layout.split()
|
2009-10-31 19:31:45 +00:00
|
|
|
split = layout.split(percentage=0.35)
|
|
|
|
|
|
|
|
if not field or field.type == 'NONE':
|
|
|
|
return
|
|
|
|
|
|
|
|
col = split.column()
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(field, "z_direction", text="")
|
|
|
|
col.prop(field, "use_min_distance", text="Use Minimum")
|
|
|
|
col.prop(field, "use_max_distance", text="Use Maximum")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = split.column()
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(field, "falloff_power", text="Power")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
sub = col.column()
|
|
|
|
sub.active = field.use_min_distance
|
2010-08-20 06:09:58 +00:00
|
|
|
sub.prop(field, "distance_min", text="Distance")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
sub = col.column()
|
|
|
|
sub.active = field.use_max_distance
|
2010-08-20 06:09:58 +00:00
|
|
|
sub.prop(field, "distance_max", text="Distance")
|
2010-02-14 11:21:21 +00:00
|
|
|
|
|
|
|
|
|
|
|
def register():
|
|
|
|
pass
|
|
|
|
|
2010-02-22 23:32:58 +00:00
|
|
|
|
2010-02-14 11:21:21 +00:00
|
|
|
def unregister():
|
|
|
|
pass
|
2010-02-16 09:55:07 +00:00
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
register()
|