[RGB, HSV color] value now clamped to its respecting range.

This commit is contained in:
Tanasart 2024-10-11 09:48:24 +07:00
parent f51f024918
commit e7397e9de8
54 changed files with 169 additions and 133 deletions

View File

@ -1,8 +1,8 @@
function nodeValue_Vector(_name, _node, _value, _data = {}) {
return new NodeValue_Array(_name, _node, _value, "", -1);
return new __NodeValue_Array(_name, _node, _value, "", -1);
}
function NodeValue_Array(_name, _node, _value, _tooltip = "", _length = 2) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor {
function __NodeValue_Array(_name, _node, _value, _tooltip = "", _length = 2) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor {
type_array = 1;
def_length = _length;

View File

@ -1,6 +1,6 @@
function nodeValue_Object(_name, _node, _value, _tooltip = "") { return new NodeValue_Object(_name, _node, _value, _tooltip); }
function nodeValue_Object(_name, _node, _value, _tooltip = "") { return new __NodeValue_Object(_name, _node, _value, _tooltip); }
function __NodeValue_Object(_name, _node, _type, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, _type, _value, _tooltip) constructor {
function __NodeValue_Object_Generic(_name, _node, _type, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, _type, _value, _tooltip) constructor {
animable = false;
@ -18,6 +18,6 @@ function __NodeValue_Object(_name, _node, _type, _value, _tooltip = "") : NodeVa
static arrayLength = arrayLengthSimple;
}
function NodeValue_Object(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.object, _value, _tooltip) constructor {
function __NodeValue_Object(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.object, _value, _tooltip) constructor {
}

View File

@ -42,7 +42,7 @@
LATEST_VERSION = 1_18_00_0;
VERSION = 1_18_01_0;
SAVE_VERSION = 1_18_01_0;
VERSION_STRING = MAC? "1.18.003m" : "1.18.2.001";
VERSION_STRING = MAC? "1.18.003m" : "1.18.2.002";
BUILD_NUMBER = 1_18_01_0;
HOTKEYS = ds_map_create();

View File

@ -347,7 +347,7 @@ function drawWidget(xx, yy, ww, _m, jun, global_var = true, _hover = false, _foc
wid.setInteract(!jun.hasJunctionFrom());
if(_focus) wid.register(_scrollPane);
if(is_instanceof(jun, NodeValue_Dimension)) {
if(is_instanceof(jun, __NodeValue_Dimension)) {
var _proj = jun.node.attributes.use_project_dimension;
wid.side_button.icon_index = _proj;

View File

@ -23,18 +23,18 @@ function Node_Color_HSV(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
input_display_list = [ 3, 0, 1, 2, 4 ];
static processData = function(_outSurf, _data, _output_index, _array_index) { #region
static processData = function(_outSurf, _data, _output_index, _array_index) {
var nor = _data[3];
return make_color_hsva(
nor? _data[0] * 255 : _data[0],
nor? _data[1] * 255 : _data[1],
nor? _data[2] * 255 : _data[2],
nor? _data[4] * 255 : _data[4],
nor? clamp(_data[0], 0, 1) * 255 : clamp(_data[0], 0, 1),
nor? clamp(_data[1], 0, 1) * 255 : clamp(_data[1], 0, 1),
nor? clamp(_data[2], 0, 1) * 255 : clamp(_data[2], 0, 1),
nor? clamp(_data[4], 0, 1) * 255 : clamp(_data[4], 0, 1),
);
} #endregion
}
static onValueUpdate = function(index = 0) { #region
static onValueUpdate = function(index = 0) {
if(index == 3) {
var _nor = getInputData(3);
@ -64,9 +64,9 @@ function Node_Color_HSV(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
inputs[4].setDisplay(VALUE_DISPLAY.slider, { range: [0, 255, 0.1] });
}
}
} #endregion
}
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { #region
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s);
if(bbox.h < 1) return;
@ -78,9 +78,9 @@ function Node_Color_HSV(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
}
drawColor(col, bbox.x0, bbox.y0, bbox.w, bbox.h);
} #endregion
}
static doApplyDeserialize = function() { #region
static doApplyDeserialize = function() {
onValueUpdate(3);
} #endregion
}
}

View File

@ -24,7 +24,7 @@ function Node_Color_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
input_display_list = [ 3, 0, 1, 2, 4 ];
static onValueUpdate = function(index = 0) { #region
static onValueUpdate = function(index = 0) {
if(index == 3) {
var _nor = getInputData(3);
@ -54,23 +54,23 @@ function Node_Color_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
inputs[4].setDisplay(VALUE_DISPLAY.slider, { range: [0, 255, 0.1] });
}
}
} #endregion
}
static processData = function(_outSurf, _data, _output_index, _array_index) { #region
static processData = function(_outSurf, _data, _output_index, _array_index) {
var nor = _data[3];
if(!is_real(_data[0])) return 0;
if(!is_real(_data[1])) return 0;
if(!is_real(_data[2])) return 0;
return make_color_rgba(
nor? _data[0] * 255 : _data[0],
nor? _data[1] * 255 : _data[1],
nor? _data[2] * 255 : _data[2],
nor? _data[4] * 255 : _data[4],
nor? clamp(_data[0], 0, 1) * 255 : clamp(_data[0], 0, 1),
nor? clamp(_data[1], 0, 1) * 255 : clamp(_data[1], 0, 1),
nor? clamp(_data[2], 0, 1) * 255 : clamp(_data[2], 0, 1),
nor? clamp(_data[4], 0, 1) * 255 : clamp(_data[4], 0, 1),
);
} #endregion
}
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { #region
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var bbox = drawGetBbox(xx, yy, _s);
if(bbox.h < 1) return;
@ -82,9 +82,9 @@ function Node_Color_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
}
drawColor(col, bbox.x0, bbox.y0, bbox.w, bbox.h);
} #endregion
}
static doApplyDeserialize = function() { #region
static doApplyDeserialize = function() {
onValueUpdate(3);
} #endregion
}
}

View File

@ -7,19 +7,40 @@ function Node_Grid_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
active_index = 1;
newInput(2, nodeValue_Int("Grid", self, 1, "Amount of grid subdivision. Higher number means more grid, detail."))
.setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 1 ] });
.setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 1 ] })
.rejectArray();
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
newOutput(0, nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone));
function createNewInput() {
var index = array_length(inputs);
var i = index - input_fix_len;
newInput(index, nodeValue_Vec2($"Anchor {i}", self, [ 0, 0 ]))
.setUnitRef(function(index) /*=>*/ {return getDimension(index)});
array_push(input_display_list, index);
return inputs[index];
}
input_display_list = [ 1, 0,
["Mesh", false], 2,
["Mesh", false], 2,
["Anchors", true],
];
setDynamicInput(1, false);
attribute_surface_depth();
attribute_interpolation();
static resetDisplay = function() {
input_display_list = array_clone(input_display_list_raw, 1);
for( var i = input_display_len, n = array_length(inputs); i < n; i++ )
array_push(input_display_list, i);
}
static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) {
var mx = (_mx - _x) / _s;
var my = (_my - _y) / _s;
@ -34,6 +55,17 @@ function Node_Grid_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
var _surf = _data[0];
var _grid = _data[2];
var _aamo = (_grid + 1) * (_grid + 1);
var _iamo = getInputAmount();
if(_iamo < _aamo) {
repeat(_aamo - _iamo) createNewInput();
resetDisplay();
} else if(_iamo > _aamo) {
array_resize(inputs, input_fix_len + _aamo);
resetDisplay();
}
}
}

View File

@ -4,6 +4,7 @@ function Node_String_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro
newInput(0, nodeValue_Text("Text", self, ""))
.setVisible(true, true);
newInput(1, nodeValue_Text("Delimiter", self, " ", "Character that used to split text,\nleave blank to create character array."));
inputs[1].editWidget.format = TEXT_AREA_FORMAT.delimiter;
@ -20,10 +21,10 @@ function Node_String_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro
}
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var str = getInputData(1);
var str = getInputData(1);
var bbox = drawGetBbox(xx, yy, _s);
var cx = bbox.xc;
var cy = bbox.yc;
var cx = bbox.xc;
var cy = bbox.yc;
if(string_length(str) == 0) {
draw_set_text(f_sdf, fa_center, fa_center, COLORS._main_text_sub);
@ -34,7 +35,8 @@ function Node_String_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro
_s *= 0.5;
draw_set_text(f_sdf, fa_center, fa_center, COLORS._main_text);
draw_text_cut(cx, cy, str, bbox.w, _s);
str = string_cut(str, bbox.w - _s * 32, "...", _s);
draw_text_add(cx, cy, str, _s);
var ww = (string_width(str) / 2) * _s;
draw_set_text(f_sdf, fa_right, fa_center, COLORS._main_text_sub);

View File

@ -61,7 +61,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
bypass_junc = noone;
if(_connect == CONNECT_TYPE.input) {
bypass_junc = new NodeValue_Input_Bypass(self, _name, _node, _type, index);
bypass_junc = new __NodeValue_Input_Bypass(self, _name, _node, _type, index);
node.input_bypass[index] = bypass_junc;
}
#endregion
@ -1554,7 +1554,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
if(!updated) return false; /////////////////////////////////////////////////////////////////////////////////
if(is_instanceof(self, NodeValue_Dimension))
if(is_instanceof(self, __NodeValue_Dimension))
node.attributes.use_project_dimension = false;
if(connect_type == CONNECT_TYPE.input && self.index >= 0) {

View File

@ -21,9 +21,9 @@ enum AREA_INDEX {
#macro DEF_AREA_REF [ 0.5, 0.5, 0.5, 0.5, AREA_SHAPE.rectangle, AREA_MODE.area ]
#macro AREA_ARRAY_LENGTH 6
function nodeValue_Area(_name, _node, _value, _data = {}) { return new NodeValue_Area(_name, _node, _value, _data); }
function nodeValue_Area(_name, _node, _value, _data = {}) { return new __NodeValue_Area(_name, _node, _value, _data); }
function NodeValue_Area(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, "") constructor {
function __NodeValue_Area(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, "") constructor {
setDisplay(VALUE_DISPLAY.area, _data);
def_length = AREA_ARRAY_LENGTH;

View File

@ -1,5 +1,5 @@
function nodeValue_Armature(_name, _node, _value, _tooltip = "") { return new NodeValue_Armature(_name, _node, _value, _tooltip); }
function nodeValue_Armature(_name, _node, _value, _tooltip = "") { return new __NodeValue_Armature(_name, _node, _value, _tooltip); }
function NodeValue_Armature(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.armature, _value, _tooltip) constructor {
function __NodeValue_Armature(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.armature, _value, _tooltip) constructor {
}

View File

@ -1,5 +1,5 @@
function nodeValue_AudioBit(_name, _node, _value, _tooltip = "") { return new NodeValue_AudioBit(_name, _node, _value, _tooltip); }
function nodeValue_AudioBit(_name, _node, _value, _tooltip = "") { return new __NodeValue_AudioBit(_name, _node, _value, _tooltip); }
function NodeValue_AudioBit(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.audioBit, _value, _tooltip) constructor {
function __NodeValue_AudioBit(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.audioBit, _value, _tooltip) constructor {
}

View File

@ -1,6 +1,6 @@
function nodeValue_Bool(_name, _node, _value, _tooltip = "") { return new NodeValue_Bool(_name, _node, _value, _tooltip); }
function nodeValue_Bool(_name, _node, _value, _tooltip = "") { return new __NodeValue_Bool(_name, _node, _value, _tooltip); }
function NodeValue_Bool(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.boolean, _value, _tooltip) constructor {
function __NodeValue_Bool(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.boolean, _value, _tooltip) constructor {
/////============== GET =============

View File

@ -1,5 +1,5 @@
function nodeValue_Buffer(_name, _node, _value, _tooltip = "") { return new NodeValue_Buffer(_name, _node, _value, _tooltip); }
function nodeValue_Buffer(_name, _node, _value, _tooltip = "") { return new __NodeValue_Buffer(_name, _node, _value, _tooltip); }
function NodeValue_Buffer(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.buffer, _value, _tooltip) constructor {
function __NodeValue_Buffer(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.buffer, _value, _tooltip) constructor {
}

View File

@ -1,6 +1,6 @@
function nodeValue_Color(_name, _node, _value, _tooltip = "") { return new NodeValue_Color(_name, _node, _value, _tooltip); }
function nodeValue_Color(_name, _node, _value, _tooltip = "") { return new __NodeValue_Color(_name, _node, _value, _tooltip); }
function NodeValue_Color(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.color, _value, _tooltip) constructor {
function __NodeValue_Color(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.color, _value, _tooltip) constructor {
/////============== GET =============

View File

@ -1,5 +1,5 @@
function nodeValue_Corner(_name, _node, _value, _tooltip = "") { return new NodeValue_Corner(_name, _node, _value, _tooltip); }
function nodeValue_Corner(_name, _node, _value, _tooltip = "") { return new __NodeValue_Corner(_name, _node, _value, _tooltip); }
function NodeValue_Corner(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor {
function __NodeValue_Corner(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor {
setDisplay(VALUE_DISPLAY.corner);
}

View File

@ -1,6 +1,6 @@
function nodeValue_Curve(_name, _node, _value) { return new NodeValue_Curve(_name, _node, _value); }
function nodeValue_Curve(_name, _node, _value) { return new __NodeValue_Curve(_name, _node, _value); }
function NodeValue_Curve(_name, _node, _value) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.curve, _value, "") constructor {
function __NodeValue_Curve(_name, _node, _value) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.curve, _value, "") constructor {
/////============== GET =============

View File

@ -1,5 +1,5 @@
function nodeValue_D3Camera(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Camera(_name, _node, _value, _tooltip); }
function nodeValue_D3Camera(_name, _node, _value, _tooltip = "") { return new __NodeValue_D3Camera(_name, _node, _value, _tooltip); }
function NodeValue_D3Camera(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.d3Camera, _value, _tooltip) constructor {
function __NodeValue_D3Camera(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.d3Camera, _value, _tooltip) constructor {
}

View File

@ -1,5 +1,5 @@
function nodeValue_D3Light(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Light(_name, _node, _value, _tooltip); }
function nodeValue_D3Light(_name, _node, _value, _tooltip = "") { return new __NodeValue_D3Light(_name, _node, _value, _tooltip); }
function NodeValue_D3Light(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.d3Light, _value, _tooltip) constructor {
function __NodeValue_D3Light(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.d3Light, _value, _tooltip) constructor {
}

View File

@ -1,6 +1,6 @@
function nodeValue_D3Material(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Material(_name, _node, _value, _tooltip); }
function nodeValue_D3Material(_name, _node, _value, _tooltip = "") { return new __NodeValue_D3Material(_name, _node, _value, _tooltip); }
function NodeValue_D3Material(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.d3Material, _value, _tooltip) constructor {
function __NodeValue_D3Material(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.d3Material, _value, _tooltip) constructor {
animable = false;

View File

@ -1,5 +1,5 @@
function nodeValue_D3Mesh(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Mesh(_name, _node, _value, _tooltip); }
function nodeValue_D3Mesh(_name, _node, _value, _tooltip = "") { return new __NodeValue_D3Mesh(_name, _node, _value, _tooltip); }
function NodeValue_D3Mesh(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.d3Mesh, _value, _tooltip) constructor {
function __NodeValue_D3Mesh(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.d3Mesh, _value, _tooltip) constructor {
}

View File

@ -1,5 +1,5 @@
function nodeValue_D3Scene(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Scene(_name, _node, _value, _tooltip); }
function nodeValue_D3Scene(_name, _node, _value, _tooltip = "") { return new __NodeValue_D3Scene(_name, _node, _value, _tooltip); }
function NodeValue_D3Scene(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.d3Scene, _value, _tooltip) constructor {
function __NodeValue_D3Scene(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.d3Scene, _value, _tooltip) constructor {
}

View File

@ -1,6 +1,6 @@
function nodeValue_Dimension(_node, value = DEF_SURF) { return new NodeValue_Dimension(_node, value); }
function nodeValue_Dimension(_node, value = DEF_SURF) { return new __NodeValue_Dimension(_node, value); }
function NodeValue_Dimension(_node, value) : NodeValue("Dimension", _node, CONNECT_TYPE.input, VALUE_TYPE.integer, value, "") constructor {
function __NodeValue_Dimension(_node, value) : NodeValue("Dimension", _node, CONNECT_TYPE.input, VALUE_TYPE.integer, value, "") constructor {
setDisplay(VALUE_DISPLAY.vector);
def_length = 2;

View File

@ -1,6 +1,6 @@
function nodeValue_Enum_Button(_name, _node, _value, _data) { return new NodeValue_Enum_Button(_name, _node, _value, _data); }
function nodeValue_Enum_Button(_name, _node, _value, _data) { return new __NodeValue_Enum_Button(_name, _node, _value, _data); }
function NodeValue_Enum_Button(_name, _node, _value, _data) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor {
function __NodeValue_Enum_Button(_name, _node, _value, _data) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor {
setDisplay(VALUE_DISPLAY.enum_button, _data);
/////============== GET =============

View File

@ -1,6 +1,6 @@
function nodeValue_Enum_Scroll(_name, _node, _value, _data) { return new NodeValue_Enum_Scroll(_name, _node, _value, _data); }
function nodeValue_Enum_Scroll(_name, _node, _value, _data) { return new __NodeValue_Enum_Scroll(_name, _node, _value, _data); }
function NodeValue_Enum_Scroll(_name, _node, _value, _data) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor {
function __NodeValue_Enum_Scroll(_name, _node, _value, _data) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor {
setDisplay(VALUE_DISPLAY.enum_scroll, _data);
/////============== GET =============

View File

@ -1,5 +1,5 @@
function nodeValue_Fdomain(_name, _node, _value, _tooltip = "") { return new NodeValue_Fdomain(_name, _node, _value, _tooltip); }
function nodeValue_Fdomain(_name, _node, _value, _tooltip = "") { return new __NodeValue_Fdomain(_name, _node, _value, _tooltip); }
function NodeValue_Fdomain(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.fdomain, _value, _tooltip) constructor {
function __NodeValue_Fdomain(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.fdomain, _value, _tooltip) constructor {
}

View File

@ -1,6 +1,6 @@
function nodeValue_Float(_name, _node, _value, _tooltip = "") { return new NodeValue_Float(_name, _node, _value, _tooltip); }
function nodeValue_Float(_name, _node, _value, _tooltip = "") { return new __NodeValue_Float(_name, _node, _value, _tooltip); }
function NodeValue_Float(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor {
function __NodeValue_Float(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor {
/////============== GET =============

View File

@ -1,6 +1,6 @@
function nodeValue_Gradient(_name, _node, _value, _tooltip = "") { return new NodeValue_Gradient(_name, _node, _value, _tooltip); }
function nodeValue_Gradient(_name, _node, _value, _tooltip = "") { return new __NodeValue_Gradient(_name, _node, _value, _tooltip); }
function NodeValue_Gradient(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.gradient, _value, _tooltip) constructor {
function __NodeValue_Gradient(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.gradient, _value, _tooltip) constructor {
/////============== GET =============

View File

@ -1,6 +1,6 @@
function nodeValue_Int(_name, _node, _value, _tooltip = "") { return new NodeValue_Int(_name, _node, _value, _tooltip); }
function nodeValue_Int(_name, _node, _value, _tooltip = "") { return new __NodeValue_Int(_name, _node, _value, _tooltip); }
function NodeValue_Int(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, _tooltip) constructor {
function __NodeValue_Int(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, _tooltip) constructor {
/////============== GET =============

View File

@ -1,6 +1,6 @@
function nodeValue_Output(_name, _node, _type, _value, _tooltip = "") { return new NodeValue_Output(_name, _node, _type, _value, _tooltip); }
function nodeValue_Output(_name, _node, _type, _value, _tooltip = "") { return new __NodeValue_Output(_name, _node, _type, _value, _tooltip); }
function NodeValue_Output(_name, _node, _type, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.output, _type, _value, _tooltip) constructor {
function __NodeValue_Output(_name, _node, _type, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.output, _type, _value, _tooltip) constructor {
index = array_length(node.outputs);
@ -37,7 +37,7 @@ function NodeValue_Output(_name, _node, _type, _value, _tooltip = "") : NodeValu
}
}
function NodeValue_Input_Bypass(_from, _name, _node, _type, _index) : NodeValue_Output(_name, _node, _type, 0, "") constructor {
function __NodeValue_Input_Bypass(_from, _name, _node, _type, _index) : __NodeValue_Output(_name, _node, _type, 0, "") constructor {
from_junc = _from;
visible = false;
index = 1000 + _index;

View File

@ -1,6 +1,6 @@
function nodeValue_Padding(_name, _node, _value, _tooltip = "") { return new NodeValue_Padding(_name, _node, _value, _tooltip); }
function nodeValue_Padding(_name, _node, _value, _tooltip = "") { return new __NodeValue_Padding(_name, _node, _value, _tooltip); }
function NodeValue_Padding(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor {
function __NodeValue_Padding(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor {
setDisplay(VALUE_DISPLAY.padding);
def_length = 4;

View File

@ -1,6 +1,6 @@
function nodeValue_Palette(_name, _node, _value, _tooltip = "") { return new NodeValue_Palette(_name, _node, _value, _tooltip); }
function nodeValue_Palette(_name, _node, _value, _tooltip = "") { return new __NodeValue_Palette(_name, _node, _value, _tooltip); }
function NodeValue_Palette(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.color, _value, _tooltip) constructor {;
function __NodeValue_Palette(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.color, _value, _tooltip) constructor {;
setDisplay(VALUE_DISPLAY.palette);

View File

@ -1,5 +1,5 @@
function nodeValue_Particle(_name, _node, _value, _tooltip = "") { return new NodeValue_Particle(_name, _node, _value, _tooltip); }
function nodeValue_Particle(_name, _node, _value, _tooltip = "") { return new __NodeValue_Particle(_name, _node, _value, _tooltip); }
function NodeValue_Particle(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.particle, _value, _tooltip) constructor {
function __NodeValue_Particle(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.particle, _value, _tooltip) constructor {
}

View File

@ -1,6 +1,6 @@
function nodeValue_Path(_name, _node, _value, _tooltip = "") { return new NodeValue_Path(_name, _node, _value, _tooltip); }
function nodeValue_Path(_name, _node, _value, _tooltip = "") { return new __NodeValue_Path(_name, _node, _value, _tooltip); }
function NodeValue_Path(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.path, _value, _tooltip) constructor {
function __NodeValue_Path(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.path, _value, _tooltip) constructor {
/////============== GET =============

View File

@ -1,9 +1,9 @@
function nodeValue_Path_Anchor(_name, _node, _value, _tooltip = "") { return new NodeValue_Path_Anchor(_name, _node, _value, _tooltip); }
function NodeValue_Path_Anchor(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, _ANCHOR.amount) constructor {
function nodeValue_Path_Anchor(_name, _node, _value, _tooltip = "") { return new __NodeValue_Path_Anchor(_name, _node, _value, _tooltip); }
function __NodeValue_Path_Anchor(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, _ANCHOR.amount) constructor {
setDisplay(VALUE_DISPLAY.path_anchor);
}
function nodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip = "") { return new NodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip); }
function NodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, _ANCHOR3.amount) constructor {
function nodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip = "") { return new __NodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip); }
function __NodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, _ANCHOR3.amount) constructor {
setDisplay(VALUE_DISPLAY.path_anchor);
}

View File

@ -1,5 +1,5 @@
function nodeValue_PathNode(_name, _node, _value, _tooltip = "") { return new NodeValue_PathNode(_name, _node, _value, _tooltip); }
function nodeValue_PathNode(_name, _node, _value, _tooltip = "") { return new __NodeValue_PathNode(_name, _node, _value, _tooltip); }
function NodeValue_PathNode(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.pathnode, _value, _tooltip) constructor {
function __NodeValue_PathNode(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.pathnode, _value, _tooltip) constructor {
}

View File

@ -1,6 +1,6 @@
function nodeValue_Quaternion(_name, _node, _value, _tooltip = "") { return new NodeValue_Quaternion(_name, _node, _value, _tooltip); }
function nodeValue_Quaternion(_name, _node, _value, _tooltip = "") { return new __NodeValue_Quaternion(_name, _node, _value, _tooltip); }
function NodeValue_Quaternion(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor {
function __NodeValue_Quaternion(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor {
setDisplay(VALUE_DISPLAY.d3quarternion);
/////============== GET =============

View File

@ -1,5 +1,5 @@
function nodeValue_Range(_name, _node, _value, _data = {}) { return new NodeValue_Range(_name, _node, _value, _data); }
function nodeValue_Range(_name, _node, _value, _data = {}) { return new __NodeValue_Range(_name, _node, _value, _data); }
function NodeValue_Range(_name, _node, _value, _data) : NodeValue_Array(_name, _node, _value, "", 2) constructor {
function __NodeValue_Range(_name, _node, _value, _data) : __NodeValue_Array(_name, _node, _value, "", 2) constructor {
setDisplay(VALUE_DISPLAY.range, _data);
}

View File

@ -1,6 +1,6 @@
function nodeValue_Rotation(_name, _node, _value, _tooltip = "") { return new NodeValue_Rotation(_name, _node, _value, _tooltip); }
function nodeValue_Rotation(_name, _node, _value, _tooltip = "") { return new __NodeValue_Rotation(_name, _node, _value, _tooltip); }
function NodeValue_Rotation(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor {
function __NodeValue_Rotation(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, _tooltip) constructor {
setDisplay(VALUE_DISPLAY.rotation);
/////============== GET =============

View File

@ -1,8 +1,8 @@
#macro ROTATION_RANDOM_LENGTH 5
function nodeValue_Rotation_Random(_name, _node, _value, _tooltip = "") { return new NodeValue_Rotation_Random(_name, _node, _value, _tooltip); }
function nodeValue_Rotation_Random(_name, _node, _value, _tooltip = "") { return new __NodeValue_Rotation_Random(_name, _node, _value, _tooltip); }
function NodeValue_Rotation_Random(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, ROTATION_RANDOM_LENGTH) constructor {
function __NodeValue_Rotation_Random(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, ROTATION_RANDOM_LENGTH) constructor {
setDisplay(VALUE_DISPLAY.rotation_random);
}

View File

@ -1,6 +1,6 @@
function nodeValue_Rotation_Range(_name, _node, _value, _tooltip = "") { return new NodeValue_Rotation_Range(_name, _node, _value, _tooltip); }
function nodeValue_Rotation_Range(_name, _node, _value, _tooltip = "") { return new __NodeValue_Rotation_Range(_name, _node, _value, _tooltip); }
function NodeValue_Rotation_Range(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 2) constructor {
function __NodeValue_Rotation_Range(_name, _node, _value, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, 2) constructor {
setDisplay(VALUE_DISPLAY.rotation_range);
}

View File

@ -1,5 +1,5 @@
function nodeValue_SDF(_name, _node, _value, _tooltip = "") { return new NodeValue_SDF(_name, _node, _value, _tooltip); }
function nodeValue_SDF(_name, _node, _value, _tooltip = "") { return new __NodeValue_SDF(_name, _node, _value, _tooltip); }
function NodeValue_SDF(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.sdf, _value, _tooltip) constructor {
function __NodeValue_SDF(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.sdf, _value, _tooltip) constructor {
}

View File

@ -1,6 +1,6 @@
function nodeValue_Slider_Range(_name, _node, _value, _data = {}) { return new NodeValue_Slider_Range(_name, _node, _value, _data); }
function nodeValue_Slider_Range(_name, _node, _value, _data = {}) { return new __NodeValue_Slider_Range(_name, _node, _value, _data); }
function NodeValue_Slider_Range(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 2) constructor {
function __NodeValue_Slider_Range(_name, _node, _value, _data = {}) : __NodeValue_Array(_name, _node, _value, "", 2) constructor {
setDisplay(VALUE_DISPLAY.slider_range, _data);
}

View File

@ -1,5 +1,5 @@
function nodeValue_Struct(_name, _node, _value, _tooltip = "") { return new NodeValue_Struct(_name, _node, _value, _tooltip); }
function nodeValue_Struct(_name, _node, _value, _tooltip = "") { return new __NodeValue_Struct(_name, _node, _value, _tooltip); }
function NodeValue_Struct(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.struct, _value, _tooltip) constructor {
function __NodeValue_Struct(_name, _node, _value, _tooltip = "") : __NodeValue_Object_Generic(_name, _node, VALUE_TYPE.struct, _value, _tooltip) constructor {
}

View File

@ -1,6 +1,6 @@
function nodeValue_Surface(_name, _node, _value = noone, _tooltip = "") { return new NodeValue_Surface(_name, _node, _value, _tooltip); }
function nodeValue_Surface(_name, _node, _value = noone, _tooltip = "") { return new __NodeValue_Surface(_name, _node, _value, _tooltip); }
function NodeValue_Surface(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.surface, _value, _tooltip) constructor {
function __NodeValue_Surface(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.surface, _value, _tooltip) constructor {
animable = false;

View File

@ -1,6 +1,6 @@
function nodeValue_Text(_name, _node, _value, _tooltip = "") { return new NodeValue_Text(_name, _node, _value, _tooltip); }
function nodeValue_Text(_name, _node, _value, _tooltip = "") { return new __NodeValue_Text(_name, _node, _value, _tooltip); }
function NodeValue_Text(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.text, _value, _tooltip) constructor {
function __NodeValue_Text(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.text, _value, _tooltip) constructor {
/////============== GET =============

View File

@ -1,6 +1,6 @@
function nodeValue_Toggle(_name, _node, _value, _data = {}) { return new NodeValue_Toggle(_name, _node, _value, _data); }
function nodeValue_Toggle(_name, _node, _value, _data = {}) { return new __NodeValue_Toggle(_name, _node, _value, _data); }
function NodeValue_Toggle(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor {
function __NodeValue_Toggle(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.integer, _value, "") constructor {
setDisplay(VALUE_DISPLAY.toggle, _data);

View File

@ -1,6 +1,6 @@
function nodeValue_Trigger(_name, _node, _value, _tooltip = "") { return new NodeValue_Trigger(_name, _node, _value, _tooltip); }
function nodeValue_Trigger(_name, _node, _value, _tooltip = "") { return new __NodeValue_Trigger(_name, _node, _value, _tooltip); }
function NodeValue_Trigger(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.trigger, _value, _tooltip) constructor {
function __NodeValue_Trigger(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.trigger, _value, _tooltip) constructor {
/////============== GET =============

View File

@ -1,6 +1,6 @@
function nodeValue_Vec2(_name, _node, _value, _data = {}) { return new NodeValue_Vec2(_name, _node, _value, _data); }
function nodeValue_Vec2(_name, _node, _value, _data = {}) { return new __NodeValue_Vec2(_name, _node, _value, _data); }
function NodeValue_Vec2(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, "") constructor {
function __NodeValue_Vec2(_name, _node, _value, _data = {}) : NodeValue(_name, _node, CONNECT_TYPE.input, VALUE_TYPE.float, _value, "") constructor {
setDisplay(VALUE_DISPLAY.vector, _data);
def_length = 2;

View File

@ -1,5 +1,5 @@
function nodeValue_Vec2_Range(_name, _node, _value, _data = {}) { return new NodeValue_Vec2_Range(_name, _node, _value, _data); }
function nodeValue_Vec2_Range(_name, _node, _value, _data = {}) { return new __NodeValue_Vec2_Range(_name, _node, _value, _data); }
function NodeValue_Vec2_Range(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 4) constructor {
function __NodeValue_Vec2_Range(_name, _node, _value, _data = {}) : __NodeValue_Array(_name, _node, _value, "", 4) constructor {
setDisplay(VALUE_DISPLAY.vector_range, _data);
}

View File

@ -1,5 +1,5 @@
function nodeValue_Vec3(_name, _node, _value, _data = {}) { return new NodeValue_Vec3(_name, _node, _value, _data); }
function nodeValue_Vec3(_name, _node, _value, _data = {}) { return new __NodeValue_Vec3(_name, _node, _value, _data); }
function NodeValue_Vec3(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 3) constructor {
function __NodeValue_Vec3(_name, _node, _value, _data = {}) : __NodeValue_Array(_name, _node, _value, "", 3) constructor {
setDisplay(VALUE_DISPLAY.vector, _data);
}

View File

@ -1,6 +1,6 @@
function nodeValue_Vec3_Range(_name, _node, _value, _tooltip = "") { return new NodeValue_Vec3_Range(_name, _node, _value, _tooltip); }
function nodeValue_Vec3_Range(_name, _node, _value, _tooltip = "") { return new __NodeValue_Vec3_Range(_name, _node, _value, _tooltip); }
function NodeValue_Vec3_Range(_name, _node, _value, _data, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 6) constructor {
function __NodeValue_Vec3_Range(_name, _node, _value, _data, _tooltip = "") : __NodeValue_Array(_name, _node, _value, _tooltip, 6) constructor {
setDisplay(VALUE_DISPLAY.vector_range, _data);
}

View File

@ -1,5 +1,5 @@
function nodeValue_Vec4(_name, _node, _value, _data = {}) { return new NodeValue_Vec4(_name, _node, _value, _data); }
function nodeValue_Vec4(_name, _node, _value, _data = {}) { return new __NodeValue_Vec4(_name, _node, _value, _data); }
function NodeValue_Vec4(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 4) constructor {
function __NodeValue_Vec4(_name, _node, _value, _data = {}) : __NodeValue_Array(_name, _node, _value, "", 4) constructor {
setDisplay(VALUE_DISPLAY.vector, _data);
}

View File

@ -39,10 +39,12 @@ function Panel_Patreon() : PanelContent() constructor {
return;
}
var key = keys[0];
var key = keys[0];
var member = map[$ key];
var stat = string_replace_all(string_lower(member.status), " ", "_");
print(stat);
if(member.status == "active_patron") {
if(string_pos("active", stat) > 0) {
var _mail = member.email;
var _code = patreon_generate_activation_key(_mail); //yea we doing this on client now.
verify_code = _code;