godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4bf3199000
godot/core/variant/variant_construct.cpp

357 lines
18 KiB
C++
Raw Normal View History

Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
/*************************************************************************/
/* variant_construct.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
Update copyright statements to 2022 Happy new year to the wonderful Godot community!
2022-01-03 20:27:34 +00:00
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
/* */
/* 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. */
/*************************************************************************/
Make some variant internal functions public. -Make constructors, ops and setget inline functions public -Should help optimizing the GDScript VM
2021-06-03 19:05:57 +00:00
#include "variant_construct.h"
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
struct VariantConstructData {
Style: Partially apply clang-tidy's `cppcoreguidelines-pro-type-member-init` Didn't commit all the changes where it wants to initialize a struct with `{}`. Should be reviewed in a separate PR. Option `IgnoreArrays` enabled for now to be conservative, can be disabled to see if it proposes more useful changes. Also fixed manually a handful of other missing initializations / moved some from constructors.
2022-05-02 14:28:25 +00:00
void (*construct)(Variant &r_base, const Variant **p_args, Callable::CallError &r_error) = nullptr;
Variant::ValidatedConstructor validated_construct = nullptr;
Variant::PTRConstructor ptr_construct = nullptr;
Variant::Type (*get_argument_type)(int) = nullptr;
int argument_count = 0;
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Vector<String> arg_names;
};
static LocalVector<VariantConstructData> construct_data[Variant::VARIANT_MAX];
template <class T>
static void add_constructor(const Vector<String> &arg_names) {
ERR_FAIL_COND_MSG(arg_names.size() != T::get_argument_count(), "Argument names size mismatch for " + Variant::get_type_name(T::get_base_type()) + ".");
VariantConstructData cd;
cd.construct = T::construct;
cd.validated_construct = T::validated_construct;
cd.ptr_construct = T::ptr_construct;
cd.get_argument_type = T::get_argument_type;
cd.argument_count = T::get_argument_count();
cd.arg_names = arg_names;
construct_data[T::get_base_type()].push_back(cd);
}
void Variant::_register_variant_constructors() {
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgsNil>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructorNil>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<bool>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<bool, bool>>(sarray("from"));
add_constructor<VariantConstructor<bool, int64_t>>(sarray("from"));
add_constructor<VariantConstructor<bool, double>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<int64_t>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<int64_t, int64_t>>(sarray("from"));
add_constructor<VariantConstructor<int64_t, double>>(sarray("from"));
Variant: Sync docs with new constructors, fixups after #43403 Change DocData comparators for MethodDoc and ArgumentDoc to get a better ordering of constructors.
2020-11-09 16:46:03 +00:00
add_constructor<VariantConstructor<int64_t, bool>>(sarray("from"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<double>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<double, double>>(sarray("from"));
add_constructor<VariantConstructor<double, int64_t>>(sarray("from"));
Variant: Sync docs with new constructors, fixups after #43403 Change DocData comparators for MethodDoc and ArgumentDoc to get a better ordering of constructors.
2020-11-09 16:46:03 +00:00
add_constructor<VariantConstructor<double, bool>>(sarray("from"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<String>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<String, String>>(sarray("from"));
add_constructor<VariantConstructor<String, StringName>>(sarray("from"));
add_constructor<VariantConstructor<String, NodePath>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Vector2>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Vector2, Vector2>>(sarray("from"));
add_constructor<VariantConstructor<Vector2, Vector2i>>(sarray("from"));
add_constructor<VariantConstructor<Vector2, double, double>>(sarray("x", "y"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Vector2i>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Vector2i, Vector2i>>(sarray("from"));
add_constructor<VariantConstructor<Vector2i, Vector2>>(sarray("from"));
add_constructor<VariantConstructor<Vector2i, int64_t, int64_t>>(sarray("x", "y"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Rect2>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Rect2, Rect2>>(sarray("from"));
add_constructor<VariantConstructor<Rect2, Rect2i>>(sarray("from"));
add_constructor<VariantConstructor<Rect2, Vector2, Vector2>>(sarray("position", "size"));
add_constructor<VariantConstructor<Rect2, double, double, double, double>>(sarray("x", "y", "width", "height"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Rect2i>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Rect2i, Rect2i>>(sarray("from"));
add_constructor<VariantConstructor<Rect2i, Rect2>>(sarray("from"));
add_constructor<VariantConstructor<Rect2i, Vector2i, Vector2i>>(sarray("position", "size"));
add_constructor<VariantConstructor<Rect2i, int64_t, int64_t, int64_t, int64_t>>(sarray("x", "y", "width", "height"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Vector3>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Vector3, Vector3>>(sarray("from"));
add_constructor<VariantConstructor<Vector3, Vector3i>>(sarray("from"));
add_constructor<VariantConstructor<Vector3, double, double, double>>(sarray("x", "y", "z"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Vector3i>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Vector3i, Vector3i>>(sarray("from"));
add_constructor<VariantConstructor<Vector3i, Vector3>>(sarray("from"));
add_constructor<VariantConstructor<Vector3i, int64_t, int64_t, int64_t>>(sarray("x", "y", "z"));
Implement Vector4, Vector4i, Projection Implement built-in classes Vector4, Vector4i and Projection. * Two versions of Vector4 (float and integer). * A Projection class, which is a 4x4 matrix specialized in projection types. These types have been requested for a long time, but given they were very corner case they were not added before. Because in Godot 4, reimplementing parts of the rendering engine is now possible, access to these types (heavily used by the rendering code) becomes a necessity. **Q**: Why Projection and not Matrix4? **A**: Godot does not use Matrix2, Matrix3, Matrix4x3, etc. naming convention because, within the engine, these types always have a *purpose*. As such, Godot names them: Transform2D, Transform3D or Basis. In this case, this 4x4 matrix is _always_ used as a _Projection_, hence the naming.
2022-07-19 23:11:13 +00:00
add_constructor<VariantConstructNoArgs<Vector4>>(sarray());
add_constructor<VariantConstructor<Vector4, Vector4>>(sarray("from"));
add_constructor<VariantConstructor<Vector4, Vector4i>>(sarray("from"));
add_constructor<VariantConstructor<Vector4, double, double, double, double>>(sarray("x", "y", "z", "w"));
add_constructor<VariantConstructNoArgs<Vector4i>>(sarray());
add_constructor<VariantConstructor<Vector4i, Vector4i>>(sarray("from"));
add_constructor<VariantConstructor<Vector4i, Vector4>>(sarray("from"));
add_constructor<VariantConstructor<Vector4i, int64_t, int64_t, int64_t, int64_t>>(sarray("x", "y", "z", "w"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Transform2D>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Transform2D, Transform2D>>(sarray("from"));
Variant: Sync docs with new constructors, fixups after #43403 Change DocData comparators for MethodDoc and ArgumentDoc to get a better ordering of constructors.
2020-11-09 16:46:03 +00:00
add_constructor<VariantConstructor<Transform2D, float, Vector2>>(sarray("rotation", "position"));
Expose get_skew for transform2d and add new constructor Expose set_scale and set_skew for transform2d Replacing float by real_t Adding const parameters Updated transform2d doc
2021-09-02 09:36:19 +00:00
add_constructor<VariantConstructor<Transform2D, float, Size2, float, Vector2>>(sarray("rotation", "scale", "skew", "position"));
Variant: Sync docs with new constructors, fixups after #43403 Change DocData comparators for MethodDoc and ArgumentDoc to get a better ordering of constructors.
2020-11-09 16:46:03 +00:00
add_constructor<VariantConstructor<Transform2D, Vector2, Vector2, Vector2>>(sarray("x_axis", "y_axis", "origin"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Plane>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Plane, Plane>>(sarray("from"));
Swap args of Plane(point, normal) constructor Now (normal, point)
2021-04-08 14:26:14 +00:00
add_constructor<VariantConstructor<Plane, Vector3>>(sarray("normal"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Plane, Vector3, double>>(sarray("normal", "d"));
Swap args of Plane(point, normal) constructor Now (normal, point)
2021-04-08 14:26:14 +00:00
add_constructor<VariantConstructor<Plane, Vector3, Vector3>>(sarray("normal", "point"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Plane, Vector3, Vector3, Vector3>>(sarray("point1", "point2", "point3"));
Variant: Sync docs with new constructors, fixups after #43403 Change DocData comparators for MethodDoc and ArgumentDoc to get a better ordering of constructors.
2020-11-09 16:46:03 +00:00
add_constructor<VariantConstructor<Plane, double, double, double, double>>(sarray("a", "b", "c", "d"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Rename Quat to Quaternion
2021-01-20 07:02:02 +00:00
add_constructor<VariantConstructNoArgs<Quaternion>>(sarray());
add_constructor<VariantConstructor<Quaternion, Quaternion>>(sarray("from"));
add_constructor<VariantConstructor<Quaternion, Basis>>(sarray("from"));
add_constructor<VariantConstructor<Quaternion, Vector3, double>>(sarray("axis", "angle"));
add_constructor<VariantConstructor<Quaternion, Vector3, Vector3>>(sarray("arc_from", "arc_to"));
add_constructor<VariantConstructor<Quaternion, double, double, double, double>>(sarray("x", "y", "z", "w"));
Refactored Node3D rotation modes * Made the Basis euler orders indexed via enum. * Node3D has a new rotation_order property to choose Euler rotation order. * Node3D has also a rotation_mode property to choose between Euler, Quaternion and Basis Exposing these modes as well as the order makes Godot a lot friendlier for animators, which can choose the best way to interpolate rotations. The new *Basis* mode makes the (exposed) transform property obsolete, so it was removed (can still be accessed by code of course).
2021-10-21 16:38:20 +00:00
add_constructor<VariantConstructor<Quaternion, Vector3>>(sarray("euler_yxz"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<::AABB>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<::AABB, ::AABB>>(sarray("from"));
add_constructor<VariantConstructor<::AABB, Vector3, Vector3>>(sarray("position", "size"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Basis>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Basis, Basis>>(sarray("from"));
Rename Quat to Quaternion
2021-01-20 07:02:02 +00:00
add_constructor<VariantConstructor<Basis, Quaternion>>(sarray("from"));
Core: Rename math 'phi' arguments to 'angle'
2022-05-05 11:25:04 +00:00
add_constructor<VariantConstructor<Basis, Vector3, double>>(sarray("axis", "angle"));
Variant: Sync docs with new constructors, fixups after #43403 Change DocData comparators for MethodDoc and ArgumentDoc to get a better ordering of constructors.
2020-11-09 16:46:03 +00:00
add_constructor<VariantConstructor<Basis, Vector3, Vector3, Vector3>>(sarray("x_axis", "y_axis", "z_axis"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Rename Transform to Transform3D in core
2020-10-17 05:08:21 +00:00
add_constructor<VariantConstructNoArgs<Transform3D>>(sarray());
add_constructor<VariantConstructor<Transform3D, Transform3D>>(sarray("from"));
add_constructor<VariantConstructor<Transform3D, Basis, Vector3>>(sarray("basis", "origin"));
add_constructor<VariantConstructor<Transform3D, Vector3, Vector3, Vector3, Vector3>>(sarray("x_axis", "y_axis", "z_axis", "origin"));
Implement Vector4, Vector4i, Projection Implement built-in classes Vector4, Vector4i and Projection. * Two versions of Vector4 (float and integer). * A Projection class, which is a 4x4 matrix specialized in projection types. These types have been requested for a long time, but given they were very corner case they were not added before. Because in Godot 4, reimplementing parts of the rendering engine is now possible, access to these types (heavily used by the rendering code) becomes a necessity. **Q**: Why Projection and not Matrix4? **A**: Godot does not use Matrix2, Matrix3, Matrix4x3, etc. naming convention because, within the engine, these types always have a *purpose*. As such, Godot names them: Transform2D, Transform3D or Basis. In this case, this 4x4 matrix is _always_ used as a _Projection_, hence the naming.
2022-07-19 23:11:13 +00:00
add_constructor<VariantConstructor<Transform3D, Projection>>(sarray("from"));
add_constructor<VariantConstructNoArgs<Projection>>(sarray());
add_constructor<VariantConstructor<Projection, Projection>>(sarray("from"));
add_constructor<VariantConstructor<Projection, Transform3D>>(sarray("from"));
Add constructor accepting four Vector4's to `Projection`
2022-08-23 17:00:26 +00:00
add_constructor<VariantConstructor<Projection, Vector4, Vector4, Vector4, Vector4>>(sarray("x_axis", "y_axis", "z_axis", "w_axis"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Color>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Color, Color>>(sarray("from"));
Variant: Sync docs with new constructors, fixups after #43403 Change DocData comparators for MethodDoc and ArgumentDoc to get a better ordering of constructors.
2020-11-09 16:46:03 +00:00
add_constructor<VariantConstructor<Color, Color, double>>(sarray("from", "alpha"));
add_constructor<VariantConstructor<Color, double, double, double>>(sarray("r", "g", "b"));
add_constructor<VariantConstructor<Color, double, double, double, double>>(sarray("r", "g", "b", "a"));
Replace ColorN and from HTML with a string constructor
2020-12-06 22:37:34 +00:00
add_constructor<VariantConstructor<Color, String>>(sarray("code"));
add_constructor<VariantConstructor<Color, String, double>>(sarray("code", "alpha"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<StringName>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<StringName, StringName>>(sarray("from"));
add_constructor<VariantConstructor<StringName, String>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<NodePath>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<NodePath, NodePath>>(sarray("from"));
add_constructor<VariantConstructor<NodePath, String>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<::RID>>(sarray());
Variant: Rename Type::_RID to Type::RID The underscore prefix was used to avoid the conflict between the `RID` class name and the matching enum value in `Variant::Type`. This can be fixed differently by prefixing uses of the `RID` class in `Variant` with the scope resolution operator, as done already for `AABB`.
2020-11-09 13:53:05 +00:00
add_constructor<VariantConstructor<::RID, ::RID>>(sarray("from"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgsObject>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructorObject>(sarray("from"));
add_constructor<VariantConstructorNilObject>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Callable>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Callable, Callable>>(sarray("from"));
add_constructor<VariantConstructorCallableArgs>(sarray("object", "method"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Signal>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Signal, Signal>>(sarray("from"));
add_constructor<VariantConstructorSignalArgs>(sarray("object", "signal"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Dictionary>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Dictionary, Dictionary>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<Array>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<Array, Array>>(sarray("from"));
[GDExtension] Implement support for typed arrays.
2022-08-25 09:35:30 +00:00
add_constructor<VariantConstructorTypedArray>(sarray("base", "type", "class_name", "script"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructorToArray<PackedByteArray>>(sarray("from"));
add_constructor<VariantConstructorToArray<PackedInt32Array>>(sarray("from"));
add_constructor<VariantConstructorToArray<PackedInt64Array>>(sarray("from"));
Fix duplicate variant constructor typo.
2020-11-09 16:34:17 +00:00
add_constructor<VariantConstructorToArray<PackedFloat32Array>>(sarray("from"));
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructorToArray<PackedFloat64Array>>(sarray("from"));
add_constructor<VariantConstructorToArray<PackedStringArray>>(sarray("from"));
add_constructor<VariantConstructorToArray<PackedVector2Array>>(sarray("from"));
add_constructor<VariantConstructorToArray<PackedVector3Array>>(sarray("from"));
add_constructor<VariantConstructorToArray<PackedColorArray>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<PackedByteArray>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<PackedByteArray, PackedByteArray>>(sarray("from"));
add_constructor<VariantConstructorFromArray<PackedByteArray>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<PackedInt32Array>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<PackedInt32Array, PackedInt32Array>>(sarray("from"));
add_constructor<VariantConstructorFromArray<PackedInt32Array>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<PackedInt64Array>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<PackedInt64Array, PackedInt64Array>>(sarray("from"));
add_constructor<VariantConstructorFromArray<PackedInt64Array>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<PackedFloat32Array>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<PackedFloat32Array, PackedFloat32Array>>(sarray("from"));
add_constructor<VariantConstructorFromArray<PackedFloat32Array>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<PackedFloat64Array>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<PackedFloat64Array, PackedFloat64Array>>(sarray("from"));
add_constructor<VariantConstructorFromArray<PackedFloat64Array>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<PackedStringArray>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<PackedStringArray, PackedStringArray>>(sarray("from"));
add_constructor<VariantConstructorFromArray<PackedStringArray>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<PackedVector2Array>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<PackedVector2Array, PackedVector2Array>>(sarray("from"));
add_constructor<VariantConstructorFromArray<PackedVector2Array>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<PackedVector3Array>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<PackedVector3Array, PackedVector3Array>>(sarray("from"));
add_constructor<VariantConstructorFromArray<PackedVector3Array>>(sarray("from"));
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
add_constructor<VariantConstructNoArgs<PackedColorArray>>(sarray());
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
add_constructor<VariantConstructor<PackedColorArray, PackedColorArray>>(sarray("from"));
add_constructor<VariantConstructorFromArray<PackedColorArray>>(sarray("from"));
}
void Variant::_unregister_variant_constructors() {
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
construct_data[i].clear();
}
}
void Variant::construct(Variant::Type p_type, Variant &base, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
Add missing ERR_FAIL_INDEX check to Variant::construct Other functions in the same file validate parameters using the ERR_FAIL macros. This validation was missing for Variant::construct resulting in a crash when called with invalid data (p_type < 0). fix #46067
2021-03-04 17:44:30 +00:00
ERR_FAIL_INDEX(p_type, Variant::VARIANT_MAX);
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
uint32_t s = construct_data[p_type].size();
for (uint32_t i = 0; i < s; i++) {
int argc = construct_data[p_type][i].argument_count;
if (argc != p_argcount) {
continue;
}
bool args_match = true;
for (int j = 0; j < argc; j++) {
if (!Variant::can_convert_strict(p_args[j]->get_type(), construct_data[p_type][i].get_argument_type(j))) {
args_match = false;
break;
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
}
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
}
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
if (!args_match) {
continue;
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
}
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
construct_data[p_type][i].construct(base, p_args, r_error);
return;
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
}
Change how no-arg constructor is handled internally in Variant.
2020-11-09 18:16:39 +00:00
r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
}
int Variant::get_constructor_count(Variant::Type p_type) {
ERR_FAIL_INDEX_V(p_type, Variant::VARIANT_MAX, -1);
return construct_data[p_type].size();
}
Variant::ValidatedConstructor Variant::get_validated_constructor(Variant::Type p_type, int p_constructor) {
ERR_FAIL_INDEX_V(p_type, Variant::VARIANT_MAX, nullptr);
ERR_FAIL_INDEX_V(p_constructor, (int)construct_data[p_type].size(), nullptr);
return construct_data[p_type][p_constructor].validated_construct;
}
Variant::PTRConstructor Variant::get_ptr_constructor(Variant::Type p_type, int p_constructor) {
ERR_FAIL_INDEX_V(p_type, Variant::VARIANT_MAX, nullptr);
ERR_FAIL_INDEX_V(p_constructor, (int)construct_data[p_type].size(), nullptr);
return construct_data[p_type][p_constructor].ptr_construct;
}
int Variant::get_constructor_argument_count(Variant::Type p_type, int p_constructor) {
ERR_FAIL_INDEX_V(p_type, Variant::VARIANT_MAX, -1);
ERR_FAIL_INDEX_V(p_constructor, (int)construct_data[p_type].size(), -1);
return construct_data[p_type][p_constructor].argument_count;
}
Variant::Type Variant::get_constructor_argument_type(Variant::Type p_type, int p_constructor, int p_argument) {
ERR_FAIL_INDEX_V(p_type, Variant::VARIANT_MAX, Variant::VARIANT_MAX);
ERR_FAIL_INDEX_V(p_constructor, (int)construct_data[p_type].size(), Variant::VARIANT_MAX);
return construct_data[p_type][p_constructor].get_argument_type(p_argument);
}
String Variant::get_constructor_argument_name(Variant::Type p_type, int p_constructor, int p_argument) {
ERR_FAIL_INDEX_V(p_type, Variant::VARIANT_MAX, String());
ERR_FAIL_INDEX_V(p_constructor, (int)construct_data[p_type].size(), String());
return construct_data[p_type][p_constructor].arg_names[p_argument];
}
Fix VariantInternal initialization and setting of object - Initialize Object pointer to nullptr so it's not used by mistake. - When setting an Object check if it's a reference so refcounting works as intended.
2020-11-30 17:27:44 +00:00
void VariantInternal::object_assign(Variant *v, const Object *o) {
if (o) {
Rename Reference to RefCounted
2021-06-04 16:03:15 +00:00
if (o->is_ref_counted()) {
RefCounted *ref_counted = const_cast<RefCounted *>(static_cast<const RefCounted *>(o));
if (!ref_counted->init_ref()) {
Fix VariantInternal initialization and setting of object - Initialize Object pointer to nullptr so it's not used by mistake. - When setting an Object check if it's a reference so refcounting works as intended.
2020-11-30 17:27:44 +00:00
v->_get_obj().obj = nullptr;
v->_get_obj().id = ObjectID();
return;
}
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
}
Fix VariantInternal initialization and setting of object - Initialize Object pointer to nullptr so it's not used by mistake. - When setting an Object check if it's a reference so refcounting works as intended.
2020-11-30 17:27:44 +00:00
v->_get_obj().obj = const_cast<Object *>(o);
v->_get_obj().id = o->get_instance_id();
} else {
v->_get_obj().obj = nullptr;
v->_get_obj().id = ObjectID();
}
Refactored variant constructor logic
2020-11-09 03:19:09 +00:00
}
void Variant::get_constructor_list(Type p_type, List<MethodInfo> *r_list) {
ERR_FAIL_INDEX(p_type, Variant::VARIANT_MAX);
MethodInfo mi;
mi.return_val.type = p_type;
mi.name = get_type_name(p_type);
for (int i = 0; i < get_constructor_count(p_type); i++) {
int ac = get_constructor_argument_count(p_type, i);
mi.arguments.clear();
for (int j = 0; j < ac; j++) {
PropertyInfo arg;
arg.name = get_constructor_argument_name(p_type, i, j);
arg.type = get_constructor_argument_type(p_type, i, j);
mi.arguments.push_back(arg);
}
r_list->push_back(mi);
}
}
Reference in New Issue Copy Permalink