seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Type renames:

Browse Source 
Matrix32 -> Transform2D
	Matrix3 -> Basis
	AABB -> Rect3
	RawArray -> PoolByteArray
	IntArray -> PoolIntArray
	FloatArray -> PoolFloatArray
	Vector2Array -> PoolVector2Array
	Vector3Array -> PoolVector3Array
	ColorArray -> PoolColorArray
This commit is contained in:
Juan Linietsky
2017-01-11 00:52:51 -03:00
parent 710692278d
commit bc26f90581
266 changed files with 2466 additions and 2468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/variant.h
View File

@ -63,13 +63,13 @@ struct PropertyInfo;
struct MethodInfo;
typedef PoolVector<uint8_t> ByteArray;
typedef PoolVector<int> IntArray;
typedef PoolVector<real_t> RealArray;
typedef PoolVector<String> StringArray;
typedef PoolVector<Vector2> Vector2Array;
typedef PoolVector<Vector3> Vector3Array;
typedef PoolVector<Color> ColorArray;
typedef PoolVector<uint8_t> PoolByteArray;
typedef PoolVector<int> PoolIntArray;
typedef PoolVector<real_t> PoolRealArray;
typedef PoolVector<String> PoolStringArray;
typedef PoolVector<Vector2> PoolVector2Array;
typedef PoolVector<Vector3> PoolVector3Array;
typedef PoolVector<Color> PoolColorArray;
class Variant {
public:
@ -89,11 +89,11 @@ public:
VECTOR2, // 5
RECT2,
VECTOR3,
MATRIX32,
TRANSFORM2D,
PLANE,
QUAT, // 10
_AABB, //sorry naming convention fail :( not like it's used often
MATRIX3,
RECT3, //sorry naming convention fail :( not like it's used often
BASIS,
TRANSFORM,
// misc types
@ -107,13 +107,13 @@ public:
ARRAY,
// arrays
RAW_ARRAY,
INT_ARRAY,
REAL_ARRAY,
STRING_ARRAY, // 25
VECTOR2_ARRAY,
VECTOR3_ARRAY,
COLOR_ARRAY,
POOL_BYTE_ARRAY,
POOL_INT_ARRAY,
POOL_REAL_ARRAY,
POOL_STRING_ARRAY, // 25
POOL_VECTOR2_ARRAY,
POOL_VECTOR3_ARRAY,
POOL_COLOR_ARRAY,
VARIANT_MAX
@ -143,9 +143,9 @@ private:
bool _bool;
int64_t _int;
double _real;
Matrix32 *_matrix32;
AABB* _aabb;
Matrix3 *_matrix3;
Transform2D *_transform2d;
Rect3* _rect3;
Basis *_basis;
Transform *_transform;
RefPtr *_resource;
InputEvent *_input_event;
@ -208,11 +208,11 @@ public:
operator Rect2() const;
operator Vector3() const;
operator Plane() const;
operator AABB() const;
operator Rect3() const;
operator Quat() const;
operator Matrix3() const;
operator Basis() const;
operator Transform() const;
operator Matrix32() const;
operator Transform2D() const;
operator Color() const;
operator Image() const;
@ -280,10 +280,10 @@ public:
Variant(const Rect2& p_rect2);
Variant(const Vector3& p_vector3);
Variant(const Plane& p_plane);
Variant(const AABB& p_aabb);
Variant(const Rect3& p_aabb);
Variant(const Quat& p_quat);
Variant(const Matrix3& p_transform);
Variant(const Matrix32& p_transform);
Variant(const Basis& p_transform);
Variant(const Transform2D& p_transform);
Variant(const Transform& p_transform);
Variant(const Color& p_color);
Variant(const Image& p_image);