Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-03-01 19:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes in searchbox

Browse Source
This commit is contained in:
tamat
2019-05-27 20:10:47 +02:00
parent 50d3fb77bd
commit 54bc9b46cc
3 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/nodes/gltextures.js
View File

@@ -470,8 +470,7 @@
this.addInput("TextureB", "Texture");
this.addInput("value", "number");
this.addOutput("Texture", "Texture");
this.help =
"<p>pixelcode must be vec3, uvcode must be vec2, is optional</p>\
this.help = "<p>pixelcode must be vec3, uvcode must be vec2, is optional</p>\
<p><strong>uv:</strong> tex. coords</p><p><strong>color:</strong> texture <strong>colorB:</strong> textureB</p><p><strong>time:</strong> scene time <strong>value:</strong> input value</p><p>For multiline you must type: result = ...</p>";
this.properties = {
@@ -845,10 +844,7 @@
}
var uniforms = this._uniforms;
var type = LGraphTexture.getTextureType(
this.properties.precision,
in_tex
);
var type = LGraphTexture.getTextureType( this.properties.precision, in_tex );
//render to texture
var w = this.properties.width | 0;
@@ -920,10 +916,7 @@
var width = tex.width;
var height = tex.height;
var type =
this.precision === LGraphTexture.LOW
? gl.UNSIGNED_BYTE
: gl.HIGH_PRECISION_FORMAT;
var type = this.precision === LGraphTexture.LOW ? gl.UNSIGNED_BYTE : gl.HIGH_PRECISION_FORMAT;
if (this.precision === LGraphTexture.DEFAULT) {
type = tex.type;
}
@@ -4387,6 +4380,7 @@
code: "",
width: 512,
height: 512,
clear: true,
precision: LGraphTexture.DEFAULT
};
this._func = null;
@@ -4394,8 +4388,8 @@
}
LGraphTextureCanvas2D.title = "Canvas2D";
LGraphTextureCanvas2D.desc =
"Executes Canvas2D code inside a texture or the viewport";
LGraphTextureCanvas2D.desc = "Executes Canvas2D code inside a texture or the viewport.";
LGraphTextureCanvas2D.help = "Set width and height to 0 to match viewport size.";
LGraphTextureCanvas2D.widgets_info = {
precision: { widget: "combo", values: LGraphTexture.MODE_VALUES },
@@ -4411,13 +4405,7 @@
if (name == "code" && LiteGraph.allow_scripts) {
this._func = null;
try {
this._func = new Function(
"canvas",
"ctx",
"time",
"script",
value
);
this._func = new Function( "canvas", "ctx", "time", "script", value );
this.boxcolor = "#00FF00";
} catch (err) {
this.boxcolor = "#FF0000";
@@ -4443,17 +4431,26 @@
var width = this.properties.width || gl.canvas.width;
var height = this.properties.height || gl.canvas.height;
var temp = this._temp_texture;
if (!temp || temp.width != width || temp.height != height) {
var type = LGraphTexture.getTextureType( this.properties.precision );
if (!temp || temp.width != width || temp.height != height || temp.type != type ) {
temp = this._temp_texture = new GL.Texture(width, height, {
format: gl.RGBA,
filter: gl.LINEAR
filter: gl.LINEAR,
type: type
});
}
var properties = this.properties;
var that = this;
var time = this.graph.getTime();
temp.drawTo(function() {
gl.start2D();
if(properties.clear)
{
gl.clearColor(0,0,0,0);
gl.clear( gl.COLOR_BUFFER_BIT );
}
try {
if (func.draw) {
func.draw.call(that, gl.canvas, gl, time, func);
@@ -4474,6 +4471,8 @@
LiteGraph.registerNodeType("texture/canvas2D", LGraphTextureCanvas2D);
// To do chroma keying *****************
function LGraphTextureMatte() {
this.addInput("in", "Texture");