From 1cd86a65375d52d7ac0fed4c59c07e17b73549ff Mon Sep 17 00:00:00 2001 From: "henry@toadstorm.com" Date: Thu, 19 Mar 2020 21:42:09 -0700 Subject: [PATCH 1/3] added local space toggle to mops align bbox mode --- otls/MOPS_Align.hda/INDEX__SECTION | 6 +- .../Contents.dir/.OPdummydefs | Bin 10393 -> 10393 bytes .../Contents.dir/Contents.mime | 581 ++++++++++++++++-- .../MOPS_8_8Sop_1Align_8_81.2/DialogScript | 9 + 4 files changed, 547 insertions(+), 49 deletions(-) diff --git a/otls/MOPS_Align.hda/INDEX__SECTION b/otls/MOPS_Align.hda/INDEX__SECTION index 54c5aebe..8e24de25 100644 --- a/otls/MOPS_Align.hda/INDEX__SECTION +++ b/otls/MOPS_Align.hda/INDEX__SECTION @@ -10,7 +10,7 @@ Inputs: 1 to 1 Subnet: true Python: false Empty: false -Modified: Mon Nov 11 16:51:29 2019 +Modified: Sun Nov 10 20:51:29 2019 Operator: MOPS::Align::1.1 Label: MOPs Align @@ -24,7 +24,7 @@ Inputs: 1 to 1 Subnet: true Python: false Empty: false -Modified: Mon Dec 2 16:13:21 2019 +Modified: Sun Dec 1 20:13:21 2019 Operator: MOPS::Align::1.2 Label: MOPs Align @@ -38,5 +38,5 @@ Inputs: 1 to 1 Subnet: true Python: false Empty: false -Modified: Tue Mar 17 21:22:55 2020 +Modified: Thu Mar 19 21:40:41 2020 diff --git a/otls/MOPS_Align.hda/MOPS_8_8Sop_1Align_8_81.2/Contents.dir/.OPdummydefs b/otls/MOPS_Align.hda/MOPS_8_8Sop_1Align_8_81.2/Contents.dir/.OPdummydefs index 5eaa8baeee039e105524a6759d77d93234950d6f..2bef8f8926151002a0f7ad1676f99db04b9c4608 100644 GIT binary patch delta 96 zcmbOkI5Tj97ITTG=R{q3Fy$}HT;efzV!j-hnlJ?2ADp?r~wk5{FX6*-PFLu c#K_omav-PK<|?LIHn7Am4!FeTKu!;N00?j%d;kCd delta 96 zcmbOkI5Tj97IWbuxrw^+V9H;XxxjJB#C$n0HDL-!aI!k%3^09&Q3E7A`7L7ryNQ8` cftiWP Date: Sun, 22 Mar 2020 15:53:33 -0700 Subject: [PATCH 2/3] updated apply core math, updated extract to only optionally extract mops_orient, updated visualize frame to match --- otls/MOPS_Visualize_Frame.hda/INDEX__SECTION | 2 +- .../Contents.dir/.OPdummydefs | Bin 11318 -> 11640 bytes .../Contents.dir/.OPfallbacks | 6 +- .../Contents.dir/Contents.mime | 47 ++-- .../ExtraFileOptions | 6 +- .../OnCreated | 6 +- .../TypePropertiesOptions | 16 +- otls/MOPS_applyAttributes.hda/INDEX__SECTION | 4 +- .../Contents.dir/.OPdummydefs | Bin 10393 -> 10393 bytes .../Contents.dir/Contents.mime | 207 ++++++++++++------ .../MOPS_extractAttributes.hda/INDEX__SECTION | 2 +- .../Contents.dir/.OPdummydefs | Bin 10393 -> 10393 bytes .../Contents.dir/Contents.mime | 204 +++++++++++++++-- .../DialogScript | 9 + otls/MOPS_transform.hda/INDEX__SECTION | 4 +- .../Contents.dir/.OPdummydefs | Bin 17406 -> 17406 bytes .../Contents.dir/Contents.mime | 35 ++- 17 files changed, 409 insertions(+), 139 deletions(-) diff --git a/otls/MOPS_Visualize_Frame.hda/INDEX__SECTION b/otls/MOPS_Visualize_Frame.hda/INDEX__SECTION index aef6167b..ea8ac6f4 100644 --- a/otls/MOPS_Visualize_Frame.hda/INDEX__SECTION +++ b/otls/MOPS_Visualize_Frame.hda/INDEX__SECTION @@ -10,5 +10,5 @@ Inputs: 1 to 1 Subnet: true Python: false Empty: false -Modified: Tue Jul 9 22:33:54 2019 +Modified: Sun Mar 22 15:08:20 2020 diff --git a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/Contents.dir/.OPdummydefs b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/Contents.dir/.OPdummydefs index 373fbdc8f6a2d923675f7d535c2dc56035bb0696..69119b2236897bc319b60237cfab6034a3bf1967 100644 GIT binary patch delta 442 zcmdlM@gr)2CQDrT!z&YYUM*NJ!4i1R`W+0uoZtaIGjvEy~PI%_~XF(NvlwC_TAeh&aToMx3UG2Ii&) z#%9Ko4fqTuPh~b`9%-FEKY2L@TA_#}{Ol<(DY&PX5R$ z#U21=ew2;6FrF;L?tpJi16TKth! zA4nn@VE{8ilm(`r8?GN{-UeP(V8|R61BQ$k8(UFKkPr_%XiN-EjLd*RW41Yxy@m~> dOcbn4_GC}uRa&gsi0RT&ya_Rs8 diff --git a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/Contents.dir/.OPfallbacks b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/Contents.dir/.OPfallbacks index 4ec63fbb..22bd775c 100644 --- a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/Contents.dir/.OPfallbacks +++ b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/Contents.dir/.OPfallbacks @@ -1,6 +1,6 @@ -MOPS::Sop/Extract_Attributes::1.0 C:/Users/Henry/Projects/VFX/MOPS/otls/MOPS_extractAttributes.hda +MOPS::Sop/Extract_Attributes::1.0 C:/Users/Henry/Projects/VFX/MOPS_Prime/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 C:/PROGRA~1/SIDEEF~1/HOUDIN~1.391/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 C:/PROGRA~1/SIDEEF~1/HOUDIN~1.391/houdini/otls/OPlibSop.hda Sop/attribwrangle otls/OPlibSop.hda diff --git a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/Contents.dir/Contents.mime b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/Contents.dir/Contents.mime index 2f9386f3..34fb9858 100644 --- a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/Contents.dir/Contents.mime +++ b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/Contents.dir/Contents.mime @@ -32,24 +32,24 @@ Content-Type: text/plain sopflags sopflags = comment "" -position 1.7841 -4.5317 +position -12.6815 1.73941 connectornextid 1 -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 +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 { } inputsNamed3 { -0 MOPs_Trails 1 1 "input1" +0 MOPs_Transform_Modifier1 1 1 "input1" } inputs { -0 MOPs_Trails 1 1 +0 MOPs_Transform_Modifier1 0 1 } stat { - create 1562628489 - modify 1562736441 + create 1584895659 + modify 1584914898 author Henry@LAPPY586 access 0777 } @@ -150,7 +150,7 @@ inputs stat { create 1542840097 - modify 1562628489 + modify 1584914855 author Henry@LAPPY586 access 0777 } @@ -171,10 +171,18 @@ grouptype [ 0 locks=0 ] ( "guess" ) class [ 0 locks=0 ] ( "point" ) vex_numcount [ 0 locks=0 ] ( 10 ) vex_threadjobsize [ 0 locks=0 ] ( 1024 ) -snippet [ 0 locks=0 ] ( "matrix3 m = qconvert(p@orient); -v@N = {0,0,1}*m; -v@up = {0,1,0}*m; -v@binormal = {1,0,0}*m;" ) +snippet [ 0 locks=0 ] ( "// apply mops_orient pretransform + +vector4 mops_orient = quaternion(ident()); +if(haspointattrib(0, \"mops_orient\")) { + mops_orient = point(0, \"mops_orient\", @ptnum); +} +p@orient = qmultiply(p@orient, mops_orient); + +matrix3 m = qconvert(p@orient); +v@viz_N = {0,0,1}*m; +v@viz_up = {0,1,0}*m; +v@viz_binormal = {1,0,0}*m;" ) exportlist [ 0 locks=0 ] ( * ) vex_strict [ 0 locks=0 ] ( "off" ) autobind [ 0 locks=0 ] ( "on" ) @@ -187,6 +195,7 @@ vex_updatenmls [ 0 locks=0 ] ( "off" ) vex_matchattrib [ 0 locks=0 ] ( id ) vex_inplace [ 0 locks=0 ] ( "off" ) vex_selectiongroup [ 0 locks=0 ] ( "" ) +vex_precision [ 0 locks=0 ] ( auto ) } --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY @@ -213,7 +222,7 @@ Content-Type: text/plain sopflags sopflags = comment "" -position 1.29394 3.62547 +position 1.72165 3.73591 connectornextid 2 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 @@ -231,7 +240,7 @@ inputs stat { create 1557810246 - modify 1557813721 + modify 1584895438 author Henry@LAPPY586 access 0777 } @@ -316,7 +325,7 @@ Content-Type: text/plain { "___Version___":{ "type":"string", - "value":"17.5.229" + "value":"18.0.391" } } @@ -346,7 +355,7 @@ inputsNamed3 } inputs { -0 (0) 1 1 +0 (0) 0 1 } stat { @@ -377,7 +386,7 @@ Content-Type: text/plain { "___Version___":{ "type":"string", - "value":"17.5.229" + "value":"18.0.391" } } @@ -414,7 +423,7 @@ inputs stat { create 1557810327 - modify 1557813725 + modify 1584895621 author Henry@LAPPY586 access 0777 } @@ -436,7 +445,7 @@ destgrouptype [ 0 locks=0 ] ( "points" ) matchbyattribute [ 0 locks=0 ] ( "off" ) attributetomatch [ 0 locks=0 ] ( piece ) attrib [ 0 locks=0 ] ( "otherattrib" ) -attribname [ 0 locks=0 ] ( "N up binormal" ) +attribname [ 0 locks=0 ] ( "viz_N viz_up viz_binormal" ) copyp [ 0 locks=0 ] ( "on" ) usenewname [ 0 locks=0 ] ( "off" ) newname [ 0 locks=0 ] ( "" ) @@ -451,7 +460,7 @@ Content-Type: text/plain { "___Version___":{ "type":"string", - "value":"17.5.229" + "value":"18.0.391" } } diff --git a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/ExtraFileOptions b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/ExtraFileOptions index 7e8cd5c9..772715d3 100644 --- a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/ExtraFileOptions +++ b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/ExtraFileOptions @@ -1,7 +1,7 @@ { "OnCreated/Cursor":{ "type":"intarray", - "value":[1,1] + "value":[34,31] }, "OnCreated/IsExpr":{ "type":"bool", @@ -39,6 +39,10 @@ "type":"string", "value":"" }, + "ViewerStateModule/CodeGenInput":{ + "type":"string", + "value":"{\n\t\"state_name\":\"\",\n\t\"state_label\":\"\",\n\t\"state_descr\":\"\",\n\t\"state_icon\":\"$HH/config/Icons\",\n\t\"state_debug_menu\":0,\n\t\"state_sample\":0,\n\t\"state_handler_indices\":[]\n}\n" + }, "mops_TD_tools_05.svg/Cursor":{ "type":"intarray", "value":[1,1] diff --git a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/OnCreated b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/OnCreated index 69a265b5..395c754f 100644 --- a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/OnCreated +++ b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/OnCreated @@ -15,7 +15,7 @@ if hasattr(hou, 'viewportVisualizers'): node = kwargs['node'] v1 = hou.viewportVisualizers.createVisualizer(hou.viewportVisualizers.type('vis_marker'), hou.viewportVisualizerCategory.Node, node) v1.setIsActive(True) - v1.setParm('attrib', 'N') + v1.setParm('attrib', 'viz_N') v1.setParm('style', 'vector') v1.setParm('markercolorr', 0); v1.setParm('markercolorg', 0); @@ -23,7 +23,7 @@ if hasattr(hou, 'viewportVisualizers'): v2 = hou.viewportVisualizers.createVisualizer(hou.viewportVisualizers.type('vis_marker'), hou.viewportVisualizerCategory.Node, node) v2.setIsActive(True) - v2.setParm('attrib', 'up') + v2.setParm('attrib', 'viz_up') v2.setParm('style', 'vector') v2.setParm('markercolorr', 0); v2.setParm('markercolorg', 1); @@ -31,7 +31,7 @@ if hasattr(hou, 'viewportVisualizers'): v1 = hou.viewportVisualizers.createVisualizer(hou.viewportVisualizers.type('vis_marker'), hou.viewportVisualizerCategory.Node, node) v1.setIsActive(True) - v1.setParm('attrib', 'binormal') + v1.setParm('attrib', 'viz_binormal') v1.setParm('style', 'vector') v1.setParm('markercolorr', 1); v1.setParm('markercolorg', 0); diff --git a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/TypePropertiesOptions b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/TypePropertiesOptions index b4811492..a6d52acf 100644 --- a/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/TypePropertiesOptions +++ b/otls/MOPS_Visualize_Frame.hda/MOPS_8_8Sop_1Visualize__Frame_8_81.0/TypePropertiesOptions @@ -1,14 +1,14 @@ -SaveSpareParms := 0; CheckExternal := 1; -SaveIcon := 1; -GzipContents := 1; ContentsCompressionType := 1; -UnlockOnCreate := 0; -SaveCachedCode := 0; +ForbidOutsideParms := 1; +GzipContents := 1; LockContents := 1; MakeDefault := 1; -UseDSParms := 1; -ForbidOutsideParms := 1; +ParmsFromVfl := 0; PrefixDroppedParmLabel := 0; PrefixDroppedParmName := 0; -ParmsFromVfl := 0; +SaveCachedCode := 0; +SaveIcon := 1; +SaveSpareParms := 0; +UnlockOnCreate := 0; +UseDSParms := 1; diff --git a/otls/MOPS_applyAttributes.hda/INDEX__SECTION b/otls/MOPS_applyAttributes.hda/INDEX__SECTION index d3a8b089..a79c526e 100644 --- a/otls/MOPS_applyAttributes.hda/INDEX__SECTION +++ b/otls/MOPS_applyAttributes.hda/INDEX__SECTION @@ -10,7 +10,7 @@ Inputs: 2 to 2 Subnet: true Python: false Empty: false -Modified: Fri Jan 4 20:24:00 2019 +Modified: Fri Jan 4 02:24:00 2019 Operator: MOPS::Apply_Attributes::1.1 Label: MOPs Apply Attributes @@ -66,5 +66,5 @@ Inputs: 2 to 2 Subnet: true Python: false Empty: false -Modified: Sun Mar 15 18:46:39 2020 +Modified: Sun Mar 22 15:46:34 2020 diff --git a/otls/MOPS_applyAttributes.hda/MOPS_8_8Sop_1Apply__Attributes_8_81.4/Contents.dir/.OPdummydefs b/otls/MOPS_applyAttributes.hda/MOPS_8_8Sop_1Apply__Attributes_8_81.4/Contents.dir/.OPdummydefs index 4c0c91ed59c18a4859e6f28a5b7292fdacfda2d5..2ff6a5026d0164615b0ae5f5cefb38f518fbc008 100644 GIT binary patch delta 96 zcmbOkI5Tj97IXQlQxkRN!IZx&b2)e8#C$n0HDL-!aI!k%3^09&Q3E7A`7L7ryQ!H0 b5E)Jm|9Lc4Jdh cBQs;u$$^|^o2!^=*}xLNIN%bS135k90Y~T~r~m)} diff --git a/otls/MOPS_applyAttributes.hda/MOPS_8_8Sop_1Apply__Attributes_8_81.4/Contents.dir/Contents.mime b/otls/MOPS_applyAttributes.hda/MOPS_8_8Sop_1Apply__Attributes_8_81.4/Contents.dir/Contents.mime index 1dd51c0c..387ef7b6 100644 --- a/otls/MOPS_applyAttributes.hda/MOPS_8_8Sop_1Apply__Attributes_8_81.4/Contents.dir/Contents.mime +++ b/otls/MOPS_applyAttributes.hda/MOPS_8_8Sop_1Apply__Attributes_8_81.4/Contents.dir/Contents.mime @@ -32,27 +32,27 @@ Content-Type: text/plain sopflags sopflags = comment "" -position -1.63175 0.0513842 +position -14.4992 1.44353 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 { -0 "output1" +2 "output1" } inputsNamed3 { -1 IN_MOPS 1 1 "input1" -2 switch_aim_method 1 1 "input2" +0 attribdelete1 1 1 "input1" +1 MOPs_Extract_Attributes 1 1 "input2" } inputs { -0 IN_MOPS 0 1 -1 switch_aim_method 0 1 +0 attribdelete1 0 1 +1 MOPs_Extract_Attributes 0 1 } stat { - create 1569471907 - modify 1575610147 + create 1584915313 + modify 1584917180 author Henry@LAPPY586 access 0777 } @@ -113,7 +113,7 @@ inputs stat { create 1529358487 - modify 1584322784 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -135,7 +135,7 @@ Content-Type: text/plain baseparm label "Group" export none - bindselector uvselect "Modify Points" + bindselector points "Modify Points" "Select the points to affect and press Enter to complete." 0 1 0xffffffff 0 grouptype 0 } @@ -571,6 +571,9 @@ if((type != \"PackedGeometry\") && (type != \"PackedFragment\") && (type != \"Pa } } } + +// p@__orient1 = orient; + // simplify pscale vs scale if(abs(scale.x-scale.y) < epsilon && abs(scale.y-scale.z) < epsilon && abs(length(scale)-1) < epsilon) { pscale *= scale.x; @@ -612,8 +615,8 @@ if(haspointattrib(1, \"euler\")) { // scale, rotate, translate -f@__pscale2 = pscale2; -v@__scale1 = scale; +//f@__pscale2 = pscale2; +//v@__scale1 = scale; if(doS) { if(Smode == 0) { // scale = lerp(scale, scale*scale2*pscale2, weight); @@ -626,35 +629,33 @@ if(doS) { } } -v@__scale = scale; -f@__pscale = pscale; +//v@__scale = scale; +//f@__pscale = pscale; vector4 mops_orient = quaternion(ident()); if(haspointattrib(0, \"mops_orient\")) { mops_orient = point(0, \"mops_orient\", @ptnum); } - if(doR) { if(Rmode == 0) { + vector4 out_orient = quaternion(ident()); // accumulate rotation - // apply mops_orient inverse pre-transform. if(local) { if(!haspointattrib(1, \"euler\")) { orient2 = slerp(quaternion(ident()), orient2, weight); } - orient2 = qmultiply(orient2, qinvert(mops_orient)); - p@__orient2 = orient2; - } - vector4 out_orient = qmultiply(orient2, orient); - if(!local){ + // pre-transform current orient by mops orient, accumulate, then invert pre-transform. + orient = qmultiply(orient, mops_orient); + out_orient = qmultiply(orient, orient2); + out_orient = qmultiply(out_orient, qinvert(mops_orient)); + } else { + // rotation order is switched if rotating in world space. + // orient = qmultiply(orient, qinvert(mops_orient)); out_orient = qmultiply(orient2, orient); } orient = out_orient; - // re-apply mops_orient. - if(local) { - orient = qmultiply(mops_orient, orient); - } + } else { // set rotation directly if(!haspointattrib(1, \"euler\")) { @@ -670,17 +671,13 @@ if(doT) { p@__out_orient = orient; -// generate output matrix. use the inverse of mops_orient axes at first (default is ident) -matrix3 out = invert(qconvert(mops_orient)); +// generate output matrix. +matrix3 out = ident(); scale(out, (scale*pscale)); -// now rotate this matrix by mops_orient. -out *= qconvert(mops_orient); - matrix3 rot = qconvert(orient); out = out * rot; 3@__transform = out; -i@__ingroup = 1; -//setprimintrinsic(0, \"transform\", @ptnum, out, \"set\");" ) +i@__ingroup = 1;" ) exportlist [ 0 locks=0 autoscope=0 ] ( * ) vex_strict [ 0 locks=0 autoscope=0 ] ( "off" ) autobind [ 0 locks=0 autoscope=0 ] ( "on" ) @@ -695,9 +692,9 @@ vex_inplace [ 0 locks=0 autoscope=0 ] ( "off" ) vex_selectiongroup [ 0 locks=0 autoscope=0 ] ( "" ) vex_precision [ 0 locks=0 ] ( auto ) folder1 [ 0 locks=0 ] ( 0 0 ) -do_translate [ 0 locks=0 autoscope=0 ] ( [ do_translate 0 ] ) +do_translate [ 0 locks=0 autoscope=0 ] ( [ do_translate 1 ] ) do_rotate [ 0 locks=0 autoscope=0 ] ( [ do_rotate 1 ] ) -do_scale [ 0 locks=0 autoscope=0 ] ( [ do_scale 0 ] ) +do_scale [ 0 locks=0 autoscope=0 ] ( [ do_scale 1 ] ) do_weight [ 0 locks=0 autoscope=0 ] ( [ do_weight 1 ] ) rotate_mode [ 0 locks=0 autoscope=0 ] ( [ rotate_mode 1 ] ) scale_mode [ 0 locks=0 autoscope=0 ] ( [ scale_mode 0 ] ) @@ -750,7 +747,7 @@ inputs stat { create 1529358487 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -833,7 +830,7 @@ inputs stat { create 1555437557 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -929,7 +926,7 @@ inputs stat { create 1569084024 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -1016,7 +1013,7 @@ inputs stat { create 1583618763 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -1096,7 +1093,7 @@ inputs stat { create 1583691828 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -1145,6 +1142,91 @@ Content-Type: text/plain } } +--HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY +Content-Disposition: attachment; filename="hdaroot/pointwrangle1.init" +Content-Type: text/plain + +type = attribwrangle +matchesdef = 1 + +--HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY +Content-Disposition: attachment; filename="hdaroot/pointwrangle1.def" +Content-Type: text/plain + +sopflags sopflags = +comment "" +position 1.33952 -13.3967 +connectornextid 2 +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 +{ +1 "output1" +} +inputsNamed3 +{ +0 attribswap2 1 1 "input1" +} +inputs +{ +0 attribswap2 0 1 +} +stat +{ + create 1584863149 + modify 1584915313 + author Henry@LAPPY586 + access 0777 +} +color UT_Color RGB 0.8 0.8 0.8 +delscript "" +exprlanguage hscript +end + +--HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY +Content-Disposition: attachment; filename="hdaroot/pointwrangle1.parm" +Content-Type: text/plain + +{ +version 0.8 +folder0 [ 0 locks=0 ] ( 0 0 ) +group [ 0 locks=0 ] ( "" ) +grouptype [ 0 locks=0 ] ( "guess" ) +class [ 0 locks=0 ] ( "point" ) +vex_numcount [ 0 locks=0 ] ( 10 ) +vex_threadjobsize [ 0 locks=0 ] ( 1024 ) +snippet [ 0 locks=0 ] ( "// the output orientation doesn't take into account the mops_orient pretransform. +// adjust orient to fit. +vector4 mops_orient = quaternion(ident()); +if(haspointattrib(0, \"mops_orient\")) { + mops_orient = point(0, \"mops_orient\", @ptnum); +} +p@orient = qmultiply(qinvert(mops_orient), p@orient);" ) +exportlist [ 0 locks=0 ] ( * ) +vex_strict [ 0 locks=0 ] ( "off" ) +autobind [ 0 locks=0 ] ( "on" ) +bindings [ 0 locks=0 ] ( 0 ) +groupautobind [ 0 locks=0 ] ( "on" ) +groupbindings [ 0 locks=0 ] ( 0 ) +vex_cwdpath [ 0 locks=0 ] ( . ) +vex_outputmask [ 0 locks=0 ] ( * ) +vex_updatenmls [ 0 locks=0 ] ( "off" ) +vex_matchattrib [ 0 locks=0 ] ( id ) +vex_inplace [ 0 locks=0 ] ( "off" ) +vex_selectiongroup [ 0 locks=0 ] ( "" ) +vex_precision [ 0 locks=0 ] ( auto ) +} + +--HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY +Content-Disposition: attachment; filename="hdaroot/pointwrangle1.userdata" +Content-Type: text/plain + +{ + "___Version___":{ + "type":"string", + "value":"" + } +} + --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY Content-Disposition: attachment; filename="hdaroot/attribcopy_id.init" Content-Type: text/plain @@ -1178,7 +1260,7 @@ inputs stat { create 1529358487 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -1331,7 +1413,7 @@ inputs stat { create 1529358487 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -1449,7 +1531,7 @@ sopflags sopflags = comment "" position -0.382921 -18.404 connectornextid 1 -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 +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 { } @@ -1464,7 +1546,7 @@ inputs stat { create 1529358487 - modify 1584322466 + modify 1584862529 author Henry@LAPPY586 access 0777 } @@ -1590,7 +1672,7 @@ inputs stat { create 1529358487 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -1665,7 +1747,7 @@ inputs stat { create 1529358487 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -1801,7 +1883,7 @@ inputs stat { create 1555459453 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -1830,7 +1912,7 @@ Content-Type: text/plain { version 0.8 -input [ 0 locks=0 ] ( [ input 0 ] ) +input [ 0 locks=0 ] ( [ input 1 ] ) } --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY @@ -1857,7 +1939,7 @@ Content-Type: text/plain sopflags sopflags = comment "" -position -0.382921 -13.5576 +position -0.382921 -14.5805 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 @@ -1867,17 +1949,17 @@ outputsNamed3 inputsNamed3 { 0 switch_do_output_scale 1 1 "input1" -2 attribswap2 1 1 "input2" +2 pointwrangle1 1 1 "input2" } inputs { 0 switch_do_output_scale 0 1 -1 attribswap2 0 1 +1 pointwrangle1 0 1 } stat { create 1556862778 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -1952,7 +2034,7 @@ inputs stat { create 1569084092 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -2009,7 +2091,7 @@ sopflags sopflags = comment "" position -0.382921 -11.2829 connectornextid 3 -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 +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 { 1 "output1" @@ -2027,7 +2109,7 @@ inputs stat { create 1569468433 - modify 1584322466 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -2214,7 +2296,7 @@ Content-Type: text/plain sopflags sopflags = comment "" -position 1.00353 -6.32362 +position 1.14262 -6.21869 connectornextid 2 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 @@ -2232,7 +2314,7 @@ inputs stat { create 1569709553 - modify 1584173407 + modify 1584897229 author Henry@LAPPY586 access 0777 } @@ -2300,7 +2382,7 @@ inputs stat { create 1573854736 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -2443,7 +2525,7 @@ inputs stat { create 1583519692 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -2519,7 +2601,7 @@ inputs stat { create 1529358487 - modify 1584208869 + modify 1584915313 author Henry@LAPPY586 access 0777 } @@ -2604,7 +2686,7 @@ inputs stat { create 1583618748 - modify 1584173368 + modify 1584897426 author Henry@LAPPY586 access 0777 } @@ -2672,7 +2754,7 @@ inputs stat { create 1583691873 - modify 1583691883 + modify 1584862529 author Henry@LAPPY586 access 0777 } @@ -2713,7 +2795,7 @@ Content-Type: text/plain Content-Disposition: attachment; filename="hdaroot.order" Content-Type: text/plain -28 +29 apply_attributes1 attribcopy_id enumerate1 @@ -2742,6 +2824,7 @@ attribpromote1 set_intrinsics primitivewrangle1 attribpromote3 +pointwrangle1 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY Content-Disposition: attachment; filename="hdaroot.net" diff --git a/otls/MOPS_extractAttributes.hda/INDEX__SECTION b/otls/MOPS_extractAttributes.hda/INDEX__SECTION index 5c9f5395..e3bbd4af 100644 --- a/otls/MOPS_extractAttributes.hda/INDEX__SECTION +++ b/otls/MOPS_extractAttributes.hda/INDEX__SECTION @@ -10,5 +10,5 @@ Inputs: 1 to 1 Subnet: true Python: false Empty: false -Modified: Sun Mar 15 18:47:55 2020 +Modified: Sun Mar 22 15:46:08 2020 diff --git a/otls/MOPS_extractAttributes.hda/MOPS_8_8Sop_1Extract__Attributes_8_81.0/Contents.dir/.OPdummydefs b/otls/MOPS_extractAttributes.hda/MOPS_8_8Sop_1Extract__Attributes_8_81.0/Contents.dir/.OPdummydefs index ad76db4b0d881127a7351ae71337556ed3b82978..b51452d38706cab6a3c9f88c6ab1bba24f1f096b 100644 GIT binary patch delta 96 zcmbOkI5Tj97IXQl4HI?c!IZx&b2)e8#C$n0HDL-!aI!k%3^09&Q3E7A`7L7ryQ!H0 b5E)Jm&!IZx&bKcdt6Z7T3)PyM@!O7~3Gr;sAMh%eg#cpbDY+`6=vN@9Zn K+x$jFNFD%U#V_>$ delta 142 zcmey@&iJpLae@|eR-@EJU3oC&ufv>Ge|Tb@ESQ=n2d4Hv0m)5X#yA;F+c3=l)7P0a zK+==rRm3JsFk7)3nV6fK8yIhnWd0@zm&lMsNUW6I%m$SRfT^CmQr2wq8x Date: Mon, 23 Mar 2020 09:04:46 -0700 Subject: [PATCH 3/3] updated VERSION --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 3ba033af..6281efba 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -v1.0.12 Experimental \ No newline at end of file +v1.0.14 Experimental \ No newline at end of file