apply attrs scale falloff now blends properly in world/local space AN…

…D with multiplicative/replace modes
toadstorm · Jan 21, 2021 · 81cc3cf · 81cc3cf
1 parent c04620f
commit 81cc3cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/otls/MOPS_applyAttributes.hda/INDEX__SECTION b/otls/MOPS_applyAttributes.hda/INDEX__SECTION
@@ -24,7 +24,7 @@ Inputs:       2 to 2
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Sat Mar 16 20:28:30 2019
+Modified:     Sun Mar 17 00:28:30 2019
 
 Operator:     MOPS::Apply_Attributes::1.2
 Label:        MOPs Apply Attributes
@@ -38,7 +38,7 @@ Inputs:       2 to 2
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Mon Jun 17 15:20:36 2019
+Modified:     Mon Jun 17 19:20:36 2019
 
 Operator:     MOPS::Apply_Attributes::1.3
 Label:        MOPs Apply Attributes
@@ -52,7 +52,7 @@ Inputs:       2 to 2
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Tue Sep 17 15:42:50 2019
+Modified:     Tue Sep 17 19:42:50 2019
 
 Operator:     MOPS::Apply_Attributes::1.4
 Label:        MOPs Apply Attributes
@@ -66,7 +66,7 @@ Inputs:       2 to 2
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Sat May 30 01:10:31 2020
+Modified:     Sat May 30 05:10:31 2020
 
 Operator:     MOPS::Apply_Attributes::1.5
 Label:        MOPs Apply Attributes
@@ -80,5 +80,5 @@ Inputs:       2 to 2
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Wed Jan 20 18:21:01 2021
+Modified:     Wed Jan 20 18:28:19 2021
 
diff --git a/.../MOPS_applyAttributes.hda/MOPS_8_8Sop_1Apply__Attributes_8_81.5/Contents.dir/.OPdummydefs b/.../MOPS_applyAttributes.hda/MOPS_8_8Sop_1Apply__Attributes_8_81.5/Contents.dir/.OPdummydefs
diff --git a/...MOPS_applyAttributes.hda/MOPS_8_8Sop_1Apply__Attributes_8_81.5/Contents.dir/Contents.mime b/...MOPS_applyAttributes.hda/MOPS_8_8Sop_1Apply__Attributes_8_81.5/Contents.dir/Contents.mime
@@ -51,7 +51,7 @@ inputs
 stat
 {
   create 1611194202
-  modify 1611195568
+  modify 1611196085
   author Henry@GlaDOS
   access 0777
 }
@@ -112,7 +112,7 @@ inputs
 stat
 {
   create 1529358487
-  modify 1611195659
+  modify 1611196096
   author Henry@LAPPY586
   access 0777
 }
@@ -721,10 +721,14 @@ if(local) {
         out = out * invert(offset);
         scale(out, scale);
         out = out * offset;
+        out = out * rot;
+        out_scale = lerp(1, scale2*pscale2, weight);
+        scale(out, out_scale);
+    } else {
+        out = out * rot;
+        out_scale = lerp(scale*pscale, scale2*pscale2, weight);
+        scale(out, out_scale);
     }
-    out = out * rot;
-    out_scale = lerp(1, scale2*pscale2, weight);
-    scale(out, out_scale);
 }
 
 // set intrinsics.