[Durian-svn] [4241] - use cloth sim pre-roll, seems to work.

campbell institute at blender.org
Tue Jun 1 16:29:56 CEST 2010


Revision: 4241
          https://blenderinstitute.dyndns.org/durian-svn/?do=log&project=durian&path=/&rev=4241
Author:   campbell
Date:     2010-06-01 16:29:56 +0200 (Tue, 01 Jun 2010)
Log Message:
-----------
- use cloth sim pre-roll, seems to work.
- made preset selections correct python

Modified Paths:
--------------
    pro/scripts/modules/finals_config.py

Modified: pro/scripts/modules/finals_config.py
===================================================================
--- pro/scripts/modules/finals_config.py	2010-06-01 14:26:47 UTC (rev 4240)
+++ pro/scripts/modules/finals_config.py	2010-06-01 14:29:56 UTC (rev 4241)
@@ -74,6 +74,7 @@
     point_cache.disk_cache = True
 
 
+
 def pointcache_generic_bake(point_cache, baked):
     base_dir, base_name, frame_start, frame_end, object_items = scene_info()
     
@@ -140,6 +141,7 @@
 
         psys.cloth.settings.pin_stiffness = 0.2
         psys.cloth.settings.quality = 20
+        psys.cloth.settings.pre_roll = pre_roll # this is very important
 
         psys.settings.child_nbr = 40
         psys.settings.draw_step = 3
@@ -746,336 +748,264 @@
             psys.cloth.settings.mass= 0.027507
             psys.cloth.settings.internal_friction= 0.431977
 
+        if base_name.startswith("01.a"): preset = 12
+        elif base_name.startswith("02.a"): preset = -1
+        elif base_name.startswith("02.b"): preset = 18
+        elif base_name.startswith("02.c"): preset = 18
+        elif base_name.startswith("02.d"): preset = 51
+        elif base_name.startswith("02.e"): preset = 51
+        elif base_name.startswith("02.f"): preset = 51
+        elif base_name.startswith("02.g"): preset = 13
+        elif base_name.startswith("02.h"): preset = 51
+        elif base_name.startswith("02.i"): preset = 51
+        #elif base_name.startswith("02.j"):
+        elif base_name.startswith("02.k"): preset = 51
+        elif base_name.startswith("03.1aa"): preset = -1
+        elif base_name.startswith("03.1a"): preset = 13
+        elif base_name.startswith("03.1b"): preset = 18
+        elif base_name.startswith("03.1c"): preset = 18
+        elif base_name.startswith("03.1e"): preset = 51
+        elif base_name.startswith("03.1f"): preset = 51
+        elif base_name.startswith("03.1g"): preset = 51
+        elif base_name.startswith("03.1h"): preset = 51
+        elif base_name.startswith("03.1i"): preset = -1
+        elif base_name.startswith("03.1j"): preset = 54
+        elif base_name.startswith("03.1k"): preset = 54
+        elif base_name.startswith("03.1l"): preset = -1
+        elif base_name.startswith("03.1m"): preset = 51
+        elif base_name.startswith("03.1n"): preset = -1
+        elif base_name.startswith("03.1o"): preset = 51
 
+        elif base_name.startswith("03.2a"): preset = -1
+        elif base_name.startswith("03.2c"): preset = 38
+        elif base_name.startswith("03.2d"): preset = 38
+        elif base_name.startswith("03.2e"): preset = 38
 
-        # run the preset
-        import os
-        try:
-            sintal_preset_hair_func = locals()["sintal_preset_" + os.environ['PRESET_SINTEL']]
-        except:
-            sintal_preset_hair_func = sintal_preset_25
+        elif base_name.startswith("03.3aa"): preset = -1
+        elif base_name.startswith("03.3a"): preset = 54
+        elif base_name.startswith("03.3b"): preset = 12
+        elif base_name.startswith("03.3c"): preset = 12
+        elif base_name.startswith("03.3d"): preset = 12
 
+        elif base_name.startswith("03.4a"): preset = -1
+        elif base_name.startswith("03.4b"): preset = 12
+        elif base_name.startswith("03.4c"): preset = 12
+        elif base_name.startswith("03.4d"): preset = -1
+        elif base_name.startswith("03.4e"): preset = 12
+        elif base_name.startswith("03.4f"): preset = 13
+        elif base_name.startswith("03.4g"): preset = 51
+        elif base_name.startswith("03.4h"): preset = 25
+        elif base_name.startswith("03.4i"): preset = 18
+        elif base_name.startswith("03.4l"): preset = -1
+        elif base_name.startswith("03.4m"): preset = 18
+        elif base_name.startswith("03.4n"): preset = -1
 
-        if base_name.startswith("01.a"):
-            preset = 12
-        else if base_name.startswith("05.8b"):
-            preset = 34
-        else if base_name.startswith("05.8c"):
-            #preset = x
-        else if base_name.startswith("05.8d"):
-            preset = 25
-        else if base_name.startswith("05.8e"):
-            preset = 12
-        else if base_name.startswith("05.8f"):
-            preset = 12
-        else if base_name.startswith("05.8g"):
-            preset = 12
-        else if base_name.startswith("05.8h"):
-            preset = 51
-        else if base_name.startswith("05.8i"):
-            preset = 34
-        else if base_name.startswith("05.8j02"):
-            preset = 13
-        else if base_name.startswith("05.8j"):
-            preset = 30
-        else if base_name.startswith("05.8k"):
-            preset = 27
-        else if base_name.startswith("05.8l"):
-            preset = 25
-        else if base_name.startswith("05.8m"):
-            preset = 51
-        #else if base_name.startswith("05.8n"):
-        else if base_name.startswith("05.8o"):
-            preset = 51
-        else if base_name.startswith("05.8p"):
-            preset = 12
-        #else if base_name.startswith("05.8q"):
-        else if base_name.startswith("05.8r"):
-            preset = 18
-        else if base_name.startswith("05.8s"):
-            preset = 54
-        else if base_name.startswith("05.8t"):
-            preset = 27
-        #else if base_name.startswith("05.8u"):
-        #else if base_name.startswith("05.8v"):
-        else if base_name.startswith("05.8w"):
-            preset = 12
+        elif base_name.startswith("04.1a"): preset = 12
+        elif base_name.startswith("04.1b"): preset = 12
+        elif base_name.startswith("04.1c"): preset = 12
+        elif base_name.startswith("04.1d"): preset = 12
+        elif base_name.startswith("04.1e"): preset = 12
+        elif base_name.startswith("04.1f"): preset = 12
 
-        #else if base_name.startswith("02.a"):
-        else if base_name.startswith("02.b"):
-            preset = 18
-        else if base_name.startswith("02.c"):
-            preset = 18
-        else if base_name.startswith("02.d"):
-            preset = 51
-        else if base_name.startswith("02.e"):
-            preset = 51
-        else if base_name.startswith("02.f"):
-            preset = 51
-        else if base_name.startswith("02.g"):
-            preset = 13
-        else if base_name.startswith("02.h"):
-            preset = 51
-        else if base_name.startswith("02.i"):
-            preset = 51
-        #else if base_name.startswith("02.j"):
-        else if base_name.startswith("02.k"):
-            preset = 51
+        elif base_name.startswith("04.2a"): preset = -1
+        elif base_name.startswith("04.2b"): preset = 13
+        elif base_name.startswith("04.2c"): preset = -1
+        elif base_name.startswith("04.2d"): preset = 12
+        elif base_name.startswith("04.2e"): preset = -1
+        elif base_name.startswith("04.2f"): preset = 12
+        elif base_name.startswith("04.2g"): preset = -1
+        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.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.2p"): preset = 12
+        elif base_name.startswith("04.2q"): preset = 12
 
+        elif base_name.startswith("05.1a"): preset = -1
+        elif base_name.startswith("05.1b"): preset = 54
+        elif base_name.startswith("05.1c"): preset = 54
+        elif base_name.startswith("05.1d"): preset = 54
+        elif base_name.startswith("05.4a"): preset = 54
 
-        #else if base_name.startswith("03.1aa"):
-        else if base_name.startswith("03.1a"):
-            preset = 13
-        else if base_name.startswith("03.1b"):
-            preset = 18
-        else if base_name.startswith("03.1c"):
-            preset = 18
-        else if base_name.startswith("03.1e"):
-            preset = 51
-        else if base_name.startswith("03.1f"):
-            preset = 51
-        else if base_name.startswith("03.1g"):
-            preset = 51
-        else if base_name.startswith("03.1h"):
-            preset = 51
-        #else if base_name.startswith("03.1i"):
-        else if base_name.startswith("03.1j"):
-            preset = 54
-        else if base_name.startswith("03.1k"):
-            preset = 54
-        #else if base_name.startswith("03.1l"):
-        else if base_name.startswith("03.1m"):
-            preset = 51
-        #else if base_name.startswith("03.1n):
-        else if base_name.startswith("03.1o"):
-            preset = 51
+        elif 0:
+            '''
+        elif base_name.startswith("05.3a"):
+        elif base_name.startswith("05.3a"):
+        elif base_name.startswith("05.3b"):
 
-        #else if base_name.startswith("03.2a"):
-        else if base_name.startswith("03.2c"):
-            preset = 38
-        else if base_name.startswith("03.2d"):
-            preset = 38
-        else if base_name.startswith("03.2e"):
-            preset = 38
+        elif base_name.startswith("05.5a"):
+        elif base_name.startswith("05.5b"):
 
-        #else if base_name.startswith("03.3aa"):
-        else if base_name.startswith("03.3a"):
-            preset = 54
-        else if base_name.startswith("03.3b"):
-            preset = 12
-        else if base_name.startswith("03.3c"):
-            preset = 12
-        else if base_name.startswith("03.3d"):
-            preset = 12
+        elif base_name.startswith("05.2a"):
+        elif base_name.startswith("05.2b"):
+        elif base_name.startswith("05.2c"):
 
-        #else if base_name.startswith("03.4a"):
-        else if base_name.startswith("03.4b"):
-            preset = 12
-        else if base_name.startswith("03.4c"):
-            preset = 12
-        #else if base_name.startswith("03.4d"):
-        else if base_name.startswith("03.4e"):
-            preset = 12
-        else if base_name.startswith("03.4f"):
-            preset = 13
-        else if base_name.startswith("03.4g"):
-            preset = 51
-        else if base_name.startswith("03.4h"):
-            preset = 25
-        else if base_name.startswith("03.4i"):
-            preset = 18
-        #else if base_name.startswith("03.4l"):

@@ Diff output truncated at 10240 characters. @@


More information about the Durian-svn mailing list