Merge pull request #78108 from aaronfranke/variant-util-header

Make a header for VariantUtilityFunctions
This commit is contained in:
Rémi Verschelde 2023-08-03 14:46:29 +02:00
commit 4ed08409b0
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 1038 additions and 888 deletions

View file

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "variant.h"
#include "variant_utility.h"
#include "core/core_string_names.h"
#include "core/io/marshalls.h"
@ -40,66 +40,64 @@
#include "core/variant/binder_common.h"
#include "core/variant/variant_parser.h"
struct VariantUtilityFunctions {
// Math
static inline double sin(double arg) {
// Math
double VariantUtilityFunctions::sin(double arg) {
return Math::sin(arg);
}
}
static inline double cos(double arg) {
double VariantUtilityFunctions::cos(double arg) {
return Math::cos(arg);
}
}
static inline double tan(double arg) {
double VariantUtilityFunctions::tan(double arg) {
return Math::tan(arg);
}
}
static inline double sinh(double arg) {
double VariantUtilityFunctions::sinh(double arg) {
return Math::sinh(arg);
}
}
static inline double cosh(double arg) {
double VariantUtilityFunctions::cosh(double arg) {
return Math::cosh(arg);
}
}
static inline double tanh(double arg) {
double VariantUtilityFunctions::tanh(double arg) {
return Math::tanh(arg);
}
}
static inline double asin(double arg) {
double VariantUtilityFunctions::asin(double arg) {
return Math::asin(arg);
}
}
static inline double acos(double arg) {
double VariantUtilityFunctions::acos(double arg) {
return Math::acos(arg);
}
}
static inline double atan(double arg) {
double VariantUtilityFunctions::atan(double arg) {
return Math::atan(arg);
}
}
static inline double atan2(double y, double x) {
double VariantUtilityFunctions::atan2(double y, double x) {
return Math::atan2(y, x);
}
}
static inline double sqrt(double x) {
double VariantUtilityFunctions::sqrt(double x) {
return Math::sqrt(x);
}
}
static inline double fmod(double b, double r) {
double VariantUtilityFunctions::fmod(double b, double r) {
return Math::fmod(b, r);
}
}
static inline double fposmod(double b, double r) {
double VariantUtilityFunctions::fposmod(double b, double r) {
return Math::fposmod(b, r);
}
}
static inline int64_t posmod(int64_t b, int64_t r) {
int64_t VariantUtilityFunctions::posmod(int64_t b, int64_t r) {
return Math::posmod(b, r);
}
}
static inline Variant floor(Variant x, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::floor(Variant x, Callable::CallError &r_error) {
r_error.error = Callable::CallError::CALL_OK;
switch (x.get_type()) {
case Variant::INT: {
@ -122,17 +120,17 @@ struct VariantUtilityFunctions {
return Variant();
}
}
}
}
static inline double floorf(double x) {
double VariantUtilityFunctions::floorf(double x) {
return Math::floor(x);
}
}
static inline int64_t floori(double x) {
int64_t VariantUtilityFunctions::floori(double x) {
return int64_t(Math::floor(x));
}
}
static inline Variant ceil(Variant x, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::ceil(Variant x, Callable::CallError &r_error) {
r_error.error = Callable::CallError::CALL_OK;
switch (x.get_type()) {
case Variant::INT: {
@ -155,17 +153,17 @@ struct VariantUtilityFunctions {
return Variant();
}
}
}
}
static inline double ceilf(double x) {
double VariantUtilityFunctions::ceilf(double x) {
return Math::ceil(x);
}
}
static inline int64_t ceili(double x) {
int64_t VariantUtilityFunctions::ceili(double x) {
return int64_t(Math::ceil(x));
}
}
static inline Variant round(Variant x, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::round(Variant x, Callable::CallError &r_error) {
r_error.error = Callable::CallError::CALL_OK;
switch (x.get_type()) {
case Variant::INT: {
@ -188,17 +186,17 @@ struct VariantUtilityFunctions {
return Variant();
}
}
}
}
static inline double roundf(double x) {
double VariantUtilityFunctions::roundf(double x) {
return Math::round(x);
}
}
static inline int64_t roundi(double x) {
int64_t VariantUtilityFunctions::roundi(double x) {
return int64_t(Math::round(x));
}
}
static inline Variant abs(const Variant &x, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::abs(const Variant &x, Callable::CallError &r_error) {
r_error.error = Callable::CallError::CALL_OK;
switch (x.get_type()) {
case Variant::INT: {
@ -230,17 +228,17 @@ struct VariantUtilityFunctions {
return Variant();
}
}
}
}
static inline double absf(double x) {
double VariantUtilityFunctions::absf(double x) {
return Math::absd(x);
}
}
static inline int64_t absi(int64_t x) {
int64_t VariantUtilityFunctions::absi(int64_t x) {
return ABS(x);
}
}
static inline Variant sign(const Variant &x, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::sign(const Variant &x, Callable::CallError &r_error) {
r_error.error = Callable::CallError::CALL_OK;
switch (x.get_type()) {
case Variant::INT: {
@ -272,57 +270,57 @@ struct VariantUtilityFunctions {
return Variant();
}
}
}
}
static inline double signf(double x) {
double VariantUtilityFunctions::signf(double x) {
return SIGN(x);
}
}
static inline int64_t signi(int64_t x) {
int64_t VariantUtilityFunctions::signi(int64_t x) {
return SIGN(x);
}
}
static inline double pow(double x, double y) {
double VariantUtilityFunctions::pow(double x, double y) {
return Math::pow(x, y);
}
}
static inline double log(double x) {
double VariantUtilityFunctions::log(double x) {
return Math::log(x);
}
}
static inline double exp(double x) {
double VariantUtilityFunctions::exp(double x) {
return Math::exp(x);
}
}
static inline bool is_nan(double x) {
bool VariantUtilityFunctions::is_nan(double x) {
return Math::is_nan(x);
}
}
static inline bool is_inf(double x) {
bool VariantUtilityFunctions::is_inf(double x) {
return Math::is_inf(x);
}
}
static inline bool is_equal_approx(double x, double y) {
bool VariantUtilityFunctions::is_equal_approx(double x, double y) {
return Math::is_equal_approx(x, y);
}
}
static inline bool is_zero_approx(double x) {
bool VariantUtilityFunctions::is_zero_approx(double x) {
return Math::is_zero_approx(x);
}
}
static inline bool is_finite(double x) {
bool VariantUtilityFunctions::is_finite(double x) {
return Math::is_finite(x);
}
}
static inline double ease(float x, float curve) {
double VariantUtilityFunctions::ease(float x, float curve) {
return Math::ease(x, curve);
}
}
static inline int step_decimals(float step) {
int VariantUtilityFunctions::step_decimals(float step) {
return Math::step_decimals(step);
}
}
static inline Variant snapped(const Variant &x, const Variant &step, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::snapped(const Variant &x, const Variant &step, Callable::CallError &r_error) {
r_error.error = Callable::CallError::CALL_OK;
if (x.get_type() != step.get_type() && !((x.get_type() == Variant::INT && step.get_type() == Variant::FLOAT) || (x.get_type() == Variant::FLOAT && step.get_type() == Variant::INT))) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
@ -360,17 +358,17 @@ struct VariantUtilityFunctions {
return Variant();
}
}
}
}
static inline double snappedf(double x, double step) {
double VariantUtilityFunctions::snappedf(double x, double step) {
return Math::snapped(x, step);
}
}
static inline int64_t snappedi(double x, int64_t step) {
int64_t VariantUtilityFunctions::snappedi(double x, int64_t step) {
return Math::snapped(x, step);
}
}
static inline Variant lerp(const Variant &from, const Variant &to, double weight, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::lerp(const Variant &from, const Variant &to, double weight, Callable::CallError &r_error) {
r_error.error = Callable::CallError::CALL_OK;
if (from.get_type() != to.get_type()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
@ -409,75 +407,75 @@ struct VariantUtilityFunctions {
return Variant();
}
}
}
}
static inline double lerpf(double from, double to, double weight) {
double VariantUtilityFunctions::lerpf(double from, double to, double weight) {
return Math::lerp(from, to, weight);
}
}
static inline double cubic_interpolate(double from, double to, double pre, double post, double weight) {
double VariantUtilityFunctions::cubic_interpolate(double from, double to, double pre, double post, double weight) {
return Math::cubic_interpolate(from, to, pre, post, weight);
}
}
static inline double cubic_interpolate_angle(double from, double to, double pre, double post, double weight) {
double VariantUtilityFunctions::cubic_interpolate_angle(double from, double to, double pre, double post, double weight) {
return Math::cubic_interpolate_angle(from, to, pre, post, weight);
}
}
static inline double cubic_interpolate_in_time(double from, double to, double pre, double post, double weight,
double VariantUtilityFunctions::cubic_interpolate_in_time(double from, double to, double pre, double post, double weight,
double to_t, double pre_t, double post_t) {
return Math::cubic_interpolate_in_time(from, to, pre, post, weight, to_t, pre_t, post_t);
}
}
static inline double cubic_interpolate_angle_in_time(double from, double to, double pre, double post, double weight,
double VariantUtilityFunctions::cubic_interpolate_angle_in_time(double from, double to, double pre, double post, double weight,
double to_t, double pre_t, double post_t) {
return Math::cubic_interpolate_angle_in_time(from, to, pre, post, weight, to_t, pre_t, post_t);
}
}
static inline double bezier_interpolate(double p_start, double p_control_1, double p_control_2, double p_end, double p_t) {
double VariantUtilityFunctions::bezier_interpolate(double p_start, double p_control_1, double p_control_2, double p_end, double p_t) {
return Math::bezier_interpolate(p_start, p_control_1, p_control_2, p_end, p_t);
}
}
static inline double bezier_derivative(double p_start, double p_control_1, double p_control_2, double p_end, double p_t) {
double VariantUtilityFunctions::bezier_derivative(double p_start, double p_control_1, double p_control_2, double p_end, double p_t) {
return Math::bezier_derivative(p_start, p_control_1, p_control_2, p_end, p_t);
}
}
static inline double lerp_angle(double from, double to, double weight) {
double VariantUtilityFunctions::lerp_angle(double from, double to, double weight) {
return Math::lerp_angle(from, to, weight);
}
}
static inline double inverse_lerp(double from, double to, double weight) {
double VariantUtilityFunctions::inverse_lerp(double from, double to, double weight) {
return Math::inverse_lerp(from, to, weight);
}
}
static inline double remap(double value, double istart, double istop, double ostart, double ostop) {
double VariantUtilityFunctions::remap(double value, double istart, double istop, double ostart, double ostop) {
return Math::remap(value, istart, istop, ostart, ostop);
}
}
static inline double smoothstep(double from, double to, double val) {
double VariantUtilityFunctions::smoothstep(double from, double to, double val) {
return Math::smoothstep(from, to, val);
}
}
static inline double move_toward(double from, double to, double delta) {
double VariantUtilityFunctions::move_toward(double from, double to, double delta) {
return Math::move_toward(from, to, delta);
}
}
static inline double deg_to_rad(double angle_deg) {
double VariantUtilityFunctions::deg_to_rad(double angle_deg) {
return Math::deg_to_rad(angle_deg);
}
}
static inline double rad_to_deg(double angle_rad) {
double VariantUtilityFunctions::rad_to_deg(double angle_rad) {
return Math::rad_to_deg(angle_rad);
}
}
static inline double linear_to_db(double linear) {
double VariantUtilityFunctions::linear_to_db(double linear) {
return Math::linear_to_db(linear);
}
}
static inline double db_to_linear(double db) {
double VariantUtilityFunctions::db_to_linear(double db) {
return Math::db_to_linear(db);
}
}
static inline Variant wrap(const Variant &p_x, const Variant &p_min, const Variant &p_max, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::wrap(const Variant &p_x, const Variant &p_min, const Variant &p_max, Callable::CallError &r_error) {
Variant::Type x_type = p_x.get_type();
if (x_type != Variant::INT && x_type != Variant::FLOAT) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
@ -521,21 +519,21 @@ struct VariantUtilityFunctions {
r_error.error = Callable::CallError::CALL_OK;
return value;
}
}
static inline int64_t wrapi(int64_t value, int64_t min, int64_t max) {
int64_t VariantUtilityFunctions::wrapi(int64_t value, int64_t min, int64_t max) {
return Math::wrapi(value, min, max);
}
}
static inline double wrapf(double value, double min, double max) {
double VariantUtilityFunctions::wrapf(double value, double min, double max) {
return Math::wrapf(value, min, max);
}
}
static inline double pingpong(double value, double length) {
double VariantUtilityFunctions::pingpong(double value, double length) {
return Math::pingpong(value, length);
}
}
static inline Variant max(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::max(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
if (p_argcount < 2) {
r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
r_error.expected = 2;
@ -569,17 +567,17 @@ struct VariantUtilityFunctions {
}
r_error.error = Callable::CallError::CALL_OK;
return base;
}
}
static inline double maxf(double x, double y) {
double VariantUtilityFunctions::maxf(double x, double y) {
return MAX(x, y);
}
}
static inline int64_t maxi(int64_t x, int64_t y) {
int64_t VariantUtilityFunctions::maxi(int64_t x, int64_t y) {
return MAX(x, y);
}
}
static inline Variant min(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::min(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
if (p_argcount < 2) {
r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
r_error.expected = 2;
@ -613,17 +611,17 @@ struct VariantUtilityFunctions {
}
r_error.error = Callable::CallError::CALL_OK;
return base;
}
}
static inline double minf(double x, double y) {
double VariantUtilityFunctions::minf(double x, double y) {
return MIN(x, y);
}
}
static inline int64_t mini(int64_t x, int64_t y) {
int64_t VariantUtilityFunctions::mini(int64_t x, int64_t y) {
return MIN(x, y);
}
}
static inline Variant clamp(const Variant &x, const Variant &min, const Variant &max, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::clamp(const Variant &x, const Variant &min, const Variant &max, Callable::CallError &r_error) {
Variant value = x;
Variant ret;
@ -653,62 +651,62 @@ struct VariantUtilityFunctions {
r_error.error = Callable::CallError::CALL_OK;
return value;
}
}
static inline double clampf(double x, double min, double max) {
double VariantUtilityFunctions::clampf(double x, double min, double max) {
return CLAMP(x, min, max);
}
}
static inline int64_t clampi(int64_t x, int64_t min, int64_t max) {
int64_t VariantUtilityFunctions::clampi(int64_t x, int64_t min, int64_t max) {
return CLAMP(x, min, max);
}
}
static inline int64_t nearest_po2(int64_t x) {
int64_t VariantUtilityFunctions::nearest_po2(int64_t x) {
return nearest_power_of_2_templated(uint64_t(x));
}
}
// Random
// Random
static inline void randomize() {
void VariantUtilityFunctions::randomize() {
Math::randomize();
}
}
static inline int64_t randi() {
int64_t VariantUtilityFunctions::randi() {
return Math::rand();
}
}
static inline double randf() {
double VariantUtilityFunctions::randf() {
return Math::randf();
}
}
static inline double randfn(double mean, double deviation) {
double VariantUtilityFunctions::randfn(double mean, double deviation) {
return Math::randfn(mean, deviation);
}
}
static inline int64_t randi_range(int64_t from, int64_t to) {
int64_t VariantUtilityFunctions::randi_range(int64_t from, int64_t to) {
return Math::random((int32_t)from, (int32_t)to);
}
}
static inline double randf_range(double from, double to) {
double VariantUtilityFunctions::randf_range(double from, double to) {
return Math::random(from, to);
}
}
static inline void seed(int64_t s) {
void VariantUtilityFunctions::seed(int64_t s) {
return Math::seed(s);
}
}
static inline PackedInt64Array rand_from_seed(int64_t seed) {
PackedInt64Array VariantUtilityFunctions::rand_from_seed(int64_t seed) {
uint64_t s = seed;
PackedInt64Array arr;
arr.resize(2);
arr.write[0] = Math::rand_from_seed(&s);
arr.write[1] = s;
return arr;
}
}
// Utility
// Utility
static inline Variant weakref(const Variant &obj, Callable::CallError &r_error) {
Variant VariantUtilityFunctions::weakref(const Variant &obj, Callable::CallError &r_error) {
if (obj.get_type() == Variant::OBJECT) {
r_error.error = Callable::CallError::CALL_OK;
if (obj.is_ref_counted()) {
@ -736,13 +734,13 @@ struct VariantUtilityFunctions {
r_error.expected = Variant::OBJECT;
return Variant();
}
}
}
static inline int64_t _typeof(const Variant &obj) {
int64_t VariantUtilityFunctions::_typeof(const Variant &obj) {
return obj.get_type();
}
}
static inline String str(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
String VariantUtilityFunctions::str(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
if (p_arg_count < 1) {
r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
r_error.argument = 1;
@ -762,17 +760,17 @@ struct VariantUtilityFunctions {
r_error.error = Callable::CallError::CALL_OK;
return s;
}
}
static inline String error_string(Error error) {
String VariantUtilityFunctions::error_string(Error error) {
if (error < 0 || error >= ERR_MAX) {
return String("(invalid error code)");
}
return String(error_names[error]);
}
}
static inline void print(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
void VariantUtilityFunctions::print(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
String s;
for (int i = 0; i < p_arg_count; i++) {
String os = p_args[i]->operator String();
@ -786,9 +784,9 @@ struct VariantUtilityFunctions {
print_line(s);
r_error.error = Callable::CallError::CALL_OK;
}
}
static inline void print_rich(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
void VariantUtilityFunctions::print_rich(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
String s;
for (int i = 0; i < p_arg_count; i++) {
String os = p_args[i]->operator String();
@ -802,11 +800,11 @@ struct VariantUtilityFunctions {
print_line_rich(s);
r_error.error = Callable::CallError::CALL_OK;
}
}
#undef print_verbose
static inline void print_verbose(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
void VariantUtilityFunctions::print_verbose(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
if (OS::get_singleton()->is_stdout_verbose()) {
String s;
for (int i = 0; i < p_arg_count; i++) {
@ -826,9 +824,9 @@ struct VariantUtilityFunctions {
}
r_error.error = Callable::CallError::CALL_OK;
}
}
static inline void printerr(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
void VariantUtilityFunctions::printerr(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
String s;
for (int i = 0; i < p_arg_count; i++) {
String os = p_args[i]->operator String();
@ -842,9 +840,9 @@ struct VariantUtilityFunctions {
print_error(s);
r_error.error = Callable::CallError::CALL_OK;
}
}
static inline void printt(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
void VariantUtilityFunctions::printt(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
String s;
for (int i = 0; i < p_arg_count; i++) {
if (i) {
@ -855,9 +853,9 @@ struct VariantUtilityFunctions {
print_line(s);
r_error.error = Callable::CallError::CALL_OK;
}
}
static inline void prints(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
void VariantUtilityFunctions::prints(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
String s;
for (int i = 0; i < p_arg_count; i++) {
if (i) {
@ -868,9 +866,9 @@ struct VariantUtilityFunctions {
print_line(s);
r_error.error = Callable::CallError::CALL_OK;
}
}
static inline void printraw(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
void VariantUtilityFunctions::printraw(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
String s;
for (int i = 0; i < p_arg_count; i++) {
String os = p_args[i]->operator String();
@ -884,9 +882,9 @@ struct VariantUtilityFunctions {
OS::get_singleton()->print("%s", s.utf8().get_data());
r_error.error = Callable::CallError::CALL_OK;
}
}
static inline void push_error(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
void VariantUtilityFunctions::push_error(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
if (p_arg_count < 1) {
r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
r_error.argument = 1;
@ -904,9 +902,9 @@ struct VariantUtilityFunctions {
ERR_PRINT(s);
r_error.error = Callable::CallError::CALL_OK;
}
}
static inline void push_warning(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
void VariantUtilityFunctions::push_warning(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
if (p_arg_count < 1) {
r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
r_error.argument = 1;
@ -924,15 +922,15 @@ struct VariantUtilityFunctions {
WARN_PRINT(s);
r_error.error = Callable::CallError::CALL_OK;
}
}
static inline String var_to_str(const Variant &p_var) {
String VariantUtilityFunctions::var_to_str(const Variant &p_var) {
String vars;
VariantWriter::write_to_string(p_var, vars);
return vars;
}
}
static inline Variant str_to_var(const String &p_var) {
Variant VariantUtilityFunctions::str_to_var(const String &p_var) {
VariantParser::StreamString ss;
ss.s = p_var;
@ -942,9 +940,9 @@ struct VariantUtilityFunctions {
(void)VariantParser::parse(&ss, ret, errs, line);
return ret;
}
}
static inline PackedByteArray var_to_bytes(const Variant &p_var) {
PackedByteArray VariantUtilityFunctions::var_to_bytes(const Variant &p_var) {
int len;
Error err = encode_variant(p_var, nullptr, len, false);
if (err != OK) {
@ -962,9 +960,9 @@ struct VariantUtilityFunctions {
}
return barr;
}
}
static inline PackedByteArray var_to_bytes_with_objects(const Variant &p_var) {
PackedByteArray VariantUtilityFunctions::var_to_bytes_with_objects(const Variant &p_var) {
int len;
Error err = encode_variant(p_var, nullptr, len, true);
if (err != OK) {
@ -982,9 +980,9 @@ struct VariantUtilityFunctions {
}
return barr;
}
}
static inline Variant bytes_to_var(const PackedByteArray &p_arr) {
Variant VariantUtilityFunctions::bytes_to_var(const PackedByteArray &p_arr) {
Variant ret;
{
const uint8_t *r = p_arr.ptr();
@ -994,9 +992,9 @@ struct VariantUtilityFunctions {
}
}
return ret;
}
}
static inline Variant bytes_to_var_with_objects(const PackedByteArray &p_arr) {
Variant VariantUtilityFunctions::bytes_to_var_with_objects(const PackedByteArray &p_arr) {
Variant ret;
{
const uint8_t *r = p_arr.ptr();
@ -1006,41 +1004,40 @@ struct VariantUtilityFunctions {
}
}
return ret;
}
}
static inline int64_t hash(const Variant &p_arr) {
int64_t VariantUtilityFunctions::hash(const Variant &p_arr) {
return p_arr.hash();
}
}
static inline Object *instance_from_id(int64_t p_id) {
Object *VariantUtilityFunctions::instance_from_id(int64_t p_id) {
ObjectID id = ObjectID((uint64_t)p_id);
Object *ret = ObjectDB::get_instance(id);
return ret;
}
}
static inline bool is_instance_id_valid(int64_t p_id) {
bool VariantUtilityFunctions::is_instance_id_valid(int64_t p_id) {
return ObjectDB::get_instance(ObjectID((uint64_t)p_id)) != nullptr;
}
}
static inline bool is_instance_valid(const Variant &p_instance) {
bool VariantUtilityFunctions::is_instance_valid(const Variant &p_instance) {
if (p_instance.get_type() != Variant::OBJECT) {
return false;
}
return p_instance.get_validated_object() != nullptr;
}
}
static inline uint64_t rid_allocate_id() {
uint64_t VariantUtilityFunctions::rid_allocate_id() {
return RID_AllocBase::_gen_id();
}
}
static inline RID rid_from_int64(uint64_t p_base) {
RID VariantUtilityFunctions::rid_from_int64(uint64_t p_base) {
return RID::from_uint64(p_base);
}
}
static inline bool is_same(const Variant &p_a, const Variant &p_b) {
bool VariantUtilityFunctions::is_same(const Variant &p_a, const Variant &p_b) {
return p_a.identity_compare(p_b);
}
};
}
#ifdef DEBUG_METHODS_ENABLED
#define VCALLR *ret = p_func(VariantCasterAndValidate<P>::cast(p_args, Is, r_error)...)

View file

@ -0,0 +1,153 @@
/**************************************************************************/
/* variant_utility.h */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef VARIANT_UTILITY_H
#define VARIANT_UTILITY_H
#include "variant.h"
struct VariantUtilityFunctions {
// Math
static double sin(double arg);
static double cos(double arg);
static double tan(double arg);
static double sinh(double arg);
static double cosh(double arg);
static double tanh(double arg);
static double asin(double arg);
static double acos(double arg);
static double atan(double arg);
static double atan2(double y, double x);
static double sqrt(double x);
static double fmod(double b, double r);
static double fposmod(double b, double r);
static int64_t posmod(int64_t b, int64_t r);
static Variant floor(Variant x, Callable::CallError &r_error);
static double floorf(double x);
static int64_t floori(double x);
static Variant ceil(Variant x, Callable::CallError &r_error);
static double ceilf(double x);
static int64_t ceili(double x);
static Variant round(Variant x, Callable::CallError &r_error);
static double roundf(double x);
static int64_t roundi(double x);
static Variant abs(const Variant &x, Callable::CallError &r_error);
static double absf(double x);
static int64_t absi(int64_t x);
static Variant sign(const Variant &x, Callable::CallError &r_error);
static double signf(double x);
static int64_t signi(int64_t x);
static double pow(double x, double y);
static double log(double x);
static double exp(double x);
static bool is_nan(double x);
static bool is_inf(double x);
static bool is_equal_approx(double x, double y);
static bool is_zero_approx(double x);
static bool is_finite(double x);
static double ease(float x, float curve);
static int step_decimals(float step);
static Variant snapped(const Variant &x, const Variant &step, Callable::CallError &r_error);
static double snappedf(double x, double step);
static int64_t snappedi(double x, int64_t step);
static Variant lerp(const Variant &from, const Variant &to, double weight, Callable::CallError &r_error);
static double lerpf(double from, double to, double weight);
static double cubic_interpolate(double from, double to, double pre, double post, double weight);
static double cubic_interpolate_angle(double from, double to, double pre, double post, double weight);
static double cubic_interpolate_in_time(double from, double to, double pre, double post, double weight,
double to_t, double pre_t, double post_t);
static double cubic_interpolate_angle_in_time(double from, double to, double pre, double post, double weight,
double to_t, double pre_t, double post_t);
static double bezier_interpolate(double p_start, double p_control_1, double p_control_2, double p_end, double p_t);
static double bezier_derivative(double p_start, double p_control_1, double p_control_2, double p_end, double p_t);
static double lerp_angle(double from, double to, double weight);
static double inverse_lerp(double from, double to, double weight);
static double remap(double value, double istart, double istop, double ostart, double ostop);
static double smoothstep(double from, double to, double val);
static double move_toward(double from, double to, double delta);
static double deg_to_rad(double angle_deg);
static double rad_to_deg(double angle_rad);
static double linear_to_db(double linear);
static double db_to_linear(double db);
static Variant wrap(const Variant &p_x, const Variant &p_min, const Variant &p_max, Callable::CallError &r_error);
static int64_t wrapi(int64_t value, int64_t min, int64_t max);
static double wrapf(double value, double min, double max);
static double pingpong(double value, double length);
static Variant max(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
static double maxf(double x, double y);
static int64_t maxi(int64_t x, int64_t y);
static Variant min(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
static double minf(double x, double y);
static int64_t mini(int64_t x, int64_t y);
static Variant clamp(const Variant &x, const Variant &min, const Variant &max, Callable::CallError &r_error);
static double clampf(double x, double min, double max);
static int64_t clampi(int64_t x, int64_t min, int64_t max);
static int64_t nearest_po2(int64_t x);
// Random
static void randomize();
static int64_t randi();
static double randf();
static double randfn(double mean, double deviation);
static int64_t randi_range(int64_t from, int64_t to);
static double randf_range(double from, double to);
static void seed(int64_t s);
static PackedInt64Array rand_from_seed(int64_t seed);
// Utility
static Variant weakref(const Variant &obj, Callable::CallError &r_error);
static int64_t _typeof(const Variant &obj);
static Variant type_convert(const Variant &p_variant, const Variant::Type p_type);
static String str(const Variant **p_args, int p_arg_count, Callable::CallError &r_error);
static String error_string(Error error);
static void print(const Variant **p_args, int p_arg_count, Callable::CallError &r_error);
static void print_rich(const Variant **p_args, int p_arg_count, Callable::CallError &r_error);
#undef print_verbose
static void print_verbose(const Variant **p_args, int p_arg_count, Callable::CallError &r_error);
static void printerr(const Variant **p_args, int p_arg_count, Callable::CallError &r_error);
static void printt(const Variant **p_args, int p_arg_count, Callable::CallError &r_error);
static void prints(const Variant **p_args, int p_arg_count, Callable::CallError &r_error);
static void printraw(const Variant **p_args, int p_arg_count, Callable::CallError &r_error);
static void push_error(const Variant **p_args, int p_arg_count, Callable::CallError &r_error);
static void push_warning(const Variant **p_args, int p_arg_count, Callable::CallError &r_error);
static String var_to_str(const Variant &p_var);
static Variant str_to_var(const String &p_var);
static PackedByteArray var_to_bytes(const Variant &p_var);
static PackedByteArray var_to_bytes_with_objects(const Variant &p_var);
static Variant bytes_to_var(const PackedByteArray &p_arr);
static Variant bytes_to_var_with_objects(const PackedByteArray &p_arr);
static int64_t hash(const Variant &p_arr);
static Object *instance_from_id(int64_t p_id);
static bool is_instance_id_valid(int64_t p_id);
static bool is_instance_valid(const Variant &p_instance);
static uint64_t rid_allocate_id();
static RID rid_from_int64(uint64_t p_base);
static bool is_same(const Variant &p_a, const Variant &p_b);
};
#endif // VARIANT_UTILITY_H

View file

@ -35,7 +35,7 @@
#include "core/io/resource_loader.h"
#include "core/io/resource_saver.h"
#include "core/object/message_queue.h"
#include "core/variant/variant_utility.cpp"
#include "core/variant/variant_utility.h"
#include "editor/editor_node.h"
#include "editor/editor_paths.h"
#include "editor/editor_scale.h"