Merge pull request #225 from toadstorm/henry_dev

Henry dev

VERSION.txt

@@ -1 +1 @@
-v0.1.70 Experimental
+v0.1.72 Experimental

otls/MOPS_Align.hda/INDEX__SECTION

@@ -10,5 +10,19 @@ Inputs:       1 to 1
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Sun Nov 10 10:14:39 2019
+Modified:     Thu Nov 14 21:51:29 2019
+
+Operator:     MOPS::Align::1.1
+Label:        MOPs Align
+Path:         oplib:/MOPS::Sop/Align::1.1?MOPS::Sop/Align::1.1
+Icon:         opdef:/MOPS::Sop/Align::1.1?IconSVG
+Table:        Sop
+License:      
+Extra:        
+User:         
+Inputs:       1 to 1
+Subnet:       true
+Python:       false
+Empty:        false
+Modified:     Thu Nov 14 22:20:33 2019
 

otls/MOPS_Align.hda/MOPS_8_8Sop_1Align_8_81.0/Contents.dir/Contents.mime

@@ -32,22 +32,25 @@ Content-Type: text/plain
 
 sopflags sopflags = 
 comment ""
-position -1.83623 0.0141712
-connectornextid 0
+position -8.47694 -31.5893
+connectornextid 2
 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
 {
+0 "output1"
 }
 inputsNamed3
 {
+1 	foreach_end2 1 1 "input1"
 }
 inputs
 {
+0 	foreach_end2 0 1
 }
 stat
 {
-  create 1573409225
-  modify 1573409305
+  create 1573797045
+  modify 1573797085
   author Henry@LAPPY586
   access 0777
 }
@@ -107,7 +110,7 @@ inputs
 stat
 {
   create 1555384760
-  modify 1573409225
+  modify 1573797086
   author Henry@LAPPY586
   access 0777
 }
@@ -323,7 +326,6 @@ Content-Type: text/plain
         label   "Do Vexpression"
         type    toggle
         default { "0" }
-        range   { 0 1 }
     }
     parm {
         name    "vexpression"
@@ -333,6 +335,14 @@ Content-Type: text/plain
         parmtag { "editor" "1" }
         parmtag { "editorlang" "vex" }
     }
+    parm {
+        name    "offset_vexpression"
+        label   "Offset Vexpression"
+        type    string
+        default { "" }
+        parmtag { "editor" "1" }
+        parmtag { "editorlang" "vex" }
+    }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
 Content-Disposition: attachment; filename="hdaroot/align_pivots.chn"
@@ -428,6 +438,13 @@ Content-Type: text/plain
       flags = 0
       segment { length = 0 expr = chs(\"../vexpression\") }
     }
+    channel offset_vexpression {
+      lefttype = extend
+      righttype = extend
+      defaultString = "\"// offset = {0,0,0};\""
+      flags = 0
+      segment { length = 0 expr = chs(\"../offset_vexpression\") }
+    }
   }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -464,7 +481,10 @@ int index = floor(mode / 2);
 // if in custom pivot mode, just add the custom value
 // to the existing pivot.
 if(mode == 6) {
-    pivot += chv(\"pivot_offset\");
+    vector offset = chv(\"pivot_offset\");
+    // enable vexpression
+    `ifs(ch(\"do_vexpression\"), chs(\"offset_vexpression\"), \"\")`
+    pivot += offset;
 } else if(mode == 7) {
     // the pivot needs to be adjusted for scale in this case.
     // we also need to account for the current orientation when adjusting.
@@ -475,7 +495,6 @@ if(mode == 6) {
     pivot[index] = bounds[mode];
 }
 // enable vexpression
-
 `ifs(ch(\"do_vexpression\"), chs(\"vexpression\"), \"\")`
 
 // if falloff is enabled, lerp this shit
@@ -513,6 +532,7 @@ pivot_offset	[ 0	locks=0 ]	(	[ pivot_offsetx	0 ] 	[ pivot_offsety	0 ] 	[ pivot_o
 pivot_absolute	[ 0	locks=0 ]	(	[ pivot_absolutex	0 ] 	[ pivot_absolutey	0 ] 	[ pivot_absolutez	0 ] 	)
 do_vexpression	[ 0	locks=0 ]	(	[ do_vexpression	0 ] 	)
 vexpression	[ 0	locks=0 ]	(	[ vexpression	"// pivot = {0,0,0};" ] 	)
+offset_vexpression	[ 0	locks=0 ]	(	[ offset_vexpression	"// offset = {0,0,0};" ] 	)
 }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY

otls/MOPS_Align.hda/MOPS_8_8Sop_1Align_8_81.0/DialogScript

@@ -19,6 +19,7 @@
         label   "Group"
         type    string
         default { "" }
+        hidewhen "{ mode < 7 }"
         menutoggle {
             [ "opmenu -l align_pivots group" ]
         }
@@ -109,7 +110,7 @@
         type    vector
         size    3
         default { "0" "0" "0" }
-        hidewhen "{ mode != 7 }"
+        hidewhen "{ mode < 7 }"
         range   { 0 1 }
         parmtag { "autoscope" "0000000000000000" }
     }
@@ -128,8 +129,28 @@
         type    string
         default { "// pivot = {0,0,0};" }
         disablewhen "{ do_vexpression == 0 }"
+        hidewhen "{ mode < 7 }"
         parmtag { "autoscope" "0000000000000000" }
         parmtag { "editor" "1" }
         parmtag { "editorlang" "vex" }
     }
+    parm {
+        name    "offset_vexpression"
+        label   "VEXpression"
+        type    string
+        default { "// offset = {0,0,0};" }
+        disablewhen "{ do_vexpression == 0 }"
+        hidewhen "{ mode != 6 }"
+        parmtag { "autoscope" "0000000000000000" }
+        parmtag { "editor" "1" }
+        parmtag { "editorlang" "vex" }
+    }
+    parm {
+        name    "show_offset"
+        label   "Label"
+        type    integer
+        invisible
+        default { "0" }
+        range   { 0 10 }
+    }
 }

otls/MOPS_Align.hda/MOPS_8_8Sop_1Align_8_81.1/Contents.dir/.OPfallbacks

@@ -0,0 +1,6 @@
+MOPS::Sop/Extract_Attributes::1.0 C:/Users/Henry/Projects/VFX/MOPS/otls/MOPS_extractAttributes.hda
+MOPS::Sop/Extract_Attributes::1.0 otls/MOPS_extractAttributes.hda
+Sop/attribdelete C:/PROGRA~1/SIDEEF~1/HOUDIN~1.229/houdini/otls/OPlibSop.hda
+Sop/attribdelete otls/OPlibSop.hda
+Sop/attribwrangle C:/PROGRA~1/SIDEEF~1/HOUDIN~1.229/houdini/otls/OPlibSop.hda
+Sop/attribwrangle otls/OPlibSop.hda