1.14.4 update

This commit is contained in:
Tanasart 2023-05-23 14:02:38 +02:00
parent 6ca1dc9286
commit ce79638733
6 changed files with 73 additions and 20 deletions

View file

@ -8,8 +8,8 @@ function FFT(array_in) {
}
var fq = _FFT(array_in);
array_resize(fq, array_length(fq) / 2);
fq = array_reverse(fq)
array_resize(fq, array_length(fq) / 2 + 1);
//fq = array_reverse(fq)
return fq;
}

View file

@ -9,19 +9,30 @@ function Node_FFT(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) const
inputs[| 0] = nodeValue("Data", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [])
.setArrayDepth(1)
.setVisible(true, true);
inputs[| 1] = nodeValue("Preprocess Function", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0)
.setDisplay(VALUE_DISPLAY.enum_scroll, [ "None", "Hann" ]);
outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [])
.setArrayDepth(1);
static process_data = function(_outSurf, _data, _output_index, _array_index) {
var _dat = _data[0];
var _pre = _data[1];
var _cmp = [];
for( var i = 0; i < array_length(_dat); i++ )
_cmp[i] = new Complex(_dat[i]);
var N = array_length(_dat);
for( var i = 0; i < N; i++ ) {
var val = _dat[i];
if(_pre == 1) val = 0.5 * (1 - cos(2 * pi * i / (N - 1)));
_cmp[i] = new Complex(val);
}
var _res = FFT(_cmp);
var _r = [];
var _r = array_create(array_length(_res));
for( var i = 0; i < array_length(_res); i++ )
_r[i] = sqrt(sqr(_res[i].re) + sqr(_res[i].im));

View file

@ -21,7 +21,11 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
MODIFIED = true;
} else {
run_in(1, function() {
internalName = string_replace_all(name, " ", "_") + string(irandom_range(10000, 99999));
var str = string_replace_all(name, " ", "_");
str = string_replace_all(str, "/", "");
str = string_replace_all(str, "-", "");
internalName = str + string(irandom_range(10000, 99999));
NODE_NAME_MAP[? internalName] = self;
});
}

View file

@ -99,15 +99,13 @@ function Node_Image_gif(_x, _y, _group = noone) : Node(_x, _y, _group) construct
}
static step = function() {
if(loading == 2 && spr_builder != noone) {
if(spr_builder.building()) {
spr = spr_builder._spr;
doUpdate();
loading = 0;
delete spr_builder;
if(loading == 2 && spr_builder != noone && spr_builder.building()) {
spr = spr_builder._spr;
doUpdate();
loading = 0;
delete spr_builder;
gc_collect();
}
gc_collect();
}
}

View file

@ -57,11 +57,14 @@ function Node_Plot_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
inputs[| 22] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false);
inputs[| 23] = nodeValue("Smooth", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0)
.setDisplay(VALUE_DISPLAY.slider, [ 0, 1, 0.01 ]);
outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone);
input_display_list = [ 0,
["Data", true], 1, 12, 21, 14, 2, 3, 15, 16,
["Plot", false], 11, 4, 10, 20, 5, 17, 22,
["Plot", false], 11, 4, 10, 20, 5, 17, 22, 23,
["Render", false], 6, 13, 7, 18, 19, 8, 9,
];
@ -83,13 +86,17 @@ function Node_Plot_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
inputs[| 18].setVisible(_typ == 0);
inputs[| 19].setVisible(_typ == 0);
inputs[| 22].setVisible(_typ == 1);
inputs[| 23].setVisible(_typ == 1);
inputs[| 4].setVisible(!_use_path);
inputs[| 10].setVisible(!_use_path);
}
static drawOverlay = function(active, _x, _y, _s, _mx, _my, _snx, _sny) {
inputs[| 4].drawOverlay(active, _x, _y, _s, _mx, _my, _snx, _sny);
var _use_path = getSingleValue(20) != noone;
if(!_use_path)
inputs[| 4].drawOverlay(active, _x, _y, _s, _mx, _my, _snx, _sny);
}
static process_data = function(_outSurf, _data, _output_index, _array_index) {
@ -120,6 +127,7 @@ function Node_Plot_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
var _path = _data[20];
var _flip = _data[21];
var _loop = _data[22];
var _smt = _data[23];
_outSurf = surface_verify(_outSurf, _dim[0], _dim[1], attrDepth());
@ -166,7 +174,6 @@ function Node_Plot_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
if(_path == noone) {
_px = _ori[0] + lengthdir_x(i * _bar_spc, _ang);
_py = _ori[1] + lengthdir_y(i * _bar_spc, _ang);
_ang_nor = _ang + 90;
} else {
_pnt = _path.getPointRatio(i / amo);
if(_ppnt == undefined)
@ -174,11 +181,13 @@ function Node_Plot_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
_px = _pnt.x;
_py = _pnt.y;
_ang_nor = point_direction(_ppnt.x, _ppnt.y, _pnt.x, _pnt.y) + 90;
_ang = point_direction(_ppnt.x, _ppnt.y, _pnt.x, _pnt.y)
_ppnt = _pnt;
}
_ang_nor = _ang + 90;
_val = _smp_data[i] + _off;
_grd_col = _grd.eval(i / amo);
@ -193,7 +202,36 @@ function Node_Plot_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
else draw_line_width(_px, _py, nx, ny, _bar_wid);
break;
case 1 :
if(i > _st) draw_line_round(ox, oy, nx, ny, _lth);
if(i > _st) {
if(_smt > 0) {
var dist = dot_product(nx - ox, ny - oy, lengthdir_x(1, _ang), lengthdir_y(1, _ang));
var _b0x = ox + lengthdir_x(dist * _smt, _ang);
var _b0y = oy + lengthdir_y(dist * _smt, _ang);
var _b1x = nx + lengthdir_x(dist * _smt, _ang + 180);
var _b1y = ny + lengthdir_y(dist * _smt, _ang + 180);
//draw_line(ox, oy, _b0x, _b0y);
//draw_line(_b0x, _b0y, _b1x, _b1y);
//draw_line(_b1x, _b1y, nx, ny);
var _ox = ox, _oy = oy, _nx, _ny;
for( var j = 1; j <= 8; j++ ) {
var _t = 1 - j / 8;
_nx = ox * power(_t, 3) + 3 * _b0x * power(_t, 2) * (1 - _t) + 3 * _b1x * (_t) * power(1 - _t, 2) + nx * power(1 - _t, 3);
_ny = oy * power(_t, 3) + 3 * _b0y * power(_t, 2) * (1 - _t) + 3 * _b1y * (_t) * power(1 - _t, 2) + ny * power(1 - _t, 3);
if(_lth > 1) draw_line_round(_ox, _oy, _nx, _ny, _lth);
else draw_line(_ox, _oy, _nx, _ny);
_ox = _nx;
_oy = _ny;
}
} else {
if(_lth > 1) draw_line_round(ox, oy, nx, ny, _lth);
else draw_line(ox, oy, nx, ny);
}
}
break;
}
@ -206,7 +244,7 @@ function Node_Plot_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
}
}
if(_loop && _typ == 1)
if(_loop && amo > 1 && _typ == 1)
draw_line_round(fx, fy, nx, ny, _lth);
draw_set_circle_precision(64);

View file

@ -184,6 +184,8 @@ function Node_WAV_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const
print("Load audio complete");
readSoundComplete();
checkPreview(true);
UPDATE |= RENDER_TYPE.full;
}
insp2UpdateIcon[1] = attributes[? "play"];