Skip to content

Commit

Permalink
Merge pull request #205 from toadstorm/henry_dev
Browse files Browse the repository at this point in the history
instancer grid is now centered at origin, align in world absolute mod…
  • Loading branch information
toadstorm authored Aug 26, 2019
2 parents d9edf72 + c2b483a commit 86596bf
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 62 deletions.
2 changes: 1 addition & 1 deletion otls/MOPS_Align.hda/INDEX__SECTION
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ Inputs: 1 to 1
Subnet: true
Python: false
Empty: false
Modified: Mon Aug 12 21:50:33 2019
Modified: Mon Aug 26 09:57:41 2019

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Content-Type: text/plain

sopflags sopflags =
comment ""
position -4.74266 -3.38812
position -5.19594 -4.00152
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
Expand All @@ -41,16 +41,16 @@ outputsNamed3
}
inputsNamed3
{
0 MOPs_Transform_Modifier2 1 1 "input1"
0 MOPs_Combine_Falloffs1 2 1 "input1"
}
inputs
{
0 MOPs_Transform_Modifier2 0 1
0 MOPs_Combine_Falloffs1 0 1
}
stat
{
create 1565668266
modify 1565671786
create 1566830810
modify 1566838658
author Henry@LAPPY586
access 0777
}
Expand Down Expand Up @@ -110,7 +110,7 @@ inputs
stat
{
create 1555384760
modify 1565671825
modify 1566838631
author Henry@LAPPY586
access 0777
}
Expand All @@ -132,7 +132,7 @@ Content-Type: text/plain
baseparm
label "Group"
export none
bindselector points "Modify Points"
bindselector uvselect "Modify Points"
"Select the points to affect and press Enter to complete."
0 1 0xffffffff 0 grouptype 0
}
Expand Down Expand Up @@ -471,7 +471,7 @@ if(mode == 6) {
} 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.
pivot = qrotate(qinvert(orient), (-@P / scale)) + chv(\"pivot_absolute\");
pivot = qrotate(qinvert(orient), (-@P / scale)) + (chv(\"pivot_absolute\") / scale);
} else if(mode == 8) {
pivot = chv(\"pivot_absolute\");
} else {
Expand All @@ -491,7 +491,7 @@ vector delta = pivot - old_pivot;
//if(mode != 7 ) {
delta = qrotate(orient, delta);
//}
v@delta = delta;
// v@delta = delta;
int pivots_only = chi(\"pivots_only\") || mode == 7;
vector pivots_mod = set(pivots_only, pivots_only, pivots_only);
@P += (delta * pivots_mod * scale * falloff);" )
Expand All @@ -509,11 +509,11 @@ vex_inplace [ 0 locks=0 ] ( "off" )
vex_selectiongroup [ 0 locks=0 ] ( "" )
folder1 [ 0 locks=0 ] ( 0 0 )
mode [ 0 locks=0 ] ( [ mode 7 ] )
do_falloff [ 0 locks=0 ] ( [ do_falloff 1 ] )
do_falloff [ 0 locks=0 ] ( [ do_falloff 0 ] )
pivots_only [ 0 locks=0 ] ( [ pivots_only 1 ] )
falloff_attribute [ 0 locks=0 ] ( [ falloff_attribute mops_falloff ] )
pivot_offset [ 0 locks=0 ] ( [ pivot_offsetx 0.5 ] [ pivot_offsety 0 ] [ pivot_offsetz 0 ] )
pivot_absolute [ 0 locks=0 ] ( [ pivot_absolutex 0 ] [ pivot_absolutey 0 ] [ pivot_absolutez 0 ] )
pivot_offset [ 0 locks=0 ] ( [ pivot_offsetx 0 ] [ pivot_offsety 0 ] [ pivot_offsetz 0 ] )
pivot_absolute [ 0 locks=0 ] ( [ pivot_absolutex -0.050000000000000003 ] [ pivot_absolutey -0.050000000000000003 ] [ pivot_absolutez -0.050000000000000003 ] )
do_vexpression [ 0 locks=0 ] ( [ do_vexpression 0 ] )
vexpression [ 0 locks=0 ] ( [ vexpression "// pivot = {0,0,0};" ] )
}
Expand Down
2 changes: 1 addition & 1 deletion otls/MOPS_instancer.hda/INDEX__SECTION
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Inputs: 0 to 0
Subnet: true
Python: false
Empty: false
Modified: Wed Jun 26 17:23:12 2019
Modified: Mon Aug 26 10:07:15 2019

Operator: MOPS::Instancer::1.2
Label: MOPs Instancer
Expand Down
Binary file not shown.
Loading

0 comments on commit 86596bf

Please sign in to comment.