Merge pull request #253 from toadstorm/henry_dev

Henry dev
toadstorm · May 30, 2020 · 59eac81 · 59eac81
2 parents 5d4b07a + 6fca193
commit 59eac81
Show file tree

Hide file tree

Showing 23 changed files with 1,659 additions and 374 deletions.
diff --git a/OPcustomize b/OPcustomize
@@ -1 +1,3 @@
-ophide Sop MOPS::Flocking::1.0
+ophide Sop MOPS::Flocking::1.0
+ophide Sop MOPS::Curl_Modifier::1.0
+ophide Sop MOPS::Curl_Modifier::1.1
diff --git a/otls/MOPS_Aim.hda/INDEX__SECTION b/otls/MOPS_Aim.hda/INDEX__SECTION
@@ -10,5 +10,5 @@ Inputs:       1 to 2
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Sun May  3 13:12:51 2020
+Modified:     Thu May 28 21:13:55 2020
 
diff --git a/otls/MOPS_Aim.hda/MOPS_8_8Sop_1Aim_8_81.0/Contents.dir/.OPdummydefs b/otls/MOPS_Aim.hda/MOPS_8_8Sop_1Aim_8_81.0/Contents.dir/.OPdummydefs
diff --git a/otls/MOPS_Aim.hda/MOPS_8_8Sop_1Aim_8_81.0/Contents.dir/Contents.mime b/otls/MOPS_Aim.hda/MOPS_8_8Sop_1Aim_8_81.0/Contents.dir/Contents.mime
@@ -32,24 +32,22 @@ Content-Type: text/plain
 
 sopflags sopflags = 
 comment ""
-position -6.8166 -1.26187
-connectornextid 1
-flags =  lock off model off template off footprint off xray off bypass off display on render on highlight off unload off savedata off compress on colordefault on exposed on
+position 17.7183 2.82686
+connectornextid 0
+flags =  lock off model off template off footprint off xray off bypass off display off render off highlight off unload off savedata off compress on colordefault on exposed on
 outputsNamed3
 {
 }
 inputsNamed3
 {
-0 	MOPs_Instancer 1 1 "input1"
 }
 inputs
 {
-0 	MOPs_Instancer 0 1
 }
 stat
 {
-  create 1588536261
-  modify 1588536767
+  create 1590722599
+  modify 1590725610
   author Henry@LAPPY586
   access 0777
 }
@@ -110,7 +108,7 @@ inputs
 stat
 {
   create 1523778096
-  modify 1588536688
+  modify 1590725585
   author henry@GlaDOS
   access 0777
 }
@@ -304,7 +302,6 @@ Content-Type: text/plain
         label   "Do Vexpression"
         type    toggle
         default { "0" }
-        range   { 0 1 }
     }
     parm {
         name    "vexpression"
@@ -314,6 +311,20 @@ Content-Type: text/plain
         parmtag { "editor" "1" }
         parmtag { "editorlang" "vex" }
     }
+    parm {
+        name    "reverse_aim"
+        label   "Reverse Aim"
+        type    integer
+        default { "0" }
+        range   { 0 10 }
+    }
+    parm {
+        name    "reverse_up"
+        label   "Reverse Up"
+        type    integer
+        default { "0" }
+        range   { 0 10 }
+    }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
 Content-Disposition: attachment; filename="hdaroot/create_aim_vector.chn"
@@ -366,6 +377,18 @@ Content-Type: text/plain
       flags = 0
       segment { length = 0 expr = chs(\"../vexpression\") }
     }
+    channel reverse_aim {
+      lefttype = extend
+      righttype = extend
+      flags = 0
+      segment { length = 0 expr = ch(\"../reverse_aim\") }
+    }
+    channel reverse_up {
+      lefttype = extend
+      righttype = extend
+      flags = 0
+      segment { length = 0 expr = ch(\"../reverse_up\") }
+    }
   }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -388,6 +411,13 @@ if(haspointattrib(0, \"up\") && chi(\"use_up_attr\")) {
 vector center = getbbox_center(1);
 vector aim = normalize(center - @P);
 
+if(chi(\"reverse_aim\")) {
+    aim *= -1;
+}
+if(chi(\"reverse_up\")) {
+    up *= -1;
+}
+
 `ifs(ch(\"do_vexpression\"), chs(\"vexpression\"), \"\")`
 
 vector4 q = quaternion(maketransform(aim, up));
@@ -410,9 +440,11 @@ vex_precision	[ 0	locks=0 ]	(	auto	)
 folder1	[ 0	locks=0 ]	(	0	0	)
 use_up_attr	[ 0	locks=0 ]	(	[ use_up_attr	0 ] 	)
 up	[ 0	locks=0 ]	(	[ upx	0 ] 	[ upy	1 ] 	[ upz	0 ] 	)
-do_vexpression	[ 0	locks=0 ]	(	[ do_vexpression	1 ] 	)
-vexpression	[ 0	locks=0 ]	(	[ vexpression	"// aim = {1,0,0};
+do_vexpression	[ 0	locks=0 ]	(	[ do_vexpression	0 ] 	)
+vexpression	[ 0	locks=0 ]	(	[ vexpression	"// aim = {0,0,1};
 // up = {0,1,0};" ] 	)
+reverse_aim	[ 0	locks=0 ]	(	[ reverse_aim	0 ] 	)
+reverse_up	[ 0	locks=0 ]	(	[ reverse_up	0 ] 	)
 }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -439,7 +471,7 @@ Content-Type: text/plain
 
 sopflags sopflags = 
 comment ""
-position -1.63175 0.0513842
+position -1.94217 -1.57831
 connectornextid 3
 flags =  lock off model off template off footprint off xray off bypass off display off render off highlight off unload off savedata off compress on colordefault on exposed on
 outputsNamed3
@@ -459,7 +491,7 @@ inputs
 stat
 {
   create 1569471907
-  modify 1588536261
+  modify 1590722621
   author Henry@LAPPY586
   access 0777
 }
@@ -636,7 +668,7 @@ inputs
 stat
 {
   create 1523780303
-  modify 1588536742
+  modify 1590725608
   author henry@GlaDOS
   access 0777
 }
@@ -830,7 +862,6 @@ Content-Type: text/plain
         label   "Do Vexpression"
         type    toggle
         default { "0" }
-        range   { 0 1 }
     }
     parm {
         name    "vexpression"
@@ -840,6 +871,20 @@ Content-Type: text/plain
         parmtag { "editor" "1" }
         parmtag { "editorlang" "vex" }
     }
+    parm {
+        name    "reverse_aim"
+        label   "Reverse Aim"
+        type    integer
+        default { "0" }
+        range   { 0 10 }
+    }
+    parm {
+        name    "reverse_up"
+        label   "Reverse Up"
+        type    integer
+        default { "0" }
+        range   { 0 10 }
+    }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
 Content-Disposition: attachment; filename="hdaroot/create_aim_vectors.chn"
@@ -889,6 +934,18 @@ Content-Type: text/plain
       flags = 0
       segment { length = 0 expr = chs(\"../vexpression\") }
     }
+    channel reverse_aim {
+      lefttype = extend
+      righttype = extend
+      flags = 0
+      segment { length = 0 expr = ch(\"../reverse_aim\") }
+    }
+    channel reverse_up {
+      lefttype = extend
+      righttype = extend
+      flags = 0
+      segment { length = 0 expr = ch(\"../reverse_up\") }
+    }
   }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -915,6 +972,13 @@ if(haspointattrib(0, \"up\") && chi(\"use_up_attr\")) {
 
 vector aim = normalize(point(1, \"P\", matchpt) - @P);
 
+if(chi(\"reverse_aim\")) {
+    aim *= -1;
+}
+if(chi(\"reverse_up\")) {
+    up *= -1;
+}
+
 `ifs(ch(\"do_vexpression\"), chs(\"vexpression\"), \"\")`
 
 vector4 q = quaternion(maketransform(aim, up));
@@ -940,6 +1004,8 @@ up	[ 0	locks=0 ]	(	[ upx	0 ] 	[ upy	1 ] 	[ upz	0 ] 	)
 do_vexpression	[ 0	locks=0 ]	(	[ do_vexpression	0 ] 	)
 vexpression	[ 0	locks=0 ]	(	[ vexpression	"// aim = {0,0,1};
 // up = {0,1,0};" ] 	)
+reverse_aim	[ 0	locks=0 ]	(	[ reverse_aim	0 ] 	)
+reverse_up	[ 0	locks=0 ]	(	[ reverse_up	0 ] 	)
 }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -986,7 +1052,7 @@ inputs
 stat
 {
   create 1525057897
-  modify 1588536752
+  modify 1590725608
   author henry@GlaDOS
   access 0777
 }
@@ -1173,7 +1239,6 @@ Content-Type: text/plain
         label   "Do Vexpression"
         type    toggle
         default { "0" }
-        range   { 0 1 }
     }
     parm {
         name    "vexpression"
@@ -1183,6 +1248,20 @@ Content-Type: text/plain
         parmtag { "editor" "1" }
         parmtag { "editorlang" "vex" }
     }
+    parm {
+        name    "reverse_aim"
+        label   "Reverse Aim"
+        type    integer
+        default { "0" }
+        range   { 0 10 }
+    }
+    parm {
+        name    "reverse_up"
+        label   "Reverse Up"
+        type    integer
+        default { "0" }
+        range   { 0 10 }
+    }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
 Content-Disposition: attachment; filename="hdaroot/pointwrangle1.chn"
@@ -1221,6 +1300,18 @@ Content-Type: text/plain
       flags = 0
       segment { length = 0 expr = chs(\"../vexpression\") }
     }
+    channel reverse_aim {
+      lefttype = extend
+      righttype = extend
+      flags = 0
+      segment { length = 0 expr = ch(\"../reverse_aim\") }
+    }
+    channel reverse_up {
+      lefttype = extend
+      righttype = extend
+      flags = 0
+      segment { length = 0 expr = ch(\"../reverse_up\") }
+    }
   }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -1238,6 +1329,12 @@ vex_threadjobsize	[ 0	locks=0 ]	(	1024	)
 snippet	[ 0	locks=0 ]	(	"vector pos = getbbox_center(1);
 vector aim = normalize(pos - @P);
 vector up = chv(\"up\");
+if(chi(\"reverse_aim\")) {
+    aim *= -1;
+}
+if(chi(\"reverse_up\")) {
+    up *= -1;
+}
 `ifs(ch(\"do_vexpression\"), chs(\"vexpression\"), \"\")`
 vector4 q = quaternion(maketransform(aim, up));
 p@orient = q;
@@ -1260,6 +1357,8 @@ up	[ 0	locks=0 ]	(	[ upx	0 ] 	[ upy	1 ] 	[ upz	0 ] 	)
 do_vexpression	[ 0	locks=0 ]	(	[ do_vexpression	0 ] 	)
 vexpression	[ 0	locks=0 ]	(	[ vexpression	"// aim = {0,0,1};
 // up = {0,1,0};" ] 	)
+reverse_aim	[ 0	locks=0 ]	(	[ reverse_aim	0 ] 	)
+reverse_up	[ 0	locks=0 ]	(	[ reverse_up	0 ] 	)
 }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -1434,7 +1533,7 @@ inputs
 stat
 {
   create 1523778074
-  modify 1588536261
+  modify 1590722600
   author henry@GlaDOS
   access 0777
 }
@@ -1478,7 +1577,7 @@ group	[ 0	locks=0 ]	(	""	)
 grouptype	[ 0	locks=0 ]	(	"guess"	)
 xOrd	[ 0	locks=0 ]	(	"srt"	)
 rOrd	[ 0	locks=0 ]	(	"xyz"	)
-t	[ 0	locks=0	autoscope=4 ]	(	[ tx	0 ] 	[ ty	0.89252158999443054 ] 	[ tz	-0.049328669905662537 ] 	)
+t	[ 0	locks=0	autoscope=4 ]	(	[ tx	0 ] 	[ ty	0 ] 	[ tz	0 ] 	)
 r	[ 0	locks=0 ]	(	0	0	0	)
 s	[ 0	locks=0 ]	(	1	1	1	)
 shear	[ 0	locks=0 ]	(	0	0	0	)
@@ -1589,7 +1688,7 @@ Content-Type: text/plain
 
 sopflags sopflags = 
 comment ""
-position -1.63175 -1.36181
+position -1.94217 -2.9915
 connectornextid 1
 flags =  lock off model off template off footprint off xray off bypass off display on render on highlight off unload off savedata off compress on colordefault on exposed on
 outputsNamed3
@@ -1606,7 +1705,7 @@ inputs
 stat
 {
   create 1523779784
-  modify 1569471907
+  modify 1590722621
   author henry@GlaDOS
   access 0777
 }
@@ -1670,7 +1769,7 @@ inputs
 stat
 {
   create 1523780233
-  modify 1588536261
+  modify 1590722600
   author henry@GlaDOS
   access 0777
 }
@@ -1928,7 +2027,7 @@ inputs
 stat
 {
   create 1525058140
-  modify 1588536261
+  modify 1590722600
   author henry@GlaDOS
   access 0777
 }

diff --git a/otls/MOPS_Aim.hda/MOPS_8_8Sop_1Aim_8_81.0/DialogScript b/otls/MOPS_Aim.hda/MOPS_8_8Sop_1Aim_8_81.0/DialogScript
@@ -109,6 +109,24 @@
         range   { -1 1 }
         parmtag { "autoscope" "0010000000000000" }
     }
+    parm {
+        name    "reverse_aim"
+        label   "Reverse Aim"
+        type    toggle
+        default { "0" }
+        range   { 0 10 }
+        parmtag { "autoscope" "0000000000000000" }
+        parmtag { "script_callback_language" "python" }
+    }
+    parm {
+        name    "reverse_up"
+        label   "Reverse Up"
+        type    toggle
+        default { "0" }
+        range   { 0 10 }
+        parmtag { "autoscope" "0000000000000000" }
+        parmtag { "script_callback_language" "python" }
+    }
     parm {
         name    "sepparm2"
         label   "Separator"

diff --git a/otls/MOPS_Randomize.hda/INDEX__SECTION b/otls/MOPS_Randomize.hda/INDEX__SECTION
@@ -24,5 +24,5 @@ Inputs:       1 to 1
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Fri Mar 13 22:23:10 2020
+Modified:     Fri May 22 15:28:55 2020
 
diff --git a/otls/MOPS_Randomize.hda/MOPS_8_8Sop_1Randomize_8_81.1/Contents.dir/.OPdummydefs b/otls/MOPS_Randomize.hda/MOPS_8_8Sop_1Randomize_8_81.1/Contents.dir/.OPdummydefs