Merge pull request #222 from toadstorm/henry_dev

move along mesh random speed
toadstorm · Oct 28, 2019 · 5f3122f · 5f3122f
2 parents 6d2a424 + 6eb984b
commit 5f3122f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/otls/MOPS_Move_Along_Mesh.hda/INDEX__SECTION b/otls/MOPS_Move_Along_Mesh.hda/INDEX__SECTION
@@ -38,5 +38,5 @@ Inputs:       2 to 2
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Sun Oct 27 22:24:37 2019
+Modified:     Sun Oct 27 22:38:47 2019
 
diff --git a/...Move_Along_Mesh.hda/MOPS_8_8Sop_1MOPs__Move__Along__Mesh_8_81.2/Contents.dir/.OPdummydefs b/...Move_Along_Mesh.hda/MOPS_8_8Sop_1MOPs__Move__Along__Mesh_8_81.2/Contents.dir/.OPdummydefs
diff --git a/...ove_Along_Mesh.hda/MOPS_8_8Sop_1MOPs__Move__Along__Mesh_8_81.2/Contents.dir/Contents.mime b/...ove_Along_Mesh.hda/MOPS_8_8Sop_1MOPs__Move__Along__Mesh_8_81.2/Contents.dir/Contents.mime
@@ -51,7 +51,7 @@ inputs
 stat
 {
   create 1572233259
-  modify 1572240275
+  modify 1572241161
   author Henry@LAPPY586
   access 0777
 }
@@ -1299,7 +1299,7 @@ inputs
 stat
 {
   create 1571370981
-  modify 1572239920
+  modify 1572241057
   author Henry@LAPPY586
   access 0777
 }
@@ -1648,6 +1648,8 @@ forward = m * forward;
 // project vector onto surface at current location
 forward = normalize(forward - dot(forward, v@__meshN)*v@__meshN);
 // advect
+float rand = fit01(rand(i@id + seed), -rand_speed, rand_speed);
+speed += rand;
 forward = forward * speed * falloff;
 @P += forward;
 
@@ -2552,7 +2554,7 @@ inputs
 stat
 {
   create 1324348265
-  modify 1572241308
+  modify 1572241515
   author [email protected]
   access 0777
 }
@@ -3378,7 +3380,7 @@ Content-Type: text/plain
 
 {
 version 0.8
-input	[ 0	locks=0 ]	(	[ input	1 ] 	)
+input	[ 0	locks=0 ]	(	[ input	0 ] 	)
 }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY

diff --git a/otls/MOPS_Move_Along_Mesh.hda/MOPS_8_8Sop_1MOPs__Move__Along__Mesh_8_81.2/DialogScript b/otls/MOPS_Move_Along_Mesh.hda/MOPS_8_8Sop_1MOPs__Move__Along__Mesh_8_81.2/DialogScript
@@ -417,7 +417,6 @@
                 label   "Rand Speed"
                 type    float
                 default { "0" }
-                disablewhen "{ rand_speed == 0 }"
                 range   { 0 1 }
                 parmtag { "autoscope" "0000000000000000" }
             }
@@ -426,6 +425,7 @@
                 label   "Seed"
                 type    float
                 default { "0" }
+                disablewhen "{ rand_speed 0 }"
                 range   { 0 1 }
                 parmtag { "autoscope" "0000000000000000" }
             }
@@ -484,9 +484,8 @@
         }
 
         group {
-            name    "folder4"
+            name    "folder3_1"
             label   "Relax"
-            tabbreak
 
             parm {
                 name    "do_relax"
@@ -499,7 +498,7 @@
             groupsimple {
                 name    "folder5"
                 label   "Relax Options"
-                disablewhentab "{ do_relax 0 }"
+                disablewhentab "{ do_relax == 0 }"
 
                 parm {
                     name    "group2"