[Durian-svn] [7058] Haired Up
campbell
institute at blender.org
Thu Jul 15 15:34:17 CEST 2010
Revision: 7058
https://blenderinstitute.dyndns.org/durian-svn/?do=log&project=durian&path=/&rev=7058
Author: campbell
Date: 2010-07-15 15:34:17 +0200 (Thu, 15 Jul 2010)
Log Message:
-----------
Haired Up
Modified Paths:
--------------
pro/scripts/modules/finals_config.py
Modified: pro/scripts/modules/finals_config.py
===================================================================
--- pro/scripts/modules/finals_config.py 2010-07-15 13:21:45 UTC (rev 7057)
+++ pro/scripts/modules/finals_config.py 2010-07-15 13:34:17 UTC (rev 7058)
@@ -126,12 +126,9 @@
pointcache_generic_setup(psys.point_cache, frame_start, frame_end, pre_roll)
psys.point_cache.name = "sintel_hair_" + base_name
pointcache_generic_bake(psys.point_cache, baked)
-
+
# so it uses the pointcache
- if sim:
- psys.hair_dynamics = True
- else:
- psys.hair_dynamics = False
+ psys.hair_dynamics = sim
# bendiness fixing (sync with hair_emit!!!)
psys.cloth.settings.fix_bending_factor = 0.0
@@ -151,10 +148,7 @@
pointcache_generic_bake(psys.point_cache, baked)
# static settings
- if sim:
- psys.hair_dynamics = True
- else:
- psys.hair_dynamics = False
+ psys.hair_dynamics = sim
psys.cloth.settings.pin_stiffness = 0.2
psys.cloth.settings.pre_roll = pre_roll # this is very important
@@ -286,19 +280,19 @@
psys.cloth.settings.internal_friction= 0.701024
def sintal_preset_10():
- psys.cloth.settings.structural_stiffness= 35.494177
- psys.cloth.settings.pin_stiffness= 0.229656
- psys.cloth.settings.bending_stiffness= 88.540157
- psys.cloth.settings.spring_damping= 3.278634
- psys.cloth.settings.air_damping= 2.627868
- psys.cloth.settings.mass= 0.052997
- psys.cloth.settings.internal_friction= 0.060474
+ psys.cloth.settings.structural_stiffness= 1.441133
+ psys.cloth.settings.pin_stiffness= 0.327424
+ psys.cloth.settings.bending_stiffness= 30.082718
+ psys.cloth.settings.spring_damping= 1.819191
+ psys.cloth.settings.air_damping= 2.472357
+ psys.cloth.settings.mass= 0.030732
+ psys.cloth.settings.internal_friction= 0.089292
def sintal_preset_11():
psys.cloth.settings.structural_stiffness= 24.063796
psys.cloth.settings.pin_stiffness= 0.538765
psys.cloth.settings.bending_stiffness= 31.428210
- psys.cloth.settings.spring_damping= 40.811812
+ psys.cloth.settings.spring_damping= 20.811812
psys.cloth.settings.air_damping= 2.802882
psys.cloth.settings.mass= 0.054681
psys.cloth.settings.internal_friction= 0.020421
@@ -413,15 +407,15 @@
psys.cloth.settings.internal_friction= 0.713538
def sintal_preset_24(): #slo mo for 5.1d
- psys.cloth.settings.structural_stiffness= 35.854706
- psys.cloth.settings.pin_stiffness= 1.357543
+ psys.cloth.settings.structural_stiffness= 30.854706
+ psys.cloth.settings.pin_stiffness= 1.257543
psys.cloth.settings.bending_stiffness= 167.134151
psys.cloth.settings.spring_damping= 5.579418
psys.cloth.settings.air_damping= 10.953396
psys.cloth.settings.mass= 0.044746
psys.cloth.settings.internal_friction= 0.432054
- def sintal_preset_25():
+ def sintal_preset_25(): #3.4h custom more curl, more face, less int
psys.cloth.settings.structural_stiffness= 22.272662
psys.cloth.settings.pin_stiffness= 0.679482
psys.cloth.settings.bending_stiffness= 194.343099
@@ -467,14 +461,16 @@
psys.cloth.settings.internal_friction= 0.321842
def sintal_preset_30():
- psys.cloth.settings.structural_stiffness= 32.132823
- psys.cloth.settings.pin_stiffness= 1.308651
- psys.cloth.settings.bending_stiffness= 74.422558
- psys.cloth.settings.spring_damping= 24.514098
- psys.cloth.settings.air_damping= 3.439486
- psys.cloth.settings.mass= 0.043920
- psys.cloth.settings.internal_friction= 0.455195
+ psys.cloth.settings.structural_stiffness= 50.854706
+ psys.cloth.settings.pin_stiffness= 1.657543
+ psys.cloth.settings.bending_stiffness= 167.134151
+ psys.cloth.settings.spring_damping= 5.579418
+ psys.cloth.settings.air_damping= 1.953396
+ psys.cloth.settings.mass= 0.044746
+ psys.cloth.settings.internal_friction= 0.132054
+ psys.cloth.settings.fix_bending_factor = (1.0 / 3.0) * 1.0
+
def sintal_preset_31():
psys.cloth.settings.structural_stiffness= 5.946803
psys.cloth.settings.pin_stiffness= 0.292560
@@ -701,9 +697,9 @@
psys.cloth.settings.internal_friction= 0.280272
def sintal_preset_56():
- psys.cloth.settings.structural_stiffness= 22.005791
- psys.cloth.settings.pin_stiffness= 0.125989
- psys.cloth.settings.bending_stiffness= 115.132191
+ psys.cloth.settings.structural_stiffness= 50.005791
+ psys.cloth.settings.pin_stiffness= 0.145989
+ psys.cloth.settings.bending_stiffness= 135.132191
psys.cloth.settings.spring_damping= 23.630750
psys.cloth.settings.air_damping= 0.010411
psys.cloth.settings.mass= 0.083926
@@ -836,7 +832,7 @@
elif base_name.startswith("04.1f"): preset = 12
elif base_name.startswith("04.2a"): preset = -1
- elif base_name.startswith("04.2b"): preset = 13
+ elif base_name.startswith("04.2b"): preset = 30
elif base_name.startswith("04.2c"): preset = -1
elif base_name.startswith("04.2d"): preset = 12
elif base_name.startswith("04.2e"): preset = -1
@@ -845,13 +841,13 @@
elif base_name.startswith("04.2h"): preset = 12
elif base_name.startswith("04.2i"): preset = 18
elif base_name.startswith("04.2j"): preset = -1
- elif base_name.startswith("04.2k"): preset = 51
+ elif base_name.startswith("04.2k"): preset = 12
elif base_name.startswith("04.2l"): preset = 12
elif base_name.startswith("04.2m"): preset = 13
elif base_name.startswith("04.2n"): preset = 12
- elif base_name.startswith("04.2o"): preset = 12
+ elif base_name.startswith("04.2o"): preset = 18
elif base_name.startswith("04.2p"): preset = 12
- elif base_name.startswith("04.2q"): preset = 12
+ elif base_name.startswith("04.2q"): preset = 18
elif base_name.startswith("05.1a"): preset = -1
elif base_name.startswith("05.1b"): preset = 54
@@ -862,35 +858,15 @@
elif base_name.startswith("05.2b"): preset = 12
elif base_name.startswith("05.2c"): preset = 54
- elif base_name.startswith("05.4a"): preset = 54 # no comp file!
+ elif base_name.startswith("05.4"): preset = 54
- elif base_name.startswith("05.5b"): preset = 12
+ elif base_name.startswith("05.5_b"): preset = 24
elif base_name.startswith("05.7a"): preset = 12
elif base_name.startswith("05.7b"): preset = 51
- elif 0:
- '''
- elif base_name.startswith("05.3a"):
- elif base_name.startswith("05.3a"):
- elif base_name.startswith("05.3b"):
+ elif base_name.startswith("05.3"): preset = 12
- elif base_name.startswith("05.5a"):
- elif base_name.startswith("05.5b"):
-
- elif base_name.startswith("05.4a"):
- elif base_name.startswith("05.4b"):
- elif base_name.startswith("05.4c"):
-
- elif base_name.startswith("05.3a"):
- elif base_name.startswith("05.3b"):
-
-
-
- elif base_name.startswith("05.8x"):
- '''
- pass
-
elif base_name.startswith("05.8b"): preset = 34
elif base_name.startswith("05.8c"): preset = -1
elif base_name.startswith("05.8d"): preset = 25
@@ -914,6 +890,7 @@
elif base_name.startswith("05.8u"): preset = -1
elif base_name.startswith("05.8v"): preset = -1
elif base_name.startswith("05.8w"): preset = 54
+ elif base_name.startswith("05.8x"): preset = 51
elif base_name.startswith("06.a"): preset = 18
elif base_name.startswith("06.b"): preset = -1
@@ -931,20 +908,8 @@
elif base_name.startswith("07.1b"): preset = 18
elif base_name.startswith("07.1c"): preset = 18
- elif base_name.startswith("07.2c"): preset = 18
+ elif base_name.startswith("07.2c"): preset = 12
- elif base_name.startswith("08.2a"): preset = 54
- elif base_name.startswith("08.2b"): preset = 54
- elif base_name.startswith("08.2c"): preset = 54
- elif base_name.startswith("08.2e"): preset = 54
- elif base_name.startswith("08.2k"): preset = 54
- elif base_name.startswith("08.2l"): preset = 54
- elif base_name.startswith("08.2p"): preset = 54
- elif base_name.startswith("08.2q"): preset = 54
- elif base_name.startswith("08.2r"): preset = 54
- elif base_name.startswith("08.2s"): preset = 54
- elif base_name.startswith("08.2t"): preset = 54
-
elif base_name.startswith("08.1a"): preset = -1
elif base_name.startswith("08.1c"): preset = -1
@@ -957,24 +922,52 @@
elif base_name.startswith("08.1i"): preset = 18
elif base_name.startswith("08.1j"): preset = 18
elif base_name.startswith("08.1k"): preset = 18
-
+
+ elif base_name.startswith("08.2a"): preset = 54
+ elif base_name.startswith("08.2b"): preset = 54
+ elif base_name.startswith("08.2c"): preset = 54
+ elif base_name.startswith("08.2e"): preset = 54
+ elif base_name.startswith("08.2i"): preset = 18
+ elif base_name.startswith("08.2k"): preset = 54
+ elif base_name.startswith("08.2l"): preset = 54
+ elif base_name.startswith("08.2m"): preset = 10
+ elif base_name.startswith("08.2n"): preset = 10
+ elif base_name.startswith("08.2o"): preset = 57
+ elif base_name.startswith("08.2p"): preset = 54
+ elif base_name.startswith("08.2q"): preset = 54
+ elif base_name.startswith("08.2r"): preset = 54
+ elif base_name.startswith("08.2s"): preset = 54
+ elif base_name.startswith("08.2t"): preset = 54
@@ Diff output truncated at 10240 characters. @@
More information about the Durian-svn
mailing list