Merge pull request #49287 from reduz/expose-variant-internal-binders
Make some Variant internal functions public.
This commit is contained in:
Rémi Verschelde
GitHub
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+1
-1336
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -28,282 +28,7 @@
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "variant.h"
|
||||
|
||||
#include "core/core_string_names.h"
|
||||
#include "core/debugger/engine_debugger.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "core/templates/local_vector.h"
|
||||
#include "core/variant/variant_internal.h"
|
||||
|
||||
/**** NAMED SETTERS AND GETTERS ****/
|
||||
|
||||
#define SETGET_STRUCT(m_base_type, m_member_type, m_member) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_member, member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_member = PtrToArg<m_member_type>::convert(member); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_NUMBER_STRUCT(m_base_type, m_member_type, m_member) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_member, member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == Variant::FLOAT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member = *VariantGetInternalPtr<double>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else if (value->get_type() == Variant::INT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member = *VariantGetInternalPtr<int64_t>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_member = PtrToArg<m_member_type>::convert(member); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_custom, member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_custom = PtrToArg<m_member_type>::convert(member); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_NUMBER_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_custom, member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == Variant::FLOAT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom = *VariantGetInternalPtr<double>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else if (value->get_type() == Variant::INT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom = *VariantGetInternalPtr<int64_t>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_custom = PtrToArg<m_member_type>::convert(member); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(), member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(*VariantGetInternalPtr<m_member_type>::get_ptr(value)); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(*VariantGetInternalPtr<m_member_type>::get_ptr(value)); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_setter(PtrToArg<m_member_type>::convert(member)); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_NUMBER_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(), member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == Variant::FLOAT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(*VariantGetInternalPtr<double>::get_ptr(value)); \
|
||||
valid = true; \
|
||||
} else if (value->get_type() == Variant::INT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(*VariantGetInternalPtr<int64_t>::get_ptr(value)); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(*VariantGetInternalPtr<m_member_type>::get_ptr(value)); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_setter(PtrToArg<m_member_type>::convert(member)); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_STRUCT_FUNC_INDEX(m_base_type, m_member_type, m_member, m_setter, m_getter, m_index) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(m_index); \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(m_index), member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(m_index, *VariantGetInternalPtr<m_member_type>::get_ptr(value)); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(m_index, *VariantGetInternalPtr<m_member_type>::get_ptr(value)); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_setter(m_index, PtrToArg<m_member_type>::convert(member)); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
SETGET_NUMBER_STRUCT(Vector2, double, x)
|
||||
SETGET_NUMBER_STRUCT(Vector2, double, y)
|
||||
|
||||
SETGET_NUMBER_STRUCT(Vector2i, int64_t, x)
|
||||
SETGET_NUMBER_STRUCT(Vector2i, int64_t, y)
|
||||
|
||||
SETGET_NUMBER_STRUCT(Vector3, double, x)
|
||||
SETGET_NUMBER_STRUCT(Vector3, double, y)
|
||||
SETGET_NUMBER_STRUCT(Vector3, double, z)
|
||||
|
||||
SETGET_NUMBER_STRUCT(Vector3i, int64_t, x)
|
||||
SETGET_NUMBER_STRUCT(Vector3i, int64_t, y)
|
||||
SETGET_NUMBER_STRUCT(Vector3i, int64_t, z)
|
||||
|
||||
SETGET_STRUCT(Rect2, Vector2, position)
|
||||
SETGET_STRUCT(Rect2, Vector2, size)
|
||||
SETGET_STRUCT_FUNC(Rect2, Vector2, end, set_end, get_end)
|
||||
|
||||
SETGET_STRUCT(Rect2i, Vector2i, position)
|
||||
SETGET_STRUCT(Rect2i, Vector2i, size)
|
||||
SETGET_STRUCT_FUNC(Rect2i, Vector2i, end, set_end, get_end)
|
||||
|
||||
SETGET_STRUCT(AABB, Vector3, position)
|
||||
SETGET_STRUCT(AABB, Vector3, size)
|
||||
SETGET_STRUCT_FUNC(AABB, Vector3, end, set_end, get_end)
|
||||
|
||||
SETGET_STRUCT_CUSTOM(Transform2D, Vector2, x, elements[0])
|
||||
SETGET_STRUCT_CUSTOM(Transform2D, Vector2, y, elements[1])
|
||||
SETGET_STRUCT_CUSTOM(Transform2D, Vector2, origin, elements[2])
|
||||
|
||||
SETGET_NUMBER_STRUCT_CUSTOM(Plane, double, x, normal.x)
|
||||
SETGET_NUMBER_STRUCT_CUSTOM(Plane, double, y, normal.y)
|
||||
SETGET_NUMBER_STRUCT_CUSTOM(Plane, double, z, normal.z)
|
||||
SETGET_STRUCT(Plane, Vector3, normal)
|
||||
SETGET_NUMBER_STRUCT(Plane, double, d)
|
||||
|
||||
SETGET_NUMBER_STRUCT(Quaternion, double, x)
|
||||
SETGET_NUMBER_STRUCT(Quaternion, double, y)
|
||||
SETGET_NUMBER_STRUCT(Quaternion, double, z)
|
||||
SETGET_NUMBER_STRUCT(Quaternion, double, w)
|
||||
|
||||
SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, x, set_axis, get_axis, 0)
|
||||
SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, y, set_axis, get_axis, 1)
|
||||
SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, z, set_axis, get_axis, 2)
|
||||
|
||||
SETGET_STRUCT(Transform3D, Basis, basis)
|
||||
SETGET_STRUCT(Transform3D, Vector3, origin)
|
||||
|
||||
SETGET_NUMBER_STRUCT(Color, double, r)
|
||||
SETGET_NUMBER_STRUCT(Color, double, g)
|
||||
SETGET_NUMBER_STRUCT(Color, double, b)
|
||||
SETGET_NUMBER_STRUCT(Color, double, a)
|
||||
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, int64_t, r8, set_r8, get_r8)
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, int64_t, g8, set_g8, get_g8)
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, int64_t, b8, set_b8, get_b8)
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, int64_t, a8, set_a8, get_a8)
|
||||
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, double, h, set_h, get_h)
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, double, s, set_s, get_s)
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, double, v, set_v, get_v)
|
||||
#include "variant_setget.h"
|
||||
|
||||
struct VariantSetterGetterInfo {
|
||||
void (*setter)(Variant *base, const Variant *value, bool &valid);
|
||||
@@ -326,7 +51,7 @@ static void register_member(Variant::Type p_type, const StringName &p_member) {
|
||||
sgi.ptr_setter = T::ptr_set;
|
||||
|
||||
sgi.getter = T::get;
|
||||
sgi.validated_getter = T::get;
|
||||
sgi.validated_getter = T::validated_get;
|
||||
sgi.ptr_getter = T::ptr_get;
|
||||
|
||||
sgi.member_type = T::get_type();
|
||||
|
||||
@@ -0,0 +1,332 @@
|
||||
/*************************************************************************/
|
||||
/* variant_setget.h */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
/* https://godotengine.org */
|
||||
/*************************************************************************/
|
||||
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
|
||||
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
|
||||
/* */
|
||||
/* 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_SETGET_H
|
||||
#define VARIANT_SETGET_H
|
||||
|
||||
#include "variant.h"
|
||||
|
||||
#include "core/core_string_names.h"
|
||||
#include "core/debugger/engine_debugger.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "core/templates/local_vector.h"
|
||||
#include "core/variant/variant_internal.h"
|
||||
|
||||
/**** NAMED SETTERS AND GETTERS ****/
|
||||
|
||||
#define SETGET_STRUCT(m_base_type, m_member_type, m_member) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \
|
||||
} \
|
||||
static inline void validated_get(const Variant *base, Variant *member) { \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_member, member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static inline void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_member = PtrToArg<m_member_type>::convert(member); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_NUMBER_STRUCT(m_base_type, m_member_type, m_member) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \
|
||||
} \
|
||||
static inline void validated_get(const Variant *base, Variant *member) { \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_member, member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == Variant::FLOAT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member = *VariantGetInternalPtr<double>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else if (value->get_type() == Variant::INT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member = *VariantGetInternalPtr<int64_t>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static inline void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_member = PtrToArg<m_member_type>::convert(member); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \
|
||||
} \
|
||||
static inline void validated_get(const Variant *base, Variant *member) { \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_custom, member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static inline void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_custom = PtrToArg<m_member_type>::convert(member); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_NUMBER_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \
|
||||
} \
|
||||
static inline void validated_get(const Variant *base, Variant *member) { \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_custom, member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == Variant::FLOAT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom = *VariantGetInternalPtr<double>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else if (value->get_type() == Variant::INT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom = *VariantGetInternalPtr<int64_t>::get_ptr(value); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static inline void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom = *VariantGetInternalPtr<m_member_type>::get_ptr(value); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_custom = PtrToArg<m_member_type>::convert(member); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \
|
||||
} \
|
||||
static inline void validated_get(const Variant *base, Variant *member) { \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(), member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(*VariantGetInternalPtr<m_member_type>::get_ptr(value)); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static inline void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(*VariantGetInternalPtr<m_member_type>::get_ptr(value)); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_setter(PtrToArg<m_member_type>::convert(member)); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_NUMBER_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \
|
||||
} \
|
||||
static inline void validated_get(const Variant *base, Variant *member) { \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(), member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == Variant::FLOAT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(*VariantGetInternalPtr<double>::get_ptr(value)); \
|
||||
valid = true; \
|
||||
} else if (value->get_type() == Variant::INT) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(*VariantGetInternalPtr<int64_t>::get_ptr(value)); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static inline void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(*VariantGetInternalPtr<m_member_type>::get_ptr(value)); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_setter(PtrToArg<m_member_type>::convert(member)); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
#define SETGET_STRUCT_FUNC_INDEX(m_base_type, m_member_type, m_member, m_setter, m_getter, m_index) \
|
||||
struct VariantSetGet_##m_base_type##_##m_member { \
|
||||
static void get(const Variant *base, Variant *member) { \
|
||||
VariantTypeAdjust<m_member_type>::adjust(member); \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(m_index); \
|
||||
} \
|
||||
static inline void validated_get(const Variant *base, Variant *member) { \
|
||||
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(m_index); \
|
||||
} \
|
||||
static void ptr_get(const void *base, void *member) { \
|
||||
PtrToArg<m_member_type>::encode(PtrToArg<m_base_type>::convert(base).m_getter(m_index), member); \
|
||||
} \
|
||||
static void set(Variant *base, const Variant *value, bool &valid) { \
|
||||
if (value->get_type() == GetTypeInfo<m_member_type>::VARIANT_TYPE) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(m_index, *VariantGetInternalPtr<m_member_type>::get_ptr(value)); \
|
||||
valid = true; \
|
||||
} else { \
|
||||
valid = false; \
|
||||
} \
|
||||
} \
|
||||
static inline void validated_set(Variant *base, const Variant *value) { \
|
||||
VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_setter(m_index, *VariantGetInternalPtr<m_member_type>::get_ptr(value)); \
|
||||
} \
|
||||
static void ptr_set(void *base, const void *member) { \
|
||||
m_base_type b = PtrToArg<m_base_type>::convert(base); \
|
||||
b.m_setter(m_index, PtrToArg<m_member_type>::convert(member)); \
|
||||
PtrToArg<m_base_type>::encode(b, base); \
|
||||
} \
|
||||
static Variant::Type get_type() { return GetTypeInfo<m_member_type>::VARIANT_TYPE; } \
|
||||
};
|
||||
|
||||
SETGET_NUMBER_STRUCT(Vector2, double, x)
|
||||
SETGET_NUMBER_STRUCT(Vector2, double, y)
|
||||
|
||||
SETGET_NUMBER_STRUCT(Vector2i, int64_t, x)
|
||||
SETGET_NUMBER_STRUCT(Vector2i, int64_t, y)
|
||||
|
||||
SETGET_NUMBER_STRUCT(Vector3, double, x)
|
||||
SETGET_NUMBER_STRUCT(Vector3, double, y)
|
||||
SETGET_NUMBER_STRUCT(Vector3, double, z)
|
||||
|
||||
SETGET_NUMBER_STRUCT(Vector3i, int64_t, x)
|
||||
SETGET_NUMBER_STRUCT(Vector3i, int64_t, y)
|
||||
SETGET_NUMBER_STRUCT(Vector3i, int64_t, z)
|
||||
|
||||
SETGET_STRUCT(Rect2, Vector2, position)
|
||||
SETGET_STRUCT(Rect2, Vector2, size)
|
||||
SETGET_STRUCT_FUNC(Rect2, Vector2, end, set_end, get_end)
|
||||
|
||||
SETGET_STRUCT(Rect2i, Vector2i, position)
|
||||
SETGET_STRUCT(Rect2i, Vector2i, size)
|
||||
SETGET_STRUCT_FUNC(Rect2i, Vector2i, end, set_end, get_end)
|
||||
|
||||
SETGET_STRUCT(AABB, Vector3, position)
|
||||
SETGET_STRUCT(AABB, Vector3, size)
|
||||
SETGET_STRUCT_FUNC(AABB, Vector3, end, set_end, get_end)
|
||||
|
||||
SETGET_STRUCT_CUSTOM(Transform2D, Vector2, x, elements[0])
|
||||
SETGET_STRUCT_CUSTOM(Transform2D, Vector2, y, elements[1])
|
||||
SETGET_STRUCT_CUSTOM(Transform2D, Vector2, origin, elements[2])
|
||||
|
||||
SETGET_NUMBER_STRUCT_CUSTOM(Plane, double, x, normal.x)
|
||||
SETGET_NUMBER_STRUCT_CUSTOM(Plane, double, y, normal.y)
|
||||
SETGET_NUMBER_STRUCT_CUSTOM(Plane, double, z, normal.z)
|
||||
SETGET_STRUCT(Plane, Vector3, normal)
|
||||
SETGET_NUMBER_STRUCT(Plane, double, d)
|
||||
|
||||
SETGET_NUMBER_STRUCT(Quaternion, double, x)
|
||||
SETGET_NUMBER_STRUCT(Quaternion, double, y)
|
||||
SETGET_NUMBER_STRUCT(Quaternion, double, z)
|
||||
SETGET_NUMBER_STRUCT(Quaternion, double, w)
|
||||
|
||||
SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, x, set_axis, get_axis, 0)
|
||||
SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, y, set_axis, get_axis, 1)
|
||||
SETGET_STRUCT_FUNC_INDEX(Basis, Vector3, z, set_axis, get_axis, 2)
|
||||
|
||||
SETGET_STRUCT(Transform3D, Basis, basis)
|
||||
SETGET_STRUCT(Transform3D, Vector3, origin)
|
||||
|
||||
SETGET_NUMBER_STRUCT(Color, double, r)
|
||||
SETGET_NUMBER_STRUCT(Color, double, g)
|
||||
SETGET_NUMBER_STRUCT(Color, double, b)
|
||||
SETGET_NUMBER_STRUCT(Color, double, a)
|
||||
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, int64_t, r8, set_r8, get_r8)
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, int64_t, g8, set_g8, get_g8)
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, int64_t, b8, set_b8, get_b8)
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, int64_t, a8, set_a8, get_a8)
|
||||
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, double, h, set_h, get_h)
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, double, s, set_s, get_s)
|
||||
SETGET_NUMBER_STRUCT_FUNC(Color, double, v, set_v, get_v)
|
||||
|
||||
#endif // VARIANT_SETGET_H
|
||||
@@ -3447,6 +3447,7 @@ GDScriptParser::DataType GDScriptAnalyzer::get_operation_type(Variant::Operator
|
||||
}
|
||||
|
||||
r_valid = true;
|
||||
result.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED;
|
||||
|
||||
result.kind = GDScriptParser::DataType::BUILTIN;
|
||||
result.builtin_type = Variant::get_operator_return_type(p_operation, a_type, b_type);
|
||||
|
||||
@@ -554,6 +554,14 @@ void GDScriptByteCodeGenerator::write_unary_operator(const Address &p_target, Va
|
||||
|
||||
void GDScriptByteCodeGenerator::write_binary_operator(const Address &p_target, Variant::Operator p_operator, const Address &p_left_operand, const Address &p_right_operand) {
|
||||
if (HAS_BUILTIN_TYPE(p_left_operand) && HAS_BUILTIN_TYPE(p_right_operand)) {
|
||||
if (p_target.mode == Address::TEMPORARY) {
|
||||
Variant::Type result_type = Variant::get_operator_return_type(p_operator, p_left_operand.type.builtin_type, p_right_operand.type.builtin_type);
|
||||
Variant::Type temp_type = temporaries[p_target.address].type;
|
||||
if (result_type != temp_type) {
|
||||
write_type_adjust(p_target, result_type);
|
||||
}
|
||||
}
|
||||
|
||||
// Gather specific operator.
|
||||
Variant::ValidatedOperatorEvaluator op_func = Variant::get_validated_operator_evaluator(p_operator, p_left_operand.type.builtin_type, p_right_operand.type.builtin_type);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user