Added more gltexture effects (tonemapping, glow, lens aberration).\nNow nodes can control the execution priority.

This commit is contained in:
tamat
2018-06-08 18:24:37 +02:00
parent 62f847fbd6
commit 826ad74c18
4 changed files with 96 additions and 28 deletions

View File

@@ -131,11 +131,8 @@ GraphicsImage.prototype.loadImage = function( url, callback )
this.img = document.createElement("img");
if(url.substr(0,7) == "http://")
{
if(LiteGraph.proxy) //proxy external files
url = LiteGraph.proxy + url.substr(7);
}
if(url.substr(0,4) == "http" && LiteGraph.proxy)
url = LiteGraph.proxy + url.substr( url.indexOf(":") + 3 );
this.img.src = url;
this.boxcolor = "#F95";
@@ -514,7 +511,7 @@ function ImageVideo()
{
this.addInput("t","number");
this.addOutputs([["frame","image"],["t","number"],["d","number"]]);
this.properties = {"url":""};
this.properties = { url:"", use_proxy: true };
}
ImageVideo.title = "Video";
@@ -560,6 +557,9 @@ ImageVideo.prototype.loadVideo = function(url)
{
this._video_url = url;
if(this.properties.use_proxy && url.substr(0,4) == "http" && LiteGraph.proxy )
url = LiteGraph.proxy + url.substr( url.indexOf(":") + 3 );
this._video = document.createElement("video");
this._video.src = url;
this._video.type = "type=video/mp4";