diff --git a/doc_classes/VisualScriptBuiltinFunc.xml b/doc_classes/VisualScriptBuiltinFunc.xml
index ef4183e..ca1215b 100644
--- a/doc_classes/VisualScriptBuiltinFunc.xml
+++ b/doc_classes/VisualScriptBuiltinFunc.xml
@@ -111,115 +111,118 @@
Randomize the seed (or the internal state) of the random number generator. Current implementation reseeds using a number based on time.
-
+
Return a random 32 bits integer value. To obtain a random value between 0 to N (where N is smaller than 2^32 - 1), you can use it with the remainder function.
Return a random floating-point value between 0 and 1. To obtain a random value between 0 to N, you can use it with multiplication.
-
+
Return a random floating-point value between the two inputs.
-
+
+ Return a random 32-bit integer value between the two inputs.
+
+
Set the seed for the random number generator.
-
+
Return a random value from the given seed, along with the new seed.
-
+
Convert the input from degrees to radians.
-
+
Convert the input from radians to degrees.
-
+
Convert the input from linear volume to decibel volume.
-
+
Convert the input from decibel volume to linear volume.
-
+
Converts a 2D point expressed in the polar coordinate system (a distance from the origin [code]r[/code] and an angle [code]th[/code]) to the cartesian coordinate system (X and Y axis).
-
+
Converts a 2D point expressed in the cartesian coordinate system (X and Y axis) to the polar coordinate system (a distance from the origin and an angle).
-
+
-
+
-
+
Return the greater of the two numbers, also known as their maximum.
-
+
Return the lesser of the two numbers, also known as their minimum.
-
+
Return the input clamped inside the given range, ensuring the result is never outside it. Equivalent to [code]min(max(input, range_low), range_high)[/code].
-
+
Return the nearest power of 2 to the input.
-
+
Create a [WeakRef] from the input.
-
+
Create a [FuncRef] from the input.
-
+
Convert between types.
-
+
Return the type of the input as an integer. Check [enum Variant.Type] for the integers that might be returned.
-
+
Checks if a type is registered in the [ClassDB].
-
+
Return a character with the given ascii value.
-
+
Convert the input to a string.
-
+
Print the given string to the output window.
-
+
Print the given string to the standard error output.
-
+
Print the given string to the standard output, without adding a newline.
-
+
Serialize a [Variant] to a string.
-
+
Deserialize a [Variant] from a string serialized using [constant VAR_TO_STR].
-
+
Serialize a [Variant] to a [PackedByteArray].
-
+
Deserialize a [Variant] from a [PackedByteArray] serialized using [constant VAR_TO_BYTES].
-
+
Return the [Color] with the given name and alpha ranging from 0 to 1.
[b]Note:[/b] Names are defined in [code]color_names.inc[/code].
-
+
Return a number smoothly interpolated between the first two inputs, based on the third input. Similar to [constant MATH_LERP], but interpolates faster at the beginning and slower at the end. Using Hermite interpolation formula:
[codeblock]
var t = clamp((weight - from) / (to - from), 0.0, 1.0)
return t * t * (3.0 - 2.0 * t)
[/codeblock]
-
+
-
+
-
+
-
+
Represents the size of the [enum BuiltinFunc] enum.
diff --git a/visual_script_builtin_funcs.cpp b/visual_script_builtin_funcs.cpp
index 177f919..6cd4da8 100644
--- a/visual_script_builtin_funcs.cpp
+++ b/visual_script_builtin_funcs.cpp
@@ -73,7 +73,8 @@ const char *VisualScriptBuiltinFunc::func_name[VisualScriptBuiltinFunc::FUNC_MAX
"randomize",
"randi",
"randf",
- "rand_range",
+ "randf_range",
+ "randi_range",
"seed",
"rand_seed",
"deg2rad",
@@ -143,7 +144,7 @@ bool VisualScriptBuiltinFunc::has_input_sequence_port() const {
int VisualScriptBuiltinFunc::get_func_argument_count(BuiltinFunc p_func) {
switch (p_func) {
case MATH_RANDOMIZE:
- case MATH_RAND:
+ case MATH_RANDI:
case MATH_RANDF:
return 0;
case MATH_SIN:
@@ -194,7 +195,8 @@ int VisualScriptBuiltinFunc::get_func_argument_count(BuiltinFunc p_func) {
case MATH_POW:
case MATH_EASE:
case MATH_STEPIFY:
- case MATH_RANDOM:
+ case MATH_RANDF_RANGE:
+ case MATH_RANDI_RANGE:
case MATH_POLAR2CARTESIAN:
case MATH_CARTESIAN2POLAR:
case LOGIC_MAX:
@@ -361,16 +363,23 @@ PropertyInfo VisualScriptBuiltinFunc::get_input_value_port_info(int p_idx) const
}
} break;
case MATH_RANDOMIZE:
- case MATH_RAND:
+ case MATH_RANDI:
case MATH_RANDF: {
} break;
- case MATH_RANDOM: {
+ case MATH_RANDF_RANGE: {
if (p_idx == 0) {
return PropertyInfo(Variant::FLOAT, "from");
} else {
return PropertyInfo(Variant::FLOAT, "to");
}
} break;
+ case MATH_RANDI_RANGE: {
+ if (p_idx == 0) {
+ return PropertyInfo(Variant::INT, "from");
+ } else {
+ return PropertyInfo(Variant::INT, "to");
+ }
+ } break;
case MATH_SEED:
case MATH_RANDSEED: {
return PropertyInfo(Variant::INT, "seed");
@@ -551,13 +560,16 @@ PropertyInfo VisualScriptBuiltinFunc::get_output_value_port_info(int p_idx) cons
} break;
case MATH_RANDOMIZE: {
} break;
- case MATH_RAND: {
+ case MATH_RANDI: {
t = Variant::INT;
} break;
case MATH_RANDF:
- case MATH_RANDOM: {
+ case MATH_RANDF_RANGE: {
t = Variant::FLOAT;
} break;
+ case MATH_RANDI_RANGE: {
+ t = Variant::INT;
+ } break;
case MATH_SEED: {
} break;
case MATH_RANDSEED: {
@@ -861,17 +873,22 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
Math::randomize();
} break;
- case VisualScriptBuiltinFunc::MATH_RAND: {
+ case VisualScriptBuiltinFunc::MATH_RANDI: {
*r_return = Math::rand();
} break;
case VisualScriptBuiltinFunc::MATH_RANDF: {
*r_return = Math::randf();
} break;
- case VisualScriptBuiltinFunc::MATH_RANDOM: {
+ case VisualScriptBuiltinFunc::MATH_RANDF_RANGE: {
VALIDATE_ARG_NUM(0);
VALIDATE_ARG_NUM(1);
*r_return = Math::random((double)*p_inputs[0], (double)*p_inputs[1]);
} break;
+ case VisualScriptBuiltinFunc::MATH_RANDI_RANGE: {
+ VALIDATE_ARG_NUM(0);
+ VALIDATE_ARG_NUM(1);
+ *r_return = Math::random((int)*p_inputs[0], (int)*p_inputs[1]);
+ } break;
case VisualScriptBuiltinFunc::MATH_SEED: {
VALIDATE_ARG_NUM(0);
uint64_t seed = *p_inputs[0];
@@ -1283,9 +1300,10 @@ void VisualScriptBuiltinFunc::_bind_methods() {
BIND_ENUM_CONSTANT(MATH_MOVE_TOWARD);
BIND_ENUM_CONSTANT(MATH_DECTIME);
BIND_ENUM_CONSTANT(MATH_RANDOMIZE);
- BIND_ENUM_CONSTANT(MATH_RAND);
+ BIND_ENUM_CONSTANT(MATH_RANDI);
BIND_ENUM_CONSTANT(MATH_RANDF);
- BIND_ENUM_CONSTANT(MATH_RANDOM);
+ BIND_ENUM_CONSTANT(MATH_RANDF_RANGE);
+ BIND_ENUM_CONSTANT(MATH_RANDI_RANGE);
BIND_ENUM_CONSTANT(MATH_SEED);
BIND_ENUM_CONSTANT(MATH_RANDSEED);
BIND_ENUM_CONSTANT(MATH_DEG2RAD);
@@ -1375,9 +1393,10 @@ void register_visual_script_builtin_func_node() {
VisualScriptLanguage::singleton->add_register_func("functions/built_in/move_toward", create_builtin_func_node);
VisualScriptLanguage::singleton->add_register_func("functions/built_in/dectime", create_builtin_func_node);
VisualScriptLanguage::singleton->add_register_func("functions/built_in/randomize", create_builtin_func_node);
- VisualScriptLanguage::singleton->add_register_func("functions/built_in/rand", create_builtin_func_node);
+ VisualScriptLanguage::singleton->add_register_func("functions/built_in/randi", create_builtin_func_node);
VisualScriptLanguage::singleton->add_register_func("functions/built_in/randf", create_builtin_func_node);
- VisualScriptLanguage::singleton->add_register_func("functions/built_in/random", create_builtin_func_node);
+ VisualScriptLanguage::singleton->add_register_func("functions/built_in/randf_range", create_builtin_func_node);
+ VisualScriptLanguage::singleton->add_register_func("functions/built_in/randi_range", create_builtin_func_node);
VisualScriptLanguage::singleton->add_register_func("functions/built_in/seed", create_builtin_func_node);
VisualScriptLanguage::singleton->add_register_func("functions/built_in/randseed", create_builtin_func_node);
diff --git a/visual_script_builtin_funcs.h b/visual_script_builtin_funcs.h
index aee2ed7..b858673 100644
--- a/visual_script_builtin_funcs.h
+++ b/visual_script_builtin_funcs.h
@@ -70,9 +70,10 @@ public:
MATH_MOVE_TOWARD,
MATH_DECTIME,
MATH_RANDOMIZE,
- MATH_RAND,
+ MATH_RANDI,
MATH_RANDF,
- MATH_RANDOM,
+ MATH_RANDF_RANGE,
+ MATH_RANDI_RANGE,
MATH_SEED,
MATH_RANDSEED,
MATH_DEG2RAD,