This commit is contained in:
Tanasart 2024-11-04 12:08:06 +07:00
parent 761f9d5cf1
commit e3a03ca6ca
35 changed files with 182 additions and 137 deletions

View File

@ -66,9 +66,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -6,6 +6,7 @@ function __3dUVSphere(radius = 0.5, hori = 16, vert = 8, smt = false) : __3dObje
self.hori = hori; self.hori = hori;
self.vert = vert; self.vert = vert;
self.smooth = smt; self.smooth = smt;
projection = 0;
static initModel = function() { // swap H, V because fuck me static initModel = function() { // swap H, V because fuck me
vertex = [ array_create(vert * hori * 2 * 3) ]; vertex = [ array_create(vert * hori * 2 * 3) ];
@ -39,17 +40,10 @@ function __3dUVSphere(radius = 0.5, hori = 16, vert = 8, smt = false) : __3dObje
var hy3 = dsin(ha1) * r1; var hy3 = dsin(ha1) * r1;
var hz3 = h1; var hz3 = h1;
var u0 = ha0 / 360; var u0 = ha0 / 360, v0;
var v0 = 0.5 - 0.5 * dsin(va0); var u1 = ha1 / 360, v1;
var u2 = ha0 / 360, v2;
var u1 = ha1 / 360; var u3 = ha1 / 360, v3;
var v1 = 0.5 - 0.5 * dsin(va0);
var u2 = ha0 / 360;
var v2 = 0.5 - 0.5 * dsin(va1);
var u3 = ha1 / 360;
var v3 = 0.5 - 0.5 * dsin(va1);
var ind = (i * hori + j) * 6; var ind = (i * hori + j) * 6;
@ -82,6 +76,29 @@ function __3dUVSphere(radius = 0.5, hori = 16, vert = 8, smt = false) : __3dObje
vertex[0][ind + 5].setNormal(nor[0], nor[1], nor[2]); vertex[0][ind + 5].setNormal(nor[0], nor[1], nor[2]);
} }
switch(projection) {
case 0 :
v0 = dsin(va0);
v2 = dsin(va1);
break;
case 1 :
v0 = va0 / 90;
v2 = va1 / 90;
break;
case 2 :
v0 = (2 * arctan(exp(degtorad(va0))) - pi / 2) / (pi / 2);
v2 = (2 * arctan(exp(degtorad(va1))) - pi / 2) / (pi / 2);
break;
}
v0 = 0.5 - 0.5 * v0;
v2 = 0.5 - 0.5 * v2;
v1 = v0;
v3 = v2;
vertex[0][ind + 0].setUV(u0, v0); vertex[0][ind + 0].setUV(u0, v0);
vertex[0][ind + 1].setUV(u1, v1); vertex[0][ind + 1].setUV(u1, v1);
vertex[0][ind + 2].setUV(u2, v2); vertex[0][ind + 2].setUV(u2, v2);

View File

@ -40,10 +40,10 @@
globalvar HOTKEYS, HOTKEY_CONTEXT; globalvar HOTKEYS, HOTKEY_CONTEXT;
LATEST_VERSION = 1_18_00_0; LATEST_VERSION = 1_18_00_0;
VERSION = 1_18_01_0; VERSION = 1_18_03_1;
SAVE_VERSION = 1_18_02_0; SAVE_VERSION = 1_18_02_0;
VERSION_STRING = MAC? "1.18.003m" : "1.18.3"; VERSION_STRING = MAC? "1.18.003m" : "1.18.3.1";
BUILD_NUMBER = 1_18_03_0; BUILD_NUMBER = 1_18_03_1;
HOTKEYS = ds_map_create(); HOTKEYS = ds_map_create();
HOTKEY_CONTEXT = ds_list_create(); HOTKEY_CONTEXT = ds_list_create();

View File

@ -14,26 +14,29 @@ function Node_3D_Mesh_Sphere_UV(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _
newInput(in_mesh + 3, nodeValue_Bool("Smooth Normal", self, false )); newInput(in_mesh + 3, nodeValue_Bool("Smooth Normal", self, false ));
newInput(in_mesh + 4, nodeValue_Enum_Scroll("Projection", self, 0, [ "Lambert", "Equirectangular" ] ));
input_display_list = [ input_display_list = [
__d3d_input_list_mesh, in_mesh + 0, in_mesh + 1, __d3d_input_list_mesh, in_mesh + 0, in_mesh + 1, in_mesh + 4,
__d3d_input_list_transform, __d3d_input_list_transform,
["Material", false], in_mesh + 3, in_mesh + 2, ["Material", false], in_mesh + 3, in_mesh + 2,
] ]
static processData = function(_output, _data, _output_index, _array_index = 0) { #region static processData = function(_output, _data, _output_index, _array_index = 0) {
var _sideH = _data[in_mesh + 0]; var _sideH = _data[in_mesh + 0];
var _sideV = _data[in_mesh + 1]; var _sideV = _data[in_mesh + 1];
var _mat = _data[in_mesh + 2]; var _mat = _data[in_mesh + 2];
var _smt = _data[in_mesh + 3]; var _smt = _data[in_mesh + 3];
var _proj = _data[in_mesh + 4];
var object = getObject(_array_index); var object = getObject(_array_index);
object.checkParameter({ hori: _sideH, vert: _sideV, smooth: _smt }); object.checkParameter({ hori: _sideH, vert: _sideV, smooth: _smt, projection: _proj });
object.materials = [ _mat ]; object.materials = [ _mat ];
setTransform(object, _data); setTransform(object, _data);
return object; return object;
} #endregion }
static getPreviewValues = function() { return getSingleValue(in_mesh + 1); } static getPreviewValues = function() { return getSingleValue(in_mesh + 1); }
} }

View File

@ -19,10 +19,13 @@ function Node_Array_Rearrange(_x, _y, _group = noone) : Node(_x, _y, _group) con
order_i = noone; order_i = noone;
order_y = 0; order_y = 0;
rearranger = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { #region rearranger = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) {
var _arr = inputs[0].getValue(); var _arr = inputs[0].getValue();
var _ord = inputs[1].getValue(); var _ord = inputs[1].getValue();
if(!is_array(_arr)) return 0;
if(!is_array(_ord) || array_length(_ord) != array_length(_arr)) return 0;
var amo = array_length(_arr); var amo = array_length(_arr);
var _fx = _x; var _fx = _x;
var _fy = _y + ui(8); var _fy = _y + ui(8);
@ -68,6 +71,12 @@ function Node_Array_Rearrange(_x, _y, _group = noone) : Node(_x, _y, _group) con
draw_set_color(COLORS.node_composite_bg); draw_set_color(COLORS.node_composite_bg);
break; break;
case VALUE_TYPE.color :
if(is_numeric(_val)) {
drawColor(_val, _fx + ui(40), _ffy + ui(4), _w - ui(40 + 8), _fsh - ui(8));
break;
}
default : default :
draw_set_text(f_p2, fa_center, fa_center, COLORS._main_text); draw_set_text(f_p2, fa_center, fa_center, COLORS._main_text);
draw_text(_ffcx, _ffy + _fsh / 2, string(_val)); draw_text(_ffcx, _ffy + _fsh / 2, string(_val));
@ -88,6 +97,7 @@ function Node_Array_Rearrange(_x, _y, _group = noone) : Node(_x, _y, _group) con
array_remove(_ord, ordering); array_remove(_ord, ordering);
array_insert(_ord, _hov, ordering); array_insert(_ord, _hov, ordering);
inputs[1].setValue(_ord); inputs[1].setValue(_ord);
triggerRender();
if(mouse_release(mb_left)) { if(mouse_release(mb_left)) {
ordering = noone; ordering = noone;
@ -97,21 +107,19 @@ function Node_Array_Rearrange(_x, _y, _group = noone) : Node(_x, _y, _group) con
order_y = lerp_float(order_y, 0, 5); order_y = lerp_float(order_y, 0, 5);
return _h; return _h;
}); #endregion });
input_display_list = [ 0, ["Rearranger", false], rearranger ]; input_display_list = [ 0, ["Rearranger", false], rearranger ];
static onValueFromUpdate = function(index = 0) { #region static onValueFromUpdate = function(index = 0) {
if(LOADING || APPENDING) return; if(LOADING || APPENDING) return;
var _arr = inputs[0].getValue(); var _arr = inputs[0].getValue();
var _val = array_create(array_length(_arr)); var _val = array_create_ext(array_length(_arr), function(i) /*=>*/ {return i});
for( var i = 0, n = array_length(_arr); i < n; i++ )
_val[i] = i;
inputs[1].setValue(_val); inputs[1].setValue(_val);
} #endregion }
static step = function() { #region static step = function() {
var _typ = VALUE_TYPE.any; var _typ = VALUE_TYPE.any;
if(inputs[0].value_from != noone) _typ = inputs[0].value_from.type; if(inputs[0].value_from != noone) _typ = inputs[0].value_from.type;
@ -127,13 +135,19 @@ function Node_Array_Rearrange(_x, _y, _group = noone) : Node(_x, _y, _group) con
type = _typ; type = _typ;
will_setHeight = true; will_setHeight = true;
} }
} #endregion }
static update = function(frame = CURRENT_FRAME) { #region static update = function(frame = CURRENT_FRAME) {
var _arr = getInputData(0); var _arr = getInputData(0);
var _ord = getInputData(1); var _ord = getInputData(1);
if(!is_array(_arr)) return; if(!is_array(_arr)) return;
if(!is_array(_ord) || array_length(_ord) != array_length(_arr)) {
_ord = array_create_ext(array_length(_arr), function(i) /*=>*/ {return i});
inputs[1].setValue(_ord);
}
var res = []; var res = [];
for( var i = 0; i < array_length(_arr); i++ ) { for( var i = 0; i < array_length(_arr); i++ ) {
@ -142,13 +156,25 @@ function Node_Array_Rearrange(_x, _y, _group = noone) : Node(_x, _y, _group) con
} }
outputs[0].setValue(res); outputs[0].setValue(res);
} #endregion }
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { #region static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
draw_set_text(f_sdf, fa_center, fa_center, COLORS._main_text);
var str = outputs[0].getValue();
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
draw_text_bbox(bbox, str); var val = outputs[0].getValue();
} #endregion
switch(inputs[0].type) {
case VALUE_TYPE.surface :
break;
case VALUE_TYPE.color :
drawPalette(val, bbox.x0, bbox.y0, bbox.w, bbox.h);
break;
default :
draw_set_text(f_sdf, fa_center, fa_center, COLORS._main_text);
draw_text_bbox(bbox, val);
}
}
} }

View File

@ -4,7 +4,6 @@
new scrollItem("Pixel"), new scrollItem("Pixel"),
new scrollItem("Bilinear"), new scrollItem("Bilinear"),
new scrollItem("Bicubic"), new scrollItem("Bicubic"),
// new scrollItem("RadSin"),
new scrollItem("Lanczos3"), new scrollItem("Lanczos3"),
]; ];
@ -26,7 +25,7 @@
surface_rgba32float, surface_rgba32float,
surface_r8unorm, surface_r8unorm,
surface_r16float, surface_r16float,
surface_r32float surface_r32float,
]; ];
var surface_format_name = [ var surface_format_name = [

View File

@ -1,5 +1,5 @@
function Node_Corner(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { function Node_Corner(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor {
name = "Round corner"; name = "Round Corner";
newInput(0, nodeValue_Surface("Surface in", self)); newInput(0, nodeValue_Surface("Surface in", self));

View File

@ -2419,7 +2419,8 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor {
postLoad(); postLoad();
} }
if(anim_timeline && attributes.show_timeline) refreshTimeline(); anim_timeline = attributes.show_timeline;
if(anim_timeline) refreshTimeline();
} }
static inputBalance = function() { // Cross-version compatibility for dynamic input nodes static inputBalance = function() { // Cross-version compatibility for dynamic input nodes
@ -2756,9 +2757,8 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor {
switch(_key) { switch(_key) {
case "interpolate" : case "interpolate" :
case "oversample" : case "oversample" :
if(group && _val == 0) return group.getAttribute(_key); if(_val == 0 && group != noone) return group.getAttribute(_key);
_val--; return _val;
break;
} }
return _val; return _val;

View File

@ -566,7 +566,6 @@ function Node_Export(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
// print($">>>>>>>>>>>>>>>>>>>> export {CURRENT_FRAME} <<<<<<<<<<<<<<<<<<<<"); // print($">>>>>>>>>>>>>>>>>>>> export {CURRENT_FRAME} <<<<<<<<<<<<<<<<<<<<");
randomize(); randomize();
directory = $"{TEMPDIR}{irandom_range(100000, 999999)}";
exportLog = log; exportLog = log;
var surf = getInputData( 0); var surf = getInputData( 0);
@ -731,6 +730,7 @@ function Node_Export(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
static doInspectorAction = function() { static doInspectorAction = function() {
if(!IS_CMD && (LOADING || APPENDING)) return; if(!IS_CMD && (LOADING || APPENDING)) return;
directory = $"{TEMPDIR}{irandom_range(100000, 999999)}";
var path = getInputData(1); var path = getInputData(1);
if(path == "") return; if(path == "") return;

View File

@ -1,5 +1,5 @@
function Node_High_Pass(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { function Node_High_Pass(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor {
name = "High_Pass"; name = "High Pass";
newInput(0, nodeValue_Surface("Surface in", self)); newInput(0, nodeValue_Surface("Surface in", self));

View File

@ -97,7 +97,7 @@ function Node_Path_Builder(_x, _y, _group = noone) : Node(_x, _y, _group) constr
segments[p][i] = sg; segments[p][i] = sg;
lengths[p][i] = l; lengths[p][i] = l;
lengthTotal[p] += l; lengthTotal[p] += l;
lengthAccs[p][i] = lengthTotal; lengthAccs[p][i] = lengthTotal[p];
} }
} }
} }

View File

@ -60,7 +60,7 @@ function Node_Pixel_Math(_x, _y, _group = noone) : Node_Processor(_x, _y, _group
var opS = _data[11]; var opS = _data[11];
var mixAmo = _data[12]; var mixAmo = _data[12];
var _oprand = global.node_math_scroll[type]; var _oprand = global.node_math_names[type];
setDisplayName(_oprand); setDisplayName(_oprand);
inputs[ 8].setVisible(false); inputs[ 8].setVisible(false);

View File

@ -640,7 +640,7 @@ function __initNodes() {
addNodeObject(filter, "Bloom", s_node_bloom, "Node_Bloom", [1, Node_Bloom],, "Apply bloom effect, blurring and brighten the bright part of the image."); addNodeObject(filter, "Bloom", s_node_bloom, "Node_Bloom", [1, Node_Bloom],, "Apply bloom effect, blurring and brighten the bright part of the image.");
addNodeObject(filter, "Trail", s_node_trail, "Node_Trail", [1, Node_Trail],, "Blend animation by filling in the pixel 'in-between' two or more frames.").setVersion(1130); addNodeObject(filter, "Trail", s_node_trail, "Node_Trail", [1, Node_Trail],, "Blend animation by filling in the pixel 'in-between' two or more frames.").setVersion(1130);
addNodeObject(filter, "Erode", s_node_erode, "Node_Erode", [1, Node_Erode],, "Remove pixel that are close to the border of the image."); addNodeObject(filter, "Erode", s_node_erode, "Node_Erode", [1, Node_Erode],, "Remove pixel that are close to the border of the image.");
addNodeObject(filter, "Corner", s_node_corner, "Node_Corner", [1, Node_Corner], ["round corner"], "Round out sharp corner of the image.").setVersion(1110); addNodeObject(filter, "Round Corner", s_node_corner, "Node_Corner", [1, Node_Corner],, "Round out sharp corner of the image.").setVersion(1110);
addNodeObject(filter, "Blobify", s_node_blobify, "Node_Blobify", [1, Node_Blobify],, "Round off sharp corner in BW image by bluring and thresholding.").setVersion(11650); addNodeObject(filter, "Blobify", s_node_blobify, "Node_Blobify", [1, Node_Blobify],, "Round off sharp corner in BW image by bluring and thresholding.").setVersion(11650);
addNodeObject(filter, "2D Light", s_node_2d_light, "Node_2D_light", [1, Node_2D_light],, "Apply different shaped light on the image."); addNodeObject(filter, "2D Light", s_node_2d_light, "Node_2D_light", [1, Node_2D_light],, "Apply different shaped light on the image.");
addNodeObject(filter, "Cast Shadow", s_node_shadow_cast, "Node_Shadow_Cast", [1, Node_Shadow_Cast], ["raycast"], "Apply light that create shadow using shadow mask.").setVersion(1100); addNodeObject(filter, "Cast Shadow", s_node_shadow_cast, "Node_Shadow_Cast", [1, Node_Shadow_Cast], ["raycast"], "Apply light that create shadow using shadow mask.").setVersion(1100);

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }

View File

@ -1,6 +1,6 @@
#pragma use(sampler) #pragma use(sampler)
#region -- sampler -- [1729740697.9444373] #region -- sampler -- [1730686036.7372286]
uniform int interpolation; uniform int interpolation;
uniform vec2 sampleDimension; uniform vec2 sampleDimension;
uniform int sampleMode; uniform int sampleMode;
@ -69,9 +69,9 @@
} }
vec4 texture2Dintp( sampler2D texture, vec2 uv ) { vec4 texture2Dintp( sampler2D texture, vec2 uv ) {
if(interpolation <= 1) return texture2D( texture, uv ); if(interpolation <= 2) return texture2D( texture, uv );
else if(interpolation == 2) return texture2D_bicubic( texture, uv ); else if(interpolation == 3) return texture2D_bicubic( texture, uv );
else if(interpolation == 3) return texture2D_lanczos3( texture, uv ); else if(interpolation == 4) return texture2D_lanczos3( texture, uv );
return texture2D( texture, uv ); return texture2D( texture, uv );
} }