Merge pull request #11 from Feu-Secret/tokenmagic-dev

Update 0.1.3d

.vs/VSWorkspaceState.json

@@ -4,14 +4,13 @@
     "\\tokenmagic",
     "\\tokenmagic\\fx",
     "\\tokenmagic\\fx\\filters",
-    "\\tokenmagic\\fx\\filters\\proto",
     "\\tokenmagic\\fx\\glsl",
     "\\tokenmagic\\fx\\glsl\\fragmentshaders",
     "\\tokenmagic\\fx\\glsl\\vertexshaders",
     "\\tokenmagic\\libs",
     "\\tokenmagic\\module",
     "\\tokenmagic\\updates"
   ],
-  "SelectedNode": "\\README.md",
+  "SelectedNode": "\\tokenmagic\\fx\\glsl\\fragmentshaders\\forcefield.js",
   "PreviewInSolutionExplorer": false
 }

README.md

@@ -1,4 +1,4 @@
-# Token Magic FX - Update v0.1.3c-alpha
+# Token Magic FX - Update v0.1.3d-alpha
 
 ## FX
 
@@ -18,6 +18,7 @@ The new filters have been added to the TokenMagic macro compendium.
 - Some internal improvements and refactoring.
 - Freezing when a scene is updated
 - Crash when a scene with animated tokens or tiles is deleted (with active players/GM in the scene)
+- autoDestroy and autoDisable properties not working properly.
 
 # Token Magic FX - Update v0.1.2-alpha
 

tokenmagic/fx/filters/proto/FilterProto.js

@@ -16,7 +16,7 @@ PIXI.Filter.prototype.setTMParams = function (params) {
 }
 
 PIXI.Filter.prototype.getPlaceable = function () {
-    return this.placeableImg;
+    return getPlaceableById(this.placeableId, this.placeableType);
 }
 
 PIXI.Filter.prototype.getPlaceableType = function () {

tokenmagic/fx/glsl/fragmentshaders/forcefield.js

@@ -223,7 +223,7 @@ vec4 blenderVec3(int blend, vec4 fColv4, vec4 sColv4)
     else if (blend == 10) { fCol = all(lessThanEqual(sCol, vec3(0.5, 0.5, 0.5))) ? (2. * fCol * sCol + fCol * fCol * (1. - 2. * sCol)) : sqrt(fCol) * (2. * sCol - 1.) + (2. * fCol) * (1. - sCol); }
     else if (blend == 11) { fCol = fCol / (1.0 - sCol + 0.00001); }
     else if (blend == 12) { fCol = 1.0 - (1.0 - fCol) / sCol + 0.00001; }
-    else if (blend == 13) { fCol = fCol + sCol; }
+    else if (blend == 13) { fCol = fCol + sCol; return vec4(fCol,0.6); }
     else { fCol = fCol + sCol; }
     
     return vec4(fCol,(fColv4.a+sColv4.a)/2.);
@@ -629,11 +629,15 @@ void main()
     
     vec4 final = clamp(ambientLight(clamp(colorized, 0., 1.)*intensity, uv, posLight-vec2(0.5,0.5)),0.,1.);
 
+    //if ( r <= 1. && pixel.a < 1. ) {
+    //    pixel.rgb = vec3(1.);
+    //}
+
     gl_FragColor =
             r > 1.0
                 ? pixel*(1.-a)
                 : (pixel.a < 1. 
-                        ? mix(blenderVec3(2, pixel, final),blenderVec3(blend, pixel, final),pixel.a)
+                        ? mix(blenderVec3(13, pixel, final),blenderVec3(blend, pixel, final),pixel.a)
                         : blenderVec3(blend, pixel, final));
 }
 `;

tokenmagic/module.json

@@ -2,7 +2,7 @@
   "name": "tokenmagic",
   "title": "Tokenmagic",
   "description": "<p>Add graphic filters and animations on your tokens and tiles.</p>",
-  "version": "0.1.3c",
+  "version": "0.1.3d",
   "compatibleCoreVersion": "0.6.5",
   "minimumCoreVersion": "0.6.0",
   "author": "SecretFire",

tokenmagic/updates/UPDATE-0.1.3d.md

@@ -0,0 +1,5 @@
+# Token Magic FX - Update v0.1.3d-alpha
+
+*Fixed regression :*
+- autoDestroy and autoDisable properties not working properly.
+