Update v0.4.3-alpha : pre-release fixes

README.md

@@ -1,36 +1,35 @@
 # Token Magic FX - Update v0.4.3-alpha
 
-*New effects :*
+*News :*
 - Polymorph effect :
     - Allow image transition between a source image (token, tile, etc.) and a target image of your choice.
     - 9 types of transition are provided :
       - Morphing, waterdrop, waving, twisting, take off/put on your disguise!, tvnoise, hologram, wind and basic alpha transition.
     - Properties to reduce or enlarge the target image.
 - XFire effect :
-    - A new fire filter with advanced properties, designed to be easily colorizable.
+    - A fire filter with advanced properties, designed to be easily colorizable.
     - specific blend modes that do not alter the visual quality of the filter depending on the brightness and intensity of the source image.
     - An advanced mode allows you to choose up to 4 colors to compose your perfect fire.
     - An inlay mode to create new effects, like superfrost or superheat.
     - A chromatic mode.
     - Adjustable scale on the x and y axis.
 - New macros have been added to the TMFX compendium (+ new presets for main library and templates)
+- Added two new `animType` :
+    - `halfCosOscillation` and `halfSinOscillation` :
+      - The half of the given oscillation in one loop.
+      - A tutorial is provided in the following macro : "36 - T01 - Turn into Mystery Man (polymorph)"
 
-*Improvements :*
+*Updates :*
 - Rank your effects :
     - The order in which you put your filters is important.
     - A new property called `rank` allow you to force the ordering of filters on a given target.
       - Filters with lowest rank are executed first, etc.
-      - If you do not specify a rank, TMFX will automatically assign rank within its reserved range (which start at 10000, to 20000).
+      - If you do not specify a rank, TMFX will automatically assign rank within its reserved range (10000 to 20000).
       - This system is the default mode and an alternative to the zOrder option, you can use either.
 - Transform filter :
     - The twist and bulge/pinch filters have been reengineered and put in the transform filter : 
       - with better performance and the elimination of flicker.
-
-*New animtypes :*
-- Added two new `animType` :
-    - `halfCosOscillation` and `halfSinOscillation` :
-      - The half of the given oscillation in one loop.
-      - A tutorial is provided in the following macro : "36 - T01 - Turn into Mystery Man (polymorph)"
+- Updated PIXI libs 
 
 *Deprecated :*
 - Twist and Bulge/Pinch effects : 

tokenmagic/fx/Anime.js

@@ -110,9 +110,10 @@ export class Anime {
     }
 
     async persistTerminatedEffect(effect) {
+        if (!(this.puppet.filterOwner === game.data.userId)) { return; }
+
         let animeInfo;
         let doInit = true;
-
         let flag = this.puppet.targetPlaceable.getFlag("tokenmagic", "animeInfo");
 
         if (flag) {

tokenmagic/fx/glsl/fragmentshaders/polymorph.js

@@ -189,6 +189,17 @@ void main() {
     uvExtra *= mat2(scale,0.,0.,scale);
     uvExtra += vec2(0.5);
 
+    // shortcut to prevent a lot of computation if progress is equal to 0 or 1
+    if (progress == 1.) {
+        gl_FragColor = getToColor(uvExtra);
+        return;
+    }
+
+    if (progress == 0.) {
+        gl_FragColor = getFromColor(vTextureCoord);
+        return;
+    }
+
     if (type <= 1 || type >= 10) {
         result = transition(vTextureCoord, uvExtra);
     } else if (type == 2) {

tokenmagic/module/tokenmagic.js

@@ -1300,13 +1300,11 @@ function initSocketListener() {
 
         switch (data.tmAction) {
             case SocketAction.SET_FLAG:
-                // getting the scene coming from the socket
                 await updateFlags(`filters`);
                 break;
 
             case SocketAction.SET_ANIME_FLAG:
-                // getting the scene coming from the socket
-                await updateFlags(`animeInfos`);
+                await updateFlags(`animeInfo`);
                 break;
         }
     });

tokenmagic/updates/UPDATE-0.4.3.md

@@ -1,36 +1,35 @@
 # Token Magic FX - Update v0.4.3-alpha
 
-*New effects :*
+*News :*
 - Polymorph effect :
     - Allow image transition between a source image (token, tile, etc.) and a target image of your choice.
     - 9 types of transition are provided :
       - Morphing, waterdrop, waving, twisting, take off/put on your disguise!, tvnoise, hologram, wind and basic alpha transition.
     - Properties to reduce or enlarge the target image.
 - XFire effect :
-    - A new fire filter with advanced properties, designed to be easily colorizable.
+    - A fire filter with advanced properties, designed to be easily colorizable.
     - specific blend modes that do not alter the visual quality of the filter depending on the brightness and intensity of the source image.
     - An advanced mode allows you to choose up to 4 colors to compose your perfect fire.
     - An inlay mode to create new effects, like superfrost or superheat.
     - A chromatic mode.
     - Adjustable scale on the x and y axis.
 - New macros have been added to the TMFX compendium (+ new presets for main library and templates)
+- Added two new `animType` :
+    - `halfCosOscillation` and `halfSinOscillation` :
+      - The half of the given oscillation in one loop.
+      - A tutorial is provided in the following macro : "36 - T01 - Turn into Mystery Man (polymorph)"
 
-*Improvements :*
+*Updates :*
 - Rank your effects :
     - The order in which you put your filters is important.
     - A new property called `rank` allow you to force the ordering of filters on a given target.
       - Filters with lowest rank are executed first, etc.
-      - If you do not specify a rank, TMFX will automatically assign rank within its reserved range (which start at 10000, to 20000).
+      - If you do not specify a rank, TMFX will automatically assign rank within its reserved range (10000 to 20000).
       - This system is the default mode and an alternative to the zOrder option, you can use either.
 - Transform filter :
     - The twist and bulge/pinch filters have been reengineered and put in the transform filter : 
       - with better performance and the elimination of flicker.
-
-*New animtypes :*
-- Added two new `animType` :
-    - `halfCosOscillation` and `halfSinOscillation` :
-      - The half of the given oscillation in one loop.
-      - A tutorial is provided in the following macro : "36 - T01 - Turn into Mystery Man (polymorph)"
+- Updated PIXI libs 
 
 *Deprecated :*
 - Twist and Bulge/Pinch effects :