diff --git a/.vs/Tokenmagic/v16/.suo b/.vs/Tokenmagic/v16/.suo index 9192dda..91edb99 100644 Binary files a/.vs/Tokenmagic/v16/.suo and b/.vs/Tokenmagic/v16/.suo differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 248969f..13dae47 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -4,7 +4,6 @@ "\\tokenmagic", "\\tokenmagic\\fx", "\\tokenmagic\\fx\\filters", - "\\tokenmagic\\fx\\filters\\proto", "\\tokenmagic\\fx\\glsl", "\\tokenmagic\\fx\\glsl\\fragmentshaders", "\\tokenmagic\\fx\\glsl\\vertexshaders", @@ -12,6 +11,6 @@ "\\tokenmagic\\module", "\\tokenmagic\\updates" ], - "SelectedNode": "\\README.md", + "SelectedNode": "\\tokenmagic\\fx\\glsl\\fragmentshaders\\forcefield.js", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index e395333..2a785f5 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/README.md b/README.md index 8671dbc..72d28b2 100644 --- a/README.md +++ b/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 diff --git a/Tokenmagic.zip b/Tokenmagic.zip index 7f4b831..c98d3c9 100644 Binary files a/Tokenmagic.zip and b/Tokenmagic.zip differ diff --git a/tokenmagic/fx/filters/proto/FilterProto.js b/tokenmagic/fx/filters/proto/FilterProto.js index 0847660..a7143c1 100644 --- a/tokenmagic/fx/filters/proto/FilterProto.js +++ b/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 () { diff --git a/tokenmagic/fx/glsl/fragmentshaders/forcefield.js b/tokenmagic/fx/glsl/fragmentshaders/forcefield.js index adb859e..b339373 100644 --- a/tokenmagic/fx/glsl/fragmentshaders/forcefield.js +++ b/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)); } `; \ No newline at end of file diff --git a/tokenmagic/module.json b/tokenmagic/module.json index 5ef93e9..50e4e45 100644 --- a/tokenmagic/module.json +++ b/tokenmagic/module.json @@ -2,7 +2,7 @@ "name": "tokenmagic", "title": "Tokenmagic", "description": "
Add graphic filters and animations on your tokens and tiles.
", - "version": "0.1.3c", + "version": "0.1.3d", "compatibleCoreVersion": "0.6.5", "minimumCoreVersion": "0.6.0", "author": "SecretFire", diff --git a/tokenmagic/updates/UPDATE-0.1.3d.md b/tokenmagic/updates/UPDATE-0.1.3d.md new file mode 100644 index 0000000..0cd3581 --- /dev/null +++ b/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. +